diff --git a/.gitignore b/.gitignore
index a1d2d8646..1254c4d5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 # remove backup FontLab Studio source files
 *.vfbak
+
+.DS_Store
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5e616e0f..b5c7aca0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Version 4.000
+
+- fixed vertical position discrepancy in paired U+007B and U+007D
+
 # Version 3.003
 
 - U+005B, increased length of square brackets' horizontal strokes (symmetrically reducing left and right sidebearing), all variants
diff --git a/Makefile b/Makefile
index 458d0cf75..86e192042 100644
--- a/Makefile
+++ b/Makefile
@@ -1,40 +1,94 @@
 all: build
 
-archives:
-	postbuild_processing/archive_prep/archiver.sh
+# FONT COMPILES
+
+#
+# Recommended usage:
+#
+#     The following targets build *.ttf, *.woff, *.woff2 (including *.woff and *.woff2 subsets):
+#
+#       `make` - builds fonts with pinned build dependency versions of all Python and local, compiled C/C++ projects
+#       `make build-system` - builds fonts with system PATH installed versions of build dependencies
+#
+#    Dependency installs for default builds with `make` can be executed with:
+#
+#      1) pip3 install pipenv
+#      2) make compile-local-dep
+#
+#    Optional dependency install for `make` if your development system does not support the defined Python interpreter version:
+#
+#      3) curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
+#
 
 build: ttf webfonts
 
-build-with-dependencies: source/*.ufo
-	./build-ttf.sh --install-dependencies
-	./build-woff.sh --install-dependencies
-	./build-woff2.sh --install-dependencies
+build-with-dependencies: compile-local-dep ttf webfonts
+
+build-system: ttf-system webfonts-system
+
+build-local-ttfa:
+	tools/scripts/install/ttfautohint-build.sh
+
+build-local-sfnt2woffzopfli:
+	tools/scripts/install/sfnt2woff-zopfli-build.sh
+
+build-local-woff2:
+	tools/scripts/install/woff2-compress-build.sh
+
+compile-local-dep: build-local-ttfa build-local-sfnt2woffzopfli build-local-woff2
+
+pipenv:
+	./build-pipenv.sh
+
+subsets: pipenv
 	./build-subsets.sh
 
+subsets-system:
+	./build-subsets.sh --system
+
+ttf: pipenv
+	./build-ttf.sh
+
+ttf-system:
+	./build-ttf.sh --system
+
+webfonts: woff woff2 subsets
+
+webfonts-system: woff-system woff2-system subsets-system
+
+woff: pipenv
+	./build-woff.sh
+
+woff-system:
+	./build-woff.sh --system
+
+woff2: pipenv
+	./build-woff2.sh
+
+woff2-system:
+	./build-woff2.sh --system
+
+
+# RELEASE PREP
+
+archives:
+	./build-archives.sh
+
 css:
 	tools/scripts/css/css-build.sh
 
-lint: shellcheck ufolint
 
-shellcheck: build-ttf.sh build-woff.sh build-woff2.sh build-subsets.sh tools/scripts/install/ttfautohint-build.sh postbuild_processing/archive_prep/archiver.sh tools/scripts/css/css-build.sh
-	$@ $^
+# TESTING
 
-subsets: source/*.ufo
-	./build-subsets.sh
+lint: shellcheck ufolint
 
-ttf:
-	./build-ttf.sh
+shellcheck: *.sh tools/scripts/css/*.sh tools/scripts/install/*.sh
+	$@ $^
 
 ufolint: source/*.ufo
 	$@ $^
 
-webfonts:
-	./build-woff.sh
-	./build-woff2.sh
-	./build-subsets.sh
 
-woff:
-	./build-woff.sh
+# PHONY TARGETS
 
-woff2:
-	./build-woff2.sh
+.PHONY: all archives build build-with-dependencies build-local-ttfa build-local-sfnt2woffzopfli build-local-woff2 build-system compile-local-dep css lint pipenv shellcheck subsets subsets-system ttf ttf-system ufolint webfonts webfonts-system woff woff-system woff2 woff2-system
diff --git a/Pipfile b/Pipfile
new file mode 100644
index 000000000..4371d5429
--- /dev/null
+++ b/Pipfile
@@ -0,0 +1,13 @@
+[[source]]
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+fonttools = "*"
+fontmake = "*"
+
+[dev-packages]
+
+[requires]
+python_version = "3.6"
diff --git a/Pipfile.lock b/Pipfile.lock
new file mode 100644
index 000000000..b25b83aea
--- /dev/null
+++ b/Pipfile.lock
@@ -0,0 +1,146 @@
+{
+    "_meta": {
+        "hash": {
+            "sha256": "60fe748ce602e0ad6290ca1db986d09913e7fdefee286a24b92af07cf8d9bb77"
+        },
+        "pipfile-spec": 6,
+        "requires": {
+            "python_version": "3.6"
+        },
+        "sources": [
+            {
+                "name": "pypi",
+                "url": "https://pypi.python.org/simple",
+                "verify_ssl": true
+            }
+        ]
+    },
+    "default": {
+        "booleanoperations": {
+            "hashes": [
+                "sha256:62723b7cabe3e727546df945c155e2f8be9514ef8c4f3b2f0f5cdb24ebbcfdf1",
+                "sha256:e405de0126aaf0f6e4f3dcebd18079db601e825e123cb095366b2a50e9abbc8c"
+            ],
+            "version": "==0.8.0"
+        },
+        "compreffor": {
+            "hashes": [
+                "sha256:02e03207bd74b8792ea51ff8ad7922d246a38886fc9a5ef4a65391cf0095533f",
+                "sha256:33ae053dcf2545bdcf9eb56d0ebc5ccc8a0bc49374a9fb3af35971c39109cca6",
+                "sha256:3c0eed769ecfc0da821cb46ee63d2ac4ab4342560d879a5e9ff194c191d72539",
+                "sha256:55ce6038dac9f58121ec066ccff8ff9cb4704f663f7ab40d5a548885bc949765",
+                "sha256:56d4997450c1303f3af4666120b8a504d3787900cc6c565851104371b00ea75d",
+                "sha256:71bb9f86f150bc132cc3a1c9f7d8b1171eb81603d7af79fc98c424780e468c6a",
+                "sha256:778ae7e6dd8115748fe3a25d80acd9dfe713a847868e083e0c67bc4c6f4aa220",
+                "sha256:902ce5a0264f17d693f517468d0cf0e33e0713198d485a43b99bb657baa3933c",
+                "sha256:bf6f12b7804bd3549df31bd5d77fe8ea3723c12d9f5ce697855b5361ab0e9f7a",
+                "sha256:c9578301995e9e011896a2ee3751419256b33342004b6ea6d34960c51d1463d5",
+                "sha256:cd503ea6bceb3dbb39c7f99dce1074803f031ba5980157b91e895a740c40f849",
+                "sha256:ce932125880f337a6d35cfe4ec444f5c3452ab3baa7e790a819f769499b1e2ff",
+                "sha256:cee7caea337b9396d9680cb847da8ead569c26974c64d80bd4977611b95aa687",
+                "sha256:d7edd2216462d5c730ea44fabab6369991fe628a30016bc21157a8aeff0cddb6",
+                "sha256:eac13d9df51e7ed8ef72c9fdfe82cd9fbab4740f63a441834b7a122a561111a2",
+                "sha256:faa61f3481a33cc93ae3cbd6daa501fec5091528d9465b86202c0ba7989db067",
+                "sha256:fc0bfb08401998c02c427e3d530d56b4bb185dd098ef6a017d61bc5080752763",
+                "sha256:fc7d4fb787b91d903733cbd9c1aa0374499d3ed92a2a45cd9d12483aa0203819"
+            ],
+            "version": "==0.4.6"
+        },
+        "cu2qu": {
+            "hashes": [
+                "sha256:33459f01d1f7ac35db39c6ad0e894984249c7e298974e1ac797e18717b5f5e39",
+                "sha256:f03a9d0f697bc4334af9cabc4002bfb1fea988bcfe2bffff46530c26b6ba7991"
+            ],
+            "version": "==1.5.0"
+        },
+        "defcon": {
+            "hashes": [
+                "sha256:77b0becf55b544283bc451c5247cea7ad79f1ef813b1e65b9ef6946906db5543",
+                "sha256:782824bc0554f7e68c8da5d53729571cb5d9316eb5f95b14ca19953b8b9c01aa"
+            ],
+            "version": "==0.5.1"
+        },
+        "fontmake": {
+            "hashes": [
+                "sha256:7d6f012ff61ceb9ab76cf53cd85e70af540b0195fd9520f1e806e2f3c8b6a2a9",
+                "sha256:b3d8b42523d129c29425c6c8394a040c230b6410806bb5a0055f981974bc604e"
+            ],
+            "index": "pypi",
+            "version": "==1.5.0"
+        },
+        "fontmath": {
+            "hashes": [
+                "sha256:1d1424ccbe80e22948c3c12cf9ee377fad9c39ff2edc38b11a12ebfd8ecf4a60",
+                "sha256:a35dde1d500bcb9d659916aa820f31bc7184fe4950708ffc00450e9ecd6c243f"
+            ],
+            "version": "==0.4.5"
+        },
+        "fonttools": {
+            "hashes": [
+                "sha256:a1ab542526347b33be5c62421081de02dc839481e9f37245a8cbe4d078284327",
+                "sha256:a81b57be6c9b556065d7f67a9ba4eb050c5074590f933d4902cd6ef331865aee"
+            ],
+            "index": "pypi",
+            "version": "==3.27.1"
+        },
+        "glyphslib": {
+            "hashes": [
+                "sha256:062506cb854a431794c12f03ba2e6faad247b51feab3d59bebca8bdd10a11217",
+                "sha256:605a53ad0d5052c6aeaa7a021ccc70f5f0fbaaed87333ca6b12997cb2af255d2"
+            ],
+            "version": "==2.3.0"
+        },
+        "mutatormath": {
+            "hashes": [
+                "sha256:3353fdd0d1beb13bda458265573bbefa0d4afb5aa5f9e4d3503cb9d3b0623f12",
+                "sha256:e6da8ae2a7008085ee0bac6d62737d37b90ce4a883d89a0f3d5c19dd350b0538"
+            ],
+            "version": "==2.1.1"
+        },
+        "pyclipper": {
+            "hashes": [
+                "sha256:013dc2a39722914e2399a7608012c21da81c0e719e4aee958d0cbf3f603094ac",
+                "sha256:04337a635dc5cd6a17bc9a85f778eeb4b9569bb9a87d789005d1b7e86dadf8ca",
+                "sha256:191f12cd9ec385d44f181786d250d29b07c515c0b2d6e28d91fe482649d0525b",
+                "sha256:19beee2f26f6037f7d42aac0acc216d73bd2cc6dc36a6fc0565767de5080b4ba",
+                "sha256:1c9c298039727c1896c013d7b25bcddd8e778b4f06d8d20c019b0a4679c26446",
+                "sha256:209a770d211e760b33c8b8af60dc475ad16aea68a5f1f80e66128ce5da7bcb27",
+                "sha256:30823cd4f27345ef303ea6c1ec7a964fa43067063a76e31cfea032954c648039",
+                "sha256:3f11e87f0b82bccc6de57eead2628ca419694352e8b843bcd228eec9c9357680",
+                "sha256:3fa17ca0bb2b78c22efd1844a13789d351b51516a54b9cd8c482afef9c2cff04",
+                "sha256:5726921e921990915f441ad91304280b26a0d5e70882d503da4e741425100c5e",
+                "sha256:5ef5c5633c1783836837b7b198c35dec54d9506d9ff5695b4293fe96de8b5481",
+                "sha256:75d03cf5e6fc6c18329e51e9f1662d9d21c37f99692438761022f5ced7300ebc",
+                "sha256:79b2b1bf113045481d3f418e692f15e089b2053574accfc951fd9d0b73132204",
+                "sha256:8794d4f29a650854f503fc63f96a06baec30c604771149b474db92499edc8072",
+                "sha256:8f09d9eac721726eb7db9bd94597d1910e472a4d08dcb2adb715700124827d3e",
+                "sha256:9f67c98a51ed0296046f8448ecc25a8d61ab97c55b4281984b2bbfa883813c7b",
+                "sha256:a1bb42a403e1cfcaaf826384647faa6039c163b4a4a9960c194f37ee48148c00",
+                "sha256:b06076efafb1e3d4f14b63e8da69da34f883eb541844df108f2629866f42d02a",
+                "sha256:b685844cc5eb196fbbcd1970e37a6216e257683bba82e4c81030dc7060c027fd",
+                "sha256:bf23b1343411d977b82ea018189c8c9b84f9da5ea74a3e8c9444e71318a51488",
+                "sha256:c158f2eab791ce072190188b82dba131475337a6ca5db3a63c78454d21ab989a",
+                "sha256:d3da370f6947c54e1146784d5deda0ab789f2184a2e189a8e05aaa2cfd9ed82b",
+                "sha256:e0cd47d425dfa2e1f9da74eeca5b0b568b439d5fa397fbf2979ac2c33eb1772a",
+                "sha256:e938e1a13f10d1770602ad505c00d7cad3e685adc4548c041ae2d56ca04b4dba",
+                "sha256:ea169703d1c7a53f6eb8fcbe8ec4057db7064fabbdc402be3bc016218b72c0d5"
+            ],
+            "version": "==1.1.0"
+        },
+        "ufo2ft": {
+            "hashes": [
+                "sha256:21f640612f6cdbc55ecc53712473dacaaed5b6f4c3eeef63dd26df3c13118858",
+                "sha256:6ce60f07290ee627e8e407305ee9d2215a34ac6450f7e9c7abc6267f8d5c7f3f"
+            ],
+            "version": "==2.0.0"
+        },
+        "ufolib": {
+            "hashes": [
+                "sha256:0cead288602914f6c3fcad6e7b704f2d27797658eaba8637b48cd64784e807f7",
+                "sha256:34fd6a7492350526beac0d108a6cf8f6059c629150300a864a91837f7a351e1f"
+            ],
+            "version": "==2.1.1"
+        }
+    },
+    "develop": {}
+}
diff --git a/postbuild_processing/archive_prep/archiver.sh b/build-archives.sh
similarity index 91%
rename from postbuild_processing/archive_prep/archiver.sh
rename to build-archives.sh
index ee737f976..4d80db966 100755
--- a/postbuild_processing/archive_prep/archiver.sh
+++ b/build-archives.sh
@@ -2,18 +2,18 @@
 
 # ////////////////////////////////////////////////////////////////////
 #
-# archiver.sh
+# build-archives.sh
 #  A shell script that packages .zip, tar.gz, and tar.xz font archives
 #  Copyright 2018 Christopher Simpkins
 #  MIT License
 #
-#  Usage: ./archiver.sh
+#  Usage: ./build-archives.sh
 #
 # ////////////////////////////////////////////////////////////////////
 
-HACK_VERSION="v3.003"
-HACK_ARCHIVES_DIR="../../../Hack-archives"
-HACK_BUILD_DIR="../../build"
+HACK_VERSION="v4.000"
+HACK_ARCHIVES_DIR="../../Hack-archives"
+HACK_BUILD_DIR="build"
 
 
 # Make build directory the current working directory
diff --git a/build-pipenv.sh b/build-pipenv.sh
new file mode 100755
index 000000000..4b02873c3
--- /dev/null
+++ b/build-pipenv.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+# /////////////////////////////////////////////////////////////////
+#
+# build-pipenv.sh
+#  A shell script that creates a virtualenv for Hack font builds
+#  Copyright 2018 Christopher Simpkins
+#  MIT License
+#
+#  Usage: ./build-pipenv.sh
+#
+# /////////////////////////////////////////////////////////////////
+
+if ! which pipenv
+	then
+		echo "Unable to detect a pipenv install.  Please install with 'pip install pipenv' then repeat your build attempt." 1>&2
+		exit 1
+fi
+
+# create virtualenv and install build dependencies
+pipenv install --ignore-pipfile
+
+# test for fontmake install in venv
+if ! pipenv run fontmake --version
+	then
+		echo "Unable to detect fontmake install with pipenv.  Please repeat your build attempt." 1>&2
+		exit 1
+fi
+
+# test for fontTools install in venv
+if ! pipenv run python -c "import fontTools"
+	then
+		echo "Unable to detect fontTools install with pipenv.  Please repeat your build attempt." 1>&2
+		exit 1
+fi
+
+# print environment used for build to std output stream
+
+echo "================================="
+echo "  PYTHON BUILD ENVIRONMENT"
+echo "================================="
+echo " "
+echo "Python interpreter version:"
+pipenv run python --version
+echo " "
+pipenv graph
+
+echo " "
+echo "================================="
+echo " "
+echo "================================="
+echo " "
diff --git a/build-subsets.sh b/build-subsets.sh
index 42df0dc4d..63858fabe 100755
--- a/build-subsets.sh
+++ b/build-subsets.sh
@@ -7,27 +7,21 @@
 #  Copyright 2018 Christopher Simpkins
 #  MIT License
 #
-#  Usage: ./build-subsets.sh
-#
-#  NOTE: must install build dependencies in:
-#        1) build-ttf.sh
-#        2) build-woff.sh
-#        3) build-woff2.sh
-#       before you execute this script.  You can do this with:
-#
-#
-#       $ ./build-ttf.sh --install-dependencies
-#       $ ./build-woff.sh --install-dependencies
-#       $ ./build-woff2.sh --install-dependencies
+#  Usage: ./build-subsets.sh (--system)
+#     Arguments:
+#     --system (optional) - build with system installed versions
+#                           of build dependencies
 #
 # //////////////////////////////////////////////////////////////////////
 
-# ttfautohint local install path from Werner Lemberg's ttfautohint-build.sh install script
-#   - This is revised to ttfautohint on the user's PATH if this local install is not identified
-#     then the identified ttfautohint is used to execute hinting.  Versions of ttfautohint < 1.6 exit with status
-#     code 1 due to use of -R option
-#   - The intent is to support use of ttfautohint installed on a user's PATH (e.g. they've previously installed it)
+# set SOURCE_DATE_EPOCH to git commit date/time for reproducible builds
+SOURCE_DATE_EPOCH=$(git show -s --format=%ct HEAD)
+export SOURCE_DATE_EPOCH
+
+# default build tooling definitions
 TTFAH="$HOME/ttfautohint-build/local/bin/ttfautohint"
+FONTMAKE="pipenv run fontmake"
+PYTHON="pipenv run python"
 
 # The sfnt2woff-zopfli build directory.
 SFNTWOFF_BUILD="$HOME/sfnt2woff-zopfli-build"
@@ -79,83 +73,30 @@ BOLDITALIC_WOFF2="hack-bolditalic-subset.woff2"
 WEB_BUILD="build/web/fonts"
 
 # test for number of arguments
-if [ $# -gt 0 ]
+if [ $# -gt 1 ]
 	then
 	    echo "Inappropriate arguments included in your command." 1>&2
-	    echo "Usage: ./build-subsets.sh" 1>&2
+	    echo "Usage: ./build-subsets.sh (--system)" 1>&2
 	    exit 1
 fi
 
-# ////////////////////////////////////////
+# //////////////////////////////////////////////
 #
 #
-#  Confirm that dependencies are installed
+#  Re-define build dependencies to PATH
+#  installed versions if --system flag is used
 #
 #
-# ////////////////////////////////////////
-
-INSTALLFLAG=0
-
-echo "Confirming that build dependencies are installed..."
-echo " "
-
-# fontmake installed
-if ! which fontmake
-	then
-	    echo "fontmake was not found.  Please install all build dependencies with 'make build-with-dependencies', then attempt your build again." 1>&2
-	    INSTALLFLAG=1
-fi
-
-# fontTools python library can be imported
-if ! python -c "import fontTools"
-	then
-	    echo "The fontTools library was not found.  Please install all build dependencies with 'make build-with-dependencies', then attempt your build again." 1>&2
-	    INSTALLFLAG=1
-else
-	echo "fontTools Python library identified"
-fi
-
-# ttfautohint installed
-#   - tests for install to local path from ttfautohint-build.sh script
-#   - if not found on this path, tests for install on system PATH - if found, revises TTFAH to the string "ttfautohint" for execution of instruction sets
-if ! [ -f "$TTFAH" ]
-	then
-	    if ! which ttfautohint
-	    	then
-	            echo "ttfautohint was not found.  Please install all build dependencies with 'make build-with-dependencies', then attempt your build again." 1>&2
-	            INSTALLFLAG=1
-	    else
-	    	TTFAH="ttfautohint"  # revise TTFAH variable to ttfautohint installed on the user's PATH for excecution of hints below
-	    	echo "ttfautohint executable identified"
-	    fi
-	else
-		echo "ttfautohint executable identified"
-fi
-
-# sfntwoff-zopfli installed
-if ! [ -f "$SFNTWOFF_BIN" ]
-	then
-	    echo "sfnt2woff-zopfli was not found on the path $SFNTWOFF_BIN.  Please install all build dependencies with 'make build-with-dependencies', then attempt your build again." 1>&2
-	    INSTALLFLAG=1
-else
-	echo "sfnt2woff-zopfli executable identified"
-fi
+# //////////////////////////////////////////////
 
-# woff2 installed
-if ! [ -f "$WOFF2_BIN" ]
-	then
-	    echo "woff2_compress was not found on the path $WOFF2_BIN.  Please install all build dependencies with 'make build-with-dependencies', then attempt your build again." 1>&2
-	    INSTALLFLAG=1
-else
-	echo "woff2_compress executable identified"
+if [ "$1" = "--system" ]; then
+	TTFAH="ttfautohint"
+	FONTMAKE="fontmake"
+	PYTHON="python3"
+	SFNTWOFF_BIN="sfnt2woff-zopfli"
+	WOFF2_BIN="woff2_compress"
 fi
 
-# if any of the dependency installs failed, exit and do not attempt build, notify user
-if [ $INSTALLFLAG -eq 1 ]
-	then
-	    echo "Build canceled." 1>&2
-	    exit 1
-fi
 
 # ////////////////////////////////////////////////
 #
@@ -167,7 +108,7 @@ fi
 # ////////////////////////////////////////////////
 
 # cleanup any previously created temp directory that was not removed
-if ! [ -d "$TEMP_SOURCE" ]; then
+if [ -d "$TEMP_SOURCE" ]; then
 	rm -rf $TEMP_SOURCE
 fi
 
@@ -204,21 +145,21 @@ fi
 
 # build regular subset
 
-if ! fontmake --subset -u "$TEMP_SOURCE/Hack-Regular.ufo" -o ttf
+if ! $FONTMAKE --subset -u "$TEMP_SOURCE/Hack-Regular.ufo" -o ttf
 	then
 	    echo "Unable to build the Hack-Regular variant subset.  Build canceled." 1>&2
 	    exit 1
 fi
 
 # build bold subset
-if ! fontmake --subset -u "$TEMP_SOURCE/Hack-Bold.ufo" -o ttf
+if ! $FONTMAKE --subset -u "$TEMP_SOURCE/Hack-Bold.ufo" -o ttf
 	then
 	    echo "Unable to build the Hack-Bold variant subset.  Build canceled." 1>&2
 	    exit 1
 fi
 
 # build italic subset
-if ! fontmake --subset -u "$TEMP_SOURCE/Hack-Italic.ufo" -o ttf
+if ! $FONTMAKE --subset -u "$TEMP_SOURCE/Hack-Italic.ufo" -o ttf
 	then
 	    echo "Unable to build the Hack-Italic variant subset.  Build canceled." 1>&2
 	    exit 1
@@ -226,7 +167,7 @@ fi
 
 # build bold italic subset
 
-if ! fontmake --subset -u "$TEMP_SOURCE/Hack-BoldItalic.ufo" -o ttf
+if ! $FONTMAKE --subset -u "$TEMP_SOURCE/Hack-BoldItalic.ufo" -o ttf
 	then
 	    echo "Unable to build the Hack-BoldItalic variant subset.  Build canceled." 1>&2
 	    exit 1
@@ -245,7 +186,7 @@ fi
 echo " "
 echo "Attempting DSIG table fixes with fontbakery..."
 echo " "
-if ! python postbuild_processing/fixes/fix-dsig.py master_ttf/*.ttf
+if ! $PYTHON postbuild_processing/fixes/fix-dsig.py master_ttf/*.ttf
 	then
 	    echo "Unable to complete DSIG table fixes on the release files"
 	    exit 1
@@ -255,7 +196,7 @@ fi
 echo " "
 echo "Attempting fstype fixes with fontbakery..."
 echo " "
-if ! python postbuild_processing/fixes/fix-fstype.py master_ttf/*.ttf
+if ! $PYTHON postbuild_processing/fixes/fix-fstype.py master_ttf/*.ttf
 	then
 	    echo "Unable to complete fstype fixes on the release files"
 	    exit 1
diff --git a/build-ttf.sh b/build-ttf.sh
index 1558dece2..258b395dc 100755
--- a/build-ttf.sh
+++ b/build-ttf.sh
@@ -7,75 +7,79 @@
 #  Copyright 2018 Christopher Simpkins
 #  MIT License
 #
-#  Usage: ./build-ttf.sh (--install-dependencies)
+#  Usage: ./build-ttf.sh (--system)
 #     Arguments:
-#     --install-dependencies (optional) - installs all
-#       build dependencies prior to the build script execution
+#     --system (optional) - use system installed build dependencies
 #
 # /////////////////////////////////////////////////////////////////
 
-# ttfautohint local install path from Werner Lemberg's ttfautohint-build.sh install script
-#   - This is revised to ttfautohint on the user's PATH if this local install is not identified
-#     then the identified ttfautohint is used to execute hinting.  Versions of ttfautohint < 1.6 exit with status
-#     code 1 due to use of -R option
-#   - The intent is to support use of ttfautohint installed on a user's PATH (e.g. they've previously installed it)
+# set SOURCE_DATE_EPOCH to git commit date/time to support reproducible builds
+# at any git commit
+SOURCE_DATE_EPOCH=$(git show -s --format=%ct HEAD)
+export SOURCE_DATE_EPOCH
+
+# default build tooling definitions
 TTFAH="$HOME/ttfautohint-build/local/bin/ttfautohint"
+FONTMAKE="pipenv run fontmake"
+PYTHON="pipenv run python"
+INSTALLFLAG=0
 
 # test for number of arguments
 if [ $# -gt 1 ]
 	then
 	    echo "Inappropriate arguments included in your command." 1>&2
-	    echo "Usage: ./build-ttf.sh (--install-dependencies)" 1>&2
+	    echo "Usage: ./build-ttf.sh (--system)" 1>&2
 	    exit 1
 fi
 
-# Optional build dependency install request with syntax `./build.sh --install-dependencies`
-if [ "$1" = "--install-dependencies" ]
-	then
-		# fontmake
-		pip install --upgrade fontmake
-		# fontTools (installed with fontmake at this time. leave this as dependency check as python scripts for fixes require it should fontTools eliminate dep)
-		pip install --upgrade fonttools
-		# ttfautohint v1.6 (must be pinned to v1.6 and above for Hack instruction sets)
-        tools/scripts/install/ttfautohint-build.sh
-
-fi
-
-# confirm executable installs and library imports for build dependencies
-INSTALLFLAG=0
-
-echo "Confirming that build dependencies are installed..."
-echo " "
-# fontmake installed
-if ! which fontmake
-	then
-	    echo "Unable to install fontmake with 'pip install fontmake'.  Please attempt a manual install of this build dependency and then repeat your build attempt." 1>&2
-	    INSTALLFLAG=1
-fi
-# fontTools python library can be imported
-if ! python -c "import fontTools"
-	then
-	    echo "Unable to install fontTools with 'pip install fonttools'.  Please attempt a manual install of this build dependency and then repeat your build attempt." 1>&2
-	    INSTALLFLAG=1
-else
-	echo "fontTools Python library identified"
-fi
-# ttfautohint installed
-#   - tests for install to local path from ttfautohint-build.sh script
-#   - if not found on this path, tests for install on system PATH - if found, revises TTFAH to the string "ttfautohint" for execution of instruction sets
-if ! [ -f "$TTFAH" ]
-	then
-	    if ! which ttfautohint
-	    	then
-	            echo "Unable to install ttfautohint from source.  Please attempt a manual install of this build dependency and then repeat your build attempt." 1>&2
-	            INSTALLFLAG=1
-	    else
-	    	TTFAH="ttfautohint"  # revise TTFAH variable to ttfautohint installed on the user's PATH for excecution of hints below
-	    fi
-fi
-# if any of the dependency installs failed, exit and do not attempt build, notify user
-if [ $INSTALLFLAG -eq 1 ]
-	then
+# Optional build with system-installed build dependencies instead of pinned build process defined versions
+if [ "$1" = "--system" ]
+	then
+		# re-define the default executables to executables that exist on PATH
+		TTFAH="ttfautohint"
+		FONTMAKE="fontmake"
+		PYTHON="python3"
+
+		echo "================================="
+        echo "  BUILD ENVIRONMENT"
+        echo "================================="
+		# test re-defined system-installed build dependency paths
+		if ! which "$TTFAH"; then
+			echo "Unable to identify a system installed version of ttfautohint.  Please install and try again." 1>&2
+			INSTALLFLAG=1
+		else
+			ttfautohint --version
+		fi
+		if ! which "$FONTMAKE"; then
+			echo "Unable to identify a system installed version of fontmake.  Please install and try again." 1>&2
+			INSTALLFLAG=1
+		else
+			"$FONTMAKE" --version
+		fi
+		if ! which "$PYTHON"; then
+			echo "Unable to identify a Python 3 installation.  Please install and try again." 1>&2
+			INSTALLFLAG=1
+		else
+			"$PYTHON" --version
+		fi
+		echo "================================="
+        echo " "
+        echo "================================="
+        echo " "
+fi
+
+# ttfautohint path test for default builds
+# test for local ttfautohint install using repository provided install script and defined ttfautohint version (and its dependencies)
+# no tests for Python build dependencies here because they are always installed by default & tested in the pipenv virtualenv before these steps
+if [ $# -eq 0 ]; then
+	if ! [ -f "$TTFAH" ]; then
+		echo "Unable to identify the expected local install path for ttfautohint.  Please install and try again." 1>&2
+		INSTALLFLAG=1
+	fi
+fi
+
+# If any of the dependency checks failed, exit the build and notify user
+if [ $INSTALLFLAG -eq 1 ]; then
 	    echo "Build canceled." 1>&2
 	    exit 1
 fi
@@ -110,21 +114,21 @@ fi
 
 # build regular set
 
-if ! fontmake -u "source/Hack-Regular.ufo" -o ttf
+if ! $FONTMAKE -u "source/Hack-Regular.ufo" -o ttf
 	then
 	    echo "Unable to build the Hack-Regular variant set.  Build canceled." 1>&2
 	    exit 1
 fi
 
 # build bold set
-if ! fontmake -u "source/Hack-Bold.ufo" -o ttf
+if ! $FONTMAKE -u "source/Hack-Bold.ufo" -o ttf
 	then
 	    echo "Unable to build the Hack-Bold variant set.  Build canceled." 1>&2
 	    exit 1
 fi
 
 # build italic set
-if ! fontmake -u "source/Hack-Italic.ufo" -o ttf
+if ! $FONTMAKE -u "source/Hack-Italic.ufo" -o ttf
 	then
 	    echo "Unable to build the Hack-Italic variant set.  Build canceled." 1>&2
 	    exit 1
@@ -132,7 +136,7 @@ fi
 
 # build bold italic set
 
-if ! fontmake -u "source/Hack-BoldItalic.ufo" -o ttf
+if ! $FONTMAKE -u "source/Hack-BoldItalic.ufo" -o ttf
 	then
 	    echo "Unable to build the Hack-BoldItalic variant set.  Build canceled." 1>&2
 	    exit 1
@@ -144,7 +148,7 @@ fi
 echo " "
 echo "Attempting DSIG table fixes with fontbakery..."
 echo " "
-if ! python postbuild_processing/fixes/fix-dsig.py master_ttf/*.ttf
+if ! $PYTHON postbuild_processing/fixes/fix-dsig.py master_ttf/*.ttf
 	then
 	    echo "Unable to complete DSIG table fixes on the release files"
 	    exit 1
@@ -154,7 +158,7 @@ fi
 echo " "
 echo "Attempting fstype fixes with fontbakery..."
 echo " "
-if ! python postbuild_processing/fixes/fix-fstype.py master_ttf/*.ttf
+if ! $PYTHON postbuild_processing/fixes/fix-fstype.py master_ttf/*.ttf
 	then
 	    echo "Unable to complete fstype fixes on the release files"
 	    exit 1
diff --git a/build-woff.sh b/build-woff.sh
index e98fe145c..b11b319dd 100755
--- a/build-woff.sh
+++ b/build-woff.sh
@@ -7,15 +7,14 @@
 #  Copyright 2018 Christopher Simpkins
 #  MIT License
 #
-#  Usage: ./build-woff.sh (--install-dependencies)
+#  Usage: ./build-woff.sh (--system)
 #     Arguments:
-#     --install-dependencies (optional) - installs all
-#       build dependencies prior to the build script execution
+#     --system (optional) - build with a system installed version
+#                           of build dependencies
 #
-#  NOTE: If you change the source, you must build new ttf files
-#        with build.sh PRIOR to execution of this script.
-#        This script builds directly from previous ttf builds,
-#        not source files.
+#  NOTE: If you modify the source, you must build new ttf files
+#        PRIOR to execution of this script. This script builds
+#        directly from previous ttf builds, not source files.
 #
 # ///////////////////////////////////////////////////////////////////
 
@@ -50,55 +49,31 @@ BOLDITALIC_WOFF="hack-bolditalic.woff"
 if [ $# -gt 1 ]
 	then
 	    echo "Inappropriate arguments included in your command." 1>&2
-	    echo "Usage: ./build-woff.sh (--install-dependencies)" 1>&2
+	    echo "Usage: ./build-woff.sh (--system)" 1>&2
 	    exit 1
 fi
 
-# Optional build dependency install request with syntax `./build-web.sh --install-dependencies`
-if [ "$1" = "--install-dependencies" ]
-	then
-		# define the current directory (Hack repository)
-		CUR_DIR=$(pwd)
-
-		if test -d "$BUILD" -o -f "$BUILD"; then
-		  echo "Build directory \`$BUILD' must not exist."
-		  exit 1
-		fi
-
-		mkdir "$BUILD"
-
-		cd "$BUILD" || exit 1
-
-		echo "#####"
-		echo "Download archive."
-		echo "#####"
-
-		curl -L -O "https://github.com/bramstein/sfnt2woff-zopfli/archive/v$SFNTWOFF_VERSION.tar.gz"
-
-		echo "#####"
-		echo "Extract archives."
-		echo "#####"
-
-		tar -xzvf "v$SFNTWOFF_VERSION.tar.gz"
-
-		cd "$SFNTWOFF" || exit 1
-
-		echo "#####"
-		echo "Build $SFNTWOFF."
-		echo "#####"
-
-		make
-
-		# make Hack repository the current directory again following the build
-		cd "$CUR_DIR" || exit 1
+# determine if system installed executable on PATH is requested for build
+# then test for presence of the sfnt2woff-zopfli build dependency based upon where it should be located
+if [ "$1" = "--system" ]; then
+	SFNTWOFF_BIN="sfnt2woff-zopfli"
+	if ! which $SFNTWOFF_BIN; then
+		echo "Unable to identify sfnt2woff-zopfli executable on system PATH.  Please install and try again." 1>&2
+		exit 1
+	else
+		# display version of installed sfnt2woff-zopfli
+		echo "Beginning web font build with $SFNTWOFF_BIN"
+	fi
 fi
 
-
-if [ -f "$SFNTWOFF_BIN" ]; then
-	echo "Beginning web font build with $SFNTWOFF"
-else
-	echo "Unable to locate sfnt2woff-zopfli on the path $SFNTWOFF_BIN.  Please attempt a manual install of this build dependency and then repeat your build attempt." 1>&2
-	exit 1
+# test for sfnt2woff-zopfli with default build approach
+if [ $# -eq 0 ]; then
+	if [ -f "$SFNTWOFF_BIN" ]; then
+		echo "Beginning web font build with $SFNTWOFF_BIN"
+	else
+		echo "Unable to locate sfnt2woff-zopfli on the path $SFNTWOFF_BIN.  Please install this build dependency and then repeat your build attempt." 1>&2
+	    exit 1
+	fi
 fi
 
 # Build woff files from ttf files
@@ -165,8 +140,3 @@ fi
 if [ -f "$WOFF_BUILD/$BOLDITALIC_WOFF" ]; then
 	echo "Bold Italic woff build path: $WOFF_BUILD/$BOLDITALIC_WOFF"
 fi
-
-
-
-
-
diff --git a/build-woff2.sh b/build-woff2.sh
index 42cbbab68..5c1a399f1 100755
--- a/build-woff2.sh
+++ b/build-woff2.sh
@@ -7,21 +7,18 @@
 #  Copyright 2018 Christopher Simpkins
 #  MIT License
 #
-#  Usage: ./build-woff2.sh (--install-dependencies)
+#  Usage: ./build-woff2.sh (--system)
 #     Arguments:
-#     --install-dependencies (optional) - installs all
-#       build dependencies prior to the build script execution
+#     --system (optional) - use build dependencies installed on PATH
 #
 #  NOTE: If you change the source, you must build new ttf files
-#        with build.sh PRIOR to execution of this script.
-#        This script builds directly from previous ttf builds,
-#        not source files.
+#        PRIOR to the execution of this script. This script builds
+#        directly from previous ttf builds, not source files.
 #
 # ///////////////////////////////////////////////////////////////////
 
 # The woff2 git clone directory.
 BUILD="$HOME"
-INST="$HOME/woff2"
 
 # woff2 executable path
 WOFF2_BIN="$BUILD/woff2/woff2_compress"
@@ -47,50 +44,31 @@ BOLDITALIC_WOFF="hack-bolditalic.woff2"
 if [ $# -gt 1 ]
 	then
 	    echo "Inappropriate arguments included in your command." 1>&2
-	    echo "Usage: ./build-woff2.sh (--install-dependencies)" 1>&2
+	    echo "Usage: ./build-woff2.sh (--system)" 1>&2
 	    exit 1
 fi
 
-# Optional build dependency install request with syntax `./build-web.sh --install-dependencies`
-if [ "$1" = "--install-dependencies" ]
-	then
-		# define the current directory (Hack repository)
-		CUR_DIR=$(pwd)
-
-		if test -d "$INST" -o -f "$INST"; then
-		  echo "Build directory \`$INST' must not exist."
-		  exit 1
-		fi
-
-		cd "$BUILD" || exit 1
-
-		echo "#####"
-		echo "git clone woff2 project"
-		echo "#####"
-
-		# clone the Source Foundry fork of the woff2 repo
-		#   contains fix for OS X build bug - https://github.com/google/woff2/issues/73
-		#   recursive flag to clone the brotli submodule within the woff2 repo
-		git clone --recursive https://github.com/source-foundry/woff2.git
-
-		cd "$INST" || exit 1
-
-		echo "#####"
-		echo "Build woff2"
-		echo "#####"
-
-		make clean all
-
-		# make Hack repository the current directory again following the build
-		cd "$CUR_DIR" || exit 1
+# determine if system installed executable on PATH is requested for build
+# then test for presence of the woff2_compress build dependency based upon where it should be located
+if [ "$1" = "--system" ]; then
+	WOFF2_BIN="woff2_compress"
+	if ! which $WOFF2_BIN; then
+		echo "Unable to identify woff2_compress executable on system PATH.  Please install and try again." 1>&2
+		exit 1
+	else
+		# display version of installed woff2_compress
+		echo "Beginning web font build with $WOFF2_BIN"
+	fi
 fi
 
-
-if [ -f "$WOFF2_BIN" ]; then
-	echo "Beginning web font build with $WOFF2_BIN"
-else
-	echo "Unable to locate woff2_compress on path $WOFF2_BIN. Please attempt a manual install of this build dependency and then repeat your build attempt." 1>&2
-	exit 1
+# test for woff2_compress executable with default build approach
+if [ $# -eq 0 ]; then
+	if [ -f "$WOFF2_BIN" ]; then
+		echo "Beginning web font build with $WOFF2_BIN"
+	else
+		echo "Unable to locate woff2_compress on path $WOFF2_BIN. Please attempt a manual install of this build dependency and then repeat your build attempt." 1>&2
+		exit 1
+	fi
 fi
 
 # Build woff2 files from ttf files
diff --git a/docs/BUILD.md b/docs/BUILD.md
index 09c57f984..1ea6ea2ca 100644
--- a/docs/BUILD.md
+++ b/docs/BUILD.md
@@ -1,37 +1,114 @@
+# Hack Font Builds from Source Files
+
+Hack is compiled from UFO v2 spec source files to ttf, woff, and woff2 fonts with free, open source build tools. The default build approach requires a *nix platform (macOS, Linux, a Unix-like development platform for Windows such as MinGW) and uses pinned build dependency versions to support font files that render reproducibly (relative to upstream repository builds) in a given rendering environment. See the bottom of this document for an alternative approach that uses system-installed versions of all build dependencies and supports build dependency versions that differ from those used in the upstream repository.
+
+## Quickstart
+The following commands will do the following:
+
+1. Clone the Hack source repository
+2. Install the `pipenv` dependency
+3. Compile and install a local version `ttfautohint` (i.e., *off of the system PATH*)
+4. Build *.ttf desktop fonts
+5. Build *.woff web fonts (including subsets)
+6. Build *.woff2 web fonts (including subsets)
+
+**Quickstart Hack font compile process**
+
+```
+$ git clone https://github.com/source-foundry/Hack.git
+$ cd Hack
+$ pip3 install pipenv
+$ make compile-local-dep
+$ make
+```
+
+The build process takes minutes to complete on the average system.  You will see a great deal of text stream by in your terminal during the build.  This text stream is normal and expected during the build.
+
+You will find the compiled fonts in the build directory (located in the top level of the source repository) after you complete these steps.
+
+Detailed instructions follow if you have difficulties with any of the above steps.  If you encounter an error that is not addressed in this build documentation, please report it as a new issue report on the repository.  *Please review the entire build document below to confirm that we have not explained how to address your problem before you submit a new issue report*!
+
+## Contents
+
+- [Build dependency installation](#build-dependencies)
+	- [Python interpreter](#python-interpreter-dependency)
+	- [ttf desktop font dependencies](#desktop-font-ttf-dependencies)
+	- [woff and woff2 web font dependencies](#web-font-woff--woff2-dependencies)
+- [Automated font builds with make](#automated-font-builds)
+- [Build paths](#build-paths)
+- [Uninstall build dependencies](#uninstall-build-dependencies)
+
 ## Build dependencies
 
-Hack is compiled from UFO v2 spec source files to ttf, woff, and woff2 fonts with free, open source build tools.  You can either install the tools manually or use the automated build dependency installation approach documented below.
+### Python interpreter dependency
 
-### Desktop font (ttf) build dependencies
+The Hack fonts are built with a Python version 3 interpreter.  The Python interpreter version is fixed at each git commit. You may view the Python interpreter in use at any commit in the Pipfile and Pipfile.lock files that are located in the root directory of the repository.  [Click here](https://sourcegraph.com/search?q=repo:%5Egithub%5C.com/source-foundry/Hack%24%40master+python_version) to search for these values in the current HEAD commit of the master branch.
+
+If this version of the Python interpreter is not available on your development system, you may install [`pyenv`](https://github.com/pyenv/pyenv-installer) before you attempt your build.  If `pyenv` is installed before the build, `pipenv` will automatically install the interpreter defined in the Hack build in the virtual environment used for the build, even if it is not installed on your system.
+
+The pyenv project defines the following command as a supported approach to install `pyenv`:
+
+
+**Pull and install the pyenv executable**
+
+```
+curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
+```
+
+### Desktop font (ttf) dependencies
 
 To build the Hack desktop fonts (ttf) from source you will need the following build dependencies:
 
+- [pipenv](https://github.com/pypa/pipenv) Python executable
 - [fontmake](https://github.com/googlei18n/fontmake) Python executable
 - [fonttools](https://github.com/fonttools/fonttools) Python library
 - [ttfautohint](https://www.freetype.org/ttfautohint/) executable (includes Harfbuzz and FreeType dependencies)
 
-### Web font (woff + woff2) build dependencies
+`fontmake` and `fontTools` are automatically installed during the compile process.
+
+`pipenv` must be installed manually with the following command before you attempt a build:
+
+**Install pipenv**
+
+```
+$ pip3 install pipenv
+```
+
+`ttfautohint` (including its Harfbuzz and FreeType dependencies) can be installed locally on the path defined for use in Hack builds with the following command:
 
-To build the Hack web fonts from source you will need all of the build dependencies listed above for desktop font builds.  In addition you will need the following dependencies for the web font build steps:
+**Compile and install a local copy of ttfautohint**
+
+```
+$ make compile-local-dep
+```
+
+This path is defined as the following subdirectory on your $HOME path:
+
+- ttfautohint: `$HOME/ttfautohint-build`
+
+### Web font (woff + woff2) dependencies
+
+To build the Hack web fonts from source you will need all of the build dependencies listed above for desktop font builds and the following additional dependencies:
 
 - [sfnt2woff-zopfli](https://github.com/bramstein/sfnt2woff-zopfli) C++ executable
 - [woff2_compress](https://github.com/source-foundry/woff2) C++ executable
 
+The sfnt2woff-zopfli executable and woff2_compress executable are compiled and installed on a local build path (i.e., off of system PATH) with the following command:
 
-### Automated build dependency installation
-
-Install all build dependencies for desktop and web fonts with the following make command:
+**Compile and install local copies of sfnt2woff-zopfli and woff2_compress**
 
 ```
-$ make build-with-dependencies
+$ make compile-local-dep
 ```
 
-This will install all necessary build dependencies and complete a build of all desktop and web fonts.
+These paths are defined as the following subdirectories on your $HOME path:
 
+- sfnt2woff-zopfli: `$HOME/sfnt2woff-zopfli-build`
+- woff2: `$HOME/woff2`
 
 ## Automated font builds
 
-After the build dependencies are installed, use make targets from the root of the Hack repository to build font sets.
+After the build dependencies are installed, use make targets from the root of the Hack repository to build font sets.  The following commands build the regular, bold, italic, and bold italic variants of the respective build types:
 
 
 #### Build all desktop and web fonts (including web font subsets)
@@ -40,7 +117,7 @@ After the build dependencies are installed, use make targets from the root of th
 $ make
 ```
 
-#### Build ttf desktop fonts
+#### Build ttf desktop fonts only
 
 ```
 $ make ttf
@@ -80,37 +157,62 @@ Desktop fonts are available on the path `build/ttf` from the root of the reposit
 
 ### Web fonts (woff + woff2)
 
-Web fonts are available on the path `build/web/fonts` from the root of the repository upon completion of your build.
+Web fonts are available on the path `build/web/fonts` from the root of the repository upon completion of your build.  CSS files that may be used with your web font builds are available on the path `build/web`.
+
+## Uninstall build dependencies
 
+Python packages that are used during the build process are installed in a virtual environment with `pipenv`.  The virtual environment and all Python packages installed in that environment can be eliminated with the execution of the following command in the root of the repository:
 
-## Uninstall
+```
+$ pipenv -rm
+```
 
-All build dependencies installed with the automated approaches can be uninstalled with the following commands:
+All compiled project build dependencies installed as part of this build process can be uninstalled with the following commands:
 
 ```
-$ pip uninstall fontmake
-$ pip uninstall fonttools
 $ rm -rf ~/ttfautohint-build
 $ rm -rf ~/sfnt2woff-zopfli-build
 $ rm -rf ~/woff2
 ```
 
-Here are all of the above commands in a single line that can be copied/pasted into your terminal to accomplish the entire uninstall process:
+In cases where a compile did not proceed to completion (e.g., you intentionally exited early, or an exception was raised that led to an early termination of the build), a temporary directory may still exist in the root of the repository on the path `master_ttf`.  This directory can be removed with:
+
+```
+$ rm -rf master_ttf
+```
+
+## Compile with system PATH installed build dependencies
+
+The following make targets are available for those who would like to build with system PATH installed versions of all build dependencies.  This approach allows you build with dependency versions that differ from those used in the upstream project.  Please see the note at the bottom of this section for caveats to this approach.
+
+#### System PATH build dependency compiles of all fonts
 
 ```
-$ pip uninstall fontmake && pip uninstall fonttools && rm -rf ~/ttfautohint-build && rm -rf ~/sfnt2woff-zopfli-build && rm -rf ~/woff2
+$ make build-system
 ```
 
-In cases where a compile did not proceed to completion (e.g. you intentionally exited early or an exception was raised) a temporary directory may still exist in the root of the repository on the path `master_ttf`.  This can be removed with:
+#### System PATH build dependency compiles of desktop fonts
 
 ```
-$ rm -rf master_ttf
+$ make ttf-system
+```
+
+#### System PATH build dependency compiles of all web fonts
+
+```
+$ make webfonts-system
 ```
 
-### Uninstall Details
+#### System PATH build dependency compiles of woff web fonts
 
-fontmake and fonttools are Python packages and are uninstalled with pip.
+```
+$ make woff-system
+```
 
-The FreeType library (including its build dependency Harfbuzz), ttfautohint, sfnt2woff-zopfli, and woff2 are built in directories on your $HOME path.  They are not installed on your $PATH (unless of course you have defined $HOME on $PATH) so they **will not** work from the command line with the name of the executable file only (e.g. `$ ttfautohint [file path]`).  This is intentional.
+#### System PATH build dependency compiles of woff web fonts
+
+```
+$ make woff2-system
+```
 
-Repeat execution of the build process cleans up the temporary directory `master_ttf` if found so this step is not mandatory to repeat a build and should not lead to errors with the build.
+You must install all build dependencies before use of these make targets.  Please refer to the documentation for the respective build dependency projects for details about installations.  While we release these system PATH installed compile make targets to simplify the approach to builds for users who prefer not to (or cannot) create a development environment that matches the one used for our upstream builds, this approach is not otherwise supported or tested in this repository.  Please understand this caveat if you intend to release fonts built with this approach in a production environment as differences in the build dependency versions can alter font renders.
diff --git a/postbuild_processing/fixes/fix-dsig.py b/postbuild_processing/fixes/fix-dsig.py
index 9502712fa..eae2641f2 100644
--- a/postbuild_processing/fixes/fix-dsig.py
+++ b/postbuild_processing/fixes/fix-dsig.py
@@ -14,34 +14,36 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# See AUTHORS.txt for the list of Authors and LICENSE.txt for the License.
-
 # Adapted for the Hack typeface build workflow by Chris Simpkins
-
-from __future__ import print_function, unicode_literals
 import sys
 import os
 from fontTools import ttLib
 
 
 def set_empty_dsig(ttFont):
-  newDSIG = ttLib.newTable("DSIG")
-  newDSIG.ulVersion = 1
-  newDSIG.usFlag = 0
-  newDSIG.usNumSigs = 0
-  newDSIG.signatureRecords = []
-  ttFont.tables["DSIG"] = newDSIG
+    newDSIG = ttLib.newTable("DSIG")
+    newDSIG.ulVersion = 1
+    newDSIG.usFlag = 0
+    newDSIG.usNumSigs = 0
+    newDSIG.signatureRecords = []
+    ttFont.tables["DSIG"] = newDSIG
+
 
 def main(argv):
-  for path in argv:
-    if not os.path.exists(path):
-      sys.stderr.write("[fix-dsig.py] ERROR: " + path + " is not a valid path to a font file")
-      sys.exit(1)
-    else:
-      font = ttLib.TTFont(path)
-      set_empty_dsig(font)
-      font.save(path)
-      print(path + " - successful DSIG table fix")
+    for path in argv:
+        if not os.path.exists(path):
+            sys.stderr.write(
+                "[fix-dsig.py] ERROR: " +
+                path +
+                " is not a valid path to a font file"
+            )
+            sys.exit(1)
+        else:
+            font = ttLib.TTFont(file=path, recalcTimestamp=False)
+            set_empty_dsig(font)
+            font.save(path)
+            print(path + " - successful DSIG table fix")
+
 
 if __name__ == '__main__':
-  main(sys.argv[1:])
+    main(sys.argv[1:])
diff --git a/postbuild_processing/fixes/fix-fstype.py b/postbuild_processing/fixes/fix-fstype.py
index 011251139..d7d3c08b9 100644
--- a/postbuild_processing/fixes/fix-fstype.py
+++ b/postbuild_processing/fixes/fix-fstype.py
@@ -14,23 +14,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
 # Adapted for the Hack typeface build workflow by Chris Simpkins
-
 import os
 import sys
 from fontTools.ttLib import TTFont
 
+
 def main(argv):
     for path in argv:
         if not os.path.exists(path):
-            sys.stderr.write("[fix-fstype.py] ERROR: " + path + " is not a valid path to a font file")
+            sys.stderr.write(
+                "[fix-fstype.py] ERROR: " +
+                path +
+                " is not a valid path to a font file"
+            )
             sys.exit(1)
         else:
-            font = TTFont(path)
+            font = TTFont(file=path, recalcTimestamp=False)
             font['OS/2'].fsType = 0
             font.save(path)
             print(path + " - successful fstype fix")
 
+
 if __name__ == '__main__':
-  main(sys.argv[1:])
+    main(sys.argv[1:])
diff --git a/source/Hack-Bold.ufo/fontinfo.plist b/source/Hack-Bold.ufo/fontinfo.plist
index 5ecbe61df..56804ca65 100644
--- a/source/Hack-Bold.ufo/fontinfo.plist
+++ b/source/Hack-Bold.ufo/fontinfo.plist
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>ascender</key>
@@ -12,6 +12,8 @@
 	<integer>-492</integer>
 	<key>familyName</key>
 	<string>Hack</string>
+	<key>guidelines</key>
+	<array/>
 	<key>macintoshFONDFamilyID</key>
 	<integer>128</integer>
 	<key>macintoshFONDName</key>
@@ -21,8 +23,7 @@
 	<key>openTypeHeadCreated</key>
 	<string>2017/10/23 12:00:00</string>
 	<key>openTypeHeadFlags</key>
-	<array>
-	</array>
+	<array/>
 	<key>openTypeHheaAscender</key>
 	<integer>1901</integer>
 	<key>openTypeHheaDescender</key>
@@ -98,7 +99,7 @@ Except as contained in this notice, the names of Gnome, the Gnome Foundation, an
 	<key>openTypeNameUniqueID</key>
 	<string>SourceFoundry: Hack Bold: 2018</string>
 	<key>openTypeNameVersion</key>
-	<string>Version 3.003</string>
+	<string>Version 4.000</string>
 	<key>openTypeOS2CodePageRanges</key>
 	<array>
 		<integer>0</integer>
@@ -142,8 +143,7 @@ Except as contained in this notice, the names of Gnome, the Gnome Foundation, an
 		<integer>4</integer>
 	</array>
 	<key>openTypeOS2Selection</key>
-	<array>
-	</array>
+	<array/>
 	<key>openTypeOS2StrikeoutPosition</key>
 	<integer>530</integer>
 	<key>openTypeOS2StrikeoutSize</key>
@@ -215,7 +215,7 @@ Except as contained in this notice, the names of Gnome, the Gnome Foundation, an
 	<key>postscriptBlueFuzz</key>
 	<integer>0</integer>
 	<key>postscriptBlueScale</key>
-	<real>0.036999999999999998</real>
+	<real>0.037</real>
 	<key>postscriptBlueShift</key>
 	<integer>14</integer>
 	<key>postscriptBlueValues</key>
@@ -227,6 +227,10 @@ Except as contained in this notice, the names of Gnome, the Gnome Foundation, an
 		<integer>1493</integer>
 		<integer>1520</integer>
 	</array>
+	<key>postscriptFamilyBlues</key>
+	<array/>
+	<key>postscriptFamilyOtherBlues</key>
+	<array/>
 	<key>postscriptFontName</key>
 	<string>Hack-Bold</string>
 	<key>postscriptForceBold</key>
@@ -270,9 +274,9 @@ Except as contained in this notice, the names of Gnome, the Gnome Foundation, an
 	<key>unitsPerEm</key>
 	<integer>2048</integer>
 	<key>versionMajor</key>
-	<integer>3</integer>
+	<integer>4</integer>
 	<key>versionMinor</key>
-	<integer>003</integer>
+	<integer>0</integer>
 	<key>xHeight</key>
 	<integer>1120</integer>
 </dict>
diff --git a/source/Hack-Bold.ufo/glyphs/A_.glif b/source/Hack-Bold.ufo/glyphs/A_.glif
index 787deff38..83b80f97d 100644
--- a/source/Hack-Bold.ufo/glyphs/A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/A_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="A" format="1">
+<glyph name="A" format="2">
   <advance width="1233"/>
   <unicode hex="0041"/>
   <outline>
     <contour>
-      <point x="436" y="1493" type="line" name="hr00"/>
+      <point x="436" y="1493" type="line"/>
       <point x="797" y="1493" type="line"/>
-      <point x="1200" y="0" type="line" name="ab01"/>
+      <point x="1200" y="0" type="line"/>
       <point x="905" y="0" type="line"/>
-      <point x="813" y="369" type="line" name="dv01"/>
+      <point x="813" y="369" type="line"/>
       <point x="418" y="369" type="line"/>
-      <point x="328" y="0" type="line" name="ab02"/>
+      <point x="328" y="0" type="line"/>
       <point x="33" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="756" y="612" type="line" name="dv02"/>
+      <point x="756" y="612" type="line"/>
       <point x="616" y="1223" type="line"/>
       <point x="477" y="612" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/A_E_.glif b/source/Hack-Bold.ufo/glyphs/A_E_.glif
index ea4dd8c85..32731f8d6 100644
--- a/source/Hack-Bold.ufo/glyphs/A_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/A_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="AE" format="1">
+<glyph name="AE" format="2">
   <advance width="1233"/>
   <unicode hex="00C6"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/A_acute.glif b/source/Hack-Bold.ufo/glyphs/A_acute.glif
index e58009f1f..8836b65ad 100644
--- a/source/Hack-Bold.ufo/glyphs/A_acute.glif
+++ b/source/Hack-Bold.ufo/glyphs/A_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Aacute" format="1">
+<glyph name="Aacute" format="2">
   <advance width="1233"/>
   <unicode hex="00C1"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/A_breve.glif b/source/Hack-Bold.ufo/glyphs/A_breve.glif
index 357b88241..9df851a18 100644
--- a/source/Hack-Bold.ufo/glyphs/A_breve.glif
+++ b/source/Hack-Bold.ufo/glyphs/A_breve.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Abreve" format="1">
+<glyph name="Abreve" format="2">
   <advance width="1233"/>
   <unicode hex="0102"/>
   <outline>
     <contour>
-      <point x="616" y="1588" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1588" type="curve" smooth="yes" name="dv01"/>
       <point x="419" y="1588"/>
       <point x="301" y="1679"/>
       <point x="281" y="1852" type="curve" name="sv02"/>
       <point x="422" y="1852" type="line"/>
       <point x="449" y="1771"/>
       <point x="515" y="1731"/>
-      <point x="618" y="1731" type="curve" name="dv02" smooth="yes"/>
+      <point x="618" y="1731" type="curve" smooth="yes" name="dv02"/>
       <point x="719" y="1731"/>
       <point x="782" y="1771"/>
       <point x="809" y="1852" type="curve" name="sv01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/A_circumflex.glif b/source/Hack-Bold.ufo/glyphs/A_circumflex.glif
index 488171dfc..50d35a07b 100644
--- a/source/Hack-Bold.ufo/glyphs/A_circumflex.glif
+++ b/source/Hack-Bold.ufo/glyphs/A_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Acircumflex" format="1">
+<glyph name="Acircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00C2"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/A_dieresis.glif b/source/Hack-Bold.ufo/glyphs/A_dieresis.glif
index 7fc32cf4e..f820bd0a2 100644
--- a/source/Hack-Bold.ufo/glyphs/A_dieresis.glif
+++ b/source/Hack-Bold.ufo/glyphs/A_dieresis.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Adieresis" format="1">
+<glyph name="Adieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00C4"/>
   <outline>
     <contour>
-      <point x="331" y="1606" type="line" name="hr00" smooth="yes"/>
+      <point x="331" y="1606" type="line" smooth="yes" name="hr00"/>
       <point x="311" y="1606"/>
       <point x="301" y="1616"/>
-      <point x="301" y="1636" type="curve" name="sh01" smooth="yes"/>
+      <point x="301" y="1636" type="curve" smooth="yes" name="sh01"/>
       <point x="301" y="1822" type="line" smooth="yes"/>
       <point x="301" y="1842"/>
       <point x="311" y="1852"/>
-      <point x="331" y="1852" type="curve" name="dv01" smooth="yes"/>
+      <point x="331" y="1852" type="curve" smooth="yes" name="dv01"/>
       <point x="507" y="1852" type="line" smooth="yes"/>
       <point x="527" y="1852"/>
       <point x="537" y="1842"/>
       <point x="537" y="1822" type="curve" smooth="yes"/>
-      <point x="537" y="1636" type="line" name="sh02" smooth="yes"/>
+      <point x="537" y="1636" type="line" smooth="yes" name="sh02"/>
       <point x="537" y="1616"/>
       <point x="527" y="1606"/>
       <point x="507" y="1606" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1606" type="line" name="sv01" smooth="yes"/>
+      <point x="726" y="1606" type="line" smooth="yes" name="sv01"/>
       <point x="706" y="1606"/>
       <point x="696" y="1616"/>
-      <point x="696" y="1636" type="curve" name="ah01" smooth="yes"/>
+      <point x="696" y="1636" type="curve" smooth="yes" name="ah01"/>
       <point x="696" y="1822" type="line" smooth="yes"/>
       <point x="696" y="1842"/>
       <point x="706" y="1852"/>
-      <point x="726" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="726" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="902" y="1852" type="line" smooth="yes"/>
       <point x="922" y="1852"/>
       <point x="932" y="1842"/>
       <point x="932" y="1822" type="curve" smooth="yes"/>
-      <point x="932" y="1636" type="line" name="sh03" smooth="yes"/>
+      <point x="932" y="1636" type="line" smooth="yes" name="sh03"/>
       <point x="932" y="1616"/>
       <point x="922" y="1606"/>
       <point x="902" y="1606" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/A_grave.glif b/source/Hack-Bold.ufo/glyphs/A_grave.glif
index 59d03e1f4..6db0ea06e 100644
--- a/source/Hack-Bold.ufo/glyphs/A_grave.glif
+++ b/source/Hack-Bold.ufo/glyphs/A_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Agrave" format="1">
+<glyph name="Agrave" format="2">
   <advance width="1233"/>
   <unicode hex="00C0"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/A_lpha.glif b/source/Hack-Bold.ufo/glyphs/A_lpha.glif
index baaa86c94..8a5436b8b 100644
--- a/source/Hack-Bold.ufo/glyphs/A_lpha.glif
+++ b/source/Hack-Bold.ufo/glyphs/A_lpha.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Alpha" format="1">
+<glyph name="Alpha" format="2">
   <advance width="1233"/>
   <unicode hex="0391"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/A_lphatonos.glif b/source/Hack-Bold.ufo/glyphs/A_lphatonos.glif
index 73f6138b2..1d88cddac 100644
--- a/source/Hack-Bold.ufo/glyphs/A_lphatonos.glif
+++ b/source/Hack-Bold.ufo/glyphs/A_lphatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Alphatonos" format="1">
+<glyph name="Alphatonos" format="2">
   <advance width="1233"/>
   <unicode hex="0386"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/A_macron.glif b/source/Hack-Bold.ufo/glyphs/A_macron.glif
index 5941e297e..d5babef3f 100644
--- a/source/Hack-Bold.ufo/glyphs/A_macron.glif
+++ b/source/Hack-Bold.ufo/glyphs/A_macron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Amacron" format="1">
+<glyph name="Amacron" format="2">
   <advance width="1233"/>
   <unicode hex="0100"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/A_ogonek.glif b/source/Hack-Bold.ufo/glyphs/A_ogonek.glif
index da41391de..13f0bde60 100644
--- a/source/Hack-Bold.ufo/glyphs/A_ogonek.glif
+++ b/source/Hack-Bold.ufo/glyphs/A_ogonek.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Aogonek" format="1">
+<glyph name="Aogonek" format="2">
   <advance width="1233"/>
   <unicode hex="0104"/>
   <outline>
     <contour>
-      <point x="1081" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="1081" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="1122" y="-254"/>
       <point x="1176" y="-244"/>
       <point x="1229" y="-223" type="curve" name="sh01"/>
       <point x="1229" y="-379" type="line"/>
       <point x="1157" y="-394"/>
       <point x="1093" y="-401"/>
-      <point x="1042" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="1042" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="886" y="-401"/>
       <point x="801" y="-339"/>
-      <point x="801" y="-224" type="curve" name="dh01" smooth="yes"/>
+      <point x="801" y="-224" type="curve" smooth="yes" name="dh01"/>
       <point x="801" y="-151"/>
       <point x="836" y="-81"/>
       <point x="912" y="0" type="curve" name="ih01"/>
@@ -32,7 +32,7 @@
       <point x="982" y="-106" type="curve" smooth="yes"/>
       <point x="969" y="-130"/>
       <point x="963" y="-147"/>
-      <point x="963" y="-166" type="curve" name="dh02" smooth="yes"/>
+      <point x="963" y="-166" type="curve" smooth="yes" name="dh02"/>
       <point x="963" y="-213"/>
       <point x="998" y="-254"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/A_ring.glif b/source/Hack-Bold.ufo/glyphs/A_ring.glif
index 49c77509c..2c7445a0d 100644
--- a/source/Hack-Bold.ufo/glyphs/A_ring.glif
+++ b/source/Hack-Bold.ufo/glyphs/A_ring.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Aring" format="1">
+<glyph name="Aring" format="2">
   <advance width="1233"/>
   <unicode hex="00C5"/>
   <outline>
@@ -10,19 +10,19 @@
       <point x="353" y="1507" type="curve" smooth="yes"/>
       <point x="338" y="1539"/>
       <point x="332" y="1577"/>
-      <point x="332" y="1614" type="curve" name="sh01" smooth="yes"/>
+      <point x="332" y="1614" type="curve" smooth="yes" name="sh01"/>
       <point x="332" y="1698"/>
       <point x="366" y="1769"/>
       <point x="415" y="1818" type="curve" smooth="yes"/>
       <point x="462" y="1865"/>
       <point x="533" y="1901"/>
-      <point x="617" y="1901" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="1901" type="curve" smooth="yes" name="dv02"/>
       <point x="692" y="1901"/>
       <point x="763" y="1873"/>
       <point x="819" y="1817" type="curve" smooth="yes"/>
       <point x="867" y="1769"/>
       <point x="901" y="1699"/>
-      <point x="901" y="1615" type="curve" name="sh02" smooth="yes"/>
+      <point x="901" y="1615" type="curve" smooth="yes" name="sh02"/>
       <point x="901" y="1576"/>
       <point x="895" y="1538"/>
       <point x="880" y="1507" type="curve" smooth="yes"/>
@@ -43,19 +43,19 @@
       <point x="710" y="1524" type="curve" smooth="yes"/>
       <point x="735" y="1549"/>
       <point x="748" y="1580"/>
-      <point x="748" y="1616" type="curve" name="ah01" smooth="yes"/>
+      <point x="748" y="1616" type="curve" smooth="yes" name="ah01"/>
       <point x="748" y="1652"/>
       <point x="735" y="1683"/>
       <point x="709" y="1709" type="curve" smooth="yes"/>
       <point x="682" y="1734"/>
       <point x="652" y="1747"/>
-      <point x="617" y="1747" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="1747" type="curve" smooth="yes" name="dv01"/>
       <point x="578" y="1747"/>
       <point x="547" y="1732"/>
       <point x="524" y="1709" type="curve" smooth="yes"/>
       <point x="498" y="1683"/>
       <point x="485" y="1652"/>
-      <point x="485" y="1616" type="curve" name="sh05" smooth="yes"/>
+      <point x="485" y="1616" type="curve" smooth="yes" name="sh05"/>
       <point x="485" y="1577"/>
       <point x="500" y="1547"/>
       <point x="523" y="1524" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/A_tilde.glif b/source/Hack-Bold.ufo/glyphs/A_tilde.glif
index 78e6ee37c..9a40a47c4 100644
--- a/source/Hack-Bold.ufo/glyphs/A_tilde.glif
+++ b/source/Hack-Bold.ufo/glyphs/A_tilde.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Atilde" format="1">
+<glyph name="Atilde" format="2">
   <advance width="1233"/>
   <unicode hex="00C3"/>
   <outline>
     <contour>
-      <point x="268" y="1618" type="line" name="hr00" smooth="yes"/>
+      <point x="268" y="1618" type="line" smooth="yes" name="hr00"/>
       <point x="268" y="1691"/>
       <point x="289" y="1750"/>
       <point x="322" y="1789" type="curve" smooth="yes"/>
       <point x="359" y="1833"/>
       <point x="411" y="1854"/>
-      <point x="466" y="1854" type="curve" name="sv01" smooth="yes"/>
+      <point x="466" y="1854" type="curve" smooth="yes" name="sv01"/>
       <point x="491" y="1854"/>
       <point x="515" y="1850"/>
       <point x="539" y="1842" type="curve" smooth="yes"/>
@@ -39,7 +39,7 @@
       <point x="910" y="1653" type="curve" smooth="yes"/>
       <point x="871" y="1606"/>
       <point x="823" y="1588"/>
-      <point x="768" y="1588" type="curve" name="dv01" smooth="yes"/>
+      <point x="768" y="1588" type="curve" smooth="yes" name="dv01"/>
       <point x="744" y="1588"/>
       <point x="720" y="1592"/>
       <point x="696" y="1599" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/B_.glif b/source/Hack-Bold.ufo/glyphs/B_.glif
index 472bbf50c..7211c603b 100644
--- a/source/Hack-Bold.ufo/glyphs/B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/B_.glif
@@ -1,63 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="B" format="1">
+<glyph name="B" format="2">
   <advance width="1233"/>
   <unicode hex="0042"/>
   <outline>
     <contour>
-      <point x="125" y="1495" type="line" name="dh01"/>
+      <point x="125" y="1495" type="line"/>
       <point x="606" y="1495" type="line" smooth="yes"/>
-      <point x="773" y="1495"/>
-      <point x="898" y="1464"/>
-      <point x="981" y="1401" type="curve" smooth="yes"/>
-      <point x="1064" y="1338"/>
-      <point x="1106" y="1243"/>
-      <point x="1106" y="1118" type="curve" name="dh04" smooth="yes"/>
-      <point x="1106" y="1023"/>
-      <point x="1081" y="948"/>
-      <point x="1032" y="893" type="curve" smooth="yes"/>
-      <point x="983" y="840"/>
-      <point x="911" y="808"/>
-      <point x="815" y="799" type="curve" name="ih01"/>
-      <point x="932" y="788"/>
-      <point x="1017" y="748"/>
-      <point x="1073" y="684" type="curve" smooth="yes"/>
-      <point x="1130" y="619"/>
-      <point x="1159" y="527"/>
-      <point x="1159" y="409" type="curve" name="sh01" smooth="yes"/>
-      <point x="1159" y="122"/>
-      <point x="997" y="0"/>
-      <point x="606" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="863.226" y="1495"/>
+      <point x="1106" y="1421.09"/>
+      <point x="1106" y="1120.16" type="curve" smooth="yes"/>
+      <point x="1106" y="926.533"/>
+      <point x="1005.49" y="816.654"/>
+      <point x="815" y="799" type="curve"/>
+      <point x="1048.12" y="777.257"/>
+      <point x="1159" y="639.153"/>
+      <point x="1159" y="409.271" type="curve" smooth="yes"/>
+      <point x="1159" y="60.6937"/>
+      <point x="904.064" y="0"/>
+      <point x="606" y="0" type="curve" smooth="yes"/>
       <point x="125" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="606" y="913" type="line" name="hr01" smooth="yes"/>
-      <point x="686" y="913"/>
-      <point x="734" y="926"/>
-      <point x="766" y="954" type="curve" smooth="yes"/>
-      <point x="797" y="981"/>
-      <point x="813" y="1018"/>
-      <point x="813" y="1085" type="curve" name="dh03" smooth="yes"/>
-      <point x="813" y="1144"/>
-      <point x="800" y="1187"/>
-      <point x="765" y="1218" type="curve" smooth="yes"/>
-      <point x="737" y="1242"/>
-      <point x="693" y="1260"/>
-      <point x="606" y="1260" type="curve" name="sv01" smooth="yes"/>
-      <point x="410" y="1260" type="line" name="dh02"/>
-      <point x="410" y="913" type="line" name="hr02"/>
+      <point x="606" y="913" type="line" smooth="yes"/>
+      <point x="731.604" y="913"/>
+      <point x="813" y="944.48"/>
+      <point x="813" y="1084.38" type="curve" smooth="yes"/>
+      <point x="813" y="1223.92"/>
+      <point x="732.029" y="1260"/>
+      <point x="606" y="1260" type="curve" smooth="yes"/>
+      <point x="410" y="1260" type="line"/>
+      <point x="410" y="913" type="line"/>
     </contour>
     <contour>
-      <point x="606" y="236" type="line" name="sv02" smooth="yes"/>
-      <point x="700" y="236"/>
-      <point x="766" y="252"/>
-      <point x="804" y="284" type="curve" smooth="yes"/>
-      <point x="841" y="316"/>
-      <point x="860" y="372"/>
-      <point x="860" y="451" type="curve" name="ih02" smooth="yes"/>
-      <point x="860" y="612"/>
-      <point x="787" y="678"/>
-      <point x="606" y="678" type="curve" name="dv01" smooth="yes"/>
-      <point x="410" y="678" type="line" name="sh02"/>
+      <point x="606" y="236" type="line" smooth="yes"/>
+      <point x="768.199" y="236"/>
+      <point x="860" y="272.993"/>
+      <point x="860" y="450.602" type="curve" smooth="yes"/>
+      <point x="860" y="625.714"/>
+      <point x="770.761" y="678"/>
+      <point x="606" y="678" type="curve" smooth="yes"/>
+      <point x="410" y="678" type="line"/>
       <point x="410" y="236" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/B_eta.glif b/source/Hack-Bold.ufo/glyphs/B_eta.glif
index 76c2bcb46..4a360d3a0 100644
--- a/source/Hack-Bold.ufo/glyphs/B_eta.glif
+++ b/source/Hack-Bold.ufo/glyphs/B_eta.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Beta" format="1">
+<glyph name="Beta" format="2">
   <advance width="1233"/>
   <unicode hex="0392"/>
   <outline>
@@ -8,37 +8,37 @@
       <point x="606" y="1495" type="line" smooth="yes"/>
       <point x="939" y="1495"/>
       <point x="1106" y="1370"/>
-      <point x="1106" y="1119" type="curve" name="dh03" smooth="yes"/>
+      <point x="1106" y="1119" type="curve" smooth="yes" name="dh03"/>
       <point x="1106" y="924"/>
       <point x="1007" y="816"/>
       <point x="815" y="799" type="curve" name="ih01"/>
       <point x="1050" y="775"/>
       <point x="1159" y="643"/>
-      <point x="1159" y="407" type="curve" name="sh02" smooth="yes"/>
+      <point x="1159" y="407" type="curve" smooth="yes" name="sh02"/>
       <point x="1159" y="122"/>
       <point x="995" y="0"/>
-      <point x="606" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="606" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="125" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="606" y="913" type="line" name="dv01" smooth="yes"/>
+      <point x="606" y="913" type="line" smooth="yes" name="dv01"/>
       <point x="755" y="913"/>
       <point x="813" y="961"/>
-      <point x="813" y="1084" type="curve" name="hr01" smooth="yes"/>
+      <point x="813" y="1084" type="curve" smooth="yes" name="hr01"/>
       <point x="813" y="1208"/>
       <point x="753" y="1260"/>
-      <point x="606" y="1260" type="curve" name="sv01" smooth="yes"/>
+      <point x="606" y="1260" type="curve" smooth="yes" name="sv01"/>
       <point x="410" y="1260" type="line" name="dh02"/>
       <point x="410" y="913" type="line"/>
     </contour>
     <contour>
-      <point x="606" y="236" type="line" name="hr02" smooth="yes"/>
+      <point x="606" y="236" type="line" smooth="yes" name="hr02"/>
       <point x="793" y="236"/>
       <point x="860" y="292"/>
-      <point x="860" y="449" type="curve" name="sh01" smooth="yes"/>
+      <point x="860" y="449" type="curve" smooth="yes" name="sh01"/>
       <point x="860" y="612"/>
       <point x="788" y="678"/>
-      <point x="606" y="678" type="curve" name="hr03" smooth="yes"/>
+      <point x="606" y="678" type="curve" smooth="yes" name="hr03"/>
       <point x="410" y="678" type="line" name="sh03"/>
       <point x="410" y="236" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/C_.glif b/source/Hack-Bold.ufo/glyphs/C_.glif
index ae8dd8804..87618a67d 100644
--- a/source/Hack-Bold.ufo/glyphs/C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/C_.glif
@@ -1,59 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="C" format="1">
+<glyph name="C" format="2">
   <advance width="1233"/>
   <unicode hex="0043"/>
   <outline>
     <contour>
-      <point x="759" y="-29" type="curve" name="hr00" smooth="yes"/>
-      <point x="560" y="-29"/>
-      <point x="407" y="37"/>
-      <point x="300" y="170" type="curve" smooth="yes"/>
-      <point x="194" y="303"/>
-      <point x="141" y="494"/>
-      <point x="141" y="745" type="curve" name="dh01" smooth="yes"/>
-      <point x="141" y="996"/>
-      <point x="194" y="1188"/>
-      <point x="300" y="1321" type="curve" smooth="yes"/>
-      <point x="407" y="1454"/>
-      <point x="560" y="1520"/>
-      <point x="759" y="1520" type="curve" name="at01" smooth="yes"/>
-      <point x="819" y="1520"/>
-      <point x="872" y="1514"/>
-      <point x="924" y="1502" type="curve" smooth="yes"/>
-      <point x="977" y="1490"/>
-      <point x="1025" y="1472"/>
+      <point x="755.045" y="-29" type="curve" smooth="yes"/>
+      <point x="291.658" y="-29"/>
+      <point x="141" y="334.939"/>
+      <point x="141" y="745.527" type="curve" smooth="yes"/>
+      <point x="141" y="1155.33"/>
+      <point x="291.08" y="1520"/>
+      <point x="754.795" y="1520" type="curve" smooth="yes"/>
+      <point x="866.443" y="1520"/>
+      <point x="974.678" y="1498.86"/>
       <point x="1070" y="1448" type="curve"/>
       <point x="1070" y="1120" type="line"/>
-      <point x="1010" y="1176"/>
-      <point x="965" y="1204"/>
-      <point x="922" y="1223" type="curve" smooth="yes"/>
-      <point x="871" y="1246"/>
-      <point x="823" y="1255"/>
-      <point x="774" y="1255" type="curve" name="sv01" smooth="yes"/>
-      <point x="667" y="1255"/>
-      <point x="586" y="1212"/>
-      <point x="531" y="1127" type="curve" smooth="yes"/>
-      <point x="476" y="1040"/>
-      <point x="448" y="913"/>
-      <point x="448" y="745" type="curve" name="dh02" smooth="yes"/>
-      <point x="448" y="577"/>
-      <point x="476" y="450"/>
-      <point x="531" y="365" type="curve" smooth="yes"/>
-      <point x="586" y="279"/>
-      <point x="667" y="236"/>
-      <point x="774" y="236" type="curve" name="dv01" smooth="yes"/>
-      <point x="825" y="236"/>
-      <point x="875" y="247"/>
-      <point x="923" y="269" type="curve" smooth="yes"/>
-      <point x="970" y="290"/>
-      <point x="1013" y="319"/>
+      <point x="985.668" y="1198.8"/>
+      <point x="893.007" y="1255"/>
+      <point x="771.706" y="1255" type="curve" smooth="yes"/>
+      <point x="495.554" y="1255"/>
+      <point x="448" y="963.743"/>
+      <point x="448" y="746.386" type="curve" smooth="yes"/>
+      <point x="448" y="526.89"/>
+      <point x="496.494" y="236"/>
+      <point x="770.815" y="236" type="curve" smooth="yes"/>
+      <point x="892.811" y="236"/>
+      <point x="985.241" y="293.531"/>
       <point x="1070" y="371" type="curve"/>
       <point x="1070" y="43" type="line"/>
-      <point x="1023" y="19"/>
-      <point x="974" y="1"/>
-      <point x="923" y="-11" type="curve" smooth="yes"/>
-      <point x="872" y="-23"/>
-      <point x="819" y="-29"/>
+      <point x="971.953" y="-7.07392"/>
+      <point x="868.784" y="-29"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Bold.ufo/glyphs/C_R_.glif b/source/Hack-Bold.ufo/glyphs/C_R_.glif
index 8dd4ab034..9c88b2cdc 100644
--- a/source/Hack-Bold.ufo/glyphs/C_R_.glif
+++ b/source/Hack-Bold.ufo/glyphs/C_R_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="CR" format="1">
+<glyph name="CR" format="2">
   <advance width="1233"/>
   <unicode hex="000D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/C_acute.glif b/source/Hack-Bold.ufo/glyphs/C_acute.glif
index 767f33a4d..7bfa38a9f 100644
--- a/source/Hack-Bold.ufo/glyphs/C_acute.glif
+++ b/source/Hack-Bold.ufo/glyphs/C_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Cacute" format="1">
+<glyph name="Cacute" format="2">
   <advance width="1233"/>
   <unicode hex="0106"/>
   <outline>
@@ -10,19 +10,19 @@
       <point x="595" y="1588" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="759" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="759" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="560" y="-29"/>
       <point x="407" y="37"/>
       <point x="300" y="170" type="curve" smooth="yes"/>
       <point x="194" y="303"/>
       <point x="141" y="494"/>
-      <point x="141" y="745" type="curve" name="dh01" smooth="yes"/>
+      <point x="141" y="745" type="curve" smooth="yes" name="dh01"/>
       <point x="141" y="996"/>
       <point x="194" y="1188"/>
       <point x="300" y="1321" type="curve" smooth="yes"/>
       <point x="407" y="1454"/>
       <point x="560" y="1520"/>
-      <point x="759" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="759" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="819" y="1520"/>
       <point x="872" y="1514"/>
       <point x="924" y="1502" type="curve" smooth="yes"/>
@@ -35,19 +35,19 @@
       <point x="922" y="1223" type="curve" smooth="yes"/>
       <point x="871" y="1246"/>
       <point x="823" y="1255"/>
-      <point x="774" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="774" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="667" y="1255"/>
       <point x="586" y="1212"/>
       <point x="531" y="1127" type="curve" smooth="yes"/>
       <point x="476" y="1040"/>
       <point x="448" y="913"/>
-      <point x="448" y="745" type="curve" name="dh02" smooth="yes"/>
+      <point x="448" y="745" type="curve" smooth="yes" name="dh02"/>
       <point x="448" y="577"/>
       <point x="476" y="450"/>
       <point x="531" y="365" type="curve" smooth="yes"/>
       <point x="586" y="279"/>
       <point x="667" y="236"/>
-      <point x="774" y="236" type="curve" name="dv02" smooth="yes"/>
+      <point x="774" y="236" type="curve" smooth="yes" name="dv02"/>
       <point x="825" y="236"/>
       <point x="875" y="247"/>
       <point x="923" y="269" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/C_caron.glif b/source/Hack-Bold.ufo/glyphs/C_caron.glif
index e7a2290eb..dc0f19fec 100644
--- a/source/Hack-Bold.ufo/glyphs/C_caron.glif
+++ b/source/Hack-Bold.ufo/glyphs/C_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ccaron" format="1">
+<glyph name="Ccaron" format="2">
   <advance width="1233"/>
   <unicode hex="010C"/>
   <outline>
@@ -13,19 +13,19 @@
       <point x="587" y="1588" type="line"/>
     </contour>
     <contour>
-      <point x="759" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="759" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="560" y="-29"/>
       <point x="407" y="37"/>
       <point x="300" y="170" type="curve" smooth="yes"/>
       <point x="194" y="303"/>
       <point x="141" y="494"/>
-      <point x="141" y="745" type="curve" name="dh01" smooth="yes"/>
+      <point x="141" y="745" type="curve" smooth="yes" name="dh01"/>
       <point x="141" y="996"/>
       <point x="194" y="1188"/>
       <point x="300" y="1321" type="curve" smooth="yes"/>
       <point x="407" y="1454"/>
       <point x="560" y="1520"/>
-      <point x="759" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="759" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="819" y="1520"/>
       <point x="872" y="1514"/>
       <point x="924" y="1502" type="curve" smooth="yes"/>
@@ -38,19 +38,19 @@
       <point x="922" y="1223" type="curve" smooth="yes"/>
       <point x="871" y="1246"/>
       <point x="823" y="1255"/>
-      <point x="774" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="774" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="667" y="1255"/>
       <point x="586" y="1212"/>
       <point x="531" y="1127" type="curve" smooth="yes"/>
       <point x="476" y="1040"/>
       <point x="448" y="913"/>
-      <point x="448" y="745" type="curve" name="dh02" smooth="yes"/>
+      <point x="448" y="745" type="curve" smooth="yes" name="dh02"/>
       <point x="448" y="577"/>
       <point x="476" y="450"/>
       <point x="531" y="365" type="curve" smooth="yes"/>
       <point x="586" y="279"/>
       <point x="667" y="236"/>
-      <point x="774" y="236" type="curve" name="dv02" smooth="yes"/>
+      <point x="774" y="236" type="curve" smooth="yes" name="dv02"/>
       <point x="825" y="236"/>
       <point x="875" y="247"/>
       <point x="923" y="269" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/C_cedilla.glif b/source/Hack-Bold.ufo/glyphs/C_cedilla.glif
index d236394a0..7a8da6a77 100644
--- a/source/Hack-Bold.ufo/glyphs/C_cedilla.glif
+++ b/source/Hack-Bold.ufo/glyphs/C_cedilla.glif
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ccedilla" format="1">
+<glyph name="Ccedilla" format="2">
   <advance width="1233"/>
   <unicode hex="00C7"/>
   <outline>
     <contour>
-      <point x="774" y="1255" type="curve" name="hr00" smooth="yes"/>
+      <point x="774" y="1255" type="curve" smooth="yes" name="hr00"/>
       <point x="667" y="1255"/>
       <point x="586" y="1212"/>
       <point x="531" y="1127" type="curve" smooth="yes"/>
       <point x="476" y="1040"/>
       <point x="448" y="913"/>
-      <point x="448" y="745" type="curve" name="sh02" smooth="yes"/>
+      <point x="448" y="745" type="curve" smooth="yes" name="sh02"/>
       <point x="448" y="577"/>
       <point x="476" y="450"/>
       <point x="531" y="365" type="curve" smooth="yes"/>
       <point x="586" y="279"/>
       <point x="667" y="236"/>
-      <point x="774" y="236" type="curve" name="sv01" smooth="yes"/>
+      <point x="774" y="236" type="curve" smooth="yes" name="sv01"/>
       <point x="825" y="236"/>
       <point x="875" y="247"/>
-      <point x="923" y="269" type="curve" name="sh04" smooth="yes"/>
+      <point x="923" y="269" type="curve" smooth="yes" name="sh04"/>
       <point x="970" y="290"/>
       <point x="1013" y="319"/>
       <point x="1070" y="371" type="curve" name="iv01"/>
       <point x="1070" y="43" type="line"/>
       <point x="1023" y="19"/>
       <point x="974" y="1"/>
-      <point x="923" y="-11" type="curve" name="sh05" smooth="yes"/>
+      <point x="923" y="-11" type="curve" smooth="yes" name="sh05"/>
       <point x="895" y="-18"/>
       <point x="867" y="-22"/>
       <point x="836" y="-25" type="curve" name="ih01"/>
@@ -35,16 +35,16 @@
       <point x="898" y="-115" type="curve" smooth="yes"/>
       <point x="916" y="-149"/>
       <point x="925" y="-184"/>
-      <point x="925" y="-221" type="curve" name="sh03" smooth="yes"/>
+      <point x="925" y="-221" type="curve" smooth="yes" name="sh03"/>
       <point x="925" y="-282"/>
       <point x="902" y="-327"/>
       <point x="863" y="-356" type="curve" smooth="yes"/>
       <point x="828" y="-383"/>
       <point x="774" y="-401"/>
-      <point x="677" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="677" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="645" y="-401"/>
       <point x="610" y="-399"/>
-      <point x="577" y="-395" type="curve" name="sv02" smooth="yes"/>
+      <point x="577" y="-395" type="curve" smooth="yes" name="sv02"/>
       <point x="526" y="-388"/>
       <point x="504" y="-382"/>
       <point x="473" y="-375" type="curve"/>
@@ -54,7 +54,7 @@
       <point x="560" y="-245" type="curve" smooth="yes"/>
       <point x="588" y="-251"/>
       <point x="614" y="-254"/>
-      <point x="638" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="638" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="676" y="-254"/>
       <point x="706" y="-246"/>
       <point x="729" y="-231" type="curve" smooth="yes"/>
@@ -72,23 +72,23 @@
       <point x="300" y="170" type="curve" smooth="yes"/>
       <point x="194" y="303"/>
       <point x="141" y="494"/>
-      <point x="141" y="745" type="curve" name="sh01" smooth="yes"/>
+      <point x="141" y="745" type="curve" smooth="yes" name="sh01"/>
       <point x="141" y="996"/>
       <point x="194" y="1188"/>
       <point x="300" y="1321" type="curve" smooth="yes"/>
       <point x="407" y="1454"/>
       <point x="560" y="1520"/>
-      <point x="759" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="759" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="819" y="1520"/>
       <point x="872" y="1514"/>
-      <point x="924" y="1502" type="curve" name="sh06" smooth="yes"/>
+      <point x="924" y="1502" type="curve" smooth="yes" name="sh06"/>
       <point x="977" y="1490"/>
       <point x="1025" y="1472"/>
       <point x="1070" y="1448" type="curve"/>
       <point x="1070" y="1120" type="line" name="iv02"/>
       <point x="1010" y="1176"/>
       <point x="965" y="1204"/>
-      <point x="922" y="1223" type="curve" name="sh07" smooth="yes"/>
+      <point x="922" y="1223" type="curve" smooth="yes" name="sh07"/>
       <point x="871" y="1246"/>
       <point x="823" y="1255"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/C_circumflex.glif b/source/Hack-Bold.ufo/glyphs/C_circumflex.glif
index 48bdc168b..f14610f37 100644
--- a/source/Hack-Bold.ufo/glyphs/C_circumflex.glif
+++ b/source/Hack-Bold.ufo/glyphs/C_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ccircumflex" format="1">
+<glyph name="Ccircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0108"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/C_dotaccent.glif b/source/Hack-Bold.ufo/glyphs/C_dotaccent.glif
index 6ebb7c5d4..4d8d65577 100644
--- a/source/Hack-Bold.ufo/glyphs/C_dotaccent.glif
+++ b/source/Hack-Bold.ufo/glyphs/C_dotaccent.glif
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Cdotaccent" format="1">
+<glyph name="Cdotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="010A"/>
   <outline>
     <contour>
-      <point x="599" y="1596" type="line" name="hr00" smooth="yes"/>
+      <point x="599" y="1596" type="line" smooth="yes" name="hr00"/>
       <point x="582" y="1596"/>
       <point x="568" y="1610"/>
-      <point x="568" y="1627" type="curve" name="ah01" smooth="yes"/>
+      <point x="568" y="1627" type="curve" smooth="yes" name="ah01"/>
       <point x="568" y="1811" type="line" smooth="yes"/>
       <point x="568" y="1828"/>
       <point x="582" y="1842"/>
-      <point x="599" y="1842" type="curve" name="dv03" smooth="yes"/>
+      <point x="599" y="1842" type="curve" smooth="yes" name="dv03"/>
       <point x="812" y="1842" type="line" smooth="yes"/>
       <point x="829" y="1842"/>
       <point x="843" y="1828"/>
       <point x="843" y="1811" type="curve" smooth="yes"/>
-      <point x="843" y="1627" type="line" name="sh01" smooth="yes"/>
+      <point x="843" y="1627" type="line" smooth="yes" name="sh01"/>
       <point x="843" y="1610"/>
       <point x="829" y="1596"/>
       <point x="812" y="1596" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="757" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="757" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="360" y="-29"/>
       <point x="141" y="244"/>
-      <point x="141" y="745" type="curve" name="sh02" smooth="yes"/>
+      <point x="141" y="745" type="curve" smooth="yes" name="sh02"/>
       <point x="141" y="1248"/>
       <point x="360" y="1520"/>
-      <point x="757" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="757" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="874" y="1520"/>
       <point x="979" y="1496"/>
       <point x="1070" y="1448" type="curve"/>
       <point x="1070" y="1120" type="line"/>
       <point x="969" y="1213"/>
       <point x="877" y="1255"/>
-      <point x="772" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="772" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="559" y="1255"/>
       <point x="448" y="1084"/>
-      <point x="448" y="745" type="curve" name="sh03" smooth="yes"/>
+      <point x="448" y="745" type="curve" smooth="yes" name="sh03"/>
       <point x="448" y="406"/>
       <point x="559" y="236"/>
-      <point x="772" y="236" type="curve" name="dv02" smooth="yes"/>
+      <point x="772" y="236" type="curve" smooth="yes" name="dv02"/>
       <point x="877" y="236"/>
       <point x="969" y="278"/>
       <point x="1070" y="371" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/C_hi.glif b/source/Hack-Bold.ufo/glyphs/C_hi.glif
index 32f7b06e2..44b7210b9 100644
--- a/source/Hack-Bold.ufo/glyphs/C_hi.glif
+++ b/source/Hack-Bold.ufo/glyphs/C_hi.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Chi" format="1">
+<glyph name="Chi" format="2">
   <advance width="1233"/>
   <unicode hex="03A7"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/D_.glif b/source/Hack-Bold.ufo/glyphs/D_.glif
index 84cf24311..5bf419178 100644
--- a/source/Hack-Bold.ufo/glyphs/D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/D_.glif
@@ -1,37 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="D" format="1">
+<glyph name="D" format="2">
   <advance width="1233"/>
   <unicode hex="0044"/>
   <outline>
     <contour>
-      <point x="137" y="1493" type="line" name="hr00"/>
+      <point x="137" y="1493" type="line"/>
       <point x="453" y="1493" type="line" smooth="yes"/>
-      <point x="697" y="1493"/>
-      <point x="873" y="1435"/>
-      <point x="980" y="1319" type="curve" smooth="yes"/>
-      <point x="1085" y="1204"/>
-      <point x="1141" y="1018"/>
-      <point x="1141" y="747" type="curve" name="sh01" smooth="yes"/>
-      <point x="1141" y="484"/>
-      <point x="1087" y="293"/>
-      <point x="980" y="176" type="curve" smooth="yes"/>
-      <point x="873" y="59"/>
-      <point x="697" y="0"/>
-      <point x="453" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="971.029" y="1493"/>
+      <point x="1141" y="1240.41"/>
+      <point x="1141" y="749.147" type="curve" smooth="yes"/>
+      <point x="1141" y="255.638"/>
+      <point x="969.471" y="0"/>
+      <point x="453" y="0" type="curve" smooth="yes"/>
       <point x="137" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="512" y="266" type="line" name="sv01" smooth="yes"/>
-      <point x="744" y="266"/>
-      <point x="834" y="399"/>
-      <point x="834" y="748" type="curve" name="ah01" smooth="yes"/>
-      <point x="834" y="921"/>
-      <point x="809" y="1045"/>
-      <point x="760" y="1118" type="curve" smooth="yes"/>
-      <point x="711" y="1191"/>
-      <point x="629" y="1227"/>
-      <point x="512" y="1227" type="curve" name="sv02" smooth="yes"/>
-      <point x="432" y="1227" type="line" name="sh02"/>
+      <point x="512" y="266" type="line" smooth="yes"/>
+      <point x="806.288" y="266"/>
+      <point x="834" y="507.488"/>
+      <point x="834" y="745.694" type="curve" smooth="yes"/>
+      <point x="834" y="985.196"/>
+      <point x="805.986" y="1227"/>
+      <point x="512" y="1227" type="curve" smooth="yes"/>
+      <point x="432" y="1227" type="line"/>
       <point x="432" y="266" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/D_caron.glif b/source/Hack-Bold.ufo/glyphs/D_caron.glif
index a0e7f8346..555924765 100644
--- a/source/Hack-Bold.ufo/glyphs/D_caron.glif
+++ b/source/Hack-Bold.ufo/glyphs/D_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Dcaron" format="1">
+<glyph name="Dcaron" format="2">
   <advance width="1233"/>
   <unicode hex="010E"/>
   <outline>
@@ -17,20 +17,20 @@
       <point x="453" y="1493" type="line" smooth="yes"/>
       <point x="941" y="1493"/>
       <point x="1141" y="1276"/>
-      <point x="1141" y="748" type="curve" name="sh03" smooth="yes"/>
+      <point x="1141" y="748" type="curve" smooth="yes" name="sh03"/>
       <point x="1141" y="219"/>
       <point x="941" y="0"/>
-      <point x="453" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="453" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="137" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="512" y="266" type="line" name="sv01" smooth="yes"/>
+      <point x="512" y="266" type="line" smooth="yes" name="sv01"/>
       <point x="744" y="266"/>
       <point x="834" y="398"/>
-      <point x="834" y="747" type="curve" name="ah01" smooth="yes"/>
+      <point x="834" y="747" type="curve" smooth="yes" name="ah01"/>
       <point x="834" y="1096"/>
       <point x="744" y="1227"/>
-      <point x="512" y="1227" type="curve" name="sv02" smooth="yes"/>
+      <point x="512" y="1227" type="curve" smooth="yes" name="sv02"/>
       <point x="432" y="1227" type="line" name="sh02"/>
       <point x="432" y="266" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/D_croat.glif b/source/Hack-Bold.ufo/glyphs/D_croat.glif
index 2414c5018..0bf1b9404 100644
--- a/source/Hack-Bold.ufo/glyphs/D_croat.glif
+++ b/source/Hack-Bold.ufo/glyphs/D_croat.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Dcroat" format="1">
+<glyph name="Dcroat" format="2">
   <advance width="1233"/>
   <unicode hex="0110"/>
   <outline>
@@ -12,20 +12,20 @@
       <point x="453" y="1493" type="line" smooth="yes"/>
       <point x="941" y="1493"/>
       <point x="1141" y="1276"/>
-      <point x="1141" y="748" type="curve" name="sh02" smooth="yes"/>
+      <point x="1141" y="748" type="curve" smooth="yes" name="sh02"/>
       <point x="1141" y="219"/>
       <point x="941" y="0"/>
-      <point x="453" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="453" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="137" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="512" y="266" type="line" name="sv01" smooth="yes"/>
+      <point x="512" y="266" type="line" smooth="yes" name="sv01"/>
       <point x="744" y="266"/>
       <point x="834" y="398"/>
-      <point x="834" y="747" type="curve" name="ah01" smooth="yes"/>
+      <point x="834" y="747" type="curve" smooth="yes" name="ah01"/>
       <point x="834" y="1096"/>
       <point x="744" y="1227"/>
-      <point x="512" y="1227" type="curve" name="sv02" smooth="yes"/>
+      <point x="512" y="1227" type="curve" smooth="yes" name="sv02"/>
       <point x="432" y="1227" type="line" name="sh04"/>
       <point x="432" y="901" type="line" name="sv03"/>
       <point x="643" y="901" type="line"/>
diff --git a/source/Hack-Bold.ufo/glyphs/E_.glif b/source/Hack-Bold.ufo/glyphs/E_.glif
index e9ddd7710..fb1e43090 100644
--- a/source/Hack-Bold.ufo/glyphs/E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/E_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="E" format="1">
+<glyph name="E" format="2">
   <advance width="1233"/>
   <unicode hex="0045"/>
   <outline>
     <contour>
-      <point x="168" y="1493" type="line" name="hr00"/>
+      <point x="168" y="1493" type="line"/>
       <point x="1098" y="1493" type="line"/>
-      <point x="1098" y="1233" type="line" name="sv01"/>
-      <point x="463" y="1233" type="line" name="dh01"/>
+      <point x="1098" y="1233" type="line"/>
+      <point x="463" y="1233" type="line"/>
       <point x="463" y="911" type="line"/>
-      <point x="1038" y="911" type="line" name="dv02"/>
-      <point x="1038" y="651" type="line" name="dv01"/>
-      <point x="463" y="651" type="line" name="sh01"/>
-      <point x="463" y="260" type="line" name="sv02"/>
+      <point x="1038" y="911" type="line"/>
+      <point x="1038" y="651" type="line"/>
+      <point x="463" y="651" type="line"/>
+      <point x="463" y="260" type="line"/>
       <point x="1098" y="260" type="line"/>
-      <point x="1098" y="0" type="line" name="ab01"/>
+      <point x="1098" y="0" type="line"/>
       <point x="168" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/E_acute.glif b/source/Hack-Bold.ufo/glyphs/E_acute.glif
index a02035ff9..4be47f6f5 100644
--- a/source/Hack-Bold.ufo/glyphs/E_acute.glif
+++ b/source/Hack-Bold.ufo/glyphs/E_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Eacute" format="1">
+<glyph name="Eacute" format="2">
   <advance width="1233"/>
   <unicode hex="00C9"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/E_breve.glif b/source/Hack-Bold.ufo/glyphs/E_breve.glif
index d858d3f4f..a0eccb77c 100644
--- a/source/Hack-Bold.ufo/glyphs/E_breve.glif
+++ b/source/Hack-Bold.ufo/glyphs/E_breve.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ebreve" format="1">
+<glyph name="Ebreve" format="2">
   <advance width="1233"/>
   <unicode hex="0114"/>
   <outline>
@@ -18,7 +18,7 @@
       <point x="168" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="676" y="1608" type="curve" name="dv03" smooth="yes"/>
+      <point x="676" y="1608" type="curve" smooth="yes" name="dv03"/>
       <point x="578" y="1608"/>
       <point x="500" y="1631"/>
       <point x="443" y="1676" type="curve" smooth="yes"/>
@@ -31,10 +31,10 @@
       <point x="551" y="1782" type="curve" smooth="yes"/>
       <point x="584" y="1761"/>
       <point x="625" y="1751"/>
-      <point x="676" y="1751" type="curve" name="dv04" smooth="yes"/>
+      <point x="676" y="1751" type="curve" smooth="yes" name="dv04"/>
       <point x="727" y="1751"/>
       <point x="769" y="1761"/>
-      <point x="801" y="1781" type="curve" name="hr01" smooth="yes"/>
+      <point x="801" y="1781" type="curve" smooth="yes" name="hr01"/>
       <point x="834" y="1802"/>
       <point x="856" y="1832"/>
       <point x="869" y="1872" type="curve" name="sv01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/E_caron.glif b/source/Hack-Bold.ufo/glyphs/E_caron.glif
index d0b98b89d..ddfd73ffa 100644
--- a/source/Hack-Bold.ufo/glyphs/E_caron.glif
+++ b/source/Hack-Bold.ufo/glyphs/E_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ecaron" format="1">
+<glyph name="Ecaron" format="2">
   <advance width="1233"/>
   <unicode hex="011A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/E_circumflex.glif b/source/Hack-Bold.ufo/glyphs/E_circumflex.glif
index 6984aa558..f4e861f76 100644
--- a/source/Hack-Bold.ufo/glyphs/E_circumflex.glif
+++ b/source/Hack-Bold.ufo/glyphs/E_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ecircumflex" format="1">
+<glyph name="Ecircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00CA"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/E_dieresis.glif b/source/Hack-Bold.ufo/glyphs/E_dieresis.glif
index 4df51b9eb..e031d997c 100644
--- a/source/Hack-Bold.ufo/glyphs/E_dieresis.glif
+++ b/source/Hack-Bold.ufo/glyphs/E_dieresis.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Edieresis" format="1">
+<glyph name="Edieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00CB"/>
   <outline>
     <contour>
-      <point x="362" y="1606" type="line" name="dv01" smooth="yes"/>
+      <point x="362" y="1606" type="line" smooth="yes" name="dv01"/>
       <point x="342" y="1606"/>
       <point x="332" y="1616"/>
-      <point x="332" y="1636" type="curve" name="ih01" smooth="yes"/>
+      <point x="332" y="1636" type="curve" smooth="yes" name="ih01"/>
       <point x="332" y="1822" type="line" smooth="yes"/>
       <point x="332" y="1842"/>
       <point x="342" y="1852"/>
-      <point x="362" y="1852" type="curve" name="dv02" smooth="yes"/>
+      <point x="362" y="1852" type="curve" smooth="yes" name="dv02"/>
       <point x="538" y="1852" type="line" smooth="yes"/>
       <point x="558" y="1852"/>
       <point x="568" y="1842"/>
       <point x="568" y="1822" type="curve" smooth="yes"/>
-      <point x="568" y="1636" type="line" name="sh01" smooth="yes"/>
+      <point x="568" y="1636" type="line" smooth="yes" name="sh01"/>
       <point x="568" y="1616"/>
       <point x="558" y="1606"/>
       <point x="538" y="1606" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="757" y="1606" type="line" name="sv01" smooth="yes"/>
+      <point x="757" y="1606" type="line" smooth="yes" name="sv01"/>
       <point x="737" y="1606"/>
       <point x="727" y="1616"/>
-      <point x="727" y="1636" type="curve" name="dh03" smooth="yes"/>
+      <point x="727" y="1636" type="curve" smooth="yes" name="dh03"/>
       <point x="727" y="1822" type="line" smooth="yes"/>
       <point x="727" y="1842"/>
       <point x="737" y="1852"/>
-      <point x="757" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="757" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="933" y="1852" type="line" smooth="yes"/>
       <point x="953" y="1852"/>
       <point x="963" y="1842"/>
       <point x="963" y="1822" type="curve" smooth="yes"/>
-      <point x="963" y="1636" type="line" name="dh04" smooth="yes"/>
+      <point x="963" y="1636" type="line" smooth="yes" name="dh04"/>
       <point x="963" y="1616"/>
       <point x="953" y="1606"/>
       <point x="933" y="1606" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/E_dotaccent.glif b/source/Hack-Bold.ufo/glyphs/E_dotaccent.glif
index 94e7560f4..a151b95da 100644
--- a/source/Hack-Bold.ufo/glyphs/E_dotaccent.glif
+++ b/source/Hack-Bold.ufo/glyphs/E_dotaccent.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Edotaccent" format="1">
+<glyph name="Edotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="0116"/>
   <outline>
     <contour>
-      <point x="541" y="1606" type="line" name="hr00" smooth="yes"/>
+      <point x="541" y="1606" type="line" smooth="yes" name="hr00"/>
       <point x="524" y="1606"/>
       <point x="510" y="1620"/>
-      <point x="510" y="1637" type="curve" name="ah01" smooth="yes"/>
+      <point x="510" y="1637" type="curve" smooth="yes" name="ah01"/>
       <point x="510" y="1821" type="line" smooth="yes"/>
       <point x="510" y="1838"/>
       <point x="524" y="1852"/>
-      <point x="541" y="1852" type="curve" name="dv01" smooth="yes"/>
+      <point x="541" y="1852" type="curve" smooth="yes" name="dv01"/>
       <point x="754" y="1852" type="line" smooth="yes"/>
       <point x="771" y="1852"/>
       <point x="785" y="1838"/>
       <point x="785" y="1821" type="curve" smooth="yes"/>
-      <point x="785" y="1637" type="line" name="sh01" smooth="yes"/>
+      <point x="785" y="1637" type="line" smooth="yes" name="sh01"/>
       <point x="785" y="1620"/>
       <point x="771" y="1606"/>
       <point x="754" y="1606" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/E_grave.glif b/source/Hack-Bold.ufo/glyphs/E_grave.glif
index 435642c89..92039870d 100644
--- a/source/Hack-Bold.ufo/glyphs/E_grave.glif
+++ b/source/Hack-Bold.ufo/glyphs/E_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Egrave" format="1">
+<glyph name="Egrave" format="2">
   <advance width="1233"/>
   <unicode hex="00C8"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/E_macron.glif b/source/Hack-Bold.ufo/glyphs/E_macron.glif
index 57af02b7e..63e0a4f39 100644
--- a/source/Hack-Bold.ufo/glyphs/E_macron.glif
+++ b/source/Hack-Bold.ufo/glyphs/E_macron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Emacron" format="1">
+<glyph name="Emacron" format="2">
   <advance width="1233"/>
   <unicode hex="0112"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/E_ng.glif b/source/Hack-Bold.ufo/glyphs/E_ng.glif
index c761f4e33..a2ab7652a 100644
--- a/source/Hack-Bold.ufo/glyphs/E_ng.glif
+++ b/source/Hack-Bold.ufo/glyphs/E_ng.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Eng" format="1">
+<glyph name="Eng" format="2">
   <advance width="1233"/>
   <unicode hex="014A"/>
   <outline>
@@ -8,11 +8,11 @@
       <point x="649" y="-199" type="line" smooth="yes"/>
       <point x="782" y="-199"/>
       <point x="831" y="-133"/>
-      <point x="831" y="44" type="curve" name="ah01" smooth="yes"/>
+      <point x="831" y="44" type="curve" smooth="yes" name="ah01"/>
       <point x="831" y="1015" type="line" smooth="yes"/>
       <point x="831" y="1182"/>
       <point x="773" y="1255"/>
-      <point x="641" y="1255" type="curve" name="sv02" smooth="yes"/>
+      <point x="641" y="1255" type="curve" smooth="yes" name="sv02"/>
       <point x="481" y="1255"/>
       <point x="401" y="1145"/>
       <point x="401" y="972" type="curve" smooth="yes"/>
@@ -23,14 +23,14 @@
       <point x="401" y="1253" type="line" name="sh02"/>
       <point x="452" y="1426"/>
       <point x="572" y="1522"/>
-      <point x="747" y="1522" type="curve" name="sv03" smooth="yes"/>
+      <point x="747" y="1522" type="curve" smooth="yes" name="sv03"/>
       <point x="992" y="1522"/>
       <point x="1125" y="1327"/>
       <point x="1125" y="942" type="curve" smooth="yes"/>
-      <point x="1125" y="58" type="line" name="sh03" smooth="yes"/>
+      <point x="1125" y="58" type="line" smooth="yes" name="sh03"/>
       <point x="1125" y="-298"/>
       <point x="1009" y="-426"/>
-      <point x="733" y="-426" type="curve" name="ab01" smooth="yes"/>
+      <point x="733" y="-426" type="curve" smooth="yes" name="ab01"/>
       <point x="612" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/E_ogonek.glif b/source/Hack-Bold.ufo/glyphs/E_ogonek.glif
index 474daa16d..77556ac01 100644
--- a/source/Hack-Bold.ufo/glyphs/E_ogonek.glif
+++ b/source/Hack-Bold.ufo/glyphs/E_ogonek.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Eogonek" format="1">
+<glyph name="Eogonek" format="2">
   <advance width="1233"/>
   <unicode hex="0118"/>
   <outline>
     <contour>
-      <point x="951" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="951" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="992" y="-254"/>
       <point x="1046" y="-244"/>
       <point x="1099" y="-223" type="curve" name="sh02"/>
       <point x="1099" y="-379" type="line"/>
       <point x="1027" y="-394"/>
       <point x="963" y="-401"/>
-      <point x="912" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="912" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="756" y="-401"/>
       <point x="671" y="-339"/>
-      <point x="671" y="-224" type="curve" name="hr01" smooth="yes"/>
+      <point x="671" y="-224" type="curve" smooth="yes" name="hr01"/>
       <point x="671" y="-151"/>
       <point x="706" y="-81"/>
       <point x="782" y="0" type="curve" name="ab01"/>
@@ -36,7 +36,7 @@
       <point x="852" y="-106" type="curve" smooth="yes"/>
       <point x="839" y="-130"/>
       <point x="833" y="-147"/>
-      <point x="833" y="-166" type="curve" name="dh03" smooth="yes"/>
+      <point x="833" y="-166" type="curve" smooth="yes" name="dh03"/>
       <point x="833" y="-213"/>
       <point x="868" y="-254"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/E_psilon.glif b/source/Hack-Bold.ufo/glyphs/E_psilon.glif
index f61af33ae..abae7b447 100644
--- a/source/Hack-Bold.ufo/glyphs/E_psilon.glif
+++ b/source/Hack-Bold.ufo/glyphs/E_psilon.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Epsilon" format="1">
+<glyph name="Epsilon" format="2">
   <advance width="1233"/>
   <unicode hex="0395"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/E_psilontonos.glif b/source/Hack-Bold.ufo/glyphs/E_psilontonos.glif
index 893c6eb64..de59a073b 100644
--- a/source/Hack-Bold.ufo/glyphs/E_psilontonos.glif
+++ b/source/Hack-Bold.ufo/glyphs/E_psilontonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Epsilontonos" format="1">
+<glyph name="Epsilontonos" format="2">
   <advance width="1233"/>
   <unicode hex="0388"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/E_ta.glif b/source/Hack-Bold.ufo/glyphs/E_ta.glif
index 61ed63e49..edd6a095e 100644
--- a/source/Hack-Bold.ufo/glyphs/E_ta.glif
+++ b/source/Hack-Bold.ufo/glyphs/E_ta.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Eta" format="1">
+<glyph name="Eta" format="2">
   <advance width="1233"/>
   <unicode hex="0397"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/E_tatonos.glif b/source/Hack-Bold.ufo/glyphs/E_tatonos.glif
index ecd5e595b..90e7f135d 100644
--- a/source/Hack-Bold.ufo/glyphs/E_tatonos.glif
+++ b/source/Hack-Bold.ufo/glyphs/E_tatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Etatonos" format="1">
+<glyph name="Etatonos" format="2">
   <advance width="1233"/>
   <unicode hex="0389"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/E_th.glif b/source/Hack-Bold.ufo/glyphs/E_th.glif
index 2d16890f6..5b4ba8a8d 100644
--- a/source/Hack-Bold.ufo/glyphs/E_th.glif
+++ b/source/Hack-Bold.ufo/glyphs/E_th.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Eth" format="1">
+<glyph name="Eth" format="2">
   <advance width="1233"/>
   <unicode hex="00D0"/>
   <outline>
@@ -15,26 +15,26 @@
       <point x="980" y="1319" type="curve" smooth="yes"/>
       <point x="1085" y="1204"/>
       <point x="1141" y="1018"/>
-      <point x="1141" y="747" type="curve" name="sh02" smooth="yes"/>
+      <point x="1141" y="747" type="curve" smooth="yes" name="sh02"/>
       <point x="1141" y="484"/>
       <point x="1087" y="293"/>
       <point x="980" y="176" type="curve" smooth="yes"/>
       <point x="873" y="59"/>
       <point x="697" y="0"/>
-      <point x="453" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="453" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="137" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="512" y="266" type="line" name="sv01" smooth="yes"/>
+      <point x="512" y="266" type="line" smooth="yes" name="sv01"/>
       <point x="744" y="266"/>
       <point x="834" y="399"/>
-      <point x="834" y="748" type="curve" name="ah01" smooth="yes"/>
+      <point x="834" y="748" type="curve" smooth="yes" name="ah01"/>
       <point x="834" y="921"/>
       <point x="809" y="1045"/>
       <point x="760" y="1118" type="curve" smooth="yes"/>
       <point x="711" y="1191"/>
       <point x="629" y="1227"/>
-      <point x="512" y="1227" type="curve" name="sv02" smooth="yes"/>
+      <point x="512" y="1227" type="curve" smooth="yes" name="sv02"/>
       <point x="432" y="1227" type="line" name="sh04"/>
       <point x="432" y="901" type="line" name="sv03"/>
       <point x="643" y="901" type="line"/>
diff --git a/source/Hack-Bold.ufo/glyphs/E_uro.glif b/source/Hack-Bold.ufo/glyphs/E_uro.glif
index 71b43f962..a04dc9524 100644
--- a/source/Hack-Bold.ufo/glyphs/E_uro.glif
+++ b/source/Hack-Bold.ufo/glyphs/E_uro.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Euro" format="1">
+<glyph name="Euro" format="2">
   <advance width="1233"/>
   <unicode hex="20AC"/>
   <outline>
     <contour>
-      <point x="779" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="779" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="623" y="-29"/>
       <point x="496" y="15"/>
       <point x="399" y="102" type="curve" smooth="yes"/>
@@ -16,13 +16,13 @@
       <point x="186" y="670" type="line" name="dv03"/>
       <point x="185" y="679"/>
       <point x="185" y="689"/>
-      <point x="185" y="700" type="curve" name="sh01" smooth="yes"/>
+      <point x="185" y="700" type="curve" smooth="yes" name="sh01"/>
       <point x="185" y="703"/>
       <point x="184" y="705"/>
-      <point x="184" y="745" type="curve" name="dh01" smooth="yes"/>
+      <point x="184" y="745" type="curve" smooth="yes" name="dh01"/>
       <point x="184" y="786"/>
       <point x="185" y="786"/>
-      <point x="185" y="790" type="curve" name="sh02" smooth="yes"/>
+      <point x="185" y="790" type="curve" smooth="yes" name="sh02"/>
       <point x="185" y="801"/>
       <point x="185" y="810"/>
       <point x="186" y="821" type="curve" name="sh03"/>
@@ -34,7 +34,7 @@
       <point x="399" y="1390" type="curve" smooth="yes"/>
       <point x="496" y="1478"/>
       <point x="623" y="1520"/>
-      <point x="778" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="778" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="837" y="1520"/>
       <point x="887" y="1514"/>
       <point x="936" y="1502" type="curve" smooth="yes"/>
@@ -47,7 +47,7 @@
       <point x="933" y="1234" type="curve" smooth="yes"/>
       <point x="886" y="1258"/>
       <point x="837" y="1270"/>
-      <point x="786" y="1270" type="curve" name="sv01" smooth="yes"/>
+      <point x="786" y="1270" type="curve" smooth="yes" name="sv01"/>
       <point x="710" y="1270"/>
       <point x="652" y="1244"/>
       <point x="609" y="1205" type="curve" smooth="yes"/>
@@ -59,13 +59,13 @@
       <point x="484" y="821" type="line"/>
       <point x="483" y="810"/>
       <point x="482" y="799"/>
-      <point x="482" y="787" type="curve" name="sh04" smooth="yes"/>
+      <point x="482" y="787" type="curve" smooth="yes" name="sh04"/>
       <point x="482" y="780"/>
       <point x="481" y="777"/>
-      <point x="481" y="742" type="curve" name="dh02" smooth="yes"/>
+      <point x="481" y="742" type="curve" smooth="yes" name="dh02"/>
       <point x="481" y="707"/>
       <point x="482" y="707"/>
-      <point x="482" y="703" type="curve" name="sh05" smooth="yes"/>
+      <point x="482" y="703" type="curve" smooth="yes" name="sh05"/>
       <point x="482" y="692"/>
       <point x="482" y="681"/>
       <point x="483" y="670" type="curve" name="sh06"/>
@@ -77,7 +77,7 @@
       <point x="604" y="289" type="curve" smooth="yes"/>
       <point x="655" y="242"/>
       <point x="712" y="221"/>
-      <point x="783" y="221" type="curve" name="dv01" smooth="yes"/>
+      <point x="783" y="221" type="curve" smooth="yes" name="dv01"/>
       <point x="836" y="221"/>
       <point x="886" y="233"/>
       <point x="933" y="257" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/F_.glif b/source/Hack-Bold.ufo/glyphs/F_.glif
index 74abbc6a3..d72cc7330 100644
--- a/source/Hack-Bold.ufo/glyphs/F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/F_.glif
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="F" format="1">
+<glyph name="F" format="2">
   <advance width="1233"/>
   <unicode hex="0046"/>
   <outline>
     <contour>
-      <point x="182" y="1493" type="line" name="hr00"/>
+      <point x="182" y="1493" type="line"/>
       <point x="1112" y="1493" type="line"/>
-      <point x="1112" y="1233" type="line" name="sv01"/>
-      <point x="477" y="1233" type="line" name="dh01"/>
+      <point x="1112" y="1233" type="line"/>
+      <point x="477" y="1233" type="line"/>
       <point x="477" y="901" type="line"/>
-      <point x="1055" y="901" type="line" name="dv02"/>
-      <point x="1055" y="641" type="line" name="dv01"/>
-      <point x="477" y="641" type="line" name="sh01"/>
-      <point x="477" y="0" type="line" name="ab01"/>
+      <point x="1055" y="901" type="line"/>
+      <point x="1055" y="641" type="line"/>
+      <point x="477" y="641" type="line"/>
+      <point x="477" y="0" type="line"/>
       <point x="182" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/G_.glif b/source/Hack-Bold.ufo/glyphs/G_.glif
index a689d8910..9bbc10154 100644
--- a/source/Hack-Bold.ufo/glyphs/G_.glif
+++ b/source/Hack-Bold.ufo/glyphs/G_.glif
@@ -1,63 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="G" format="1">
+<glyph name="G" format="2">
   <advance width="1233"/>
   <unicode hex="0047"/>
   <outline>
     <contour>
-      <point x="720" y="-29" type="curve" name="dv01" smooth="yes"/>
-      <point x="529" y="-29"/>
-      <point x="379" y="39"/>
-      <point x="275" y="172" type="curve" smooth="yes"/>
-      <point x="175" y="300"/>
-      <point x="117" y="487"/>
-      <point x="117" y="747" type="curve" name="dh01" smooth="yes"/>
-      <point x="117" y="995"/>
-      <point x="169" y="1188"/>
-      <point x="277" y="1321" type="curve" smooth="yes"/>
-      <point x="384" y="1454"/>
-      <point x="535" y="1520"/>
-      <point x="732" y="1520" type="curve" name="at01" smooth="yes"/>
-      <point x="800" y="1520"/>
-      <point x="855" y="1512"/>
-      <point x="914" y="1495" type="curve" smooth="yes"/>
-      <point x="971" y="1478"/>
-      <point x="1025" y="1454"/>
-      <point x="1077" y="1421" type="curve" name="hr01"/>
-      <point x="1077" y="1094" type="line" name="ih01"/>
-      <point x="1036" y="1147"/>
-      <point x="988" y="1188"/>
-      <point x="935" y="1215" type="curve" smooth="yes"/>
-      <point x="882" y="1242"/>
-      <point x="823" y="1255"/>
-      <point x="759" y="1255" type="curve" name="sv01" smooth="yes"/>
-      <point x="646" y="1255"/>
-      <point x="562" y="1213"/>
-      <point x="507" y="1129" type="curve" smooth="yes"/>
-      <point x="452" y="1044"/>
-      <point x="424" y="916"/>
-      <point x="424" y="747" type="curve" name="dh02" smooth="yes"/>
-      <point x="424" y="580"/>
-      <point x="451" y="453"/>
-      <point x="504" y="365" type="curve" smooth="yes"/>
-      <point x="555" y="282"/>
-      <point x="630" y="236"/>
-      <point x="738" y="236" type="curve" name="dv02" smooth="yes"/>
-      <point x="765" y="236"/>
-      <point x="794" y="238"/>
-      <point x="817" y="245" type="curve"/>
-      <point x="846" y="252"/>
-      <point x="857" y="259"/>
-      <point x="872" y="270" type="curve" name="sh01"/>
+      <point x="713.772" y="-29" type="curve" smooth="yes"/>
+      <point x="262.975" y="-29"/>
+      <point x="117" y="352.08"/>
+      <point x="117" y="749.032" type="curve" smooth="yes"/>
+      <point x="117" y="1152.64"/>
+      <point x="267.912" y="1520"/>
+      <point x="722.038" y="1520" type="curve" smooth="yes"/>
+      <point x="856.464" y="1520"/>
+      <point x="971.722" y="1487.81"/>
+      <point x="1077" y="1421" type="curve"/>
+      <point x="1077" y="1094" type="line"/>
+      <point x="996.518" y="1198.11"/>
+      <point x="891.517" y="1255"/>
+      <point x="760.624" y="1255" type="curve" smooth="yes"/>
+      <point x="470.966" y="1255"/>
+      <point x="424" y="976.405"/>
+      <point x="424" y="751.31" type="curve" smooth="yes"/>
+      <point x="424" y="537.148"/>
+      <point x="466.514" y="236"/>
+      <point x="742.657" y="236" type="curve" smooth="yes"/>
+      <point x="781.641" y="236"/>
+      <point x="836.759" y="242.002"/>
+      <point x="872" y="270" type="curve"/>
       <point x="872" y="555" type="line"/>
-      <point x="670" y="555" type="line" name="dv03"/>
-      <point x="670" y="803" type="line" name="dh03"/>
-      <point x="1130" y="803" type="line" name="dh04"/>
+      <point x="670" y="555" type="line"/>
+      <point x="670" y="803" type="line"/>
+      <point x="1130" y="803" type="line"/>
       <point x="1130" y="119" type="line"/>
-      <point x="1074" y="71"/>
-      <point x="1012" y="34"/>
-      <point x="943" y="9" type="curve" smooth="yes"/>
-      <point x="874" y="-16"/>
-      <point x="804" y="-29"/>
+      <point x="1013.11" y="18.7711"/>
+      <point x="873.38" y="-29"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Bold.ufo/glyphs/G_amma.glif b/source/Hack-Bold.ufo/glyphs/G_amma.glif
index 9a8f78b56..6e7e1ed28 100644
--- a/source/Hack-Bold.ufo/glyphs/G_amma.glif
+++ b/source/Hack-Bold.ufo/glyphs/G_amma.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Gamma" format="1">
+<glyph name="Gamma" format="2">
   <advance width="1233"/>
   <unicode hex="0393"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/G_breve.glif b/source/Hack-Bold.ufo/glyphs/G_breve.glif
index 0d416bbe8..9e752a61e 100644
--- a/source/Hack-Bold.ufo/glyphs/G_breve.glif
+++ b/source/Hack-Bold.ufo/glyphs/G_breve.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Gbreve" format="1">
+<glyph name="Gbreve" format="2">
   <advance width="1233"/>
   <unicode hex="011E"/>
   <outline>
     <contour>
-      <point x="676" y="1588" type="curve" name="dv03" smooth="yes"/>
+      <point x="676" y="1588" type="curve" smooth="yes" name="dv03"/>
       <point x="578" y="1588"/>
       <point x="500" y="1611"/>
       <point x="443" y="1656" type="curve" smooth="yes"/>
@@ -17,10 +17,10 @@
       <point x="551" y="1762" type="curve" smooth="yes"/>
       <point x="584" y="1741"/>
       <point x="625" y="1731"/>
-      <point x="676" y="1731" type="curve" name="dv04" smooth="yes"/>
+      <point x="676" y="1731" type="curve" smooth="yes" name="dv04"/>
       <point x="727" y="1731"/>
       <point x="769" y="1741"/>
-      <point x="801" y="1761" type="curve" name="hr01" smooth="yes"/>
+      <point x="801" y="1761" type="curve" smooth="yes" name="hr01"/>
       <point x="834" y="1782"/>
       <point x="856" y="1812"/>
       <point x="869" y="1852" type="curve" name="sv01"/>
@@ -32,19 +32,19 @@
       <point x="771" y="1588"/>
     </contour>
     <contour>
-      <point x="720" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="720" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="529" y="-29"/>
       <point x="379" y="39"/>
       <point x="275" y="172" type="curve" smooth="yes"/>
       <point x="175" y="300"/>
       <point x="117" y="487"/>
-      <point x="117" y="747" type="curve" name="dh01" smooth="yes"/>
+      <point x="117" y="747" type="curve" smooth="yes" name="dh01"/>
       <point x="117" y="995"/>
       <point x="169" y="1188"/>
       <point x="277" y="1321" type="curve" smooth="yes"/>
       <point x="384" y="1454"/>
       <point x="535" y="1520"/>
-      <point x="732" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="732" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="800" y="1520"/>
       <point x="855" y="1512"/>
       <point x="914" y="1495" type="curve" smooth="yes"/>
@@ -57,19 +57,19 @@
       <point x="935" y="1215" type="curve" smooth="yes"/>
       <point x="882" y="1242"/>
       <point x="823" y="1255"/>
-      <point x="759" y="1255" type="curve" name="sv03" smooth="yes"/>
+      <point x="759" y="1255" type="curve" smooth="yes" name="sv03"/>
       <point x="646" y="1255"/>
       <point x="562" y="1213"/>
       <point x="507" y="1129" type="curve" smooth="yes"/>
       <point x="452" y="1044"/>
       <point x="424" y="916"/>
-      <point x="424" y="747" type="curve" name="dh02" smooth="yes"/>
+      <point x="424" y="747" type="curve" smooth="yes" name="dh02"/>
       <point x="424" y="580"/>
       <point x="451" y="453"/>
       <point x="504" y="365" type="curve" smooth="yes"/>
       <point x="555" y="282"/>
       <point x="628" y="236"/>
-      <point x="739" y="236" type="curve" name="dv02" smooth="yes"/>
+      <point x="739" y="236" type="curve" smooth="yes" name="dv02"/>
       <point x="766" y="236"/>
       <point x="792" y="239"/>
       <point x="817" y="245" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/G_caron.glif b/source/Hack-Bold.ufo/glyphs/G_caron.glif
index be3a8fb3a..2174bb1f7 100644
--- a/source/Hack-Bold.ufo/glyphs/G_caron.glif
+++ b/source/Hack-Bold.ufo/glyphs/G_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Gcaron" format="1">
+<glyph name="Gcaron" format="2">
   <advance width="1233"/>
   <unicode hex="01E6"/>
   <outline>
@@ -13,26 +13,26 @@
       <point x="558" y="1588" type="line"/>
     </contour>
     <contour>
-      <point x="719" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="719" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="338" y="-29"/>
       <point x="117" y="251"/>
-      <point x="117" y="747" type="curve" name="dh01" smooth="yes"/>
+      <point x="117" y="747" type="curve" smooth="yes" name="dh01"/>
       <point x="117" y="1247"/>
       <point x="342" y="1520"/>
-      <point x="727" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="727" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="862" y="1520"/>
       <point x="970" y="1488"/>
       <point x="1077" y="1421" type="curve"/>
       <point x="1077" y="1094" type="line" name="ih03"/>
       <point x="994" y="1201"/>
       <point x="887" y="1255"/>
-      <point x="758" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="758" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="535" y="1255"/>
       <point x="424" y="1086"/>
-      <point x="424" y="747" type="curve" name="dh02" smooth="yes"/>
+      <point x="424" y="747" type="curve" smooth="yes" name="dh02"/>
       <point x="424" y="411"/>
       <point x="528" y="236"/>
-      <point x="743" y="236" type="curve" name="dv02" smooth="yes"/>
+      <point x="743" y="236" type="curve" smooth="yes" name="dv02"/>
       <point x="796" y="236"/>
       <point x="844" y="247"/>
       <point x="872" y="270" type="curve" name="sh01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/G_circumflex.glif b/source/Hack-Bold.ufo/glyphs/G_circumflex.glif
index 7404aad56..04aa485e0 100644
--- a/source/Hack-Bold.ufo/glyphs/G_circumflex.glif
+++ b/source/Hack-Bold.ufo/glyphs/G_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Gcircumflex" format="1">
+<glyph name="Gcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="011C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/G_dotaccent.glif b/source/Hack-Bold.ufo/glyphs/G_dotaccent.glif
index 088d8d18e..0fe3067a0 100644
--- a/source/Hack-Bold.ufo/glyphs/G_dotaccent.glif
+++ b/source/Hack-Bold.ufo/glyphs/G_dotaccent.glif
@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Gdotaccent" format="1">
+<glyph name="Gdotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="0120"/>
   <outline>
     <contour>
-      <point x="580" y="1606" type="line" name="dv03" smooth="yes"/>
+      <point x="580" y="1606" type="line" smooth="yes" name="dv03"/>
       <point x="563" y="1606"/>
       <point x="549" y="1620"/>
-      <point x="549" y="1637" type="curve" name="dh03" smooth="yes"/>
+      <point x="549" y="1637" type="curve" smooth="yes" name="dh03"/>
       <point x="549" y="1821" type="line" smooth="yes"/>
       <point x="549" y="1838"/>
       <point x="563" y="1852"/>
-      <point x="580" y="1852" type="curve" name="dv04" smooth="yes"/>
+      <point x="580" y="1852" type="curve" smooth="yes" name="dv04"/>
       <point x="793" y="1852" type="line" smooth="yes"/>
       <point x="810" y="1852"/>
       <point x="824" y="1838"/>
       <point x="824" y="1821" type="curve" smooth="yes"/>
-      <point x="824" y="1637" type="line" name="hr01" smooth="yes"/>
+      <point x="824" y="1637" type="line" smooth="yes" name="hr01"/>
       <point x="824" y="1620"/>
       <point x="810" y="1606"/>
       <point x="793" y="1606" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="719" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="719" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="338" y="-29"/>
       <point x="117" y="251"/>
-      <point x="117" y="747" type="curve" name="dh01" smooth="yes"/>
+      <point x="117" y="747" type="curve" smooth="yes" name="dh01"/>
       <point x="117" y="1247"/>
       <point x="342" y="1520"/>
-      <point x="727" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="727" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="862" y="1520"/>
       <point x="970" y="1488"/>
       <point x="1077" y="1421" type="curve"/>
       <point x="1077" y="1094" type="line" name="ih02"/>
       <point x="994" y="1201"/>
       <point x="887" y="1255"/>
-      <point x="758" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="758" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="534" y="1255"/>
       <point x="424" y="1091"/>
-      <point x="424" y="748" type="curve" name="dh02" smooth="yes"/>
+      <point x="424" y="748" type="curve" smooth="yes" name="dh02"/>
       <point x="424" y="412"/>
       <point x="529" y="236"/>
-      <point x="741" y="236" type="curve" name="dv02" smooth="yes"/>
+      <point x="741" y="236" type="curve" smooth="yes" name="dv02"/>
       <point x="786" y="236"/>
       <point x="828" y="243"/>
       <point x="853" y="258" type="curve" smooth="yes"/>
       <point x="865" y="265"/>
       <point x="872" y="273"/>
-      <point x="872" y="293" type="curve" name="sh02" smooth="yes"/>
+      <point x="872" y="293" type="curve" smooth="yes" name="sh02"/>
       <point x="872" y="525" type="line" smooth="yes"/>
       <point x="872" y="545"/>
       <point x="862" y="555"/>
diff --git a/source/Hack-Bold.ufo/glyphs/H_.glif b/source/Hack-Bold.ufo/glyphs/H_.glif
index e3ea5ff83..4943f875f 100644
--- a/source/Hack-Bold.ufo/glyphs/H_.glif
+++ b/source/Hack-Bold.ufo/glyphs/H_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="H" format="1">
+<glyph name="H" format="2">
   <advance width="1233"/>
   <unicode hex="0048"/>
   <outline>
     <contour>
-      <point x="137" y="1493" type="line" name="hr00"/>
-      <point x="432" y="1493" type="line" name="sh01"/>
+      <point x="137" y="1493" type="line"/>
+      <point x="432" y="1493" type="line"/>
       <point x="432" y="924" type="line"/>
-      <point x="801" y="924" type="line" name="dv02"/>
-      <point x="801" y="1493" type="line" name="ah01"/>
-      <point x="1096" y="1493" type="line" name="sh02"/>
-      <point x="1096" y="0" type="line" name="ab01"/>
-      <point x="801" y="0" type="line" name="sh03"/>
-      <point x="801" y="664" type="line" name="dv01"/>
-      <point x="432" y="664" type="line" name="sh04"/>
-      <point x="432" y="0" type="line" name="ab02"/>
+      <point x="801" y="924" type="line"/>
+      <point x="801" y="1493" type="line"/>
+      <point x="1096" y="1493" type="line"/>
+      <point x="1096" y="0" type="line"/>
+      <point x="801" y="0" type="line"/>
+      <point x="801" y="664" type="line"/>
+      <point x="432" y="664" type="line"/>
+      <point x="432" y="0" type="line"/>
       <point x="137" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/H_bar.glif b/source/Hack-Bold.ufo/glyphs/H_bar.glif
index 7909b4143..68c237c08 100644
--- a/source/Hack-Bold.ufo/glyphs/H_bar.glif
+++ b/source/Hack-Bold.ufo/glyphs/H_bar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Hbar" format="1">
+<glyph name="Hbar" format="2">
   <advance width="1233"/>
   <unicode hex="0126"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/H_circumflex.glif b/source/Hack-Bold.ufo/glyphs/H_circumflex.glif
index 84a7e384b..27cccf631 100644
--- a/source/Hack-Bold.ufo/glyphs/H_circumflex.glif
+++ b/source/Hack-Bold.ufo/glyphs/H_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Hcircumflex" format="1">
+<glyph name="Hcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0124"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/I_.glif b/source/Hack-Bold.ufo/glyphs/I_.glif
index ab89cacc3..0ca99f2a5 100644
--- a/source/Hack-Bold.ufo/glyphs/I_.glif
+++ b/source/Hack-Bold.ufo/glyphs/I_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="I" format="1">
+<glyph name="I" format="2">
   <advance width="1233"/>
   <unicode hex="0049"/>
   <outline>
     <contour>
-      <point x="172" y="260" type="line" name="hr00"/>
-      <point x="469" y="260" type="line" name="dh01"/>
-      <point x="469" y="1233" type="line" name="sv01"/>
+      <point x="172" y="260" type="line"/>
+      <point x="469" y="260" type="line"/>
+      <point x="469" y="1233" type="line"/>
       <point x="172" y="1233" type="line"/>
-      <point x="172" y="1493" type="line" name="at01"/>
+      <point x="172" y="1493" type="line"/>
       <point x="1061" y="1493" type="line"/>
-      <point x="1061" y="1233" type="line" name="sv02"/>
-      <point x="764" y="1233" type="line" name="sv03"/>
-      <point x="764" y="260" type="line" name="dh02"/>
-      <point x="1061" y="260" type="line" name="sv04"/>
-      <point x="1061" y="0" type="line" name="ab01"/>
+      <point x="1061" y="1233" type="line"/>
+      <point x="764" y="1233" type="line"/>
+      <point x="764" y="260" type="line"/>
+      <point x="1061" y="260" type="line"/>
+      <point x="1061" y="0" type="line"/>
       <point x="172" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/I_J_.glif b/source/Hack-Bold.ufo/glyphs/I_J_.glif
index b6186dfc7..53d0780a3 100644
--- a/source/Hack-Bold.ufo/glyphs/I_J_.glif
+++ b/source/Hack-Bold.ufo/glyphs/I_J_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="IJ" format="1">
+<glyph name="IJ" format="2">
   <advance width="1233"/>
   <unicode hex="0132"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/I_acute.glif b/source/Hack-Bold.ufo/glyphs/I_acute.glif
index 90b08e553..f9b4304fe 100644
--- a/source/Hack-Bold.ufo/glyphs/I_acute.glif
+++ b/source/Hack-Bold.ufo/glyphs/I_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Iacute" format="1">
+<glyph name="Iacute" format="2">
   <advance width="1233"/>
   <unicode hex="00CD"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/I_breve.glif b/source/Hack-Bold.ufo/glyphs/I_breve.glif
index 17ae84d5d..64e8a0bcf 100644
--- a/source/Hack-Bold.ufo/glyphs/I_breve.glif
+++ b/source/Hack-Bold.ufo/glyphs/I_breve.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ibreve" format="1">
+<glyph name="Ibreve" format="2">
   <advance width="1233"/>
   <unicode hex="012C"/>
   <outline>
@@ -18,7 +18,7 @@
       <point x="172" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="616" y="1608" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1608" type="curve" smooth="yes" name="dv03"/>
       <point x="518" y="1608"/>
       <point x="440" y="1631"/>
       <point x="383" y="1676" type="curve" smooth="yes"/>
@@ -31,10 +31,10 @@
       <point x="491" y="1782" type="curve" smooth="yes"/>
       <point x="524" y="1761"/>
       <point x="565" y="1751"/>
-      <point x="616" y="1751" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="1751" type="curve" smooth="yes" name="dv04"/>
       <point x="667" y="1751"/>
       <point x="709" y="1761"/>
-      <point x="741" y="1781" type="curve" name="hr01" smooth="yes"/>
+      <point x="741" y="1781" type="curve" smooth="yes" name="hr01"/>
       <point x="774" y="1802"/>
       <point x="796" y="1832"/>
       <point x="809" y="1872" type="curve" name="sv01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/I_circumflex.glif b/source/Hack-Bold.ufo/glyphs/I_circumflex.glif
index e24468ef7..531baf973 100644
--- a/source/Hack-Bold.ufo/glyphs/I_circumflex.glif
+++ b/source/Hack-Bold.ufo/glyphs/I_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Icircumflex" format="1">
+<glyph name="Icircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00CE"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/I_dieresis.glif b/source/Hack-Bold.ufo/glyphs/I_dieresis.glif
index 1667524f0..6bdb487ba 100644
--- a/source/Hack-Bold.ufo/glyphs/I_dieresis.glif
+++ b/source/Hack-Bold.ufo/glyphs/I_dieresis.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Idieresis" format="1">
+<glyph name="Idieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00CF"/>
   <outline>
     <contour>
-      <point x="331" y="1606" type="line" name="dv01" smooth="yes"/>
+      <point x="331" y="1606" type="line" smooth="yes" name="dv01"/>
       <point x="311" y="1606"/>
       <point x="301" y="1616"/>
-      <point x="301" y="1636" type="curve" name="sh01" smooth="yes"/>
+      <point x="301" y="1636" type="curve" smooth="yes" name="sh01"/>
       <point x="301" y="1822" type="line" smooth="yes"/>
       <point x="301" y="1842"/>
       <point x="311" y="1852"/>
-      <point x="331" y="1852" type="curve" name="dv02" smooth="yes"/>
+      <point x="331" y="1852" type="curve" smooth="yes" name="dv02"/>
       <point x="507" y="1852" type="line" smooth="yes"/>
       <point x="527" y="1852"/>
       <point x="537" y="1842"/>
       <point x="537" y="1822" type="curve" smooth="yes"/>
-      <point x="537" y="1636" type="line" name="sh02" smooth="yes"/>
+      <point x="537" y="1636" type="line" smooth="yes" name="sh02"/>
       <point x="537" y="1616"/>
       <point x="527" y="1606"/>
       <point x="507" y="1606" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1606" type="line" name="sv01" smooth="yes"/>
+      <point x="726" y="1606" type="line" smooth="yes" name="sv01"/>
       <point x="706" y="1606"/>
       <point x="696" y="1616"/>
-      <point x="696" y="1636" type="curve" name="sh04" smooth="yes"/>
+      <point x="696" y="1636" type="curve" smooth="yes" name="sh04"/>
       <point x="696" y="1822" type="line" smooth="yes"/>
       <point x="696" y="1842"/>
       <point x="706" y="1852"/>
-      <point x="726" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="726" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="902" y="1852" type="line" smooth="yes"/>
       <point x="922" y="1852"/>
       <point x="932" y="1842"/>
-      <point x="932" y="1822" type="curve" name="hr01" smooth="yes"/>
-      <point x="932" y="1636" type="line" name="sh05" smooth="yes"/>
+      <point x="932" y="1822" type="curve" smooth="yes" name="hr01"/>
+      <point x="932" y="1636" type="line" smooth="yes" name="sh05"/>
       <point x="932" y="1616"/>
       <point x="922" y="1606"/>
       <point x="902" y="1606" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/I_dotaccent.glif b/source/Hack-Bold.ufo/glyphs/I_dotaccent.glif
index b0c06c022..12c8e20be 100644
--- a/source/Hack-Bold.ufo/glyphs/I_dotaccent.glif
+++ b/source/Hack-Bold.ufo/glyphs/I_dotaccent.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Idotaccent" format="1">
+<glyph name="Idotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="0130"/>
   <outline>
     <contour>
-      <point x="509" y="1606" type="line" name="hr00" smooth="yes"/>
+      <point x="509" y="1606" type="line" smooth="yes" name="hr00"/>
       <point x="489" y="1606"/>
       <point x="479" y="1616"/>
-      <point x="479" y="1636" type="curve" name="sh01" smooth="yes"/>
+      <point x="479" y="1636" type="curve" smooth="yes" name="sh01"/>
       <point x="479" y="1822" type="line" smooth="yes"/>
       <point x="479" y="1842"/>
       <point x="489" y="1852"/>
-      <point x="509" y="1852" type="curve" name="dv01" smooth="yes"/>
+      <point x="509" y="1852" type="curve" smooth="yes" name="dv01"/>
       <point x="724" y="1852" type="line" smooth="yes"/>
       <point x="744" y="1852"/>
       <point x="754" y="1842"/>
-      <point x="754" y="1822" type="curve" name="sh02" smooth="yes"/>
+      <point x="754" y="1822" type="curve" smooth="yes" name="sh02"/>
       <point x="754" y="1636" type="line" smooth="yes"/>
       <point x="754" y="1616"/>
       <point x="744" y="1606"/>
diff --git a/source/Hack-Bold.ufo/glyphs/I_grave.glif b/source/Hack-Bold.ufo/glyphs/I_grave.glif
index 262bdefd3..68a7275ff 100644
--- a/source/Hack-Bold.ufo/glyphs/I_grave.glif
+++ b/source/Hack-Bold.ufo/glyphs/I_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Igrave" format="1">
+<glyph name="Igrave" format="2">
   <advance width="1233"/>
   <unicode hex="00CC"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/I_macron.glif b/source/Hack-Bold.ufo/glyphs/I_macron.glif
index cb0f84dd2..0e0ae737f 100644
--- a/source/Hack-Bold.ufo/glyphs/I_macron.glif
+++ b/source/Hack-Bold.ufo/glyphs/I_macron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Imacron" format="1">
+<glyph name="Imacron" format="2">
   <advance width="1233"/>
   <unicode hex="012A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/I_ogonek.glif b/source/Hack-Bold.ufo/glyphs/I_ogonek.glif
index 4c1497c4c..81a2e6600 100644
--- a/source/Hack-Bold.ufo/glyphs/I_ogonek.glif
+++ b/source/Hack-Bold.ufo/glyphs/I_ogonek.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Iogonek" format="1">
+<glyph name="Iogonek" format="2">
   <advance width="1233"/>
   <unicode hex="012E"/>
   <outline>
@@ -14,20 +14,20 @@
       <point x="693" y="-106" type="curve" smooth="yes"/>
       <point x="680" y="-130"/>
       <point x="674" y="-147"/>
-      <point x="674" y="-166" type="curve" name="sh01" smooth="yes"/>
+      <point x="674" y="-166" type="curve" smooth="yes" name="sh01"/>
       <point x="674" y="-213"/>
       <point x="709" y="-254"/>
-      <point x="792" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="792" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="833" y="-254"/>
       <point x="887" y="-244"/>
       <point x="940" y="-223" type="curve" name="sh02"/>
       <point x="940" y="-379" type="line" name="hr01"/>
       <point x="868" y="-394"/>
       <point x="804" y="-401"/>
-      <point x="753" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="753" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="597" y="-401"/>
       <point x="512" y="-339"/>
-      <point x="512" y="-224" type="curve" name="ih01" smooth="yes"/>
+      <point x="512" y="-224" type="curve" smooth="yes" name="ih01"/>
       <point x="512" y="-151"/>
       <point x="547" y="-81"/>
       <point x="623" y="0" type="curve" name="ih02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/I_ota.glif b/source/Hack-Bold.ufo/glyphs/I_ota.glif
index 097bbf391..2f45bb397 100644
--- a/source/Hack-Bold.ufo/glyphs/I_ota.glif
+++ b/source/Hack-Bold.ufo/glyphs/I_ota.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Iota" format="1">
+<glyph name="Iota" format="2">
   <advance width="1233"/>
   <unicode hex="0399"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/I_otadieresis.glif b/source/Hack-Bold.ufo/glyphs/I_otadieresis.glif
index 6a6e22a14..4786bd14b 100644
--- a/source/Hack-Bold.ufo/glyphs/I_otadieresis.glif
+++ b/source/Hack-Bold.ufo/glyphs/I_otadieresis.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Iotadieresis" format="1">
+<glyph name="Iotadieresis" format="2">
   <advance width="1233"/>
   <unicode hex="03AA"/>
   <outline>
     <contour>
-      <point x="331" y="1606" type="line" name="dv01" smooth="yes"/>
+      <point x="331" y="1606" type="line" smooth="yes" name="dv01"/>
       <point x="311" y="1606"/>
       <point x="301" y="1616"/>
-      <point x="301" y="1636" type="curve" name="sh01" smooth="yes"/>
+      <point x="301" y="1636" type="curve" smooth="yes" name="sh01"/>
       <point x="301" y="1822" type="line" smooth="yes"/>
       <point x="301" y="1842"/>
       <point x="311" y="1852"/>
-      <point x="331" y="1852" type="curve" name="dv02" smooth="yes"/>
+      <point x="331" y="1852" type="curve" smooth="yes" name="dv02"/>
       <point x="507" y="1852" type="line" smooth="yes"/>
       <point x="527" y="1852"/>
       <point x="537" y="1842"/>
       <point x="537" y="1822" type="curve" smooth="yes"/>
-      <point x="537" y="1636" type="line" name="sh02" smooth="yes"/>
+      <point x="537" y="1636" type="line" smooth="yes" name="sh02"/>
       <point x="537" y="1616"/>
       <point x="527" y="1606"/>
       <point x="507" y="1606" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1606" type="line" name="sv01" smooth="yes"/>
+      <point x="726" y="1606" type="line" smooth="yes" name="sv01"/>
       <point x="706" y="1606"/>
       <point x="696" y="1616"/>
-      <point x="696" y="1636" type="curve" name="sh04" smooth="yes"/>
+      <point x="696" y="1636" type="curve" smooth="yes" name="sh04"/>
       <point x="696" y="1822" type="line" smooth="yes"/>
       <point x="696" y="1842"/>
       <point x="706" y="1852"/>
-      <point x="726" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="726" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="902" y="1852" type="line" smooth="yes"/>
       <point x="922" y="1852"/>
       <point x="932" y="1842"/>
-      <point x="932" y="1822" type="curve" name="hr01" smooth="yes"/>
-      <point x="932" y="1636" type="line" name="sh05" smooth="yes"/>
+      <point x="932" y="1822" type="curve" smooth="yes" name="hr01"/>
+      <point x="932" y="1636" type="line" smooth="yes" name="sh05"/>
       <point x="932" y="1616"/>
       <point x="922" y="1606"/>
       <point x="902" y="1606" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/I_otatonos.glif b/source/Hack-Bold.ufo/glyphs/I_otatonos.glif
index 8916f6143..d164b4502 100644
--- a/source/Hack-Bold.ufo/glyphs/I_otatonos.glif
+++ b/source/Hack-Bold.ufo/glyphs/I_otatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Iotatonos" format="1">
+<glyph name="Iotatonos" format="2">
   <advance width="1233"/>
   <unicode hex="038A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/I_tilde.glif b/source/Hack-Bold.ufo/glyphs/I_tilde.glif
index 9884c0624..eaee4a5ea 100644
--- a/source/Hack-Bold.ufo/glyphs/I_tilde.glif
+++ b/source/Hack-Bold.ufo/glyphs/I_tilde.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Itilde" format="1">
+<glyph name="Itilde" format="2">
   <advance width="1233"/>
   <unicode hex="0128"/>
   <outline>
     <contour>
-      <point x="268" y="1618" type="line" name="hr00" smooth="yes"/>
+      <point x="268" y="1618" type="line" smooth="yes" name="hr00"/>
       <point x="268" y="1759"/>
       <point x="349" y="1854"/>
-      <point x="463" y="1854" type="curve" name="dv02" smooth="yes"/>
+      <point x="463" y="1854" type="curve" smooth="yes" name="dv02"/>
       <point x="514" y="1854"/>
       <point x="566" y="1836"/>
       <point x="614" y="1805" type="curve" smooth="yes"/>
       <point x="674" y="1766" type="line" smooth="yes"/>
       <point x="701" y="1749"/>
       <point x="724" y="1737"/>
-      <point x="751" y="1737" type="curve" name="dv04" smooth="yes"/>
+      <point x="751" y="1737" type="curve" smooth="yes" name="dv04"/>
       <point x="798" y="1737"/>
       <point x="825" y="1778"/>
       <point x="825" y="1854" type="curve" name="sv01"/>
@@ -24,7 +24,7 @@
       <point x="963" y="1826" type="curve" smooth="yes"/>
       <point x="963" y="1682"/>
       <point x="887" y="1588"/>
-      <point x="765" y="1588" type="curve" name="dv03" smooth="yes"/>
+      <point x="765" y="1588" type="curve" smooth="yes" name="dv03"/>
       <point x="718" y="1588"/>
       <point x="675" y="1601"/>
       <point x="618" y="1637" type="curve" smooth="yes"/>
@@ -32,7 +32,7 @@
       <point x="552" y="1678" type="line" smooth="yes"/>
       <point x="525" y="1693"/>
       <point x="503" y="1704"/>
-      <point x="480" y="1704" type="curve" name="dv01" smooth="yes"/>
+      <point x="480" y="1704" type="curve" smooth="yes" name="dv01"/>
       <point x="437" y="1704"/>
       <point x="408" y="1662"/>
       <point x="408" y="1594" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/J_.glif b/source/Hack-Bold.ufo/glyphs/J_.glif
index 60edab2e0..f7580f2f5 100644
--- a/source/Hack-Bold.ufo/glyphs/J_.glif
+++ b/source/Hack-Bold.ufo/glyphs/J_.glif
@@ -1,36 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="J" format="1">
+<glyph name="J" format="2">
   <advance width="1233"/>
   <unicode hex="004A"/>
   <outline>
     <contour>
-      <point x="524" y="-29" type="curve" name="hr00" smooth="yes"/>
-      <point x="447" y="-29"/>
-      <point x="387" y="-20"/>
-      <point x="318" y="-3" type="curve" smooth="yes"/>
-      <point x="250" y="14"/>
-      <point x="184" y="38"/>
+      <point x="544.006" y="-29" type="curve" smooth="yes"/>
+      <point x="402.995" y="-29"/>
+      <point x="246.142" y="8.13948"/>
       <point x="109" y="74" type="curve"/>
       <point x="109" y="416" type="line"/>
-      <point x="166" y="356"/>
-      <point x="228" y="313"/>
-      <point x="293" y="282" type="curve" smooth="yes"/>
-      <point x="357" y="251"/>
-      <point x="423" y="236"/>
-      <point x="490" y="236" type="curve" name="dv01" smooth="yes"/>
-      <point x="643" y="236"/>
-      <point x="713" y="310"/>
-      <point x="713" y="479" type="curve" name="dh01" smooth="yes"/>
-      <point x="713" y="1233" type="line" name="sv01"/>
+      <point x="217.997" y="301.269"/>
+      <point x="357.706" y="236"/>
+      <point x="495.532" y="236" type="curve" smooth="yes"/>
+      <point x="644.434" y="236"/>
+      <point x="713" y="312.181"/>
+      <point x="713" y="479" type="curve" smooth="yes"/>
+      <point x="713" y="1233" type="line"/>
       <point x="352" y="1233" type="line"/>
-      <point x="352" y="1493" type="line" name="at01"/>
+      <point x="352" y="1493" type="line"/>
       <point x="1008" y="1493" type="line"/>
-      <point x="1008" y="479" type="line" name="dh02" smooth="yes"/>
-      <point x="1008" y="297"/>
-      <point x="970" y="167"/>
-      <point x="894" y="89" type="curve" smooth="yes"/>
-      <point x="817" y="9"/>
-      <point x="685" y="-29"/>
+      <point x="1008" y="479" type="line" smooth="yes"/>
+      <point x="1008" y="123.046"/>
+      <point x="869.125" y="-29"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Bold.ufo/glyphs/J_circumflex.glif b/source/Hack-Bold.ufo/glyphs/J_circumflex.glif
index 8923aaff1..0356a1fe0 100644
--- a/source/Hack-Bold.ufo/glyphs/J_circumflex.glif
+++ b/source/Hack-Bold.ufo/glyphs/J_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Jcircumflex" format="1">
+<glyph name="Jcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0134"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/K_.glif b/source/Hack-Bold.ufo/glyphs/K_.glif
index 6a9dfc284..14fa9bf4a 100644
--- a/source/Hack-Bold.ufo/glyphs/K_.glif
+++ b/source/Hack-Bold.ufo/glyphs/K_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="K" format="1">
+<glyph name="K" format="2">
   <advance width="1233"/>
   <unicode hex="004B"/>
   <outline>
     <contour>
-      <point x="117" y="1493" type="line" name="hr00"/>
-      <point x="412" y="1493" type="line" name="dh01"/>
-      <point x="412" y="903" type="line" name="iv01"/>
-      <point x="874" y="1493" type="line" name="at01"/>
+      <point x="117" y="1493" type="line"/>
+      <point x="412" y="1493" type="line"/>
+      <point x="412" y="903" type="line"/>
+      <point x="874" y="1493" type="line"/>
       <point x="1208" y="1493" type="line"/>
       <point x="737" y="905" type="line"/>
-      <point x="1225" y="0" type="line" name="ab01"/>
+      <point x="1225" y="0" type="line"/>
       <point x="897" y="0" type="line"/>
-      <point x="543" y="672" type="line" name="iv02"/>
-      <point x="412" y="506" type="line" name="sh01"/>
-      <point x="412" y="0" type="line" name="ab02"/>
+      <point x="543" y="672" type="line"/>
+      <point x="412" y="506" type="line"/>
+      <point x="412" y="0" type="line"/>
       <point x="117" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/K_appa.glif b/source/Hack-Bold.ufo/glyphs/K_appa.glif
index efc0c4867..c3d306d68 100644
--- a/source/Hack-Bold.ufo/glyphs/K_appa.glif
+++ b/source/Hack-Bold.ufo/glyphs/K_appa.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Kappa" format="1">
+<glyph name="Kappa" format="2">
   <advance width="1233"/>
   <unicode hex="039A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/L_.glif b/source/Hack-Bold.ufo/glyphs/L_.glif
index 70bca4427..4607d6273 100644
--- a/source/Hack-Bold.ufo/glyphs/L_.glif
+++ b/source/Hack-Bold.ufo/glyphs/L_.glif
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="L" format="1">
+<glyph name="L" format="2">
   <advance width="1233"/>
   <unicode hex="004C"/>
   <outline>
     <contour>
-      <point x="225" y="1493" type="line" name="hr00"/>
-      <point x="520" y="1493" type="line" name="dh01"/>
-      <point x="520" y="260" type="line" name="sv01"/>
+      <point x="225" y="1493" type="line"/>
+      <point x="520" y="1493" type="line"/>
+      <point x="520" y="260" type="line"/>
       <point x="1151" y="260" type="line"/>
-      <point x="1151" y="0" type="line" name="ab01"/>
+      <point x="1151" y="0" type="line"/>
       <point x="225" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/L_acute.glif b/source/Hack-Bold.ufo/glyphs/L_acute.glif
index 85b8f9aba..4c8bfcf98 100644
--- a/source/Hack-Bold.ufo/glyphs/L_acute.glif
+++ b/source/Hack-Bold.ufo/glyphs/L_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Lacute" format="1">
+<glyph name="Lacute" format="2">
   <advance width="1233"/>
   <unicode hex="0139"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/L_ambda.glif b/source/Hack-Bold.ufo/glyphs/L_ambda.glif
index 9aa3f6330..228f25839 100644
--- a/source/Hack-Bold.ufo/glyphs/L_ambda.glif
+++ b/source/Hack-Bold.ufo/glyphs/L_ambda.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Lambda" format="1">
+<glyph name="Lambda" format="2">
   <advance width="1233"/>
   <unicode hex="039B"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/L_caron.glif b/source/Hack-Bold.ufo/glyphs/L_caron.glif
index 1aa30b186..aac76cce8 100644
--- a/source/Hack-Bold.ufo/glyphs/L_caron.glif
+++ b/source/Hack-Bold.ufo/glyphs/L_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Lcaron" format="1">
+<glyph name="Lcaron" format="2">
   <advance width="1233"/>
   <unicode hex="013D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/L_dot.glif b/source/Hack-Bold.ufo/glyphs/L_dot.glif
index 03d2d3239..c524d8f57 100644
--- a/source/Hack-Bold.ufo/glyphs/L_dot.glif
+++ b/source/Hack-Bold.ufo/glyphs/L_dot.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ldot" format="1">
+<glyph name="Ldot" format="2">
   <advance width="1233"/>
   <unicode hex="013F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/L_slash.glif b/source/Hack-Bold.ufo/glyphs/L_slash.glif
index f7c82ee72..537391515 100644
--- a/source/Hack-Bold.ufo/glyphs/L_slash.glif
+++ b/source/Hack-Bold.ufo/glyphs/L_slash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Lslash" format="1">
+<glyph name="Lslash" format="2">
   <advance width="1233"/>
   <unicode hex="0141"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/M_.glif b/source/Hack-Bold.ufo/glyphs/M_.glif
index c62a36872..91c1179bb 100644
--- a/source/Hack-Bold.ufo/glyphs/M_.glif
+++ b/source/Hack-Bold.ufo/glyphs/M_.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="M" format="1">
+<glyph name="M" format="2">
   <advance width="1233"/>
   <unicode hex="004D"/>
   <outline>
     <contour>
-      <point x="86" y="1493" type="line" name="hr00"/>
+      <point x="86" y="1493" type="line"/>
       <point x="438" y="1493" type="line"/>
-      <point x="616" y="838" type="line" name="ih01"/>
-      <point x="793" y="1493" type="line" name="at01"/>
+      <point x="616" y="838" type="line"/>
+      <point x="793" y="1493" type="line"/>
       <point x="1147" y="1493" type="line"/>
-      <point x="1147" y="0" type="line" name="sh01"/>
-      <point x="893" y="0" type="line" name="ah01"/>
-      <point x="893" y="1196" type="line" name="iv01"/>
+      <point x="1147" y="0" type="line"/>
+      <point x="893" y="0" type="line"/>
+      <point x="893" y="1196" type="line"/>
       <point x="735" y="543" type="line"/>
       <point x="500" y="543" type="line"/>
-      <point x="340" y="1196" type="line" name="sh02"/>
-      <point x="340" y="0" type="line" name="ab01"/>
+      <point x="340" y="1196" type="line"/>
+      <point x="340" y="0" type="line"/>
       <point x="86" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/M_u.glif b/source/Hack-Bold.ufo/glyphs/M_u.glif
index b05ea6390..1920028c1 100644
--- a/source/Hack-Bold.ufo/glyphs/M_u.glif
+++ b/source/Hack-Bold.ufo/glyphs/M_u.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Mu" format="1">
+<glyph name="Mu" format="2">
   <advance width="1233"/>
   <unicode hex="039C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/N_.glif b/source/Hack-Bold.ufo/glyphs/N_.glif
index c2d9215de..09b413b3b 100644
--- a/source/Hack-Bold.ufo/glyphs/N_.glif
+++ b/source/Hack-Bold.ufo/glyphs/N_.glif
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="N" format="1">
+<glyph name="N" format="2">
   <advance width="1233"/>
   <unicode hex="004E"/>
   <outline>
     <contour>
-      <point x="119" y="1493" type="line" name="hr00"/>
+      <point x="119" y="1493" type="line"/>
       <point x="436" y="1493" type="line"/>
-      <point x="852" y="408" type="line" name="ah01"/>
-      <point x="852" y="1493" type="line" name="at01"/>
+      <point x="852" y="408" type="line"/>
+      <point x="852" y="1493" type="line"/>
       <point x="1112" y="1493" type="line"/>
-      <point x="1112" y="0" type="line" name="sh01"/>
+      <point x="1112" y="0" type="line"/>
       <point x="797" y="0" type="line"/>
-      <point x="379" y="1085" type="line" name="sh02"/>
-      <point x="379" y="0" type="line" name="ab01"/>
+      <point x="379" y="1085" type="line"/>
+      <point x="379" y="0" type="line"/>
       <point x="119" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/N_U_L_L_.glif b/source/Hack-Bold.ufo/glyphs/N_U_L_L_.glif
index fa0b87887..79a4001e6 100644
--- a/source/Hack-Bold.ufo/glyphs/N_U_L_L_.glif
+++ b/source/Hack-Bold.ufo/glyphs/N_U_L_L_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="NULL" format="1">
-  <advance width="0"/>
+<glyph name="NULL" format="2">
   <unicode hex="0000"/>
   <outline>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/N_acute.glif b/source/Hack-Bold.ufo/glyphs/N_acute.glif
index 6ad646837..e810dd6e1 100644
--- a/source/Hack-Bold.ufo/glyphs/N_acute.glif
+++ b/source/Hack-Bold.ufo/glyphs/N_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Nacute" format="1">
+<glyph name="Nacute" format="2">
   <advance width="1233"/>
   <unicode hex="0143"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/N_caron.glif b/source/Hack-Bold.ufo/glyphs/N_caron.glif
index 2288fe3f2..d4b182a23 100644
--- a/source/Hack-Bold.ufo/glyphs/N_caron.glif
+++ b/source/Hack-Bold.ufo/glyphs/N_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ncaron" format="1">
+<glyph name="Ncaron" format="2">
   <advance width="1233"/>
   <unicode hex="0147"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/N_tilde.glif b/source/Hack-Bold.ufo/glyphs/N_tilde.glif
index c7f7fde84..50a3aedda 100644
--- a/source/Hack-Bold.ufo/glyphs/N_tilde.glif
+++ b/source/Hack-Bold.ufo/glyphs/N_tilde.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ntilde" format="1">
+<glyph name="Ntilde" format="2">
   <advance width="1233"/>
   <unicode hex="00D1"/>
   <outline>
     <contour>
-      <point x="268" y="1618" type="line" name="hr00" smooth="yes"/>
+      <point x="268" y="1618" type="line" smooth="yes" name="hr00"/>
       <point x="268" y="1691"/>
       <point x="289" y="1750"/>
       <point x="322" y="1789" type="curve" smooth="yes"/>
       <point x="359" y="1833"/>
       <point x="411" y="1854"/>
-      <point x="466" y="1854" type="curve" name="sv01" smooth="yes"/>
+      <point x="466" y="1854" type="curve" smooth="yes" name="sv01"/>
       <point x="491" y="1854"/>
       <point x="515" y="1850"/>
       <point x="539" y="1842" type="curve" smooth="yes"/>
@@ -42,7 +42,7 @@
       <point x="910" y="1653" type="curve" smooth="yes"/>
       <point x="871" y="1606"/>
       <point x="823" y="1588"/>
-      <point x="768" y="1588" type="curve" name="dv01" smooth="yes"/>
+      <point x="768" y="1588" type="curve" smooth="yes" name="dv01"/>
       <point x="744" y="1588"/>
       <point x="720" y="1592"/>
       <point x="696" y="1599" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/N_u.glif b/source/Hack-Bold.ufo/glyphs/N_u.glif
index 467fa8d0b..ede62aa9f 100644
--- a/source/Hack-Bold.ufo/glyphs/N_u.glif
+++ b/source/Hack-Bold.ufo/glyphs/N_u.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Nu" format="1">
+<glyph name="Nu" format="2">
   <advance width="1233"/>
   <unicode hex="039D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/O_.glif b/source/Hack-Bold.ufo/glyphs/O_.glif
index 529289e5e..4b8f3b6f8 100644
--- a/source/Hack-Bold.ufo/glyphs/O_.glif
+++ b/source/Hack-Bold.ufo/glyphs/O_.glif
@@ -1,59 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="O" format="1">
+<glyph name="O" format="2">
   <advance width="1233"/>
   <unicode hex="004F"/>
   <outline>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr00" smooth="yes"/>
-      <point x="436" y="-29"/>
-      <point x="309" y="41"/>
-      <point x="225" y="166" type="curve" smooth="yes"/>
-      <point x="136" y="297"/>
-      <point x="92" y="490"/>
-      <point x="92" y="745" type="curve" name="sh01" smooth="yes"/>
-      <point x="92" y="1000"/>
-      <point x="136" y="1192"/>
-      <point x="225" y="1325" type="curve" smooth="yes"/>
-      <point x="317" y="1461"/>
-      <point x="453" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
-      <point x="791" y="1520"/>
-      <point x="921" y="1453"/>
-      <point x="1009" y="1324" type="curve" smooth="yes"/>
-      <point x="1097" y="1193"/>
-      <point x="1141" y="1000"/>
-      <point x="1141" y="745" type="curve" name="sh02" smooth="yes"/>
-      <point x="1141" y="490"/>
-      <point x="1097" y="298"/>
-      <point x="1009" y="167" type="curve" smooth="yes"/>
-      <point x="924" y="40"/>
-      <point x="795" y="-29"/>
+      <point x="629.017" y="-29" type="curve" smooth="yes"/>
+      <point x="289.744" y="-29"/>
+      <point x="92" y="261.249"/>
+      <point x="92" y="758.999" type="curve" smooth="yes"/>
+      <point x="92" y="1246.23"/>
+      <point x="281.474" y="1520"/>
+      <point x="618.581" y="1520" type="curve" smooth="yes"/>
+      <point x="956.215" y="1520"/>
+      <point x="1141" y="1245.37"/>
+      <point x="1141" y="743.576" type="curve" smooth="yes"/>
+      <point x="1141" y="245.589"/>
+      <point x="959.011" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="236" type="curve" name="dv01" smooth="yes"/>
-      <point x="692" y="236"/>
-      <point x="747" y="276"/>
-      <point x="782" y="357" type="curve" smooth="yes"/>
-      <point x="817" y="436"/>
-      <point x="834" y="566"/>
-      <point x="834" y="746" type="curve" name="ah01" smooth="yes"/>
-      <point x="834" y="925"/>
-      <point x="817" y="1055"/>
-      <point x="782" y="1134" type="curve" smooth="yes"/>
-      <point x="747" y="1215"/>
-      <point x="692" y="1255"/>
-      <point x="616" y="1255" type="curve" name="sv01" smooth="yes"/>
-      <point x="537" y="1255"/>
-      <point x="486" y="1214"/>
-      <point x="451" y="1134" type="curve" smooth="yes"/>
-      <point x="416" y="1055"/>
-      <point x="399" y="925"/>
-      <point x="399" y="746" type="curve" name="sh03" smooth="yes"/>
-      <point x="399" y="566"/>
-      <point x="416" y="436"/>
-      <point x="451" y="357" type="curve" smooth="yes"/>
-      <point x="486" y="276"/>
-      <point x="541" y="236"/>
+      <point x="619.951" y="236" type="curve" smooth="yes"/>
+      <point x="759.542" y="236"/>
+      <point x="834.091" y="405.385"/>
+      <point x="834.091" y="724.752" type="curve" smooth="yes"/>
+      <point x="834.091" y="743.074" type="line" smooth="yes"/>
+      <point x="834.091" y="762.158" type="line" smooth="yes"/>
+      <point x="834.091" y="1086.59"/>
+      <point x="757.906" y="1255"/>
+      <point x="611.122" y="1255" type="curve" smooth="yes"/>
+      <point x="398.727" y="1255"/>
+      <point x="398.996" y="902.378"/>
+      <point x="398.996" y="745.169" type="curve" smooth="yes"/>
+      <point x="398.996" y="732.002" type="line" smooth="yes"/>
+      <point x="398.996" y="412.714"/>
+      <point x="477.373" y="236"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Bold.ufo/glyphs/O_E_.glif b/source/Hack-Bold.ufo/glyphs/O_E_.glif
index fc72803f2..3ff85409a 100644
--- a/source/Hack-Bold.ufo/glyphs/O_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/O_E_.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="OE" format="1">
+<glyph name="OE" format="2">
   <advance width="1233"/>
   <unicode hex="0152"/>
   <outline>
     <contour>
-      <point x="633" y="0" type="line" name="hr00" smooth="yes"/>
+      <point x="633" y="0" type="line" smooth="yes" name="hr00"/>
       <point x="417" y="0"/>
       <point x="269" y="52"/>
       <point x="189" y="156" type="curve" smooth="yes"/>
       <point x="106" y="263"/>
       <point x="68" y="456"/>
-      <point x="68" y="745" type="curve" name="sh01" smooth="yes"/>
+      <point x="68" y="745" type="curve" smooth="yes" name="sh01"/>
       <point x="68" y="1036"/>
       <point x="108" y="1234"/>
       <point x="189" y="1337" type="curve" smooth="yes"/>
       <point x="272" y="1444"/>
       <point x="422" y="1493"/>
-      <point x="633" y="1493" type="curve" name="sh02" smooth="yes"/>
+      <point x="633" y="1493" type="curve" smooth="yes" name="sh02"/>
       <point x="1206" y="1493" type="line"/>
       <point x="1206" y="1233" type="line" name="sv01"/>
       <point x="874" y="1233" type="line" name="sh04"/>
@@ -31,19 +31,19 @@
     <contour>
       <point x="621" y="260" type="line" name="ah01"/>
       <point x="621" y="1233" type="line" name="sv02"/>
-      <point x="569" y="1233" type="line" name="sv03" smooth="yes"/>
+      <point x="569" y="1233" type="line" smooth="yes" name="sv03"/>
       <point x="485" y="1233"/>
       <point x="428" y="1200"/>
       <point x="400" y="1144" type="curve" smooth="yes"/>
       <point x="369" y="1084"/>
       <point x="354" y="962"/>
-      <point x="354" y="745" type="curve" name="sh05" smooth="yes"/>
+      <point x="354" y="745" type="curve" smooth="yes" name="sh05"/>
       <point x="354" y="527"/>
       <point x="370" y="406"/>
       <point x="400" y="347" type="curve" smooth="yes"/>
       <point x="431" y="286"/>
       <point x="490" y="260"/>
-      <point x="569" y="260" type="curve" name="sv04" smooth="yes"/>
+      <point x="569" y="260" type="curve" smooth="yes" name="sv04"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Bold.ufo/glyphs/O_acute.glif b/source/Hack-Bold.ufo/glyphs/O_acute.glif
index f203d5b7c..ab0ddf1e0 100644
--- a/source/Hack-Bold.ufo/glyphs/O_acute.glif
+++ b/source/Hack-Bold.ufo/glyphs/O_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Oacute" format="1">
+<glyph name="Oacute" format="2">
   <advance width="1233"/>
   <unicode hex="00D3"/>
   <outline>
@@ -10,25 +10,25 @@
       <point x="469" y="1588" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="436" y="-29"/>
       <point x="309" y="41"/>
       <point x="225" y="166" type="curve" smooth="yes"/>
       <point x="136" y="297"/>
       <point x="92" y="490"/>
-      <point x="92" y="745" type="curve" name="sh02" smooth="yes"/>
+      <point x="92" y="745" type="curve" smooth="yes" name="sh02"/>
       <point x="92" y="1000"/>
       <point x="136" y="1192"/>
       <point x="225" y="1325" type="curve" smooth="yes"/>
       <point x="317" y="1461"/>
       <point x="453" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="791" y="1520"/>
       <point x="921" y="1453"/>
       <point x="1009" y="1324" type="curve" smooth="yes"/>
       <point x="1097" y="1193"/>
       <point x="1141" y="1000"/>
-      <point x="1141" y="745" type="curve" name="sh01" smooth="yes"/>
+      <point x="1141" y="745" type="curve" smooth="yes" name="sh01"/>
       <point x="1141" y="490"/>
       <point x="1097" y="298"/>
       <point x="1009" y="167" type="curve" smooth="yes"/>
@@ -36,13 +36,13 @@
       <point x="795" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="236" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="236" type="curve" smooth="yes" name="dv02"/>
       <point x="692" y="236"/>
       <point x="747" y="276"/>
       <point x="782" y="357" type="curve" smooth="yes"/>
       <point x="817" y="436"/>
       <point x="834" y="566"/>
-      <point x="834" y="746" type="curve" name="ah01" smooth="yes"/>
+      <point x="834" y="746" type="curve" smooth="yes" name="ah01"/>
       <point x="834" y="925"/>
       <point x="817" y="1055"/>
       <point x="782" y="1134" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/O_breve.glif b/source/Hack-Bold.ufo/glyphs/O_breve.glif
index 23a1acf84..da691a106 100644
--- a/source/Hack-Bold.ufo/glyphs/O_breve.glif
+++ b/source/Hack-Bold.ufo/glyphs/O_breve.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Obreve" format="1">
+<glyph name="Obreve" format="2">
   <advance width="1233"/>
   <unicode hex="014E"/>
   <outline>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="436" y="-29"/>
       <point x="309" y="41"/>
       <point x="225" y="166" type="curve" smooth="yes"/>
       <point x="136" y="297"/>
       <point x="92" y="490"/>
-      <point x="92" y="745" type="curve" name="sh01" smooth="yes"/>
+      <point x="92" y="745" type="curve" smooth="yes" name="sh01"/>
       <point x="92" y="1000"/>
       <point x="136" y="1192"/>
       <point x="225" y="1325" type="curve" smooth="yes"/>
       <point x="317" y="1461"/>
       <point x="453" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="791" y="1520"/>
       <point x="921" y="1453"/>
       <point x="1009" y="1324" type="curve" smooth="yes"/>
       <point x="1097" y="1193"/>
       <point x="1141" y="1000"/>
-      <point x="1141" y="745" type="curve" name="sh02" smooth="yes"/>
+      <point x="1141" y="745" type="curve" smooth="yes" name="sh02"/>
       <point x="1141" y="490"/>
       <point x="1097" y="298"/>
       <point x="1009" y="167" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="795" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="236" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="236" type="curve" smooth="yes" name="dv01"/>
       <point x="692" y="236"/>
       <point x="747" y="276"/>
       <point x="782" y="357" type="curve" smooth="yes"/>
       <point x="817" y="436"/>
       <point x="834" y="566"/>
-      <point x="834" y="746" type="curve" name="ah01" smooth="yes"/>
+      <point x="834" y="746" type="curve" smooth="yes" name="ah01"/>
       <point x="834" y="925"/>
       <point x="817" y="1055"/>
       <point x="782" y="1134" type="curve" smooth="yes"/>
       <point x="747" y="1215"/>
       <point x="692" y="1255"/>
-      <point x="616" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="537" y="1255"/>
       <point x="486" y="1214"/>
       <point x="451" y="1134" type="curve" smooth="yes"/>
       <point x="416" y="1055"/>
       <point x="399" y="925"/>
-      <point x="399" y="746" type="curve" name="sh03" smooth="yes"/>
+      <point x="399" y="746" type="curve" smooth="yes" name="sh03"/>
       <point x="399" y="566"/>
       <point x="416" y="436"/>
       <point x="451" y="357" type="curve" smooth="yes"/>
@@ -56,7 +56,7 @@
       <point x="541" y="236"/>
     </contour>
     <contour>
-      <point x="616" y="1588" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1588" type="curve" smooth="yes" name="dv03"/>
       <point x="518" y="1588"/>
       <point x="440" y="1611"/>
       <point x="383" y="1656" type="curve" smooth="yes"/>
@@ -69,10 +69,10 @@
       <point x="491" y="1762" type="curve" smooth="yes"/>
       <point x="524" y="1741"/>
       <point x="565" y="1731"/>
-      <point x="616" y="1731" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="1731" type="curve" smooth="yes" name="dv04"/>
       <point x="667" y="1731"/>
       <point x="709" y="1741"/>
-      <point x="741" y="1761" type="curve" name="hr01" smooth="yes"/>
+      <point x="741" y="1761" type="curve" smooth="yes" name="hr01"/>
       <point x="774" y="1782"/>
       <point x="796" y="1812"/>
       <point x="809" y="1852" type="curve" name="sv01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/O_circumflex.glif b/source/Hack-Bold.ufo/glyphs/O_circumflex.glif
index df8ea8451..7c240c148 100644
--- a/source/Hack-Bold.ufo/glyphs/O_circumflex.glif
+++ b/source/Hack-Bold.ufo/glyphs/O_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ocircumflex" format="1">
+<glyph name="Ocircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00D4"/>
   <outline>
@@ -13,25 +13,25 @@
       <point x="240" y="1588" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="436" y="-29"/>
       <point x="309" y="41"/>
       <point x="225" y="166" type="curve" smooth="yes"/>
       <point x="136" y="297"/>
       <point x="92" y="490"/>
-      <point x="92" y="745" type="curve" name="sh02" smooth="yes"/>
+      <point x="92" y="745" type="curve" smooth="yes" name="sh02"/>
       <point x="92" y="1000"/>
       <point x="136" y="1192"/>
       <point x="225" y="1325" type="curve" smooth="yes"/>
       <point x="317" y="1461"/>
       <point x="453" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="791" y="1520"/>
       <point x="921" y="1453"/>
       <point x="1009" y="1324" type="curve" smooth="yes"/>
       <point x="1097" y="1193"/>
       <point x="1141" y="1000"/>
-      <point x="1141" y="745" type="curve" name="sh01" smooth="yes"/>
+      <point x="1141" y="745" type="curve" smooth="yes" name="sh01"/>
       <point x="1141" y="490"/>
       <point x="1097" y="298"/>
       <point x="1009" y="167" type="curve" smooth="yes"/>
@@ -39,13 +39,13 @@
       <point x="795" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="236" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="236" type="curve" smooth="yes" name="dv02"/>
       <point x="692" y="236"/>
       <point x="747" y="276"/>
       <point x="782" y="357" type="curve" smooth="yes"/>
       <point x="817" y="436"/>
       <point x="834" y="566"/>
-      <point x="834" y="746" type="curve" name="ah01" smooth="yes"/>
+      <point x="834" y="746" type="curve" smooth="yes" name="ah01"/>
       <point x="834" y="925"/>
       <point x="817" y="1055"/>
       <point x="782" y="1134" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/O_dieresis.glif b/source/Hack-Bold.ufo/glyphs/O_dieresis.glif
index 43e192140..c408a8fe7 100644
--- a/source/Hack-Bold.ufo/glyphs/O_dieresis.glif
+++ b/source/Hack-Bold.ufo/glyphs/O_dieresis.glif
@@ -1,64 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Odieresis" format="1">
+<glyph name="Odieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00D6"/>
   <outline>
     <contour>
-      <point x="331" y="1606" type="line" name="dv03" smooth="yes"/>
+      <point x="331" y="1606" type="line" smooth="yes" name="dv03"/>
       <point x="311" y="1606"/>
       <point x="301" y="1616"/>
-      <point x="301" y="1636" type="curve" name="ih01" smooth="yes"/>
+      <point x="301" y="1636" type="curve" smooth="yes" name="ih01"/>
       <point x="301" y="1822" type="line" smooth="yes"/>
       <point x="301" y="1842"/>
       <point x="311" y="1852"/>
-      <point x="331" y="1852" type="curve" name="dv04" smooth="yes"/>
+      <point x="331" y="1852" type="curve" smooth="yes" name="dv04"/>
       <point x="507" y="1852" type="line" smooth="yes"/>
       <point x="527" y="1852"/>
       <point x="537" y="1842"/>
       <point x="537" y="1822" type="curve" smooth="yes"/>
-      <point x="537" y="1636" type="line" name="sh01" smooth="yes"/>
+      <point x="537" y="1636" type="line" smooth="yes" name="sh01"/>
       <point x="537" y="1616"/>
       <point x="527" y="1606"/>
       <point x="507" y="1606" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1606" type="line" name="sv01" smooth="yes"/>
+      <point x="726" y="1606" type="line" smooth="yes" name="sv01"/>
       <point x="706" y="1606"/>
       <point x="696" y="1616"/>
-      <point x="696" y="1636" type="curve" name="dh03" smooth="yes"/>
+      <point x="696" y="1636" type="curve" smooth="yes" name="dh03"/>
       <point x="696" y="1822" type="line" smooth="yes"/>
       <point x="696" y="1842"/>
       <point x="706" y="1852"/>
-      <point x="726" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="726" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="902" y="1852" type="line" smooth="yes"/>
       <point x="922" y="1852"/>
       <point x="932" y="1842"/>
       <point x="932" y="1822" type="curve" smooth="yes"/>
-      <point x="932" y="1636" type="line" name="dh04" smooth="yes"/>
+      <point x="932" y="1636" type="line" smooth="yes" name="dh04"/>
       <point x="932" y="1616"/>
       <point x="922" y="1606"/>
       <point x="902" y="1606" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="436" y="-29"/>
       <point x="309" y="41"/>
       <point x="225" y="166" type="curve" smooth="yes"/>
       <point x="136" y="297"/>
       <point x="92" y="490"/>
-      <point x="92" y="745" type="curve" name="dh01" smooth="yes"/>
+      <point x="92" y="745" type="curve" smooth="yes" name="dh01"/>
       <point x="92" y="1000"/>
       <point x="136" y="1192"/>
-      <point x="225" y="1325" type="curve" name="hr01" smooth="yes"/>
+      <point x="225" y="1325" type="curve" smooth="yes" name="hr01"/>
       <point x="317" y="1461"/>
       <point x="453" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="791" y="1520"/>
       <point x="921" y="1453"/>
       <point x="1009" y="1324" type="curve" smooth="yes"/>
       <point x="1097" y="1193"/>
       <point x="1141" y="1000"/>
-      <point x="1141" y="745" type="curve" name="sh02" smooth="yes"/>
+      <point x="1141" y="745" type="curve" smooth="yes" name="sh02"/>
       <point x="1141" y="490"/>
       <point x="1097" y="298"/>
       <point x="1009" y="167" type="curve" smooth="yes"/>
@@ -66,13 +66,13 @@
       <point x="795" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="236" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="236" type="curve" smooth="yes" name="dv02"/>
       <point x="692" y="236"/>
       <point x="747" y="276"/>
       <point x="782" y="357" type="curve" smooth="yes"/>
       <point x="817" y="436"/>
       <point x="834" y="566"/>
-      <point x="834" y="746" type="curve" name="ih02" smooth="yes"/>
+      <point x="834" y="746" type="curve" smooth="yes" name="ih02"/>
       <point x="834" y="925"/>
       <point x="817" y="1055"/>
       <point x="782" y="1134" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/O_grave.glif b/source/Hack-Bold.ufo/glyphs/O_grave.glif
index 8a1193279..c70e8665a 100644
--- a/source/Hack-Bold.ufo/glyphs/O_grave.glif
+++ b/source/Hack-Bold.ufo/glyphs/O_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ograve" format="1">
+<glyph name="Ograve" format="2">
   <advance width="1233"/>
   <unicode hex="00D2"/>
   <outline>
@@ -10,25 +10,25 @@
       <point x="569" y="1588" type="line"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="436" y="-29"/>
       <point x="309" y="41"/>
       <point x="225" y="166" type="curve" smooth="yes"/>
       <point x="136" y="297"/>
       <point x="92" y="490"/>
-      <point x="92" y="745" type="curve" name="sh01" smooth="yes"/>
+      <point x="92" y="745" type="curve" smooth="yes" name="sh01"/>
       <point x="92" y="1000"/>
       <point x="136" y="1192"/>
       <point x="225" y="1325" type="curve" smooth="yes"/>
       <point x="317" y="1461"/>
       <point x="453" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="791" y="1520"/>
       <point x="921" y="1453"/>
       <point x="1009" y="1324" type="curve" smooth="yes"/>
       <point x="1097" y="1193"/>
       <point x="1141" y="1000"/>
-      <point x="1141" y="745" type="curve" name="sh03" smooth="yes"/>
+      <point x="1141" y="745" type="curve" smooth="yes" name="sh03"/>
       <point x="1141" y="490"/>
       <point x="1097" y="298"/>
       <point x="1009" y="167" type="curve" smooth="yes"/>
@@ -36,13 +36,13 @@
       <point x="795" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="236" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="236" type="curve" smooth="yes" name="dv02"/>
       <point x="692" y="236"/>
       <point x="747" y="276"/>
       <point x="782" y="357" type="curve" smooth="yes"/>
       <point x="817" y="436"/>
       <point x="834" y="566"/>
-      <point x="834" y="746" type="curve" name="ah01" smooth="yes"/>
+      <point x="834" y="746" type="curve" smooth="yes" name="ah01"/>
       <point x="834" y="925"/>
       <point x="817" y="1055"/>
       <point x="782" y="1134" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/O_horn.glif b/source/Hack-Bold.ufo/glyphs/O_horn.glif
index e4cbafb06..57635e0ac 100644
--- a/source/Hack-Bold.ufo/glyphs/O_horn.glif
+++ b/source/Hack-Bold.ufo/glyphs/O_horn.glif
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ohorn" format="1">
+<glyph name="Ohorn" format="2">
   <advance width="1233"/>
   <unicode hex="01A0"/>
   <outline>
     <contour>
-      <point x="1229" y="1367" type="curve" name="dh05" smooth="yes"/>
+      <point x="1229" y="1367" type="curve" smooth="yes" name="dh05"/>
       <point x="1229" y="1211"/>
       <point x="1167" y="1127"/>
-      <point x="1052" y="1127" type="curve" name="sv01" smooth="yes"/>
+      <point x="1052" y="1127" type="curve" smooth="yes" name="sv01"/>
       <point x="1037" y="1127"/>
       <point x="1022" y="1128"/>
       <point x="1007" y="1132" type="curve" name="ih01"/>
       <point x="1038" y="1026"/>
       <point x="1053" y="897"/>
-      <point x="1053" y="746" type="curve" name="dh04" smooth="yes"/>
+      <point x="1053" y="746" type="curve" smooth="yes" name="dh04"/>
       <point x="1053" y="235"/>
       <point x="874" y="-29"/>
-      <point x="529" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="529" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="182" y="-29"/>
       <point x="4" y="237"/>
-      <point x="4" y="746" type="curve" name="dh01" smooth="yes"/>
+      <point x="4" y="746" type="curve" smooth="yes" name="dh01"/>
       <point x="4" y="1255"/>
       <point x="182" y="1520"/>
-      <point x="529" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="529" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="707" y="1520"/>
       <point x="840" y="1451"/>
       <point x="929" y="1312" type="curve"/>
       <point x="932" y="1310" type="line" smooth="yes"/>
       <point x="955" y="1297"/>
       <point x="976" y="1291"/>
-      <point x="995" y="1291" type="curve" name="sv02" smooth="yes"/>
+      <point x="995" y="1291" type="curve" smooth="yes" name="sv02"/>
       <point x="1043" y="1291"/>
       <point x="1082" y="1326"/>
-      <point x="1082" y="1406" type="curve" name="hr01" smooth="yes"/>
+      <point x="1082" y="1406" type="curve" smooth="yes" name="hr01"/>
       <point x="1082" y="1446"/>
       <point x="1072" y="1503"/>
       <point x="1051" y="1555" type="curve" name="ih02"/>
@@ -41,28 +41,28 @@
       <point x="1229" y="1419"/>
     </contour>
     <contour>
-      <point x="694" y="357" type="curve" name="hr02" smooth="yes"/>
+      <point x="694" y="357" type="curve" smooth="yes" name="hr02"/>
       <point x="729" y="436"/>
       <point x="746" y="566"/>
-      <point x="746" y="746" type="curve" name="dh03" smooth="yes"/>
+      <point x="746" y="746" type="curve" smooth="yes" name="dh03"/>
       <point x="746" y="925"/>
       <point x="729" y="1055"/>
       <point x="694" y="1134" type="curve" smooth="yes"/>
       <point x="659" y="1215"/>
       <point x="604" y="1255"/>
-      <point x="528" y="1255" type="curve" name="hr03" smooth="yes"/>
+      <point x="528" y="1255" type="curve" smooth="yes" name="hr03"/>
       <point x="449" y="1255"/>
       <point x="398" y="1214"/>
       <point x="363" y="1134" type="curve" smooth="yes"/>
       <point x="328" y="1055"/>
       <point x="311" y="925"/>
-      <point x="311" y="746" type="curve" name="dh02" smooth="yes"/>
+      <point x="311" y="746" type="curve" smooth="yes" name="dh02"/>
       <point x="311" y="566"/>
       <point x="328" y="436"/>
       <point x="363" y="357" type="curve" smooth="yes"/>
       <point x="398" y="276"/>
       <point x="453" y="236"/>
-      <point x="528" y="236" type="curve" name="dv02" smooth="yes"/>
+      <point x="528" y="236" type="curve" smooth="yes" name="dv02"/>
       <point x="604" y="236"/>
       <point x="659" y="276"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/O_hungarumlaut.glif b/source/Hack-Bold.ufo/glyphs/O_hungarumlaut.glif
index ab3b1df54..b2db654c3 100644
--- a/source/Hack-Bold.ufo/glyphs/O_hungarumlaut.glif
+++ b/source/Hack-Bold.ufo/glyphs/O_hungarumlaut.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ohungarumlaut" format="1">
+<glyph name="Ohungarumlaut" format="2">
   <advance width="1233"/>
   <unicode hex="0150"/>
   <outline>
@@ -16,39 +16,39 @@
       <point x="639" y="1588" type="line"/>
     </contour>
     <contour>
-      <point x="617" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="270" y="-29"/>
       <point x="92" y="237"/>
-      <point x="92" y="746" type="curve" name="sh01" smooth="yes"/>
+      <point x="92" y="746" type="curve" smooth="yes" name="sh01"/>
       <point x="92" y="1255"/>
       <point x="270" y="1520"/>
-      <point x="617" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="617" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="962" y="1520"/>
       <point x="1141" y="1257"/>
-      <point x="1141" y="746" type="curve" name="sh02" smooth="yes"/>
+      <point x="1141" y="746" type="curve" smooth="yes" name="sh02"/>
       <point x="1141" y="235"/>
       <point x="962" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="236" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="236" type="curve" smooth="yes" name="dv02"/>
       <point x="692" y="236"/>
       <point x="747" y="276"/>
       <point x="782" y="357" type="curve" smooth="yes"/>
       <point x="817" y="436"/>
       <point x="834" y="566"/>
-      <point x="834" y="746" type="curve" name="ah01" smooth="yes"/>
+      <point x="834" y="746" type="curve" smooth="yes" name="ah01"/>
       <point x="834" y="925"/>
       <point x="817" y="1055"/>
       <point x="782" y="1134" type="curve" smooth="yes"/>
       <point x="747" y="1215"/>
       <point x="692" y="1255"/>
-      <point x="616" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="537" y="1255"/>
       <point x="486" y="1214"/>
       <point x="451" y="1134" type="curve" smooth="yes"/>
       <point x="416" y="1055"/>
       <point x="399" y="925"/>
-      <point x="399" y="746" type="curve" name="sh03" smooth="yes"/>
+      <point x="399" y="746" type="curve" smooth="yes" name="sh03"/>
       <point x="399" y="566"/>
       <point x="416" y="436"/>
       <point x="451" y="357" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/O_macron.glif b/source/Hack-Bold.ufo/glyphs/O_macron.glif
index e64e5e569..5f8cf7b81 100644
--- a/source/Hack-Bold.ufo/glyphs/O_macron.glif
+++ b/source/Hack-Bold.ufo/glyphs/O_macron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Omacron" format="1">
+<glyph name="Omacron" format="2">
   <advance width="1233"/>
   <unicode hex="014C"/>
   <outline>
@@ -10,39 +10,39 @@
       <point x="301" y="1642" type="line"/>
     </contour>
     <contour>
-      <point x="617" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="270" y="-29"/>
       <point x="92" y="237"/>
-      <point x="92" y="746" type="curve" name="sh01" smooth="yes"/>
+      <point x="92" y="746" type="curve" smooth="yes" name="sh01"/>
       <point x="92" y="1255"/>
       <point x="270" y="1520"/>
-      <point x="617" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="617" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="962" y="1520"/>
       <point x="1141" y="1257"/>
-      <point x="1141" y="746" type="curve" name="sh02" smooth="yes"/>
+      <point x="1141" y="746" type="curve" smooth="yes" name="sh02"/>
       <point x="1141" y="235"/>
       <point x="962" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="236" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="236" type="curve" smooth="yes" name="dv02"/>
       <point x="692" y="236"/>
       <point x="747" y="276"/>
       <point x="782" y="357" type="curve" smooth="yes"/>
       <point x="817" y="436"/>
       <point x="834" y="566"/>
-      <point x="834" y="746" type="curve" name="ah01" smooth="yes"/>
+      <point x="834" y="746" type="curve" smooth="yes" name="ah01"/>
       <point x="834" y="925"/>
       <point x="817" y="1055"/>
       <point x="782" y="1134" type="curve" smooth="yes"/>
       <point x="747" y="1215"/>
       <point x="692" y="1255"/>
-      <point x="616" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="537" y="1255"/>
       <point x="486" y="1214"/>
       <point x="451" y="1134" type="curve" smooth="yes"/>
       <point x="416" y="1055"/>
       <point x="399" y="925"/>
-      <point x="399" y="746" type="curve" name="sh03" smooth="yes"/>
+      <point x="399" y="746" type="curve" smooth="yes" name="sh03"/>
       <point x="399" y="566"/>
       <point x="416" y="436"/>
       <point x="451" y="357" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/O_megatonos.glif b/source/Hack-Bold.ufo/glyphs/O_megatonos.glif
index 83e35946f..2c65d1218 100644
--- a/source/Hack-Bold.ufo/glyphs/O_megatonos.glif
+++ b/source/Hack-Bold.ufo/glyphs/O_megatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Omegatonos" format="1">
+<glyph name="Omegatonos" format="2">
   <advance width="1233"/>
   <unicode hex="038F"/>
   <outline>
@@ -14,13 +14,13 @@
       <point x="328" y="211" type="line" name="ih02"/>
       <point x="173" y="350"/>
       <point x="100" y="523"/>
-      <point x="100" y="777" type="curve" name="hr02" smooth="yes"/>
+      <point x="100" y="777" type="curve" smooth="yes" name="hr02"/>
       <point x="100" y="1201"/>
       <point x="301" y="1460"/>
-      <point x="615" y="1460" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="1460" type="curve" smooth="yes" name="dv02"/>
       <point x="931" y="1460"/>
       <point x="1133" y="1201"/>
-      <point x="1133" y="777" type="curve" name="dh03" smooth="yes"/>
+      <point x="1133" y="777" type="curve" smooth="yes" name="dh03"/>
       <point x="1133" y="521"/>
       <point x="1059" y="349"/>
       <point x="905" y="211" type="curve" name="ih03"/>
@@ -30,13 +30,13 @@
       <point x="672" y="268" type="line" name="dh02"/>
       <point x="780" y="373"/>
       <point x="831" y="524"/>
-      <point x="831" y="751" type="curve" name="sh04" smooth="yes"/>
+      <point x="831" y="751" type="curve" smooth="yes" name="sh04"/>
       <point x="831" y="1031"/>
       <point x="752" y="1194"/>
-      <point x="616" y="1194" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1194" type="curve" smooth="yes" name="sv01"/>
       <point x="480" y="1194"/>
       <point x="401" y="1031"/>
-      <point x="401" y="752" type="curve" name="dh01" smooth="yes"/>
+      <point x="401" y="752" type="curve" smooth="yes" name="dh01"/>
       <point x="401" y="536"/>
       <point x="447" y="377"/>
       <point x="563" y="268" type="curve" name="sh01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/O_micron.glif b/source/Hack-Bold.ufo/glyphs/O_micron.glif
index a7423290d..cd98b502b 100644
--- a/source/Hack-Bold.ufo/glyphs/O_micron.glif
+++ b/source/Hack-Bold.ufo/glyphs/O_micron.glif
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Omicron" format="1">
+<glyph name="Omicron" format="2">
   <advance width="1233"/>
   <unicode hex="039F"/>
   <outline>
     <contour>
-      <point x="617" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="270" y="-29"/>
       <point x="92" y="237"/>
-      <point x="92" y="746" type="curve" name="sh01" smooth="yes"/>
+      <point x="92" y="746" type="curve" smooth="yes" name="sh01"/>
       <point x="92" y="1255"/>
       <point x="270" y="1520"/>
-      <point x="617" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="617" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="962" y="1520"/>
       <point x="1141" y="1257"/>
-      <point x="1141" y="746" type="curve" name="sh02" smooth="yes"/>
+      <point x="1141" y="746" type="curve" smooth="yes" name="sh02"/>
       <point x="1141" y="235"/>
       <point x="962" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="236" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="236" type="curve" smooth="yes" name="dv01"/>
       <point x="692" y="236"/>
       <point x="747" y="276"/>
       <point x="782" y="357" type="curve" smooth="yes"/>
       <point x="817" y="436"/>
       <point x="834" y="566"/>
-      <point x="834" y="746" type="curve" name="ah01" smooth="yes"/>
+      <point x="834" y="746" type="curve" smooth="yes" name="ah01"/>
       <point x="834" y="925"/>
       <point x="817" y="1055"/>
       <point x="782" y="1134" type="curve" smooth="yes"/>
       <point x="747" y="1215"/>
       <point x="692" y="1255"/>
-      <point x="616" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="537" y="1255"/>
       <point x="486" y="1214"/>
       <point x="451" y="1134" type="curve" smooth="yes"/>
       <point x="416" y="1055"/>
       <point x="399" y="925"/>
-      <point x="399" y="746" type="curve" name="sh03" smooth="yes"/>
+      <point x="399" y="746" type="curve" smooth="yes" name="sh03"/>
       <point x="399" y="566"/>
       <point x="416" y="436"/>
       <point x="451" y="357" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/O_microntonos.glif b/source/Hack-Bold.ufo/glyphs/O_microntonos.glif
index 1614d6524..a909dc65a 100644
--- a/source/Hack-Bold.ufo/glyphs/O_microntonos.glif
+++ b/source/Hack-Bold.ufo/glyphs/O_microntonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Omicrontonos" format="1">
+<glyph name="Omicrontonos" format="2">
   <advance width="1233"/>
   <unicode hex="038C"/>
   <outline>
@@ -10,39 +10,39 @@
       <point x="-171" y="1262" type="line"/>
     </contour>
     <contour>
-      <point x="617" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="270" y="-29"/>
       <point x="92" y="237"/>
-      <point x="92" y="746" type="curve" name="sh01" smooth="yes"/>
+      <point x="92" y="746" type="curve" smooth="yes" name="sh01"/>
       <point x="92" y="1255"/>
       <point x="270" y="1520"/>
-      <point x="617" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="617" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="962" y="1520"/>
       <point x="1141" y="1257"/>
-      <point x="1141" y="746" type="curve" name="sh04" smooth="yes"/>
+      <point x="1141" y="746" type="curve" smooth="yes" name="sh04"/>
       <point x="1141" y="235"/>
       <point x="962" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="236" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="236" type="curve" smooth="yes" name="dv02"/>
       <point x="692" y="236"/>
       <point x="747" y="276"/>
       <point x="782" y="357" type="curve" smooth="yes"/>
       <point x="817" y="436"/>
       <point x="834" y="566"/>
-      <point x="834" y="746" type="curve" name="ah01" smooth="yes"/>
+      <point x="834" y="746" type="curve" smooth="yes" name="ah01"/>
       <point x="834" y="925"/>
       <point x="817" y="1055"/>
       <point x="782" y="1134" type="curve" smooth="yes"/>
       <point x="747" y="1215"/>
       <point x="692" y="1255"/>
-      <point x="616" y="1255" type="curve" name="sv02" smooth="yes"/>
+      <point x="616" y="1255" type="curve" smooth="yes" name="sv02"/>
       <point x="537" y="1255"/>
       <point x="486" y="1214"/>
       <point x="451" y="1134" type="curve" smooth="yes"/>
       <point x="416" y="1055"/>
       <point x="399" y="925"/>
-      <point x="399" y="746" type="curve" name="sh02" smooth="yes"/>
+      <point x="399" y="746" type="curve" smooth="yes" name="sh02"/>
       <point x="399" y="566"/>
       <point x="416" y="436"/>
       <point x="451" y="357" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/O_slash.glif b/source/Hack-Bold.ufo/glyphs/O_slash.glif
index de0813ea6..334b6a75a 100644
--- a/source/Hack-Bold.ufo/glyphs/O_slash.glif
+++ b/source/Hack-Bold.ufo/glyphs/O_slash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Oslash" format="1">
+<glyph name="Oslash" format="2">
   <advance width="1233"/>
   <unicode hex="00D8"/>
   <outline>
@@ -11,13 +11,13 @@
       <point x="110" y="491" type="curve" smooth="yes"/>
       <point x="99" y="563"/>
       <point x="92" y="639"/>
-      <point x="92" y="743" type="curve" name="sh01" smooth="yes"/>
+      <point x="92" y="743" type="curve" smooth="yes" name="sh01"/>
       <point x="92" y="1000"/>
       <point x="136" y="1193"/>
       <point x="225" y="1324" type="curve" smooth="yes"/>
       <point x="313" y="1455"/>
       <point x="439" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at02" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at02"/>
       <point x="686" y="1520"/>
       <point x="748" y="1510"/>
       <point x="802" y="1489" type="curve" smooth="yes"/>
@@ -32,13 +32,13 @@
       <point x="1122" y="1008" type="curve" smooth="yes"/>
       <point x="1135" y="928"/>
       <point x="1141" y="841"/>
-      <point x="1141" y="745" type="curve" name="sh02" smooth="yes"/>
+      <point x="1141" y="745" type="curve" smooth="yes" name="sh02"/>
       <point x="1141" y="490"/>
       <point x="1097" y="298"/>
       <point x="1009" y="167" type="curve" smooth="yes"/>
       <point x="917" y="31"/>
       <point x="784" y="-29"/>
-      <point x="615" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="470" y="-29"/>
       <point x="365" y="15"/>
       <point x="276" y="104" type="curve"/>
@@ -51,17 +51,17 @@
       <point x="707" y="1230" type="curve" smooth="yes"/>
       <point x="682" y="1247"/>
       <point x="652" y="1255"/>
-      <point x="617" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="617" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="538" y="1255"/>
       <point x="487" y="1214"/>
       <point x="452" y="1135" type="curve" smooth="yes"/>
       <point x="417" y="1054"/>
       <point x="399" y="928"/>
-      <point x="399" y="756" type="curve" name="sh03" smooth="yes"/>
+      <point x="399" y="756" type="curve" smooth="yes" name="sh03"/>
       <point x="399" y="629" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="618" y="236" type="curve" name="dv02" smooth="yes"/>
+      <point x="618" y="236" type="curve" smooth="yes" name="dv02"/>
       <point x="698" y="236"/>
       <point x="748" y="280"/>
       <point x="781" y="357" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/O_slashacute.glif b/source/Hack-Bold.ufo/glyphs/O_slashacute.glif
index b3004761e..f610fbd98 100644
--- a/source/Hack-Bold.ufo/glyphs/O_slashacute.glif
+++ b/source/Hack-Bold.ufo/glyphs/O_slashacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Oslashacute" format="1">
+<glyph name="Oslashacute" format="2">
   <advance width="1233"/>
   <unicode hex="01FE"/>
   <outline>
@@ -14,10 +14,10 @@
       <point x="162" y="289" type="line"/>
       <point x="115" y="406"/>
       <point x="92" y="557"/>
-      <point x="92" y="742" type="curve" name="sh02" smooth="yes"/>
+      <point x="92" y="742" type="curve" smooth="yes" name="sh02"/>
       <point x="92" y="1257"/>
       <point x="271" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="754" y="1520"/>
       <point x="864" y="1479"/>
       <point x="946" y="1397" type="curve"/>
@@ -26,10 +26,10 @@
       <point x="1063" y="1221" type="line"/>
       <point x="1115" y="1096"/>
       <point x="1141" y="936"/>
-      <point x="1141" y="743" type="curve" name="sh01" smooth="yes"/>
+      <point x="1141" y="743" type="curve" smooth="yes" name="sh01"/>
       <point x="1141" y="236"/>
       <point x="962" y="-29"/>
-      <point x="617" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="475" y="-29"/>
       <point x="361" y="15"/>
       <point x="276" y="104" type="curve"/>
@@ -39,23 +39,23 @@
       <point x="772" y="1153" type="line"/>
       <point x="737" y="1221"/>
       <point x="685" y="1255"/>
-      <point x="616" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="541" y="1255"/>
       <point x="487" y="1215"/>
       <point x="452" y="1135" type="curve" smooth="yes"/>
       <point x="417" y="1054"/>
       <point x="399" y="928"/>
-      <point x="399" y="756" type="curve" name="sh03" smooth="yes"/>
+      <point x="399" y="756" type="curve" smooth="yes" name="sh03"/>
       <point x="399" y="629" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="617" y="236" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="236" type="curve" smooth="yes" name="dv02"/>
       <point x="692" y="236"/>
       <point x="747" y="276"/>
       <point x="782" y="357" type="curve" smooth="yes"/>
       <point x="817" y="437"/>
       <point x="834" y="566"/>
-      <point x="834" y="741" type="curve" name="ah01" smooth="yes"/>
+      <point x="834" y="741" type="curve" smooth="yes" name="ah01"/>
       <point x="834" y="782"/>
       <point x="833" y="817"/>
       <point x="829" y="888" type="curve" name="sh04"/>
diff --git a/source/Hack-Bold.ufo/glyphs/O_tilde.glif b/source/Hack-Bold.ufo/glyphs/O_tilde.glif
index 214710ac9..623d9827c 100644
--- a/source/Hack-Bold.ufo/glyphs/O_tilde.glif
+++ b/source/Hack-Bold.ufo/glyphs/O_tilde.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Otilde" format="1">
+<glyph name="Otilde" format="2">
   <advance width="1233"/>
   <unicode hex="00D5"/>
   <outline>
     <contour>
-      <point x="268" y="1618" type="line" name="hr00" smooth="yes"/>
+      <point x="268" y="1618" type="line" smooth="yes" name="hr00"/>
       <point x="268" y="1691"/>
       <point x="289" y="1750"/>
       <point x="322" y="1789" type="curve" smooth="yes"/>
       <point x="359" y="1833"/>
       <point x="411" y="1854"/>
-      <point x="466" y="1854" type="curve" name="sv01" smooth="yes"/>
+      <point x="466" y="1854" type="curve" smooth="yes" name="sv01"/>
       <point x="491" y="1854"/>
       <point x="515" y="1850"/>
       <point x="539" y="1842" type="curve" smooth="yes"/>
@@ -42,7 +42,7 @@
       <point x="910" y="1653" type="curve" smooth="yes"/>
       <point x="871" y="1606"/>
       <point x="823" y="1588"/>
-      <point x="768" y="1588" type="curve" name="dv03" smooth="yes"/>
+      <point x="768" y="1588" type="curve" smooth="yes" name="dv03"/>
       <point x="744" y="1588"/>
       <point x="720" y="1592"/>
       <point x="696" y="1599" type="curve" smooth="yes"/>
@@ -50,7 +50,7 @@
       <point x="646" y="1618"/>
       <point x="618" y="1637" type="curve" smooth="yes"/>
       <point x="564" y="1671" type="line"/>
-      <point x="552" y="1678" type="line" name="hr01" smooth="yes"/>
+      <point x="552" y="1678" type="line" smooth="yes" name="hr01"/>
       <point x="524" y="1693"/>
       <point x="502" y="1704"/>
       <point x="479" y="1704" type="curve" smooth="yes"/>
@@ -59,30 +59,30 @@
       <point x="428" y="1674" type="curve" smooth="yes"/>
       <point x="415" y="1653"/>
       <point x="408" y="1627"/>
-      <point x="408" y="1594" type="curve" name="sh02" smooth="yes"/>
+      <point x="408" y="1594" type="curve" smooth="yes" name="sh02"/>
       <point x="408" y="1588" type="line" name="sv02"/>
       <point x="268" y="1588" type="line" name="sh03"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="436" y="-29"/>
       <point x="309" y="41"/>
       <point x="225" y="166" type="curve" smooth="yes"/>
       <point x="136" y="297"/>
       <point x="92" y="490"/>
-      <point x="92" y="745" type="curve" name="dh01" smooth="yes"/>
+      <point x="92" y="745" type="curve" smooth="yes" name="dh01"/>
       <point x="92" y="1000"/>
       <point x="136" y="1192"/>
       <point x="225" y="1325" type="curve" smooth="yes"/>
       <point x="317" y="1461"/>
       <point x="453" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="791" y="1520"/>
       <point x="921" y="1453"/>
       <point x="1009" y="1324" type="curve" smooth="yes"/>
       <point x="1097" y="1193"/>
       <point x="1141" y="1000"/>
-      <point x="1141" y="745" type="curve" name="dh04" smooth="yes"/>
+      <point x="1141" y="745" type="curve" smooth="yes" name="dh04"/>
       <point x="1141" y="490"/>
       <point x="1097" y="298"/>
       <point x="1009" y="167" type="curve" smooth="yes"/>
@@ -90,13 +90,13 @@
       <point x="795" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="236" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="236" type="curve" smooth="yes" name="dv02"/>
       <point x="692" y="236"/>
       <point x="747" y="276"/>
       <point x="782" y="357" type="curve" smooth="yes"/>
       <point x="817" y="436"/>
       <point x="834" y="566"/>
-      <point x="834" y="746" type="curve" name="dh03" smooth="yes"/>
+      <point x="834" y="746" type="curve" smooth="yes" name="dh03"/>
       <point x="834" y="925"/>
       <point x="817" y="1055"/>
       <point x="782" y="1134" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/P_.glif b/source/Hack-Bold.ufo/glyphs/P_.glif
index c1e1f7dcd..ac9bc65a6 100644
--- a/source/Hack-Bold.ufo/glyphs/P_.glif
+++ b/source/Hack-Bold.ufo/glyphs/P_.glif
@@ -1,36 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="P" format="1">
+<glyph name="P" format="2">
   <advance width="1233"/>
   <unicode hex="0050"/>
   <outline>
     <contour>
-      <point x="166" y="1493" type="line" name="hr00"/>
+      <point x="166" y="1493" type="line"/>
       <point x="571" y="1493" type="line" smooth="yes"/>
-      <point x="776" y="1493"/>
-      <point x="925" y="1456"/>
-      <point x="1016" y="1383" type="curve" smooth="yes"/>
-      <point x="1106" y="1310"/>
-      <point x="1151" y="1191"/>
-      <point x="1151" y="1026" type="curve" name="sh01" smooth="yes"/>
-      <point x="1151" y="861"/>
-      <point x="1106" y="742"/>
-      <point x="1016" y="669" type="curve" smooth="yes"/>
-      <point x="925" y="596"/>
-      <point x="776" y="559"/>
-      <point x="571" y="559" type="curve" name="dv01" smooth="yes"/>
-      <point x="461" y="559" type="line" name="sh03"/>
-      <point x="461" y="0" type="line" name="ab01"/>
+      <point x="907.884" y="1493"/>
+      <point x="1151" y="1409.19"/>
+      <point x="1151" y="1022.87" type="curve" smooth="yes"/>
+      <point x="1151" y="573.055"/>
+      <point x="821.396" y="559"/>
+      <point x="461" y="559" type="curve"/>
+      <point x="461" y="0" type="line"/>
       <point x="166" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="582" y="807" type="line" name="dv02" smooth="yes"/>
-      <point x="777" y="807"/>
-      <point x="844" y="865"/>
-      <point x="844" y="1026" type="curve" name="ah01" smooth="yes"/>
-      <point x="844" y="1187"/>
-      <point x="777" y="1245"/>
-      <point x="582" y="1245" type="curve" name="sv01" smooth="yes"/>
-      <point x="461" y="1245" type="line" name="sh02"/>
+      <point x="582" y="807" type="line" smooth="yes"/>
+      <point x="749.152" y="807"/>
+      <point x="844" y="843.302"/>
+      <point x="844" y="1026" type="curve" smooth="yes"/>
+      <point x="844" y="1208.7"/>
+      <point x="749.152" y="1245"/>
+      <point x="582" y="1245" type="curve" smooth="yes"/>
+      <point x="461" y="1245" type="line"/>
       <point x="461" y="807" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/P_hi.glif b/source/Hack-Bold.ufo/glyphs/P_hi.glif
index 6d08bad0c..1cee48d49 100644
--- a/source/Hack-Bold.ufo/glyphs/P_hi.glif
+++ b/source/Hack-Bold.ufo/glyphs/P_hi.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Phi" format="1">
+<glyph name="Phi" format="2">
   <advance width="1233"/>
   <unicode hex="03A6"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="469" y="330" type="line"/>
       <point x="266" y="359"/>
       <point x="92" y="465"/>
-      <point x="92" y="746" type="curve" name="sh01" smooth="yes"/>
+      <point x="92" y="746" type="curve" smooth="yes" name="sh01"/>
       <point x="92" y="1027"/>
       <point x="265" y="1129"/>
       <point x="469" y="1161" type="curve" name="sh04"/>
@@ -22,7 +22,7 @@
       <point x="764" y="1161" type="line"/>
       <point x="967" y="1129"/>
       <point x="1141" y="1027"/>
-      <point x="1141" y="746" type="curve" name="sh10" smooth="yes"/>
+      <point x="1141" y="746" type="curve" smooth="yes" name="sh10"/>
       <point x="1141" y="465"/>
       <point x="967" y="359"/>
       <point x="764" y="330" type="curve"/>
@@ -36,7 +36,7 @@
       <point x="434" y="938" type="line" smooth="yes"/>
       <point x="379" y="895"/>
       <point x="353" y="828"/>
-      <point x="353" y="751" type="curve" name="sh02" smooth="yes"/>
+      <point x="353" y="751" type="curve" smooth="yes" name="sh02"/>
       <point x="353" y="671"/>
       <point x="382" y="605"/>
       <point x="434" y="553" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="800" y="553" type="curve" smooth="yes"/>
       <point x="843" y="593"/>
       <point x="880" y="668"/>
-      <point x="880" y="753" type="curve" name="sh06" smooth="yes"/>
+      <point x="880" y="753" type="curve" smooth="yes" name="sh06"/>
       <point x="880" y="822"/>
       <point x="856" y="894"/>
       <point x="799" y="938" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/P_i.glif b/source/Hack-Bold.ufo/glyphs/P_i.glif
index 49f3ecdd3..221608450 100644
--- a/source/Hack-Bold.ufo/glyphs/P_i.glif
+++ b/source/Hack-Bold.ufo/glyphs/P_i.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Pi" format="1">
+<glyph name="Pi" format="2">
   <advance width="1233"/>
   <unicode hex="03A0"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/P_si.glif b/source/Hack-Bold.ufo/glyphs/P_si.glif
index 86a410361..9bbd82b5b 100644
--- a/source/Hack-Bold.ufo/glyphs/P_si.glif
+++ b/source/Hack-Bold.ufo/glyphs/P_si.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Psi" format="1">
+<glyph name="Psi" format="2">
   <advance width="1233"/>
   <unicode hex="03A8"/>
   <outline>
@@ -12,10 +12,10 @@
       <point x="224" y="568" type="curve" smooth="yes"/>
       <point x="124" y="705"/>
       <point x="80" y="897"/>
-      <point x="80" y="1146" type="curve" name="sh01" smooth="yes"/>
+      <point x="80" y="1146" type="curve" smooth="yes" name="sh01"/>
       <point x="80" y="1493" type="line" name="at01"/>
       <point x="375" y="1493" type="line"/>
-      <point x="375" y="1146" type="line" name="sh03" smooth="yes"/>
+      <point x="375" y="1146" type="line" smooth="yes" name="sh03"/>
       <point x="375" y="979"/>
       <point x="396" y="849"/>
       <point x="439" y="758" type="curve" smooth="yes"/>
@@ -30,10 +30,10 @@
       <point x="794" y="758" type="curve" smooth="yes"/>
       <point x="837" y="849"/>
       <point x="858" y="979"/>
-      <point x="858" y="1146" type="curve" name="sh07" smooth="yes"/>
+      <point x="858" y="1146" type="curve" smooth="yes" name="sh07"/>
       <point x="858" y="1493" type="line" name="at03"/>
       <point x="1153" y="1493" type="line"/>
-      <point x="1153" y="1146" type="line" name="sh08" smooth="yes"/>
+      <point x="1153" y="1146" type="line" smooth="yes" name="sh08"/>
       <point x="1153" y="887"/>
       <point x="1105" y="701"/>
       <point x="1008" y="568" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/Q_.glif b/source/Hack-Bold.ufo/glyphs/Q_.glif
index 4cbb032b2..0f24e4b4f 100644
--- a/source/Hack-Bold.ufo/glyphs/Q_.glif
+++ b/source/Hack-Bold.ufo/glyphs/Q_.glif
@@ -1,63 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Q" format="1">
+<glyph name="Q" format="2">
   <advance width="1233"/>
   <unicode hex="0051"/>
   <outline>
     <contour>
-      <point x="656" y="-23" type="line" name="hr00"/>
-      <point x="633" y="-28" type="line" smooth="yes"/>
-      <point x="626" y="-29"/>
-      <point x="625" y="-29"/>
-      <point x="622" y="-29" type="curve" smooth="yes" name="dv01"/>
-      <point x="439" y="-29"/>
-      <point x="312" y="40"/>
-      <point x="225" y="167" type="curve" smooth="yes"/>
-      <point x="136" y="298"/>
-      <point x="92" y="490"/>
-      <point x="92" y="744" type="curve" smooth="yes" name="sh01"/>
-      <point x="92" y="1000"/>
-      <point x="136" y="1192"/>
-      <point x="225" y="1325" type="curve" smooth="yes"/>
-      <point x="318" y="1462"/>
-      <point x="453" y="1520"/>
-      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
-      <point x="791" y="1520"/>
-      <point x="921" y="1453"/>
-      <point x="1009" y="1324" type="curve" smooth="yes"/>
-      <point x="1097" y="1193"/>
-      <point x="1141" y="1000"/>
-      <point x="1141" y="745" type="curve" smooth="yes" name="sh02"/>
-      <point x="1141" y="394"/>
-      <point x="1055" y="154"/>
+      <point x="656" y="-23" type="line"/>
+      <point x="654.101" y="-23.4558" type="line"/>
+      <point x="643.686" y="-25.9562"/>
+      <point x="631.103" y="-29"/>
+      <point x="596.862" y="-29" type="curve" smooth="yes"/>
+      <point x="271.801" y="-29"/>
+      <point x="92" y="245.316"/>
+      <point x="92" y="741.172" type="curve" smooth="yes"/>
+      <point x="92" y="1244.79"/>
+      <point x="277.475" y="1520"/>
+      <point x="616.818" y="1520" type="curve" smooth="yes"/>
+      <point x="955.093" y="1520"/>
+      <point x="1141" y="1246.52"/>
+      <point x="1141" y="748.934" type="curve" smooth="yes"/>
+      <point x="1141" y="404.648"/>
+      <point x="1052" y="152.141"/>
       <point x="895" y="51" type="curve"/>
-      <point x="1233" y="-350" type="line" name="av01"/>
-      <point x="891" y="-350" type="line" name="sh03"/>
+      <point x="1233" y="-350" type="line"/>
+      <point x="891" y="-350" type="line"/>
     </contour>
     <contour>
-      <point x="616" y="236" type="curve" smooth="yes" name="dv02"/>
-      <point x="692" y="236"/>
-      <point x="747" y="276"/>
-      <point x="782" y="357" type="curve" smooth="yes"/>
-      <point x="817" y="436"/>
-      <point x="834" y="566"/>
-      <point x="834" y="746" type="curve" smooth="yes" name="ah01"/>
-      <point x="834" y="925"/>
-      <point x="817" y="1055"/>
-      <point x="782" y="1134" type="curve" smooth="yes"/>
-      <point x="747" y="1215"/>
-      <point x="692" y="1255"/>
-      <point x="616" y="1255" type="curve" smooth="yes" name="sv01"/>
-      <point x="537" y="1255"/>
-      <point x="486" y="1214"/>
-      <point x="451" y="1134" type="curve" smooth="yes"/>
-      <point x="416" y="1055"/>
-      <point x="399" y="925"/>
-      <point x="399" y="746" type="curve" smooth="yes" name="sh04"/>
-      <point x="399" y="566"/>
-      <point x="416" y="436"/>
-      <point x="451" y="357" type="curve" smooth="yes"/>
-      <point x="486" y="276"/>
-      <point x="541" y="236"/>
+      <point x="619.018" y="236" type="curve" smooth="yes"/>
+      <point x="758.924" y="236"/>
+      <point x="834.034" y="404.774"/>
+      <point x="834.034" y="721.078" type="curve" smooth="yes"/>
+      <point x="834.034" y="750.517" type="line"/>
+      <point x="834.033" y="761.118" type="line" smooth="yes"/>
+      <point x="834.033" y="1082.79"/>
+      <point x="758.599" y="1255"/>
+      <point x="610.741" y="1255" type="curve" smooth="yes"/>
+      <point x="398.661" y="1255"/>
+      <point x="398.997" y="900.717"/>
+      <point x="398.997" y="750.032" type="curve" smooth="yes"/>
+      <point x="398.997" y="738.792" type="line" smooth="yes"/>
+      <point x="398.997" y="412.518"/>
+      <point x="475.939" y="236"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Bold.ufo/glyphs/R_.glif b/source/Hack-Bold.ufo/glyphs/R_.glif
index 9ae9d1275..26501e8b1 100644
--- a/source/Hack-Bold.ufo/glyphs/R_.glif
+++ b/source/Hack-Bold.ufo/glyphs/R_.glif
@@ -1,55 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="R" format="1">
+<glyph name="R" format="2">
   <advance width="1233"/>
   <unicode hex="0052"/>
   <outline>
     <contour>
-      <point x="133" y="1493" type="line" name="hr00"/>
+      <point x="133" y="1493" type="line"/>
       <point x="559" y="1493" type="line" smooth="yes"/>
-      <point x="751" y="1493"/>
-      <point x="889" y="1459"/>
-      <point x="973" y="1391" type="curve" smooth="yes"/>
-      <point x="1057" y="1323"/>
-      <point x="1098" y="1209"/>
-      <point x="1098" y="1064" type="curve" name="sh01" smooth="yes"/>
-      <point x="1098" y="952"/>
-      <point x="1074" y="875"/>
-      <point x="1023" y="814" type="curve" smooth="yes"/>
-      <point x="975" y="755"/>
-      <point x="907" y="718"/>
-      <point x="807" y="705" type="curve" name="sh02"/>
-      <point x="838" y="698"/>
-      <point x="865" y="683"/>
-      <point x="884" y="664" type="curve" smooth="yes"/>
-      <point x="904" y="644"/>
-      <point x="930" y="604"/>
-      <point x="963" y="537" type="curve" smooth="yes"/>
-      <point x="1233" y="0" type="line" name="ab01"/>
+      <point x="868.067" y="1493"/>
+      <point x="1098" y="1417.42"/>
+      <point x="1098" y="1076.56" type="curve" smooth="yes"/>
+      <point x="1098" y="867.131"/>
+      <point x="1011.2" y="731.422"/>
+      <point x="807" y="705" type="curve"/>
+      <point x="888.358" y="686.565"/>
+      <point x="922.81" y="617.516"/>
+      <point x="956.857" y="549.281" type="curve" smooth="yes"/>
+      <point x="1233" y="0" type="line"/>
       <point x="909" y="0" type="line"/>
-      <point x="729" y="377" type="line"/>
-      <point x="708" y="421" type="line" smooth="yes"/>
-      <point x="652" y="536"/>
-      <point x="597" y="590"/>
-      <point x="522" y="590" type="curve" name="dv01" smooth="yes"/>
-      <point x="428" y="590" type="line" name="sh04"/>
-      <point x="428" y="0" type="line" name="ab02"/>
+      <point x="722.615" y="390.447" type="line" smooth="yes"/>
+      <point x="682.635" y="474.867"/>
+      <point x="628.11" y="590"/>
+      <point x="522" y="590" type="curve" smooth="yes"/>
+      <point x="428" y="590" type="line"/>
+      <point x="428" y="0" type="line"/>
       <point x="133" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="567" y="838" type="line" name="dv02" smooth="yes"/>
-      <point x="648" y="838"/>
-      <point x="706" y="854"/>
-      <point x="741" y="886" type="curve" smooth="yes"/>
-      <point x="773" y="915"/>
-      <point x="793" y="962"/>
-      <point x="793" y="1042" type="curve" name="ah01" smooth="yes"/>
-      <point x="793" y="1115"/>
-      <point x="776" y="1167"/>
-      <point x="741" y="1198" type="curve" smooth="yes"/>
-      <point x="706" y="1229"/>
-      <point x="648" y="1245"/>
-      <point x="567" y="1245" type="curve" name="sv01" smooth="yes"/>
-      <point x="428" y="1245" type="line" name="sh03"/>
+      <point x="567" y="838" type="line" smooth="yes"/>
+      <point x="714.807" y="838"/>
+      <point x="793" y="885.562"/>
+      <point x="793" y="1042.3" type="curve" smooth="yes"/>
+      <point x="793" y="1199.01"/>
+      <point x="714.832" y="1245"/>
+      <point x="567" y="1245" type="curve" smooth="yes"/>
+      <point x="428" y="1245" type="line"/>
       <point x="428" y="838" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/R_acute.glif b/source/Hack-Bold.ufo/glyphs/R_acute.glif
index 2278c406d..07619555f 100644
--- a/source/Hack-Bold.ufo/glyphs/R_acute.glif
+++ b/source/Hack-Bold.ufo/glyphs/R_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Racute" format="1">
+<glyph name="Racute" format="2">
   <advance width="1233"/>
   <unicode hex="0154"/>
   <outline>
@@ -14,7 +14,7 @@
       <point x="559" y="1493" type="line" smooth="yes"/>
       <point x="934" y="1493"/>
       <point x="1098" y="1366"/>
-      <point x="1098" y="1074" type="curve" name="sh01" smooth="yes"/>
+      <point x="1098" y="1074" type="curve" smooth="yes" name="sh01"/>
       <point x="1098" y="846"/>
       <point x="998" y="732"/>
       <point x="807" y="705" type="curve" name="sh03"/>
@@ -27,19 +27,19 @@
       <point x="708" y="421" type="line" smooth="yes"/>
       <point x="652" y="536"/>
       <point x="597" y="590"/>
-      <point x="522" y="590" type="curve" name="dv01" smooth="yes"/>
+      <point x="522" y="590" type="curve" smooth="yes" name="dv01"/>
       <point x="428" y="590" type="line" name="sh05"/>
       <point x="428" y="0" type="line" name="ab02"/>
       <point x="133" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="567" y="838" type="line" name="dv02" smooth="yes"/>
+      <point x="567" y="838" type="line" smooth="yes" name="dv02"/>
       <point x="728" y="838"/>
       <point x="793" y="896"/>
-      <point x="793" y="1043" type="curve" name="ah01" smooth="yes"/>
+      <point x="793" y="1043" type="curve" smooth="yes" name="ah01"/>
       <point x="793" y="1187"/>
       <point x="730" y="1245"/>
-      <point x="567" y="1245" type="curve" name="sv01" smooth="yes"/>
+      <point x="567" y="1245" type="curve" smooth="yes" name="sv01"/>
       <point x="428" y="1245" type="line" name="sh04"/>
       <point x="428" y="838" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/R_caron.glif b/source/Hack-Bold.ufo/glyphs/R_caron.glif
index b2cd97742..195e91e06 100644
--- a/source/Hack-Bold.ufo/glyphs/R_caron.glif
+++ b/source/Hack-Bold.ufo/glyphs/R_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Rcaron" format="1">
+<glyph name="Rcaron" format="2">
   <advance width="1233"/>
   <unicode hex="0158"/>
   <outline>
@@ -17,7 +17,7 @@
       <point x="559" y="1493" type="line" smooth="yes"/>
       <point x="934" y="1493"/>
       <point x="1098" y="1366"/>
-      <point x="1098" y="1074" type="curve" name="sh04" smooth="yes"/>
+      <point x="1098" y="1074" type="curve" smooth="yes" name="sh04"/>
       <point x="1098" y="846"/>
       <point x="998" y="732"/>
       <point x="807" y="705" type="curve" name="sh06"/>
@@ -30,19 +30,19 @@
       <point x="708" y="421" type="line" smooth="yes"/>
       <point x="652" y="536"/>
       <point x="597" y="590"/>
-      <point x="522" y="590" type="curve" name="dv01" smooth="yes"/>
+      <point x="522" y="590" type="curve" smooth="yes" name="dv01"/>
       <point x="428" y="590" type="line" name="sh07"/>
       <point x="428" y="0" type="line" name="ab02"/>
       <point x="133" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="567" y="838" type="line" name="dv02" smooth="yes"/>
+      <point x="567" y="838" type="line" smooth="yes" name="dv02"/>
       <point x="728" y="838"/>
       <point x="793" y="896"/>
-      <point x="793" y="1043" type="curve" name="ah01" smooth="yes"/>
+      <point x="793" y="1043" type="curve" smooth="yes" name="ah01"/>
       <point x="793" y="1187"/>
       <point x="730" y="1245"/>
-      <point x="567" y="1245" type="curve" name="sv01" smooth="yes"/>
+      <point x="567" y="1245" type="curve" smooth="yes" name="sv01"/>
       <point x="428" y="1245" type="line" name="sh02"/>
       <point x="428" y="838" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/R_ho.glif b/source/Hack-Bold.ufo/glyphs/R_ho.glif
index e1f9d8b43..66e09c0ad 100644
--- a/source/Hack-Bold.ufo/glyphs/R_ho.glif
+++ b/source/Hack-Bold.ufo/glyphs/R_ho.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Rho" format="1">
+<glyph name="Rho" format="2">
   <advance width="1233"/>
   <unicode hex="03A1"/>
   <outline>
@@ -8,22 +8,22 @@
       <point x="567" y="1493" type="line" smooth="yes"/>
       <point x="979" y="1493"/>
       <point x="1147" y="1355"/>
-      <point x="1147" y="1026" type="curve" name="sh01" smooth="yes"/>
+      <point x="1147" y="1026" type="curve" smooth="yes" name="sh01"/>
       <point x="1147" y="697"/>
       <point x="979" y="559"/>
-      <point x="567" y="559" type="curve" name="dv01" smooth="yes"/>
+      <point x="567" y="559" type="curve" smooth="yes" name="dv01"/>
       <point x="457" y="559" type="line" name="sh03"/>
       <point x="457" y="0" type="line" name="ab01"/>
       <point x="162" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="578" y="807" type="line" name="dv02" smooth="yes"/>
+      <point x="578" y="807" type="line" smooth="yes" name="dv02"/>
       <point x="770" y="807"/>
       <point x="840" y="865"/>
-      <point x="840" y="1026" type="curve" name="ah01" smooth="yes"/>
+      <point x="840" y="1026" type="curve" smooth="yes" name="ah01"/>
       <point x="840" y="1187"/>
       <point x="770" y="1245"/>
-      <point x="578" y="1245" type="curve" name="sv01" smooth="yes"/>
+      <point x="578" y="1245" type="curve" smooth="yes" name="sv01"/>
       <point x="457" y="1245" type="line" name="sh02"/>
       <point x="457" y="807" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/S_.glif b/source/Hack-Bold.ufo/glyphs/S_.glif
index fd5218e6c..8e5c292ad 100644
--- a/source/Hack-Bold.ufo/glyphs/S_.glif
+++ b/source/Hack-Bold.ufo/glyphs/S_.glif
@@ -1,79 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="S" format="1">
+<glyph name="S" format="2">
   <advance width="1233"/>
   <unicode hex="0053"/>
   <outline>
     <contour>
-      <point x="582" y="-29" type="curve" name="hr00" smooth="yes"/>
-      <point x="502" y="-29"/>
-      <point x="427" y="-22"/>
-      <point x="351" y="-3" type="curve" smooth="yes"/>
-      <point x="275" y="15"/>
-      <point x="203" y="41"/>
-      <point x="135" y="76" type="curve" name="sh02"/>
-      <point x="135" y="381" type="line" name="ih01"/>
-      <point x="218" y="322"/>
-      <point x="288" y="284"/>
-      <point x="364" y="256" type="curve" smooth="yes"/>
-      <point x="438" y="229"/>
-      <point x="510" y="215"/>
-      <point x="580" y="215" type="curve" name="dv01" smooth="yes"/>
-      <point x="656" y="215"/>
-      <point x="711" y="232"/>
-      <point x="751" y="265" type="curve" smooth="yes"/>
-      <point x="791" y="298"/>
-      <point x="811" y="344"/>
-      <point x="811" y="403" type="curve" name="ah01" smooth="yes"/>
-      <point x="811" y="448"/>
-      <point x="798" y="488"/>
-      <point x="771" y="521" type="curve" smooth="yes"/>
-      <point x="743" y="556"/>
-      <point x="703" y="581"/>
-      <point x="655" y="600" type="curve" smooth="yes"/>
-      <point x="510" y="655" type="line" smooth="yes"/>
-      <point x="357" y="714"/>
-      <point x="260" y="773"/>
-      <point x="208" y="834" type="curve" smooth="yes"/>
-      <point x="155" y="895"/>
-      <point x="129" y="979"/>
-      <point x="129" y="1085" type="curve" name="sh01" smooth="yes"/>
-      <point x="129" y="1221"/>
-      <point x="172" y="1327"/>
-      <point x="259" y="1404" type="curve" smooth="yes"/>
-      <point x="346" y="1481"/>
-      <point x="465" y="1520"/>
-      <point x="615" y="1520" type="curve" name="at01" smooth="yes"/>
-      <point x="763" y="1520"/>
-      <point x="883" y="1493"/>
+      <point x="612.926" y="-29" type="curve" smooth="yes"/>
+      <point x="443.482" y="-29"/>
+      <point x="253.066" y="15.2354"/>
+      <point x="135" y="76" type="curve"/>
+      <point x="135" y="381" type="line"/>
+      <point x="289.189" y="271.346"/>
+      <point x="437.796" y="215"/>
+      <point x="574.484" y="215" type="curve" smooth="yes"/>
+      <point x="724.092" y="215"/>
+      <point x="811" y="282.501"/>
+      <point x="811" y="404.974" type="curve" smooth="yes"/>
+      <point x="811" y="547.935"/>
+      <point x="692.581" y="590.325"/>
+      <point x="679.424" y="595.035" type="curve" smooth="yes"/>
+      <point x="308.666" y="727.752"/>
+      <point x="129" y="816.033"/>
+      <point x="129" y="1084.71" type="curve" smooth="yes"/>
+      <point x="129" y="1358.54"/>
+      <point x="315.624" y="1520"/>
+      <point x="631.24" y="1520" type="curve" smooth="yes"/>
+      <point x="764.771" y="1520"/>
+      <point x="887.187" y="1491.1"/>
       <point x="1026" y="1427" type="curve"/>
-      <point x="1026" y="1139" type="line" name="ih02"/>
-      <point x="901" y="1228"/>
-      <point x="766" y="1276"/>
-      <point x="638" y="1276" type="curve" name="sv01" smooth="yes"/>
-      <point x="567" y="1276"/>
-      <point x="512" y="1262"/>
-      <point x="475" y="1233" type="curve" smooth="yes"/>
-      <point x="437" y="1204"/>
-      <point x="418" y="1163"/>
-      <point x="418" y="1111" type="curve" name="sh03" smooth="yes"/>
-      <point x="418" y="1069"/>
-      <point x="432" y="1035"/>
-      <point x="460" y="1008" type="curve" smooth="yes"/>
-      <point x="487" y="981"/>
-      <point x="534" y="955"/>
-      <point x="633" y="918" type="curve" smooth="yes"/>
-      <point x="760" y="870" type="line" smooth="yes"/>
-      <point x="881" y="825"/>
-      <point x="969" y="767"/>
-      <point x="1025" y="696" type="curve" smooth="yes"/>
-      <point x="1082" y="623"/>
-      <point x="1110" y="530"/>
-      <point x="1110" y="415" type="curve" name="sh05" smooth="yes"/>
-      <point x="1110" y="268"/>
-      <point x="1065" y="157"/>
-      <point x="976" y="83" type="curve" smooth="yes"/>
-      <point x="886" y="8"/>
-      <point x="755" y="-29"/>
+      <point x="1026" y="1139" type="line"/>
+      <point x="901.038" y="1227.98"/>
+      <point x="765.932" y="1276"/>
+      <point x="638.885" y="1276" type="curve" smooth="yes"/>
+      <point x="500.354" y="1276"/>
+      <point x="418" y="1218.91"/>
+      <point x="418" y="1118.98" type="curve" smooth="yes"/>
+      <point x="418" y="998.302"/>
+      <point x="538.086" y="953.949"/>
+      <point x="678.209" y="902.197" type="curve" smooth="yes"/>
+      <point x="874.454" y="829.716"/>
+      <point x="1110" y="742.719"/>
+      <point x="1110" y="413.425" type="curve" smooth="yes"/>
+      <point x="1110" y="124.075"/>
+      <point x="928.132" y="-29"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Bold.ufo/glyphs/S_acute.glif b/source/Hack-Bold.ufo/glyphs/S_acute.glif
index 455f9e16b..eea98d20f 100644
--- a/source/Hack-Bold.ufo/glyphs/S_acute.glif
+++ b/source/Hack-Bold.ufo/glyphs/S_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Sacute" format="1">
+<glyph name="Sacute" format="2">
   <advance width="1233"/>
   <unicode hex="015A"/>
   <outline>
@@ -10,37 +10,37 @@
       <point x="500" y="1589" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="584" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="584" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="420" y="-29"/>
       <point x="280" y="4"/>
       <point x="135" y="76" type="curve" name="sh03"/>
       <point x="135" y="381" type="line" name="ih03"/>
       <point x="288" y="270"/>
       <point x="439" y="215"/>
-      <point x="576" y="215" type="curve" name="dv02" smooth="yes"/>
+      <point x="576" y="215" type="curve" smooth="yes" name="dv02"/>
       <point x="729" y="215"/>
       <point x="811" y="283"/>
-      <point x="811" y="399" type="curve" name="ah01" smooth="yes"/>
+      <point x="811" y="399" type="curve" smooth="yes" name="ah01"/>
       <point x="811" y="495"/>
       <point x="755" y="561"/>
       <point x="655" y="600" type="curve" smooth="yes"/>
       <point x="510" y="655" type="line" smooth="yes"/>
       <point x="219" y="764"/>
       <point x="129" y="876"/>
-      <point x="129" y="1075" type="curve" name="sh02" smooth="yes"/>
+      <point x="129" y="1075" type="curve" smooth="yes" name="sh02"/>
       <point x="129" y="1360"/>
       <point x="313" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="753" y="1520"/>
       <point x="890" y="1488"/>
       <point x="1026" y="1427" type="curve"/>
       <point x="1026" y="1139" type="line" name="ih04"/>
       <point x="898" y="1228"/>
       <point x="768" y="1276"/>
-      <point x="639" y="1276" type="curve" name="sv01" smooth="yes"/>
+      <point x="639" y="1276" type="curve" smooth="yes" name="sv01"/>
       <point x="495" y="1276"/>
       <point x="418" y="1216"/>
-      <point x="418" y="1112" type="curve" name="sh04" smooth="yes"/>
+      <point x="418" y="1112" type="curve" smooth="yes" name="sh04"/>
       <point x="418" y="1069"/>
       <point x="432" y="1035"/>
       <point x="460" y="1008" type="curve" smooth="yes"/>
@@ -50,7 +50,7 @@
       <point x="760" y="870" type="line" smooth="yes"/>
       <point x="1007" y="777"/>
       <point x="1110" y="641"/>
-      <point x="1110" y="417" type="curve" name="sh01" smooth="yes"/>
+      <point x="1110" y="417" type="curve" smooth="yes" name="sh01"/>
       <point x="1110" y="118"/>
       <point x="925" y="-29"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/S_caron.glif b/source/Hack-Bold.ufo/glyphs/S_caron.glif
index f5643ab82..c525f93b4 100644
--- a/source/Hack-Bold.ufo/glyphs/S_caron.glif
+++ b/source/Hack-Bold.ufo/glyphs/S_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Scaron" format="1">
+<glyph name="Scaron" format="2">
   <advance width="1233"/>
   <unicode hex="0160"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="461" y="1588" type="line"/>
     </contour>
     <contour>
-      <point x="582" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="582" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="502" y="-29"/>
       <point x="427" y="-22"/>
       <point x="351" y="-3" type="curve" smooth="yes"/>
@@ -26,13 +26,13 @@
       <point x="364" y="256" type="curve" smooth="yes"/>
       <point x="438" y="229"/>
       <point x="510" y="215"/>
-      <point x="580" y="215" type="curve" name="dv02" smooth="yes"/>
+      <point x="580" y="215" type="curve" smooth="yes" name="dv02"/>
       <point x="656" y="215"/>
       <point x="711" y="232"/>
       <point x="751" y="265" type="curve" smooth="yes"/>
       <point x="791" y="298"/>
       <point x="811" y="344"/>
-      <point x="811" y="403" type="curve" name="ah01" smooth="yes"/>
+      <point x="811" y="403" type="curve" smooth="yes" name="ah01"/>
       <point x="811" y="448"/>
       <point x="798" y="488"/>
       <point x="771" y="521" type="curve" smooth="yes"/>
@@ -45,26 +45,26 @@
       <point x="208" y="834" type="curve" smooth="yes"/>
       <point x="155" y="895"/>
       <point x="129" y="979"/>
-      <point x="129" y="1085" type="curve" name="sh01" smooth="yes"/>
+      <point x="129" y="1085" type="curve" smooth="yes" name="sh01"/>
       <point x="129" y="1221"/>
       <point x="172" y="1327"/>
       <point x="259" y="1404" type="curve" smooth="yes"/>
       <point x="346" y="1481"/>
       <point x="465" y="1520"/>
-      <point x="615" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="615" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="763" y="1520"/>
       <point x="883" y="1493"/>
       <point x="1026" y="1427" type="curve"/>
       <point x="1026" y="1139" type="line" name="ih03"/>
       <point x="901" y="1228"/>
       <point x="766" y="1276"/>
-      <point x="638" y="1276" type="curve" name="sv01" smooth="yes"/>
+      <point x="638" y="1276" type="curve" smooth="yes" name="sv01"/>
       <point x="567" y="1276"/>
       <point x="512" y="1262"/>
       <point x="475" y="1233" type="curve" smooth="yes"/>
       <point x="437" y="1204"/>
       <point x="418" y="1163"/>
-      <point x="418" y="1111" type="curve" name="sh02" smooth="yes"/>
+      <point x="418" y="1111" type="curve" smooth="yes" name="sh02"/>
       <point x="418" y="1069"/>
       <point x="432" y="1035"/>
       <point x="460" y="1008" type="curve" smooth="yes"/>
@@ -77,7 +77,7 @@
       <point x="1025" y="696" type="curve" smooth="yes"/>
       <point x="1082" y="623"/>
       <point x="1110" y="530"/>
-      <point x="1110" y="415" type="curve" name="sh05" smooth="yes"/>
+      <point x="1110" y="415" type="curve" smooth="yes" name="sh05"/>
       <point x="1110" y="268"/>
       <point x="1065" y="157"/>
       <point x="976" y="83" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/S_cedilla.glif b/source/Hack-Bold.ufo/glyphs/S_cedilla.glif
index 36f4ed2c8..a5546cd22 100644
--- a/source/Hack-Bold.ufo/glyphs/S_cedilla.glif
+++ b/source/Hack-Bold.ufo/glyphs/S_cedilla.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Scedilla" format="1">
+<glyph name="Scedilla" format="2">
   <advance width="1233"/>
   <unicode hex="015E"/>
   <outline>
     <contour>
-      <point x="1025" y="696" type="curve" name="hr00" smooth="yes"/>
+      <point x="1025" y="696" type="curve" smooth="yes" name="hr00"/>
       <point x="1082" y="623"/>
       <point x="1110" y="530"/>
-      <point x="1110" y="415" type="curve" name="sh02" smooth="yes"/>
+      <point x="1110" y="415" type="curve" smooth="yes" name="sh02"/>
       <point x="1110" y="268"/>
       <point x="1065" y="157"/>
       <point x="976" y="83" type="curve" smooth="yes"/>
@@ -19,16 +19,16 @@
       <point x="792" y="-115" type="curve" smooth="yes"/>
       <point x="810" y="-149"/>
       <point x="819" y="-184"/>
-      <point x="819" y="-221" type="curve" name="sh01" smooth="yes"/>
+      <point x="819" y="-221" type="curve" smooth="yes" name="sh01"/>
       <point x="819" y="-282"/>
       <point x="796" y="-327"/>
       <point x="757" y="-356" type="curve" smooth="yes"/>
       <point x="722" y="-383"/>
       <point x="668" y="-401"/>
-      <point x="571" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="571" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="539" y="-401"/>
       <point x="504" y="-399"/>
-      <point x="471" y="-395" type="curve" name="sv01" smooth="yes"/>
+      <point x="471" y="-395" type="curve" smooth="yes" name="sv01"/>
       <point x="420" y="-388"/>
       <point x="398" y="-382"/>
       <point x="367" y="-375" type="curve"/>
@@ -38,7 +38,7 @@
       <point x="454" y="-245" type="curve" smooth="yes"/>
       <point x="482" y="-251"/>
       <point x="508" y="-254"/>
-      <point x="532" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="532" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="570" y="-254"/>
       <point x="600" y="-246"/>
       <point x="623" y="-231" type="curve" smooth="yes"/>
@@ -70,7 +70,7 @@
       <point x="751" y="265" type="curve" smooth="yes"/>
       <point x="791" y="298"/>
       <point x="811" y="344"/>
-      <point x="811" y="403" type="curve" name="sh04" smooth="yes"/>
+      <point x="811" y="403" type="curve" smooth="yes" name="sh04"/>
       <point x="811" y="448"/>
       <point x="798" y="488"/>
       <point x="771" y="521" type="curve" smooth="yes"/>
@@ -83,33 +83,33 @@
       <point x="208" y="834" type="curve" smooth="yes"/>
       <point x="155" y="895"/>
       <point x="129" y="979"/>
-      <point x="129" y="1085" type="curve" name="dh01" smooth="yes"/>
+      <point x="129" y="1085" type="curve" smooth="yes" name="dh01"/>
       <point x="129" y="1221"/>
       <point x="172" y="1327"/>
       <point x="259" y="1404" type="curve" smooth="yes"/>
       <point x="346" y="1481"/>
       <point x="465" y="1520"/>
-      <point x="615" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="615" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="763" y="1520"/>
       <point x="883" y="1493"/>
       <point x="1026" y="1427" type="curve"/>
       <point x="1026" y="1139" type="line" name="ih04"/>
       <point x="901" y="1228"/>
       <point x="766" y="1276"/>
-      <point x="638" y="1276" type="curve" name="sv02" smooth="yes"/>
+      <point x="638" y="1276" type="curve" smooth="yes" name="sv02"/>
       <point x="567" y="1276"/>
       <point x="512" y="1262"/>
       <point x="475" y="1233" type="curve" smooth="yes"/>
       <point x="437" y="1204"/>
       <point x="418" y="1163"/>
-      <point x="418" y="1111" type="curve" name="dh02" smooth="yes"/>
+      <point x="418" y="1111" type="curve" smooth="yes" name="dh02"/>
       <point x="418" y="1069"/>
       <point x="432" y="1035"/>
       <point x="460" y="1008" type="curve" smooth="yes"/>
       <point x="487" y="981"/>
       <point x="534" y="955"/>
       <point x="633" y="918" type="curve" smooth="yes"/>
-      <point x="760" y="870" type="line" name="hr02" smooth="yes"/>
+      <point x="760" y="870" type="line" smooth="yes" name="hr02"/>
       <point x="881" y="825"/>
       <point x="969" y="767"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/S_circumflex.glif b/source/Hack-Bold.ufo/glyphs/S_circumflex.glif
index 0c064a1b1..a013686e1 100644
--- a/source/Hack-Bold.ufo/glyphs/S_circumflex.glif
+++ b/source/Hack-Bold.ufo/glyphs/S_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Scircumflex" format="1">
+<glyph name="Scircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="015C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/S_igma.glif b/source/Hack-Bold.ufo/glyphs/S_igma.glif
index 5661bdf84..e46f51706 100644
--- a/source/Hack-Bold.ufo/glyphs/S_igma.glif
+++ b/source/Hack-Bold.ufo/glyphs/S_igma.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Sigma" format="1">
+<glyph name="Sigma" format="2">
   <advance width="1233"/>
   <unicode hex="03A3"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/T_.glif b/source/Hack-Bold.ufo/glyphs/T_.glif
index b22c39dfd..20bbc1b2d 100644
--- a/source/Hack-Bold.ufo/glyphs/T_.glif
+++ b/source/Hack-Bold.ufo/glyphs/T_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="T" format="1">
+<glyph name="T" format="2">
   <advance width="1233"/>
   <unicode hex="0054"/>
   <outline>
     <contour>
-      <point x="469" y="1235" type="line" name="hr00"/>
+      <point x="469" y="1235" type="line"/>
       <point x="90" y="1235" type="line"/>
-      <point x="90" y="1493" type="line" name="at01"/>
+      <point x="90" y="1493" type="line"/>
       <point x="1143" y="1493" type="line"/>
-      <point x="1143" y="1235" type="line" name="sv01"/>
-      <point x="764" y="1235" type="line" name="dh01"/>
-      <point x="764" y="0" type="line" name="ab01"/>
+      <point x="1143" y="1235" type="line"/>
+      <point x="764" y="1235" type="line"/>
+      <point x="764" y="0" type="line"/>
       <point x="469" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/T_au.glif b/source/Hack-Bold.ufo/glyphs/T_au.glif
index 602bacb48..d99dc4046 100644
--- a/source/Hack-Bold.ufo/glyphs/T_au.glif
+++ b/source/Hack-Bold.ufo/glyphs/T_au.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Tau" format="1">
+<glyph name="Tau" format="2">
   <advance width="1233"/>
   <unicode hex="03A4"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/T_bar.glif b/source/Hack-Bold.ufo/glyphs/T_bar.glif
index 5960d7946..0d4bffd1d 100644
--- a/source/Hack-Bold.ufo/glyphs/T_bar.glif
+++ b/source/Hack-Bold.ufo/glyphs/T_bar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Tbar" format="1">
+<glyph name="Tbar" format="2">
   <advance width="1233"/>
   <unicode hex="0166"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/T_caron.glif b/source/Hack-Bold.ufo/glyphs/T_caron.glif
index c3e82aef9..a085360d7 100644
--- a/source/Hack-Bold.ufo/glyphs/T_caron.glif
+++ b/source/Hack-Bold.ufo/glyphs/T_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Tcaron" format="1">
+<glyph name="Tcaron" format="2">
   <advance width="1233"/>
   <unicode hex="0164"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/T_heta.glif b/source/Hack-Bold.ufo/glyphs/T_heta.glif
index 8077e9822..3a85d2642 100644
--- a/source/Hack-Bold.ufo/glyphs/T_heta.glif
+++ b/source/Hack-Bold.ufo/glyphs/T_heta.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Theta" format="1">
+<glyph name="Theta" format="2">
   <advance width="1233"/>
   <unicode hex="0398"/>
   <outline>
     <contour>
-      <point x="10" y="680" type="curve" name="hr00" smooth="yes"/>
+      <point x="10" y="680" type="curve" smooth="yes" name="hr00"/>
       <point x="10" y="1154"/>
       <point x="230" y="1418"/>
       <point x="618" y="1418" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/T_horn.glif b/source/Hack-Bold.ufo/glyphs/T_horn.glif
index d5302010d..b1cb6eec3 100644
--- a/source/Hack-Bold.ufo/glyphs/T_horn.glif
+++ b/source/Hack-Bold.ufo/glyphs/T_horn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Thorn" format="1">
+<glyph name="Thorn" format="2">
   <advance width="1233"/>
   <unicode hex="00DE"/>
   <outline>
@@ -7,34 +7,34 @@
       <point x="162" y="1493" type="line" name="hr00"/>
       <point x="457" y="1493" type="line" name="sh01"/>
       <point x="457" y="1255" type="line"/>
-      <point x="567" y="1255" type="line" name="dv04" smooth="yes"/>
+      <point x="567" y="1255" type="line" smooth="yes" name="dv04"/>
       <point x="773" y="1255"/>
       <point x="921" y="1219"/>
       <point x="1012" y="1146" type="curve" smooth="yes"/>
       <point x="1103" y="1073"/>
       <point x="1147" y="952"/>
-      <point x="1147" y="791" type="curve" name="sh02" smooth="yes"/>
+      <point x="1147" y="791" type="curve" smooth="yes" name="sh02"/>
       <point x="1147" y="630"/>
       <point x="1101" y="513"/>
       <point x="1010" y="441" type="curve" smooth="yes"/>
       <point x="917" y="366"/>
       <point x="770" y="332"/>
-      <point x="567" y="332" type="curve" name="dv01" smooth="yes"/>
+      <point x="567" y="332" type="curve" smooth="yes" name="dv01"/>
       <point x="457" y="332" type="line" name="sh03"/>
       <point x="457" y="0" type="line" name="ab01"/>
       <point x="162" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="578" y="575" type="line" name="dv02" smooth="yes"/>
+      <point x="578" y="575" type="line" smooth="yes" name="dv02"/>
       <point x="773" y="575"/>
       <point x="840" y="633"/>
-      <point x="840" y="793" type="curve" name="ah01" smooth="yes"/>
+      <point x="840" y="793" type="curve" smooth="yes" name="ah01"/>
       <point x="840" y="874"/>
       <point x="821" y="931"/>
       <point x="782" y="964" type="curve" smooth="yes"/>
       <point x="743" y="997"/>
       <point x="675" y="1014"/>
-      <point x="578" y="1014" type="curve" name="dv03" smooth="yes"/>
+      <point x="578" y="1014" type="curve" smooth="yes" name="dv03"/>
       <point x="457" y="1014" type="line" name="sh04"/>
       <point x="457" y="575" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/U_.glif b/source/Hack-Bold.ufo/glyphs/U_.glif
index 106503764..e10a7223d 100644
--- a/source/Hack-Bold.ufo/glyphs/U_.glif
+++ b/source/Hack-Bold.ufo/glyphs/U_.glif
@@ -1,39 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="U" format="1">
+<glyph name="U" format="2">
   <advance width="1233"/>
   <unicode hex="0055"/>
   <outline>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr00" smooth="yes"/>
-      <point x="438" y="-29"/>
-      <point x="309" y="17"/>
-      <point x="228" y="109" type="curve" smooth="yes"/>
-      <point x="147" y="202"/>
-      <point x="106" y="349"/>
-      <point x="106" y="551" type="curve" name="sh01" smooth="yes"/>
-      <point x="106" y="1493" type="line" name="at01"/>
+      <point x="617.774" y="-29" type="curve" smooth="yes"/>
+      <point x="297.52" y="-29"/>
+      <point x="106" y="188.052"/>
+      <point x="106" y="551" type="curve" smooth="yes"/>
+      <point x="106" y="1493" type="line"/>
       <point x="401" y="1493" type="line"/>
-      <point x="401" y="477" type="line" name="sh02" smooth="yes"/>
-      <point x="401" y="401"/>
-      <point x="422" y="341"/>
-      <point x="458" y="301" type="curve" smooth="yes"/>
-      <point x="497" y="258"/>
-      <point x="552" y="238"/>
-      <point x="616" y="238" type="curve" name="dv01" smooth="yes"/>
-      <point x="680" y="238"/>
-      <point x="735" y="258"/>
-      <point x="774" y="301" type="curve" smooth="yes"/>
-      <point x="810" y="341"/>
-      <point x="831" y="401"/>
-      <point x="831" y="477" type="curve" name="ah01" smooth="yes"/>
-      <point x="831" y="1493" type="line" name="at02"/>
+      <point x="401" y="477" type="line" smooth="yes"/>
+      <point x="401" y="327.512"/>
+      <point x="481.523" y="238"/>
+      <point x="616" y="238" type="curve" smooth="yes"/>
+      <point x="750.477" y="238"/>
+      <point x="831" y="327.512"/>
+      <point x="831" y="477" type="curve" smooth="yes"/>
+      <point x="831" y="1493" type="line"/>
       <point x="1126" y="1493" type="line"/>
-      <point x="1126" y="551" type="line" name="sh03" smooth="yes"/>
-      <point x="1126" y="348"/>
-      <point x="1086" y="200"/>
-      <point x="1005" y="109" type="curve" smooth="yes"/>
-      <point x="924" y="17"/>
-      <point x="794" y="-29"/>
+      <point x="1126" y="551" type="line" smooth="yes"/>
+      <point x="1126" y="147.185"/>
+      <point x="971.618" y="-29"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Bold.ufo/glyphs/U_acute.glif b/source/Hack-Bold.ufo/glyphs/U_acute.glif
index f8c30ee03..cf571d898 100644
--- a/source/Hack-Bold.ufo/glyphs/U_acute.glif
+++ b/source/Hack-Bold.ufo/glyphs/U_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Uacute" format="1">
+<glyph name="Uacute" format="2">
   <advance width="1233"/>
   <unicode hex="00DA"/>
   <outline>
@@ -10,31 +10,31 @@
       <point x="469" y="1588" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="438" y="-29"/>
       <point x="309" y="17"/>
       <point x="228" y="109" type="curve" smooth="yes"/>
       <point x="147" y="202"/>
       <point x="106" y="349"/>
-      <point x="106" y="551" type="curve" name="sh02" smooth="yes"/>
+      <point x="106" y="551" type="curve" smooth="yes" name="sh02"/>
       <point x="106" y="1493" type="line" name="at01"/>
       <point x="401" y="1493" type="line"/>
-      <point x="401" y="477" type="line" name="sh03" smooth="yes"/>
+      <point x="401" y="477" type="line" smooth="yes" name="sh03"/>
       <point x="401" y="401"/>
       <point x="422" y="341"/>
       <point x="458" y="301" type="curve" smooth="yes"/>
       <point x="497" y="258"/>
       <point x="552" y="238"/>
-      <point x="616" y="238" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="238" type="curve" smooth="yes" name="dv02"/>
       <point x="680" y="238"/>
       <point x="735" y="258"/>
       <point x="774" y="301" type="curve" smooth="yes"/>
       <point x="810" y="341"/>
       <point x="831" y="401"/>
-      <point x="831" y="477" type="curve" name="ah01" smooth="yes"/>
+      <point x="831" y="477" type="curve" smooth="yes" name="ah01"/>
       <point x="831" y="1493" type="line" name="at02"/>
       <point x="1126" y="1493" type="line"/>
-      <point x="1126" y="551" type="line" name="sh01" smooth="yes"/>
+      <point x="1126" y="551" type="line" smooth="yes" name="sh01"/>
       <point x="1126" y="348"/>
       <point x="1086" y="200"/>
       <point x="1005" y="109" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/U_breve.glif b/source/Hack-Bold.ufo/glyphs/U_breve.glif
index 41654b13f..064a6e516 100644
--- a/source/Hack-Bold.ufo/glyphs/U_breve.glif
+++ b/source/Hack-Bold.ufo/glyphs/U_breve.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ubreve" format="1">
+<glyph name="Ubreve" format="2">
   <advance width="1233"/>
   <unicode hex="016C"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="809" y="1852" type="line"/>
       <point x="784" y="1771"/>
       <point x="720" y="1731"/>
-      <point x="616" y="1731" type="curve" name="hr01" smooth="yes"/>
+      <point x="616" y="1731" type="curve" smooth="yes" name="hr01"/>
       <point x="515" y="1731"/>
       <point x="447" y="1773"/>
       <point x="422" y="1852" type="curve" name="hr02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/U_circumflex.glif b/source/Hack-Bold.ufo/glyphs/U_circumflex.glif
index a3bab2eb4..3dc729132 100644
--- a/source/Hack-Bold.ufo/glyphs/U_circumflex.glif
+++ b/source/Hack-Bold.ufo/glyphs/U_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ucircumflex" format="1">
+<glyph name="Ucircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00DB"/>
   <outline>
@@ -13,31 +13,31 @@
       <point x="240" y="1588" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="438" y="-29"/>
       <point x="309" y="17"/>
       <point x="228" y="109" type="curve" smooth="yes"/>
       <point x="147" y="202"/>
       <point x="106" y="349"/>
-      <point x="106" y="551" type="curve" name="sh02" smooth="yes"/>
+      <point x="106" y="551" type="curve" smooth="yes" name="sh02"/>
       <point x="106" y="1493" type="line" name="at01"/>
       <point x="401" y="1493" type="line"/>
-      <point x="401" y="477" type="line" name="sh03" smooth="yes"/>
+      <point x="401" y="477" type="line" smooth="yes" name="sh03"/>
       <point x="401" y="401"/>
       <point x="422" y="341"/>
       <point x="458" y="301" type="curve" smooth="yes"/>
       <point x="497" y="258"/>
       <point x="552" y="238"/>
-      <point x="616" y="238" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="238" type="curve" smooth="yes" name="dv02"/>
       <point x="680" y="238"/>
       <point x="735" y="258"/>
       <point x="774" y="301" type="curve" smooth="yes"/>
       <point x="810" y="341"/>
       <point x="831" y="401"/>
-      <point x="831" y="477" type="curve" name="ah01" smooth="yes"/>
+      <point x="831" y="477" type="curve" smooth="yes" name="ah01"/>
       <point x="831" y="1493" type="line" name="at02"/>
       <point x="1126" y="1493" type="line"/>
-      <point x="1126" y="551" type="line" name="sh01" smooth="yes"/>
+      <point x="1126" y="551" type="line" smooth="yes" name="sh01"/>
       <point x="1126" y="348"/>
       <point x="1086" y="200"/>
       <point x="1005" y="109" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/U_dieresis.glif b/source/Hack-Bold.ufo/glyphs/U_dieresis.glif
index 6cab5e78c..c0b862c71 100644
--- a/source/Hack-Bold.ufo/glyphs/U_dieresis.glif
+++ b/source/Hack-Bold.ufo/glyphs/U_dieresis.glif
@@ -1,70 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Udieresis" format="1">
+<glyph name="Udieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00DC"/>
   <outline>
     <contour>
-      <point x="331" y="1606" type="line" name="dv02" smooth="yes"/>
+      <point x="331" y="1606" type="line" smooth="yes" name="dv02"/>
       <point x="311" y="1606"/>
       <point x="301" y="1616"/>
-      <point x="301" y="1636" type="curve" name="ih01" smooth="yes"/>
+      <point x="301" y="1636" type="curve" smooth="yes" name="ih01"/>
       <point x="301" y="1822" type="line" smooth="yes"/>
       <point x="301" y="1842"/>
       <point x="311" y="1852"/>
-      <point x="331" y="1852" type="curve" name="dv03" smooth="yes"/>
+      <point x="331" y="1852" type="curve" smooth="yes" name="dv03"/>
       <point x="507" y="1852" type="line" smooth="yes"/>
       <point x="527" y="1852"/>
       <point x="537" y="1842"/>
       <point x="537" y="1822" type="curve" smooth="yes"/>
-      <point x="537" y="1636" type="line" name="sh01" smooth="yes"/>
+      <point x="537" y="1636" type="line" smooth="yes" name="sh01"/>
       <point x="537" y="1616"/>
       <point x="527" y="1606"/>
       <point x="507" y="1606" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1606" type="line" name="sv01" smooth="yes"/>
+      <point x="726" y="1606" type="line" smooth="yes" name="sv01"/>
       <point x="706" y="1606"/>
       <point x="696" y="1616"/>
-      <point x="696" y="1636" type="curve" name="dh03" smooth="yes"/>
+      <point x="696" y="1636" type="curve" smooth="yes" name="dh03"/>
       <point x="696" y="1822" type="line" smooth="yes"/>
       <point x="696" y="1842"/>
       <point x="706" y="1852"/>
-      <point x="726" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="726" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="902" y="1852" type="line" smooth="yes"/>
       <point x="922" y="1852"/>
       <point x="932" y="1842"/>
       <point x="932" y="1822" type="curve" smooth="yes"/>
-      <point x="932" y="1636" type="line" name="dh04" smooth="yes"/>
+      <point x="932" y="1636" type="line" smooth="yes" name="dh04"/>
       <point x="932" y="1616"/>
       <point x="922" y="1606"/>
       <point x="902" y="1606" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="hr01"/>
       <point x="438" y="-29"/>
       <point x="309" y="17"/>
       <point x="228" y="109" type="curve" smooth="yes"/>
       <point x="147" y="202"/>
       <point x="106" y="349"/>
-      <point x="106" y="551" type="curve" name="dh01" smooth="yes"/>
+      <point x="106" y="551" type="curve" smooth="yes" name="dh01"/>
       <point x="106" y="1493" type="line" name="at01"/>
       <point x="401" y="1493" type="line"/>
-      <point x="401" y="477" type="line" name="dh02" smooth="yes"/>
+      <point x="401" y="477" type="line" smooth="yes" name="dh02"/>
       <point x="401" y="401"/>
       <point x="422" y="341"/>
       <point x="458" y="301" type="curve" smooth="yes"/>
       <point x="497" y="258"/>
       <point x="552" y="238"/>
-      <point x="616" y="238" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="238" type="curve" smooth="yes" name="dv01"/>
       <point x="680" y="238"/>
       <point x="735" y="258"/>
       <point x="774" y="301" type="curve" smooth="yes"/>
       <point x="810" y="341"/>
       <point x="831" y="401"/>
-      <point x="831" y="477" type="curve" name="ih02" smooth="yes"/>
+      <point x="831" y="477" type="curve" smooth="yes" name="ih02"/>
       <point x="831" y="1493" type="line" name="at02"/>
       <point x="1126" y="1493" type="line"/>
-      <point x="1126" y="551" type="line" name="sh02" smooth="yes"/>
+      <point x="1126" y="551" type="line" smooth="yes" name="sh02"/>
       <point x="1126" y="348"/>
       <point x="1086" y="200"/>
       <point x="1005" y="109" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/U_grave.glif b/source/Hack-Bold.ufo/glyphs/U_grave.glif
index bcd1a3e65..117df95cb 100644
--- a/source/Hack-Bold.ufo/glyphs/U_grave.glif
+++ b/source/Hack-Bold.ufo/glyphs/U_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ugrave" format="1">
+<glyph name="Ugrave" format="2">
   <advance width="1233"/>
   <unicode hex="00D9"/>
   <outline>
@@ -10,31 +10,31 @@
       <point x="569" y="1588" type="line"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="438" y="-29"/>
       <point x="309" y="17"/>
       <point x="228" y="109" type="curve" smooth="yes"/>
       <point x="147" y="202"/>
       <point x="106" y="349"/>
-      <point x="106" y="551" type="curve" name="sh01" smooth="yes"/>
+      <point x="106" y="551" type="curve" smooth="yes" name="sh01"/>
       <point x="106" y="1493" type="line" name="at01"/>
       <point x="401" y="1493" type="line"/>
-      <point x="401" y="477" type="line" name="sh02" smooth="yes"/>
+      <point x="401" y="477" type="line" smooth="yes" name="sh02"/>
       <point x="401" y="401"/>
       <point x="422" y="341"/>
       <point x="458" y="301" type="curve" smooth="yes"/>
       <point x="497" y="258"/>
       <point x="552" y="238"/>
-      <point x="616" y="238" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="238" type="curve" smooth="yes" name="dv02"/>
       <point x="680" y="238"/>
       <point x="735" y="258"/>
       <point x="774" y="301" type="curve" smooth="yes"/>
       <point x="810" y="341"/>
       <point x="831" y="401"/>
-      <point x="831" y="477" type="curve" name="ah01" smooth="yes"/>
+      <point x="831" y="477" type="curve" smooth="yes" name="ah01"/>
       <point x="831" y="1493" type="line" name="at02"/>
       <point x="1126" y="1493" type="line"/>
-      <point x="1126" y="551" type="line" name="sh03" smooth="yes"/>
+      <point x="1126" y="551" type="line" smooth="yes" name="sh03"/>
       <point x="1126" y="348"/>
       <point x="1086" y="200"/>
       <point x="1005" y="109" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/U_horn.glif b/source/Hack-Bold.ufo/glyphs/U_horn.glif
index 7ff622392..14b217b28 100644
--- a/source/Hack-Bold.ufo/glyphs/U_horn.glif
+++ b/source/Hack-Bold.ufo/glyphs/U_horn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Uhorn" format="1">
+<glyph name="Uhorn" format="2">
   <advance width="1233"/>
   <unicode hex="01AF"/>
   <outline>
@@ -7,35 +7,35 @@
       <point x="1206" y="1555" type="line" name="at03"/>
       <point x="1221" y="1482"/>
       <point x="1228" y="1419"/>
-      <point x="1228" y="1367" type="curve" name="dh06" smooth="yes"/>
+      <point x="1228" y="1367" type="curve" smooth="yes" name="dh06"/>
       <point x="1228" y="1211"/>
       <point x="1166" y="1127"/>
-      <point x="1051" y="1127" type="curve" name="sv01" smooth="yes"/>
+      <point x="1051" y="1127" type="curve" smooth="yes" name="sv01"/>
       <point x="1042" y="1127"/>
       <point x="1034" y="1126"/>
       <point x="1025" y="1129" type="curve" name="hr01"/>
-      <point x="1025" y="551" type="line" name="dh04" smooth="yes"/>
+      <point x="1025" y="551" type="line" smooth="yes" name="dh04"/>
       <point x="1025" y="146"/>
       <point x="872" y="-29"/>
-      <point x="515" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="515" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="159" y="-29"/>
       <point x="5" y="146"/>
-      <point x="5" y="551" type="curve" name="dh01" smooth="yes"/>
+      <point x="5" y="551" type="curve" smooth="yes" name="dh01"/>
       <point x="5" y="1493" type="line" name="at01"/>
       <point x="300" y="1493" type="line"/>
-      <point x="300" y="477" type="line" name="dh02" smooth="yes"/>
+      <point x="300" y="477" type="line" smooth="yes" name="dh02"/>
       <point x="300" y="328"/>
       <point x="379" y="238"/>
-      <point x="515" y="238" type="curve" name="dv02" smooth="yes"/>
+      <point x="515" y="238" type="curve" smooth="yes" name="dv02"/>
       <point x="651" y="238"/>
       <point x="730" y="328"/>
-      <point x="730" y="477" type="curve" name="dh03" smooth="yes"/>
+      <point x="730" y="477" type="curve" smooth="yes" name="dh03"/>
       <point x="730" y="1493" type="line" name="at02"/>
       <point x="1025" y="1493" type="line" name="sh01"/>
       <point x="1025" y="1297" type="line" name="hr02"/>
       <point x="1058" y="1310"/>
       <point x="1081" y="1345"/>
-      <point x="1081" y="1406" type="curve" name="dh05" smooth="yes"/>
+      <point x="1081" y="1406" type="curve" smooth="yes" name="dh05"/>
       <point x="1081" y="1446"/>
       <point x="1071" y="1503"/>
       <point x="1050" y="1555" type="curve" name="ih01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/U_hungarumlaut.glif b/source/Hack-Bold.ufo/glyphs/U_hungarumlaut.glif
index 70b7c04d8..adf7886cb 100644
--- a/source/Hack-Bold.ufo/glyphs/U_hungarumlaut.glif
+++ b/source/Hack-Bold.ufo/glyphs/U_hungarumlaut.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Uhungarumlaut" format="1">
+<glyph name="Uhungarumlaut" format="2">
   <advance width="1233"/>
   <unicode hex="0170"/>
   <outline>
@@ -16,22 +16,22 @@
       <point x="639" y="1588" type="line"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="260" y="-29"/>
       <point x="106" y="146"/>
-      <point x="106" y="551" type="curve" name="sh01" smooth="yes"/>
+      <point x="106" y="551" type="curve" smooth="yes" name="sh01"/>
       <point x="106" y="1493" type="line" name="at01"/>
       <point x="401" y="1493" type="line"/>
-      <point x="401" y="477" type="line" name="sh03" smooth="yes"/>
+      <point x="401" y="477" type="line" smooth="yes" name="sh03"/>
       <point x="401" y="328"/>
       <point x="480" y="238"/>
-      <point x="616" y="238" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="238" type="curve" smooth="yes" name="dv02"/>
       <point x="752" y="238"/>
       <point x="831" y="328"/>
-      <point x="831" y="477" type="curve" name="ah01" smooth="yes"/>
+      <point x="831" y="477" type="curve" smooth="yes" name="ah01"/>
       <point x="831" y="1493" type="line" name="at02"/>
       <point x="1126" y="1493" type="line"/>
-      <point x="1126" y="551" type="line" name="sh02" smooth="yes"/>
+      <point x="1126" y="551" type="line" smooth="yes" name="sh02"/>
       <point x="1126" y="146"/>
       <point x="973" y="-29"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/U_macron.glif b/source/Hack-Bold.ufo/glyphs/U_macron.glif
index 57bf20cd8..603b3a7ad 100644
--- a/source/Hack-Bold.ufo/glyphs/U_macron.glif
+++ b/source/Hack-Bold.ufo/glyphs/U_macron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Umacron" format="1">
+<glyph name="Umacron" format="2">
   <advance width="1233"/>
   <unicode hex="016A"/>
   <outline>
@@ -10,22 +10,22 @@
       <point x="301" y="1642" type="line"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="260" y="-29"/>
       <point x="106" y="146"/>
-      <point x="106" y="551" type="curve" name="sh01" smooth="yes"/>
+      <point x="106" y="551" type="curve" smooth="yes" name="sh01"/>
       <point x="106" y="1493" type="line" name="at01"/>
       <point x="401" y="1493" type="line"/>
-      <point x="401" y="477" type="line" name="sh02" smooth="yes"/>
+      <point x="401" y="477" type="line" smooth="yes" name="sh02"/>
       <point x="401" y="328"/>
       <point x="480" y="238"/>
-      <point x="616" y="238" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="238" type="curve" smooth="yes" name="dv02"/>
       <point x="752" y="238"/>
       <point x="831" y="328"/>
-      <point x="831" y="477" type="curve" name="ah01" smooth="yes"/>
+      <point x="831" y="477" type="curve" smooth="yes" name="ah01"/>
       <point x="831" y="1493" type="line" name="at02"/>
       <point x="1126" y="1493" type="line"/>
-      <point x="1126" y="551" type="line" name="sh03" smooth="yes"/>
+      <point x="1126" y="551" type="line" smooth="yes" name="sh03"/>
       <point x="1126" y="146"/>
       <point x="973" y="-29"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/U_ogonek.glif b/source/Hack-Bold.ufo/glyphs/U_ogonek.glif
index 781bb1652..fa69c3ea5 100644
--- a/source/Hack-Bold.ufo/glyphs/U_ogonek.glif
+++ b/source/Hack-Bold.ufo/glyphs/U_ogonek.glif
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Uogonek" format="1">
+<glyph name="Uogonek" format="2">
   <advance width="1233"/>
   <unicode hex="0172"/>
   <outline>
     <contour>
       <point x="1126" y="1493" type="line" name="at01"/>
-      <point x="1126" y="551" type="line" name="dh06" smooth="yes"/>
+      <point x="1126" y="551" type="line" smooth="yes" name="dh06"/>
       <point x="1126" y="170"/>
       <point x="991" y="-8"/>
       <point x="678" y="-27" type="curve" name="ab01"/>
@@ -14,35 +14,35 @@
       <point x="615" y="-122" type="curve" smooth="yes"/>
       <point x="602" y="-146"/>
       <point x="596" y="-163"/>
-      <point x="596" y="-182" type="curve" name="dh04" smooth="yes"/>
+      <point x="596" y="-182" type="curve" smooth="yes" name="dh04"/>
       <point x="596" y="-229"/>
       <point x="631" y="-270"/>
-      <point x="714" y="-270" type="curve" name="dv02" smooth="yes"/>
+      <point x="714" y="-270" type="curve" smooth="yes" name="dv02"/>
       <point x="755" y="-270"/>
       <point x="809" y="-260"/>
       <point x="862" y="-239" type="curve" name="sh01"/>
       <point x="862" y="-395" type="line"/>
       <point x="790" y="-410"/>
       <point x="726" y="-417"/>
-      <point x="675" y="-417" type="curve" name="dv01" smooth="yes"/>
+      <point x="675" y="-417" type="curve" smooth="yes" name="dv01"/>
       <point x="519" y="-417"/>
       <point x="434" y="-355"/>
-      <point x="434" y="-240" type="curve" name="dh03" smooth="yes"/>
+      <point x="434" y="-240" type="curve" smooth="yes" name="dh03"/>
       <point x="434" y="-169"/>
       <point x="467" y="-103"/>
       <point x="536" y="-26" type="curve" name="hr01"/>
       <point x="236" y="1"/>
       <point x="106" y="178"/>
-      <point x="106" y="551" type="curve" name="dh01" smooth="yes"/>
+      <point x="106" y="551" type="curve" smooth="yes" name="dh01"/>
       <point x="106" y="1493" type="line" name="at02"/>
       <point x="401" y="1493" type="line" name="hr02"/>
-      <point x="401" y="477" type="line" name="dh02" smooth="yes"/>
+      <point x="401" y="477" type="line" smooth="yes" name="dh02"/>
       <point x="401" y="328"/>
       <point x="480" y="238"/>
-      <point x="616" y="238" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="238" type="curve" smooth="yes" name="sv01"/>
       <point x="752" y="238"/>
       <point x="831" y="328"/>
-      <point x="831" y="477" type="curve" name="dh05" smooth="yes"/>
+      <point x="831" y="477" type="curve" smooth="yes" name="dh05"/>
       <point x="831" y="1493" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/U_psilon.glif b/source/Hack-Bold.ufo/glyphs/U_psilon.glif
index 48ca33268..8072d367d 100644
--- a/source/Hack-Bold.ufo/glyphs/U_psilon.glif
+++ b/source/Hack-Bold.ufo/glyphs/U_psilon.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Upsilon" format="1">
+<glyph name="Upsilon" format="2">
   <advance width="1233"/>
   <unicode hex="03A5"/>
   <outline>
     <contour>
-      <point x="459" y="534" type="line" name="hr00" smooth="yes"/>
+      <point x="459" y="534" type="line" smooth="yes" name="hr00"/>
       <point x="459" y="846"/>
       <point x="364" y="1142"/>
       <point x="260" y="1203" type="curve" smooth="yes"/>
@@ -32,7 +32,7 @@
       <point x="931" y="1203" type="curve"/>
       <point x="808" y="1022"/>
       <point x="754" y="803"/>
-      <point x="754" y="534" type="curve" name="dh01" smooth="yes"/>
+      <point x="754" y="534" type="curve" smooth="yes" name="dh01"/>
       <point x="754" y="0" type="line" name="ab01"/>
       <point x="459" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/U_psilondieresis.glif b/source/Hack-Bold.ufo/glyphs/U_psilondieresis.glif
index da832ef0f..92fed99dd 100644
--- a/source/Hack-Bold.ufo/glyphs/U_psilondieresis.glif
+++ b/source/Hack-Bold.ufo/glyphs/U_psilondieresis.glif
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Upsilondieresis" format="1">
+<glyph name="Upsilondieresis" format="2">
   <advance width="1233"/>
   <unicode hex="03AB"/>
   <outline>
     <contour>
-      <point x="321" y="1606" type="line" name="dv01" smooth="yes"/>
+      <point x="321" y="1606" type="line" smooth="yes" name="dv01"/>
       <point x="301" y="1606"/>
       <point x="291" y="1616"/>
-      <point x="291" y="1636" type="curve" name="sh01" smooth="yes"/>
+      <point x="291" y="1636" type="curve" smooth="yes" name="sh01"/>
       <point x="291" y="1822" type="line" smooth="yes"/>
       <point x="291" y="1842"/>
       <point x="301" y="1852"/>
-      <point x="321" y="1852" type="curve" name="dv02" smooth="yes"/>
+      <point x="321" y="1852" type="curve" smooth="yes" name="dv02"/>
       <point x="497" y="1852" type="line" smooth="yes"/>
       <point x="517" y="1852"/>
       <point x="527" y="1842"/>
       <point x="527" y="1822" type="curve" smooth="yes"/>
-      <point x="527" y="1636" type="line" name="sh02" smooth="yes"/>
+      <point x="527" y="1636" type="line" smooth="yes" name="sh02"/>
       <point x="527" y="1616"/>
       <point x="517" y="1606"/>
       <point x="497" y="1606" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="716" y="1606" type="line" name="sv01" smooth="yes"/>
+      <point x="716" y="1606" type="line" smooth="yes" name="sv01"/>
       <point x="696" y="1606"/>
       <point x="686" y="1616"/>
-      <point x="686" y="1636" type="curve" name="sh04" smooth="yes"/>
+      <point x="686" y="1636" type="curve" smooth="yes" name="sh04"/>
       <point x="686" y="1822" type="line" smooth="yes"/>
       <point x="686" y="1842"/>
       <point x="696" y="1852"/>
-      <point x="716" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="716" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="892" y="1852" type="line" smooth="yes"/>
       <point x="912" y="1852"/>
       <point x="922" y="1842"/>
       <point x="922" y="1822" type="curve" smooth="yes"/>
-      <point x="922" y="1636" type="line" name="hr01" smooth="yes"/>
+      <point x="922" y="1636" type="line" smooth="yes" name="hr01"/>
       <point x="922" y="1616"/>
       <point x="912" y="1606"/>
       <point x="892" y="1606" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="459" y="534" type="line" name="sh03" smooth="yes"/>
+      <point x="459" y="534" type="line" smooth="yes" name="sh03"/>
       <point x="459" y="846"/>
       <point x="364" y="1142"/>
       <point x="260" y="1203" type="curve" smooth="yes"/>
@@ -68,7 +68,7 @@
       <point x="931" y="1203" type="curve" name="sh05"/>
       <point x="808" y="1022"/>
       <point x="754" y="803"/>
-      <point x="754" y="534" type="curve" name="sh06" smooth="yes"/>
+      <point x="754" y="534" type="curve" smooth="yes" name="sh06"/>
       <point x="754" y="0" type="line" name="ab01"/>
       <point x="459" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/U_psilontonos.glif b/source/Hack-Bold.ufo/glyphs/U_psilontonos.glif
index 8bac4799b..cae115fc9 100644
--- a/source/Hack-Bold.ufo/glyphs/U_psilontonos.glif
+++ b/source/Hack-Bold.ufo/glyphs/U_psilontonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Upsilontonos" format="1">
+<glyph name="Upsilontonos" format="2">
   <advance width="1233"/>
   <unicode hex="038E"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="-536" y="1232" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="469" y="534" type="line" name="dh01" smooth="yes"/>
+      <point x="469" y="534" type="line" smooth="yes" name="dh01"/>
       <point x="469" y="846"/>
       <point x="374" y="1142"/>
       <point x="270" y="1203" type="curve" smooth="yes"/>
@@ -38,7 +38,7 @@
       <point x="941" y="1203" type="curve" name="iv02"/>
       <point x="818" y="1022"/>
       <point x="764" y="803"/>
-      <point x="764" y="534" type="curve" name="dh02" smooth="yes"/>
+      <point x="764" y="534" type="curve" smooth="yes" name="dh02"/>
       <point x="764" y="0" type="line" name="ab01"/>
       <point x="469" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/U_ring.glif b/source/Hack-Bold.ufo/glyphs/U_ring.glif
index ab1fa88c7..c4a6fe335 100644
--- a/source/Hack-Bold.ufo/glyphs/U_ring.glif
+++ b/source/Hack-Bold.ufo/glyphs/U_ring.glif
@@ -1,59 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Uring" format="1">
+<glyph name="Uring" format="2">
   <advance width="1233"/>
   <unicode hex="016E"/>
   <outline>
     <contour>
       <point x="1126" y="1493" type="line" name="at01"/>
-      <point x="1126" y="551" type="line" name="sh01" smooth="yes"/>
+      <point x="1126" y="551" type="line" smooth="yes" name="sh01"/>
       <point x="1126" y="146"/>
       <point x="973" y="-29"/>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="260" y="-29"/>
       <point x="106" y="146"/>
-      <point x="106" y="551" type="curve" name="dh01" smooth="yes"/>
+      <point x="106" y="551" type="curve" smooth="yes" name="dh01"/>
       <point x="106" y="1493" type="line" name="at02"/>
       <point x="365" y="1493" type="line" name="ih02"/>
       <point x="346" y="1532"/>
       <point x="337" y="1573"/>
-      <point x="337" y="1616" type="curve" name="ih03" smooth="yes"/>
+      <point x="337" y="1616" type="curve" smooth="yes" name="ih03"/>
       <point x="337" y="1773"/>
       <point x="465" y="1901"/>
-      <point x="622" y="1901" type="curve" name="dv04" smooth="yes"/>
+      <point x="622" y="1901" type="curve" smooth="yes" name="dv04"/>
       <point x="780" y="1901"/>
       <point x="906" y="1773"/>
-      <point x="906" y="1616" type="curve" name="hr01" smooth="yes"/>
+      <point x="906" y="1616" type="curve" smooth="yes" name="hr01"/>
       <point x="906" y="1573"/>
       <point x="897" y="1532"/>
       <point x="878" y="1493" type="curve" name="ih04"/>
     </contour>
     <contour>
-      <point x="621" y="1747" type="curve" name="dv03" smooth="yes"/>
+      <point x="621" y="1747" type="curve" smooth="yes" name="dv03"/>
       <point x="549" y="1747"/>
       <point x="490" y="1688"/>
-      <point x="490" y="1616" type="curve" name="sh02" smooth="yes"/>
+      <point x="490" y="1616" type="curve" smooth="yes" name="sh02"/>
       <point x="490" y="1543"/>
       <point x="549" y="1485"/>
-      <point x="621" y="1485" type="curve" name="hr02" smooth="yes"/>
+      <point x="621" y="1485" type="curve" smooth="yes" name="hr02"/>
       <point x="693" y="1485"/>
       <point x="753" y="1544"/>
-      <point x="753" y="1616" type="curve" name="dh03" smooth="yes"/>
+      <point x="753" y="1616" type="curve" smooth="yes" name="dh03"/>
       <point x="753" y="1688"/>
       <point x="693" y="1747"/>
     </contour>
     <contour>
-      <point x="616" y="238" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="238" type="curve" smooth="yes" name="dv02"/>
       <point x="752" y="238"/>
       <point x="831" y="328"/>
-      <point x="831" y="477" type="curve" name="ih01" smooth="yes"/>
+      <point x="831" y="477" type="curve" smooth="yes" name="ih01"/>
       <point x="831" y="1423" type="line" name="ih05"/>
       <point x="779" y="1366"/>
       <point x="706" y="1331"/>
-      <point x="622" y="1331" type="curve" name="hr03" smooth="yes"/>
+      <point x="622" y="1331" type="curve" smooth="yes" name="hr03"/>
       <point x="533" y="1331"/>
       <point x="453" y="1372"/>
       <point x="401" y="1436" type="curve" name="iv01"/>
-      <point x="401" y="477" type="line" name="dh02" smooth="yes"/>
+      <point x="401" y="477" type="line" smooth="yes" name="dh02"/>
       <point x="401" y="328"/>
       <point x="480" y="238"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/U_tilde.glif b/source/Hack-Bold.ufo/glyphs/U_tilde.glif
index 9f997bcd5..d6335c4be 100644
--- a/source/Hack-Bold.ufo/glyphs/U_tilde.glif
+++ b/source/Hack-Bold.ufo/glyphs/U_tilde.glif
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Utilde" format="1">
+<glyph name="Utilde" format="2">
   <advance width="1233"/>
   <unicode hex="0168"/>
   <outline>
     <contour>
-      <point x="268" y="1618" type="line" name="hr00" smooth="yes"/>
+      <point x="268" y="1618" type="line" smooth="yes" name="hr00"/>
       <point x="268" y="1759"/>
       <point x="349" y="1854"/>
-      <point x="463" y="1854" type="curve" name="dv04" smooth="yes"/>
+      <point x="463" y="1854" type="curve" smooth="yes" name="dv04"/>
       <point x="514" y="1854"/>
       <point x="566" y="1836"/>
       <point x="614" y="1805" type="curve" smooth="yes"/>
       <point x="674" y="1766" type="line" smooth="yes"/>
       <point x="701" y="1749"/>
       <point x="724" y="1737"/>
-      <point x="751" y="1737" type="curve" name="dv06" smooth="yes"/>
+      <point x="751" y="1737" type="curve" smooth="yes" name="dv06"/>
       <point x="798" y="1737"/>
       <point x="825" y="1778"/>
       <point x="825" y="1854" type="curve" name="sh01"/>
       <point x="965" y="1854" type="line"/>
       <point x="965" y="1849"/>
       <point x="963" y="1829"/>
-      <point x="963" y="1826" type="curve" name="dh02" smooth="yes"/>
+      <point x="963" y="1826" type="curve" smooth="yes" name="dh02"/>
       <point x="963" y="1682"/>
       <point x="887" y="1588"/>
-      <point x="765" y="1588" type="curve" name="dv05" smooth="yes"/>
+      <point x="765" y="1588" type="curve" smooth="yes" name="dv05"/>
       <point x="718" y="1588"/>
       <point x="675" y="1601"/>
       <point x="618" y="1637" type="curve" smooth="yes"/>
@@ -32,30 +32,30 @@
       <point x="552" y="1678" type="line" smooth="yes"/>
       <point x="525" y="1693"/>
       <point x="503" y="1704"/>
-      <point x="480" y="1704" type="curve" name="dv03" smooth="yes"/>
+      <point x="480" y="1704" type="curve" smooth="yes" name="dv03"/>
       <point x="437" y="1704"/>
       <point x="408" y="1662"/>
-      <point x="408" y="1594" type="curve" name="hr02" smooth="yes"/>
+      <point x="408" y="1594" type="curve" smooth="yes" name="hr02"/>
       <point x="408" y="1588" type="line" name="sv01"/>
       <point x="268" y="1588" type="line" name="sh02"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="260" y="-29"/>
       <point x="106" y="146"/>
-      <point x="106" y="551" type="curve" name="hr03" smooth="yes"/>
+      <point x="106" y="551" type="curve" smooth="yes" name="hr03"/>
       <point x="106" y="1493" type="line" name="at01"/>
       <point x="401" y="1493" type="line"/>
-      <point x="401" y="477" type="line" name="hr04" smooth="yes"/>
+      <point x="401" y="477" type="line" smooth="yes" name="hr04"/>
       <point x="401" y="328"/>
       <point x="480" y="238"/>
-      <point x="616" y="238" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="238" type="curve" smooth="yes" name="dv02"/>
       <point x="752" y="238"/>
       <point x="831" y="328"/>
-      <point x="831" y="477" type="curve" name="hr05" smooth="yes"/>
+      <point x="831" y="477" type="curve" smooth="yes" name="hr05"/>
       <point x="831" y="1493" type="line" name="dh01"/>
       <point x="1126" y="1493" type="line"/>
-      <point x="1126" y="551" type="line" name="hr06" smooth="yes"/>
+      <point x="1126" y="551" type="line" smooth="yes" name="hr06"/>
       <point x="1126" y="146"/>
       <point x="973" y="-29"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/V_.glif b/source/Hack-Bold.ufo/glyphs/V_.glif
index b75c1c453..ffd758feb 100644
--- a/source/Hack-Bold.ufo/glyphs/V_.glif
+++ b/source/Hack-Bold.ufo/glyphs/V_.glif
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="V" format="1">
+<glyph name="V" format="2">
   <advance width="1233"/>
   <unicode hex="0056"/>
   <outline>
     <contour>
-      <point x="57" y="1493" type="line" name="hr00"/>
+      <point x="57" y="1493" type="line"/>
       <point x="354" y="1493" type="line"/>
-      <point x="616" y="246" type="line" name="iv01"/>
-      <point x="879" y="1493" type="line" name="at01"/>
+      <point x="616" y="246" type="line"/>
+      <point x="879" y="1493" type="line"/>
       <point x="1176" y="1493" type="line"/>
-      <point x="821" y="0" type="line" name="ab01"/>
+      <point x="821" y="0" type="line"/>
       <point x="412" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/W_.glif b/source/Hack-Bold.ufo/glyphs/W_.glif
index 2d4727d97..5cb828fc1 100644
--- a/source/Hack-Bold.ufo/glyphs/W_.glif
+++ b/source/Hack-Bold.ufo/glyphs/W_.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="W" format="1">
+<glyph name="W" format="2">
   <advance width="1233"/>
   <unicode hex="0057"/>
   <outline>
     <contour>
-      <point x="0" y="1493" type="line" name="hr00"/>
+      <point x="0" y="1493" type="line"/>
       <point x="258" y="1493" type="line"/>
-      <point x="365" y="397" type="line" name="iv01"/>
+      <point x="365" y="397" type="line"/>
       <point x="494" y="1106" type="line"/>
       <point x="739" y="1106" type="line"/>
-      <point x="889" y="397" type="line" name="iv02"/>
-      <point x="973" y="1493" type="line" name="at01"/>
+      <point x="889" y="397" type="line"/>
+      <point x="973" y="1493" type="line"/>
       <point x="1233" y="1493" type="line"/>
-      <point x="1061" y="0" type="line" name="ab01"/>
+      <point x="1061" y="0" type="line"/>
       <point x="786" y="0" type="line"/>
-      <point x="616" y="784" type="line" name="iv03"/>
-      <point x="457" y="0" type="line" name="ab02"/>
+      <point x="616" y="784" type="line"/>
+      <point x="457" y="0" type="line"/>
       <point x="184" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/W_acute.glif b/source/Hack-Bold.ufo/glyphs/W_acute.glif
index d1dec818e..3939bf82b 100644
--- a/source/Hack-Bold.ufo/glyphs/W_acute.glif
+++ b/source/Hack-Bold.ufo/glyphs/W_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Wacute" format="1">
+<glyph name="Wacute" format="2">
   <advance width="1233"/>
   <unicode hex="1E82"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/W_circumflex.glif b/source/Hack-Bold.ufo/glyphs/W_circumflex.glif
index c34e557f4..83a024e4e 100644
--- a/source/Hack-Bold.ufo/glyphs/W_circumflex.glif
+++ b/source/Hack-Bold.ufo/glyphs/W_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Wcircumflex" format="1">
+<glyph name="Wcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0174"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/W_dieresis.glif b/source/Hack-Bold.ufo/glyphs/W_dieresis.glif
index 93fc2c523..6d86bdde2 100644
--- a/source/Hack-Bold.ufo/glyphs/W_dieresis.glif
+++ b/source/Hack-Bold.ufo/glyphs/W_dieresis.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Wdieresis" format="1">
+<glyph name="Wdieresis" format="2">
   <advance width="1233"/>
   <unicode hex="1E84"/>
   <outline>
     <contour>
-      <point x="331" y="1595" type="line" name="hr00" smooth="yes"/>
+      <point x="331" y="1595" type="line" smooth="yes" name="hr00"/>
       <point x="311" y="1595"/>
       <point x="301" y="1605"/>
-      <point x="301" y="1625" type="curve" name="sh01" smooth="yes"/>
+      <point x="301" y="1625" type="curve" smooth="yes" name="sh01"/>
       <point x="301" y="1811" type="line" smooth="yes"/>
       <point x="301" y="1831"/>
       <point x="311" y="1841"/>
-      <point x="331" y="1841" type="curve" name="dv01" smooth="yes"/>
+      <point x="331" y="1841" type="curve" smooth="yes" name="dv01"/>
       <point x="507" y="1841" type="line" smooth="yes"/>
       <point x="527" y="1841"/>
       <point x="537" y="1831"/>
       <point x="537" y="1811" type="curve" smooth="yes"/>
-      <point x="537" y="1625" type="line" name="sh02" smooth="yes"/>
+      <point x="537" y="1625" type="line" smooth="yes" name="sh02"/>
       <point x="537" y="1605"/>
       <point x="527" y="1595"/>
       <point x="507" y="1595" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1595" type="line" name="sv01" smooth="yes"/>
+      <point x="726" y="1595" type="line" smooth="yes" name="sv01"/>
       <point x="706" y="1595"/>
       <point x="696" y="1605"/>
-      <point x="696" y="1625" type="curve" name="ah01" smooth="yes"/>
+      <point x="696" y="1625" type="curve" smooth="yes" name="ah01"/>
       <point x="696" y="1811" type="line" smooth="yes"/>
       <point x="696" y="1831"/>
       <point x="706" y="1841"/>
-      <point x="726" y="1841" type="curve" name="sv02" smooth="yes"/>
+      <point x="726" y="1841" type="curve" smooth="yes" name="sv02"/>
       <point x="902" y="1841" type="line" smooth="yes"/>
       <point x="922" y="1841"/>
       <point x="932" y="1831"/>
       <point x="932" y="1811" type="curve" smooth="yes"/>
-      <point x="932" y="1625" type="line" name="sh03" smooth="yes"/>
+      <point x="932" y="1625" type="line" smooth="yes" name="sh03"/>
       <point x="932" y="1605"/>
       <point x="922" y="1595"/>
       <point x="902" y="1595" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/W_grave.glif b/source/Hack-Bold.ufo/glyphs/W_grave.glif
index def317f94..d44cca3bb 100644
--- a/source/Hack-Bold.ufo/glyphs/W_grave.glif
+++ b/source/Hack-Bold.ufo/glyphs/W_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Wgrave" format="1">
+<glyph name="Wgrave" format="2">
   <advance width="1233"/>
   <unicode hex="1E80"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/X_.glif b/source/Hack-Bold.ufo/glyphs/X_.glif
index d4fb558aa..5029d68eb 100644
--- a/source/Hack-Bold.ufo/glyphs/X_.glif
+++ b/source/Hack-Bold.ufo/glyphs/X_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="X" format="1">
+<glyph name="X" format="2">
   <advance width="1233"/>
   <unicode hex="0058"/>
   <outline>
     <contour>
-      <point x="465" y="758" type="line" name="hr00"/>
-      <point x="39" y="1493" type="line" name="at01"/>
+      <point x="465" y="758" type="line"/>
+      <point x="39" y="1493" type="line"/>
       <point x="344" y="1493" type="line"/>
-      <point x="616" y="1018" type="line" name="iv01"/>
-      <point x="889" y="1493" type="line" name="at02"/>
+      <point x="616" y="1018" type="line"/>
+      <point x="889" y="1493" type="line"/>
       <point x="1194" y="1493" type="line"/>
       <point x="770" y="758" type="line"/>
-      <point x="1206" y="0" type="line" name="ab01"/>
+      <point x="1206" y="0" type="line"/>
       <point x="901" y="0" type="line"/>
-      <point x="616" y="494" type="line" name="iv02"/>
-      <point x="332" y="0" type="line" name="ab02"/>
+      <point x="616" y="494" type="line"/>
+      <point x="332" y="0" type="line"/>
       <point x="27" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/X_i.glif b/source/Hack-Bold.ufo/glyphs/X_i.glif
index fe11c88db..2f8be083c 100644
--- a/source/Hack-Bold.ufo/glyphs/X_i.glif
+++ b/source/Hack-Bold.ufo/glyphs/X_i.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Xi" format="1">
+<glyph name="Xi" format="2">
   <advance width="1233"/>
   <unicode hex="039E"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/Y_.glif b/source/Hack-Bold.ufo/glyphs/Y_.glif
index 90df7bed4..6297aaaa0 100644
--- a/source/Hack-Bold.ufo/glyphs/Y_.glif
+++ b/source/Hack-Bold.ufo/glyphs/Y_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Y" format="1">
+<glyph name="Y" format="2">
   <advance width="1233"/>
   <unicode hex="0059"/>
   <outline>
     <contour>
-      <point x="469" y="588" type="line" name="hr00"/>
-      <point x="8" y="1493" type="line" name="at01"/>
+      <point x="469" y="588" type="line"/>
+      <point x="8" y="1493" type="line"/>
       <point x="326" y="1493" type="line"/>
-      <point x="616" y="893" type="line" name="ih01"/>
-      <point x="907" y="1493" type="line" name="at02"/>
+      <point x="616" y="893" type="line"/>
+      <point x="907" y="1493" type="line"/>
       <point x="1225" y="1493" type="line"/>
-      <point x="764" y="588" type="line" name="dh01"/>
-      <point x="764" y="0" type="line" name="ab01"/>
+      <point x="764" y="588" type="line"/>
+      <point x="764" y="0" type="line"/>
       <point x="469" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/Y_acute.glif b/source/Hack-Bold.ufo/glyphs/Y_acute.glif
index 182a38ca2..f83ab2f35 100644
--- a/source/Hack-Bold.ufo/glyphs/Y_acute.glif
+++ b/source/Hack-Bold.ufo/glyphs/Y_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Yacute" format="1">
+<glyph name="Yacute" format="2">
   <advance width="1233"/>
   <unicode hex="00DD"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/Y_circumflex.glif b/source/Hack-Bold.ufo/glyphs/Y_circumflex.glif
index d6494dc84..717c6c94d 100644
--- a/source/Hack-Bold.ufo/glyphs/Y_circumflex.glif
+++ b/source/Hack-Bold.ufo/glyphs/Y_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ycircumflex" format="1">
+<glyph name="Ycircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0176"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/Y_dieresis.glif b/source/Hack-Bold.ufo/glyphs/Y_dieresis.glif
index 296caeab6..87abca22a 100644
--- a/source/Hack-Bold.ufo/glyphs/Y_dieresis.glif
+++ b/source/Hack-Bold.ufo/glyphs/Y_dieresis.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ydieresis" format="1">
+<glyph name="Ydieresis" format="2">
   <advance width="1233"/>
   <unicode hex="0178"/>
   <outline>
     <contour>
-      <point x="331" y="1606" type="line" name="dv01" smooth="yes"/>
+      <point x="331" y="1606" type="line" smooth="yes" name="dv01"/>
       <point x="311" y="1606"/>
       <point x="301" y="1616"/>
-      <point x="301" y="1636" type="curve" name="sh01" smooth="yes"/>
+      <point x="301" y="1636" type="curve" smooth="yes" name="sh01"/>
       <point x="301" y="1822" type="line" smooth="yes"/>
       <point x="301" y="1842"/>
       <point x="311" y="1852"/>
-      <point x="331" y="1852" type="curve" name="dv02" smooth="yes"/>
+      <point x="331" y="1852" type="curve" smooth="yes" name="dv02"/>
       <point x="507" y="1852" type="line" smooth="yes"/>
       <point x="527" y="1852"/>
       <point x="537" y="1842"/>
       <point x="537" y="1822" type="curve" smooth="yes"/>
-      <point x="537" y="1636" type="line" name="sh02" smooth="yes"/>
+      <point x="537" y="1636" type="line" smooth="yes" name="sh02"/>
       <point x="537" y="1616"/>
       <point x="527" y="1606"/>
       <point x="507" y="1606" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1606" type="line" name="sv01" smooth="yes"/>
+      <point x="726" y="1606" type="line" smooth="yes" name="sv01"/>
       <point x="706" y="1606"/>
       <point x="696" y="1616"/>
-      <point x="696" y="1636" type="curve" name="sh04" smooth="yes"/>
-      <point x="696" y="1822" type="line" name="hr01" smooth="yes"/>
+      <point x="696" y="1636" type="curve" smooth="yes" name="sh04"/>
+      <point x="696" y="1822" type="line" smooth="yes" name="hr01"/>
       <point x="696" y="1842"/>
       <point x="706" y="1852"/>
-      <point x="726" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="726" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="902" y="1852" type="line" smooth="yes"/>
       <point x="922" y="1852"/>
       <point x="932" y="1842"/>
       <point x="932" y="1822" type="curve" smooth="yes"/>
-      <point x="932" y="1636" type="line" name="sh05" smooth="yes"/>
+      <point x="932" y="1636" type="line" smooth="yes" name="sh05"/>
       <point x="932" y="1616"/>
       <point x="922" y="1606"/>
       <point x="902" y="1606" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/Y_grave.glif b/source/Hack-Bold.ufo/glyphs/Y_grave.glif
index ae84bc8ec..755989fb9 100644
--- a/source/Hack-Bold.ufo/glyphs/Y_grave.glif
+++ b/source/Hack-Bold.ufo/glyphs/Y_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ygrave" format="1">
+<glyph name="Ygrave" format="2">
   <advance width="1233"/>
   <unicode hex="1EF2"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/Z_.glif b/source/Hack-Bold.ufo/glyphs/Z_.glif
index 2ce7767cd..e5aed3fdc 100644
--- a/source/Hack-Bold.ufo/glyphs/Z_.glif
+++ b/source/Hack-Bold.ufo/glyphs/Z_.glif
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Z" format="1">
+<glyph name="Z" format="2">
   <advance width="1233"/>
   <unicode hex="005A"/>
   <outline>
     <contour>
-      <point x="94" y="244" type="line" name="hr00"/>
-      <point x="765" y="1233" type="line" name="sv01"/>
+      <point x="94" y="244" type="line"/>
+      <point x="765" y="1233" type="line"/>
       <point x="116" y="1233" type="line"/>
-      <point x="116" y="1493" type="line" name="at01"/>
+      <point x="116" y="1493" type="line"/>
       <point x="1126" y="1493" type="line"/>
       <point x="1126" y="1249" type="line"/>
-      <point x="434" y="260" type="line" name="sv02"/>
+      <point x="434" y="260" type="line"/>
       <point x="1140" y="260" type="line"/>
-      <point x="1140" y="0" type="line" name="ab01"/>
+      <point x="1140" y="0" type="line"/>
       <point x="94" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/Z_acute.glif b/source/Hack-Bold.ufo/glyphs/Z_acute.glif
index 1ff20c1da..6e1c39fa4 100644
--- a/source/Hack-Bold.ufo/glyphs/Z_acute.glif
+++ b/source/Hack-Bold.ufo/glyphs/Z_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Zacute" format="1">
+<glyph name="Zacute" format="2">
   <advance width="1233"/>
   <unicode hex="0179"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/Z_caron.glif b/source/Hack-Bold.ufo/glyphs/Z_caron.glif
index 792f51c40..82f51cb20 100644
--- a/source/Hack-Bold.ufo/glyphs/Z_caron.glif
+++ b/source/Hack-Bold.ufo/glyphs/Z_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Zcaron" format="1">
+<glyph name="Zcaron" format="2">
   <advance width="1233"/>
   <unicode hex="017D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/Z_dotaccent.glif b/source/Hack-Bold.ufo/glyphs/Z_dotaccent.glif
index f2b3c2752..ac696ac68 100644
--- a/source/Hack-Bold.ufo/glyphs/Z_dotaccent.glif
+++ b/source/Hack-Bold.ufo/glyphs/Z_dotaccent.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Zdotaccent" format="1">
+<glyph name="Zdotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="017B"/>
   <outline>
     <contour>
-      <point x="559" y="1606" type="line" name="hr00" smooth="yes"/>
+      <point x="559" y="1606" type="line" smooth="yes" name="hr00"/>
       <point x="539" y="1606"/>
       <point x="529" y="1616"/>
-      <point x="529" y="1636" type="curve" name="dh01" smooth="yes"/>
+      <point x="529" y="1636" type="curve" smooth="yes" name="dh01"/>
       <point x="529" y="1822" type="line" smooth="yes"/>
       <point x="529" y="1842"/>
       <point x="539" y="1852"/>
-      <point x="559" y="1852" type="curve" name="dv01" smooth="yes"/>
+      <point x="559" y="1852" type="curve" smooth="yes" name="dv01"/>
       <point x="774" y="1852" type="line" smooth="yes"/>
       <point x="794" y="1852"/>
       <point x="804" y="1842"/>
       <point x="804" y="1822" type="curve" smooth="yes"/>
-      <point x="804" y="1636" type="line" name="dh02" smooth="yes"/>
+      <point x="804" y="1636" type="line" smooth="yes" name="dh02"/>
       <point x="804" y="1616"/>
       <point x="794" y="1606"/>
       <point x="774" y="1606" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/Z_eta.glif b/source/Hack-Bold.ufo/glyphs/Z_eta.glif
index ba6f7543c..935ed9ec1 100644
--- a/source/Hack-Bold.ufo/glyphs/Z_eta.glif
+++ b/source/Hack-Bold.ufo/glyphs/Z_eta.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Zeta" format="1">
+<glyph name="Zeta" format="2">
   <advance width="1233"/>
   <unicode hex="0396"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/_1608.glif b/source/Hack-Bold.ufo/glyphs/_1608.glif
index 4a83a6f90..6f797122a 100644
--- a/source/Hack-Bold.ufo/glyphs/_1608.glif
+++ b/source/Hack-Bold.ufo/glyphs/_1608.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="_1608" format="1">
-  <advance width="0"/>
+<glyph name="_1608" format="2">
   <outline>
   </outline>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/_notdef.glif b/source/Hack-Bold.ufo/glyphs/_notdef.glif
index 112158991..5c8a9cc25 100644
--- a/source/Hack-Bold.ufo/glyphs/_notdef.glif
+++ b/source/Hack-Bold.ufo/glyphs/_notdef.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name=".notdef" format="1">
+<glyph name=".notdef" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/a.glif b/source/Hack-Bold.ufo/glyphs/a.glif
index 55d5659ee..2ba936de4 100644
--- a/source/Hack-Bold.ufo/glyphs/a.glif
+++ b/source/Hack-Bold.ufo/glyphs/a.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="a" format="1">
+<glyph name="a" format="2">
   <advance width="1233"/>
   <unicode hex="0061"/>
   <outline>
@@ -34,8 +34,8 @@
       <point x="1104" y="250" type="curve" smooth="yes"/>
       <point x="1104" y="192"/>
       <point x="1108" y="64"/>
-      <point x="1155" y="-0" type="curve"/>
-      <point x="865" y="-0" type="line"/>
+      <point x="1155" y="0" type="curve"/>
+      <point x="865" y="0" type="line"/>
       <point x="839" y="43"/>
       <point x="830" y="75"/>
       <point x="824" y="125" type="curve"/>
@@ -57,9 +57,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/aacute.glif b/source/Hack-Bold.ufo/glyphs/aacute.glif
index 7ea400a5b..a452d64ca 100644
--- a/source/Hack-Bold.ufo/glyphs/aacute.glif
+++ b/source/Hack-Bold.ufo/glyphs/aacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="aacute" format="1">
+<glyph name="aacute" format="2">
   <advance width="1233"/>
   <unicode hex="00E1"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="469" y="1297" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="494" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="494" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="373" y="-29"/>
       <point x="274" y="4"/>
       <point x="202" y="72" type="curve" smooth="yes"/>
       <point x="131" y="139"/>
       <point x="95" y="233"/>
-      <point x="95" y="354" type="curve" name="sh02" smooth="yes"/>
+      <point x="95" y="354" type="curve" smooth="yes" name="sh02"/>
       <point x="95" y="482"/>
       <point x="134" y="580"/>
       <point x="222" y="644" type="curve" smooth="yes"/>
@@ -30,35 +30,35 @@
       <point x="767" y="894" type="curve" smooth="yes"/>
       <point x="732" y="919"/>
       <point x="679" y="930"/>
-      <point x="610" y="930" type="curve" name="dv04" smooth="yes"/>
+      <point x="610" y="930" type="curve" smooth="yes" name="dv04"/>
       <point x="546" y="930"/>
       <point x="477" y="921"/>
-      <point x="412" y="904" type="curve" name="hr01" smooth="yes"/>
+      <point x="412" y="904" type="curve" smooth="yes" name="hr01"/>
       <point x="348" y="887"/>
       <point x="278" y="858"/>
       <point x="206" y="819" type="curve" name="ih03"/>
       <point x="206" y="1069" type="line"/>
       <point x="262" y="1092"/>
       <point x="336" y="1116"/>
-      <point x="403" y="1128" type="curve" name="sh05" smooth="yes"/>
+      <point x="403" y="1128" type="curve" smooth="yes" name="sh05"/>
       <point x="458" y="1139"/>
       <point x="540" y="1148"/>
-      <point x="628" y="1148" type="curve" name="dv05" smooth="yes"/>
+      <point x="628" y="1148" type="curve" smooth="yes" name="dv05"/>
       <point x="815" y="1148"/>
       <point x="927" y="1102"/>
       <point x="997" y="1035" type="curve"/>
       <point x="1069" y="963"/>
       <point x="1109" y="852"/>
-      <point x="1109" y="644" type="curve" name="sh01" smooth="yes"/>
+      <point x="1109" y="644" type="curve" smooth="yes" name="sh01"/>
       <point x="1109" y="570"/>
       <point x="1104" y="323"/>
-      <point x="1104" y="274" type="curve" name="sh06" smooth="yes"/>
+      <point x="1104" y="274" type="curve" smooth="yes" name="sh06"/>
       <point x="1104" y="246"/>
       <point x="1105" y="216"/>
-      <point x="1106" y="197" type="curve" name="sh07" smooth="yes"/>
+      <point x="1106" y="197" type="curve" smooth="yes" name="sh07"/>
       <point x="1109" y="170"/>
       <point x="1110" y="142"/>
-      <point x="1113" y="125" type="curve" name="sh03" smooth="yes"/>
+      <point x="1113" y="125" type="curve" smooth="yes" name="sh03"/>
       <point x="1117" y="98"/>
       <point x="1123" y="71"/>
       <point x="1127" y="58" type="curve" smooth="yes"/>
@@ -74,26 +74,26 @@
       <point x="824" y="125" type="curve" name="sh08"/>
       <point x="787" y="76"/>
       <point x="740" y="38"/>
-      <point x="682" y="11" type="curve" name="ab02" smooth="yes"/>
+      <point x="682" y="11" type="curve" smooth="yes" name="ab02"/>
       <point x="626" y="-16"/>
       <point x="570" y="-29"/>
     </contour>
     <contour>
-      <point x="576" y="174" type="curve" name="dv02" smooth="yes"/>
+      <point x="576" y="174" type="curve" smooth="yes" name="dv02"/>
       <point x="651" y="174"/>
       <point x="711" y="202"/>
       <point x="754" y="262" type="curve"/>
       <point x="797" y="319"/>
       <point x="818" y="401"/>
-      <point x="818" y="506" type="curve" name="sh09" smooth="yes"/>
+      <point x="818" y="506" type="curve" smooth="yes" name="sh09"/>
       <point x="818" y="526" type="line" name="dv03"/>
       <point x="701" y="526" type="line" smooth="yes"/>
       <point x="591" y="526"/>
       <point x="515" y="512"/>
-      <point x="472" y="484" type="curve" name="hr02" smooth="yes"/>
+      <point x="472" y="484" type="curve" smooth="yes" name="hr02"/>
       <point x="429" y="456"/>
       <point x="407" y="409"/>
-      <point x="407" y="342" type="curve" name="sh04" smooth="yes"/>
+      <point x="407" y="342" type="curve" smooth="yes" name="sh04"/>
       <point x="407" y="287"/>
       <point x="421" y="250"/>
       <point x="452" y="219" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/abreve.glif b/source/Hack-Bold.ufo/glyphs/abreve.glif
index f435180d2..751b63d67 100644
--- a/source/Hack-Bold.ufo/glyphs/abreve.glif
+++ b/source/Hack-Bold.ufo/glyphs/abreve.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="abreve" format="1">
+<glyph name="abreve" format="2">
   <advance width="1233"/>
   <unicode hex="0103"/>
   <outline>
     <contour>
-      <point x="616" y="1297" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1297" type="curve" smooth="yes" name="dv03"/>
       <point x="407" y="1297"/>
       <point x="289" y="1401"/>
       <point x="281" y="1594" type="curve" name="sv01"/>
       <point x="422" y="1594" type="line"/>
       <point x="437" y="1502"/>
       <point x="504" y="1450"/>
-      <point x="616" y="1450" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="1450" type="curve" smooth="yes" name="dv04"/>
       <point x="728" y="1450"/>
       <point x="794" y="1501"/>
       <point x="809" y="1594" type="curve" name="sh01"/>
@@ -20,13 +20,13 @@
       <point x="827" y="1297"/>
     </contour>
     <contour>
-      <point x="494" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="494" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="373" y="-29"/>
       <point x="274" y="4"/>
       <point x="202" y="72" type="curve" smooth="yes"/>
       <point x="131" y="139"/>
       <point x="95" y="233"/>
-      <point x="95" y="354" type="curve" name="sh02" smooth="yes"/>
+      <point x="95" y="354" type="curve" smooth="yes" name="sh02"/>
       <point x="95" y="482"/>
       <point x="134" y="580"/>
       <point x="222" y="644" type="curve" smooth="yes"/>
@@ -37,38 +37,38 @@
       <point x="818" y="786" type="line" smooth="yes"/>
       <point x="818" y="835"/>
       <point x="799" y="871"/>
-      <point x="767" y="894" type="curve" name="hr01" smooth="yes"/>
+      <point x="767" y="894" type="curve" smooth="yes" name="hr01"/>
       <point x="732" y="919"/>
       <point x="679" y="930"/>
-      <point x="610" y="930" type="curve" name="dv05" smooth="yes"/>
+      <point x="610" y="930" type="curve" smooth="yes" name="dv05"/>
       <point x="546" y="930"/>
       <point x="477" y="921"/>
-      <point x="412" y="904" type="curve" name="sh04" smooth="yes"/>
+      <point x="412" y="904" type="curve" smooth="yes" name="sh04"/>
       <point x="348" y="887"/>
       <point x="278" y="858"/>
       <point x="206" y="819" type="curve" name="ih01"/>
       <point x="206" y="1069" type="line"/>
       <point x="262" y="1092"/>
       <point x="336" y="1116"/>
-      <point x="403" y="1128" type="curve" name="sh05" smooth="yes"/>
+      <point x="403" y="1128" type="curve" smooth="yes" name="sh05"/>
       <point x="458" y="1139"/>
       <point x="540" y="1148"/>
-      <point x="628" y="1148" type="curve" name="dv06" smooth="yes"/>
+      <point x="628" y="1148" type="curve" smooth="yes" name="dv06"/>
       <point x="815" y="1148"/>
       <point x="927" y="1102"/>
       <point x="997" y="1035" type="curve"/>
       <point x="1069" y="963"/>
       <point x="1109" y="852"/>
-      <point x="1109" y="644" type="curve" name="sh06" smooth="yes"/>
+      <point x="1109" y="644" type="curve" smooth="yes" name="sh06"/>
       <point x="1109" y="570"/>
       <point x="1104" y="323"/>
-      <point x="1104" y="274" type="curve" name="sh07" smooth="yes"/>
+      <point x="1104" y="274" type="curve" smooth="yes" name="sh07"/>
       <point x="1104" y="246"/>
       <point x="1105" y="216"/>
-      <point x="1106" y="197" type="curve" name="sh08" smooth="yes"/>
+      <point x="1106" y="197" type="curve" smooth="yes" name="sh08"/>
       <point x="1109" y="170"/>
       <point x="1110" y="142"/>
-      <point x="1113" y="125" type="curve" name="sh09" smooth="yes"/>
+      <point x="1113" y="125" type="curve" smooth="yes" name="sh09"/>
       <point x="1117" y="98"/>
       <point x="1123" y="71"/>
       <point x="1127" y="58" type="curve" smooth="yes"/>
@@ -84,18 +84,18 @@
       <point x="824" y="125" type="curve" name="sh10"/>
       <point x="787" y="76"/>
       <point x="740" y="38"/>
-      <point x="682" y="11" type="curve" name="ab02" smooth="yes"/>
+      <point x="682" y="11" type="curve" smooth="yes" name="ab02"/>
       <point x="626" y="-16"/>
       <point x="570" y="-29"/>
     </contour>
     <contour>
-      <point x="576" y="174" type="curve" name="dv02" smooth="yes"/>
+      <point x="576" y="174" type="curve" smooth="yes" name="dv02"/>
       <point x="651" y="174"/>
       <point x="711" y="202"/>
       <point x="754" y="262" type="curve"/>
       <point x="797" y="319"/>
       <point x="818" y="401"/>
-      <point x="818" y="506" type="curve" name="sh11" smooth="yes"/>
+      <point x="818" y="506" type="curve" smooth="yes" name="sh11"/>
       <point x="818" y="526" type="line" name="hr02"/>
       <point x="701" y="526" type="line" smooth="yes"/>
       <point x="591" y="526"/>
@@ -103,10 +103,10 @@
       <point x="472" y="484" type="curve" smooth="yes"/>
       <point x="429" y="456"/>
       <point x="407" y="409"/>
-      <point x="407" y="342" type="curve" name="sh03" smooth="yes"/>
+      <point x="407" y="342" type="curve" smooth="yes" name="sh03"/>
       <point x="407" y="287"/>
       <point x="421" y="250"/>
-      <point x="452" y="219" type="curve" name="hr03" smooth="yes"/>
+      <point x="452" y="219" type="curve" smooth="yes" name="hr03"/>
       <point x="482" y="189"/>
       <point x="523" y="174"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/acircumflex.glif b/source/Hack-Bold.ufo/glyphs/acircumflex.glif
index c1ce74444..b48713306 100644
--- a/source/Hack-Bold.ufo/glyphs/acircumflex.glif
+++ b/source/Hack-Bold.ufo/glyphs/acircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="acircumflex" format="1">
+<glyph name="acircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00E2"/>
   <outline>
@@ -13,13 +13,13 @@
       <point x="240" y="1296" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="494" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="494" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="373" y="-29"/>
       <point x="274" y="4"/>
       <point x="202" y="72" type="curve" smooth="yes"/>
       <point x="131" y="139"/>
       <point x="95" y="233"/>
-      <point x="95" y="354" type="curve" name="sh03" smooth="yes"/>
+      <point x="95" y="354" type="curve" smooth="yes" name="sh03"/>
       <point x="95" y="482"/>
       <point x="134" y="580"/>
       <point x="222" y="644" type="curve" smooth="yes"/>
@@ -27,41 +27,41 @@
       <point x="438" y="737"/>
       <point x="615" y="737" type="curve" smooth="yes"/>
       <point x="818" y="737" type="line" name="ah01"/>
-      <point x="818" y="786" type="line" name="hr01" smooth="yes"/>
+      <point x="818" y="786" type="line" smooth="yes" name="hr01"/>
       <point x="818" y="835"/>
       <point x="799" y="871"/>
       <point x="767" y="894" type="curve" smooth="yes"/>
       <point x="732" y="919"/>
       <point x="679" y="930"/>
-      <point x="610" y="930" type="curve" name="dv04" smooth="yes"/>
+      <point x="610" y="930" type="curve" smooth="yes" name="dv04"/>
       <point x="546" y="930"/>
       <point x="477" y="921"/>
-      <point x="412" y="904" type="curve" name="sh06" smooth="yes"/>
+      <point x="412" y="904" type="curve" smooth="yes" name="sh06"/>
       <point x="348" y="887"/>
       <point x="278" y="858"/>
       <point x="206" y="819" type="curve" name="ih03"/>
       <point x="206" y="1069" type="line"/>
       <point x="262" y="1092"/>
       <point x="336" y="1116"/>
-      <point x="403" y="1128" type="curve" name="sh07" smooth="yes"/>
+      <point x="403" y="1128" type="curve" smooth="yes" name="sh07"/>
       <point x="458" y="1139"/>
       <point x="540" y="1148"/>
-      <point x="628" y="1148" type="curve" name="dv05" smooth="yes"/>
+      <point x="628" y="1148" type="curve" smooth="yes" name="dv05"/>
       <point x="815" y="1148"/>
       <point x="927" y="1102"/>
       <point x="997" y="1035" type="curve"/>
       <point x="1069" y="963"/>
       <point x="1109" y="852"/>
-      <point x="1109" y="644" type="curve" name="sh01" smooth="yes"/>
+      <point x="1109" y="644" type="curve" smooth="yes" name="sh01"/>
       <point x="1109" y="570"/>
       <point x="1104" y="323"/>
-      <point x="1104" y="274" type="curve" name="sh08" smooth="yes"/>
+      <point x="1104" y="274" type="curve" smooth="yes" name="sh08"/>
       <point x="1104" y="246"/>
       <point x="1105" y="216"/>
-      <point x="1106" y="197" type="curve" name="sh09" smooth="yes"/>
+      <point x="1106" y="197" type="curve" smooth="yes" name="sh09"/>
       <point x="1109" y="170"/>
       <point x="1110" y="142"/>
-      <point x="1113" y="125" type="curve" name="sh10" smooth="yes"/>
+      <point x="1113" y="125" type="curve" smooth="yes" name="sh10"/>
       <point x="1117" y="98"/>
       <point x="1123" y="71"/>
       <point x="1127" y="58" type="curve" smooth="yes"/>
@@ -77,18 +77,18 @@
       <point x="824" y="125" type="curve" name="sh11"/>
       <point x="787" y="76"/>
       <point x="740" y="38"/>
-      <point x="682" y="11" type="curve" name="ab02" smooth="yes"/>
+      <point x="682" y="11" type="curve" smooth="yes" name="ab02"/>
       <point x="626" y="-16"/>
       <point x="570" y="-29"/>
     </contour>
     <contour>
-      <point x="576" y="174" type="curve" name="dv02" smooth="yes"/>
+      <point x="576" y="174" type="curve" smooth="yes" name="dv02"/>
       <point x="651" y="174"/>
       <point x="711" y="202"/>
       <point x="754" y="262" type="curve"/>
       <point x="797" y="319"/>
       <point x="818" y="401"/>
-      <point x="818" y="506" type="curve" name="hr02" smooth="yes"/>
+      <point x="818" y="506" type="curve" smooth="yes" name="hr02"/>
       <point x="818" y="526" type="line" name="dv03"/>
       <point x="701" y="526" type="line" smooth="yes"/>
       <point x="591" y="526"/>
@@ -96,7 +96,7 @@
       <point x="472" y="484" type="curve" smooth="yes"/>
       <point x="429" y="456"/>
       <point x="407" y="409"/>
-      <point x="407" y="342" type="curve" name="sh04" smooth="yes"/>
+      <point x="407" y="342" type="curve" smooth="yes" name="sh04"/>
       <point x="407" y="287"/>
       <point x="421" y="250"/>
       <point x="452" y="219" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/acute.glif b/source/Hack-Bold.ufo/glyphs/acute.glif
index 533b9f60b..e05d5bce3 100644
--- a/source/Hack-Bold.ufo/glyphs/acute.glif
+++ b/source/Hack-Bold.ufo/glyphs/acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="acute" format="1">
+<glyph name="acute" format="2">
   <advance width="1233"/>
   <unicode hex="00B4"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/acutecomb.glif b/source/Hack-Bold.ufo/glyphs/acutecomb.glif
index e78fea801..9af1a6edc 100644
--- a/source/Hack-Bold.ufo/glyphs/acutecomb.glif
+++ b/source/Hack-Bold.ufo/glyphs/acutecomb.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="acutecomb" format="1">
-  <advance width="0"/>
+<glyph name="acutecomb" format="2">
   <unicode hex="0301"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/adieresis.glif b/source/Hack-Bold.ufo/glyphs/adieresis.glif
index 097276cbe..f370424ae 100644
--- a/source/Hack-Bold.ufo/glyphs/adieresis.glif
+++ b/source/Hack-Bold.ufo/glyphs/adieresis.glif
@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="adieresis" format="1">
+<glyph name="adieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00E4"/>
   <outline>
     <contour>
-      <point x="331" y="1349" type="line" name="dv03" smooth="yes"/>
+      <point x="331" y="1349" type="line" smooth="yes" name="dv03"/>
       <point x="311" y="1349"/>
       <point x="301" y="1359"/>
-      <point x="301" y="1379" type="curve" name="ih01" smooth="yes"/>
+      <point x="301" y="1379" type="curve" smooth="yes" name="ih01"/>
       <point x="301" y="1565" type="line" smooth="yes"/>
       <point x="301" y="1585"/>
       <point x="311" y="1595"/>
-      <point x="331" y="1595" type="curve" name="dv04" smooth="yes"/>
+      <point x="331" y="1595" type="curve" smooth="yes" name="dv04"/>
       <point x="507" y="1595" type="line" smooth="yes"/>
       <point x="527" y="1595"/>
       <point x="537" y="1585"/>
       <point x="537" y="1565" type="curve" smooth="yes"/>
-      <point x="537" y="1379" type="line" name="sh01" smooth="yes"/>
+      <point x="537" y="1379" type="line" smooth="yes" name="sh01"/>
       <point x="537" y="1359"/>
       <point x="527" y="1349"/>
       <point x="507" y="1349" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1349" type="line" name="sv01" smooth="yes"/>
+      <point x="726" y="1349" type="line" smooth="yes" name="sv01"/>
       <point x="706" y="1349"/>
       <point x="696" y="1359"/>
-      <point x="696" y="1379" type="curve" name="dh03" smooth="yes"/>
+      <point x="696" y="1379" type="curve" smooth="yes" name="dh03"/>
       <point x="696" y="1565" type="line" smooth="yes"/>
       <point x="696" y="1585"/>
       <point x="706" y="1595"/>
-      <point x="726" y="1595" type="curve" name="sv02" smooth="yes"/>
+      <point x="726" y="1595" type="curve" smooth="yes" name="sv02"/>
       <point x="902" y="1595" type="line" smooth="yes"/>
       <point x="922" y="1595"/>
       <point x="932" y="1585"/>
-      <point x="932" y="1565" type="curve" name="hr01" smooth="yes"/>
-      <point x="932" y="1379" type="line" name="dh04" smooth="yes"/>
+      <point x="932" y="1565" type="curve" smooth="yes" name="hr01"/>
+      <point x="932" y="1379" type="line" smooth="yes" name="dh04"/>
       <point x="932" y="1359"/>
       <point x="922" y="1349"/>
       <point x="902" y="1349" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="494" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="494" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="373" y="-29"/>
       <point x="274" y="4"/>
       <point x="202" y="72" type="curve" smooth="yes"/>
       <point x="131" y="139"/>
       <point x="95" y="233"/>
-      <point x="95" y="354" type="curve" name="dh01" smooth="yes"/>
+      <point x="95" y="354" type="curve" smooth="yes" name="dh01"/>
       <point x="95" y="482"/>
       <point x="134" y="580"/>
       <point x="222" y="644" type="curve" smooth="yes"/>
@@ -60,7 +60,7 @@
       <point x="767" y="894" type="curve" smooth="yes"/>
       <point x="732" y="919"/>
       <point x="679" y="930"/>
-      <point x="610" y="930" type="curve" name="dv06" smooth="yes"/>
+      <point x="610" y="930" type="curve" smooth="yes" name="dv06"/>
       <point x="546" y="930"/>
       <point x="477" y="921"/>
       <point x="412" y="904" type="curve" smooth="yes"/>
@@ -73,22 +73,22 @@
       <point x="403" y="1128" type="curve" smooth="yes"/>
       <point x="458" y="1139"/>
       <point x="540" y="1148"/>
-      <point x="628" y="1148" type="curve" name="dv07" smooth="yes"/>
+      <point x="628" y="1148" type="curve" smooth="yes" name="dv07"/>
       <point x="815" y="1148"/>
       <point x="927" y="1102"/>
       <point x="997" y="1035" type="curve"/>
       <point x="1069" y="963"/>
       <point x="1109" y="852"/>
-      <point x="1109" y="644" type="curve" name="sh02" smooth="yes"/>
+      <point x="1109" y="644" type="curve" smooth="yes" name="sh02"/>
       <point x="1109" y="570"/>
       <point x="1104" y="323"/>
-      <point x="1104" y="274" type="curve" name="sh03" smooth="yes"/>
+      <point x="1104" y="274" type="curve" smooth="yes" name="sh03"/>
       <point x="1104" y="246"/>
       <point x="1105" y="216"/>
-      <point x="1106" y="197" type="curve" name="sh04" smooth="yes"/>
+      <point x="1106" y="197" type="curve" smooth="yes" name="sh04"/>
       <point x="1109" y="170"/>
       <point x="1110" y="142"/>
-      <point x="1113" y="125" type="curve" name="hr02" smooth="yes"/>
+      <point x="1113" y="125" type="curve" smooth="yes" name="hr02"/>
       <point x="1117" y="98"/>
       <point x="1123" y="71"/>
       <point x="1127" y="58" type="curve" smooth="yes"/>
@@ -104,18 +104,18 @@
       <point x="824" y="125" type="curve" name="sh05"/>
       <point x="787" y="76"/>
       <point x="740" y="38"/>
-      <point x="682" y="11" type="curve" name="ab02" smooth="yes"/>
+      <point x="682" y="11" type="curve" smooth="yes" name="ab02"/>
       <point x="626" y="-16"/>
       <point x="570" y="-29"/>
     </contour>
     <contour>
-      <point x="576" y="174" type="curve" name="dv02" smooth="yes"/>
+      <point x="576" y="174" type="curve" smooth="yes" name="dv02"/>
       <point x="651" y="174"/>
       <point x="711" y="202"/>
       <point x="754" y="262" type="curve"/>
       <point x="797" y="319"/>
       <point x="818" y="401"/>
-      <point x="818" y="506" type="curve" name="sh06" smooth="yes"/>
+      <point x="818" y="506" type="curve" smooth="yes" name="sh06"/>
       <point x="818" y="526" type="line" name="dv05"/>
       <point x="701" y="526" type="line" smooth="yes"/>
       <point x="591" y="526"/>
@@ -123,7 +123,7 @@
       <point x="472" y="484" type="curve" smooth="yes"/>
       <point x="429" y="456"/>
       <point x="407" y="409"/>
-      <point x="407" y="342" type="curve" name="dh02" smooth="yes"/>
+      <point x="407" y="342" type="curve" smooth="yes" name="dh02"/>
       <point x="407" y="287"/>
       <point x="421" y="250"/>
       <point x="452" y="219" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/ae.glif b/source/Hack-Bold.ufo/glyphs/ae.glif
index ae5920c35..d3643c3ed 100644
--- a/source/Hack-Bold.ufo/glyphs/ae.glif
+++ b/source/Hack-Bold.ufo/glyphs/ae.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ae" format="1">
+<glyph name="ae" format="2">
   <advance width="1233"/>
   <unicode hex="00E6"/>
   <outline>
     <contour>
-      <point x="346" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="346" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="241" y="-29"/>
       <point x="159" y="2"/>
       <point x="101" y="63" type="curve" smooth="yes"/>
       <point x="43" y="125"/>
       <point x="14" y="213"/>
-      <point x="14" y="326" type="curve" name="dh01" smooth="yes"/>
+      <point x="14" y="326" type="curve" smooth="yes" name="dh01"/>
       <point x="14" y="449"/>
       <point x="48" y="542"/>
       <point x="115" y="603" type="curve" smooth="yes"/>
@@ -21,14 +21,14 @@
       <point x="496" y="745" type="line" smooth="yes"/>
       <point x="496" y="869"/>
       <point x="443" y="932"/>
-      <point x="343" y="932" type="curve" name="sv01" smooth="yes"/>
+      <point x="343" y="932" type="curve" smooth="yes" name="sv01"/>
       <point x="258" y="932"/>
       <point x="181" y="901"/>
       <point x="76" y="823" type="curve" name="ih01"/>
       <point x="76" y="1069" type="line"/>
       <point x="176" y="1122"/>
       <point x="266" y="1147"/>
-      <point x="357" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="357" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="418" y="1147"/>
       <point x="472" y="1137"/>
       <point x="515" y="1116" type="curve" smooth="yes"/>
@@ -40,7 +40,7 @@
       <point x="707" y="1114" type="curve" smooth="yes"/>
       <point x="751" y="1136"/>
       <point x="804" y="1147"/>
-      <point x="865" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="865" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="986" y="1147"/>
       <point x="1065" y="1108"/>
       <point x="1114" y="1028" type="curve" smooth="yes"/>
@@ -54,7 +54,7 @@
       <point x="787" y="260" type="curve" smooth="yes"/>
       <point x="818" y="213"/>
       <point x="863" y="184"/>
-      <point x="932" y="184" type="curve" name="sv02" smooth="yes"/>
+      <point x="932" y="184" type="curve" smooth="yes" name="sv02"/>
       <point x="977" y="184"/>
       <point x="1015" y="195"/>
       <point x="1052" y="214" type="curve" smooth="yes"/>
@@ -67,7 +67,7 @@
       <point x="1059" y="-8" type="curve" smooth="yes"/>
       <point x="1016" y="-23"/>
       <point x="967" y="-29"/>
-      <point x="916" y="-29" type="curve" name="sv03" smooth="yes"/>
+      <point x="916" y="-29" type="curve" smooth="yes" name="sv03"/>
       <point x="843" y="-29"/>
       <point x="786" y="-15"/>
       <point x="735" y="13" type="curve" smooth="yes"/>
@@ -88,7 +88,7 @@
       <point x="938" y="885" type="curve" smooth="yes"/>
       <point x="921" y="916"/>
       <point x="891" y="932"/>
-      <point x="850" y="932" type="curve" name="sv04" smooth="yes"/>
+      <point x="850" y="932" type="curve" smooth="yes" name="sv04"/>
       <point x="809" y="932"/>
       <point x="779" y="916"/>
       <point x="762" y="885" type="curve" smooth="yes"/>
@@ -98,18 +98,18 @@
       <point x="737" y="690" type="line" name="dh04"/>
     </contour>
     <contour>
-      <point x="365" y="184" type="curve" name="dv01" smooth="yes"/>
+      <point x="365" y="184" type="curve" smooth="yes" name="dv01"/>
       <point x="407" y="184"/>
       <point x="438" y="198"/>
       <point x="459" y="227" type="curve" smooth="yes"/>
       <point x="479" y="256"/>
       <point x="489" y="299"/>
-      <point x="489" y="358" type="curve" name="sh02" smooth="yes"/>
+      <point x="489" y="358" type="curve" smooth="yes" name="sh02"/>
       <point x="489" y="483" type="line" name="sv05"/>
       <point x="416" y="483" type="line" smooth="yes"/>
       <point x="301" y="483"/>
       <point x="240" y="430"/>
-      <point x="240" y="329" type="curve" name="dh02" smooth="yes"/>
+      <point x="240" y="329" type="curve" smooth="yes" name="dh02"/>
       <point x="240" y="237"/>
       <point x="284" y="184"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/agrave.glif b/source/Hack-Bold.ufo/glyphs/agrave.glif
index 4e82907ea..5d532a47e 100644
--- a/source/Hack-Bold.ufo/glyphs/agrave.glif
+++ b/source/Hack-Bold.ufo/glyphs/agrave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="agrave" format="1">
+<glyph name="agrave" format="2">
   <advance width="1233"/>
   <unicode hex="00E0"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="567" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="494" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="494" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="373" y="-29"/>
       <point x="274" y="4"/>
       <point x="202" y="72" type="curve" smooth="yes"/>
       <point x="131" y="139"/>
       <point x="95" y="233"/>
-      <point x="95" y="354" type="curve" name="sh01" smooth="yes"/>
+      <point x="95" y="354" type="curve" smooth="yes" name="sh01"/>
       <point x="95" y="482"/>
       <point x="134" y="580"/>
       <point x="222" y="644" type="curve" smooth="yes"/>
@@ -30,35 +30,35 @@
       <point x="767" y="894" type="curve" smooth="yes"/>
       <point x="732" y="919"/>
       <point x="679" y="930"/>
-      <point x="610" y="930" type="curve" name="dv04" smooth="yes"/>
+      <point x="610" y="930" type="curve" smooth="yes" name="dv04"/>
       <point x="546" y="930"/>
       <point x="477" y="921"/>
-      <point x="412" y="904" type="curve" name="hr01" smooth="yes"/>
+      <point x="412" y="904" type="curve" smooth="yes" name="hr01"/>
       <point x="348" y="887"/>
       <point x="278" y="858"/>
       <point x="206" y="819" type="curve" name="ih03"/>
       <point x="206" y="1069" type="line"/>
       <point x="262" y="1092"/>
       <point x="336" y="1116"/>
-      <point x="403" y="1128" type="curve" name="sh05" smooth="yes"/>
+      <point x="403" y="1128" type="curve" smooth="yes" name="sh05"/>
       <point x="458" y="1139"/>
       <point x="540" y="1148"/>
-      <point x="628" y="1148" type="curve" name="dv05" smooth="yes"/>
+      <point x="628" y="1148" type="curve" smooth="yes" name="dv05"/>
       <point x="815" y="1148"/>
       <point x="927" y="1102"/>
       <point x="997" y="1035" type="curve"/>
       <point x="1069" y="963"/>
       <point x="1109" y="852"/>
-      <point x="1109" y="644" type="curve" name="sh03" smooth="yes"/>
+      <point x="1109" y="644" type="curve" smooth="yes" name="sh03"/>
       <point x="1109" y="570"/>
       <point x="1104" y="323"/>
-      <point x="1104" y="274" type="curve" name="sh06" smooth="yes"/>
+      <point x="1104" y="274" type="curve" smooth="yes" name="sh06"/>
       <point x="1104" y="246"/>
       <point x="1105" y="216"/>
-      <point x="1106" y="197" type="curve" name="sh07" smooth="yes"/>
+      <point x="1106" y="197" type="curve" smooth="yes" name="sh07"/>
       <point x="1109" y="170"/>
       <point x="1110" y="142"/>
-      <point x="1113" y="125" type="curve" name="sh04" smooth="yes"/>
+      <point x="1113" y="125" type="curve" smooth="yes" name="sh04"/>
       <point x="1117" y="98"/>
       <point x="1123" y="71"/>
       <point x="1127" y="58" type="curve" smooth="yes"/>
@@ -74,26 +74,26 @@
       <point x="824" y="125" type="curve" name="sh08"/>
       <point x="787" y="76"/>
       <point x="740" y="38"/>
-      <point x="682" y="11" type="curve" name="ab02" smooth="yes"/>
+      <point x="682" y="11" type="curve" smooth="yes" name="ab02"/>
       <point x="626" y="-16"/>
       <point x="570" y="-29"/>
     </contour>
     <contour>
-      <point x="576" y="174" type="curve" name="dv02" smooth="yes"/>
+      <point x="576" y="174" type="curve" smooth="yes" name="dv02"/>
       <point x="651" y="174"/>
       <point x="711" y="202"/>
       <point x="754" y="262" type="curve"/>
       <point x="797" y="319"/>
       <point x="818" y="401"/>
-      <point x="818" y="506" type="curve" name="sh09" smooth="yes"/>
+      <point x="818" y="506" type="curve" smooth="yes" name="sh09"/>
       <point x="818" y="526" type="line" name="dv03"/>
       <point x="701" y="526" type="line" smooth="yes"/>
       <point x="591" y="526"/>
       <point x="515" y="512"/>
-      <point x="472" y="484" type="curve" name="hr02" smooth="yes"/>
+      <point x="472" y="484" type="curve" smooth="yes" name="hr02"/>
       <point x="429" y="456"/>
       <point x="407" y="409"/>
-      <point x="407" y="342" type="curve" name="sh02" smooth="yes"/>
+      <point x="407" y="342" type="curve" smooth="yes" name="sh02"/>
       <point x="407" y="287"/>
       <point x="421" y="250"/>
       <point x="452" y="219" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/alpha.glif b/source/Hack-Bold.ufo/glyphs/alpha.glif
index 2c1413f1b..f9f0ba719 100644
--- a/source/Hack-Bold.ufo/glyphs/alpha.glif
+++ b/source/Hack-Bold.ufo/glyphs/alpha.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="alpha" format="1">
+<glyph name="alpha" format="2">
   <advance width="1233"/>
   <unicode hex="03B1"/>
   <outline>
     <contour>
-      <point x="1062" y="0" type="line" name="hr00" smooth="yes"/>
+      <point x="1062" y="0" type="line" smooth="yes" name="hr00"/>
       <point x="956" y="0"/>
       <point x="876" y="28"/>
       <point x="822" y="84" type="curve" smooth="yes"/>
@@ -19,7 +19,7 @@
       <point x="166" y="123" type="curve" smooth="yes"/>
       <point x="91" y="220"/>
       <point x="54" y="374"/>
-      <point x="54" y="559" type="curve" name="dh01" smooth="yes"/>
+      <point x="54" y="559" type="curve" smooth="yes" name="dh01"/>
       <point x="54" y="965"/>
       <point x="240" y="1137"/>
       <point x="500" y="1145" type="curve" smooth="yes"/>
@@ -32,7 +32,7 @@
       <point x="985" y="390" type="line" smooth="yes"/>
       <point x="1004" y="280"/>
       <point x="1036" y="225"/>
-      <point x="1082" y="225" type="curve" name="sv01" smooth="yes"/>
+      <point x="1082" y="225" type="curve" smooth="yes" name="sv01"/>
       <point x="1164" y="225" type="line"/>
       <point x="1164" y="0" type="line"/>
     </contour>
@@ -44,7 +44,7 @@
       <point x="381" y="814" type="curve" smooth="yes"/>
       <point x="342" y="755"/>
       <point x="323" y="667"/>
-      <point x="323" y="552" type="curve" name="dh02" smooth="yes"/>
+      <point x="323" y="552" type="curve" smooth="yes" name="dh02"/>
       <point x="323" y="431"/>
       <point x="344" y="354"/>
       <point x="381" y="299" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/alphatonos.glif b/source/Hack-Bold.ufo/glyphs/alphatonos.glif
index 16795c149..90187f172 100644
--- a/source/Hack-Bold.ufo/glyphs/alphatonos.glif
+++ b/source/Hack-Bold.ufo/glyphs/alphatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="alphatonos" format="1">
+<glyph name="alphatonos" format="2">
   <advance width="1233"/>
   <unicode hex="03AC"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="469" y="1295" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="1062" y="0" type="line" name="ab01" smooth="yes"/>
+      <point x="1062" y="0" type="line" smooth="yes" name="ab01"/>
       <point x="956" y="0"/>
       <point x="876" y="28"/>
       <point x="822" y="84" type="curve" smooth="yes"/>
@@ -25,7 +25,7 @@
       <point x="166" y="123" type="curve" smooth="yes"/>
       <point x="91" y="220"/>
       <point x="54" y="374"/>
-      <point x="54" y="559" type="curve" name="dh01" smooth="yes"/>
+      <point x="54" y="559" type="curve" smooth="yes" name="dh01"/>
       <point x="54" y="965"/>
       <point x="240" y="1137"/>
       <point x="500" y="1145" type="curve" smooth="yes"/>
@@ -38,7 +38,7 @@
       <point x="985" y="390" type="line" smooth="yes"/>
       <point x="1004" y="280"/>
       <point x="1036" y="225"/>
-      <point x="1082" y="225" type="curve" name="sv01" smooth="yes"/>
+      <point x="1082" y="225" type="curve" smooth="yes" name="sv01"/>
       <point x="1164" y="225" type="line"/>
       <point x="1164" y="0" type="line"/>
     </contour>
@@ -50,7 +50,7 @@
       <point x="381" y="814" type="curve" smooth="yes"/>
       <point x="342" y="755"/>
       <point x="323" y="667"/>
-      <point x="323" y="552" type="curve" name="dh02" smooth="yes"/>
+      <point x="323" y="552" type="curve" smooth="yes" name="dh02"/>
       <point x="323" y="431"/>
       <point x="344" y="354"/>
       <point x="381" y="299" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/amacron.glif b/source/Hack-Bold.ufo/glyphs/amacron.glif
index 4c0525b82..14aff3a9a 100644
--- a/source/Hack-Bold.ufo/glyphs/amacron.glif
+++ b/source/Hack-Bold.ufo/glyphs/amacron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="amacron" format="1">
+<glyph name="amacron" format="2">
   <advance width="1233"/>
   <unicode hex="0101"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="301" y="1347" type="line"/>
     </contour>
     <contour>
-      <point x="494" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="494" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="373" y="-29"/>
       <point x="274" y="4"/>
       <point x="202" y="72" type="curve" smooth="yes"/>
       <point x="131" y="139"/>
       <point x="95" y="233"/>
-      <point x="95" y="354" type="curve" name="sh01" smooth="yes"/>
+      <point x="95" y="354" type="curve" smooth="yes" name="sh01"/>
       <point x="95" y="482"/>
       <point x="134" y="580"/>
       <point x="222" y="644" type="curve" smooth="yes"/>
@@ -30,35 +30,35 @@
       <point x="767" y="894" type="curve" smooth="yes"/>
       <point x="732" y="919"/>
       <point x="679" y="930"/>
-      <point x="610" y="930" type="curve" name="dv06" smooth="yes"/>
+      <point x="610" y="930" type="curve" smooth="yes" name="dv06"/>
       <point x="546" y="930"/>
       <point x="477" y="921"/>
-      <point x="412" y="904" type="curve" name="hr01" smooth="yes"/>
+      <point x="412" y="904" type="curve" smooth="yes" name="hr01"/>
       <point x="348" y="887"/>
       <point x="278" y="858"/>
       <point x="206" y="819" type="curve" name="ih01"/>
       <point x="206" y="1069" type="line"/>
       <point x="262" y="1092"/>
       <point x="336" y="1116"/>
-      <point x="403" y="1128" type="curve" name="sh03" smooth="yes"/>
+      <point x="403" y="1128" type="curve" smooth="yes" name="sh03"/>
       <point x="458" y="1139"/>
       <point x="540" y="1148"/>
-      <point x="628" y="1148" type="curve" name="dv07" smooth="yes"/>
+      <point x="628" y="1148" type="curve" smooth="yes" name="dv07"/>
       <point x="815" y="1148"/>
       <point x="927" y="1102"/>
       <point x="997" y="1035" type="curve"/>
       <point x="1069" y="963"/>
       <point x="1109" y="852"/>
-      <point x="1109" y="644" type="curve" name="sh04" smooth="yes"/>
+      <point x="1109" y="644" type="curve" smooth="yes" name="sh04"/>
       <point x="1109" y="570"/>
       <point x="1104" y="323"/>
-      <point x="1104" y="274" type="curve" name="sh05" smooth="yes"/>
+      <point x="1104" y="274" type="curve" smooth="yes" name="sh05"/>
       <point x="1104" y="246"/>
       <point x="1105" y="216"/>
-      <point x="1106" y="197" type="curve" name="sh06" smooth="yes"/>
+      <point x="1106" y="197" type="curve" smooth="yes" name="sh06"/>
       <point x="1109" y="170"/>
       <point x="1110" y="142"/>
-      <point x="1113" y="125" type="curve" name="sh07" smooth="yes"/>
+      <point x="1113" y="125" type="curve" smooth="yes" name="sh07"/>
       <point x="1117" y="98"/>
       <point x="1123" y="71"/>
       <point x="1127" y="58" type="curve" smooth="yes"/>
@@ -74,26 +74,26 @@
       <point x="824" y="125" type="curve" name="sh08"/>
       <point x="787" y="76"/>
       <point x="740" y="38"/>
-      <point x="682" y="11" type="curve" name="ab02" smooth="yes"/>
+      <point x="682" y="11" type="curve" smooth="yes" name="ab02"/>
       <point x="626" y="-16"/>
       <point x="570" y="-29"/>
     </contour>
     <contour>
-      <point x="576" y="174" type="curve" name="dv02" smooth="yes"/>
+      <point x="576" y="174" type="curve" smooth="yes" name="dv02"/>
       <point x="651" y="174"/>
       <point x="711" y="202"/>
       <point x="754" y="262" type="curve"/>
       <point x="797" y="319"/>
       <point x="818" y="401"/>
-      <point x="818" y="506" type="curve" name="sh09" smooth="yes"/>
+      <point x="818" y="506" type="curve" smooth="yes" name="sh09"/>
       <point x="818" y="526" type="line" name="dv05"/>
       <point x="701" y="526" type="line" smooth="yes"/>
       <point x="591" y="526"/>
       <point x="515" y="512"/>
-      <point x="472" y="484" type="curve" name="hr02" smooth="yes"/>
+      <point x="472" y="484" type="curve" smooth="yes" name="hr02"/>
       <point x="429" y="456"/>
       <point x="407" y="409"/>
-      <point x="407" y="342" type="curve" name="sh02" smooth="yes"/>
+      <point x="407" y="342" type="curve" smooth="yes" name="sh02"/>
       <point x="407" y="287"/>
       <point x="421" y="250"/>
       <point x="452" y="219" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/ampersand.glif b/source/Hack-Bold.ufo/glyphs/ampersand.glif
index b6c4f0f63..2236807d5 100644
--- a/source/Hack-Bold.ufo/glyphs/ampersand.glif
+++ b/source/Hack-Bold.ufo/glyphs/ampersand.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ampersand" format="1">
+<glyph name="ampersand" format="2">
   <advance width="1233"/>
   <unicode hex="0026"/>
   <outline>
     <contour>
-      <point x="537" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="537" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="390" y="-29"/>
       <point x="269" y="15"/>
       <point x="176" y="102" type="curve" smooth="yes"/>
       <point x="83" y="189"/>
       <point x="37" y="302"/>
-      <point x="37" y="442" type="curve" name="dh01" smooth="yes"/>
+      <point x="37" y="442" type="curve" smooth="yes" name="dh01"/>
       <point x="37" y="546"/>
       <point x="61" y="629"/>
       <point x="108" y="706" type="curve" smooth="yes"/>
@@ -22,29 +22,29 @@
       <point x="243" y="1058" type="curve" smooth="yes"/>
       <point x="227" y="1102"/>
       <point x="219" y="1142"/>
-      <point x="219" y="1189" type="curve" name="ih01" smooth="yes"/>
+      <point x="219" y="1189" type="curve" smooth="yes" name="ih01"/>
       <point x="219" y="1290"/>
       <point x="255" y="1374"/>
       <point x="328" y="1433" type="curve" smooth="yes"/>
       <point x="401" y="1491"/>
       <point x="506" y="1520"/>
-      <point x="643" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="643" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="694" y="1520"/>
       <point x="739" y="1516"/>
-      <point x="786" y="1509" type="curve" name="at02" smooth="yes"/>
+      <point x="786" y="1509" type="curve" smooth="yes" name="at02"/>
       <point x="839" y="1501"/>
       <point x="877" y="1492"/>
       <point x="924" y="1477" type="curve"/>
       <point x="924" y="1221" type="line" name="ih02"/>
       <point x="838" y="1270"/>
       <point x="756" y="1294"/>
-      <point x="663" y="1294" type="curve" name="hr01" smooth="yes"/>
+      <point x="663" y="1294" type="curve" smooth="yes" name="hr01"/>
       <point x="612" y="1294"/>
       <point x="570" y="1285"/>
       <point x="543" y="1266" type="curve" smooth="yes"/>
       <point x="516" y="1247"/>
       <point x="502" y="1220"/>
-      <point x="502" y="1186" type="curve" name="sh01" smooth="yes"/>
+      <point x="502" y="1186" type="curve" smooth="yes" name="sh01"/>
       <point x="502" y="1159"/>
       <point x="510" y="1130"/>
       <point x="533" y="1085" type="curve" smooth="yes"/>
@@ -57,15 +57,15 @@
       <point x="976" y="527" type="curve" smooth="yes"/>
       <point x="983" y="562"/>
       <point x="987" y="597"/>
-      <point x="987" y="633" type="curve" name="sh02" smooth="yes"/>
+      <point x="987" y="633" type="curve" smooth="yes" name="sh02"/>
       <point x="987" y="652"/>
       <point x="986" y="675"/>
-      <point x="985" y="692" type="curve" name="dh03" smooth="yes"/>
+      <point x="985" y="692" type="curve" smooth="yes" name="dh03"/>
       <point x="984" y="712"/>
       <point x="983" y="722"/>
       <point x="979" y="745" type="curve" name="sh03"/>
       <point x="1214" y="745" type="line"/>
-      <point x="1214" y="694" type="line" name="dh04" smooth="yes"/>
+      <point x="1214" y="694" type="line" smooth="yes" name="dh04"/>
       <point x="1214" y="596"/>
       <point x="1203" y="512"/>
       <point x="1180" y="441" type="curve" smooth="yes"/>
@@ -77,12 +77,12 @@
       <point x="870" y="72" type="line"/>
       <point x="818" y="37"/>
       <point x="770" y="16"/>
-      <point x="711" y="-3" type="curve" name="ab02" smooth="yes"/>
+      <point x="711" y="-3" type="curve" smooth="yes" name="ab02"/>
       <point x="655" y="-20"/>
       <point x="604" y="-29"/>
     </contour>
     <contour>
-      <point x="580" y="207" type="curve" name="dv02" smooth="yes"/>
+      <point x="580" y="207" type="curve" smooth="yes" name="dv02"/>
       <point x="600" y="207"/>
       <point x="613" y="209"/>
       <point x="636" y="214" type="curve" smooth="yes"/>
@@ -99,10 +99,10 @@
       <point x="341" y="629" type="curve" smooth="yes"/>
       <point x="318" y="590"/>
       <point x="307" y="545"/>
-      <point x="307" y="494" type="curve" name="dh02" smooth="yes"/>
+      <point x="307" y="494" type="curve" smooth="yes" name="dh02"/>
       <point x="307" y="406"/>
       <point x="340" y="339"/>
-      <point x="385" y="291" type="curve" name="hr02" smooth="yes"/>
+      <point x="385" y="291" type="curve" smooth="yes" name="hr02"/>
       <point x="438" y="235"/>
       <point x="503" y="207"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/angle.glif b/source/Hack-Bold.ufo/glyphs/angle.glif
index 96ea71403..917ef6c4f 100644
--- a/source/Hack-Bold.ufo/glyphs/angle.glif
+++ b/source/Hack-Bold.ufo/glyphs/angle.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="angle" format="1">
+<glyph name="angle" format="2">
   <advance width="1233"/>
   <unicode hex="2220"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/aogonek.glif b/source/Hack-Bold.ufo/glyphs/aogonek.glif
index f3687c06c..6e483a359 100644
--- a/source/Hack-Bold.ufo/glyphs/aogonek.glif
+++ b/source/Hack-Bold.ufo/glyphs/aogonek.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="aogonek" format="1">
+<glyph name="aogonek" format="2">
   <advance width="1233"/>
   <unicode hex="0105"/>
   <outline>
     <contour>
-      <point x="1036" y="-252" type="curve" name="dv02" smooth="yes"/>
+      <point x="1036" y="-252" type="curve" smooth="yes" name="dv02"/>
       <point x="1077" y="-252"/>
       <point x="1131" y="-242"/>
       <point x="1184" y="-221" type="curve" name="sh01"/>
       <point x="1184" y="-377" type="line"/>
       <point x="1112" y="-392"/>
       <point x="1048" y="-399"/>
-      <point x="997" y="-399" type="curve" name="dv01" smooth="yes"/>
+      <point x="997" y="-399" type="curve" smooth="yes" name="dv01"/>
       <point x="841" y="-399"/>
       <point x="756" y="-337"/>
-      <point x="756" y="-222" type="curve" name="dh02" smooth="yes"/>
+      <point x="756" y="-222" type="curve" smooth="yes" name="dh02"/>
       <point x="756" y="-150"/>
       <point x="790" y="-80"/>
       <point x="865" y="0" type="curve" name="ab01"/>
@@ -26,16 +26,16 @@
       <point x="824" y="125" type="curve" name="sh02"/>
       <point x="787" y="76"/>
       <point x="740" y="38"/>
-      <point x="682" y="11" type="curve" name="ab02" smooth="yes"/>
+      <point x="682" y="11" type="curve" smooth="yes" name="ab02"/>
       <point x="626" y="-16"/>
       <point x="570" y="-29"/>
-      <point x="494" y="-29" type="curve" name="hr01" smooth="yes"/>
+      <point x="494" y="-29" type="curve" smooth="yes" name="hr01"/>
       <point x="373" y="-29"/>
       <point x="274" y="4"/>
       <point x="202" y="72" type="curve" smooth="yes"/>
       <point x="131" y="139"/>
       <point x="95" y="233"/>
-      <point x="95" y="354" type="curve" name="dh01" smooth="yes"/>
+      <point x="95" y="354" type="curve" smooth="yes" name="dh01"/>
       <point x="95" y="482"/>
       <point x="134" y="580"/>
       <point x="222" y="644" type="curve" smooth="yes"/>
@@ -49,7 +49,7 @@
       <point x="767" y="894" type="curve" smooth="yes"/>
       <point x="732" y="919"/>
       <point x="679" y="930"/>
-      <point x="610" y="930" type="curve" name="hr02" smooth="yes"/>
+      <point x="610" y="930" type="curve" smooth="yes" name="hr02"/>
       <point x="546" y="930"/>
       <point x="477" y="921"/>
       <point x="412" y="904" type="curve" smooth="yes"/>
@@ -62,19 +62,19 @@
       <point x="403" y="1128" type="curve" smooth="yes"/>
       <point x="458" y="1139"/>
       <point x="540" y="1148"/>
-      <point x="628" y="1148" type="curve" name="dv03" smooth="yes"/>
+      <point x="628" y="1148" type="curve" smooth="yes" name="dv03"/>
       <point x="815" y="1148"/>
       <point x="927" y="1102"/>
       <point x="997" y="1035" type="curve"/>
       <point x="1069" y="963"/>
       <point x="1109" y="852"/>
-      <point x="1109" y="644" type="curve" name="sh03" smooth="yes"/>
+      <point x="1109" y="644" type="curve" smooth="yes" name="sh03"/>
       <point x="1109" y="570"/>
       <point x="1104" y="323"/>
-      <point x="1104" y="274" type="curve" name="sh04" smooth="yes"/>
+      <point x="1104" y="274" type="curve" smooth="yes" name="sh04"/>
       <point x="1104" y="246"/>
       <point x="1105" y="216"/>
-      <point x="1106" y="197" type="curve" name="sh05" smooth="yes"/>
+      <point x="1106" y="197" type="curve" smooth="yes" name="sh05"/>
       <point x="1109" y="170"/>
       <point x="1110" y="142"/>
       <point x="1113" y="125" type="curve" smooth="yes"/>
@@ -90,7 +90,7 @@
       <point x="937" y="-104" type="curve" smooth="yes"/>
       <point x="924" y="-128"/>
       <point x="918" y="-145"/>
-      <point x="918" y="-164" type="curve" name="dh03" smooth="yes"/>
+      <point x="918" y="-164" type="curve" smooth="yes" name="dh03"/>
       <point x="918" y="-211"/>
       <point x="953" y="-252"/>
     </contour>
@@ -102,13 +102,13 @@
       <point x="472" y="484" type="curve" smooth="yes"/>
       <point x="429" y="456"/>
       <point x="407" y="409"/>
-      <point x="407" y="342" type="curve" name="hr03" smooth="yes"/>
+      <point x="407" y="342" type="curve" smooth="yes" name="hr03"/>
       <point x="407" y="287"/>
       <point x="421" y="250"/>
       <point x="452" y="219" type="curve" smooth="yes"/>
       <point x="482" y="189"/>
       <point x="523" y="174"/>
-      <point x="576" y="174" type="curve" name="dv04" smooth="yes"/>
+      <point x="576" y="174" type="curve" smooth="yes" name="dv04"/>
       <point x="651" y="174"/>
       <point x="711" y="202"/>
       <point x="754" y="262" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/approxequal.glif b/source/Hack-Bold.ufo/glyphs/approxequal.glif
index 161e1c4d1..96d624fcd 100644
--- a/source/Hack-Bold.ufo/glyphs/approxequal.glif
+++ b/source/Hack-Bold.ufo/glyphs/approxequal.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="approxequal" format="1">
+<glyph name="approxequal" format="2">
   <advance width="1233"/>
   <unicode hex="2248"/>
   <outline>
     <contour>
-      <point x="850" y="672" type="curve" name="dv04" smooth="yes"/>
+      <point x="850" y="672" type="curve" smooth="yes" name="dv04"/>
       <point x="770" y="672"/>
       <point x="714" y="694"/>
       <point x="645" y="723" type="curve"/>
@@ -16,7 +16,7 @@
       <point x="484" y="783" type="curve" smooth="yes"/>
       <point x="449" y="791"/>
       <point x="414" y="795"/>
-      <point x="381" y="795" type="curve" name="sv01" smooth="yes"/>
+      <point x="381" y="795" type="curve" smooth="yes" name="sv01"/>
       <point x="330" y="795"/>
       <point x="281" y="785"/>
       <point x="233" y="766" type="curve" smooth="yes"/>
@@ -29,7 +29,7 @@
       <point x="239" y="991" type="curve" smooth="yes"/>
       <point x="287" y="1010"/>
       <point x="343" y="1018"/>
-      <point x="392" y="1018" type="curve" name="hr01" smooth="yes"/>
+      <point x="392" y="1018" type="curve" smooth="yes" name="hr01"/>
       <point x="461" y="1018"/>
       <point x="533" y="1000"/>
       <point x="621" y="963" type="curve"/>
@@ -37,7 +37,7 @@
       <point x="652" y="949" type="line" smooth="yes"/>
       <point x="730" y="913"/>
       <point x="801" y="895"/>
-      <point x="864" y="895" type="curve" name="dv05" smooth="yes"/>
+      <point x="864" y="895" type="curve" smooth="yes" name="dv05"/>
       <point x="959" y="895"/>
       <point x="1046" y="933"/>
       <point x="1145" y="1020" type="curve" name="av01"/>
@@ -49,7 +49,7 @@
       <point x="907" y="672"/>
     </contour>
     <contour>
-      <point x="850" y="254" type="curve" name="hr02" smooth="yes"/>
+      <point x="850" y="254" type="curve" smooth="yes" name="hr02"/>
       <point x="770" y="254"/>
       <point x="714" y="276"/>
       <point x="645" y="305" type="curve"/>
@@ -61,7 +61,7 @@
       <point x="484" y="365" type="curve" smooth="yes"/>
       <point x="449" y="373"/>
       <point x="414" y="377"/>
-      <point x="381" y="377" type="curve" name="dv02" smooth="yes"/>
+      <point x="381" y="377" type="curve" smooth="yes" name="dv02"/>
       <point x="330" y="377"/>
       <point x="281" y="367"/>
       <point x="233" y="348" type="curve" smooth="yes"/>
@@ -74,7 +74,7 @@
       <point x="239" y="573" type="curve" smooth="yes"/>
       <point x="288" y="592"/>
       <point x="342" y="600"/>
-      <point x="391" y="600" type="curve" name="dv03" smooth="yes"/>
+      <point x="391" y="600" type="curve" smooth="yes" name="dv03"/>
       <point x="462" y="600"/>
       <point x="533" y="582"/>
       <point x="621" y="545" type="curve" name="hr03"/>
@@ -82,7 +82,7 @@
       <point x="653" y="531" type="line" smooth="yes"/>
       <point x="728" y="496"/>
       <point x="796" y="477"/>
-      <point x="864" y="477" type="curve" name="dv01" smooth="yes"/>
+      <point x="864" y="477" type="curve" smooth="yes" name="dv01"/>
       <point x="915" y="477"/>
       <point x="958" y="488"/>
       <point x="1003" y="508" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/aring.glif b/source/Hack-Bold.ufo/glyphs/aring.glif
index ca498268f..b6a828dd4 100644
--- a/source/Hack-Bold.ufo/glyphs/aring.glif
+++ b/source/Hack-Bold.ufo/glyphs/aring.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="aring" format="1">
+<glyph name="aring" format="2">
   <advance width="1233"/>
   <unicode hex="00E5"/>
   <outline>
     <contour>
-      <point x="617" y="1249" type="curve" name="dv06" smooth="yes"/>
+      <point x="617" y="1249" type="curve" smooth="yes" name="dv06"/>
       <point x="541" y="1249"/>
       <point x="469" y="1277"/>
       <point x="414" y="1332" type="curve" smooth="yes"/>
       <point x="367" y="1379"/>
       <point x="332" y="1451"/>
-      <point x="332" y="1535" type="curve" name="ih01" smooth="yes"/>
+      <point x="332" y="1535" type="curve" smooth="yes" name="ih01"/>
       <point x="332" y="1620"/>
       <point x="368" y="1690"/>
       <point x="415" y="1737" type="curve" smooth="yes"/>
       <point x="470" y="1792"/>
       <point x="540" y="1819"/>
-      <point x="616" y="1819" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="1819" type="curve" smooth="yes" name="dv04"/>
       <point x="699" y="1819"/>
       <point x="769" y="1786"/>
       <point x="818" y="1737" type="curve" smooth="yes"/>
       <point x="866" y="1689"/>
       <point x="901" y="1618"/>
-      <point x="901" y="1534" type="curve" name="dh03" smooth="yes"/>
+      <point x="901" y="1534" type="curve" smooth="yes" name="dh03"/>
       <point x="901" y="1458"/>
       <point x="874" y="1389"/>
       <point x="819" y="1333" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="693" y="1249"/>
     </contour>
     <contour>
-      <point x="617" y="1403" type="curve" name="dv07" smooth="yes"/>
+      <point x="617" y="1403" type="curve" smooth="yes" name="dv07"/>
       <point x="653" y="1403"/>
       <point x="684" y="1416"/>
       <point x="710" y="1442" type="curve" smooth="yes"/>
       <point x="735" y="1467"/>
       <point x="748" y="1498"/>
-      <point x="748" y="1534" type="curve" name="dh02" smooth="yes"/>
+      <point x="748" y="1534" type="curve" smooth="yes" name="dh02"/>
       <point x="748" y="1570"/>
       <point x="735" y="1601"/>
       <point x="709" y="1627" type="curve" smooth="yes"/>
       <point x="682" y="1652"/>
       <point x="651" y="1665"/>
-      <point x="616" y="1665" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1665" type="curve" smooth="yes" name="dv03"/>
       <point x="580" y="1665"/>
       <point x="549" y="1652"/>
-      <point x="524" y="1627" type="curve" name="hr01" smooth="yes"/>
+      <point x="524" y="1627" type="curve" smooth="yes" name="hr01"/>
       <point x="498" y="1601"/>
       <point x="485" y="1570"/>
-      <point x="485" y="1534" type="curve" name="sh01" smooth="yes"/>
+      <point x="485" y="1534" type="curve" smooth="yes" name="sh01"/>
       <point x="485" y="1497"/>
       <point x="498" y="1466"/>
       <point x="523" y="1441" type="curve" smooth="yes"/>
@@ -56,13 +56,13 @@
       <point x="577" y="1403"/>
     </contour>
     <contour>
-      <point x="494" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="494" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="373" y="-29"/>
       <point x="274" y="4"/>
       <point x="202" y="72" type="curve" smooth="yes"/>
       <point x="131" y="139"/>
       <point x="95" y="233"/>
-      <point x="95" y="354" type="curve" name="dh01" smooth="yes"/>
+      <point x="95" y="354" type="curve" smooth="yes" name="dh01"/>
       <point x="95" y="482"/>
       <point x="134" y="580"/>
       <point x="222" y="644" type="curve" smooth="yes"/>
@@ -76,7 +76,7 @@
       <point x="767" y="894" type="curve" smooth="yes"/>
       <point x="732" y="919"/>
       <point x="679" y="930"/>
-      <point x="610" y="930" type="curve" name="dv08" smooth="yes"/>
+      <point x="610" y="930" type="curve" smooth="yes" name="dv08"/>
       <point x="546" y="930"/>
       <point x="477" y="921"/>
       <point x="412" y="904" type="curve" smooth="yes"/>
@@ -89,22 +89,22 @@
       <point x="403" y="1128" type="curve" smooth="yes"/>
       <point x="458" y="1139"/>
       <point x="540" y="1148"/>
-      <point x="628" y="1148" type="curve" name="dv09" smooth="yes"/>
+      <point x="628" y="1148" type="curve" smooth="yes" name="dv09"/>
       <point x="815" y="1148"/>
       <point x="927" y="1102"/>
       <point x="997" y="1035" type="curve"/>
       <point x="1069" y="963"/>
       <point x="1109" y="852"/>
-      <point x="1109" y="644" type="curve" name="sh02" smooth="yes"/>
+      <point x="1109" y="644" type="curve" smooth="yes" name="sh02"/>
       <point x="1109" y="570"/>
       <point x="1104" y="323"/>
-      <point x="1104" y="274" type="curve" name="sh03" smooth="yes"/>
+      <point x="1104" y="274" type="curve" smooth="yes" name="sh03"/>
       <point x="1104" y="246"/>
       <point x="1105" y="216"/>
-      <point x="1106" y="197" type="curve" name="sh04" smooth="yes"/>
+      <point x="1106" y="197" type="curve" smooth="yes" name="sh04"/>
       <point x="1109" y="170"/>
       <point x="1110" y="142"/>
-      <point x="1113" y="125" type="curve" name="hr02" smooth="yes"/>
+      <point x="1113" y="125" type="curve" smooth="yes" name="hr02"/>
       <point x="1117" y="98"/>
       <point x="1123" y="71"/>
       <point x="1127" y="58" type="curve" smooth="yes"/>
@@ -120,18 +120,18 @@
       <point x="824" y="125" type="curve" name="sh05"/>
       <point x="787" y="76"/>
       <point x="740" y="38"/>
-      <point x="682" y="11" type="curve" name="ab02" smooth="yes"/>
+      <point x="682" y="11" type="curve" smooth="yes" name="ab02"/>
       <point x="626" y="-16"/>
       <point x="570" y="-29"/>
     </contour>
     <contour>
-      <point x="576" y="174" type="curve" name="dv02" smooth="yes"/>
+      <point x="576" y="174" type="curve" smooth="yes" name="dv02"/>
       <point x="651" y="174"/>
       <point x="711" y="202"/>
       <point x="754" y="262" type="curve"/>
       <point x="797" y="319"/>
       <point x="818" y="401"/>
-      <point x="818" y="506" type="curve" name="sh06" smooth="yes"/>
+      <point x="818" y="506" type="curve" smooth="yes" name="sh06"/>
       <point x="818" y="526" type="line" name="dv05"/>
       <point x="701" y="526" type="line" smooth="yes"/>
       <point x="591" y="526"/>
@@ -139,7 +139,7 @@
       <point x="472" y="484" type="curve" smooth="yes"/>
       <point x="429" y="456"/>
       <point x="407" y="409"/>
-      <point x="407" y="342" type="curve" name="hr03" smooth="yes"/>
+      <point x="407" y="342" type="curve" smooth="yes" name="hr03"/>
       <point x="407" y="287"/>
       <point x="421" y="250"/>
       <point x="452" y="219" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/arrowboth.glif b/source/Hack-Bold.ufo/glyphs/arrowboth.glif
index 979672a7d..a3ea1d527 100644
--- a/source/Hack-Bold.ufo/glyphs/arrowboth.glif
+++ b/source/Hack-Bold.ufo/glyphs/arrowboth.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowboth" format="1">
+<glyph name="arrowboth" format="2">
   <advance width="1233"/>
   <unicode hex="2194"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/arrowdblboth.glif b/source/Hack-Bold.ufo/glyphs/arrowdblboth.glif
index ea5f8624c..38aaf49a4 100644
--- a/source/Hack-Bold.ufo/glyphs/arrowdblboth.glif
+++ b/source/Hack-Bold.ufo/glyphs/arrowdblboth.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowdblboth" format="1">
+<glyph name="arrowdblboth" format="2">
   <advance width="1233"/>
   <unicode hex="21D4"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/arrowdbldown.glif b/source/Hack-Bold.ufo/glyphs/arrowdbldown.glif
index 9b3a9be50..38bff7a2e 100644
--- a/source/Hack-Bold.ufo/glyphs/arrowdbldown.glif
+++ b/source/Hack-Bold.ufo/glyphs/arrowdbldown.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowdbldown" format="1">
+<glyph name="arrowdbldown" format="2">
   <advance width="1233"/>
   <unicode hex="21D3"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/arrowdblleft.glif b/source/Hack-Bold.ufo/glyphs/arrowdblleft.glif
index 46e95df75..504edd739 100644
--- a/source/Hack-Bold.ufo/glyphs/arrowdblleft.glif
+++ b/source/Hack-Bold.ufo/glyphs/arrowdblleft.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowdblleft" format="1">
+<glyph name="arrowdblleft" format="2">
   <advance width="1233"/>
   <unicode hex="21D0"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/arrowdblright.glif b/source/Hack-Bold.ufo/glyphs/arrowdblright.glif
index 878d61b77..9a5a67668 100644
--- a/source/Hack-Bold.ufo/glyphs/arrowdblright.glif
+++ b/source/Hack-Bold.ufo/glyphs/arrowdblright.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowdblright" format="1">
+<glyph name="arrowdblright" format="2">
   <advance width="1233"/>
   <unicode hex="21D2"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/arrowdblup.glif b/source/Hack-Bold.ufo/glyphs/arrowdblup.glif
index ded4a3c5b..cd38e6bf6 100644
--- a/source/Hack-Bold.ufo/glyphs/arrowdblup.glif
+++ b/source/Hack-Bold.ufo/glyphs/arrowdblup.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowdblup" format="1">
+<glyph name="arrowdblup" format="2">
   <advance width="1233"/>
   <unicode hex="21D1"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/arrowdown.glif b/source/Hack-Bold.ufo/glyphs/arrowdown.glif
index 18e0673ba..298b24959 100644
--- a/source/Hack-Bold.ufo/glyphs/arrowdown.glif
+++ b/source/Hack-Bold.ufo/glyphs/arrowdown.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowdown" format="1">
+<glyph name="arrowdown" format="2">
   <advance width="1233"/>
   <unicode hex="2193"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/arrowleft.glif b/source/Hack-Bold.ufo/glyphs/arrowleft.glif
index 4a16ddd96..26ebe65e6 100644
--- a/source/Hack-Bold.ufo/glyphs/arrowleft.glif
+++ b/source/Hack-Bold.ufo/glyphs/arrowleft.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowleft" format="1">
+<glyph name="arrowleft" format="2">
   <advance width="1233"/>
   <unicode hex="2190"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/arrowright.glif b/source/Hack-Bold.ufo/glyphs/arrowright.glif
index a210453f3..310250374 100644
--- a/source/Hack-Bold.ufo/glyphs/arrowright.glif
+++ b/source/Hack-Bold.ufo/glyphs/arrowright.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowright" format="1">
+<glyph name="arrowright" format="2">
   <advance width="1233"/>
   <unicode hex="2192"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/arrowup.glif b/source/Hack-Bold.ufo/glyphs/arrowup.glif
index 3c23f687e..f244b0f90 100644
--- a/source/Hack-Bold.ufo/glyphs/arrowup.glif
+++ b/source/Hack-Bold.ufo/glyphs/arrowup.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowup" format="1">
+<glyph name="arrowup" format="2">
   <advance width="1233"/>
   <unicode hex="2191"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/arrowupdn.glif b/source/Hack-Bold.ufo/glyphs/arrowupdn.glif
index fd3edea94..8c92bef2e 100644
--- a/source/Hack-Bold.ufo/glyphs/arrowupdn.glif
+++ b/source/Hack-Bold.ufo/glyphs/arrowupdn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowupdn" format="1">
+<glyph name="arrowupdn" format="2">
   <advance width="1233"/>
   <unicode hex="2195"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/arrowupdnbse.glif b/source/Hack-Bold.ufo/glyphs/arrowupdnbse.glif
index 80c7235ee..7ff09332b 100644
--- a/source/Hack-Bold.ufo/glyphs/arrowupdnbse.glif
+++ b/source/Hack-Bold.ufo/glyphs/arrowupdnbse.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowupdnbse" format="1">
+<glyph name="arrowupdnbse" format="2">
   <advance width="1233"/>
   <unicode hex="21A8"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/asciicircum.glif b/source/Hack-Bold.ufo/glyphs/asciicircum.glif
index e96383134..f2ebc4256 100644
--- a/source/Hack-Bold.ufo/glyphs/asciicircum.glif
+++ b/source/Hack-Bold.ufo/glyphs/asciicircum.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="asciicircum" format="1">
+<glyph name="asciicircum" format="2">
   <advance width="1233"/>
   <unicode hex="005E"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/asciitilde.glif b/source/Hack-Bold.ufo/glyphs/asciitilde.glif
index 904a8c368..75da2cdbe 100644
--- a/source/Hack-Bold.ufo/glyphs/asciitilde.glif
+++ b/source/Hack-Bold.ufo/glyphs/asciitilde.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="asciitilde" format="1">
+<glyph name="asciitilde" format="2">
   <advance width="1233"/>
   <unicode hex="007E"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/asterisk.glif b/source/Hack-Bold.ufo/glyphs/asterisk.glif
index 9159b1016..310e3fca1 100644
--- a/source/Hack-Bold.ufo/glyphs/asterisk.glif
+++ b/source/Hack-Bold.ufo/glyphs/asterisk.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="asterisk" format="1">
+<glyph name="asterisk" format="2">
   <advance width="1233"/>
   <unicode hex="002A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/asteriskmath.glif b/source/Hack-Bold.ufo/glyphs/asteriskmath.glif
index 08b44db3a..e908b8173 100644
--- a/source/Hack-Bold.ufo/glyphs/asteriskmath.glif
+++ b/source/Hack-Bold.ufo/glyphs/asteriskmath.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="asteriskmath" format="1">
+<glyph name="asteriskmath" format="2">
   <advance width="1233"/>
   <unicode hex="2217"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/at.glif b/source/Hack-Bold.ufo/glyphs/at.glif
index 8bae0be27..0d8e68a79 100644
--- a/source/Hack-Bold.ufo/glyphs/at.glif
+++ b/source/Hack-Bold.ufo/glyphs/at.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="at" format="1">
+<glyph name="at" format="2">
   <advance width="1233"/>
   <unicode hex="0040"/>
   <outline>
     <contour>
-      <point x="767" y="-319" type="curve" name="hr00" smooth="yes"/>
+      <point x="767" y="-319" type="curve" smooth="yes" name="hr00"/>
       <point x="539" y="-319"/>
       <point x="354" y="-242"/>
       <point x="214" y="-86" type="curve" smooth="yes"/>
@@ -28,19 +28,19 @@
       <point x="874" y="140" type="curve" smooth="yes"/>
       <point x="840" y="123"/>
       <point x="798" y="115"/>
-      <point x="749" y="115" type="curve" name="dv04" smooth="yes"/>
+      <point x="749" y="115" type="curve" smooth="yes" name="dv04"/>
       <point x="640" y="115"/>
       <point x="553" y="154"/>
       <point x="486" y="233" type="curve" smooth="yes"/>
       <point x="419" y="312"/>
       <point x="385" y="417"/>
-      <point x="385" y="546" type="curve" name="dh03" smooth="yes"/>
+      <point x="385" y="546" type="curve" smooth="yes" name="dh03"/>
       <point x="385" y="678"/>
       <point x="420" y="780"/>
       <point x="485" y="856" type="curve" smooth="yes"/>
       <point x="552" y="934"/>
       <point x="639" y="973"/>
-      <point x="748" y="973" type="curve" name="dv07" smooth="yes"/>
+      <point x="748" y="973" type="curve" smooth="yes" name="dv07"/>
       <point x="793" y="973"/>
       <point x="838" y="966"/>
       <point x="875" y="949" type="curve" smooth="yes"/>
@@ -53,19 +53,19 @@
       <point x="889" y="1128" type="curve" smooth="yes"/>
       <point x="838" y="1177"/>
       <point x="768" y="1202"/>
-      <point x="679" y="1202" type="curve" name="dv02" smooth="yes"/>
+      <point x="679" y="1202" type="curve" smooth="yes" name="dv02"/>
       <point x="535" y="1202"/>
       <point x="419" y="1136"/>
       <point x="336" y="1020" type="curve" smooth="yes"/>
       <point x="255" y="907"/>
       <point x="205" y="743"/>
-      <point x="205" y="544" type="curve" name="dh02" smooth="yes"/>
+      <point x="205" y="544" type="curve" smooth="yes" name="dh02"/>
       <point x="205" y="329"/>
       <point x="264" y="165"/>
       <point x="356" y="54" type="curve" smooth="yes"/>
       <point x="460" y="-70"/>
       <point x="604" y="-127"/>
-      <point x="757" y="-127" type="curve" name="dv01" smooth="yes"/>
+      <point x="757" y="-127" type="curve" smooth="yes" name="dv01"/>
       <point x="810" y="-127"/>
       <point x="866" y="-120"/>
       <point x="917" y="-104" type="curve" smooth="yes"/>
@@ -80,22 +80,22 @@
       <point x="848" y="-319"/>
     </contour>
     <contour>
-      <point x="782" y="303" type="curve" name="dv05" smooth="yes"/>
+      <point x="782" y="303" type="curve" smooth="yes" name="dv05"/>
       <point x="901" y="303"/>
       <point x="973" y="393"/>
-      <point x="973" y="545" type="curve" name="sh02" smooth="yes"/>
+      <point x="973" y="545" type="curve" smooth="yes" name="sh02"/>
       <point x="973" y="620"/>
       <point x="956" y="679"/>
       <point x="922" y="722" type="curve" smooth="yes"/>
       <point x="888" y="765"/>
       <point x="841" y="786"/>
-      <point x="782" y="786" type="curve" name="dv06" smooth="yes"/>
+      <point x="782" y="786" type="curve" smooth="yes" name="dv06"/>
       <point x="715" y="786"/>
       <point x="674" y="761"/>
       <point x="643" y="722" type="curve" smooth="yes"/>
       <point x="609" y="679"/>
       <point x="592" y="620"/>
-      <point x="592" y="545" type="curve" name="dh04" smooth="yes"/>
+      <point x="592" y="545" type="curve" smooth="yes" name="dh04"/>
       <point x="592" y="469"/>
       <point x="609" y="410"/>
       <point x="643" y="367" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/atilde.glif b/source/Hack-Bold.ufo/glyphs/atilde.glif
index c5e9d877b..8765b1e73 100644
--- a/source/Hack-Bold.ufo/glyphs/atilde.glif
+++ b/source/Hack-Bold.ufo/glyphs/atilde.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="atilde" format="1">
+<glyph name="atilde" format="2">
   <advance width="1233"/>
   <unicode hex="00E3"/>
   <outline>
     <contour>
-      <point x="768" y="1317" type="curve" name="sv01" smooth="yes"/>
+      <point x="768" y="1317" type="curve" smooth="yes" name="sv01"/>
       <point x="720" y="1317"/>
       <point x="682" y="1330"/>
       <point x="618" y="1374" type="curve" smooth="yes"/>
@@ -17,7 +17,7 @@
       <point x="427" y="1417" type="curve" smooth="yes"/>
       <point x="414" y="1396"/>
       <point x="408" y="1366"/>
-      <point x="408" y="1327" type="curve" name="sh01" smooth="yes"/>
+      <point x="408" y="1327" type="curve" smooth="yes" name="sh01"/>
       <point x="408" y="1319" type="line" name="dv02"/>
       <point x="268" y="1319" type="line" name="sh02"/>
       <point x="268" y="1414"/>
@@ -25,14 +25,14 @@
       <point x="320" y="1530" type="curve" smooth="yes"/>
       <point x="351" y="1574"/>
       <point x="398" y="1603"/>
-      <point x="465" y="1603" type="curve" name="av01" smooth="yes"/>
+      <point x="465" y="1603" type="curve" smooth="yes" name="av01"/>
       <point x="490" y="1603"/>
       <point x="514" y="1599"/>
-      <point x="537" y="1590" type="curve" name="av02" smooth="yes"/>
+      <point x="537" y="1590" type="curve" smooth="yes" name="av02"/>
       <point x="564" y="1579"/>
       <point x="586" y="1566"/>
       <point x="614" y="1546" type="curve" smooth="yes"/>
-      <point x="676" y="1503" type="line" name="hr01" smooth="yes"/>
+      <point x="676" y="1503" type="line" smooth="yes" name="hr01"/>
       <point x="693" y="1491"/>
       <point x="701" y="1487"/>
       <point x="716" y="1480" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="806" y="1504" type="curve" smooth="yes"/>
       <point x="819" y="1525"/>
       <point x="825" y="1554"/>
-      <point x="825" y="1593" type="curve" name="sh03" smooth="yes"/>
+      <point x="825" y="1593" type="curve" smooth="yes" name="sh03"/>
       <point x="825" y="1601" type="line" name="dv03"/>
       <point x="965" y="1601" type="line" name="av03"/>
       <point x="965" y="1510"/>
@@ -54,13 +54,13 @@
       <point x="833" y="1317"/>
     </contour>
     <contour>
-      <point x="494" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="494" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="373" y="-29"/>
       <point x="274" y="4"/>
       <point x="202" y="72" type="curve" smooth="yes"/>
       <point x="131" y="139"/>
       <point x="95" y="233"/>
-      <point x="95" y="354" type="curve" name="dh01" smooth="yes"/>
+      <point x="95" y="354" type="curve" smooth="yes" name="dh01"/>
       <point x="95" y="482"/>
       <point x="134" y="580"/>
       <point x="222" y="644" type="curve" smooth="yes"/>
@@ -74,7 +74,7 @@
       <point x="767" y="894" type="curve" smooth="yes"/>
       <point x="732" y="919"/>
       <point x="679" y="930"/>
-      <point x="610" y="930" type="curve" name="dv05" smooth="yes"/>
+      <point x="610" y="930" type="curve" smooth="yes" name="dv05"/>
       <point x="546" y="930"/>
       <point x="477" y="921"/>
       <point x="412" y="904" type="curve" smooth="yes"/>
@@ -87,19 +87,19 @@
       <point x="403" y="1128" type="curve" smooth="yes"/>
       <point x="458" y="1139"/>
       <point x="540" y="1148"/>
-      <point x="628" y="1148" type="curve" name="hr02" smooth="yes"/>
+      <point x="628" y="1148" type="curve" smooth="yes" name="hr02"/>
       <point x="815" y="1148"/>
       <point x="927" y="1102"/>
       <point x="997" y="1035" type="curve"/>
       <point x="1069" y="963"/>
       <point x="1109" y="852"/>
-      <point x="1109" y="644" type="curve" name="dh04" smooth="yes"/>
+      <point x="1109" y="644" type="curve" smooth="yes" name="dh04"/>
       <point x="1109" y="570"/>
       <point x="1104" y="323"/>
-      <point x="1104" y="274" type="curve" name="sh04" smooth="yes"/>
+      <point x="1104" y="274" type="curve" smooth="yes" name="sh04"/>
       <point x="1104" y="246"/>
       <point x="1105" y="216"/>
-      <point x="1106" y="197" type="curve" name="sh05" smooth="yes"/>
+      <point x="1106" y="197" type="curve" smooth="yes" name="sh05"/>
       <point x="1109" y="170"/>
       <point x="1110" y="142"/>
       <point x="1113" y="125" type="curve" smooth="yes"/>
@@ -118,18 +118,18 @@
       <point x="824" y="125" type="curve" name="sh06"/>
       <point x="787" y="76"/>
       <point x="740" y="38"/>
-      <point x="682" y="11" type="curve" name="ab02" smooth="yes"/>
+      <point x="682" y="11" type="curve" smooth="yes" name="ab02"/>
       <point x="626" y="-16"/>
       <point x="570" y="-29"/>
     </contour>
     <contour>
-      <point x="576" y="174" type="curve" name="hr03" smooth="yes"/>
+      <point x="576" y="174" type="curve" smooth="yes" name="hr03"/>
       <point x="651" y="174"/>
       <point x="711" y="202"/>
       <point x="754" y="262" type="curve"/>
       <point x="797" y="319"/>
       <point x="818" y="401"/>
-      <point x="818" y="506" type="curve" name="hr04" smooth="yes"/>
+      <point x="818" y="506" type="curve" smooth="yes" name="hr04"/>
       <point x="818" y="526" type="line" name="dv04"/>
       <point x="701" y="526" type="line" smooth="yes"/>
       <point x="591" y="526"/>
@@ -137,7 +137,7 @@
       <point x="472" y="484" type="curve" smooth="yes"/>
       <point x="429" y="456"/>
       <point x="407" y="409"/>
-      <point x="407" y="342" type="curve" name="dh02" smooth="yes"/>
+      <point x="407" y="342" type="curve" smooth="yes" name="dh02"/>
       <point x="407" y="287"/>
       <point x="421" y="250"/>
       <point x="452" y="219" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/b.glif b/source/Hack-Bold.ufo/glyphs/b.glif
index f1fd8ccfe..73f831b13 100644
--- a/source/Hack-Bold.ufo/glyphs/b.glif
+++ b/source/Hack-Bold.ufo/glyphs/b.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="b" format="1">
+<glyph name="b" format="2">
   <advance width="1233"/>
   <unicode hex="0062"/>
   <outline>
@@ -8,8 +8,8 @@
       <point x="604" y="-29"/>
       <point x="504" y="36"/>
       <point x="442" y="166" type="curve"/>
-      <point x="413" y="-0" type="line"/>
-      <point x="150" y="-0" type="line"/>
+      <point x="413" y="0" type="line"/>
+      <point x="150" y="0" type="line"/>
       <point x="150" y="1556" type="line"/>
       <point x="442" y="1556" type="line"/>
       <point x="442" y="961" type="line"/>
@@ -38,9 +38,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/backslash.glif b/source/Hack-Bold.ufo/glyphs/backslash.glif
index 2d37982b6..1a052af93 100644
--- a/source/Hack-Bold.ufo/glyphs/backslash.glif
+++ b/source/Hack-Bold.ufo/glyphs/backslash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="backslash" format="1">
+<glyph name="backslash" format="2">
   <advance width="1233"/>
   <unicode hex="005C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/bar.glif b/source/Hack-Bold.ufo/glyphs/bar.glif
index 3a22da8fc..52c9eea6d 100644
--- a/source/Hack-Bold.ufo/glyphs/bar.glif
+++ b/source/Hack-Bold.ufo/glyphs/bar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="bar" format="1">
+<glyph name="bar" format="2">
   <advance width="1233"/>
   <unicode hex="007C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/beta.glif b/source/Hack-Bold.ufo/glyphs/beta.glif
index a58c24b32..ee3cfbbb5 100644
--- a/source/Hack-Bold.ufo/glyphs/beta.glif
+++ b/source/Hack-Bold.ufo/glyphs/beta.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="beta" format="1">
+<glyph name="beta" format="2">
   <advance width="1233"/>
   <unicode hex="03B2"/>
   <outline>
@@ -7,13 +7,13 @@
       <point x="132" y="1113" type="line" name="hr00"/>
       <point x="132" y="1418"/>
       <point x="279" y="1569"/>
-      <point x="559" y="1569" type="curve" name="at01" smooth="yes"/>
+      <point x="559" y="1569" type="curve" smooth="yes" name="at01"/>
       <point x="1104" y="1569"/>
       <point x="1133" y="984"/>
       <point x="911" y="810" type="curve" name="ih01"/>
       <point x="1068" y="755"/>
       <point x="1135" y="640"/>
-      <point x="1135" y="439" type="curve" name="sh01" smooth="yes"/>
+      <point x="1135" y="439" type="curve" smooth="yes" name="sh01"/>
       <point x="1135" y="159"/>
       <point x="1006" y="-8"/>
       <point x="737" y="-21" type="curve" smooth="yes"/>
@@ -27,14 +27,14 @@
       <point x="422" y="402" type="line" name="sh04"/>
       <point x="553" y="200"/>
       <point x="834" y="146"/>
-      <point x="834" y="438" type="curve" name="ah01" smooth="yes"/>
+      <point x="834" y="438" type="curve" smooth="yes" name="ah01"/>
       <point x="834" y="605"/>
       <point x="742" y="665"/>
       <point x="554" y="657" type="curve" name="dv01"/>
       <point x="554" y="880" type="line" name="dv02"/>
       <point x="802" y="869"/>
       <point x="808" y="1333"/>
-      <point x="567" y="1333" type="curve" name="sv01" smooth="yes"/>
+      <point x="567" y="1333" type="curve" smooth="yes" name="sv01"/>
       <point x="470" y="1333"/>
       <point x="422" y="1258"/>
       <point x="422" y="1107" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/block.glif b/source/Hack-Bold.ufo/glyphs/block.glif
index bf10efca1..89dc04bf7 100644
--- a/source/Hack-Bold.ufo/glyphs/block.glif
+++ b/source/Hack-Bold.ufo/glyphs/block.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="block" format="1">
+<glyph name="block" format="2">
   <advance width="1233"/>
   <unicode hex="2588"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/braceleft.glif b/source/Hack-Bold.ufo/glyphs/braceleft.glif
index 2c127ae08..473221814 100644
--- a/source/Hack-Bold.ufo/glyphs/braceleft.glif
+++ b/source/Hack-Bold.ufo/glyphs/braceleft.glif
@@ -1,76 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="braceleft" format="1">
+<glyph name="braceleft" format="2">
   <advance width="1233"/>
   <unicode hex="007B"/>
   <outline>
     <contour>
-      <point x="853" y="-334" type="line" name="hr00" smooth="yes"/>
-      <point x="688" y="-334"/>
-      <point x="577" y="-309"/>
-      <point x="520" y="-260" type="curve" smooth="yes"/>
-      <point x="463" y="-211"/>
-      <point x="435" y="-113"/>
-      <point x="435" y="35" type="curve" name="dh01" smooth="yes"/>
-      <point x="435" y="250" type="line" smooth="yes"/>
-      <point x="435" y="343"/>
-      <point x="419" y="419"/>
-      <point x="382" y="459" type="curve" smooth="yes"/>
-      <point x="346" y="498"/>
-      <point x="277" y="516"/>
-      <point x="188" y="516" type="curve" name="dv02" smooth="yes"/>
-      <point x="96" y="516" type="line"/>
-      <point x="96" y="707" type="line"/>
-      <point x="188" y="707" type="line" name="dv03" smooth="yes"/>
-      <point x="281" y="707"/>
-      <point x="346" y="726"/>
-      <point x="382" y="764" type="curve" smooth="yes"/>
-      <point x="417" y="803"/>
-      <point x="435" y="872"/>
-      <point x="435" y="973" type="curve" name="sh01" smooth="yes"/>
-      <point x="435" y="1188" type="line" smooth="yes"/>
-      <point x="435" y="1336"/>
-      <point x="463" y="1434"/>
-      <point x="520" y="1483" type="curve" smooth="yes"/>
-      <point x="575" y="1532"/>
-      <point x="686" y="1556"/>
-      <point x="853" y="1556" type="curve" name="at01" smooth="yes"/>
-      <point x="1003" y="1556" type="line"/>
-      <point x="1003" y="1366" type="line" name="sv01"/>
-      <point x="880" y="1366" type="line" smooth="yes"/>
-      <point x="810" y="1366"/>
-      <point x="764" y="1352"/>
-      <point x="741" y="1324" type="curve" smooth="yes"/>
-      <point x="718" y="1295"/>
-      <point x="706" y="1234"/>
-      <point x="706" y="1139" type="curve" name="sh02" smooth="yes"/>
-      <point x="706" y="930" type="line" smooth="yes"/>
-      <point x="706" y="820"/>
-      <point x="690" y="743"/>
-      <point x="657" y="698" type="curve" smooth="yes"/>
-      <point x="624" y="654"/>
-      <point x="566" y="625"/>
-      <point x="482" y="612" type="curve" name="ih01"/>
-      <point x="565" y="598"/>
-      <point x="624" y="568"/>
-      <point x="657" y="523" type="curve" smooth="yes"/>
-      <point x="690" y="478"/>
-      <point x="706" y="401"/>
-      <point x="706" y="291" type="curve" smooth="yes"/>
-      <point x="706" y="86" type="line" name="dh02" smooth="yes"/>
-      <point x="706" y="-9"/>
-      <point x="718" y="-72"/>
-      <point x="741" y="-101" type="curve" smooth="yes"/>
-      <point x="764" y="-129"/>
-      <point x="810" y="-143"/>
-      <point x="880" y="-143" type="curve" name="dv01" smooth="yes"/>
-      <point x="1003" y="-143" type="line"/>
-      <point x="1003" y="-334" type="line" name="sv02"/>
+      <point x="853" y="-190" type="line" smooth="yes" name="hr00"/>
+      <point x="526.073" y="-190"/>
+      <point x="435.652" y="-118.832"/>
+      <point x="435.652" y="138.48" type="curve" smooth="yes"/>
+      <point x="435.652" y="225.468" type="line" smooth="yes"/>
+      <point x="435.652" y="259.858"/>
+      <point x="437.846" y="296.339"/>
+      <point x="437.846" y="333.613" type="curve" smooth="yes"/>
+      <point x="437.846" y="573.492"/>
+      <point x="381" y="660"/>
+      <point x="96" y="660" type="curve"/>
+      <point x="96" y="851" type="line"/>
+      <point x="380.487" y="851"/>
+      <point x="434.469" y="915.715"/>
+      <point x="434.469" y="1256.76" type="curve" smooth="yes" name="sh01"/>
+      <point x="434.469" y="1379.93" type="line" smooth="yes"/>
+      <point x="434.469" y="1626.28"/>
+      <point x="530.871" y="1700"/>
+      <point x="853" y="1700" type="curve" smooth="yes" name="at01"/>
+      <point x="1003" y="1700" type="line"/>
+      <point x="1003" y="1510" type="line" name="sv01"/>
+      <point x="980.877" y="1510"/>
+      <point x="947.698" y="1511.95"/>
+      <point x="909.113" y="1511.95" type="curve" smooth="yes"/>
+      <point x="739.503" y="1511.95"/>
+      <point x="706" y="1474.18"/>
+      <point x="706" y="1283" type="curve" smooth="yes" name="sh02"/>
+      <point x="706" y="1074" type="line" smooth="yes"/>
+      <point x="706" y="860.567"/>
+      <point x="650.652" y="781.992"/>
+      <point x="482" y="756" type="curve" name="ih01"/>
+      <point x="650.236" y="727.726"/>
+      <point x="706" y="647.815"/>
+      <point x="706" y="435" type="curve" smooth="yes"/>
+      <point x="706" y="230" type="line" smooth="yes" name="dh02"/>
+      <point x="706" y="37.206"/>
+      <point x="739.414" y="-1.003"/>
+      <point x="908.017" y="-1.003" type="curve" smooth="yes"/>
+      <point x="946.691" y="-1.003"/>
+      <point x="980.428" y="1"/>
+      <point x="1003" y="1" type="curve"/>
+      <point x="1003" y="-190" type="line" name="sv02"/>
     </contour>
   </outline>
   <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
-    </dict>
+  <dict>
+    <key>com.schriftgestaltung.Glyphs.lastChange</key>
+    <string>2017-07-11 17:15:08 +0000</string>
+  </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/braceright.glif b/source/Hack-Bold.ufo/glyphs/braceright.glif
index 8000cb059..9d7d9487a 100644
--- a/source/Hack-Bold.ufo/glyphs/braceright.glif
+++ b/source/Hack-Bold.ufo/glyphs/braceright.glif
@@ -1,73 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="braceright" format="1">
+<glyph name="braceright" format="2">
   <advance width="1233"/>
   <unicode hex="007D"/>
   <outline>
     <contour>
-      <point x="230" y="-143" type="line" name="hr00"/>
-      <point x="351" y="-143" type="line" name="dv02" smooth="yes"/>
-      <point x="420" y="-143"/>
-      <point x="467" y="-129"/>
-      <point x="491" y="-100" type="curve" smooth="yes"/>
-      <point x="515" y="-71"/>
-      <point x="527" y="-9"/>
-      <point x="527" y="86" type="curve" name="dh01" smooth="yes"/>
-      <point x="527" y="291" type="line" smooth="yes"/>
-      <point x="527" y="401"/>
-      <point x="543" y="478"/>
-      <point x="576" y="523" type="curve" smooth="yes"/>
-      <point x="611" y="570"/>
-      <point x="671" y="599"/>
-      <point x="750" y="612" type="curve" name="ih01"/>
-      <point x="665" y="625"/>
-      <point x="607" y="654"/>
-      <point x="576" y="698" type="curve" smooth="yes"/>
-      <point x="543" y="743"/>
-      <point x="527" y="820"/>
-      <point x="527" y="930" type="curve" name="sh01" smooth="yes"/>
-      <point x="527" y="1139" type="line" smooth="yes"/>
-      <point x="527" y="1232"/>
-      <point x="515" y="1294"/>
-      <point x="492" y="1323" type="curve" smooth="yes"/>
-      <point x="467" y="1354"/>
-      <point x="415" y="1366"/>
-      <point x="351" y="1366" type="curve" name="sv01" smooth="yes"/>
-      <point x="230" y="1366" type="line"/>
-      <point x="230" y="1556" type="line" name="at01"/>
-      <point x="380" y="1556" type="line" smooth="yes"/>
-      <point x="546" y="1556"/>
-      <point x="657" y="1532"/>
-      <point x="712" y="1483" type="curve" smooth="yes"/>
-      <point x="767" y="1434"/>
-      <point x="795" y="1335"/>
-      <point x="795" y="1188" type="curve" name="sh02" smooth="yes"/>
-      <point x="795" y="973" type="line"/>
-      <point x="804" y="761"/>
-      <point x="847" y="716"/>
-      <point x="1045" y="707" type="curve"/>
-      <point x="1137" y="707" type="line" name="dv04"/>
-      <point x="1137" y="516" type="line" name="dv03"/>
-      <point x="1045" y="516" type="line" smooth="yes"/>
-      <point x="951" y="516"/>
-      <point x="886" y="497"/>
-      <point x="850" y="458" type="curve" smooth="yes"/>
-      <point x="813" y="419"/>
-      <point x="795" y="350"/>
-      <point x="795" y="250" type="curve" smooth="yes"/>
-      <point x="795" y="35" type="line" name="dh02" smooth="yes"/>
-      <point x="795" y="-112"/>
-      <point x="767" y="-211"/>
-      <point x="712" y="-260" type="curve" smooth="yes"/>
-      <point x="655" y="-309"/>
-      <point x="545" y="-334"/>
-      <point x="380" y="-334" type="curve" name="dv01" smooth="yes"/>
-      <point x="230" y="-334" type="line"/>
+      <point x="230" y="1" type="line" name="hr00"/>
+      <point x="241.281" y="1"/>
+      <point x="254.736" y="0.54461"/>
+      <point x="269.531" y="0.044" type="curve" smooth="yes"/>
+      <point x="287.6" y="-0.56739"/>
+      <point x="307.668" y="-1.245"/>
+      <point x="324.622" y="-1.245" type="curve" smooth="yes"/>
+      <point x="517.382" y="-1.245"/>
+      <point x="529.514" y="86.4998"/>
+      <point x="529.514" y="231.722" type="curve" smooth="yes"/>
+      <point x="529.514" y="271.399"/>
+      <point x="528.609" y="310.237"/>
+      <point x="527.713" y="348.665" type="curve" smooth="yes"/>
+      <point x="526.835" y="386.29"/>
+      <point x="525.967" y="423.522"/>
+      <point x="525.967" y="451.22" type="curve" smooth="yes"/>
+      <point x="525.967" y="602.721"/>
+      <point x="551.944" y="723.56"/>
+      <point x="750" y="756" type="curve" name="ih01"/>
+      <point x="582.312" y="781.515"/>
+      <point x="527" y="860.39"/>
+      <point x="527" y="1074" type="curve" smooth="yes" name="sh01"/>
+      <point x="527" y="1283" type="line" smooth="yes"/>
+      <point x="527" y="1459.68"/>
+      <point x="503.501" y="1512.53"/>
+      <point x="324.135" y="1512.53" type="curve" smooth="yes"/>
+      <point x="301.62" y="1512.53"/>
+      <point x="281.078" y="1511.7"/>
+      <point x="263.568" y="1510.99" type="curve" smooth="yes"/>
+      <point x="250.562" y="1510.46"/>
+      <point x="239.228" y="1510"/>
+      <point x="230" y="1510" type="curve"/>
+      <point x="230" y="1700" type="line" name="at01"/>
+      <point x="380" y="1700" type="line" smooth="yes"/>
+      <point x="733.351" y="1700"/>
+      <point x="795.601" y="1618.73"/>
+      <point x="795.601" y="1271.29" type="curve" smooth="yes"/>
+      <point x="795.601" y="1238.89"/>
+      <point x="795.059" y="1209.15"/>
+      <point x="794.562" y="1181.88" type="curve" smooth="yes"/>
+      <point x="794.141" y="1158.78"/>
+      <point x="793.753" y="1137.44"/>
+      <point x="793.753" y="1113.33" type="curve" smooth="yes"/>
+      <point x="793.753" y="909.96"/>
+      <point x="821.398" y="851"/>
+      <point x="1137" y="851" type="curve" name="dv04"/>
+      <point x="1137" y="660" type="line" name="dv03"/>
+      <point x="821" y="660"/>
+      <point x="795" y="612.818"/>
+      <point x="795" y="330.487" type="curve" smooth="yes"/>
+      <point x="795" y="301.663"/>
+      <point x="795.271" y="274.499"/>
+      <point x="795.528" y="248.705" type="curve" smooth="yes"/>
+      <point x="795.761" y="225.388"/>
+      <point x="795.982" y="203.19"/>
+      <point x="795.982" y="181.897" type="curve" smooth="yes"/>
+      <point x="795.982" y="-64.753"/>
+      <point x="766.268" y="-190"/>
+      <point x="380" y="-190" type="curve" smooth="yes" name="dv01"/>
+      <point x="230" y="-190" type="line"/>
     </contour>
   </outline>
   <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
-    </dict>
+  <dict>
+    <key>com.schriftgestaltung.Glyphs.lastChange</key>
+    <string>2017-07-11 17:15:08 +0000</string>
+  </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/bracketleft.glif b/source/Hack-Bold.ufo/glyphs/bracketleft.glif
index 962e41396..4b40482f1 100644
--- a/source/Hack-Bold.ufo/glyphs/bracketleft.glif
+++ b/source/Hack-Bold.ufo/glyphs/bracketleft.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="bracketleft" format="1">
+<glyph name="bracketleft" format="2">
   <advance width="1233"/>
   <unicode hex="005B"/>
   <outline>
     <contour>
-      <point x="284" y="1636" type="line" name="dh01"/>
-      <point x="987" y="1636" type="line" name="sh01"/>
-      <point x="987" y="1446" type="line" name="dv02"/>
-      <point x="549" y="1446" type="line" name="hr01"/>
-      <point x="549" y="-85" type="line"/>
-      <point x="987" y="-85" type="line" name="hr02"/>
-      <point x="987" y="-270" type="line" name="dv01"/>
-      <point x="284" y="-270" type="line"/>
+      <point x="284" y="1700" type="line" name="dh01"/>
+      <point x="987" y="1700" type="line" name="sh01"/>
+      <point x="987" y="1510" type="line" name="dv02"/>
+      <point x="549" y="1510" type="line" name="hr01"/>
+      <point x="549" y="-21" type="line"/>
+      <point x="987" y="-21" type="line" name="hr02"/>
+      <point x="987" y="-206" type="line" name="dv01"/>
+      <point x="284" y="-206" type="line"/>
     </contour>
   </outline>
   <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
-    </dict>
+  <dict>
+    <key>com.schriftgestaltung.Glyphs.lastChange</key>
+    <string>2017-07-11 17:15:08 +0000</string>
+  </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/bracketright.glif b/source/Hack-Bold.ufo/glyphs/bracketright.glif
index dba581d49..743b6ff1b 100644
--- a/source/Hack-Bold.ufo/glyphs/bracketright.glif
+++ b/source/Hack-Bold.ufo/glyphs/bracketright.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="bracketright" format="1">
+<glyph name="bracketright" format="2">
   <advance width="1233"/>
   <unicode hex="005D"/>
   <outline>
     <contour>
-      <point x="244" y="-83" type="line" name="hr00"/>
-      <point x="687" y="-83" type="line" name="sh01"/>
-      <point x="687" y="1445" type="line"/>
-      <point x="244" y="1445" type="line" name="sh02"/>
-      <point x="244" y="1635" type="line" name="dv01"/>
-      <point x="949" y="1635" type="line" name="hr01"/>
-      <point x="949" y="-270" type="line" name="dh01"/>
-      <point x="244" y="-270" type="line" name="hr02"/>
+      <point x="244" y="-18" type="line" name="hr00"/>
+      <point x="687" y="-18" type="line" name="sh01"/>
+      <point x="687" y="1510" type="line"/>
+      <point x="244" y="1510" type="line" name="sh02"/>
+      <point x="244" y="1700" type="line" name="dv01"/>
+      <point x="949" y="1700" type="line" name="hr01"/>
+      <point x="949" y="-205" type="line" name="dh01"/>
+      <point x="244" y="-205" type="line" name="hr02"/>
     </contour>
   </outline>
   <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
-    </dict>
+  <dict>
+    <key>com.schriftgestaltung.Glyphs.lastChange</key>
+    <string>2017-07-11 17:15:08 +0000</string>
+  </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/breve.glif b/source/Hack-Bold.ufo/glyphs/breve.glif
index 73dd829de..c57505d24 100644
--- a/source/Hack-Bold.ufo/glyphs/breve.glif
+++ b/source/Hack-Bold.ufo/glyphs/breve.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="breve" format="1">
+<glyph name="breve" format="2">
   <advance width="1233"/>
   <unicode hex="02D8"/>
   <outline>
     <contour>
-      <point x="616" y="1309" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1309" type="curve" smooth="yes" name="dv01"/>
       <point x="512" y="1309"/>
       <point x="431" y="1335"/>
       <point x="374" y="1386" type="curve" smooth="yes"/>
@@ -17,7 +17,7 @@
       <point x="483" y="1500" type="curve" smooth="yes"/>
       <point x="516" y="1475"/>
       <point x="561" y="1462"/>
-      <point x="616" y="1462" type="curve" name="hr01" smooth="yes"/>
+      <point x="616" y="1462" type="curve" smooth="yes" name="hr01"/>
       <point x="672" y="1462"/>
       <point x="716" y="1474"/>
       <point x="749" y="1499" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/brokenbar.glif b/source/Hack-Bold.ufo/glyphs/brokenbar.glif
index 7efe44fa8..25f64cf80 100644
--- a/source/Hack-Bold.ufo/glyphs/brokenbar.glif
+++ b/source/Hack-Bold.ufo/glyphs/brokenbar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="brokenbar" format="1">
+<glyph name="brokenbar" format="2">
   <advance width="1233"/>
   <unicode hex="00A6"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/bullet.glif b/source/Hack-Bold.ufo/glyphs/bullet.glif
index 18a7a1478..ca06012b3 100644
--- a/source/Hack-Bold.ufo/glyphs/bullet.glif
+++ b/source/Hack-Bold.ufo/glyphs/bullet.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="bullet" format="1">
+<glyph name="bullet" format="2">
   <advance width="1233"/>
   <unicode hex="2022"/>
   <outline>
     <contour>
-      <point x="614" y="399" type="curve" name="hr00" smooth="yes"/>
+      <point x="614" y="399" type="curve" smooth="yes" name="hr00"/>
       <point x="566" y="399"/>
       <point x="520" y="408"/>
       <point x="476" y="427" type="curve" smooth="yes"/>
@@ -25,7 +25,7 @@
       <point x="480" y="1094" type="curve" smooth="yes"/>
       <point x="519" y="1110"/>
       <point x="566" y="1120"/>
-      <point x="617" y="1120" type="curve" name="at01" smooth="yes"/>
+      <point x="617" y="1120" type="curve" smooth="yes" name="at01"/>
       <point x="665" y="1120"/>
       <point x="711" y="1111"/>
       <point x="755" y="1093" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/c.glif b/source/Hack-Bold.ufo/glyphs/c.glif
index 089d06da2..11cbc0514 100644
--- a/source/Hack-Bold.ufo/glyphs/c.glif
+++ b/source/Hack-Bold.ufo/glyphs/c.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c" format="1">
+<glyph name="c" format="2">
   <advance width="1233"/>
   <unicode hex="0063"/>
   <outline>
@@ -33,9 +33,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/c6459.glif b/source/Hack-Bold.ufo/glyphs/c6459.glif
index 98671092d..57adfefaf 100644
--- a/source/Hack-Bold.ufo/glyphs/c6459.glif
+++ b/source/Hack-Bold.ufo/glyphs/c6459.glif
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6459" format="1">
+<glyph name="c6459" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="331" y="1280" type="line" name="hr00" smooth="yes"/>
+      <point x="331" y="1280" type="line" smooth="yes" name="hr00"/>
       <point x="311" y="1280"/>
       <point x="301" y="1290"/>
-      <point x="301" y="1310" type="curve" name="sh01" smooth="yes"/>
+      <point x="301" y="1310" type="curve" smooth="yes" name="sh01"/>
       <point x="301" y="1496" type="line" smooth="yes"/>
       <point x="301" y="1516"/>
       <point x="311" y="1526"/>
-      <point x="331" y="1526" type="curve" name="dv01" smooth="yes"/>
+      <point x="331" y="1526" type="curve" smooth="yes" name="dv01"/>
       <point x="507" y="1526" type="line" smooth="yes"/>
       <point x="527" y="1526"/>
       <point x="537" y="1516"/>
       <point x="537" y="1496" type="curve" smooth="yes"/>
-      <point x="537" y="1310" type="line" name="sh02" smooth="yes"/>
+      <point x="537" y="1310" type="line" smooth="yes" name="sh02"/>
       <point x="537" y="1290"/>
       <point x="527" y="1280"/>
       <point x="507" y="1280" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1280" type="line" name="sv01" smooth="yes"/>
+      <point x="726" y="1280" type="line" smooth="yes" name="sv01"/>
       <point x="706" y="1280"/>
       <point x="696" y="1290"/>
-      <point x="696" y="1310" type="curve" name="ah01" smooth="yes"/>
+      <point x="696" y="1310" type="curve" smooth="yes" name="ah01"/>
       <point x="696" y="1496" type="line" smooth="yes"/>
       <point x="696" y="1516"/>
       <point x="706" y="1526"/>
-      <point x="726" y="1526" type="curve" name="sv02" smooth="yes"/>
+      <point x="726" y="1526" type="curve" smooth="yes" name="sv02"/>
       <point x="902" y="1526" type="line" smooth="yes"/>
       <point x="922" y="1526"/>
       <point x="932" y="1516"/>
       <point x="932" y="1496" type="curve" smooth="yes"/>
-      <point x="932" y="1310" type="line" name="sh03" smooth="yes"/>
+      <point x="932" y="1310" type="line" smooth="yes" name="sh03"/>
       <point x="932" y="1290"/>
       <point x="922" y="1280"/>
       <point x="902" y="1280" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/c6460.glif b/source/Hack-Bold.ufo/glyphs/c6460.glif
index cf426cb01..88a182949 100644
--- a/source/Hack-Bold.ufo/glyphs/c6460.glif
+++ b/source/Hack-Bold.ufo/glyphs/c6460.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6460" format="1">
+<glyph name="c6460" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/c6461.glif b/source/Hack-Bold.ufo/glyphs/c6461.glif
index d1d4f9212..388bd612e 100644
--- a/source/Hack-Bold.ufo/glyphs/c6461.glif
+++ b/source/Hack-Bold.ufo/glyphs/c6461.glif
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6461" format="1">
+<glyph name="c6461" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="268" y="1292" type="line" name="hr00" smooth="yes"/>
+      <point x="268" y="1292" type="line" smooth="yes" name="hr00"/>
       <point x="268" y="1365"/>
       <point x="289" y="1424"/>
       <point x="322" y="1463" type="curve" smooth="yes"/>
       <point x="359" y="1507"/>
       <point x="411" y="1528"/>
-      <point x="466" y="1528" type="curve" name="sv01" smooth="yes"/>
+      <point x="466" y="1528" type="curve" smooth="yes" name="sv01"/>
       <point x="489" y="1528"/>
       <point x="514" y="1524"/>
       <point x="539" y="1516" type="curve" smooth="yes"/>
@@ -38,7 +38,7 @@
       <point x="910" y="1327" type="curve" smooth="yes"/>
       <point x="871" y="1280"/>
       <point x="823" y="1262"/>
-      <point x="768" y="1262" type="curve" name="dv01" smooth="yes"/>
+      <point x="768" y="1262" type="curve" smooth="yes" name="dv01"/>
       <point x="744" y="1262"/>
       <point x="720" y="1266"/>
       <point x="696" y="1273" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/c6468.glif b/source/Hack-Bold.ufo/glyphs/c6468.glif
index 62926ab87..c7fd949a0 100644
--- a/source/Hack-Bold.ufo/glyphs/c6468.glif
+++ b/source/Hack-Bold.ufo/glyphs/c6468.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6468" format="1">
+<glyph name="c6468" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/c6470.glif b/source/Hack-Bold.ufo/glyphs/c6470.glif
index 296fbc10a..3f93c8f31 100644
--- a/source/Hack-Bold.ufo/glyphs/c6470.glif
+++ b/source/Hack-Bold.ufo/glyphs/c6470.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6470" format="1">
+<glyph name="c6470" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/c6472.glif b/source/Hack-Bold.ufo/glyphs/c6472.glif
index b009956d3..55a3eefb7 100644
--- a/source/Hack-Bold.ufo/glyphs/c6472.glif
+++ b/source/Hack-Bold.ufo/glyphs/c6472.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6472" format="1">
+<glyph name="c6472" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/c6475.glif b/source/Hack-Bold.ufo/glyphs/c6475.glif
index 72765cf95..4defcd429 100644
--- a/source/Hack-Bold.ufo/glyphs/c6475.glif
+++ b/source/Hack-Bold.ufo/glyphs/c6475.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6475" format="1">
+<glyph name="c6475" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="616" y="1262" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1262" type="curve" smooth="yes" name="dv01"/>
       <point x="518" y="1262"/>
       <point x="440" y="1285"/>
       <point x="383" y="1330" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="491" y="1436" type="curve" smooth="yes"/>
       <point x="524" y="1415"/>
       <point x="565" y="1405"/>
-      <point x="616" y="1405" type="curve" name="hr01" smooth="yes"/>
+      <point x="616" y="1405" type="curve" smooth="yes" name="hr01"/>
       <point x="667" y="1405"/>
       <point x="709" y="1415"/>
       <point x="741" y="1435" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/c6476.glif b/source/Hack-Bold.ufo/glyphs/c6476.glif
index 3c4a383d2..f37541d7f 100644
--- a/source/Hack-Bold.ufo/glyphs/c6476.glif
+++ b/source/Hack-Bold.ufo/glyphs/c6476.glif
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6476" format="1">
+<glyph name="c6476" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="509" y="1280" type="line" name="hr00" smooth="yes"/>
+      <point x="509" y="1280" type="line" smooth="yes" name="hr00"/>
       <point x="489" y="1280"/>
       <point x="479" y="1290"/>
-      <point x="479" y="1310" type="curve" name="dh01" smooth="yes"/>
+      <point x="479" y="1310" type="curve" smooth="yes" name="dh01"/>
       <point x="479" y="1496" type="line" smooth="yes"/>
       <point x="479" y="1516"/>
       <point x="489" y="1526"/>
-      <point x="509" y="1526" type="curve" name="dv01" smooth="yes"/>
+      <point x="509" y="1526" type="curve" smooth="yes" name="dv01"/>
       <point x="724" y="1526" type="line" smooth="yes"/>
       <point x="744" y="1526"/>
       <point x="754" y="1516"/>
       <point x="754" y="1496" type="curve" smooth="yes"/>
-      <point x="754" y="1310" type="line" name="dh02" smooth="yes"/>
+      <point x="754" y="1310" type="line" smooth="yes" name="dh02"/>
       <point x="754" y="1290"/>
       <point x="744" y="1280"/>
-      <point x="724" y="1280" type="curve" name="sv01" smooth="yes"/>
+      <point x="724" y="1280" type="curve" smooth="yes" name="sv01"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Bold.ufo/glyphs/c6477.glif b/source/Hack-Bold.ufo/glyphs/c6477.glif
index 3f3870e87..cefd41f59 100644
--- a/source/Hack-Bold.ufo/glyphs/c6477.glif
+++ b/source/Hack-Bold.ufo/glyphs/c6477.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6477" format="1">
+<glyph name="c6477" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/c6478.glif b/source/Hack-Bold.ufo/glyphs/c6478.glif
index 50ca5fab8..70dc205dd 100644
--- a/source/Hack-Bold.ufo/glyphs/c6478.glif
+++ b/source/Hack-Bold.ufo/glyphs/c6478.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6478" format="1">
+<glyph name="c6478" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/cacute.glif b/source/Hack-Bold.ufo/glyphs/cacute.glif
index 3df35772e..375f3ba7f 100644
--- a/source/Hack-Bold.ufo/glyphs/cacute.glif
+++ b/source/Hack-Bold.ufo/glyphs/cacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="cacute" format="1">
+<glyph name="cacute" format="2">
   <advance width="1233"/>
   <unicode hex="0107"/>
   <outline>
@@ -10,19 +10,19 @@
       <point x="571" y="1296" type="line"/>
     </contour>
     <contour>
-      <point x="722" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="722" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="547" y="-29"/>
       <point x="411" y="23"/>
       <point x="314" y="127" type="curve" smooth="yes"/>
       <point x="217" y="232"/>
       <point x="168" y="376"/>
-      <point x="168" y="559" type="curve" name="dh01" smooth="yes"/>
+      <point x="168" y="559" type="curve" smooth="yes" name="dh01"/>
       <point x="168" y="743"/>
       <point x="217" y="888"/>
       <point x="315" y="993" type="curve" smooth="yes"/>
       <point x="413" y="1097"/>
       <point x="548" y="1149"/>
-      <point x="719" y="1149" type="curve" name="dv04" smooth="yes"/>
+      <point x="719" y="1149" type="curve" smooth="yes" name="dv04"/>
       <point x="780" y="1149"/>
       <point x="839" y="1142"/>
       <point x="895" y="1128" type="curve" smooth="yes"/>
@@ -32,19 +32,19 @@
       <point x="1061" y="795" type="line"/>
       <point x="974" y="871"/>
       <point x="876" y="909"/>
-      <point x="761" y="909" type="curve" name="dv03" smooth="yes"/>
+      <point x="761" y="909" type="curve" smooth="yes" name="dv03"/>
       <point x="661" y="909"/>
       <point x="591" y="877"/>
       <point x="542" y="818" type="curve" smooth="yes"/>
       <point x="491" y="757"/>
       <point x="465" y="670"/>
-      <point x="465" y="559" type="curve" name="dh02" smooth="yes"/>
+      <point x="465" y="559" type="curve" smooth="yes" name="dh02"/>
       <point x="465" y="448"/>
       <point x="491" y="362"/>
       <point x="542" y="301" type="curve" smooth="yes"/>
       <point x="593" y="241"/>
       <point x="666" y="211"/>
-      <point x="762" y="211" type="curve" name="dv02" smooth="yes"/>
+      <point x="762" y="211" type="curve" smooth="yes" name="dv02"/>
       <point x="818" y="211"/>
       <point x="871" y="221"/>
       <point x="921" y="240" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/caron.glif b/source/Hack-Bold.ufo/glyphs/caron.glif
index 5db5c4aa1..d19a5a148 100644
--- a/source/Hack-Bold.ufo/glyphs/caron.glif
+++ b/source/Hack-Bold.ufo/glyphs/caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="caron" format="1">
+<glyph name="caron" format="2">
   <advance width="1233"/>
   <unicode hex="02C7"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/carriagereturn.glif b/source/Hack-Bold.ufo/glyphs/carriagereturn.glif
index b7ec56f83..bfd3dabf9 100644
--- a/source/Hack-Bold.ufo/glyphs/carriagereturn.glif
+++ b/source/Hack-Bold.ufo/glyphs/carriagereturn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="carriagereturn" format="1">
+<glyph name="carriagereturn" format="2">
   <advance width="1233"/>
   <unicode hex="21B5"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/ccaron.glif b/source/Hack-Bold.ufo/glyphs/ccaron.glif
index 917f91376..6608f2b57 100644
--- a/source/Hack-Bold.ufo/glyphs/ccaron.glif
+++ b/source/Hack-Bold.ufo/glyphs/ccaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ccaron" format="1">
+<glyph name="ccaron" format="2">
   <advance width="1233"/>
   <unicode hex="010D"/>
   <outline>
@@ -13,19 +13,19 @@
       <point x="598" y="1299" type="line"/>
     </contour>
     <contour>
-      <point x="722" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="722" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="547" y="-29"/>
       <point x="411" y="23"/>
       <point x="314" y="127" type="curve" smooth="yes"/>
       <point x="217" y="232"/>
       <point x="168" y="376"/>
-      <point x="168" y="559" type="curve" name="dh01" smooth="yes"/>
+      <point x="168" y="559" type="curve" smooth="yes" name="dh01"/>
       <point x="168" y="743"/>
       <point x="217" y="888"/>
       <point x="315" y="993" type="curve" smooth="yes"/>
       <point x="413" y="1097"/>
       <point x="548" y="1149"/>
-      <point x="719" y="1149" type="curve" name="dv04" smooth="yes"/>
+      <point x="719" y="1149" type="curve" smooth="yes" name="dv04"/>
       <point x="780" y="1149"/>
       <point x="839" y="1142"/>
       <point x="895" y="1128" type="curve" smooth="yes"/>
@@ -35,19 +35,19 @@
       <point x="1061" y="795" type="line"/>
       <point x="974" y="871"/>
       <point x="876" y="909"/>
-      <point x="761" y="909" type="curve" name="dv03" smooth="yes"/>
+      <point x="761" y="909" type="curve" smooth="yes" name="dv03"/>
       <point x="661" y="909"/>
       <point x="591" y="877"/>
       <point x="542" y="818" type="curve" smooth="yes"/>
       <point x="491" y="757"/>
       <point x="465" y="670"/>
-      <point x="465" y="559" type="curve" name="dh02" smooth="yes"/>
+      <point x="465" y="559" type="curve" smooth="yes" name="dh02"/>
       <point x="465" y="448"/>
       <point x="491" y="362"/>
       <point x="542" y="301" type="curve" smooth="yes"/>
       <point x="593" y="241"/>
       <point x="666" y="211"/>
-      <point x="762" y="211" type="curve" name="dv02" smooth="yes"/>
+      <point x="762" y="211" type="curve" smooth="yes" name="dv02"/>
       <point x="818" y="211"/>
       <point x="871" y="221"/>
       <point x="921" y="240" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/ccedilla.glif b/source/Hack-Bold.ufo/glyphs/ccedilla.glif
index c2d35bb6b..32de84a58 100644
--- a/source/Hack-Bold.ufo/glyphs/ccedilla.glif
+++ b/source/Hack-Bold.ufo/glyphs/ccedilla.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ccedilla" format="1">
+<glyph name="ccedilla" format="2">
   <advance width="1233"/>
   <unicode hex="00E7"/>
   <outline>
     <contour>
-      <point x="761" y="909" type="curve" name="dv03" smooth="yes"/>
+      <point x="761" y="909" type="curve" smooth="yes" name="dv03"/>
       <point x="661" y="909"/>
       <point x="591" y="877"/>
       <point x="542" y="818" type="curve" smooth="yes"/>
       <point x="491" y="757"/>
       <point x="465" y="670"/>
-      <point x="465" y="559" type="curve" name="dh02" smooth="yes"/>
+      <point x="465" y="559" type="curve" smooth="yes" name="dh02"/>
       <point x="465" y="448"/>
       <point x="491" y="362"/>
       <point x="542" y="301" type="curve" smooth="yes"/>
       <point x="593" y="241"/>
       <point x="666" y="211"/>
-      <point x="762" y="211" type="curve" name="sv01" smooth="yes"/>
+      <point x="762" y="211" type="curve" smooth="yes" name="sv01"/>
       <point x="818" y="211"/>
       <point x="871" y="221"/>
       <point x="921" y="240" type="curve" smooth="yes"/>
@@ -35,16 +35,16 @@
       <point x="864" y="-115" type="curve" smooth="yes"/>
       <point x="882" y="-149"/>
       <point x="891" y="-184"/>
-      <point x="891" y="-221" type="curve" name="sh01" smooth="yes"/>
+      <point x="891" y="-221" type="curve" smooth="yes" name="sh01"/>
       <point x="891" y="-282"/>
       <point x="868" y="-327"/>
       <point x="829" y="-356" type="curve" smooth="yes"/>
       <point x="794" y="-383"/>
       <point x="740" y="-401"/>
-      <point x="643" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="643" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="611" y="-401"/>
       <point x="576" y="-399"/>
-      <point x="543" y="-395" type="curve" name="sv02" smooth="yes"/>
+      <point x="543" y="-395" type="curve" smooth="yes" name="sv02"/>
       <point x="492" y="-388"/>
       <point x="470" y="-382"/>
       <point x="439" y="-375" type="curve" name="hr01"/>
@@ -54,7 +54,7 @@
       <point x="526" y="-245" type="curve" smooth="yes"/>
       <point x="554" y="-251"/>
       <point x="580" y="-254"/>
-      <point x="604" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="604" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="642" y="-254"/>
       <point x="672" y="-246"/>
       <point x="695" y="-231" type="curve" smooth="yes"/>
@@ -72,13 +72,13 @@
       <point x="314" y="127" type="curve" smooth="yes"/>
       <point x="217" y="232"/>
       <point x="168" y="376"/>
-      <point x="168" y="559" type="curve" name="dh01" smooth="yes"/>
+      <point x="168" y="559" type="curve" smooth="yes" name="dh01"/>
       <point x="168" y="743"/>
       <point x="217" y="888"/>
       <point x="315" y="993" type="curve" smooth="yes"/>
       <point x="413" y="1097"/>
       <point x="548" y="1149"/>
-      <point x="719" y="1149" type="curve" name="dv04" smooth="yes"/>
+      <point x="719" y="1149" type="curve" smooth="yes" name="dv04"/>
       <point x="780" y="1149"/>
       <point x="839" y="1142"/>
       <point x="895" y="1128" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/ccircumflex.glif b/source/Hack-Bold.ufo/glyphs/ccircumflex.glif
index 179a81357..bd9f42b5c 100644
--- a/source/Hack-Bold.ufo/glyphs/ccircumflex.glif
+++ b/source/Hack-Bold.ufo/glyphs/ccircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ccircumflex" format="1">
+<glyph name="ccircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0109"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/cdotaccent.glif b/source/Hack-Bold.ufo/glyphs/cdotaccent.glif
index 7c9b1ed70..cd0aaaccb 100644
--- a/source/Hack-Bold.ufo/glyphs/cdotaccent.glif
+++ b/source/Hack-Bold.ufo/glyphs/cdotaccent.glif
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="cdotaccent" format="1">
+<glyph name="cdotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="010B"/>
   <outline>
     <contour>
-      <point x="584" y="1349" type="line" name="hr00" smooth="yes"/>
+      <point x="584" y="1349" type="line" smooth="yes" name="hr00"/>
       <point x="564" y="1349"/>
       <point x="554" y="1359"/>
-      <point x="554" y="1379" type="curve" name="ah01" smooth="yes"/>
+      <point x="554" y="1379" type="curve" smooth="yes" name="ah01"/>
       <point x="554" y="1565" type="line" smooth="yes"/>
       <point x="554" y="1585"/>
       <point x="564" y="1595"/>
-      <point x="584" y="1595" type="curve" name="dv03" smooth="yes"/>
+      <point x="584" y="1595" type="curve" smooth="yes" name="dv03"/>
       <point x="799" y="1595" type="line" smooth="yes"/>
       <point x="819" y="1595"/>
       <point x="829" y="1585"/>
       <point x="829" y="1565" type="curve" smooth="yes"/>
-      <point x="829" y="1379" type="line" name="sh01" smooth="yes"/>
+      <point x="829" y="1379" type="line" smooth="yes" name="sh01"/>
       <point x="829" y="1359"/>
       <point x="819" y="1349"/>
       <point x="799" y="1349" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="722" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="722" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="373" y="-29"/>
       <point x="168" y="191"/>
-      <point x="168" y="558" type="curve" name="sh02" smooth="yes"/>
+      <point x="168" y="558" type="curve" smooth="yes" name="sh02"/>
       <point x="168" y="928"/>
       <point x="376" y="1149"/>
-      <point x="721" y="1149" type="curve" name="dv05" smooth="yes"/>
+      <point x="721" y="1149" type="curve" smooth="yes" name="dv05"/>
       <point x="842" y="1149"/>
       <point x="949" y="1123"/>
       <point x="1061" y="1063" type="curve"/>
       <point x="1061" y="795" type="line"/>
       <point x="976" y="868"/>
       <point x="871" y="909"/>
-      <point x="762" y="909" type="curve" name="dv04" smooth="yes"/>
+      <point x="762" y="909" type="curve" smooth="yes" name="dv04"/>
       <point x="570" y="909"/>
       <point x="465" y="785"/>
-      <point x="465" y="558" type="curve" name="sh03" smooth="yes"/>
+      <point x="465" y="558" type="curve" smooth="yes" name="sh03"/>
       <point x="465" y="334"/>
       <point x="569" y="211"/>
-      <point x="765" y="211" type="curve" name="dv02" smooth="yes"/>
+      <point x="765" y="211" type="curve" smooth="yes" name="dv02"/>
       <point x="878" y="211"/>
       <point x="977" y="251"/>
       <point x="1061" y="326" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/cedilla.glif b/source/Hack-Bold.ufo/glyphs/cedilla.glif
index a94c9a8a2..d09dd6091 100644
--- a/source/Hack-Bold.ufo/glyphs/cedilla.glif
+++ b/source/Hack-Bold.ufo/glyphs/cedilla.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="cedilla" format="1">
+<glyph name="cedilla" format="2">
   <advance width="1233"/>
   <unicode hex="00B8"/>
   <outline>
     <contour>
-      <point x="573" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="573" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="542" y="-401"/>
       <point x="502" y="-399"/>
-      <point x="471" y="-395" type="curve" name="sv01" smooth="yes"/>
+      <point x="471" y="-395" type="curve" smooth="yes" name="sv01"/>
       <point x="422" y="-390"/>
       <point x="401" y="-383"/>
       <point x="367" y="-375" type="curve"/>
@@ -17,7 +17,7 @@
       <point x="454" y="-245" type="curve" smooth="yes"/>
       <point x="482" y="-251"/>
       <point x="508" y="-254"/>
-      <point x="532" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="532" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="570" y="-254"/>
       <point x="600" y="-246"/>
       <point x="623" y="-231" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="792" y="-115" type="curve" smooth="yes"/>
       <point x="810" y="-149"/>
       <point x="819" y="-184"/>
-      <point x="819" y="-221" type="curve" name="dh02" smooth="yes"/>
+      <point x="819" y="-221" type="curve" smooth="yes" name="dh02"/>
       <point x="819" y="-282"/>
       <point x="796" y="-327"/>
       <point x="757" y="-356" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/cent.glif b/source/Hack-Bold.ufo/glyphs/cent.glif
index 6645f8ecd..51f782f72 100644
--- a/source/Hack-Bold.ufo/glyphs/cent.glif
+++ b/source/Hack-Bold.ufo/glyphs/cent.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="cent" format="1">
+<glyph name="cent" format="2">
   <advance width="1233"/>
   <unicode hex="00A2"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="284" y="154" type="curve" smooth="yes"/>
       <point x="193" y="259"/>
       <point x="147" y="395"/>
-      <point x="147" y="562" type="curve" name="dh01" smooth="yes"/>
+      <point x="147" y="562" type="curve" smooth="yes" name="dh01"/>
       <point x="147" y="735"/>
       <point x="195" y="870"/>
       <point x="284" y="973" type="curve" smooth="yes"/>
@@ -57,7 +57,7 @@
       <point x="480" y="804" type="curve" smooth="yes"/>
       <point x="440" y="745"/>
       <point x="418" y="665"/>
-      <point x="418" y="560" type="curve" name="dh02" smooth="yes"/>
+      <point x="418" y="560" type="curve" smooth="yes" name="dh02"/>
       <point x="418" y="460"/>
       <point x="438" y="378"/>
       <point x="481" y="314" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/chi.glif b/source/Hack-Bold.ufo/glyphs/chi.glif
index b1452317b..10890b3ac 100644
--- a/source/Hack-Bold.ufo/glyphs/chi.glif
+++ b/source/Hack-Bold.ufo/glyphs/chi.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="chi" format="1">
+<glyph name="chi" format="2">
   <advance width="1233"/>
   <unicode hex="03C7"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/circle.glif b/source/Hack-Bold.ufo/glyphs/circle.glif
index 4bc4878d5..a34dafb61 100644
--- a/source/Hack-Bold.ufo/glyphs/circle.glif
+++ b/source/Hack-Bold.ufo/glyphs/circle.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="circle" format="1">
+<glyph name="circle" format="2">
   <advance width="1233"/>
   <unicode hex="25CB"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv03"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -30,13 +30,13 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="616" y="79" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="79" type="curve" smooth="yes" name="dv01"/>
       <point x="691" y="79"/>
       <point x="766" y="100"/>
       <point x="841" y="143" type="curve" smooth="yes"/>
       <point x="990" y="228"/>
       <point x="1066" y="357"/>
-      <point x="1066" y="532" type="curve" name="ah01" smooth="yes"/>
+      <point x="1066" y="532" type="curve" smooth="yes" name="ah01"/>
       <point x="1066" y="619"/>
       <point x="1047" y="695"/>
       <point x="1010" y="760" type="curve" smooth="yes"/>
@@ -45,13 +45,13 @@
       <point x="841" y="921" type="curve" smooth="yes"/>
       <point x="766" y="964"/>
       <point x="691" y="985"/>
-      <point x="616" y="985" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="985" type="curve" smooth="yes" name="dv02"/>
       <point x="541" y="985"/>
       <point x="467" y="964"/>
       <point x="392" y="921" type="curve" smooth="yes"/>
       <point x="243" y="836"/>
       <point x="167" y="707"/>
-      <point x="167" y="532" type="curve" name="sh03" smooth="yes"/>
+      <point x="167" y="532" type="curve" smooth="yes" name="sh03"/>
       <point x="167" y="445"/>
       <point x="186" y="369"/>
       <point x="224" y="304" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/circlemultiply.glif b/source/Hack-Bold.ufo/glyphs/circlemultiply.glif
index d5e0c6a8d..abd230793 100644
--- a/source/Hack-Bold.ufo/glyphs/circlemultiply.glif
+++ b/source/Hack-Bold.ufo/glyphs/circlemultiply.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="circlemultiply" format="1">
+<glyph name="circlemultiply" format="2">
   <advance width="1233"/>
   <unicode hex="2297"/>
   <outline>
     <contour>
-      <point x="617" y="52" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="52" type="curve" smooth="yes" name="hr00"/>
       <point x="448" y="52"/>
       <point x="302" y="121"/>
       <point x="198" y="225" type="curve" smooth="yes"/>
       <point x="82" y="341"/>
       <point x="26" y="488"/>
-      <point x="26" y="643" type="curve" name="sh01" smooth="yes"/>
+      <point x="26" y="643" type="curve" smooth="yes" name="sh01"/>
       <point x="26" y="810"/>
       <point x="90" y="954"/>
       <point x="198" y="1061" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="391" y="1191" type="curve" smooth="yes"/>
       <point x="461" y="1220"/>
       <point x="536" y="1235"/>
-      <point x="615" y="1235" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1235" type="curve" smooth="yes" name="dv03"/>
       <point x="772" y="1235"/>
       <point x="922" y="1175"/>
       <point x="1035" y="1062" type="curve" smooth="yes"/>
       <point x="1140" y="957"/>
       <point x="1207" y="810"/>
-      <point x="1207" y="643" type="curve" name="sh02" smooth="yes"/>
+      <point x="1207" y="643" type="curve" smooth="yes" name="sh02"/>
       <point x="1207" y="487"/>
       <point x="1150" y="340"/>
       <point x="1035" y="225" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="786" y="52"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="533"/>
-      <point x="1012" y="646" type="curve" name="ah01" smooth="yes"/>
+      <point x="1012" y="646" type="curve" smooth="yes" name="ah01"/>
       <point x="1012" y="747"/>
       <point x="977" y="844"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="412" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/circleplus.glif b/source/Hack-Bold.ufo/glyphs/circleplus.glif
index bbdd63fec..7a3e98dc5 100644
--- a/source/Hack-Bold.ufo/glyphs/circleplus.glif
+++ b/source/Hack-Bold.ufo/glyphs/circleplus.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="circleplus" format="1">
+<glyph name="circleplus" format="2">
   <advance width="1233"/>
   <unicode hex="2295"/>
   <outline>
     <contour>
-      <point x="617" y="52" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="52" type="curve" smooth="yes" name="hr00"/>
       <point x="448" y="52"/>
       <point x="302" y="121"/>
       <point x="198" y="225" type="curve" smooth="yes"/>
       <point x="82" y="341"/>
       <point x="26" y="488"/>
-      <point x="26" y="643" type="curve" name="dh01" smooth="yes"/>
+      <point x="26" y="643" type="curve" smooth="yes" name="dh01"/>
       <point x="26" y="810"/>
       <point x="90" y="954"/>
       <point x="198" y="1061" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="391" y="1191" type="curve" smooth="yes"/>
       <point x="461" y="1220"/>
       <point x="536" y="1235"/>
-      <point x="615" y="1235" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1235" type="curve" smooth="yes" name="dv03"/>
       <point x="772" y="1235"/>
       <point x="922" y="1175"/>
       <point x="1035" y="1062" type="curve" smooth="yes"/>
       <point x="1140" y="957"/>
       <point x="1207" y="810"/>
-      <point x="1207" y="643" type="curve" name="dh06" smooth="yes"/>
+      <point x="1207" y="643" type="curve" smooth="yes" name="dh06"/>
       <point x="1207" y="487"/>
       <point x="1150" y="340"/>
       <point x="1035" y="225" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="786" y="52"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="533"/>
-      <point x="1012" y="646" type="curve" name="dh05" smooth="yes"/>
+      <point x="1012" y="646" type="curve" smooth="yes" name="dh05"/>
       <point x="1012" y="747"/>
       <point x="977" y="844"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="412" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="dh02" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="dh02"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/circumflex.glif b/source/Hack-Bold.ufo/glyphs/circumflex.glif
index 4a3d5b885..c119b1c54 100644
--- a/source/Hack-Bold.ufo/glyphs/circumflex.glif
+++ b/source/Hack-Bold.ufo/glyphs/circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="circumflex" format="1">
+<glyph name="circumflex" format="2">
   <advance width="1233"/>
   <unicode hex="02C6"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/colon.glif b/source/Hack-Bold.ufo/glyphs/colon.glif
index ecd9b7c10..8e9686628 100644
--- a/source/Hack-Bold.ufo/glyphs/colon.glif
+++ b/source/Hack-Bold.ufo/glyphs/colon.glif
@@ -1,51 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="colon" format="1">
+<glyph name="colon" format="2">
   <advance width="1233"/>
   <unicode hex="003A"/>
   <outline>
     <contour>
-      <point x="619" y="752" type="curve" name="hr00" smooth="yes"/>
+      <point x="619" y="752" type="curve" smooth="yes" name="hr00"/>
       <point x="567" y="752"/>
       <point x="524" y="774"/>
       <point x="495" y="803" type="curve" smooth="yes"/>
       <point x="459" y="839"/>
       <point x="443" y="885"/>
-      <point x="443" y="936" type="curve" name="dh01" smooth="yes"/>
+      <point x="443" y="936" type="curve" smooth="yes" name="dh01"/>
       <point x="443" y="993"/>
       <point x="463" y="1038"/>
       <point x="494" y="1069" type="curve" smooth="yes"/>
       <point x="529" y="1104"/>
       <point x="574" y="1120"/>
-      <point x="621" y="1120" type="curve" name="dv01" smooth="yes"/>
+      <point x="621" y="1120" type="curve" smooth="yes" name="dv01"/>
       <point x="668" y="1120"/>
       <point x="711" y="1104"/>
       <point x="746" y="1069" type="curve" smooth="yes"/>
       <point x="777" y="1038"/>
       <point x="797" y="993"/>
-      <point x="797" y="937" type="curve" name="dh02" smooth="yes"/>
+      <point x="797" y="937" type="curve" smooth="yes" name="dh02"/>
       <point x="797" y="825"/>
       <point x="721" y="752"/>
     </contour>
     <contour>
-      <point x="620" y="36" type="curve" name="ab01" smooth="yes"/>
+      <point x="620" y="36" type="curve" smooth="yes" name="ab01"/>
       <point x="571" y="36"/>
       <point x="529" y="53"/>
       <point x="495" y="87" type="curve" smooth="yes"/>
       <point x="460" y="122"/>
       <point x="443" y="166"/>
-      <point x="443" y="220" type="curve" name="sh01" smooth="yes"/>
+      <point x="443" y="220" type="curve" smooth="yes" name="sh01"/>
       <point x="443" y="274"/>
       <point x="460" y="318"/>
       <point x="495" y="353" type="curve" smooth="yes"/>
       <point x="529" y="387"/>
       <point x="571" y="404"/>
-      <point x="620" y="404" type="curve" name="sv01" smooth="yes"/>
+      <point x="620" y="404" type="curve" smooth="yes" name="sv01"/>
       <point x="668" y="404"/>
       <point x="711" y="388"/>
       <point x="746" y="353" type="curve" smooth="yes"/>
       <point x="777" y="322"/>
       <point x="797" y="277"/>
-      <point x="797" y="220" type="curve" name="sh02" smooth="yes"/>
+      <point x="797" y="220" type="curve" smooth="yes" name="sh02"/>
       <point x="797" y="164"/>
       <point x="778" y="119"/>
       <point x="746" y="87" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/colonmonetary.glif b/source/Hack-Bold.ufo/glyphs/colonmonetary.glif
index ea5089351..1de26c4fd 100644
--- a/source/Hack-Bold.ufo/glyphs/colonmonetary.glif
+++ b/source/Hack-Bold.ufo/glyphs/colonmonetary.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="colonmonetary" format="1">
+<glyph name="colonmonetary" format="2">
   <advance width="1233"/>
   <unicode hex="20A1"/>
   <outline>
@@ -16,7 +16,7 @@
       <point x="268" y="180" type="curve" smooth="yes"/>
       <point x="149" y="319"/>
       <point x="89" y="507"/>
-      <point x="89" y="742" type="curve" name="dh01" smooth="yes"/>
+      <point x="89" y="742" type="curve" smooth="yes" name="dh01"/>
       <point x="89" y="1223"/>
       <point x="343" y="1503"/>
       <point x="715" y="1519" type="curve"/>
@@ -46,7 +46,7 @@
       <point x="1130" y="82" type="line"/>
       <point x="1014" y="9"/>
       <point x="890" y="-29"/>
-      <point x="753" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="753" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="742" y="-29"/>
       <point x="730" y="-29"/>
       <point x="718" y="-28" type="curve" name="sv01"/>
@@ -70,7 +70,7 @@
       <point x="512" y="1109" type="curve" smooth="yes"/>
       <point x="449" y="1025"/>
       <point x="416" y="904"/>
-      <point x="416" y="745" type="curve" name="hr02" smooth="yes"/>
+      <point x="416" y="745" type="curve" smooth="yes" name="hr02"/>
       <point x="416" y="649"/>
       <point x="428" y="566"/>
       <point x="453" y="497" type="curve" name="iv03"/>
diff --git a/source/Hack-Bold.ufo/glyphs/comma.glif b/source/Hack-Bold.ufo/glyphs/comma.glif
index 71e4d6740..da5fc9b22 100644
--- a/source/Hack-Bold.ufo/glyphs/comma.glif
+++ b/source/Hack-Bold.ufo/glyphs/comma.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="comma" format="1">
+<glyph name="comma" format="2">
   <advance width="1233"/>
   <unicode hex="002C"/>
   <outline>
@@ -17,7 +17,7 @@
       <point x="492" y="75" type="curve" smooth="yes"/>
       <point x="461" y="102"/>
       <point x="443" y="139"/>
-      <point x="443" y="196" type="curve" name="dh01" smooth="yes"/>
+      <point x="443" y="196" type="curve" smooth="yes" name="dh01"/>
       <point x="443" y="215"/>
       <point x="445" y="229"/>
       <point x="449" y="244" type="curve" smooth="yes"/>
@@ -26,13 +26,13 @@
       <point x="494" y="319" type="curve" smooth="yes"/>
       <point x="513" y="335"/>
       <point x="528" y="345"/>
-      <point x="551" y="353" type="curve" name="av02" smooth="yes"/>
+      <point x="551" y="353" type="curve" smooth="yes" name="av02"/>
       <point x="571" y="360"/>
       <point x="591" y="364"/>
-      <point x="618" y="364" type="curve" name="av03" smooth="yes"/>
+      <point x="618" y="364" type="curve" smooth="yes" name="av03"/>
       <point x="641" y="364"/>
       <point x="657" y="361"/>
-      <point x="676" y="356" type="curve" name="av04" smooth="yes"/>
+      <point x="676" y="356" type="curve" smooth="yes" name="av04"/>
       <point x="694" y="351"/>
       <point x="711" y="342"/>
       <point x="726" y="331" type="curve" smooth="yes"/>
@@ -41,13 +41,13 @@
       <point x="764" y="289" type="curve"/>
       <point x="797" y="242"/>
       <point x="813" y="174"/>
-      <point x="813" y="93" type="curve" name="dh02" smooth="yes"/>
+      <point x="813" y="93" type="curve" smooth="yes" name="dh02"/>
       <point x="813" y="34"/>
       <point x="805" y="-20"/>
       <point x="789" y="-71" type="curve" smooth="yes"/>
       <point x="774" y="-118"/>
       <point x="753" y="-164"/>
-      <point x="718" y="-211" type="curve" name="hr01" smooth="yes"/>
+      <point x="718" y="-211" type="curve" smooth="yes" name="hr01"/>
       <point x="653" y="-300"/>
       <point x="564" y="-358"/>
       <point x="451" y="-401" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/congruent.glif b/source/Hack-Bold.ufo/glyphs/congruent.glif
index 41b4b83b5..2db77df53 100644
--- a/source/Hack-Bold.ufo/glyphs/congruent.glif
+++ b/source/Hack-Bold.ufo/glyphs/congruent.glif
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="congruent" format="1">
+<glyph name="congruent" format="2">
   <advance width="1233"/>
   <unicode hex="2245"/>
   <outline>
     <contour>
-      <point x="850" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="850" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="778" y="909"/>
       <point x="726" y="925"/>
       <point x="645" y="960" type="curve" smooth="yes"/>
       <point x="612" y="974" type="line" smooth="yes"/>
       <point x="522" y="1011"/>
       <point x="468" y="1032"/>
-      <point x="385" y="1032" type="curve" name="sv02" smooth="yes"/>
+      <point x="385" y="1032" type="curve" smooth="yes" name="sv02"/>
       <point x="280" y="1032"/>
       <point x="192" y="999"/>
       <point x="88" y="911" type="curve" name="iv01"/>
       <point x="88" y="1140" type="line" name="at01"/>
       <point x="192" y="1220"/>
       <point x="287" y="1255"/>
-      <point x="390" y="1255" type="curve" name="av01" smooth="yes"/>
+      <point x="390" y="1255" type="curve" smooth="yes" name="av01"/>
       <point x="463" y="1255"/>
       <point x="533" y="1237"/>
       <point x="621" y="1200" type="curve"/>
@@ -26,7 +26,7 @@
       <point x="652" y="1186" type="line" smooth="yes"/>
       <point x="725" y="1151"/>
       <point x="797" y="1132"/>
-      <point x="865" y="1132" type="curve" name="at02" smooth="yes"/>
+      <point x="865" y="1132" type="curve" smooth="yes" name="at02"/>
       <point x="958" y="1132"/>
       <point x="1045" y="1169"/>
       <point x="1145" y="1257" type="curve" name="av02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/contents.plist b/source/Hack-Bold.ufo/glyphs/contents.plist
index 470e4f080..4fbc3bfba 100644
--- a/source/Hack-Bold.ufo/glyphs/contents.plist
+++ b/source/Hack-Bold.ufo/glyphs/contents.plist
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>.notdef</key>
@@ -60,6 +60,8 @@
 	<string>E_.glif</string>
 	<key>Eacute</key>
 	<string>E_acute.glif</string>
+	<key>Ebreve</key>
+	<string>E_breve.glif</string>
 	<key>Ecaron</key>
 	<string>E_caron.glif</string>
 	<key>Ecircumflex</key>
@@ -114,6 +116,8 @@
 	<string>I_J_.glif</string>
 	<key>Iacute</key>
 	<string>I_acute.glif</string>
+	<key>Ibreve</key>
+	<string>I_breve.glif</string>
 	<key>Icircumflex</key>
 	<string>I_circumflex.glif</string>
 	<key>Idieresis</key>
@@ -176,6 +180,8 @@
 	<string>O_E_.glif</string>
 	<key>Oacute</key>
 	<string>O_acute.glif</string>
+	<key>Obreve</key>
+	<string>O_breve.glif</string>
 	<key>Ocircumflex</key>
 	<string>O_circumflex.glif</string>
 	<key>Odieresis</key>
@@ -506,6 +512,8 @@
 	<string>e.glif</string>
 	<key>eacute</key>
 	<string>eacute.glif</string>
+	<key>ebreve</key>
+	<string>ebreve.glif</string>
 	<key>ecaron</key>
 	<string>ecaron.glif</string>
 	<key>ecircumflex</key>
@@ -522,18 +530,10 @@
 	<string>eight.subs.glif</string>
 	<key>element</key>
 	<string>element.glif</string>
-	<key>onedotenleader</key>
-	<string>onedotenleader.glif</string>
-	<key>twodotenleader</key>
-	<string>twodotenleader.glif</string>
 	<key>ellipsis</key>
 	<string>ellipsis.glif</string>
 	<key>emacron</key>
 	<string>emacron.glif</string>
-	<key>Ebreve</key>
-	<string>E_breve.glif</string>
-	<key>ebreve</key>
-	<string>ebreve.glif</string>
 	<key>emdash</key>
 	<string>emdash.glif</string>
 	<key>emptyset</key>
@@ -636,10 +636,14 @@
 	<string>hungarumlaut.glif</string>
 	<key>hyphen</key>
 	<string>hyphen.glif</string>
+	<key>hyphenationpoint</key>
+	<string>hyphenationpoint.glif</string>
 	<key>i</key>
 	<string>i.glif</string>
 	<key>iacute</key>
 	<string>iacute.glif</string>
+	<key>ibreve</key>
+	<string>ibreve.glif</string>
 	<key>icircumflex</key>
 	<string>icircumflex.glif</string>
 	<key>idieresis</key>
@@ -650,10 +654,6 @@
 	<string>ij.glif</string>
 	<key>imacron</key>
 	<string>imacron.glif</string>
-	<key>Ibreve</key>
-	<string>I_breve.glif</string>
-	<key>ibreve</key>
-	<string>ibreve.glif</string>
 	<key>infinity</key>
 	<string>infinity.glif</string>
 	<key>integral</key>
@@ -726,8 +726,12 @@
 	<string>m.glif</string>
 	<key>macron</key>
 	<string>macron.glif</string>
+	<key>millisecond</key>
+	<string>millisecond.glif</string>
 	<key>minus</key>
 	<string>minus.glif</string>
+	<key>minute</key>
+	<string>minute.glif</string>
 	<key>multiply</key>
 	<string>multiply.glif</string>
 	<key>musicalnote</key>
@@ -760,6 +764,8 @@
 	<string>o.glif</string>
 	<key>oacute</key>
 	<string>oacute.glif</string>
+	<key>obreve</key>
+	<string>obreve.glif</string>
 	<key>ocircumflex</key>
 	<string>ocircumflex.glif</string>
 	<key>odieresis</key>
@@ -776,10 +782,6 @@
 	<string>ohungarumlaut.glif</string>
 	<key>omacron</key>
 	<string>omacron.glif</string>
-	<key>Obreve</key>
-	<string>O_breve.glif</string>
-	<key>obreve</key>
-	<string>obreve.glif</string>
 	<key>omega</key>
 	<string>omega.glif</string>
 	<key>omegatonos</key>
@@ -792,6 +794,8 @@
 	<string>one.glif</string>
 	<key>one.subs</key>
 	<string>one.subs.glif</string>
+	<key>onedotenleader</key>
+	<string>onedotenleader.glif</string>
 	<key>oneeighth</key>
 	<string>oneeighth.glif</string>
 	<key>onehalf</key>
@@ -898,6 +902,8 @@
 	<string>ring.glif</string>
 	<key>rtblock</key>
 	<string>rtblock.glif</string>
+	<key>ruble</key>
+	<string>ruble.glif</string>
 	<key>s</key>
 	<string>s.glif</string>
 	<key>sacute</key>
@@ -908,6 +914,8 @@
 	<string>scedilla.glif</string>
 	<key>scircumflex</key>
 	<string>scircumflex.glif</string>
+	<key>second</key>
+	<string>second.glif</string>
 	<key>section</key>
 	<string>section.glif</string>
 	<key>semicolon</key>
@@ -980,6 +988,8 @@
 	<string>two.glif</string>
 	<key>two.subs</key>
 	<string>two.subs.glif</string>
+	<key>twodotenleader</key>
+	<string>twodotenleader.glif</string>
 	<key>u</key>
 	<string>u.glif</string>
 	<key>uacute</key>
@@ -1902,18 +1912,10 @@
 	<string>uni201F_.glif</string>
 	<key>uni2023</key>
 	<string>uni2023.glif</string>
-	<key>hyphenationpoint</key>
-	<string>hyphenationpoint.glif</string>
 	<key>uni202F</key>
 	<string>uni202F_.glif</string>
 	<key>uni2031</key>
 	<string>uni2031.glif</string>
-	<key>minute</key>
-	<string>minute.glif</string>
-	<key>second</key>
-	<string>second.glif</string>
-	<key>millisecond</key>
-	<string>millisecond.glif</string>
 	<key>uni2035</key>
 	<string>uni2035.glif</string>
 	<key>uni2036</key>
diff --git a/source/Hack-Bold.ufo/glyphs/copyright.glif b/source/Hack-Bold.ufo/glyphs/copyright.glif
index e8c94a94e..20ab02617 100644
--- a/source/Hack-Bold.ufo/glyphs/copyright.glif
+++ b/source/Hack-Bold.ufo/glyphs/copyright.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="copyright" format="1">
+<glyph name="copyright" format="2">
   <advance width="1233"/>
   <unicode hex="00A9"/>
   <outline>
     <contour>
-      <point x="616" y="125" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="125" type="curve" smooth="yes" name="hr00"/>
       <point x="528" y="125"/>
       <point x="454" y="140"/>
       <point x="382" y="171" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="45" y="508" type="curve" smooth="yes"/>
       <point x="15" y="579"/>
       <point x="0" y="656"/>
-      <point x="0" y="741" type="curve" name="dh01" smooth="yes"/>
+      <point x="0" y="741" type="curve" smooth="yes" name="dh01"/>
       <point x="0" y="825"/>
       <point x="15" y="904"/>
       <point x="46" y="977" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="381" y="1313" type="curve" smooth="yes"/>
       <point x="454" y="1343"/>
       <point x="532" y="1358"/>
-      <point x="616" y="1358" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1358" type="curve" smooth="yes" name="dv03"/>
       <point x="700" y="1358"/>
       <point x="779" y="1343"/>
       <point x="852" y="1313" type="curve" smooth="yes"/>
@@ -40,7 +40,7 @@
       <point x="1187" y="977" type="curve" smooth="yes"/>
       <point x="1218" y="905"/>
       <point x="1233" y="827"/>
-      <point x="1233" y="742" type="curve" name="dh06" smooth="yes"/>
+      <point x="1233" y="742" type="curve" smooth="yes" name="dh06"/>
       <point x="1233" y="657"/>
       <point x="1218" y="579"/>
       <point x="1188" y="508" type="curve" smooth="yes"/>
@@ -54,7 +54,7 @@
       <point x="701" y="125"/>
     </contour>
     <contour>
-      <point x="616" y="256" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="256" type="curve" smooth="yes" name="dv01"/>
       <point x="684" y="256"/>
       <point x="741" y="266"/>
       <point x="802" y="293" type="curve" smooth="yes"/>
@@ -66,7 +66,7 @@
       <point x="1066" y="558" type="curve" smooth="yes"/>
       <point x="1090" y="615"/>
       <point x="1102" y="676"/>
-      <point x="1102" y="743" type="curve" name="dh05" smooth="yes"/>
+      <point x="1102" y="743" type="curve" smooth="yes" name="dh05"/>
       <point x="1102" y="815"/>
       <point x="1089" y="871"/>
       <point x="1066" y="927" type="curve" smooth="yes"/>
@@ -75,7 +75,7 @@
       <point x="802" y="1193" type="curve" smooth="yes"/>
       <point x="738" y="1220"/>
       <point x="680" y="1229"/>
-      <point x="619" y="1229" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1229" type="curve" smooth="yes" name="dv02"/>
       <point x="544" y="1229"/>
       <point x="486" y="1216"/>
       <point x="431" y="1193" type="curve" smooth="yes"/>
@@ -84,7 +84,7 @@
       <point x="167" y="927" type="curve" smooth="yes"/>
       <point x="143" y="871"/>
       <point x="131" y="809"/>
-      <point x="131" y="742" type="curve" name="dh02" smooth="yes"/>
+      <point x="131" y="742" type="curve" smooth="yes" name="dh02"/>
       <point x="131" y="676"/>
       <point x="143" y="615"/>
       <point x="167" y="558" type="curve" smooth="yes"/>
@@ -98,16 +98,16 @@
       <point x="549" y="256"/>
     </contour>
     <contour>
-      <point x="637" y="399" type="curve" name="dv04" smooth="yes"/>
+      <point x="637" y="399" type="curve" smooth="yes" name="dv04"/>
       <point x="415" y="399"/>
       <point x="266" y="537"/>
-      <point x="266" y="741" type="curve" name="dh03" smooth="yes"/>
+      <point x="266" y="741" type="curve" smooth="yes" name="dh03"/>
       <point x="266" y="850"/>
       <point x="306" y="935"/>
       <point x="367" y="991" type="curve" smooth="yes"/>
       <point x="430" y="1048"/>
       <point x="521" y="1083"/>
-      <point x="636" y="1083" type="curve" name="dv07" smooth="yes"/>
+      <point x="636" y="1083" type="curve" smooth="yes" name="dv07"/>
       <point x="671" y="1083"/>
       <point x="713" y="1080"/>
       <point x="745" y="1075" type="curve" smooth="yes"/>
@@ -120,19 +120,19 @@
       <point x="751" y="926" type="curve" smooth="yes"/>
       <point x="720" y="935"/>
       <point x="690" y="940"/>
-      <point x="655" y="940" type="curve" name="dv06" smooth="yes"/>
+      <point x="655" y="940" type="curve" smooth="yes" name="dv06"/>
       <point x="590" y="940"/>
       <point x="542" y="923"/>
       <point x="507" y="888" type="curve" smooth="yes"/>
       <point x="471" y="853"/>
       <point x="453" y="804"/>
-      <point x="453" y="741" type="curve" name="dh04" smooth="yes"/>
+      <point x="453" y="741" type="curve" smooth="yes" name="dh04"/>
       <point x="453" y="678"/>
       <point x="471" y="629"/>
       <point x="506" y="595" type="curve" smooth="yes"/>
       <point x="541" y="560"/>
       <point x="591" y="543"/>
-      <point x="658" y="543" type="curve" name="dv05" smooth="yes"/>
+      <point x="658" y="543" type="curve" smooth="yes" name="dv05"/>
       <point x="733" y="543"/>
       <point x="786" y="559"/>
       <point x="848" y="602" type="curve" name="ih02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/currency.glif b/source/Hack-Bold.ufo/glyphs/currency.glif
index 22d66b8f0..6f3d9f77c 100644
--- a/source/Hack-Bold.ufo/glyphs/currency.glif
+++ b/source/Hack-Bold.ufo/glyphs/currency.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="currency" format="1">
+<glyph name="currency" format="2">
   <advance width="1233"/>
   <unicode hex="00A4"/>
   <outline>
@@ -8,13 +8,13 @@
       <point x="356" y="475" type="line"/>
       <point x="337" y="511"/>
       <point x="332" y="527"/>
-      <point x="323" y="559" type="curve" name="sh02" smooth="yes"/>
+      <point x="323" y="559" type="curve" smooth="yes" name="sh02"/>
       <point x="316" y="586"/>
       <point x="311" y="607"/>
-      <point x="311" y="642" type="curve" name="sh01" smooth="yes"/>
+      <point x="311" y="642" type="curve" smooth="yes" name="sh01"/>
       <point x="311" y="677"/>
       <point x="316" y="704"/>
-      <point x="323" y="729" type="curve" name="sh03" smooth="yes"/>
+      <point x="323" y="729" type="curve" smooth="yes" name="sh03"/>
       <point x="330" y="752"/>
       <point x="338" y="776"/>
       <point x="358" y="807" type="curve"/>
@@ -26,7 +26,7 @@
       <point x="566" y="972" type="curve" smooth="yes"/>
       <point x="594" y="979"/>
       <point x="623" y="983"/>
-      <point x="652" y="983" type="curve" name="dv04" smooth="yes"/>
+      <point x="652" y="983" type="curve" smooth="yes" name="dv04"/>
       <point x="708" y="983"/>
       <point x="756" y="968"/>
       <point x="819" y="938" type="curve" name="sh07"/>
@@ -35,13 +35,13 @@
       <point x="948" y="809" type="line"/>
       <point x="963" y="782"/>
       <point x="975" y="754"/>
-      <point x="982" y="727" type="curve" name="sh10" smooth="yes"/>
+      <point x="982" y="727" type="curve" smooth="yes" name="sh10"/>
       <point x="989" y="698"/>
       <point x="993" y="669"/>
-      <point x="993" y="641" type="curve" name="sh08" smooth="yes"/>
+      <point x="993" y="641" type="curve" smooth="yes" name="sh08"/>
       <point x="993" y="613"/>
       <point x="989" y="579"/>
-      <point x="982" y="554" type="curve" name="sh11" smooth="yes"/>
+      <point x="982" y="554" type="curve" smooth="yes" name="sh11"/>
       <point x="975" y="533"/>
       <point x="963" y="502"/>
       <point x="946" y="477" type="curve"/>
@@ -53,32 +53,32 @@
       <point x="741" y="313" type="curve" smooth="yes"/>
       <point x="716" y="306"/>
       <point x="689" y="301"/>
-      <point x="656" y="301" type="curve" name="dv01" smooth="yes"/>
+      <point x="656" y="301" type="curve" smooth="yes" name="dv01"/>
       <point x="598" y="301"/>
       <point x="546" y="315"/>
       <point x="485" y="344" type="curve" name="sh14"/>
       <point x="315" y="176" type="line" name="sh15"/>
     </contour>
     <contour>
-      <point x="654" y="467" type="curve" name="dv02" smooth="yes"/>
+      <point x="654" y="467" type="curve" smooth="yes" name="dv02"/>
       <point x="703" y="467"/>
       <point x="744" y="484"/>
       <point x="777" y="518" type="curve" smooth="yes"/>
       <point x="810" y="553"/>
       <point x="827" y="594"/>
-      <point x="827" y="642" type="curve" name="ah01" smooth="yes"/>
+      <point x="827" y="642" type="curve" smooth="yes" name="ah01"/>
       <point x="827" y="690"/>
       <point x="809" y="735"/>
       <point x="778" y="766" type="curve" smooth="yes"/>
       <point x="746" y="798"/>
       <point x="700" y="815"/>
-      <point x="653" y="815" type="curve" name="dv03" smooth="yes"/>
+      <point x="653" y="815" type="curve" smooth="yes" name="dv03"/>
       <point x="606" y="815"/>
       <point x="563" y="799"/>
       <point x="530" y="767" type="curve" smooth="yes"/>
       <point x="499" y="738"/>
       <point x="479" y="694"/>
-      <point x="479" y="643" type="curve" name="sh05" smooth="yes"/>
+      <point x="479" y="643" type="curve" smooth="yes" name="sh05"/>
       <point x="479" y="596"/>
       <point x="496" y="553"/>
       <point x="529" y="518" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/d.glif b/source/Hack-Bold.ufo/glyphs/d.glif
index 11f68c879..354afecb5 100644
--- a/source/Hack-Bold.ufo/glyphs/d.glif
+++ b/source/Hack-Bold.ufo/glyphs/d.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="d" format="1">
+<glyph name="d" format="2">
   <advance width="1233"/>
   <unicode hex="0064"/>
   <outline>
@@ -16,8 +16,8 @@
       <point x="791" y="961" type="curve"/>
       <point x="791" y="1556" type="line"/>
       <point x="1083" y="1556" type="line"/>
-      <point x="1083" y="-0" type="line"/>
-      <point x="820" y="-0" type="line"/>
+      <point x="1083" y="0" type="line"/>
+      <point x="820" y="0" type="line"/>
       <point x="791" y="166" type="line"/>
       <point x="729" y="36"/>
       <point x="629" y="-29"/>
@@ -38,9 +38,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/dagger.glif b/source/Hack-Bold.ufo/glyphs/dagger.glif
index fd828e216..5a516eb99 100644
--- a/source/Hack-Bold.ufo/glyphs/dagger.glif
+++ b/source/Hack-Bold.ufo/glyphs/dagger.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dagger" format="1">
+<glyph name="dagger" format="2">
   <advance width="1233"/>
   <unicode hex="2020"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/daggerdbl.glif b/source/Hack-Bold.ufo/glyphs/daggerdbl.glif
index 79063804f..45e9daf18 100644
--- a/source/Hack-Bold.ufo/glyphs/daggerdbl.glif
+++ b/source/Hack-Bold.ufo/glyphs/daggerdbl.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="daggerdbl" format="1">
+<glyph name="daggerdbl" format="2">
   <advance width="1233"/>
   <unicode hex="2021"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/dcaron.glif b/source/Hack-Bold.ufo/glyphs/dcaron.glif
index fcb5d2a53..3df3e34f9 100644
--- a/source/Hack-Bold.ufo/glyphs/dcaron.glif
+++ b/source/Hack-Bold.ufo/glyphs/dcaron.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dcaron" format="1">
+<glyph name="dcaron" format="2">
   <advance width="1233"/>
   <unicode hex="010F"/>
   <outline>
     <contour>
-      <point x="491" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="491" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="239" y="-29"/>
       <point x="90" y="186"/>
-      <point x="90" y="559" type="curve" name="sh01" smooth="yes"/>
+      <point x="90" y="559" type="curve" smooth="yes" name="sh01"/>
       <point x="90" y="938"/>
       <point x="244" y="1147"/>
-      <point x="495" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="495" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="626" y="1147"/>
       <point x="714" y="1092"/>
       <point x="791" y="961" type="curve" name="iv01"/>
@@ -29,16 +29,16 @@
       <point x="1090" y="1172" type="line" name="sh04"/>
     </contour>
     <contour>
-      <point x="586" y="211" type="curve" name="sv01" smooth="yes"/>
+      <point x="586" y="211" type="curve" smooth="yes" name="sv01"/>
       <point x="714" y="211"/>
       <point x="791" y="341"/>
-      <point x="791" y="557" type="curve" name="sh05" smooth="yes"/>
+      <point x="791" y="557" type="curve" smooth="yes" name="sh05"/>
       <point x="791" y="773"/>
       <point x="714" y="903"/>
-      <point x="586" y="903" type="curve" name="sv03" smooth="yes"/>
+      <point x="586" y="903" type="curve" smooth="yes" name="sv03"/>
       <point x="459" y="903"/>
       <point x="383" y="773"/>
-      <point x="383" y="557" type="curve" name="sh06" smooth="yes"/>
+      <point x="383" y="557" type="curve" smooth="yes" name="sh06"/>
       <point x="383" y="341"/>
       <point x="459" y="211"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/dcroat.glif b/source/Hack-Bold.ufo/glyphs/dcroat.glif
index 37773f2f4..0d83e21b3 100644
--- a/source/Hack-Bold.ufo/glyphs/dcroat.glif
+++ b/source/Hack-Bold.ufo/glyphs/dcroat.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dcroat" format="1">
+<glyph name="dcroat" format="2">
   <advance width="1233"/>
   <unicode hex="0111"/>
   <outline>
     <contour>
-      <point x="492" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="492" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="368" y="-29"/>
       <point x="268" y="21"/>
       <point x="196" y="124" type="curve" smooth="yes"/>
       <point x="125" y="226"/>
       <point x="90" y="371"/>
-      <point x="90" y="560" type="curve" name="sh01" smooth="yes"/>
+      <point x="90" y="560" type="curve" smooth="yes" name="sh01"/>
       <point x="90" y="749"/>
       <point x="126" y="894"/>
       <point x="198" y="995" type="curve" smooth="yes"/>
       <point x="266" y="1091"/>
       <point x="366" y="1147"/>
-      <point x="498" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="498" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="562" y="1147"/>
       <point x="615" y="1134"/>
       <point x="666" y="1101" type="curve" smooth="yes"/>
@@ -43,22 +43,22 @@
       <point x="561" y="-29"/>
     </contour>
     <contour>
-      <point x="586" y="211" type="curve" name="dv02" smooth="yes"/>
+      <point x="586" y="211" type="curve" smooth="yes" name="dv02"/>
       <point x="649" y="211"/>
       <point x="699" y="242"/>
       <point x="736" y="303" type="curve" smooth="yes"/>
       <point x="773" y="364"/>
       <point x="791" y="448"/>
-      <point x="791" y="557" type="curve" name="sh05" smooth="yes"/>
+      <point x="791" y="557" type="curve" smooth="yes" name="sh05"/>
       <point x="791" y="666"/>
       <point x="773" y="750"/>
       <point x="736" y="811" type="curve" smooth="yes"/>
       <point x="699" y="872"/>
       <point x="649" y="903"/>
-      <point x="586" y="903" type="curve" name="sv01" smooth="yes"/>
+      <point x="586" y="903" type="curve" smooth="yes" name="sv01"/>
       <point x="459" y="903"/>
       <point x="383" y="773"/>
-      <point x="383" y="557" type="curve" name="sh06" smooth="yes"/>
+      <point x="383" y="557" type="curve" smooth="yes" name="sh06"/>
       <point x="383" y="448"/>
       <point x="401" y="364"/>
       <point x="437" y="303" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/degree.glif b/source/Hack-Bold.ufo/glyphs/degree.glif
index 821d51768..f0eb13f69 100644
--- a/source/Hack-Bold.ufo/glyphs/degree.glif
+++ b/source/Hack-Bold.ufo/glyphs/degree.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="degree" format="1">
+<glyph name="degree" format="2">
   <advance width="1233"/>
   <unicode hex="00B0"/>
   <outline>
     <contour>
-      <point x="613" y="854" type="curve" name="hr00" smooth="yes"/>
+      <point x="613" y="854" type="curve" smooth="yes" name="hr00"/>
       <point x="518" y="854"/>
       <point x="437" y="889"/>
       <point x="378" y="948" type="curve" smooth="yes"/>
       <point x="315" y="1011"/>
       <point x="283" y="1093"/>
-      <point x="283" y="1185" type="curve" name="sh01" smooth="yes"/>
+      <point x="283" y="1185" type="curve" smooth="yes" name="sh01"/>
       <point x="283" y="1373"/>
       <point x="428" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="661" y="1520"/>
       <point x="704" y="1512"/>
       <point x="744" y="1495" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="924" y="1313" type="curve" smooth="yes"/>
       <point x="940" y="1274"/>
       <point x="948" y="1232"/>
-      <point x="948" y="1188" type="curve" name="sh02" smooth="yes"/>
+      <point x="948" y="1188" type="curve" smooth="yes" name="sh02"/>
       <point x="948" y="1142"/>
       <point x="940" y="1099"/>
       <point x="923" y="1059" type="curve" smooth="yes"/>
@@ -36,19 +36,19 @@
       <point x="660" y="854"/>
     </contour>
     <contour>
-      <point x="614" y="1016" type="curve" name="dv01" smooth="yes"/>
+      <point x="614" y="1016" type="curve" smooth="yes" name="dv01"/>
       <point x="710" y="1016"/>
       <point x="786" y="1092"/>
-      <point x="786" y="1187" type="curve" name="ah01" smooth="yes"/>
+      <point x="786" y="1187" type="curve" smooth="yes" name="ah01"/>
       <point x="786" y="1235"/>
       <point x="770" y="1275"/>
       <point x="737" y="1308" type="curve" smooth="yes"/>
       <point x="704" y="1341"/>
       <point x="663" y="1358"/>
-      <point x="616" y="1358" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1358" type="curve" smooth="yes" name="sv01"/>
       <point x="520" y="1358"/>
       <point x="444" y="1282"/>
-      <point x="444" y="1185" type="curve" name="sh03" smooth="yes"/>
+      <point x="444" y="1185" type="curve" smooth="yes" name="sh03"/>
       <point x="444" y="1090"/>
       <point x="518" y="1016"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/delta.glif b/source/Hack-Bold.ufo/glyphs/delta.glif
index 6125429af..cf5d37bb7 100644
--- a/source/Hack-Bold.ufo/glyphs/delta.glif
+++ b/source/Hack-Bold.ufo/glyphs/delta.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="delta" format="1">
+<glyph name="delta" format="2">
   <advance width="1233"/>
   <unicode hex="03B4"/>
   <outline>
     <contour>
-      <point x="618" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="618" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="300" y="-29"/>
       <point x="98" y="196"/>
-      <point x="98" y="560" type="curve" name="dh01" smooth="yes"/>
+      <point x="98" y="560" type="curve" smooth="yes" name="dh01"/>
       <point x="98" y="739"/>
       <point x="146" y="875"/>
       <point x="238" y="988" type="curve" smooth="yes"/>
@@ -16,10 +16,10 @@
       <point x="327" y="1065" type="curve" name="ih01"/>
       <point x="228" y="1108"/>
       <point x="182" y="1181"/>
-      <point x="182" y="1277" type="curve" name="sh01" smooth="yes"/>
+      <point x="182" y="1277" type="curve" smooth="yes" name="sh01"/>
       <point x="182" y="1460"/>
       <point x="355" y="1569"/>
-      <point x="662" y="1569" type="curve" name="at01" smooth="yes"/>
+      <point x="662" y="1569" type="curve" smooth="yes" name="at01"/>
       <point x="722" y="1569"/>
       <point x="784" y="1565"/>
       <point x="840" y="1557" type="curve" name="at02"/>
@@ -35,34 +35,34 @@
       <point x="977" y="1314" type="curve" smooth="yes"/>
       <point x="846" y="1354"/>
       <point x="778" y="1367"/>
-      <point x="684" y="1367" type="curve" name="sv02" smooth="yes"/>
+      <point x="684" y="1367" type="curve" smooth="yes" name="sv02"/>
       <point x="598" y="1367"/>
       <point x="553" y="1357"/>
       <point x="510" y="1333" type="curve"/>
       <point x="488" y="1318" type="line"/>
       <point x="465" y="1301"/>
       <point x="453" y="1279"/>
-      <point x="453" y="1246" type="curve" name="sh02" smooth="yes"/>
+      <point x="453" y="1246" type="curve" smooth="yes" name="sh02"/>
       <point x="453" y="1159"/>
       <point x="534" y="1152"/>
       <point x="616" y="1147" type="curve" name="at04"/>
       <point x="941" y="1123"/>
       <point x="1135" y="939"/>
-      <point x="1135" y="570" type="curve" name="dh04" smooth="yes"/>
+      <point x="1135" y="570" type="curve" smooth="yes" name="dh04"/>
       <point x="1135" y="193"/>
       <point x="933" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="209" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="209" type="curve" smooth="yes" name="dv02"/>
       <point x="757" y="209"/>
       <point x="842" y="338"/>
-      <point x="842" y="559" type="curve" name="dh03" smooth="yes"/>
+      <point x="842" y="559" type="curve" smooth="yes" name="dh03"/>
       <point x="842" y="778"/>
       <point x="757" y="909"/>
-      <point x="616" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="476" y="909"/>
       <point x="391" y="778"/>
-      <point x="391" y="559" type="curve" name="dh02" smooth="yes"/>
+      <point x="391" y="559" type="curve" smooth="yes" name="dh02"/>
       <point x="391" y="338"/>
       <point x="476" y="209"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/dieresis.glif b/source/Hack-Bold.ufo/glyphs/dieresis.glif
index 7e1f0572c..ddf12f589 100644
--- a/source/Hack-Bold.ufo/glyphs/dieresis.glif
+++ b/source/Hack-Bold.ufo/glyphs/dieresis.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dieresis" format="1">
+<glyph name="dieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00A8"/>
   <outline>
     <contour>
-      <point x="331" y="1339" type="line" name="hr00" smooth="yes"/>
+      <point x="331" y="1339" type="line" smooth="yes" name="hr00"/>
       <point x="311" y="1339"/>
       <point x="301" y="1349"/>
-      <point x="301" y="1369" type="curve" name="sh01" smooth="yes"/>
+      <point x="301" y="1369" type="curve" smooth="yes" name="sh01"/>
       <point x="301" y="1555" type="line" smooth="yes"/>
       <point x="301" y="1575"/>
       <point x="311" y="1585"/>
-      <point x="331" y="1585" type="curve" name="dv01" smooth="yes"/>
+      <point x="331" y="1585" type="curve" smooth="yes" name="dv01"/>
       <point x="507" y="1585" type="line" smooth="yes"/>
       <point x="527" y="1585"/>
       <point x="537" y="1575"/>
       <point x="537" y="1555" type="curve" smooth="yes"/>
-      <point x="537" y="1369" type="line" name="sh02" smooth="yes"/>
+      <point x="537" y="1369" type="line" smooth="yes" name="sh02"/>
       <point x="537" y="1349"/>
       <point x="527" y="1339"/>
       <point x="507" y="1339" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1339" type="line" name="sv01" smooth="yes"/>
+      <point x="726" y="1339" type="line" smooth="yes" name="sv01"/>
       <point x="706" y="1339"/>
       <point x="696" y="1349"/>
-      <point x="696" y="1369" type="curve" name="ah01" smooth="yes"/>
+      <point x="696" y="1369" type="curve" smooth="yes" name="ah01"/>
       <point x="696" y="1555" type="line" smooth="yes"/>
       <point x="696" y="1575"/>
       <point x="706" y="1585"/>
-      <point x="726" y="1585" type="curve" name="sv02" smooth="yes"/>
+      <point x="726" y="1585" type="curve" smooth="yes" name="sv02"/>
       <point x="902" y="1585" type="line" smooth="yes"/>
       <point x="922" y="1585"/>
       <point x="932" y="1575"/>
       <point x="932" y="1555" type="curve" smooth="yes"/>
-      <point x="932" y="1369" type="line" name="sh03" smooth="yes"/>
+      <point x="932" y="1369" type="line" smooth="yes" name="sh03"/>
       <point x="932" y="1349"/>
       <point x="922" y="1339"/>
       <point x="902" y="1339" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/dieresistonos.glif b/source/Hack-Bold.ufo/glyphs/dieresistonos.glif
index 6ead39c2f..11beaeabd 100644
--- a/source/Hack-Bold.ufo/glyphs/dieresistonos.glif
+++ b/source/Hack-Bold.ufo/glyphs/dieresistonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dieresistonos" format="1">
+<glyph name="dieresistonos" format="2">
   <advance width="1233"/>
   <unicode hex="0385"/>
   <outline>
@@ -10,40 +10,40 @@
       <point x="469" y="1515" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="211" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="211" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="191" y="1320"/>
       <point x="181" y="1330"/>
-      <point x="181" y="1350" type="curve" name="sh03" smooth="yes"/>
+      <point x="181" y="1350" type="curve" smooth="yes" name="sh03"/>
       <point x="181" y="1536" type="line" smooth="yes"/>
       <point x="181" y="1556"/>
       <point x="191" y="1566"/>
-      <point x="211" y="1566" type="curve" name="at02" smooth="yes"/>
+      <point x="211" y="1566" type="curve" smooth="yes" name="at02"/>
       <point x="387" y="1566" type="line" smooth="yes"/>
       <point x="407" y="1566"/>
       <point x="417" y="1556"/>
       <point x="417" y="1536" type="curve" smooth="yes"/>
-      <point x="417" y="1350" type="line" name="sh04" smooth="yes"/>
+      <point x="417" y="1350" type="line" smooth="yes" name="sh04"/>
       <point x="417" y="1330"/>
       <point x="407" y="1320"/>
       <point x="387" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="816" y="1320" type="line" name="sv02" smooth="yes"/>
+      <point x="816" y="1320" type="line" smooth="yes" name="sv02"/>
       <point x="796" y="1320"/>
       <point x="786" y="1330"/>
-      <point x="786" y="1350" type="curve" name="ah01" smooth="yes"/>
+      <point x="786" y="1350" type="curve" smooth="yes" name="ah01"/>
       <point x="786" y="1536" type="line" smooth="yes"/>
       <point x="786" y="1556"/>
       <point x="796" y="1566"/>
-      <point x="816" y="1566" type="curve" name="at03" smooth="yes"/>
-      <point x="992" y="1566" type="line" name="hr01" smooth="yes"/>
+      <point x="816" y="1566" type="curve" smooth="yes" name="at03"/>
+      <point x="992" y="1566" type="line" smooth="yes" name="hr01"/>
       <point x="1012" y="1566"/>
       <point x="1022" y="1556"/>
       <point x="1022" y="1536" type="curve" smooth="yes"/>
-      <point x="1022" y="1350" type="line" name="sh01" smooth="yes"/>
+      <point x="1022" y="1350" type="line" smooth="yes" name="sh01"/>
       <point x="1022" y="1330"/>
       <point x="1012" y="1320"/>
-      <point x="992" y="1320" type="curve" name="sv03" smooth="yes"/>
+      <point x="992" y="1320" type="curve" smooth="yes" name="sv03"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Bold.ufo/glyphs/divide.glif b/source/Hack-Bold.ufo/glyphs/divide.glif
index 67514877e..ac07ecc7e 100644
--- a/source/Hack-Bold.ufo/glyphs/divide.glif
+++ b/source/Hack-Bold.ufo/glyphs/divide.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="divide" format="1">
+<glyph name="divide" format="2">
   <advance width="1233"/>
   <unicode hex="00F7"/>
   <outline>
     <contour>
-      <point x="491" y="889" type="line" name="hr00" smooth="yes"/>
+      <point x="491" y="889" type="line" smooth="yes" name="hr00"/>
       <point x="471" y="889"/>
       <point x="461" y="899"/>
-      <point x="461" y="919" type="curve" name="dh01" smooth="yes"/>
+      <point x="461" y="919" type="curve" smooth="yes" name="dh01"/>
       <point x="461" y="1168" type="line" smooth="yes"/>
       <point x="461" y="1188"/>
       <point x="471" y="1198"/>
-      <point x="491" y="1198" type="curve" name="dv03" smooth="yes"/>
+      <point x="491" y="1198" type="curve" smooth="yes" name="dv03"/>
       <point x="740" y="1198" type="line" smooth="yes"/>
       <point x="760" y="1198"/>
       <point x="770" y="1188"/>
       <point x="770" y="1168" type="curve" smooth="yes"/>
-      <point x="770" y="919" type="line" name="dh02" smooth="yes"/>
+      <point x="770" y="919" type="line" smooth="yes" name="dh02"/>
       <point x="770" y="899"/>
       <point x="760" y="889"/>
       <point x="740" y="889" type="curve" smooth="yes"/>
@@ -28,18 +28,18 @@
       <point x="66" y="524" type="line"/>
     </contour>
     <contour>
-      <point x="491" y="86" type="line" name="dv01" smooth="yes"/>
+      <point x="491" y="86" type="line" smooth="yes" name="dv01"/>
       <point x="471" y="86"/>
       <point x="461" y="96"/>
-      <point x="461" y="116" type="curve" name="sh01" smooth="yes"/>
+      <point x="461" y="116" type="curve" smooth="yes" name="sh01"/>
       <point x="461" y="365" type="line" smooth="yes"/>
       <point x="461" y="385"/>
       <point x="471" y="395"/>
-      <point x="491" y="395" type="curve" name="dv02" smooth="yes"/>
+      <point x="491" y="395" type="curve" smooth="yes" name="dv02"/>
       <point x="740" y="395" type="line" smooth="yes"/>
       <point x="760" y="395"/>
       <point x="770" y="385"/>
-      <point x="770" y="365" type="curve" name="sh02" smooth="yes"/>
+      <point x="770" y="365" type="curve" smooth="yes" name="sh02"/>
       <point x="770" y="116" type="line" smooth="yes"/>
       <point x="770" y="96"/>
       <point x="760" y="86"/>
diff --git a/source/Hack-Bold.ufo/glyphs/dkshade.glif b/source/Hack-Bold.ufo/glyphs/dkshade.glif
index 4107a505a..8a2848824 100644
--- a/source/Hack-Bold.ufo/glyphs/dkshade.glif
+++ b/source/Hack-Bold.ufo/glyphs/dkshade.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dkshade" format="1">
+<glyph name="dkshade" format="2">
   <advance width="1233"/>
   <unicode hex="2593"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/dnblock.glif b/source/Hack-Bold.ufo/glyphs/dnblock.glif
index d5c91abc5..ae024e4f7 100644
--- a/source/Hack-Bold.ufo/glyphs/dnblock.glif
+++ b/source/Hack-Bold.ufo/glyphs/dnblock.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dnblock" format="1">
+<glyph name="dnblock" format="2">
   <advance width="1233"/>
   <unicode hex="2584"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/dollar.glif b/source/Hack-Bold.ufo/glyphs/dollar.glif
index 33b2ceb0b..b3387e89c 100644
--- a/source/Hack-Bold.ufo/glyphs/dollar.glif
+++ b/source/Hack-Bold.ufo/glyphs/dollar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dollar" format="1">
+<glyph name="dollar" format="2">
   <advance width="1233"/>
   <unicode hex="0024"/>
   <outline>
@@ -24,7 +24,7 @@
       <point x="260" y="690" type="curve" smooth="yes"/>
       <point x="196" y="753"/>
       <point x="164" y="837"/>
-      <point x="164" y="943" type="curve" name="dh01" smooth="yes"/>
+      <point x="164" y="943" type="curve" smooth="yes" name="dh01"/>
       <point x="164" y="1054"/>
       <point x="198" y="1142"/>
       <point x="266" y="1208" type="curve" smooth="yes"/>
@@ -43,17 +43,17 @@
       <point x="999" y="1006" type="line" name="sh06"/>
       <point x="955" y="1035"/>
       <point x="906" y="1055"/>
-      <point x="861" y="1070" type="curve" name="hr02" smooth="yes"/>
+      <point x="861" y="1070" type="curve" smooth="yes" name="hr02"/>
       <point x="809" y="1086"/>
       <point x="755" y="1096"/>
       <point x="694" y="1100" type="curve" name="sh07"/>
       <point x="694" y="793" type="line"/>
       <point x="827" y="772"/>
       <point x="926" y="727"/>
-      <point x="992" y="659" type="curve" name="hr03" smooth="yes"/>
+      <point x="992" y="659" type="curve" smooth="yes" name="hr03"/>
       <point x="1060" y="590"/>
       <point x="1092" y="497"/>
-      <point x="1092" y="386" type="curve" name="dh06" smooth="yes"/>
+      <point x="1092" y="386" type="curve" smooth="yes" name="dh06"/>
       <point x="1092" y="271"/>
       <point x="1056" y="185"/>
       <point x="984" y="114" type="curve" smooth="yes"/>
@@ -70,7 +70,7 @@
       <point x="460" y="1059" type="curve" smooth="yes"/>
       <point x="441" y="1040"/>
       <point x="428" y="1010"/>
-      <point x="428" y="967" type="curve" name="dh02" smooth="yes"/>
+      <point x="428" y="967" type="curve" smooth="yes" name="dh02"/>
       <point x="428" y="929"/>
       <point x="439" y="897"/>
       <point x="460" y="872" type="curve" smooth="yes"/>
@@ -85,7 +85,7 @@
       <point x="792" y="275" type="curve" smooth="yes"/>
       <point x="815" y="302"/>
       <point x="827" y="335"/>
-      <point x="827" y="376" type="curve" name="dh05" smooth="yes"/>
+      <point x="827" y="376" type="curve" smooth="yes" name="dh05"/>
       <point x="827" y="417"/>
       <point x="816" y="450"/>
       <point x="793" y="477" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/dong.glif b/source/Hack-Bold.ufo/glyphs/dong.glif
index 650950af8..e0f579c05 100644
--- a/source/Hack-Bold.ufo/glyphs/dong.glif
+++ b/source/Hack-Bold.ufo/glyphs/dong.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dong" format="1">
+<glyph name="dong" format="2">
   <advance width="1233"/>
   <unicode hex="20AB"/>
   <outline>
     <contour>
-      <point x="637" y="-25" type="curve" name="ab01" smooth="yes"/>
+      <point x="637" y="-25" type="curve" smooth="yes" name="ab01"/>
       <point x="385" y="-25"/>
       <point x="236" y="190"/>
-      <point x="236" y="563" type="curve" name="sh01" smooth="yes"/>
+      <point x="236" y="563" type="curve" smooth="yes" name="sh01"/>
       <point x="236" y="942"/>
       <point x="390" y="1151"/>
-      <point x="641" y="1151" type="curve" name="dv04" smooth="yes"/>
+      <point x="641" y="1151" type="curve" smooth="yes" name="dv04"/>
       <point x="772" y="1151"/>
       <point x="860" y="1096"/>
       <point x="937" y="965" type="curve"/>
@@ -31,16 +31,16 @@
       <point x="781" y="-25"/>
     </contour>
     <contour>
-      <point x="732" y="215" type="curve" name="sv03" smooth="yes"/>
+      <point x="732" y="215" type="curve" smooth="yes" name="sv03"/>
       <point x="860" y="215"/>
       <point x="937" y="345"/>
-      <point x="937" y="561" type="curve" name="sh06" smooth="yes"/>
+      <point x="937" y="561" type="curve" smooth="yes" name="sh06"/>
       <point x="937" y="777"/>
       <point x="860" y="907"/>
-      <point x="732" y="907" type="curve" name="dv03" smooth="yes"/>
+      <point x="732" y="907" type="curve" smooth="yes" name="dv03"/>
       <point x="605" y="907"/>
       <point x="529" y="777"/>
-      <point x="529" y="561" type="curve" name="sh07" smooth="yes"/>
+      <point x="529" y="561" type="curve" smooth="yes" name="sh07"/>
       <point x="529" y="345"/>
       <point x="605" y="215"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/dotaccent.glif b/source/Hack-Bold.ufo/glyphs/dotaccent.glif
index 0be90576c..8f9c6b154 100644
--- a/source/Hack-Bold.ufo/glyphs/dotaccent.glif
+++ b/source/Hack-Bold.ufo/glyphs/dotaccent.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dotaccent" format="1">
+<glyph name="dotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="02D9"/>
   <outline>
     <contour>
-      <point x="509" y="1339" type="line" name="hr00" smooth="yes"/>
+      <point x="509" y="1339" type="line" smooth="yes" name="hr00"/>
       <point x="489" y="1339"/>
       <point x="479" y="1349"/>
-      <point x="479" y="1369" type="curve" name="dh01" smooth="yes"/>
+      <point x="479" y="1369" type="curve" smooth="yes" name="dh01"/>
       <point x="479" y="1555" type="line" smooth="yes"/>
       <point x="479" y="1575"/>
       <point x="489" y="1585"/>
-      <point x="509" y="1585" type="curve" name="dv01" smooth="yes"/>
+      <point x="509" y="1585" type="curve" smooth="yes" name="dv01"/>
       <point x="724" y="1585" type="line" smooth="yes"/>
       <point x="744" y="1585"/>
       <point x="754" y="1575"/>
       <point x="754" y="1555" type="curve" smooth="yes"/>
-      <point x="754" y="1369" type="line" name="dh02" smooth="yes"/>
+      <point x="754" y="1369" type="line" smooth="yes" name="dh02"/>
       <point x="754" y="1349"/>
       <point x="744" y="1339"/>
-      <point x="724" y="1339" type="curve" name="sv01" smooth="yes"/>
+      <point x="724" y="1339" type="curve" smooth="yes" name="sv01"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Bold.ufo/glyphs/dotbelowcomb.glif b/source/Hack-Bold.ufo/glyphs/dotbelowcomb.glif
index a73f0b381..b7bedfa8d 100644
--- a/source/Hack-Bold.ufo/glyphs/dotbelowcomb.glif
+++ b/source/Hack-Bold.ufo/glyphs/dotbelowcomb.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dotbelowcomb" format="1">
-  <advance width="0"/>
+<glyph name="dotbelowcomb" format="2">
   <unicode hex="0323"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/dotlessi.glif b/source/Hack-Bold.ufo/glyphs/dotlessi.glif
index 89a6f3ad4..01cec323d 100644
--- a/source/Hack-Bold.ufo/glyphs/dotlessi.glif
+++ b/source/Hack-Bold.ufo/glyphs/dotlessi.glif
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dotlessi" format="1">
+<glyph name="dotlessi" format="2">
   <advance width="1233"/>
   <unicode hex="0131"/>
   <outline>
     <contour>
-      <point x="812" y="-12" type="line" name="hr00" smooth="yes"/>
+      <point x="812" y="-12" type="line" smooth="yes" name="hr00"/>
       <point x="673" y="-12"/>
       <point x="573" y="24"/>
       <point x="512" y="96" type="curve" smooth="yes"/>
       <point x="451" y="167"/>
       <point x="421" y="287"/>
-      <point x="421" y="455" type="curve" name="dh01" smooth="yes"/>
+      <point x="421" y="455" type="curve" smooth="yes" name="dh01"/>
       <point x="421" y="895" type="line" name="sv01"/>
       <point x="184" y="895" type="line"/>
       <point x="184" y="1120" type="line" name="at01"/>
       <point x="714" y="1120" type="line"/>
-      <point x="714" y="455" type="line" name="dh02" smooth="yes"/>
+      <point x="714" y="455" type="line" smooth="yes" name="dh02"/>
       <point x="714" y="368"/>
       <point x="728" y="305"/>
       <point x="755" y="268" type="curve" smooth="yes"/>
       <point x="782" y="231"/>
       <point x="828" y="213"/>
-      <point x="894" y="213" type="curve" name="sv02" smooth="yes"/>
+      <point x="894" y="213" type="curve" smooth="yes" name="sv02"/>
       <point x="1128" y="213" type="line" name="sv03"/>
       <point x="1128" y="-12" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/dotmath.glif b/source/Hack-Bold.ufo/glyphs/dotmath.glif
index c97d119dd..e7395b48c 100644
--- a/source/Hack-Bold.ufo/glyphs/dotmath.glif
+++ b/source/Hack-Bold.ufo/glyphs/dotmath.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dotmath" format="1">
+<glyph name="dotmath" format="2">
   <advance width="1233"/>
   <unicode hex="22C5"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/e.glif b/source/Hack-Bold.ufo/glyphs/e.glif
index 2aa1bd40a..781695cd8 100644
--- a/source/Hack-Bold.ufo/glyphs/e.glif
+++ b/source/Hack-Bold.ufo/glyphs/e.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="e" format="1">
+<glyph name="e" format="2">
   <advance width="1233"/>
   <unicode hex="0065"/>
   <outline>
@@ -37,9 +37,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/eacute.glif b/source/Hack-Bold.ufo/glyphs/eacute.glif
index ff2151b09..5ce25ff42 100644
--- a/source/Hack-Bold.ufo/glyphs/eacute.glif
+++ b/source/Hack-Bold.ufo/glyphs/eacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eacute" format="1">
+<glyph name="eacute" format="2">
   <advance width="1233"/>
   <unicode hex="00E9"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="498" y="1296" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="665" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="665" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="470" y="-29"/>
       <point x="331" y="21"/>
       <point x="231" y="122" type="curve" smooth="yes"/>
@@ -33,7 +33,7 @@
       <point x="458" y="268" type="curve" smooth="yes"/>
       <point x="509" y="225"/>
       <point x="586" y="203"/>
-      <point x="687" y="203" type="curve" name="dv02" smooth="yes"/>
+      <point x="687" y="203" type="curve" smooth="yes" name="dv02"/>
       <point x="754" y="203"/>
       <point x="821" y="213"/>
       <point x="887" y="232" type="curve" smooth="yes"/>
@@ -54,7 +54,7 @@
       <point x="785" y="861" type="curve" smooth="yes"/>
       <point x="749" y="898"/>
       <point x="692" y="920"/>
-      <point x="617" y="920" type="curve" name="sv01" smooth="yes"/>
+      <point x="617" y="920" type="curve" smooth="yes" name="sv01"/>
       <point x="548" y="920"/>
       <point x="494" y="900"/>
       <point x="454" y="859" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/ebreve.glif b/source/Hack-Bold.ufo/glyphs/ebreve.glif
index 7431f829c..4fda8b9ee 100644
--- a/source/Hack-Bold.ufo/glyphs/ebreve.glif
+++ b/source/Hack-Bold.ufo/glyphs/ebreve.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ebreve" format="1">
+<glyph name="ebreve" format="2">
   <advance width="1233"/>
   <unicode hex="0115"/>
   <outline>
     <contour>
-      <point x="665" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="665" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="470" y="-29"/>
       <point x="331" y="21"/>
       <point x="231" y="122" type="curve" smooth="yes"/>
@@ -27,7 +27,7 @@
       <point x="458" y="268" type="curve" smooth="yes"/>
       <point x="509" y="225"/>
       <point x="586" y="203"/>
-      <point x="687" y="203" type="curve" name="dv01" smooth="yes"/>
+      <point x="687" y="203" type="curve" smooth="yes" name="dv01"/>
       <point x="754" y="203"/>
       <point x="821" y="213"/>
       <point x="887" y="232" type="curve" smooth="yes"/>
@@ -48,7 +48,7 @@
       <point x="785" y="861" type="curve" smooth="yes"/>
       <point x="749" y="898"/>
       <point x="692" y="920"/>
-      <point x="617" y="920" type="curve" name="sv01" smooth="yes"/>
+      <point x="617" y="920" type="curve" smooth="yes" name="sv01"/>
       <point x="548" y="920"/>
       <point x="494" y="900"/>
       <point x="454" y="859" type="curve" smooth="yes"/>
@@ -57,7 +57,7 @@
       <point x="383" y="684" type="curve" name="dv03"/>
     </contour>
     <contour>
-      <point x="616" y="1299" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1299" type="curve" smooth="yes" name="dv01"/>
       <point x="515" y="1299"/>
       <point x="434" y="1323"/>
       <point x="374" y="1376" type="curve" smooth="yes"/>
@@ -70,7 +70,7 @@
       <point x="483" y="1490" type="curve" smooth="yes"/>
       <point x="516" y="1465"/>
       <point x="561" y="1452"/>
-      <point x="617" y="1452" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="1452" type="curve" smooth="yes" name="dv02"/>
       <point x="672" y="1452"/>
       <point x="716" y="1464"/>
       <point x="749" y="1489" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/ecaron.glif b/source/Hack-Bold.ufo/glyphs/ecaron.glif
index af3dbfd4b..0442e07ea 100644
--- a/source/Hack-Bold.ufo/glyphs/ecaron.glif
+++ b/source/Hack-Bold.ufo/glyphs/ecaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ecaron" format="1">
+<glyph name="ecaron" format="2">
   <advance width="1233"/>
   <unicode hex="011B"/>
   <outline>
@@ -13,21 +13,21 @@
       <point x="503" y="1302" type="line"/>
     </contour>
     <contour>
-      <point x="669" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="669" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="283" y="-29"/>
       <point x="82" y="178"/>
-      <point x="82" y="550" type="curve" name="sh01" smooth="yes"/>
+      <point x="82" y="550" type="curve" smooth="yes" name="sh01"/>
       <point x="82" y="920"/>
       <point x="281" y="1147"/>
-      <point x="621" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="621" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="944" y="1147"/>
       <point x="1139" y="940"/>
-      <point x="1139" y="584" type="curve" name="sh03" smooth="yes"/>
+      <point x="1139" y="584" type="curve" smooth="yes" name="sh03"/>
       <point x="1139" y="465" type="line"/>
       <point x="380" y="465" type="line" name="sh02"/>
       <point x="381" y="290"/>
       <point x="483" y="203"/>
-      <point x="688" y="203" type="curve" name="dv02" smooth="yes"/>
+      <point x="688" y="203" type="curve" smooth="yes" name="dv02"/>
       <point x="824" y="203"/>
       <point x="948" y="240"/>
       <point x="1092" y="324" type="curve" name="ih02"/>
@@ -39,7 +39,7 @@
       <point x="844" y="685" type="line" name="ah01"/>
       <point x="841" y="840"/>
       <point x="761" y="920"/>
-      <point x="620" y="920" type="curve" name="sv01" smooth="yes"/>
+      <point x="620" y="920" type="curve" smooth="yes" name="sv01"/>
       <point x="476" y="920"/>
       <point x="399" y="837"/>
       <point x="383" y="684" type="curve" name="sh04"/>
diff --git a/source/Hack-Bold.ufo/glyphs/ecircumflex.glif b/source/Hack-Bold.ufo/glyphs/ecircumflex.glif
index b3a9bce9d..14f7bcf05 100644
--- a/source/Hack-Bold.ufo/glyphs/ecircumflex.glif
+++ b/source/Hack-Bold.ufo/glyphs/ecircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ecircumflex" format="1">
+<glyph name="ecircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00EA"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="269" y="1297" type="line" name="iv02"/>
     </contour>
     <contour>
-      <point x="665" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="665" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="470" y="-29"/>
       <point x="331" y="21"/>
       <point x="231" y="122" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="458" y="268" type="curve" smooth="yes"/>
       <point x="509" y="225"/>
       <point x="586" y="203"/>
-      <point x="687" y="203" type="curve" name="dv02" smooth="yes"/>
+      <point x="687" y="203" type="curve" smooth="yes" name="dv02"/>
       <point x="754" y="203"/>
       <point x="821" y="213"/>
       <point x="887" y="232" type="curve" smooth="yes"/>
@@ -57,7 +57,7 @@
       <point x="785" y="861" type="curve" smooth="yes"/>
       <point x="749" y="898"/>
       <point x="692" y="920"/>
-      <point x="617" y="920" type="curve" name="sv01" smooth="yes"/>
+      <point x="617" y="920" type="curve" smooth="yes" name="sv01"/>
       <point x="548" y="920"/>
       <point x="494" y="900"/>
       <point x="454" y="859" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/edieresis.glif b/source/Hack-Bold.ufo/glyphs/edieresis.glif
index 098e09519..49ed9dff2 100644
--- a/source/Hack-Bold.ufo/glyphs/edieresis.glif
+++ b/source/Hack-Bold.ufo/glyphs/edieresis.glif
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="edieresis" format="1">
+<glyph name="edieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00EB"/>
   <outline>
     <contour>
-      <point x="360" y="1349" type="line" name="hr00" smooth="yes"/>
+      <point x="360" y="1349" type="line" smooth="yes" name="hr00"/>
       <point x="340" y="1349"/>
       <point x="330" y="1359"/>
-      <point x="330" y="1379" type="curve" name="sh01" smooth="yes"/>
+      <point x="330" y="1379" type="curve" smooth="yes" name="sh01"/>
       <point x="330" y="1565" type="line" smooth="yes"/>
       <point x="330" y="1585"/>
       <point x="340" y="1595"/>
-      <point x="360" y="1595" type="curve" name="dv03" smooth="yes"/>
+      <point x="360" y="1595" type="curve" smooth="yes" name="dv03"/>
       <point x="536" y="1595" type="line" smooth="yes"/>
       <point x="556" y="1595"/>
       <point x="566" y="1585"/>
       <point x="566" y="1565" type="curve" smooth="yes"/>
-      <point x="566" y="1379" type="line" name="sh02" smooth="yes"/>
+      <point x="566" y="1379" type="line" smooth="yes" name="sh02"/>
       <point x="566" y="1359"/>
       <point x="556" y="1349"/>
       <point x="536" y="1349" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="755" y="1349" type="line" name="sv01" smooth="yes"/>
+      <point x="755" y="1349" type="line" smooth="yes" name="sv01"/>
       <point x="735" y="1349"/>
       <point x="725" y="1359"/>
-      <point x="725" y="1379" type="curve" name="ah01" smooth="yes"/>
+      <point x="725" y="1379" type="curve" smooth="yes" name="ah01"/>
       <point x="725" y="1565" type="line" smooth="yes"/>
       <point x="725" y="1585"/>
       <point x="735" y="1595"/>
-      <point x="755" y="1595" type="curve" name="sv02" smooth="yes"/>
+      <point x="755" y="1595" type="curve" smooth="yes" name="sv02"/>
       <point x="931" y="1595" type="line" smooth="yes"/>
       <point x="951" y="1595"/>
       <point x="961" y="1585"/>
       <point x="961" y="1565" type="curve" smooth="yes"/>
-      <point x="961" y="1379" type="line" name="sh03" smooth="yes"/>
+      <point x="961" y="1379" type="line" smooth="yes" name="sh03"/>
       <point x="961" y="1359"/>
       <point x="951" y="1349"/>
       <point x="931" y="1349" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="665" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="665" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="470" y="-29"/>
       <point x="331" y="21"/>
       <point x="231" y="122" type="curve" smooth="yes"/>
@@ -63,7 +63,7 @@
       <point x="458" y="268" type="curve" smooth="yes"/>
       <point x="509" y="225"/>
       <point x="586" y="203"/>
-      <point x="687" y="203" type="curve" name="dv02" smooth="yes"/>
+      <point x="687" y="203" type="curve" smooth="yes" name="dv02"/>
       <point x="754" y="203"/>
       <point x="821" y="213"/>
       <point x="887" y="232" type="curve" smooth="yes"/>
@@ -84,7 +84,7 @@
       <point x="785" y="861" type="curve" smooth="yes"/>
       <point x="749" y="898"/>
       <point x="692" y="920"/>
-      <point x="617" y="920" type="curve" name="sv03" smooth="yes"/>
+      <point x="617" y="920" type="curve" smooth="yes" name="sv03"/>
       <point x="548" y="920"/>
       <point x="494" y="900"/>
       <point x="454" y="859" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/edotaccent.glif b/source/Hack-Bold.ufo/glyphs/edotaccent.glif
index a770fffb1..bbc1cde88 100644
--- a/source/Hack-Bold.ufo/glyphs/edotaccent.glif
+++ b/source/Hack-Bold.ufo/glyphs/edotaccent.glif
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="edotaccent" format="1">
+<glyph name="edotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="0117"/>
   <outline>
     <contour>
-      <point x="538" y="1349" type="line" name="hr00" smooth="yes"/>
+      <point x="538" y="1349" type="line" smooth="yes" name="hr00"/>
       <point x="518" y="1349"/>
       <point x="508" y="1359"/>
-      <point x="508" y="1379" type="curve" name="dh03" smooth="yes"/>
+      <point x="508" y="1379" type="curve" smooth="yes" name="dh03"/>
       <point x="508" y="1565" type="line" smooth="yes"/>
       <point x="508" y="1585"/>
       <point x="518" y="1595"/>
-      <point x="538" y="1595" type="curve" name="dv03" smooth="yes"/>
+      <point x="538" y="1595" type="curve" smooth="yes" name="dv03"/>
       <point x="753" y="1595" type="line" smooth="yes"/>
       <point x="773" y="1595"/>
       <point x="783" y="1585"/>
       <point x="783" y="1565" type="curve" smooth="yes"/>
-      <point x="783" y="1379" type="line" name="dh04" smooth="yes"/>
+      <point x="783" y="1379" type="line" smooth="yes" name="dh04"/>
       <point x="783" y="1359"/>
       <point x="773" y="1349"/>
       <point x="753" y="1349" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="669" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="669" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="283" y="-29"/>
       <point x="82" y="178"/>
-      <point x="82" y="550" type="curve" name="dh01" smooth="yes"/>
+      <point x="82" y="550" type="curve" smooth="yes" name="dh01"/>
       <point x="82" y="920"/>
       <point x="281" y="1147"/>
-      <point x="621" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="621" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="944" y="1147"/>
       <point x="1139" y="940"/>
-      <point x="1139" y="584" type="curve" name="dh06" smooth="yes"/>
+      <point x="1139" y="584" type="curve" smooth="yes" name="dh06"/>
       <point x="1139" y="465" type="line"/>
       <point x="380" y="465" type="line" name="dh02"/>
       <point x="381" y="290"/>
       <point x="483" y="203"/>
-      <point x="688" y="203" type="curve" name="dv02" smooth="yes"/>
+      <point x="688" y="203" type="curve" smooth="yes" name="dv02"/>
       <point x="824" y="203"/>
       <point x="948" y="240"/>
       <point x="1092" y="324" type="curve" name="ih01"/>
@@ -48,7 +48,7 @@
       <point x="844" y="685" type="line" name="dh05"/>
       <point x="841" y="840"/>
       <point x="761" y="920"/>
-      <point x="620" y="920" type="curve" name="sv01" smooth="yes"/>
+      <point x="620" y="920" type="curve" smooth="yes" name="sv01"/>
       <point x="476" y="920"/>
       <point x="399" y="837"/>
       <point x="383" y="684" type="curve" name="sh01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/egrave.glif b/source/Hack-Bold.ufo/glyphs/egrave.glif
index cd17beecc..bc45e3e9d 100644
--- a/source/Hack-Bold.ufo/glyphs/egrave.glif
+++ b/source/Hack-Bold.ufo/glyphs/egrave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="egrave" format="1">
+<glyph name="egrave" format="2">
   <advance width="1233"/>
   <unicode hex="00E8"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="606" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="675" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="675" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="480" y="-29"/>
       <point x="341" y="21"/>
       <point x="241" y="122" type="curve" smooth="yes"/>
@@ -33,7 +33,7 @@
       <point x="468" y="268" type="curve" smooth="yes"/>
       <point x="519" y="225"/>
       <point x="596" y="203"/>
-      <point x="697" y="203" type="curve" name="dv02" smooth="yes"/>
+      <point x="697" y="203" type="curve" smooth="yes" name="dv02"/>
       <point x="764" y="203"/>
       <point x="831" y="213"/>
       <point x="897" y="232" type="curve" smooth="yes"/>
@@ -54,7 +54,7 @@
       <point x="795" y="861" type="curve" smooth="yes"/>
       <point x="759" y="898"/>
       <point x="702" y="920"/>
-      <point x="627" y="920" type="curve" name="sv01" smooth="yes"/>
+      <point x="627" y="920" type="curve" smooth="yes" name="sv01"/>
       <point x="558" y="920"/>
       <point x="504" y="900"/>
       <point x="464" y="859" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/eight.glif b/source/Hack-Bold.ufo/glyphs/eight.glif
index 43cd69498..acf657bd2 100644
--- a/source/Hack-Bold.ufo/glyphs/eight.glif
+++ b/source/Hack-Bold.ufo/glyphs/eight.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eight" format="1">
+<glyph name="eight" format="2">
   <advance width="1233"/>
   <unicode hex="0038"/>
   <outline>
     <contour>
-      <point x="617" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="453" y="-29"/>
       <point x="336" y="13"/>
       <point x="256" y="88" type="curve" smooth="yes"/>
       <point x="171" y="167"/>
       <point x="129" y="279"/>
-      <point x="129" y="414" type="curve" name="dh01" smooth="yes"/>
+      <point x="129" y="414" type="curve" smooth="yes" name="dh01"/>
       <point x="129" y="515"/>
       <point x="153" y="591"/>
       <point x="200" y="656" type="curve" smooth="yes"/>
@@ -22,22 +22,22 @@
       <point x="225" y="914" type="curve" smooth="yes"/>
       <point x="186" y="970"/>
       <point x="166" y="1036"/>
-      <point x="166" y="1121" type="curve" name="ih01" smooth="yes"/>
+      <point x="166" y="1121" type="curve" smooth="yes" name="ih01"/>
       <point x="166" y="1242"/>
       <point x="206" y="1340"/>
       <point x="287" y="1412" type="curve" smooth="yes"/>
       <point x="368" y="1484"/>
       <point x="477" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="755" y="1520"/>
       <point x="865" y="1484"/>
       <point x="946" y="1412" type="curve" smooth="yes"/>
       <point x="1027" y="1340"/>
       <point x="1067" y="1243"/>
-      <point x="1067" y="1120" type="curve" name="dh04" smooth="yes"/>
+      <point x="1067" y="1120" type="curve" smooth="yes" name="dh04"/>
       <point x="1067" y="1038"/>
       <point x="1048" y="970"/>
-      <point x="1009" y="915" type="curve" name="hr01" smooth="yes"/>
+      <point x="1009" y="915" type="curve" smooth="yes" name="hr01"/>
       <point x="970" y="859"/>
       <point x="914" y="818"/>
       <point x="840" y="791" type="curve" name="ih03"/>
@@ -46,7 +46,7 @@
       <point x="1034" y="655" type="curve" smooth="yes"/>
       <point x="1081" y="590"/>
       <point x="1104" y="514"/>
-      <point x="1104" y="414" type="curve" name="sh02" smooth="yes"/>
+      <point x="1104" y="414" type="curve" smooth="yes" name="sh02"/>
       <point x="1104" y="279"/>
       <point x="1062" y="167"/>
       <point x="977" y="88" type="curve" smooth="yes"/>
@@ -54,22 +54,22 @@
       <point x="772" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="903" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="903" type="curve" smooth="yes" name="dv03"/>
       <point x="675" y="903"/>
       <point x="721" y="920"/>
       <point x="755" y="955" type="curve" smooth="yes"/>
       <point x="788" y="990"/>
       <point x="805" y="1036"/>
-      <point x="805" y="1093" type="curve" name="dh03" smooth="yes"/>
+      <point x="805" y="1093" type="curve" smooth="yes" name="dh03"/>
       <point x="805" y="1152"/>
       <point x="788" y="1199"/>
       <point x="755" y="1232" type="curve" smooth="yes"/>
       <point x="724" y="1263"/>
       <point x="677" y="1282"/>
-      <point x="616" y="1282" type="curve" name="hr02" smooth="yes"/>
+      <point x="616" y="1282" type="curve" smooth="yes" name="hr02"/>
       <point x="501" y="1282"/>
       <point x="428" y="1209"/>
-      <point x="428" y="1093" type="curve" name="sh01" smooth="yes"/>
+      <point x="428" y="1093" type="curve" smooth="yes" name="sh01"/>
       <point x="428" y="1036"/>
       <point x="445" y="990"/>
       <point x="479" y="955" type="curve" smooth="yes"/>
@@ -77,25 +77,25 @@
       <point x="560" y="903"/>
     </contour>
     <contour>
-      <point x="616" y="209" type="curve" name="hr03" smooth="yes"/>
+      <point x="616" y="209" type="curve" smooth="yes" name="hr03"/>
       <point x="680" y="209"/>
       <point x="736" y="229"/>
       <point x="777" y="272" type="curve" smooth="yes"/>
       <point x="816" y="311"/>
       <point x="838" y="369"/>
-      <point x="838" y="440" type="curve" name="ih04" smooth="yes"/>
+      <point x="838" y="440" type="curve" smooth="yes" name="ih04"/>
       <point x="838" y="507"/>
       <point x="818" y="561"/>
       <point x="777" y="604" type="curve" smooth="yes"/>
       <point x="740" y="643"/>
       <point x="687" y="666"/>
-      <point x="616" y="666" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="666" type="curve" smooth="yes" name="dv02"/>
       <point x="552" y="666"/>
       <point x="497" y="647"/>
       <point x="456" y="604" type="curve" smooth="yes"/>
       <point x="415" y="563"/>
       <point x="395" y="508"/>
-      <point x="395" y="439" type="curve" name="dh02" smooth="yes"/>
+      <point x="395" y="439" type="curve" smooth="yes" name="dh02"/>
       <point x="395" y="371"/>
       <point x="415" y="314"/>
       <point x="456" y="271" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/eight.subs.glif b/source/Hack-Bold.ufo/glyphs/eight.subs.glif
index c91f250ee..4056b3c3b 100644
--- a/source/Hack-Bold.ufo/glyphs/eight.subs.glif
+++ b/source/Hack-Bold.ufo/glyphs/eight.subs.glif
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eight.subs" format="1">
+<glyph name="eight.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="617" y="-423" type="curve" name="ab01" smooth="yes"/>
+      <point x="617" y="-423" type="curve" smooth="yes" name="ab01"/>
       <point x="402" y="-423"/>
       <point x="282" y="-330"/>
-      <point x="282" y="-179" type="curve" name="dh01" smooth="yes"/>
+      <point x="282" y="-179" type="curve" smooth="yes" name="dh01"/>
       <point x="282" y="-68"/>
       <point x="347" y="5"/>
       <point x="466" y="36" type="curve" name="ih01"/>
       <point x="359" y="67"/>
       <point x="308" y="129"/>
-      <point x="308" y="221" type="curve" name="sh01" smooth="yes"/>
+      <point x="308" y="221" type="curve" smooth="yes" name="sh01"/>
       <point x="308" y="359"/>
       <point x="426" y="444"/>
-      <point x="615" y="444" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="444" type="curve" smooth="yes" name="dv02"/>
       <point x="807" y="444"/>
       <point x="924" y="357"/>
-      <point x="924" y="221" type="curve" name="dh04" smooth="yes"/>
+      <point x="924" y="221" type="curve" smooth="yes" name="dh04"/>
       <point x="924" y="129"/>
       <point x="870" y="67"/>
       <point x="769" y="36" type="curve" name="ih02"/>
       <point x="882" y="7"/>
       <point x="949" y="-63"/>
-      <point x="949" y="-179" type="curve" name="sh02" smooth="yes"/>
+      <point x="949" y="-179" type="curve" smooth="yes" name="sh02"/>
       <point x="949" y="-332"/>
       <point x="830" y="-423"/>
     </contour>
     <contour>
-      <point x="616" y="99" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="99" type="curve" smooth="yes" name="dv04"/>
       <point x="696" y="99"/>
       <point x="745" y="141"/>
-      <point x="745" y="206" type="curve" name="dh03" smooth="yes"/>
+      <point x="745" y="206" type="curve" smooth="yes" name="dh03"/>
       <point x="745" y="271"/>
       <point x="696" y="311"/>
-      <point x="616" y="311" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="311" type="curve" smooth="yes" name="dv01"/>
       <point x="536" y="311"/>
       <point x="487" y="270"/>
-      <point x="487" y="206" type="curve" name="dh02" smooth="yes"/>
+      <point x="487" y="206" type="curve" smooth="yes" name="dh02"/>
       <point x="487" y="141"/>
       <point x="536" y="99"/>
     </contour>
     <contour>
-      <point x="615" y="-290" type="curve" name="sv01" smooth="yes"/>
+      <point x="615" y="-290" type="curve" smooth="yes" name="sv01"/>
       <point x="706" y="-290"/>
       <point x="767" y="-240"/>
       <point x="767" y="-161" type="curve" smooth="yes"/>
       <point x="767" y="-120"/>
       <point x="750" y="-89"/>
-      <point x="726" y="-69" type="curve" name="hr01" smooth="yes"/>
+      <point x="726" y="-69" type="curve" smooth="yes" name="hr01"/>
       <point x="699" y="-46"/>
       <point x="663" y="-35"/>
-      <point x="618" y="-35" type="curve" name="dv03" smooth="yes"/>
+      <point x="618" y="-35" type="curve" smooth="yes" name="dv03"/>
       <point x="525" y="-35"/>
       <point x="464" y="-85"/>
       <point x="464" y="-162" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/element.glif b/source/Hack-Bold.ufo/glyphs/element.glif
index 2c832dab4..c698a1d01 100644
--- a/source/Hack-Bold.ufo/glyphs/element.glif
+++ b/source/Hack-Bold.ufo/glyphs/element.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="element" format="1">
+<glyph name="element" format="2">
   <advance width="1233"/>
   <unicode hex="2208"/>
   <outline>
     <contour>
-      <point x="636" y="0" type="line" name="hr00" smooth="yes"/>
+      <point x="636" y="0" type="line" smooth="yes" name="hr00"/>
       <point x="442" y="0"/>
       <point x="268" y="146"/>
       <point x="172" y="380" type="curve" smooth="yes"/>
@@ -34,7 +34,7 @@
       <point x="483" y="301" type="curve" smooth="yes"/>
       <point x="530" y="254"/>
       <point x="581" y="230"/>
-      <point x="636" y="230" type="curve" name="sv01" smooth="yes"/>
+      <point x="636" y="230" type="curve" smooth="yes" name="sv01"/>
       <point x="1133" y="230" type="line" name="sv02"/>
       <point x="1133" y="0" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/ellipsis.glif b/source/Hack-Bold.ufo/glyphs/ellipsis.glif
index c19cd2a67..355bdf70b 100644
--- a/source/Hack-Bold.ufo/glyphs/ellipsis.glif
+++ b/source/Hack-Bold.ufo/glyphs/ellipsis.glif
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ellipsis" format="1">
+<glyph name="ellipsis" format="2">
   <advance width="1233"/>
   <unicode hex="2026"/>
   <outline>
     <contour>
-      <point x="87" y="0" type="line" name="hr00" smooth="yes"/>
+      <point x="87" y="0" type="line" smooth="yes" name="hr00"/>
       <point x="67" y="0"/>
       <point x="57" y="10"/>
-      <point x="57" y="30" type="curve" name="sh01" smooth="yes"/>
+      <point x="57" y="30" type="curve" smooth="yes" name="sh01"/>
       <point x="57" y="337" type="line" smooth="yes"/>
       <point x="57" y="357"/>
       <point x="67" y="367"/>
-      <point x="87" y="367" type="curve" name="sv01" smooth="yes"/>
-      <point x="322" y="367" type="line" name="sv02" smooth="yes"/>
+      <point x="87" y="367" type="curve" smooth="yes" name="sv01"/>
+      <point x="322" y="367" type="line" smooth="yes" name="sv02"/>
       <point x="342" y="367"/>
       <point x="352" y="357"/>
       <point x="352" y="337" type="curve" smooth="yes"/>
-      <point x="352" y="30" type="line" name="sh02" smooth="yes"/>
+      <point x="352" y="30" type="line" smooth="yes" name="sh02"/>
       <point x="352" y="10"/>
       <point x="342" y="0"/>
       <point x="322" y="0" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="499" y="0" type="line" name="ab01" smooth="yes"/>
+      <point x="499" y="0" type="line" smooth="yes" name="ab01"/>
       <point x="479" y="0"/>
       <point x="469" y="10"/>
-      <point x="469" y="30" type="curve" name="sh03" smooth="yes"/>
+      <point x="469" y="30" type="curve" smooth="yes" name="sh03"/>
       <point x="469" y="337" type="line" smooth="yes"/>
       <point x="469" y="357"/>
       <point x="479" y="367"/>
-      <point x="499" y="367" type="curve" name="sv03" smooth="yes"/>
-      <point x="734" y="367" type="line" name="sv04" smooth="yes"/>
+      <point x="499" y="367" type="curve" smooth="yes" name="sv03"/>
+      <point x="734" y="367" type="line" smooth="yes" name="sv04"/>
       <point x="754" y="367"/>
       <point x="764" y="357"/>
       <point x="764" y="337" type="curve" smooth="yes"/>
-      <point x="764" y="30" type="line" name="sh04" smooth="yes"/>
+      <point x="764" y="30" type="line" smooth="yes" name="sh04"/>
       <point x="764" y="10"/>
       <point x="754" y="0"/>
       <point x="734" y="0" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="911" y="0" type="line" name="ab02" smooth="yes"/>
+      <point x="911" y="0" type="line" smooth="yes" name="ab02"/>
       <point x="891" y="0"/>
       <point x="881" y="10"/>
-      <point x="881" y="30" type="curve" name="sh05" smooth="yes"/>
+      <point x="881" y="30" type="curve" smooth="yes" name="sh05"/>
       <point x="881" y="337" type="line" smooth="yes"/>
       <point x="881" y="357"/>
       <point x="891" y="367"/>
-      <point x="911" y="367" type="curve" name="sv05" smooth="yes"/>
-      <point x="1146" y="367" type="line" name="sv06" smooth="yes"/>
+      <point x="911" y="367" type="curve" smooth="yes" name="sv05"/>
+      <point x="1146" y="367" type="line" smooth="yes" name="sv06"/>
       <point x="1166" y="367"/>
       <point x="1176" y="357"/>
       <point x="1176" y="337" type="curve" smooth="yes"/>
-      <point x="1176" y="30" type="line" name="sh06" smooth="yes"/>
+      <point x="1176" y="30" type="line" smooth="yes" name="sh06"/>
       <point x="1176" y="10"/>
       <point x="1166" y="0"/>
       <point x="1146" y="0" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/emacron.glif b/source/Hack-Bold.ufo/glyphs/emacron.glif
index 20ef78b00..454c4f411 100644
--- a/source/Hack-Bold.ufo/glyphs/emacron.glif
+++ b/source/Hack-Bold.ufo/glyphs/emacron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="emacron" format="1">
+<glyph name="emacron" format="2">
   <advance width="1233"/>
   <unicode hex="0113"/>
   <outline>
@@ -10,21 +10,21 @@
       <point x="330" y="1347" type="line"/>
     </contour>
     <contour>
-      <point x="669" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="669" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="283" y="-29"/>
       <point x="82" y="178"/>
-      <point x="82" y="550" type="curve" name="sh01" smooth="yes"/>
+      <point x="82" y="550" type="curve" smooth="yes" name="sh01"/>
       <point x="82" y="920"/>
       <point x="281" y="1147"/>
-      <point x="621" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="621" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="944" y="1147"/>
       <point x="1139" y="940"/>
-      <point x="1139" y="584" type="curve" name="sh02" smooth="yes"/>
+      <point x="1139" y="584" type="curve" smooth="yes" name="sh02"/>
       <point x="1139" y="465" type="line"/>
       <point x="380" y="465" type="line" name="sh03"/>
       <point x="381" y="290"/>
       <point x="483" y="203"/>
-      <point x="688" y="203" type="curve" name="dv02" smooth="yes"/>
+      <point x="688" y="203" type="curve" smooth="yes" name="dv02"/>
       <point x="824" y="203"/>
       <point x="948" y="240"/>
       <point x="1092" y="324" type="curve" name="ih01"/>
@@ -36,7 +36,7 @@
       <point x="844" y="685" type="line" name="ah01"/>
       <point x="841" y="840"/>
       <point x="761" y="920"/>
-      <point x="620" y="920" type="curve" name="sv01" smooth="yes"/>
+      <point x="620" y="920" type="curve" smooth="yes" name="sv01"/>
       <point x="476" y="920"/>
       <point x="399" y="837"/>
       <point x="383" y="684" type="curve" name="sh04"/>
diff --git a/source/Hack-Bold.ufo/glyphs/emdash.glif b/source/Hack-Bold.ufo/glyphs/emdash.glif
index 3ad5266f7..48dafa498 100644
--- a/source/Hack-Bold.ufo/glyphs/emdash.glif
+++ b/source/Hack-Bold.ufo/glyphs/emdash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="emdash" format="1">
+<glyph name="emdash" format="2">
   <advance width="1233"/>
   <unicode hex="2014"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/emptyset.glif b/source/Hack-Bold.ufo/glyphs/emptyset.glif
index daf5bda0c..470d4d56b 100644
--- a/source/Hack-Bold.ufo/glyphs/emptyset.glif
+++ b/source/Hack-Bold.ufo/glyphs/emptyset.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="emptyset" format="1">
+<glyph name="emptyset" format="2">
   <advance width="1233"/>
   <unicode hex="2205"/>
   <outline>
@@ -8,13 +8,13 @@
       <point x="183" y="327" type="line"/>
       <point x="130" y="396"/>
       <point x="80" y="497"/>
-      <point x="80" y="642" type="curve" name="sh01" smooth="yes"/>
+      <point x="80" y="642" type="curve" smooth="yes" name="sh01"/>
       <point x="80" y="791"/>
       <point x="132" y="918"/>
       <point x="237" y="1023" type="curve" smooth="yes"/>
       <point x="343" y="1129"/>
       <point x="470" y="1182"/>
-      <point x="618" y="1182" type="curve" name="av01" smooth="yes"/>
+      <point x="618" y="1182" type="curve" smooth="yes" name="av01"/>
       <point x="764" y="1182"/>
       <point x="864" y="1130"/>
       <point x="933" y="1077" type="curve"/>
@@ -23,13 +23,13 @@
       <point x="1052" y="958" type="line"/>
       <point x="1102" y="889"/>
       <point x="1153" y="790"/>
-      <point x="1153" y="644" type="curve" name="sh02" smooth="yes"/>
+      <point x="1153" y="644" type="curve" smooth="yes" name="sh02"/>
       <point x="1153" y="495"/>
       <point x="1101" y="369"/>
       <point x="996" y="264" type="curve" smooth="yes"/>
       <point x="896" y="164"/>
       <point x="770" y="106"/>
-      <point x="615" y="106" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="106" type="curve" smooth="yes" name="dv01"/>
       <point x="470" y="106"/>
       <point x="369" y="157"/>
       <point x="302" y="208" type="curve"/>
@@ -39,16 +39,16 @@
       <point x="810" y="953" type="line"/>
       <point x="793" y="964"/>
       <point x="775" y="974"/>
-      <point x="756" y="982" type="curve" name="hr01" smooth="yes"/>
+      <point x="756" y="982" type="curve" smooth="yes" name="hr01"/>
       <point x="713" y="1000"/>
       <point x="667" y="1009"/>
-      <point x="618" y="1009" type="curve" name="sv01" smooth="yes"/>
+      <point x="618" y="1009" type="curve" smooth="yes" name="sv01"/>
       <point x="513" y="1009"/>
       <point x="421" y="965"/>
-      <point x="358" y="902" type="curve" name="hr02" smooth="yes"/>
+      <point x="358" y="902" type="curve" smooth="yes" name="hr02"/>
       <point x="286" y="830"/>
       <point x="252" y="737"/>
-      <point x="252" y="641" type="curve" name="sh03" smooth="yes"/>
+      <point x="252" y="641" type="curve" smooth="yes" name="sh03"/>
       <point x="252" y="592"/>
       <point x="261" y="547"/>
       <point x="279" y="504" type="curve"/>
@@ -57,16 +57,16 @@
       <point x="307" y="451" type="curve"/>
     </contour>
     <contour>
-      <point x="617" y="278" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="278" type="curve" smooth="yes" name="dv02"/>
       <point x="716" y="278"/>
       <point x="802" y="314"/>
       <point x="874" y="386" type="curve" smooth="yes"/>
       <point x="945" y="457"/>
       <point x="981" y="543"/>
-      <point x="981" y="643" type="curve" name="ah01" smooth="yes"/>
+      <point x="981" y="643" type="curve" smooth="yes" name="ah01"/>
       <point x="981" y="693"/>
       <point x="972" y="740"/>
-      <point x="954" y="783" type="curve" name="hr03" smooth="yes"/>
+      <point x="954" y="783" type="curve" smooth="yes" name="hr03"/>
       <point x="947" y="800"/>
       <point x="939" y="817"/>
       <point x="928" y="834" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/endash.glif b/source/Hack-Bold.ufo/glyphs/endash.glif
index bf2a1227e..c2abe3210 100644
--- a/source/Hack-Bold.ufo/glyphs/endash.glif
+++ b/source/Hack-Bold.ufo/glyphs/endash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="endash" format="1">
+<glyph name="endash" format="2">
   <advance width="1233"/>
   <unicode hex="2013"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/eng.glif b/source/Hack-Bold.ufo/glyphs/eng.glif
index e3caef90d..8fb9c05d7 100644
--- a/source/Hack-Bold.ufo/glyphs/eng.glif
+++ b/source/Hack-Bold.ufo/glyphs/eng.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eng" format="1">
+<glyph name="eng" format="2">
   <advance width="1233"/>
   <unicode hex="014B"/>
   <outline>
@@ -8,11 +8,11 @@
       <point x="598" y="-199" type="line" smooth="yes"/>
       <point x="731" y="-199"/>
       <point x="780" y="-133"/>
-      <point x="780" y="43" type="curve" name="sh01" smooth="yes"/>
+      <point x="780" y="43" type="curve" smooth="yes" name="sh01"/>
       <point x="780" y="682" type="line" smooth="yes"/>
       <point x="780" y="839"/>
       <point x="737" y="909"/>
-      <point x="640" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="640" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="523" y="909"/>
       <point x="463" y="810"/>
       <point x="463" y="641" type="curve" smooth="yes"/>
@@ -23,14 +23,14 @@
       <point x="463" y="952" type="line" name="sh02"/>
       <point x="506" y="1081"/>
       <point x="610" y="1147"/>
-      <point x="753" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="753" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="961" y="1147"/>
       <point x="1071" y="1008"/>
       <point x="1071" y="727" type="curve" smooth="yes"/>
-      <point x="1071" y="43" type="line" name="dh03" smooth="yes"/>
+      <point x="1071" y="43" type="line" smooth="yes" name="dh03"/>
       <point x="1071" y="-293"/>
       <point x="960" y="-424"/>
-      <point x="680" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="680" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="559" y="-424" type="line" name="hr02"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/eogonek.glif b/source/Hack-Bold.ufo/glyphs/eogonek.glif
index 2a020effe..66d9a3977 100644
--- a/source/Hack-Bold.ufo/glyphs/eogonek.glif
+++ b/source/Hack-Bold.ufo/glyphs/eogonek.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eogonek" format="1">
+<glyph name="eogonek" format="2">
   <advance width="1233"/>
   <unicode hex="0119"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="380" y="465" type="line" name="dh02"/>
       <point x="381" y="290"/>
       <point x="483" y="203"/>
-      <point x="688" y="203" type="curve" name="dv04" smooth="yes"/>
+      <point x="688" y="203" type="curve" smooth="yes" name="dv04"/>
       <point x="824" y="203"/>
       <point x="948" y="240"/>
       <point x="1092" y="324" type="curve" name="ih01"/>
@@ -21,41 +21,41 @@
       <point x="848" y="-106" type="curve" smooth="yes"/>
       <point x="835" y="-130"/>
       <point x="829" y="-147"/>
-      <point x="829" y="-166" type="curve" name="dh04" smooth="yes"/>
+      <point x="829" y="-166" type="curve" smooth="yes" name="dh04"/>
       <point x="829" y="-213"/>
       <point x="864" y="-254"/>
-      <point x="947" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="947" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="988" y="-254"/>
       <point x="1042" y="-244"/>
       <point x="1095" y="-223" type="curve" name="sh02"/>
       <point x="1095" y="-379" type="line"/>
       <point x="1023" y="-394"/>
       <point x="959" y="-401"/>
-      <point x="908" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="908" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="752" y="-401"/>
       <point x="667" y="-339"/>
-      <point x="667" y="-224" type="curve" name="dh03" smooth="yes"/>
+      <point x="667" y="-224" type="curve" smooth="yes" name="dh03"/>
       <point x="667" y="-159"/>
       <point x="695" y="-97"/>
       <point x="755" y="-26" type="curve" name="ih02"/>
       <point x="727" y="-28"/>
       <point x="698" y="-29"/>
-      <point x="669" y="-29" type="curve" name="dv03" smooth="yes"/>
+      <point x="669" y="-29" type="curve" smooth="yes" name="dv03"/>
       <point x="283" y="-29"/>
       <point x="82" y="178"/>
-      <point x="82" y="550" type="curve" name="dh01" smooth="yes"/>
+      <point x="82" y="550" type="curve" smooth="yes" name="dh01"/>
       <point x="82" y="920"/>
       <point x="281" y="1147"/>
-      <point x="621" y="1147" type="curve" name="hr01" smooth="yes"/>
+      <point x="621" y="1147" type="curve" smooth="yes" name="hr01"/>
       <point x="944" y="1147"/>
       <point x="1139" y="940"/>
-      <point x="1139" y="584" type="curve" name="dh06" smooth="yes"/>
+      <point x="1139" y="584" type="curve" smooth="yes" name="dh06"/>
     </contour>
     <contour>
       <point x="844" y="685" type="line" name="dh05"/>
       <point x="841" y="840"/>
       <point x="761" y="920"/>
-      <point x="620" y="920" type="curve" name="sv01" smooth="yes"/>
+      <point x="620" y="920" type="curve" smooth="yes" name="sv01"/>
       <point x="476" y="920"/>
       <point x="399" y="837"/>
       <point x="383" y="684" type="curve" name="hr02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/epsilon.glif b/source/Hack-Bold.ufo/glyphs/epsilon.glif
index fe419eb68..0a667c054 100644
--- a/source/Hack-Bold.ufo/glyphs/epsilon.glif
+++ b/source/Hack-Bold.ufo/glyphs/epsilon.glif
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="epsilon" format="1">
+<glyph name="epsilon" format="2">
   <advance width="1233"/>
   <unicode hex="03B5"/>
   <outline>
     <contour>
-      <point x="672" y="-22" type="curve" name="ab01" smooth="yes"/>
+      <point x="672" y="-22" type="curve" smooth="yes" name="ab01"/>
       <point x="324" y="-22"/>
       <point x="149" y="94"/>
-      <point x="149" y="309" type="curve" name="dh01" smooth="yes"/>
+      <point x="149" y="309" type="curve" smooth="yes" name="dh01"/>
       <point x="149" y="474"/>
       <point x="254" y="575"/>
       <point x="461" y="604" type="curve" name="iv01"/>
       <point x="276" y="631"/>
       <point x="182" y="717"/>
-      <point x="182" y="853" type="curve" name="ih01" smooth="yes"/>
+      <point x="182" y="853" type="curve" smooth="yes" name="ih01"/>
       <point x="182" y="1030"/>
       <point x="347" y="1140"/>
-      <point x="683" y="1140" type="curve" name="at01" smooth="yes"/>
+      <point x="683" y="1140" type="curve" smooth="yes" name="at01"/>
       <point x="795" y="1140"/>
       <point x="857" y="1127"/>
       <point x="1002" y="1092" type="curve"/>
       <point x="1002" y="877" type="line" name="iv02"/>
       <point x="861" y="922"/>
       <point x="771" y="938"/>
-      <point x="685" y="938" type="curve" name="sv01" smooth="yes"/>
+      <point x="685" y="938" type="curve" smooth="yes" name="sv01"/>
       <point x="532" y="938"/>
       <point x="453" y="887"/>
-      <point x="453" y="822" type="curve" name="sh01" smooth="yes"/>
+      <point x="453" y="822" type="curve" smooth="yes" name="sh01"/>
       <point x="453" y="757"/>
       <point x="532" y="710"/>
-      <point x="672" y="710" type="curve" name="hr01" smooth="yes"/>
+      <point x="672" y="710" type="curve" smooth="yes" name="hr01"/>
       <point x="823" y="710" type="line" name="dv02"/>
       <point x="823" y="487" type="line" name="dv01"/>
       <point x="672" y="487" type="line" smooth="yes"/>
       <point x="510" y="487"/>
       <point x="418" y="413"/>
-      <point x="418" y="325" type="curve" name="dh02" smooth="yes"/>
+      <point x="418" y="325" type="curve" smooth="yes" name="dh02"/>
       <point x="418" y="244"/>
       <point x="493" y="181"/>
-      <point x="713" y="181" type="curve" name="sv02" smooth="yes"/>
+      <point x="713" y="181" type="curve" smooth="yes" name="sv02"/>
       <point x="820" y="181"/>
       <point x="903" y="197"/>
       <point x="1045" y="253" type="curve" name="iv03"/>
diff --git a/source/Hack-Bold.ufo/glyphs/epsilontonos.glif b/source/Hack-Bold.ufo/glyphs/epsilontonos.glif
index 0f2514aca..18d09218b 100644
--- a/source/Hack-Bold.ufo/glyphs/epsilontonos.glif
+++ b/source/Hack-Bold.ufo/glyphs/epsilontonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="epsilontonos" format="1">
+<glyph name="epsilontonos" format="2">
   <advance width="1233"/>
   <unicode hex="03AD"/>
   <outline>
@@ -10,41 +10,41 @@
       <point x="469" y="1290" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="672" y="-22" type="curve" name="ab01" smooth="yes"/>
+      <point x="672" y="-22" type="curve" smooth="yes" name="ab01"/>
       <point x="324" y="-22"/>
       <point x="149" y="94"/>
-      <point x="149" y="309" type="curve" name="dh01" smooth="yes"/>
+      <point x="149" y="309" type="curve" smooth="yes" name="dh01"/>
       <point x="149" y="474"/>
       <point x="254" y="575"/>
       <point x="461" y="604" type="curve" name="iv02"/>
       <point x="276" y="631"/>
       <point x="182" y="717"/>
-      <point x="182" y="853" type="curve" name="ih01" smooth="yes"/>
+      <point x="182" y="853" type="curve" smooth="yes" name="ih01"/>
       <point x="182" y="1030"/>
       <point x="347" y="1140"/>
-      <point x="683" y="1140" type="curve" name="at01" smooth="yes"/>
+      <point x="683" y="1140" type="curve" smooth="yes" name="at01"/>
       <point x="795" y="1140"/>
       <point x="857" y="1127"/>
       <point x="1002" y="1092" type="curve" name="hr01"/>
       <point x="1002" y="877" type="line" name="iv03"/>
       <point x="861" y="922"/>
       <point x="771" y="938"/>
-      <point x="685" y="938" type="curve" name="sv01" smooth="yes"/>
+      <point x="685" y="938" type="curve" smooth="yes" name="sv01"/>
       <point x="532" y="938"/>
       <point x="453" y="887"/>
-      <point x="453" y="822" type="curve" name="sh01" smooth="yes"/>
+      <point x="453" y="822" type="curve" smooth="yes" name="sh01"/>
       <point x="453" y="757"/>
       <point x="532" y="710"/>
       <point x="672" y="710" type="curve" smooth="yes"/>
       <point x="823" y="710" type="line" name="dv02"/>
       <point x="823" y="487" type="line" name="dv01"/>
-      <point x="672" y="487" type="line" name="hr02" smooth="yes"/>
+      <point x="672" y="487" type="line" smooth="yes" name="hr02"/>
       <point x="510" y="487"/>
       <point x="418" y="413"/>
-      <point x="418" y="325" type="curve" name="dh02" smooth="yes"/>
+      <point x="418" y="325" type="curve" smooth="yes" name="dh02"/>
       <point x="418" y="244"/>
       <point x="493" y="181"/>
-      <point x="713" y="181" type="curve" name="sv02" smooth="yes"/>
+      <point x="713" y="181" type="curve" smooth="yes" name="sv02"/>
       <point x="820" y="181"/>
       <point x="903" y="197"/>
       <point x="1045" y="253" type="curve" name="iv04"/>
diff --git a/source/Hack-Bold.ufo/glyphs/equal.glif b/source/Hack-Bold.ufo/glyphs/equal.glif
index 7358e6688..17a3441ac 100644
--- a/source/Hack-Bold.ufo/glyphs/equal.glif
+++ b/source/Hack-Bold.ufo/glyphs/equal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="equal" format="1">
+<glyph name="equal" format="2">
   <advance width="1233"/>
   <unicode hex="003D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/equivalence.glif b/source/Hack-Bold.ufo/glyphs/equivalence.glif
index 0524ffd24..a89aebdca 100644
--- a/source/Hack-Bold.ufo/glyphs/equivalence.glif
+++ b/source/Hack-Bold.ufo/glyphs/equivalence.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="equivalence" format="1">
+<glyph name="equivalence" format="2">
   <advance width="1233"/>
   <unicode hex="2261"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/eta.glif b/source/Hack-Bold.ufo/glyphs/eta.glif
index 776922568..68829645c 100644
--- a/source/Hack-Bold.ufo/glyphs/eta.glif
+++ b/source/Hack-Bold.ufo/glyphs/eta.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eta" format="1">
+<glyph name="eta" format="2">
   <advance width="1233"/>
   <unicode hex="03B7"/>
   <outline>
     <contour>
-      <point x="780" y="682" type="line" name="ah01" smooth="yes"/>
+      <point x="780" y="682" type="line" smooth="yes" name="ah01"/>
       <point x="780" y="839"/>
       <point x="737" y="909"/>
-      <point x="640" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="640" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="523" y="909"/>
       <point x="463" y="810"/>
       <point x="463" y="641" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="463" y="952" type="line" name="sh03"/>
       <point x="506" y="1081"/>
       <point x="610" y="1147"/>
-      <point x="753" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="753" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="961" y="1147"/>
       <point x="1071" y="1008"/>
-      <point x="1071" y="727" type="curve" name="sh04" smooth="yes"/>
+      <point x="1071" y="727" type="curve" smooth="yes" name="sh04"/>
       <point x="1071" y="-426" type="line" name="ab01"/>
       <point x="780" y="-426" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/etatonos.glif b/source/Hack-Bold.ufo/glyphs/etatonos.glif
index 633b72f45..00a60df33 100644
--- a/source/Hack-Bold.ufo/glyphs/etatonos.glif
+++ b/source/Hack-Bold.ufo/glyphs/etatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="etatonos" format="1">
+<glyph name="etatonos" format="2">
   <advance width="1233"/>
   <unicode hex="03AE"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="469" y="1297" type="line" name="sh04"/>
     </contour>
     <contour>
-      <point x="780" y="682" type="line" name="ah01" smooth="yes"/>
+      <point x="780" y="682" type="line" smooth="yes" name="ah01"/>
       <point x="780" y="839"/>
       <point x="737" y="909"/>
-      <point x="640" y="909" type="curve" name="hr01" smooth="yes"/>
+      <point x="640" y="909" type="curve" smooth="yes" name="hr01"/>
       <point x="523" y="909"/>
       <point x="463" y="810"/>
       <point x="463" y="641" type="curve" smooth="yes"/>
@@ -24,10 +24,10 @@
       <point x="463" y="952" type="line" name="sh05"/>
       <point x="506" y="1081"/>
       <point x="610" y="1147"/>
-      <point x="753" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="753" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="961" y="1147"/>
       <point x="1071" y="1008"/>
-      <point x="1071" y="727" type="curve" name="sh01" smooth="yes"/>
+      <point x="1071" y="727" type="curve" smooth="yes" name="sh01"/>
       <point x="1071" y="-426" type="line" name="ab01"/>
       <point x="780" y="-426" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/eth.glif b/source/Hack-Bold.ufo/glyphs/eth.glif
index 8cdfe6df1..448f936a6 100644
--- a/source/Hack-Bold.ufo/glyphs/eth.glif
+++ b/source/Hack-Bold.ufo/glyphs/eth.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eth" format="1">
+<glyph name="eth" format="2">
   <advance width="1233"/>
   <unicode hex="00F0"/>
   <outline>
     <contour>
-      <point x="613" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="613" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="446" y="-29"/>
       <point x="321" y="29"/>
       <point x="236" y="124" type="curve" smooth="yes"/>
       <point x="144" y="227"/>
       <point x="98" y="367"/>
-      <point x="98" y="534" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="534" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="693"/>
       <point x="141" y="820"/>
       <point x="227" y="913" type="curve" smooth="yes"/>
       <point x="308" y="1001"/>
       <point x="425" y="1053"/>
-      <point x="574" y="1053" type="curve" name="dv03" smooth="yes"/>
+      <point x="574" y="1053" type="curve" smooth="yes" name="dv03"/>
       <point x="629" y="1053"/>
       <point x="670" y="1045"/>
       <point x="705" y="1028" type="curve" name="ih01"/>
@@ -36,21 +36,21 @@
       <point x="1083" y="837" type="curve" smooth="yes"/>
       <point x="1112" y="753"/>
       <point x="1126" y="660"/>
-      <point x="1126" y="559" type="curve" name="sh02" smooth="yes"/>
+      <point x="1126" y="559" type="curve" smooth="yes" name="sh02"/>
       <point x="1126" y="192"/>
       <point x="936" y="-29"/>
     </contour>
     <contour>
-      <point x="613" y="209" type="curve" name="dv01" smooth="yes"/>
+      <point x="613" y="209" type="curve" smooth="yes" name="dv01"/>
       <point x="689" y="209"/>
       <point x="744" y="244"/>
       <point x="779" y="300" type="curve" smooth="yes"/>
       <point x="818" y="360"/>
       <point x="836" y="451"/>
-      <point x="836" y="556" type="curve" name="ah01" smooth="yes"/>
+      <point x="836" y="556" type="curve" smooth="yes" name="ah01"/>
       <point x="836" y="591"/>
       <point x="834" y="628"/>
-      <point x="830" y="657" type="curve" name="sh04" smooth="yes"/>
+      <point x="830" y="657" type="curve" smooth="yes" name="sh04"/>
       <point x="827" y="680"/>
       <point x="819" y="724"/>
       <point x="811" y="760" type="curve"/>
@@ -59,13 +59,13 @@
       <point x="713" y="801" type="curve" smooth="yes"/>
       <point x="679" y="810"/>
       <point x="647" y="815"/>
-      <point x="617" y="815" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="815" type="curve" smooth="yes" name="dv02"/>
       <point x="548" y="815"/>
       <point x="489" y="790"/>
       <point x="449" y="743" type="curve" smooth="yes"/>
       <point x="410" y="696"/>
       <point x="389" y="630"/>
-      <point x="389" y="535" type="curve" name="sh03" smooth="yes"/>
+      <point x="389" y="535" type="curve" smooth="yes" name="sh03"/>
       <point x="389" y="439"/>
       <point x="410" y="355"/>
       <point x="449" y="298" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/exclam.glif b/source/Hack-Bold.ufo/glyphs/exclam.glif
index 63ba8789d..08f89dcc8 100644
--- a/source/Hack-Bold.ufo/glyphs/exclam.glif
+++ b/source/Hack-Bold.ufo/glyphs/exclam.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="exclam" format="1">
+<glyph name="exclam" format="2">
   <advance width="1233"/>
   <unicode hex="0021"/>
   <outline>
@@ -12,13 +12,13 @@
       <point x="548" y="476" type="line"/>
     </contour>
     <contour>
-      <point x="615" y="-72" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="-72" type="curve" smooth="yes" name="dv01"/>
       <point x="564" y="-72"/>
       <point x="522" y="-52"/>
       <point x="491" y="-21" type="curve" smooth="yes"/>
       <point x="458" y="12"/>
       <point x="441" y="57"/>
-      <point x="441" y="113" type="curve" name="dh01" smooth="yes"/>
+      <point x="441" y="113" type="curve" smooth="yes" name="dh01"/>
       <point x="441" y="168"/>
       <point x="458" y="211"/>
       <point x="491" y="244" type="curve" smooth="yes"/>
@@ -34,19 +34,19 @@
       <point x="586" y="294" type="line" smooth="yes"/>
       <point x="594" y="295"/>
       <point x="606" y="296"/>
-      <point x="617" y="296" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="296" type="curve" smooth="yes" name="dv02"/>
       <point x="662" y="296"/>
       <point x="708" y="278"/>
       <point x="740" y="245" type="curve" smooth="yes"/>
       <point x="773" y="212"/>
       <point x="789" y="167"/>
-      <point x="789" y="112" type="curve" name="dh02" smooth="yes"/>
+      <point x="789" y="112" type="curve" smooth="yes" name="dh02"/>
       <point x="789" y="96"/>
       <point x="787" y="80"/>
       <point x="784" y="63" type="curve" smooth="yes"/>
       <point x="781" y="46"/>
       <point x="778" y="37"/>
-      <point x="767" y="18" type="curve" name="hr01" smooth="yes"/>
+      <point x="767" y="18" type="curve" smooth="yes" name="hr01"/>
       <point x="759" y="3"/>
       <point x="755" y="-3"/>
       <point x="739" y="-20" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/exclamdbl.glif b/source/Hack-Bold.ufo/glyphs/exclamdbl.glif
index f33ff2173..1af9db9db 100644
--- a/source/Hack-Bold.ufo/glyphs/exclamdbl.glif
+++ b/source/Hack-Bold.ufo/glyphs/exclamdbl.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="exclamdbl" format="1">
+<glyph name="exclamdbl" format="2">
   <advance width="1233"/>
   <unicode hex="203C"/>
   <outline>
@@ -20,13 +20,13 @@
       <point x="826" y="481" type="line"/>
     </contour>
     <contour>
-      <point x="308" y="-72" type="curve" name="dv01" smooth="yes"/>
+      <point x="308" y="-72" type="curve" smooth="yes" name="dv01"/>
       <point x="257" y="-72"/>
       <point x="215" y="-52"/>
       <point x="184" y="-21" type="curve" smooth="yes"/>
       <point x="151" y="12"/>
       <point x="134" y="57"/>
-      <point x="134" y="113" type="curve" name="dh01" smooth="yes"/>
+      <point x="134" y="113" type="curve" smooth="yes" name="dh01"/>
       <point x="134" y="168"/>
       <point x="151" y="211"/>
       <point x="184" y="244" type="curve" smooth="yes"/>
@@ -42,13 +42,13 @@
       <point x="279" y="294" type="line" smooth="yes"/>
       <point x="287" y="295"/>
       <point x="299" y="296"/>
-      <point x="310" y="296" type="curve" name="dv02" smooth="yes"/>
+      <point x="310" y="296" type="curve" smooth="yes" name="dv02"/>
       <point x="355" y="296"/>
       <point x="401" y="278"/>
       <point x="433" y="245" type="curve" smooth="yes"/>
       <point x="466" y="212"/>
       <point x="482" y="167"/>
-      <point x="482" y="112" type="curve" name="dh02" smooth="yes"/>
+      <point x="482" y="112" type="curve" smooth="yes" name="dh02"/>
       <point x="482" y="96"/>
       <point x="480" y="80"/>
       <point x="477" y="63" type="curve" smooth="yes"/>
@@ -65,13 +65,13 @@
       <point x="331" y="-72"/>
     </contour>
     <contour>
-      <point x="928" y="-72" type="curve" name="sv01" smooth="yes"/>
+      <point x="928" y="-72" type="curve" smooth="yes" name="sv01"/>
       <point x="877" y="-72"/>
       <point x="835" y="-52"/>
       <point x="804" y="-21" type="curve" smooth="yes"/>
       <point x="771" y="12"/>
       <point x="754" y="57"/>
-      <point x="754" y="113" type="curve" name="dh03" smooth="yes"/>
+      <point x="754" y="113" type="curve" smooth="yes" name="dh03"/>
       <point x="754" y="168"/>
       <point x="771" y="211"/>
       <point x="804" y="244" type="curve" smooth="yes"/>
@@ -84,16 +84,16 @@
       <point x="851" y="279"/>
       <point x="865" y="285"/>
       <point x="873" y="288" type="curve"/>
-      <point x="899" y="294" type="line" name="hr01" smooth="yes"/>
+      <point x="899" y="294" type="line" smooth="yes" name="hr01"/>
       <point x="907" y="295"/>
       <point x="919" y="296"/>
-      <point x="930" y="296" type="curve" name="sv02" smooth="yes"/>
+      <point x="930" y="296" type="curve" smooth="yes" name="sv02"/>
       <point x="975" y="296"/>
       <point x="1021" y="278"/>
       <point x="1053" y="245" type="curve" smooth="yes"/>
       <point x="1086" y="212"/>
       <point x="1102" y="167"/>
-      <point x="1102" y="112" type="curve" name="dh04" smooth="yes"/>
+      <point x="1102" y="112" type="curve" smooth="yes" name="dh04"/>
       <point x="1102" y="96"/>
       <point x="1100" y="80"/>
       <point x="1097" y="63" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/exclamdown.case.glif b/source/Hack-Bold.ufo/glyphs/exclamdown.case.glif
index 5555df495..e33fef04f 100644
--- a/source/Hack-Bold.ufo/glyphs/exclamdown.case.glif
+++ b/source/Hack-Bold.ufo/glyphs/exclamdown.case.glif
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="exclamdown.case" format="1">
+<glyph name="exclamdown.case" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="615" y="1508" type="curve" name="at01" smooth="yes"/>
+      <point x="615" y="1508" type="curve" smooth="yes" name="at01"/>
       <point x="638" y="1508"/>
       <point x="660" y="1506"/>
-      <point x="683" y="1495" type="curve" name="at02" smooth="yes"/>
+      <point x="683" y="1495" type="curve" smooth="yes" name="at02"/>
       <point x="706" y="1486"/>
       <point x="720" y="1476"/>
       <point x="739" y="1456" type="curve" smooth="yes"/>
@@ -18,16 +18,16 @@
       <point x="784" y="1373" type="curve" smooth="yes"/>
       <point x="787" y="1356"/>
       <point x="789" y="1340"/>
-      <point x="789" y="1324" type="curve" name="dh02" smooth="yes"/>
+      <point x="789" y="1324" type="curve" smooth="yes" name="dh02"/>
       <point x="789" y="1269"/>
       <point x="773" y="1224"/>
       <point x="740" y="1191" type="curve" smooth="yes"/>
       <point x="708" y="1158"/>
       <point x="662" y="1140"/>
-      <point x="617" y="1140" type="curve" name="at03" smooth="yes"/>
+      <point x="617" y="1140" type="curve" smooth="yes" name="at03"/>
       <point x="606" y="1140"/>
       <point x="594" y="1141"/>
-      <point x="586" y="1142" type="curve" name="hr01" smooth="yes"/>
+      <point x="586" y="1142" type="curve" smooth="yes" name="hr01"/>
       <point x="560" y="1148" type="line"/>
       <point x="552" y="1151"/>
       <point x="538" y="1157"/>
@@ -40,7 +40,7 @@
       <point x="491" y="1192" type="curve" smooth="yes"/>
       <point x="458" y="1225"/>
       <point x="441" y="1268"/>
-      <point x="441" y="1323" type="curve" name="dh01" smooth="yes"/>
+      <point x="441" y="1323" type="curve" smooth="yes" name="dh01"/>
       <point x="441" y="1379"/>
       <point x="458" y="1424"/>
       <point x="491" y="1457" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/exclamdown.glif b/source/Hack-Bold.ufo/glyphs/exclamdown.glif
index 4b8a0e881..515b7d17d 100644
--- a/source/Hack-Bold.ufo/glyphs/exclamdown.glif
+++ b/source/Hack-Bold.ufo/glyphs/exclamdown.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="exclamdown" format="1">
+<glyph name="exclamdown" format="2">
   <advance width="1233"/>
   <unicode hex="00A1"/>
   <outline>
     <contour>
-      <point x="615" y="1508" type="curve" name="at01" smooth="yes"/>
+      <point x="615" y="1508" type="curve" smooth="yes" name="at01"/>
       <point x="638" y="1508"/>
       <point x="660" y="1506"/>
-      <point x="683" y="1495" type="curve" name="at02" smooth="yes"/>
+      <point x="683" y="1495" type="curve" smooth="yes" name="at02"/>
       <point x="706" y="1486"/>
       <point x="720" y="1476"/>
       <point x="739" y="1456" type="curve" smooth="yes"/>
@@ -19,16 +19,16 @@
       <point x="784" y="1373" type="curve" smooth="yes"/>
       <point x="787" y="1356"/>
       <point x="789" y="1340"/>
-      <point x="789" y="1324" type="curve" name="dh02" smooth="yes"/>
+      <point x="789" y="1324" type="curve" smooth="yes" name="dh02"/>
       <point x="789" y="1269"/>
       <point x="773" y="1224"/>
       <point x="740" y="1191" type="curve" smooth="yes"/>
       <point x="708" y="1158"/>
       <point x="662" y="1140"/>
-      <point x="617" y="1140" type="curve" name="at03" smooth="yes"/>
+      <point x="617" y="1140" type="curve" smooth="yes" name="at03"/>
       <point x="606" y="1140"/>
       <point x="594" y="1141"/>
-      <point x="586" y="1142" type="curve" name="hr01" smooth="yes"/>
+      <point x="586" y="1142" type="curve" smooth="yes" name="hr01"/>
       <point x="560" y="1148" type="line"/>
       <point x="552" y="1151"/>
       <point x="538" y="1157"/>
@@ -41,7 +41,7 @@
       <point x="491" y="1192" type="curve" smooth="yes"/>
       <point x="458" y="1225"/>
       <point x="441" y="1268"/>
-      <point x="441" y="1323" type="curve" name="dh01" smooth="yes"/>
+      <point x="441" y="1323" type="curve" smooth="yes" name="dh01"/>
       <point x="441" y="1379"/>
       <point x="458" y="1424"/>
       <point x="491" y="1457" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/existential.glif b/source/Hack-Bold.ufo/glyphs/existential.glif
index 3c20b3963..3f47619b5 100644
--- a/source/Hack-Bold.ufo/glyphs/existential.glif
+++ b/source/Hack-Bold.ufo/glyphs/existential.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="existential" format="1">
+<glyph name="existential" format="2">
   <advance width="1233"/>
   <unicode hex="2203"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/f.glif b/source/Hack-Bold.ufo/glyphs/f.glif
index e4d3aead7..97980e583 100644
--- a/source/Hack-Bold.ufo/glyphs/f.glif
+++ b/source/Hack-Bold.ufo/glyphs/f.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="f" format="1">
+<glyph name="f" format="2">
   <advance width="1233"/>
   <unicode hex="0066"/>
   <outline>
@@ -22,14 +22,14 @@
       <point x="1063" y="1120" type="line"/>
       <point x="1063" y="895" type="line"/>
       <point x="719" y="895" type="line"/>
-      <point x="719" y="-0" type="line"/>
-      <point x="426" y="-0" type="line"/>
+      <point x="719" y="0" type="line"/>
+      <point x="426" y="0" type="line"/>
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/figuredash.glif b/source/Hack-Bold.ufo/glyphs/figuredash.glif
index a70954366..a06287985 100644
--- a/source/Hack-Bold.ufo/glyphs/figuredash.glif
+++ b/source/Hack-Bold.ufo/glyphs/figuredash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="figuredash" format="1">
+<glyph name="figuredash" format="2">
   <advance width="1233"/>
   <unicode hex="2012"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/filledbox.glif b/source/Hack-Bold.ufo/glyphs/filledbox.glif
index ce4481119..a7028df70 100644
--- a/source/Hack-Bold.ufo/glyphs/filledbox.glif
+++ b/source/Hack-Bold.ufo/glyphs/filledbox.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="filledbox" format="1">
+<glyph name="filledbox" format="2">
   <advance width="1233"/>
   <unicode hex="25A0"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/filledrect.glif b/source/Hack-Bold.ufo/glyphs/filledrect.glif
index 2dfc9ac67..eca6c2868 100644
--- a/source/Hack-Bold.ufo/glyphs/filledrect.glif
+++ b/source/Hack-Bold.ufo/glyphs/filledrect.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="filledrect" format="1">
+<glyph name="filledrect" format="2">
   <advance width="1233"/>
   <unicode hex="25AC"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/five.glif b/source/Hack-Bold.ufo/glyphs/five.glif
index 407ac7609..5ff850577 100644
--- a/source/Hack-Bold.ufo/glyphs/five.glif
+++ b/source/Hack-Bold.ufo/glyphs/five.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="five" format="1">
+<glyph name="five" format="2">
   <advance width="1233"/>
   <unicode hex="0035"/>
   <outline>
     <contour>
-      <point x="533" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="533" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="476" y="-29"/>
       <point x="408" y="-24"/>
       <point x="343" y="-13" type="curve" smooth="yes"/>
@@ -17,16 +17,16 @@
       <point x="314" y="240" type="curve" smooth="yes"/>
       <point x="374" y="225"/>
       <point x="428" y="219"/>
-      <point x="488" y="219" type="curve" name="dv01" smooth="yes"/>
+      <point x="488" y="219" type="curve" smooth="yes" name="dv01"/>
       <point x="593" y="219"/>
       <point x="673" y="241"/>
       <point x="726" y="286" type="curve" smooth="yes"/>
       <point x="780" y="331"/>
       <point x="807" y="394"/>
-      <point x="807" y="475" type="curve" name="ah01" smooth="yes"/>
+      <point x="807" y="475" type="curve" smooth="yes" name="ah01"/>
       <point x="807" y="644"/>
       <point x="697" y="737"/>
-      <point x="508" y="737" type="curve" name="dv02" smooth="yes"/>
+      <point x="508" y="737" type="curve" smooth="yes" name="dv02"/>
       <point x="461" y="737"/>
       <point x="407" y="731"/>
       <point x="354" y="718" type="curve" smooth="yes"/>
@@ -43,13 +43,13 @@
       <point x="509" y="977" type="curve" smooth="yes"/>
       <point x="533" y="981"/>
       <point x="570" y="983"/>
-      <point x="598" y="983" type="curve" name="dv03" smooth="yes"/>
+      <point x="598" y="983" type="curve" smooth="yes" name="dv03"/>
       <point x="739" y="983"/>
       <point x="868" y="935"/>
       <point x="957" y="844" type="curve" smooth="yes"/>
       <point x="1044" y="756"/>
       <point x="1094" y="630"/>
-      <point x="1094" y="477" type="curve" name="sh03" smooth="yes"/>
+      <point x="1094" y="477" type="curve" smooth="yes" name="sh03"/>
       <point x="1094" y="163"/>
       <point x="888" y="-29"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/five.subs.glif b/source/Hack-Bold.ufo/glyphs/five.subs.glif
index 39ee32ae9..e075f1a48 100644
--- a/source/Hack-Bold.ufo/glyphs/five.subs.glif
+++ b/source/Hack-Bold.ufo/glyphs/five.subs.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="five.subs" format="1">
+<glyph name="five.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="557" y="-407" type="curve" name="hr00" smooth="yes"/>
+      <point x="557" y="-407" type="curve" smooth="yes" name="hr00"/>
       <point x="477" y="-407"/>
       <point x="386" y="-395"/>
       <point x="293" y="-371" type="curve"/>
       <point x="293" y="-223" type="line"/>
       <point x="361" y="-251"/>
       <point x="448" y="-269"/>
-      <point x="531" y="-269" type="curve" name="dv01" smooth="yes"/>
+      <point x="531" y="-269" type="curve" smooth="yes" name="dv01"/>
       <point x="672" y="-269"/>
       <point x="747" y="-217"/>
-      <point x="747" y="-126" type="curve" name="ah01" smooth="yes"/>
+      <point x="747" y="-126" type="curve" smooth="yes" name="ah01"/>
       <point x="747" y="-33"/>
       <point x="668" y="21"/>
-      <point x="541" y="21" type="curve" name="dv04" smooth="yes"/>
+      <point x="541" y="21" type="curve" smooth="yes" name="dv04"/>
       <point x="474" y="21"/>
       <point x="400" y="6"/>
       <point x="327" y="-22" type="curve" name="sh01"/>
@@ -27,10 +27,10 @@
       <point x="491" y="144" type="line" name="sh02"/>
       <point x="523" y="153"/>
       <point x="558" y="159"/>
-      <point x="605" y="159" type="curve" name="dv05" smooth="yes"/>
+      <point x="605" y="159" type="curve" smooth="yes" name="dv05"/>
       <point x="803" y="159"/>
       <point x="944" y="45"/>
-      <point x="944" y="-126" type="curve" name="sh03" smooth="yes"/>
+      <point x="944" y="-126" type="curve" smooth="yes" name="sh03"/>
       <point x="944" y="-299"/>
       <point x="798" y="-407"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/fiveeighths.glif b/source/Hack-Bold.ufo/glyphs/fiveeighths.glif
index 908a7ea0b..1e43ed867 100644
--- a/source/Hack-Bold.ufo/glyphs/fiveeighths.glif
+++ b/source/Hack-Bold.ufo/glyphs/fiveeighths.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="fiveeighths" format="1">
+<glyph name="fiveeighths" format="2">
   <advance width="1233"/>
   <unicode hex="215D"/>
   <outline>
     <contour>
-      <point x="299" y="809" type="curve" name="dv10" smooth="yes"/>
+      <point x="299" y="809" type="curve" smooth="yes" name="dv10"/>
       <point x="219" y="809"/>
       <point x="128" y="821"/>
       <point x="35" y="845" type="curve"/>
       <point x="35" y="993" type="line"/>
       <point x="103" y="965"/>
       <point x="190" y="947"/>
-      <point x="273" y="947" type="curve" name="dv11" smooth="yes"/>
+      <point x="273" y="947" type="curve" smooth="yes" name="dv11"/>
       <point x="414" y="947"/>
       <point x="489" y="999"/>
-      <point x="489" y="1090" type="curve" name="dh03" smooth="yes"/>
+      <point x="489" y="1090" type="curve" smooth="yes" name="dh03"/>
       <point x="489" y="1183"/>
       <point x="410" y="1237"/>
-      <point x="283" y="1237" type="curve" name="dv06" smooth="yes"/>
+      <point x="283" y="1237" type="curve" smooth="yes" name="dv06"/>
       <point x="216" y="1237"/>
       <point x="142" y="1222"/>
       <point x="69" y="1194" type="curve" name="dh01"/>
@@ -28,10 +28,10 @@
       <point x="233" y="1360" type="line" name="dh02"/>
       <point x="265" y="1369"/>
       <point x="300" y="1375"/>
-      <point x="347" y="1375" type="curve" name="dv07" smooth="yes"/>
+      <point x="347" y="1375" type="curve" smooth="yes" name="dv07"/>
       <point x="545" y="1375"/>
       <point x="686" y="1261"/>
-      <point x="686" y="1090" type="curve" name="dh04" smooth="yes"/>
+      <point x="686" y="1090" type="curve" smooth="yes" name="dh04"/>
       <point x="686" y="917"/>
       <point x="540" y="809"/>
     </contour>
@@ -42,10 +42,10 @@
       <point x="84" y="500" type="line"/>
     </contour>
     <contour>
-      <point x="818" y="-285" type="curve" name="hr02" smooth="yes"/>
+      <point x="818" y="-285" type="curve" smooth="yes" name="hr02"/>
       <point x="603" y="-285"/>
       <point x="483" y="-192"/>
-      <point x="483" y="-41" type="curve" name="sh01" smooth="yes"/>
+      <point x="483" y="-41" type="curve" smooth="yes" name="sh01"/>
       <point x="483" y="70"/>
       <point x="548" y="143"/>
       <point x="667" y="174" type="curve" name="ih01"/>
@@ -54,35 +54,35 @@
       <point x="509" y="359" type="curve" smooth="yes"/>
       <point x="509" y="497"/>
       <point x="627" y="582"/>
-      <point x="816" y="582" type="curve" name="dv09" smooth="yes"/>
+      <point x="816" y="582" type="curve" smooth="yes" name="dv09"/>
       <point x="1008" y="582"/>
       <point x="1125" y="495"/>
-      <point x="1125" y="359" type="curve" name="dh06" smooth="yes"/>
+      <point x="1125" y="359" type="curve" smooth="yes" name="dh06"/>
       <point x="1125" y="267"/>
       <point x="1071" y="205"/>
       <point x="970" y="174" type="curve" name="ih02"/>
       <point x="1083" y="145"/>
       <point x="1150" y="75"/>
-      <point x="1150" y="-41" type="curve" name="sh02" smooth="yes"/>
+      <point x="1150" y="-41" type="curve" smooth="yes" name="sh02"/>
       <point x="1150" y="-194"/>
       <point x="1031" y="-285"/>
     </contour>
     <contour>
-      <point x="817" y="237" type="curve" name="dv05" smooth="yes"/>
+      <point x="817" y="237" type="curve" smooth="yes" name="dv05"/>
       <point x="897" y="237"/>
       <point x="946" y="279"/>
-      <point x="946" y="344" type="curve" name="dh05" smooth="yes"/>
+      <point x="946" y="344" type="curve" smooth="yes" name="dh05"/>
       <point x="946" y="409"/>
       <point x="897" y="449"/>
-      <point x="817" y="449" type="curve" name="dv08" smooth="yes"/>
+      <point x="817" y="449" type="curve" smooth="yes" name="dv08"/>
       <point x="737" y="449"/>
       <point x="688" y="408"/>
-      <point x="688" y="344" type="curve" name="sh03" smooth="yes"/>
+      <point x="688" y="344" type="curve" smooth="yes" name="sh03"/>
       <point x="688" y="279"/>
       <point x="737" y="237"/>
     </contour>
     <contour>
-      <point x="816" y="-152" type="curve" name="dv01" smooth="yes"/>
+      <point x="816" y="-152" type="curve" smooth="yes" name="dv01"/>
       <point x="907" y="-152"/>
       <point x="968" y="-102"/>
       <point x="968" y="-23" type="curve" smooth="yes"/>
@@ -91,7 +91,7 @@
       <point x="927" y="69" type="curve" smooth="yes"/>
       <point x="900" y="92"/>
       <point x="864" y="103"/>
-      <point x="819" y="103" type="curve" name="dv04" smooth="yes"/>
+      <point x="819" y="103" type="curve" smooth="yes" name="dv04"/>
       <point x="726" y="103"/>
       <point x="665" y="53"/>
       <point x="665" y="-24" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/florin.glif b/source/Hack-Bold.ufo/glyphs/florin.glif
index 4bdd0294d..ccb95cf07 100644
--- a/source/Hack-Bold.ufo/glyphs/florin.glif
+++ b/source/Hack-Bold.ufo/glyphs/florin.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="florin" format="1">
+<glyph name="florin" format="2">
   <advance width="1233"/>
   <unicode hex="0192"/>
   <outline>
     <contour>
-      <point x="240" y="-426" type="curve" name="hr00" smooth="yes"/>
+      <point x="240" y="-426" type="curve" smooth="yes" name="hr00"/>
       <point x="161" y="-426"/>
       <point x="89" y="-411"/>
       <point x="12" y="-375" type="curve"/>
@@ -14,7 +14,7 @@
       <point x="95" y="-182" type="curve" smooth="yes"/>
       <point x="121" y="-191"/>
       <point x="148" y="-195"/>
-      <point x="175" y="-195" type="curve" name="sv01" smooth="yes"/>
+      <point x="175" y="-195" type="curve" smooth="yes" name="sv01"/>
       <point x="238" y="-195"/>
       <point x="287" y="-175"/>
       <point x="322" y="-135" type="curve" smooth="yes"/>
@@ -31,10 +31,10 @@
       <point x="665" y="1458" type="curve" smooth="yes"/>
       <point x="733" y="1523"/>
       <point x="822" y="1556"/>
-      <point x="926" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="926" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="963" y="1556"/>
       <point x="1007" y="1552"/>
-      <point x="1042" y="1544" type="curve" name="at02" smooth="yes"/>
+      <point x="1042" y="1544" type="curve" smooth="yes" name="at02"/>
       <point x="1073" y="1537"/>
       <point x="1118" y="1521"/>
       <point x="1153" y="1505" type="curve"/>
@@ -44,7 +44,7 @@
       <point x="1071" y="1312" type="curve" smooth="yes"/>
       <point x="1045" y="1321"/>
       <point x="1019" y="1325"/>
-      <point x="992" y="1325" type="curve" name="sv02" smooth="yes"/>
+      <point x="992" y="1325" type="curve" smooth="yes" name="sv02"/>
       <point x="930" y="1325"/>
       <point x="882" y="1305"/>
       <point x="848" y="1265" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/four.glif b/source/Hack-Bold.ufo/glyphs/four.glif
index d2a284e73..8d7e42a06 100644
--- a/source/Hack-Bold.ufo/glyphs/four.glif
+++ b/source/Hack-Bold.ufo/glyphs/four.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="four" format="1">
+<glyph name="four" format="2">
   <advance width="1233"/>
   <unicode hex="0034"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/four.subs.glif b/source/Hack-Bold.ufo/glyphs/four.subs.glif
index 7587aea35..5a54a5f16 100644
--- a/source/Hack-Bold.ufo/glyphs/four.subs.glif
+++ b/source/Hack-Bold.ufo/glyphs/four.subs.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="four.subs" format="1">
+<glyph name="four.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/fraction.glif b/source/Hack-Bold.ufo/glyphs/fraction.glif
index a2601cfe7..c4453d7e9 100644
--- a/source/Hack-Bold.ufo/glyphs/fraction.glif
+++ b/source/Hack-Bold.ufo/glyphs/fraction.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="fraction" format="1">
+<glyph name="fraction" format="2">
   <advance width="1233"/>
   <unicode hex="2044"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/franc.glif b/source/Hack-Bold.ufo/glyphs/franc.glif
index dd39e276b..8021da19f 100644
--- a/source/Hack-Bold.ufo/glyphs/franc.glif
+++ b/source/Hack-Bold.ufo/glyphs/franc.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="franc" format="1">
+<glyph name="franc" format="2">
   <advance width="1233"/>
   <unicode hex="20A3"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/g.glif b/source/Hack-Bold.ufo/glyphs/g.glif
index 437916581..ff41fc0cb 100644
--- a/source/Hack-Bold.ufo/glyphs/g.glif
+++ b/source/Hack-Bold.ufo/glyphs/g.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="g" format="1">
+<glyph name="g" format="2">
   <advance width="1233"/>
   <unicode hex="0067"/>
   <outline>
@@ -50,9 +50,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/gamma.glif b/source/Hack-Bold.ufo/glyphs/gamma.glif
index a05a53db3..b03fdf4cd 100644
--- a/source/Hack-Bold.ufo/glyphs/gamma.glif
+++ b/source/Hack-Bold.ufo/glyphs/gamma.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gamma" format="1">
+<glyph name="gamma" format="2">
   <advance width="1233"/>
   <unicode hex="03B3"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/gbreve.glif b/source/Hack-Bold.ufo/glyphs/gbreve.glif
index 3a2b0c569..45f1af52c 100644
--- a/source/Hack-Bold.ufo/glyphs/gbreve.glif
+++ b/source/Hack-Bold.ufo/glyphs/gbreve.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gbreve" format="1">
+<glyph name="gbreve" format="2">
   <advance width="1233"/>
   <unicode hex="011F"/>
   <outline>
     <contour>
-      <point x="616" y="1299" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1299" type="curve" smooth="yes" name="dv01"/>
       <point x="515" y="1299"/>
       <point x="434" y="1323"/>
       <point x="374" y="1376" type="curve" smooth="yes"/>
@@ -17,7 +17,7 @@
       <point x="483" y="1490" type="curve" smooth="yes"/>
       <point x="516" y="1465"/>
       <point x="561" y="1452"/>
-      <point x="617" y="1452" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="1452" type="curve" smooth="yes" name="dv02"/>
       <point x="672" y="1452"/>
       <point x="716" y="1464"/>
       <point x="749" y="1489" type="curve" smooth="yes"/>
@@ -32,51 +32,51 @@
       <point x="720" y="1299"/>
     </contour>
     <contour>
-      <point x="578" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="578" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="519" y="-424"/>
       <point x="458" y="-420"/>
-      <point x="398" y="-411" type="curve" name="sh04" smooth="yes"/>
+      <point x="398" y="-411" type="curve" smooth="yes" name="sh04"/>
       <point x="338" y="-402"/>
       <point x="277" y="-388"/>
       <point x="215" y="-369" type="curve" name="hr01"/>
       <point x="215" y="-100" type="line" name="ih01"/>
       <point x="271" y="-131"/>
       <point x="329" y="-153"/>
-      <point x="384" y="-168" type="curve" name="sh05" smooth="yes"/>
+      <point x="384" y="-168" type="curve" smooth="yes" name="sh05"/>
       <point x="441" y="-183"/>
       <point x="501" y="-190"/>
-      <point x="556" y="-190" type="curve" name="sv02" smooth="yes"/>
+      <point x="556" y="-190" type="curve" smooth="yes" name="sv02"/>
       <point x="647" y="-190"/>
       <point x="705" y="-171"/>
-      <point x="744" y="-132" type="curve" name="hr02" smooth="yes"/>
+      <point x="744" y="-132" type="curve" smooth="yes" name="hr02"/>
       <point x="783" y="-93"/>
       <point x="803" y="-32"/>
-      <point x="803" y="51" type="curve" name="ah01" smooth="yes"/>
+      <point x="803" y="51" type="curve" smooth="yes" name="ah01"/>
       <point x="803" y="172" type="line" name="iv01"/>
       <point x="774" y="119"/>
       <point x="736" y="79"/>
       <point x="689" y="53" type="curve" smooth="yes"/>
       <point x="642" y="27"/>
       <point x="584" y="14"/>
-      <point x="517" y="14" type="curve" name="dv03" smooth="yes"/>
+      <point x="517" y="14" type="curve" smooth="yes" name="dv03"/>
       <point x="388" y="14"/>
       <point x="286" y="64"/>
       <point x="211" y="164" type="curve" smooth="yes"/>
       <point x="135" y="264"/>
       <point x="98" y="398"/>
-      <point x="98" y="573" type="curve" name="sh02" smooth="yes"/>
+      <point x="98" y="573" type="curve" smooth="yes" name="sh02"/>
       <point x="98" y="748"/>
       <point x="136" y="888"/>
       <point x="211" y="993" type="curve" smooth="yes"/>
       <point x="287" y="1097"/>
       <point x="387" y="1149"/>
-      <point x="512" y="1149" type="curve" name="dv06" smooth="yes"/>
+      <point x="512" y="1149" type="curve" smooth="yes" name="dv06"/>
       <point x="643" y="1149"/>
       <point x="746" y="1086"/>
       <point x="803" y="977" type="curve" name="sh06"/>
       <point x="832" y="1120" type="line" name="at01"/>
       <point x="1096" y="1120" type="line"/>
-      <point x="1096" y="84" type="line" name="sh07" smooth="yes"/>
+      <point x="1096" y="84" type="line" smooth="yes" name="sh07"/>
       <point x="1096" y="-95"/>
       <point x="1056" y="-225"/>
       <point x="975" y="-305" type="curve" smooth="yes"/>
@@ -84,28 +84,28 @@
       <point x="761" y="-424"/>
     </contour>
     <contour>
-      <point x="596" y="246" type="curve" name="dv04" smooth="yes"/>
+      <point x="596" y="246" type="curve" smooth="yes" name="dv04"/>
       <point x="658" y="246"/>
       <point x="708" y="276"/>
       <point x="746" y="337" type="curve" smooth="yes"/>
       <point x="783" y="397"/>
       <point x="803" y="473"/>
-      <point x="803" y="577" type="curve" name="sh08" smooth="yes"/>
+      <point x="803" y="577" type="curve" smooth="yes" name="sh08"/>
       <point x="803" y="676"/>
       <point x="785" y="756"/>
       <point x="746" y="819" type="curve" smooth="yes"/>
       <point x="708" y="879"/>
       <point x="658" y="909"/>
-      <point x="596" y="909" type="curve" name="dv05" smooth="yes"/>
+      <point x="596" y="909" type="curve" smooth="yes" name="dv05"/>
       <point x="535" y="909"/>
       <point x="485" y="879"/>
-      <point x="448" y="819" type="curve" name="hr03" smooth="yes"/>
+      <point x="448" y="819" type="curve" smooth="yes" name="hr03"/>
       <point x="410" y="759"/>
       <point x="391" y="679"/>
-      <point x="391" y="578" type="curve" name="sh03" smooth="yes"/>
+      <point x="391" y="578" type="curve" smooth="yes" name="sh03"/>
       <point x="391" y="477"/>
       <point x="410" y="396"/>
-      <point x="448" y="336" type="curve" name="hr04" smooth="yes"/>
+      <point x="448" y="336" type="curve" smooth="yes" name="hr04"/>
       <point x="485" y="276"/>
       <point x="535" y="246"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/gcaron.glif b/source/Hack-Bold.ufo/glyphs/gcaron.glif
index 534bfe12f..144a7a663 100644
--- a/source/Hack-Bold.ufo/glyphs/gcaron.glif
+++ b/source/Hack-Bold.ufo/glyphs/gcaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gcaron" format="1">
+<glyph name="gcaron" format="2">
   <advance width="1233"/>
   <unicode hex="01E7"/>
   <outline>
@@ -13,47 +13,47 @@
       <point x="476" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="580" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="580" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="456" y="-424"/>
       <point x="340" y="-406"/>
       <point x="215" y="-369" type="curve"/>
       <point x="215" y="-100" type="line" name="ih03"/>
       <point x="327" y="-161"/>
       <point x="440" y="-190"/>
-      <point x="561" y="-190" type="curve" name="hr01" smooth="yes"/>
+      <point x="561" y="-190" type="curve" smooth="yes" name="hr01"/>
       <point x="728" y="-190"/>
       <point x="803" y="-116"/>
-      <point x="803" y="51" type="curve" name="ah01" smooth="yes"/>
+      <point x="803" y="51" type="curve" smooth="yes" name="ah01"/>
       <point x="803" y="172" type="line" name="iv01"/>
       <point x="746" y="64"/>
       <point x="653" y="14"/>
-      <point x="516" y="14" type="curve" name="dv01" smooth="yes"/>
+      <point x="516" y="14" type="curve" smooth="yes" name="dv01"/>
       <point x="260" y="14"/>
       <point x="98" y="228"/>
-      <point x="98" y="571" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="571" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="926"/>
       <point x="261" y="1149"/>
-      <point x="514" y="1149" type="curve" name="sv02" smooth="yes"/>
+      <point x="514" y="1149" type="curve" smooth="yes" name="sv02"/>
       <point x="643" y="1149"/>
       <point x="746" y="1086"/>
       <point x="803" y="977" type="curve" name="sh06"/>
       <point x="832" y="1120" type="line" name="at01"/>
       <point x="1096" y="1120" type="line"/>
-      <point x="1096" y="84" type="line" name="sh05" smooth="yes"/>
+      <point x="1096" y="84" type="line" smooth="yes" name="sh05"/>
       <point x="1096" y="-275"/>
       <point x="944" y="-424"/>
     </contour>
     <contour>
-      <point x="596" y="246" type="curve" name="dv02" smooth="yes"/>
+      <point x="596" y="246" type="curve" smooth="yes" name="dv02"/>
       <point x="720" y="246"/>
       <point x="803" y="377"/>
-      <point x="803" y="578" type="curve" name="sh07" smooth="yes"/>
+      <point x="803" y="578" type="curve" smooth="yes" name="sh07"/>
       <point x="803" y="778"/>
       <point x="720" y="909"/>
-      <point x="596" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="596" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="472" y="909"/>
       <point x="391" y="779"/>
-      <point x="391" y="578" type="curve" name="sh02" smooth="yes"/>
+      <point x="391" y="578" type="curve" smooth="yes" name="sh02"/>
       <point x="391" y="375"/>
       <point x="472" y="246"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/gcircumflex.glif b/source/Hack-Bold.ufo/glyphs/gcircumflex.glif
index 6852f14fc..3724d8158 100644
--- a/source/Hack-Bold.ufo/glyphs/gcircumflex.glif
+++ b/source/Hack-Bold.ufo/glyphs/gcircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gcircumflex" format="1">
+<glyph name="gcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="011D"/>
   <outline>
@@ -27,13 +27,13 @@
       <point x="803" y="172" type="line"/>
       <point x="744" y="65"/>
       <point x="652" y="14"/>
-      <point x="517" y="14" type="curve" name="hr01" smooth="yes"/>
+      <point x="517" y="14" type="curve" smooth="yes" name="hr01"/>
       <point x="260" y="14"/>
       <point x="98" y="228"/>
       <point x="98" y="573" type="curve" smooth="yes"/>
       <point x="98" y="802"/>
       <point x="170" y="982"/>
-      <point x="295" y="1078" type="curve" name="hr02" smooth="yes"/>
+      <point x="295" y="1078" type="curve" smooth="yes" name="hr02"/>
       <point x="358" y="1125"/>
       <point x="431" y="1149"/>
       <point x="512" y="1149" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/gdotaccent.glif b/source/Hack-Bold.ufo/glyphs/gdotaccent.glif
index a57161092..7d4d20fb0 100644
--- a/source/Hack-Bold.ufo/glyphs/gdotaccent.glif
+++ b/source/Hack-Bold.ufo/glyphs/gdotaccent.glif
@@ -1,68 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gdotaccent" format="1">
+<glyph name="gdotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="0121"/>
   <outline>
     <contour>
-      <point x="509" y="1349" type="line" name="dv01" smooth="yes"/>
+      <point x="509" y="1349" type="line" smooth="yes" name="dv01"/>
       <point x="489" y="1349"/>
       <point x="479" y="1359"/>
-      <point x="479" y="1379" type="curve" name="dh03" smooth="yes"/>
+      <point x="479" y="1379" type="curve" smooth="yes" name="dh03"/>
       <point x="479" y="1565" type="line" smooth="yes"/>
       <point x="479" y="1585"/>
       <point x="489" y="1595"/>
-      <point x="509" y="1595" type="curve" name="dv02" smooth="yes"/>
+      <point x="509" y="1595" type="curve" smooth="yes" name="dv02"/>
       <point x="724" y="1595" type="line" smooth="yes"/>
       <point x="744" y="1595"/>
       <point x="754" y="1585"/>
       <point x="754" y="1565" type="curve" smooth="yes"/>
-      <point x="754" y="1379" type="line" name="dh04" smooth="yes"/>
+      <point x="754" y="1379" type="line" smooth="yes" name="dh04"/>
       <point x="754" y="1359"/>
       <point x="744" y="1349"/>
       <point x="724" y="1349" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="582" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="582" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="455" y="-424"/>
       <point x="340" y="-406"/>
       <point x="215" y="-369" type="curve"/>
       <point x="215" y="-100" type="line" name="hr01"/>
       <point x="326" y="-161"/>
       <point x="445" y="-190"/>
-      <point x="554" y="-190" type="curve" name="sv01" smooth="yes"/>
+      <point x="554" y="-190" type="curve" smooth="yes" name="sv01"/>
       <point x="726" y="-190"/>
       <point x="803" y="-117"/>
-      <point x="803" y="51" type="curve" name="dh05" smooth="yes"/>
+      <point x="803" y="51" type="curve" smooth="yes" name="dh05"/>
       <point x="803" y="172" type="line" name="iv01"/>
       <point x="744" y="61"/>
       <point x="645" y="14"/>
-      <point x="520" y="14" type="curve" name="dv03" smooth="yes"/>
+      <point x="520" y="14" type="curve" smooth="yes" name="dv03"/>
       <point x="257" y="14"/>
       <point x="98" y="228"/>
-      <point x="98" y="574" type="curve" name="dh01" smooth="yes"/>
+      <point x="98" y="574" type="curve" smooth="yes" name="dh01"/>
       <point x="98" y="926"/>
       <point x="263" y="1149"/>
-      <point x="511" y="1149" type="curve" name="sv03" smooth="yes"/>
+      <point x="511" y="1149" type="curve" smooth="yes" name="sv03"/>
       <point x="644" y="1149"/>
       <point x="746" y="1086"/>
       <point x="803" y="977" type="curve" name="sh01"/>
       <point x="832" y="1120" type="line" name="at01"/>
       <point x="1096" y="1120" type="line"/>
-      <point x="1096" y="84" type="line" name="dh06" smooth="yes"/>
+      <point x="1096" y="84" type="line" smooth="yes" name="dh06"/>
       <point x="1096" y="-274"/>
       <point x="944" y="-424"/>
     </contour>
     <contour>
-      <point x="596" y="246" type="curve" name="dv04" smooth="yes"/>
+      <point x="596" y="246" type="curve" smooth="yes" name="dv04"/>
       <point x="720" y="246"/>
       <point x="803" y="377"/>
-      <point x="803" y="578" type="curve" name="sh02" smooth="yes"/>
+      <point x="803" y="578" type="curve" smooth="yes" name="sh02"/>
       <point x="803" y="778"/>
       <point x="720" y="909"/>
-      <point x="596" y="909" type="curve" name="sv02" smooth="yes"/>
+      <point x="596" y="909" type="curve" smooth="yes" name="sv02"/>
       <point x="472" y="909"/>
       <point x="391" y="779"/>
-      <point x="391" y="577" type="curve" name="dh02" smooth="yes"/>
+      <point x="391" y="577" type="curve" smooth="yes" name="dh02"/>
       <point x="391" y="375"/>
       <point x="472" y="246"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/germandbls.glif b/source/Hack-Bold.ufo/glyphs/germandbls.glif
index d7910f45e..e8d8610eb 100644
--- a/source/Hack-Bold.ufo/glyphs/germandbls.glif
+++ b/source/Hack-Bold.ufo/glyphs/germandbls.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="germandbls" format="1">
+<glyph name="germandbls" format="2">
   <advance width="1233"/>
   <unicode hex="00DF"/>
   <outline>
     <contour>
-      <point x="759" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="759" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="716" y="-29"/>
       <point x="672" y="-25"/>
       <point x="633" y="-17" type="curve" smooth="yes"/>
@@ -17,10 +17,10 @@
       <point x="620" y="223" type="curve" smooth="yes"/>
       <point x="656" y="212"/>
       <point x="690" y="207"/>
-      <point x="729" y="207" type="curve" name="dv02" smooth="yes"/>
+      <point x="729" y="207" type="curve" smooth="yes" name="dv02"/>
       <point x="833" y="207"/>
       <point x="889" y="257"/>
-      <point x="889" y="328" type="curve" name="dh05" smooth="yes"/>
+      <point x="889" y="328" type="curve" smooth="yes" name="dh05"/>
       <point x="889" y="384"/>
       <point x="850" y="432"/>
       <point x="774" y="492" type="curve" smooth="yes"/>
@@ -33,7 +33,7 @@
       <point x="554" y="706" type="curve" smooth="yes"/>
       <point x="534" y="748"/>
       <point x="524" y="795"/>
-      <point x="524" y="847" type="curve" name="dh03" smooth="yes"/>
+      <point x="524" y="847" type="curve" smooth="yes" name="dh03"/>
       <point x="524" y="930"/>
       <point x="549" y="1001"/>
       <point x="598" y="1058" type="curve" smooth="yes"/>
@@ -42,10 +42,10 @@
       <point x="809" y="1174" type="curve"/>
       <point x="802" y="1226"/>
       <point x="780" y="1264"/>
-      <point x="751" y="1285" type="curve" name="hr01" smooth="yes"/>
+      <point x="751" y="1285" type="curve" smooth="yes" name="hr01"/>
       <point x="718" y="1309"/>
       <point x="670" y="1321"/>
-      <point x="614" y="1321" type="curve" name="sv01" smooth="yes"/>
+      <point x="614" y="1321" type="curve" smooth="yes" name="sv01"/>
       <point x="553" y="1321"/>
       <point x="503" y="1307"/>
       <point x="468" y="1271" type="curve" smooth="yes"/>
@@ -60,7 +60,7 @@
       <point x="248" y="1447" type="curve" smooth="yes"/>
       <point x="332" y="1523"/>
       <point x="449" y="1556"/>
-      <point x="594" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="594" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="750" y="1556"/>
       <point x="856" y="1518"/>
       <point x="928" y="1438" type="curve" smooth="yes"/>
@@ -73,7 +73,7 @@
       <point x="846" y="1008" type="curve" smooth="yes"/>
       <point x="803" y="977"/>
       <point x="780" y="936"/>
-      <point x="780" y="889" type="curve" name="dh04" smooth="yes"/>
+      <point x="780" y="889" type="curve" smooth="yes" name="dh04"/>
       <point x="780" y="832"/>
       <point x="815" y="793"/>
       <point x="896" y="728" type="curve" smooth="yes"/>
@@ -86,7 +86,7 @@
       <point x="1134" y="501" type="curve" smooth="yes"/>
       <point x="1159" y="453"/>
       <point x="1174" y="398"/>
-      <point x="1174" y="330" type="curve" name="dh06" smooth="yes"/>
+      <point x="1174" y="330" type="curve" smooth="yes" name="dh06"/>
       <point x="1174" y="225"/>
       <point x="1139" y="132"/>
       <point x="1063" y="67" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/gradient.glif b/source/Hack-Bold.ufo/glyphs/gradient.glif
index 8482d600a..b9eb751df 100644
--- a/source/Hack-Bold.ufo/glyphs/gradient.glif
+++ b/source/Hack-Bold.ufo/glyphs/gradient.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gradient" format="1">
+<glyph name="gradient" format="2">
   <advance width="1233"/>
   <unicode hex="2207"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/grave.glif b/source/Hack-Bold.ufo/glyphs/grave.glif
index d2c88bf93..5f527d87b 100644
--- a/source/Hack-Bold.ufo/glyphs/grave.glif
+++ b/source/Hack-Bold.ufo/glyphs/grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="grave" format="1">
+<glyph name="grave" format="2">
   <advance width="1233"/>
   <unicode hex="0060"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/gravecomb.glif b/source/Hack-Bold.ufo/glyphs/gravecomb.glif
index 2d2e66bbc..8c128b43c 100644
--- a/source/Hack-Bold.ufo/glyphs/gravecomb.glif
+++ b/source/Hack-Bold.ufo/glyphs/gravecomb.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gravecomb" format="1">
-  <advance width="0"/>
+<glyph name="gravecomb" format="2">
   <unicode hex="0300"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/greater.glif b/source/Hack-Bold.ufo/glyphs/greater.glif
index 4a52d67a0..9594c58db 100644
--- a/source/Hack-Bold.ufo/glyphs/greater.glif
+++ b/source/Hack-Bold.ufo/glyphs/greater.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="greater" format="1">
+<glyph name="greater" format="2">
   <advance width="1233"/>
   <unicode hex="003E"/>
   <outline>
     <contour>
-      <point x="88" y="358" type="line" name="hr00"/>
-      <point x="883" y="641" type="line" name="iv01"/>
-      <point x="88" y="926" type="line"/>
-      <point x="88" y="1176" type="line" name="av01"/>
+      <point x="88" y="268" type="line" name=""/>
+      <point x="873" y="641" type="line" name="iv01"/>
+      <point x="88" y="1016" type="line"/>
+      <point x="88" y="1276" type="line" name="av01"/>
       <point x="1145" y="760" type="line"/>
       <point x="1145" y="524" type="line"/>
-      <point x="88" y="109" type="line" name="av02"/>
+      <point x="88" y="9" type="line" name="av02"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Bold.ufo/glyphs/greaterequal.glif b/source/Hack-Bold.ufo/glyphs/greaterequal.glif
index 81ad922fb..48a419ba1 100644
--- a/source/Hack-Bold.ufo/glyphs/greaterequal.glif
+++ b/source/Hack-Bold.ufo/glyphs/greaterequal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="greaterequal" format="1">
+<glyph name="greaterequal" format="2">
   <advance width="1233"/>
   <unicode hex="2265"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/guillemotleft.glif b/source/Hack-Bold.ufo/glyphs/guillemotleft.glif
index c77f83032..49252d8b9 100644
--- a/source/Hack-Bold.ufo/glyphs/guillemotleft.glif
+++ b/source/Hack-Bold.ufo/glyphs/guillemotleft.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="guillemotleft" format="1">
+<glyph name="guillemotleft" format="2">
   <advance width="1233"/>
   <unicode hex="00AB"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/guillemotright.glif b/source/Hack-Bold.ufo/glyphs/guillemotright.glif
index 37d9dcc97..50a87efcd 100644
--- a/source/Hack-Bold.ufo/glyphs/guillemotright.glif
+++ b/source/Hack-Bold.ufo/glyphs/guillemotright.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="guillemotright" format="1">
+<glyph name="guillemotright" format="2">
   <advance width="1233"/>
   <unicode hex="00BB"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/guilsinglleft.glif b/source/Hack-Bold.ufo/glyphs/guilsinglleft.glif
index ecb0d2264..353f4b6af 100644
--- a/source/Hack-Bold.ufo/glyphs/guilsinglleft.glif
+++ b/source/Hack-Bold.ufo/glyphs/guilsinglleft.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="guilsinglleft" format="1">
+<glyph name="guilsinglleft" format="2">
   <advance width="1233"/>
   <unicode hex="2039"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/guilsinglright.glif b/source/Hack-Bold.ufo/glyphs/guilsinglright.glif
index 929d6d218..b0dc7fd72 100644
--- a/source/Hack-Bold.ufo/glyphs/guilsinglright.glif
+++ b/source/Hack-Bold.ufo/glyphs/guilsinglright.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="guilsinglright" format="1">
+<glyph name="guilsinglright" format="2">
   <advance width="1233"/>
   <unicode hex="203A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/h.glif b/source/Hack-Bold.ufo/glyphs/h.glif
index 91d130f21..b725c667e 100644
--- a/source/Hack-Bold.ufo/glyphs/h.glif
+++ b/source/Hack-Bold.ufo/glyphs/h.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="h" format="1">
+<glyph name="h" format="2">
   <advance width="1233"/>
   <unicode hex="0068"/>
   <outline>
@@ -13,8 +13,8 @@
       <point x="961" y="1147"/>
       <point x="1071" y="1002"/>
       <point x="1071" y="727" type="curve" smooth="yes"/>
-      <point x="1071" y="-0" type="line"/>
-      <point x="780" y="-0" type="line"/>
+      <point x="1071" y="0" type="line"/>
+      <point x="780" y="0" type="line"/>
       <point x="780" y="682" type="line" smooth="yes"/>
       <point x="780" y="838"/>
       <point x="735" y="907"/>
@@ -22,14 +22,14 @@
       <point x="528" y="907"/>
       <point x="463" y="806"/>
       <point x="463" y="641" type="curve" smooth="yes"/>
-      <point x="463" y="-0" type="line"/>
-      <point x="172" y="-0" type="line"/>
+      <point x="463" y="0" type="line"/>
+      <point x="172" y="0" type="line"/>
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/hbar.glif b/source/Hack-Bold.ufo/glyphs/hbar.glif
index 5cc6140b9..b735ed4af 100644
--- a/source/Hack-Bold.ufo/glyphs/hbar.glif
+++ b/source/Hack-Bold.ufo/glyphs/hbar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="hbar" format="1">
+<glyph name="hbar" format="2">
   <advance width="1233"/>
   <unicode hex="0127"/>
   <outline>
@@ -17,7 +17,7 @@
       <point x="463" y="952" type="line" name="iv01"/>
       <point x="506" y="1081"/>
       <point x="610" y="1147"/>
-      <point x="753" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="753" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="961" y="1147"/>
       <point x="1071" y="1008"/>
       <point x="1071" y="727" type="curve" smooth="yes"/>
@@ -26,10 +26,10 @@
       <point x="780" y="682" type="line" smooth="yes"/>
       <point x="780" y="839"/>
       <point x="738" y="907"/>
-      <point x="639" y="907" type="curve" name="sv03" smooth="yes"/>
+      <point x="639" y="907" type="curve" smooth="yes" name="sv03"/>
       <point x="522" y="907"/>
       <point x="463" y="810"/>
-      <point x="463" y="641" type="curve" name="sh05" smooth="yes"/>
+      <point x="463" y="641" type="curve" smooth="yes" name="sh05"/>
       <point x="463" y="0" type="line" name="ab01"/>
       <point x="172" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/hcircumflex.glif b/source/Hack-Bold.ufo/glyphs/hcircumflex.glif
index 4fbf2a3fa..25720ea73 100644
--- a/source/Hack-Bold.ufo/glyphs/hcircumflex.glif
+++ b/source/Hack-Bold.ufo/glyphs/hcircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="hcircumflex" format="1">
+<glyph name="hcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0125"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/hookabovecomb.glif b/source/Hack-Bold.ufo/glyphs/hookabovecomb.glif
index a6dd78060..decd8b7a0 100644
--- a/source/Hack-Bold.ufo/glyphs/hookabovecomb.glif
+++ b/source/Hack-Bold.ufo/glyphs/hookabovecomb.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="hookabovecomb" format="1">
-  <advance width="0"/>
+<glyph name="hookabovecomb" format="2">
   <unicode hex="0309"/>
   <outline>
     <contour>
@@ -10,7 +9,7 @@
       <point x="-577" y="1438" type="curve"/>
       <point x="-562" y="1453"/>
       <point x="-555" y="1472"/>
-      <point x="-555" y="1500" type="curve" name="sh01" smooth="yes"/>
+      <point x="-555" y="1500" type="curve" smooth="yes" name="sh01"/>
       <point x="-555" y="1591"/>
       <point x="-639" y="1594"/>
       <point x="-677" y="1591" type="curve" name="sv01"/>
@@ -21,13 +20,13 @@
       <point x="-843" y="1712" type="line"/>
       <point x="-772" y="1729"/>
       <point x="-705" y="1738"/>
-      <point x="-641" y="1738" type="curve" name="dv02" smooth="yes"/>
+      <point x="-641" y="1738" type="curve" smooth="yes" name="dv02"/>
       <point x="-492" y="1738"/>
       <point x="-409" y="1690"/>
       <point x="-393" y="1593" type="curve" name="hr01"/>
       <point x="-392" y="1580"/>
       <point x="-391" y="1566"/>
-      <point x="-391" y="1555" type="curve" name="dh02" smooth="yes"/>
+      <point x="-391" y="1555" type="curve" smooth="yes" name="dh02"/>
       <point x="-391" y="1490"/>
       <point x="-426" y="1423"/>
       <point x="-495" y="1346" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/hungarumlaut.glif b/source/Hack-Bold.ufo/glyphs/hungarumlaut.glif
index ed1021fc9..eb2f7e4a8 100644
--- a/source/Hack-Bold.ufo/glyphs/hungarumlaut.glif
+++ b/source/Hack-Bold.ufo/glyphs/hungarumlaut.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="hungarumlaut" format="1">
+<glyph name="hungarumlaut" format="2">
   <advance width="1233"/>
   <unicode hex="02DD"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/hyphen.glif b/source/Hack-Bold.ufo/glyphs/hyphen.glif
index e45ef7ac6..7656aacf5 100644
--- a/source/Hack-Bold.ufo/glyphs/hyphen.glif
+++ b/source/Hack-Bold.ufo/glyphs/hyphen.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="hyphen" format="1">
+<glyph name="hyphen" format="2">
   <advance width="1233"/>
   <unicode hex="002D"/>
   <outline>
     <contour>
-      <point x="221" y="746" type="line" name="hr00"/>
-      <point x="1012" y="746" type="line" name="dv02"/>
-      <point x="1012" y="455" type="line" name="dv01"/>
-      <point x="221" y="455" type="line"/>
+      <point x="221" y="776" type="line" name="hr00"/>
+      <point x="1012" y="776" type="line" name="dv02"/>
+      <point x="1012" y="485" type="line" name="dv01"/>
+      <point x="221" y="485" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
+      <string>2018-06-07 23:58:46 +0000</string>
     </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/hyphenationpoint.glif b/source/Hack-Bold.ufo/glyphs/hyphenationpoint.glif
index 0ec3270f8..8102b7058 100644
--- a/source/Hack-Bold.ufo/glyphs/hyphenationpoint.glif
+++ b/source/Hack-Bold.ufo/glyphs/hyphenationpoint.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="hyphenationpoint" format="1">
+<glyph name="hyphenationpoint" format="2">
   <advance width="1233"/>
   <unicode hex="2027"/>
   <outline>
     <contour>
-      <point x="616" y="576" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="576" type="curve" smooth="yes" name="hr00"/>
       <point x="525" y="576"/>
       <point x="454" y="645"/>
       <point x="454" y="745" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/i.glif b/source/Hack-Bold.ufo/glyphs/i.glif
index 589045697..c43414bba 100644
--- a/source/Hack-Bold.ufo/glyphs/i.glif
+++ b/source/Hack-Bold.ufo/glyphs/i.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="i" format="1">
+<glyph name="i" format="2">
   <advance width="1233"/>
   <unicode hex="0069"/>
   <outline>
@@ -39,9 +39,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/iacute.glif b/source/Hack-Bold.ufo/glyphs/iacute.glif
index 26d3fb0e2..4bd374c4d 100644
--- a/source/Hack-Bold.ufo/glyphs/iacute.glif
+++ b/source/Hack-Bold.ufo/glyphs/iacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="iacute" format="1">
+<glyph name="iacute" format="2">
   <advance width="1233"/>
   <unicode hex="00ED"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="411" y="1297" type="line" name="dh01"/>
     </contour>
     <contour>
-      <point x="802" y="-12" type="line" name="ab01" smooth="yes"/>
+      <point x="802" y="-12" type="line" smooth="yes" name="ab01"/>
       <point x="663" y="-12"/>
       <point x="563" y="24"/>
       <point x="502" y="96" type="curve" smooth="yes"/>
       <point x="441" y="167"/>
       <point x="411" y="287"/>
-      <point x="411" y="455" type="curve" name="sh01" smooth="yes"/>
+      <point x="411" y="455" type="curve" smooth="yes" name="sh01"/>
       <point x="411" y="895" type="line" name="sv01"/>
       <point x="184" y="895" type="line"/>
       <point x="184" y="1120" type="line" name="at01"/>
@@ -27,7 +27,7 @@
       <point x="745" y="268" type="curve" smooth="yes"/>
       <point x="772" y="231"/>
       <point x="818" y="213"/>
-      <point x="884" y="213" type="curve" name="sv02" smooth="yes"/>
+      <point x="884" y="213" type="curve" smooth="yes" name="sv02"/>
       <point x="1118" y="213" type="line"/>
       <point x="1118" y="-12" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/ibreve.glif b/source/Hack-Bold.ufo/glyphs/ibreve.glif
index 4da2d23c0..1d72230d3 100644
--- a/source/Hack-Bold.ufo/glyphs/ibreve.glif
+++ b/source/Hack-Bold.ufo/glyphs/ibreve.glif
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ibreve" format="1">
+<glyph name="ibreve" format="2">
   <advance width="1233"/>
   <unicode hex="012D"/>
   <outline>
     <contour>
-      <point x="812" y="-12" type="line" name="hr00" smooth="yes"/>
+      <point x="812" y="-12" type="line" smooth="yes" name="hr00"/>
       <point x="673" y="-12"/>
       <point x="573" y="24"/>
       <point x="512" y="96" type="curve" smooth="yes"/>
       <point x="451" y="167"/>
       <point x="421" y="287"/>
-      <point x="421" y="455" type="curve" name="dh01" smooth="yes"/>
+      <point x="421" y="455" type="curve" smooth="yes" name="dh01"/>
       <point x="421" y="895" type="line" name="sv01"/>
       <point x="184" y="895" type="line"/>
       <point x="184" y="1120" type="line" name="at01"/>
       <point x="714" y="1120" type="line"/>
-      <point x="714" y="455" type="line" name="dh02" smooth="yes"/>
+      <point x="714" y="455" type="line" smooth="yes" name="dh02"/>
       <point x="714" y="368"/>
       <point x="728" y="305"/>
       <point x="755" y="268" type="curve" smooth="yes"/>
       <point x="782" y="231"/>
       <point x="828" y="213"/>
-      <point x="894" y="213" type="curve" name="sv02" smooth="yes"/>
+      <point x="894" y="213" type="curve" smooth="yes" name="sv02"/>
       <point x="1128" y="213" type="line" name="sv03"/>
       <point x="1128" y="-12" type="line" name="ab01"/>
     </contour>
     <contour>
-      <point x="567" y="1299" type="curve" name="dv01" smooth="yes"/>
+      <point x="567" y="1299" type="curve" smooth="yes" name="dv01"/>
       <point x="466" y="1299"/>
       <point x="385" y="1323"/>
       <point x="325" y="1376" type="curve" smooth="yes"/>
@@ -39,7 +39,7 @@
       <point x="434" y="1490" type="curve" smooth="yes"/>
       <point x="467" y="1465"/>
       <point x="512" y="1452"/>
-      <point x="568" y="1452" type="curve" name="dv02" smooth="yes"/>
+      <point x="568" y="1452" type="curve" smooth="yes" name="dv02"/>
       <point x="623" y="1452"/>
       <point x="667" y="1464"/>
       <point x="700" y="1489" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/icircumflex.glif b/source/Hack-Bold.ufo/glyphs/icircumflex.glif
index 21252baa2..063f9e448 100644
--- a/source/Hack-Bold.ufo/glyphs/icircumflex.glif
+++ b/source/Hack-Bold.ufo/glyphs/icircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="icircumflex" format="1">
+<glyph name="icircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00EE"/>
   <outline>
@@ -13,24 +13,24 @@
       <point x="184" y="1297" type="line" name="iv02"/>
     </contour>
     <contour>
-      <point x="812" y="-12" type="line" name="ab01" smooth="yes"/>
+      <point x="812" y="-12" type="line" smooth="yes" name="ab01"/>
       <point x="673" y="-12"/>
       <point x="573" y="24"/>
       <point x="512" y="96" type="curve" smooth="yes"/>
       <point x="451" y="167"/>
       <point x="421" y="287"/>
-      <point x="421" y="455" type="curve" name="dh01" smooth="yes"/>
+      <point x="421" y="455" type="curve" smooth="yes" name="dh01"/>
       <point x="421" y="895" type="line" name="sv01"/>
       <point x="184" y="895" type="line"/>
       <point x="184" y="1120" type="line" name="at01"/>
       <point x="714" y="1120" type="line"/>
-      <point x="714" y="455" type="line" name="dh02" smooth="yes"/>
+      <point x="714" y="455" type="line" smooth="yes" name="dh02"/>
       <point x="714" y="368"/>
       <point x="728" y="305"/>
       <point x="755" y="268" type="curve" smooth="yes"/>
       <point x="782" y="231"/>
       <point x="828" y="213"/>
-      <point x="894" y="213" type="curve" name="sv02" smooth="yes"/>
+      <point x="894" y="213" type="curve" smooth="yes" name="sv02"/>
       <point x="1128" y="213" type="line"/>
       <point x="1128" y="-12" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/idieresis.glif b/source/Hack-Bold.ufo/glyphs/idieresis.glif
index e0de4be48..295ecd131 100644
--- a/source/Hack-Bold.ufo/glyphs/idieresis.glif
+++ b/source/Hack-Bold.ufo/glyphs/idieresis.glif
@@ -1,63 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="idieresis" format="1">
+<glyph name="idieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00EF"/>
   <outline>
     <contour>
-      <point x="261" y="1347" type="line" name="sv01" smooth="yes"/>
+      <point x="261" y="1347" type="line" smooth="yes" name="sv01"/>
       <point x="241" y="1347"/>
       <point x="231" y="1357"/>
-      <point x="231" y="1377" type="curve" name="dh01" smooth="yes"/>
+      <point x="231" y="1377" type="curve" smooth="yes" name="dh01"/>
       <point x="231" y="1563" type="line" smooth="yes"/>
       <point x="231" y="1583"/>
       <point x="241" y="1593"/>
-      <point x="261" y="1593" type="curve" name="at01" smooth="yes"/>
+      <point x="261" y="1593" type="curve" smooth="yes" name="at01"/>
       <point x="437" y="1593" type="line" smooth="yes"/>
       <point x="457" y="1593"/>
       <point x="467" y="1583"/>
       <point x="467" y="1563" type="curve" smooth="yes"/>
-      <point x="467" y="1377" type="line" name="dh02" smooth="yes"/>
+      <point x="467" y="1377" type="line" smooth="yes" name="dh02"/>
       <point x="467" y="1357"/>
       <point x="457" y="1347"/>
       <point x="437" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="656" y="1347" type="line" name="sv02" smooth="yes"/>
+      <point x="656" y="1347" type="line" smooth="yes" name="sv02"/>
       <point x="636" y="1347"/>
       <point x="626" y="1357"/>
-      <point x="626" y="1377" type="curve" name="dh03" smooth="yes"/>
+      <point x="626" y="1377" type="curve" smooth="yes" name="dh03"/>
       <point x="626" y="1563" type="line" smooth="yes"/>
       <point x="626" y="1583"/>
       <point x="636" y="1593"/>
-      <point x="656" y="1593" type="curve" name="at02" smooth="yes"/>
+      <point x="656" y="1593" type="curve" smooth="yes" name="at02"/>
       <point x="832" y="1593" type="line" smooth="yes"/>
       <point x="852" y="1593"/>
       <point x="862" y="1583"/>
-      <point x="862" y="1563" type="curve" name="hr01" smooth="yes"/>
-      <point x="862" y="1377" type="line" name="dh04" smooth="yes"/>
+      <point x="862" y="1563" type="curve" smooth="yes" name="hr01"/>
+      <point x="862" y="1377" type="line" smooth="yes" name="dh04"/>
       <point x="862" y="1357"/>
       <point x="852" y="1347"/>
-      <point x="832" y="1347" type="curve" name="sv03" smooth="yes"/>
+      <point x="832" y="1347" type="curve" smooth="yes" name="sv03"/>
     </contour>
     <contour>
-      <point x="812" y="-12" type="line" name="ab01" smooth="yes"/>
+      <point x="812" y="-12" type="line" smooth="yes" name="ab01"/>
       <point x="673" y="-12"/>
       <point x="573" y="24"/>
       <point x="512" y="96" type="curve" smooth="yes"/>
       <point x="451" y="167"/>
       <point x="421" y="287"/>
-      <point x="421" y="455" type="curve" name="ih01" smooth="yes"/>
+      <point x="421" y="455" type="curve" smooth="yes" name="ih01"/>
       <point x="421" y="895" type="line" name="sv04"/>
       <point x="184" y="895" type="line"/>
       <point x="184" y="1120" type="line" name="at03"/>
       <point x="714" y="1120" type="line"/>
-      <point x="714" y="455" type="line" name="sh01" smooth="yes"/>
+      <point x="714" y="455" type="line" smooth="yes" name="sh01"/>
       <point x="714" y="368"/>
       <point x="728" y="305"/>
       <point x="755" y="268" type="curve" smooth="yes"/>
       <point x="782" y="231"/>
       <point x="828" y="213"/>
-      <point x="894" y="213" type="curve" name="sv05" smooth="yes"/>
+      <point x="894" y="213" type="curve" smooth="yes" name="sv05"/>
       <point x="1128" y="213" type="line"/>
       <point x="1128" y="-12" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/igrave.glif b/source/Hack-Bold.ufo/glyphs/igrave.glif
index dc31b5c95..c88bfd307 100644
--- a/source/Hack-Bold.ufo/glyphs/igrave.glif
+++ b/source/Hack-Bold.ufo/glyphs/igrave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="igrave" format="1">
+<glyph name="igrave" format="2">
   <advance width="1233"/>
   <unicode hex="00EC"/>
   <outline>
@@ -10,24 +10,24 @@
       <point x="527" y="1307" type="line"/>
     </contour>
     <contour>
-      <point x="822" y="-12" type="line" name="ab01" smooth="yes"/>
+      <point x="822" y="-12" type="line" smooth="yes" name="ab01"/>
       <point x="683" y="-12"/>
       <point x="583" y="24"/>
       <point x="522" y="96" type="curve" smooth="yes"/>
       <point x="461" y="167"/>
       <point x="431" y="287"/>
-      <point x="431" y="455" type="curve" name="dh01" smooth="yes"/>
+      <point x="431" y="455" type="curve" smooth="yes" name="dh01"/>
       <point x="431" y="895" type="line" name="sv01"/>
       <point x="184" y="895" type="line"/>
       <point x="184" y="1120" type="line" name="at01"/>
       <point x="724" y="1120" type="line"/>
-      <point x="724" y="455" type="line" name="dh02" smooth="yes"/>
+      <point x="724" y="455" type="line" smooth="yes" name="dh02"/>
       <point x="724" y="368"/>
       <point x="738" y="305"/>
       <point x="765" y="268" type="curve" smooth="yes"/>
       <point x="792" y="231"/>
       <point x="838" y="213"/>
-      <point x="904" y="213" type="curve" name="sv02" smooth="yes"/>
+      <point x="904" y="213" type="curve" smooth="yes" name="sv02"/>
       <point x="1138" y="213" type="line"/>
       <point x="1138" y="-12" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/ij.glif b/source/Hack-Bold.ufo/glyphs/ij.glif
index da7768389..906651d47 100644
--- a/source/Hack-Bold.ufo/glyphs/ij.glif
+++ b/source/Hack-Bold.ufo/glyphs/ij.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ij" format="1">
+<glyph name="ij" format="2">
   <advance width="1233"/>
   <unicode hex="0133"/>
   <outline>
     <contour>
-      <point x="131" y="1283" type="curve" name="hr00" smooth="yes"/>
+      <point x="131" y="1283" type="curve" smooth="yes" name="hr00"/>
       <point x="131" y="1565" type="line" smooth="yes"/>
       <point x="131" y="1585"/>
       <point x="141" y="1595"/>
diff --git a/source/Hack-Bold.ufo/glyphs/imacron.glif b/source/Hack-Bold.ufo/glyphs/imacron.glif
index a7674f0a9..c835d617a 100644
--- a/source/Hack-Bold.ufo/glyphs/imacron.glif
+++ b/source/Hack-Bold.ufo/glyphs/imacron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="imacron" format="1">
+<glyph name="imacron" format="2">
   <advance width="1233"/>
   <unicode hex="012B"/>
   <outline>
@@ -10,24 +10,24 @@
       <point x="230" y="1348" type="line"/>
     </contour>
     <contour>
-      <point x="812" y="-12" type="line" name="ab01" smooth="yes"/>
+      <point x="812" y="-12" type="line" smooth="yes" name="ab01"/>
       <point x="673" y="-12"/>
       <point x="573" y="24"/>
       <point x="512" y="96" type="curve" smooth="yes"/>
       <point x="451" y="167"/>
       <point x="421" y="287"/>
-      <point x="421" y="455" type="curve" name="dh01" smooth="yes"/>
+      <point x="421" y="455" type="curve" smooth="yes" name="dh01"/>
       <point x="421" y="895" type="line" name="sv01"/>
       <point x="184" y="895" type="line"/>
       <point x="184" y="1120" type="line" name="at01"/>
       <point x="714" y="1120" type="line"/>
-      <point x="714" y="455" type="line" name="dh02" smooth="yes"/>
+      <point x="714" y="455" type="line" smooth="yes" name="dh02"/>
       <point x="714" y="368"/>
       <point x="728" y="305"/>
       <point x="755" y="268" type="curve" smooth="yes"/>
       <point x="782" y="231"/>
       <point x="828" y="213"/>
-      <point x="894" y="213" type="curve" name="sv02" smooth="yes"/>
+      <point x="894" y="213" type="curve" smooth="yes" name="sv02"/>
       <point x="1128" y="213" type="line"/>
       <point x="1128" y="-12" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/infinity.glif b/source/Hack-Bold.ufo/glyphs/infinity.glif
index eb65a8231..e3f8cbeb0 100644
--- a/source/Hack-Bold.ufo/glyphs/infinity.glif
+++ b/source/Hack-Bold.ufo/glyphs/infinity.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="infinity" format="1">
+<glyph name="infinity" format="2">
   <advance width="1233"/>
   <unicode hex="221E"/>
   <outline>
     <contour>
-      <point x="331" y="223" type="curve" name="hr00" smooth="yes"/>
+      <point x="331" y="223" type="curve" smooth="yes" name="hr00"/>
       <point x="240" y="223"/>
       <point x="164" y="262"/>
       <point x="103" y="339" type="curve" smooth="yes"/>
       <point x="42" y="416"/>
       <point x="12" y="510"/>
-      <point x="12" y="634" type="curve" name="sh01" smooth="yes"/>
+      <point x="12" y="634" type="curve" smooth="yes" name="sh01"/>
       <point x="12" y="755"/>
       <point x="40" y="854"/>
       <point x="99" y="929" type="curve" smooth="yes"/>
       <point x="159" y="1006"/>
       <point x="236" y="1040"/>
-      <point x="328" y="1040" type="curve" name="dv03" smooth="yes"/>
+      <point x="328" y="1040" type="curve" smooth="yes" name="dv03"/>
       <point x="391" y="1040"/>
       <point x="447" y="1023"/>
       <point x="494" y="988" type="curve" smooth="yes"/>
@@ -28,19 +28,19 @@
       <point x="731" y="989" type="curve" smooth="yes"/>
       <point x="778" y="1023"/>
       <point x="834" y="1040"/>
-      <point x="901" y="1040" type="curve" name="sv01" smooth="yes"/>
+      <point x="901" y="1040" type="curve" smooth="yes" name="sv01"/>
       <point x="998" y="1040"/>
       <point x="1076" y="1003"/>
       <point x="1134" y="928" type="curve" smooth="yes"/>
       <point x="1192" y="853"/>
       <point x="1221" y="754"/>
-      <point x="1221" y="633" type="curve" name="sh02" smooth="yes"/>
+      <point x="1221" y="633" type="curve" smooth="yes" name="sh02"/>
       <point x="1221" y="510"/>
       <point x="1191" y="415"/>
       <point x="1131" y="338" type="curve" smooth="yes"/>
       <point x="1071" y="261"/>
       <point x="995" y="223"/>
-      <point x="904" y="223" type="curve" name="sv02" smooth="yes"/>
+      <point x="904" y="223" type="curve" smooth="yes" name="sv02"/>
       <point x="785" y="223"/>
       <point x="703" y="285"/>
       <point x="616" y="428" type="curve" name="ih02"/>
@@ -48,7 +48,7 @@
       <point x="448" y="223"/>
     </contour>
     <contour>
-      <point x="319" y="422" type="curve" name="dv01" smooth="yes"/>
+      <point x="319" y="422" type="curve" smooth="yes" name="dv01"/>
       <point x="355" y="422"/>
       <point x="388" y="439"/>
       <point x="419" y="474" type="curve" smooth="yes"/>
@@ -60,13 +60,13 @@
       <point x="415" y="801" type="curve" smooth="yes"/>
       <point x="388" y="830"/>
       <point x="360" y="842"/>
-      <point x="329" y="842" type="curve" name="dv02" smooth="yes"/>
+      <point x="329" y="842" type="curve" smooth="yes" name="dv02"/>
       <point x="289" y="842"/>
       <point x="256" y="820"/>
       <point x="233" y="785" type="curve" smooth="yes"/>
       <point x="209" y="748"/>
       <point x="195" y="693"/>
-      <point x="195" y="628" type="curve" name="sh03" smooth="yes"/>
+      <point x="195" y="628" type="curve" smooth="yes" name="sh03"/>
       <point x="195" y="571"/>
       <point x="206" y="517"/>
       <point x="229" y="478" type="curve" smooth="yes"/>
@@ -74,19 +74,19 @@
       <point x="281" y="422"/>
     </contour>
     <contour>
-      <point x="903" y="422" type="curve" name="sv03" smooth="yes"/>
+      <point x="903" y="422" type="curve" smooth="yes" name="sv03"/>
       <point x="942" y="422"/>
       <point x="975" y="443"/>
       <point x="999" y="480" type="curve" smooth="yes"/>
       <point x="1024" y="519"/>
       <point x="1036" y="572"/>
-      <point x="1036" y="635" type="curve" name="ah01" smooth="yes"/>
+      <point x="1036" y="635" type="curve" smooth="yes" name="ah01"/>
       <point x="1036" y="695"/>
       <point x="1026" y="746"/>
       <point x="1003" y="785" type="curve" smooth="yes"/>
       <point x="982" y="821"/>
       <point x="951" y="842"/>
-      <point x="912" y="842" type="curve" name="sv04" smooth="yes"/>
+      <point x="912" y="842" type="curve" smooth="yes" name="sv04"/>
       <point x="875" y="842"/>
       <point x="841" y="824"/>
       <point x="808" y="787" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/integral.glif b/source/Hack-Bold.ufo/glyphs/integral.glif
index 3a8c8534b..3e335d594 100644
--- a/source/Hack-Bold.ufo/glyphs/integral.glif
+++ b/source/Hack-Bold.ufo/glyphs/integral.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="integral" format="1">
+<glyph name="integral" format="2">
   <advance width="1233"/>
   <unicode hex="222B"/>
   <outline>
     <contour>
-      <point x="291" y="-373" type="curve" name="dv01" smooth="yes"/>
+      <point x="291" y="-373" type="curve" smooth="yes" name="dv01"/>
       <point x="222" y="-373"/>
       <point x="167" y="-355"/>
       <point x="131" y="-324" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="111" y="-98" type="curve" smooth="yes"/>
       <point x="136" y="-73"/>
       <point x="169" y="-61"/>
-      <point x="210" y="-61" type="curve" name="sv01" smooth="yes"/>
+      <point x="210" y="-61" type="curve" smooth="yes" name="sv01"/>
       <point x="247" y="-61"/>
       <point x="277" y="-71"/>
       <point x="301" y="-92" type="curve" smooth="yes"/>
@@ -28,19 +28,19 @@
       <point x="342" y="-237" type="curve" smooth="yes"/>
       <point x="345" y="-244"/>
       <point x="351" y="-252"/>
-      <point x="366" y="-252" type="curve" name="dv02" smooth="yes"/>
+      <point x="366" y="-252" type="curve" smooth="yes" name="dv02"/>
       <point x="443" y="-252"/>
       <point x="466" y="-40"/>
       <point x="485" y="387" type="curve"/>
       <point x="485" y="414"/>
       <point x="489" y="528"/>
-      <point x="492" y="599" type="curve" name="hr01" smooth="yes"/>
+      <point x="492" y="599" type="curve" smooth="yes" name="hr01"/>
       <point x="505" y="939"/>
       <point x="540" y="1175"/>
       <point x="615" y="1330" type="curve" smooth="yes"/>
       <point x="683" y="1471"/>
       <point x="788" y="1554"/>
-      <point x="941" y="1554" type="curve" name="at01" smooth="yes"/>
+      <point x="941" y="1554" type="curve" smooth="yes" name="at01"/>
       <point x="1008" y="1554"/>
       <point x="1061" y="1538"/>
       <point x="1100" y="1505" type="curve" smooth="yes"/>
@@ -52,7 +52,7 @@
       <point x="1121" y="1279" type="curve" smooth="yes"/>
       <point x="1096" y="1255"/>
       <point x="1060" y="1243"/>
-      <point x="1021" y="1243" type="curve" name="sv02" smooth="yes"/>
+      <point x="1021" y="1243" type="curve" smooth="yes" name="sv02"/>
       <point x="991" y="1243"/>
       <point x="966" y="1251"/>
       <point x="945" y="1267" type="curve" smooth="yes"/>
@@ -64,7 +64,7 @@
       <point x="896" y="1390" type="curve" smooth="yes"/>
       <point x="893" y="1410"/>
       <point x="890" y="1436"/>
-      <point x="867" y="1436" type="curve" name="sv03" smooth="yes"/>
+      <point x="867" y="1436" type="curve" smooth="yes" name="sv03"/>
       <point x="799" y="1436"/>
       <point x="762" y="1223"/>
       <point x="747" y="802" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/integralbt.glif b/source/Hack-Bold.ufo/glyphs/integralbt.glif
index d53cd7c5a..9d55316f7 100644
--- a/source/Hack-Bold.ufo/glyphs/integralbt.glif
+++ b/source/Hack-Bold.ufo/glyphs/integralbt.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="integralbt" format="1">
+<glyph name="integralbt" format="2">
   <advance width="1233"/>
   <unicode hex="2321"/>
   <outline>
     <contour>
-      <point x="288" y="-490" type="curve" name="hr00" smooth="yes"/>
+      <point x="288" y="-490" type="curve" smooth="yes" name="hr00"/>
       <point x="153" y="-490"/>
       <point x="67" y="-419"/>
       <point x="67" y="-315" type="curve" smooth="yes"/>
@@ -19,19 +19,19 @@
       <point x="330" y="-326" type="curve" smooth="yes"/>
       <point x="333" y="-353"/>
       <point x="340" y="-372"/>
-      <point x="359" y="-372" type="curve" name="sv01" smooth="yes"/>
+      <point x="359" y="-372" type="curve" smooth="yes" name="sv01"/>
       <point x="422" y="-372"/>
       <point x="460" y="-166"/>
-      <point x="479" y="262" type="curve" name="sh01" smooth="yes"/>
+      <point x="479" y="262" type="curve" smooth="yes" name="sh01"/>
       <point x="483" y="357"/>
       <point x="485" y="416"/>
-      <point x="485" y="440" type="curve" name="dh01" smooth="yes"/>
+      <point x="485" y="440" type="curve" smooth="yes" name="dh01"/>
       <point x="485" y="1926" type="line" name="av01"/>
       <point x="741" y="1926" type="line"/>
-      <point x="741" y="677" type="line" name="dh02" smooth="yes"/>
+      <point x="741" y="677" type="line" smooth="yes" name="dh02"/>
       <point x="741" y="672"/>
       <point x="739" y="605"/>
-      <point x="734" y="465" type="curve" name="sh02" smooth="yes"/>
+      <point x="734" y="465" type="curve" smooth="yes" name="sh02"/>
       <point x="721" y="128"/>
       <point x="685" y="-113"/>
       <point x="612" y="-266" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/integraltp.glif b/source/Hack-Bold.ufo/glyphs/integraltp.glif
index 6f8f3d3e1..ededd23c4 100644
--- a/source/Hack-Bold.ufo/glyphs/integraltp.glif
+++ b/source/Hack-Bold.ufo/glyphs/integraltp.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="integraltp" format="1">
+<glyph name="integraltp" format="2">
   <advance width="1233"/>
   <unicode hex="2320"/>
   <outline>
     <contour>
-      <point x="485" y="727" type="line" name="dh01" smooth="yes"/>
+      <point x="485" y="727" type="line" smooth="yes" name="dh01"/>
       <point x="485" y="732"/>
       <point x="487" y="799"/>
-      <point x="492" y="939" type="curve" name="sh01" smooth="yes"/>
+      <point x="492" y="939" type="curve" smooth="yes" name="sh01"/>
       <point x="505" y="1276"/>
       <point x="541" y="1517"/>
       <point x="614" y="1670" type="curve" smooth="yes"/>
       <point x="683" y="1815"/>
       <point x="794" y="1894"/>
-      <point x="938" y="1894" type="curve" name="dv02" smooth="yes"/>
+      <point x="938" y="1894" type="curve" smooth="yes" name="dv02"/>
       <point x="1073" y="1894"/>
       <point x="1159" y="1823"/>
       <point x="1159" y="1719" type="curve" smooth="yes"/>
       <point x="1159" y="1635"/>
       <point x="1104" y="1583"/>
-      <point x="1024" y="1583" type="curve" name="sv01" smooth="yes"/>
+      <point x="1024" y="1583" type="curve" smooth="yes" name="sv01"/>
       <point x="955" y="1583"/>
       <point x="916" y="1621"/>
       <point x="903" y="1676" type="curve" smooth="yes"/>
       <point x="900" y="1689"/>
       <point x="897" y="1711"/>
-      <point x="896" y="1730" type="curve" name="hr01" smooth="yes"/>
+      <point x="896" y="1730" type="curve" smooth="yes" name="hr01"/>
       <point x="893" y="1757"/>
       <point x="886" y="1776"/>
-      <point x="867" y="1776" type="curve" name="dv01" smooth="yes"/>
+      <point x="867" y="1776" type="curve" smooth="yes" name="dv01"/>
       <point x="804" y="1776"/>
       <point x="766" y="1570"/>
-      <point x="747" y="1142" type="curve" name="sh02" smooth="yes"/>
+      <point x="747" y="1142" type="curve" smooth="yes" name="sh02"/>
       <point x="743" y="1047"/>
       <point x="741" y="987"/>
-      <point x="741" y="964" type="curve" name="dh02" smooth="yes"/>
+      <point x="741" y="964" type="curve" smooth="yes" name="dh02"/>
       <point x="741" y="-512" type="line" name="av01"/>
       <point x="485" y="-512" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/intersection.glif b/source/Hack-Bold.ufo/glyphs/intersection.glif
index 92bea0238..8bc6952f4 100644
--- a/source/Hack-Bold.ufo/glyphs/intersection.glif
+++ b/source/Hack-Bold.ufo/glyphs/intersection.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="intersection" format="1">
+<glyph name="intersection" format="2">
   <advance width="1233"/>
   <unicode hex="2229"/>
   <outline>
     <contour>
-      <point x="182" y="602" type="line" name="hr00" smooth="yes"/>
+      <point x="182" y="602" type="line" smooth="yes" name="hr00"/>
       <point x="182" y="1013"/>
       <point x="312" y="1186"/>
-      <point x="616" y="1186" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1186" type="curve" smooth="yes" name="dv02"/>
       <point x="920" y="1186"/>
       <point x="1050" y="1013"/>
       <point x="1050" y="602" type="curve" smooth="yes"/>
@@ -16,10 +16,10 @@
       <point x="799" y="676" type="line" smooth="yes"/>
       <point x="799" y="832"/>
       <point x="732" y="919"/>
-      <point x="616" y="919" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="919" type="curve" smooth="yes" name="dv01"/>
       <point x="500" y="919"/>
       <point x="433" y="832"/>
-      <point x="433" y="676" type="curve" name="sh02" smooth="yes"/>
+      <point x="433" y="676" type="curve" smooth="yes" name="sh02"/>
       <point x="433" y="0" type="line" name="ab01"/>
       <point x="182" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/invbullet.glif b/source/Hack-Bold.ufo/glyphs/invbullet.glif
index e07eaa736..bf40bf663 100644
--- a/source/Hack-Bold.ufo/glyphs/invbullet.glif
+++ b/source/Hack-Bold.ufo/glyphs/invbullet.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="invbullet" format="1">
+<glyph name="invbullet" format="2">
   <advance width="1233"/>
   <unicode hex="25D8"/>
   <outline>
@@ -10,25 +10,25 @@
       <point x="-20" y="-20" type="line" name="sh02"/>
     </contour>
     <contour>
-      <point x="615" y="399" type="curve" name="sv01" smooth="yes"/>
+      <point x="615" y="399" type="curve" smooth="yes" name="sv01"/>
       <point x="710" y="399"/>
       <point x="798" y="434"/>
       <point x="870" y="506" type="curve" smooth="yes"/>
       <point x="939" y="575"/>
       <point x="977" y="664"/>
-      <point x="977" y="763" type="curve" name="ah01" smooth="yes"/>
+      <point x="977" y="763" type="curve" smooth="yes" name="ah01"/>
       <point x="977" y="859"/>
       <point x="942" y="947"/>
       <point x="870" y="1016" type="curve" smooth="yes"/>
       <point x="802" y="1083"/>
       <point x="715" y="1120"/>
-      <point x="618" y="1120" type="curve" name="dv01" smooth="yes"/>
+      <point x="618" y="1120" type="curve" smooth="yes" name="dv01"/>
       <point x="518" y="1120"/>
       <point x="429" y="1081"/>
       <point x="362" y="1016" type="curve" smooth="yes"/>
       <point x="294" y="948"/>
       <point x="256" y="861"/>
-      <point x="256" y="761" type="curve" name="sh03" smooth="yes"/>
+      <point x="256" y="761" type="curve" smooth="yes" name="sh03"/>
       <point x="256" y="664"/>
       <point x="292" y="574"/>
       <point x="360" y="506" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/invcircle.glif b/source/Hack-Bold.ufo/glyphs/invcircle.glif
index d98a3f13b..60142c83c 100644
--- a/source/Hack-Bold.ufo/glyphs/invcircle.glif
+++ b/source/Hack-Bold.ufo/glyphs/invcircle.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="invcircle" format="1">
+<glyph name="invcircle" format="2">
   <advance width="1233"/>
   <unicode hex="25D9"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="-20" y="-512" type="line"/>
     </contour>
     <contour>
-      <point x="617" y="-84" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="-84"/>
       <point x="818" y="-56"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="818" y="1120"/>
       <point x="710" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv03"/>
       <point x="524" y="1148"/>
       <point x="413" y="1119"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/iogonek.glif b/source/Hack-Bold.ufo/glyphs/iogonek.glif
index ae08cae00..4bc84357a 100644
--- a/source/Hack-Bold.ufo/glyphs/iogonek.glif
+++ b/source/Hack-Bold.ufo/glyphs/iogonek.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="iogonek" format="1">
+<glyph name="iogonek" format="2">
   <advance width="1233"/>
   <unicode hex="012F"/>
   <outline>
     <contour>
-      <point x="451" y="1323" type="line" name="dv03" smooth="yes"/>
+      <point x="451" y="1323" type="line" smooth="yes" name="dv03"/>
       <point x="431" y="1323"/>
       <point x="421" y="1333"/>
-      <point x="421" y="1353" type="curve" name="dh01" smooth="yes"/>
+      <point x="421" y="1353" type="curve" smooth="yes" name="dh01"/>
       <point x="421" y="1635" type="line" smooth="yes"/>
       <point x="421" y="1655"/>
       <point x="431" y="1665"/>
-      <point x="451" y="1665" type="curve" name="dv04" smooth="yes"/>
-      <point x="684" y="1665" type="line" name="hr01" smooth="yes"/>
+      <point x="451" y="1665" type="curve" smooth="yes" name="dv04"/>
+      <point x="684" y="1665" type="line" smooth="yes" name="hr01"/>
       <point x="704" y="1665"/>
       <point x="714" y="1655"/>
       <point x="714" y="1635" type="curve" smooth="yes"/>
-      <point x="714" y="1353" type="line" name="dh02" smooth="yes"/>
+      <point x="714" y="1353" type="line" smooth="yes" name="dh02"/>
       <point x="714" y="1333"/>
       <point x="704" y="1323"/>
       <point x="684" y="1323" type="curve" smooth="yes"/>
@@ -28,40 +28,40 @@
       <point x="881" y="-108" type="curve" smooth="yes"/>
       <point x="868" y="-132"/>
       <point x="862" y="-149"/>
-      <point x="862" y="-168" type="curve" name="sh01" smooth="yes"/>
+      <point x="862" y="-168" type="curve" smooth="yes" name="sh01"/>
       <point x="862" y="-215"/>
       <point x="897" y="-256"/>
-      <point x="980" y="-256" type="curve" name="dv02" smooth="yes"/>
+      <point x="980" y="-256" type="curve" smooth="yes" name="dv02"/>
       <point x="1021" y="-256"/>
       <point x="1075" y="-246"/>
       <point x="1128" y="-225" type="curve" name="hr02"/>
       <point x="1128" y="-381" type="line"/>
       <point x="1056" y="-396"/>
       <point x="992" y="-403"/>
-      <point x="941" y="-403" type="curve" name="dv01" smooth="yes"/>
+      <point x="941" y="-403" type="curve" smooth="yes" name="dv01"/>
       <point x="785" y="-403"/>
       <point x="700" y="-341"/>
-      <point x="700" y="-226" type="curve" name="sh02" smooth="yes"/>
+      <point x="700" y="-226" type="curve" smooth="yes" name="sh02"/>
       <point x="700" y="-155"/>
       <point x="733" y="-89"/>
       <point x="802" y="-12" type="curve" name="ih01"/>
       <point x="669" y="-10"/>
       <point x="572" y="26"/>
-      <point x="512" y="96" type="curve" name="hr03" smooth="yes"/>
+      <point x="512" y="96" type="curve" smooth="yes" name="hr03"/>
       <point x="451" y="167"/>
       <point x="421" y="287"/>
-      <point x="421" y="455" type="curve" name="hr04" smooth="yes"/>
+      <point x="421" y="455" type="curve" smooth="yes" name="hr04"/>
       <point x="421" y="895" type="line" name="sv01"/>
       <point x="184" y="895" type="line"/>
       <point x="184" y="1120" type="line" name="hr05"/>
       <point x="714" y="1120" type="line" name="sh03"/>
-      <point x="714" y="455" type="line" name="sh04" smooth="yes"/>
+      <point x="714" y="455" type="line" smooth="yes" name="sh04"/>
       <point x="714" y="368"/>
       <point x="728" y="305"/>
       <point x="755" y="268" type="curve" smooth="yes"/>
       <point x="782" y="231"/>
       <point x="828" y="213"/>
-      <point x="894" y="213" type="curve" name="sv02" smooth="yes"/>
+      <point x="894" y="213" type="curve" smooth="yes" name="sv02"/>
       <point x="1128" y="213" type="line" name="sh05"/>
       <point x="1128" y="-12" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/iota.glif b/source/Hack-Bold.ufo/glyphs/iota.glif
index f01aa5fa9..572458f29 100644
--- a/source/Hack-Bold.ufo/glyphs/iota.glif
+++ b/source/Hack-Bold.ufo/glyphs/iota.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="iota" format="1">
+<glyph name="iota" format="2">
   <advance width="1233"/>
   <unicode hex="03B9"/>
   <outline>
     <contour>
-      <point x="901" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="901" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="565" y="-8"/>
       <point x="471" y="75"/>
-      <point x="471" y="371" type="curve" name="sh01" smooth="yes"/>
+      <point x="471" y="371" type="curve" smooth="yes" name="sh01"/>
       <point x="471" y="895" type="line" name="sv01"/>
       <point x="270" y="895" type="line" name="hr01"/>
       <point x="270" y="1120" type="line" name="dh01"/>
@@ -15,7 +15,7 @@
       <point x="763" y="357" type="line" smooth="yes"/>
       <point x="763" y="258"/>
       <point x="809" y="217"/>
-      <point x="921" y="217" type="curve" name="hr02" smooth="yes"/>
+      <point x="921" y="217" type="curve" smooth="yes" name="hr02"/>
       <point x="979" y="217" type="line" name="hr03"/>
       <point x="979" y="-8" type="line" name="ab02"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/iotadieresis.glif b/source/Hack-Bold.ufo/glyphs/iotadieresis.glif
index 649c53ae0..640327840 100644
--- a/source/Hack-Bold.ufo/glyphs/iotadieresis.glif
+++ b/source/Hack-Bold.ufo/glyphs/iotadieresis.glif
@@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="iotadieresis" format="1">
+<glyph name="iotadieresis" format="2">
   <advance width="1233"/>
   <unicode hex="03CA"/>
   <outline>
     <contour>
-      <point x="331" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="331" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="311" y="1320"/>
       <point x="301" y="1330"/>
-      <point x="301" y="1350" type="curve" name="ih01" smooth="yes"/>
+      <point x="301" y="1350" type="curve" smooth="yes" name="ih01"/>
       <point x="301" y="1536" type="line" smooth="yes"/>
       <point x="301" y="1556"/>
       <point x="311" y="1566"/>
-      <point x="331" y="1566" type="curve" name="hr01" smooth="yes"/>
+      <point x="331" y="1566" type="curve" smooth="yes" name="hr01"/>
       <point x="507" y="1566" type="line" smooth="yes"/>
       <point x="527" y="1566"/>
       <point x="537" y="1556"/>
       <point x="537" y="1536" type="curve" smooth="yes"/>
-      <point x="537" y="1350" type="line" name="sh01" smooth="yes"/>
+      <point x="537" y="1350" type="line" smooth="yes" name="sh01"/>
       <point x="537" y="1330"/>
       <point x="527" y="1320"/>
-      <point x="507" y="1320" type="curve" name="hr02" smooth="yes"/>
+      <point x="507" y="1320" type="curve" smooth="yes" name="hr02"/>
     </contour>
     <contour>
-      <point x="726" y="1320" type="line" name="hr03" smooth="yes"/>
+      <point x="726" y="1320" type="line" smooth="yes" name="hr03"/>
       <point x="706" y="1320"/>
       <point x="696" y="1330"/>
-      <point x="696" y="1350" type="curve" name="ih02" smooth="yes"/>
+      <point x="696" y="1350" type="curve" smooth="yes" name="ih02"/>
       <point x="696" y="1536" type="line" smooth="yes"/>
       <point x="696" y="1556"/>
       <point x="706" y="1566"/>
-      <point x="726" y="1566" type="curve" name="hr04" smooth="yes"/>
+      <point x="726" y="1566" type="curve" smooth="yes" name="hr04"/>
       <point x="902" y="1566" type="line" smooth="yes"/>
       <point x="922" y="1566"/>
       <point x="932" y="1556"/>
       <point x="932" y="1536" type="curve" smooth="yes"/>
-      <point x="932" y="1350" type="line" name="sh02" smooth="yes"/>
+      <point x="932" y="1350" type="line" smooth="yes" name="sh02"/>
       <point x="932" y="1330"/>
       <point x="922" y="1320"/>
-      <point x="902" y="1320" type="curve" name="sv02" smooth="yes"/>
+      <point x="902" y="1320" type="curve" smooth="yes" name="sv02"/>
     </contour>
     <contour>
-      <point x="901" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="901" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="565" y="-8"/>
       <point x="471" y="75"/>
-      <point x="471" y="371" type="curve" name="sh03" smooth="yes"/>
+      <point x="471" y="371" type="curve" smooth="yes" name="sh03"/>
       <point x="471" y="895" type="line" name="sv03"/>
       <point x="270" y="895" type="line"/>
       <point x="270" y="1120" type="line" name="dh01"/>
@@ -51,7 +51,7 @@
       <point x="763" y="357" type="line" smooth="yes"/>
       <point x="763" y="258"/>
       <point x="809" y="217"/>
-      <point x="921" y="217" type="curve" name="sv04" smooth="yes"/>
+      <point x="921" y="217" type="curve" smooth="yes" name="sv04"/>
       <point x="979" y="217" type="line" name="sh04"/>
       <point x="979" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/iotadieresistonos.glif b/source/Hack-Bold.ufo/glyphs/iotadieresistonos.glif
index 7756f5889..23aa11e56 100644
--- a/source/Hack-Bold.ufo/glyphs/iotadieresistonos.glif
+++ b/source/Hack-Bold.ufo/glyphs/iotadieresistonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="iotadieresistonos" format="1">
+<glyph name="iotadieresistonos" format="2">
   <advance width="1233"/>
   <unicode hex="0390"/>
   <outline>
@@ -10,54 +10,54 @@
       <point x="469" y="1515" type="line" name="hr01"/>
     </contour>
     <contour>
-      <point x="211" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="211" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="191" y="1320"/>
       <point x="181" y="1330"/>
-      <point x="181" y="1350" type="curve" name="dh01" smooth="yes"/>
+      <point x="181" y="1350" type="curve" smooth="yes" name="dh01"/>
       <point x="181" y="1536" type="line" smooth="yes"/>
       <point x="181" y="1556"/>
       <point x="191" y="1566"/>
-      <point x="211" y="1566" type="curve" name="hr02" smooth="yes"/>
-      <point x="387" y="1566" type="line" name="hr03" smooth="yes"/>
+      <point x="211" y="1566" type="curve" smooth="yes" name="hr02"/>
+      <point x="387" y="1566" type="line" smooth="yes" name="hr03"/>
       <point x="407" y="1566"/>
       <point x="417" y="1556"/>
       <point x="417" y="1536" type="curve" smooth="yes"/>
-      <point x="417" y="1350" type="line" name="dh02" smooth="yes"/>
+      <point x="417" y="1350" type="line" smooth="yes" name="dh02"/>
       <point x="417" y="1330"/>
       <point x="407" y="1320"/>
-      <point x="387" y="1320" type="curve" name="hr04" smooth="yes"/>
+      <point x="387" y="1320" type="curve" smooth="yes" name="hr04"/>
     </contour>
     <contour>
-      <point x="816" y="1320" type="line" name="sv02" smooth="yes"/>
+      <point x="816" y="1320" type="line" smooth="yes" name="sv02"/>
       <point x="796" y="1320"/>
       <point x="786" y="1330"/>
-      <point x="786" y="1350" type="curve" name="dh03" smooth="yes"/>
+      <point x="786" y="1350" type="curve" smooth="yes" name="dh03"/>
       <point x="786" y="1536" type="line" smooth="yes"/>
       <point x="786" y="1556"/>
       <point x="796" y="1566"/>
-      <point x="816" y="1566" type="curve" name="at02" smooth="yes"/>
+      <point x="816" y="1566" type="curve" smooth="yes" name="at02"/>
       <point x="992" y="1566" type="line" smooth="yes"/>
       <point x="1012" y="1566"/>
       <point x="1022" y="1556"/>
       <point x="1022" y="1536" type="curve" smooth="yes"/>
-      <point x="1022" y="1350" type="line" name="dh04" smooth="yes"/>
+      <point x="1022" y="1350" type="line" smooth="yes" name="dh04"/>
       <point x="1022" y="1330"/>
       <point x="1012" y="1320"/>
-      <point x="992" y="1320" type="curve" name="sv03" smooth="yes"/>
+      <point x="992" y="1320" type="curve" smooth="yes" name="sv03"/>
     </contour>
     <contour>
-      <point x="901" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="901" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="565" y="-8"/>
       <point x="471" y="75"/>
-      <point x="471" y="371" type="curve" name="sh02" smooth="yes"/>
+      <point x="471" y="371" type="curve" smooth="yes" name="sh02"/>
       <point x="471" y="895" type="line" name="sv04"/>
       <point x="270" y="895" type="line"/>
       <point x="270" y="1120" type="line" name="ih01"/>
       <point x="763" y="1120" type="line" name="sh01"/>
-      <point x="763" y="357" type="line" name="hr05" smooth="yes"/>
+      <point x="763" y="357" type="line" smooth="yes" name="hr05"/>
       <point x="763" y="258"/>
       <point x="809" y="217"/>
-      <point x="921" y="217" type="curve" name="sv05" smooth="yes"/>
+      <point x="921" y="217" type="curve" smooth="yes" name="sv05"/>
       <point x="979" y="217" type="line" name="sh03"/>
       <point x="979" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/iotatonos.glif b/source/Hack-Bold.ufo/glyphs/iotatonos.glif
index f80b52d7a..fc5ba9da8 100644
--- a/source/Hack-Bold.ufo/glyphs/iotatonos.glif
+++ b/source/Hack-Bold.ufo/glyphs/iotatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="iotatonos" format="1">
+<glyph name="iotatonos" format="2">
   <advance width="1233"/>
   <unicode hex="03AF"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="469" y="1272" type="line" name="hr01"/>
     </contour>
     <contour>
-      <point x="901" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="901" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="565" y="-8"/>
       <point x="471" y="75"/>
-      <point x="471" y="371" type="curve" name="sh01" smooth="yes"/>
+      <point x="471" y="371" type="curve" smooth="yes" name="sh01"/>
       <point x="471" y="895" type="line" name="sv01"/>
       <point x="270" y="895" type="line" name="hr02"/>
       <point x="270" y="1120" type="line" name="hr03"/>
@@ -21,7 +21,7 @@
       <point x="763" y="357" type="line" smooth="yes"/>
       <point x="763" y="258"/>
       <point x="809" y="217"/>
-      <point x="921" y="217" type="curve" name="sv02" smooth="yes"/>
+      <point x="921" y="217" type="curve" smooth="yes" name="sv02"/>
       <point x="979" y="217" type="line" name="sh02"/>
       <point x="979" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/itilde.glif b/source/Hack-Bold.ufo/glyphs/itilde.glif
index d15f44189..f1e43a1f0 100644
--- a/source/Hack-Bold.ufo/glyphs/itilde.glif
+++ b/source/Hack-Bold.ufo/glyphs/itilde.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="itilde" format="1">
+<glyph name="itilde" format="2">
   <advance width="1233"/>
   <unicode hex="0129"/>
   <outline>
     <contour>
-      <point x="714" y="1270" type="curve" name="dv01" smooth="yes"/>
+      <point x="714" y="1270" type="curve" smooth="yes" name="dv01"/>
       <point x="673" y="1270"/>
       <point x="635" y="1281"/>
       <point x="568" y="1327" type="curve" smooth="yes"/>
@@ -12,7 +12,7 @@
       <point x="501" y="1372" type="line" smooth="yes"/>
       <point x="472" y="1391"/>
       <point x="450" y="1401"/>
-      <point x="429" y="1401" type="curve" name="sv01" smooth="yes"/>
+      <point x="429" y="1401" type="curve" smooth="yes" name="sv01"/>
       <point x="384" y="1401"/>
       <point x="358" y="1357"/>
       <point x="358" y="1280" type="curve" smooth="yes"/>
@@ -20,41 +20,41 @@
       <point x="218" y="1272" type="line"/>
       <point x="218" y="1455"/>
       <point x="290" y="1556"/>
-      <point x="415" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="415" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="466" y="1556"/>
       <point x="507" y="1539"/>
       <point x="564" y="1499" type="curve" smooth="yes"/>
       <point x="626" y="1456" type="line" smooth="yes"/>
       <point x="653" y="1437"/>
       <point x="677" y="1425"/>
-      <point x="701" y="1425" type="curve" name="dv02" smooth="yes"/>
+      <point x="701" y="1425" type="curve" smooth="yes" name="dv02"/>
       <point x="748" y="1425"/>
       <point x="775" y="1470"/>
-      <point x="775" y="1546" type="curve" name="at02" smooth="yes"/>
+      <point x="775" y="1546" type="curve" smooth="yes" name="at02"/>
       <point x="775" y="1554" type="line"/>
       <point x="915" y="1554" type="line" name="at03"/>
       <point x="915" y="1371"/>
       <point x="845" y="1270"/>
     </contour>
     <contour>
-      <point x="812" y="-12" type="line" name="ab01" smooth="yes"/>
+      <point x="812" y="-12" type="line" smooth="yes" name="ab01"/>
       <point x="673" y="-12"/>
       <point x="573" y="24"/>
       <point x="512" y="96" type="curve" smooth="yes"/>
       <point x="451" y="167"/>
       <point x="421" y="287"/>
-      <point x="421" y="455" type="curve" name="dh01" smooth="yes"/>
+      <point x="421" y="455" type="curve" smooth="yes" name="dh01"/>
       <point x="421" y="895" type="line" name="sv03"/>
       <point x="184" y="895" type="line" name="hr01"/>
       <point x="184" y="1120" type="line" name="at04"/>
       <point x="714" y="1120" type="line"/>
-      <point x="714" y="455" type="line" name="dh02" smooth="yes"/>
+      <point x="714" y="455" type="line" smooth="yes" name="dh02"/>
       <point x="714" y="368"/>
       <point x="728" y="305"/>
       <point x="755" y="268" type="curve" smooth="yes"/>
       <point x="782" y="231"/>
       <point x="828" y="213"/>
-      <point x="894" y="213" type="curve" name="sv04" smooth="yes"/>
+      <point x="894" y="213" type="curve" smooth="yes" name="sv04"/>
       <point x="1128" y="213" type="line"/>
       <point x="1128" y="-12" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/j.glif b/source/Hack-Bold.ufo/glyphs/j.glif
index c01b94c1c..ad22fc947 100644
--- a/source/Hack-Bold.ufo/glyphs/j.glif
+++ b/source/Hack-Bold.ufo/glyphs/j.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="j" format="1">
+<glyph name="j" format="2">
   <advance width="1233"/>
   <unicode hex="006A"/>
   <outline>
@@ -39,9 +39,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/jcircumflex.glif b/source/Hack-Bold.ufo/glyphs/jcircumflex.glif
index b24478fa0..04885b01c 100644
--- a/source/Hack-Bold.ufo/glyphs/jcircumflex.glif
+++ b/source/Hack-Bold.ufo/glyphs/jcircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="jcircumflex" format="1">
+<glyph name="jcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0135"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/k.glif b/source/Hack-Bold.ufo/glyphs/k.glif
index 459883d5f..efda8c6a1 100644
--- a/source/Hack-Bold.ufo/glyphs/k.glif
+++ b/source/Hack-Bold.ufo/glyphs/k.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="k" format="1">
+<glyph name="k" format="2">
   <advance width="1233"/>
   <unicode hex="006B"/>
   <outline>
@@ -19,9 +19,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/kappa.glif b/source/Hack-Bold.ufo/glyphs/kappa.glif
index 6b7887d3a..2a8c1e473 100644
--- a/source/Hack-Bold.ufo/glyphs/kappa.glif
+++ b/source/Hack-Bold.ufo/glyphs/kappa.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="kappa" format="1">
+<glyph name="kappa" format="2">
   <advance width="1233"/>
   <unicode hex="03BA"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/kgreenlandic.glif b/source/Hack-Bold.ufo/glyphs/kgreenlandic.glif
index ca445accd..b31b87116 100644
--- a/source/Hack-Bold.ufo/glyphs/kgreenlandic.glif
+++ b/source/Hack-Bold.ufo/glyphs/kgreenlandic.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="kgreenlandic" format="1">
+<glyph name="kgreenlandic" format="2">
   <advance width="1233"/>
   <unicode hex="0138"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/l.glif b/source/Hack-Bold.ufo/glyphs/l.glif
index ae169f994..907e73d8b 100644
--- a/source/Hack-Bold.ufo/glyphs/l.glif
+++ b/source/Hack-Bold.ufo/glyphs/l.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="l" format="1">
+<glyph name="l" format="2">
   <advance width="1233"/>
   <unicode hex="006C"/>
   <outline>
@@ -21,9 +21,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/lacute.glif b/source/Hack-Bold.ufo/glyphs/lacute.glif
index 9d3c9f9be..02568911a 100644
--- a/source/Hack-Bold.ufo/glyphs/lacute.glif
+++ b/source/Hack-Bold.ufo/glyphs/lacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lacute" format="1">
+<glyph name="lacute" format="2">
   <advance width="1233"/>
   <unicode hex="013A"/>
   <outline>
@@ -10,18 +10,18 @@
       <point x="470" y="1636" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="778" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="778" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="499" y="-8"/>
       <point x="387" y="124"/>
-      <point x="387" y="459" type="curve" name="dh01" smooth="yes"/>
+      <point x="387" y="459" type="curve" smooth="yes" name="dh01"/>
       <point x="387" y="1331" type="line" name="sv01"/>
       <point x="90" y="1331" type="line"/>
       <point x="90" y="1556" type="line" name="at01"/>
       <point x="680" y="1556" type="line"/>
-      <point x="680" y="459" type="line" name="dh02" smooth="yes"/>
+      <point x="680" y="459" type="line" smooth="yes" name="dh02"/>
       <point x="680" y="283"/>
       <point x="728" y="217"/>
-      <point x="860" y="217" type="curve" name="sv02" smooth="yes"/>
+      <point x="860" y="217" type="curve" smooth="yes" name="sv02"/>
       <point x="1094" y="217" type="line"/>
       <point x="1094" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/lambda.glif b/source/Hack-Bold.ufo/glyphs/lambda.glif
index df29d5b90..d4e278a0a 100644
--- a/source/Hack-Bold.ufo/glyphs/lambda.glif
+++ b/source/Hack-Bold.ufo/glyphs/lambda.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lambda" format="1">
+<glyph name="lambda" format="2">
   <advance width="1233"/>
   <unicode hex="03BB"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="455" y="1188" type="line" smooth="yes"/>
       <point x="420" y="1287"/>
       <point x="384" y="1321"/>
-      <point x="258" y="1321" type="curve" name="sv01" smooth="yes"/>
+      <point x="258" y="1321" type="curve" smooth="yes" name="sv01"/>
       <point x="146" y="1321" type="line"/>
       <point x="146" y="1556" type="line" name="at01"/>
       <point x="296" y="1556" type="line" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/layerinfo.plist b/source/Hack-Bold.ufo/glyphs/layerinfo.plist
new file mode 100644
index 000000000..0c67376eb
--- /dev/null
+++ b/source/Hack-Bold.ufo/glyphs/layerinfo.plist
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
diff --git a/source/Hack-Bold.ufo/glyphs/lcaron.glif b/source/Hack-Bold.ufo/glyphs/lcaron.glif
index b5f3b0a76..81acc6f6b 100644
--- a/source/Hack-Bold.ufo/glyphs/lcaron.glif
+++ b/source/Hack-Bold.ufo/glyphs/lcaron.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lcaron" format="1">
+<glyph name="lcaron" format="2">
   <advance width="1233"/>
   <unicode hex="013E"/>
   <outline>
     <contour>
-      <point x="778" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="778" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="499" y="-8"/>
       <point x="387" y="124"/>
-      <point x="387" y="459" type="curve" name="dh01" smooth="yes"/>
+      <point x="387" y="459" type="curve" smooth="yes" name="dh01"/>
       <point x="387" y="1331" type="line" name="sv01"/>
       <point x="90" y="1331" type="line"/>
       <point x="90" y="1556" type="line" name="at01"/>
       <point x="680" y="1556" type="line"/>
-      <point x="680" y="459" type="line" name="dh02" smooth="yes"/>
+      <point x="680" y="459" type="line" smooth="yes" name="dh02"/>
       <point x="680" y="283"/>
       <point x="728" y="217"/>
-      <point x="860" y="217" type="curve" name="sv02" smooth="yes"/>
+      <point x="860" y="217" type="curve" smooth="yes" name="sv02"/>
       <point x="1094" y="217" type="line"/>
       <point x="1094" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/ldot.glif b/source/Hack-Bold.ufo/glyphs/ldot.glif
index f0c5e1891..fb85eb740 100644
--- a/source/Hack-Bold.ufo/glyphs/ldot.glif
+++ b/source/Hack-Bold.ufo/glyphs/ldot.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ldot" format="1">
+<glyph name="ldot" format="2">
   <advance width="1233"/>
   <unicode hex="0140"/>
   <outline>
     <contour>
-      <point x="502" y="39" type="curve" name="hr00" smooth="yes"/>
+      <point x="502" y="39" type="curve" smooth="yes" name="hr00"/>
       <point x="389" y="102"/>
       <point x="337" y="234"/>
       <point x="337" y="459" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/less.glif b/source/Hack-Bold.ufo/glyphs/less.glif
index 10001beae..9aeff4d15 100644
--- a/source/Hack-Bold.ufo/glyphs/less.glif
+++ b/source/Hack-Bold.ufo/glyphs/less.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="less" format="1">
+<glyph name="less" format="2">
   <advance width="1233"/>
   <unicode hex="003C"/>
   <outline>
     <contour>
-      <point x="88" y="524" type="line" name="hr00"/>
+      <point x="88" y="524" type="line" name="key"/>
       <point x="88" y="760" type="line"/>
-      <point x="1145" y="1176" type="line" name="av01"/>
-      <point x="1145" y="926" type="line"/>
-      <point x="350" y="641" type="line" name="iv01"/>
-      <point x="1145" y="358" type="line"/>
-      <point x="1145" y="109" type="line" name="av02"/>
+      <point x="1145" y="1276" type="line" name="av01"/>
+      <point x="1145" y="1016" type="line"/>
+      <point x="360" y="641" type="line" name="iv01"/>
+      <point x="1145" y="268" type="line"/>
+      <point x="1145" y="9" type="line" name="av02"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Bold.ufo/glyphs/lessequal.glif b/source/Hack-Bold.ufo/glyphs/lessequal.glif
index ee0dc9d62..d229eae59 100644
--- a/source/Hack-Bold.ufo/glyphs/lessequal.glif
+++ b/source/Hack-Bold.ufo/glyphs/lessequal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lessequal" format="1">
+<glyph name="lessequal" format="2">
   <advance width="1233"/>
   <unicode hex="2264"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/lfblock.glif b/source/Hack-Bold.ufo/glyphs/lfblock.glif
index 8a76fb3d0..379f2131b 100644
--- a/source/Hack-Bold.ufo/glyphs/lfblock.glif
+++ b/source/Hack-Bold.ufo/glyphs/lfblock.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lfblock" format="1">
+<glyph name="lfblock" format="2">
   <advance width="1233"/>
   <unicode hex="258C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/lira.glif b/source/Hack-Bold.ufo/glyphs/lira.glif
index db146aeea..136985fb7 100644
--- a/source/Hack-Bold.ufo/glyphs/lira.glif
+++ b/source/Hack-Bold.ufo/glyphs/lira.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lira" format="1">
+<glyph name="lira" format="2">
   <advance width="1233"/>
   <unicode hex="20A4"/>
   <outline>
@@ -16,14 +16,14 @@
       <point x="310" y="1023" type="line" name="sh02"/>
       <point x="318" y="1362"/>
       <point x="452" y="1520"/>
-      <point x="776" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="776" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="885" y="1520"/>
       <point x="992" y="1502"/>
       <point x="1096" y="1466" type="curve"/>
       <point x="1096" y="1180" type="line" name="iv01"/>
       <point x="1016" y="1232"/>
       <point x="924" y="1257"/>
-      <point x="841" y="1257" type="curve" name="sv01" smooth="yes"/>
+      <point x="841" y="1257" type="curve" smooth="yes" name="sv01"/>
       <point x="698" y="1257"/>
       <point x="640" y="1183"/>
       <point x="632" y="1023" type="curve" name="sh03"/>
diff --git a/source/Hack-Bold.ufo/glyphs/logicaland.glif b/source/Hack-Bold.ufo/glyphs/logicaland.glif
index 80cdfc4eb..6a2490e3c 100644
--- a/source/Hack-Bold.ufo/glyphs/logicaland.glif
+++ b/source/Hack-Bold.ufo/glyphs/logicaland.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="logicaland" format="1">
+<glyph name="logicaland" format="2">
   <advance width="1233"/>
   <unicode hex="2227"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/logicalnot.glif b/source/Hack-Bold.ufo/glyphs/logicalnot.glif
index 1ad37b83f..aff079849 100644
--- a/source/Hack-Bold.ufo/glyphs/logicalnot.glif
+++ b/source/Hack-Bold.ufo/glyphs/logicalnot.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="logicalnot" format="1">
+<glyph name="logicalnot" format="2">
   <advance width="1233"/>
   <unicode hex="00AC"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/logicalor.glif b/source/Hack-Bold.ufo/glyphs/logicalor.glif
index d0711d982..69c653f25 100644
--- a/source/Hack-Bold.ufo/glyphs/logicalor.glif
+++ b/source/Hack-Bold.ufo/glyphs/logicalor.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="logicalor" format="1">
+<glyph name="logicalor" format="2">
   <advance width="1233"/>
   <unicode hex="2228"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/longs.glif b/source/Hack-Bold.ufo/glyphs/longs.glif
index e4f786d62..c0b2a2632 100644
--- a/source/Hack-Bold.ufo/glyphs/longs.glif
+++ b/source/Hack-Bold.ufo/glyphs/longs.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="longs" format="1">
+<glyph name="longs" format="2">
   <advance width="1233"/>
   <unicode hex="017F"/>
   <outline>
@@ -14,7 +14,7 @@
       <point x="550" y="1478" type="curve" smooth="yes"/>
       <point x="606" y="1530"/>
       <point x="710" y="1556"/>
-      <point x="862" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="862" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="1103" y="1556" type="line"/>
       <point x="1103" y="1331" type="line" name="sv01"/>
       <point x="874" y="1331" type="line" smooth="yes"/>
@@ -23,7 +23,7 @@
       <point x="785" y="1307" type="curve" smooth="yes"/>
       <point x="769" y="1291"/>
       <point x="759" y="1257"/>
-      <point x="759" y="1218" type="curve" name="sh02" smooth="yes"/>
+      <point x="759" y="1218" type="curve" smooth="yes" name="sh02"/>
       <point x="759" y="1120" type="line" name="at03"/>
       <point x="759" y="-270" type="line" name="ab01"/>
       <point x="466" y="-270" type="line"/>
diff --git a/source/Hack-Bold.ufo/glyphs/lozenge.glif b/source/Hack-Bold.ufo/glyphs/lozenge.glif
index 88d12a8f8..4252cd2f9 100644
--- a/source/Hack-Bold.ufo/glyphs/lozenge.glif
+++ b/source/Hack-Bold.ufo/glyphs/lozenge.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lozenge" format="1">
+<glyph name="lozenge" format="2">
   <advance width="1233"/>
   <unicode hex="25CA"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/lslash.glif b/source/Hack-Bold.ufo/glyphs/lslash.glif
index f6dc9210e..50fabba8c 100644
--- a/source/Hack-Bold.ufo/glyphs/lslash.glif
+++ b/source/Hack-Bold.ufo/glyphs/lslash.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lslash" format="1">
+<glyph name="lslash" format="2">
   <advance width="1233"/>
   <unicode hex="0142"/>
   <outline>
     <contour>
-      <point x="801" y="-8" type="line" name="hr00" smooth="yes"/>
+      <point x="801" y="-8" type="line" smooth="yes" name="hr00"/>
       <point x="662" y="-8"/>
       <point x="562" y="28"/>
       <point x="501" y="100" type="curve" smooth="yes"/>
       <point x="440" y="171"/>
       <point x="410" y="291"/>
-      <point x="410" y="459" type="curve" name="dh01" smooth="yes"/>
+      <point x="410" y="459" type="curve" smooth="yes" name="dh01"/>
       <point x="410" y="625" type="line" name="iv01"/>
       <point x="137" y="430" type="line"/>
       <point x="37" y="592" type="line"/>
@@ -23,13 +23,13 @@
       <point x="997" y="1272" type="line"/>
       <point x="1100" y="1112" type="line"/>
       <point x="702" y="832" type="line"/>
-      <point x="702" y="459" type="line" name="dh02" smooth="yes"/>
+      <point x="702" y="459" type="line" smooth="yes" name="dh02"/>
       <point x="702" y="371"/>
       <point x="716" y="309"/>
       <point x="744" y="272" type="curve" smooth="yes"/>
       <point x="771" y="236"/>
       <point x="815" y="217"/>
-      <point x="883" y="217" type="curve" name="sv02" smooth="yes"/>
+      <point x="883" y="217" type="curve" smooth="yes" name="sv02"/>
       <point x="1116" y="217" type="line" name="sv03"/>
       <point x="1116" y="-8" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/ltshade.glif b/source/Hack-Bold.ufo/glyphs/ltshade.glif
index 80c634926..d044e38f7 100644
--- a/source/Hack-Bold.ufo/glyphs/ltshade.glif
+++ b/source/Hack-Bold.ufo/glyphs/ltshade.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ltshade" format="1">
+<glyph name="ltshade" format="2">
   <advance width="1233"/>
   <unicode hex="2591"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/m.glif b/source/Hack-Bold.ufo/glyphs/m.glif
index a647a0670..830136d72 100644
--- a/source/Hack-Bold.ufo/glyphs/m.glif
+++ b/source/Hack-Bold.ufo/glyphs/m.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="m" format="1">
+<glyph name="m" format="2">
   <advance width="1233"/>
   <unicode hex="006D"/>
   <outline>
@@ -22,8 +22,8 @@
       <point x="1138" y="979"/>
       <point x="1155" y="847"/>
       <point x="1155" y="631" type="curve" smooth="yes"/>
-      <point x="1155" y="-0" type="line"/>
-      <point x="915" y="-0" type="line"/>
+      <point x="1155" y="0" type="line"/>
+      <point x="915" y="0" type="line"/>
       <point x="915" y="719" type="line" smooth="yes"/>
       <point x="915" y="805"/>
       <point x="909" y="855"/>
@@ -37,8 +37,8 @@
       <point x="744" y="855"/>
       <point x="737" y="801"/>
       <point x="737" y="719" type="curve" smooth="yes"/>
-      <point x="737" y="-0" type="line"/>
-      <point x="500" y="-0" type="line"/>
+      <point x="737" y="0" type="line"/>
+      <point x="500" y="0" type="line"/>
       <point x="500" y="719" type="line" smooth="yes"/>
       <point x="500" y="798"/>
       <point x="493" y="854"/>
@@ -52,14 +52,14 @@
       <point x="328" y="860"/>
       <point x="322" y="805"/>
       <point x="322" y="719" type="curve" smooth="yes"/>
-      <point x="322" y="-0" type="line"/>
-      <point x="82" y="-0" type="line"/>
+      <point x="322" y="0" type="line"/>
+      <point x="82" y="0" type="line"/>
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/macron.glif b/source/Hack-Bold.ufo/glyphs/macron.glif
index 49ab53871..90aa36999 100644
--- a/source/Hack-Bold.ufo/glyphs/macron.glif
+++ b/source/Hack-Bold.ufo/glyphs/macron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="macron" format="1">
+<glyph name="macron" format="2">
   <advance width="1233"/>
   <unicode hex="00AF"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/millisecond.glif b/source/Hack-Bold.ufo/glyphs/millisecond.glif
index f5a2e84a4..5da07efc1 100644
--- a/source/Hack-Bold.ufo/glyphs/millisecond.glif
+++ b/source/Hack-Bold.ufo/glyphs/millisecond.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="millisecond" format="1">
+<glyph name="millisecond" format="2">
   <advance width="1233"/>
   <unicode hex="2034"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/minus.glif b/source/Hack-Bold.ufo/glyphs/minus.glif
index 6eae802f2..e956e8d6a 100644
--- a/source/Hack-Bold.ufo/glyphs/minus.glif
+++ b/source/Hack-Bold.ufo/glyphs/minus.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="minus" format="1">
+<glyph name="minus" format="2">
   <advance width="1233"/>
   <unicode hex="2212"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/minute.glif b/source/Hack-Bold.ufo/glyphs/minute.glif
index aba948c34..67c80a7f0 100644
--- a/source/Hack-Bold.ufo/glyphs/minute.glif
+++ b/source/Hack-Bold.ufo/glyphs/minute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="minute" format="1">
+<glyph name="minute" format="2">
   <advance width="1233"/>
   <unicode hex="2032"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/multiply.glif b/source/Hack-Bold.ufo/glyphs/multiply.glif
index 740a6094a..40865e298 100644
--- a/source/Hack-Bold.ufo/glyphs/multiply.glif
+++ b/source/Hack-Bold.ufo/glyphs/multiply.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="multiply" format="1">
+<glyph name="multiply" format="2">
   <advance width="1233"/>
   <unicode hex="00D7"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/musicalnote.glif b/source/Hack-Bold.ufo/glyphs/musicalnote.glif
index 2cbf8709a..39ec11fce 100644
--- a/source/Hack-Bold.ufo/glyphs/musicalnote.glif
+++ b/source/Hack-Bold.ufo/glyphs/musicalnote.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="musicalnote" format="1">
+<glyph name="musicalnote" format="2">
   <advance width="1233"/>
   <unicode hex="266A"/>
   <outline>
     <contour>
-      <point x="602" y="265" type="line" name="hr00" smooth="yes"/>
+      <point x="602" y="265" type="line" smooth="yes" name="hr00"/>
       <point x="602" y="256"/>
       <point x="601" y="238"/>
       <point x="600" y="211" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/n.glif b/source/Hack-Bold.ufo/glyphs/n.glif
index 8344e0a22..8bacc0f9b 100644
--- a/source/Hack-Bold.ufo/glyphs/n.glif
+++ b/source/Hack-Bold.ufo/glyphs/n.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="n" format="1">
+<glyph name="n" format="2">
   <advance width="1233"/>
   <unicode hex="006E"/>
   <outline>
@@ -13,8 +13,8 @@
       <point x="961" y="1147"/>
       <point x="1071" y="1002"/>
       <point x="1071" y="727" type="curve" smooth="yes"/>
-      <point x="1071" y="-0" type="line"/>
-      <point x="780" y="-0" type="line"/>
+      <point x="1071" y="0" type="line"/>
+      <point x="780" y="0" type="line"/>
       <point x="780" y="682" type="line" smooth="yes"/>
       <point x="780" y="839"/>
       <point x="736" y="909"/>
@@ -22,14 +22,14 @@
       <point x="530" y="909"/>
       <point x="463" y="806"/>
       <point x="463" y="641" type="curve" smooth="yes"/>
-      <point x="463" y="-0" type="line"/>
-      <point x="172" y="-0" type="line"/>
+      <point x="463" y="0" type="line"/>
+      <point x="172" y="0" type="line"/>
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/nacute.glif b/source/Hack-Bold.ufo/glyphs/nacute.glif
index d8940bb0d..9cdad717b 100644
--- a/source/Hack-Bold.ufo/glyphs/nacute.glif
+++ b/source/Hack-Bold.ufo/glyphs/nacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="nacute" format="1">
+<glyph name="nacute" format="2">
   <advance width="1233"/>
   <unicode hex="0144"/>
   <outline>
@@ -15,7 +15,7 @@
       <point x="463" y="952" type="line" name="sh03"/>
       <point x="506" y="1081"/>
       <point x="610" y="1147"/>
-      <point x="753" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="753" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="961" y="1147"/>
       <point x="1071" y="1008"/>
       <point x="1071" y="727" type="curve" smooth="yes"/>
@@ -24,10 +24,10 @@
       <point x="780" y="682" type="line" smooth="yes"/>
       <point x="780" y="839"/>
       <point x="737" y="909"/>
-      <point x="640" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="640" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="523" y="909"/>
       <point x="463" y="810"/>
-      <point x="463" y="641" type="curve" name="sh05" smooth="yes"/>
+      <point x="463" y="641" type="curve" smooth="yes" name="sh05"/>
       <point x="463" y="0" type="line" name="ab01"/>
       <point x="172" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/napostrophe.glif b/source/Hack-Bold.ufo/glyphs/napostrophe.glif
index 0cf144489..c5c1a81e4 100644
--- a/source/Hack-Bold.ufo/glyphs/napostrophe.glif
+++ b/source/Hack-Bold.ufo/glyphs/napostrophe.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="napostrophe" format="1">
+<glyph name="napostrophe" format="2">
   <advance width="1233"/>
   <unicode hex="0149"/>
   <outline>
@@ -29,7 +29,7 @@
       <point x="798" y="909" type="curve" smooth="yes"/>
       <point x="742" y="909"/>
       <point x="703" y="886"/>
-      <point x="671" y="838" type="curve" name="hr02" smooth="yes"/>
+      <point x="671" y="838" type="curve" smooth="yes" name="hr02"/>
       <point x="640" y="791"/>
       <point x="625" y="726"/>
       <point x="625" y="641" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/ncaron.glif b/source/Hack-Bold.ufo/glyphs/ncaron.glif
index 51bee28d5..42a8ab597 100644
--- a/source/Hack-Bold.ufo/glyphs/ncaron.glif
+++ b/source/Hack-Bold.ufo/glyphs/ncaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ncaron" format="1">
+<glyph name="ncaron" format="2">
   <advance width="1233"/>
   <unicode hex="0148"/>
   <outline>
@@ -18,7 +18,7 @@
       <point x="463" y="952" type="line" name="sh02"/>
       <point x="506" y="1081"/>
       <point x="610" y="1147"/>
-      <point x="753" y="1147" type="curve" name="hr01" smooth="yes"/>
+      <point x="753" y="1147" type="curve" smooth="yes" name="hr01"/>
       <point x="961" y="1147"/>
       <point x="1071" y="1008"/>
       <point x="1071" y="727" type="curve" smooth="yes"/>
@@ -27,10 +27,10 @@
       <point x="780" y="682" type="line" smooth="yes"/>
       <point x="780" y="839"/>
       <point x="737" y="909"/>
-      <point x="640" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="640" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="523" y="909"/>
       <point x="463" y="810"/>
-      <point x="463" y="641" type="curve" name="sh06" smooth="yes"/>
+      <point x="463" y="641" type="curve" smooth="yes" name="sh06"/>
       <point x="463" y="0" type="line" name="ab01"/>
       <point x="172" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/nine.glif b/source/Hack-Bold.ufo/glyphs/nine.glif
index 61f7ceae3..967959354 100644
--- a/source/Hack-Bold.ufo/glyphs/nine.glif
+++ b/source/Hack-Bold.ufo/glyphs/nine.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="nine" format="1">
+<glyph name="nine" format="2">
   <advance width="1233"/>
   <unicode hex="0039"/>
   <outline>
     <contour>
-      <point x="502" y="-39" type="curve" name="dv01" smooth="yes"/>
+      <point x="502" y="-39" type="curve" smooth="yes" name="dv01"/>
       <point x="449" y="-39"/>
       <point x="403" y="-35"/>
       <point x="354" y="-24" type="curve" smooth="yes"/>
@@ -17,7 +17,7 @@
       <point x="355" y="221" type="curve" smooth="yes"/>
       <point x="402" y="206"/>
       <point x="448" y="199"/>
-      <point x="495" y="199" type="curve" name="dv02" smooth="yes"/>
+      <point x="495" y="199" type="curve" smooth="yes" name="dv02"/>
       <point x="596" y="199"/>
       <point x="680" y="233"/>
       <point x="737" y="306" type="curve" smooth="yes"/>
@@ -26,25 +26,25 @@
       <point x="825" y="624" type="curve" name="sh01"/>
       <point x="762" y="538"/>
       <point x="666" y="494"/>
-      <point x="533" y="494" type="curve" name="dv03" smooth="yes"/>
+      <point x="533" y="494" type="curve" smooth="yes" name="dv03"/>
       <point x="400" y="494"/>
       <point x="293" y="537"/>
       <point x="220" y="622" type="curve" smooth="yes"/>
       <point x="148" y="706"/>
       <point x="111" y="827"/>
-      <point x="111" y="983" type="curve" name="dh01" smooth="yes"/>
+      <point x="111" y="983" type="curve" smooth="yes" name="dh01"/>
       <point x="111" y="1146"/>
       <point x="152" y="1278"/>
       <point x="233" y="1370" type="curve" smooth="yes"/>
       <point x="314" y="1461"/>
       <point x="433" y="1507"/>
-      <point x="590" y="1507" type="curve" name="at01" smooth="yes"/>
+      <point x="590" y="1507" type="curve" smooth="yes" name="at01"/>
       <point x="775" y="1507"/>
       <point x="897" y="1441"/>
       <point x="977" y="1324" type="curve" smooth="yes"/>
       <point x="1068" y="1191"/>
       <point x="1102" y="993"/>
-      <point x="1102" y="756" type="curve" name="dh03" smooth="yes"/>
+      <point x="1102" y="756" type="curve" smooth="yes" name="dh03"/>
       <point x="1102" y="462"/>
       <point x="1048" y="278"/>
       <point x="952" y="155" type="curve" smooth="yes"/>
@@ -52,25 +52,25 @@
       <point x="691" y="-39"/>
     </contour>
     <contour>
-      <point x="589" y="741" type="curve" name="dv04" smooth="yes"/>
+      <point x="589" y="741" type="curve" smooth="yes" name="dv04"/>
       <point x="653" y="741"/>
       <point x="702" y="764"/>
       <point x="736" y="811" type="curve" smooth="yes"/>
       <point x="769" y="858"/>
       <point x="786" y="924"/>
-      <point x="786" y="1011" type="curve" name="hr01" smooth="yes"/>
+      <point x="786" y="1011" type="curve" smooth="yes" name="hr01"/>
       <point x="786" y="1103"/>
       <point x="767" y="1170"/>
       <point x="736" y="1213" type="curve" smooth="yes"/>
       <point x="701" y="1260"/>
       <point x="652" y="1282"/>
-      <point x="589" y="1282" type="curve" name="sv01" smooth="yes"/>
+      <point x="589" y="1282" type="curve" smooth="yes" name="sv01"/>
       <point x="521" y="1282"/>
       <point x="475" y="1256"/>
       <point x="443" y="1213" type="curve" smooth="yes"/>
       <point x="408" y="1166"/>
       <point x="391" y="1099"/>
-      <point x="391" y="1012" type="curve" name="dh02" smooth="yes"/>
+      <point x="391" y="1012" type="curve" smooth="yes" name="dh02"/>
       <point x="391" y="925"/>
       <point x="408" y="858"/>
       <point x="443" y="811" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/nine.subs.glif b/source/Hack-Bold.ufo/glyphs/nine.subs.glif
index 63e573210..2a4b91256 100644
--- a/source/Hack-Bold.ufo/glyphs/nine.subs.glif
+++ b/source/Hack-Bold.ufo/glyphs/nine.subs.glif
@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="nine.subs" format="1">
+<glyph name="nine.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="539" y="-430" type="curve" name="dv01" smooth="yes"/>
+      <point x="539" y="-430" type="curve" smooth="yes" name="dv01"/>
       <point x="471" y="-430"/>
       <point x="410" y="-421"/>
       <point x="330" y="-397" type="curve"/>
       <point x="330" y="-246" type="line" name="ih01"/>
       <point x="398" y="-278"/>
       <point x="465" y="-297"/>
-      <point x="533" y="-297" type="curve" name="dv02" smooth="yes"/>
+      <point x="533" y="-297" type="curve" smooth="yes" name="dv02"/>
       <point x="676" y="-297"/>
       <point x="752" y="-214"/>
       <point x="756" y="-59" type="curve" name="sh01"/>
       <point x="712" y="-107"/>
       <point x="646" y="-132"/>
-      <point x="554" y="-132" type="curve" name="dv05" smooth="yes"/>
+      <point x="554" y="-132" type="curve" smooth="yes" name="dv05"/>
       <point x="370" y="-132"/>
       <point x="267" y="-35"/>
-      <point x="267" y="144" type="curve" name="dh01" smooth="yes"/>
+      <point x="267" y="144" type="curve" smooth="yes" name="dh01"/>
       <point x="267" y="332"/>
       <point x="380" y="437"/>
-      <point x="595" y="437" type="curve" name="dv04" smooth="yes"/>
+      <point x="595" y="437" type="curve" smooth="yes" name="dv04"/>
       <point x="828" y="437"/>
       <point x="945" y="309"/>
-      <point x="945" y="21" type="curve" name="dh03" smooth="yes"/>
+      <point x="945" y="21" type="curve" smooth="yes" name="dh03"/>
       <point x="945" y="-288"/>
       <point x="811" y="-430"/>
     </contour>
     <contour>
-      <point x="595" y="8" type="curve" name="dv06" smooth="yes"/>
+      <point x="595" y="8" type="curve" smooth="yes" name="dv06"/>
       <point x="683" y="8"/>
       <point x="729" y="60"/>
-      <point x="729" y="159" type="curve" name="hr01" smooth="yes"/>
+      <point x="729" y="159" type="curve" smooth="yes" name="hr01"/>
       <point x="729" y="258"/>
       <point x="683" y="311"/>
-      <point x="595" y="311" type="curve" name="dv03" smooth="yes"/>
+      <point x="595" y="311" type="curve" smooth="yes" name="dv03"/>
       <point x="507" y="311"/>
       <point x="459" y="257"/>
-      <point x="459" y="160" type="curve" name="dh02" smooth="yes"/>
+      <point x="459" y="160" type="curve" smooth="yes" name="dh02"/>
       <point x="459" y="63"/>
       <point x="507" y="8"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/notelement.glif b/source/Hack-Bold.ufo/glyphs/notelement.glif
index 2cdbc7b63..d7e8ead05 100644
--- a/source/Hack-Bold.ufo/glyphs/notelement.glif
+++ b/source/Hack-Bold.ufo/glyphs/notelement.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="notelement" format="1">
+<glyph name="notelement" format="2">
   <advance width="1233"/>
   <unicode hex="2209"/>
   <outline>
@@ -14,7 +14,7 @@
       <point x="367" y="1422" type="curve" smooth="yes"/>
       <point x="449" y="1490"/>
       <point x="539" y="1524"/>
-      <point x="636" y="1524" type="curve" name="sv01" smooth="yes"/>
+      <point x="636" y="1524" type="curve" smooth="yes" name="sv01"/>
       <point x="854" y="1524" type="line"/>
       <point x="928" y="1721" type="line" name="av02"/>
       <point x="1143" y="1641" type="line"/>
@@ -29,13 +29,13 @@
       <point x="614" y="231" type="line"/>
       <point x="621" y="230"/>
       <point x="629" y="230"/>
-      <point x="636" y="230" type="curve" name="sv02" smooth="yes"/>
+      <point x="636" y="230" type="curve" smooth="yes" name="sv02"/>
       <point x="1133" y="230" type="line" name="sv03"/>
       <point x="1133" y="0" type="line" name="ab01"/>
       <point x="636" y="0" type="line" smooth="yes"/>
       <point x="592" y="0"/>
       <point x="567" y="6"/>
-      <point x="532" y="14" type="curve" name="ab02" smooth="yes"/>
+      <point x="532" y="14" type="curve" smooth="yes" name="ab02"/>
       <point x="473" y="29"/>
       <point x="447" y="-38"/>
       <point x="454" y="-197" type="curve" name="av01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/notequal.glif b/source/Hack-Bold.ufo/glyphs/notequal.glif
index 9f476a259..fd6d6d956 100644
--- a/source/Hack-Bold.ufo/glyphs/notequal.glif
+++ b/source/Hack-Bold.ufo/glyphs/notequal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="notequal" format="1">
+<glyph name="notequal" format="2">
   <advance width="1233"/>
   <unicode hex="2260"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/notsubset.glif b/source/Hack-Bold.ufo/glyphs/notsubset.glif
index b64fd7994..fd5d22b05 100644
--- a/source/Hack-Bold.ufo/glyphs/notsubset.glif
+++ b/source/Hack-Bold.ufo/glyphs/notsubset.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="notsubset" format="1">
+<glyph name="notsubset" format="2">
   <advance width="1233"/>
   <unicode hex="2284"/>
   <outline>
@@ -11,10 +11,10 @@
       <point x="230" y="280" type="curve" smooth="yes"/>
       <point x="134" y="381"/>
       <point x="88" y="505"/>
-      <point x="88" y="641" type="curve" name="dh01" smooth="yes"/>
+      <point x="88" y="641" type="curve" smooth="yes" name="dh01"/>
       <point x="88" y="930"/>
       <point x="303" y="1144"/>
-      <point x="575" y="1144" type="curve" name="at01" smooth="yes"/>
+      <point x="575" y="1144" type="curve" smooth="yes" name="at01"/>
       <point x="709" y="1144" type="line"/>
       <point x="808" y="1401" type="line" name="av01"/>
       <point x="987" y="1332" type="line"/>
@@ -33,10 +33,10 @@
     </contour>
     <contour>
       <point x="621" y="919" type="line" name="sv03"/>
-      <point x="575" y="919" type="line" name="sv04" smooth="yes"/>
+      <point x="575" y="919" type="line" smooth="yes" name="sv04"/>
       <point x="428" y="919"/>
       <point x="313" y="808"/>
-      <point x="313" y="637" type="curve" name="dh02" smooth="yes"/>
+      <point x="313" y="637" type="curve" smooth="yes" name="dh02"/>
       <point x="313" y="558"/>
       <point x="337" y="492"/>
       <point x="389" y="440" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/ntilde.glif b/source/Hack-Bold.ufo/glyphs/ntilde.glif
index 708a9d214..4b4a8abff 100644
--- a/source/Hack-Bold.ufo/glyphs/ntilde.glif
+++ b/source/Hack-Bold.ufo/glyphs/ntilde.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ntilde" format="1">
+<glyph name="ntilde" format="2">
   <advance width="1233"/>
   <unicode hex="00F1"/>
   <outline>
     <contour>
-      <point x="768" y="1297" type="curve" name="sh01" smooth="yes"/>
+      <point x="768" y="1297" type="curve" smooth="yes" name="sh01"/>
       <point x="720" y="1297"/>
       <point x="682" y="1310"/>
       <point x="618" y="1354" type="curve" smooth="yes"/>
@@ -25,17 +25,17 @@
       <point x="320" y="1510" type="curve" smooth="yes"/>
       <point x="351" y="1554"/>
       <point x="398" y="1583"/>
-      <point x="465" y="1583" type="curve" name="sh04" smooth="yes"/>
+      <point x="465" y="1583" type="curve" smooth="yes" name="sh04"/>
       <point x="490" y="1583"/>
       <point x="514" y="1579"/>
-      <point x="537" y="1570" type="curve" name="av01" smooth="yes"/>
+      <point x="537" y="1570" type="curve" smooth="yes" name="av01"/>
       <point x="564" y="1559"/>
       <point x="586" y="1546"/>
       <point x="614" y="1526" type="curve" smooth="yes"/>
       <point x="676" y="1483" type="line" smooth="yes"/>
       <point x="693" y="1471"/>
       <point x="701" y="1467"/>
-      <point x="716" y="1460" type="curve" name="hr01" smooth="yes"/>
+      <point x="716" y="1460" type="curve" smooth="yes" name="hr01"/>
       <point x="729" y="1455"/>
       <point x="740" y="1452"/>
       <point x="751" y="1452" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="806" y="1484" type="curve" smooth="yes"/>
       <point x="819" y="1505"/>
       <point x="825" y="1534"/>
-      <point x="825" y="1573" type="curve" name="av02" smooth="yes"/>
+      <point x="825" y="1573" type="curve" smooth="yes" name="av02"/>
       <point x="825" y="1581" type="line" name="dv02"/>
       <point x="965" y="1581" type="line" name="av03"/>
       <point x="965" y="1490"/>
@@ -62,13 +62,13 @@
       <point x="569" y="1096" type="curve" smooth="yes"/>
       <point x="619" y="1130"/>
       <point x="680" y="1147"/>
-      <point x="751" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="751" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="856" y="1147"/>
       <point x="936" y="1112"/>
       <point x="990" y="1042" type="curve" smooth="yes"/>
       <point x="1044" y="971"/>
       <point x="1071" y="866"/>
-      <point x="1071" y="727" type="curve" name="hr02" smooth="yes"/>
+      <point x="1071" y="727" type="curve" smooth="yes" name="hr02"/>
       <point x="1071" y="0" type="line" name="sh05"/>
       <point x="780" y="0" type="line" name="hr03"/>
       <point x="780" y="682" type="line" smooth="yes"/>
@@ -77,13 +77,13 @@
       <point x="746" y="857" type="curve" smooth="yes"/>
       <point x="723" y="892"/>
       <point x="684" y="909"/>
-      <point x="636" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="636" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="579" y="909"/>
       <point x="540" y="885"/>
       <point x="509" y="838" type="curve" smooth="yes"/>
       <point x="480" y="793"/>
       <point x="463" y="733"/>
-      <point x="463" y="641" type="curve" name="sh06" smooth="yes"/>
+      <point x="463" y="641" type="curve" smooth="yes" name="sh06"/>
       <point x="463" y="0" type="line" name="ab01"/>
       <point x="172" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/nu.glif b/source/Hack-Bold.ufo/glyphs/nu.glif
index a97f86373..d3792e13b 100644
--- a/source/Hack-Bold.ufo/glyphs/nu.glif
+++ b/source/Hack-Bold.ufo/glyphs/nu.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="nu" format="1">
+<glyph name="nu" format="2">
   <advance width="1233"/>
   <unicode hex="03BD"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="576" y="295" type="line" name="iv01"/>
       <point x="728" y="452"/>
       <point x="836" y="599"/>
-      <point x="836" y="758" type="curve" name="dh01" smooth="yes"/>
+      <point x="836" y="758" type="curve" smooth="yes" name="dh01"/>
       <point x="836" y="789"/>
       <point x="833" y="818"/>
       <point x="814" y="871" type="curve" smooth="yes"/>
@@ -19,7 +19,7 @@
       <point x="987" y="1120" type="line"/>
       <point x="1075" y="1002"/>
       <point x="1144" y="831"/>
-      <point x="1144" y="707" type="curve" name="dh02" smooth="yes"/>
+      <point x="1144" y="707" type="curve" smooth="yes" name="dh02"/>
       <point x="1144" y="462"/>
       <point x="873" y="153"/>
       <point x="708" y="0" type="curve" name="ab01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/numbersign.glif b/source/Hack-Bold.ufo/glyphs/numbersign.glif
index 2ddbd5ff6..7dc486d46 100644
--- a/source/Hack-Bold.ufo/glyphs/numbersign.glif
+++ b/source/Hack-Bold.ufo/glyphs/numbersign.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="numbersign" format="1">
+<glyph name="numbersign" format="2">
   <advance width="1233"/>
   <unicode hex="0023"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/o.glif b/source/Hack-Bold.ufo/glyphs/o.glif
index 46353c633..2a93f5dd3 100644
--- a/source/Hack-Bold.ufo/glyphs/o.glif
+++ b/source/Hack-Bold.ufo/glyphs/o.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="o" format="1">
+<glyph name="o" format="2">
   <advance width="1233"/>
   <unicode hex="006F"/>
   <outline>
@@ -33,9 +33,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/oacute.glif b/source/Hack-Bold.ufo/glyphs/oacute.glif
index fed393885..a6207e46e 100644
--- a/source/Hack-Bold.ufo/glyphs/oacute.glif
+++ b/source/Hack-Bold.ufo/glyphs/oacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="oacute" format="1">
+<glyph name="oacute" format="2">
   <advance width="1233"/>
   <unicode hex="00F3"/>
   <outline>
@@ -10,19 +10,19 @@
       <point x="469" y="1297" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="617" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="446" y="-29"/>
       <point x="322" y="34"/>
       <point x="238" y="129" type="curve" smooth="yes"/>
       <point x="145" y="234"/>
       <point x="98" y="384"/>
-      <point x="98" y="560" type="curve" name="sh02" smooth="yes"/>
+      <point x="98" y="560" type="curve" smooth="yes" name="sh02"/>
       <point x="98" y="920"/>
       <point x="300" y="1147"/>
-      <point x="616" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="937" y="1147"/>
       <point x="1135" y="928"/>
-      <point x="1135" y="559" type="curve" name="sh01" smooth="yes"/>
+      <point x="1135" y="559" type="curve" smooth="yes" name="sh01"/>
       <point x="1135" y="380"/>
       <point x="1088" y="235"/>
       <point x="996" y="130" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="780" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="209" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="209" type="curve" smooth="yes" name="dv02"/>
       <point x="687" y="209"/>
       <point x="742" y="240"/>
       <point x="782" y="301" type="curve" smooth="yes"/>
       <point x="822" y="363"/>
       <point x="842" y="449"/>
-      <point x="842" y="560" type="curve" name="ah01" smooth="yes"/>
+      <point x="842" y="560" type="curve" smooth="yes" name="ah01"/>
       <point x="842" y="669"/>
       <point x="822" y="755"/>
       <point x="782" y="817" type="curve" smooth="yes"/>
       <point x="741" y="881"/>
       <point x="684" y="909"/>
-      <point x="616" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="541" y="909"/>
       <point x="488" y="874"/>
       <point x="451" y="817" type="curve" smooth="yes"/>
       <point x="411" y="755"/>
       <point x="391" y="669"/>
-      <point x="391" y="560" type="curve" name="sh03" smooth="yes"/>
+      <point x="391" y="560" type="curve" smooth="yes" name="sh03"/>
       <point x="391" y="449"/>
       <point x="411" y="363"/>
       <point x="451" y="301" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/obreve.glif b/source/Hack-Bold.ufo/glyphs/obreve.glif
index 79ae0d9e0..a1f9990bf 100644
--- a/source/Hack-Bold.ufo/glyphs/obreve.glif
+++ b/source/Hack-Bold.ufo/glyphs/obreve.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="obreve" format="1">
+<glyph name="obreve" format="2">
   <advance width="1233"/>
   <unicode hex="014F"/>
   <outline>
     <contour>
-      <point x="617" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="446" y="-29"/>
       <point x="322" y="34"/>
       <point x="238" y="129" type="curve" smooth="yes"/>
       <point x="145" y="234"/>
       <point x="98" y="384"/>
-      <point x="98" y="560" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="560" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="920"/>
       <point x="300" y="1147"/>
-      <point x="616" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="937" y="1147"/>
       <point x="1135" y="928"/>
-      <point x="1135" y="559" type="curve" name="sh02" smooth="yes"/>
+      <point x="1135" y="559" type="curve" smooth="yes" name="sh02"/>
       <point x="1135" y="380"/>
       <point x="1088" y="235"/>
       <point x="996" y="130" type="curve" smooth="yes"/>
@@ -24,25 +24,25 @@
       <point x="780" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="209" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="209" type="curve" smooth="yes" name="dv01"/>
       <point x="687" y="209"/>
       <point x="742" y="240"/>
       <point x="782" y="301" type="curve" smooth="yes"/>
       <point x="822" y="363"/>
       <point x="842" y="449"/>
-      <point x="842" y="560" type="curve" name="ah01" smooth="yes"/>
+      <point x="842" y="560" type="curve" smooth="yes" name="ah01"/>
       <point x="842" y="669"/>
       <point x="822" y="755"/>
       <point x="782" y="817" type="curve" smooth="yes"/>
       <point x="741" y="881"/>
       <point x="684" y="909"/>
-      <point x="616" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="541" y="909"/>
       <point x="488" y="874"/>
       <point x="451" y="817" type="curve" smooth="yes"/>
       <point x="411" y="755"/>
       <point x="391" y="669"/>
-      <point x="391" y="560" type="curve" name="sh03" smooth="yes"/>
+      <point x="391" y="560" type="curve" smooth="yes" name="sh03"/>
       <point x="391" y="449"/>
       <point x="411" y="363"/>
       <point x="451" y="301" type="curve" smooth="yes"/>
@@ -50,7 +50,7 @@
       <point x="546" y="209"/>
     </contour>
     <contour>
-      <point x="616" y="1299" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1299" type="curve" smooth="yes" name="dv01"/>
       <point x="515" y="1299"/>
       <point x="434" y="1323"/>
       <point x="374" y="1376" type="curve" smooth="yes"/>
@@ -63,7 +63,7 @@
       <point x="483" y="1490" type="curve" smooth="yes"/>
       <point x="516" y="1465"/>
       <point x="561" y="1452"/>
-      <point x="617" y="1452" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="1452" type="curve" smooth="yes" name="dv02"/>
       <point x="672" y="1452"/>
       <point x="716" y="1464"/>
       <point x="749" y="1489" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/ocircumflex.glif b/source/Hack-Bold.ufo/glyphs/ocircumflex.glif
index e5fa68460..0f55616fb 100644
--- a/source/Hack-Bold.ufo/glyphs/ocircumflex.glif
+++ b/source/Hack-Bold.ufo/glyphs/ocircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ocircumflex" format="1">
+<glyph name="ocircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00F4"/>
   <outline>
@@ -13,19 +13,19 @@
       <point x="240" y="1297" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="617" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="446" y="-29"/>
       <point x="322" y="34"/>
       <point x="238" y="129" type="curve" smooth="yes"/>
       <point x="145" y="234"/>
       <point x="98" y="384"/>
-      <point x="98" y="560" type="curve" name="sh02" smooth="yes"/>
+      <point x="98" y="560" type="curve" smooth="yes" name="sh02"/>
       <point x="98" y="920"/>
       <point x="300" y="1147"/>
-      <point x="616" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="937" y="1147"/>
       <point x="1135" y="928"/>
-      <point x="1135" y="559" type="curve" name="sh01" smooth="yes"/>
+      <point x="1135" y="559" type="curve" smooth="yes" name="sh01"/>
       <point x="1135" y="380"/>
       <point x="1088" y="235"/>
       <point x="996" y="130" type="curve" smooth="yes"/>
@@ -33,25 +33,25 @@
       <point x="780" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="209" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="209" type="curve" smooth="yes" name="dv02"/>
       <point x="687" y="209"/>
       <point x="742" y="240"/>
       <point x="782" y="301" type="curve" smooth="yes"/>
       <point x="822" y="363"/>
       <point x="842" y="449"/>
-      <point x="842" y="560" type="curve" name="ah01" smooth="yes"/>
+      <point x="842" y="560" type="curve" smooth="yes" name="ah01"/>
       <point x="842" y="669"/>
       <point x="822" y="755"/>
       <point x="782" y="817" type="curve" smooth="yes"/>
       <point x="741" y="881"/>
       <point x="684" y="909"/>
-      <point x="616" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="541" y="909"/>
       <point x="488" y="874"/>
       <point x="451" y="817" type="curve" smooth="yes"/>
       <point x="411" y="755"/>
       <point x="391" y="669"/>
-      <point x="391" y="560" type="curve" name="sh03" smooth="yes"/>
+      <point x="391" y="560" type="curve" smooth="yes" name="sh03"/>
       <point x="391" y="449"/>
       <point x="411" y="363"/>
       <point x="451" y="301" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/odieresis.glif b/source/Hack-Bold.ufo/glyphs/odieresis.glif
index bdea54f30..834312b3c 100644
--- a/source/Hack-Bold.ufo/glyphs/odieresis.glif
+++ b/source/Hack-Bold.ufo/glyphs/odieresis.glif
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="odieresis" format="1">
+<glyph name="odieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00F6"/>
   <outline>
     <contour>
-      <point x="331" y="1347" type="line" name="dv03" smooth="yes"/>
+      <point x="331" y="1347" type="line" smooth="yes" name="dv03"/>
       <point x="311" y="1347"/>
       <point x="301" y="1357"/>
-      <point x="301" y="1377" type="curve" name="ih01" smooth="yes"/>
+      <point x="301" y="1377" type="curve" smooth="yes" name="ih01"/>
       <point x="301" y="1563" type="line" smooth="yes"/>
       <point x="301" y="1583"/>
       <point x="311" y="1593"/>
-      <point x="331" y="1593" type="curve" name="dv04" smooth="yes"/>
+      <point x="331" y="1593" type="curve" smooth="yes" name="dv04"/>
       <point x="507" y="1593" type="line" smooth="yes"/>
       <point x="527" y="1593"/>
       <point x="537" y="1583"/>
       <point x="537" y="1563" type="curve" smooth="yes"/>
-      <point x="537" y="1377" type="line" name="sh01" smooth="yes"/>
+      <point x="537" y="1377" type="line" smooth="yes" name="sh01"/>
       <point x="537" y="1357"/>
       <point x="527" y="1347"/>
       <point x="507" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1347" type="line" name="sv01" smooth="yes"/>
+      <point x="726" y="1347" type="line" smooth="yes" name="sv01"/>
       <point x="706" y="1347"/>
       <point x="696" y="1357"/>
-      <point x="696" y="1377" type="curve" name="dh03" smooth="yes"/>
+      <point x="696" y="1377" type="curve" smooth="yes" name="dh03"/>
       <point x="696" y="1563" type="line" smooth="yes"/>
       <point x="696" y="1583"/>
       <point x="706" y="1593"/>
-      <point x="726" y="1593" type="curve" name="sv02" smooth="yes"/>
+      <point x="726" y="1593" type="curve" smooth="yes" name="sv02"/>
       <point x="902" y="1593" type="line" smooth="yes"/>
       <point x="922" y="1593"/>
       <point x="932" y="1583"/>
       <point x="932" y="1563" type="curve" smooth="yes"/>
-      <point x="932" y="1377" type="line" name="dh04" smooth="yes"/>
+      <point x="932" y="1377" type="line" smooth="yes" name="dh04"/>
       <point x="932" y="1357"/>
       <point x="922" y="1347"/>
       <point x="902" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="617" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="446" y="-29"/>
       <point x="322" y="34"/>
       <point x="238" y="129" type="curve" smooth="yes"/>
       <point x="145" y="234"/>
       <point x="98" y="384"/>
-      <point x="98" y="560" type="curve" name="dh01" smooth="yes"/>
+      <point x="98" y="560" type="curve" smooth="yes" name="dh01"/>
       <point x="98" y="920"/>
       <point x="300" y="1147"/>
-      <point x="616" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="937" y="1147"/>
       <point x="1135" y="928"/>
-      <point x="1135" y="559" type="curve" name="sh02" smooth="yes"/>
+      <point x="1135" y="559" type="curve" smooth="yes" name="sh02"/>
       <point x="1135" y="380"/>
       <point x="1088" y="235"/>
       <point x="996" y="130" type="curve" smooth="yes"/>
@@ -60,25 +60,25 @@
       <point x="780" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="209" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="209" type="curve" smooth="yes" name="dv02"/>
       <point x="687" y="209"/>
       <point x="742" y="240"/>
       <point x="782" y="301" type="curve" smooth="yes"/>
       <point x="822" y="363"/>
       <point x="842" y="449"/>
-      <point x="842" y="560" type="curve" name="ih02" smooth="yes"/>
+      <point x="842" y="560" type="curve" smooth="yes" name="ih02"/>
       <point x="842" y="669"/>
       <point x="822" y="755"/>
       <point x="782" y="817" type="curve" smooth="yes"/>
       <point x="741" y="881"/>
       <point x="684" y="909"/>
-      <point x="616" y="909" type="curve" name="sv03" smooth="yes"/>
+      <point x="616" y="909" type="curve" smooth="yes" name="sv03"/>
       <point x="541" y="909"/>
       <point x="488" y="874"/>
       <point x="451" y="817" type="curve" smooth="yes"/>
       <point x="411" y="755"/>
       <point x="391" y="669"/>
-      <point x="391" y="560" type="curve" name="dh02" smooth="yes"/>
+      <point x="391" y="560" type="curve" smooth="yes" name="dh02"/>
       <point x="391" y="449"/>
       <point x="411" y="363"/>
       <point x="451" y="301" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/oe.glif b/source/Hack-Bold.ufo/glyphs/oe.glif
index 776e947bd..a73de5c36 100644
--- a/source/Hack-Bold.ufo/glyphs/oe.glif
+++ b/source/Hack-Bold.ufo/glyphs/oe.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="oe" format="1">
+<glyph name="oe" format="2">
   <advance width="1233"/>
   <unicode hex="0153"/>
   <outline>
     <contour>
-      <point x="374" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="374" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="239" y="-29"/>
       <point x="154" y="21"/>
       <point x="99" y="109" type="curve" smooth="yes"/>
       <point x="39" y="205"/>
       <point x="14" y="356"/>
-      <point x="14" y="560" type="curve" name="dh01" smooth="yes"/>
+      <point x="14" y="560" type="curve" smooth="yes" name="dh01"/>
       <point x="14" y="768"/>
       <point x="40" y="916"/>
       <point x="99" y="1011" type="curve" smooth="yes"/>
       <point x="155" y="1103"/>
       <point x="244" y="1147"/>
-      <point x="377" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="377" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="440" y="1147"/>
       <point x="492" y="1137"/>
       <point x="533" y="1118" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="730" y="1115" type="curve" smooth="yes"/>
       <point x="773" y="1136"/>
       <point x="825" y="1147"/>
-      <point x="888" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="888" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1003" y="1147"/>
       <point x="1088" y="1108"/>
       <point x="1137" y="1028" type="curve" smooth="yes"/>
@@ -42,7 +42,7 @@
       <point x="810" y="260" type="curve" smooth="yes"/>
       <point x="843" y="209"/>
       <point x="891" y="184"/>
-      <point x="955" y="184" type="curve" name="sv02" smooth="yes"/>
+      <point x="955" y="184" type="curve" smooth="yes" name="sv02"/>
       <point x="999" y="184"/>
       <point x="1037" y="195"/>
       <point x="1074" y="214" type="curve" smooth="yes"/>
@@ -55,7 +55,7 @@
       <point x="1083" y="-8" type="curve" smooth="yes"/>
       <point x="1042" y="-22"/>
       <point x="994" y="-29"/>
-      <point x="939" y="-29" type="curve" name="sv03" smooth="yes"/>
+      <point x="939" y="-29" type="curve" smooth="yes" name="sv03"/>
       <point x="871" y="-29"/>
       <point x="814" y="-17"/>
       <point x="767" y="8" type="curve" smooth="yes"/>
@@ -69,25 +69,25 @@
       <point x="439" y="-29"/>
     </contour>
     <contour>
-      <point x="385" y="184" type="curve" name="dv01" smooth="yes"/>
+      <point x="385" y="184" type="curve" smooth="yes" name="dv01"/>
       <point x="445" y="184"/>
       <point x="473" y="210"/>
       <point x="490" y="251" type="curve" smooth="yes"/>
       <point x="509" y="300"/>
       <point x="520" y="384"/>
-      <point x="520" y="558" type="curve" name="dh03" smooth="yes"/>
+      <point x="520" y="558" type="curve" smooth="yes" name="dh03"/>
       <point x="520" y="746"/>
       <point x="509" y="825"/>
       <point x="490" y="868" type="curve" smooth="yes"/>
       <point x="471" y="913"/>
       <point x="439" y="934"/>
-      <point x="384" y="934" type="curve" name="sv01" smooth="yes"/>
+      <point x="384" y="934" type="curve" smooth="yes" name="sv01"/>
       <point x="333" y="934"/>
       <point x="299" y="915"/>
       <point x="279" y="868" type="curve" smooth="yes"/>
       <point x="256" y="817"/>
       <point x="248" y="724"/>
-      <point x="248" y="560" type="curve" name="dh02" smooth="yes"/>
+      <point x="248" y="560" type="curve" smooth="yes" name="dh02"/>
       <point x="248" y="379"/>
       <point x="258" y="295"/>
       <point x="279" y="250" type="curve" smooth="yes"/>
@@ -102,13 +102,13 @@
       <point x="960" y="887" type="curve" smooth="yes"/>
       <point x="943" y="918"/>
       <point x="914" y="934"/>
-      <point x="873" y="934" type="curve" name="sv04" smooth="yes"/>
+      <point x="873" y="934" type="curve" smooth="yes" name="sv04"/>
       <point x="828" y="934"/>
       <point x="801" y="917"/>
       <point x="785" y="886" type="curve" smooth="yes"/>
       <point x="770" y="857"/>
       <point x="760" y="812"/>
-      <point x="760" y="713" type="curve" name="sh01" smooth="yes"/>
+      <point x="760" y="713" type="curve" smooth="yes" name="sh01"/>
       <point x="760" y="690" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/ogonek.glif b/source/Hack-Bold.ufo/glyphs/ogonek.glif
index ba44f42e4..f525afd64 100644
--- a/source/Hack-Bold.ufo/glyphs/ogonek.glif
+++ b/source/Hack-Bold.ufo/glyphs/ogonek.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ogonek" format="1">
+<glyph name="ogonek" format="2">
   <advance width="1233"/>
   <unicode hex="02DB"/>
   <outline>
     <contour>
-      <point x="681" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="681" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="609" y="-401"/>
       <point x="549" y="-386"/>
       <point x="508" y="-355" type="curve" smooth="yes"/>
       <point x="467" y="-324"/>
       <point x="446" y="-280"/>
-      <point x="446" y="-223" type="curve" name="dh01" smooth="yes"/>
+      <point x="446" y="-223" type="curve" smooth="yes" name="dh01"/>
       <point x="446" y="-182"/>
       <point x="457" y="-151"/>
       <point x="474" y="-116" type="curve" smooth="yes"/>
@@ -29,7 +29,7 @@
       <point x="638" y="-230" type="curve" smooth="yes"/>
       <point x="659" y="-247"/>
       <point x="689" y="-254"/>
-      <point x="724" y="-254" type="curve" name="hr01" smooth="yes"/>
+      <point x="724" y="-254" type="curve" smooth="yes" name="hr01"/>
       <point x="743" y="-254"/>
       <point x="769" y="-252"/>
       <point x="796" y="-247" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/ograve.glif b/source/Hack-Bold.ufo/glyphs/ograve.glif
index 4ea9dcf0b..efe504f01 100644
--- a/source/Hack-Bold.ufo/glyphs/ograve.glif
+++ b/source/Hack-Bold.ufo/glyphs/ograve.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ograve" format="1">
+<glyph name="ograve" format="2">
   <advance width="1233"/>
   <unicode hex="00F2"/>
   <outline>
@@ -10,19 +10,19 @@
       <point x="567" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="617" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="446" y="-29"/>
       <point x="322" y="34"/>
       <point x="238" y="129" type="curve" smooth="yes"/>
       <point x="145" y="234"/>
       <point x="98" y="384"/>
-      <point x="98" y="560" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="560" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="920"/>
       <point x="300" y="1147"/>
-      <point x="616" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="937" y="1147"/>
       <point x="1135" y="928"/>
-      <point x="1135" y="559" type="curve" name="sh03" smooth="yes"/>
+      <point x="1135" y="559" type="curve" smooth="yes" name="sh03"/>
       <point x="1135" y="380"/>
       <point x="1088" y="235"/>
       <point x="996" y="130" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="780" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="209" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="209" type="curve" smooth="yes" name="dv02"/>
       <point x="687" y="209"/>
       <point x="742" y="240"/>
       <point x="782" y="301" type="curve" smooth="yes"/>
       <point x="822" y="363"/>
       <point x="842" y="449"/>
-      <point x="842" y="560" type="curve" name="ah01" smooth="yes"/>
+      <point x="842" y="560" type="curve" smooth="yes" name="ah01"/>
       <point x="842" y="669"/>
       <point x="822" y="755"/>
       <point x="782" y="817" type="curve" smooth="yes"/>
       <point x="741" y="881"/>
       <point x="684" y="909"/>
-      <point x="616" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="541" y="909"/>
       <point x="488" y="874"/>
       <point x="451" y="817" type="curve" smooth="yes"/>
       <point x="411" y="755"/>
       <point x="391" y="669"/>
-      <point x="391" y="560" type="curve" name="sh02" smooth="yes"/>
+      <point x="391" y="560" type="curve" smooth="yes" name="sh02"/>
       <point x="391" y="449"/>
       <point x="411" y="363"/>
       <point x="451" y="301" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/ohorn.glif b/source/Hack-Bold.ufo/glyphs/ohorn.glif
index e89819be3..2c01a9540 100644
--- a/source/Hack-Bold.ufo/glyphs/ohorn.glif
+++ b/source/Hack-Bold.ufo/glyphs/ohorn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ohorn" format="1">
+<glyph name="ohorn" format="2">
   <advance width="1233"/>
   <unicode hex="01A1"/>
   <outline>
@@ -7,49 +7,49 @@
       <point x="1202" y="1167" type="line" name="av01"/>
       <point x="1217" y="1094"/>
       <point x="1224" y="1031"/>
-      <point x="1224" y="979" type="curve" name="dh06" smooth="yes"/>
+      <point x="1224" y="979" type="curve" smooth="yes" name="dh06"/>
       <point x="1224" y="823"/>
       <point x="1162" y="739"/>
-      <point x="1047" y="739" type="curve" name="sv02" smooth="yes"/>
+      <point x="1047" y="739" type="curve" smooth="yes" name="sv02"/>
       <point x="1040" y="739"/>
       <point x="1034" y="739"/>
       <point x="1027" y="740" type="curve" name="ih01"/>
       <point x="1039" y="684"/>
       <point x="1046" y="624"/>
-      <point x="1046" y="559" type="curve" name="dh04" smooth="yes"/>
+      <point x="1046" y="559" type="curve" smooth="yes" name="dh04"/>
       <point x="1046" y="198"/>
       <point x="844" y="-29"/>
-      <point x="527" y="-29" type="curve" name="hr01" smooth="yes"/>
+      <point x="527" y="-29" type="curve" smooth="yes" name="hr01"/>
       <point x="211" y="-29"/>
       <point x="9" y="198"/>
-      <point x="9" y="559" type="curve" name="dh01" smooth="yes"/>
+      <point x="9" y="559" type="curve" smooth="yes" name="dh01"/>
       <point x="9" y="920"/>
       <point x="211" y="1147"/>
-      <point x="527" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="527" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="726" y="1147"/>
       <point x="876" y="1060"/>
       <point x="964" y="907" type="curve"/>
       <point x="972" y="904"/>
       <point x="981" y="903"/>
-      <point x="990" y="903" type="curve" name="sv01" smooth="yes"/>
+      <point x="990" y="903" type="curve" smooth="yes" name="sv01"/>
       <point x="1038" y="903"/>
       <point x="1077" y="938"/>
-      <point x="1077" y="1018" type="curve" name="dh05" smooth="yes"/>
+      <point x="1077" y="1018" type="curve" smooth="yes" name="dh05"/>
       <point x="1077" y="1058"/>
       <point x="1067" y="1115"/>
       <point x="1046" y="1167" type="curve" name="ih02"/>
     </contour>
     <contour>
-      <point x="527" y="209" type="curve" name="dv01" smooth="yes"/>
+      <point x="527" y="209" type="curve" smooth="yes" name="dv01"/>
       <point x="668" y="209"/>
       <point x="753" y="338"/>
-      <point x="753" y="559" type="curve" name="dh03" smooth="yes"/>
+      <point x="753" y="559" type="curve" smooth="yes" name="dh03"/>
       <point x="753" y="778"/>
       <point x="668" y="909"/>
-      <point x="527" y="909" type="curve" name="sv03" smooth="yes"/>
+      <point x="527" y="909" type="curve" smooth="yes" name="sv03"/>
       <point x="387" y="909"/>
       <point x="302" y="778"/>
-      <point x="302" y="559" type="curve" name="dh02" smooth="yes"/>
+      <point x="302" y="559" type="curve" smooth="yes" name="dh02"/>
       <point x="302" y="338"/>
       <point x="387" y="209"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/ohungarumlaut.glif b/source/Hack-Bold.ufo/glyphs/ohungarumlaut.glif
index 812d69481..62f119f7c 100644
--- a/source/Hack-Bold.ufo/glyphs/ohungarumlaut.glif
+++ b/source/Hack-Bold.ufo/glyphs/ohungarumlaut.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ohungarumlaut" format="1">
+<glyph name="ohungarumlaut" format="2">
   <advance width="1233"/>
   <unicode hex="0151"/>
   <outline>
@@ -16,30 +16,30 @@
       <point x="639" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="300" y="-29"/>
       <point x="98" y="198"/>
-      <point x="98" y="559" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="559" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="920"/>
       <point x="300" y="1147"/>
-      <point x="616" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="933" y="1147"/>
       <point x="1135" y="920"/>
-      <point x="1135" y="559" type="curve" name="sh02" smooth="yes"/>
+      <point x="1135" y="559" type="curve" smooth="yes" name="sh02"/>
       <point x="1135" y="198"/>
       <point x="933" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="209" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="209" type="curve" smooth="yes" name="dv02"/>
       <point x="757" y="209"/>
       <point x="842" y="338"/>
-      <point x="842" y="559" type="curve" name="ah01" smooth="yes"/>
+      <point x="842" y="559" type="curve" smooth="yes" name="ah01"/>
       <point x="842" y="778"/>
       <point x="757" y="909"/>
-      <point x="616" y="909" type="curve" name="sv02" smooth="yes"/>
+      <point x="616" y="909" type="curve" smooth="yes" name="sv02"/>
       <point x="476" y="909"/>
       <point x="391" y="778"/>
-      <point x="391" y="559" type="curve" name="sh03" smooth="yes"/>
+      <point x="391" y="559" type="curve" smooth="yes" name="sh03"/>
       <point x="391" y="338"/>
       <point x="476" y="209"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/omacron.glif b/source/Hack-Bold.ufo/glyphs/omacron.glif
index b41032317..bf4045480 100644
--- a/source/Hack-Bold.ufo/glyphs/omacron.glif
+++ b/source/Hack-Bold.ufo/glyphs/omacron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="omacron" format="1">
+<glyph name="omacron" format="2">
   <advance width="1233"/>
   <unicode hex="014D"/>
   <outline>
@@ -10,30 +10,30 @@
       <point x="301" y="1347" type="line"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="300" y="-29"/>
       <point x="98" y="198"/>
-      <point x="98" y="559" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="559" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="920"/>
       <point x="300" y="1147"/>
-      <point x="616" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="933" y="1147"/>
       <point x="1135" y="920"/>
-      <point x="1135" y="559" type="curve" name="sh02" smooth="yes"/>
+      <point x="1135" y="559" type="curve" smooth="yes" name="sh02"/>
       <point x="1135" y="198"/>
       <point x="933" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="209" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="209" type="curve" smooth="yes" name="dv02"/>
       <point x="757" y="209"/>
       <point x="842" y="338"/>
-      <point x="842" y="559" type="curve" name="ah01" smooth="yes"/>
+      <point x="842" y="559" type="curve" smooth="yes" name="ah01"/>
       <point x="842" y="778"/>
       <point x="757" y="909"/>
-      <point x="616" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="476" y="909"/>
       <point x="391" y="778"/>
-      <point x="391" y="559" type="curve" name="sh03" smooth="yes"/>
+      <point x="391" y="559" type="curve" smooth="yes" name="sh03"/>
       <point x="391" y="338"/>
       <point x="476" y="209"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/omega.glif b/source/Hack-Bold.ufo/glyphs/omega.glif
index c329507aa..4b330d44b 100644
--- a/source/Hack-Bold.ufo/glyphs/omega.glif
+++ b/source/Hack-Bold.ufo/glyphs/omega.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="omega" format="1">
+<glyph name="omega" format="2">
   <advance width="1233"/>
   <unicode hex="03C9"/>
   <outline>
     <contour>
-      <point x="393" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="393" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="305" y="-29"/>
       <point x="227" y="5"/>
       <point x="180" y="54" type="curve" smooth="yes"/>
@@ -14,7 +14,7 @@
       <point x="433" y="1120" type="line" name="ih01"/>
       <point x="372" y="905"/>
       <point x="346" y="748"/>
-      <point x="346" y="526" type="curve" name="sh01" smooth="yes"/>
+      <point x="346" y="526" type="curve" smooth="yes" name="sh01"/>
       <point x="346" y="395"/>
       <point x="356" y="273"/>
       <point x="372" y="237" type="curve" smooth="yes"/>
@@ -33,7 +33,7 @@
       <point x="862" y="237" type="curve" smooth="yes"/>
       <point x="878" y="273"/>
       <point x="888" y="395"/>
-      <point x="888" y="526" type="curve" name="sh03" smooth="yes"/>
+      <point x="888" y="526" type="curve" smooth="yes" name="sh03"/>
       <point x="888" y="748"/>
       <point x="862" y="905"/>
       <point x="801" y="1120" type="curve" name="ih02"/>
@@ -43,7 +43,7 @@
       <point x="1054" y="54" type="curve" smooth="yes"/>
       <point x="1003" y="1"/>
       <point x="923" y="-29"/>
-      <point x="840" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="840" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="725" y="-29"/>
       <point x="650" y="31"/>
       <point x="617" y="150" type="curve" name="ih03"/>
diff --git a/source/Hack-Bold.ufo/glyphs/omegatonos.glif b/source/Hack-Bold.ufo/glyphs/omegatonos.glif
index da61aa3a8..173c3a6a4 100644
--- a/source/Hack-Bold.ufo/glyphs/omegatonos.glif
+++ b/source/Hack-Bold.ufo/glyphs/omegatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="omegatonos" format="1">
+<glyph name="omegatonos" format="2">
   <advance width="1233"/>
   <unicode hex="03CE"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="469" y="1270" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="393" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="393" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="305" y="-29"/>
       <point x="227" y="5"/>
       <point x="180" y="54" type="curve" smooth="yes"/>
@@ -20,7 +20,7 @@
       <point x="433" y="1120" type="line" name="ih02"/>
       <point x="372" y="905"/>
       <point x="346" y="748"/>
-      <point x="346" y="526" type="curve" name="sh01" smooth="yes"/>
+      <point x="346" y="526" type="curve" smooth="yes" name="sh01"/>
       <point x="346" y="395"/>
       <point x="356" y="273"/>
       <point x="372" y="237" type="curve" smooth="yes"/>
@@ -39,7 +39,7 @@
       <point x="862" y="237" type="curve" smooth="yes"/>
       <point x="878" y="273"/>
       <point x="888" y="395"/>
-      <point x="888" y="526" type="curve" name="sh03" smooth="yes"/>
+      <point x="888" y="526" type="curve" smooth="yes" name="sh03"/>
       <point x="888" y="748"/>
       <point x="862" y="905"/>
       <point x="801" y="1120" type="curve" name="ih03"/>
@@ -49,7 +49,7 @@
       <point x="1054" y="54" type="curve" smooth="yes"/>
       <point x="1003" y="1"/>
       <point x="923" y="-29"/>
-      <point x="840" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="840" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="725" y="-29"/>
       <point x="650" y="31"/>
       <point x="617" y="150" type="curve" name="ih04"/>
diff --git a/source/Hack-Bold.ufo/glyphs/omicron.glif b/source/Hack-Bold.ufo/glyphs/omicron.glif
index dd094d335..c481f7267 100644
--- a/source/Hack-Bold.ufo/glyphs/omicron.glif
+++ b/source/Hack-Bold.ufo/glyphs/omicron.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="omicron" format="1">
+<glyph name="omicron" format="2">
   <advance width="1233"/>
   <unicode hex="03BF"/>
   <outline>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="300" y="-29"/>
       <point x="98" y="198"/>
-      <point x="98" y="559" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="559" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="920"/>
       <point x="300" y="1147"/>
-      <point x="616" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="933" y="1147"/>
       <point x="1135" y="920"/>
-      <point x="1135" y="559" type="curve" name="sh02" smooth="yes"/>
+      <point x="1135" y="559" type="curve" smooth="yes" name="sh02"/>
       <point x="1135" y="198"/>
       <point x="933" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="209" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="209" type="curve" smooth="yes" name="dv01"/>
       <point x="757" y="209"/>
       <point x="842" y="338"/>
-      <point x="842" y="559" type="curve" name="ah01" smooth="yes"/>
+      <point x="842" y="559" type="curve" smooth="yes" name="ah01"/>
       <point x="842" y="778"/>
       <point x="757" y="909"/>
-      <point x="616" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="476" y="909"/>
       <point x="391" y="778"/>
-      <point x="391" y="559" type="curve" name="sh03" smooth="yes"/>
+      <point x="391" y="559" type="curve" smooth="yes" name="sh03"/>
       <point x="391" y="338"/>
       <point x="476" y="209"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/omicrontonos.glif b/source/Hack-Bold.ufo/glyphs/omicrontonos.glif
index 680b6f9c6..c37997b92 100644
--- a/source/Hack-Bold.ufo/glyphs/omicrontonos.glif
+++ b/source/Hack-Bold.ufo/glyphs/omicrontonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="omicrontonos" format="1">
+<glyph name="omicrontonos" format="2">
   <advance width="1233"/>
   <unicode hex="03CC"/>
   <outline>
@@ -10,30 +10,30 @@
       <point x="469" y="1297" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="300" y="-29"/>
       <point x="98" y="198"/>
-      <point x="98" y="559" type="curve" name="sh02" smooth="yes"/>
+      <point x="98" y="559" type="curve" smooth="yes" name="sh02"/>
       <point x="98" y="920"/>
       <point x="300" y="1147"/>
-      <point x="616" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="933" y="1147"/>
       <point x="1135" y="920"/>
-      <point x="1135" y="559" type="curve" name="sh01" smooth="yes"/>
+      <point x="1135" y="559" type="curve" smooth="yes" name="sh01"/>
       <point x="1135" y="198"/>
       <point x="933" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="209" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="209" type="curve" smooth="yes" name="dv02"/>
       <point x="757" y="209"/>
       <point x="842" y="338"/>
-      <point x="842" y="559" type="curve" name="ah01" smooth="yes"/>
+      <point x="842" y="559" type="curve" smooth="yes" name="ah01"/>
       <point x="842" y="778"/>
       <point x="757" y="909"/>
-      <point x="616" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="476" y="909"/>
       <point x="391" y="778"/>
-      <point x="391" y="559" type="curve" name="sh03" smooth="yes"/>
+      <point x="391" y="559" type="curve" smooth="yes" name="sh03"/>
       <point x="391" y="338"/>
       <point x="476" y="209"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/one.glif b/source/Hack-Bold.ufo/glyphs/one.glif
index b3c1b909f..32251d91f 100644
--- a/source/Hack-Bold.ufo/glyphs/one.glif
+++ b/source/Hack-Bold.ufo/glyphs/one.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="one" format="1">
+<glyph name="one" format="2">
   <advance width="1233"/>
   <unicode hex="0031"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/one.subs.glif b/source/Hack-Bold.ufo/glyphs/one.subs.glif
index 03e4ea9f0..8b0466051 100644
--- a/source/Hack-Bold.ufo/glyphs/one.subs.glif
+++ b/source/Hack-Bold.ufo/glyphs/one.subs.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="one.subs" format="1">
+<glyph name="one.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/onedotenleader.glif b/source/Hack-Bold.ufo/glyphs/onedotenleader.glif
index d74f60445..1738f9017 100644
--- a/source/Hack-Bold.ufo/glyphs/onedotenleader.glif
+++ b/source/Hack-Bold.ufo/glyphs/onedotenleader.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="onedotenleader" format="1">
+<glyph name="onedotenleader" format="2">
   <advance width="1233"/>
   <unicode hex="2024"/>
   <outline>
     <contour>
-      <point x="499" y="0" type="line" name="ab01" smooth="yes"/>
+      <point x="499" y="0" type="line" smooth="yes" name="ab01"/>
       <point x="479" y="0"/>
       <point x="469" y="10"/>
-      <point x="469" y="30" type="curve" name="sh03" smooth="yes"/>
+      <point x="469" y="30" type="curve" smooth="yes" name="sh03"/>
       <point x="469" y="337" type="line" smooth="yes"/>
       <point x="469" y="357"/>
       <point x="479" y="367"/>
-      <point x="499" y="367" type="curve" name="sv03" smooth="yes"/>
-      <point x="734" y="367" type="line" name="sv04" smooth="yes"/>
+      <point x="499" y="367" type="curve" smooth="yes" name="sv03"/>
+      <point x="734" y="367" type="line" smooth="yes" name="sv04"/>
       <point x="754" y="367"/>
       <point x="764" y="357"/>
       <point x="764" y="337" type="curve" smooth="yes"/>
-      <point x="764" y="30" type="line" name="sh04" smooth="yes"/>
+      <point x="764" y="30" type="line" smooth="yes" name="sh04"/>
       <point x="764" y="10"/>
       <point x="754" y="0"/>
       <point x="734" y="0" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/oneeighth.glif b/source/Hack-Bold.ufo/glyphs/oneeighth.glif
index c743298de..3935643f9 100644
--- a/source/Hack-Bold.ufo/glyphs/oneeighth.glif
+++ b/source/Hack-Bold.ufo/glyphs/oneeighth.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="oneeighth" format="1">
+<glyph name="oneeighth" format="2">
   <advance width="1233"/>
   <unicode hex="215B"/>
   <outline>
@@ -23,47 +23,47 @@
       <point x="84" y="500" type="line" name="hr01"/>
     </contour>
     <contour>
-      <point x="818" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="818" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="603" y="-285"/>
       <point x="483" y="-192"/>
-      <point x="483" y="-41" type="curve" name="sh03" smooth="yes"/>
+      <point x="483" y="-41" type="curve" smooth="yes" name="sh03"/>
       <point x="483" y="70"/>
       <point x="548" y="143"/>
       <point x="667" y="174" type="curve" name="ih01"/>
       <point x="560" y="205"/>
       <point x="509" y="267"/>
-      <point x="509" y="359" type="curve" name="hr02" smooth="yes"/>
+      <point x="509" y="359" type="curve" smooth="yes" name="hr02"/>
       <point x="509" y="497"/>
       <point x="627" y="582"/>
-      <point x="816" y="582" type="curve" name="dv06" smooth="yes"/>
+      <point x="816" y="582" type="curve" smooth="yes" name="dv06"/>
       <point x="1008" y="582"/>
       <point x="1125" y="495"/>
-      <point x="1125" y="359" type="curve" name="dh04" smooth="yes"/>
+      <point x="1125" y="359" type="curve" smooth="yes" name="dh04"/>
       <point x="1125" y="267"/>
       <point x="1071" y="205"/>
       <point x="970" y="174" type="curve" name="ih02"/>
       <point x="1083" y="145"/>
       <point x="1150" y="75"/>
-      <point x="1150" y="-41" type="curve" name="sh05" smooth="yes"/>
+      <point x="1150" y="-41" type="curve" smooth="yes" name="sh05"/>
       <point x="1150" y="-194"/>
       <point x="1031" y="-285"/>
     </contour>
     <contour>
-      <point x="817" y="237" type="curve" name="dv04" smooth="yes"/>
+      <point x="817" y="237" type="curve" smooth="yes" name="dv04"/>
       <point x="897" y="237"/>
       <point x="946" y="279"/>
-      <point x="946" y="344" type="curve" name="dh03" smooth="yes"/>
+      <point x="946" y="344" type="curve" smooth="yes" name="dh03"/>
       <point x="946" y="409"/>
       <point x="897" y="449"/>
-      <point x="817" y="449" type="curve" name="dv05" smooth="yes"/>
+      <point x="817" y="449" type="curve" smooth="yes" name="dv05"/>
       <point x="737" y="449"/>
       <point x="688" y="408"/>
-      <point x="688" y="344" type="curve" name="sh04" smooth="yes"/>
+      <point x="688" y="344" type="curve" smooth="yes" name="sh04"/>
       <point x="688" y="279"/>
       <point x="737" y="237"/>
     </contour>
     <contour>
-      <point x="816" y="-152" type="curve" name="dv02" smooth="yes"/>
+      <point x="816" y="-152" type="curve" smooth="yes" name="dv02"/>
       <point x="907" y="-152"/>
       <point x="968" y="-102"/>
       <point x="968" y="-23" type="curve" smooth="yes"/>
@@ -72,7 +72,7 @@
       <point x="927" y="69" type="curve" smooth="yes"/>
       <point x="900" y="92"/>
       <point x="864" y="103"/>
-      <point x="819" y="103" type="curve" name="dv03" smooth="yes"/>
+      <point x="819" y="103" type="curve" smooth="yes" name="dv03"/>
       <point x="726" y="103"/>
       <point x="665" y="53"/>
       <point x="665" y="-24" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/onehalf.glif b/source/Hack-Bold.ufo/glyphs/onehalf.glif
index 6b043ce25..406220e20 100644
--- a/source/Hack-Bold.ufo/glyphs/onehalf.glif
+++ b/source/Hack-Bold.ufo/glyphs/onehalf.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="onehalf" format="1">
+<glyph name="onehalf" format="2">
   <advance width="1233"/>
   <unicode hex="00BD"/>
   <outline>
@@ -29,13 +29,13 @@
       <point x="616" y="-11" type="curve" smooth="yes"/>
       <point x="828" y="166"/>
       <point x="930" y="274"/>
-      <point x="930" y="337" type="curve" name="dh03" smooth="yes"/>
+      <point x="930" y="337" type="curve" smooth="yes" name="dh03"/>
       <point x="930" y="360"/>
       <point x="918" y="391"/>
       <point x="887" y="412" type="curve" smooth="yes"/>
       <point x="858" y="432"/>
       <point x="819" y="442"/>
-      <point x="770" y="442" type="curve" name="dv02" smooth="yes"/>
+      <point x="770" y="442" type="curve" smooth="yes" name="dv02"/>
       <point x="688" y="442"/>
       <point x="606" y="423"/>
       <point x="500" y="373" type="curve" name="ih01"/>
@@ -45,13 +45,13 @@
       <point x="646" y="571" type="curve" smooth="yes"/>
       <point x="683" y="578"/>
       <point x="736" y="582"/>
-      <point x="788" y="582" type="curve" name="dv03" smooth="yes"/>
+      <point x="788" y="582" type="curve" smooth="yes" name="dv03"/>
       <point x="896" y="582"/>
       <point x="985" y="562"/>
       <point x="1046" y="519" type="curve" smooth="yes"/>
       <point x="1109" y="476"/>
       <point x="1139" y="416"/>
-      <point x="1139" y="363" type="curve" name="dh04" smooth="yes"/>
+      <point x="1139" y="363" type="curve" smooth="yes" name="dh04"/>
       <point x="1139" y="266"/>
       <point x="1037" y="137"/>
       <point x="784" y="-60" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/onequarter.glif b/source/Hack-Bold.ufo/glyphs/onequarter.glif
index dc5db61c8..1142bbe4b 100644
--- a/source/Hack-Bold.ufo/glyphs/onequarter.glif
+++ b/source/Hack-Bold.ufo/glyphs/onequarter.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="onequarter" format="1">
+<glyph name="onequarter" format="2">
   <advance width="1233"/>
   <unicode hex="00BC"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/openbullet.glif b/source/Hack-Bold.ufo/glyphs/openbullet.glif
index 91e2561c8..e815b31fa 100644
--- a/source/Hack-Bold.ufo/glyphs/openbullet.glif
+++ b/source/Hack-Bold.ufo/glyphs/openbullet.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="openbullet" format="1">
+<glyph name="openbullet" format="2">
   <advance width="1233"/>
   <unicode hex="25E6"/>
   <outline>
     <contour>
-      <point x="614" y="399" type="curve" name="hr00" smooth="yes"/>
+      <point x="614" y="399" type="curve" smooth="yes" name="hr00"/>
       <point x="517" y="399"/>
       <point x="427" y="438"/>
       <point x="360" y="506" type="curve" smooth="yes"/>
       <point x="292" y="574"/>
       <point x="256" y="664"/>
-      <point x="256" y="761" type="curve" name="sh01" smooth="yes"/>
+      <point x="256" y="761" type="curve" smooth="yes" name="sh01"/>
       <point x="256" y="861"/>
       <point x="294" y="948"/>
       <point x="362" y="1016" type="curve" smooth="yes"/>
       <point x="429" y="1081"/>
       <point x="520" y="1120"/>
-      <point x="617" y="1120" type="curve" name="at01" smooth="yes"/>
+      <point x="617" y="1120" type="curve" smooth="yes" name="at01"/>
       <point x="713" y="1120"/>
       <point x="802" y="1082"/>
       <point x="870" y="1017" type="curve" smooth="yes"/>
       <point x="942" y="946"/>
       <point x="977" y="856"/>
-      <point x="977" y="763" type="curve" name="sh02" smooth="yes"/>
+      <point x="977" y="763" type="curve" smooth="yes" name="sh02"/>
       <point x="977" y="667"/>
       <point x="938" y="573"/>
       <point x="870" y="505" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="711" y="399"/>
     </contour>
     <contour>
-      <point x="616" y="471" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="471" type="curve" smooth="yes" name="dv01"/>
       <point x="696" y="471"/>
       <point x="764" y="502"/>
       <point x="819" y="557" type="curve" smooth="yes"/>
       <point x="876" y="614"/>
       <point x="905" y="682"/>
-      <point x="905" y="761" type="curve" name="ah01" smooth="yes"/>
+      <point x="905" y="761" type="curve" smooth="yes" name="ah01"/>
       <point x="905" y="840"/>
       <point x="876" y="909"/>
       <point x="819" y="965" type="curve" smooth="yes"/>
       <point x="763" y="1020"/>
       <point x="693" y="1048"/>
-      <point x="616" y="1048" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1048" type="curve" smooth="yes" name="sv01"/>
       <point x="539" y="1048"/>
       <point x="469" y="1020"/>
       <point x="413" y="965" type="curve" smooth="yes"/>
       <point x="358" y="912"/>
       <point x="328" y="842"/>
-      <point x="328" y="762" type="curve" name="sh03" smooth="yes"/>
+      <point x="328" y="762" type="curve" smooth="yes" name="sh03"/>
       <point x="328" y="678"/>
       <point x="362" y="608"/>
       <point x="411" y="557" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/ordfeminine.glif b/source/Hack-Bold.ufo/glyphs/ordfeminine.glif
index c0518b2a4..e90e64303 100644
--- a/source/Hack-Bold.ufo/glyphs/ordfeminine.glif
+++ b/source/Hack-Bold.ufo/glyphs/ordfeminine.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ordfeminine" format="1">
+<glyph name="ordfeminine" format="2">
   <advance width="1233"/>
   <unicode hex="00AA"/>
   <outline>
     <contour>
-      <point x="537" y="698" type="curve" name="hr00" smooth="yes"/>
+      <point x="537" y="698" type="curve" smooth="yes" name="hr00"/>
       <point x="452" y="698"/>
       <point x="383" y="721"/>
       <point x="332" y="766" type="curve" smooth="yes"/>
       <point x="281" y="811"/>
       <point x="256" y="874"/>
-      <point x="256" y="953" type="curve" name="sh01" smooth="yes"/>
+      <point x="256" y="953" type="curve" smooth="yes" name="sh01"/>
       <point x="256" y="1042"/>
       <point x="289" y="1110"/>
       <point x="349" y="1153" type="curve" smooth="yes"/>
@@ -24,7 +24,7 @@
       <point x="741" y="1319" type="curve" smooth="yes"/>
       <point x="713" y="1334"/>
       <point x="669" y="1343"/>
-      <point x="601" y="1343" type="curve" name="sv01" smooth="yes"/>
+      <point x="601" y="1343" type="curve" smooth="yes" name="sv01"/>
       <point x="550" y="1343"/>
       <point x="498" y="1338"/>
       <point x="451" y="1327" type="curve" smooth="yes"/>
@@ -34,13 +34,13 @@
       <point x="315" y="1464" type="line"/>
       <point x="351" y="1479"/>
       <point x="406" y="1495"/>
-      <point x="462" y="1506" type="curve" name="sh03" smooth="yes"/>
+      <point x="462" y="1506" type="curve" smooth="yes" name="sh03"/>
       <point x="511" y="1515"/>
       <point x="561" y="1520"/>
-      <point x="613" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="613" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="864" y="1520"/>
       <point x="979" y="1409"/>
-      <point x="979" y="1165" type="curve" name="sh04" smooth="yes"/>
+      <point x="979" y="1165" type="curve" smooth="yes" name="sh04"/>
       <point x="979" y="717" type="line"/>
       <point x="805" y="717" type="line" name="dv02"/>
       <point x="786" y="809" type="line" name="sh05"/>
@@ -51,18 +51,18 @@
       <point x="588" y="698"/>
     </contour>
     <contour>
-      <point x="593" y="866" type="curve" name="dv03" smooth="yes"/>
+      <point x="593" y="866" type="curve" smooth="yes" name="dv03"/>
       <point x="649" y="866"/>
       <point x="699" y="887"/>
       <point x="732" y="918" type="curve" smooth="yes"/>
       <point x="768" y="953"/>
       <point x="786" y="998"/>
-      <point x="786" y="1049" type="curve" name="sh06" smooth="yes"/>
+      <point x="786" y="1049" type="curve" smooth="yes" name="sh06"/>
       <point x="786" y="1079" type="line" name="dv04"/>
       <point x="684" y="1079" type="line" smooth="yes"/>
       <point x="539" y="1079"/>
       <point x="475" y="1046"/>
-      <point x="475" y="970" type="curve" name="sh02" smooth="yes"/>
+      <point x="475" y="970" type="curve" smooth="yes" name="sh02"/>
       <point x="475" y="941"/>
       <point x="485" y="913"/>
       <point x="505" y="894" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/ordmasculine.glif b/source/Hack-Bold.ufo/glyphs/ordmasculine.glif
index 33b96e3e0..5b58c8389 100644
--- a/source/Hack-Bold.ufo/glyphs/ordmasculine.glif
+++ b/source/Hack-Bold.ufo/glyphs/ordmasculine.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ordmasculine" format="1">
+<glyph name="ordmasculine" format="2">
   <advance width="1233"/>
   <unicode hex="00BA"/>
   <outline>
     <contour>
-      <point x="637" y="698" type="curve" name="hr00" smooth="yes"/>
+      <point x="637" y="698" type="curve" smooth="yes" name="hr00"/>
       <point x="414" y="698"/>
       <point x="274" y="855"/>
-      <point x="274" y="1107" type="curve" name="sh01" smooth="yes"/>
+      <point x="274" y="1107" type="curve" smooth="yes" name="sh01"/>
       <point x="274" y="1233"/>
       <point x="307" y="1334"/>
       <point x="373" y="1409" type="curve" smooth="yes"/>
       <point x="438" y="1483"/>
       <point x="526" y="1520"/>
-      <point x="637" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="637" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="748" y="1520"/>
       <point x="836" y="1483"/>
       <point x="901" y="1409" type="curve" smooth="yes"/>
       <point x="966" y="1334"/>
       <point x="999" y="1234"/>
-      <point x="999" y="1107" type="curve" name="sh02" smooth="yes"/>
+      <point x="999" y="1107" type="curve" smooth="yes" name="sh02"/>
       <point x="999" y="982"/>
       <point x="969" y="885"/>
       <point x="902" y="809" type="curve" smooth="yes"/>
@@ -27,25 +27,25 @@
       <point x="748" y="698"/>
     </contour>
     <contour>
-      <point x="637" y="874" type="curve" name="dv03" smooth="yes"/>
+      <point x="637" y="874" type="curve" smooth="yes" name="dv03"/>
       <point x="684" y="874"/>
       <point x="724" y="894"/>
       <point x="753" y="937" type="curve" smooth="yes"/>
       <point x="781" y="978"/>
       <point x="795" y="1035"/>
-      <point x="795" y="1108" type="curve" name="ah01" smooth="yes"/>
+      <point x="795" y="1108" type="curve" smooth="yes" name="ah01"/>
       <point x="795" y="1181"/>
       <point x="781" y="1238"/>
       <point x="753" y="1280" type="curve" smooth="yes"/>
       <point x="726" y="1320"/>
       <point x="688" y="1343"/>
-      <point x="637" y="1343" type="curve" name="sv01" smooth="yes"/>
+      <point x="637" y="1343" type="curve" smooth="yes" name="sv01"/>
       <point x="582" y="1343"/>
       <point x="546" y="1316"/>
       <point x="522" y="1281" type="curve" smooth="yes"/>
       <point x="493" y="1238"/>
       <point x="479" y="1181"/>
-      <point x="479" y="1108" type="curve" name="sh03" smooth="yes"/>
+      <point x="479" y="1108" type="curve" smooth="yes" name="sh03"/>
       <point x="479" y="1035"/>
       <point x="493" y="978"/>
       <point x="521" y="937" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/orthogonal.glif b/source/Hack-Bold.ufo/glyphs/orthogonal.glif
index 328f3b42d..f309b3078 100644
--- a/source/Hack-Bold.ufo/glyphs/orthogonal.glif
+++ b/source/Hack-Bold.ufo/glyphs/orthogonal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="orthogonal" format="1">
+<glyph name="orthogonal" format="2">
   <advance width="1233"/>
   <unicode hex="221F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/oslash.glif b/source/Hack-Bold.ufo/glyphs/oslash.glif
index ac1de8b33..498b03358 100644
--- a/source/Hack-Bold.ufo/glyphs/oslash.glif
+++ b/source/Hack-Bold.ufo/glyphs/oslash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="oslash" format="1">
+<glyph name="oslash" format="2">
   <advance width="1233"/>
   <unicode hex="00F8"/>
   <outline>
@@ -8,13 +8,13 @@
       <point x="188" y="199" type="line"/>
       <point x="129" y="295"/>
       <point x="98" y="415"/>
-      <point x="98" y="559" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="559" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="739"/>
       <point x="146" y="885"/>
       <point x="238" y="989" type="curve" smooth="yes"/>
       <point x="331" y="1094"/>
       <point x="462" y="1147"/>
-      <point x="615" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="615" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="671" y="1147"/>
       <point x="728" y="1141"/>
       <point x="775" y="1126" type="curve" smooth="yes"/>
@@ -29,13 +29,13 @@
       <point x="1112" y="758" type="curve" smooth="yes"/>
       <point x="1127" y="702"/>
       <point x="1135" y="633"/>
-      <point x="1135" y="557" type="curve" name="sh02" smooth="yes"/>
+      <point x="1135" y="557" type="curve" smooth="yes" name="sh02"/>
       <point x="1135" y="382"/>
       <point x="1088" y="235"/>
       <point x="996" y="130" type="curve" smooth="yes"/>
       <point x="908" y="30"/>
       <point x="780" y="-29"/>
-      <point x="620" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="620" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="501" y="-29"/>
       <point x="409" y="0"/>
       <point x="315" y="61" type="curve"/>
@@ -45,31 +45,31 @@
       <point x="745" y="860" type="line"/>
       <point x="712" y="893"/>
       <point x="669" y="909"/>
-      <point x="618" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="618" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="547" y="909"/>
       <point x="492" y="878"/>
       <point x="452" y="817" type="curve" smooth="yes"/>
       <point x="411" y="756"/>
       <point x="391" y="670"/>
-      <point x="391" y="559" type="curve" name="sh03" smooth="yes"/>
+      <point x="391" y="559" type="curve" smooth="yes" name="sh03"/>
       <point x="391" y="535"/>
       <point x="392" y="516"/>
-      <point x="393" y="499" type="curve" name="sh04" smooth="yes"/>
+      <point x="393" y="499" type="curve" smooth="yes" name="sh04"/>
       <point x="394" y="483"/>
       <point x="394" y="476"/>
       <point x="399" y="449" type="curve" name="sh05"/>
     </contour>
     <contour>
-      <point x="617" y="209" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="209" type="curve" smooth="yes" name="dv02"/>
       <point x="688" y="209"/>
       <point x="743" y="240"/>
       <point x="782" y="302" type="curve" smooth="yes"/>
       <point x="822" y="366"/>
       <point x="842" y="456"/>
-      <point x="842" y="553" type="curve" name="ah01" smooth="yes"/>
+      <point x="842" y="553" type="curve" smooth="yes" name="ah01"/>
       <point x="842" y="576"/>
       <point x="841" y="602"/>
-      <point x="840" y="617" type="curve" name="sh06" smooth="yes"/>
+      <point x="840" y="617" type="curve" smooth="yes" name="sh06"/>
       <point x="839" y="629"/>
       <point x="835" y="656"/>
       <point x="831" y="675" type="curve" name="sh07"/>
diff --git a/source/Hack-Bold.ufo/glyphs/oslashacute.glif b/source/Hack-Bold.ufo/glyphs/oslashacute.glif
index 0ab11aa3f..678990f3d 100644
--- a/source/Hack-Bold.ufo/glyphs/oslashacute.glif
+++ b/source/Hack-Bold.ufo/glyphs/oslashacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="oslashacute" format="1">
+<glyph name="oslashacute" format="2">
   <advance width="1233"/>
   <unicode hex="01FF"/>
   <outline>
@@ -14,10 +14,10 @@
       <point x="190" y="200" type="line"/>
       <point x="130" y="297"/>
       <point x="100" y="417"/>
-      <point x="100" y="560" type="curve" name="sh02" smooth="yes"/>
+      <point x="100" y="560" type="curve" smooth="yes" name="sh02"/>
       <point x="100" y="921"/>
       <point x="302" y="1148"/>
-      <point x="618" y="1148" type="curve" name="dv04" smooth="yes"/>
+      <point x="618" y="1148" type="curve" smooth="yes" name="dv04"/>
       <point x="731" y="1148"/>
       <point x="828" y="1120"/>
       <point x="917" y="1060" type="curve"/>
@@ -26,10 +26,10 @@
       <point x="1044" y="927" type="line"/>
       <point x="1105" y="826"/>
       <point x="1137" y="704"/>
-      <point x="1137" y="560" type="curve" name="sh01" smooth="yes"/>
+      <point x="1137" y="560" type="curve" smooth="yes" name="sh01"/>
       <point x="1137" y="199"/>
       <point x="935" y="-28"/>
-      <point x="618" y="-28" type="curve" name="dv01" smooth="yes"/>
+      <point x="618" y="-28" type="curve" smooth="yes" name="dv01"/>
       <point x="506" y="-28"/>
       <point x="406" y="2"/>
       <point x="317" y="62" type="curve"/>
@@ -39,19 +39,19 @@
       <point x="747" y="861" type="line"/>
       <point x="712" y="894"/>
       <point x="672" y="910"/>
-      <point x="620" y="910" type="curve" name="dv03" smooth="yes"/>
+      <point x="620" y="910" type="curve" smooth="yes" name="dv03"/>
       <point x="479" y="910"/>
       <point x="393" y="779"/>
-      <point x="393" y="560" type="curve" name="sh03" smooth="yes"/>
+      <point x="393" y="560" type="curve" smooth="yes" name="sh03"/>
       <point x="393" y="515"/>
       <point x="396" y="482"/>
       <point x="401" y="450" type="curve" name="sh04"/>
     </contour>
     <contour>
-      <point x="620" y="210" type="curve" name="dv02" smooth="yes"/>
+      <point x="620" y="210" type="curve" smooth="yes" name="dv02"/>
       <point x="759" y="210"/>
       <point x="844" y="343"/>
-      <point x="844" y="560" type="curve" name="ah01" smooth="yes"/>
+      <point x="844" y="560" type="curve" smooth="yes" name="ah01"/>
       <point x="844" y="599"/>
       <point x="841" y="637"/>
       <point x="833" y="676" type="curve" name="sh05"/>
diff --git a/source/Hack-Bold.ufo/glyphs/otilde.glif b/source/Hack-Bold.ufo/glyphs/otilde.glif
index 1eb19509d..3daf50051 100644
--- a/source/Hack-Bold.ufo/glyphs/otilde.glif
+++ b/source/Hack-Bold.ufo/glyphs/otilde.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="otilde" format="1">
+<glyph name="otilde" format="2">
   <advance width="1233"/>
   <unicode hex="00F5"/>
   <outline>
     <contour>
-      <point x="768" y="1297" type="curve" name="sv01" smooth="yes"/>
+      <point x="768" y="1297" type="curve" smooth="yes" name="sv01"/>
       <point x="740" y="1297"/>
       <point x="721" y="1302"/>
       <point x="701" y="1309" type="curve" smooth="yes"/>
@@ -23,10 +23,10 @@
       <point x="268" y="1332" type="line" smooth="yes"/>
       <point x="268" y="1484"/>
       <point x="346" y="1584"/>
-      <point x="465" y="1584" type="curve" name="av01" smooth="yes"/>
+      <point x="465" y="1584" type="curve" smooth="yes" name="av01"/>
       <point x="490" y="1584"/>
       <point x="514" y="1580"/>
-      <point x="537" y="1571" type="curve" name="av02" smooth="yes"/>
+      <point x="537" y="1571" type="curve" smooth="yes" name="av02"/>
       <point x="564" y="1560"/>
       <point x="586" y="1546"/>
       <point x="614" y="1526" type="curve" smooth="yes"/>
@@ -39,7 +39,7 @@
       <point x="751" y="1453" type="curve" smooth="yes"/>
       <point x="799" y="1453"/>
       <point x="825" y="1496"/>
-      <point x="825" y="1573" type="curve" name="av03" smooth="yes"/>
+      <point x="825" y="1573" type="curve" smooth="yes" name="av03"/>
       <point x="825" y="1582" type="line" name="dv04"/>
       <point x="965" y="1582" type="line" name="av04"/>
       <point x="965" y="1573"/>
@@ -52,45 +52,45 @@
       <point x="829" y="1297"/>
     </contour>
     <contour>
-      <point x="617" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="446" y="-29"/>
       <point x="322" y="34"/>
       <point x="238" y="129" type="curve" smooth="yes"/>
       <point x="145" y="234"/>
       <point x="98" y="384"/>
-      <point x="98" y="560" type="curve" name="dh01" smooth="yes"/>
+      <point x="98" y="560" type="curve" smooth="yes" name="dh01"/>
       <point x="98" y="920"/>
       <point x="300" y="1147"/>
-      <point x="616" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="937" y="1147"/>
       <point x="1135" y="928"/>
-      <point x="1135" y="559" type="curve" name="dh03" smooth="yes"/>
+      <point x="1135" y="559" type="curve" smooth="yes" name="dh03"/>
       <point x="1135" y="380"/>
       <point x="1088" y="235"/>
-      <point x="996" y="130" type="curve" name="hr01" smooth="yes"/>
+      <point x="996" y="130" type="curve" smooth="yes" name="hr01"/>
       <point x="908" y="30"/>
       <point x="780" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="209" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="209" type="curve" smooth="yes" name="dv02"/>
       <point x="687" y="209"/>
       <point x="742" y="240"/>
       <point x="782" y="301" type="curve" smooth="yes"/>
       <point x="822" y="363"/>
       <point x="842" y="449"/>
-      <point x="842" y="560" type="curve" name="hr02" smooth="yes"/>
+      <point x="842" y="560" type="curve" smooth="yes" name="hr02"/>
       <point x="842" y="669"/>
       <point x="822" y="755"/>
       <point x="782" y="817" type="curve" smooth="yes"/>
       <point x="741" y="881"/>
       <point x="684" y="909"/>
-      <point x="616" y="909" type="curve" name="sv02" smooth="yes"/>
+      <point x="616" y="909" type="curve" smooth="yes" name="sv02"/>
       <point x="541" y="909"/>
       <point x="488" y="874"/>
       <point x="451" y="817" type="curve" smooth="yes"/>
       <point x="411" y="755"/>
       <point x="391" y="669"/>
-      <point x="391" y="560" type="curve" name="dh02" smooth="yes"/>
+      <point x="391" y="560" type="curve" smooth="yes" name="dh02"/>
       <point x="391" y="449"/>
       <point x="411" y="363"/>
       <point x="451" y="301" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/p.glif b/source/Hack-Bold.ufo/glyphs/p.glif
index 6f7cfead3..23543240f 100644
--- a/source/Hack-Bold.ufo/glyphs/p.glif
+++ b/source/Hack-Bold.ufo/glyphs/p.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="p" format="1">
+<glyph name="p" format="2">
   <advance width="1233"/>
   <unicode hex="0070"/>
   <outline>
@@ -38,9 +38,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/paragraph.glif b/source/Hack-Bold.ufo/glyphs/paragraph.glif
index 166ed5da8..ee9bdf81b 100644
--- a/source/Hack-Bold.ufo/glyphs/paragraph.glif
+++ b/source/Hack-Bold.ufo/glyphs/paragraph.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="paragraph" format="1">
+<glyph name="paragraph" format="2">
   <advance width="1233"/>
   <unicode hex="00B6"/>
   <outline>
@@ -16,7 +16,7 @@
       <point x="200" y="1377" type="curve" smooth="yes"/>
       <point x="287" y="1454"/>
       <point x="402" y="1493"/>
-      <point x="545" y="1493" type="curve" name="at01" smooth="yes"/>
+      <point x="545" y="1493" type="curve" smooth="yes" name="at01"/>
       <point x="1065" y="1493" type="line"/>
       <point x="1065" y="-197" type="line" name="sh01"/>
       <point x="874" y="-197" type="line" name="ah01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/parenleft.glif b/source/Hack-Bold.ufo/glyphs/parenleft.glif
index 1ff6d0dd0..940c860b8 100644
--- a/source/Hack-Bold.ufo/glyphs/parenleft.glif
+++ b/source/Hack-Bold.ufo/glyphs/parenleft.glif
@@ -1,41 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="parenleft" format="1">
+<glyph name="parenleft" format="2">
   <advance width="1233"/>
   <unicode hex="0028"/>
   <outline>
     <contour>
-      <point x="596" y="-270" type="line" name="hr00"/>
-      <point x="497" y="-127"/>
-      <point x="416" y="23"/>
-      <point x="360" y="186" type="curve" smooth="yes"/>
-      <point x="309" y="336"/>
-      <point x="283" y="488"/>
-      <point x="283" y="643" type="curve" name="dh01" smooth="yes"/>
-      <point x="283" y="797"/>
-      <point x="309" y="950"/>
-      <point x="361" y="1101" type="curve" smooth="yes"/>
-      <point x="412" y="1248"/>
-      <point x="484" y="1393"/>
-      <point x="596" y="1554" type="curve" name="at01"/>
-      <point x="824" y="1554" type="line"/>
-      <point x="739" y="1399"/>
-      <point x="672" y="1244"/>
-      <point x="628" y="1091" type="curve" smooth="yes"/>
-      <point x="585" y="943"/>
-      <point x="564" y="794"/>
-      <point x="564" y="643" type="curve" name="dh02" smooth="yes"/>
-      <point x="564" y="494"/>
-      <point x="585" y="345"/>
-      <point x="628" y="196" type="curve" smooth="yes"/>
-      <point x="671" y="45"/>
-      <point x="737" y="-111"/>
-      <point x="824" y="-270" type="curve" name="av01"/>
+      <point x="977" y="-205" type="line" name="hr00"/>
+      <point x="567" y="-86"/>
+      <point x="244" y="255"/>
+      <point x="244" y="747" type="curve" smooth="yes" name="dh01"/>
+      <point x="244" y="1238"/>
+      <point x="576" y="1591.25"/>
+      <point x="977" y="1700" type="curve" name="at01"/>
+      <point x="977" y="1485" type="line"/>
+      <point x="671" y="1359"/>
+      <point x="509" y="1104"/>
+      <point x="509" y="747" type="curve" smooth="yes" name="dh02"/>
+      <point x="509" y="389"/>
+      <point x="672" y="136"/>
+      <point x="977" y="10" type="curve" name="av01"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
+      <string>2018-06-05 00:49:11 +0000</string>
     </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/parenright.glif b/source/Hack-Bold.ufo/glyphs/parenright.glif
index 8b45b140f..aa734c241 100644
--- a/source/Hack-Bold.ufo/glyphs/parenright.glif
+++ b/source/Hack-Bold.ufo/glyphs/parenright.glif
@@ -1,41 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="parenright" format="1">
+<glyph name="parenright" format="2">
   <advance width="1233"/>
   <unicode hex="0029"/>
   <outline>
     <contour>
-      <point x="409" y="-270" type="line" name="hr00"/>
-      <point x="496" y="-111"/>
-      <point x="562" y="45"/>
-      <point x="605" y="196" type="curve" smooth="yes"/>
-      <point x="648" y="345"/>
-      <point x="669" y="494"/>
-      <point x="669" y="643" type="curve" name="dh01" smooth="yes"/>
-      <point x="669" y="794"/>
-      <point x="648" y="943"/>
-      <point x="605" y="1091" type="curve" smooth="yes"/>
-      <point x="562" y="1238"/>
-      <point x="498" y="1393"/>
-      <point x="409" y="1554" type="curve" name="at01"/>
-      <point x="637" y="1554" type="line"/>
-      <point x="743" y="1401"/>
-      <point x="822" y="1250"/>
-      <point x="873" y="1101" type="curve" smooth="yes"/>
-      <point x="925" y="949"/>
-      <point x="950" y="792"/>
-      <point x="950" y="641" type="curve" name="dh02" smooth="yes"/>
-      <point x="950" y="488"/>
-      <point x="924" y="336"/>
-      <point x="873" y="186" type="curve" smooth="yes"/>
-      <point x="820" y="30"/>
-      <point x="742" y="-117"/>
-      <point x="637" y="-270" type="curve" name="av01"/>
+      <point x="254" y="-205" type="line" name="hr00"/>
+      <point x="664" y="-86"/>
+      <point x="987" y="255"/>
+      <point x="987" y="747" type="curve" smooth="yes" name="dh01"/>
+      <point x="987" y="1238"/>
+      <point x="655" y="1591.25"/>
+      <point x="254" y="1700" type="curve" name="at01"/>
+      <point x="254" y="1485" type="line"/>
+      <point x="560" y="1359"/>
+      <point x="722" y="1104"/>
+      <point x="722" y="747" type="curve" smooth="yes" name="dh02"/>
+      <point x="722" y="389"/>
+      <point x="559" y="136"/>
+      <point x="254" y="10" type="curve" name="av01"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
+      <string>2018-06-05 00:49:05 +0000</string>
     </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/partialdiff.glif b/source/Hack-Bold.ufo/glyphs/partialdiff.glif
index 9ca8b46fd..202327703 100644
--- a/source/Hack-Bold.ufo/glyphs/partialdiff.glif
+++ b/source/Hack-Bold.ufo/glyphs/partialdiff.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="partialdiff" format="1">
+<glyph name="partialdiff" format="2">
   <advance width="1233"/>
   <unicode hex="2202"/>
   <outline>
     <contour>
-      <point x="538" y="-25" type="curve" name="ab01" smooth="yes"/>
+      <point x="538" y="-25" type="curve" smooth="yes" name="ab01"/>
       <point x="418" y="-25"/>
       <point x="328" y="15"/>
       <point x="256" y="90" type="curve" smooth="yes"/>
       <point x="181" y="166"/>
       <point x="145" y="260"/>
-      <point x="145" y="384" type="curve" name="dh01" smooth="yes"/>
+      <point x="145" y="384" type="curve" smooth="yes" name="dh01"/>
       <point x="145" y="512"/>
       <point x="183" y="623"/>
       <point x="262" y="711" type="curve" smooth="yes"/>
       <point x="339" y="798"/>
       <point x="435" y="842"/>
-      <point x="550" y="842" type="curve" name="dv04" smooth="yes"/>
+      <point x="550" y="842" type="curve" smooth="yes" name="dv04"/>
       <point x="617" y="842"/>
       <point x="674" y="828"/>
       <point x="719" y="799" type="curve" smooth="yes"/>
@@ -25,22 +25,22 @@
       <point x="831" y="662" type="curve" name="ih01"/>
       <point x="839" y="721"/>
       <point x="849" y="750"/>
-      <point x="860" y="851" type="curve" name="sh02" smooth="yes"/>
+      <point x="860" y="851" type="curve" smooth="yes" name="sh02"/>
       <point x="867" y="907"/>
       <point x="870" y="952"/>
-      <point x="870" y="1003" type="curve" name="sh01" smooth="yes"/>
+      <point x="870" y="1003" type="curve" smooth="yes" name="sh01"/>
       <point x="870" y="1075"/>
       <point x="862" y="1125"/>
       <point x="845" y="1164" type="curve" smooth="yes"/>
       <point x="826" y="1204"/>
       <point x="802" y="1221"/>
-      <point x="775" y="1221" type="curve" name="dv01" smooth="yes"/>
+      <point x="775" y="1221" type="curve" smooth="yes" name="dv01"/>
       <point x="735" y="1221"/>
       <point x="682" y="1185"/>
       <point x="629" y="1148" type="curve" smooth="yes"/>
       <point x="564" y="1103"/>
       <point x="516" y="1075"/>
-      <point x="469" y="1075" type="curve" name="sv01" smooth="yes"/>
+      <point x="469" y="1075" type="curve" smooth="yes" name="sv01"/>
       <point x="440" y="1075"/>
       <point x="417" y="1085"/>
       <point x="398" y="1105" type="curve" smooth="yes"/>
@@ -52,39 +52,39 @@
       <point x="455" y="1296" type="curve" smooth="yes"/>
       <point x="512" y="1331"/>
       <point x="581" y="1350"/>
-      <point x="661" y="1350" type="curve" name="dv02" smooth="yes"/>
+      <point x="661" y="1350" type="curve" smooth="yes" name="dv02"/>
       <point x="798" y="1350"/>
       <point x="899" y="1294"/>
       <point x="975" y="1189" type="curve" smooth="yes"/>
       <point x="1054" y="1081"/>
       <point x="1092" y="941"/>
-      <point x="1092" y="750" type="curve" name="dh04" smooth="yes"/>
+      <point x="1092" y="750" type="curve" smooth="yes" name="dh04"/>
       <point x="1092" y="537"/>
       <point x="1043" y="349"/>
-      <point x="935" y="196" type="curve" name="hr01" smooth="yes"/>
+      <point x="935" y="196" type="curve" smooth="yes" name="hr01"/>
       <point x="831" y="51"/>
       <point x="701" y="-25"/>
     </contour>
     <contour>
-      <point x="535" y="45" type="curve" name="sv02" smooth="yes"/>
+      <point x="535" y="45" type="curve" smooth="yes" name="sv02"/>
       <point x="599" y="45"/>
       <point x="659" y="86"/>
       <point x="704" y="178" type="curve" smooth="yes"/>
       <point x="748" y="269"/>
       <point x="770" y="387"/>
-      <point x="770" y="507" type="curve" name="dh03" smooth="yes"/>
+      <point x="770" y="507" type="curve" smooth="yes" name="dh03"/>
       <point x="770" y="588"/>
       <point x="760" y="652"/>
       <point x="732" y="696" type="curve" smooth="yes"/>
       <point x="705" y="739"/>
       <point x="666" y="758"/>
-      <point x="623" y="758" type="curve" name="dv03" smooth="yes"/>
+      <point x="623" y="758" type="curve" smooth="yes" name="dv03"/>
       <point x="551" y="758"/>
       <point x="495" y="709"/>
       <point x="454" y="625" type="curve" smooth="yes"/>
       <point x="411" y="537"/>
       <point x="387" y="420"/>
-      <point x="387" y="295" type="curve" name="dh02" smooth="yes"/>
+      <point x="387" y="295" type="curve" smooth="yes" name="dh02"/>
       <point x="387" y="203"/>
       <point x="400" y="144"/>
       <point x="425" y="105" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/percent.glif b/source/Hack-Bold.ufo/glyphs/percent.glif
index 5ab4c40b4..453d3013f 100644
--- a/source/Hack-Bold.ufo/glyphs/percent.glif
+++ b/source/Hack-Bold.ufo/glyphs/percent.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="percent" format="1">
+<glyph name="percent" format="2">
   <advance width="1233"/>
   <unicode hex="0025"/>
   <outline>
     <contour>
-      <point x="352" y="793" type="curve" name="dv05" smooth="yes"/>
+      <point x="352" y="793" type="curve" smooth="yes" name="dv05"/>
       <point x="263" y="793"/>
       <point x="188" y="824"/>
       <point x="126" y="886" type="curve" smooth="yes"/>
       <point x="66" y="946"/>
       <point x="33" y="1019"/>
-      <point x="33" y="1112" type="curve" name="dh01" smooth="yes"/>
+      <point x="33" y="1112" type="curve" smooth="yes" name="dh01"/>
       <point x="33" y="1201"/>
       <point x="64" y="1277"/>
       <point x="126" y="1339" type="curve" smooth="yes"/>
       <point x="188" y="1401"/>
       <point x="263" y="1432"/>
-      <point x="352" y="1432" type="curve" name="dv02" smooth="yes"/>
+      <point x="352" y="1432" type="curve" smooth="yes" name="dv02"/>
       <point x="531" y="1432"/>
       <point x="672" y="1291"/>
-      <point x="672" y="1112" type="curve" name="dh03" smooth="yes"/>
+      <point x="672" y="1112" type="curve" smooth="yes" name="dh03"/>
       <point x="672" y="1023"/>
       <point x="641" y="948"/>
       <point x="579" y="886" type="curve" smooth="yes"/>
@@ -27,25 +27,25 @@
       <point x="444" y="793"/>
     </contour>
     <contour>
-      <point x="352" y="975" type="curve" name="dv06" smooth="yes"/>
+      <point x="352" y="975" type="curve" smooth="yes" name="dv06"/>
       <point x="391" y="975"/>
       <point x="423" y="988"/>
       <point x="450" y="1015" type="curve" smooth="yes"/>
       <point x="476" y="1041"/>
       <point x="489" y="1073"/>
-      <point x="489" y="1112" type="curve" name="dh02" smooth="yes"/>
+      <point x="489" y="1112" type="curve" smooth="yes" name="dh02"/>
       <point x="489" y="1188"/>
       <point x="428" y="1249"/>
-      <point x="352" y="1249" type="curve" name="dv01" smooth="yes"/>
+      <point x="352" y="1249" type="curve" smooth="yes" name="dv01"/>
       <point x="314" y="1249"/>
       <point x="282" y="1236"/>
       <point x="255" y="1210" type="curve" smooth="yes"/>
       <point x="228" y="1183"/>
       <point x="215" y="1151"/>
-      <point x="215" y="1112" type="curve" name="hr01" smooth="yes"/>
+      <point x="215" y="1112" type="curve" smooth="yes" name="hr01"/>
       <point x="215" y="1068"/>
       <point x="231" y="1039"/>
-      <point x="255" y="1015" type="curve" name="hr02" smooth="yes"/>
+      <point x="255" y="1015" type="curve" smooth="yes" name="hr02"/>
       <point x="282" y="988"/>
       <point x="314" y="975"/>
     </contour>
@@ -56,25 +56,25 @@
       <point x="52" y="451" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="898" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="898" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="803" y="0"/>
       <point x="724" y="40"/>
       <point x="672" y="92" type="curve" smooth="yes"/>
       <point x="608" y="156"/>
       <point x="580" y="238"/>
-      <point x="580" y="321" type="curve" name="ih03" smooth="yes"/>
+      <point x="580" y="321" type="curve" smooth="yes" name="ih03"/>
       <point x="580" y="405"/>
       <point x="611" y="483"/>
       <point x="672" y="546" type="curve" smooth="yes"/>
       <point x="729" y="605"/>
       <point x="807" y="639"/>
-      <point x="898" y="639" type="curve" name="dv04" smooth="yes"/>
+      <point x="898" y="639" type="curve" smooth="yes" name="dv04"/>
       <point x="989" y="639"/>
       <point x="1065" y="606"/>
       <point x="1125" y="547" type="curve" smooth="yes"/>
       <point x="1182" y="491"/>
       <point x="1219" y="412"/>
-      <point x="1219" y="320" type="curve" name="dh05" smooth="yes"/>
+      <point x="1219" y="320" type="curve" smooth="yes" name="dh05"/>
       <point x="1219" y="233"/>
       <point x="1186" y="153"/>
       <point x="1126" y="93" type="curve" smooth="yes"/>
@@ -82,22 +82,22 @@
       <point x="989" y="0"/>
     </contour>
     <contour>
-      <point x="898" y="182" type="curve" name="sv01" smooth="yes"/>
+      <point x="898" y="182" type="curve" smooth="yes" name="sv01"/>
       <point x="975" y="182"/>
       <point x="1036" y="243"/>
-      <point x="1036" y="319" type="curve" name="dh04" smooth="yes"/>
+      <point x="1036" y="319" type="curve" smooth="yes" name="dh04"/>
       <point x="1036" y="357"/>
       <point x="1022" y="390"/>
       <point x="995" y="417" type="curve" smooth="yes"/>
       <point x="968" y="444"/>
       <point x="934" y="457"/>
-      <point x="898" y="457" type="curve" name="dv03" smooth="yes"/>
+      <point x="898" y="457" type="curve" smooth="yes" name="dv03"/>
       <point x="860" y="457"/>
       <point x="828" y="444"/>
       <point x="801" y="417" type="curve" smooth="yes"/>
       <point x="774" y="390"/>
       <point x="762" y="355"/>
-      <point x="762" y="319" type="curve" name="sh01" smooth="yes"/>
+      <point x="762" y="319" type="curve" smooth="yes" name="sh01"/>
       <point x="762" y="279"/>
       <point x="778" y="244"/>
       <point x="801" y="221" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/period.glif b/source/Hack-Bold.ufo/glyphs/period.glif
index 713ccf1c3..3da32ee03 100644
--- a/source/Hack-Bold.ufo/glyphs/period.glif
+++ b/source/Hack-Bold.ufo/glyphs/period.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="period" format="1">
+<glyph name="period" format="2">
   <advance width="1233"/>
   <unicode hex="002E"/>
   <outline>
     <contour>
-      <point x="612" y="-42" type="curve" name="hr00" smooth="yes"/>
+      <point x="612" y="-42" type="curve" smooth="yes" name="hr00"/>
       <point x="560" y="-42"/>
       <point x="521" y="-23"/>
       <point x="488" y="10" type="curve" smooth="yes"/>
       <point x="453" y="45"/>
       <point x="436" y="88"/>
-      <point x="436" y="141" type="curve" name="dh01" smooth="yes"/>
+      <point x="436" y="141" type="curve" smooth="yes" name="dh01"/>
       <point x="436" y="196"/>
       <point x="453" y="240"/>
       <point x="488" y="275" type="curve" smooth="yes"/>
       <point x="522" y="309"/>
       <point x="564" y="326"/>
-      <point x="613" y="326" type="curve" name="dv01" smooth="yes"/>
+      <point x="613" y="326" type="curve" smooth="yes" name="dv01"/>
       <point x="661" y="326"/>
       <point x="704" y="310"/>
       <point x="739" y="275" type="curve" smooth="yes"/>
       <point x="773" y="241"/>
       <point x="790" y="196"/>
-      <point x="790" y="141" type="curve" name="dh02" smooth="yes"/>
+      <point x="790" y="141" type="curve" smooth="yes" name="dh02"/>
       <point x="790" y="88"/>
       <point x="773" y="44"/>
       <point x="739" y="10" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/periodcentered.glif b/source/Hack-Bold.ufo/glyphs/periodcentered.glif
index 3f59cf121..121be074e 100644
--- a/source/Hack-Bold.ufo/glyphs/periodcentered.glif
+++ b/source/Hack-Bold.ufo/glyphs/periodcentered.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="periodcentered" format="1">
+<glyph name="periodcentered" format="2">
   <advance width="1233"/>
   <unicode hex="00B7"/>
   <outline>
     <contour>
-      <point x="616" y="576" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="576" type="curve" smooth="yes" name="hr00"/>
       <point x="525" y="576"/>
       <point x="454" y="645"/>
       <point x="454" y="745" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/perthousand.glif b/source/Hack-Bold.ufo/glyphs/perthousand.glif
index d2c6ca93f..522986292 100644
--- a/source/Hack-Bold.ufo/glyphs/perthousand.glif
+++ b/source/Hack-Bold.ufo/glyphs/perthousand.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="perthousand" format="1">
+<glyph name="perthousand" format="2">
   <advance width="1233"/>
   <unicode hex="2030"/>
   <outline>
     <contour>
-      <point x="286" y="856" type="curve" name="dv05" smooth="yes"/>
+      <point x="286" y="856" type="curve" smooth="yes" name="dv05"/>
       <point x="206" y="856"/>
       <point x="135" y="888"/>
       <point x="84" y="939" type="curve" smooth="yes"/>
       <point x="28" y="995"/>
       <point x="0" y="1065"/>
-      <point x="0" y="1144" type="curve" name="dh01" smooth="yes"/>
+      <point x="0" y="1144" type="curve" smooth="yes" name="dh01"/>
       <point x="0" y="1228"/>
       <point x="33" y="1300"/>
       <point x="82" y="1349" type="curve" smooth="yes"/>
       <point x="135" y="1402"/>
       <point x="208" y="1432"/>
-      <point x="287" y="1432" type="curve" name="dv02" smooth="yes"/>
+      <point x="287" y="1432" type="curve" smooth="yes" name="dv02"/>
       <point x="368" y="1432"/>
       <point x="438" y="1400"/>
       <point x="489" y="1348" type="curve" smooth="yes"/>
       <point x="540" y="1297"/>
       <point x="571" y="1226"/>
-      <point x="571" y="1146" type="curve" name="dh04" smooth="yes"/>
+      <point x="571" y="1146" type="curve" smooth="yes" name="dh04"/>
       <point x="571" y="1066"/>
       <point x="540" y="991"/>
       <point x="489" y="940" type="curve" smooth="yes"/>
@@ -30,22 +30,22 @@
       <point x="359" y="856"/>
     </contour>
     <contour>
-      <point x="285" y="1018" type="curve" name="dv06" smooth="yes"/>
+      <point x="285" y="1018" type="curve" smooth="yes" name="dv06"/>
       <point x="318" y="1018"/>
       <point x="348" y="1031"/>
       <point x="373" y="1057" type="curve" smooth="yes"/>
       <point x="400" y="1085"/>
       <point x="410" y="1114"/>
-      <point x="410" y="1146" type="curve" name="dh03" smooth="yes"/>
+      <point x="410" y="1146" type="curve" smooth="yes" name="dh03"/>
       <point x="410" y="1213"/>
       <point x="353" y="1270"/>
-      <point x="284" y="1270" type="curve" name="dv01" smooth="yes"/>
+      <point x="284" y="1270" type="curve" smooth="yes" name="dv01"/>
       <point x="250" y="1270"/>
       <point x="221" y="1258"/>
       <point x="198" y="1235" type="curve" smooth="yes"/>
       <point x="174" y="1211"/>
       <point x="162" y="1182"/>
-      <point x="162" y="1147" type="curve" name="dh02" smooth="yes"/>
+      <point x="162" y="1147" type="curve" smooth="yes" name="dh02"/>
       <point x="162" y="1111"/>
       <point x="174" y="1081"/>
       <point x="198" y="1056" type="curve" smooth="yes"/>
@@ -59,25 +59,25 @@
       <point x="72" y="565" type="line"/>
     </contour>
     <contour>
-      <point x="330" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="330" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="250" y="0"/>
       <point x="183" y="28"/>
       <point x="128" y="84" type="curve" smooth="yes"/>
       <point x="73" y="141"/>
       <point x="45" y="209"/>
-      <point x="45" y="290" type="curve" name="ih01" smooth="yes"/>
+      <point x="45" y="290" type="curve" smooth="yes" name="ih01"/>
       <point x="45" y="374"/>
       <point x="73" y="437"/>
       <point x="128" y="492" type="curve" smooth="yes"/>
       <point x="183" y="547"/>
       <point x="250" y="575"/>
-      <point x="329" y="575" type="curve" name="dv04" smooth="yes"/>
+      <point x="329" y="575" type="curve" smooth="yes" name="dv04"/>
       <point x="410" y="575"/>
       <point x="478" y="547"/>
       <point x="533" y="492" type="curve" smooth="yes"/>
       <point x="586" y="439"/>
       <point x="616" y="371"/>
-      <point x="616" y="288" type="curve" name="sh01" smooth="yes"/>
+      <point x="616" y="288" type="curve" smooth="yes" name="sh01"/>
       <point x="616" y="211"/>
       <point x="591" y="145"/>
       <point x="532" y="85" type="curve" smooth="yes"/>
@@ -85,26 +85,26 @@
       <point x="409" y="0"/>
     </contour>
     <contour>
-      <point x="946" y="0" type="curve" name="ab02" smooth="yes"/>
+      <point x="946" y="0" type="curve" smooth="yes" name="ab02"/>
       <point x="870" y="0"/>
       <point x="802" y="27"/>
       <point x="746" y="82" type="curve" smooth="yes"/>
       <point x="690" y="138"/>
       <point x="662" y="208"/>
       <point x="662" y="285" type="curve" smooth="yes"/>
-      <point x="662" y="289" type="line" name="dh05" smooth="yes"/>
+      <point x="662" y="289" type="line" smooth="yes" name="dh05"/>
       <point x="662" y="366"/>
       <point x="689" y="436"/>
       <point x="744" y="492" type="curve" smooth="yes"/>
       <point x="799" y="547"/>
       <point x="869" y="575"/>
-      <point x="946" y="575" type="curve" name="sv01" smooth="yes"/>
+      <point x="946" y="575" type="curve" smooth="yes" name="sv01"/>
       <point x="1026" y="575"/>
       <point x="1099" y="543"/>
       <point x="1150" y="492" type="curve" smooth="yes"/>
       <point x="1206" y="436"/>
       <point x="1233" y="364"/>
-      <point x="1233" y="288" type="curve" name="dh08" smooth="yes"/>
+      <point x="1233" y="288" type="curve" smooth="yes" name="dh08"/>
       <point x="1233" y="212"/>
       <point x="1206" y="141"/>
       <point x="1150" y="85" type="curve" smooth="yes"/>
@@ -112,19 +112,19 @@
       <point x="1027" y="0"/>
     </contour>
     <contour>
-      <point x="330" y="162" type="curve" name="sv02" smooth="yes"/>
+      <point x="330" y="162" type="curve" smooth="yes" name="sv02"/>
       <point x="363" y="162"/>
       <point x="393" y="175"/>
       <point x="418" y="201" type="curve" smooth="yes"/>
       <point x="445" y="229"/>
       <point x="455" y="258"/>
-      <point x="455" y="290" type="curve" name="ih02" smooth="yes"/>
+      <point x="455" y="290" type="curve" smooth="yes" name="ih02"/>
       <point x="455" y="357"/>
       <point x="398" y="414"/>
-      <point x="330" y="414" type="curve" name="dv03" smooth="yes"/>
+      <point x="330" y="414" type="curve" smooth="yes" name="dv03"/>
       <point x="262" y="414"/>
       <point x="207" y="359"/>
-      <point x="207" y="291" type="curve" name="hr01" smooth="yes"/>
+      <point x="207" y="291" type="curve" smooth="yes" name="hr01"/>
       <point x="207" y="255"/>
       <point x="219" y="225"/>
       <point x="243" y="200" type="curve" smooth="yes"/>
@@ -132,13 +132,13 @@
       <point x="296" y="162"/>
     </contour>
     <contour>
-      <point x="946" y="162" type="curve" name="sv03" smooth="yes"/>
+      <point x="946" y="162" type="curve" smooth="yes" name="sv03"/>
       <point x="978" y="162"/>
       <point x="1011" y="176"/>
       <point x="1035" y="200" type="curve" smooth="yes"/>
       <point x="1055" y="220"/>
       <point x="1071" y="252"/>
-      <point x="1071" y="291" type="curve" name="dh07" smooth="yes"/>
+      <point x="1071" y="291" type="curve" smooth="yes" name="dh07"/>
       <point x="1071" y="323"/>
       <point x="1059" y="351"/>
       <point x="1034" y="376" type="curve" smooth="yes"/>
@@ -150,7 +150,7 @@
       <point x="860" y="378" type="curve" smooth="yes"/>
       <point x="839" y="357"/>
       <point x="823" y="324"/>
-      <point x="823" y="288" type="curve" name="dh06" smooth="yes"/>
+      <point x="823" y="288" type="curve" smooth="yes" name="dh06"/>
       <point x="823" y="256"/>
       <point x="836" y="223"/>
       <point x="859" y="199" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/peseta.glif b/source/Hack-Bold.ufo/glyphs/peseta.glif
index 6cccfe01b..d9d6606e6 100644
--- a/source/Hack-Bold.ufo/glyphs/peseta.glif
+++ b/source/Hack-Bold.ufo/glyphs/peseta.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="peseta" format="1">
+<glyph name="peseta" format="2">
   <advance width="1233"/>
   <unicode hex="20A7"/>
   <outline>
     <contour>
-      <point x="1004" y="-28" type="curve" name="dv01" smooth="yes"/>
+      <point x="1004" y="-28" type="curve" smooth="yes" name="dv01"/>
       <point x="969" y="-28"/>
       <point x="935" y="-22"/>
-      <point x="901" y="-11" type="curve" name="ab01" smooth="yes"/>
+      <point x="901" y="-11" type="curve" smooth="yes" name="ab01"/>
       <point x="885" y="-6"/>
       <point x="883" y="-4"/>
       <point x="872" y="0" type="curve" name="ab02"/>
@@ -17,12 +17,12 @@
       <point x="616" y="89" type="curve" smooth="yes"/>
       <point x="590" y="148"/>
       <point x="577" y="248"/>
-      <point x="577" y="389" type="curve" name="dh05" smooth="yes"/>
+      <point x="577" y="389" type="curve" smooth="yes" name="dh05"/>
       <point x="577" y="864" type="line"/>
       <point x="530" y="864" type="line" name="sh01"/>
       <point x="509" y="685"/>
       <point x="446" y="518"/>
-      <point x="281" y="518" type="curve" name="dv03" smooth="yes"/>
+      <point x="281" y="518" type="curve" smooth="yes" name="dv03"/>
       <point x="171" y="518" type="line"/>
       <point x="171" y="0" type="line" name="dh02"/>
       <point x="4" y="0" type="line" name="dh01"/>
@@ -38,55 +38,55 @@
       <point x="893" y="1120" type="line"/>
       <point x="923" y="1138"/>
       <point x="959" y="1147"/>
-      <point x="1002" y="1147" type="curve" name="at03" smooth="yes"/>
+      <point x="1002" y="1147" type="curve" smooth="yes" name="at03"/>
       <point x="1062" y="1147"/>
       <point x="1123" y="1128"/>
       <point x="1196" y="1085" type="curve"/>
       <point x="1196" y="813" type="line" name="sh04"/>
       <point x="1131" y="877"/>
       <point x="1069" y="909"/>
-      <point x="1011" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="1011" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="954" y="909"/>
       <point x="925" y="874"/>
-      <point x="925" y="805" type="curve" name="hr01" smooth="yes"/>
+      <point x="925" y="805" type="curve" smooth="yes" name="hr01"/>
       <point x="925" y="748"/>
       <point x="944" y="720"/>
       <point x="1000" y="705" type="curve"/>
       <point x="1028" y="696" type="line" smooth="yes"/>
       <point x="1179" y="648"/>
       <point x="1230" y="567"/>
-      <point x="1230" y="351" type="curve" name="hr02" smooth="yes"/>
+      <point x="1230" y="351" type="curve" smooth="yes" name="hr02"/>
       <point x="1230" y="91"/>
       <point x="1157" y="-28"/>
     </contour>
     <contour>
-      <point x="263" y="797" type="line" name="dv04" smooth="yes"/>
+      <point x="263" y="797" type="line" smooth="yes" name="dv04"/>
       <point x="328" y="797"/>
       <point x="365" y="873"/>
-      <point x="365" y="1006" type="curve" name="dh03" smooth="yes"/>
+      <point x="365" y="1006" type="curve" smooth="yes" name="dh03"/>
       <point x="365" y="1139"/>
       <point x="328" y="1214"/>
-      <point x="263" y="1214" type="curve" name="sv02" smooth="yes"/>
+      <point x="263" y="1214" type="curve" smooth="yes" name="sv02"/>
       <point x="171" y="1214" type="line" name="sh05"/>
       <point x="171" y="797" type="line"/>
     </contour>
     <contour>
-      <point x="993" y="209" type="curve" name="dv02" smooth="yes"/>
+      <point x="993" y="209" type="curve" smooth="yes" name="dv02"/>
       <point x="1052" y="209"/>
       <point x="1081" y="249"/>
-      <point x="1081" y="328" type="curve" name="dh08" smooth="yes"/>
+      <point x="1081" y="328" type="curve" smooth="yes" name="dh08"/>
       <point x="1081" y="396"/>
       <point x="1059" y="416"/>
       <point x="1003" y="432" type="curve" smooth="yes"/>
       <point x="976" y="440" type="line" smooth="yes"/>
       <point x="838" y="480"/>
       <point x="788" y="576"/>
-      <point x="788" y="791" type="curve" name="dh07" smooth="yes"/>
+      <point x="788" y="791" type="curve" smooth="yes" name="dh07"/>
       <point x="788" y="822"/>
       <point x="788" y="843"/>
       <point x="791" y="864" type="curve" name="sh06"/>
       <point x="733" y="864" type="line"/>
-      <point x="733" y="389" type="line" name="dh06" smooth="yes"/>
+      <point x="733" y="389" type="line" smooth="yes" name="dh06"/>
       <point x="733" y="338"/>
       <point x="738" y="303"/>
       <point x="747" y="284" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/phi.glif b/source/Hack-Bold.ufo/glyphs/phi.glif
index 4e66d7412..f3d0e4510 100644
--- a/source/Hack-Bold.ufo/glyphs/phi.glif
+++ b/source/Hack-Bold.ufo/glyphs/phi.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="phi" format="1">
+<glyph name="phi" format="2">
   <advance width="1233"/>
   <unicode hex="03C6"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="471" y="0" type="line" name="dh03"/>
       <point x="200" y="44"/>
       <point x="65" y="222"/>
-      <point x="65" y="565" type="curve" name="dh01" smooth="yes"/>
+      <point x="65" y="565" type="curve" smooth="yes" name="dh01"/>
       <point x="65" y="982"/>
       <point x="267" y="1128"/>
       <point x="440" y="1120" type="curve" name="at01"/>
@@ -17,14 +17,14 @@
       <point x="374" y="806" type="curve" smooth="yes"/>
       <point x="346" y="749"/>
       <point x="332" y="678"/>
-      <point x="332" y="593" type="curve" name="dh02" smooth="yes"/>
+      <point x="332" y="593" type="curve" smooth="yes" name="dh02"/>
       <point x="332" y="436"/>
       <point x="378" y="324"/>
       <point x="471" y="256" type="curve" name="sh02"/>
       <point x="471" y="648" type="line" smooth="yes"/>
       <point x="471" y="971"/>
       <point x="587" y="1130"/>
-      <point x="796" y="1130" type="curve" name="at02" smooth="yes"/>
+      <point x="796" y="1130" type="curve" smooth="yes" name="at02"/>
       <point x="1010" y="1130"/>
       <point x="1168" y="958"/>
       <point x="1168" y="570" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/pi.glif b/source/Hack-Bold.ufo/glyphs/pi.glif
index 6521b5a7c..b9baca996 100644
--- a/source/Hack-Bold.ufo/glyphs/pi.glif
+++ b/source/Hack-Bold.ufo/glyphs/pi.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="pi" format="1">
+<glyph name="pi" format="2">
   <advance width="1233"/>
   <unicode hex="03C0"/>
   <outline>
     <contour>
-      <point x="1018" y="-39" type="curve" name="av01" smooth="yes"/>
+      <point x="1018" y="-39" type="curve" smooth="yes" name="av01"/>
       <point x="961" y="-39"/>
       <point x="919" y="-33"/>
       <point x="880" y="-22" type="curve"/>
@@ -13,7 +13,7 @@
       <point x="749" y="102" type="curve" smooth="yes"/>
       <point x="740" y="132"/>
       <point x="735" y="176"/>
-      <point x="735" y="233" type="curve" name="dh02" smooth="yes"/>
+      <point x="735" y="233" type="curve" smooth="yes" name="dh02"/>
       <point x="735" y="891" type="line" name="sv01"/>
       <point x="461" y="891" type="line"/>
       <point x="461" y="0" type="line" name="hr01"/>
@@ -24,7 +24,7 @@
       <point x="1182" y="1100" type="line" name="dv02"/>
       <point x="1182" y="891" type="line" name="dv01"/>
       <point x="1020" y="891" type="line"/>
-      <point x="1020" y="362" type="line" name="dh03" smooth="yes"/>
+      <point x="1020" y="362" type="line" smooth="yes" name="dh03"/>
       <point x="1020" y="265"/>
       <point x="1029" y="220"/>
       <point x="1045" y="202" type="curve"/>
@@ -38,7 +38,7 @@
       <point x="1214" y="-14" type="line" name="ab01"/>
       <point x="1187" y="-23"/>
       <point x="1156" y="-29"/>
-      <point x="1121" y="-33" type="curve" name="av02" smooth="yes"/>
+      <point x="1121" y="-33" type="curve" smooth="yes" name="av02"/>
       <point x="1088" y="-37"/>
       <point x="1051" y="-39"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/plus.glif b/source/Hack-Bold.ufo/glyphs/plus.glif
index df4d2a0c5..28eb2f5a8 100644
--- a/source/Hack-Bold.ufo/glyphs/plus.glif
+++ b/source/Hack-Bold.ufo/glyphs/plus.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="plus" format="1">
+<glyph name="plus" format="2">
   <advance width="1233"/>
   <unicode hex="002B"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/plusminus.glif b/source/Hack-Bold.ufo/glyphs/plusminus.glif
index f39cbb9e5..1da6b560d 100644
--- a/source/Hack-Bold.ufo/glyphs/plusminus.glif
+++ b/source/Hack-Bold.ufo/glyphs/plusminus.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="plusminus" format="1">
+<glyph name="plusminus" format="2">
   <advance width="1233"/>
   <unicode hex="00B1"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/product.glif b/source/Hack-Bold.ufo/glyphs/product.glif
index 878e50b16..d4a4c8ad4 100644
--- a/source/Hack-Bold.ufo/glyphs/product.glif
+++ b/source/Hack-Bold.ufo/glyphs/product.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="product" format="1">
+<glyph name="product" format="2">
   <advance width="1233"/>
   <unicode hex="220F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/propersubset.glif b/source/Hack-Bold.ufo/glyphs/propersubset.glif
index bd48f8f25..928ddaff8 100644
--- a/source/Hack-Bold.ufo/glyphs/propersubset.glif
+++ b/source/Hack-Bold.ufo/glyphs/propersubset.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="propersubset" format="1">
+<glyph name="propersubset" format="2">
   <advance width="1233"/>
   <unicode hex="2282"/>
   <outline>
     <contour>
-      <point x="576" y="138" type="line" name="hr00" smooth="yes"/>
+      <point x="576" y="138" type="line" smooth="yes" name="hr00"/>
       <point x="289" y="138"/>
       <point x="88" y="364"/>
-      <point x="88" y="642" type="curve" name="dh01" smooth="yes"/>
+      <point x="88" y="642" type="curve" smooth="yes" name="dh01"/>
       <point x="88" y="929"/>
       <point x="303" y="1144"/>
-      <point x="575" y="1144" type="curve" name="at01" smooth="yes"/>
+      <point x="575" y="1144" type="curve" smooth="yes" name="at01"/>
       <point x="1145" y="1144" type="line"/>
       <point x="1145" y="919" type="line" name="sv01"/>
       <point x="575" y="919" type="line" smooth="yes"/>
       <point x="428" y="919"/>
       <point x="313" y="805"/>
-      <point x="313" y="640" type="curve" name="dh02" smooth="yes"/>
+      <point x="313" y="640" type="curve" smooth="yes" name="dh02"/>
       <point x="313" y="473"/>
       <point x="430" y="363"/>
-      <point x="575" y="363" type="curve" name="dv01" smooth="yes"/>
+      <point x="575" y="363" type="curve" smooth="yes" name="dv01"/>
       <point x="1145" y="363" type="line"/>
       <point x="1145" y="138" type="line" name="sv02"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/propersuperset.glif b/source/Hack-Bold.ufo/glyphs/propersuperset.glif
index 0fa233258..a2c8f1182 100644
--- a/source/Hack-Bold.ufo/glyphs/propersuperset.glif
+++ b/source/Hack-Bold.ufo/glyphs/propersuperset.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="propersuperset" format="1">
+<glyph name="propersuperset" format="2">
   <advance width="1233"/>
   <unicode hex="2283"/>
   <outline>
     <contour>
       <point x="88" y="363" type="line" name="hr00"/>
-      <point x="658" y="363" type="line" name="dv02" smooth="yes"/>
+      <point x="658" y="363" type="line" smooth="yes" name="dv02"/>
       <point x="803" y="363"/>
       <point x="920" y="473"/>
-      <point x="920" y="640" type="curve" name="dh01" smooth="yes"/>
+      <point x="920" y="640" type="curve" smooth="yes" name="dh01"/>
       <point x="920" y="805"/>
       <point x="805" y="919"/>
-      <point x="658" y="919" type="curve" name="sv01" smooth="yes"/>
+      <point x="658" y="919" type="curve" smooth="yes" name="sv01"/>
       <point x="88" y="919" type="line"/>
       <point x="88" y="1144" type="line" name="at01"/>
       <point x="658" y="1144" type="line" smooth="yes"/>
       <point x="930" y="1144"/>
       <point x="1145" y="929"/>
-      <point x="1145" y="642" type="curve" name="dh02" smooth="yes"/>
+      <point x="1145" y="642" type="curve" smooth="yes" name="dh02"/>
       <point x="1145" y="364"/>
       <point x="944" y="138"/>
-      <point x="657" y="138" type="curve" name="dv01" smooth="yes"/>
+      <point x="657" y="138" type="curve" smooth="yes" name="dv01"/>
       <point x="88" y="138" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/proportional.glif b/source/Hack-Bold.ufo/glyphs/proportional.glif
index b9fffab9f..d2617c15f 100644
--- a/source/Hack-Bold.ufo/glyphs/proportional.glif
+++ b/source/Hack-Bold.ufo/glyphs/proportional.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="proportional" format="1">
+<glyph name="proportional" format="2">
   <advance width="1233"/>
   <unicode hex="221D"/>
   <outline>
     <contour>
-      <point x="497" y="223" type="curve" name="hr00" smooth="yes"/>
+      <point x="497" y="223" type="curve" smooth="yes" name="hr00"/>
       <point x="313" y="223"/>
       <point x="177" y="391"/>
-      <point x="177" y="639" type="curve" name="dh01" smooth="yes"/>
+      <point x="177" y="639" type="curve" smooth="yes" name="dh01"/>
       <point x="177" y="875"/>
       <point x="302" y="1040"/>
-      <point x="494" y="1040" type="curve" name="sv01" smooth="yes"/>
+      <point x="494" y="1040" type="curve" smooth="yes" name="sv01"/>
       <point x="615" y="1040"/>
       <point x="712" y="976"/>
       <point x="781" y="831" type="curve"/>
@@ -38,16 +38,16 @@
       <point x="614" y="223"/>
     </contour>
     <contour>
-      <point x="485" y="422" type="curve" name="dv01" smooth="yes"/>
+      <point x="485" y="422" type="curve" smooth="yes" name="dv01"/>
       <point x="556" y="422"/>
       <point x="616" y="490"/>
       <point x="671" y="635" type="curve"/>
       <point x="599" y="802"/>
       <point x="559" y="842"/>
-      <point x="494" y="842" type="curve" name="sv04" smooth="yes"/>
+      <point x="494" y="842" type="curve" smooth="yes" name="sv04"/>
       <point x="415" y="842"/>
       <point x="360" y="757"/>
-      <point x="360" y="626" type="curve" name="dh02" smooth="yes"/>
+      <point x="360" y="626" type="curve" smooth="yes" name="dh02"/>
       <point x="360" y="503"/>
       <point x="409" y="422"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/psi.glif b/source/Hack-Bold.ufo/glyphs/psi.glif
index 66f1d9ce4..b5ac38ee4 100644
--- a/source/Hack-Bold.ufo/glyphs/psi.glif
+++ b/source/Hack-Bold.ufo/glyphs/psi.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="psi" format="1">
+<glyph name="psi" format="2">
   <advance width="1233"/>
   <unicode hex="03C8"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="471" y="0" type="line" name="hr00"/>
       <point x="203" y="43"/>
       <point x="69" y="239"/>
-      <point x="69" y="588" type="curve" name="sh01" smooth="yes"/>
+      <point x="69" y="588" type="curve" smooth="yes" name="sh01"/>
       <point x="69" y="1120" type="line" name="at01"/>
       <point x="361" y="1120" type="line"/>
-      <point x="361" y="595" type="line" name="sh02" smooth="yes"/>
+      <point x="361" y="595" type="line" smooth="yes" name="sh02"/>
       <point x="361" y="402"/>
       <point x="398" y="278"/>
       <point x="471" y="225" type="curve" name="sh03"/>
@@ -19,10 +19,10 @@
       <point x="763" y="225" type="line" name="ih01"/>
       <point x="836" y="292"/>
       <point x="873" y="416"/>
-      <point x="873" y="595" type="curve" name="sh06" smooth="yes"/>
+      <point x="873" y="595" type="curve" smooth="yes" name="sh06"/>
       <point x="873" y="1120" type="line" name="at03"/>
       <point x="1165" y="1120" type="line"/>
-      <point x="1165" y="588" type="line" name="sh07" smooth="yes"/>
+      <point x="1165" y="588" type="line" smooth="yes" name="sh07"/>
       <point x="1165" y="230"/>
       <point x="1031" y="34"/>
       <point x="763" y="0" type="curve" name="sh04"/>
diff --git a/source/Hack-Bold.ufo/glyphs/q.glif b/source/Hack-Bold.ufo/glyphs/q.glif
index 0639ebef1..095b9ea82 100644
--- a/source/Hack-Bold.ufo/glyphs/q.glif
+++ b/source/Hack-Bold.ufo/glyphs/q.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="q" format="1">
+<glyph name="q" format="2">
   <advance width="1233"/>
   <unicode hex="0071"/>
   <outline>
@@ -38,9 +38,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/question.glif b/source/Hack-Bold.ufo/glyphs/question.glif
index 665571709..2b906daa9 100644
--- a/source/Hack-Bold.ufo/glyphs/question.glif
+++ b/source/Hack-Bold.ufo/glyphs/question.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="question" format="1">
+<glyph name="question" format="2">
   <advance width="1233"/>
   <unicode hex="003F"/>
   <outline>
     <contour>
-      <point x="479" y="583" type="line" name="ih01" smooth="yes"/>
+      <point x="479" y="583" type="line" smooth="yes" name="ih01"/>
       <point x="479" y="638"/>
       <point x="489" y="689"/>
       <point x="510" y="735" type="curve" smooth="yes"/>
@@ -38,7 +38,7 @@
       <point x="718" y="1326" type="curve" smooth="yes"/>
       <point x="711" y="1329"/>
       <point x="686" y="1339"/>
-      <point x="663" y="1343" type="curve" name="hr01" smooth="yes"/>
+      <point x="663" y="1343" type="curve" smooth="yes" name="hr01"/>
       <point x="643" y="1347"/>
       <point x="622" y="1349"/>
       <point x="599" y="1349" type="curve" smooth="yes"/>
@@ -59,7 +59,7 @@
       <point x="430" y="1515" type="curve" smooth="yes"/>
       <point x="494" y="1534"/>
       <point x="561" y="1543"/>
-      <point x="632" y="1543" type="curve" name="av01" smooth="yes"/>
+      <point x="632" y="1543" type="curve" smooth="yes" name="av01"/>
       <point x="697" y="1543"/>
       <point x="755" y="1535"/>
       <point x="805" y="1518" type="curve" smooth="yes"/>
@@ -87,15 +87,15 @@
       <point x="717" y="676" type="curve"/>
       <point x="706" y="655"/>
       <point x="699" y="622"/>
-      <point x="699" y="599" type="curve" name="sh01" smooth="yes"/>
+      <point x="699" y="599" type="curve" smooth="yes" name="sh01"/>
       <point x="699" y="457" type="line"/>
       <point x="479" y="457" type="line"/>
     </contour>
     <contour>
-      <point x="592" y="-50" type="curve" name="av02" smooth="yes"/>
+      <point x="592" y="-50" type="curve" smooth="yes" name="av02"/>
       <point x="503" y="-50"/>
       <point x="431" y="20"/>
-      <point x="431" y="117" type="curve" name="dh01" smooth="yes"/>
+      <point x="431" y="117" type="curve" smooth="yes" name="dh01"/>
       <point x="431" y="166"/>
       <point x="447" y="208"/>
       <point x="478" y="239" type="curve" smooth="yes"/>
@@ -116,7 +116,7 @@
       <point x="741" y="184" type="curve" smooth="yes"/>
       <point x="749" y="164"/>
       <point x="753" y="142"/>
-      <point x="753" y="118" type="curve" name="dh02" smooth="yes"/>
+      <point x="753" y="118" type="curve" smooth="yes" name="dh02"/>
       <point x="753" y="19"/>
       <point x="681" y="-50"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/questiondown.case.glif b/source/Hack-Bold.ufo/glyphs/questiondown.case.glif
index 8869e3552..0d15b27c8 100644
--- a/source/Hack-Bold.ufo/glyphs/questiondown.case.glif
+++ b/source/Hack-Bold.ufo/glyphs/questiondown.case.glif
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="questiondown.case" format="1">
+<glyph name="questiondown.case" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="662" y="1230" type="curve" name="dv01" smooth="yes"/>
+      <point x="662" y="1230" type="curve" smooth="yes" name="dv01"/>
       <point x="573" y="1230"/>
       <point x="501" y="1300"/>
-      <point x="501" y="1397" type="curve" name="dh03" smooth="yes"/>
+      <point x="501" y="1397" type="curve" smooth="yes" name="dh03"/>
       <point x="501" y="1446"/>
       <point x="517" y="1488"/>
       <point x="548" y="1519" type="curve" smooth="yes"/>
       <point x="580" y="1550"/>
       <point x="622" y="1564"/>
-      <point x="662" y="1564" type="curve" name="at01" smooth="yes"/>
+      <point x="662" y="1564" type="curve" smooth="yes" name="at01"/>
       <point x="673" y="1564"/>
       <point x="684" y="1563"/>
-      <point x="695" y="1561" type="curve" name="at02" smooth="yes"/>
+      <point x="695" y="1561" type="curve" smooth="yes" name="at02"/>
       <point x="700" y="1560"/>
       <point x="713" y="1557"/>
-      <point x="724" y="1552" type="curve" name="at03" smooth="yes"/>
+      <point x="724" y="1552" type="curve" smooth="yes" name="at03"/>
       <point x="749" y="1541"/>
       <point x="754" y="1539"/>
       <point x="776" y="1517" type="curve" smooth="yes"/>
@@ -27,15 +27,15 @@
       <point x="811" y="1464" type="curve" smooth="yes"/>
       <point x="819" y="1444"/>
       <point x="823" y="1422"/>
-      <point x="823" y="1398" type="curve" name="dh04" smooth="yes"/>
+      <point x="823" y="1398" type="curve" smooth="yes" name="dh04"/>
       <point x="823" y="1299"/>
       <point x="751" y="1230"/>
     </contour>
     <contour>
-      <point x="602" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="602" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="342" y="-27"/>
       <point x="176" y="105"/>
-      <point x="176" y="324" type="curve" name="dh01" smooth="yes"/>
+      <point x="176" y="324" type="curve" smooth="yes" name="dh01"/>
       <point x="176" y="426"/>
       <point x="211" y="500"/>
       <point x="338" y="625" type="curve" smooth="yes"/>
@@ -45,23 +45,23 @@
       <point x="530" y="922" type="curve" name="sh01"/>
       <point x="530" y="924"/>
       <point x="530" y="926"/>
-      <point x="531" y="928" type="curve" name="sh02" smooth="yes"/>
+      <point x="531" y="928" type="curve" smooth="yes" name="sh02"/>
       <point x="532" y="943"/>
       <point x="532" y="956"/>
-      <point x="532" y="969" type="curve" name="ih01" smooth="yes"/>
+      <point x="532" y="969" type="curve" smooth="yes" name="ih01"/>
       <point x="532" y="1092" type="line" name="hr01"/>
       <point x="799" y="1092" type="line"/>
-      <point x="799" y="938" type="line" name="sh03" smooth="yes"/>
+      <point x="799" y="938" type="line" smooth="yes" name="sh03"/>
       <point x="799" y="801"/>
       <point x="763" y="724"/>
       <point x="657" y="621" type="curve" smooth="yes"/>
       <point x="567" y="532" type="line" smooth="yes"/>
       <point x="489" y="454"/>
       <point x="461" y="411"/>
-      <point x="461" y="349" type="curve" name="dh02" smooth="yes"/>
+      <point x="461" y="349" type="curve" smooth="yes" name="dh02"/>
       <point x="461" y="258"/>
       <point x="523" y="213"/>
-      <point x="640" y="213" type="curve" name="sv01" smooth="yes"/>
+      <point x="640" y="213" type="curve" smooth="yes" name="sv01"/>
       <point x="757" y="213"/>
       <point x="871" y="258"/>
       <point x="1006" y="354" type="curve" name="iv01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/questiondown.glif b/source/Hack-Bold.ufo/glyphs/questiondown.glif
index 16615146c..42017c156 100644
--- a/source/Hack-Bold.ufo/glyphs/questiondown.glif
+++ b/source/Hack-Bold.ufo/glyphs/questiondown.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="questiondown" format="1">
+<glyph name="questiondown" format="2">
   <advance width="1233"/>
   <unicode hex="00BF"/>
   <outline>
     <contour>
-      <point x="667" y="1222" type="curve" name="dv02" smooth="yes"/>
+      <point x="667" y="1222" type="curve" smooth="yes" name="dv02"/>
       <point x="578" y="1222"/>
       <point x="506" y="1292"/>
-      <point x="506" y="1389" type="curve" name="dh03" smooth="yes"/>
+      <point x="506" y="1389" type="curve" smooth="yes" name="dh03"/>
       <point x="506" y="1438"/>
       <point x="522" y="1480"/>
       <point x="553" y="1511" type="curve" smooth="yes"/>
       <point x="585" y="1542"/>
       <point x="627" y="1556"/>
-      <point x="667" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="667" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="678" y="1556"/>
       <point x="689" y="1555"/>
-      <point x="700" y="1553" type="curve" name="at02" smooth="yes"/>
+      <point x="700" y="1553" type="curve" smooth="yes" name="at02"/>
       <point x="705" y="1552"/>
       <point x="718" y="1549"/>
-      <point x="729" y="1544" type="curve" name="at03" smooth="yes"/>
+      <point x="729" y="1544" type="curve" smooth="yes" name="at03"/>
       <point x="754" y="1533"/>
       <point x="759" y="1531"/>
       <point x="781" y="1509" type="curve" smooth="yes"/>
@@ -28,15 +28,15 @@
       <point x="816" y="1456" type="curve" smooth="yes"/>
       <point x="824" y="1436"/>
       <point x="828" y="1414"/>
-      <point x="828" y="1390" type="curve" name="dh04" smooth="yes"/>
+      <point x="828" y="1390" type="curve" smooth="yes" name="dh04"/>
       <point x="828" y="1291"/>
       <point x="756" y="1222"/>
     </contour>
     <contour>
-      <point x="606" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="606" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="339" y="-27"/>
       <point x="176" y="110"/>
-      <point x="176" y="323" type="curve" name="dh01" smooth="yes"/>
+      <point x="176" y="323" type="curve" smooth="yes" name="dh01"/>
       <point x="176" y="379"/>
       <point x="187" y="424"/>
       <point x="210" y="468" type="curve" smooth="yes"/>
@@ -52,29 +52,29 @@
       <point x="530" y="922" type="curve" name="sh01"/>
       <point x="530" y="924"/>
       <point x="530" y="926"/>
-      <point x="531" y="928" type="curve" name="sh02" smooth="yes"/>
+      <point x="531" y="928" type="curve" smooth="yes" name="sh02"/>
       <point x="532" y="943"/>
       <point x="532" y="956"/>
-      <point x="532" y="969" type="curve" name="ih01" smooth="yes"/>
+      <point x="532" y="969" type="curve" smooth="yes" name="ih01"/>
       <point x="532" y="1092" type="line"/>
       <point x="799" y="1092" type="line" name="dv01"/>
-      <point x="799" y="938" type="line" name="sh03" smooth="yes"/>
+      <point x="799" y="938" type="line" smooth="yes" name="sh03"/>
       <point x="799" y="871"/>
       <point x="789" y="815"/>
       <point x="768" y="769" type="curve" smooth="yes"/>
       <point x="745" y="718"/>
       <point x="709" y="672"/>
       <point x="657" y="621" type="curve" smooth="yes"/>
-      <point x="567" y="532" type="line" name="hr01" smooth="yes"/>
+      <point x="567" y="532" type="line" smooth="yes" name="hr01"/>
       <point x="514" y="479"/>
       <point x="497" y="458"/>
       <point x="484" y="434" type="curve" smooth="yes"/>
       <point x="469" y="405"/>
       <point x="461" y="376"/>
-      <point x="461" y="347" type="curve" name="dh02" smooth="yes"/>
+      <point x="461" y="347" type="curve" smooth="yes" name="dh02"/>
       <point x="461" y="260"/>
       <point x="524" y="213"/>
-      <point x="642" y="213" type="curve" name="sv01" smooth="yes"/>
+      <point x="642" y="213" type="curve" smooth="yes" name="sv01"/>
       <point x="702" y="213"/>
       <point x="758" y="225"/>
       <point x="819" y="249" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/quotedbl.glif b/source/Hack-Bold.ufo/glyphs/quotedbl.glif
index 396ff1c5c..d0d00ca20 100644
--- a/source/Hack-Bold.ufo/glyphs/quotedbl.glif
+++ b/source/Hack-Bold.ufo/glyphs/quotedbl.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotedbl" format="1">
+<glyph name="quotedbl" format="2">
   <advance width="1233"/>
   <unicode hex="0022"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/quotedblbase.glif b/source/Hack-Bold.ufo/glyphs/quotedblbase.glif
index 8849bcb00..c7fb285b4 100644
--- a/source/Hack-Bold.ufo/glyphs/quotedblbase.glif
+++ b/source/Hack-Bold.ufo/glyphs/quotedblbase.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotedblbase" format="1">
+<glyph name="quotedblbase" format="2">
   <advance width="1233"/>
   <unicode hex="201E"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/quotedblleft.glif b/source/Hack-Bold.ufo/glyphs/quotedblleft.glif
index d2c825a2b..ca929394f 100644
--- a/source/Hack-Bold.ufo/glyphs/quotedblleft.glif
+++ b/source/Hack-Bold.ufo/glyphs/quotedblleft.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotedblleft" format="1">
+<glyph name="quotedblleft" format="2">
   <advance width="1233"/>
   <unicode hex="201C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/quotedblright.glif b/source/Hack-Bold.ufo/glyphs/quotedblright.glif
index ef4f04ed8..c67f38e6f 100644
--- a/source/Hack-Bold.ufo/glyphs/quotedblright.glif
+++ b/source/Hack-Bold.ufo/glyphs/quotedblright.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotedblright" format="1">
+<glyph name="quotedblright" format="2">
   <advance width="1233"/>
   <unicode hex="201D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/quoteleft.glif b/source/Hack-Bold.ufo/glyphs/quoteleft.glif
index 0c68e38d6..8c4325d68 100644
--- a/source/Hack-Bold.ufo/glyphs/quoteleft.glif
+++ b/source/Hack-Bold.ufo/glyphs/quoteleft.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quoteleft" format="1">
+<glyph name="quoteleft" format="2">
   <advance width="1233"/>
   <unicode hex="2018"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/quotereversed.glif b/source/Hack-Bold.ufo/glyphs/quotereversed.glif
index a6f2d5904..a0db7b4ac 100644
--- a/source/Hack-Bold.ufo/glyphs/quotereversed.glif
+++ b/source/Hack-Bold.ufo/glyphs/quotereversed.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotereversed" format="1">
+<glyph name="quotereversed" format="2">
   <advance width="1233"/>
   <unicode hex="201B"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/quoteright.glif b/source/Hack-Bold.ufo/glyphs/quoteright.glif
index 3094d4910..31053502c 100644
--- a/source/Hack-Bold.ufo/glyphs/quoteright.glif
+++ b/source/Hack-Bold.ufo/glyphs/quoteright.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quoteright" format="1">
+<glyph name="quoteright" format="2">
   <advance width="1233"/>
   <unicode hex="2019"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/quotesinglbase.glif b/source/Hack-Bold.ufo/glyphs/quotesinglbase.glif
index 6a5f35a2e..de42a9e65 100644
--- a/source/Hack-Bold.ufo/glyphs/quotesinglbase.glif
+++ b/source/Hack-Bold.ufo/glyphs/quotesinglbase.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotesinglbase" format="1">
+<glyph name="quotesinglbase" format="2">
   <advance width="1233"/>
   <unicode hex="201A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/quotesingle.glif b/source/Hack-Bold.ufo/glyphs/quotesingle.glif
index c29dd1fbd..c95307de6 100644
--- a/source/Hack-Bold.ufo/glyphs/quotesingle.glif
+++ b/source/Hack-Bold.ufo/glyphs/quotesingle.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotesingle" format="1">
+<glyph name="quotesingle" format="2">
   <advance width="1233"/>
   <unicode hex="0027"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/r.glif b/source/Hack-Bold.ufo/glyphs/r.glif
index 2811c67dc..f6579ed80 100644
--- a/source/Hack-Bold.ufo/glyphs/r.glif
+++ b/source/Hack-Bold.ufo/glyphs/r.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="r" format="1">
+<glyph name="r" format="2">
   <advance width="1233"/>
   <unicode hex="0072"/>
   <outline>
@@ -23,14 +23,14 @@
       <point x="537" y="640"/>
       <point x="534" y="593"/>
       <point x="534" y="516" type="curve" smooth="yes"/>
-      <point x="534" y="-0" type="line"/>
-      <point x="241" y="-0" type="line"/>
+      <point x="534" y="0" type="line"/>
+      <point x="241" y="0" type="line"/>
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/racute.glif b/source/Hack-Bold.ufo/glyphs/racute.glif
index 23ee6de5e..027463188 100644
--- a/source/Hack-Bold.ufo/glyphs/racute.glif
+++ b/source/Hack-Bold.ufo/glyphs/racute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="racute" format="1">
+<glyph name="racute" format="2">
   <advance width="1233"/>
   <unicode hex="0155"/>
   <outline>
@@ -15,20 +15,20 @@
       <point x="584" y="946" type="line" name="dh02"/>
       <point x="641" y="1075"/>
       <point x="766" y="1147"/>
-      <point x="923" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="923" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1006" y="1147"/>
       <point x="1082" y="1127"/>
       <point x="1151" y="1090" type="curve"/>
       <point x="1151" y="811" type="line" name="hr01"/>
       <point x="1087" y="871"/>
       <point x="1001" y="899"/>
-      <point x="897" y="899" type="curve" name="sv01" smooth="yes"/>
+      <point x="897" y="899" type="curve" smooth="yes" name="sv01"/>
       <point x="766" y="899"/>
       <point x="678" y="852"/>
       <point x="627" y="772" type="curve" smooth="yes"/>
       <point x="595" y="721"/>
       <point x="584" y="663"/>
-      <point x="584" y="516" type="curve" name="sh01" smooth="yes"/>
+      <point x="584" y="516" type="curve" smooth="yes" name="sh01"/>
       <point x="584" y="0" type="line" name="ab01"/>
       <point x="291" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/radical.glif b/source/Hack-Bold.ufo/glyphs/radical.glif
index a7a2487ea..aeeb3b70b 100644
--- a/source/Hack-Bold.ufo/glyphs/radical.glif
+++ b/source/Hack-Bold.ufo/glyphs/radical.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="radical" format="1">
+<glyph name="radical" format="2">
   <advance width="1233"/>
   <unicode hex="221A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/rcaron.glif b/source/Hack-Bold.ufo/glyphs/rcaron.glif
index de8e4d0aa..df8bc79e9 100644
--- a/source/Hack-Bold.ufo/glyphs/rcaron.glif
+++ b/source/Hack-Bold.ufo/glyphs/rcaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="rcaron" format="1">
+<glyph name="rcaron" format="2">
   <advance width="1233"/>
   <unicode hex="0159"/>
   <outline>
@@ -18,20 +18,20 @@
       <point x="584" y="946" type="line" name="hr01"/>
       <point x="641" y="1075"/>
       <point x="766" y="1147"/>
-      <point x="923" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="923" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1006" y="1147"/>
       <point x="1082" y="1127"/>
       <point x="1151" y="1090" type="curve"/>
       <point x="1151" y="811" type="line" name="iv01"/>
       <point x="1087" y="871"/>
       <point x="1001" y="899"/>
-      <point x="897" y="899" type="curve" name="sv01" smooth="yes"/>
+      <point x="897" y="899" type="curve" smooth="yes" name="sv01"/>
       <point x="766" y="899"/>
       <point x="678" y="852"/>
       <point x="627" y="772" type="curve" smooth="yes"/>
       <point x="595" y="721"/>
       <point x="584" y="663"/>
-      <point x="584" y="516" type="curve" name="sh01" smooth="yes"/>
+      <point x="584" y="516" type="curve" smooth="yes" name="sh01"/>
       <point x="584" y="0" type="line" name="ab01"/>
       <point x="291" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/reflexsubset.glif b/source/Hack-Bold.ufo/glyphs/reflexsubset.glif
index 30fdc3855..426b32f6a 100644
--- a/source/Hack-Bold.ufo/glyphs/reflexsubset.glif
+++ b/source/Hack-Bold.ufo/glyphs/reflexsubset.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="reflexsubset" format="1">
+<glyph name="reflexsubset" format="2">
   <advance width="1233"/>
   <unicode hex="2286"/>
   <outline>
     <contour>
-      <point x="576" y="315" type="line" name="hr00" smooth="yes"/>
+      <point x="576" y="315" type="line" smooth="yes" name="hr00"/>
       <point x="289" y="315"/>
       <point x="88" y="541"/>
-      <point x="88" y="819" type="curve" name="dh01" smooth="yes"/>
+      <point x="88" y="819" type="curve" smooth="yes" name="dh01"/>
       <point x="88" y="1106"/>
       <point x="303" y="1321"/>
       <point x="575" y="1321" type="curve" smooth="yes"/>
@@ -16,10 +16,10 @@
       <point x="575" y="1096" type="line" smooth="yes"/>
       <point x="428" y="1096"/>
       <point x="313" y="982"/>
-      <point x="313" y="817" type="curve" name="dh02" smooth="yes"/>
+      <point x="313" y="817" type="curve" smooth="yes" name="dh02"/>
       <point x="313" y="650"/>
       <point x="430" y="540"/>
-      <point x="575" y="540" type="curve" name="dv05" smooth="yes"/>
+      <point x="575" y="540" type="curve" smooth="yes" name="dv05"/>
       <point x="1145" y="540" type="line"/>
       <point x="1145" y="315" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/reflexsuperset.glif b/source/Hack-Bold.ufo/glyphs/reflexsuperset.glif
index b5163d43e..4312a39ac 100644
--- a/source/Hack-Bold.ufo/glyphs/reflexsuperset.glif
+++ b/source/Hack-Bold.ufo/glyphs/reflexsuperset.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="reflexsuperset" format="1">
+<glyph name="reflexsuperset" format="2">
   <advance width="1233"/>
   <unicode hex="2287"/>
   <outline>
     <contour>
       <point x="88" y="540" type="line" name="hr00"/>
-      <point x="658" y="540" type="line" name="dv05" smooth="yes"/>
+      <point x="658" y="540" type="line" smooth="yes" name="dv05"/>
       <point x="803" y="540"/>
       <point x="920" y="650"/>
-      <point x="920" y="817" type="curve" name="dh01" smooth="yes"/>
+      <point x="920" y="817" type="curve" smooth="yes" name="dh01"/>
       <point x="920" y="982"/>
       <point x="805" y="1096"/>
-      <point x="658" y="1096" type="curve" name="dv02" smooth="yes"/>
+      <point x="658" y="1096" type="curve" smooth="yes" name="dv02"/>
       <point x="88" y="1096" type="line"/>
       <point x="88" y="1321" type="line"/>
-      <point x="658" y="1321" type="line" name="dv03" smooth="yes"/>
+      <point x="658" y="1321" type="line" smooth="yes" name="dv03"/>
       <point x="930" y="1321"/>
       <point x="1145" y="1106"/>
-      <point x="1145" y="819" type="curve" name="dh02" smooth="yes"/>
+      <point x="1145" y="819" type="curve" smooth="yes" name="dh02"/>
       <point x="1145" y="541"/>
       <point x="944" y="315"/>
-      <point x="657" y="315" type="curve" name="dv04" smooth="yes"/>
+      <point x="657" y="315" type="curve" smooth="yes" name="dv04"/>
       <point x="88" y="315" type="line"/>
     </contour>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/registered.glif b/source/Hack-Bold.ufo/glyphs/registered.glif
index 6d7222316..cbb775c89 100644
--- a/source/Hack-Bold.ufo/glyphs/registered.glif
+++ b/source/Hack-Bold.ufo/glyphs/registered.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="registered" format="1">
+<glyph name="registered" format="2">
   <advance width="1233"/>
   <unicode hex="00AE"/>
   <outline>
     <contour>
-      <point x="616" y="125" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="125" type="curve" smooth="yes" name="hr00"/>
       <point x="448" y="125"/>
       <point x="302" y="186"/>
       <point x="181" y="307" type="curve" smooth="yes"/>
@@ -13,7 +13,7 @@
       <point x="46" y="507" type="curve" smooth="yes"/>
       <point x="15" y="579"/>
       <point x="0" y="653"/>
-      <point x="0" y="741" type="curve" name="dh01" smooth="yes"/>
+      <point x="0" y="741" type="curve" smooth="yes" name="dh01"/>
       <point x="0" y="826"/>
       <point x="15" y="905"/>
       <point x="46" y="977" type="curve" smooth="yes"/>
@@ -25,7 +25,7 @@
       <point x="381" y="1313" type="curve" smooth="yes"/>
       <point x="454" y="1343"/>
       <point x="532" y="1358"/>
-      <point x="616" y="1358" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1358" type="curve" smooth="yes" name="dv03"/>
       <point x="700" y="1358"/>
       <point x="779" y="1343"/>
       <point x="852" y="1313" type="curve" smooth="yes"/>
@@ -37,7 +37,7 @@
       <point x="1187" y="977" type="curve" smooth="yes"/>
       <point x="1218" y="905"/>
       <point x="1233" y="827"/>
-      <point x="1233" y="742" type="curve" name="dh08" smooth="yes"/>
+      <point x="1233" y="742" type="curve" smooth="yes" name="dh08"/>
       <point x="1233" y="657"/>
       <point x="1218" y="579"/>
       <point x="1188" y="508" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="701" y="125"/>
     </contour>
     <contour>
-      <point x="616" y="256" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="256" type="curve" smooth="yes" name="dv01"/>
       <point x="748" y="256"/>
       <point x="863" y="304"/>
       <point x="958" y="399" type="curve" smooth="yes"/>
@@ -60,7 +60,7 @@
       <point x="1066" y="558" type="curve" smooth="yes"/>
       <point x="1090" y="615"/>
       <point x="1102" y="674"/>
-      <point x="1102" y="742" type="curve" name="dh07" smooth="yes"/>
+      <point x="1102" y="742" type="curve" smooth="yes" name="dh07"/>
       <point x="1102" y="872"/>
       <point x="1050" y="992"/>
       <point x="959" y="1086" type="curve" smooth="yes"/>
@@ -69,7 +69,7 @@
       <point x="802" y="1193" type="curve" smooth="yes"/>
       <point x="738" y="1220"/>
       <point x="681" y="1229"/>
-      <point x="617" y="1229" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="1229" type="curve" smooth="yes" name="dv02"/>
       <point x="538" y="1229"/>
       <point x="484" y="1216"/>
       <point x="432" y="1193" type="curve" smooth="yes"/>
@@ -81,7 +81,7 @@
       <point x="167" y="927" type="curve" smooth="yes"/>
       <point x="140" y="863"/>
       <point x="131" y="802"/>
-      <point x="131" y="742" type="curve" name="dh02" smooth="yes"/>
+      <point x="131" y="742" type="curve" smooth="yes" name="dh02"/>
       <point x="131" y="674"/>
       <point x="143" y="615"/>
       <point x="167" y="558" type="curve" smooth="yes"/>
@@ -102,7 +102,7 @@
       <point x="804" y="1011" type="curve" smooth="yes"/>
       <point x="847" y="982"/>
       <point x="868" y="937"/>
-      <point x="868" y="878" type="curve" name="dh06" smooth="yes"/>
+      <point x="868" y="878" type="curve" smooth="yes" name="dh06"/>
       <point x="868" y="834"/>
       <point x="855" y="798"/>
       <point x="829" y="770" type="curve" smooth="yes"/>
@@ -135,7 +135,7 @@
       <point x="674" y="800" type="curve" smooth="yes"/>
       <point x="693" y="813"/>
       <point x="702" y="833"/>
-      <point x="702" y="861" type="curve" name="dh05" smooth="yes"/>
+      <point x="702" y="861" type="curve" smooth="yes" name="dh05"/>
       <point x="702" y="889"/>
       <point x="693" y="910"/>
       <point x="674" y="924" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/revlogicalnot.glif b/source/Hack-Bold.ufo/glyphs/revlogicalnot.glif
index 0f58a543f..3b409abe0 100644
--- a/source/Hack-Bold.ufo/glyphs/revlogicalnot.glif
+++ b/source/Hack-Bold.ufo/glyphs/revlogicalnot.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="revlogicalnot" format="1">
+<glyph name="revlogicalnot" format="2">
   <advance width="1233"/>
   <unicode hex="2310"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/rho.glif b/source/Hack-Bold.ufo/glyphs/rho.glif
index f692eea07..be0f4ae9a 100644
--- a/source/Hack-Bold.ufo/glyphs/rho.glif
+++ b/source/Hack-Bold.ufo/glyphs/rho.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="rho" format="1">
+<glyph name="rho" format="2">
   <advance width="1233"/>
   <unicode hex="03C1"/>
   <outline>
     <contour>
-      <point x="150" y="552" type="line" name="hr00" smooth="yes"/>
+      <point x="150" y="552" type="line" smooth="yes" name="hr00"/>
       <point x="150" y="953"/>
       <point x="316" y="1147"/>
-      <point x="657" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="657" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1016" y="1147"/>
       <point x="1143" y="933"/>
-      <point x="1143" y="572" type="curve" name="sh01" smooth="yes"/>
+      <point x="1143" y="572" type="curve" smooth="yes" name="sh01"/>
       <point x="1143" y="179"/>
       <point x="992" y="-29"/>
-      <point x="739" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="739" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="600" y="-29"/>
       <point x="517" y="33"/>
       <point x="442" y="158" type="curve" name="sh03"/>
@@ -21,19 +21,19 @@
       <point x="150" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="647" y="215" type="curve" name="dv02" smooth="yes"/>
+      <point x="647" y="215" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="215"/>
       <point x="760" y="246"/>
       <point x="796" y="307" type="curve" smooth="yes"/>
       <point x="832" y="368"/>
       <point x="850" y="453"/>
-      <point x="850" y="560" type="curve" name="ah01" smooth="yes"/>
+      <point x="850" y="560" type="curve" smooth="yes" name="ah01"/>
       <point x="850" y="779"/>
       <point x="774" y="907"/>
-      <point x="647" y="907" type="curve" name="sv01" smooth="yes"/>
+      <point x="647" y="907" type="curve" smooth="yes" name="sv01"/>
       <point x="519" y="907"/>
       <point x="442" y="777"/>
-      <point x="442" y="561" type="curve" name="sh02" smooth="yes"/>
+      <point x="442" y="561" type="curve" smooth="yes" name="sh02"/>
       <point x="442" y="345"/>
       <point x="519" y="215"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/ring.glif b/source/Hack-Bold.ufo/glyphs/ring.glif
index d1342e22e..38a0c715f 100644
--- a/source/Hack-Bold.ufo/glyphs/ring.glif
+++ b/source/Hack-Bold.ufo/glyphs/ring.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ring" format="1">
+<glyph name="ring" format="2">
   <advance width="1233"/>
   <unicode hex="02DA"/>
   <outline>
     <contour>
-      <point x="617" y="1249" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="1249" type="curve" smooth="yes" name="hr00"/>
       <point x="541" y="1249"/>
       <point x="469" y="1277"/>
       <point x="414" y="1332" type="curve" smooth="yes"/>
       <point x="367" y="1379"/>
       <point x="332" y="1451"/>
-      <point x="332" y="1535" type="curve" name="sh01" smooth="yes"/>
+      <point x="332" y="1535" type="curve" smooth="yes" name="sh01"/>
       <point x="332" y="1620"/>
       <point x="368" y="1690"/>
       <point x="415" y="1737" type="curve" smooth="yes"/>
       <point x="470" y="1792"/>
       <point x="540" y="1819"/>
-      <point x="616" y="1819" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1819" type="curve" smooth="yes" name="dv03"/>
       <point x="699" y="1819"/>
       <point x="769" y="1786"/>
       <point x="818" y="1737" type="curve" smooth="yes"/>
       <point x="866" y="1689"/>
       <point x="901" y="1618"/>
-      <point x="901" y="1533" type="curve" name="sh02" smooth="yes"/>
+      <point x="901" y="1533" type="curve" smooth="yes" name="sh02"/>
       <point x="901" y="1457"/>
       <point x="874" y="1389"/>
       <point x="819" y="1333" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="693" y="1249"/>
     </contour>
     <contour>
-      <point x="617" y="1403" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="1403" type="curve" smooth="yes" name="dv01"/>
       <point x="653" y="1403"/>
       <point x="684" y="1416"/>
       <point x="710" y="1442" type="curve" smooth="yes"/>
       <point x="735" y="1467"/>
       <point x="748" y="1498"/>
-      <point x="748" y="1534" type="curve" name="ah01" smooth="yes"/>
+      <point x="748" y="1534" type="curve" smooth="yes" name="ah01"/>
       <point x="748" y="1570"/>
       <point x="735" y="1601"/>
       <point x="709" y="1627" type="curve" smooth="yes"/>
       <point x="682" y="1652"/>
       <point x="651" y="1665"/>
-      <point x="616" y="1665" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1665" type="curve" smooth="yes" name="dv02"/>
       <point x="580" y="1665"/>
       <point x="549" y="1652"/>
       <point x="524" y="1627" type="curve" smooth="yes"/>
       <point x="498" y="1601"/>
       <point x="485" y="1570"/>
-      <point x="485" y="1534" type="curve" name="sh03" smooth="yes"/>
+      <point x="485" y="1534" type="curve" smooth="yes" name="sh03"/>
       <point x="485" y="1497"/>
       <point x="498" y="1466"/>
       <point x="523" y="1441" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/rtblock.glif b/source/Hack-Bold.ufo/glyphs/rtblock.glif
index 847a9fd1a..d12eaad05 100644
--- a/source/Hack-Bold.ufo/glyphs/rtblock.glif
+++ b/source/Hack-Bold.ufo/glyphs/rtblock.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="rtblock" format="1">
+<glyph name="rtblock" format="2">
   <advance width="1233"/>
   <unicode hex="2590"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/ruble.glif b/source/Hack-Bold.ufo/glyphs/ruble.glif
new file mode 100644
index 000000000..94adb9173
--- /dev/null
+++ b/source/Hack-Bold.ufo/glyphs/ruble.glif
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="ruble" format="2">
+  <advance width="1233"/>
+  <unicode hex="20BD"/>
+  <outline>
+    <contour>
+      <point x="162" y="207" type="line"/>
+      <point x="78" y="207" type="line"/>
+      <point x="78" y="455" type="line"/>
+      <point x="162" y="455" type="line"/>
+      <point x="162" y="559" type="line"/>
+      <point x="78" y="559" type="line"/>
+      <point x="78" y="807" type="line"/>
+      <point x="162" y="807" type="line"/>
+      <point x="162" y="1493" type="line" name="hr00"/>
+      <point x="567" y="1493" type="line" smooth="yes"/>
+      <point x="979" y="1493"/>
+      <point x="1147" y="1355"/>
+      <point x="1147" y="1026" type="curve" smooth="yes" name="sh01"/>
+      <point x="1147" y="697"/>
+      <point x="979" y="559"/>
+      <point x="567" y="559" type="curve" smooth="yes" name="dv01"/>
+      <point x="457" y="559" type="line" name="sh03"/>
+      <point x="457" y="455" type="line"/>
+      <point x="886" y="455" type="line"/>
+      <point x="886" y="207" type="line"/>
+      <point x="457" y="207" type="line"/>
+      <point x="457" y="0" type="line" name="ab01"/>
+      <point x="162" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="578" y="807" type="line" smooth="yes" name="dv02"/>
+      <point x="770" y="807"/>
+      <point x="840" y="865"/>
+      <point x="840" y="1026" type="curve" smooth="yes" name="ah01"/>
+      <point x="840" y="1187"/>
+      <point x="770" y="1245"/>
+      <point x="578" y="1245" type="curve" smooth="yes" name="sv01"/>
+      <point x="457" y="1245" type="line" name="sh02"/>
+      <point x="457" y="807" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2018-05-15 17:58:08 +0000</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/s.glif b/source/Hack-Bold.ufo/glyphs/s.glif
index b68fa7acd..f44a68aa2 100644
--- a/source/Hack-Bold.ufo/glyphs/s.glif
+++ b/source/Hack-Bold.ufo/glyphs/s.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="s" format="1">
+<glyph name="s" format="2">
   <advance width="1233"/>
   <unicode hex="0073"/>
   <outline>
@@ -47,9 +47,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/sacute.glif b/source/Hack-Bold.ufo/glyphs/sacute.glif
index 657389725..d17768f83 100644
--- a/source/Hack-Bold.ufo/glyphs/sacute.glif
+++ b/source/Hack-Bold.ufo/glyphs/sacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="sacute" format="1">
+<glyph name="sacute" format="2">
   <advance width="1233"/>
   <unicode hex="015B"/>
   <outline>
@@ -10,17 +10,17 @@
       <point x="467" y="1297" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="613" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="613" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="476" y="-29"/>
       <point x="335" y="-6"/>
       <point x="190" y="41" type="curve"/>
       <point x="190" y="297" type="line" name="ih03"/>
       <point x="319" y="224"/>
       <point x="453" y="184"/>
-      <point x="588" y="184" type="curve" name="dv02" smooth="yes"/>
+      <point x="588" y="184" type="curve" smooth="yes" name="dv02"/>
       <point x="723" y="184"/>
       <point x="791" y="225"/>
-      <point x="791" y="308" type="curve" name="ah01" smooth="yes"/>
+      <point x="791" y="308" type="curve" smooth="yes" name="ah01"/>
       <point x="791" y="345"/>
       <point x="778" y="365"/>
       <point x="753" y="385" type="curve" smooth="yes"/>
@@ -30,20 +30,20 @@
       <point x="494" y="469" type="line" smooth="yes"/>
       <point x="279" y="517"/>
       <point x="172" y="620"/>
-      <point x="172" y="801" type="curve" name="sh02" smooth="yes"/>
+      <point x="172" y="801" type="curve" smooth="yes" name="sh02"/>
       <point x="172" y="1025"/>
       <point x="335" y="1147"/>
-      <point x="623" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="623" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="744" y="1147"/>
       <point x="871" y="1126"/>
       <point x="991" y="1085" type="curve"/>
       <point x="991" y="829" type="line" name="ih04"/>
       <point x="882" y="899"/>
       <point x="766" y="934"/>
-      <point x="645" y="934" type="curve" name="sv01" smooth="yes"/>
+      <point x="645" y="934" type="curve" smooth="yes" name="sv01"/>
       <point x="516" y="934"/>
       <point x="449" y="892"/>
-      <point x="449" y="828" type="curve" name="sh03" smooth="yes"/>
+      <point x="449" y="828" type="curve" smooth="yes" name="sh03"/>
       <point x="449" y="765"/>
       <point x="512" y="727"/>
       <point x="663" y="691" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="758" y="668" type="line" smooth="yes"/>
       <point x="969" y="617"/>
       <point x="1067" y="511"/>
-      <point x="1067" y="320" type="curve" name="sh01" smooth="yes"/>
+      <point x="1067" y="320" type="curve" smooth="yes" name="sh01"/>
       <point x="1067" y="87"/>
       <point x="916" y="-29"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/scaron.glif b/source/Hack-Bold.ufo/glyphs/scaron.glif
index ea565836b..10189d619 100644
--- a/source/Hack-Bold.ufo/glyphs/scaron.glif
+++ b/source/Hack-Bold.ufo/glyphs/scaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="scaron" format="1">
+<glyph name="scaron" format="2">
   <advance width="1233"/>
   <unicode hex="0161"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="496" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="473" y="-29"/>
       <point x="340" y="-5"/>
       <point x="190" y="41" type="curve"/>
@@ -23,13 +23,13 @@
       <point x="388" y="213" type="curve" smooth="yes"/>
       <point x="456" y="194"/>
       <point x="519" y="184"/>
-      <point x="583" y="184" type="curve" name="dv02" smooth="yes"/>
+      <point x="583" y="184" type="curve" smooth="yes" name="dv02"/>
       <point x="655" y="184"/>
       <point x="707" y="195"/>
       <point x="739" y="214" type="curve" smooth="yes"/>
       <point x="778" y="237"/>
       <point x="791" y="269"/>
-      <point x="791" y="308" type="curve" name="ah01" smooth="yes"/>
+      <point x="791" y="308" type="curve" smooth="yes" name="ah01"/>
       <point x="791" y="366"/>
       <point x="758" y="411"/>
       <point x="575" y="451" type="curve" smooth="yes"/>
@@ -39,23 +39,23 @@
       <point x="249" y="588" type="curve" smooth="yes"/>
       <point x="198" y="643"/>
       <point x="172" y="714"/>
-      <point x="172" y="803" type="curve" name="sh01" smooth="yes"/>
+      <point x="172" y="803" type="curve" smooth="yes" name="sh01"/>
       <point x="172" y="1022"/>
       <point x="335" y="1147"/>
-      <point x="619" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="619" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="753" y="1147"/>
       <point x="866" y="1129"/>
       <point x="991" y="1085" type="curve"/>
       <point x="991" y="829" type="line" name="ih03"/>
       <point x="877" y="901"/>
       <point x="775" y="934"/>
-      <point x="643" y="934" type="curve" name="sv01" smooth="yes"/>
+      <point x="643" y="934" type="curve" smooth="yes" name="sv01"/>
       <point x="583" y="934"/>
       <point x="535" y="926"/>
       <point x="500" y="906" type="curve" smooth="yes"/>
       <point x="465" y="887"/>
       <point x="449" y="857"/>
-      <point x="449" y="826" type="curve" name="sh02" smooth="yes"/>
+      <point x="449" y="826" type="curve" smooth="yes" name="sh02"/>
       <point x="449" y="766"/>
       <point x="514" y="726"/>
       <point x="663" y="691" type="curve" smooth="yes"/>
@@ -63,7 +63,7 @@
       <point x="758" y="668" type="line" smooth="yes"/>
       <point x="971" y="617"/>
       <point x="1067" y="509"/>
-      <point x="1067" y="317" type="curve" name="sh03" smooth="yes"/>
+      <point x="1067" y="317" type="curve" smooth="yes" name="sh03"/>
       <point x="1067" y="202"/>
       <point x="1029" y="115"/>
       <point x="954" y="58" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/scedilla.glif b/source/Hack-Bold.ufo/glyphs/scedilla.glif
index 755eefa6b..7c4929e78 100644
--- a/source/Hack-Bold.ufo/glyphs/scedilla.glif
+++ b/source/Hack-Bold.ufo/glyphs/scedilla.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="scedilla" format="1">
+<glyph name="scedilla" format="2">
   <advance width="1233"/>
   <unicode hex="015F"/>
   <outline>
     <contour>
-      <point x="993" y="546" type="curve" name="hr00" smooth="yes"/>
+      <point x="993" y="546" type="curve" smooth="yes" name="hr00"/>
       <point x="1044" y="489"/>
       <point x="1067" y="409"/>
-      <point x="1067" y="317" type="curve" name="dh04" smooth="yes"/>
+      <point x="1067" y="317" type="curve" smooth="yes" name="dh04"/>
       <point x="1067" y="202"/>
       <point x="1029" y="115"/>
       <point x="954" y="58" type="curve" smooth="yes"/>
@@ -19,16 +19,16 @@
       <point x="792" y="-115" type="curve" smooth="yes"/>
       <point x="810" y="-149"/>
       <point x="819" y="-184"/>
-      <point x="819" y="-221" type="curve" name="sh01" smooth="yes"/>
+      <point x="819" y="-221" type="curve" smooth="yes" name="sh01"/>
       <point x="819" y="-282"/>
       <point x="796" y="-327"/>
       <point x="757" y="-356" type="curve" smooth="yes"/>
       <point x="722" y="-383"/>
       <point x="668" y="-401"/>
-      <point x="571" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="571" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="539" y="-401"/>
       <point x="504" y="-399"/>
-      <point x="471" y="-395" type="curve" name="sv01" smooth="yes"/>
+      <point x="471" y="-395" type="curve" smooth="yes" name="sv01"/>
       <point x="420" y="-388"/>
       <point x="398" y="-382"/>
       <point x="367" y="-375" type="curve"/>
@@ -38,7 +38,7 @@
       <point x="454" y="-245" type="curve" smooth="yes"/>
       <point x="482" y="-251"/>
       <point x="508" y="-254"/>
-      <point x="532" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="532" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="570" y="-254"/>
       <point x="600" y="-246"/>
       <point x="623" y="-231" type="curve" smooth="yes"/>
@@ -69,7 +69,7 @@
       <point x="739" y="214" type="curve" smooth="yes"/>
       <point x="778" y="237"/>
       <point x="791" y="269"/>
-      <point x="791" y="308" type="curve" name="dh03" smooth="yes"/>
+      <point x="791" y="308" type="curve" smooth="yes" name="dh03"/>
       <point x="791" y="366"/>
       <point x="758" y="411"/>
       <point x="575" y="451" type="curve" smooth="yes"/>
@@ -79,28 +79,28 @@
       <point x="249" y="588" type="curve" smooth="yes"/>
       <point x="198" y="643"/>
       <point x="172" y="714"/>
-      <point x="172" y="803" type="curve" name="dh01" smooth="yes"/>
+      <point x="172" y="803" type="curve" smooth="yes" name="dh01"/>
       <point x="172" y="1022"/>
       <point x="335" y="1147"/>
-      <point x="619" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="619" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="753" y="1147"/>
       <point x="866" y="1129"/>
       <point x="991" y="1085" type="curve"/>
       <point x="991" y="829" type="line" name="ih04"/>
       <point x="877" y="901"/>
       <point x="775" y="934"/>
-      <point x="643" y="934" type="curve" name="sv02" smooth="yes"/>
+      <point x="643" y="934" type="curve" smooth="yes" name="sv02"/>
       <point x="583" y="934"/>
       <point x="535" y="926"/>
       <point x="500" y="906" type="curve" smooth="yes"/>
       <point x="465" y="887"/>
       <point x="449" y="857"/>
-      <point x="449" y="826" type="curve" name="dh02" smooth="yes"/>
+      <point x="449" y="826" type="curve" smooth="yes" name="dh02"/>
       <point x="449" y="766"/>
       <point x="514" y="726"/>
       <point x="663" y="691" type="curve" smooth="yes"/>
       <point x="674" y="688" type="line"/>
-      <point x="758" y="668" type="line" name="hr02" smooth="yes"/>
+      <point x="758" y="668" type="line" smooth="yes" name="hr02"/>
       <point x="863" y="643"/>
       <point x="942" y="603"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/scircumflex.glif b/source/Hack-Bold.ufo/glyphs/scircumflex.glif
index 7cbe579b6..3f1da6377 100644
--- a/source/Hack-Bold.ufo/glyphs/scircumflex.glif
+++ b/source/Hack-Bold.ufo/glyphs/scircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="scircumflex" format="1">
+<glyph name="scircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="015D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/second.glif b/source/Hack-Bold.ufo/glyphs/second.glif
index a9a09914f..a4792a064 100644
--- a/source/Hack-Bold.ufo/glyphs/second.glif
+++ b/source/Hack-Bold.ufo/glyphs/second.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="second" format="1">
+<glyph name="second" format="2">
   <advance width="1233"/>
   <unicode hex="2033"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/section.glif b/source/Hack-Bold.ufo/glyphs/section.glif
index 6093e66a9..a9c40af77 100644
--- a/source/Hack-Bold.ufo/glyphs/section.glif
+++ b/source/Hack-Bold.ufo/glyphs/section.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="section" format="1">
+<glyph name="section" format="2">
   <advance width="1233"/>
   <unicode hex="00A7"/>
   <outline>
     <contour>
-      <point x="602" y="-195" type="curve" name="dv01" smooth="yes"/>
+      <point x="602" y="-195" type="curve" smooth="yes" name="dv01"/>
       <point x="488" y="-195"/>
       <point x="371" y="-176"/>
       <point x="258" y="-137" type="curve"/>
@@ -14,20 +14,20 @@
       <point x="424" y="47" type="curve" smooth="yes"/>
       <point x="476" y="36"/>
       <point x="524" y="31"/>
-      <point x="571" y="31" type="curve" name="dv02" smooth="yes"/>
+      <point x="571" y="31" type="curve" smooth="yes" name="dv02"/>
       <point x="686" y="31"/>
       <point x="737" y="76"/>
-      <point x="737" y="134" type="curve" name="dh03" smooth="yes"/>
+      <point x="737" y="134" type="curve" smooth="yes" name="dh03"/>
       <point x="737" y="190"/>
       <point x="677" y="241"/>
       <point x="523" y="326" type="curve" smooth="yes"/>
       <point x="486" y="346" type="line" smooth="yes"/>
       <point x="266" y="466"/>
       <point x="170" y="574"/>
-      <point x="170" y="696" type="curve" name="dh01" smooth="yes"/>
+      <point x="170" y="696" type="curve" smooth="yes" name="dh01"/>
       <point x="170" y="747"/>
       <point x="187" y="805"/>
-      <point x="222" y="852" type="curve" name="hr01" smooth="yes"/>
+      <point x="222" y="852" type="curve" smooth="yes" name="hr01"/>
       <point x="254" y="895"/>
       <point x="304" y="931"/>
       <point x="371" y="954" type="curve" name="ih02"/>
@@ -36,10 +36,10 @@
       <point x="268" y="1064" type="curve" smooth="yes"/>
       <point x="247" y="1105"/>
       <point x="236" y="1152"/>
-      <point x="236" y="1205" type="curve" name="ih03" smooth="yes"/>
+      <point x="236" y="1205" type="curve" smooth="yes" name="ih03"/>
       <point x="236" y="1396"/>
       <point x="386" y="1520"/>
-      <point x="617" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="617" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="665" y="1520"/>
       <point x="716" y="1515"/>
       <point x="769" y="1505" type="curve" smooth="yes"/>
@@ -52,13 +52,13 @@
       <point x="779" y="1280" type="curve" smooth="yes"/>
       <point x="738" y="1289"/>
       <point x="692" y="1294"/>
-      <point x="657" y="1294" type="curve" name="sv01" smooth="yes"/>
+      <point x="657" y="1294" type="curve" smooth="yes" name="sv01"/>
       <point x="608" y="1294"/>
       <point x="570" y="1284"/>
       <point x="541" y="1265" type="curve" smooth="yes"/>
       <point x="510" y="1244"/>
       <point x="498" y="1215"/>
-      <point x="498" y="1188" type="curve" name="sh01" smooth="yes"/>
+      <point x="498" y="1188" type="curve" smooth="yes" name="sh01"/>
       <point x="498" y="1128"/>
       <point x="563" y="1078"/>
       <point x="701" y="1004" type="curve" smooth="yes"/>
@@ -70,7 +70,7 @@
       <point x="1002" y="809" type="curve" smooth="yes"/>
       <point x="1041" y="762"/>
       <point x="1061" y="705"/>
-      <point x="1061" y="638" type="curve" name="sh02" smooth="yes"/>
+      <point x="1061" y="638" type="curve" smooth="yes" name="sh02"/>
       <point x="1061" y="518"/>
       <point x="1001" y="436"/>
       <point x="864" y="373" type="curve" name="ih06"/>
@@ -79,10 +79,10 @@
       <point x="967" y="262" type="curve" smooth="yes"/>
       <point x="988" y="221"/>
       <point x="999" y="173"/>
-      <point x="999" y="118" type="curve" name="dh04" smooth="yes"/>
+      <point x="999" y="118" type="curve" smooth="yes" name="dh04"/>
       <point x="999" y="23"/>
       <point x="966" y="-56"/>
-      <point x="895" y="-112" type="curve" name="hr03" smooth="yes"/>
+      <point x="895" y="-112" type="curve" smooth="yes" name="hr03"/>
       <point x="828" y="-165"/>
       <point x="731" y="-195"/>
     </contour>
@@ -93,14 +93,14 @@
       <point x="791" y="544" type="curve" smooth="yes"/>
       <point x="807" y="567"/>
       <point x="815" y="594"/>
-      <point x="815" y="613" type="curve" name="ih05" smooth="yes"/>
+      <point x="815" y="613" type="curve" smooth="yes" name="ih05"/>
       <point x="815" y="674"/>
       <point x="725" y="752"/>
       <point x="550" y="840" type="curve" smooth="yes"/>
       <point x="518" y="856" type="line"/>
       <point x="446" y="809"/>
       <point x="414" y="764"/>
-      <point x="414" y="712" type="curve" name="dh02" smooth="yes"/>
+      <point x="414" y="712" type="curve" smooth="yes" name="dh02"/>
       <point x="414" y="675"/>
       <point x="430" y="642"/>
       <point x="463" y="613" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/semicolon.glif b/source/Hack-Bold.ufo/glyphs/semicolon.glif
index 60a6048ae..d14d3e208 100644
--- a/source/Hack-Bold.ufo/glyphs/semicolon.glif
+++ b/source/Hack-Bold.ufo/glyphs/semicolon.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="semicolon" format="1">
+<glyph name="semicolon" format="2">
   <advance width="1233"/>
   <unicode hex="003B"/>
   <outline>
     <contour>
-      <point x="609" y="695" type="curve" name="dv01" smooth="yes"/>
+      <point x="609" y="695" type="curve" smooth="yes" name="dv01"/>
       <point x="554" y="695"/>
       <point x="510" y="717"/>
       <point x="479" y="748" type="curve" smooth="yes"/>
       <point x="440" y="787"/>
       <point x="425" y="836"/>
-      <point x="425" y="888" type="curve" name="dh01" smooth="yes"/>
+      <point x="425" y="888" type="curve" smooth="yes" name="dh01"/>
       <point x="425" y="948"/>
       <point x="447" y="996"/>
       <point x="478" y="1028" type="curve"/>
       <point x="514" y="1063"/>
       <point x="561" y="1081"/>
-      <point x="612" y="1081" type="curve" name="dv02" smooth="yes"/>
+      <point x="612" y="1081" type="curve" smooth="yes" name="dv02"/>
       <point x="663" y="1081"/>
       <point x="706" y="1063"/>
       <point x="743" y="1028" type="curve"/>
       <point x="775" y="995"/>
       <point x="796" y="949"/>
-      <point x="796" y="889" type="curve" name="dh02" smooth="yes"/>
+      <point x="796" y="889" type="curve" smooth="yes" name="dh02"/>
       <point x="796" y="829"/>
       <point x="775" y="781"/>
       <point x="743" y="748" type="curve"/>
@@ -47,7 +47,7 @@
       <point x="490" y="22" type="curve" smooth="yes"/>
       <point x="455" y="53"/>
       <point x="439" y="97"/>
-      <point x="439" y="150" type="curve" name="sh01" smooth="yes"/>
+      <point x="439" y="150" type="curve" smooth="yes" name="sh01"/>
       <point x="439" y="204"/>
       <point x="457" y="247"/>
       <point x="493" y="278" type="curve" smooth="yes"/>
@@ -56,19 +56,19 @@
       <point x="553" y="314" type="curve" smooth="yes"/>
       <point x="572" y="321"/>
       <point x="596" y="325"/>
-      <point x="624" y="325" type="curve" name="sv01" smooth="yes"/>
+      <point x="624" y="325" type="curve" smooth="yes" name="sv01"/>
       <point x="655" y="325"/>
       <point x="684" y="320"/>
       <point x="711" y="305" type="curve"/>
       <point x="738" y="292"/>
       <point x="759" y="273"/>
-      <point x="776" y="247" type="curve" name="hr01" smooth="yes"/>
+      <point x="776" y="247" type="curve" smooth="yes" name="hr01"/>
       <point x="795" y="219"/>
       <point x="807" y="192"/>
       <point x="815" y="157" type="curve"/>
       <point x="824" y="122"/>
       <point x="828" y="84"/>
-      <point x="828" y="41" type="curve" name="sh02" smooth="yes"/>
+      <point x="828" y="41" type="curve" smooth="yes" name="sh02"/>
       <point x="828" y="-84"/>
       <point x="793" y="-191"/>
       <point x="729" y="-278" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/seven.glif b/source/Hack-Bold.ufo/glyphs/seven.glif
index 95a45f906..c82c055bf 100644
--- a/source/Hack-Bold.ufo/glyphs/seven.glif
+++ b/source/Hack-Bold.ufo/glyphs/seven.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="seven" format="1">
+<glyph name="seven" format="2">
   <advance width="1233"/>
   <unicode hex="0037"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/seven.subs.glif b/source/Hack-Bold.ufo/glyphs/seven.subs.glif
index 9efe082af..54676fc7c 100644
--- a/source/Hack-Bold.ufo/glyphs/seven.subs.glif
+++ b/source/Hack-Bold.ufo/glyphs/seven.subs.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="seven.subs" format="1">
+<glyph name="seven.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/seveneighths.glif b/source/Hack-Bold.ufo/glyphs/seveneighths.glif
index 2d1218d7d..f17c31764 100644
--- a/source/Hack-Bold.ufo/glyphs/seveneighths.glif
+++ b/source/Hack-Bold.ufo/glyphs/seveneighths.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="seveneighths" format="1">
+<glyph name="seveneighths" format="2">
   <advance width="1233"/>
   <unicode hex="215E"/>
   <outline>
@@ -19,47 +19,47 @@
       <point x="84" y="500" type="line"/>
     </contour>
     <contour>
-      <point x="818" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="818" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="603" y="-285"/>
       <point x="483" y="-192"/>
-      <point x="483" y="-41" type="curve" name="dh01" smooth="yes"/>
+      <point x="483" y="-41" type="curve" smooth="yes" name="dh01"/>
       <point x="483" y="70"/>
       <point x="548" y="143"/>
       <point x="667" y="174" type="curve" name="ih01"/>
       <point x="560" y="205"/>
       <point x="509" y="267"/>
-      <point x="509" y="359" type="curve" name="hr01" smooth="yes"/>
+      <point x="509" y="359" type="curve" smooth="yes" name="hr01"/>
       <point x="509" y="497"/>
       <point x="627" y="582"/>
-      <point x="816" y="582" type="curve" name="dv08" smooth="yes"/>
+      <point x="816" y="582" type="curve" smooth="yes" name="dv08"/>
       <point x="1008" y="582"/>
       <point x="1125" y="495"/>
-      <point x="1125" y="359" type="curve" name="dh04" smooth="yes"/>
+      <point x="1125" y="359" type="curve" smooth="yes" name="dh04"/>
       <point x="1125" y="267"/>
       <point x="1071" y="205"/>
       <point x="970" y="174" type="curve" name="ih02"/>
       <point x="1083" y="145"/>
       <point x="1150" y="75"/>
-      <point x="1150" y="-41" type="curve" name="hr02" smooth="yes"/>
+      <point x="1150" y="-41" type="curve" smooth="yes" name="hr02"/>
       <point x="1150" y="-194"/>
       <point x="1031" y="-285"/>
     </contour>
     <contour>
-      <point x="817" y="237" type="curve" name="dv06" smooth="yes"/>
+      <point x="817" y="237" type="curve" smooth="yes" name="dv06"/>
       <point x="897" y="237"/>
       <point x="946" y="279"/>
-      <point x="946" y="344" type="curve" name="dh03" smooth="yes"/>
+      <point x="946" y="344" type="curve" smooth="yes" name="dh03"/>
       <point x="946" y="409"/>
       <point x="897" y="449"/>
-      <point x="817" y="449" type="curve" name="dv07" smooth="yes"/>
+      <point x="817" y="449" type="curve" smooth="yes" name="dv07"/>
       <point x="737" y="449"/>
       <point x="688" y="408"/>
-      <point x="688" y="344" type="curve" name="dh02" smooth="yes"/>
+      <point x="688" y="344" type="curve" smooth="yes" name="dh02"/>
       <point x="688" y="279"/>
       <point x="737" y="237"/>
     </contour>
     <contour>
-      <point x="816" y="-152" type="curve" name="dv02" smooth="yes"/>
+      <point x="816" y="-152" type="curve" smooth="yes" name="dv02"/>
       <point x="907" y="-152"/>
       <point x="968" y="-102"/>
       <point x="968" y="-23" type="curve" smooth="yes"/>
@@ -68,7 +68,7 @@
       <point x="927" y="69" type="curve" smooth="yes"/>
       <point x="900" y="92"/>
       <point x="864" y="103"/>
-      <point x="819" y="103" type="curve" name="dv05" smooth="yes"/>
+      <point x="819" y="103" type="curve" smooth="yes" name="dv05"/>
       <point x="726" y="103"/>
       <point x="665" y="53"/>
       <point x="665" y="-24" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/shade.glif b/source/Hack-Bold.ufo/glyphs/shade.glif
index edf408aa9..9b35592e0 100644
--- a/source/Hack-Bold.ufo/glyphs/shade.glif
+++ b/source/Hack-Bold.ufo/glyphs/shade.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="shade" format="1">
+<glyph name="shade" format="2">
   <advance width="1233"/>
   <unicode hex="2592"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/sigma.glif b/source/Hack-Bold.ufo/glyphs/sigma.glif
index 5c2fb6fe3..67883104a 100644
--- a/source/Hack-Bold.ufo/glyphs/sigma.glif
+++ b/source/Hack-Bold.ufo/glyphs/sigma.glif
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="sigma" format="1">
+<glyph name="sigma" format="2">
   <advance width="1233"/>
   <unicode hex="03C3"/>
   <outline>
     <contour>
-      <point x="594" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="594" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="281" y="-29"/>
       <point x="78" y="198"/>
-      <point x="78" y="559" type="curve" name="sh01" smooth="yes"/>
+      <point x="78" y="559" type="curve" smooth="yes" name="sh01"/>
       <point x="78" y="895"/>
       <point x="255" y="1120"/>
-      <point x="596" y="1120" type="curve" name="at01" smooth="yes"/>
+      <point x="596" y="1120" type="curve" smooth="yes" name="at01"/>
       <point x="1148" y="1120" type="line"/>
       <point x="1148" y="895" type="line" name="sv01"/>
       <point x="936" y="895" type="line" name="ih01"/>
       <point x="1064" y="799"/>
       <point x="1115" y="703"/>
-      <point x="1115" y="537" type="curve" name="sh02" smooth="yes"/>
+      <point x="1115" y="537" type="curve" smooth="yes" name="sh02"/>
       <point x="1115" y="208"/>
       <point x="913" y="-29"/>
     </contour>
     <contour>
-      <point x="594" y="209" type="curve" name="dv01" smooth="yes"/>
+      <point x="594" y="209" type="curve" smooth="yes" name="dv01"/>
       <point x="739" y="209"/>
       <point x="822" y="354"/>
-      <point x="822" y="534" type="curve" name="ah01" smooth="yes"/>
+      <point x="822" y="534" type="curve" smooth="yes" name="ah01"/>
       <point x="822" y="655"/>
       <point x="785" y="735"/>
       <point x="641" y="828" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="431" y="812" type="curve" smooth="yes"/>
       <point x="392" y="755"/>
       <point x="371" y="671"/>
-      <point x="371" y="559" type="curve" name="sh03" smooth="yes"/>
+      <point x="371" y="559" type="curve" smooth="yes" name="sh03"/>
       <point x="371" y="338"/>
       <point x="457" y="209"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/similar.glif b/source/Hack-Bold.ufo/glyphs/similar.glif
index 480de3fb2..588c95803 100644
--- a/source/Hack-Bold.ufo/glyphs/similar.glif
+++ b/source/Hack-Bold.ufo/glyphs/similar.glif
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="similar" format="1">
+<glyph name="similar" format="2">
   <advance width="1233"/>
   <unicode hex="223C"/>
   <outline>
     <contour>
-      <point x="850" y="468" type="curve" name="dv01" smooth="yes"/>
+      <point x="850" y="468" type="curve" smooth="yes" name="dv01"/>
       <point x="778" y="468"/>
       <point x="726" y="484"/>
       <point x="645" y="519" type="curve" smooth="yes"/>
       <point x="612" y="533" type="line" smooth="yes"/>
       <point x="522" y="570"/>
       <point x="468" y="591"/>
-      <point x="385" y="591" type="curve" name="sv01" smooth="yes"/>
+      <point x="385" y="591" type="curve" smooth="yes" name="sv01"/>
       <point x="280" y="591"/>
       <point x="192" y="558"/>
       <point x="88" y="470" type="curve" name="iv01"/>
       <point x="88" y="699" type="line"/>
       <point x="192" y="779"/>
       <point x="287" y="814"/>
-      <point x="390" y="814" type="curve" name="av01" smooth="yes"/>
+      <point x="390" y="814" type="curve" smooth="yes" name="av01"/>
       <point x="463" y="814"/>
       <point x="533" y="796"/>
       <point x="621" y="759" type="curve" name="hr01"/>
@@ -26,7 +26,7 @@
       <point x="652" y="745" type="line" smooth="yes"/>
       <point x="725" y="710"/>
       <point x="797" y="691"/>
-      <point x="865" y="691" type="curve" name="dv02" smooth="yes"/>
+      <point x="865" y="691" type="curve" smooth="yes" name="dv02"/>
       <point x="958" y="691"/>
       <point x="1045" y="728"/>
       <point x="1145" y="816" type="curve" name="av02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/six.glif b/source/Hack-Bold.ufo/glyphs/six.glif
index f4db17fea..1eea8da1c 100644
--- a/source/Hack-Bold.ufo/glyphs/six.glif
+++ b/source/Hack-Bold.ufo/glyphs/six.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="six" format="1">
+<glyph name="six" format="2">
   <advance width="1233"/>
   <unicode hex="0036"/>
   <outline>
     <contour>
-      <point x="644" y="-31" type="curve" name="dv01" smooth="yes"/>
+      <point x="644" y="-31" type="curve" smooth="yes" name="dv01"/>
       <point x="469" y="-31"/>
       <point x="341" y="26"/>
       <point x="256" y="153" type="curve" smooth="yes"/>
       <point x="168" y="282"/>
       <point x="131" y="476"/>
-      <point x="131" y="724" type="curve" name="dh01" smooth="yes"/>
+      <point x="131" y="724" type="curve" smooth="yes" name="dh01"/>
       <point x="131" y="988"/>
       <point x="174" y="1189"/>
       <point x="282" y="1326" type="curve" smooth="yes"/>
       <point x="383" y="1454"/>
       <point x="536" y="1518"/>
-      <point x="731" y="1518" type="curve" name="at01" smooth="yes"/>
+      <point x="731" y="1518" type="curve" smooth="yes" name="at01"/>
       <point x="786" y="1518"/>
       <point x="829" y="1514"/>
       <point x="880" y="1503" type="curve" smooth="yes"/>
@@ -29,7 +29,7 @@
       <point x="879" y="1258" type="curve" smooth="yes"/>
       <point x="831" y="1273"/>
       <point x="784" y="1280"/>
-      <point x="738" y="1280" type="curve" name="sv01" smooth="yes"/>
+      <point x="738" y="1280" type="curve" smooth="yes" name="sv01"/>
       <point x="526" y="1280"/>
       <point x="415" y="1136"/>
       <point x="408" y="855" type="curve" name="dh02"/>
@@ -38,13 +38,13 @@
       <point x="528" y="953" type="curve" smooth="yes"/>
       <point x="571" y="972"/>
       <point x="629" y="985"/>
-      <point x="702" y="985" type="curve" name="dv04" smooth="yes"/>
+      <point x="702" y="985" type="curve" smooth="yes" name="dv04"/>
       <point x="834" y="985"/>
       <point x="940" y="943"/>
       <point x="1012" y="859" type="curve" smooth="yes"/>
       <point x="1084" y="776"/>
       <point x="1122" y="654"/>
-      <point x="1122" y="495" type="curve" name="hr01" smooth="yes"/>
+      <point x="1122" y="495" type="curve" smooth="yes" name="hr01"/>
       <point x="1122" y="334"/>
       <point x="1082" y="198"/>
       <point x="999" y="106" type="curve" smooth="yes"/>
@@ -52,25 +52,25 @@
       <point x="796" y="-31"/>
     </contour>
     <contour>
-      <point x="643" y="207" type="curve" name="dv02" smooth="yes"/>
+      <point x="643" y="207" type="curve" smooth="yes" name="dv02"/>
       <point x="703" y="207"/>
       <point x="755" y="228"/>
       <point x="791" y="277" type="curve" smooth="yes"/>
       <point x="825" y="323"/>
       <point x="842" y="390"/>
-      <point x="842" y="477" type="curve" name="dh03" smooth="yes"/>
+      <point x="842" y="477" type="curve" smooth="yes" name="dh03"/>
       <point x="842" y="564"/>
       <point x="825" y="631"/>
       <point x="791" y="678" type="curve" smooth="yes"/>
       <point x="759" y="722"/>
       <point x="710" y="748"/>
-      <point x="642" y="748" type="curve" name="dv03" smooth="yes"/>
+      <point x="642" y="748" type="curve" smooth="yes" name="dv03"/>
       <point x="575" y="748"/>
       <point x="529" y="723"/>
       <point x="497" y="679" type="curve" smooth="yes"/>
       <point x="463" y="632"/>
       <point x="446" y="565"/>
-      <point x="446" y="478" type="curve" name="sh01" smooth="yes"/>
+      <point x="446" y="478" type="curve" smooth="yes" name="sh01"/>
       <point x="446" y="386"/>
       <point x="465" y="320"/>
       <point x="497" y="276" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/six.subs.glif b/source/Hack-Bold.ufo/glyphs/six.subs.glif
index 5b3171ce3..e454c2ce0 100644
--- a/source/Hack-Bold.ufo/glyphs/six.subs.glif
+++ b/source/Hack-Bold.ufo/glyphs/six.subs.glif
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="six.subs" format="1">
+<glyph name="six.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="637" y="-428" type="curve" name="ab01" smooth="yes"/>
+      <point x="637" y="-428" type="curve" smooth="yes" name="ab01"/>
       <point x="402" y="-428"/>
       <point x="287" y="-299"/>
-      <point x="287" y="-11" type="curve" name="dh01" smooth="yes"/>
+      <point x="287" y="-11" type="curve" smooth="yes" name="dh01"/>
       <point x="287" y="297"/>
       <point x="419" y="440"/>
-      <point x="694" y="440" type="curve" name="dv02" smooth="yes"/>
+      <point x="694" y="440" type="curve" smooth="yes" name="dv02"/>
       <point x="759" y="440"/>
       <point x="822" y="433"/>
       <point x="902" y="406" type="curve"/>
       <point x="902" y="257" type="line" name="ih01"/>
       <point x="837" y="286"/>
       <point x="769" y="307"/>
-      <point x="698" y="307" type="curve" name="dv01" smooth="yes"/>
+      <point x="698" y="307" type="curve" smooth="yes" name="dv01"/>
       <point x="558" y="307"/>
       <point x="479" y="226"/>
       <point x="476" y="69" type="curve" name="dh02"/>
       <point x="519" y="118"/>
       <point x="585" y="142"/>
-      <point x="676" y="142" type="curve" name="dv04" smooth="yes"/>
+      <point x="676" y="142" type="curve" smooth="yes" name="dv04"/>
       <point x="861" y="142"/>
       <point x="965" y="44"/>
-      <point x="965" y="-135" type="curve" name="dh04" smooth="yes"/>
+      <point x="965" y="-135" type="curve" smooth="yes" name="dh04"/>
       <point x="965" y="-322"/>
       <point x="852" y="-428"/>
     </contour>
     <contour>
-      <point x="637" y="-295" type="curve" name="hr01" smooth="yes"/>
+      <point x="637" y="-295" type="curve" smooth="yes" name="hr01"/>
       <point x="725" y="-295"/>
       <point x="773" y="-241"/>
-      <point x="773" y="-144" type="curve" name="dh03" smooth="yes"/>
+      <point x="773" y="-144" type="curve" smooth="yes" name="dh03"/>
       <point x="773" y="-96"/>
       <point x="761" y="-59"/>
       <point x="738" y="-32" type="curve" smooth="yes"/>
       <point x="715" y="-6"/>
       <point x="681" y="7"/>
-      <point x="637" y="7" type="curve" name="dv03" smooth="yes"/>
+      <point x="637" y="7" type="curve" smooth="yes" name="dv03"/>
       <point x="549" y="7"/>
       <point x="502" y="-44"/>
-      <point x="502" y="-143" type="curve" name="sh01" smooth="yes"/>
+      <point x="502" y="-143" type="curve" smooth="yes" name="sh01"/>
       <point x="502" y="-242"/>
       <point x="549" y="-295"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/slash.glif b/source/Hack-Bold.ufo/glyphs/slash.glif
index 01979e63a..4412b9d46 100644
--- a/source/Hack-Bold.ufo/glyphs/slash.glif
+++ b/source/Hack-Bold.ufo/glyphs/slash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="slash" format="1">
+<glyph name="slash" format="2">
   <advance width="1233"/>
   <unicode hex="002F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/space.glif b/source/Hack-Bold.ufo/glyphs/space.glif
index 6b1fa9261..13665e890 100644
--- a/source/Hack-Bold.ufo/glyphs/space.glif
+++ b/source/Hack-Bold.ufo/glyphs/space.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="space" format="1">
+<glyph name="space" format="2">
   <advance width="1233"/>
   <unicode hex="0020"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/sterling.glif b/source/Hack-Bold.ufo/glyphs/sterling.glif
index 2062b313f..25e9076a5 100644
--- a/source/Hack-Bold.ufo/glyphs/sterling.glif
+++ b/source/Hack-Bold.ufo/glyphs/sterling.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="sterling" format="1">
+<glyph name="sterling" format="2">
   <advance width="1233"/>
   <unicode hex="00A3"/>
   <outline>
@@ -16,7 +16,7 @@
       <point x="467" y="1396" type="curve" smooth="yes"/>
       <point x="542" y="1479"/>
       <point x="656" y="1520"/>
-      <point x="810" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="810" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="936" y="1520"/>
       <point x="1001" y="1505"/>
       <point x="1102" y="1462" type="curve"/>
@@ -26,13 +26,13 @@
       <point x="980" y="1251" type="curve" smooth="yes"/>
       <point x="937" y="1266"/>
       <point x="891" y="1272"/>
-      <point x="848" y="1272" type="curve" name="sv01" smooth="yes"/>
+      <point x="848" y="1272" type="curve" smooth="yes" name="sv01"/>
       <point x="773" y="1272"/>
       <point x="724" y="1250"/>
       <point x="691" y="1206" type="curve" smooth="yes"/>
       <point x="658" y="1161"/>
       <point x="641" y="1090"/>
-      <point x="641" y="995" type="curve" name="sh02" smooth="yes"/>
+      <point x="641" y="995" type="curve" smooth="yes" name="sh02"/>
       <point x="641" y="819" type="line" name="sv02"/>
       <point x="977" y="819" type="line"/>
       <point x="977" y="594" type="line" name="sv03"/>
diff --git a/source/Hack-Bold.ufo/glyphs/suchthat.glif b/source/Hack-Bold.ufo/glyphs/suchthat.glif
index 068b7392c..c599cf459 100644
--- a/source/Hack-Bold.ufo/glyphs/suchthat.glif
+++ b/source/Hack-Bold.ufo/glyphs/suchthat.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="suchthat" format="1">
+<glyph name="suchthat" format="2">
   <advance width="1233"/>
   <unicode hex="220B"/>
   <outline>
@@ -20,10 +20,10 @@
       <point x="751" y="1223" type="curve" smooth="yes"/>
       <point x="704" y="1270"/>
       <point x="652" y="1294"/>
-      <point x="597" y="1294" type="curve" name="dv01" smooth="yes"/>
+      <point x="597" y="1294" type="curve" smooth="yes" name="dv01"/>
       <point x="100" y="1294" type="line"/>
       <point x="100" y="1524" type="line"/>
-      <point x="597" y="1524" type="line" name="dv02" smooth="yes"/>
+      <point x="597" y="1524" type="line" smooth="yes" name="dv02"/>
       <point x="791" y="1524"/>
       <point x="965" y="1379"/>
       <point x="1061" y="1145" type="curve" smooth="yes"/>
@@ -35,7 +35,7 @@
       <point x="866" y="102" type="curve" smooth="yes"/>
       <point x="784" y="34"/>
       <point x="694" y="0"/>
-      <point x="597" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="597" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="100" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/summation.glif b/source/Hack-Bold.ufo/glyphs/summation.glif
index 9590e5b3c..103e1710c 100644
--- a/source/Hack-Bold.ufo/glyphs/summation.glif
+++ b/source/Hack-Bold.ufo/glyphs/summation.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="summation" format="1">
+<glyph name="summation" format="2">
   <advance width="1233"/>
   <unicode hex="2211"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/t.glif b/source/Hack-Bold.ufo/glyphs/t.glif
index 3eda77536..f90d34144 100644
--- a/source/Hack-Bold.ufo/glyphs/t.glif
+++ b/source/Hack-Bold.ufo/glyphs/t.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="t" format="1">
+<glyph name="t" format="2">
   <advance width="1233"/>
   <unicode hex="0074"/>
   <outline>
@@ -27,9 +27,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/tau.glif b/source/Hack-Bold.ufo/glyphs/tau.glif
index 2730518f9..55eb3970c 100644
--- a/source/Hack-Bold.ufo/glyphs/tau.glif
+++ b/source/Hack-Bold.ufo/glyphs/tau.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="tau" format="1">
+<glyph name="tau" format="2">
   <advance width="1233"/>
   <unicode hex="03C4"/>
   <outline>
     <contour>
-      <point x="901" y="0" type="line" name="ab01" smooth="yes"/>
+      <point x="901" y="0" type="line" smooth="yes" name="ab01"/>
       <point x="565" y="0"/>
       <point x="471" y="83"/>
-      <point x="471" y="379" type="curve" name="dh01" smooth="yes"/>
+      <point x="471" y="379" type="curve" smooth="yes" name="dh01"/>
       <point x="471" y="895" type="line" name="sv01"/>
       <point x="136" y="895" type="line" name="hr01"/>
       <point x="136" y="1120" type="line" name="at01"/>
       <point x="1098" y="1120" type="line"/>
       <point x="1098" y="895" type="line" name="sv02"/>
       <point x="763" y="895" type="line" name="sv03"/>
-      <point x="763" y="365" type="line" name="dh02" smooth="yes"/>
+      <point x="763" y="365" type="line" smooth="yes" name="dh02"/>
       <point x="763" y="265"/>
       <point x="809" y="225"/>
-      <point x="921" y="225" type="curve" name="sv04" smooth="yes"/>
+      <point x="921" y="225" type="curve" smooth="yes" name="sv04"/>
       <point x="979" y="225" type="line" name="hr02"/>
       <point x="979" y="0" type="line" name="ab02"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/tbar.glif b/source/Hack-Bold.ufo/glyphs/tbar.glif
index 2a2e47f14..b91b8a22a 100644
--- a/source/Hack-Bold.ufo/glyphs/tbar.glif
+++ b/source/Hack-Bold.ufo/glyphs/tbar.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="tbar" format="1">
+<glyph name="tbar" format="2">
   <advance width="1233"/>
   <unicode hex="0167"/>
   <outline>
     <contour>
-      <point x="827" y="-4" type="line" name="hr00" smooth="yes"/>
+      <point x="827" y="-4" type="line" smooth="yes" name="hr00"/>
       <point x="491" y="-4"/>
       <point x="397" y="84"/>
-      <point x="397" y="375" type="curve" name="dh01" smooth="yes"/>
+      <point x="397" y="375" type="curve" smooth="yes" name="dh01"/>
       <point x="397" y="561" type="line" name="dv01"/>
       <point x="219" y="561" type="line"/>
       <point x="219" y="753" type="line"/>
@@ -26,10 +26,10 @@
       <point x="874" y="753" type="line"/>
       <point x="874" y="561" type="line" name="sv04"/>
       <point x="690" y="561" type="line"/>
-      <point x="690" y="361" type="line" name="dh02" smooth="yes"/>
+      <point x="690" y="361" type="line" smooth="yes" name="dh02"/>
       <point x="690" y="261"/>
       <point x="735" y="221"/>
-      <point x="848" y="221" type="curve" name="sv05" smooth="yes"/>
+      <point x="848" y="221" type="curve" smooth="yes" name="sv05"/>
       <point x="1073" y="221" type="line" name="sv06"/>
       <point x="1073" y="-4" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/tcaron.glif b/source/Hack-Bold.ufo/glyphs/tcaron.glif
index 5b734cce2..34d7cd9aa 100644
--- a/source/Hack-Bold.ufo/glyphs/tcaron.glif
+++ b/source/Hack-Bold.ufo/glyphs/tcaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="tcaron" format="1">
+<glyph name="tcaron" format="2">
   <advance width="1233"/>
   <unicode hex="0165"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="833" y="1311" type="line" name="dv01"/>
     </contour>
     <contour>
-      <point x="827" y="-4" type="line" name="ab01" smooth="yes"/>
+      <point x="827" y="-4" type="line" smooth="yes" name="ab01"/>
       <point x="658" y="-4"/>
       <point x="545" y="23"/>
       <point x="486" y="77" type="curve" smooth="yes"/>
       <point x="427" y="130"/>
       <point x="397" y="230"/>
-      <point x="397" y="375" type="curve" name="dh01" smooth="yes"/>
+      <point x="397" y="375" type="curve" smooth="yes" name="dh01"/>
       <point x="397" y="895" type="line" name="sv01"/>
       <point x="111" y="895" type="line"/>
       <point x="111" y="1120" type="line" name="at01"/>
@@ -27,13 +27,13 @@
       <point x="1073" y="1120" type="line"/>
       <point x="1073" y="895" type="line" name="sv02"/>
       <point x="690" y="895" type="line" name="sv03"/>
-      <point x="690" y="361" type="line" name="dh02" smooth="yes"/>
+      <point x="690" y="361" type="line" smooth="yes" name="dh02"/>
       <point x="690" y="312"/>
       <point x="702" y="276"/>
       <point x="727" y="254" type="curve" smooth="yes"/>
       <point x="754" y="230"/>
       <point x="795" y="221"/>
-      <point x="848" y="221" type="curve" name="sv04" smooth="yes"/>
+      <point x="848" y="221" type="curve" smooth="yes" name="sv04"/>
       <point x="1073" y="221" type="line"/>
       <point x="1073" y="-4" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/therefore.glif b/source/Hack-Bold.ufo/glyphs/therefore.glif
index 936660d2c..c31e0d73b 100644
--- a/source/Hack-Bold.ufo/glyphs/therefore.glif
+++ b/source/Hack-Bold.ufo/glyphs/therefore.glif
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="therefore" format="1">
+<glyph name="therefore" format="2">
   <advance width="1233"/>
   <unicode hex="2234"/>
   <outline>
     <contour>
-      <point x="478" y="822" type="line" name="dv03" smooth="yes"/>
+      <point x="478" y="822" type="line" smooth="yes" name="dv03"/>
       <point x="458" y="822"/>
       <point x="448" y="832"/>
-      <point x="448" y="852" type="curve" name="ih01" smooth="yes"/>
+      <point x="448" y="852" type="curve" smooth="yes" name="ih01"/>
       <point x="448" y="1157" type="line" smooth="yes"/>
       <point x="448" y="1177"/>
       <point x="458" y="1187"/>
-      <point x="478" y="1187" type="curve" name="dv04" smooth="yes"/>
+      <point x="478" y="1187" type="curve" smooth="yes" name="dv04"/>
       <point x="751" y="1187" type="line" smooth="yes"/>
       <point x="771" y="1187"/>
       <point x="781" y="1177"/>
       <point x="781" y="1157" type="curve" smooth="yes"/>
-      <point x="781" y="852" type="line" name="sh01" smooth="yes"/>
+      <point x="781" y="852" type="line" smooth="yes" name="sh01"/>
       <point x="781" y="832"/>
       <point x="771" y="822"/>
       <point x="751" y="822" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="177" y="105" type="line" name="dv01" smooth="yes"/>
+      <point x="177" y="105" type="line" smooth="yes" name="dv01"/>
       <point x="157" y="105"/>
       <point x="147" y="115"/>
-      <point x="147" y="135" type="curve" name="dh01" smooth="yes"/>
+      <point x="147" y="135" type="curve" smooth="yes" name="dh01"/>
       <point x="147" y="440" type="line" smooth="yes"/>
       <point x="147" y="460"/>
       <point x="157" y="470"/>
-      <point x="177" y="470" type="curve" name="dv02" smooth="yes"/>
+      <point x="177" y="470" type="curve" smooth="yes" name="dv02"/>
       <point x="450" y="470" type="line" smooth="yes"/>
       <point x="470" y="470"/>
       <point x="480" y="460"/>
       <point x="480" y="440" type="curve" smooth="yes"/>
-      <point x="480" y="135" type="line" name="dh02" smooth="yes"/>
+      <point x="480" y="135" type="line" smooth="yes" name="dh02"/>
       <point x="480" y="115"/>
       <point x="470" y="105"/>
       <point x="450" y="105" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="787" y="105" type="line" name="sv01" smooth="yes"/>
+      <point x="787" y="105" type="line" smooth="yes" name="sv01"/>
       <point x="767" y="105"/>
       <point x="757" y="115"/>
-      <point x="757" y="135" type="curve" name="hr01" smooth="yes"/>
+      <point x="757" y="135" type="curve" smooth="yes" name="hr01"/>
       <point x="757" y="440" type="line" smooth="yes"/>
       <point x="757" y="460"/>
       <point x="767" y="470"/>
-      <point x="787" y="470" type="curve" name="sv02" smooth="yes"/>
+      <point x="787" y="470" type="curve" smooth="yes" name="sv02"/>
       <point x="1060" y="470" type="line" smooth="yes"/>
       <point x="1080" y="470"/>
       <point x="1090" y="460"/>
       <point x="1090" y="440" type="curve" smooth="yes"/>
-      <point x="1090" y="135" type="line" name="dh03" smooth="yes"/>
+      <point x="1090" y="135" type="line" smooth="yes" name="dh03"/>
       <point x="1090" y="115"/>
       <point x="1080" y="105"/>
       <point x="1060" y="105" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/theta.glif b/source/Hack-Bold.ufo/glyphs/theta.glif
index 6dcffa64e..d8cdb8c91 100644
--- a/source/Hack-Bold.ufo/glyphs/theta.glif
+++ b/source/Hack-Bold.ufo/glyphs/theta.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="theta" format="1">
+<glyph name="theta" format="2">
   <advance width="1233"/>
   <unicode hex="03B8"/>
   <outline>
     <contour>
-      <point x="617" y="-24" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-24" type="curve" smooth="yes" name="hr00"/>
       <point x="299" y="-24"/>
       <point x="97" y="284"/>
-      <point x="97" y="776" type="curve" name="sh01" smooth="yes"/>
+      <point x="97" y="776" type="curve" smooth="yes" name="sh01"/>
       <point x="97" y="1268"/>
       <point x="299" y="1575"/>
-      <point x="616" y="1575" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1575" type="curve" smooth="yes" name="dv02"/>
       <point x="933" y="1575"/>
       <point x="1135" y="1268"/>
-      <point x="1135" y="774" type="curve" name="sh02" smooth="yes"/>
+      <point x="1135" y="774" type="curve" smooth="yes" name="sh02"/>
       <point x="1135" y="525"/>
       <point x="1084" y="329"/>
       <point x="996" y="192" type="curve" smooth="yes"/>
@@ -24,13 +24,13 @@
       <point x="839" y="887" type="line" name="sh03"/>
       <point x="823" y="1146"/>
       <point x="756" y="1343"/>
-      <point x="616" y="1343" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1343" type="curve" smooth="yes" name="dv01"/>
       <point x="476" y="1343"/>
       <point x="409" y="1146"/>
       <point x="393" y="887" type="curve" name="sh04"/>
     </contour>
     <contour>
-      <point x="616" y="209" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="209" type="curve" smooth="yes" name="sv01"/>
       <point x="761" y="209"/>
       <point x="823" y="415"/>
       <point x="839" y="662" type="curve" name="ah01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/thorn.glif b/source/Hack-Bold.ufo/glyphs/thorn.glif
index 2f4655c16..7bac75e63 100644
--- a/source/Hack-Bold.ufo/glyphs/thorn.glif
+++ b/source/Hack-Bold.ufo/glyphs/thorn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="thorn" format="1">
+<glyph name="thorn" format="2">
   <advance width="1233"/>
   <unicode hex="00FE"/>
   <outline>
@@ -12,19 +12,19 @@
       <point x="563" y="1098" type="curve" smooth="yes"/>
       <point x="612" y="1131"/>
       <point x="671" y="1147"/>
-      <point x="740" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="740" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="865" y="1147"/>
       <point x="965" y="1097"/>
       <point x="1037" y="994" type="curve" smooth="yes"/>
       <point x="1109" y="890"/>
       <point x="1143" y="741"/>
-      <point x="1143" y="558" type="curve" name="sh02" smooth="yes"/>
+      <point x="1143" y="558" type="curve" smooth="yes" name="sh02"/>
       <point x="1143" y="363"/>
       <point x="1104" y="219"/>
       <point x="1036" y="123" type="curve" smooth="yes"/>
       <point x="963" y="19"/>
       <point x="856" y="-29"/>
-      <point x="735" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="735" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="672" y="-29"/>
       <point x="618" y="-17"/>
       <point x="567" y="18" type="curve" smooth="yes"/>
@@ -35,22 +35,22 @@
       <point x="150" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="647" y="215" type="curve" name="dv02" smooth="yes"/>
+      <point x="647" y="215" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="215"/>
       <point x="760" y="246"/>
       <point x="796" y="307" type="curve" smooth="yes"/>
       <point x="832" y="368"/>
       <point x="850" y="452"/>
-      <point x="850" y="561" type="curve" name="ah01" smooth="yes"/>
+      <point x="850" y="561" type="curve" smooth="yes" name="ah01"/>
       <point x="850" y="777"/>
       <point x="774" y="907"/>
-      <point x="647" y="907" type="curve" name="sv01" smooth="yes"/>
+      <point x="647" y="907" type="curve" smooth="yes" name="sv01"/>
       <point x="584" y="907"/>
       <point x="534" y="876"/>
       <point x="497" y="815" type="curve" smooth="yes"/>
       <point x="460" y="754"/>
       <point x="442" y="670"/>
-      <point x="442" y="561" type="curve" name="sh04" smooth="yes"/>
+      <point x="442" y="561" type="curve" smooth="yes" name="sh04"/>
       <point x="442" y="452"/>
       <point x="460" y="368"/>
       <point x="497" y="307" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/three.glif b/source/Hack-Bold.ufo/glyphs/three.glif
index ef2f01794..819d3e8ee 100644
--- a/source/Hack-Bold.ufo/glyphs/three.glif
+++ b/source/Hack-Bold.ufo/glyphs/three.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="three" format="1">
+<glyph name="three" format="2">
   <advance width="1233"/>
   <unicode hex="0033"/>
   <outline>
     <contour>
-      <point x="555" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="555" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="484" y="-29"/>
       <point x="408" y="-23"/>
       <point x="335" y="-10" type="curve" smooth="yes"/>
@@ -17,34 +17,34 @@
       <point x="328" y="248" type="curve" smooth="yes"/>
       <point x="404" y="231"/>
       <point x="480" y="223"/>
-      <point x="541" y="223" type="curve" name="dv02" smooth="yes"/>
+      <point x="541" y="223" type="curve" smooth="yes" name="dv02"/>
       <point x="629" y="223"/>
       <point x="699" y="239"/>
-      <point x="748" y="278" type="curve" name="hr01" smooth="yes"/>
+      <point x="748" y="278" type="curve" smooth="yes" name="hr01"/>
       <point x="796" y="317"/>
       <point x="817" y="371"/>
-      <point x="817" y="435" type="curve" name="dh01" smooth="yes"/>
+      <point x="817" y="435" type="curve" smooth="yes" name="dh01"/>
       <point x="817" y="503"/>
       <point x="794" y="563"/>
       <point x="747" y="606" type="curve" smooth="yes"/>
       <point x="703" y="645"/>
       <point x="637" y="668"/>
-      <point x="549" y="668" type="curve" name="dv03" smooth="yes"/>
+      <point x="549" y="668" type="curve" smooth="yes" name="dv03"/>
       <point x="391" y="668" type="line"/>
       <point x="391" y="928" type="line"/>
-      <point x="549" y="928" type="line" name="dv04" smooth="yes"/>
+      <point x="549" y="928" type="line" smooth="yes" name="dv04"/>
       <point x="622" y="928"/>
       <point x="679" y="943"/>
       <point x="720" y="972" type="curve" smooth="yes"/>
       <point x="763" y="1003"/>
       <point x="780" y="1044"/>
-      <point x="780" y="1095" type="curve" name="sh01" smooth="yes"/>
+      <point x="780" y="1095" type="curve" smooth="yes" name="sh01"/>
       <point x="780" y="1150"/>
       <point x="760" y="1193"/>
       <point x="720" y="1224" type="curve" smooth="yes"/>
       <point x="681" y="1255"/>
       <point x="626" y="1270"/>
-      <point x="547" y="1270" type="curve" name="sv01" smooth="yes"/>
+      <point x="547" y="1270" type="curve" smooth="yes" name="sv01"/>
       <point x="495" y="1270"/>
       <point x="433" y="1264"/>
       <point x="369" y="1249" type="curve" smooth="yes"/>
@@ -57,13 +57,13 @@
       <point x="373" y="1504" type="curve" smooth="yes"/>
       <point x="441" y="1515"/>
       <point x="504" y="1520"/>
-      <point x="564" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="564" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="723" y="1520"/>
       <point x="846" y="1486"/>
-      <point x="933" y="1417" type="curve" name="hr02" smooth="yes"/>
+      <point x="933" y="1417" type="curve" smooth="yes" name="hr02"/>
       <point x="1021" y="1348"/>
       <point x="1065" y="1253"/>
-      <point x="1065" y="1133" type="curve" name="ih01" smooth="yes"/>
+      <point x="1065" y="1133" type="curve" smooth="yes" name="ih01"/>
       <point x="1065" y="1048"/>
       <point x="1044" y="976"/>
       <point x="989" y="916" type="curve" smooth="yes"/>
@@ -75,7 +75,7 @@
       <point x="1016" y="678" type="curve" smooth="yes"/>
       <point x="1072" y="613"/>
       <point x="1100" y="527"/>
-      <point x="1100" y="414" type="curve" name="dh02" smooth="yes"/>
+      <point x="1100" y="414" type="curve" smooth="yes" name="dh02"/>
       <point x="1100" y="129"/>
       <point x="913" y="-29"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/three.subs.glif b/source/Hack-Bold.ufo/glyphs/three.subs.glif
index 1bf9af175..9a157090b 100644
--- a/source/Hack-Bold.ufo/glyphs/three.subs.glif
+++ b/source/Hack-Bold.ufo/glyphs/three.subs.glif
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="three.subs" format="1">
+<glyph name="three.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="585" y="-415" type="curve" name="dv01" smooth="yes"/>
+      <point x="585" y="-415" type="curve" smooth="yes" name="dv01"/>
       <point x="486" y="-415"/>
       <point x="387" y="-401"/>
       <point x="287" y="-374" type="curve"/>
       <point x="287" y="-220" type="line"/>
       <point x="374" y="-257"/>
       <point x="488" y="-275"/>
-      <point x="573" y="-275" type="curve" name="hr01" smooth="yes"/>
+      <point x="573" y="-275" type="curve" smooth="yes" name="hr01"/>
       <point x="706" y="-275"/>
       <point x="766" y="-231"/>
-      <point x="766" y="-155" type="curve" name="sh01" smooth="yes"/>
+      <point x="766" y="-155" type="curve" smooth="yes" name="sh01"/>
       <point x="766" y="-74"/>
       <point x="698" y="-26"/>
-      <point x="582" y="-26" type="curve" name="ab01" smooth="yes"/>
+      <point x="582" y="-26" type="curve" smooth="yes" name="ab01"/>
       <point x="471" y="-26" type="line"/>
       <point x="471" y="120" type="line" name="dh01"/>
       <point x="582" y="120" type="line" smooth="yes"/>
       <point x="682" y="120"/>
       <point x="741" y="153"/>
-      <point x="741" y="216" type="curve" name="sh02" smooth="yes"/>
+      <point x="741" y="216" type="curve" smooth="yes" name="sh02"/>
       <point x="741" y="275"/>
       <point x="691" y="310"/>
-      <point x="580" y="310" type="curve" name="hr02" smooth="yes"/>
+      <point x="580" y="310" type="curve" smooth="yes" name="hr02"/>
       <point x="516" y="310"/>
       <point x="413" y="297"/>
       <point x="317" y="265" type="curve"/>
       <point x="317" y="417" type="line"/>
       <point x="409" y="440"/>
       <point x="504" y="452"/>
-      <point x="588" y="452" type="curve" name="hr03" smooth="yes"/>
+      <point x="588" y="452" type="curve" smooth="yes" name="hr03"/>
       <point x="807" y="452"/>
       <point x="938" y="369"/>
-      <point x="938" y="236" type="curve" name="dh02" smooth="yes"/>
+      <point x="938" y="236" type="curve" smooth="yes" name="dh02"/>
       <point x="938" y="136"/>
       <point x="867" y="73"/>
       <point x="735" y="52" type="curve" name="ih01"/>
       <point x="878" y="33"/>
       <point x="963" y="-39"/>
-      <point x="963" y="-168" type="curve" name="sh03" smooth="yes"/>
+      <point x="963" y="-168" type="curve" smooth="yes" name="sh03"/>
       <point x="963" y="-329"/>
       <point x="833" y="-415"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/threeeighths.glif b/source/Hack-Bold.ufo/glyphs/threeeighths.glif
index dc16db0f5..378b7bdef 100644
--- a/source/Hack-Bold.ufo/glyphs/threeeighths.glif
+++ b/source/Hack-Bold.ufo/glyphs/threeeighths.glif
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="threeeighths" format="1">
+<glyph name="threeeighths" format="2">
   <advance width="1233"/>
   <unicode hex="215C"/>
   <outline>
     <contour>
-      <point x="327" y="809" type="curve" name="dv10" smooth="yes"/>
+      <point x="327" y="809" type="curve" smooth="yes" name="dv10"/>
       <point x="228" y="809"/>
       <point x="129" y="823"/>
       <point x="29" y="850" type="curve"/>
       <point x="29" y="1004" type="line"/>
       <point x="116" y="967"/>
       <point x="230" y="949"/>
-      <point x="315" y="949" type="curve" name="dv11" smooth="yes"/>
+      <point x="315" y="949" type="curve" smooth="yes" name="dv11"/>
       <point x="448" y="949"/>
       <point x="508" y="993"/>
-      <point x="508" y="1069" type="curve" name="sh01" smooth="yes"/>
+      <point x="508" y="1069" type="curve" smooth="yes" name="sh01"/>
       <point x="508" y="1150"/>
       <point x="440" y="1198"/>
-      <point x="324" y="1198" type="curve" name="dv07" smooth="yes"/>
+      <point x="324" y="1198" type="curve" smooth="yes" name="dv07"/>
       <point x="213" y="1198" type="line"/>
       <point x="213" y="1344" type="line" name="dh01"/>
-      <point x="324" y="1344" type="line" name="dv08" smooth="yes"/>
+      <point x="324" y="1344" type="line" smooth="yes" name="dv08"/>
       <point x="424" y="1344"/>
       <point x="483" y="1377"/>
-      <point x="483" y="1440" type="curve" name="sh02" smooth="yes"/>
+      <point x="483" y="1440" type="curve" smooth="yes" name="sh02"/>
       <point x="483" y="1499"/>
       <point x="433" y="1534"/>
-      <point x="322" y="1534" type="curve" name="dv03" smooth="yes"/>
+      <point x="322" y="1534" type="curve" smooth="yes" name="dv03"/>
       <point x="258" y="1534"/>
       <point x="155" y="1521"/>
       <point x="59" y="1489" type="curve"/>
       <point x="59" y="1641" type="line"/>
       <point x="151" y="1664"/>
       <point x="246" y="1676"/>
-      <point x="330" y="1676" type="curve" name="dv04" smooth="yes"/>
+      <point x="330" y="1676" type="curve" smooth="yes" name="dv04"/>
       <point x="549" y="1676"/>
       <point x="680" y="1593"/>
-      <point x="680" y="1460" type="curve" name="hr01" smooth="yes"/>
+      <point x="680" y="1460" type="curve" smooth="yes" name="hr01"/>
       <point x="680" y="1360"/>
       <point x="609" y="1297"/>
       <point x="477" y="1276" type="curve" name="ih01"/>
       <point x="620" y="1257"/>
       <point x="705" y="1185"/>
-      <point x="705" y="1056" type="curve" name="sh03" smooth="yes"/>
+      <point x="705" y="1056" type="curve" smooth="yes" name="sh03"/>
       <point x="705" y="895"/>
       <point x="575" y="809"/>
     </contour>
@@ -53,56 +53,56 @@
       <point x="84" y="500" type="line"/>
     </contour>
     <contour>
-      <point x="818" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="818" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="603" y="-285"/>
       <point x="483" y="-192"/>
-      <point x="483" y="-41" type="curve" name="sh04" smooth="yes"/>
+      <point x="483" y="-41" type="curve" smooth="yes" name="sh04"/>
       <point x="483" y="70"/>
       <point x="548" y="143"/>
       <point x="667" y="174" type="curve" name="ih02"/>
       <point x="560" y="205"/>
       <point x="509" y="267"/>
-      <point x="509" y="359" type="curve" name="sh05" smooth="yes"/>
+      <point x="509" y="359" type="curve" smooth="yes" name="sh05"/>
       <point x="509" y="497"/>
       <point x="627" y="582"/>
-      <point x="816" y="582" type="curve" name="hr03" smooth="yes"/>
+      <point x="816" y="582" type="curve" smooth="yes" name="hr03"/>
       <point x="1008" y="582"/>
       <point x="1125" y="495"/>
-      <point x="1125" y="359" type="curve" name="dh03" smooth="yes"/>
+      <point x="1125" y="359" type="curve" smooth="yes" name="dh03"/>
       <point x="1125" y="267"/>
       <point x="1071" y="205"/>
       <point x="970" y="174" type="curve" name="ih03"/>
       <point x="1083" y="145"/>
       <point x="1150" y="75"/>
-      <point x="1150" y="-41" type="curve" name="sh06" smooth="yes"/>
+      <point x="1150" y="-41" type="curve" smooth="yes" name="sh06"/>
       <point x="1150" y="-194"/>
       <point x="1031" y="-285"/>
     </contour>
     <contour>
-      <point x="817" y="237" type="curve" name="dv06" smooth="yes"/>
+      <point x="817" y="237" type="curve" smooth="yes" name="dv06"/>
       <point x="897" y="237"/>
       <point x="946" y="279"/>
-      <point x="946" y="344" type="curve" name="dh02" smooth="yes"/>
+      <point x="946" y="344" type="curve" smooth="yes" name="dh02"/>
       <point x="946" y="409"/>
       <point x="897" y="449"/>
-      <point x="817" y="449" type="curve" name="dv09" smooth="yes"/>
+      <point x="817" y="449" type="curve" smooth="yes" name="dv09"/>
       <point x="737" y="449"/>
       <point x="688" y="408"/>
-      <point x="688" y="344" type="curve" name="hr04" smooth="yes"/>
+      <point x="688" y="344" type="curve" smooth="yes" name="hr04"/>
       <point x="688" y="279"/>
       <point x="737" y="237"/>
     </contour>
     <contour>
-      <point x="816" y="-152" type="curve" name="dv02" smooth="yes"/>
+      <point x="816" y="-152" type="curve" smooth="yes" name="dv02"/>
       <point x="907" y="-152"/>
       <point x="968" y="-102"/>
-      <point x="968" y="-23" type="curve" name="hr05" smooth="yes"/>
+      <point x="968" y="-23" type="curve" smooth="yes" name="hr05"/>
       <point x="968" y="18"/>
       <point x="951" y="49"/>
       <point x="927" y="69" type="curve" smooth="yes"/>
       <point x="900" y="92"/>
       <point x="864" y="103"/>
-      <point x="819" y="103" type="curve" name="dv05" smooth="yes"/>
+      <point x="819" y="103" type="curve" smooth="yes" name="dv05"/>
       <point x="726" y="103"/>
       <point x="665" y="53"/>
       <point x="665" y="-24" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/threequarters.glif b/source/Hack-Bold.ufo/glyphs/threequarters.glif
index 9759304b8..83c15ff8b 100644
--- a/source/Hack-Bold.ufo/glyphs/threequarters.glif
+++ b/source/Hack-Bold.ufo/glyphs/threequarters.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="threequarters" format="1">
+<glyph name="threequarters" format="2">
   <advance width="1233"/>
   <unicode hex="00BE"/>
   <outline>
     <contour>
-      <point x="361" y="809" type="curve" name="dv05" smooth="yes"/>
+      <point x="361" y="809" type="curve" smooth="yes" name="dv05"/>
       <point x="308" y="809"/>
       <point x="260" y="813"/>
-      <point x="209" y="820" type="curve" name="sv01" smooth="yes"/>
+      <point x="209" y="820" type="curve" smooth="yes" name="sv01"/>
       <point x="158" y="827"/>
       <point x="109" y="837"/>
       <point x="60" y="850" type="curve"/>
@@ -17,47 +17,47 @@
       <point x="203" y="963" type="curve" smooth="yes"/>
       <point x="254" y="954"/>
       <point x="309" y="949"/>
-      <point x="353" y="949" type="curve" name="dv06" smooth="yes"/>
+      <point x="353" y="949" type="curve" smooth="yes" name="dv06"/>
       <point x="420" y="949"/>
       <point x="460" y="960"/>
       <point x="492" y="981" type="curve" smooth="yes"/>
       <point x="523" y="1002"/>
       <point x="539" y="1032"/>
-      <point x="539" y="1070" type="curve" name="dh03" smooth="yes"/>
+      <point x="539" y="1070" type="curve" smooth="yes" name="dh03"/>
       <point x="539" y="1150"/>
       <point x="470" y="1198"/>
-      <point x="355" y="1198" type="curve" name="dv03" smooth="yes"/>
+      <point x="355" y="1198" type="curve" smooth="yes" name="dv03"/>
       <point x="244" y="1198" type="line"/>
       <point x="244" y="1344" type="line"/>
-      <point x="355" y="1344" type="line" name="dv04" smooth="yes"/>
+      <point x="355" y="1344" type="line" smooth="yes" name="dv04"/>
       <point x="404" y="1344"/>
       <point x="443" y="1352"/>
       <point x="472" y="1369" type="curve" smooth="yes"/>
       <point x="500" y="1386"/>
       <point x="514" y="1409"/>
-      <point x="514" y="1439" type="curve" name="sh01" smooth="yes"/>
+      <point x="514" y="1439" type="curve" smooth="yes" name="sh01"/>
       <point x="514" y="1464"/>
       <point x="504" y="1490"/>
       <point x="475" y="1509" type="curve" smooth="yes"/>
       <point x="448" y="1526"/>
       <point x="414" y="1534"/>
-      <point x="359" y="1534" type="curve" name="dv01" smooth="yes"/>
+      <point x="359" y="1534" type="curve" smooth="yes" name="dv01"/>
       <point x="278" y="1534"/>
       <point x="179" y="1518"/>
       <point x="90" y="1489" type="curve"/>
       <point x="90" y="1641" type="line"/>
       <point x="133" y="1652"/>
       <point x="180" y="1660"/>
-      <point x="229" y="1667" type="curve" name="sv02" smooth="yes"/>
+      <point x="229" y="1667" type="curve" smooth="yes" name="sv02"/>
       <point x="276" y="1674"/>
       <point x="321" y="1676"/>
-      <point x="364" y="1676" type="curve" name="dv02" smooth="yes"/>
+      <point x="364" y="1676" type="curve" smooth="yes" name="dv02"/>
       <point x="465" y="1676"/>
       <point x="556" y="1659"/>
       <point x="620" y="1618" type="curve" smooth="yes"/>
       <point x="680" y="1579"/>
       <point x="711" y="1526"/>
-      <point x="711" y="1458" type="curve" name="ih01" smooth="yes"/>
+      <point x="711" y="1458" type="curve" smooth="yes" name="ih01"/>
       <point x="711" y="1361"/>
       <point x="640" y="1299"/>
       <point x="508" y="1276" type="curve" name="iv01"/>
@@ -66,7 +66,7 @@
       <point x="678" y="1205" type="curve" smooth="yes"/>
       <point x="717" y="1168"/>
       <point x="736" y="1119"/>
-      <point x="736" y="1056" type="curve" name="dh04" smooth="yes"/>
+      <point x="736" y="1056" type="curve" smooth="yes" name="dh04"/>
       <point x="736" y="976"/>
       <point x="704" y="915"/>
       <point x="640" y="873" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/tilde.glif b/source/Hack-Bold.ufo/glyphs/tilde.glif
index 1651710df..671d45ae3 100644
--- a/source/Hack-Bold.ufo/glyphs/tilde.glif
+++ b/source/Hack-Bold.ufo/glyphs/tilde.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="tilde" format="1">
+<glyph name="tilde" format="2">
   <advance width="1233"/>
   <unicode hex="02DC"/>
   <outline>
     <contour>
-      <point x="768" y="1307" type="curve" name="av01" smooth="yes"/>
+      <point x="768" y="1307" type="curve" smooth="yes" name="av01"/>
       <point x="720" y="1307"/>
       <point x="682" y="1320"/>
-      <point x="618" y="1364" type="curve" name="hr01" smooth="yes"/>
+      <point x="618" y="1364" type="curve" smooth="yes" name="hr01"/>
       <point x="551" y="1409" type="line" smooth="yes"/>
       <point x="522" y="1428"/>
       <point x="500" y="1438"/>
@@ -17,7 +17,7 @@
       <point x="427" y="1407" type="curve" smooth="yes"/>
       <point x="414" y="1386"/>
       <point x="408" y="1356"/>
-      <point x="408" y="1317" type="curve" name="av03" smooth="yes"/>
+      <point x="408" y="1317" type="curve" smooth="yes" name="av03"/>
       <point x="408" y="1309" type="line" name="dv01"/>
       <point x="268" y="1309" type="line" name="av04"/>
       <point x="268" y="1404"/>
@@ -25,14 +25,14 @@
       <point x="320" y="1520" type="curve" smooth="yes"/>
       <point x="351" y="1564"/>
       <point x="398" y="1593"/>
-      <point x="465" y="1593" type="curve" name="av05" smooth="yes"/>
+      <point x="465" y="1593" type="curve" smooth="yes" name="av05"/>
       <point x="490" y="1593"/>
       <point x="514" y="1589"/>
-      <point x="537" y="1580" type="curve" name="hr02" smooth="yes"/>
+      <point x="537" y="1580" type="curve" smooth="yes" name="hr02"/>
       <point x="564" y="1569"/>
       <point x="586" y="1556"/>
       <point x="614" y="1536" type="curve" smooth="yes"/>
-      <point x="676" y="1493" type="line" name="hr03" smooth="yes"/>
+      <point x="676" y="1493" type="line" smooth="yes" name="hr03"/>
       <point x="693" y="1481"/>
       <point x="701" y="1477"/>
       <point x="716" y="1470" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="806" y="1494" type="curve" smooth="yes"/>
       <point x="819" y="1515"/>
       <point x="825" y="1544"/>
-      <point x="825" y="1583" type="curve" name="av06" smooth="yes"/>
+      <point x="825" y="1583" type="curve" smooth="yes" name="av06"/>
       <point x="825" y="1591" type="line" name="dv02"/>
       <point x="965" y="1591" type="line" name="av07"/>
       <point x="965" y="1500"/>
diff --git a/source/Hack-Bold.ufo/glyphs/tildecomb.glif b/source/Hack-Bold.ufo/glyphs/tildecomb.glif
index f1cebea47..ca3c15bfe 100644
--- a/source/Hack-Bold.ufo/glyphs/tildecomb.glif
+++ b/source/Hack-Bold.ufo/glyphs/tildecomb.glif
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="tildecomb" format="1">
-  <advance width="0"/>
+<glyph name="tildecomb" format="2">
   <unicode hex="0303"/>
   <outline>
     <contour>
-      <point x="-469" y="1307" type="curve" name="dv01" smooth="yes"/>
+      <point x="-469" y="1307" type="curve" smooth="yes" name="dv01"/>
       <point x="-510" y="1307"/>
       <point x="-548" y="1318"/>
       <point x="-615" y="1364" type="curve" smooth="yes"/>
@@ -12,7 +11,7 @@
       <point x="-682" y="1409" type="line" smooth="yes"/>
       <point x="-711" y="1428"/>
       <point x="-733" y="1438"/>
-      <point x="-754" y="1438" type="curve" name="dv03" smooth="yes"/>
+      <point x="-754" y="1438" type="curve" smooth="yes" name="dv03"/>
       <point x="-799" y="1438"/>
       <point x="-825" y="1394"/>
       <point x="-825" y="1317" type="curve" smooth="yes"/>
@@ -20,14 +19,14 @@
       <point x="-965" y="1309" type="line" name="hr01"/>
       <point x="-965" y="1492"/>
       <point x="-893" y="1593"/>
-      <point x="-768" y="1593" type="curve" name="dv04" smooth="yes"/>
+      <point x="-768" y="1593" type="curve" smooth="yes" name="dv04"/>
       <point x="-717" y="1593"/>
       <point x="-676" y="1576"/>
       <point x="-619" y="1536" type="curve" smooth="yes"/>
       <point x="-557" y="1493" type="line" smooth="yes"/>
       <point x="-530" y="1474"/>
       <point x="-506" y="1462"/>
-      <point x="-482" y="1462" type="curve" name="dv02" smooth="yes"/>
+      <point x="-482" y="1462" type="curve" smooth="yes" name="dv02"/>
       <point x="-435" y="1462"/>
       <point x="-408" y="1507"/>
       <point x="-408" y="1583" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/tonos.glif b/source/Hack-Bold.ufo/glyphs/tonos.glif
index 154402beb..15ba87056 100644
--- a/source/Hack-Bold.ufo/glyphs/tonos.glif
+++ b/source/Hack-Bold.ufo/glyphs/tonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="tonos" format="1">
+<glyph name="tonos" format="2">
   <advance width="1233"/>
   <unicode hex="0384"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/trademark.glif b/source/Hack-Bold.ufo/glyphs/trademark.glif
index 5a6a66cce..997be8f17 100644
--- a/source/Hack-Bold.ufo/glyphs/trademark.glif
+++ b/source/Hack-Bold.ufo/glyphs/trademark.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="trademark" format="1">
+<glyph name="trademark" format="2">
   <advance width="1233"/>
   <unicode hex="2122"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/triagdn.glif b/source/Hack-Bold.ufo/glyphs/triagdn.glif
index ae62ad357..4964145af 100644
--- a/source/Hack-Bold.ufo/glyphs/triagdn.glif
+++ b/source/Hack-Bold.ufo/glyphs/triagdn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="triagdn" format="1">
+<glyph name="triagdn" format="2">
   <advance width="1233"/>
   <unicode hex="25BC"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/triaglf.glif b/source/Hack-Bold.ufo/glyphs/triaglf.glif
index 5b464644c..a9eecf67b 100644
--- a/source/Hack-Bold.ufo/glyphs/triaglf.glif
+++ b/source/Hack-Bold.ufo/glyphs/triaglf.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="triaglf" format="1">
+<glyph name="triaglf" format="2">
   <advance width="1233"/>
   <unicode hex="25C4"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/triagrt.glif b/source/Hack-Bold.ufo/glyphs/triagrt.glif
index 4fa9ebf0a..76cd2a61c 100644
--- a/source/Hack-Bold.ufo/glyphs/triagrt.glif
+++ b/source/Hack-Bold.ufo/glyphs/triagrt.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="triagrt" format="1">
+<glyph name="triagrt" format="2">
   <advance width="1233"/>
   <unicode hex="25BA"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/triagup.glif b/source/Hack-Bold.ufo/glyphs/triagup.glif
index 8b827d704..6a5b3fba1 100644
--- a/source/Hack-Bold.ufo/glyphs/triagup.glif
+++ b/source/Hack-Bold.ufo/glyphs/triagup.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="triagup" format="1">
+<glyph name="triagup" format="2">
   <advance width="1233"/>
   <unicode hex="25B2"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/two.glif b/source/Hack-Bold.ufo/glyphs/two.glif
index 2a8f202e6..ff09ef438 100644
--- a/source/Hack-Bold.ufo/glyphs/two.glif
+++ b/source/Hack-Bold.ufo/glyphs/two.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="two" format="1">
+<glyph name="two" format="2">
   <advance width="1233"/>
   <unicode hex="0032"/>
   <outline>
     <contour>
-      <point x="115" y="216" type="line" name="hr00" smooth="yes"/>
+      <point x="115" y="216" type="line" smooth="yes" name="hr00"/>
       <point x="115" y="241"/>
       <point x="123" y="259"/>
       <point x="140" y="278" type="curve" smooth="yes"/>
@@ -17,10 +17,10 @@
       <point x="729" y="947" type="curve"/>
       <point x="751" y="992"/>
       <point x="762" y="1037"/>
-      <point x="762" y="1082" type="curve" name="dh01" smooth="yes"/>
+      <point x="762" y="1082" type="curve" smooth="yes" name="dh01"/>
       <point x="762" y="1210"/>
       <point x="677" y="1288"/>
-      <point x="530" y="1288" type="curve" name="sv01" smooth="yes"/>
+      <point x="530" y="1288" type="curve" smooth="yes" name="sv01"/>
       <point x="476" y="1288"/>
       <point x="417" y="1278"/>
       <point x="353" y="1257" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="357" y="1500" type="curve" smooth="yes"/>
       <point x="424" y="1513"/>
       <point x="490" y="1520"/>
-      <point x="557" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="557" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="702" y="1520"/>
       <point x="831" y="1486"/>
       <point x="926" y="1410" type="curve" smooth="yes"/>
       <point x="1011" y="1341"/>
       <point x="1061" y="1243"/>
-      <point x="1061" y="1104" type="curve" name="sh01" smooth="yes"/>
+      <point x="1061" y="1104" type="curve" smooth="yes" name="sh01"/>
       <point x="1061" y="1045"/>
       <point x="1052" y="998"/>
       <point x="1031" y="943" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/two.subs.glif b/source/Hack-Bold.ufo/glyphs/two.subs.glif
index 1892d339e..7b30381d0 100644
--- a/source/Hack-Bold.ufo/glyphs/two.subs.glif
+++ b/source/Hack-Bold.ufo/glyphs/two.subs.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="two.subs" format="1">
+<glyph name="two.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
@@ -9,20 +9,20 @@
       <point x="415" y="-141" type="curve"/>
       <point x="630" y="36"/>
       <point x="729" y="146"/>
-      <point x="729" y="210" type="curve" name="dh01" smooth="yes"/>
+      <point x="729" y="210" type="curve" smooth="yes" name="dh01"/>
       <point x="729" y="255"/>
       <point x="677" y="312"/>
-      <point x="565" y="312" type="curve" name="dv02" smooth="yes"/>
+      <point x="565" y="312" type="curve" smooth="yes" name="dv02"/>
       <point x="492" y="312"/>
       <point x="403" y="288"/>
       <point x="299" y="243" type="curve"/>
       <point x="299" y="407" type="line"/>
       <point x="399" y="436"/>
       <point x="492" y="452"/>
-      <point x="584" y="452" type="curve" name="dv03" smooth="yes"/>
+      <point x="584" y="452" type="curve" smooth="yes" name="dv03"/>
       <point x="815" y="452"/>
       <point x="938" y="349"/>
-      <point x="938" y="234" type="curve" name="dh02" smooth="yes"/>
+      <point x="938" y="234" type="curve" smooth="yes" name="dh02"/>
       <point x="938" y="119"/>
       <point x="818" y="-3"/>
       <point x="583" y="-190" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/twodotenleader.glif b/source/Hack-Bold.ufo/glyphs/twodotenleader.glif
index c4ec30a2b..b5b7069e1 100644
--- a/source/Hack-Bold.ufo/glyphs/twodotenleader.glif
+++ b/source/Hack-Bold.ufo/glyphs/twodotenleader.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="twodotenleader" format="1">
+<glyph name="twodotenleader" format="2">
   <advance width="1233"/>
   <unicode hex="2025"/>
   <outline>
     <contour>
-      <point x="263" y="0" type="line" name="hr00" smooth="yes"/>
+      <point x="263" y="0" type="line" smooth="yes" name="hr00"/>
       <point x="243" y="0"/>
       <point x="233" y="10"/>
-      <point x="233" y="30" type="curve" name="sh01" smooth="yes"/>
+      <point x="233" y="30" type="curve" smooth="yes" name="sh01"/>
       <point x="233" y="337" type="line" smooth="yes"/>
       <point x="233" y="357"/>
       <point x="243" y="367"/>
-      <point x="263" y="367" type="curve" name="sv01" smooth="yes"/>
-      <point x="498" y="367" type="line" name="sv02" smooth="yes"/>
+      <point x="263" y="367" type="curve" smooth="yes" name="sv01"/>
+      <point x="498" y="367" type="line" smooth="yes" name="sv02"/>
       <point x="518" y="367"/>
       <point x="528" y="357"/>
       <point x="528" y="337" type="curve" smooth="yes"/>
-      <point x="528" y="30" type="line" name="sh02" smooth="yes"/>
+      <point x="528" y="30" type="line" smooth="yes" name="sh02"/>
       <point x="528" y="10"/>
       <point x="518" y="0"/>
       <point x="498" y="0" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="735" y="0" type="line" name="ab01" smooth="yes"/>
+      <point x="735" y="0" type="line" smooth="yes" name="ab01"/>
       <point x="715" y="0"/>
       <point x="705" y="10"/>
-      <point x="705" y="30" type="curve" name="sh03" smooth="yes"/>
+      <point x="705" y="30" type="curve" smooth="yes" name="sh03"/>
       <point x="705" y="337" type="line" smooth="yes"/>
       <point x="705" y="357"/>
       <point x="715" y="367"/>
-      <point x="735" y="367" type="curve" name="sv03" smooth="yes"/>
-      <point x="970" y="367" type="line" name="sv04" smooth="yes"/>
+      <point x="735" y="367" type="curve" smooth="yes" name="sv03"/>
+      <point x="970" y="367" type="line" smooth="yes" name="sv04"/>
       <point x="990" y="367"/>
       <point x="1000" y="357"/>
       <point x="1000" y="337" type="curve" smooth="yes"/>
-      <point x="1000" y="30" type="line" name="sh04" smooth="yes"/>
+      <point x="1000" y="30" type="line" smooth="yes" name="sh04"/>
       <point x="1000" y="10"/>
       <point x="990" y="0"/>
       <point x="970" y="0" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/u.glif b/source/Hack-Bold.ufo/glyphs/u.glif
index ead758cc9..51a57d524 100644
--- a/source/Hack-Bold.ufo/glyphs/u.glif
+++ b/source/Hack-Bold.ufo/glyphs/u.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="u" format="1">
+<glyph name="u" format="2">
   <advance width="1233"/>
   <unicode hex="0075"/>
   <outline>
@@ -19,17 +19,17 @@
       <point x="768" y="477" type="curve" smooth="yes"/>
       <point x="768" y="1120" type="line"/>
       <point x="1061" y="1120" type="line"/>
-      <point x="1061" y="-0" type="line"/>
-      <point x="797" y="-0" type="line"/>
+      <point x="1061" y="0" type="line"/>
+      <point x="797" y="0" type="line"/>
       <point x="768" y="166" type="line"/>
       <point x="725" y="40"/>
       <point x="623" y="-29"/>
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/uacute.glif b/source/Hack-Bold.ufo/glyphs/uacute.glif
index 98b62f09d..12ead49f4 100644
--- a/source/Hack-Bold.ufo/glyphs/uacute.glif
+++ b/source/Hack-Bold.ufo/glyphs/uacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uacute" format="1">
+<glyph name="uacute" format="2">
   <advance width="1233"/>
   <unicode hex="00FA"/>
   <outline>
@@ -10,28 +10,28 @@
       <point x="469" y="1270" type="line" name="hr01"/>
     </contour>
     <contour>
-      <point x="481" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="481" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="381" y="-29"/>
       <point x="299" y="2"/>
       <point x="242" y="77" type="curve" smooth="yes"/>
       <point x="187" y="148"/>
       <point x="160" y="252"/>
-      <point x="160" y="391" type="curve" name="sh02" smooth="yes"/>
+      <point x="160" y="391" type="curve" smooth="yes" name="sh02"/>
       <point x="160" y="1120" type="line" name="at01"/>
       <point x="453" y="1120" type="line"/>
-      <point x="453" y="436" type="line" name="hr02" smooth="yes"/>
+      <point x="453" y="436" type="line" smooth="yes" name="hr02"/>
       <point x="453" y="355"/>
       <point x="464" y="298"/>
       <point x="487" y="263" type="curve" smooth="yes"/>
       <point x="510" y="228"/>
       <point x="549" y="211"/>
-      <point x="598" y="211" type="curve" name="dv02" smooth="yes"/>
+      <point x="598" y="211" type="curve" smooth="yes" name="dv02"/>
       <point x="649" y="211"/>
       <point x="692" y="230"/>
       <point x="724" y="281" type="curve" smooth="yes"/>
       <point x="753" y="328"/>
       <point x="768" y="394"/>
-      <point x="768" y="477" type="curve" name="sh03" smooth="yes"/>
+      <point x="768" y="477" type="curve" smooth="yes" name="sh03"/>
       <point x="768" y="1120" type="line" name="at02"/>
       <point x="1061" y="1120" type="line"/>
       <point x="1061" y="0" type="line" name="sh01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/ubreve.glif b/source/Hack-Bold.ufo/glyphs/ubreve.glif
index f1aae48db..915f52de0 100644
--- a/source/Hack-Bold.ufo/glyphs/ubreve.glif
+++ b/source/Hack-Bold.ufo/glyphs/ubreve.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ubreve" format="1">
+<glyph name="ubreve" format="2">
   <advance width="1233"/>
   <unicode hex="016D"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="803" y="1596" type="line"/>
       <point x="790" y="1503"/>
       <point x="722" y="1452"/>
-      <point x="611" y="1452" type="curve" name="hr01" smooth="yes"/>
+      <point x="611" y="1452" type="curve" smooth="yes" name="hr01"/>
       <point x="499" y="1452"/>
       <point x="429" y="1504"/>
       <point x="416" y="1596" type="curve" name="hr02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/ucircumflex.glif b/source/Hack-Bold.ufo/glyphs/ucircumflex.glif
index 46212e766..cd47fd7c6 100644
--- a/source/Hack-Bold.ufo/glyphs/ucircumflex.glif
+++ b/source/Hack-Bold.ufo/glyphs/ucircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ucircumflex" format="1">
+<glyph name="ucircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00FB"/>
   <outline>
@@ -13,28 +13,28 @@
       <point x="240" y="1270" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="481" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="481" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="381" y="-29"/>
       <point x="299" y="2"/>
       <point x="242" y="77" type="curve" smooth="yes"/>
       <point x="187" y="148"/>
       <point x="160" y="252"/>
-      <point x="160" y="391" type="curve" name="hr02" smooth="yes"/>
+      <point x="160" y="391" type="curve" smooth="yes" name="hr02"/>
       <point x="160" y="1120" type="line" name="at01"/>
       <point x="453" y="1120" type="line"/>
-      <point x="453" y="436" type="line" name="sh02" smooth="yes"/>
+      <point x="453" y="436" type="line" smooth="yes" name="sh02"/>
       <point x="453" y="355"/>
       <point x="464" y="298"/>
       <point x="487" y="263" type="curve" smooth="yes"/>
       <point x="510" y="228"/>
       <point x="549" y="211"/>
-      <point x="598" y="211" type="curve" name="dv02" smooth="yes"/>
+      <point x="598" y="211" type="curve" smooth="yes" name="dv02"/>
       <point x="649" y="211"/>
       <point x="692" y="230"/>
       <point x="724" y="281" type="curve" smooth="yes"/>
       <point x="753" y="328"/>
       <point x="768" y="394"/>
-      <point x="768" y="477" type="curve" name="sh03" smooth="yes"/>
+      <point x="768" y="477" type="curve" smooth="yes" name="sh03"/>
       <point x="768" y="1120" type="line" name="at02"/>
       <point x="1061" y="1120" type="line"/>
       <point x="1061" y="0" type="line" name="sh01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/udieresis.glif b/source/Hack-Bold.ufo/glyphs/udieresis.glif
index 16c464983..366004199 100644
--- a/source/Hack-Bold.ufo/glyphs/udieresis.glif
+++ b/source/Hack-Bold.ufo/glyphs/udieresis.glif
@@ -1,67 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="udieresis" format="1">
+<glyph name="udieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00FC"/>
   <outline>
     <contour>
-      <point x="331" y="1347" type="line" name="sv01" smooth="yes"/>
+      <point x="331" y="1347" type="line" smooth="yes" name="sv01"/>
       <point x="311" y="1347"/>
       <point x="301" y="1357"/>
-      <point x="301" y="1377" type="curve" name="ih01" smooth="yes"/>
+      <point x="301" y="1377" type="curve" smooth="yes" name="ih01"/>
       <point x="301" y="1563" type="line" smooth="yes"/>
       <point x="301" y="1583"/>
       <point x="311" y="1593"/>
-      <point x="331" y="1593" type="curve" name="hr01" smooth="yes"/>
+      <point x="331" y="1593" type="curve" smooth="yes" name="hr01"/>
       <point x="507" y="1593" type="line" smooth="yes"/>
       <point x="527" y="1593"/>
       <point x="537" y="1583"/>
       <point x="537" y="1563" type="curve" smooth="yes"/>
-      <point x="537" y="1377" type="line" name="sh01" smooth="yes"/>
+      <point x="537" y="1377" type="line" smooth="yes" name="sh01"/>
       <point x="537" y="1357"/>
       <point x="527" y="1347"/>
       <point x="507" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1347" type="line" name="sv02" smooth="yes"/>
+      <point x="726" y="1347" type="line" smooth="yes" name="sv02"/>
       <point x="706" y="1347"/>
       <point x="696" y="1357"/>
-      <point x="696" y="1377" type="curve" name="hr02" smooth="yes"/>
+      <point x="696" y="1377" type="curve" smooth="yes" name="hr02"/>
       <point x="696" y="1563" type="line" smooth="yes"/>
       <point x="696" y="1583"/>
       <point x="706" y="1593"/>
-      <point x="726" y="1593" type="curve" name="at02" smooth="yes"/>
+      <point x="726" y="1593" type="curve" smooth="yes" name="at02"/>
       <point x="902" y="1593" type="line" smooth="yes"/>
       <point x="922" y="1593"/>
       <point x="932" y="1583"/>
       <point x="932" y="1563" type="curve" smooth="yes"/>
-      <point x="932" y="1377" type="line" name="dh03" smooth="yes"/>
+      <point x="932" y="1377" type="line" smooth="yes" name="dh03"/>
       <point x="932" y="1357"/>
       <point x="922" y="1347"/>
-      <point x="902" y="1347" type="curve" name="sv03" smooth="yes"/>
+      <point x="902" y="1347" type="curve" smooth="yes" name="sv03"/>
     </contour>
     <contour>
-      <point x="481" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="481" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="381" y="-29"/>
       <point x="299" y="2"/>
       <point x="242" y="77" type="curve" smooth="yes"/>
       <point x="187" y="148"/>
       <point x="160" y="252"/>
-      <point x="160" y="391" type="curve" name="dh01" smooth="yes"/>
+      <point x="160" y="391" type="curve" smooth="yes" name="dh01"/>
       <point x="160" y="1120" type="line" name="at01"/>
       <point x="453" y="1120" type="line"/>
-      <point x="453" y="436" type="line" name="dh02" smooth="yes"/>
+      <point x="453" y="436" type="line" smooth="yes" name="dh02"/>
       <point x="453" y="355"/>
       <point x="464" y="298"/>
       <point x="487" y="263" type="curve" smooth="yes"/>
       <point x="510" y="228"/>
       <point x="549" y="211"/>
-      <point x="598" y="211" type="curve" name="dv02" smooth="yes"/>
+      <point x="598" y="211" type="curve" smooth="yes" name="dv02"/>
       <point x="649" y="211"/>
       <point x="692" y="230"/>
       <point x="724" y="281" type="curve" smooth="yes"/>
       <point x="753" y="328"/>
       <point x="768" y="394"/>
-      <point x="768" y="477" type="curve" name="sh02" smooth="yes"/>
+      <point x="768" y="477" type="curve" smooth="yes" name="sh02"/>
       <point x="768" y="1120" type="line" name="hr03"/>
       <point x="1061" y="1120" type="line"/>
       <point x="1061" y="0" type="line" name="sh03"/>
diff --git a/source/Hack-Bold.ufo/glyphs/ugrave.glif b/source/Hack-Bold.ufo/glyphs/ugrave.glif
index 4cc420972..b9d7cc5c7 100644
--- a/source/Hack-Bold.ufo/glyphs/ugrave.glif
+++ b/source/Hack-Bold.ufo/glyphs/ugrave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ugrave" format="1">
+<glyph name="ugrave" format="2">
   <advance width="1233"/>
   <unicode hex="00F9"/>
   <outline>
@@ -10,28 +10,28 @@
       <point x="567" y="1270" type="line" name="hr01"/>
     </contour>
     <contour>
-      <point x="481" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="481" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="381" y="-29"/>
       <point x="299" y="2"/>
       <point x="242" y="77" type="curve" smooth="yes"/>
       <point x="187" y="148"/>
       <point x="160" y="252"/>
-      <point x="160" y="391" type="curve" name="sh01" smooth="yes"/>
+      <point x="160" y="391" type="curve" smooth="yes" name="sh01"/>
       <point x="160" y="1120" type="line" name="at01"/>
       <point x="453" y="1120" type="line"/>
-      <point x="453" y="436" type="line" name="hr02" smooth="yes"/>
+      <point x="453" y="436" type="line" smooth="yes" name="hr02"/>
       <point x="453" y="355"/>
       <point x="464" y="298"/>
       <point x="487" y="263" type="curve" smooth="yes"/>
       <point x="510" y="228"/>
       <point x="549" y="211"/>
-      <point x="598" y="211" type="curve" name="dv02" smooth="yes"/>
+      <point x="598" y="211" type="curve" smooth="yes" name="dv02"/>
       <point x="649" y="211"/>
       <point x="692" y="230"/>
       <point x="724" y="281" type="curve" smooth="yes"/>
       <point x="753" y="328"/>
       <point x="768" y="394"/>
-      <point x="768" y="477" type="curve" name="sh03" smooth="yes"/>
+      <point x="768" y="477" type="curve" smooth="yes" name="sh03"/>
       <point x="768" y="1120" type="line" name="at02"/>
       <point x="1061" y="1120" type="line"/>
       <point x="1061" y="0" type="line" name="sh04"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uhorn.glif b/source/Hack-Bold.ufo/glyphs/uhorn.glif
index 0fd451651..a95279113 100644
--- a/source/Hack-Bold.ufo/glyphs/uhorn.glif
+++ b/source/Hack-Bold.ufo/glyphs/uhorn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uhorn" format="1">
+<glyph name="uhorn" format="2">
   <advance width="1233"/>
   <unicode hex="01B0"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="1203" y="1167" type="line" name="sv01"/>
       <point x="1218" y="1094"/>
       <point x="1225" y="1031"/>
-      <point x="1225" y="979" type="curve" name="dh06" smooth="yes"/>
+      <point x="1225" y="979" type="curve" smooth="yes" name="dh06"/>
       <point x="1225" y="823"/>
       <point x="1163" y="739"/>
-      <point x="1048" y="739" type="curve" name="hr01" smooth="yes"/>
+      <point x="1048" y="739" type="curve" smooth="yes" name="hr01"/>
       <point x="1002" y="739"/>
       <point x="956" y="754"/>
       <point x="909" y="783" type="curve"/>
@@ -19,19 +19,19 @@
       <point x="616" y="166" type="line" name="dh03"/>
       <point x="575" y="43"/>
       <point x="477" y="-29"/>
-      <point x="328" y="-29" type="curve" name="sv03" smooth="yes"/>
+      <point x="328" y="-29" type="curve" smooth="yes" name="sv03"/>
       <point x="119" y="-29"/>
       <point x="8" y="112"/>
-      <point x="8" y="391" type="curve" name="dh01" smooth="yes"/>
+      <point x="8" y="391" type="curve" smooth="yes" name="dh01"/>
       <point x="8" y="1120" type="line" name="at01"/>
       <point x="301" y="1120" type="line"/>
-      <point x="301" y="436" type="line" name="dh02" smooth="yes"/>
+      <point x="301" y="436" type="line" smooth="yes" name="dh02"/>
       <point x="301" y="280"/>
       <point x="342" y="211"/>
-      <point x="441" y="211" type="curve" name="sv02" smooth="yes"/>
+      <point x="441" y="211" type="curve" smooth="yes" name="sv02"/>
       <point x="558" y="211"/>
       <point x="616" y="308"/>
-      <point x="616" y="477" type="curve" name="sh01" smooth="yes"/>
+      <point x="616" y="477" type="curve" smooth="yes" name="sh01"/>
       <point x="616" y="1120" type="line" name="at02"/>
       <point x="909" y="1120" type="line" name="hr02"/>
       <point x="909" y="933" type="line"/>
@@ -40,10 +40,10 @@
       <point x="928" y="922" type="curve" smooth="yes"/>
       <point x="951" y="909"/>
       <point x="972" y="903"/>
-      <point x="991" y="903" type="curve" name="dv01" smooth="yes"/>
+      <point x="991" y="903" type="curve" smooth="yes" name="dv01"/>
       <point x="1039" y="903"/>
       <point x="1078" y="938"/>
-      <point x="1078" y="1018" type="curve" name="dh05" smooth="yes"/>
+      <point x="1078" y="1018" type="curve" smooth="yes" name="dh05"/>
       <point x="1078" y="1058"/>
       <point x="1068" y="1115"/>
       <point x="1047" y="1167" type="curve" name="ih01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uhungarumlaut.glif b/source/Hack-Bold.ufo/glyphs/uhungarumlaut.glif
index 5d3090107..5f8cc4c65 100644
--- a/source/Hack-Bold.ufo/glyphs/uhungarumlaut.glif
+++ b/source/Hack-Bold.ufo/glyphs/uhungarumlaut.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uhungarumlaut" format="1">
+<glyph name="uhungarumlaut" format="2">
   <advance width="1233"/>
   <unicode hex="0171"/>
   <outline>
@@ -16,19 +16,19 @@
       <point x="639" y="1270" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="480" y="-29" type="curve" name="sv04" smooth="yes"/>
+      <point x="480" y="-29" type="curve" smooth="yes" name="sv04"/>
       <point x="271" y="-29"/>
       <point x="160" y="112"/>
-      <point x="160" y="391" type="curve" name="sh01" smooth="yes"/>
+      <point x="160" y="391" type="curve" smooth="yes" name="sh01"/>
       <point x="160" y="1120" type="line" name="at01"/>
       <point x="453" y="1120" type="line"/>
-      <point x="453" y="436" type="line" name="hr02" smooth="yes"/>
+      <point x="453" y="436" type="line" smooth="yes" name="hr02"/>
       <point x="453" y="280"/>
       <point x="494" y="211"/>
-      <point x="593" y="211" type="curve" name="sv03" smooth="yes"/>
+      <point x="593" y="211" type="curve" smooth="yes" name="sv03"/>
       <point x="710" y="211"/>
       <point x="768" y="308"/>
-      <point x="768" y="477" type="curve" name="sh03" smooth="yes"/>
+      <point x="768" y="477" type="curve" smooth="yes" name="sh03"/>
       <point x="768" y="1120" type="line" name="at02"/>
       <point x="1061" y="1120" type="line"/>
       <point x="1061" y="0" type="line" name="sh02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/umacron.glif b/source/Hack-Bold.ufo/glyphs/umacron.glif
index f26d0a375..b0ff10926 100644
--- a/source/Hack-Bold.ufo/glyphs/umacron.glif
+++ b/source/Hack-Bold.ufo/glyphs/umacron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="umacron" format="1">
+<glyph name="umacron" format="2">
   <advance width="1233"/>
   <unicode hex="016B"/>
   <outline>
@@ -10,19 +10,19 @@
       <point x="301" y="1320" type="line"/>
     </contour>
     <contour>
-      <point x="480" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="480" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="271" y="-29"/>
       <point x="160" y="112"/>
-      <point x="160" y="391" type="curve" name="sh01" smooth="yes"/>
+      <point x="160" y="391" type="curve" smooth="yes" name="sh01"/>
       <point x="160" y="1120" type="line" name="at01"/>
       <point x="453" y="1120" type="line"/>
-      <point x="453" y="436" type="line" name="sh02" smooth="yes"/>
+      <point x="453" y="436" type="line" smooth="yes" name="sh02"/>
       <point x="453" y="280"/>
       <point x="494" y="211"/>
-      <point x="593" y="211" type="curve" name="sv01" smooth="yes"/>
+      <point x="593" y="211" type="curve" smooth="yes" name="sv01"/>
       <point x="710" y="211"/>
       <point x="768" y="308"/>
-      <point x="768" y="477" type="curve" name="sh03" smooth="yes"/>
+      <point x="768" y="477" type="curve" smooth="yes" name="sh03"/>
       <point x="768" y="1120" type="line" name="at02"/>
       <point x="1061" y="1120" type="line" name="hr02"/>
       <point x="1061" y="0" type="line" name="sh04"/>
diff --git a/source/Hack-Bold.ufo/glyphs/underscore.glif b/source/Hack-Bold.ufo/glyphs/underscore.glif
index 80080a654..bb4427197 100644
--- a/source/Hack-Bold.ufo/glyphs/underscore.glif
+++ b/source/Hack-Bold.ufo/glyphs/underscore.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="underscore" format="1">
+<glyph name="underscore" format="2">
   <advance width="1233"/>
   <unicode hex="005F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/underscoredbl.glif b/source/Hack-Bold.ufo/glyphs/underscoredbl.glif
index 2bac7f055..a4b0d7423 100644
--- a/source/Hack-Bold.ufo/glyphs/underscoredbl.glif
+++ b/source/Hack-Bold.ufo/glyphs/underscoredbl.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="underscoredbl" format="1">
+<glyph name="underscoredbl" format="2">
   <advance width="1233"/>
   <unicode hex="2017"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni00A_0.glif b/source/Hack-Bold.ufo/glyphs/uni00A_0.glif
index c0979d094..a4b993919 100644
--- a/source/Hack-Bold.ufo/glyphs/uni00A_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni00A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni00A0" format="1">
+<glyph name="uni00A0" format="2">
   <advance width="1233"/>
   <unicode hex="00A0"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni00A_D_.glif b/source/Hack-Bold.ufo/glyphs/uni00A_D_.glif
index b3cb5772c..96b1774ba 100644
--- a/source/Hack-Bold.ufo/glyphs/uni00A_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni00A_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni00AD" format="1">
+<glyph name="uni00AD" format="2">
   <advance width="1233"/>
   <unicode hex="00AD"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni00B_2.glif b/source/Hack-Bold.ufo/glyphs/uni00B_2.glif
index be1d48d61..e766350a1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni00B_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni00B_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni00B2" format="1">
+<glyph name="uni00B2" format="2">
   <advance width="1233"/>
   <unicode hex="00B2"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="415" y="1379" type="curve" smooth="yes"/>
       <point x="627" y="1556"/>
       <point x="729" y="1664"/>
-      <point x="729" y="1727" type="curve" name="dh01" smooth="yes"/>
+      <point x="729" y="1727" type="curve" smooth="yes" name="dh01"/>
       <point x="729" y="1750"/>
       <point x="717" y="1781"/>
       <point x="686" y="1802" type="curve" smooth="yes"/>
       <point x="657" y="1822"/>
       <point x="618" y="1832"/>
-      <point x="569" y="1832" type="curve" name="dv02" smooth="yes"/>
+      <point x="569" y="1832" type="curve" smooth="yes" name="dv02"/>
       <point x="487" y="1832"/>
       <point x="405" y="1813"/>
       <point x="299" y="1763" type="curve"/>
@@ -26,13 +26,13 @@
       <point x="445" y="1961" type="curve" smooth="yes"/>
       <point x="482" y="1968"/>
       <point x="535" y="1972"/>
-      <point x="587" y="1972" type="curve" name="dv03" smooth="yes"/>
+      <point x="587" y="1972" type="curve" smooth="yes" name="dv03"/>
       <point x="695" y="1972"/>
       <point x="784" y="1952"/>
       <point x="845" y="1909" type="curve" smooth="yes"/>
       <point x="908" y="1866"/>
       <point x="938" y="1806"/>
-      <point x="938" y="1753" type="curve" name="dh02" smooth="yes"/>
+      <point x="938" y="1753" type="curve" smooth="yes" name="dh02"/>
       <point x="938" y="1656"/>
       <point x="836" y="1527"/>
       <point x="583" y="1330" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni00B_3.glif b/source/Hack-Bold.ufo/glyphs/uni00B_3.glif
index 29f788b4d..76eb36f1f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni00B_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni00B_3.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni00B3" format="1">
+<glyph name="uni00B3" format="2">
   <advance width="1233"/>
   <unicode hex="00B3"/>
   <outline>
     <contour>
-      <point x="588" y="1113" type="curve" name="dv01" smooth="yes"/>
+      <point x="588" y="1113" type="curve" smooth="yes" name="dv01"/>
       <point x="535" y="1113"/>
       <point x="487" y="1117"/>
-      <point x="436" y="1124" type="curve" name="sv01" smooth="yes"/>
+      <point x="436" y="1124" type="curve" smooth="yes" name="sv01"/>
       <point x="385" y="1131"/>
       <point x="336" y="1141"/>
       <point x="287" y="1154" type="curve"/>
@@ -17,47 +17,47 @@
       <point x="430" y="1267" type="curve" smooth="yes"/>
       <point x="481" y="1258"/>
       <point x="536" y="1253"/>
-      <point x="580" y="1253" type="curve" name="dv02" smooth="yes"/>
+      <point x="580" y="1253" type="curve" smooth="yes" name="dv02"/>
       <point x="647" y="1253"/>
       <point x="687" y="1264"/>
-      <point x="719" y="1285" type="curve" name="hr01" smooth="yes"/>
+      <point x="719" y="1285" type="curve" smooth="yes" name="hr01"/>
       <point x="750" y="1306"/>
       <point x="766" y="1336"/>
-      <point x="766" y="1374" type="curve" name="dh01" smooth="yes"/>
+      <point x="766" y="1374" type="curve" smooth="yes" name="dh01"/>
       <point x="766" y="1454"/>
       <point x="697" y="1502"/>
-      <point x="582" y="1502" type="curve" name="dv05" smooth="yes"/>
+      <point x="582" y="1502" type="curve" smooth="yes" name="dv05"/>
       <point x="471" y="1502" type="line"/>
       <point x="471" y="1648" type="line"/>
-      <point x="582" y="1648" type="line" name="dv06" smooth="yes"/>
+      <point x="582" y="1648" type="line" smooth="yes" name="dv06"/>
       <point x="631" y="1648"/>
       <point x="670" y="1656"/>
       <point x="699" y="1673" type="curve" smooth="yes"/>
       <point x="727" y="1690"/>
       <point x="741" y="1713"/>
-      <point x="741" y="1743" type="curve" name="sh01" smooth="yes"/>
+      <point x="741" y="1743" type="curve" smooth="yes" name="sh01"/>
       <point x="741" y="1768"/>
       <point x="731" y="1794"/>
       <point x="702" y="1813" type="curve" smooth="yes"/>
       <point x="675" y="1830"/>
       <point x="641" y="1838"/>
-      <point x="586" y="1838" type="curve" name="dv03" smooth="yes"/>
+      <point x="586" y="1838" type="curve" smooth="yes" name="dv03"/>
       <point x="505" y="1838"/>
       <point x="406" y="1822"/>
       <point x="317" y="1793" type="curve"/>
       <point x="317" y="1945" type="line"/>
       <point x="360" y="1956"/>
       <point x="407" y="1964"/>
-      <point x="456" y="1971" type="curve" name="sv02" smooth="yes"/>
+      <point x="456" y="1971" type="curve" smooth="yes" name="sv02"/>
       <point x="503" y="1978"/>
       <point x="548" y="1980"/>
-      <point x="591" y="1980" type="curve" name="dv04" smooth="yes"/>
+      <point x="591" y="1980" type="curve" smooth="yes" name="dv04"/>
       <point x="692" y="1980"/>
       <point x="783" y="1963"/>
-      <point x="847" y="1922" type="curve" name="hr02" smooth="yes"/>
+      <point x="847" y="1922" type="curve" smooth="yes" name="hr02"/>
       <point x="907" y="1883"/>
       <point x="938" y="1830"/>
-      <point x="938" y="1762" type="curve" name="ih01" smooth="yes"/>
+      <point x="938" y="1762" type="curve" smooth="yes" name="ih01"/>
       <point x="938" y="1665"/>
       <point x="867" y="1603"/>
       <point x="735" y="1580" type="curve" name="iv01"/>
@@ -66,7 +66,7 @@
       <point x="905" y="1509" type="curve" smooth="yes"/>
       <point x="944" y="1472"/>
       <point x="963" y="1423"/>
-      <point x="963" y="1360" type="curve" name="dh02" smooth="yes"/>
+      <point x="963" y="1360" type="curve" smooth="yes" name="dh02"/>
       <point x="963" y="1280"/>
       <point x="931" y="1219"/>
       <point x="867" y="1177" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni00B_5.glif b/source/Hack-Bold.ufo/glyphs/uni00B_5.glif
index bf75ce0d3..3a21401ee 100644
--- a/source/Hack-Bold.ufo/glyphs/uni00B_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni00B_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni00B5" format="1">
+<glyph name="uni00B5" format="2">
   <advance width="1233"/>
   <unicode hex="00B5"/>
   <outline>
@@ -12,22 +12,22 @@
       <point x="482" y="269" type="curve" smooth="yes"/>
       <point x="509" y="232"/>
       <point x="547" y="211"/>
-      <point x="604" y="211" type="curve" name="sv01" smooth="yes"/>
+      <point x="604" y="211" type="curve" smooth="yes" name="sv01"/>
       <point x="658" y="211"/>
       <point x="699" y="230"/>
       <point x="726" y="268" type="curve" smooth="yes"/>
       <point x="753" y="305"/>
       <point x="766" y="363"/>
-      <point x="766" y="440" type="curve" name="ah01" smooth="yes"/>
+      <point x="766" y="440" type="curve" smooth="yes" name="ah01"/>
       <point x="766" y="1120" type="line" name="at01"/>
       <point x="1055" y="1120" type="line"/>
-      <point x="1055" y="344" type="line" name="sh02" smooth="yes"/>
+      <point x="1055" y="344" type="line" smooth="yes" name="sh02"/>
       <point x="1055" y="298"/>
       <point x="1060" y="264"/>
-      <point x="1069" y="242" type="curve" name="sh03" smooth="yes"/>
+      <point x="1069" y="242" type="curve" smooth="yes" name="sh03"/>
       <point x="1078" y="221"/>
       <point x="1092" y="211"/>
-      <point x="1113" y="211" type="curve" name="dv02" smooth="yes"/>
+      <point x="1113" y="211" type="curve" smooth="yes" name="dv02"/>
       <point x="1124" y="211"/>
       <point x="1129" y="213"/>
       <point x="1140" y="217" type="curve" smooth="yes"/>
@@ -40,7 +40,7 @@
       <point x="1088" y="-18" type="curve" smooth="yes"/>
       <point x="1063" y="-25"/>
       <point x="1041" y="-29"/>
-      <point x="1014" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="1014" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="962" y="-29"/>
       <point x="927" y="-14"/>
       <point x="899" y="9" type="curve" smooth="yes"/>
@@ -52,7 +52,7 @@
       <point x="734" y="11" type="curve" smooth="yes"/>
       <point x="697" y="-16"/>
       <point x="655" y="-29"/>
-      <point x="608" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="608" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="569" y="-29"/>
       <point x="536" y="-21"/>
       <point x="509" y="-6" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni00B_9.glif b/source/Hack-Bold.ufo/glyphs/uni00B_9.glif
index db8e5b50c..c9aa7d625 100644
--- a/source/Hack-Bold.ufo/glyphs/uni00B_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni00B_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni00B9" format="1">
+<glyph name="uni00B9" format="2">
   <advance width="1233"/>
   <unicode hex="00B9"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0122.glif b/source/Hack-Bold.ufo/glyphs/uni0122.glif
index 70bb74905..de19e146e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0122.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0122.glif
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0122" format="1">
+<glyph name="uni0122" format="2">
   <advance width="1233"/>
   <unicode hex="0122"/>
   <outline>
     <contour>
-      <point x="719" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="719" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="338" y="-29"/>
       <point x="117" y="251"/>
-      <point x="117" y="747" type="curve" name="dh01" smooth="yes"/>
+      <point x="117" y="747" type="curve" smooth="yes" name="dh01"/>
       <point x="117" y="1247"/>
       <point x="342" y="1520"/>
-      <point x="727" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="727" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="862" y="1520"/>
       <point x="970" y="1488"/>
       <point x="1077" y="1421" type="curve"/>
       <point x="1077" y="1094" type="line" name="ih01"/>
       <point x="994" y="1201"/>
       <point x="887" y="1255"/>
-      <point x="758" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="758" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="535" y="1255"/>
       <point x="424" y="1086"/>
-      <point x="424" y="747" type="curve" name="dh02" smooth="yes"/>
+      <point x="424" y="747" type="curve" smooth="yes" name="dh02"/>
       <point x="424" y="411"/>
       <point x="528" y="236"/>
-      <point x="743" y="236" type="curve" name="dv02" smooth="yes"/>
+      <point x="743" y="236" type="curve" smooth="yes" name="dv02"/>
       <point x="796" y="236"/>
       <point x="844" y="247"/>
       <point x="872" y="270" type="curve" name="sh01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0123.glif b/source/Hack-Bold.ufo/glyphs/uni0123.glif
index d0150fc51..4dfb3575d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0123.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0123.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0123" format="1">
+<glyph name="uni0123" format="2">
   <advance width="1233"/>
   <unicode hex="0123"/>
   <outline>
@@ -10,47 +10,47 @@
       <point x="455" y="1259" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="582" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="582" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="455" y="-424"/>
       <point x="340" y="-406"/>
       <point x="215" y="-369" type="curve"/>
       <point x="215" y="-100" type="line" name="ih03"/>
       <point x="326" y="-161"/>
       <point x="445" y="-190"/>
-      <point x="554" y="-190" type="curve" name="sv02" smooth="yes"/>
+      <point x="554" y="-190" type="curve" smooth="yes" name="sv02"/>
       <point x="726" y="-190"/>
       <point x="803" y="-117"/>
-      <point x="803" y="51" type="curve" name="ah01" smooth="yes"/>
+      <point x="803" y="51" type="curve" smooth="yes" name="ah01"/>
       <point x="803" y="172" type="line" name="iv01"/>
       <point x="744" y="61"/>
       <point x="645" y="14"/>
-      <point x="520" y="14" type="curve" name="hr01" smooth="yes"/>
+      <point x="520" y="14" type="curve" smooth="yes" name="hr01"/>
       <point x="257" y="14"/>
       <point x="98" y="228"/>
-      <point x="98" y="574" type="curve" name="sh02" smooth="yes"/>
+      <point x="98" y="574" type="curve" smooth="yes" name="sh02"/>
       <point x="98" y="926"/>
       <point x="263" y="1149"/>
-      <point x="511" y="1149" type="curve" name="sv04" smooth="yes"/>
+      <point x="511" y="1149" type="curve" smooth="yes" name="sv04"/>
       <point x="644" y="1149"/>
       <point x="746" y="1086"/>
       <point x="803" y="977" type="curve" name="sh04"/>
       <point x="832" y="1120" type="line" name="at02"/>
       <point x="1096" y="1120" type="line"/>
-      <point x="1096" y="84" type="line" name="sh01" smooth="yes"/>
+      <point x="1096" y="84" type="line" smooth="yes" name="sh01"/>
       <point x="1096" y="-274"/>
       <point x="944" y="-424"/>
     </contour>
     <contour>
-      <point x="596" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="596" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="720" y="246"/>
       <point x="803" y="377"/>
-      <point x="803" y="578" type="curve" name="sh05" smooth="yes"/>
+      <point x="803" y="578" type="curve" smooth="yes" name="sh05"/>
       <point x="803" y="778"/>
       <point x="720" y="909"/>
-      <point x="596" y="909" type="curve" name="sv03" smooth="yes"/>
+      <point x="596" y="909" type="curve" smooth="yes" name="sv03"/>
       <point x="472" y="909"/>
       <point x="391" y="779"/>
-      <point x="391" y="577" type="curve" name="sh03" smooth="yes"/>
+      <point x="391" y="577" type="curve" smooth="yes" name="sh03"/>
       <point x="391" y="375"/>
       <point x="472" y="246"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0136.glif b/source/Hack-Bold.ufo/glyphs/uni0136.glif
index 5d7ccc4e6..c9c8abb60 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0136.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0136.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0136" format="1">
+<glyph name="uni0136" format="2">
   <advance width="1233"/>
   <unicode hex="0136"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0137.glif b/source/Hack-Bold.ufo/glyphs/uni0137.glif
index 1cef47df5..fad4e8970 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0137.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0137.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0137" format="1">
+<glyph name="uni0137" format="2">
   <advance width="1233"/>
   <unicode hex="0137"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni013B_.glif b/source/Hack-Bold.ufo/glyphs/uni013B_.glif
index 2ebacb4b7..4b6561eb9 100644
--- a/source/Hack-Bold.ufo/glyphs/uni013B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni013B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni013B" format="1">
+<glyph name="uni013B" format="2">
   <advance width="1233"/>
   <unicode hex="013B"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni013C_.glif b/source/Hack-Bold.ufo/glyphs/uni013C_.glif
index fd254ba9e..e64b8b12d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni013C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni013C_.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni013C" format="1">
+<glyph name="uni013C" format="2">
   <advance width="1233"/>
   <unicode hex="013C"/>
   <outline>
     <contour>
-      <point x="778" y="-8" type="line" name="hr00" smooth="yes"/>
+      <point x="778" y="-8" type="line" smooth="yes" name="hr00"/>
       <point x="499" y="-8"/>
       <point x="387" y="124"/>
-      <point x="387" y="459" type="curve" name="dh01" smooth="yes"/>
+      <point x="387" y="459" type="curve" smooth="yes" name="dh01"/>
       <point x="387" y="1331" type="line" name="sv01"/>
       <point x="90" y="1331" type="line"/>
       <point x="90" y="1556" type="line" name="at01"/>
       <point x="680" y="1556" type="line"/>
-      <point x="680" y="459" type="line" name="dh02" smooth="yes"/>
+      <point x="680" y="459" type="line" smooth="yes" name="dh02"/>
       <point x="680" y="283"/>
       <point x="728" y="217"/>
-      <point x="860" y="217" type="curve" name="sv02" smooth="yes"/>
+      <point x="860" y="217" type="curve" smooth="yes" name="sv02"/>
       <point x="1094" y="217" type="line"/>
       <point x="1094" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0145.glif b/source/Hack-Bold.ufo/glyphs/uni0145.glif
index e1d39ed2b..c83f8deb0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0145.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0145.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0145" format="1">
+<glyph name="uni0145" format="2">
   <advance width="1233"/>
   <unicode hex="0145"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0146.glif b/source/Hack-Bold.ufo/glyphs/uni0146.glif
index 5e3384db0..5b0c4552c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0146.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0146.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0146" format="1">
+<glyph name="uni0146" format="2">
   <advance width="1233"/>
   <unicode hex="0146"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="463" y="952" type="line" name="sh02"/>
       <point x="506" y="1081"/>
       <point x="610" y="1147"/>
-      <point x="753" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="753" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="961" y="1147"/>
       <point x="1071" y="1008"/>
       <point x="1071" y="727" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="780" y="682" type="line" smooth="yes"/>
       <point x="780" y="839"/>
       <point x="737" y="909"/>
-      <point x="640" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="640" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="523" y="909"/>
       <point x="463" y="810"/>
-      <point x="463" y="641" type="curve" name="sh04" smooth="yes"/>
+      <point x="463" y="641" type="curve" smooth="yes" name="sh04"/>
       <point x="463" y="0" type="line" name="ab01"/>
       <point x="172" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0156.glif b/source/Hack-Bold.ufo/glyphs/uni0156.glif
index bc2808178..bcb2a8f50 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0156.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0156.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0156" format="1">
+<glyph name="uni0156" format="2">
   <advance width="1233"/>
   <unicode hex="0156"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="559" y="1493" type="line" smooth="yes"/>
       <point x="934" y="1493"/>
       <point x="1098" y="1366"/>
-      <point x="1098" y="1074" type="curve" name="sh01" smooth="yes"/>
+      <point x="1098" y="1074" type="curve" smooth="yes" name="sh01"/>
       <point x="1098" y="846"/>
       <point x="998" y="732"/>
       <point x="807" y="705" type="curve" name="sh02"/>
@@ -21,19 +21,19 @@
       <point x="708" y="421" type="line" smooth="yes"/>
       <point x="652" y="536"/>
       <point x="597" y="590"/>
-      <point x="522" y="590" type="curve" name="dv02" smooth="yes"/>
+      <point x="522" y="590" type="curve" smooth="yes" name="dv02"/>
       <point x="428" y="590" type="line" name="sh04"/>
       <point x="428" y="0" type="line" name="ab02"/>
       <point x="133" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="567" y="838" type="line" name="dv03" smooth="yes"/>
+      <point x="567" y="838" type="line" smooth="yes" name="dv03"/>
       <point x="728" y="838"/>
       <point x="793" y="896"/>
-      <point x="793" y="1043" type="curve" name="ah01" smooth="yes"/>
+      <point x="793" y="1043" type="curve" smooth="yes" name="ah01"/>
       <point x="793" y="1187"/>
       <point x="730" y="1245"/>
-      <point x="567" y="1245" type="curve" name="sv01" smooth="yes"/>
+      <point x="567" y="1245" type="curve" smooth="yes" name="sv01"/>
       <point x="428" y="1245" type="line" name="sh03"/>
       <point x="428" y="838" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0157.glif b/source/Hack-Bold.ufo/glyphs/uni0157.glif
index 46d87d381..f184720cc 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0157.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0157.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0157" format="1">
+<glyph name="uni0157" format="2">
   <advance width="1233"/>
   <unicode hex="0157"/>
   <outline>
@@ -9,20 +9,20 @@
       <point x="584" y="946" type="line" name="dh02"/>
       <point x="641" y="1075"/>
       <point x="766" y="1147"/>
-      <point x="923" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="923" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1006" y="1147"/>
       <point x="1082" y="1127"/>
       <point x="1151" y="1090" type="curve"/>
       <point x="1151" y="811" type="line" name="iv01"/>
       <point x="1087" y="871"/>
       <point x="1001" y="899"/>
-      <point x="897" y="899" type="curve" name="sv01" smooth="yes"/>
+      <point x="897" y="899" type="curve" smooth="yes" name="sv01"/>
       <point x="766" y="899"/>
       <point x="678" y="852"/>
       <point x="627" y="772" type="curve" smooth="yes"/>
       <point x="595" y="721"/>
       <point x="584" y="663"/>
-      <point x="584" y="516" type="curve" name="sh01" smooth="yes"/>
+      <point x="584" y="516" type="curve" smooth="yes" name="sh01"/>
       <point x="584" y="0" type="line" name="ab01"/>
       <point x="291" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0162.glif b/source/Hack-Bold.ufo/glyphs/uni0162.glif
index 157eb9ab0..ea51352d8 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0162.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0162.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0162" format="1">
+<glyph name="uni0162" format="2">
   <advance width="1233"/>
   <unicode hex="0162"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0163.glif b/source/Hack-Bold.ufo/glyphs/uni0163.glif
index e3515aaac..b87c37b72 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0163.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0163.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0163" format="1">
+<glyph name="uni0163" format="2">
   <advance width="1233"/>
   <unicode hex="0163"/>
   <outline>
@@ -36,7 +36,7 @@
       <point x="543" y="40" type="curve" smooth="yes"/>
       <point x="442" y="84"/>
       <point x="397" y="183"/>
-      <point x="397" y="375" type="curve" name="hr01" smooth="yes"/>
+      <point x="397" y="375" type="curve" smooth="yes" name="hr01"/>
       <point x="397" y="895" type="line"/>
       <point x="111" y="895" type="line"/>
       <point x="111" y="1120" type="line"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni01A_4.glif b/source/Hack-Bold.ufo/glyphs/uni01A_4.glif
index fce6ddd02..b4151d463 100644
--- a/source/Hack-Bold.ufo/glyphs/uni01A_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni01A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni01A4" format="1">
+<glyph name="uni01A4" format="2">
   <advance width="1233"/>
   <unicode hex="01A4"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0218.glif b/source/Hack-Bold.ufo/glyphs/uni0218.glif
index 1c32a35ce..087aa505d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0218.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0218.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0218" format="1">
+<glyph name="uni0218" format="2">
   <advance width="1233"/>
   <unicode hex="0218"/>
   <outline>
     <contour>
-      <point x="584" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="584" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="420" y="-29"/>
       <point x="280" y="4"/>
       <point x="135" y="76" type="curve" name="sh02"/>
       <point x="135" y="381" type="line" name="ih01"/>
       <point x="288" y="270"/>
       <point x="439" y="215"/>
-      <point x="576" y="215" type="curve" name="dv01" smooth="yes"/>
+      <point x="576" y="215" type="curve" smooth="yes" name="dv01"/>
       <point x="729" y="215"/>
       <point x="811" y="283"/>
-      <point x="811" y="399" type="curve" name="ah01" smooth="yes"/>
+      <point x="811" y="399" type="curve" smooth="yes" name="ah01"/>
       <point x="811" y="495"/>
       <point x="755" y="561"/>
       <point x="655" y="600" type="curve" smooth="yes"/>
       <point x="510" y="655" type="line" smooth="yes"/>
       <point x="219" y="764"/>
       <point x="129" y="876"/>
-      <point x="129" y="1075" type="curve" name="sh01" smooth="yes"/>
+      <point x="129" y="1075" type="curve" smooth="yes" name="sh01"/>
       <point x="129" y="1360"/>
       <point x="313" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="753" y="1520"/>
       <point x="890" y="1488"/>
       <point x="1026" y="1427" type="curve"/>
       <point x="1026" y="1139" type="line" name="ih02"/>
       <point x="898" y="1228"/>
       <point x="768" y="1276"/>
-      <point x="639" y="1276" type="curve" name="sv01" smooth="yes"/>
+      <point x="639" y="1276" type="curve" smooth="yes" name="sv01"/>
       <point x="495" y="1276"/>
       <point x="418" y="1216"/>
-      <point x="418" y="1112" type="curve" name="sh03" smooth="yes"/>
+      <point x="418" y="1112" type="curve" smooth="yes" name="sh03"/>
       <point x="418" y="1069"/>
       <point x="432" y="1035"/>
       <point x="460" y="1008" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="760" y="870" type="line" smooth="yes"/>
       <point x="1007" y="777"/>
       <point x="1110" y="641"/>
-      <point x="1110" y="417" type="curve" name="sh04" smooth="yes"/>
+      <point x="1110" y="417" type="curve" smooth="yes" name="sh04"/>
       <point x="1110" y="118"/>
       <point x="925" y="-29"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0219.glif b/source/Hack-Bold.ufo/glyphs/uni0219.glif
index 61b34a890..f56b181fb 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0219.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0219.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0219" format="1">
+<glyph name="uni0219" format="2">
   <advance width="1233"/>
   <unicode hex="0219"/>
   <outline>
     <contour>
-      <point x="613" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="613" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="476" y="-29"/>
       <point x="335" y="-6"/>
       <point x="190" y="41" type="curve"/>
       <point x="190" y="297" type="line" name="ih01"/>
       <point x="319" y="224"/>
       <point x="453" y="184"/>
-      <point x="588" y="184" type="curve" name="dv01" smooth="yes"/>
+      <point x="588" y="184" type="curve" smooth="yes" name="dv01"/>
       <point x="723" y="184"/>
       <point x="791" y="225"/>
-      <point x="791" y="308" type="curve" name="ah01" smooth="yes"/>
+      <point x="791" y="308" type="curve" smooth="yes" name="ah01"/>
       <point x="791" y="345"/>
       <point x="778" y="365"/>
       <point x="753" y="385" type="curve" smooth="yes"/>
@@ -24,20 +24,20 @@
       <point x="494" y="469" type="line" smooth="yes"/>
       <point x="279" y="517"/>
       <point x="172" y="620"/>
-      <point x="172" y="801" type="curve" name="sh01" smooth="yes"/>
+      <point x="172" y="801" type="curve" smooth="yes" name="sh01"/>
       <point x="172" y="1025"/>
       <point x="335" y="1147"/>
-      <point x="623" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="623" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="744" y="1147"/>
       <point x="871" y="1126"/>
       <point x="991" y="1085" type="curve"/>
       <point x="991" y="829" type="line" name="ih02"/>
       <point x="882" y="899"/>
       <point x="766" y="934"/>
-      <point x="645" y="934" type="curve" name="sv01" smooth="yes"/>
+      <point x="645" y="934" type="curve" smooth="yes" name="sv01"/>
       <point x="516" y="934"/>
       <point x="449" y="892"/>
-      <point x="449" y="828" type="curve" name="sh02" smooth="yes"/>
+      <point x="449" y="828" type="curve" smooth="yes" name="sh02"/>
       <point x="449" y="765"/>
       <point x="512" y="727"/>
       <point x="663" y="691" type="curve" smooth="yes"/>
@@ -45,7 +45,7 @@
       <point x="758" y="668" type="line" smooth="yes"/>
       <point x="969" y="617"/>
       <point x="1067" y="511"/>
-      <point x="1067" y="320" type="curve" name="sh03" smooth="yes"/>
+      <point x="1067" y="320" type="curve" smooth="yes" name="sh03"/>
       <point x="1067" y="87"/>
       <point x="916" y="-29"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni021A_.glif b/source/Hack-Bold.ufo/glyphs/uni021A_.glif
index 600e560ef..0fb2de8a8 100644
--- a/source/Hack-Bold.ufo/glyphs/uni021A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni021A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni021A" format="1">
+<glyph name="uni021A" format="2">
   <advance width="1233"/>
   <unicode hex="021A"/>
   <outline>
@@ -8,20 +8,20 @@
       <point x="707" y="0" type="line" name="ih02"/>
       <point x="792" y="-96"/>
       <point x="819" y="-155"/>
-      <point x="819" y="-222" type="curve" name="dh02" smooth="yes"/>
+      <point x="819" y="-222" type="curve" smooth="yes" name="dh02"/>
       <point x="819" y="-339"/>
       <point x="740" y="-401"/>
-      <point x="569" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="569" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="505" y="-401"/>
       <point x="439" y="-392"/>
       <point x="367" y="-375" type="curve"/>
       <point x="367" y="-219" type="line" name="dh01"/>
       <point x="428" y="-242"/>
       <point x="482" y="-254"/>
-      <point x="531" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="531" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="610" y="-254"/>
       <point x="655" y="-221"/>
-      <point x="655" y="-170" type="curve" name="sh02" smooth="yes"/>
+      <point x="655" y="-170" type="curve" smooth="yes" name="sh02"/>
       <point x="655" y="-131"/>
       <point x="628" y="-80"/>
       <point x="567" y="0" type="curve" name="hr01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni021B_.glif b/source/Hack-Bold.ufo/glyphs/uni021B_.glif
index 2938164fd..5ca9c5c35 100644
--- a/source/Hack-Bold.ufo/glyphs/uni021B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni021B_.glif
@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni021B" format="1">
+<glyph name="uni021B" format="2">
   <advance width="1233"/>
   <unicode hex="021B"/>
   <outline>
     <contour>
       <point x="690" y="895" type="line" name="sv01"/>
-      <point x="690" y="361" type="line" name="dh02" smooth="yes"/>
+      <point x="690" y="361" type="line" smooth="yes" name="dh02"/>
       <point x="690" y="312"/>
       <point x="702" y="276"/>
       <point x="727" y="254" type="curve" smooth="yes"/>
       <point x="754" y="230"/>
       <point x="795" y="221"/>
-      <point x="848" y="221" type="curve" name="sv02" smooth="yes"/>
+      <point x="848" y="221" type="curve" smooth="yes" name="sv02"/>
       <point x="1073" y="221" type="line" name="sv03"/>
       <point x="1073" y="-4" type="line" name="ab01"/>
       <point x="900" y="-4" type="line" name="ih02"/>
       <point x="975" y="-93"/>
       <point x="1000" y="-149"/>
-      <point x="1000" y="-213" type="curve" name="sh01" smooth="yes"/>
+      <point x="1000" y="-213" type="curve" smooth="yes" name="sh01"/>
       <point x="1000" y="-330"/>
       <point x="921" y="-392"/>
-      <point x="750" y="-392" type="curve" name="dv01" smooth="yes"/>
+      <point x="750" y="-392" type="curve" smooth="yes" name="dv01"/>
       <point x="686" y="-392"/>
       <point x="620" y="-383"/>
       <point x="548" y="-366" type="curve"/>
       <point x="548" y="-210" type="line" name="ih01"/>
       <point x="609" y="-233"/>
       <point x="663" y="-245"/>
-      <point x="712" y="-245" type="curve" name="dv02" smooth="yes"/>
+      <point x="712" y="-245" type="curve" smooth="yes" name="dv02"/>
       <point x="791" y="-245"/>
       <point x="836" y="-212"/>
-      <point x="836" y="-161" type="curve" name="sh02" smooth="yes"/>
+      <point x="836" y="-161" type="curve" smooth="yes" name="sh02"/>
       <point x="836" y="-125"/>
       <point x="812" y="-77"/>
       <point x="756" y="-2" type="curve" name="ab02"/>
       <point x="625" y="5"/>
       <point x="535" y="32"/>
-      <point x="486" y="77" type="curve" name="hr01" smooth="yes"/>
+      <point x="486" y="77" type="curve" smooth="yes" name="hr01"/>
       <point x="427" y="130"/>
       <point x="397" y="230"/>
-      <point x="397" y="375" type="curve" name="dh01" smooth="yes"/>
+      <point x="397" y="375" type="curve" smooth="yes" name="dh01"/>
       <point x="397" y="895" type="line" name="sv04"/>
       <point x="111" y="895" type="line" name="sv05"/>
       <point x="111" y="1120" type="line" name="at01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni02B_9.glif b/source/Hack-Bold.ufo/glyphs/uni02B_9.glif
index 9f5152d33..3dc2eddff 100644
--- a/source/Hack-Bold.ufo/glyphs/uni02B_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni02B_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02B9" format="1">
+<glyph name="uni02B9" format="2">
   <advance width="1233"/>
   <unicode hex="02B9"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni02B_B_.glif b/source/Hack-Bold.ufo/glyphs/uni02B_B_.glif
index d395fc9bf..bd0a185c9 100644
--- a/source/Hack-Bold.ufo/glyphs/uni02B_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni02B_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02BB" format="1">
+<glyph name="uni02BB" format="2">
   <advance width="1233"/>
   <unicode hex="02BB"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni02B_C_.glif b/source/Hack-Bold.ufo/glyphs/uni02B_C_.glif
index 6d17d34a2..0c59ac2a3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni02B_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni02B_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02BC" format="1">
+<glyph name="uni02BC" format="2">
   <advance width="1233"/>
   <unicode hex="02BC"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni02B_D_.glif b/source/Hack-Bold.ufo/glyphs/uni02B_D_.glif
index e5f4d5ad0..2b8a7d917 100644
--- a/source/Hack-Bold.ufo/glyphs/uni02B_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni02B_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02BD" format="1">
+<glyph name="uni02BD" format="2">
   <advance width="1233"/>
   <unicode hex="02BD"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="754" y="1218" type="line" name="sh01"/>
       <point x="571" y="1219"/>
       <point x="480" y="1307"/>
-      <point x="480" y="1483" type="curve" name="dh01" smooth="yes"/>
+      <point x="480" y="1483" type="curve" smooth="yes" name="dh01"/>
       <point x="480" y="1729" type="line"/>
       <point x="754" y="1729" type="line" name="dv01"/>
       <point x="754" y="1483" type="line" name="dh02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni02B_E_.glif b/source/Hack-Bold.ufo/glyphs/uni02B_E_.glif
index 6e8064e95..a48063ae7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni02B_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni02B_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02BE" format="1">
+<glyph name="uni02BE" format="2">
   <advance width="1233"/>
   <unicode hex="02BE"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="474" y="1140" type="line" name="dh01"/>
       <point x="547" y="1140"/>
       <point x="605" y="1199"/>
-      <point x="605" y="1271" type="curve" name="sh01" smooth="yes"/>
+      <point x="605" y="1271" type="curve" smooth="yes" name="sh01"/>
       <point x="605" y="1343"/>
       <point x="546" y="1402"/>
       <point x="474" y="1402" type="curve" name="sh02"/>
       <point x="474" y="1556" type="line" name="at01"/>
       <point x="631" y="1556"/>
       <point x="759" y="1428"/>
-      <point x="759" y="1271" type="curve" name="hr01" smooth="yes"/>
+      <point x="759" y="1271" type="curve" smooth="yes" name="hr01"/>
       <point x="759" y="1114"/>
       <point x="631" y="986"/>
       <point x="474" y="986" type="curve" name="hr02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni02B_F_.glif b/source/Hack-Bold.ufo/glyphs/uni02B_F_.glif
index 40a10beb9..25f7eaceb 100644
--- a/source/Hack-Bold.ufo/glyphs/uni02B_F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni02B_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02BF" format="1">
+<glyph name="uni02BF" format="2">
   <advance width="1233"/>
   <unicode hex="02BF"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="759" y="986" type="line" name="sh02"/>
       <point x="602" y="986"/>
       <point x="474" y="1114"/>
-      <point x="474" y="1271" type="curve" name="hr01" smooth="yes"/>
+      <point x="474" y="1271" type="curve" smooth="yes" name="hr01"/>
       <point x="474" y="1428"/>
       <point x="602" y="1556"/>
       <point x="759" y="1556" type="curve" name="hr02"/>
       <point x="759" y="1402" type="line" name="sh01"/>
       <point x="687" y="1402"/>
       <point x="628" y="1343"/>
-      <point x="628" y="1271" type="curve" name="dh01" smooth="yes"/>
+      <point x="628" y="1271" type="curve" smooth="yes" name="dh01"/>
       <point x="628" y="1199"/>
       <point x="686" y="1140"/>
       <point x="759" y="1140" type="curve" name="sh03"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni02C_0.glif b/source/Hack-Bold.ufo/glyphs/uni02C_0.glif
index f8bfb3378..b4bbfcdef 100644
--- a/source/Hack-Bold.ufo/glyphs/uni02C_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni02C_0.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02C0" format="1">
+<glyph name="uni02C0" format="2">
   <advance width="1233"/>
   <unicode hex="02C0"/>
   <outline>
     <contour>
       <point x="442" y="1080" type="line" name="hr00"/>
-      <point x="496" y="1080" type="line" name="dv02" smooth="yes"/>
+      <point x="496" y="1080" type="line" smooth="yes" name="dv02"/>
       <point x="579" y="1080"/>
       <point x="637" y="1101"/>
       <point x="670" y="1144" type="curve" smooth="yes"/>
       <point x="692" y="1173"/>
       <point x="703" y="1200"/>
-      <point x="703" y="1226" type="curve" name="ah01" smooth="yes"/>
+      <point x="703" y="1226" type="curve" smooth="yes" name="ah01"/>
       <point x="703" y="1261"/>
       <point x="692" y="1292"/>
       <point x="670" y="1317" type="curve" smooth="yes"/>
       <point x="632" y="1360"/>
       <point x="579" y="1381"/>
-      <point x="510" y="1381" type="curve" name="dv03" smooth="yes"/>
+      <point x="510" y="1381" type="curve" smooth="yes" name="dv03"/>
       <point x="449" y="1381"/>
       <point x="388" y="1365"/>
       <point x="328" y="1333" type="curve"/>
       <point x="328" y="1500" type="line"/>
       <point x="388" y="1525"/>
       <point x="429" y="1539"/>
-      <point x="570" y="1539" type="curve" name="dv04" smooth="yes"/>
+      <point x="570" y="1539" type="curve" smooth="yes" name="dv04"/>
       <point x="754" y="1539"/>
       <point x="905" y="1386"/>
-      <point x="905" y="1226" type="curve" name="sh01" smooth="yes"/>
+      <point x="905" y="1226" type="curve" smooth="yes" name="sh01"/>
       <point x="905" y="1053"/>
       <point x="792" y="970"/>
       <point x="648" y="946" type="curve" name="sh02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni02C_1.glif b/source/Hack-Bold.ufo/glyphs/uni02C_1.glif
index add0cd4e2..ec373ea78 100644
--- a/source/Hack-Bold.ufo/glyphs/uni02C_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni02C_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02C1" format="1">
+<glyph name="uni02C1" format="2">
   <advance width="1233"/>
   <unicode hex="02C1"/>
   <outline>
@@ -7,23 +7,23 @@
       <point x="585" y="946" type="line" name="hr00"/>
       <point x="441" y="970"/>
       <point x="328" y="1053"/>
-      <point x="328" y="1226" type="curve" name="sh01" smooth="yes"/>
+      <point x="328" y="1226" type="curve" smooth="yes" name="sh01"/>
       <point x="328" y="1386"/>
       <point x="479" y="1539"/>
-      <point x="663" y="1539" type="curve" name="dv03" smooth="yes"/>
+      <point x="663" y="1539" type="curve" smooth="yes" name="dv03"/>
       <point x="803" y="1539"/>
       <point x="846" y="1524"/>
       <point x="905" y="1500" type="curve"/>
       <point x="905" y="1333" type="line"/>
       <point x="845" y="1365"/>
       <point x="784" y="1381"/>
-      <point x="723" y="1381" type="curve" name="dv02" smooth="yes"/>
+      <point x="723" y="1381" type="curve" smooth="yes" name="dv02"/>
       <point x="654" y="1381"/>
       <point x="601" y="1360"/>
       <point x="563" y="1317" type="curve" smooth="yes"/>
       <point x="541" y="1292"/>
       <point x="530" y="1261"/>
-      <point x="530" y="1226" type="curve" name="sh02" smooth="yes"/>
+      <point x="530" y="1226" type="curve" smooth="yes" name="sh02"/>
       <point x="530" y="1200"/>
       <point x="541" y="1173"/>
       <point x="563" y="1144" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni02C_8.glif b/source/Hack-Bold.ufo/glyphs/uni02C_8.glif
index 2de1dea10..385ba0f45 100644
--- a/source/Hack-Bold.ufo/glyphs/uni02C_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni02C_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02C8" format="1">
+<glyph name="uni02C8" format="2">
   <advance width="1233"/>
   <unicode hex="02C8"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni02C_9.glif b/source/Hack-Bold.ufo/glyphs/uni02C_9.glif
index b1a92145e..759513511 100644
--- a/source/Hack-Bold.ufo/glyphs/uni02C_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni02C_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02C9" format="1">
+<glyph name="uni02C9" format="2">
   <advance width="1233"/>
   <unicode hex="02C9"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni02C_C_.glif b/source/Hack-Bold.ufo/glyphs/uni02C_C_.glif
index 2f5c0c6ff..d721ae709 100644
--- a/source/Hack-Bold.ufo/glyphs/uni02C_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni02C_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02CC" format="1">
+<glyph name="uni02CC" format="2">
   <advance width="1233"/>
   <unicode hex="02CC"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni02C_D_.glif b/source/Hack-Bold.ufo/glyphs/uni02C_D_.glif
index e4365491b..304dc010c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni02C_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni02C_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02CD" format="1">
+<glyph name="uni02CD" format="2">
   <advance width="1233"/>
   <unicode hex="02CD"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni02C_E_.glif b/source/Hack-Bold.ufo/glyphs/uni02C_E_.glif
index b4201b2d3..3741c80dc 100644
--- a/source/Hack-Bold.ufo/glyphs/uni02C_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni02C_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02CE" format="1">
+<glyph name="uni02CE" format="2">
   <advance width="1233"/>
   <unicode hex="02CE"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni02C_F_.glif b/source/Hack-Bold.ufo/glyphs/uni02C_F_.glif
index 5ee98d64b..f25e1a78e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni02C_F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni02C_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02CF" format="1">
+<glyph name="uni02CF" format="2">
   <advance width="1233"/>
   <unicode hex="02CF"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni02D_0.glif b/source/Hack-Bold.ufo/glyphs/uni02D_0.glif
index f8046fec0..4319e7550 100644
--- a/source/Hack-Bold.ufo/glyphs/uni02D_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni02D_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02D0" format="1">
+<glyph name="uni02D0" format="2">
   <advance width="1233"/>
   <unicode hex="02D0"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni02D_1.glif b/source/Hack-Bold.ufo/glyphs/uni02D_1.glif
index 66375d0b4..a6e85e41a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni02D_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni02D_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02D1" format="1">
+<glyph name="uni02D1" format="2">
   <advance width="1233"/>
   <unicode hex="02D1"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0302.glif b/source/Hack-Bold.ufo/glyphs/uni0302.glif
index 6fe520cd7..754ddf54b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0302.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0302.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0302" format="1">
-  <advance width="0"/>
+<glyph name="uni0302" format="2">
   <unicode hex="0302"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0304.case.glif b/source/Hack-Bold.ufo/glyphs/uni0304.case.glif
index 210896b63..6a378d95e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0304.case.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0304.case.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0304.case" format="1">
-  <advance width="0"/>
+<glyph name="uni0304.case" format="2">
   <outline>
     <contour>
       <point x="-932" y="1870" type="line" name="hr00"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0304.glif b/source/Hack-Bold.ufo/glyphs/uni0304.glif
index 6f12e15ef..52a29780c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0304.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0304.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0304" format="1">
-  <advance width="0"/>
+<glyph name="uni0304" format="2">
   <unicode hex="0304"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0305.glif b/source/Hack-Bold.ufo/glyphs/uni0305.glif
index bf50bdfa6..8b2955304 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0305.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0305.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0305" format="1">
-  <advance width="0"/>
+<glyph name="uni0305" format="2">
   <unicode hex="0305"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0306.case.glif b/source/Hack-Bold.ufo/glyphs/uni0306.case.glif
index 29b0d28d5..8c5a8b4ff 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0306.case.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0306.case.glif
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0306.case" format="1">
-  <advance width="0"/>
+<glyph name="uni0306.case" format="2">
   <outline>
     <contour>
-      <point x="-617" y="1635" type="curve" name="dv01" smooth="yes"/>
+      <point x="-617" y="1635" type="curve" smooth="yes" name="dv01"/>
       <point x="-814" y="1635"/>
       <point x="-932" y="1726"/>
       <point x="-952" y="1899" type="curve" name="sv01"/>
       <point x="-811" y="1899" type="line"/>
       <point x="-784" y="1818"/>
       <point x="-719" y="1778"/>
-      <point x="-617" y="1778" type="curve" name="hr01" smooth="yes"/>
+      <point x="-617" y="1778" type="curve" smooth="yes" name="hr01"/>
       <point x="-515" y="1778"/>
       <point x="-451" y="1818"/>
       <point x="-424" y="1899" type="curve" name="hr02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0306.glif b/source/Hack-Bold.ufo/glyphs/uni0306.glif
index 41a172755..44d84ed85 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0306.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0306.glif
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0306" format="1">
-  <advance width="0"/>
+<glyph name="uni0306" format="2">
   <unicode hex="0306"/>
   <outline>
     <contour>
-      <point x="-617" y="1309" type="curve" name="dv01" smooth="yes"/>
+      <point x="-617" y="1309" type="curve" smooth="yes" name="dv01"/>
       <point x="-826" y="1309"/>
       <point x="-944" y="1413"/>
       <point x="-952" y="1606" type="curve" name="sv01"/>
       <point x="-811" y="1606" type="line"/>
       <point x="-796" y="1514"/>
       <point x="-729" y="1462"/>
-      <point x="-617" y="1462" type="curve" name="hr01" smooth="yes"/>
+      <point x="-617" y="1462" type="curve" smooth="yes" name="hr01"/>
       <point x="-505" y="1462"/>
       <point x="-439" y="1513"/>
       <point x="-424" y="1606" type="curve" name="hr02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0307.case.glif b/source/Hack-Bold.ufo/glyphs/uni0307.case.glif
index 7709a9f12..da25ba32b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0307.case.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0307.case.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0307.case" format="1">
-  <advance width="0"/>
+<glyph name="uni0307.case" format="2">
   <outline>
     <contour>
       <point x="-754" y="1899" type="line" name="hr00"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0307.glif b/source/Hack-Bold.ufo/glyphs/uni0307.glif
index 61b43fd7c..2e69f7e1b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0307.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0307.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0307" format="1">
-  <advance width="0"/>
+<glyph name="uni0307" format="2">
   <unicode hex="0307"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0308.glif b/source/Hack-Bold.ufo/glyphs/uni0308.glif
index 4666ba54a..b2067f4da 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0308.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0308.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0308" format="1">
-  <advance width="0"/>
+<glyph name="uni0308" format="2">
   <unicode hex="0308"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni030A_.glif b/source/Hack-Bold.ufo/glyphs/uni030A_.glif
index 3f732b82d..551af6d0d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni030A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni030A_.glif
@@ -1,33 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni030A" format="1">
-  <advance width="0"/>
+<glyph name="uni030A" format="2">
   <unicode hex="030A"/>
   <outline>
     <contour>
-      <point x="-617" y="1249" type="curve" name="hr00" smooth="yes"/>
+      <point x="-617" y="1249" type="curve" smooth="yes" name="hr00"/>
       <point x="-773" y="1249"/>
       <point x="-901" y="1377"/>
-      <point x="-901" y="1534" type="curve" name="sh01" smooth="yes"/>
+      <point x="-901" y="1534" type="curve" smooth="yes" name="sh01"/>
       <point x="-901" y="1691"/>
       <point x="-773" y="1819"/>
-      <point x="-617" y="1819" type="curve" name="dv03" smooth="yes"/>
+      <point x="-617" y="1819" type="curve" smooth="yes" name="dv03"/>
       <point x="-457" y="1819"/>
       <point x="-332" y="1691"/>
-      <point x="-332" y="1534" type="curve" name="sh02" smooth="yes"/>
+      <point x="-332" y="1534" type="curve" smooth="yes" name="sh02"/>
       <point x="-332" y="1377"/>
       <point x="-457" y="1249"/>
     </contour>
     <contour>
-      <point x="-617" y="1403" type="curve" name="dv01" smooth="yes"/>
+      <point x="-617" y="1403" type="curve" smooth="yes" name="dv01"/>
       <point x="-545" y="1403"/>
       <point x="-485" y="1462"/>
-      <point x="-485" y="1534" type="curve" name="ah01" smooth="yes"/>
+      <point x="-485" y="1534" type="curve" smooth="yes" name="ah01"/>
       <point x="-485" y="1606"/>
       <point x="-545" y="1665"/>
-      <point x="-617" y="1665" type="curve" name="dv02" smooth="yes"/>
+      <point x="-617" y="1665" type="curve" smooth="yes" name="dv02"/>
       <point x="-689" y="1665"/>
       <point x="-748" y="1606"/>
-      <point x="-748" y="1534" type="curve" name="sh03" smooth="yes"/>
+      <point x="-748" y="1534" type="curve" smooth="yes" name="sh03"/>
       <point x="-748" y="1461"/>
       <point x="-689" y="1403"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni030B_.case.glif b/source/Hack-Bold.ufo/glyphs/uni030B_.case.glif
index 288b5480a..a793daebd 100644
--- a/source/Hack-Bold.ufo/glyphs/uni030B_.case.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni030B_.case.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni030B.case" format="1">
-  <advance width="0"/>
+<glyph name="uni030B.case" format="2">
   <outline>
     <contour>
       <point x="-770" y="1899" type="line" name="hr00"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni030B_.glif b/source/Hack-Bold.ufo/glyphs/uni030B_.glif
index 06916e6d5..1d6aec067 100644
--- a/source/Hack-Bold.ufo/glyphs/uni030B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni030B_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni030B" format="1">
-  <advance width="0"/>
+<glyph name="uni030B" format="2">
   <unicode hex="030B"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni030C_.glif b/source/Hack-Bold.ufo/glyphs/uni030C_.glif
index 6aff92263..237af9e3c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni030C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni030C_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni030C" format="1">
-  <advance width="0"/>
+<glyph name="uni030C" format="2">
   <unicode hex="030C"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni030D_.glif b/source/Hack-Bold.ufo/glyphs/uni030D_.glif
index d2a3982c7..4ca270705 100644
--- a/source/Hack-Bold.ufo/glyphs/uni030D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni030D_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni030D" format="1">
-  <advance width="0"/>
+<glyph name="uni030D" format="2">
   <unicode hex="030D"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni030E_.glif b/source/Hack-Bold.ufo/glyphs/uni030E_.glif
index 433aac75d..ecdc2e021 100644
--- a/source/Hack-Bold.ufo/glyphs/uni030E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni030E_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni030E" format="1">
-  <advance width="0"/>
+<glyph name="uni030E" format="2">
   <unicode hex="030E"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni030F_.case.glif b/source/Hack-Bold.ufo/glyphs/uni030F_.case.glif
index 99d094fab..3b17d17b9 100644
--- a/source/Hack-Bold.ufo/glyphs/uni030F_.case.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni030F_.case.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni030F.case" format="1">
-  <advance width="0"/>
+<glyph name="uni030F.case" format="2">
   <outline>
     <contour>
       <point x="-1122" y="1899" type="line" name="hr00"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni030F_.glif b/source/Hack-Bold.ufo/glyphs/uni030F_.glif
index bdc2fcb59..ae8cefa15 100644
--- a/source/Hack-Bold.ufo/glyphs/uni030F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni030F_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni030F" format="1">
-  <advance width="0"/>
+<glyph name="uni030F" format="2">
   <unicode hex="030F"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0310.glif b/source/Hack-Bold.ufo/glyphs/uni0310.glif
index b54fe6e67..6fe59854e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0310.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0310.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0310" format="1">
-  <advance width="0"/>
+<glyph name="uni0310" format="2">
   <unicode hex="0310"/>
   <outline>
     <contour>
@@ -10,14 +9,14 @@
       <point x="-754" y="1555" type="line" name="hr01"/>
     </contour>
     <contour>
-      <point x="-617" y="1309" type="curve" name="hr02" smooth="yes"/>
+      <point x="-617" y="1309" type="curve" smooth="yes" name="hr02"/>
       <point x="-826" y="1309"/>
       <point x="-944" y="1413"/>
       <point x="-952" y="1606" type="curve" name="sh01"/>
       <point x="-811" y="1606" type="line"/>
       <point x="-796" y="1514"/>
       <point x="-729" y="1462"/>
-      <point x="-617" y="1462" type="curve" name="hr03" smooth="yes"/>
+      <point x="-617" y="1462" type="curve" smooth="yes" name="hr03"/>
       <point x="-505" y="1462"/>
       <point x="-439" y="1513"/>
       <point x="-424" y="1606" type="curve" name="sv01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0311.case.glif b/source/Hack-Bold.ufo/glyphs/uni0311.case.glif
index abd4b5b6a..524c1f13a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0311.case.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0311.case.glif
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0311.case" format="1">
-  <advance width="0"/>
+<glyph name="uni0311.case" format="2">
   <outline>
     <contour>
       <point x="-952" y="1635" type="line" name="sv01"/>
       <point x="-932" y="1808"/>
       <point x="-814" y="1899"/>
-      <point x="-617" y="1899" type="curve" name="hr01" smooth="yes"/>
+      <point x="-617" y="1899" type="curve" smooth="yes" name="hr01"/>
       <point x="-418" y="1899"/>
       <point x="-301" y="1808"/>
       <point x="-281" y="1635" type="curve" name="hr02"/>
       <point x="-424" y="1635" type="line" name="dv01"/>
       <point x="-451" y="1716"/>
       <point x="-515" y="1756"/>
-      <point x="-617" y="1756" type="curve" name="sv02" smooth="yes"/>
+      <point x="-617" y="1756" type="curve" smooth="yes" name="sv02"/>
       <point x="-719" y="1756"/>
       <point x="-784" y="1716"/>
       <point x="-811" y="1635" type="curve" name="sv03"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0311.glif b/source/Hack-Bold.ufo/glyphs/uni0311.glif
index b03ed327a..32a0f4ade 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0311.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0311.glif
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0311" format="1">
-  <advance width="0"/>
+<glyph name="uni0311" format="2">
   <unicode hex="0311"/>
   <outline>
     <contour>
       <point x="-952" y="1309" type="line" name="sv01"/>
       <point x="-944" y="1502"/>
       <point x="-826" y="1606"/>
-      <point x="-617" y="1606" type="curve" name="hr01" smooth="yes"/>
+      <point x="-617" y="1606" type="curve" smooth="yes" name="hr01"/>
       <point x="-406" y="1606"/>
       <point x="-289" y="1502"/>
       <point x="-281" y="1309" type="curve" name="hr02"/>
       <point x="-424" y="1309" type="line" name="dv01"/>
       <point x="-439" y="1402"/>
       <point x="-505" y="1453"/>
-      <point x="-617" y="1453" type="curve" name="sv02" smooth="yes"/>
+      <point x="-617" y="1453" type="curve" smooth="yes" name="sv02"/>
       <point x="-729" y="1453"/>
       <point x="-796" y="1401"/>
       <point x="-811" y="1309" type="curve" name="sv03"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0312.glif b/source/Hack-Bold.ufo/glyphs/uni0312.glif
index da712793d..edfc18f09 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0312.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0312.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0312" format="1">
-  <advance width="0"/>
+<glyph name="uni0312" format="2">
   <unicode hex="0312"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0313.glif b/source/Hack-Bold.ufo/glyphs/uni0313.glif
index 9aad91e58..e2cea6d31 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0313.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0313.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0313" format="1">
-  <advance width="0"/>
+<glyph name="uni0313" format="2">
   <unicode hex="0313"/>
   <outline>
     <contour>
@@ -11,7 +10,7 @@
       <point x="-753" y="1483" type="line" name="dh01"/>
       <point x="-753" y="1729" type="line" name="dv02"/>
       <point x="-479" y="1729" type="line"/>
-      <point x="-479" y="1483" type="line" name="dh02" smooth="yes"/>
+      <point x="-479" y="1483" type="line" smooth="yes" name="dh02"/>
       <point x="-479" y="1307"/>
       <point x="-570" y="1219"/>
       <point x="-753" y="1218" type="curve" name="dv01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0314.glif b/source/Hack-Bold.ufo/glyphs/uni0314.glif
index 4273a7062..606b7c2e6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0314.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0314.glif
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0314" format="1">
-  <advance width="0"/>
+<glyph name="uni0314" format="2">
   <unicode hex="0314"/>
   <outline>
     <contour>
       <point x="-479" y="1218" type="line" name="sh01"/>
       <point x="-662" y="1219"/>
       <point x="-753" y="1307"/>
-      <point x="-753" y="1483" type="curve" name="dh01" smooth="yes"/>
+      <point x="-753" y="1483" type="curve" smooth="yes" name="dh01"/>
       <point x="-753" y="1729" type="line"/>
       <point x="-479" y="1729" type="line" name="dv01"/>
       <point x="-479" y="1483" type="line" name="dh02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0315.glif b/source/Hack-Bold.ufo/glyphs/uni0315.glif
index 362ea3056..a054e8087 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0315.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0315.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0315" format="1">
-  <advance width="0"/>
+<glyph name="uni0315" format="2">
   <unicode hex="0315"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0316.glif b/source/Hack-Bold.ufo/glyphs/uni0316.glif
index 86295110c..50e84113f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0316.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0316.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0316" format="1">
-  <advance width="0"/>
+<glyph name="uni0316" format="2">
   <unicode hex="0316"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0317.glif b/source/Hack-Bold.ufo/glyphs/uni0317.glif
index 92c827ab9..e3b61fa8e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0317.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0317.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0317" format="1">
-  <advance width="0"/>
+<glyph name="uni0317" format="2">
   <unicode hex="0317"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0318.glif b/source/Hack-Bold.ufo/glyphs/uni0318.glif
index ebe4aed0d..62afbb2a5 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0318.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0318.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0318" format="1">
-  <advance width="0"/>
+<glyph name="uni0318" format="2">
   <unicode hex="0318"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0319.glif b/source/Hack-Bold.ufo/glyphs/uni0319.glif
index 17160f8fc..a9bc38e1c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0319.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0319.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0319" format="1">
-  <advance width="0"/>
+<glyph name="uni0319" format="2">
   <unicode hex="0319"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni031A_.glif b/source/Hack-Bold.ufo/glyphs/uni031A_.glif
index b9fa1b867..b3cfab121 100644
--- a/source/Hack-Bold.ufo/glyphs/uni031A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni031A_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni031A" format="1">
-  <advance width="0"/>
+<glyph name="uni031A" format="2">
   <unicode hex="031A"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni031B_.glif b/source/Hack-Bold.ufo/glyphs/uni031B_.glif
index 8b73bddfa..6eb08901c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni031B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni031B_.glif
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni031B" format="1">
-  <advance width="0"/>
+<glyph name="uni031B" format="2">
   <unicode hex="031B"/>
   <outline>
     <contour>
-      <point x="-594" y="739" type="curve" name="dv01" smooth="yes"/>
+      <point x="-594" y="739" type="curve" smooth="yes" name="dv01"/>
       <point x="-666" y="739"/>
       <point x="-736" y="774"/>
       <point x="-817" y="850" type="curve"/>
@@ -14,17 +13,17 @@
       <point x="-713" y="922" type="curve" smooth="yes"/>
       <point x="-690" y="909"/>
       <point x="-669" y="903"/>
-      <point x="-651" y="903" type="curve" name="dv02" smooth="yes"/>
+      <point x="-651" y="903" type="curve" smooth="yes" name="dv02"/>
       <point x="-599" y="903"/>
       <point x="-563" y="946"/>
-      <point x="-563" y="1011" type="curve" name="hr01" smooth="yes"/>
+      <point x="-563" y="1011" type="curve" smooth="yes" name="hr01"/>
       <point x="-563" y="1063"/>
       <point x="-573" y="1115"/>
       <point x="-594" y="1167" type="curve" name="ih01"/>
       <point x="-438" y="1167" type="line"/>
       <point x="-423" y="1096"/>
       <point x="-416" y="1032"/>
-      <point x="-416" y="977" type="curve" name="dh02" smooth="yes"/>
+      <point x="-416" y="977" type="curve" smooth="yes" name="dh02"/>
       <point x="-416" y="824"/>
       <point x="-478" y="739"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni031C_.glif b/source/Hack-Bold.ufo/glyphs/uni031C_.glif
index d9c1d461e..06fac676b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni031C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni031C_.glif
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni031C" format="1">
-  <advance width="0"/>
+<glyph name="uni031C" format="2">
   <unicode hex="031C"/>
   <outline>
     <contour>
       <point x="-507" y="-502" type="line" name="sh02"/>
       <point x="-630" y="-502"/>
       <point x="-726" y="-405"/>
-      <point x="-726" y="-282" type="curve" name="hr01" smooth="yes"/>
+      <point x="-726" y="-282" type="curve" smooth="yes" name="hr01"/>
       <point x="-726" y="-159"/>
       <point x="-630" y="-63"/>
       <point x="-507" y="-63" type="curve" name="hr02"/>
       <point x="-507" y="-195" type="line" name="sh01"/>
       <point x="-556" y="-195"/>
       <point x="-594" y="-233"/>
-      <point x="-594" y="-282" type="curve" name="dh01" smooth="yes"/>
+      <point x="-594" y="-282" type="curve" smooth="yes" name="dh01"/>
       <point x="-594" y="-333"/>
       <point x="-556" y="-370"/>
       <point x="-507" y="-370" type="curve" name="sh03"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni031D_.glif b/source/Hack-Bold.ufo/glyphs/uni031D_.glif
index c62451272..1ab98dd64 100644
--- a/source/Hack-Bold.ufo/glyphs/uni031D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni031D_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni031D" format="1">
-  <advance width="0"/>
+<glyph name="uni031D" format="2">
   <unicode hex="031D"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni031E_.glif b/source/Hack-Bold.ufo/glyphs/uni031E_.glif
index 94e50cec3..2e6047f3c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni031E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni031E_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni031E" format="1">
-  <advance width="0"/>
+<glyph name="uni031E" format="2">
   <unicode hex="031E"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni031F_.glif b/source/Hack-Bold.ufo/glyphs/uni031F_.glif
index 331dc161f..d9862242d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni031F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni031F_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni031F" format="1">
-  <advance width="0"/>
+<glyph name="uni031F" format="2">
   <unicode hex="031F"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0320.glif b/source/Hack-Bold.ufo/glyphs/uni0320.glif
index 75037faf7..e2b21da60 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0320.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0320.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0320" format="1">
-  <advance width="0"/>
+<glyph name="uni0320" format="2">
   <unicode hex="0320"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0321.glif b/source/Hack-Bold.ufo/glyphs/uni0321.glif
index 119d77e6e..b7b0adffa 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0321.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0321.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0321" format="1">
-  <advance width="0"/>
+<glyph name="uni0321" format="2">
   <unicode hex="0321"/>
   <outline>
     <contour>
@@ -8,13 +7,13 @@
       <point x="-635" y="-199" type="line" smooth="yes"/>
       <point x="-504" y="-199"/>
       <point x="-453" y="-137"/>
-      <point x="-453" y="43" type="curve" name="sh01" smooth="yes"/>
+      <point x="-453" y="43" type="curve" smooth="yes" name="sh01"/>
       <point x="-453" y="168" type="line" name="av01"/>
       <point x="-162" y="168" type="line" name="hr01"/>
-      <point x="-162" y="43" type="line" name="dh02" smooth="yes"/>
+      <point x="-162" y="43" type="line" smooth="yes" name="dh02"/>
       <point x="-162" y="-290"/>
       <point x="-273" y="-424"/>
-      <point x="-553" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="-553" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="-674" y="-424" type="line" name="hr02"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0322.glif b/source/Hack-Bold.ufo/glyphs/uni0322.glif
index 5a25db5dc..544cc59b9 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0322.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0322.glif
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0322" format="1">
-  <advance width="0"/>
+<glyph name="uni0322" format="2">
   <unicode hex="0322"/>
   <outline>
     <contour>
-      <point x="-675" y="-426" type="line" name="ab01" smooth="yes"/>
+      <point x="-675" y="-426" type="line" smooth="yes" name="ab01"/>
       <point x="-955" y="-426"/>
       <point x="-1066" y="-292"/>
-      <point x="-1066" y="41" type="curve" name="dh01" smooth="yes"/>
+      <point x="-1066" y="41" type="curve" smooth="yes" name="dh01"/>
       <point x="-1066" y="166" type="line" name="av01"/>
       <point x="-775" y="166" type="line" name="hr01"/>
-      <point x="-775" y="41" type="line" name="dh02" smooth="yes"/>
+      <point x="-775" y="41" type="line" smooth="yes" name="dh02"/>
       <point x="-775" y="-139"/>
       <point x="-724" y="-201"/>
-      <point x="-593" y="-201" type="curve" name="sv01" smooth="yes"/>
+      <point x="-593" y="-201" type="curve" smooth="yes" name="sv01"/>
       <point x="-554" y="-201" type="line" name="hr02"/>
       <point x="-554" y="-426" type="line" name="ab02"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0324.glif b/source/Hack-Bold.ufo/glyphs/uni0324.glif
index 94604909e..72b4045dd 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0324.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0324.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0324" format="1">
-  <advance width="0"/>
+<glyph name="uni0324" format="2">
   <unicode hex="0324"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0325.glif b/source/Hack-Bold.ufo/glyphs/uni0325.glif
index 0e6c970f6..b10f89750 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0325.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0325.glif
@@ -1,33 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0325" format="1">
-  <advance width="0"/>
+<glyph name="uni0325" format="2">
   <unicode hex="0325"/>
   <outline>
     <contour>
-      <point x="-617" y="-502" type="curve" name="hr00" smooth="yes"/>
+      <point x="-617" y="-502" type="curve" smooth="yes" name="hr00"/>
       <point x="-740" y="-502"/>
       <point x="-836" y="-405"/>
-      <point x="-836" y="-282" type="curve" name="sh01" smooth="yes"/>
+      <point x="-836" y="-282" type="curve" smooth="yes" name="sh01"/>
       <point x="-836" y="-159"/>
       <point x="-740" y="-63"/>
-      <point x="-617" y="-63" type="curve" name="dv02" smooth="yes"/>
+      <point x="-617" y="-63" type="curve" smooth="yes" name="dv02"/>
       <point x="-493" y="-63"/>
       <point x="-397" y="-159"/>
-      <point x="-397" y="-282" type="curve" name="sh02" smooth="yes"/>
+      <point x="-397" y="-282" type="curve" smooth="yes" name="sh02"/>
       <point x="-397" y="-405"/>
       <point x="-493" y="-502"/>
     </contour>
     <contour>
-      <point x="-617" y="-370" type="curve" name="sv01" smooth="yes"/>
+      <point x="-617" y="-370" type="curve" smooth="yes" name="sv01"/>
       <point x="-568" y="-370"/>
       <point x="-529" y="-331"/>
-      <point x="-529" y="-282" type="curve" name="ah01" smooth="yes"/>
+      <point x="-529" y="-282" type="curve" smooth="yes" name="ah01"/>
       <point x="-529" y="-234"/>
       <point x="-568" y="-195"/>
-      <point x="-617" y="-195" type="curve" name="dv01" smooth="yes"/>
+      <point x="-617" y="-195" type="curve" smooth="yes" name="dv01"/>
       <point x="-666" y="-195"/>
       <point x="-704" y="-233"/>
-      <point x="-704" y="-282" type="curve" name="sh03" smooth="yes"/>
+      <point x="-704" y="-282" type="curve" smooth="yes" name="sh03"/>
       <point x="-704" y="-333"/>
       <point x="-666" y="-370"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0326.glif b/source/Hack-Bold.ufo/glyphs/uni0326.glif
index 7fd57fa73..f8e257115 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0326.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0326.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0326" format="1">
-  <advance width="0"/>
+<glyph name="uni0326" format="2">
   <unicode hex="0326"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0327.glif b/source/Hack-Bold.ufo/glyphs/uni0327.glif
index 79305cda8..ffc8c3015 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0327.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0327.glif
@@ -1,27 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0327" format="1">
-  <advance width="0"/>
+<glyph name="uni0327" format="2">
   <unicode hex="0327"/>
   <outline>
     <contour>
-      <point x="-664" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="-664" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="-728" y="-401"/>
       <point x="-794" y="-392"/>
       <point x="-866" y="-375" type="curve"/>
       <point x="-866" y="-219" type="line" name="dh01"/>
       <point x="-805" y="-242"/>
       <point x="-750" y="-254"/>
-      <point x="-701" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="-701" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="-624" y="-254"/>
       <point x="-578" y="-221"/>
-      <point x="-578" y="-168" type="curve" name="sh01" smooth="yes"/>
+      <point x="-578" y="-168" type="curve" smooth="yes" name="sh01"/>
       <point x="-578" y="-133"/>
       <point x="-605" y="-80"/>
       <point x="-666" y="0" type="curve" name="hr01"/>
       <point x="-526" y="0" type="line"/>
       <point x="-450" y="-84"/>
       <point x="-414" y="-151"/>
-      <point x="-414" y="-215" type="curve" name="dh02" smooth="yes"/>
+      <point x="-414" y="-215" type="curve" smooth="yes" name="dh02"/>
       <point x="-414" y="-343"/>
       <point x="-493" y="-401"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0328.glif b/source/Hack-Bold.ufo/glyphs/uni0328.glif
index 4395a6d44..0092b1584 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0328.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0328.glif
@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0328" format="1">
-  <advance width="0"/>
+<glyph name="uni0328" format="2">
   <unicode hex="0328"/>
   <outline>
     <contour>
-      <point x="-593" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="-593" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="-746" y="-401"/>
       <point x="-831" y="-339"/>
-      <point x="-831" y="-223" type="curve" name="dh01" smooth="yes"/>
+      <point x="-831" y="-223" type="curve" smooth="yes" name="dh01"/>
       <point x="-831" y="-151"/>
       <point x="-796" y="-81"/>
       <point x="-720" y="0" type="curve"/>
       <point x="-579" y="0" type="line" name="ih01"/>
       <point x="-614" y="-47"/>
       <point x="-637" y="-82"/>
-      <point x="-650" y="-106" type="curve" name="hr01" smooth="yes"/>
+      <point x="-650" y="-106" type="curve" smooth="yes" name="hr01"/>
       <point x="-663" y="-129"/>
       <point x="-669" y="-149"/>
-      <point x="-669" y="-166" type="curve" name="dh02" smooth="yes"/>
+      <point x="-669" y="-166" type="curve" smooth="yes" name="dh02"/>
       <point x="-669" y="-218"/>
       <point x="-626" y="-254"/>
-      <point x="-558" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="-558" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="-507" y="-254"/>
       <point x="-455" y="-244"/>
       <point x="-403" y="-223" type="curve" name="sh01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0329.glif b/source/Hack-Bold.ufo/glyphs/uni0329.glif
index 736dde59e..e814791a2 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0329.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0329.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0329" format="1">
-  <advance width="0"/>
+<glyph name="uni0329" format="2">
   <unicode hex="0329"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni032A_.glif b/source/Hack-Bold.ufo/glyphs/uni032A_.glif
index d0b4831a4..32b8c923b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni032A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni032A_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni032A" format="1">
-  <advance width="0"/>
+<glyph name="uni032A" format="2">
   <unicode hex="032A"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni032B_.glif b/source/Hack-Bold.ufo/glyphs/uni032B_.glif
index e1eb7021b..e8e664348 100644
--- a/source/Hack-Bold.ufo/glyphs/uni032B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni032B_.glif
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni032B" format="1">
-  <advance width="0"/>
+<glyph name="uni032B" format="2">
   <unicode hex="032B"/>
   <outline>
     <contour>
-      <point x="-785" y="-489" type="curve" name="dv01" smooth="yes"/>
+      <point x="-785" y="-489" type="curve" smooth="yes" name="dv01"/>
       <point x="-904" y="-489"/>
       <point x="-980" y="-425"/>
       <point x="-1011" y="-298" type="curve"/>
@@ -34,10 +33,10 @@
       <point x="-209" y="-192" type="line" name="hr03"/>
       <point x="-213" y="-331"/>
       <point x="-255" y="-421"/>
-      <point x="-336" y="-464" type="curve" name="hr04" smooth="yes"/>
+      <point x="-336" y="-464" type="curve" smooth="yes" name="hr04"/>
       <point x="-367" y="-481"/>
       <point x="-405" y="-489"/>
-      <point x="-448" y="-489" type="curve" name="sv04" smooth="yes"/>
+      <point x="-448" y="-489" type="curve" smooth="yes" name="sv04"/>
       <point x="-520" y="-489"/>
       <point x="-576" y="-466"/>
       <point x="-617" y="-419" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni032C_.glif b/source/Hack-Bold.ufo/glyphs/uni032C_.glif
index a5730a312..a4318753d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni032C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni032C_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni032C" format="1">
-  <advance width="0"/>
+<glyph name="uni032C" format="2">
   <unicode hex="032C"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni032D_.glif b/source/Hack-Bold.ufo/glyphs/uni032D_.glif
index a69603124..76c6b9126 100644
--- a/source/Hack-Bold.ufo/glyphs/uni032D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni032D_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni032D" format="1">
-  <advance width="0"/>
+<glyph name="uni032D" format="2">
   <unicode hex="032D"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni032E_.glif b/source/Hack-Bold.ufo/glyphs/uni032E_.glif
index fcefc67f5..e5baba7c0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni032E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni032E_.glif
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni032E" format="1">
-  <advance width="0"/>
+<glyph name="uni032E" format="2">
   <unicode hex="032E"/>
   <outline>
     <contour>
-      <point x="-617" y="-491" type="curve" name="ab01" smooth="yes"/>
+      <point x="-617" y="-491" type="curve" smooth="yes" name="ab01"/>
       <point x="-826" y="-491"/>
       <point x="-944" y="-387"/>
       <point x="-952" y="-194" type="curve" name="sv01"/>
       <point x="-811" y="-194" type="line"/>
       <point x="-796" y="-286"/>
       <point x="-729" y="-338"/>
-      <point x="-617" y="-338" type="curve" name="hr01" smooth="yes"/>
+      <point x="-617" y="-338" type="curve" smooth="yes" name="hr01"/>
       <point x="-505" y="-338"/>
       <point x="-439" y="-287"/>
       <point x="-424" y="-194" type="curve" name="hr02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni032F_.glif b/source/Hack-Bold.ufo/glyphs/uni032F_.glif
index 5db13e4b6..f9f5a23e6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni032F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni032F_.glif
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni032F" format="1">
-  <advance width="0"/>
+<glyph name="uni032F" format="2">
   <unicode hex="032F"/>
   <outline>
     <contour>
       <point x="-952" y="-489" type="line" name="sv01"/>
       <point x="-944" y="-296"/>
       <point x="-827" y="-192"/>
-      <point x="-616" y="-192" type="curve" name="hr01" smooth="yes"/>
+      <point x="-616" y="-192" type="curve" smooth="yes" name="hr01"/>
       <point x="-407" y="-192"/>
       <point x="-289" y="-296"/>
       <point x="-281" y="-489" type="curve" name="hr02"/>
       <point x="-422" y="-489" type="line"/>
       <point x="-437" y="-397"/>
       <point x="-504" y="-345"/>
-      <point x="-616" y="-345" type="curve" name="sv02" smooth="yes"/>
+      <point x="-616" y="-345" type="curve" smooth="yes" name="sv02"/>
       <point x="-728" y="-345"/>
       <point x="-794" y="-396"/>
       <point x="-809" y="-489" type="curve" name="dv01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0330.glif b/source/Hack-Bold.ufo/glyphs/uni0330.glif
index 1ea5fc51f..76ceab0f7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0330.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0330.glif
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0330" format="1">
-  <advance width="0"/>
+<glyph name="uni0330" format="2">
   <unicode hex="0330"/>
   <outline>
     <contour>
-      <point x="-465" y="-487" type="curve" name="av01" smooth="yes"/>
+      <point x="-465" y="-487" type="curve" smooth="yes" name="av01"/>
       <point x="-513" y="-487"/>
       <point x="-551" y="-474"/>
       <point x="-615" y="-430" type="curve" smooth="yes"/>
@@ -12,7 +11,7 @@
       <point x="-682" y="-385" type="line" smooth="yes"/>
       <point x="-711" y="-366"/>
       <point x="-735" y="-356"/>
-      <point x="-752" y="-356" type="curve" name="dv01" smooth="yes"/>
+      <point x="-752" y="-356" type="curve" smooth="yes" name="dv01"/>
       <point x="-801" y="-356"/>
       <point x="-825" y="-396"/>
       <point x="-825" y="-477" type="curve" smooth="yes"/>
@@ -20,14 +19,14 @@
       <point x="-965" y="-485" type="line" name="hr01"/>
       <point x="-965" y="-302"/>
       <point x="-893" y="-201"/>
-      <point x="-768" y="-201" type="curve" name="dv02" smooth="yes"/>
+      <point x="-768" y="-201" type="curve" smooth="yes" name="dv02"/>
       <point x="-720" y="-201"/>
       <point x="-675" y="-218"/>
       <point x="-619" y="-258" type="curve" smooth="yes"/>
       <point x="-557" y="-301" type="line" smooth="yes"/>
       <point x="-528" y="-322"/>
       <point x="-504" y="-332"/>
-      <point x="-483" y="-332" type="curve" name="sv01" smooth="yes"/>
+      <point x="-483" y="-332" type="curve" smooth="yes" name="sv01"/>
       <point x="-435" y="-332"/>
       <point x="-408" y="-288"/>
       <point x="-408" y="-211" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0331.glif b/source/Hack-Bold.ufo/glyphs/uni0331.glif
index e846811a8..e28d3467f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0331.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0331.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0331" format="1">
-  <advance width="0"/>
+<glyph name="uni0331" format="2">
   <unicode hex="0331"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0332.glif b/source/Hack-Bold.ufo/glyphs/uni0332.glif
index 0d65945c4..2da59158c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0332.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0332.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0332" format="1">
-  <advance width="0"/>
+<glyph name="uni0332" format="2">
   <unicode hex="0332"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0333.glif b/source/Hack-Bold.ufo/glyphs/uni0333.glif
index a09cb3581..2b496525b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0333.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0333.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0333" format="1">
-  <advance width="0"/>
+<glyph name="uni0333" format="2">
   <unicode hex="0333"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0334.glif b/source/Hack-Bold.ufo/glyphs/uni0334.glif
index 82cde911f..750aac751 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0334.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0334.glif
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0334" format="1">
-  <advance width="0"/>
+<glyph name="uni0334" format="2">
   <unicode hex="0334"/>
   <outline>
     <contour>
-      <point x="-385" y="463" type="curve" name="dv01" smooth="yes"/>
+      <point x="-385" y="463" type="curve" smooth="yes" name="dv01"/>
       <point x="-446" y="463"/>
       <point x="-513" y="480"/>
       <point x="-588" y="514" type="curve" smooth="yes"/>
@@ -13,21 +12,21 @@
       <point x="-621" y="528" type="curve" smooth="yes"/>
       <point x="-724" y="573"/>
       <point x="-784" y="586"/>
-      <point x="-852" y="586" type="curve" name="sv01" smooth="yes"/>
+      <point x="-852" y="586" type="curve" smooth="yes" name="sv01"/>
       <point x="-956" y="586"/>
       <point x="-1045" y="549"/>
       <point x="-1145" y="465" type="curve" name="iv01"/>
       <point x="-1145" y="694" type="line"/>
       <point x="-1041" y="775"/>
       <point x="-949" y="809"/>
-      <point x="-838" y="809" type="curve" name="hr01" smooth="yes"/>
+      <point x="-838" y="809" type="curve" smooth="yes" name="hr01"/>
       <point x="-767" y="809"/>
       <point x="-710" y="796"/>
       <point x="-611" y="756" type="curve"/>
       <point x="-578" y="741" type="line" smooth="yes"/>
       <point x="-502" y="704"/>
       <point x="-432" y="686"/>
-      <point x="-369" y="686" type="curve" name="dv02" smooth="yes"/>
+      <point x="-369" y="686" type="curve" smooth="yes" name="dv02"/>
       <point x="-276" y="686"/>
       <point x="-185" y="726"/>
       <point x="-88" y="811" type="curve" name="av01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0335.glif b/source/Hack-Bold.ufo/glyphs/uni0335.glif
index 3e2c60de2..d48de1a3b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0335.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0335.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0335" format="1">
-  <advance width="0"/>
+<glyph name="uni0335" format="2">
   <unicode hex="0335"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0336.glif b/source/Hack-Bold.ufo/glyphs/uni0336.glif
index a48596986..29e4a2d35 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0336.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0336.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0336" format="1">
-  <advance width="0"/>
+<glyph name="uni0336" format="2">
   <unicode hex="0336"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0337.glif b/source/Hack-Bold.ufo/glyphs/uni0337.glif
index b7b1528d1..84dd416dc 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0337.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0337.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0337" format="1">
-  <advance width="0"/>
+<glyph name="uni0337" format="2">
   <unicode hex="0337"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0338.glif b/source/Hack-Bold.ufo/glyphs/uni0338.glif
index 17e57c8b8..3c61165b4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0338.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0338.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0338" format="1">
-  <advance width="0"/>
+<glyph name="uni0338" format="2">
   <unicode hex="0338"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0339.glif b/source/Hack-Bold.ufo/glyphs/uni0339.glif
index c8660e9f6..d1138a861 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0339.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0339.glif
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0339" format="1">
-  <advance width="0"/>
+<glyph name="uni0339" format="2">
   <unicode hex="0339"/>
   <outline>
     <contour>
       <point x="-726" y="-370" type="line" name="sh01"/>
       <point x="-677" y="-370"/>
       <point x="-639" y="-333"/>
-      <point x="-639" y="-282" type="curve" name="sh02" smooth="yes"/>
+      <point x="-639" y="-282" type="curve" smooth="yes" name="sh02"/>
       <point x="-639" y="-233"/>
       <point x="-677" y="-195"/>
       <point x="-726" y="-195" type="curve" name="dh01"/>
       <point x="-726" y="-63" type="line" name="sv01"/>
       <point x="-603" y="-63"/>
       <point x="-507" y="-159"/>
-      <point x="-507" y="-282" type="curve" name="hr01" smooth="yes"/>
+      <point x="-507" y="-282" type="curve" smooth="yes" name="hr01"/>
       <point x="-507" y="-405"/>
       <point x="-603" y="-502"/>
       <point x="-726" y="-502" type="curve" name="hr02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni033A_.glif b/source/Hack-Bold.ufo/glyphs/uni033A_.glif
index a223bb73a..eff6c52a4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni033A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni033A_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni033A" format="1">
-  <advance width="0"/>
+<glyph name="uni033A" format="2">
   <unicode hex="033A"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni033B_.glif b/source/Hack-Bold.ufo/glyphs/uni033B_.glif
index 001cd0f01..95c8edc7f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni033B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni033B_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni033B" format="1">
-  <advance width="0"/>
+<glyph name="uni033B" format="2">
   <unicode hex="033B"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni033C_.glif b/source/Hack-Bold.ufo/glyphs/uni033C_.glif
index d5a20f588..3e2c157f4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni033C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni033C_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni033C" format="1">
-  <advance width="0"/>
+<glyph name="uni033C" format="2">
   <unicode hex="033C"/>
   <outline>
     <contour>
@@ -10,13 +9,13 @@
       <point x="-897" y="-217" type="curve" smooth="yes"/>
       <point x="-866" y="-200"/>
       <point x="-828" y="-192"/>
-      <point x="-785" y="-192" type="curve" name="hr01" smooth="yes"/>
+      <point x="-785" y="-192" type="curve" smooth="yes" name="hr01"/>
       <point x="-714" y="-192"/>
       <point x="-658" y="-215"/>
       <point x="-617" y="-262" type="curve" name="hr02"/>
       <point x="-576" y="-215"/>
       <point x="-520" y="-192"/>
-      <point x="-448" y="-192" type="curve" name="sv02" smooth="yes"/>
+      <point x="-448" y="-192" type="curve" smooth="yes" name="sv02"/>
       <point x="-329" y="-192"/>
       <point x="-253" y="-256"/>
       <point x="-222" y="-383" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni033D_.glif b/source/Hack-Bold.ufo/glyphs/uni033D_.glif
index e90e8e85b..27f7e7a13 100644
--- a/source/Hack-Bold.ufo/glyphs/uni033D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni033D_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni033D" format="1">
-  <advance width="0"/>
+<glyph name="uni033D" format="2">
   <unicode hex="033D"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni033E_.glif b/source/Hack-Bold.ufo/glyphs/uni033E_.glif
index bcbb98842..89473fc99 100644
--- a/source/Hack-Bold.ufo/glyphs/uni033E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni033E_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni033E" format="1">
-  <advance width="0"/>
+<glyph name="uni033E" format="2">
   <unicode hex="033E"/>
   <outline>
     <contour>
@@ -15,7 +14,7 @@
       <point x="-703" y="1498" type="line" smooth="yes"/>
       <point x="-744" y="1542"/>
       <point x="-759" y="1574"/>
-      <point x="-759" y="1610" type="curve" name="dh01" smooth="yes"/>
+      <point x="-759" y="1610" type="curve" smooth="yes" name="dh01"/>
       <point x="-759" y="1719"/>
       <point x="-658" y="1775"/>
       <point x="-475" y="1775" type="curve" name="sh01"/>
@@ -36,7 +35,7 @@
       <point x="-531" y="1495" type="line" smooth="yes"/>
       <point x="-483" y="1442"/>
       <point x="-473" y="1420"/>
-      <point x="-473" y="1382" type="curve" name="dh02" smooth="yes"/>
+      <point x="-473" y="1382" type="curve" smooth="yes" name="dh02"/>
       <point x="-473" y="1273"/>
       <point x="-574" y="1218"/>
       <point x="-757" y="1218" type="curve" name="dv01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni033F_.glif b/source/Hack-Bold.ufo/glyphs/uni033F_.glif
index a69c9172b..5c99e7a5c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni033F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni033F_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni033F" format="1">
-  <advance width="0"/>
+<glyph name="uni033F" format="2">
   <unicode hex="033F"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0358.glif b/source/Hack-Bold.ufo/glyphs/uni0358.glif
index 4207ec6e1..a6bbce768 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0358.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0358.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0358" format="1">
-  <advance width="0"/>
+<glyph name="uni0358" format="2">
   <unicode hex="0358"/>
   <outline>
     <contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0361.glif b/source/Hack-Bold.ufo/glyphs/uni0361.glif
index 9b6d7e9fd..c25aa9bec 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0361.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0361.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0361" format="1">
-  <advance width="0"/>
+<glyph name="uni0361" format="2">
   <unicode hex="0361"/>
   <outline>
     <contour>
@@ -17,7 +16,7 @@
       <point x="-111" y="1613" type="curve" smooth="yes"/>
       <point x="-248" y="1638"/>
       <point x="-414" y="1650"/>
-      <point x="-615" y="1650" type="curve" name="dv01" smooth="yes"/>
+      <point x="-615" y="1650" type="curve" smooth="yes" name="dv01"/>
       <point x="-818" y="1650"/>
       <point x="-986" y="1638"/>
       <point x="-1119" y="1613" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0394.glif b/source/Hack-Bold.ufo/glyphs/uni0394.glif
index ba11696bf..e239cced4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0394.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0394.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0394" format="1">
+<glyph name="uni0394" format="2">
   <advance width="1233"/>
   <unicode hex="0394"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni03A_9.glif b/source/Hack-Bold.ufo/glyphs/uni03A_9.glif
index 8336d7b42..35b951b36 100644
--- a/source/Hack-Bold.ufo/glyphs/uni03A_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni03A_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni03A9" format="1">
+<glyph name="uni03A9" format="2">
   <advance width="1233"/>
   <unicode hex="03A9"/>
   <outline>
@@ -11,19 +11,19 @@
       <point x="154" y="456" type="curve" smooth="yes"/>
       <point x="118" y="546"/>
       <point x="100" y="654"/>
-      <point x="100" y="781" type="curve" name="dh01" smooth="yes"/>
+      <point x="100" y="781" type="curve" smooth="yes" name="dh01"/>
       <point x="100" y="990"/>
       <point x="150" y="1161"/>
-      <point x="239" y="1278" type="curve" name="hr01" smooth="yes"/>
+      <point x="239" y="1278" type="curve" smooth="yes" name="hr01"/>
       <point x="326" y="1391"/>
       <point x="452" y="1460"/>
-      <point x="615" y="1460" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="1460" type="curve" smooth="yes" name="dv02"/>
       <point x="776" y="1460"/>
       <point x="904" y="1394"/>
       <point x="993" y="1277" type="curve" smooth="yes"/>
       <point x="1084" y="1160"/>
       <point x="1133" y="993"/>
-      <point x="1133" y="782" type="curve" name="dh04" smooth="yes"/>
+      <point x="1133" y="782" type="curve" smooth="yes" name="dh04"/>
       <point x="1133" y="655"/>
       <point x="1115" y="546"/>
       <point x="1079" y="456" type="curve" smooth="yes"/>
@@ -39,19 +39,19 @@
       <point x="792" y="464" type="curve" smooth="yes"/>
       <point x="818" y="542"/>
       <point x="831" y="638"/>
-      <point x="831" y="751" type="curve" name="sh02" smooth="yes"/>
+      <point x="831" y="751" type="curve" smooth="yes" name="sh02"/>
       <point x="831" y="891"/>
       <point x="812" y="1000"/>
       <point x="775" y="1078" type="curve" smooth="yes"/>
       <point x="738" y="1155"/>
       <point x="685" y="1194"/>
-      <point x="616" y="1194" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1194" type="curve" smooth="yes" name="dv01"/>
       <point x="549" y="1194"/>
       <point x="496" y="1155"/>
       <point x="458" y="1078" type="curve" smooth="yes"/>
       <point x="420" y="1000"/>
       <point x="401" y="891"/>
-      <point x="401" y="751" type="curve" name="dh02" smooth="yes"/>
+      <point x="401" y="751" type="curve" smooth="yes" name="dh02"/>
       <point x="401" y="638"/>
       <point x="414" y="542"/>
       <point x="441" y="464" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni03B_C_.glif b/source/Hack-Bold.ufo/glyphs/uni03B_C_.glif
index 253e6c64c..c8cc39bc2 100644
--- a/source/Hack-Bold.ufo/glyphs/uni03B_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni03B_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni03BC" format="1">
+<glyph name="uni03BC" format="2">
   <advance width="1233"/>
   <unicode hex="03BC"/>
   <outline>
@@ -9,32 +9,32 @@
       <point x="461" y="440" type="line" smooth="yes"/>
       <point x="461" y="287"/>
       <point x="516" y="211"/>
-      <point x="625" y="211" type="curve" name="sv01" smooth="yes"/>
+      <point x="625" y="211" type="curve" smooth="yes" name="sv01"/>
       <point x="732" y="211"/>
       <point x="786" y="287"/>
-      <point x="786" y="440" type="curve" name="ah01" smooth="yes"/>
+      <point x="786" y="440" type="curve" smooth="yes" name="ah01"/>
       <point x="786" y="1120" type="line" name="at01"/>
       <point x="1075" y="1120" type="line"/>
-      <point x="1075" y="344" type="line" name="sh02" smooth="yes"/>
+      <point x="1075" y="344" type="line" smooth="yes" name="sh02"/>
       <point x="1075" y="298"/>
       <point x="1080" y="264"/>
-      <point x="1089" y="242" type="curve" name="sh03" smooth="yes"/>
+      <point x="1089" y="242" type="curve" smooth="yes" name="sh03"/>
       <point x="1098" y="221"/>
       <point x="1112" y="211"/>
-      <point x="1133" y="211" type="curve" name="dv02" smooth="yes"/>
+      <point x="1133" y="211" type="curve" smooth="yes" name="dv02"/>
       <point x="1150" y="211"/>
       <point x="1169" y="218"/>
       <point x="1188" y="233" type="curve" name="iv01"/>
       <point x="1188" y="16" type="line"/>
       <point x="1131" y="-15"/>
       <point x="1083" y="-29"/>
-      <point x="1036" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="1036" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="940" y="-29"/>
       <point x="882" y="17"/>
       <point x="846" y="129" type="curve" name="ih01"/>
       <point x="797" y="25"/>
       <point x="722" y="-29"/>
-      <point x="629" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="629" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="552" y="-29"/>
       <point x="496" y="3"/>
       <point x="461" y="66" type="curve" name="sh04"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni03C_2.glif b/source/Hack-Bold.ufo/glyphs/uni03C_2.glif
index f5271899a..9c9932cf6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni03C_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni03C_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni03C2" format="1">
+<glyph name="uni03C2" format="2">
   <advance width="1233"/>
   <unicode hex="03C2"/>
   <outline>
@@ -7,32 +7,32 @@
       <point x="749" y="-201" type="line" name="sh01"/>
       <point x="841" y="-201"/>
       <point x="867" y="-155"/>
-      <point x="867" y="-105" type="curve" name="sh02" smooth="yes"/>
+      <point x="867" y="-105" type="curve" smooth="yes" name="sh02"/>
       <point x="867" y="-50"/>
       <point x="836" y="-7"/>
       <point x="749" y="0" type="curve" name="dh03"/>
       <point x="630" y="11"/>
       <point x="168" y="-30"/>
-      <point x="168" y="547" type="curve" name="dh01" smooth="yes"/>
+      <point x="168" y="547" type="curve" smooth="yes" name="dh01"/>
       <point x="168" y="935"/>
       <point x="376" y="1149"/>
-      <point x="720" y="1149" type="curve" name="dv02" smooth="yes"/>
+      <point x="720" y="1149" type="curve" smooth="yes" name="dv02"/>
       <point x="843" y="1149"/>
       <point x="949" y="1123"/>
       <point x="1061" y="1063" type="curve" name="sh03"/>
       <point x="1061" y="795" type="line" name="ih01"/>
       <point x="976" y="868"/>
       <point x="871" y="909"/>
-      <point x="762" y="909" type="curve" name="dv01" smooth="yes"/>
+      <point x="762" y="909" type="curve" smooth="yes" name="dv01"/>
       <point x="570" y="909"/>
       <point x="465" y="787"/>
-      <point x="465" y="551" type="curve" name="dh02" smooth="yes"/>
+      <point x="465" y="551" type="curve" smooth="yes" name="dh02"/>
       <point x="465" y="263"/>
       <point x="627" y="237"/>
       <point x="749" y="225" type="curve"/>
       <point x="941" y="204"/>
       <point x="1066" y="115"/>
-      <point x="1066" y="-93" type="curve" name="hr01" smooth="yes"/>
+      <point x="1066" y="-93" type="curve" smooth="yes" name="hr01"/>
       <point x="1066" y="-305"/>
       <point x="938" y="-426"/>
       <point x="749" y="-426" type="curve" name="hr02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni03F_4.glif b/source/Hack-Bold.ufo/glyphs/uni03F_4.glif
index 7ce445e2f..5db8bacef 100644
--- a/source/Hack-Bold.ufo/glyphs/uni03F_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni03F_4.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni03F4" format="1">
+<glyph name="uni03F4" format="2">
   <advance width="1233"/>
   <unicode hex="03F4"/>
   <outline>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="269" y="-29"/>
       <point x="92" y="233"/>
-      <point x="92" y="745" type="curve" name="sh01" smooth="yes"/>
+      <point x="92" y="745" type="curve" smooth="yes" name="sh01"/>
       <point x="92" y="1256"/>
       <point x="271" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="963" y="1520"/>
       <point x="1141" y="1256"/>
-      <point x="1141" y="745" type="curve" name="sh02" smooth="yes"/>
+      <point x="1141" y="745" type="curve" smooth="yes" name="sh02"/>
       <point x="1141" y="236"/>
       <point x="963" y="-29"/>
     </contour>
@@ -21,13 +21,13 @@
       <point x="828" y="911" type="line" name="sh03"/>
       <point x="809" y="1108"/>
       <point x="768" y="1255"/>
-      <point x="616" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="466" y="1255"/>
       <point x="424" y="1112"/>
       <point x="405" y="911" type="curve" name="sh05"/>
     </contour>
     <contour>
-      <point x="616" y="236" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="236" type="curve" smooth="yes" name="dv01"/>
       <point x="768" y="236"/>
       <point x="819" y="382"/>
       <point x="832" y="651" type="curve" name="ah01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0400.glif b/source/Hack-Bold.ufo/glyphs/uni0400.glif
index 4e44c55ea..af48f35b1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0400.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0400.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0400" format="1">
+<glyph name="uni0400" format="2">
   <advance width="1233"/>
   <unicode hex="0400"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0401.glif b/source/Hack-Bold.ufo/glyphs/uni0401.glif
index 80a4491f0..06284fe4b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0401.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0401.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0401" format="1">
+<glyph name="uni0401" format="2">
   <advance width="1233"/>
   <unicode hex="0401"/>
   <outline>
     <contour>
-      <point x="352" y="1604" type="line" name="dv01" smooth="yes"/>
+      <point x="352" y="1604" type="line" smooth="yes" name="dv01"/>
       <point x="332" y="1604"/>
       <point x="322" y="1614"/>
-      <point x="322" y="1634" type="curve" name="ih01" smooth="yes"/>
+      <point x="322" y="1634" type="curve" smooth="yes" name="ih01"/>
       <point x="322" y="1820" type="line" smooth="yes"/>
       <point x="322" y="1840"/>
       <point x="332" y="1850"/>
-      <point x="352" y="1850" type="curve" name="dv02" smooth="yes"/>
+      <point x="352" y="1850" type="curve" smooth="yes" name="dv02"/>
       <point x="528" y="1850" type="line" smooth="yes"/>
       <point x="548" y="1850"/>
       <point x="558" y="1840"/>
       <point x="558" y="1820" type="curve" smooth="yes"/>
-      <point x="558" y="1634" type="line" name="sh01" smooth="yes"/>
+      <point x="558" y="1634" type="line" smooth="yes" name="sh01"/>
       <point x="558" y="1614"/>
       <point x="548" y="1604"/>
       <point x="528" y="1604" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="747" y="1604" type="line" name="sv01" smooth="yes"/>
+      <point x="747" y="1604" type="line" smooth="yes" name="sv01"/>
       <point x="727" y="1604"/>
       <point x="717" y="1614"/>
-      <point x="717" y="1634" type="curve" name="dh03" smooth="yes"/>
+      <point x="717" y="1634" type="curve" smooth="yes" name="dh03"/>
       <point x="717" y="1820" type="line" smooth="yes"/>
       <point x="717" y="1840"/>
       <point x="727" y="1850"/>
-      <point x="747" y="1850" type="curve" name="sv02" smooth="yes"/>
+      <point x="747" y="1850" type="curve" smooth="yes" name="sv02"/>
       <point x="923" y="1850" type="line" smooth="yes"/>
       <point x="943" y="1850"/>
       <point x="953" y="1840"/>
       <point x="953" y="1820" type="curve" smooth="yes"/>
-      <point x="953" y="1634" type="line" name="dh04" smooth="yes"/>
+      <point x="953" y="1634" type="line" smooth="yes" name="dh04"/>
       <point x="953" y="1614"/>
       <point x="943" y="1604"/>
       <point x="923" y="1604" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0402.glif b/source/Hack-Bold.ufo/glyphs/uni0402.glif
index db9550a8b..76d0138aa 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0402.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0402.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0402" format="1">
+<glyph name="uni0402" format="2">
   <advance width="1233"/>
   <unicode hex="0402"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="701" y="-199" type="line" smooth="yes"/>
       <point x="833" y="-199"/>
       <point x="881" y="-133"/>
-      <point x="881" y="43" type="curve" name="ah01" smooth="yes"/>
+      <point x="881" y="43" type="curve" smooth="yes" name="ah01"/>
       <point x="881" y="504" type="line" smooth="yes"/>
       <point x="881" y="585"/>
       <point x="869" y="642"/>
@@ -55,10 +55,10 @@
       <point x="1142" y="823"/>
       <point x="1172" y="717"/>
       <point x="1172" y="572" type="curve" smooth="yes"/>
-      <point x="1172" y="43" type="line" name="sh04" smooth="yes"/>
+      <point x="1172" y="43" type="line" smooth="yes" name="sh04"/>
       <point x="1172" y="-293"/>
       <point x="1059" y="-424"/>
-      <point x="783" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="783" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="565" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0403.glif b/source/Hack-Bold.ufo/glyphs/uni0403.glif
index 1b25f4aa4..ef257a5a9 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0403.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0403.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0403" format="1">
+<glyph name="uni0403" format="2">
   <advance width="1233"/>
   <unicode hex="0403"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0404.glif b/source/Hack-Bold.ufo/glyphs/uni0404.glif
index 149ddfd3f..51fe47745 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0404.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0404.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0404" format="1">
+<glyph name="uni0404" format="2">
   <advance width="1233"/>
   <unicode hex="0404"/>
   <outline>
     <contour>
-      <point x="739" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="739" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="340" y="-29"/>
       <point x="122" y="244"/>
       <point x="122" y="746" type="curve" smooth="yes"/>
       <point x="122" y="1247"/>
       <point x="340" y="1520"/>
-      <point x="739" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="739" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="868" y="1520"/>
       <point x="967" y="1492"/>
       <point x="1051" y="1448" type="curve"/>
       <point x="1051" y="1120" type="line"/>
       <point x="978" y="1187"/>
       <point x="880" y="1255"/>
-      <point x="754" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="754" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="550" y="1255"/>
       <point x="457" y="1076"/>
       <point x="436" y="875" type="curve"/>
@@ -26,7 +26,7 @@
       <point x="436" y="615" type="line"/>
       <point x="455" y="420"/>
       <point x="556" y="236"/>
-      <point x="755" y="236" type="curve" name="dv01" smooth="yes"/>
+      <point x="755" y="236" type="curve" smooth="yes" name="dv01"/>
       <point x="854" y="236"/>
       <point x="953" y="281"/>
       <point x="1051" y="371" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0405.glif b/source/Hack-Bold.ufo/glyphs/uni0405.glif
index 5c2b8072a..4f97d364c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0405.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0405.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0405" format="1">
+<glyph name="uni0405" format="2">
   <advance width="1233"/>
   <unicode hex="0405"/>
   <outline>
     <contour>
-      <point x="584" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="584" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="420" y="-29"/>
       <point x="280" y="4"/>
       <point x="135" y="76" type="curve" name="sh02"/>
       <point x="135" y="381" type="line" name="ih01"/>
       <point x="288" y="270"/>
       <point x="439" y="215"/>
-      <point x="576" y="215" type="curve" name="dv01" smooth="yes"/>
+      <point x="576" y="215" type="curve" smooth="yes" name="dv01"/>
       <point x="729" y="215"/>
       <point x="811" y="283"/>
-      <point x="811" y="399" type="curve" name="ah01" smooth="yes"/>
+      <point x="811" y="399" type="curve" smooth="yes" name="ah01"/>
       <point x="811" y="495"/>
       <point x="755" y="561"/>
       <point x="655" y="600" type="curve" smooth="yes"/>
       <point x="510" y="655" type="line" smooth="yes"/>
       <point x="219" y="764"/>
       <point x="129" y="876"/>
-      <point x="129" y="1075" type="curve" name="sh01" smooth="yes"/>
+      <point x="129" y="1075" type="curve" smooth="yes" name="sh01"/>
       <point x="129" y="1360"/>
       <point x="313" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="753" y="1520"/>
       <point x="890" y="1488"/>
       <point x="1026" y="1427" type="curve"/>
       <point x="1026" y="1139" type="line" name="ih02"/>
       <point x="898" y="1228"/>
       <point x="768" y="1276"/>
-      <point x="639" y="1276" type="curve" name="sv01" smooth="yes"/>
+      <point x="639" y="1276" type="curve" smooth="yes" name="sv01"/>
       <point x="495" y="1276"/>
       <point x="418" y="1216"/>
-      <point x="418" y="1112" type="curve" name="sh03" smooth="yes"/>
+      <point x="418" y="1112" type="curve" smooth="yes" name="sh03"/>
       <point x="418" y="1069"/>
       <point x="432" y="1035"/>
       <point x="460" y="1008" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="760" y="870" type="line" smooth="yes"/>
       <point x="1007" y="777"/>
       <point x="1110" y="641"/>
-      <point x="1110" y="417" type="curve" name="sh04" smooth="yes"/>
+      <point x="1110" y="417" type="curve" smooth="yes" name="sh04"/>
       <point x="1110" y="118"/>
       <point x="925" y="-29"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0406.glif b/source/Hack-Bold.ufo/glyphs/uni0406.glif
index d61acf95d..55d998d2b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0406.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0406.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0406" format="1">
+<glyph name="uni0406" format="2">
   <advance width="1233"/>
   <unicode hex="0406"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0407.glif b/source/Hack-Bold.ufo/glyphs/uni0407.glif
index 22c1a8f02..9f11cd5e6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0407.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0407.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0407" format="1">
+<glyph name="uni0407" format="2">
   <advance width="1233"/>
   <unicode hex="0407"/>
   <outline>
     <contour>
-      <point x="331" y="1604" type="line" name="dv01" smooth="yes"/>
+      <point x="331" y="1604" type="line" smooth="yes" name="dv01"/>
       <point x="311" y="1604"/>
       <point x="301" y="1614"/>
-      <point x="301" y="1634" type="curve" name="sh01" smooth="yes"/>
+      <point x="301" y="1634" type="curve" smooth="yes" name="sh01"/>
       <point x="301" y="1820" type="line" smooth="yes"/>
       <point x="301" y="1840"/>
       <point x="311" y="1850"/>
-      <point x="331" y="1850" type="curve" name="dv02" smooth="yes"/>
+      <point x="331" y="1850" type="curve" smooth="yes" name="dv02"/>
       <point x="507" y="1850" type="line" smooth="yes"/>
       <point x="527" y="1850"/>
       <point x="537" y="1840"/>
       <point x="537" y="1820" type="curve" smooth="yes"/>
-      <point x="537" y="1634" type="line" name="sh02" smooth="yes"/>
+      <point x="537" y="1634" type="line" smooth="yes" name="sh02"/>
       <point x="537" y="1614"/>
       <point x="527" y="1604"/>
       <point x="507" y="1604" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1604" type="line" name="sv01" smooth="yes"/>
+      <point x="726" y="1604" type="line" smooth="yes" name="sv01"/>
       <point x="706" y="1604"/>
       <point x="696" y="1614"/>
-      <point x="696" y="1634" type="curve" name="sh04" smooth="yes"/>
+      <point x="696" y="1634" type="curve" smooth="yes" name="sh04"/>
       <point x="696" y="1820" type="line" smooth="yes"/>
       <point x="696" y="1840"/>
       <point x="706" y="1850"/>
-      <point x="726" y="1850" type="curve" name="sv02" smooth="yes"/>
+      <point x="726" y="1850" type="curve" smooth="yes" name="sv02"/>
       <point x="902" y="1850" type="line" smooth="yes"/>
       <point x="922" y="1850"/>
       <point x="932" y="1840"/>
-      <point x="932" y="1820" type="curve" name="hr01" smooth="yes"/>
-      <point x="932" y="1634" type="line" name="sh05" smooth="yes"/>
+      <point x="932" y="1820" type="curve" smooth="yes" name="hr01"/>
+      <point x="932" y="1634" type="line" smooth="yes" name="sh05"/>
       <point x="932" y="1614"/>
       <point x="922" y="1604"/>
       <point x="902" y="1604" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0408.glif b/source/Hack-Bold.ufo/glyphs/uni0408.glif
index b9e240364..244fb5cad 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0408.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0408.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0408" format="1">
+<glyph name="uni0408" format="2">
   <advance width="1233"/>
   <unicode hex="0408"/>
   <outline>
     <contour>
-      <point x="533" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="533" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="393" y="-29"/>
       <point x="268" y="-3"/>
       <point x="109" y="74" type="curve"/>
       <point x="109" y="416" type="line"/>
       <point x="225" y="299"/>
       <point x="354" y="236"/>
-      <point x="493" y="236" type="curve" name="dv01" smooth="yes"/>
+      <point x="493" y="236" type="curve" smooth="yes" name="dv01"/>
       <point x="645" y="236"/>
       <point x="713" y="311"/>
-      <point x="713" y="479" type="curve" name="dh01" smooth="yes"/>
+      <point x="713" y="479" type="curve" smooth="yes" name="dh01"/>
       <point x="713" y="1233" type="line" name="sv01"/>
       <point x="352" y="1233" type="line"/>
       <point x="352" y="1493" type="line" name="at01"/>
       <point x="1008" y="1493" type="line"/>
-      <point x="1008" y="479" type="line" name="dh02" smooth="yes"/>
+      <point x="1008" y="479" type="line" smooth="yes" name="dh02"/>
       <point x="1008" y="124"/>
       <point x="866" y="-29"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0409.glif b/source/Hack-Bold.ufo/glyphs/uni0409.glif
index d1ee44580..110f8b67d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0409.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0409.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0409" format="1">
+<glyph name="uni0409" format="2">
   <advance width="1233"/>
   <unicode hex="0409"/>
   <outline>
@@ -8,37 +8,37 @@
       <point x="6" y="250" type="line" smooth="yes"/>
       <point x="155" y="250"/>
       <point x="187" y="324"/>
-      <point x="203" y="471" type="curve" name="sh01" smooth="yes"/>
+      <point x="203" y="471" type="curve" smooth="yes" name="sh01"/>
       <point x="211" y="549"/>
       <point x="216" y="687"/>
-      <point x="216" y="1065" type="curve" name="dh01" smooth="yes"/>
+      <point x="216" y="1065" type="curve" smooth="yes" name="dh01"/>
       <point x="216" y="1493" type="line" name="at01"/>
       <point x="832" y="1493" type="line" name="sh02"/>
       <point x="832" y="913" type="line"/>
       <point x="854" y="913" type="line" smooth="yes"/>
       <point x="1001" y="913"/>
       <point x="1233" y="772"/>
-      <point x="1233" y="457" type="curve" name="dh06" smooth="yes"/>
+      <point x="1233" y="457" type="curve" smooth="yes" name="dh06"/>
       <point x="1233" y="141"/>
       <point x="998" y="0"/>
-      <point x="854" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="854" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="592" y="0" type="line" name="dh03"/>
       <point x="592" y="1233" type="line" name="sv01"/>
       <point x="456" y="1233" type="line"/>
-      <point x="456" y="1057" type="line" name="dh02" smooth="yes"/>
+      <point x="456" y="1057" type="line" smooth="yes" name="dh02"/>
       <point x="456" y="574"/>
       <point x="460" y="264"/>
       <point x="333" y="113" type="curve" smooth="yes"/>
       <point x="270" y="38"/>
       <point x="170" y="0"/>
-      <point x="33" y="0" type="curve" name="ab02" smooth="yes"/>
+      <point x="33" y="0" type="curve" smooth="yes" name="ab02"/>
       <point x="0" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="840" y="236" type="line" name="sv02" smooth="yes"/>
+      <point x="840" y="236" type="line" smooth="yes" name="sv02"/>
       <point x="889" y="236"/>
       <point x="993" y="293"/>
-      <point x="993" y="457" type="curve" name="dh05" smooth="yes"/>
+      <point x="993" y="457" type="curve" smooth="yes" name="dh05"/>
       <point x="993" y="621"/>
       <point x="889" y="678"/>
       <point x="840" y="678" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni040A_.glif b/source/Hack-Bold.ufo/glyphs/uni040A_.glif
index ab477d592..18935f9c7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni040A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni040A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni040A" format="1">
+<glyph name="uni040A" format="2">
   <advance width="1233"/>
   <unicode hex="040A"/>
   <outline>
@@ -14,10 +14,10 @@
       <point x="854" y="913" type="line" smooth="yes"/>
       <point x="1001" y="913"/>
       <point x="1233" y="770"/>
-      <point x="1233" y="457" type="curve" name="dh05" smooth="yes"/>
+      <point x="1233" y="457" type="curve" smooth="yes" name="dh05"/>
       <point x="1233" y="141"/>
       <point x="998" y="0"/>
-      <point x="854" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="854" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="592" y="0" type="line" name="sh01"/>
       <point x="592" y="664" type="line" name="dv01"/>
       <point x="270" y="664" type="line" name="sh02"/>
@@ -28,10 +28,10 @@
       <point x="840" y="236" type="line" smooth="yes"/>
       <point x="889" y="236"/>
       <point x="993" y="293"/>
-      <point x="993" y="457" type="curve" name="dh04" smooth="yes"/>
+      <point x="993" y="457" type="curve" smooth="yes" name="dh04"/>
       <point x="993" y="621"/>
       <point x="889" y="678"/>
-      <point x="840" y="678" type="curve" name="sv02" smooth="yes"/>
+      <point x="840" y="678" type="curve" smooth="yes" name="sv02"/>
       <point x="832" y="678" type="line" name="sh03"/>
       <point x="832" y="236" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni040B_.glif b/source/Hack-Bold.ufo/glyphs/uni040B_.glif
index 1da6e2b57..7b42a7b32 100644
--- a/source/Hack-Bold.ufo/glyphs/uni040B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni040B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni040B" format="1">
+<glyph name="uni040B" format="2">
   <advance width="1233"/>
   <unicode hex="040B"/>
   <outline>
@@ -48,7 +48,7 @@
       <point x="492" y="658" type="curve" smooth="yes"/>
       <point x="461" y="615"/>
       <point x="447" y="546"/>
-      <point x="447" y="463" type="curve" name="sh03" smooth="yes"/>
+      <point x="447" y="463" type="curve" smooth="yes" name="sh03"/>
       <point x="447" y="0" type="line" name="ab01"/>
       <point x="156" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni040C_.glif b/source/Hack-Bold.ufo/glyphs/uni040C_.glif
index e4638f78c..0b2ab7566 100644
--- a/source/Hack-Bold.ufo/glyphs/uni040C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni040C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni040C" format="1">
+<glyph name="uni040C" format="2">
   <advance width="1233"/>
   <unicode hex="040C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni040D_.glif b/source/Hack-Bold.ufo/glyphs/uni040D_.glif
index 9af85e00f..d8122511b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni040D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni040D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni040D" format="1">
+<glyph name="uni040D" format="2">
   <advance width="1233"/>
   <unicode hex="040D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni040E_.glif b/source/Hack-Bold.ufo/glyphs/uni040E_.glif
index 958b79125..0795a9f2a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni040E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni040E_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni040E" format="1">
+<glyph name="uni040E" format="2">
   <advance width="1233"/>
   <unicode hex="040E"/>
   <outline>
     <contour>
-      <point x="626" y="1586" type="curve" name="dv01" smooth="yes"/>
+      <point x="626" y="1586" type="curve" smooth="yes" name="dv01"/>
       <point x="429" y="1586"/>
       <point x="311" y="1677"/>
       <point x="291" y="1850" type="curve" name="sv02"/>
       <point x="432" y="1850" type="line"/>
       <point x="459" y="1769"/>
       <point x="525" y="1729"/>
-      <point x="628" y="1729" type="curve" name="dv02" smooth="yes"/>
+      <point x="628" y="1729" type="curve" smooth="yes" name="dv02"/>
       <point x="729" y="1729"/>
       <point x="792" y="1769"/>
       <point x="819" y="1850" type="curve" name="sv01"/>
@@ -31,10 +31,10 @@
       <point x="659" y="873" type="line" name="iv01"/>
       <point x="910" y="1493" type="line" name="at02"/>
       <point x="1215" y="1493" type="line"/>
-      <point x="737" y="303" type="line" name="hr01" smooth="yes"/>
+      <point x="737" y="303" type="line" smooth="yes" name="hr01"/>
       <point x="654" y="98"/>
       <point x="551" y="0"/>
-      <point x="395" y="0" type="curve" name="hr02" smooth="yes"/>
+      <point x="395" y="0" type="curve" smooth="yes" name="hr02"/>
       <point x="195" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni040F_.glif b/source/Hack-Bold.ufo/glyphs/uni040F_.glif
index a0dc86790..3866f543e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni040F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni040F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni040F" format="1">
+<glyph name="uni040F" format="2">
   <advance width="1233"/>
   <unicode hex="040F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0410.glif b/source/Hack-Bold.ufo/glyphs/uni0410.glif
index 19860c5d5..54880c586 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0410.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0410.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0410" format="1">
+<glyph name="uni0410" format="2">
   <advance width="1233"/>
   <unicode hex="0410"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0411.glif b/source/Hack-Bold.ufo/glyphs/uni0411.glif
index ae5364a9c..9543c4f60 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0411.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0411.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0411" format="1">
+<glyph name="uni0411" format="2">
   <advance width="1233"/>
   <unicode hex="0411"/>
   <outline>
@@ -9,23 +9,23 @@
       <point x="1082" y="1233" type="line" name="sv01"/>
       <point x="447" y="1233" type="line" name="sh01"/>
       <point x="447" y="934" type="line"/>
-      <point x="557" y="934" type="line" name="dv02" smooth="yes"/>
+      <point x="557" y="934" type="line" smooth="yes" name="dv02"/>
       <point x="969" y="934"/>
       <point x="1137" y="796"/>
-      <point x="1137" y="467" type="curve" name="sh02" smooth="yes"/>
+      <point x="1137" y="467" type="curve" smooth="yes" name="sh02"/>
       <point x="1137" y="138"/>
       <point x="969" y="0"/>
-      <point x="557" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="557" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="152" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="568" y="248" type="line" name="sv02" smooth="yes"/>
+      <point x="568" y="248" type="line" smooth="yes" name="sv02"/>
       <point x="760" y="248"/>
       <point x="830" y="306"/>
-      <point x="830" y="467" type="curve" name="ah01" smooth="yes"/>
+      <point x="830" y="467" type="curve" smooth="yes" name="ah01"/>
       <point x="830" y="628"/>
       <point x="760" y="686"/>
-      <point x="568" y="686" type="curve" name="dv01" smooth="yes"/>
+      <point x="568" y="686" type="curve" smooth="yes" name="dv01"/>
       <point x="447" y="686" type="line" name="sh03"/>
       <point x="447" y="248" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0412.glif b/source/Hack-Bold.ufo/glyphs/uni0412.glif
index 5e3237656..fd1525371 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0412.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0412.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0412" format="1">
+<glyph name="uni0412" format="2">
   <advance width="1233"/>
   <unicode hex="0412"/>
   <outline>
@@ -8,37 +8,37 @@
       <point x="606" y="1495" type="line" smooth="yes"/>
       <point x="939" y="1495"/>
       <point x="1106" y="1370"/>
-      <point x="1106" y="1119" type="curve" name="dh03" smooth="yes"/>
+      <point x="1106" y="1119" type="curve" smooth="yes" name="dh03"/>
       <point x="1106" y="924"/>
       <point x="1007" y="816"/>
       <point x="815" y="799" type="curve" name="ih01"/>
       <point x="1050" y="775"/>
       <point x="1159" y="643"/>
-      <point x="1159" y="407" type="curve" name="sh02" smooth="yes"/>
+      <point x="1159" y="407" type="curve" smooth="yes" name="sh02"/>
       <point x="1159" y="122"/>
       <point x="995" y="0"/>
-      <point x="606" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="606" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="125" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="606" y="913" type="line" name="dv01" smooth="yes"/>
+      <point x="606" y="913" type="line" smooth="yes" name="dv01"/>
       <point x="755" y="913"/>
       <point x="813" y="961"/>
-      <point x="813" y="1084" type="curve" name="hr01" smooth="yes"/>
+      <point x="813" y="1084" type="curve" smooth="yes" name="hr01"/>
       <point x="813" y="1208"/>
       <point x="753" y="1260"/>
-      <point x="606" y="1260" type="curve" name="sv01" smooth="yes"/>
+      <point x="606" y="1260" type="curve" smooth="yes" name="sv01"/>
       <point x="410" y="1260" type="line" name="dh02"/>
       <point x="410" y="913" type="line"/>
     </contour>
     <contour>
-      <point x="606" y="236" type="line" name="hr02" smooth="yes"/>
+      <point x="606" y="236" type="line" smooth="yes" name="hr02"/>
       <point x="793" y="236"/>
       <point x="860" y="292"/>
-      <point x="860" y="449" type="curve" name="sh01" smooth="yes"/>
+      <point x="860" y="449" type="curve" smooth="yes" name="sh01"/>
       <point x="860" y="612"/>
       <point x="788" y="678"/>
-      <point x="606" y="678" type="curve" name="hr03" smooth="yes"/>
+      <point x="606" y="678" type="curve" smooth="yes" name="hr03"/>
       <point x="410" y="678" type="line" name="sh03"/>
       <point x="410" y="236" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0413.glif b/source/Hack-Bold.ufo/glyphs/uni0413.glif
index dacfbf797..91dfe9159 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0413.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0413.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0413" format="1">
+<glyph name="uni0413" format="2">
   <advance width="1233"/>
   <unicode hex="0413"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0414.glif b/source/Hack-Bold.ufo/glyphs/uni0414.glif
index 36046344c..9b35ac3d6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0414.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0414.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0414" format="1">
+<glyph name="uni0414" format="2">
   <advance width="1233"/>
   <unicode hex="0414"/>
   <outline>
@@ -25,7 +25,7 @@
       <point x="760" y="260" type="line" name="dh03"/>
       <point x="760" y="1233" type="line" name="sv02"/>
       <point x="502" y="1233" type="line"/>
-      <point x="502" y="497" type="line" name="sh02" smooth="yes"/>
+      <point x="502" y="497" type="line" smooth="yes" name="sh02"/>
       <point x="502" y="403"/>
       <point x="492" y="324"/>
       <point x="472" y="260" type="curve" name="hr03"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0415.glif b/source/Hack-Bold.ufo/glyphs/uni0415.glif
index 1b95eb200..86a63a83b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0415.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0415.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0415" format="1">
+<glyph name="uni0415" format="2">
   <advance width="1233"/>
   <unicode hex="0415"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0416.glif b/source/Hack-Bold.ufo/glyphs/uni0416.glif
index ba8604272..f678658e6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0416.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0416.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0416" format="1">
+<glyph name="uni0416" format="2">
   <advance width="1233"/>
   <unicode hex="0416"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0417.glif b/source/Hack-Bold.ufo/glyphs/uni0417.glif
index 27630b6b1..5b3876230 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0417.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0417.glif
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0417" format="1">
+<glyph name="uni0417" format="2">
   <advance width="1233"/>
   <unicode hex="0417"/>
   <outline>
     <contour>
-      <point x="554" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="554" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="407" y="-29"/>
       <point x="258" y="-3"/>
       <point x="125" y="45" type="curve"/>
       <point x="125" y="319" type="line"/>
       <point x="253" y="252"/>
       <point x="419" y="223"/>
-      <point x="538" y="223" type="curve" name="hr01" smooth="yes"/>
+      <point x="538" y="223" type="curve" smooth="yes" name="hr01"/>
       <point x="731" y="223"/>
       <point x="817" y="303"/>
-      <point x="817" y="435" type="curve" name="sh01" smooth="yes"/>
+      <point x="817" y="435" type="curve" smooth="yes" name="sh01"/>
       <point x="817" y="578"/>
       <point x="721" y="668"/>
-      <point x="549" y="668" type="curve" name="dv02" smooth="yes"/>
+      <point x="549" y="668" type="curve" smooth="yes" name="dv02"/>
       <point x="391" y="668" type="line"/>
       <point x="391" y="928" type="line"/>
-      <point x="549" y="928" type="line" name="dv03" smooth="yes"/>
+      <point x="549" y="928" type="line" smooth="yes" name="dv03"/>
       <point x="697" y="928"/>
       <point x="780" y="988"/>
-      <point x="780" y="1097" type="curve" name="dh01" smooth="yes"/>
+      <point x="780" y="1097" type="curve" smooth="yes" name="dh01"/>
       <point x="780" y="1205"/>
       <point x="697" y="1270"/>
-      <point x="544" y="1270" type="curve" name="sv01" smooth="yes"/>
+      <point x="544" y="1270" type="curve" smooth="yes" name="sv01"/>
       <point x="440" y="1270"/>
       <point x="307" y="1241"/>
       <point x="170" y="1188" type="curve"/>
       <point x="170" y="1456" type="line"/>
       <point x="307" y="1497"/>
       <point x="441" y="1520"/>
-      <point x="566" y="1520" type="curve" name="hr02" smooth="yes"/>
+      <point x="566" y="1520" type="curve" smooth="yes" name="hr02"/>
       <point x="880" y="1520"/>
       <point x="1065" y="1373"/>
-      <point x="1065" y="1135" type="curve" name="dh02" smooth="yes"/>
+      <point x="1065" y="1135" type="curve" smooth="yes" name="dh02"/>
       <point x="1065" y="952"/>
       <point x="960" y="840"/>
       <point x="772" y="805" type="curve" name="iv01"/>
       <point x="977" y="768"/>
       <point x="1100" y="642"/>
-      <point x="1100" y="412" type="curve" name="sh02" smooth="yes"/>
+      <point x="1100" y="412" type="curve" smooth="yes" name="sh02"/>
       <point x="1100" y="125"/>
       <point x="913" y="-29"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0418.glif b/source/Hack-Bold.ufo/glyphs/uni0418.glif
index 56f502bab..df47e8bb3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0418.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0418.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0418" format="1">
+<glyph name="uni0418" format="2">
   <advance width="1233"/>
   <unicode hex="0418"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0419.glif b/source/Hack-Bold.ufo/glyphs/uni0419.glif
index b2466f93d..7b9724e52 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0419.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0419.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0419" format="1">
+<glyph name="uni0419" format="2">
   <advance width="1233"/>
   <unicode hex="0419"/>
   <outline>
     <contour>
-      <point x="616" y="1586" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1586" type="curve" smooth="yes" name="dv01"/>
       <point x="419" y="1586"/>
       <point x="301" y="1677"/>
       <point x="281" y="1850" type="curve" name="sv02"/>
       <point x="422" y="1850" type="line"/>
       <point x="449" y="1769"/>
       <point x="515" y="1729"/>
-      <point x="618" y="1729" type="curve" name="dv02" smooth="yes"/>
+      <point x="618" y="1729" type="curve" smooth="yes" name="dv02"/>
       <point x="719" y="1729"/>
       <point x="782" y="1769"/>
       <point x="809" y="1850" type="curve" name="sv01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni041A_.glif b/source/Hack-Bold.ufo/glyphs/uni041A_.glif
index acaaff141..bc7a3eec3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni041A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni041A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni041A" format="1">
+<glyph name="uni041A" format="2">
   <advance width="1233"/>
   <unicode hex="041A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni041B_.glif b/source/Hack-Bold.ufo/glyphs/uni041B_.glif
index ee2771c77..6ac3fcb7b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni041B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni041B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni041B" format="1">
+<glyph name="uni041B" format="2">
   <advance width="1233"/>
   <unicode hex="041B"/>
   <outline>
@@ -8,23 +8,23 @@
       <point x="36" y="265" type="line" smooth="yes"/>
       <point x="171" y="265"/>
       <point x="228" y="330"/>
-      <point x="233" y="473" type="curve" name="sh02" smooth="yes"/>
+      <point x="233" y="473" type="curve" smooth="yes" name="sh02"/>
       <point x="241" y="695"/>
       <point x="246" y="836"/>
-      <point x="246" y="1065" type="curve" name="sh01" smooth="yes"/>
+      <point x="246" y="1065" type="curve" smooth="yes" name="sh01"/>
       <point x="246" y="1493" type="line" name="at01"/>
       <point x="1116" y="1493" type="line"/>
       <point x="1116" y="0" type="line" name="sh03"/>
       <point x="821" y="0" type="line" name="ah01"/>
       <point x="821" y="1233" type="line" name="sv01"/>
       <point x="541" y="1233" type="line"/>
-      <point x="541" y="1057" type="line" name="sh04" smooth="yes"/>
+      <point x="541" y="1057" type="line" smooth="yes" name="sh04"/>
       <point x="541" y="574"/>
       <point x="545" y="264"/>
       <point x="418" y="113" type="curve" smooth="yes"/>
       <point x="355" y="38"/>
       <point x="255" y="0"/>
-      <point x="118" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="118" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="26" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni041C_.glif b/source/Hack-Bold.ufo/glyphs/uni041C_.glif
index 495394e23..1e0b7cdd2 100644
--- a/source/Hack-Bold.ufo/glyphs/uni041C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni041C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni041C" format="1">
+<glyph name="uni041C" format="2">
   <advance width="1233"/>
   <unicode hex="041C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni041D_.glif b/source/Hack-Bold.ufo/glyphs/uni041D_.glif
index 6f581e86b..ac931823e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni041D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni041D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni041D" format="1">
+<glyph name="uni041D" format="2">
   <advance width="1233"/>
   <unicode hex="041D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni041E_.glif b/source/Hack-Bold.ufo/glyphs/uni041E_.glif
index 6648188e3..2d1826818 100644
--- a/source/Hack-Bold.ufo/glyphs/uni041E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni041E_.glif
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni041E" format="1">
+<glyph name="uni041E" format="2">
   <advance width="1233"/>
   <unicode hex="041E"/>
   <outline>
     <contour>
-      <point x="617" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="270" y="-29"/>
       <point x="92" y="237"/>
-      <point x="92" y="746" type="curve" name="sh01" smooth="yes"/>
+      <point x="92" y="746" type="curve" smooth="yes" name="sh01"/>
       <point x="92" y="1255"/>
       <point x="270" y="1520"/>
-      <point x="617" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="617" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="962" y="1520"/>
       <point x="1141" y="1257"/>
-      <point x="1141" y="746" type="curve" name="sh02" smooth="yes"/>
+      <point x="1141" y="746" type="curve" smooth="yes" name="sh02"/>
       <point x="1141" y="235"/>
       <point x="962" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="236" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="236" type="curve" smooth="yes" name="dv01"/>
       <point x="692" y="236"/>
       <point x="747" y="276"/>
       <point x="782" y="357" type="curve" smooth="yes"/>
       <point x="817" y="436"/>
       <point x="834" y="566"/>
-      <point x="834" y="746" type="curve" name="ah01" smooth="yes"/>
+      <point x="834" y="746" type="curve" smooth="yes" name="ah01"/>
       <point x="834" y="925"/>
       <point x="817" y="1055"/>
       <point x="782" y="1134" type="curve" smooth="yes"/>
       <point x="747" y="1215"/>
       <point x="692" y="1255"/>
-      <point x="616" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="537" y="1255"/>
       <point x="486" y="1214"/>
       <point x="451" y="1134" type="curve" smooth="yes"/>
       <point x="416" y="1055"/>
       <point x="399" y="925"/>
-      <point x="399" y="746" type="curve" name="sh03" smooth="yes"/>
+      <point x="399" y="746" type="curve" smooth="yes" name="sh03"/>
       <point x="399" y="566"/>
       <point x="416" y="436"/>
       <point x="451" y="357" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni041F_.glif b/source/Hack-Bold.ufo/glyphs/uni041F_.glif
index a1f84ed7b..728fbbe6f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni041F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni041F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni041F" format="1">
+<glyph name="uni041F" format="2">
   <advance width="1233"/>
   <unicode hex="041F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0420.glif b/source/Hack-Bold.ufo/glyphs/uni0420.glif
index 2c2512d0a..594fcc7c1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0420.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0420.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0420" format="1">
+<glyph name="uni0420" format="2">
   <advance width="1233"/>
   <unicode hex="0420"/>
   <outline>
@@ -8,22 +8,22 @@
       <point x="567" y="1493" type="line" smooth="yes"/>
       <point x="979" y="1493"/>
       <point x="1147" y="1355"/>
-      <point x="1147" y="1026" type="curve" name="sh01" smooth="yes"/>
+      <point x="1147" y="1026" type="curve" smooth="yes" name="sh01"/>
       <point x="1147" y="697"/>
       <point x="979" y="559"/>
-      <point x="567" y="559" type="curve" name="dv01" smooth="yes"/>
+      <point x="567" y="559" type="curve" smooth="yes" name="dv01"/>
       <point x="457" y="559" type="line" name="sh03"/>
       <point x="457" y="0" type="line" name="ab01"/>
       <point x="162" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="578" y="807" type="line" name="dv02" smooth="yes"/>
+      <point x="578" y="807" type="line" smooth="yes" name="dv02"/>
       <point x="770" y="807"/>
       <point x="840" y="865"/>
-      <point x="840" y="1026" type="curve" name="ah01" smooth="yes"/>
+      <point x="840" y="1026" type="curve" smooth="yes" name="ah01"/>
       <point x="840" y="1187"/>
       <point x="770" y="1245"/>
-      <point x="578" y="1245" type="curve" name="sv01" smooth="yes"/>
+      <point x="578" y="1245" type="curve" smooth="yes" name="sv01"/>
       <point x="457" y="1245" type="line" name="sh02"/>
       <point x="457" y="807" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0421.glif b/source/Hack-Bold.ufo/glyphs/uni0421.glif
index b0596bd20..1636820a9 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0421.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0421.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0421" format="1">
+<glyph name="uni0421" format="2">
   <advance width="1233"/>
   <unicode hex="0421"/>
   <outline>
     <contour>
-      <point x="759" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="759" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="560" y="-29"/>
       <point x="407" y="37"/>
       <point x="300" y="170" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0422.glif b/source/Hack-Bold.ufo/glyphs/uni0422.glif
index 742d1b647..fc9b475be 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0422.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0422.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0422" format="1">
+<glyph name="uni0422" format="2">
   <advance width="1233"/>
   <unicode hex="0422"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0423.glif b/source/Hack-Bold.ufo/glyphs/uni0423.glif
index a57a6683b..eda4c1126 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0423.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0423.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0423" format="1">
+<glyph name="uni0423" format="2">
   <advance width="1233"/>
   <unicode hex="0423"/>
   <outline>
@@ -18,7 +18,7 @@
       <point x="737" y="303" type="line" smooth="yes"/>
       <point x="654" y="98"/>
       <point x="551" y="0"/>
-      <point x="395" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="395" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="195" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0424.glif b/source/Hack-Bold.ufo/glyphs/uni0424.glif
index 2632e80e9..e420af732 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0424.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0424.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0424" format="1">
+<glyph name="uni0424" format="2">
   <advance width="1233"/>
   <unicode hex="0424"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="489" y="132" type="line" name="hr00"/>
       <point x="213" y="156"/>
       <point x="30" y="441"/>
-      <point x="30" y="761" type="curve" name="sh01" smooth="yes"/>
+      <point x="30" y="761" type="curve" smooth="yes" name="sh01"/>
       <point x="30" y="1078"/>
       <point x="211" y="1367"/>
       <point x="489" y="1391" type="curve" name="sh02"/>
@@ -16,7 +16,7 @@
       <point x="744" y="1391" type="line"/>
       <point x="1020" y="1367"/>
       <point x="1203" y="1080"/>
-      <point x="1203" y="760" type="curve" name="sh06" smooth="yes"/>
+      <point x="1203" y="760" type="curve" smooth="yes" name="sh06"/>
       <point x="1203" y="441"/>
       <point x="1020" y="156"/>
       <point x="744" y="132" type="curve" name="sh03"/>
@@ -27,7 +27,7 @@
       <point x="489" y="1136" type="line" name="sh07"/>
       <point x="336" y="1104"/>
       <point x="284" y="950"/>
-      <point x="284" y="763" type="curve" name="sh08" smooth="yes"/>
+      <point x="284" y="763" type="curve" smooth="yes" name="sh08"/>
       <point x="284" y="590"/>
       <point x="329" y="419"/>
       <point x="489" y="387" type="curve"/>
@@ -36,7 +36,7 @@
       <point x="744" y="387" type="line" name="sh09"/>
       <point x="897" y="419"/>
       <point x="949" y="571"/>
-      <point x="949" y="760" type="curve" name="sh05" smooth="yes"/>
+      <point x="949" y="760" type="curve" smooth="yes" name="sh05"/>
       <point x="949" y="936"/>
       <point x="904" y="1104"/>
       <point x="744" y="1136" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0425.glif b/source/Hack-Bold.ufo/glyphs/uni0425.glif
index 8c4f96a4a..37e26b72f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0425.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0425.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0425" format="1">
+<glyph name="uni0425" format="2">
   <advance width="1233"/>
   <unicode hex="0425"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0426.glif b/source/Hack-Bold.ufo/glyphs/uni0426.glif
index 4de839bc1..886a1c6eb 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0426.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0426.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0426" format="1">
+<glyph name="uni0426" format="2">
   <advance width="1233"/>
   <unicode hex="0426"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0427.glif b/source/Hack-Bold.ufo/glyphs/uni0427.glif
index 645b36884..5f8bffeff 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0427.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0427.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0427" format="1">
+<glyph name="uni0427" format="2">
   <advance width="1233"/>
   <unicode hex="0427"/>
   <outline>
@@ -7,19 +7,19 @@
       <point x="828" y="766" type="line" name="hr00"/>
       <point x="788" y="663"/>
       <point x="681" y="607"/>
-      <point x="488" y="607" type="curve" name="dv01" smooth="yes"/>
+      <point x="488" y="607" type="curve" smooth="yes" name="dv01"/>
       <point x="203" y="607"/>
       <point x="93" y="731"/>
-      <point x="93" y="1027" type="curve" name="sh01" smooth="yes"/>
+      <point x="93" y="1027" type="curve" smooth="yes" name="sh01"/>
       <point x="93" y="1556" type="line" name="at01"/>
       <point x="384" y="1556" type="line"/>
-      <point x="384" y="1095" type="line" name="sh02" smooth="yes"/>
+      <point x="384" y="1095" type="line" smooth="yes" name="sh02"/>
       <point x="384" y="904"/>
       <point x="485" y="870"/>
-      <point x="594" y="870" type="curve" name="dv02" smooth="yes"/>
+      <point x="594" y="870" type="curve" smooth="yes" name="dv02"/>
       <point x="780" y="870"/>
       <point x="828" y="965"/>
-      <point x="828" y="1136" type="curve" name="sh03" smooth="yes"/>
+      <point x="828" y="1136" type="curve" smooth="yes" name="sh03"/>
       <point x="828" y="1556" type="line" name="at02"/>
       <point x="1119" y="1556" type="line"/>
       <point x="1119" y="0" type="line" name="sh04"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0428.glif b/source/Hack-Bold.ufo/glyphs/uni0428.glif
index 134ede0b9..73992f582 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0428.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0428.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0428" format="1">
+<glyph name="uni0428" format="2">
   <advance width="1233"/>
   <unicode hex="0428"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0429.glif b/source/Hack-Bold.ufo/glyphs/uni0429.glif
index 6c3726eaa..8deaa69ae 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0429.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0429.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0429" format="1">
+<glyph name="uni0429" format="2">
   <advance width="1233"/>
   <unicode hex="0429"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni042A_.glif b/source/Hack-Bold.ufo/glyphs/uni042A_.glif
index 2ab01d399..70834cf40 100644
--- a/source/Hack-Bold.ufo/glyphs/uni042A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni042A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni042A" format="1">
+<glyph name="uni042A" format="2">
   <advance width="1233"/>
   <unicode hex="042A"/>
   <outline>
@@ -9,23 +9,23 @@
       <point x="30" y="1493" type="line" name="at01"/>
       <point x="575" y="1493" type="line" name="sh01"/>
       <point x="575" y="913" type="line"/>
-      <point x="605" y="913" type="line" name="dv02" smooth="yes"/>
+      <point x="605" y="913" type="line" smooth="yes" name="dv02"/>
       <point x="1014" y="913"/>
       <point x="1185" y="774"/>
-      <point x="1185" y="456" type="curve" name="sh02" smooth="yes"/>
+      <point x="1185" y="456" type="curve" smooth="yes" name="sh02"/>
       <point x="1185" y="143"/>
       <point x="1020" y="0"/>
-      <point x="605" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="605" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="280" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="616" y="236" type="line" name="sv01" smooth="yes"/>
+      <point x="616" y="236" type="line" smooth="yes" name="sv01"/>
       <point x="824" y="236"/>
       <point x="886" y="294"/>
-      <point x="886" y="455" type="curve" name="ah01" smooth="yes"/>
+      <point x="886" y="455" type="curve" smooth="yes" name="ah01"/>
       <point x="886" y="624"/>
       <point x="818" y="678"/>
-      <point x="616" y="678" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="678" type="curve" smooth="yes" name="dv01"/>
       <point x="575" y="678" type="line" name="sh03"/>
       <point x="575" y="236" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni042B_.glif b/source/Hack-Bold.ufo/glyphs/uni042B_.glif
index 6139d6115..2741411eb 100644
--- a/source/Hack-Bold.ufo/glyphs/uni042B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni042B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni042B" format="1">
+<glyph name="uni042B" format="2">
   <advance width="1233"/>
   <unicode hex="042B"/>
   <outline>
@@ -7,13 +7,13 @@
       <point x="40" y="1493" type="line" name="hr00"/>
       <point x="295" y="1493" type="line" name="dh01"/>
       <point x="295" y="913" type="line"/>
-      <point x="305" y="913" type="line" name="dv01" smooth="yes"/>
+      <point x="305" y="913" type="line" smooth="yes" name="dv01"/>
       <point x="655" y="913"/>
       <point x="841" y="774"/>
-      <point x="841" y="456" type="curve" name="dh03" smooth="yes"/>
+      <point x="841" y="456" type="curve" smooth="yes" name="dh03"/>
       <point x="841" y="143"/>
       <point x="661" y="0"/>
-      <point x="305" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="305" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="40" y="0" type="line"/>
     </contour>
     <contour>
@@ -23,10 +23,10 @@
       <point x="938" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="316" y="236" type="line" name="sv01" smooth="yes"/>
+      <point x="316" y="236" type="line" smooth="yes" name="sv01"/>
       <point x="524" y="236"/>
       <point x="586" y="294"/>
-      <point x="586" y="455" type="curve" name="dh02" smooth="yes"/>
+      <point x="586" y="455" type="curve" smooth="yes" name="dh02"/>
       <point x="586" y="624"/>
       <point x="518" y="678"/>
       <point x="316" y="678" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni042C_.glif b/source/Hack-Bold.ufo/glyphs/uni042C_.glif
index 7284588a9..4912c3cd7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni042C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni042C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni042C" format="1">
+<glyph name="uni042C" format="2">
   <advance width="1233"/>
   <unicode hex="042C"/>
   <outline>
@@ -7,23 +7,23 @@
       <point x="164" y="1493" type="line" name="hr00"/>
       <point x="459" y="1493" type="line" name="sh01"/>
       <point x="459" y="913" type="line"/>
-      <point x="569" y="913" type="line" name="dv02" smooth="yes"/>
+      <point x="569" y="913" type="line" smooth="yes" name="dv02"/>
       <point x="978" y="913"/>
       <point x="1149" y="774"/>
-      <point x="1149" y="456" type="curve" name="sh02" smooth="yes"/>
+      <point x="1149" y="456" type="curve" smooth="yes" name="sh02"/>
       <point x="1149" y="143"/>
       <point x="984" y="0"/>
-      <point x="569" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="569" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="164" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="580" y="236" type="line" name="sv01" smooth="yes"/>
+      <point x="580" y="236" type="line" smooth="yes" name="sv01"/>
       <point x="788" y="236"/>
       <point x="850" y="294"/>
-      <point x="850" y="455" type="curve" name="ah01" smooth="yes"/>
+      <point x="850" y="455" type="curve" smooth="yes" name="ah01"/>
       <point x="850" y="624"/>
       <point x="782" y="678"/>
-      <point x="580" y="678" type="curve" name="dv01" smooth="yes"/>
+      <point x="580" y="678" type="curve" smooth="yes" name="dv01"/>
       <point x="459" y="678" type="line" name="sh03"/>
       <point x="459" y="236" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni042D_.glif b/source/Hack-Bold.ufo/glyphs/uni042D_.glif
index e31431f80..6c0bf1a3e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni042D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni042D_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni042D" format="1">
+<glyph name="uni042D" format="2">
   <advance width="1233"/>
   <unicode hex="042D"/>
   <outline>
     <contour>
-      <point x="505" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="505" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="386" y="-29"/>
       <point x="287" y="-5"/>
       <point x="192" y="43" type="curve"/>
       <point x="192" y="371" type="line"/>
       <point x="289" y="281"/>
       <point x="390" y="236"/>
-      <point x="496" y="236" type="curve" name="dv01" smooth="yes"/>
+      <point x="496" y="236" type="curve" smooth="yes" name="dv01"/>
       <point x="677" y="236"/>
       <point x="780" y="362"/>
       <point x="807" y="615" type="curve" name="dv02"/>
@@ -20,14 +20,14 @@
       <point x="807" y="875" type="line" name="dv03"/>
       <point x="780" y="1128"/>
       <point x="676" y="1255"/>
-      <point x="495" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="495" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="390" y="1255"/>
       <point x="289" y="1210"/>
       <point x="192" y="1120" type="curve"/>
       <point x="192" y="1448" type="line"/>
       <point x="282" y="1496"/>
       <point x="386" y="1520"/>
-      <point x="503" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="503" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="903" y="1520"/>
       <point x="1121" y="1247"/>
       <point x="1121" y="746" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni042E_.glif b/source/Hack-Bold.ufo/glyphs/uni042E_.glif
index 8c6c72062..724bebb54 100644
--- a/source/Hack-Bold.ufo/glyphs/uni042E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni042E_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni042E" format="1">
+<glyph name="uni042E" format="2">
   <advance width="1233"/>
   <unicode hex="042E"/>
   <outline>
     <contour>
-      <point x="820" y="-29" type="curve" name="av01" smooth="yes"/>
+      <point x="820" y="-29" type="curve" smooth="yes" name="av01"/>
       <point x="708" y="-29"/>
       <point x="606" y="31"/>
       <point x="537" y="167" type="curve"/>
@@ -20,7 +20,7 @@
       <point x="416" y="911" type="line" name="sh04"/>
       <point x="444" y="1186"/>
       <point x="558" y="1520"/>
-      <point x="843" y="1520" type="curve" name="at02" smooth="yes"/>
+      <point x="843" y="1520" type="curve" smooth="yes" name="at02"/>
       <point x="972" y="1520"/>
       <point x="1071" y="1452"/>
       <point x="1134" y="1324" type="curve" smooth="yes"/>
@@ -31,7 +31,7 @@
       <point x="1058" y="-29"/>
     </contour>
     <contour>
-      <point x="739" y="356" type="curve" name="hr01" smooth="yes"/>
+      <point x="739" y="356" type="curve" smooth="yes" name="hr01"/>
       <point x="787" y="212"/>
       <point x="870" y="205"/>
       <point x="910" y="356" type="curve"/>
@@ -40,13 +40,13 @@
       <point x="910" y="1134" type="curve" smooth="yes"/>
       <point x="887" y="1214"/>
       <point x="861" y="1255"/>
-      <point x="822" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="822" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="783" y="1255"/>
       <point x="756" y="1211"/>
       <point x="739" y="1134" type="curve"/>
       <point x="711" y="1031"/>
       <point x="697" y="907"/>
-      <point x="697" y="740" type="curve" name="sh05" smooth="yes"/>
+      <point x="697" y="740" type="curve" smooth="yes" name="sh05"/>
       <point x="697" y="573"/>
       <point x="711" y="441"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni042F_.glif b/source/Hack-Bold.ufo/glyphs/uni042F_.glif
index 4ee919f4e..2f011999a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni042F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni042F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni042F" format="1">
+<glyph name="uni042F" format="2">
   <advance width="1233"/>
   <unicode hex="042F"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="359" y="644" type="line" name="hr00"/>
       <point x="255" y="697"/>
       <point x="95" y="810"/>
-      <point x="95" y="1078" type="curve" name="sh01" smooth="yes"/>
+      <point x="95" y="1078" type="curve" smooth="yes" name="sh01"/>
       <point x="95" y="1366"/>
       <point x="279" y="1493"/>
-      <point x="634" y="1493" type="curve" name="at01" smooth="yes"/>
+      <point x="634" y="1493" type="curve" smooth="yes" name="at01"/>
       <point x="1110" y="1493" type="line"/>
       <point x="1110" y="0" type="line" name="sh02"/>
       <point x="815" y="0" type="line" name="ah01"/>
@@ -25,7 +25,7 @@
       <point x="626" y="1245" type="line" smooth="yes"/>
       <point x="478" y="1245"/>
       <point x="400" y="1187"/>
-      <point x="400" y="1042" type="curve" name="sh04" smooth="yes"/>
+      <point x="400" y="1042" type="curve" smooth="yes" name="sh04"/>
       <point x="400" y="897"/>
       <point x="478" y="838"/>
       <point x="626" y="838" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0430.glif b/source/Hack-Bold.ufo/glyphs/uni0430.glif
index 56cd6fdb0..648aaeda5 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0430.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0430.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0430" format="1">
+<glyph name="uni0430" format="2">
   <advance width="1233"/>
   <unicode hex="0430"/>
   <outline>
     <contour>
-      <point x="494" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="494" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="373" y="-29"/>
       <point x="274" y="4"/>
       <point x="202" y="72" type="curve" smooth="yes"/>
       <point x="131" y="139"/>
       <point x="95" y="233"/>
-      <point x="95" y="354" type="curve" name="sh01" smooth="yes"/>
+      <point x="95" y="354" type="curve" smooth="yes" name="sh01"/>
       <point x="95" y="482"/>
       <point x="134" y="580"/>
       <point x="222" y="644" type="curve" smooth="yes"/>
@@ -24,35 +24,35 @@
       <point x="767" y="894" type="curve" smooth="yes"/>
       <point x="732" y="919"/>
       <point x="679" y="930"/>
-      <point x="610" y="930" type="curve" name="dv03" smooth="yes"/>
+      <point x="610" y="930" type="curve" smooth="yes" name="dv03"/>
       <point x="546" y="930"/>
       <point x="477" y="921"/>
-      <point x="412" y="904" type="curve" name="sh03" smooth="yes"/>
+      <point x="412" y="904" type="curve" smooth="yes" name="sh03"/>
       <point x="348" y="887"/>
       <point x="278" y="858"/>
       <point x="206" y="819" type="curve" name="ih01"/>
       <point x="206" y="1069" type="line"/>
       <point x="262" y="1092"/>
       <point x="336" y="1116"/>
-      <point x="403" y="1128" type="curve" name="sh04" smooth="yes"/>
+      <point x="403" y="1128" type="curve" smooth="yes" name="sh04"/>
       <point x="458" y="1139"/>
       <point x="540" y="1148"/>
-      <point x="628" y="1148" type="curve" name="hr01" smooth="yes"/>
+      <point x="628" y="1148" type="curve" smooth="yes" name="hr01"/>
       <point x="815" y="1148"/>
       <point x="927" y="1102"/>
       <point x="997" y="1035" type="curve"/>
       <point x="1069" y="963"/>
       <point x="1109" y="852"/>
-      <point x="1109" y="644" type="curve" name="sh05" smooth="yes"/>
+      <point x="1109" y="644" type="curve" smooth="yes" name="sh05"/>
       <point x="1109" y="570"/>
       <point x="1104" y="323"/>
-      <point x="1104" y="274" type="curve" name="sh06" smooth="yes"/>
+      <point x="1104" y="274" type="curve" smooth="yes" name="sh06"/>
       <point x="1104" y="246"/>
       <point x="1105" y="216"/>
-      <point x="1106" y="197" type="curve" name="sh07" smooth="yes"/>
+      <point x="1106" y="197" type="curve" smooth="yes" name="sh07"/>
       <point x="1109" y="170"/>
       <point x="1110" y="142"/>
-      <point x="1113" y="125" type="curve" name="sh08" smooth="yes"/>
+      <point x="1113" y="125" type="curve" smooth="yes" name="sh08"/>
       <point x="1117" y="98"/>
       <point x="1123" y="71"/>
       <point x="1127" y="58" type="curve" smooth="yes"/>
@@ -68,18 +68,18 @@
       <point x="824" y="125" type="curve" name="sh09"/>
       <point x="787" y="76"/>
       <point x="740" y="38"/>
-      <point x="682" y="11" type="curve" name="ab02" smooth="yes"/>
+      <point x="682" y="11" type="curve" smooth="yes" name="ab02"/>
       <point x="626" y="-16"/>
       <point x="570" y="-29"/>
     </contour>
     <contour>
-      <point x="576" y="174" type="curve" name="dv02" smooth="yes"/>
+      <point x="576" y="174" type="curve" smooth="yes" name="dv02"/>
       <point x="651" y="174"/>
       <point x="711" y="202"/>
       <point x="754" y="262" type="curve"/>
       <point x="797" y="319"/>
       <point x="818" y="401"/>
-      <point x="818" y="506" type="curve" name="sh10" smooth="yes"/>
+      <point x="818" y="506" type="curve" smooth="yes" name="sh10"/>
       <point x="818" y="526" type="line" name="dv04"/>
       <point x="701" y="526" type="line" smooth="yes"/>
       <point x="591" y="526"/>
@@ -87,7 +87,7 @@
       <point x="472" y="484" type="curve" smooth="yes"/>
       <point x="429" y="456"/>
       <point x="407" y="409"/>
-      <point x="407" y="342" type="curve" name="sh02" smooth="yes"/>
+      <point x="407" y="342" type="curve" smooth="yes" name="sh02"/>
       <point x="407" y="287"/>
       <point x="421" y="250"/>
       <point x="452" y="219" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0431.glif b/source/Hack-Bold.ufo/glyphs/uni0431.glif
index 9c522cbc1..c06ad8775 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0431.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0431.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0431" format="1">
+<glyph name="uni0431" format="2">
   <advance width="1233"/>
   <unicode hex="0431"/>
   <outline>
     <contour>
-      <point x="636" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="636" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="320" y="-29"/>
       <point x="118" y="198"/>
-      <point x="118" y="559" type="curve" name="sh01" smooth="yes"/>
+      <point x="118" y="559" type="curve" smooth="yes" name="sh01"/>
       <point x="118" y="594"/>
       <point x="118" y="614"/>
       <point x="117" y="621" type="curve" name="sh02"/>
@@ -20,10 +20,10 @@
       <point x="87" y="1024" type="curve" smooth="yes"/>
       <point x="106" y="1190"/>
       <point x="183" y="1415"/>
-      <point x="400" y="1517" type="curve" name="sh04" smooth="yes"/>
+      <point x="400" y="1517" type="curve" smooth="yes" name="sh04"/>
       <point x="510" y="1568"/>
       <point x="632" y="1580"/>
-      <point x="863" y="1593" type="curve" name="sh05" smooth="yes"/>
+      <point x="863" y="1593" type="curve" smooth="yes" name="sh05"/>
       <point x="910" y="1596"/>
       <point x="921" y="1598"/>
       <point x="949" y="1611" type="curve" name="av01"/>
@@ -40,24 +40,24 @@
       <point x="318" y="1045" type="curve" name="ih01"/>
       <point x="403" y="1113"/>
       <point x="509" y="1147"/>
-      <point x="634" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="634" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="954" y="1147"/>
       <point x="1155" y="920"/>
-      <point x="1155" y="559" type="curve" name="sh06" smooth="yes"/>
+      <point x="1155" y="559" type="curve" smooth="yes" name="sh06"/>
       <point x="1155" y="198"/>
       <point x="953" y="-29"/>
     </contour>
     <contour>
-      <point x="636" y="209" type="curve" name="dv01" smooth="yes"/>
+      <point x="636" y="209" type="curve" smooth="yes" name="dv01"/>
       <point x="777" y="209"/>
       <point x="862" y="338"/>
-      <point x="862" y="559" type="curve" name="ah01" smooth="yes"/>
+      <point x="862" y="559" type="curve" smooth="yes" name="ah01"/>
       <point x="862" y="778"/>
       <point x="777" y="909"/>
-      <point x="636" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="636" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="496" y="909"/>
       <point x="411" y="778"/>
-      <point x="411" y="559" type="curve" name="sh03" smooth="yes"/>
+      <point x="411" y="559" type="curve" smooth="yes" name="sh03"/>
       <point x="411" y="338"/>
       <point x="496" y="209"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0432.glif b/source/Hack-Bold.ufo/glyphs/uni0432.glif
index 1c180cf72..2daaaca4b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0432.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0432.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0432" format="1">
+<glyph name="uni0432" format="2">
   <advance width="1233"/>
   <unicode hex="0432"/>
   <outline>
@@ -8,43 +8,43 @@
       <point x="607" y="1120" type="line" smooth="yes"/>
       <point x="936" y="1120"/>
       <point x="1085" y="1032"/>
-      <point x="1085" y="827" type="curve" name="dh03" smooth="yes"/>
+      <point x="1085" y="827" type="curve" smooth="yes" name="dh03"/>
       <point x="1085" y="701"/>
       <point x="1029" y="639"/>
       <point x="924" y="599" type="curve" name="ih01"/>
       <point x="1063" y="560"/>
       <point x="1134" y="459"/>
-      <point x="1134" y="318" type="curve" name="sh02" smooth="yes"/>
+      <point x="1134" y="318" type="curve" smooth="yes" name="sh02"/>
       <point x="1134" y="113"/>
       <point x="981" y="0"/>
-      <point x="656" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="656" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="139" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="587" y="698" type="line" name="dv01" smooth="yes"/>
+      <point x="587" y="698" type="line" smooth="yes" name="dv01"/>
       <point x="683" y="698"/>
       <point x="736" y="706"/>
       <point x="764" y="722" type="curve" smooth="yes"/>
       <point x="787" y="735"/>
       <point x="803" y="759"/>
-      <point x="803" y="794" type="curve" name="hr01" smooth="yes"/>
+      <point x="803" y="794" type="curve" smooth="yes" name="hr01"/>
       <point x="803" y="825"/>
       <point x="791" y="854"/>
       <point x="764" y="873" type="curve" smooth="yes"/>
       <point x="736" y="892"/>
       <point x="683" y="901"/>
-      <point x="587" y="901" type="curve" name="sv01" smooth="yes"/>
+      <point x="587" y="901" type="curve" smooth="yes" name="sv01"/>
       <point x="431" y="901" type="line" name="dh02"/>
       <point x="431" y="698" type="line"/>
     </contour>
     <contour>
-      <point x="598" y="219" type="line" name="hr02" smooth="yes"/>
+      <point x="598" y="219" type="line" smooth="yes" name="hr02"/>
       <point x="766" y="219"/>
       <point x="841" y="257"/>
-      <point x="841" y="350" type="curve" name="sh01" smooth="yes"/>
+      <point x="841" y="350" type="curve" smooth="yes" name="sh01"/>
       <point x="841" y="443"/>
       <point x="766" y="479"/>
-      <point x="598" y="479" type="curve" name="hr03" smooth="yes"/>
+      <point x="598" y="479" type="curve" smooth="yes" name="hr03"/>
       <point x="431" y="479" type="line" name="sh03"/>
       <point x="431" y="219" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0433.glif b/source/Hack-Bold.ufo/glyphs/uni0433.glif
index 34f8c95d0..7f15a2722 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0433.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0433.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0433" format="1">
+<glyph name="uni0433" format="2">
   <advance width="1233"/>
   <unicode hex="0433"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0434.glif b/source/Hack-Bold.ufo/glyphs/uni0434.glif
index c3ab4cf8b..8d071b902 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0434.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0434.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0434" format="1">
+<glyph name="uni0434" format="2">
   <advance width="1233"/>
   <unicode hex="0434"/>
   <outline>
     <contour>
       <point x="68" y="219" type="line" name="dh01"/>
-      <point x="144" y="219" type="line" name="sv01" smooth="yes"/>
+      <point x="144" y="219" type="line" smooth="yes" name="sv01"/>
       <point x="155" y="219"/>
       <point x="174" y="233"/>
       <point x="190" y="262" type="curve" smooth="yes"/>
       <point x="206" y="289"/>
       <point x="216" y="335"/>
-      <point x="216" y="435" type="curve" name="ih01" smooth="yes"/>
+      <point x="216" y="435" type="curve" smooth="yes" name="ih01"/>
       <point x="216" y="1120" type="line" name="at01"/>
       <point x="1063" y="1120" type="line" name="hr01"/>
       <point x="1063" y="219" type="line" name="dh04"/>
@@ -27,7 +27,7 @@
       <point x="772" y="219" type="line" name="dh03"/>
       <point x="772" y="901" type="line" name="sv02"/>
       <point x="507" y="901" type="line"/>
-      <point x="507" y="459" type="line" name="sh02" smooth="yes"/>
+      <point x="507" y="459" type="line" smooth="yes" name="sh02"/>
       <point x="507" y="361"/>
       <point x="497" y="281"/>
       <point x="476" y="219" type="curve" name="hr05"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0435.glif b/source/Hack-Bold.ufo/glyphs/uni0435.glif
index 637ece009..44d3e0127 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0435.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0435.glif
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0435" format="1">
+<glyph name="uni0435" format="2">
   <advance width="1233"/>
   <unicode hex="0435"/>
   <outline>
     <contour>
-      <point x="679" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="679" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="293" y="-29"/>
       <point x="92" y="178"/>
-      <point x="92" y="550" type="curve" name="sh01" smooth="yes"/>
+      <point x="92" y="550" type="curve" smooth="yes" name="sh01"/>
       <point x="92" y="920"/>
       <point x="291" y="1147"/>
-      <point x="631" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="631" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="954" y="1147"/>
       <point x="1149" y="940"/>
-      <point x="1149" y="584" type="curve" name="sh02" smooth="yes"/>
+      <point x="1149" y="584" type="curve" smooth="yes" name="sh02"/>
       <point x="1149" y="465" type="line"/>
       <point x="390" y="465" type="line" name="sh03"/>
       <point x="391" y="290"/>
       <point x="493" y="203"/>
-      <point x="698" y="203" type="curve" name="dv01" smooth="yes"/>
+      <point x="698" y="203" type="curve" smooth="yes" name="dv01"/>
       <point x="834" y="203"/>
       <point x="958" y="240"/>
       <point x="1102" y="324" type="curve" name="ih01"/>
@@ -30,7 +30,7 @@
       <point x="854" y="685" type="line" name="ah01"/>
       <point x="851" y="840"/>
       <point x="771" y="920"/>
-      <point x="630" y="920" type="curve" name="sv01" smooth="yes"/>
+      <point x="630" y="920" type="curve" smooth="yes" name="sv01"/>
       <point x="486" y="920"/>
       <point x="409" y="837"/>
       <point x="393" y="684" type="curve" name="sh04"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0436.glif b/source/Hack-Bold.ufo/glyphs/uni0436.glif
index 78b5a4a6a..b8aa8d7eb 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0436.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0436.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0436" format="1">
+<glyph name="uni0436" format="2">
   <advance width="1233"/>
   <unicode hex="0436"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0437.glif b/source/Hack-Bold.ufo/glyphs/uni0437.glif
index 3d1f52325..051a11147 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0437.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0437.glif
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0437" format="1">
+<glyph name="uni0437" format="2">
   <advance width="1233"/>
   <unicode hex="0437"/>
   <outline>
     <contour>
-      <point x="522" y="-22" type="curve" name="ab01" smooth="yes"/>
+      <point x="522" y="-22" type="curve" smooth="yes" name="ab01"/>
       <point x="398" y="-22"/>
       <point x="303" y="-9"/>
       <point x="165" y="44" type="curve"/>
       <point x="165" y="280" type="line" name="iv01"/>
       <point x="297" y="215"/>
       <point x="383" y="201"/>
-      <point x="543" y="201" type="curve" name="hr01" smooth="yes"/>
+      <point x="543" y="201" type="curve" smooth="yes" name="hr01"/>
       <point x="691" y="201"/>
       <point x="798" y="212"/>
-      <point x="798" y="319" type="curve" name="sh01" smooth="yes"/>
+      <point x="798" y="319" type="curve" smooth="yes" name="sh01"/>
       <point x="798" y="439"/>
       <point x="660" y="462"/>
-      <point x="568" y="462" type="curve" name="dv01" smooth="yes"/>
+      <point x="568" y="462" type="curve" smooth="yes" name="dv01"/>
       <point x="405" y="462" type="line"/>
       <point x="405" y="681" type="line"/>
-      <point x="542" y="681" type="line" name="dv02" smooth="yes"/>
+      <point x="542" y="681" type="line" smooth="yes" name="dv02"/>
       <point x="654" y="681"/>
       <point x="771" y="711"/>
-      <point x="771" y="805" type="curve" name="dh01" smooth="yes"/>
+      <point x="771" y="805" type="curve" smooth="yes" name="dh01"/>
       <point x="771" y="887"/>
       <point x="686" y="928"/>
-      <point x="516" y="928" type="curve" name="sv01" smooth="yes"/>
+      <point x="516" y="928" type="curve" smooth="yes" name="sv01"/>
       <point x="409" y="928"/>
       <point x="304" y="911"/>
       <point x="202" y="876" type="curve" name="iv02"/>
       <point x="202" y="1099" type="line"/>
       <point x="274" y="1120"/>
       <point x="403" y="1147"/>
-      <point x="559" y="1147" type="curve" name="hr02" smooth="yes"/>
+      <point x="559" y="1147" type="curve" smooth="yes" name="hr02"/>
       <point x="889" y="1147"/>
       <point x="1054" y="1024"/>
-      <point x="1054" y="825" type="curve" name="dh02" smooth="yes"/>
+      <point x="1054" y="825" type="curve" smooth="yes" name="dh02"/>
       <point x="1054" y="670"/>
       <point x="953" y="600"/>
       <point x="869" y="573" type="curve" name="ih01"/>
       <point x="977" y="543"/>
       <point x="1091" y="438"/>
-      <point x="1091" y="287" type="curve" name="sh02" smooth="yes"/>
+      <point x="1091" y="287" type="curve" smooth="yes" name="sh02"/>
       <point x="1091" y="79"/>
       <point x="869" y="-22"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0438.glif b/source/Hack-Bold.ufo/glyphs/uni0438.glif
index 5269080a6..11d9bb744 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0438.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0438.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0438" format="1">
+<glyph name="uni0438" format="2">
   <advance width="1233"/>
   <unicode hex="0438"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0439.glif b/source/Hack-Bold.ufo/glyphs/uni0439.glif
index 3192ecfa6..b34052cad 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0439.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0439.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0439" format="1">
+<glyph name="uni0439" format="2">
   <advance width="1233"/>
   <unicode hex="0439"/>
   <outline>
     <contour>
-      <point x="616" y="1270" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1270" type="curve" smooth="yes" name="sv01"/>
       <point x="407" y="1270"/>
       <point x="289" y="1374"/>
       <point x="281" y="1567" type="curve" name="at01"/>
       <point x="422" y="1567" type="line"/>
       <point x="437" y="1475"/>
       <point x="504" y="1423"/>
-      <point x="616" y="1423" type="curve" name="sv02" smooth="yes"/>
+      <point x="616" y="1423" type="curve" smooth="yes" name="sv02"/>
       <point x="728" y="1423"/>
       <point x="794" y="1474"/>
       <point x="809" y="1567" type="curve" name="sh01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni043A_.glif b/source/Hack-Bold.ufo/glyphs/uni043A_.glif
index 3255455c7..991c637f5 100644
--- a/source/Hack-Bold.ufo/glyphs/uni043A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni043A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni043A" format="1">
+<glyph name="uni043A" format="2">
   <advance width="1233"/>
   <unicode hex="043A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni043B_.glif b/source/Hack-Bold.ufo/glyphs/uni043B_.glif
index 073088028..6e2c49b11 100644
--- a/source/Hack-Bold.ufo/glyphs/uni043B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni043B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni043B" format="1">
+<glyph name="uni043B" format="2">
   <advance width="1233"/>
   <unicode hex="043B"/>
   <outline>
@@ -8,23 +8,23 @@
       <point x="49" y="240" type="line" smooth="yes"/>
       <point x="188" y="240"/>
       <point x="224" y="272"/>
-      <point x="240" y="439" type="curve" name="sh02" smooth="yes"/>
+      <point x="240" y="439" type="curve" smooth="yes" name="sh02"/>
       <point x="248" y="516"/>
       <point x="250" y="621"/>
-      <point x="250" y="700" type="curve" name="sh01" smooth="yes"/>
+      <point x="250" y="700" type="curve" smooth="yes" name="sh01"/>
       <point x="250" y="1120" type="line" name="at01"/>
       <point x="1099" y="1120" type="line"/>
       <point x="1099" y="0" type="line" name="sh03"/>
       <point x="808" y="0" type="line" name="ah01"/>
       <point x="808" y="901" type="line" name="sv01"/>
       <point x="541" y="901" type="line"/>
-      <point x="541" y="704" type="line" name="sh04" smooth="yes"/>
+      <point x="541" y="704" type="line" smooth="yes" name="sh04"/>
       <point x="541" y="509"/>
       <point x="532" y="248"/>
       <point x="433" y="115" type="curve" smooth="yes"/>
       <point x="373" y="35"/>
       <point x="283" y="0"/>
-      <point x="134" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="134" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="39" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni043C_.glif b/source/Hack-Bold.ufo/glyphs/uni043C_.glif
index 61b0712b6..fba54e228 100644
--- a/source/Hack-Bold.ufo/glyphs/uni043C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni043C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni043C" format="1">
+<glyph name="uni043C" format="2">
   <advance width="1233"/>
   <unicode hex="043C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni043D_.glif b/source/Hack-Bold.ufo/glyphs/uni043D_.glif
index a9dfe9152..55e10303e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni043D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni043D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni043D" format="1">
+<glyph name="uni043D" format="2">
   <advance width="1233"/>
   <unicode hex="043D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni043E_.glif b/source/Hack-Bold.ufo/glyphs/uni043E_.glif
index 2c2bd0bd5..c61a4f696 100644
--- a/source/Hack-Bold.ufo/glyphs/uni043E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni043E_.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni043E" format="1">
+<glyph name="uni043E" format="2">
   <advance width="1233"/>
   <unicode hex="043E"/>
   <outline>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="300" y="-29"/>
       <point x="98" y="198"/>
-      <point x="98" y="559" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="559" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="920"/>
       <point x="300" y="1147"/>
-      <point x="616" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="933" y="1147"/>
       <point x="1135" y="920"/>
-      <point x="1135" y="559" type="curve" name="sh02" smooth="yes"/>
+      <point x="1135" y="559" type="curve" smooth="yes" name="sh02"/>
       <point x="1135" y="198"/>
       <point x="933" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="209" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="209" type="curve" smooth="yes" name="dv01"/>
       <point x="757" y="209"/>
       <point x="842" y="338"/>
-      <point x="842" y="559" type="curve" name="ah01" smooth="yes"/>
+      <point x="842" y="559" type="curve" smooth="yes" name="ah01"/>
       <point x="842" y="778"/>
       <point x="757" y="909"/>
-      <point x="616" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="476" y="909"/>
       <point x="391" y="778"/>
-      <point x="391" y="559" type="curve" name="sh03" smooth="yes"/>
+      <point x="391" y="559" type="curve" smooth="yes" name="sh03"/>
       <point x="391" y="338"/>
       <point x="476" y="209"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni043F_.glif b/source/Hack-Bold.ufo/glyphs/uni043F_.glif
index fd9a01c2c..276f39c26 100644
--- a/source/Hack-Bold.ufo/glyphs/uni043F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni043F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni043F" format="1">
+<glyph name="uni043F" format="2">
   <advance width="1233"/>
   <unicode hex="043F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0440.glif b/source/Hack-Bold.ufo/glyphs/uni0440.glif
index 2b0ea9e43..e93ea0a79 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0440.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0440.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0440" format="1">
+<glyph name="uni0440" format="2">
   <advance width="1233"/>
   <unicode hex="0440"/>
   <outline>
@@ -9,13 +9,13 @@
       <point x="442" y="952" type="line" name="sh02"/>
       <point x="502" y="1079"/>
       <point x="598" y="1147"/>
-      <point x="742" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="742" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="994" y="1147"/>
       <point x="1143" y="932"/>
-      <point x="1143" y="559" type="curve" name="sh03" smooth="yes"/>
+      <point x="1143" y="559" type="curve" smooth="yes" name="sh03"/>
       <point x="1143" y="180"/>
       <point x="989" y="-29"/>
-      <point x="738" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="738" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="607" y="-29"/>
       <point x="519" y="27"/>
       <point x="442" y="158" type="curve" name="sh04"/>
@@ -23,16 +23,16 @@
       <point x="150" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="647" y="215" type="curve" name="dv02" smooth="yes"/>
+      <point x="647" y="215" type="curve" smooth="yes" name="dv02"/>
       <point x="774" y="215"/>
       <point x="850" y="345"/>
-      <point x="850" y="561" type="curve" name="ah01" smooth="yes"/>
+      <point x="850" y="561" type="curve" smooth="yes" name="ah01"/>
       <point x="850" y="777"/>
       <point x="774" y="907"/>
-      <point x="647" y="907" type="curve" name="sv01" smooth="yes"/>
+      <point x="647" y="907" type="curve" smooth="yes" name="sv01"/>
       <point x="519" y="907"/>
       <point x="442" y="777"/>
-      <point x="442" y="561" type="curve" name="hr01" smooth="yes"/>
+      <point x="442" y="561" type="curve" smooth="yes" name="hr01"/>
       <point x="442" y="345"/>
       <point x="519" y="215"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0441.glif b/source/Hack-Bold.ufo/glyphs/uni0441.glif
index e84e7c36a..568d77431 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0441.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0441.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0441" format="1">
+<glyph name="uni0441" format="2">
   <advance width="1233"/>
   <unicode hex="0441"/>
   <outline>
     <contour>
-      <point x="702" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="702" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="527" y="-29"/>
       <point x="391" y="23"/>
       <point x="294" y="127" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0442.glif b/source/Hack-Bold.ufo/glyphs/uni0442.glif
index 36f9255b4..aec597516 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0442.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0442.glif
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0442" format="1">
+<glyph name="uni0442" format="2">
   <advance width="1233"/>
   <unicode hex="0442"/>
   <outline>
     <contour>
       <point x="472" y="901" type="line" name="hr00"/>
-      <point x="164" y="901" type="line"/>
-      <point x="164" y="1120" type="line" name="at01"/>
-      <point x="1071" y="1120" type="line"/>
-      <point x="1071" y="901" type="line" name="sv01"/>
+      <point x="134" y="901" type="line"/>
+      <point x="134" y="1120" type="line" name="at01"/>
+      <point x="1101" y="1120" type="line"/>
+      <point x="1101" y="901" type="line" name="sv01"/>
       <point x="763" y="901" type="line" name="dh01"/>
       <point x="763" y="0" type="line" name="ab01"/>
       <point x="472" y="0" type="line"/>
@@ -17,7 +17,7 @@
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
+      <string>2018-05-30 18:05:11 +0000</string>
     </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0443.glif b/source/Hack-Bold.ufo/glyphs/uni0443.glif
index 9e0e4c8bb..42c0f6cc4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0443.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0443.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0443" format="1">
+<glyph name="uni0443" format="2">
   <advance width="1233"/>
   <unicode hex="0443"/>
   <outline>
@@ -18,7 +18,7 @@
       <point x="721" y="-121" type="line" smooth="yes"/>
       <point x="642" y="-332"/>
       <point x="536" y="-424"/>
-      <point x="379" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="379" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="137" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0444.glif b/source/Hack-Bold.ufo/glyphs/uni0444.glif
index de5e786c5..ff11dd517 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0444.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0444.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0444" format="1">
+<glyph name="uni0444" format="2">
   <advance width="1233"/>
   <unicode hex="0444"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="496" y="-29" type="line" name="hr00"/>
       <point x="300" y="-10"/>
       <point x="80" y="200"/>
-      <point x="80" y="559" type="curve" name="dh01" smooth="yes"/>
+      <point x="80" y="559" type="curve" smooth="yes" name="dh01"/>
       <point x="80" y="920"/>
       <point x="300" y="1126"/>
       <point x="496" y="1147" type="curve" name="sh01"/>
@@ -16,7 +16,7 @@
       <point x="736" y="1147" type="line"/>
       <point x="936" y="1126"/>
       <point x="1154" y="920"/>
-      <point x="1154" y="559" type="curve" name="dh05" smooth="yes"/>
+      <point x="1154" y="559" type="curve" smooth="yes" name="dh05"/>
       <point x="1154" y="200"/>
       <point x="936" y="-10"/>
       <point x="736" y="-29" type="curve" name="dh03"/>
@@ -27,7 +27,7 @@
       <point x="496" y="909" type="line" name="sh03"/>
       <point x="403" y="885"/>
       <point x="320" y="786"/>
-      <point x="320" y="559" type="curve" name="dh02" smooth="yes"/>
+      <point x="320" y="559" type="curve" smooth="yes" name="dh02"/>
       <point x="320" y="332"/>
       <point x="403" y="233"/>
       <point x="496" y="209" type="curve"/>
@@ -36,7 +36,7 @@
       <point x="736" y="209" type="line" name="sh04"/>
       <point x="832" y="233"/>
       <point x="914" y="332"/>
-      <point x="914" y="559" type="curve" name="dh04" smooth="yes"/>
+      <point x="914" y="559" type="curve" smooth="yes" name="dh04"/>
       <point x="914" y="786"/>
       <point x="832" y="885"/>
       <point x="736" y="909" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0445.glif b/source/Hack-Bold.ufo/glyphs/uni0445.glif
index 5e65302e9..3496be804 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0445.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0445.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0445" format="1">
+<glyph name="uni0445" format="2">
   <advance width="1233"/>
   <unicode hex="0445"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0446.glif b/source/Hack-Bold.ufo/glyphs/uni0446.glif
index 7e9bd8607..a65edf043 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0446.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0446.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0446" format="1">
+<glyph name="uni0446" format="2">
   <advance width="1233"/>
   <unicode hex="0446"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0447.glif b/source/Hack-Bold.ufo/glyphs/uni0447.glif
index 8f8cbd1a2..cff473947 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0447.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0447.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0447" format="1">
+<glyph name="uni0447" format="2">
   <advance width="1233"/>
   <unicode hex="0447"/>
   <outline>
@@ -8,10 +8,10 @@
       <point x="570" y="416" type="line" smooth="yes"/>
       <point x="310" y="416"/>
       <point x="128" y="496"/>
-      <point x="128" y="813" type="curve" name="sh01" smooth="yes"/>
+      <point x="128" y="813" type="curve" smooth="yes" name="sh01"/>
       <point x="128" y="1120" type="line" name="at01"/>
       <point x="427" y="1120" type="line"/>
-      <point x="427" y="783" type="line" name="sh02" smooth="yes"/>
+      <point x="427" y="783" type="line" smooth="yes" name="sh02"/>
       <point x="427" y="662"/>
       <point x="473" y="633"/>
       <point x="653" y="633" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0448.glif b/source/Hack-Bold.ufo/glyphs/uni0448.glif
index b9ec6f44d..2c38bc824 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0448.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0448.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0448" format="1">
+<glyph name="uni0448" format="2">
   <advance width="1233"/>
   <unicode hex="0448"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0449.glif b/source/Hack-Bold.ufo/glyphs/uni0449.glif
index a10861bc3..c077f3a3f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0449.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0449.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0449" format="1">
+<glyph name="uni0449" format="2">
   <advance width="1233"/>
   <unicode hex="0449"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni044A_.glif b/source/Hack-Bold.ufo/glyphs/uni044A_.glif
index 9f0a21a82..866e99f74 100644
--- a/source/Hack-Bold.ufo/glyphs/uni044A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni044A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni044A" format="1">
+<glyph name="uni044A" format="2">
   <advance width="1233"/>
   <unicode hex="044A"/>
   <outline>
@@ -9,23 +9,23 @@
       <point x="50" y="1120" type="line" name="at01"/>
       <point x="592" y="1120" type="line"/>
       <point x="592" y="698" type="line" name="sh01"/>
-      <point x="719" y="698" type="line" name="dv02" smooth="yes"/>
+      <point x="719" y="698" type="line" smooth="yes" name="dv02"/>
       <point x="1002" y="698"/>
       <point x="1174" y="585"/>
-      <point x="1174" y="350" type="curve" name="sh02" smooth="yes"/>
+      <point x="1174" y="350" type="curve" smooth="yes" name="sh02"/>
       <point x="1174" y="114"/>
       <point x="1002" y="0"/>
-      <point x="719" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="719" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="301" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="665" y="219" type="line" name="sv01" smooth="yes"/>
+      <point x="665" y="219" type="line" smooth="yes" name="sv01"/>
       <point x="813" y="219"/>
       <point x="881" y="257"/>
-      <point x="881" y="350" type="curve" name="ah01" smooth="yes"/>
+      <point x="881" y="350" type="curve" smooth="yes" name="ah01"/>
       <point x="881" y="443"/>
       <point x="813" y="479"/>
-      <point x="665" y="479" type="curve" name="dv01" smooth="yes"/>
+      <point x="665" y="479" type="curve" smooth="yes" name="dv01"/>
       <point x="592" y="479" type="line" name="sh03"/>
       <point x="592" y="219" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni044B_.glif b/source/Hack-Bold.ufo/glyphs/uni044B_.glif
index cd3c772fa..275c2cee4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni044B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni044B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni044B" format="1">
+<glyph name="uni044B" format="2">
   <advance width="1233"/>
   <unicode hex="044B"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="343" y="698" type="line" smooth="yes"/>
       <point x="626" y="698"/>
       <point x="798" y="585"/>
-      <point x="798" y="350" type="curve" name="dh03" smooth="yes"/>
+      <point x="798" y="350" type="curve" smooth="yes" name="dh03"/>
       <point x="798" y="114"/>
       <point x="626" y="0"/>
-      <point x="343" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="343" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="31" y="0" type="line"/>
     </contour>
     <contour>
@@ -23,10 +23,10 @@
       <point x="908" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="349" y="219" type="line" name="sv01" smooth="yes"/>
+      <point x="349" y="219" type="line" smooth="yes" name="sv01"/>
       <point x="416" y="219"/>
       <point x="505" y="257"/>
-      <point x="505" y="350" type="curve" name="dh02" smooth="yes"/>
+      <point x="505" y="350" type="curve" smooth="yes" name="dh02"/>
       <point x="505" y="443"/>
       <point x="416" y="479"/>
       <point x="349" y="479" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni044C_.glif b/source/Hack-Bold.ufo/glyphs/uni044C_.glif
index 9b00f04ed..24a6eebb6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni044C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni044C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni044C" format="1">
+<glyph name="uni044C" format="2">
   <advance width="1233"/>
   <unicode hex="044C"/>
   <outline>
@@ -7,23 +7,23 @@
       <point x="217" y="1120" type="line" name="hr00"/>
       <point x="508" y="1120" type="line" name="sh01"/>
       <point x="508" y="698" type="line"/>
-      <point x="685" y="698" type="line" name="dv02" smooth="yes"/>
+      <point x="685" y="698" type="line" smooth="yes" name="dv02"/>
       <point x="968" y="698"/>
       <point x="1140" y="585"/>
-      <point x="1140" y="350" type="curve" name="sh02" smooth="yes"/>
+      <point x="1140" y="350" type="curve" smooth="yes" name="sh02"/>
       <point x="1140" y="114"/>
       <point x="968" y="0"/>
-      <point x="685" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="685" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="217" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="631" y="219" type="line" name="sv01" smooth="yes"/>
+      <point x="631" y="219" type="line" smooth="yes" name="sv01"/>
       <point x="779" y="219"/>
       <point x="847" y="257"/>
-      <point x="847" y="350" type="curve" name="ah01" smooth="yes"/>
+      <point x="847" y="350" type="curve" smooth="yes" name="ah01"/>
       <point x="847" y="443"/>
       <point x="779" y="479"/>
-      <point x="631" y="479" type="curve" name="dv01" smooth="yes"/>
+      <point x="631" y="479" type="curve" smooth="yes" name="dv01"/>
       <point x="508" y="479" type="line" name="sh03"/>
       <point x="508" y="219" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni044D_.glif b/source/Hack-Bold.ufo/glyphs/uni044D_.glif
index f4b55ed8f..1800ec0a5 100644
--- a/source/Hack-Bold.ufo/glyphs/uni044D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni044D_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni044D" format="1">
+<glyph name="uni044D" format="2">
   <advance width="1233"/>
   <unicode hex="044D"/>
   <outline>
     <contour>
-      <point x="532" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="532" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="403" y="-29"/>
       <point x="290" y="0"/>
       <point x="193" y="57" type="curve"/>
       <point x="193" y="326" type="line"/>
       <point x="284" y="247"/>
       <point x="372" y="209"/>
-      <point x="484" y="209" type="curve" name="dv01" smooth="yes"/>
+      <point x="484" y="209" type="curve" smooth="yes" name="dv01"/>
       <point x="643" y="209"/>
       <point x="752" y="287"/>
       <point x="783" y="458" type="curve" name="dv02"/>
@@ -20,14 +20,14 @@
       <point x="778" y="677" type="line" name="dv03"/>
       <point x="743" y="832"/>
       <point x="648" y="909"/>
-      <point x="491" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="491" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="380" y="909"/>
       <point x="281" y="871"/>
       <point x="193" y="795" type="curve"/>
       <point x="193" y="1063" type="line"/>
       <point x="297" y="1119"/>
       <point x="411" y="1147"/>
-      <point x="534" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="534" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="881" y="1147"/>
       <point x="1086" y="928"/>
       <point x="1086" y="559" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni044E_.glif b/source/Hack-Bold.ufo/glyphs/uni044E_.glif
index 4101a8a7f..77d894c76 100644
--- a/source/Hack-Bold.ufo/glyphs/uni044E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni044E_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni044E" format="1">
+<glyph name="uni044E" format="2">
   <advance width="1233"/>
   <unicode hex="044E"/>
   <outline>
     <contour>
-      <point x="807" y="-29" type="curve" name="av01" smooth="yes"/>
+      <point x="807" y="-29" type="curve" smooth="yes" name="av01"/>
       <point x="618" y="-29"/>
       <point x="463" y="147"/>
       <point x="442" y="480" type="curve" name="dh03"/>
@@ -20,7 +20,7 @@
       <point x="824" y="1147" type="curve" smooth="yes"/>
       <point x="1020" y="1134"/>
       <point x="1208" y="941"/>
-      <point x="1208" y="562" type="curve" name="dh06" smooth="yes"/>
+      <point x="1208" y="562" type="curve" smooth="yes" name="dh06"/>
       <point x="1208" y="167"/>
       <point x="1007" y="-29"/>
     </contour>
@@ -31,19 +31,19 @@
       <point x="922" y="295" type="curve" smooth="yes"/>
       <point x="951" y="356"/>
       <point x="964" y="440"/>
-      <point x="964" y="561" type="curve" name="dh05" smooth="yes"/>
+      <point x="964" y="561" type="curve" smooth="yes" name="dh05"/>
       <point x="964" y="700"/>
       <point x="947" y="779"/>
-      <point x="918" y="831" type="curve" name="hr01" smooth="yes"/>
+      <point x="918" y="831" type="curve" smooth="yes" name="hr01"/>
       <point x="897" y="868"/>
       <point x="858" y="909"/>
-      <point x="824" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="824" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="795" y="909"/>
       <point x="760" y="878"/>
       <point x="733" y="831" type="curve" smooth="yes"/>
       <point x="698" y="768"/>
       <point x="686" y="685"/>
-      <point x="686" y="541" type="curve" name="dh04" smooth="yes"/>
+      <point x="686" y="541" type="curve" smooth="yes" name="dh04"/>
       <point x="686" y="448"/>
       <point x="691" y="362"/>
       <point x="731" y="290" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni044F_.glif b/source/Hack-Bold.ufo/glyphs/uni044F_.glif
index 3a1097685..68d37f3c4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni044F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni044F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni044F" format="1">
+<glyph name="uni044F" format="2">
   <advance width="1233"/>
   <unicode hex="044F"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="365" y="488" type="line" name="hr00"/>
       <point x="248" y="544"/>
       <point x="144" y="637"/>
-      <point x="144" y="810" type="curve" name="sh01" smooth="yes"/>
+      <point x="144" y="810" type="curve" smooth="yes" name="sh01"/>
       <point x="144" y="1020"/>
       <point x="293" y="1120"/>
-      <point x="656" y="1120" type="curve" name="at01" smooth="yes"/>
+      <point x="656" y="1120" type="curve" smooth="yes" name="at01"/>
       <point x="1080" y="1120" type="line"/>
       <point x="1080" y="0" type="line" name="sh02"/>
       <point x="789" y="0" type="line" name="ah01"/>
@@ -25,7 +25,7 @@
       <point x="616" y="909" type="line" smooth="yes"/>
       <point x="508" y="909"/>
       <point x="426" y="872"/>
-      <point x="426" y="779" type="curve" name="sh04" smooth="yes"/>
+      <point x="426" y="779" type="curve" smooth="yes" name="sh04"/>
       <point x="426" y="686"/>
       <point x="508" y="648"/>
       <point x="616" y="648" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0450.glif b/source/Hack-Bold.ufo/glyphs/uni0450.glif
index 53ea5d2c2..daf550b77 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0450.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0450.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0450" format="1">
+<glyph name="uni0450" format="2">
   <advance width="1233"/>
   <unicode hex="0450"/>
   <outline>
@@ -10,21 +10,21 @@
       <point x="606" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="679" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="679" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="293" y="-29"/>
       <point x="92" y="178"/>
-      <point x="92" y="550" type="curve" name="sh01" smooth="yes"/>
+      <point x="92" y="550" type="curve" smooth="yes" name="sh01"/>
       <point x="92" y="920"/>
       <point x="291" y="1147"/>
-      <point x="631" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="631" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="954" y="1147"/>
       <point x="1149" y="940"/>
-      <point x="1149" y="584" type="curve" name="sh03" smooth="yes"/>
+      <point x="1149" y="584" type="curve" smooth="yes" name="sh03"/>
       <point x="1149" y="465" type="line"/>
       <point x="390" y="465" type="line" name="sh02"/>
       <point x="391" y="290"/>
       <point x="493" y="203"/>
-      <point x="698" y="203" type="curve" name="dv02" smooth="yes"/>
+      <point x="698" y="203" type="curve" smooth="yes" name="dv02"/>
       <point x="834" y="203"/>
       <point x="958" y="240"/>
       <point x="1102" y="324" type="curve" name="ih02"/>
@@ -36,7 +36,7 @@
       <point x="854" y="685" type="line" name="ah01"/>
       <point x="851" y="840"/>
       <point x="771" y="920"/>
-      <point x="630" y="920" type="curve" name="sv01" smooth="yes"/>
+      <point x="630" y="920" type="curve" smooth="yes" name="sv01"/>
       <point x="486" y="920"/>
       <point x="409" y="837"/>
       <point x="393" y="684" type="curve" name="sh04"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0451.glif b/source/Hack-Bold.ufo/glyphs/uni0451.glif
index 3350990a0..61ccfd01a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0451.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0451.glif
@@ -1,60 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0451" format="1">
+<glyph name="uni0451" format="2">
   <advance width="1233"/>
   <unicode hex="0451"/>
   <outline>
     <contour>
-      <point x="370" y="1349" type="line" name="dv03" smooth="yes"/>
+      <point x="370" y="1349" type="line" smooth="yes" name="dv03"/>
       <point x="350" y="1349"/>
       <point x="340" y="1359"/>
-      <point x="340" y="1379" type="curve" name="ih01" smooth="yes"/>
+      <point x="340" y="1379" type="curve" smooth="yes" name="ih01"/>
       <point x="340" y="1565" type="line" smooth="yes"/>
       <point x="340" y="1585"/>
       <point x="350" y="1595"/>
-      <point x="370" y="1595" type="curve" name="dv04" smooth="yes"/>
+      <point x="370" y="1595" type="curve" smooth="yes" name="dv04"/>
       <point x="546" y="1595" type="line" smooth="yes"/>
       <point x="566" y="1595"/>
       <point x="576" y="1585"/>
       <point x="576" y="1565" type="curve" smooth="yes"/>
-      <point x="576" y="1379" type="line" name="sh01" smooth="yes"/>
+      <point x="576" y="1379" type="line" smooth="yes" name="sh01"/>
       <point x="576" y="1359"/>
       <point x="566" y="1349"/>
       <point x="546" y="1349" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="765" y="1349" type="line" name="sv01" smooth="yes"/>
+      <point x="765" y="1349" type="line" smooth="yes" name="sv01"/>
       <point x="745" y="1349"/>
       <point x="735" y="1359"/>
-      <point x="735" y="1379" type="curve" name="dh03" smooth="yes"/>
+      <point x="735" y="1379" type="curve" smooth="yes" name="dh03"/>
       <point x="735" y="1565" type="line" smooth="yes"/>
       <point x="735" y="1585"/>
       <point x="745" y="1595"/>
-      <point x="765" y="1595" type="curve" name="sv02" smooth="yes"/>
+      <point x="765" y="1595" type="curve" smooth="yes" name="sv02"/>
       <point x="941" y="1595" type="line" smooth="yes"/>
       <point x="961" y="1595"/>
       <point x="971" y="1585"/>
       <point x="971" y="1565" type="curve" smooth="yes"/>
-      <point x="971" y="1379" type="line" name="hr01" smooth="yes"/>
+      <point x="971" y="1379" type="line" smooth="yes" name="hr01"/>
       <point x="971" y="1359"/>
       <point x="961" y="1349"/>
       <point x="941" y="1349" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="679" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="679" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="293" y="-29"/>
       <point x="92" y="178"/>
-      <point x="92" y="550" type="curve" name="dh01" smooth="yes"/>
+      <point x="92" y="550" type="curve" smooth="yes" name="dh01"/>
       <point x="92" y="920"/>
       <point x="291" y="1147"/>
-      <point x="631" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="631" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="954" y="1147"/>
       <point x="1149" y="940"/>
-      <point x="1149" y="584" type="curve" name="sh02" smooth="yes"/>
+      <point x="1149" y="584" type="curve" smooth="yes" name="sh02"/>
       <point x="1149" y="465" type="line"/>
       <point x="390" y="465" type="line" name="dh02"/>
       <point x="391" y="290"/>
       <point x="493" y="203"/>
-      <point x="698" y="203" type="curve" name="dv02" smooth="yes"/>
+      <point x="698" y="203" type="curve" smooth="yes" name="dv02"/>
       <point x="834" y="203"/>
       <point x="958" y="240"/>
       <point x="1102" y="324" type="curve" name="ih03"/>
@@ -66,7 +66,7 @@
       <point x="854" y="685" type="line" name="ih02"/>
       <point x="851" y="840"/>
       <point x="771" y="920"/>
-      <point x="630" y="920" type="curve" name="sv03" smooth="yes"/>
+      <point x="630" y="920" type="curve" smooth="yes" name="sv03"/>
       <point x="486" y="920"/>
       <point x="409" y="837"/>
       <point x="393" y="684" type="curve" name="sh03"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0452.glif b/source/Hack-Bold.ufo/glyphs/uni0452.glif
index e6f13829f..074b7b05d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0452.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0452.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0452" format="1">
+<glyph name="uni0452" format="2">
   <advance width="1233"/>
   <unicode hex="0452"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="575" y="-199" type="line" name="hr00"/>
       <point x="796" y="-167"/>
       <point x="867" y="15"/>
-      <point x="867" y="279" type="curve" name="ah01" smooth="yes"/>
+      <point x="867" y="279" type="curve" smooth="yes" name="ah01"/>
       <point x="867" y="504"/>
       <point x="815" y="555"/>
-      <point x="703" y="555" type="curve" name="dv01" smooth="yes"/>
+      <point x="703" y="555" type="curve" smooth="yes" name="dv01"/>
       <point x="554" y="555"/>
       <point x="497" y="468"/>
       <point x="497" y="289" type="curve" smooth="yes"/>
@@ -29,10 +29,10 @@
       <point x="497" y="600" type="line" name="ih01"/>
       <point x="537" y="725"/>
       <point x="640" y="795"/>
-      <point x="804" y="795" type="curve" name="dv02" smooth="yes"/>
+      <point x="804" y="795" type="curve" smooth="yes" name="dv02"/>
       <point x="1012" y="795"/>
       <point x="1158" y="680"/>
-      <point x="1158" y="283" type="curve" name="sh06" smooth="yes"/>
+      <point x="1158" y="283" type="curve" smooth="yes" name="sh06"/>
       <point x="1158" y="-69"/>
       <point x="1043" y="-360"/>
       <point x="575" y="-424" type="curve" name="ab01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0453.glif b/source/Hack-Bold.ufo/glyphs/uni0453.glif
index b34dc8221..83aff3166 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0453.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0453.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0453" format="1">
+<glyph name="uni0453" format="2">
   <advance width="1233"/>
   <unicode hex="0453"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0454.glif b/source/Hack-Bold.ufo/glyphs/uni0454.glif
index 39a03a7aa..6f591a2df 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0454.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0454.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0454" format="1">
+<glyph name="uni0454" format="2">
   <advance width="1233"/>
   <unicode hex="0454"/>
   <outline>
     <contour>
-      <point x="697" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="697" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="348" y="-29"/>
       <point x="143" y="191"/>
       <point x="143" y="558" type="curve" smooth="yes"/>
       <point x="143" y="928"/>
       <point x="351" y="1149"/>
-      <point x="696" y="1149" type="curve" name="dv03" smooth="yes"/>
+      <point x="696" y="1149" type="curve" smooth="yes" name="dv03"/>
       <point x="817" y="1149"/>
       <point x="924" y="1123"/>
       <point x="1036" y="1063" type="curve"/>
       <point x="1036" y="795" type="line"/>
       <point x="951" y="868"/>
       <point x="848" y="909"/>
-      <point x="736" y="909" type="curve" name="dv02" smooth="yes"/>
+      <point x="736" y="909" type="curve" smooth="yes" name="dv02"/>
       <point x="547" y="909"/>
       <point x="475" y="789"/>
       <point x="451" y="677" type="curve"/>
@@ -26,7 +26,7 @@
       <point x="446" y="468" type="line"/>
       <point x="468" y="331"/>
       <point x="545" y="211"/>
-      <point x="740" y="211" type="curve" name="dv01" smooth="yes"/>
+      <point x="740" y="211" type="curve" smooth="yes" name="dv01"/>
       <point x="850" y="211"/>
       <point x="949" y="249"/>
       <point x="1036" y="326" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0455.glif b/source/Hack-Bold.ufo/glyphs/uni0455.glif
index 2e48625d1..d0be37e47 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0455.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0455.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0455" format="1">
+<glyph name="uni0455" format="2">
   <advance width="1233"/>
   <unicode hex="0455"/>
   <outline>
     <contour>
-      <point x="613" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="613" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="476" y="-29"/>
       <point x="335" y="-6"/>
       <point x="190" y="41" type="curve"/>
       <point x="190" y="297" type="line" name="ih01"/>
       <point x="319" y="224"/>
       <point x="453" y="184"/>
-      <point x="588" y="184" type="curve" name="dv01" smooth="yes"/>
+      <point x="588" y="184" type="curve" smooth="yes" name="dv01"/>
       <point x="723" y="184"/>
       <point x="791" y="225"/>
-      <point x="791" y="308" type="curve" name="ah01" smooth="yes"/>
+      <point x="791" y="308" type="curve" smooth="yes" name="ah01"/>
       <point x="791" y="345"/>
       <point x="778" y="365"/>
       <point x="753" y="385" type="curve" smooth="yes"/>
@@ -24,20 +24,20 @@
       <point x="494" y="469" type="line" smooth="yes"/>
       <point x="279" y="517"/>
       <point x="172" y="620"/>
-      <point x="172" y="801" type="curve" name="sh01" smooth="yes"/>
+      <point x="172" y="801" type="curve" smooth="yes" name="sh01"/>
       <point x="172" y="1025"/>
       <point x="335" y="1147"/>
-      <point x="623" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="623" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="744" y="1147"/>
       <point x="871" y="1126"/>
       <point x="991" y="1085" type="curve"/>
       <point x="991" y="829" type="line" name="ih02"/>
       <point x="882" y="899"/>
       <point x="766" y="934"/>
-      <point x="645" y="934" type="curve" name="sv01" smooth="yes"/>
+      <point x="645" y="934" type="curve" smooth="yes" name="sv01"/>
       <point x="516" y="934"/>
       <point x="449" y="892"/>
-      <point x="449" y="828" type="curve" name="sh02" smooth="yes"/>
+      <point x="449" y="828" type="curve" smooth="yes" name="sh02"/>
       <point x="449" y="765"/>
       <point x="512" y="727"/>
       <point x="663" y="691" type="curve" smooth="yes"/>
@@ -45,7 +45,7 @@
       <point x="758" y="668" type="line" smooth="yes"/>
       <point x="969" y="617"/>
       <point x="1067" y="511"/>
-      <point x="1067" y="320" type="curve" name="sh03" smooth="yes"/>
+      <point x="1067" y="320" type="curve" smooth="yes" name="sh03"/>
       <point x="1067" y="87"/>
       <point x="916" y="-29"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0456.glif b/source/Hack-Bold.ufo/glyphs/uni0456.glif
index d2219d7c6..1bd5a361a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0456.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0456.glif
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0456" format="1">
+<glyph name="uni0456" format="2">
   <advance width="1233"/>
   <unicode hex="0456"/>
   <outline>
     <contour>
-      <point x="441" y="1323" type="line" name="hr00" smooth="yes"/>
+      <point x="441" y="1323" type="line" smooth="yes" name="hr00"/>
       <point x="421" y="1323"/>
       <point x="411" y="1333"/>
-      <point x="411" y="1353" type="curve" name="dh01" smooth="yes"/>
+      <point x="411" y="1353" type="curve" smooth="yes" name="dh01"/>
       <point x="411" y="1635" type="line" smooth="yes"/>
       <point x="411" y="1655"/>
       <point x="421" y="1665"/>
-      <point x="441" y="1665" type="curve" name="dv01" smooth="yes"/>
+      <point x="441" y="1665" type="curve" smooth="yes" name="dv01"/>
       <point x="674" y="1665" type="line" smooth="yes"/>
       <point x="694" y="1665"/>
       <point x="704" y="1655"/>
       <point x="704" y="1635" type="curve" smooth="yes"/>
-      <point x="704" y="1353" type="line" name="dh02" smooth="yes"/>
+      <point x="704" y="1353" type="line" smooth="yes" name="dh02"/>
       <point x="704" y="1333"/>
       <point x="694" y="1323"/>
       <point x="674" y="1323" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="802" y="-12" type="line" name="ab01" smooth="yes"/>
+      <point x="802" y="-12" type="line" smooth="yes" name="ab01"/>
       <point x="663" y="-12"/>
       <point x="563" y="24"/>
       <point x="502" y="96" type="curve" smooth="yes"/>
       <point x="441" y="167"/>
       <point x="411" y="287"/>
-      <point x="411" y="455" type="curve" name="sh01" smooth="yes"/>
+      <point x="411" y="455" type="curve" smooth="yes" name="sh01"/>
       <point x="411" y="895" type="line" name="sv01"/>
       <point x="184" y="895" type="line"/>
       <point x="184" y="1120" type="line" name="at01"/>
@@ -39,7 +39,7 @@
       <point x="745" y="268" type="curve" smooth="yes"/>
       <point x="772" y="231"/>
       <point x="818" y="213"/>
-      <point x="884" y="213" type="curve" name="sv02" smooth="yes"/>
+      <point x="884" y="213" type="curve" smooth="yes" name="sv02"/>
       <point x="1118" y="213" type="line"/>
       <point x="1118" y="-12" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0457.glif b/source/Hack-Bold.ufo/glyphs/uni0457.glif
index dfb03ef6f..e93ecae55 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0457.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0457.glif
@@ -1,63 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0457" format="1">
+<glyph name="uni0457" format="2">
   <advance width="1233"/>
   <unicode hex="0457"/>
   <outline>
     <contour>
-      <point x="271" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="271" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="251" y="1320"/>
       <point x="241" y="1330"/>
-      <point x="241" y="1350" type="curve" name="dh01" smooth="yes"/>
+      <point x="241" y="1350" type="curve" smooth="yes" name="dh01"/>
       <point x="241" y="1536" type="line" smooth="yes"/>
       <point x="241" y="1556"/>
       <point x="251" y="1566"/>
-      <point x="271" y="1566" type="curve" name="at01" smooth="yes"/>
+      <point x="271" y="1566" type="curve" smooth="yes" name="at01"/>
       <point x="447" y="1566" type="line" smooth="yes"/>
       <point x="467" y="1566"/>
       <point x="477" y="1556"/>
       <point x="477" y="1536" type="curve" smooth="yes"/>
-      <point x="477" y="1350" type="line" name="dh02" smooth="yes"/>
+      <point x="477" y="1350" type="line" smooth="yes" name="dh02"/>
       <point x="477" y="1330"/>
       <point x="467" y="1320"/>
       <point x="447" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="666" y="1320" type="line" name="sv02" smooth="yes"/>
+      <point x="666" y="1320" type="line" smooth="yes" name="sv02"/>
       <point x="646" y="1320"/>
       <point x="636" y="1330"/>
-      <point x="636" y="1350" type="curve" name="dh03" smooth="yes"/>
+      <point x="636" y="1350" type="curve" smooth="yes" name="dh03"/>
       <point x="636" y="1536" type="line" smooth="yes"/>
       <point x="636" y="1556"/>
       <point x="646" y="1566"/>
-      <point x="666" y="1566" type="curve" name="at02" smooth="yes"/>
+      <point x="666" y="1566" type="curve" smooth="yes" name="at02"/>
       <point x="842" y="1566" type="line" smooth="yes"/>
       <point x="862" y="1566"/>
       <point x="872" y="1556"/>
-      <point x="872" y="1536" type="curve" name="hr01" smooth="yes"/>
-      <point x="872" y="1350" type="line" name="dh04" smooth="yes"/>
+      <point x="872" y="1536" type="curve" smooth="yes" name="hr01"/>
+      <point x="872" y="1350" type="line" smooth="yes" name="dh04"/>
       <point x="872" y="1330"/>
       <point x="862" y="1320"/>
-      <point x="842" y="1320" type="curve" name="sv03" smooth="yes"/>
+      <point x="842" y="1320" type="curve" smooth="yes" name="sv03"/>
     </contour>
     <contour>
-      <point x="802" y="-12" type="line" name="ab01" smooth="yes"/>
+      <point x="802" y="-12" type="line" smooth="yes" name="ab01"/>
       <point x="663" y="-12"/>
       <point x="563" y="24"/>
       <point x="502" y="96" type="curve" smooth="yes"/>
       <point x="441" y="167"/>
       <point x="411" y="287"/>
-      <point x="411" y="455" type="curve" name="ih01" smooth="yes"/>
+      <point x="411" y="455" type="curve" smooth="yes" name="ih01"/>
       <point x="411" y="895" type="line" name="sv04"/>
       <point x="184" y="895" type="line"/>
       <point x="184" y="1120" type="line" name="at03"/>
       <point x="704" y="1120" type="line"/>
-      <point x="704" y="455" type="line" name="sh01" smooth="yes"/>
+      <point x="704" y="455" type="line" smooth="yes" name="sh01"/>
       <point x="704" y="368"/>
       <point x="718" y="305"/>
       <point x="745" y="268" type="curve" smooth="yes"/>
       <point x="772" y="231"/>
       <point x="818" y="213"/>
-      <point x="884" y="213" type="curve" name="sv05" smooth="yes"/>
+      <point x="884" y="213" type="curve" smooth="yes" name="sv05"/>
       <point x="1118" y="213" type="line"/>
       <point x="1118" y="-12" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0458.glif b/source/Hack-Bold.ufo/glyphs/uni0458.glif
index f3b78666b..e5f5b0996 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0458.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0458.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0458" format="1">
+<glyph name="uni0458" format="2">
   <advance width="1233"/>
   <unicode hex="0458"/>
   <outline>
     <contour>
-      <point x="614" y="1323" type="line" name="hr00" smooth="yes"/>
+      <point x="614" y="1323" type="line" smooth="yes" name="hr00"/>
       <point x="594" y="1323"/>
       <point x="584" y="1333"/>
-      <point x="584" y="1353" type="curve" name="dh01" smooth="yes"/>
+      <point x="584" y="1353" type="curve" smooth="yes" name="dh01"/>
       <point x="584" y="1635" type="line" smooth="yes"/>
       <point x="584" y="1655"/>
       <point x="594" y="1665"/>
-      <point x="614" y="1665" type="curve" name="dv01" smooth="yes"/>
+      <point x="614" y="1665" type="curve" smooth="yes" name="dv01"/>
       <point x="847" y="1665" type="line" smooth="yes"/>
       <point x="867" y="1665"/>
       <point x="877" y="1655"/>
       <point x="877" y="1635" type="curve" smooth="yes"/>
-      <point x="877" y="1353" type="line" name="dh02" smooth="yes"/>
+      <point x="877" y="1353" type="line" smooth="yes" name="dh02"/>
       <point x="877" y="1333"/>
       <point x="867" y="1323"/>
       <point x="847" y="1323" type="curve" smooth="yes"/>
@@ -26,7 +26,7 @@
       <point x="404" y="-199" type="line" smooth="yes"/>
       <point x="536" y="-199"/>
       <point x="584" y="-133"/>
-      <point x="584" y="43" type="curve" name="sh01" smooth="yes"/>
+      <point x="584" y="43" type="curve" smooth="yes" name="sh01"/>
       <point x="584" y="895" type="line" name="sv02"/>
       <point x="287" y="895" type="line"/>
       <point x="287" y="1120" type="line" name="at01"/>
@@ -34,7 +34,7 @@
       <point x="877" y="43" type="line" smooth="yes"/>
       <point x="877" y="-293"/>
       <point x="766" y="-424"/>
-      <point x="486" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="486" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="170" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0459.glif b/source/Hack-Bold.ufo/glyphs/uni0459.glif
index d40e39e2a..67316fd82 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0459.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0459.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0459" format="1">
+<glyph name="uni0459" format="2">
   <advance width="1233"/>
   <unicode hex="0459"/>
   <outline>
@@ -8,37 +8,37 @@
       <point x="21" y="240" type="line" smooth="yes"/>
       <point x="160" y="240"/>
       <point x="196" y="272"/>
-      <point x="212" y="439" type="curve" name="sh01" smooth="yes"/>
+      <point x="212" y="439" type="curve" smooth="yes" name="sh01"/>
       <point x="220" y="516"/>
       <point x="222" y="621"/>
-      <point x="222" y="700" type="curve" name="dh01" smooth="yes"/>
+      <point x="222" y="700" type="curve" smooth="yes" name="dh01"/>
       <point x="222" y="1120" type="line" name="at01"/>
       <point x="820" y="1120" type="line" name="sh02"/>
       <point x="820" y="698" type="line"/>
       <point x="831" y="698" type="line" smooth="yes"/>
       <point x="1043" y="698"/>
       <point x="1233" y="585"/>
-      <point x="1233" y="350" type="curve" name="dh06" smooth="yes"/>
+      <point x="1233" y="350" type="curve" smooth="yes" name="dh06"/>
       <point x="1233" y="114"/>
       <point x="1043" y="0"/>
-      <point x="831" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="831" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="580" y="0" type="line" name="dh03"/>
       <point x="580" y="901" type="line"/>
       <point x="462" y="901" type="line"/>
-      <point x="462" y="704" type="line" name="dh02" smooth="yes"/>
+      <point x="462" y="704" type="line" smooth="yes" name="dh02"/>
       <point x="462" y="509"/>
       <point x="453" y="248"/>
       <point x="354" y="115" type="curve" smooth="yes"/>
       <point x="294" y="35"/>
       <point x="204" y="0"/>
-      <point x="55" y="0" type="curve" name="ab02" smooth="yes"/>
+      <point x="55" y="0" type="curve" smooth="yes" name="ab02"/>
       <point x="11" y="0" type="line"/>
     </contour>
     <contour>
       <point x="837" y="219" type="line" smooth="yes"/>
       <point x="904" y="219"/>
       <point x="993" y="257"/>
-      <point x="993" y="350" type="curve" name="dh05" smooth="yes"/>
+      <point x="993" y="350" type="curve" smooth="yes" name="dh05"/>
       <point x="993" y="443"/>
       <point x="904" y="479"/>
       <point x="837" y="479" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni045A_.glif b/source/Hack-Bold.ufo/glyphs/uni045A_.glif
index 278a60c66..ef80e98e2 100644
--- a/source/Hack-Bold.ufo/glyphs/uni045A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni045A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni045A" format="1">
+<glyph name="uni045A" format="2">
   <advance width="1233"/>
   <unicode hex="045A"/>
   <outline>
@@ -14,10 +14,10 @@
       <point x="831" y="698" type="line" smooth="yes"/>
       <point x="1043" y="698"/>
       <point x="1233" y="585"/>
-      <point x="1233" y="350" type="curve" name="dh05" smooth="yes"/>
+      <point x="1233" y="350" type="curve" smooth="yes" name="dh05"/>
       <point x="1233" y="114"/>
       <point x="1043" y="0"/>
-      <point x="831" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="831" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="580" y="0" type="line" name="sh01"/>
       <point x="580" y="520" type="line" name="dv01"/>
       <point x="281" y="520" type="line" name="sh02"/>
@@ -25,10 +25,10 @@
       <point x="41" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="837" y="219" type="line" name="sv01" smooth="yes"/>
+      <point x="837" y="219" type="line" smooth="yes" name="sv01"/>
       <point x="904" y="219"/>
       <point x="993" y="257"/>
-      <point x="993" y="350" type="curve" name="dh04" smooth="yes"/>
+      <point x="993" y="350" type="curve" smooth="yes" name="dh04"/>
       <point x="993" y="443"/>
       <point x="904" y="479"/>
       <point x="837" y="479" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni045B_.glif b/source/Hack-Bold.ufo/glyphs/uni045B_.glif
index c5c74ecc7..8268a59c1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni045B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni045B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni045B" format="1">
+<glyph name="uni045B" format="2">
   <advance width="1233"/>
   <unicode hex="045B"/>
   <outline>
@@ -17,7 +17,7 @@
       <point x="502" y="600" type="line" name="iv01"/>
       <point x="545" y="729"/>
       <point x="649" y="795"/>
-      <point x="792" y="795" type="curve" name="dv02" smooth="yes"/>
+      <point x="792" y="795" type="curve" smooth="yes" name="dv02"/>
       <point x="1000" y="795"/>
       <point x="1110" y="656"/>
       <point x="1110" y="375" type="curve" smooth="yes"/>
@@ -26,10 +26,10 @@
       <point x="819" y="330" type="line" smooth="yes"/>
       <point x="819" y="487"/>
       <point x="776" y="555"/>
-      <point x="679" y="555" type="curve" name="dv01" smooth="yes"/>
+      <point x="679" y="555" type="curve" smooth="yes" name="dv01"/>
       <point x="564" y="555"/>
       <point x="502" y="462"/>
-      <point x="502" y="289" type="curve" name="sh05" smooth="yes"/>
+      <point x="502" y="289" type="curve" smooth="yes" name="sh05"/>
       <point x="502" y="0" type="line" name="ab01"/>
       <point x="211" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni045C_.glif b/source/Hack-Bold.ufo/glyphs/uni045C_.glif
index f662c2ec0..3c206b51c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni045C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni045C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni045C" format="1">
+<glyph name="uni045C" format="2">
   <advance width="1233"/>
   <unicode hex="045C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni045D_.glif b/source/Hack-Bold.ufo/glyphs/uni045D_.glif
index 55e880435..87cd001c8 100644
--- a/source/Hack-Bold.ufo/glyphs/uni045D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni045D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni045D" format="1">
+<glyph name="uni045D" format="2">
   <advance width="1233"/>
   <unicode hex="045D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni045E_.glif b/source/Hack-Bold.ufo/glyphs/uni045E_.glif
index a0912f259..a786522f8 100644
--- a/source/Hack-Bold.ufo/glyphs/uni045E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni045E_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni045E" format="1">
+<glyph name="uni045E" format="2">
   <advance width="1233"/>
   <unicode hex="045E"/>
   <outline>
     <contour>
-      <point x="626" y="1270" type="curve" name="sv01" smooth="yes"/>
+      <point x="626" y="1270" type="curve" smooth="yes" name="sv01"/>
       <point x="417" y="1270"/>
       <point x="299" y="1374"/>
       <point x="291" y="1567" type="curve" name="at03"/>
       <point x="432" y="1567" type="line"/>
       <point x="447" y="1475"/>
       <point x="514" y="1423"/>
-      <point x="626" y="1423" type="curve" name="sv02" smooth="yes"/>
+      <point x="626" y="1423" type="curve" smooth="yes" name="sv02"/>
       <point x="738" y="1423"/>
       <point x="804" y="1474"/>
       <point x="819" y="1567" type="curve" name="at04"/>
@@ -31,10 +31,10 @@
       <point x="633" y="393" type="line" name="iv01"/>
       <point x="878" y="1120" type="line" name="at02"/>
       <point x="1186" y="1120" type="line" name="iv02"/>
-      <point x="721" y="-121" type="line" name="hr01" smooth="yes"/>
+      <point x="721" y="-121" type="line" smooth="yes" name="hr01"/>
       <point x="642" y="-332"/>
       <point x="536" y="-424"/>
-      <point x="379" y="-424" type="curve" name="hr02" smooth="yes"/>
+      <point x="379" y="-424" type="curve" smooth="yes" name="hr02"/>
       <point x="137" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni045F_.glif b/source/Hack-Bold.ufo/glyphs/uni045F_.glif
index e24344436..4ab486c22 100644
--- a/source/Hack-Bold.ufo/glyphs/uni045F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni045F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni045F" format="1">
+<glyph name="uni045F" format="2">
   <advance width="1233"/>
   <unicode hex="045F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0462.glif b/source/Hack-Bold.ufo/glyphs/uni0462.glif
index 44ec91ded..13fa456e4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0462.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0462.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0462" format="1">
+<glyph name="uni0462" format="2">
   <advance width="1233"/>
   <unicode hex="0462"/>
   <outline>
@@ -15,23 +15,23 @@
       <point x="888" y="1124" type="line" name="sv02"/>
       <point x="565" y="1124" type="line" name="sh02"/>
       <point x="565" y="913" type="line"/>
-      <point x="595" y="913" type="line" name="dv02" smooth="yes"/>
+      <point x="595" y="913" type="line" smooth="yes" name="dv02"/>
       <point x="1004" y="913"/>
       <point x="1175" y="774"/>
-      <point x="1175" y="456" type="curve" name="sh05" smooth="yes"/>
+      <point x="1175" y="456" type="curve" smooth="yes" name="sh05"/>
       <point x="1175" y="143"/>
       <point x="1010" y="0"/>
-      <point x="595" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="595" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="270" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="606" y="236" type="line" name="sv03" smooth="yes"/>
+      <point x="606" y="236" type="line" smooth="yes" name="sv03"/>
       <point x="814" y="236"/>
       <point x="876" y="294"/>
-      <point x="876" y="455" type="curve" name="ah01" smooth="yes"/>
+      <point x="876" y="455" type="curve" smooth="yes" name="ah01"/>
       <point x="876" y="624"/>
       <point x="808" y="678"/>
-      <point x="606" y="678" type="curve" name="dv01" smooth="yes"/>
+      <point x="606" y="678" type="curve" smooth="yes" name="dv01"/>
       <point x="565" y="678" type="line" name="sh06"/>
       <point x="565" y="236" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0463.glif b/source/Hack-Bold.ufo/glyphs/uni0463.glif
index 2e584f7a6..e576ed95e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0463.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0463.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0463" format="1">
+<glyph name="uni0463" format="2">
   <advance width="1233"/>
   <unicode hex="0463"/>
   <outline>
@@ -15,23 +15,23 @@
       <point x="979" y="950" type="line" name="sv02"/>
       <point x="577" y="950" type="line" name="sh02"/>
       <point x="577" y="698" type="line"/>
-      <point x="704" y="698" type="line" name="dv02" smooth="yes"/>
+      <point x="704" y="698" type="line" smooth="yes" name="dv02"/>
       <point x="987" y="698"/>
       <point x="1159" y="585"/>
-      <point x="1159" y="350" type="curve" name="sh04" smooth="yes"/>
+      <point x="1159" y="350" type="curve" smooth="yes" name="sh04"/>
       <point x="1159" y="114"/>
       <point x="987" y="0"/>
-      <point x="704" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="704" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="286" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="650" y="219" type="line" name="sv03" smooth="yes"/>
+      <point x="650" y="219" type="line" smooth="yes" name="sv03"/>
       <point x="798" y="219"/>
       <point x="866" y="257"/>
-      <point x="866" y="350" type="curve" name="ah01" smooth="yes"/>
+      <point x="866" y="350" type="curve" smooth="yes" name="ah01"/>
       <point x="866" y="443"/>
       <point x="798" y="479"/>
-      <point x="650" y="479" type="curve" name="dv01" smooth="yes"/>
+      <point x="650" y="479" type="curve" smooth="yes" name="dv01"/>
       <point x="577" y="479" type="line" name="sh05"/>
       <point x="577" y="219" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0472.glif b/source/Hack-Bold.ufo/glyphs/uni0472.glif
index 21542087f..57b26308a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0472.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0472.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0472" format="1">
+<glyph name="uni0472" format="2">
   <advance width="1233"/>
   <unicode hex="0472"/>
   <outline>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="128" y="-29"/>
       <point x="92" y="449"/>
-      <point x="92" y="712" type="curve" name="sh01" smooth="yes"/>
+      <point x="92" y="712" type="curve" smooth="yes" name="sh01"/>
       <point x="92" y="1160"/>
       <point x="200" y="1413"/>
       <point x="440" y="1493" type="curve" smooth="yes"/>
       <point x="494" y="1511"/>
       <point x="553" y="1520"/>
-      <point x="617" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="617" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="965" y="1520"/>
       <point x="1141" y="1259"/>
-      <point x="1141" y="743" type="curve" name="sh02" smooth="yes"/>
+      <point x="1141" y="743" type="curve" smooth="yes" name="sh02"/>
       <point x="1141" y="310"/>
       <point x="1014" y="65"/>
       <point x="777" y="-7" type="curve" smooth="yes"/>
@@ -30,7 +30,7 @@
       <point x="752" y="1187" type="curve" smooth="yes"/>
       <point x="717" y="1234"/>
       <point x="672" y="1255"/>
-      <point x="616" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="517" y="1255"/>
       <point x="453" y="1184"/>
       <point x="423" y="1041" type="curve" smooth="yes"/>
@@ -39,7 +39,7 @@
       <point x="405" y="911" type="curve" name="sh05"/>
     </contour>
     <contour>
-      <point x="617" y="236" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="236" type="curve" smooth="yes" name="dv01"/>
       <point x="768" y="236"/>
       <point x="819" y="382"/>
       <point x="832" y="651" type="curve" name="ah01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0473.glif b/source/Hack-Bold.ufo/glyphs/uni0473.glif
index d24a1caf3..408381f19 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0473.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0473.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0473" format="1">
+<glyph name="uni0473" format="2">
   <advance width="1233"/>
   <unicode hex="0473"/>
   <outline>
     <contour>
-      <point x="614" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="614" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="457" y="-29"/>
       <point x="332" y="24"/>
       <point x="238" y="130" type="curve" smooth="yes"/>
@@ -13,7 +13,7 @@
       <point x="98" y="556" type="curve" smooth="yes"/>
       <point x="98" y="921"/>
       <point x="300" y="1147"/>
-      <point x="616" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="933" y="1147"/>
       <point x="1135" y="920"/>
       <point x="1135" y="559" type="curve" smooth="yes"/>
@@ -24,13 +24,13 @@
       <point x="839" y="632" type="line" name="dv03"/>
       <point x="823" y="783"/>
       <point x="758" y="909"/>
-      <point x="616" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="475" y="909"/>
       <point x="410" y="783"/>
       <point x="394" y="632" type="curve"/>
     </contour>
     <contour>
-      <point x="616" y="209" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="209" type="curve" smooth="yes" name="dv01"/>
       <point x="756" y="209"/>
       <point x="814" y="330"/>
       <point x="832" y="438" type="curve" name="dv02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0490.glif b/source/Hack-Bold.ufo/glyphs/uni0490.glif
index 24c114f06..8f967d486 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0490.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0490.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0490" format="1">
+<glyph name="uni0490" format="2">
   <advance width="1233"/>
   <unicode hex="0490"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0491.glif b/source/Hack-Bold.ufo/glyphs/uni0491.glif
index d557db1d4..d9361c5c4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0491.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0491.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0491" format="1">
+<glyph name="uni0491" format="2">
   <advance width="1233"/>
   <unicode hex="0491"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0492.glif b/source/Hack-Bold.ufo/glyphs/uni0492.glif
index e2192d539..fa475d6c7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0492.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0492.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0492" format="1">
+<glyph name="uni0492" format="2">
   <advance width="1233"/>
   <unicode hex="0492"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0493.glif b/source/Hack-Bold.ufo/glyphs/uni0493.glif
index f94aecab6..4befd7621 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0493.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0493.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0493" format="1">
+<glyph name="uni0493" format="2">
   <advance width="1233"/>
   <unicode hex="0493"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0494.glif b/source/Hack-Bold.ufo/glyphs/uni0494.glif
index df59d975c..235e4f5d7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0494.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0494.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0494" format="1">
+<glyph name="uni0494" format="2">
   <advance width="1233"/>
   <unicode hex="0494"/>
   <outline>
@@ -8,14 +8,14 @@
       <point x="664" y="-199" type="line" smooth="yes"/>
       <point x="796" y="-199"/>
       <point x="844" y="-133"/>
-      <point x="844" y="43" type="curve" name="ah01" smooth="yes"/>
+      <point x="844" y="43" type="curve" smooth="yes" name="ah01"/>
       <point x="844" y="464" type="line" smooth="yes"/>
       <point x="844" y="545"/>
       <point x="832" y="602"/>
       <point x="809" y="637" type="curve" smooth="yes"/>
       <point x="789" y="666"/>
       <point x="758" y="686"/>
-      <point x="690" y="686" type="curve" name="dv01" smooth="yes"/>
+      <point x="690" y="686" type="curve" smooth="yes" name="dv01"/>
       <point x="457" y="686" type="line"/>
       <point x="457" y="0" type="line" name="sh02"/>
       <point x="162" y="0" type="line" name="sh01"/>
@@ -24,7 +24,7 @@
       <point x="1092" y="1233" type="line" name="sv01"/>
       <point x="457" y="1233" type="line" name="sh03"/>
       <point x="457" y="952" type="line"/>
-      <point x="766" y="952" type="line" name="dv02" smooth="yes"/>
+      <point x="766" y="952" type="line" smooth="yes" name="dv02"/>
       <point x="849" y="952"/>
       <point x="925" y="934"/>
       <point x="992" y="899" type="curve" smooth="yes"/>
@@ -34,10 +34,10 @@
       <point x="1112" y="776"/>
       <point x="1139" y="671"/>
       <point x="1139" y="532" type="curve" smooth="yes"/>
-      <point x="1139" y="43" type="line" name="sh04" smooth="yes"/>
+      <point x="1139" y="43" type="line" smooth="yes" name="sh04"/>
       <point x="1139" y="-293"/>
       <point x="1029" y="-424"/>
-      <point x="746" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="746" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="528" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0495.glif b/source/Hack-Bold.ufo/glyphs/uni0495.glif
index 1a43ea903..dad0b2c99 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0495.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0495.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0495" format="1">
+<glyph name="uni0495" format="2">
   <advance width="1233"/>
   <unicode hex="0495"/>
   <outline>
@@ -8,11 +8,11 @@
       <point x="601" y="-199" type="line" smooth="yes"/>
       <point x="732" y="-199"/>
       <point x="780" y="-133"/>
-      <point x="780" y="43" type="curve" name="ah01" smooth="yes"/>
+      <point x="780" y="43" type="curve" smooth="yes" name="ah01"/>
       <point x="780" y="180" type="line" smooth="yes"/>
       <point x="780" y="345"/>
       <point x="733" y="405"/>
-      <point x="633" y="405" type="curve" name="dv01" smooth="yes"/>
+      <point x="633" y="405" type="curve" smooth="yes" name="dv01"/>
       <point x="513" y="405" type="line"/>
       <point x="513" y="0" type="line" name="sh02"/>
       <point x="222" y="0" type="line" name="sh01"/>
@@ -21,14 +21,14 @@
       <point x="1021" y="911" type="line" name="sv01"/>
       <point x="513" y="911" type="line" name="sh03"/>
       <point x="513" y="645" type="line"/>
-      <point x="750" y="645" type="line" name="dv02" smooth="yes"/>
+      <point x="750" y="645" type="line" smooth="yes" name="dv02"/>
       <point x="963" y="645"/>
       <point x="1071" y="508"/>
       <point x="1071" y="225" type="curve" smooth="yes"/>
-      <point x="1071" y="43" type="line" name="sh04" smooth="yes"/>
+      <point x="1071" y="43" type="line" smooth="yes" name="sh04"/>
       <point x="1071" y="-294"/>
       <point x="960" y="-424"/>
-      <point x="683" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="683" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="488" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0496.glif b/source/Hack-Bold.ufo/glyphs/uni0496.glif
index eee00093a..20e78609f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0496.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0496.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0496" format="1">
+<glyph name="uni0496" format="2">
   <advance width="1233"/>
   <unicode hex="0496"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0497.glif b/source/Hack-Bold.ufo/glyphs/uni0497.glif
index 489c65c74..80bf0f063 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0497.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0497.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0497" format="1">
+<glyph name="uni0497" format="2">
   <advance width="1233"/>
   <unicode hex="0497"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0498.glif b/source/Hack-Bold.ufo/glyphs/uni0498.glif
index e1185c40f..c9c4ab7db 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0498.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0498.glif
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0498" format="1">
+<glyph name="uni0498" format="2">
   <advance width="1233"/>
   <unicode hex="0498"/>
   <outline>
     <contour>
-      <point x="1100" y="412" type="curve" name="sh01" smooth="yes"/>
+      <point x="1100" y="412" type="curve" smooth="yes" name="sh01"/>
       <point x="1100" y="160"/>
       <point x="954" y="10"/>
       <point x="673" y="-23" type="curve" name="ih01"/>
       <point x="742" y="-106"/>
       <point x="765" y="-161"/>
-      <point x="765" y="-222" type="curve" name="hr01" smooth="yes"/>
+      <point x="765" y="-222" type="curve" smooth="yes" name="hr01"/>
       <point x="765" y="-339"/>
       <point x="686" y="-401"/>
-      <point x="515" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="515" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="451" y="-401"/>
       <point x="385" y="-392"/>
       <point x="313" y="-375" type="curve"/>
       <point x="313" y="-219" type="line" name="dh01"/>
       <point x="374" y="-242"/>
       <point x="428" y="-254"/>
-      <point x="477" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="477" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="556" y="-254"/>
       <point x="601" y="-221"/>
-      <point x="601" y="-170" type="curve" name="sh02" smooth="yes"/>
+      <point x="601" y="-170" type="curve" smooth="yes" name="sh02"/>
       <point x="601" y="-137"/>
       <point x="581" y="-93"/>
       <point x="534" y="-29" type="curve" name="dv03"/>
@@ -33,32 +33,32 @@
       <point x="125" y="319" type="line"/>
       <point x="253" y="252"/>
       <point x="419" y="223"/>
-      <point x="538" y="223" type="curve" name="dv04" smooth="yes"/>
+      <point x="538" y="223" type="curve" smooth="yes" name="dv04"/>
       <point x="731" y="223"/>
       <point x="817" y="303"/>
-      <point x="817" y="435" type="curve" name="hr02" smooth="yes"/>
+      <point x="817" y="435" type="curve" smooth="yes" name="hr02"/>
       <point x="817" y="578"/>
       <point x="721" y="668"/>
-      <point x="549" y="668" type="curve" name="dv05" smooth="yes"/>
+      <point x="549" y="668" type="curve" smooth="yes" name="dv05"/>
       <point x="391" y="668" type="line"/>
       <point x="391" y="928" type="line"/>
-      <point x="549" y="928" type="line" name="dv06" smooth="yes"/>
+      <point x="549" y="928" type="line" smooth="yes" name="dv06"/>
       <point x="697" y="928"/>
       <point x="780" y="988"/>
-      <point x="780" y="1097" type="curve" name="dh02" smooth="yes"/>
+      <point x="780" y="1097" type="curve" smooth="yes" name="dh02"/>
       <point x="780" y="1205"/>
       <point x="697" y="1270"/>
-      <point x="544" y="1270" type="curve" name="sv01" smooth="yes"/>
+      <point x="544" y="1270" type="curve" smooth="yes" name="sv01"/>
       <point x="440" y="1270"/>
       <point x="307" y="1241"/>
       <point x="170" y="1188" type="curve" name="hr03"/>
       <point x="170" y="1456" type="line"/>
       <point x="307" y="1497"/>
       <point x="441" y="1520"/>
-      <point x="566" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="566" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="880" y="1520"/>
       <point x="1065" y="1373"/>
-      <point x="1065" y="1135" type="curve" name="dh03" smooth="yes"/>
+      <point x="1065" y="1135" type="curve" smooth="yes" name="dh03"/>
       <point x="1065" y="952"/>
       <point x="960" y="840"/>
       <point x="772" y="805" type="curve" name="ih02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0499.glif b/source/Hack-Bold.ufo/glyphs/uni0499.glif
index 4407e24b2..96bd896f6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0499.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0499.glif
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0499" format="1">
+<glyph name="uni0499" format="2">
   <advance width="1233"/>
   <unicode hex="0499"/>
   <outline>
     <contour>
-      <point x="1079" y="287" type="curve" name="sh03" smooth="yes"/>
+      <point x="1079" y="287" type="curve" smooth="yes" name="sh03"/>
       <point x="1079" y="109"/>
       <point x="916" y="8"/>
       <point x="651" y="-16" type="curve" name="ih01"/>
       <point x="726" y="-101"/>
       <point x="749" y="-161"/>
-      <point x="749" y="-222" type="curve" name="hr01" smooth="yes"/>
+      <point x="749" y="-222" type="curve" smooth="yes" name="hr01"/>
       <point x="749" y="-339"/>
       <point x="670" y="-401"/>
-      <point x="499" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="499" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="435" y="-401"/>
       <point x="369" y="-392"/>
       <point x="297" y="-375" type="curve"/>
       <point x="297" y="-219" type="line" name="dh01"/>
       <point x="358" y="-242"/>
       <point x="412" y="-254"/>
-      <point x="461" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="461" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="540" y="-254"/>
       <point x="585" y="-221"/>
-      <point x="585" y="-170" type="curve" name="sh04" smooth="yes"/>
+      <point x="585" y="-170" type="curve" smooth="yes" name="sh04"/>
       <point x="585" y="-135"/>
       <point x="564" y="-90"/>
       <point x="513" y="-22" type="curve" name="ab01"/>
@@ -34,32 +34,32 @@
       <point x="153" y="280" type="line" name="iv01"/>
       <point x="285" y="215"/>
       <point x="371" y="201"/>
-      <point x="531" y="201" type="curve" name="hr02" smooth="yes"/>
+      <point x="531" y="201" type="curve" smooth="yes" name="hr02"/>
       <point x="679" y="201"/>
       <point x="786" y="212"/>
-      <point x="786" y="319" type="curve" name="sh02" smooth="yes"/>
+      <point x="786" y="319" type="curve" smooth="yes" name="sh02"/>
       <point x="786" y="439"/>
       <point x="648" y="462"/>
-      <point x="556" y="462" type="curve" name="dv03" smooth="yes"/>
+      <point x="556" y="462" type="curve" smooth="yes" name="dv03"/>
       <point x="393" y="462" type="line"/>
       <point x="393" y="681" type="line"/>
-      <point x="530" y="681" type="line" name="dv04" smooth="yes"/>
+      <point x="530" y="681" type="line" smooth="yes" name="dv04"/>
       <point x="642" y="681"/>
       <point x="759" y="711"/>
-      <point x="759" y="805" type="curve" name="sh05" smooth="yes"/>
+      <point x="759" y="805" type="curve" smooth="yes" name="sh05"/>
       <point x="759" y="887"/>
       <point x="674" y="928"/>
-      <point x="504" y="928" type="curve" name="sv01" smooth="yes"/>
+      <point x="504" y="928" type="curve" smooth="yes" name="sv01"/>
       <point x="397" y="928"/>
       <point x="292" y="911"/>
       <point x="190" y="876" type="curve" name="hr03"/>
       <point x="190" y="1099" type="line"/>
       <point x="262" y="1120"/>
       <point x="391" y="1147"/>
-      <point x="547" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="547" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="877" y="1147"/>
       <point x="1042" y="1024"/>
-      <point x="1042" y="825" type="curve" name="sh01" smooth="yes"/>
+      <point x="1042" y="825" type="curve" smooth="yes" name="sh01"/>
       <point x="1042" y="670"/>
       <point x="941" y="600"/>
       <point x="857" y="573" type="curve" name="ih02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni049A_.glif b/source/Hack-Bold.ufo/glyphs/uni049A_.glif
index 38ed6cf34..c1eb199d2 100644
--- a/source/Hack-Bold.ufo/glyphs/uni049A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni049A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni049A" format="1">
+<glyph name="uni049A" format="2">
   <advance width="1233"/>
   <unicode hex="049A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni049B_.glif b/source/Hack-Bold.ufo/glyphs/uni049B_.glif
index 062b0bdd7..fc36088d9 100644
--- a/source/Hack-Bold.ufo/glyphs/uni049B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni049B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni049B" format="1">
+<glyph name="uni049B" format="2">
   <advance width="1233"/>
   <unicode hex="049B"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04A_2.glif b/source/Hack-Bold.ufo/glyphs/uni04A_2.glif
index 5bae28a7e..e3cc081cb 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04A_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04A_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04A2" format="1">
+<glyph name="uni04A2" format="2">
   <advance width="1233"/>
   <unicode hex="04A2"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04A_3.glif b/source/Hack-Bold.ufo/glyphs/uni04A_3.glif
index 6b9ace443..5a43b86e9 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04A_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04A_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04A3" format="1">
+<glyph name="uni04A3" format="2">
   <advance width="1233"/>
   <unicode hex="04A3"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04A_4.glif b/source/Hack-Bold.ufo/glyphs/uni04A_4.glif
index 1dd887b5d..eeee3fd5c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04A_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04A4" format="1">
+<glyph name="uni04A4" format="2">
   <advance width="1233"/>
   <unicode hex="04A4"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04A_5.glif b/source/Hack-Bold.ufo/glyphs/uni04A_5.glif
index 26f67f83b..dc1a2b8d8 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04A_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04A_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04A5" format="1">
+<glyph name="uni04A5" format="2">
   <advance width="1233"/>
   <unicode hex="04A5"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04A_A_.glif b/source/Hack-Bold.ufo/glyphs/uni04A_A_.glif
index f8faf2f0b..5187bdac0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04A_A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04A_A_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04AA" format="1">
+<glyph name="uni04AA" format="2">
   <advance width="1233"/>
   <unicode hex="04AA"/>
   <outline>
     <contour>
-      <point x="772" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="772" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="559" y="1255"/>
       <point x="448" y="1084"/>
-      <point x="448" y="745" type="curve" name="dh02" smooth="yes"/>
+      <point x="448" y="745" type="curve" smooth="yes" name="dh02"/>
       <point x="448" y="406"/>
       <point x="559" y="236"/>
       <point x="772" y="236" type="curve" smooth="yes"/>
@@ -20,29 +20,29 @@
       <point x="835" y="-25" type="curve" name="ih01"/>
       <point x="904" y="-105"/>
       <point x="925" y="-164"/>
-      <point x="925" y="-222" type="curve" name="dh04" smooth="yes"/>
+      <point x="925" y="-222" type="curve" smooth="yes" name="dh04"/>
       <point x="925" y="-339"/>
       <point x="846" y="-401"/>
-      <point x="675" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="675" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="611" y="-401"/>
       <point x="545" y="-392"/>
       <point x="473" y="-375" type="curve" name="hr01"/>
       <point x="473" y="-219" type="line" name="dh03"/>
       <point x="534" y="-242"/>
       <point x="588" y="-254"/>
-      <point x="637" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="637" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="716" y="-254"/>
       <point x="761" y="-221"/>
-      <point x="761" y="-170" type="curve" name="sh01" smooth="yes"/>
+      <point x="761" y="-170" type="curve" smooth="yes" name="sh01"/>
       <point x="761" y="-135"/>
       <point x="740" y="-92"/>
       <point x="693" y="-27" type="curve"/>
       <point x="336" y="2"/>
       <point x="141" y="272"/>
-      <point x="141" y="745" type="curve" name="dh01" smooth="yes"/>
+      <point x="141" y="745" type="curve" smooth="yes" name="dh01"/>
       <point x="141" y="1248"/>
       <point x="360" y="1520"/>
-      <point x="757" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="757" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="874" y="1520"/>
       <point x="979" y="1496"/>
       <point x="1070" y="1448" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04A_B_.glif b/source/Hack-Bold.ufo/glyphs/uni04A_B_.glif
index 6e3e8f7b9..14d96e715 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04A_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04A_B_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04AB" format="1">
+<glyph name="uni04AB" format="2">
   <advance width="1233"/>
   <unicode hex="04AB"/>
   <outline>
     <contour>
-      <point x="747" y="909" type="curve" name="dv03" smooth="yes"/>
+      <point x="747" y="909" type="curve" smooth="yes" name="dv03"/>
       <point x="555" y="909"/>
       <point x="450" y="785"/>
-      <point x="450" y="558" type="curve" name="dh02" smooth="yes"/>
+      <point x="450" y="558" type="curve" smooth="yes" name="dh02"/>
       <point x="450" y="334"/>
       <point x="554" y="211"/>
       <point x="750" y="211" type="curve" smooth="yes"/>
@@ -20,29 +20,29 @@
       <point x="786" y="-25" type="curve" name="ih02"/>
       <point x="855" y="-105"/>
       <point x="876" y="-164"/>
-      <point x="876" y="-222" type="curve" name="sh01" smooth="yes"/>
+      <point x="876" y="-222" type="curve" smooth="yes" name="sh01"/>
       <point x="876" y="-339"/>
       <point x="797" y="-401"/>
-      <point x="626" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="626" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="562" y="-401"/>
       <point x="496" y="-392"/>
       <point x="424" y="-375" type="curve" name="hr01"/>
       <point x="424" y="-219" type="line" name="ih01"/>
       <point x="485" y="-242"/>
       <point x="539" y="-254"/>
-      <point x="588" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="588" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="667" y="-254"/>
       <point x="712" y="-221"/>
-      <point x="712" y="-170" type="curve" name="sh02" smooth="yes"/>
+      <point x="712" y="-170" type="curve" smooth="yes" name="sh02"/>
       <point x="712" y="-135"/>
       <point x="691" y="-93"/>
       <point x="644" y="-26" type="curve"/>
       <point x="333" y="-2"/>
       <point x="153" y="214"/>
-      <point x="153" y="558" type="curve" name="dh01" smooth="yes"/>
+      <point x="153" y="558" type="curve" smooth="yes" name="dh01"/>
       <point x="153" y="928"/>
       <point x="361" y="1149"/>
-      <point x="706" y="1149" type="curve" name="dv04" smooth="yes"/>
+      <point x="706" y="1149" type="curve" smooth="yes" name="dv04"/>
       <point x="827" y="1149"/>
       <point x="934" y="1123"/>
       <point x="1046" y="1063" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04A_C_.glif b/source/Hack-Bold.ufo/glyphs/uni04A_C_.glif
index 73aba4ed2..7bda7558d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04A_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04A_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04AC" format="1">
+<glyph name="uni04AC" format="2">
   <advance width="1233"/>
   <unicode hex="04AC"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04A_D_.glif b/source/Hack-Bold.ufo/glyphs/uni04A_D_.glif
index fecd86adb..90061c0d1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04A_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04A_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04AD" format="1">
+<glyph name="uni04AD" format="2">
   <advance width="1233"/>
   <unicode hex="04AD"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04A_E_.glif b/source/Hack-Bold.ufo/glyphs/uni04A_E_.glif
index fd04e6dd2..a4c42e061 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04A_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04A_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04AE" format="1">
+<glyph name="uni04AE" format="2">
   <advance width="1233"/>
   <unicode hex="04AE"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04A_F_.glif b/source/Hack-Bold.ufo/glyphs/uni04A_F_.glif
index 0e7ac6590..76a5b595b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04A_F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04A_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04AF" format="1">
+<glyph name="uni04AF" format="2">
   <advance width="1233"/>
   <unicode hex="04AF"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04B_0.glif b/source/Hack-Bold.ufo/glyphs/uni04B_0.glif
index b99ce3cbc..a142a73e6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04B_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04B_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04B0" format="1">
+<glyph name="uni04B0" format="2">
   <advance width="1233"/>
   <unicode hex="04B0"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04B_1.glif b/source/Hack-Bold.ufo/glyphs/uni04B_1.glif
index 165d6f6d5..9754eb9d3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04B_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04B_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04B1" format="1">
+<glyph name="uni04B1" format="2">
   <advance width="1233"/>
   <unicode hex="04B1"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04B_2.glif b/source/Hack-Bold.ufo/glyphs/uni04B_2.glif
index 2e64e9e52..62616241c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04B_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04B_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04B2" format="1">
+<glyph name="uni04B2" format="2">
   <advance width="1233"/>
   <unicode hex="04B2"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04B_3.glif b/source/Hack-Bold.ufo/glyphs/uni04B_3.glif
index dbb2736a9..77ea1cc32 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04B_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04B3" format="1">
+<glyph name="uni04B3" format="2">
   <advance width="1233"/>
   <unicode hex="04B3"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04B_A_.glif b/source/Hack-Bold.ufo/glyphs/uni04B_A_.glif
index e0ec15ba6..6e5131104 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04B_A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04B_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04BA" format="1">
+<glyph name="uni04BA" format="2">
   <advance width="1233"/>
   <unicode hex="04BA"/>
   <outline>
@@ -32,10 +32,10 @@
       <point x="821" y="734" type="curve" smooth="yes"/>
       <point x="806" y="759"/>
       <point x="766" y="775"/>
-      <point x="702" y="783" type="curve" name="sv01" smooth="yes"/>
+      <point x="702" y="783" type="curve" smooth="yes" name="sv01"/>
       <point x="687" y="785"/>
       <point x="673" y="786"/>
-      <point x="660" y="786" type="curve" name="dv01" smooth="yes"/>
+      <point x="660" y="786" type="curve" smooth="yes" name="dv01"/>
       <point x="614" y="786"/>
       <point x="567" y="776"/>
       <point x="519" y="757" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="457" y="715" type="curve" smooth="yes"/>
       <point x="426" y="674"/>
       <point x="412" y="600"/>
-      <point x="412" y="520" type="curve" name="sh03" smooth="yes"/>
+      <point x="412" y="520" type="curve" smooth="yes" name="sh03"/>
       <point x="412" y="0" type="line" name="ab01"/>
       <point x="121" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04B_B_.glif b/source/Hack-Bold.ufo/glyphs/uni04B_B_.glif
index 8381b4099..0a2ad0b9b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04B_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04B_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04BB" format="1">
+<glyph name="uni04BB" format="2">
   <advance width="1233"/>
   <unicode hex="04BB"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="463" y="952" type="line" name="iv01"/>
       <point x="506" y="1081"/>
       <point x="610" y="1147"/>
-      <point x="753" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="753" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="961" y="1147"/>
       <point x="1071" y="1008"/>
       <point x="1071" y="727" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="780" y="682" type="line" smooth="yes"/>
       <point x="780" y="839"/>
       <point x="738" y="907"/>
-      <point x="639" y="907" type="curve" name="sv01" smooth="yes"/>
+      <point x="639" y="907" type="curve" smooth="yes" name="sv01"/>
       <point x="522" y="907"/>
       <point x="463" y="810"/>
-      <point x="463" y="641" type="curve" name="sh03" smooth="yes"/>
+      <point x="463" y="641" type="curve" smooth="yes" name="sh03"/>
       <point x="463" y="0" type="line" name="ab01"/>
       <point x="172" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04C_0.glif b/source/Hack-Bold.ufo/glyphs/uni04C_0.glif
index 507cead84..e97ed3851 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04C_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04C_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C0" format="1">
+<glyph name="uni04C0" format="2">
   <advance width="1233"/>
   <unicode hex="04C0"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04C_1.glif b/source/Hack-Bold.ufo/glyphs/uni04C_1.glif
index 2c77dbdc8..2c4f20345 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04C_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04C_1.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C1" format="1">
+<glyph name="uni04C1" format="2">
   <advance width="1233"/>
   <unicode hex="04C1"/>
   <outline>
     <contour>
-      <point x="616" y="1587" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1587" type="curve" smooth="yes" name="dv01"/>
       <point x="419" y="1587"/>
       <point x="301" y="1678"/>
       <point x="281" y="1851" type="curve" name="sv02"/>
       <point x="422" y="1851" type="line"/>
       <point x="449" y="1770"/>
       <point x="515" y="1730"/>
-      <point x="618" y="1730" type="curve" name="dv02" smooth="yes"/>
+      <point x="618" y="1730" type="curve" smooth="yes" name="dv02"/>
       <point x="719" y="1730"/>
       <point x="782" y="1770"/>
       <point x="809" y="1851" type="curve" name="sv01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04C_2.glif b/source/Hack-Bold.ufo/glyphs/uni04C_2.glif
index 7f08ee6d5..ba0e78d84 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04C_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04C_2.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C2" format="1">
+<glyph name="uni04C2" format="2">
   <advance width="1233"/>
   <unicode hex="04C2"/>
   <outline>
     <contour>
-      <point x="616" y="1270" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1270" type="curve" smooth="yes" name="sv01"/>
       <point x="407" y="1270"/>
       <point x="289" y="1374"/>
       <point x="281" y="1567" type="curve" name="at04"/>
       <point x="422" y="1567" type="line"/>
       <point x="437" y="1475"/>
       <point x="504" y="1423"/>
-      <point x="616" y="1423" type="curve" name="sv02" smooth="yes"/>
+      <point x="616" y="1423" type="curve" smooth="yes" name="sv02"/>
       <point x="728" y="1423"/>
       <point x="794" y="1474"/>
       <point x="809" y="1567" type="curve" name="at05"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04C_3.glif b/source/Hack-Bold.ufo/glyphs/uni04C_3.glif
index 43d72ad19..9e4cc0ff8 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04C_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04C_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C3" format="1">
+<glyph name="uni04C3" format="2">
   <advance width="1233"/>
   <unicode hex="04C3"/>
   <outline>
@@ -11,7 +11,7 @@
       <point x="758" y="-144" type="curve"/>
       <point x="785" y="-107"/>
       <point x="799" y="-44"/>
-      <point x="799" y="43" type="curve" name="ah01" smooth="yes"/>
+      <point x="799" y="43" type="curve" smooth="yes" name="ah01"/>
       <point x="799" y="464" type="line" smooth="yes"/>
       <point x="799" y="548"/>
       <point x="787" y="606"/>
@@ -38,13 +38,13 @@
       <point x="1062" y="782"/>
       <point x="1094" y="673"/>
       <point x="1094" y="532" type="curve" smooth="yes"/>
-      <point x="1094" y="43" type="line" name="sh04" smooth="yes"/>
+      <point x="1094" y="43" type="line" smooth="yes" name="sh04"/>
       <point x="1094" y="-120"/>
       <point x="1064" y="-244"/>
       <point x="1004" y="-316" type="curve" smooth="yes"/>
       <point x="945" y="-387"/>
       <point x="845" y="-424"/>
-      <point x="701" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="701" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="483" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04C_4.glif b/source/Hack-Bold.ufo/glyphs/uni04C_4.glif
index cdff57bc1..b32fad4a4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04C_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04C_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C4" format="1">
+<glyph name="uni04C4" format="2">
   <advance width="1233"/>
   <unicode hex="04C4"/>
   <outline>
@@ -8,11 +8,11 @@
       <point x="555" y="-199" type="line" smooth="yes"/>
       <point x="686" y="-199"/>
       <point x="734" y="-133"/>
-      <point x="734" y="43" type="curve" name="ah01" smooth="yes"/>
+      <point x="734" y="43" type="curve" smooth="yes" name="ah01"/>
       <point x="734" y="180" type="line" smooth="yes"/>
       <point x="734" y="345"/>
       <point x="687" y="405"/>
-      <point x="587" y="405" type="curve" name="dv01" smooth="yes"/>
+      <point x="587" y="405" type="curve" smooth="yes" name="dv01"/>
       <point x="467" y="405" type="line"/>
       <point x="467" y="0" type="line" name="sh02"/>
       <point x="174" y="0" type="line" name="sh01"/>
@@ -26,10 +26,10 @@
       <point x="917" y="645"/>
       <point x="1025" y="508"/>
       <point x="1025" y="225" type="curve" smooth="yes"/>
-      <point x="1025" y="43" type="line" name="sh04" smooth="yes"/>
+      <point x="1025" y="43" type="line" smooth="yes" name="sh04"/>
       <point x="1025" y="-294"/>
       <point x="914" y="-424"/>
-      <point x="637" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="637" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="442" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04C_7.glif b/source/Hack-Bold.ufo/glyphs/uni04C_7.glif
index 6ca6e5d78..66307b279 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04C_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04C_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C7" format="1">
+<glyph name="uni04C7" format="2">
   <advance width="1233"/>
   <unicode hex="04C7"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="621" y="-199" type="line" smooth="yes"/>
       <point x="753" y="-199"/>
       <point x="801" y="-133"/>
-      <point x="801" y="43" type="curve" name="ah01" smooth="yes"/>
+      <point x="801" y="43" type="curve" smooth="yes" name="ah01"/>
       <point x="801" y="664" type="line" name="dv01"/>
       <point x="432" y="664" type="line"/>
       <point x="432" y="0" type="line" name="sh02"/>
@@ -19,10 +19,10 @@
       <point x="801" y="924" type="line" name="sh04"/>
       <point x="801" y="1493" type="line" name="at02"/>
       <point x="1096" y="1493" type="line"/>
-      <point x="1096" y="43" type="line" name="sh05" smooth="yes"/>
+      <point x="1096" y="43" type="line" smooth="yes" name="sh05"/>
       <point x="1096" y="-289"/>
       <point x="983" y="-424"/>
-      <point x="703" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="703" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="485" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04C_8.glif b/source/Hack-Bold.ufo/glyphs/uni04C_8.glif
index e8fd691e5..d356c5a44 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04C_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04C_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C8" format="1">
+<glyph name="uni04C8" format="2">
   <advance width="1233"/>
   <unicode hex="04C8"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="600" y="-199" type="line" smooth="yes"/>
       <point x="732" y="-199"/>
       <point x="780" y="-133"/>
-      <point x="780" y="43" type="curve" name="ah01" smooth="yes"/>
+      <point x="780" y="43" type="curve" smooth="yes" name="ah01"/>
       <point x="780" y="530" type="line" name="dv01"/>
       <point x="463" y="530" type="line"/>
       <point x="463" y="0" type="line" name="sh02"/>
@@ -19,10 +19,10 @@
       <point x="780" y="739" type="line" name="sh04"/>
       <point x="780" y="1120" type="line" name="at02"/>
       <point x="1071" y="1120" type="line"/>
-      <point x="1071" y="43" type="line" name="sh05" smooth="yes"/>
+      <point x="1071" y="43" type="line" smooth="yes" name="sh05"/>
       <point x="1071" y="-294"/>
       <point x="961" y="-424"/>
-      <point x="682" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="682" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="487" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04C_B_.glif b/source/Hack-Bold.ufo/glyphs/uni04C_B_.glif
index 6afd5b932..b9599fab6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04C_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04C_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04CB" format="1">
+<glyph name="uni04CB" format="2">
   <advance width="1233"/>
   <unicode hex="04CB"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="830" y="766" type="line" name="iv01"/>
       <point x="819" y="733"/>
       <point x="799" y="708"/>
-      <point x="771" y="689" type="curve" name="hr01" smooth="yes"/>
+      <point x="771" y="689" type="curve" smooth="yes" name="hr01"/>
       <point x="724" y="658" type="line" smooth="yes"/>
       <point x="688" y="635"/>
       <point x="601" y="613"/>
@@ -23,19 +23,19 @@
       <point x="176" y="713" type="curve" smooth="yes"/>
       <point x="125" y="776"/>
       <point x="95" y="882"/>
-      <point x="95" y="1027" type="curve" name="dh01" smooth="yes"/>
+      <point x="95" y="1027" type="curve" smooth="yes" name="dh01"/>
       <point x="95" y="1556" type="line" name="at01"/>
       <point x="386" y="1556" type="line"/>
-      <point x="386" y="1095" type="line" name="dh02" smooth="yes"/>
+      <point x="386" y="1095" type="line" smooth="yes" name="dh02"/>
       <point x="386" y="1014"/>
       <point x="398" y="957"/>
       <point x="421" y="922" type="curve" smooth="yes"/>
       <point x="436" y="897"/>
       <point x="476" y="881"/>
-      <point x="540" y="873" type="curve" name="sv01" smooth="yes"/>
+      <point x="540" y="873" type="curve" smooth="yes" name="sv01"/>
       <point x="555" y="871"/>
       <point x="569" y="870"/>
-      <point x="582" y="870" type="curve" name="dv02" smooth="yes"/>
+      <point x="582" y="870" type="curve" smooth="yes" name="dv02"/>
       <point x="628" y="870"/>
       <point x="675" y="880"/>
       <point x="723" y="899" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="785" y="941" type="curve" smooth="yes"/>
       <point x="816" y="982"/>
       <point x="830" y="1056"/>
-      <point x="830" y="1136" type="curve" name="sh01" smooth="yes"/>
+      <point x="830" y="1136" type="curve" smooth="yes" name="sh01"/>
       <point x="830" y="1556" type="line" name="sh03"/>
       <point x="1121" y="1556" type="line"/>
       <point x="1121" y="0" type="line" name="sh04"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04C_C_.glif b/source/Hack-Bold.ufo/glyphs/uni04C_C_.glif
index 4b0aba898..08af0fe5f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04C_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04C_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04CC" format="1">
+<glyph name="uni04CC" format="2">
   <advance width="1233"/>
   <unicode hex="04CC"/>
   <outline>
@@ -14,16 +14,16 @@
       <point x="266" y="520" type="line" smooth="yes"/>
       <point x="175" y="581"/>
       <point x="130" y="678"/>
-      <point x="130" y="813" type="curve" name="dh01" smooth="yes"/>
+      <point x="130" y="813" type="curve" smooth="yes" name="dh01"/>
       <point x="130" y="1120" type="line" name="at01"/>
       <point x="429" y="1120" type="line"/>
-      <point x="429" y="783" type="line" name="dh02" smooth="yes"/>
+      <point x="429" y="783" type="line" smooth="yes" name="dh02"/>
       <point x="429" y="742"/>
       <point x="441" y="711"/>
       <point x="464" y="689" type="curve" smooth="yes"/>
       <point x="469" y="684"/>
       <point x="476" y="679"/>
-      <point x="485" y="672" type="curve" name="hr02" smooth="yes"/>
+      <point x="485" y="672" type="curve" smooth="yes" name="hr02"/>
       <point x="522" y="646"/>
       <point x="578" y="633"/>
       <point x="655" y="633" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04C_F_.glif b/source/Hack-Bold.ufo/glyphs/uni04C_F_.glif
index aaf650f5b..e5e06ae89 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04C_F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04C_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04CF" format="1">
+<glyph name="uni04CF" format="2">
   <advance width="1233"/>
   <unicode hex="04CF"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04D_0.glif b/source/Hack-Bold.ufo/glyphs/uni04D_0.glif
index d4d908378..9c9a8daef 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04D_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04D_0.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D0" format="1">
+<glyph name="uni04D0" format="2">
   <advance width="1233"/>
   <unicode hex="04D0"/>
   <outline>
     <contour>
-      <point x="616" y="1586" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1586" type="curve" smooth="yes" name="dv01"/>
       <point x="419" y="1586"/>
       <point x="301" y="1677"/>
       <point x="281" y="1850" type="curve" name="sv02"/>
       <point x="422" y="1850" type="line"/>
       <point x="449" y="1769"/>
       <point x="515" y="1729"/>
-      <point x="618" y="1729" type="curve" name="dv02" smooth="yes"/>
+      <point x="618" y="1729" type="curve" smooth="yes" name="dv02"/>
       <point x="719" y="1729"/>
       <point x="782" y="1769"/>
       <point x="809" y="1850" type="curve" name="sv01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04D_1.glif b/source/Hack-Bold.ufo/glyphs/uni04D_1.glif
index a63f0ef1d..2d6d62787 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04D_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04D_1.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D1" format="1">
+<glyph name="uni04D1" format="2">
   <advance width="1233"/>
   <unicode hex="04D1"/>
   <outline>
     <contour>
-      <point x="616" y="1270" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1270" type="curve" smooth="yes" name="sv01"/>
       <point x="407" y="1270"/>
       <point x="289" y="1374"/>
       <point x="281" y="1567" type="curve" name="at01"/>
       <point x="422" y="1567" type="line"/>
       <point x="437" y="1475"/>
       <point x="504" y="1423"/>
-      <point x="616" y="1423" type="curve" name="sv02" smooth="yes"/>
+      <point x="616" y="1423" type="curve" smooth="yes" name="sv02"/>
       <point x="728" y="1423"/>
       <point x="794" y="1474"/>
       <point x="809" y="1567" type="curve" name="sh01"/>
@@ -20,13 +20,13 @@
       <point x="827" y="1270"/>
     </contour>
     <contour>
-      <point x="494" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="494" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="373" y="-29"/>
       <point x="274" y="4"/>
       <point x="202" y="72" type="curve" smooth="yes"/>
       <point x="131" y="139"/>
       <point x="95" y="233"/>
-      <point x="95" y="354" type="curve" name="sh02" smooth="yes"/>
+      <point x="95" y="354" type="curve" smooth="yes" name="sh02"/>
       <point x="95" y="482"/>
       <point x="134" y="580"/>
       <point x="222" y="644" type="curve" smooth="yes"/>
@@ -37,38 +37,38 @@
       <point x="818" y="786" type="line" smooth="yes"/>
       <point x="818" y="835"/>
       <point x="799" y="871"/>
-      <point x="767" y="894" type="curve" name="hr01" smooth="yes"/>
+      <point x="767" y="894" type="curve" smooth="yes" name="hr01"/>
       <point x="732" y="919"/>
       <point x="679" y="930"/>
-      <point x="610" y="930" type="curve" name="dv03" smooth="yes"/>
+      <point x="610" y="930" type="curve" smooth="yes" name="dv03"/>
       <point x="546" y="930"/>
       <point x="477" y="921"/>
-      <point x="412" y="904" type="curve" name="sh04" smooth="yes"/>
+      <point x="412" y="904" type="curve" smooth="yes" name="sh04"/>
       <point x="348" y="887"/>
       <point x="278" y="858"/>
       <point x="206" y="819" type="curve" name="ih01"/>
       <point x="206" y="1069" type="line"/>
       <point x="262" y="1092"/>
       <point x="336" y="1116"/>
-      <point x="403" y="1128" type="curve" name="sh05" smooth="yes"/>
+      <point x="403" y="1128" type="curve" smooth="yes" name="sh05"/>
       <point x="458" y="1139"/>
       <point x="540" y="1148"/>
-      <point x="628" y="1148" type="curve" name="dv04" smooth="yes"/>
+      <point x="628" y="1148" type="curve" smooth="yes" name="dv04"/>
       <point x="815" y="1148"/>
       <point x="927" y="1102"/>
       <point x="997" y="1035" type="curve"/>
       <point x="1069" y="963"/>
       <point x="1109" y="852"/>
-      <point x="1109" y="644" type="curve" name="sh06" smooth="yes"/>
+      <point x="1109" y="644" type="curve" smooth="yes" name="sh06"/>
       <point x="1109" y="570"/>
       <point x="1104" y="323"/>
-      <point x="1104" y="274" type="curve" name="sh07" smooth="yes"/>
+      <point x="1104" y="274" type="curve" smooth="yes" name="sh07"/>
       <point x="1104" y="246"/>
       <point x="1105" y="216"/>
-      <point x="1106" y="197" type="curve" name="sh08" smooth="yes"/>
+      <point x="1106" y="197" type="curve" smooth="yes" name="sh08"/>
       <point x="1109" y="170"/>
       <point x="1110" y="142"/>
-      <point x="1113" y="125" type="curve" name="sh09" smooth="yes"/>
+      <point x="1113" y="125" type="curve" smooth="yes" name="sh09"/>
       <point x="1117" y="98"/>
       <point x="1123" y="71"/>
       <point x="1127" y="58" type="curve" smooth="yes"/>
@@ -84,18 +84,18 @@
       <point x="824" y="125" type="curve" name="sh10"/>
       <point x="787" y="76"/>
       <point x="740" y="38"/>
-      <point x="682" y="11" type="curve" name="ab02" smooth="yes"/>
+      <point x="682" y="11" type="curve" smooth="yes" name="ab02"/>
       <point x="626" y="-16"/>
       <point x="570" y="-29"/>
     </contour>
     <contour>
-      <point x="576" y="174" type="curve" name="dv02" smooth="yes"/>
+      <point x="576" y="174" type="curve" smooth="yes" name="dv02"/>
       <point x="651" y="174"/>
       <point x="711" y="202"/>
       <point x="754" y="262" type="curve"/>
       <point x="797" y="319"/>
       <point x="818" y="401"/>
-      <point x="818" y="506" type="curve" name="sh11" smooth="yes"/>
+      <point x="818" y="506" type="curve" smooth="yes" name="sh11"/>
       <point x="818" y="526" type="line" name="hr02"/>
       <point x="701" y="526" type="line" smooth="yes"/>
       <point x="591" y="526"/>
@@ -103,10 +103,10 @@
       <point x="472" y="484" type="curve" smooth="yes"/>
       <point x="429" y="456"/>
       <point x="407" y="409"/>
-      <point x="407" y="342" type="curve" name="sh03" smooth="yes"/>
+      <point x="407" y="342" type="curve" smooth="yes" name="sh03"/>
       <point x="407" y="287"/>
       <point x="421" y="250"/>
-      <point x="452" y="219" type="curve" name="hr03" smooth="yes"/>
+      <point x="452" y="219" type="curve" smooth="yes" name="hr03"/>
       <point x="482" y="189"/>
       <point x="523" y="174"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04D_2.glif b/source/Hack-Bold.ufo/glyphs/uni04D_2.glif
index d782a3d60..88f6fd1e1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04D_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04D_2.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D2" format="1">
+<glyph name="uni04D2" format="2">
   <advance width="1233"/>
   <unicode hex="04D2"/>
   <outline>
     <contour>
-      <point x="331" y="1604" type="line" name="hr00" smooth="yes"/>
+      <point x="331" y="1604" type="line" smooth="yes" name="hr00"/>
       <point x="311" y="1604"/>
       <point x="301" y="1614"/>
-      <point x="301" y="1634" type="curve" name="sh01" smooth="yes"/>
+      <point x="301" y="1634" type="curve" smooth="yes" name="sh01"/>
       <point x="301" y="1820" type="line" smooth="yes"/>
       <point x="301" y="1840"/>
       <point x="311" y="1850"/>
-      <point x="331" y="1850" type="curve" name="dv01" smooth="yes"/>
+      <point x="331" y="1850" type="curve" smooth="yes" name="dv01"/>
       <point x="507" y="1850" type="line" smooth="yes"/>
       <point x="527" y="1850"/>
       <point x="537" y="1840"/>
       <point x="537" y="1820" type="curve" smooth="yes"/>
-      <point x="537" y="1634" type="line" name="sh02" smooth="yes"/>
+      <point x="537" y="1634" type="line" smooth="yes" name="sh02"/>
       <point x="537" y="1614"/>
       <point x="527" y="1604"/>
       <point x="507" y="1604" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1604" type="line" name="sv01" smooth="yes"/>
+      <point x="726" y="1604" type="line" smooth="yes" name="sv01"/>
       <point x="706" y="1604"/>
       <point x="696" y="1614"/>
-      <point x="696" y="1634" type="curve" name="ah01" smooth="yes"/>
+      <point x="696" y="1634" type="curve" smooth="yes" name="ah01"/>
       <point x="696" y="1820" type="line" smooth="yes"/>
       <point x="696" y="1840"/>
       <point x="706" y="1850"/>
-      <point x="726" y="1850" type="curve" name="sv02" smooth="yes"/>
+      <point x="726" y="1850" type="curve" smooth="yes" name="sv02"/>
       <point x="902" y="1850" type="line" smooth="yes"/>
       <point x="922" y="1850"/>
       <point x="932" y="1840"/>
       <point x="932" y="1820" type="curve" smooth="yes"/>
-      <point x="932" y="1634" type="line" name="sh03" smooth="yes"/>
+      <point x="932" y="1634" type="line" smooth="yes" name="sh03"/>
       <point x="932" y="1614"/>
       <point x="922" y="1604"/>
       <point x="902" y="1604" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04D_3.glif b/source/Hack-Bold.ufo/glyphs/uni04D_3.glif
index 0659b50d0..063bcffb8 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04D_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04D_3.glif
@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D3" format="1">
+<glyph name="uni04D3" format="2">
   <advance width="1233"/>
   <unicode hex="04D3"/>
   <outline>
     <contour>
-      <point x="331" y="1347" type="line" name="dv03" smooth="yes"/>
+      <point x="331" y="1347" type="line" smooth="yes" name="dv03"/>
       <point x="311" y="1347"/>
       <point x="301" y="1357"/>
-      <point x="301" y="1377" type="curve" name="ih01" smooth="yes"/>
+      <point x="301" y="1377" type="curve" smooth="yes" name="ih01"/>
       <point x="301" y="1563" type="line" smooth="yes"/>
       <point x="301" y="1583"/>
       <point x="311" y="1593"/>
-      <point x="331" y="1593" type="curve" name="dv04" smooth="yes"/>
+      <point x="331" y="1593" type="curve" smooth="yes" name="dv04"/>
       <point x="507" y="1593" type="line" smooth="yes"/>
       <point x="527" y="1593"/>
       <point x="537" y="1583"/>
       <point x="537" y="1563" type="curve" smooth="yes"/>
-      <point x="537" y="1377" type="line" name="sh01" smooth="yes"/>
+      <point x="537" y="1377" type="line" smooth="yes" name="sh01"/>
       <point x="537" y="1357"/>
       <point x="527" y="1347"/>
       <point x="507" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1347" type="line" name="sv01" smooth="yes"/>
+      <point x="726" y="1347" type="line" smooth="yes" name="sv01"/>
       <point x="706" y="1347"/>
       <point x="696" y="1357"/>
-      <point x="696" y="1377" type="curve" name="dh03" smooth="yes"/>
+      <point x="696" y="1377" type="curve" smooth="yes" name="dh03"/>
       <point x="696" y="1563" type="line" smooth="yes"/>
       <point x="696" y="1583"/>
       <point x="706" y="1593"/>
-      <point x="726" y="1593" type="curve" name="sv02" smooth="yes"/>
+      <point x="726" y="1593" type="curve" smooth="yes" name="sv02"/>
       <point x="902" y="1593" type="line" smooth="yes"/>
       <point x="922" y="1593"/>
       <point x="932" y="1583"/>
-      <point x="932" y="1563" type="curve" name="hr01" smooth="yes"/>
-      <point x="932" y="1377" type="line" name="dh04" smooth="yes"/>
+      <point x="932" y="1563" type="curve" smooth="yes" name="hr01"/>
+      <point x="932" y="1377" type="line" smooth="yes" name="dh04"/>
       <point x="932" y="1357"/>
       <point x="922" y="1347"/>
       <point x="902" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="494" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="494" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="373" y="-29"/>
       <point x="274" y="4"/>
       <point x="202" y="72" type="curve" smooth="yes"/>
       <point x="131" y="139"/>
       <point x="95" y="233"/>
-      <point x="95" y="354" type="curve" name="dh01" smooth="yes"/>
+      <point x="95" y="354" type="curve" smooth="yes" name="dh01"/>
       <point x="95" y="482"/>
       <point x="134" y="580"/>
       <point x="222" y="644" type="curve" smooth="yes"/>
@@ -60,7 +60,7 @@
       <point x="767" y="894" type="curve" smooth="yes"/>
       <point x="732" y="919"/>
       <point x="679" y="930"/>
-      <point x="610" y="930" type="curve" name="dv06" smooth="yes"/>
+      <point x="610" y="930" type="curve" smooth="yes" name="dv06"/>
       <point x="546" y="930"/>
       <point x="477" y="921"/>
       <point x="412" y="904" type="curve" smooth="yes"/>
@@ -73,22 +73,22 @@
       <point x="403" y="1128" type="curve" smooth="yes"/>
       <point x="458" y="1139"/>
       <point x="540" y="1148"/>
-      <point x="628" y="1148" type="curve" name="dv07" smooth="yes"/>
+      <point x="628" y="1148" type="curve" smooth="yes" name="dv07"/>
       <point x="815" y="1148"/>
       <point x="927" y="1102"/>
       <point x="997" y="1035" type="curve"/>
       <point x="1069" y="963"/>
       <point x="1109" y="852"/>
-      <point x="1109" y="644" type="curve" name="sh02" smooth="yes"/>
+      <point x="1109" y="644" type="curve" smooth="yes" name="sh02"/>
       <point x="1109" y="570"/>
       <point x="1104" y="323"/>
-      <point x="1104" y="274" type="curve" name="sh03" smooth="yes"/>
+      <point x="1104" y="274" type="curve" smooth="yes" name="sh03"/>
       <point x="1104" y="246"/>
       <point x="1105" y="216"/>
-      <point x="1106" y="197" type="curve" name="sh04" smooth="yes"/>
+      <point x="1106" y="197" type="curve" smooth="yes" name="sh04"/>
       <point x="1109" y="170"/>
       <point x="1110" y="142"/>
-      <point x="1113" y="125" type="curve" name="hr02" smooth="yes"/>
+      <point x="1113" y="125" type="curve" smooth="yes" name="hr02"/>
       <point x="1117" y="98"/>
       <point x="1123" y="71"/>
       <point x="1127" y="58" type="curve" smooth="yes"/>
@@ -104,18 +104,18 @@
       <point x="824" y="125" type="curve" name="sh05"/>
       <point x="787" y="76"/>
       <point x="740" y="38"/>
-      <point x="682" y="11" type="curve" name="ab02" smooth="yes"/>
+      <point x="682" y="11" type="curve" smooth="yes" name="ab02"/>
       <point x="626" y="-16"/>
       <point x="570" y="-29"/>
     </contour>
     <contour>
-      <point x="576" y="174" type="curve" name="dv02" smooth="yes"/>
+      <point x="576" y="174" type="curve" smooth="yes" name="dv02"/>
       <point x="651" y="174"/>
       <point x="711" y="202"/>
       <point x="754" y="262" type="curve"/>
       <point x="797" y="319"/>
       <point x="818" y="401"/>
-      <point x="818" y="506" type="curve" name="sh06" smooth="yes"/>
+      <point x="818" y="506" type="curve" smooth="yes" name="sh06"/>
       <point x="818" y="526" type="line" name="dv05"/>
       <point x="701" y="526" type="line" smooth="yes"/>
       <point x="591" y="526"/>
@@ -123,7 +123,7 @@
       <point x="472" y="484" type="curve" smooth="yes"/>
       <point x="429" y="456"/>
       <point x="407" y="409"/>
-      <point x="407" y="342" type="curve" name="dh02" smooth="yes"/>
+      <point x="407" y="342" type="curve" smooth="yes" name="dh02"/>
       <point x="407" y="287"/>
       <point x="421" y="250"/>
       <point x="452" y="219" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04D_4.glif b/source/Hack-Bold.ufo/glyphs/uni04D_4.glif
index 75f910006..c4082f07d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04D_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04D_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D4" format="1">
+<glyph name="uni04D4" format="2">
   <advance width="1233"/>
   <unicode hex="04D4"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04D_5.glif b/source/Hack-Bold.ufo/glyphs/uni04D_5.glif
index 10131301c..362f77414 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04D_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04D_5.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D5" format="1">
+<glyph name="uni04D5" format="2">
   <advance width="1233"/>
   <unicode hex="04D5"/>
   <outline>
     <contour>
-      <point x="346" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="346" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="134" y="-29"/>
       <point x="14" y="97"/>
-      <point x="14" y="329" type="curve" name="dh01" smooth="yes"/>
+      <point x="14" y="329" type="curve" smooth="yes" name="dh01"/>
       <point x="14" y="572"/>
       <point x="149" y="694"/>
       <point x="420" y="694" type="curve" smooth="yes"/>
@@ -15,35 +15,35 @@
       <point x="496" y="745" type="line" smooth="yes"/>
       <point x="496" y="870"/>
       <point x="445" y="932"/>
-      <point x="342" y="932" type="curve" name="sv01" smooth="yes"/>
+      <point x="342" y="932" type="curve" smooth="yes" name="sv01"/>
       <point x="265" y="932"/>
       <point x="176" y="896"/>
       <point x="76" y="823" type="curve" name="ih01"/>
       <point x="76" y="1069" type="line"/>
       <point x="179" y="1122"/>
       <point x="265" y="1147"/>
-      <point x="361" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="361" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="493" y="1147"/>
       <point x="569" y="1100"/>
       <point x="612" y="1020" type="curve" name="ih02"/>
       <point x="655" y="1105"/>
       <point x="742" y="1147"/>
-      <point x="869" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="869" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1100" y="1147"/>
       <point x="1188" y="1006"/>
-      <point x="1188" y="606" type="curve" name="dh06" smooth="yes"/>
+      <point x="1188" y="606" type="curve" smooth="yes" name="dh06"/>
       <point x="1188" y="479" type="line"/>
       <point x="737" y="479" type="line" name="sh01"/>
       <point x="737" y="286"/>
       <point x="804" y="184"/>
-      <point x="932" y="184" type="curve" name="sv02" smooth="yes"/>
+      <point x="932" y="184" type="curve" smooth="yes" name="sv02"/>
       <point x="1011" y="184"/>
       <point x="1091" y="223"/>
       <point x="1171" y="301" type="curve" name="ih03"/>
       <point x="1171" y="57" type="line"/>
       <point x="1107" y="0"/>
       <point x="1023" y="-29"/>
-      <point x="919" y="-29" type="curve" name="sv03" smooth="yes"/>
+      <point x="919" y="-29" type="curve" smooth="yes" name="sv03"/>
       <point x="776" y="-29"/>
       <point x="678" y="23"/>
       <point x="618" y="135" type="curve" name="ih04"/>
@@ -58,7 +58,7 @@
       <point x="938" y="885" type="curve" smooth="yes"/>
       <point x="921" y="916"/>
       <point x="891" y="932"/>
-      <point x="850" y="932" type="curve" name="sv04" smooth="yes"/>
+      <point x="850" y="932" type="curve" smooth="yes" name="sv04"/>
       <point x="809" y="932"/>
       <point x="779" y="916"/>
       <point x="762" y="885" type="curve" smooth="yes"/>
@@ -68,15 +68,15 @@
       <point x="737" y="690" type="line" name="dh04"/>
     </contour>
     <contour>
-      <point x="365" y="184" type="curve" name="dv01" smooth="yes"/>
+      <point x="365" y="184" type="curve" smooth="yes" name="dv01"/>
       <point x="448" y="184"/>
       <point x="489" y="242"/>
-      <point x="489" y="358" type="curve" name="sh02" smooth="yes"/>
+      <point x="489" y="358" type="curve" smooth="yes" name="sh02"/>
       <point x="489" y="483" type="line" name="sv05"/>
       <point x="416" y="483" type="line" smooth="yes"/>
       <point x="299" y="483"/>
       <point x="240" y="431"/>
-      <point x="240" y="327" type="curve" name="dh02" smooth="yes"/>
+      <point x="240" y="327" type="curve" smooth="yes" name="dh02"/>
       <point x="240" y="236"/>
       <point x="284" y="184"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04D_6.glif b/source/Hack-Bold.ufo/glyphs/uni04D_6.glif
index 63d0b4a8e..1bf95e2fc 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04D_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04D_6.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D6" format="1">
+<glyph name="uni04D6" format="2">
   <advance width="1233"/>
   <unicode hex="04D6"/>
   <outline>
     <contour>
-      <point x="634" y="1586" type="curve" name="dv01" smooth="yes"/>
+      <point x="634" y="1586" type="curve" smooth="yes" name="dv01"/>
       <point x="437" y="1586"/>
       <point x="319" y="1677"/>
       <point x="299" y="1850" type="curve" name="sv02"/>
       <point x="440" y="1850" type="line"/>
       <point x="467" y="1769"/>
       <point x="533" y="1729"/>
-      <point x="636" y="1729" type="curve" name="dv02" smooth="yes"/>
+      <point x="636" y="1729" type="curve" smooth="yes" name="dv02"/>
       <point x="737" y="1729"/>
       <point x="800" y="1769"/>
       <point x="827" y="1850" type="curve" name="sv01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04D_7.glif b/source/Hack-Bold.ufo/glyphs/uni04D_7.glif
index 71f07aa79..cc7e6197b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04D_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04D_7.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D7" format="1">
+<glyph name="uni04D7" format="2">
   <advance width="1233"/>
   <unicode hex="04D7"/>
   <outline>
     <contour>
-      <point x="630" y="1297" type="curve" name="dv03" smooth="yes"/>
+      <point x="630" y="1297" type="curve" smooth="yes" name="dv03"/>
       <point x="421" y="1297"/>
       <point x="303" y="1401"/>
       <point x="295" y="1594" type="curve" name="sv02"/>
       <point x="436" y="1594" type="line"/>
       <point x="451" y="1502"/>
       <point x="518" y="1450"/>
-      <point x="630" y="1450" type="curve" name="dv04" smooth="yes"/>
+      <point x="630" y="1450" type="curve" smooth="yes" name="dv04"/>
       <point x="742" y="1450"/>
       <point x="808" y="1501"/>
       <point x="823" y="1594" type="curve" name="sv01"/>
@@ -20,21 +20,21 @@
       <point x="841" y="1297"/>
     </contour>
     <contour>
-      <point x="679" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="679" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="293" y="-29"/>
       <point x="92" y="178"/>
-      <point x="92" y="550" type="curve" name="sh01" smooth="yes"/>
+      <point x="92" y="550" type="curve" smooth="yes" name="sh01"/>
       <point x="92" y="920"/>
       <point x="291" y="1147"/>
-      <point x="631" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="631" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="954" y="1147"/>
       <point x="1149" y="940"/>
-      <point x="1149" y="584" type="curve" name="sh02" smooth="yes"/>
+      <point x="1149" y="584" type="curve" smooth="yes" name="sh02"/>
       <point x="1149" y="465" type="line"/>
       <point x="390" y="465" type="line" name="sh03"/>
       <point x="391" y="290"/>
       <point x="493" y="203"/>
-      <point x="698" y="203" type="curve" name="dv02" smooth="yes"/>
+      <point x="698" y="203" type="curve" smooth="yes" name="dv02"/>
       <point x="834" y="203"/>
       <point x="958" y="240"/>
       <point x="1102" y="324" type="curve" name="ih01"/>
@@ -46,7 +46,7 @@
       <point x="854" y="685" type="line" name="ah01"/>
       <point x="851" y="840"/>
       <point x="771" y="920"/>
-      <point x="630" y="920" type="curve" name="hr01" smooth="yes"/>
+      <point x="630" y="920" type="curve" smooth="yes" name="hr01"/>
       <point x="486" y="920"/>
       <point x="409" y="837"/>
       <point x="393" y="684" type="curve" name="hr02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04D_8.glif b/source/Hack-Bold.ufo/glyphs/uni04D_8.glif
index 521226204..4100aeac0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04D_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04D_8.glif
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D8" format="1">
+<glyph name="uni04D8" format="2">
   <advance width="1233"/>
   <unicode hex="04D8"/>
   <outline>
     <contour>
-      <point x="617" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="270" y="-29"/>
       <point x="92" y="234"/>
-      <point x="92" y="745" type="curve" name="sh01" smooth="yes"/>
+      <point x="92" y="745" type="curve" smooth="yes" name="sh01"/>
       <point x="92" y="840" type="line"/>
       <point x="832" y="840" type="line" name="ah01"/>
       <point x="832" y="845" type="line" smooth="yes"/>
       <point x="832" y="1105"/>
       <point x="762" y="1255"/>
-      <point x="595" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="595" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="506" y="1255"/>
       <point x="407" y="1213"/>
       <point x="307" y="1120" type="curve" name="ih01"/>
       <point x="307" y="1448" type="line"/>
       <point x="400" y="1496"/>
       <point x="504" y="1520"/>
-      <point x="611" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="611" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="964" y="1520"/>
       <point x="1141" y="1256"/>
-      <point x="1141" y="747" type="curve" name="sh03" smooth="yes"/>
+      <point x="1141" y="747" type="curve" smooth="yes" name="sh03"/>
       <point x="1141" y="236"/>
       <point x="962" y="-29"/>
     </contour>
     <contour>
-      <point x="618" y="236" type="curve" name="dv01" smooth="yes"/>
+      <point x="618" y="236" type="curve" smooth="yes" name="dv01"/>
       <point x="751" y="236"/>
       <point x="807" y="355"/>
       <point x="828" y="580" type="curve" name="sh04"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04D_9.glif b/source/Hack-Bold.ufo/glyphs/uni04D_9.glif
index b0c33ffdb..d6df08079 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04D_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04D_9.glif
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D9" format="1">
+<glyph name="uni04D9" format="2">
   <advance width="1233"/>
   <unicode hex="04D9"/>
   <outline>
     <contour>
-      <point x="620" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="620" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="297" y="-29"/>
       <point x="102" y="178"/>
-      <point x="102" y="534" type="curve" name="sh01" smooth="yes"/>
+      <point x="102" y="534" type="curve" smooth="yes" name="sh01"/>
       <point x="102" y="653" type="line"/>
       <point x="861" y="653" type="line" name="ah01"/>
       <point x="861" y="663" type="line"/>
       <point x="860" y="839"/>
       <point x="756" y="915"/>
-      <point x="556" y="915" type="curve" name="sv01" smooth="yes"/>
+      <point x="556" y="915" type="curve" smooth="yes" name="sv01"/>
       <point x="416" y="915"/>
       <point x="293" y="878"/>
       <point x="149" y="794" type="curve" name="ih01"/>
       <point x="149" y="1063" type="line"/>
       <point x="282" y="1119"/>
       <point x="427" y="1147"/>
-      <point x="572" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="572" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="958" y="1147"/>
       <point x="1159" y="940"/>
-      <point x="1159" y="568" type="curve" name="sh03" smooth="yes"/>
+      <point x="1159" y="568" type="curve" smooth="yes" name="sh03"/>
       <point x="1159" y="197"/>
       <point x="960" y="-29"/>
     </contour>
     <contour>
-      <point x="621" y="198" type="curve" name="dv01" smooth="yes"/>
+      <point x="621" y="198" type="curve" smooth="yes" name="dv01"/>
       <point x="765" y="198"/>
       <point x="842" y="280"/>
       <point x="858" y="433" type="curve" name="sh04"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04D_A_.glif b/source/Hack-Bold.ufo/glyphs/uni04D_A_.glif
index d6e30cc66..506aa3fd0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04D_A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04D_A_.glif
@@ -1,70 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04DA" format="1">
+<glyph name="uni04DA" format="2">
   <advance width="1233"/>
   <unicode hex="04DA"/>
   <outline>
     <contour>
-      <point x="341" y="1604" type="line" name="dv03" smooth="yes"/>
+      <point x="341" y="1604" type="line" smooth="yes" name="dv03"/>
       <point x="321" y="1604"/>
       <point x="311" y="1614"/>
-      <point x="311" y="1634" type="curve" name="sh01" smooth="yes"/>
+      <point x="311" y="1634" type="curve" smooth="yes" name="sh01"/>
       <point x="311" y="1820" type="line" smooth="yes"/>
       <point x="311" y="1840"/>
       <point x="321" y="1850"/>
-      <point x="341" y="1850" type="curve" name="dv04" smooth="yes"/>
+      <point x="341" y="1850" type="curve" smooth="yes" name="dv04"/>
       <point x="517" y="1850" type="line" smooth="yes"/>
       <point x="537" y="1850"/>
       <point x="547" y="1840"/>
       <point x="547" y="1820" type="curve" smooth="yes"/>
-      <point x="547" y="1634" type="line" name="sh02" smooth="yes"/>
+      <point x="547" y="1634" type="line" smooth="yes" name="sh02"/>
       <point x="547" y="1614"/>
       <point x="537" y="1604"/>
-      <point x="517" y="1604" type="curve" name="hr01" smooth="yes"/>
+      <point x="517" y="1604" type="curve" smooth="yes" name="hr01"/>
     </contour>
     <contour>
-      <point x="736" y="1604" type="line" name="sv01" smooth="yes"/>
+      <point x="736" y="1604" type="line" smooth="yes" name="sv01"/>
       <point x="716" y="1604"/>
       <point x="706" y="1614"/>
-      <point x="706" y="1634" type="curve" name="dh03" smooth="yes"/>
+      <point x="706" y="1634" type="curve" smooth="yes" name="dh03"/>
       <point x="706" y="1820" type="line" smooth="yes"/>
       <point x="706" y="1840"/>
       <point x="716" y="1850"/>
-      <point x="736" y="1850" type="curve" name="sv02" smooth="yes"/>
-      <point x="912" y="1850" type="line" name="hr02" smooth="yes"/>
+      <point x="736" y="1850" type="curve" smooth="yes" name="sv02"/>
+      <point x="912" y="1850" type="line" smooth="yes" name="hr02"/>
       <point x="932" y="1850"/>
       <point x="942" y="1840"/>
       <point x="942" y="1820" type="curve" smooth="yes"/>
-      <point x="942" y="1634" type="line" name="dh04" smooth="yes"/>
+      <point x="942" y="1634" type="line" smooth="yes" name="dh04"/>
       <point x="942" y="1614"/>
       <point x="932" y="1604"/>
       <point x="912" y="1604" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="617" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="270" y="-29"/>
       <point x="92" y="234"/>
-      <point x="92" y="745" type="curve" name="dh01" smooth="yes"/>
+      <point x="92" y="745" type="curve" smooth="yes" name="dh01"/>
       <point x="92" y="840" type="line"/>
       <point x="832" y="840" type="line" name="ih02"/>
       <point x="832" y="845" type="line" smooth="yes"/>
       <point x="832" y="1105"/>
       <point x="762" y="1255"/>
-      <point x="595" y="1255" type="curve" name="sv03" smooth="yes"/>
+      <point x="595" y="1255" type="curve" smooth="yes" name="sv03"/>
       <point x="506" y="1255"/>
       <point x="407" y="1213"/>
       <point x="307" y="1120" type="curve" name="ih03"/>
       <point x="307" y="1448" type="line" name="ih01"/>
       <point x="400" y="1496"/>
       <point x="504" y="1520"/>
-      <point x="611" y="1520" type="curve" name="hr03" smooth="yes"/>
+      <point x="611" y="1520" type="curve" smooth="yes" name="hr03"/>
       <point x="964" y="1520"/>
       <point x="1141" y="1256"/>
-      <point x="1141" y="747" type="curve" name="sh03" smooth="yes"/>
+      <point x="1141" y="747" type="curve" smooth="yes" name="sh03"/>
       <point x="1141" y="236"/>
       <point x="962" y="-29"/>
     </contour>
     <contour>
-      <point x="618" y="236" type="curve" name="dv02" smooth="yes"/>
+      <point x="618" y="236" type="curve" smooth="yes" name="dv02"/>
       <point x="751" y="236"/>
       <point x="807" y="355"/>
       <point x="828" y="580" type="curve" name="sh04"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04D_B_.glif b/source/Hack-Bold.ufo/glyphs/uni04D_B_.glif
index ffcc369f0..33ba4039d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04D_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04D_B_.glif
@@ -1,70 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04DB" format="1">
+<glyph name="uni04DB" format="2">
   <advance width="1233"/>
   <unicode hex="04DB"/>
   <outline>
     <contour>
-      <point x="341" y="1347" type="line" name="dv02" smooth="yes"/>
+      <point x="341" y="1347" type="line" smooth="yes" name="dv02"/>
       <point x="321" y="1347"/>
       <point x="311" y="1357"/>
-      <point x="311" y="1377" type="curve" name="ih01" smooth="yes"/>
+      <point x="311" y="1377" type="curve" smooth="yes" name="ih01"/>
       <point x="311" y="1563" type="line" smooth="yes"/>
       <point x="311" y="1583"/>
       <point x="321" y="1593"/>
-      <point x="341" y="1593" type="curve" name="dv03" smooth="yes"/>
+      <point x="341" y="1593" type="curve" smooth="yes" name="dv03"/>
       <point x="517" y="1593" type="line" smooth="yes"/>
       <point x="537" y="1593"/>
       <point x="547" y="1583"/>
       <point x="547" y="1563" type="curve" smooth="yes"/>
-      <point x="547" y="1377" type="line" name="sh01" smooth="yes"/>
+      <point x="547" y="1377" type="line" smooth="yes" name="sh01"/>
       <point x="547" y="1357"/>
       <point x="537" y="1347"/>
       <point x="517" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="736" y="1347" type="line" name="sv01" smooth="yes"/>
+      <point x="736" y="1347" type="line" smooth="yes" name="sv01"/>
       <point x="716" y="1347"/>
       <point x="706" y="1357"/>
-      <point x="706" y="1377" type="curve" name="dh03" smooth="yes"/>
+      <point x="706" y="1377" type="curve" smooth="yes" name="dh03"/>
       <point x="706" y="1563" type="line" smooth="yes"/>
       <point x="706" y="1583"/>
       <point x="716" y="1593"/>
-      <point x="736" y="1593" type="curve" name="sv02" smooth="yes"/>
+      <point x="736" y="1593" type="curve" smooth="yes" name="sv02"/>
       <point x="912" y="1593" type="line" smooth="yes"/>
       <point x="932" y="1593"/>
       <point x="942" y="1583"/>
       <point x="942" y="1563" type="curve" smooth="yes"/>
-      <point x="942" y="1377" type="line" name="dh04" smooth="yes"/>
+      <point x="942" y="1377" type="line" smooth="yes" name="dh04"/>
       <point x="942" y="1357"/>
       <point x="932" y="1347"/>
       <point x="912" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="620" y="-29" type="curve" name="hr01" smooth="yes"/>
+      <point x="620" y="-29" type="curve" smooth="yes" name="hr01"/>
       <point x="297" y="-29"/>
       <point x="102" y="178"/>
-      <point x="102" y="534" type="curve" name="dh01" smooth="yes"/>
+      <point x="102" y="534" type="curve" smooth="yes" name="dh01"/>
       <point x="102" y="653" type="line"/>
       <point x="861" y="653" type="line" name="ih02"/>
       <point x="861" y="663" type="line"/>
       <point x="860" y="839"/>
       <point x="756" y="915"/>
-      <point x="556" y="915" type="curve" name="sv03" smooth="yes"/>
+      <point x="556" y="915" type="curve" smooth="yes" name="sv03"/>
       <point x="416" y="915"/>
       <point x="293" y="878"/>
       <point x="149" y="794" type="curve" name="ih03"/>
       <point x="149" y="1063" type="line"/>
       <point x="282" y="1119"/>
       <point x="427" y="1147"/>
-      <point x="572" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="572" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="958" y="1147"/>
       <point x="1159" y="940"/>
-      <point x="1159" y="568" type="curve" name="sh02" smooth="yes"/>
+      <point x="1159" y="568" type="curve" smooth="yes" name="sh02"/>
       <point x="1159" y="197"/>
       <point x="960" y="-29"/>
     </contour>
     <contour>
-      <point x="621" y="198" type="curve" name="dv01" smooth="yes"/>
+      <point x="621" y="198" type="curve" smooth="yes" name="dv01"/>
       <point x="765" y="198"/>
       <point x="842" y="280"/>
       <point x="858" y="433" type="curve" name="sh03"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04D_C_.glif b/source/Hack-Bold.ufo/glyphs/uni04D_C_.glif
index 90c3edbd8..077d18c8c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04D_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04D_C_.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04DC" format="1">
+<glyph name="uni04DC" format="2">
   <advance width="1233"/>
   <unicode hex="04DC"/>
   <outline>
     <contour>
-      <point x="323" y="1604" type="line" name="dv01" smooth="yes"/>
+      <point x="323" y="1604" type="line" smooth="yes" name="dv01"/>
       <point x="303" y="1604"/>
       <point x="293" y="1614"/>
-      <point x="293" y="1634" type="curve" name="dh01" smooth="yes"/>
+      <point x="293" y="1634" type="curve" smooth="yes" name="dh01"/>
       <point x="293" y="1820" type="line" smooth="yes"/>
       <point x="293" y="1840"/>
       <point x="303" y="1850"/>
-      <point x="323" y="1850" type="curve" name="dv02" smooth="yes"/>
+      <point x="323" y="1850" type="curve" smooth="yes" name="dv02"/>
       <point x="499" y="1850" type="line" smooth="yes"/>
       <point x="519" y="1850"/>
       <point x="529" y="1840"/>
       <point x="529" y="1820" type="curve" smooth="yes"/>
-      <point x="529" y="1634" type="line" name="dh02" smooth="yes"/>
+      <point x="529" y="1634" type="line" smooth="yes" name="dh02"/>
       <point x="529" y="1614"/>
       <point x="519" y="1604"/>
       <point x="499" y="1604" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="718" y="1604" type="line" name="sv01" smooth="yes"/>
+      <point x="718" y="1604" type="line" smooth="yes" name="sv01"/>
       <point x="698" y="1604"/>
       <point x="688" y="1614"/>
-      <point x="688" y="1634" type="curve" name="dh03" smooth="yes"/>
+      <point x="688" y="1634" type="curve" smooth="yes" name="dh03"/>
       <point x="688" y="1820" type="line" smooth="yes"/>
       <point x="688" y="1840"/>
       <point x="698" y="1850"/>
-      <point x="718" y="1850" type="curve" name="sv02" smooth="yes"/>
+      <point x="718" y="1850" type="curve" smooth="yes" name="sv02"/>
       <point x="894" y="1850" type="line" smooth="yes"/>
       <point x="914" y="1850"/>
       <point x="924" y="1840"/>
       <point x="924" y="1820" type="curve" smooth="yes"/>
-      <point x="924" y="1634" type="line" name="dh04" smooth="yes"/>
+      <point x="924" y="1634" type="line" smooth="yes" name="dh04"/>
       <point x="924" y="1614"/>
       <point x="914" y="1604"/>
       <point x="894" y="1604" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04D_D_.glif b/source/Hack-Bold.ufo/glyphs/uni04D_D_.glif
index 3bacf577c..7c3fed5f6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04D_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04D_D_.glif
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04DD" format="1">
+<glyph name="uni04DD" format="2">
   <advance width="1233"/>
   <unicode hex="04DD"/>
   <outline>
     <contour>
-      <point x="330" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="330" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="310" y="1320"/>
       <point x="300" y="1330"/>
-      <point x="300" y="1350" type="curve" name="dh01" smooth="yes"/>
+      <point x="300" y="1350" type="curve" smooth="yes" name="dh01"/>
       <point x="300" y="1536" type="line" smooth="yes"/>
       <point x="300" y="1556"/>
       <point x="310" y="1566"/>
-      <point x="330" y="1566" type="curve" name="at04" smooth="yes"/>
+      <point x="330" y="1566" type="curve" smooth="yes" name="at04"/>
       <point x="506" y="1566" type="line" smooth="yes"/>
       <point x="526" y="1566"/>
       <point x="536" y="1556"/>
       <point x="536" y="1536" type="curve" smooth="yes"/>
-      <point x="536" y="1350" type="line" name="dh02" smooth="yes"/>
+      <point x="536" y="1350" type="line" smooth="yes" name="dh02"/>
       <point x="536" y="1330"/>
       <point x="526" y="1320"/>
       <point x="506" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="725" y="1320" type="line" name="sv02" smooth="yes"/>
+      <point x="725" y="1320" type="line" smooth="yes" name="sv02"/>
       <point x="705" y="1320"/>
       <point x="695" y="1330"/>
-      <point x="695" y="1350" type="curve" name="dh03" smooth="yes"/>
+      <point x="695" y="1350" type="curve" smooth="yes" name="dh03"/>
       <point x="695" y="1536" type="line" smooth="yes"/>
       <point x="695" y="1556"/>
       <point x="705" y="1566"/>
-      <point x="725" y="1566" type="curve" name="at05" smooth="yes"/>
+      <point x="725" y="1566" type="curve" smooth="yes" name="at05"/>
       <point x="901" y="1566" type="line" smooth="yes"/>
       <point x="921" y="1566"/>
       <point x="931" y="1556"/>
       <point x="931" y="1536" type="curve" smooth="yes"/>
-      <point x="931" y="1350" type="line" name="dh04" smooth="yes"/>
+      <point x="931" y="1350" type="line" smooth="yes" name="dh04"/>
       <point x="931" y="1330"/>
       <point x="921" y="1320"/>
-      <point x="901" y="1320" type="curve" name="sv03" smooth="yes"/>
+      <point x="901" y="1320" type="curve" smooth="yes" name="sv03"/>
     </contour>
     <contour>
       <point x="268" y="694" type="line"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04D_E_.glif b/source/Hack-Bold.ufo/glyphs/uni04D_E_.glif
index 5997d0e29..29a40ac17 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04D_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04D_E_.glif
@@ -1,84 +1,84 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04DE" format="1">
+<glyph name="uni04DE" format="2">
   <advance width="1233"/>
   <unicode hex="04DE"/>
   <outline>
     <contour>
-      <point x="311" y="1604" type="line" name="dv02" smooth="yes"/>
+      <point x="311" y="1604" type="line" smooth="yes" name="dv02"/>
       <point x="291" y="1604"/>
       <point x="281" y="1614"/>
-      <point x="281" y="1634" type="curve" name="dh01" smooth="yes"/>
+      <point x="281" y="1634" type="curve" smooth="yes" name="dh01"/>
       <point x="281" y="1820" type="line" smooth="yes"/>
       <point x="281" y="1840"/>
       <point x="291" y="1850"/>
-      <point x="311" y="1850" type="curve" name="hr01" smooth="yes"/>
+      <point x="311" y="1850" type="curve" smooth="yes" name="hr01"/>
       <point x="487" y="1850" type="line" smooth="yes"/>
       <point x="507" y="1850"/>
       <point x="517" y="1840"/>
       <point x="517" y="1820" type="curve" smooth="yes"/>
-      <point x="517" y="1634" type="line" name="dh02" smooth="yes"/>
+      <point x="517" y="1634" type="line" smooth="yes" name="dh02"/>
       <point x="517" y="1614"/>
       <point x="507" y="1604"/>
       <point x="487" y="1604" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="706" y="1604" type="line" name="sv01" smooth="yes"/>
+      <point x="706" y="1604" type="line" smooth="yes" name="sv01"/>
       <point x="686" y="1604"/>
       <point x="676" y="1614"/>
-      <point x="676" y="1634" type="curve" name="dh03" smooth="yes"/>
+      <point x="676" y="1634" type="curve" smooth="yes" name="dh03"/>
       <point x="676" y="1820" type="line" smooth="yes"/>
       <point x="676" y="1840"/>
       <point x="686" y="1850"/>
-      <point x="706" y="1850" type="curve" name="sv02" smooth="yes"/>
+      <point x="706" y="1850" type="curve" smooth="yes" name="sv02"/>
       <point x="882" y="1850" type="line" smooth="yes"/>
       <point x="902" y="1850"/>
       <point x="912" y="1840"/>
-      <point x="912" y="1820" type="curve" name="hr02" smooth="yes"/>
-      <point x="912" y="1634" type="line" name="dh04" smooth="yes"/>
+      <point x="912" y="1820" type="curve" smooth="yes" name="hr02"/>
+      <point x="912" y="1634" type="line" smooth="yes" name="dh04"/>
       <point x="912" y="1614"/>
       <point x="902" y="1604"/>
       <point x="882" y="1604" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="554" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="554" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="407" y="-29"/>
       <point x="258" y="-3"/>
       <point x="125" y="45" type="curve"/>
       <point x="125" y="319" type="line"/>
       <point x="253" y="252"/>
       <point x="419" y="223"/>
-      <point x="538" y="223" type="curve" name="hr03" smooth="yes"/>
+      <point x="538" y="223" type="curve" smooth="yes" name="hr03"/>
       <point x="731" y="223"/>
       <point x="817" y="303"/>
-      <point x="817" y="435" type="curve" name="sh02" smooth="yes"/>
+      <point x="817" y="435" type="curve" smooth="yes" name="sh02"/>
       <point x="817" y="578"/>
       <point x="721" y="668"/>
-      <point x="549" y="668" type="curve" name="dv03" smooth="yes"/>
+      <point x="549" y="668" type="curve" smooth="yes" name="dv03"/>
       <point x="391" y="668" type="line"/>
       <point x="391" y="928" type="line"/>
-      <point x="549" y="928" type="line" name="dv04" smooth="yes"/>
+      <point x="549" y="928" type="line" smooth="yes" name="dv04"/>
       <point x="697" y="928"/>
       <point x="780" y="988"/>
-      <point x="780" y="1097" type="curve" name="ih01" smooth="yes"/>
+      <point x="780" y="1097" type="curve" smooth="yes" name="ih01"/>
       <point x="780" y="1205"/>
       <point x="697" y="1270"/>
-      <point x="544" y="1270" type="curve" name="sv03" smooth="yes"/>
+      <point x="544" y="1270" type="curve" smooth="yes" name="sv03"/>
       <point x="440" y="1270"/>
       <point x="307" y="1241"/>
       <point x="170" y="1188" type="curve"/>
       <point x="170" y="1456" type="line"/>
       <point x="307" y="1497"/>
       <point x="441" y="1520"/>
-      <point x="566" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="566" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="880" y="1520"/>
       <point x="1065" y="1373"/>
-      <point x="1065" y="1135" type="curve" name="sh01" smooth="yes"/>
+      <point x="1065" y="1135" type="curve" smooth="yes" name="sh01"/>
       <point x="1065" y="952"/>
       <point x="960" y="840"/>
       <point x="772" y="805" type="curve" name="ih02"/>
       <point x="977" y="768"/>
       <point x="1100" y="642"/>
-      <point x="1100" y="412" type="curve" name="sh03" smooth="yes"/>
+      <point x="1100" y="412" type="curve" smooth="yes" name="sh03"/>
       <point x="1100" y="125"/>
       <point x="913" y="-29"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04D_F_.glif b/source/Hack-Bold.ufo/glyphs/uni04D_F_.glif
index ac237b014..be721809f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04D_F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04D_F_.glif
@@ -1,84 +1,84 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04DF" format="1">
+<glyph name="uni04DF" format="2">
   <advance width="1233"/>
   <unicode hex="04DF"/>
   <outline>
     <contour>
-      <point x="319" y="1347" type="line" name="dv01" smooth="yes"/>
+      <point x="319" y="1347" type="line" smooth="yes" name="dv01"/>
       <point x="299" y="1347"/>
       <point x="289" y="1357"/>
-      <point x="289" y="1377" type="curve" name="dh01" smooth="yes"/>
+      <point x="289" y="1377" type="curve" smooth="yes" name="dh01"/>
       <point x="289" y="1563" type="line" smooth="yes"/>
       <point x="289" y="1583"/>
       <point x="299" y="1593"/>
-      <point x="319" y="1593" type="curve" name="hr01" smooth="yes"/>
+      <point x="319" y="1593" type="curve" smooth="yes" name="hr01"/>
       <point x="495" y="1593" type="line" smooth="yes"/>
       <point x="515" y="1593"/>
       <point x="525" y="1583"/>
       <point x="525" y="1563" type="curve" smooth="yes"/>
-      <point x="525" y="1377" type="line" name="dh02" smooth="yes"/>
+      <point x="525" y="1377" type="line" smooth="yes" name="dh02"/>
       <point x="525" y="1357"/>
       <point x="515" y="1347"/>
       <point x="495" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="714" y="1347" type="line" name="sv01" smooth="yes"/>
+      <point x="714" y="1347" type="line" smooth="yes" name="sv01"/>
       <point x="694" y="1347"/>
       <point x="684" y="1357"/>
-      <point x="684" y="1377" type="curve" name="dh03" smooth="yes"/>
+      <point x="684" y="1377" type="curve" smooth="yes" name="dh03"/>
       <point x="684" y="1563" type="line" smooth="yes"/>
       <point x="684" y="1583"/>
       <point x="694" y="1593"/>
-      <point x="714" y="1593" type="curve" name="sv02" smooth="yes"/>
+      <point x="714" y="1593" type="curve" smooth="yes" name="sv02"/>
       <point x="890" y="1593" type="line" smooth="yes"/>
       <point x="910" y="1593"/>
       <point x="920" y="1583"/>
-      <point x="920" y="1563" type="curve" name="hr02" smooth="yes"/>
-      <point x="920" y="1377" type="line" name="dh04" smooth="yes"/>
+      <point x="920" y="1563" type="curve" smooth="yes" name="hr02"/>
+      <point x="920" y="1377" type="line" smooth="yes" name="dh04"/>
       <point x="920" y="1357"/>
       <point x="910" y="1347"/>
       <point x="890" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="510" y="-22" type="curve" name="ab01" smooth="yes"/>
+      <point x="510" y="-22" type="curve" smooth="yes" name="ab01"/>
       <point x="386" y="-22"/>
       <point x="291" y="-9"/>
       <point x="153" y="44" type="curve"/>
       <point x="153" y="280" type="line" name="iv01"/>
       <point x="285" y="215"/>
       <point x="371" y="201"/>
-      <point x="531" y="201" type="curve" name="hr03" smooth="yes"/>
+      <point x="531" y="201" type="curve" smooth="yes" name="hr03"/>
       <point x="679" y="201"/>
       <point x="786" y="212"/>
-      <point x="786" y="319" type="curve" name="sh02" smooth="yes"/>
+      <point x="786" y="319" type="curve" smooth="yes" name="sh02"/>
       <point x="786" y="439"/>
       <point x="648" y="462"/>
-      <point x="556" y="462" type="curve" name="dv02" smooth="yes"/>
+      <point x="556" y="462" type="curve" smooth="yes" name="dv02"/>
       <point x="393" y="462" type="line"/>
       <point x="393" y="681" type="line"/>
-      <point x="530" y="681" type="line" name="dv03" smooth="yes"/>
+      <point x="530" y="681" type="line" smooth="yes" name="dv03"/>
       <point x="642" y="681"/>
       <point x="759" y="711"/>
-      <point x="759" y="805" type="curve" name="ih01" smooth="yes"/>
+      <point x="759" y="805" type="curve" smooth="yes" name="ih01"/>
       <point x="759" y="887"/>
       <point x="674" y="928"/>
-      <point x="504" y="928" type="curve" name="sv03" smooth="yes"/>
+      <point x="504" y="928" type="curve" smooth="yes" name="sv03"/>
       <point x="397" y="928"/>
       <point x="292" y="911"/>
       <point x="190" y="876" type="curve" name="iv02"/>
       <point x="190" y="1099" type="line"/>
       <point x="262" y="1120"/>
       <point x="391" y="1147"/>
-      <point x="547" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="547" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="877" y="1147"/>
       <point x="1042" y="1024"/>
-      <point x="1042" y="825" type="curve" name="sh01" smooth="yes"/>
+      <point x="1042" y="825" type="curve" smooth="yes" name="sh01"/>
       <point x="1042" y="670"/>
       <point x="941" y="600"/>
       <point x="857" y="573" type="curve" name="ih02"/>
       <point x="965" y="543"/>
       <point x="1079" y="438"/>
-      <point x="1079" y="287" type="curve" name="sh03" smooth="yes"/>
+      <point x="1079" y="287" type="curve" smooth="yes" name="sh03"/>
       <point x="1079" y="79"/>
       <point x="857" y="-22"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04E_0.glif b/source/Hack-Bold.ufo/glyphs/uni04E_0.glif
index eec73ce4b..5790c1614 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04E_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04E_0.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E0" format="1">
+<glyph name="uni04E0" format="2">
   <advance width="1233"/>
   <unicode hex="04E0"/>
   <outline>
     <contour>
-      <point x="615" y="-28" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="-28" type="curve" smooth="yes" name="dv01"/>
       <point x="171" y="-28"/>
       <point x="10" y="145"/>
       <point x="10" y="439" type="curve" name="sh01"/>
       <point x="328" y="439" type="line" name="sh02"/>
       <point x="328" y="296"/>
       <point x="454" y="234"/>
-      <point x="607" y="234" type="curve" name="dv02" smooth="yes"/>
+      <point x="607" y="234" type="curve" smooth="yes" name="dv02"/>
       <point x="744" y="234"/>
       <point x="840" y="283"/>
-      <point x="868" y="380" type="curve" name="sh03" smooth="yes"/>
+      <point x="868" y="380" type="curve" smooth="yes" name="sh03"/>
       <point x="875" y="401"/>
       <point x="876" y="422"/>
-      <point x="876" y="441" type="curve" name="ah01" smooth="yes"/>
+      <point x="876" y="441" type="curve" smooth="yes" name="ah01"/>
       <point x="876" y="556"/>
       <point x="807" y="623"/>
       <point x="652" y="642" type="curve" smooth="yes"/>
@@ -34,10 +34,10 @@
       <point x="739" y="848" type="line" name="ih02"/>
       <point x="931" y="835"/>
       <point x="1045" y="819"/>
-      <point x="1142" y="685" type="curve" name="hr01" smooth="yes"/>
+      <point x="1142" y="685" type="curve" smooth="yes" name="hr01"/>
       <point x="1198" y="609"/>
       <point x="1223" y="529"/>
-      <point x="1223" y="421" type="curve" name="sh05" smooth="yes"/>
+      <point x="1223" y="421" type="curve" smooth="yes" name="sh05"/>
       <point x="1223" y="50"/>
       <point x="913" y="-28"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04E_1.glif b/source/Hack-Bold.ufo/glyphs/uni04E_1.glif
index bd08e8dad..4595cc144 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04E_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04E_1.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E1" format="1">
+<glyph name="uni04E1" format="2">
   <advance width="1233"/>
   <unicode hex="04E1"/>
   <outline>
     <contour>
-      <point x="531" y="-440" type="curve" name="hr00" smooth="yes"/>
+      <point x="531" y="-440" type="curve" smooth="yes" name="hr00"/>
       <point x="382" y="-440"/>
       <point x="251" y="-417"/>
       <point x="110" y="-366" type="curve"/>
       <point x="110" y="-69" type="line"/>
       <point x="240" y="-142"/>
       <point x="369" y="-178"/>
-      <point x="496" y="-178" type="curve" name="dv01" smooth="yes"/>
+      <point x="496" y="-178" type="curve" smooth="yes" name="dv01"/>
       <point x="677" y="-178"/>
       <point x="776" y="-105"/>
-      <point x="776" y="28" type="curve" name="dh01" smooth="yes"/>
+      <point x="776" y="28" type="curve" smooth="yes" name="dh01"/>
       <point x="776" y="163"/>
       <point x="676" y="234"/>
-      <point x="479" y="234" type="curve" name="dv02" smooth="yes"/>
+      <point x="479" y="234" type="curve" smooth="yes" name="dv02"/>
       <point x="311" y="234" type="line"/>
       <point x="311" y="452" type="line"/>
       <point x="701" y="901" type="line" name="sv01"/>
@@ -31,7 +31,7 @@
       <point x="1052" y="258" type="curve" smooth="yes"/>
       <point x="1100" y="186"/>
       <point x="1123" y="110"/>
-      <point x="1123" y="13" type="curve" name="dh02" smooth="yes"/>
+      <point x="1123" y="13" type="curve" smooth="yes" name="dh02"/>
       <point x="1123" y="-283"/>
       <point x="911" y="-440"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04E_2.glif b/source/Hack-Bold.ufo/glyphs/uni04E_2.glif
index 714f2db31..0fdeb0fa9 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04E_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04E_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E2" format="1">
+<glyph name="uni04E2" format="2">
   <advance width="1233"/>
   <unicode hex="04E2"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04E_3.glif b/source/Hack-Bold.ufo/glyphs/uni04E_3.glif
index f9056a9f1..c438fb716 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04E_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04E_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E3" format="1">
+<glyph name="uni04E3" format="2">
   <advance width="1233"/>
   <unicode hex="04E3"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04E_4.glif b/source/Hack-Bold.ufo/glyphs/uni04E_4.glif
index 063d1a7f0..a0501c457 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04E_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04E_4.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E4" format="1">
+<glyph name="uni04E4" format="2">
   <advance width="1233"/>
   <unicode hex="04E4"/>
   <outline>
     <contour>
-      <point x="331" y="1606" type="line" name="dv01" smooth="yes"/>
+      <point x="331" y="1606" type="line" smooth="yes" name="dv01"/>
       <point x="311" y="1606"/>
       <point x="301" y="1616"/>
-      <point x="301" y="1636" type="curve" name="ih01" smooth="yes"/>
+      <point x="301" y="1636" type="curve" smooth="yes" name="ih01"/>
       <point x="301" y="1822" type="line" smooth="yes"/>
       <point x="301" y="1842"/>
       <point x="311" y="1852"/>
-      <point x="331" y="1852" type="curve" name="dv02" smooth="yes"/>
+      <point x="331" y="1852" type="curve" smooth="yes" name="dv02"/>
       <point x="507" y="1852" type="line" smooth="yes"/>
       <point x="527" y="1852"/>
       <point x="537" y="1842"/>
       <point x="537" y="1822" type="curve" smooth="yes"/>
-      <point x="537" y="1636" type="line" name="sh01" smooth="yes"/>
+      <point x="537" y="1636" type="line" smooth="yes" name="sh01"/>
       <point x="537" y="1616"/>
       <point x="527" y="1606"/>
       <point x="507" y="1606" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1606" type="line" name="sv01" smooth="yes"/>
+      <point x="726" y="1606" type="line" smooth="yes" name="sv01"/>
       <point x="706" y="1606"/>
       <point x="696" y="1616"/>
-      <point x="696" y="1636" type="curve" name="dh03" smooth="yes"/>
+      <point x="696" y="1636" type="curve" smooth="yes" name="dh03"/>
       <point x="696" y="1822" type="line" smooth="yes"/>
       <point x="696" y="1842"/>
       <point x="706" y="1852"/>
-      <point x="726" y="1852" type="curve" name="hr01" smooth="yes"/>
+      <point x="726" y="1852" type="curve" smooth="yes" name="hr01"/>
       <point x="902" y="1852" type="line" smooth="yes"/>
       <point x="922" y="1852"/>
       <point x="932" y="1842"/>
       <point x="932" y="1822" type="curve" smooth="yes"/>
-      <point x="932" y="1636" type="line" name="dh04" smooth="yes"/>
+      <point x="932" y="1636" type="line" smooth="yes" name="dh04"/>
       <point x="932" y="1616"/>
       <point x="922" y="1606"/>
       <point x="902" y="1606" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04E_5.glif b/source/Hack-Bold.ufo/glyphs/uni04E_5.glif
index f91d7dbc4..4c21d7e0b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04E_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04E_5.glif
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E5" format="1">
+<glyph name="uni04E5" format="2">
   <advance width="1233"/>
   <unicode hex="04E5"/>
   <outline>
     <contour>
-      <point x="331" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="331" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="311" y="1320"/>
       <point x="301" y="1330"/>
-      <point x="301" y="1350" type="curve" name="ih01" smooth="yes"/>
+      <point x="301" y="1350" type="curve" smooth="yes" name="ih01"/>
       <point x="301" y="1536" type="line" smooth="yes"/>
       <point x="301" y="1556"/>
       <point x="311" y="1566"/>
-      <point x="331" y="1566" type="curve" name="at01" smooth="yes"/>
+      <point x="331" y="1566" type="curve" smooth="yes" name="at01"/>
       <point x="507" y="1566" type="line" smooth="yes"/>
       <point x="527" y="1566"/>
       <point x="537" y="1556"/>
       <point x="537" y="1536" type="curve" smooth="yes"/>
-      <point x="537" y="1350" type="line" name="sh01" smooth="yes"/>
+      <point x="537" y="1350" type="line" smooth="yes" name="sh01"/>
       <point x="537" y="1330"/>
       <point x="527" y="1320"/>
       <point x="507" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1320" type="line" name="sv02" smooth="yes"/>
+      <point x="726" y="1320" type="line" smooth="yes" name="sv02"/>
       <point x="706" y="1320"/>
       <point x="696" y="1330"/>
-      <point x="696" y="1350" type="curve" name="dh03" smooth="yes"/>
+      <point x="696" y="1350" type="curve" smooth="yes" name="dh03"/>
       <point x="696" y="1536" type="line" smooth="yes"/>
       <point x="696" y="1556"/>
       <point x="706" y="1566"/>
-      <point x="726" y="1566" type="curve" name="hr01" smooth="yes"/>
+      <point x="726" y="1566" type="curve" smooth="yes" name="hr01"/>
       <point x="902" y="1566" type="line" smooth="yes"/>
       <point x="922" y="1566"/>
       <point x="932" y="1556"/>
       <point x="932" y="1536" type="curve" smooth="yes"/>
-      <point x="932" y="1350" type="line" name="dh04" smooth="yes"/>
+      <point x="932" y="1350" type="line" smooth="yes" name="dh04"/>
       <point x="932" y="1330"/>
       <point x="922" y="1320"/>
-      <point x="902" y="1320" type="curve" name="sv03" smooth="yes"/>
+      <point x="902" y="1320" type="curve" smooth="yes" name="sv03"/>
     </contour>
     <contour>
       <point x="152" y="1120" type="line" name="dh01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04E_6.glif b/source/Hack-Bold.ufo/glyphs/uni04E_6.glif
index 4a77edfa1..df548ff19 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04E_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04E_6.glif
@@ -1,78 +1,78 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E6" format="1">
+<glyph name="uni04E6" format="2">
   <advance width="1233"/>
   <unicode hex="04E6"/>
   <outline>
     <contour>
-      <point x="331" y="1606" type="line" name="dv03" smooth="yes"/>
+      <point x="331" y="1606" type="line" smooth="yes" name="dv03"/>
       <point x="311" y="1606"/>
       <point x="301" y="1616"/>
-      <point x="301" y="1636" type="curve" name="ih01" smooth="yes"/>
+      <point x="301" y="1636" type="curve" smooth="yes" name="ih01"/>
       <point x="301" y="1822" type="line" smooth="yes"/>
       <point x="301" y="1842"/>
       <point x="311" y="1852"/>
-      <point x="331" y="1852" type="curve" name="dv04" smooth="yes"/>
+      <point x="331" y="1852" type="curve" smooth="yes" name="dv04"/>
       <point x="507" y="1852" type="line" smooth="yes"/>
       <point x="527" y="1852"/>
       <point x="537" y="1842"/>
       <point x="537" y="1822" type="curve" smooth="yes"/>
-      <point x="537" y="1636" type="line" name="sh01" smooth="yes"/>
+      <point x="537" y="1636" type="line" smooth="yes" name="sh01"/>
       <point x="537" y="1616"/>
       <point x="527" y="1606"/>
       <point x="507" y="1606" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1606" type="line" name="sv01" smooth="yes"/>
+      <point x="726" y="1606" type="line" smooth="yes" name="sv01"/>
       <point x="706" y="1606"/>
       <point x="696" y="1616"/>
-      <point x="696" y="1636" type="curve" name="dh03" smooth="yes"/>
+      <point x="696" y="1636" type="curve" smooth="yes" name="dh03"/>
       <point x="696" y="1822" type="line" smooth="yes"/>
       <point x="696" y="1842"/>
       <point x="706" y="1852"/>
-      <point x="726" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="726" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="902" y="1852" type="line" smooth="yes"/>
       <point x="922" y="1852"/>
       <point x="932" y="1842"/>
       <point x="932" y="1822" type="curve" smooth="yes"/>
-      <point x="932" y="1636" type="line" name="dh04" smooth="yes"/>
+      <point x="932" y="1636" type="line" smooth="yes" name="dh04"/>
       <point x="932" y="1616"/>
       <point x="922" y="1606"/>
-      <point x="902" y="1606" type="curve" name="hr01" smooth="yes"/>
+      <point x="902" y="1606" type="curve" smooth="yes" name="hr01"/>
     </contour>
     <contour>
-      <point x="617" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="270" y="-29"/>
       <point x="92" y="237"/>
-      <point x="92" y="746" type="curve" name="dh01" smooth="yes"/>
+      <point x="92" y="746" type="curve" smooth="yes" name="dh01"/>
       <point x="92" y="1255"/>
       <point x="270" y="1520"/>
-      <point x="617" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="617" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="962" y="1520"/>
       <point x="1141" y="1257"/>
-      <point x="1141" y="746" type="curve" name="sh02" smooth="yes"/>
+      <point x="1141" y="746" type="curve" smooth="yes" name="sh02"/>
       <point x="1141" y="235"/>
       <point x="962" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="236" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="236" type="curve" smooth="yes" name="dv02"/>
       <point x="692" y="236"/>
       <point x="747" y="276"/>
       <point x="782" y="357" type="curve" smooth="yes"/>
       <point x="817" y="436"/>
       <point x="834" y="566"/>
-      <point x="834" y="746" type="curve" name="ih02" smooth="yes"/>
+      <point x="834" y="746" type="curve" smooth="yes" name="ih02"/>
       <point x="834" y="925"/>
       <point x="817" y="1055"/>
       <point x="782" y="1134" type="curve" smooth="yes"/>
       <point x="747" y="1215"/>
       <point x="692" y="1255"/>
-      <point x="616" y="1255" type="curve" name="sv03" smooth="yes"/>
+      <point x="616" y="1255" type="curve" smooth="yes" name="sv03"/>
       <point x="537" y="1255"/>
       <point x="486" y="1214"/>
       <point x="451" y="1134" type="curve" smooth="yes"/>
       <point x="416" y="1055"/>
       <point x="399" y="925"/>
-      <point x="399" y="746" type="curve" name="dh02" smooth="yes"/>
+      <point x="399" y="746" type="curve" smooth="yes" name="dh02"/>
       <point x="399" y="566"/>
       <point x="416" y="436"/>
       <point x="451" y="357" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04E_7.glif b/source/Hack-Bold.ufo/glyphs/uni04E_7.glif
index c46ee2f89..2eaa16f9b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04E_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04E_7.glif
@@ -1,69 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E7" format="1">
+<glyph name="uni04E7" format="2">
   <advance width="1233"/>
   <unicode hex="04E7"/>
   <outline>
     <contour>
-      <point x="331" y="1347" type="line" name="dv03" smooth="yes"/>
+      <point x="331" y="1347" type="line" smooth="yes" name="dv03"/>
       <point x="311" y="1347"/>
       <point x="301" y="1357"/>
-      <point x="301" y="1377" type="curve" name="ih01" smooth="yes"/>
+      <point x="301" y="1377" type="curve" smooth="yes" name="ih01"/>
       <point x="301" y="1563" type="line" smooth="yes"/>
       <point x="301" y="1583"/>
       <point x="311" y="1593"/>
-      <point x="331" y="1593" type="curve" name="dv04" smooth="yes"/>
+      <point x="331" y="1593" type="curve" smooth="yes" name="dv04"/>
       <point x="507" y="1593" type="line" smooth="yes"/>
       <point x="527" y="1593"/>
       <point x="537" y="1583"/>
       <point x="537" y="1563" type="curve" smooth="yes"/>
-      <point x="537" y="1377" type="line" name="sh01" smooth="yes"/>
+      <point x="537" y="1377" type="line" smooth="yes" name="sh01"/>
       <point x="537" y="1357"/>
       <point x="527" y="1347"/>
       <point x="507" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1347" type="line" name="sv01" smooth="yes"/>
+      <point x="726" y="1347" type="line" smooth="yes" name="sv01"/>
       <point x="706" y="1347"/>
       <point x="696" y="1357"/>
-      <point x="696" y="1377" type="curve" name="dh03" smooth="yes"/>
+      <point x="696" y="1377" type="curve" smooth="yes" name="dh03"/>
       <point x="696" y="1563" type="line" smooth="yes"/>
       <point x="696" y="1583"/>
       <point x="706" y="1593"/>
-      <point x="726" y="1593" type="curve" name="hr01" smooth="yes"/>
+      <point x="726" y="1593" type="curve" smooth="yes" name="hr01"/>
       <point x="902" y="1593" type="line" smooth="yes"/>
       <point x="922" y="1593"/>
       <point x="932" y="1583"/>
       <point x="932" y="1563" type="curve" smooth="yes"/>
-      <point x="932" y="1377" type="line" name="dh04" smooth="yes"/>
+      <point x="932" y="1377" type="line" smooth="yes" name="dh04"/>
       <point x="932" y="1357"/>
       <point x="922" y="1347"/>
       <point x="902" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="300" y="-29"/>
       <point x="98" y="198"/>
-      <point x="98" y="559" type="curve" name="dh01" smooth="yes"/>
+      <point x="98" y="559" type="curve" smooth="yes" name="dh01"/>
       <point x="98" y="920"/>
       <point x="300" y="1147"/>
-      <point x="616" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="933" y="1147"/>
       <point x="1135" y="920"/>
-      <point x="1135" y="559" type="curve" name="sh02" smooth="yes"/>
+      <point x="1135" y="559" type="curve" smooth="yes" name="sh02"/>
       <point x="1135" y="198"/>
       <point x="933" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="209" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="209" type="curve" smooth="yes" name="dv02"/>
       <point x="757" y="209"/>
       <point x="842" y="338"/>
-      <point x="842" y="559" type="curve" name="ih02" smooth="yes"/>
+      <point x="842" y="559" type="curve" smooth="yes" name="ih02"/>
       <point x="842" y="778"/>
       <point x="757" y="909"/>
-      <point x="616" y="909" type="curve" name="sv02" smooth="yes"/>
+      <point x="616" y="909" type="curve" smooth="yes" name="sv02"/>
       <point x="476" y="909"/>
       <point x="391" y="778"/>
-      <point x="391" y="559" type="curve" name="dh02" smooth="yes"/>
+      <point x="391" y="559" type="curve" smooth="yes" name="dh02"/>
       <point x="391" y="338"/>
       <point x="476" y="209"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04E_8.glif b/source/Hack-Bold.ufo/glyphs/uni04E_8.glif
index c4e6683c8..ed1f87bbe 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04E_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04E_8.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E8" format="1">
+<glyph name="uni04E8" format="2">
   <advance width="1233"/>
   <unicode hex="04E8"/>
   <outline>
     <contour>
-      <point x="617" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="270" y="-29"/>
       <point x="92" y="237"/>
-      <point x="92" y="746" type="curve" name="sh01" smooth="yes"/>
+      <point x="92" y="746" type="curve" smooth="yes" name="sh01"/>
       <point x="92" y="1255"/>
       <point x="270" y="1520"/>
-      <point x="617" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="617" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="962" y="1520"/>
       <point x="1141" y="1257"/>
-      <point x="1141" y="746" type="curve" name="sh02" smooth="yes"/>
+      <point x="1141" y="746" type="curve" smooth="yes" name="sh02"/>
       <point x="1141" y="235"/>
       <point x="962" y="-29"/>
     </contour>
@@ -21,13 +21,13 @@
       <point x="828" y="911" type="line" name="sh03"/>
       <point x="809" y="1108"/>
       <point x="768" y="1255"/>
-      <point x="616" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="466" y="1255"/>
       <point x="424" y="1112"/>
       <point x="405" y="911" type="curve" name="sh05"/>
     </contour>
     <contour>
-      <point x="617" y="236" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="236" type="curve" smooth="yes" name="dv01"/>
       <point x="768" y="236"/>
       <point x="819" y="382"/>
       <point x="832" y="651" type="curve" name="ah01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04E_9.glif b/source/Hack-Bold.ufo/glyphs/uni04E_9.glif
index 26dc7775f..91338ac2d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04E_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04E_9.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E9" format="1">
+<glyph name="uni04E9" format="2">
   <advance width="1233"/>
   <unicode hex="04E9"/>
   <outline>
     <contour>
-      <point x="614" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="614" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="457" y="-29"/>
       <point x="332" y="24"/>
       <point x="238" y="130" type="curve" smooth="yes"/>
@@ -13,7 +13,7 @@
       <point x="98" y="556" type="curve" smooth="yes"/>
       <point x="98" y="921"/>
       <point x="300" y="1147"/>
-      <point x="616" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="933" y="1147"/>
       <point x="1135" y="920"/>
       <point x="1135" y="559" type="curve" smooth="yes"/>
@@ -24,13 +24,13 @@
       <point x="839" y="632" type="line" name="dv03"/>
       <point x="823" y="783"/>
       <point x="758" y="909"/>
-      <point x="616" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="475" y="909"/>
       <point x="410" y="783"/>
       <point x="394" y="632" type="curve"/>
     </contour>
     <contour>
-      <point x="616" y="209" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="209" type="curve" smooth="yes" name="dv01"/>
       <point x="756" y="209"/>
       <point x="814" y="330"/>
       <point x="832" y="438" type="curve" name="dv02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04E_A_.glif b/source/Hack-Bold.ufo/glyphs/uni04E_A_.glif
index e21d5bf59..21e7dd53b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04E_A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04E_A_.glif
@@ -1,55 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04EA" format="1">
+<glyph name="uni04EA" format="2">
   <advance width="1233"/>
   <unicode hex="04EA"/>
   <outline>
     <contour>
-      <point x="331" y="1606" type="line" name="dv03" smooth="yes"/>
+      <point x="331" y="1606" type="line" smooth="yes" name="dv03"/>
       <point x="311" y="1606"/>
       <point x="301" y="1616"/>
-      <point x="301" y="1636" type="curve" name="ih01" smooth="yes"/>
+      <point x="301" y="1636" type="curve" smooth="yes" name="ih01"/>
       <point x="301" y="1822" type="line" smooth="yes"/>
       <point x="301" y="1842"/>
       <point x="311" y="1852"/>
-      <point x="331" y="1852" type="curve" name="dv04" smooth="yes"/>
+      <point x="331" y="1852" type="curve" smooth="yes" name="dv04"/>
       <point x="507" y="1852" type="line" smooth="yes"/>
       <point x="527" y="1852"/>
       <point x="537" y="1842"/>
       <point x="537" y="1822" type="curve" smooth="yes"/>
-      <point x="537" y="1636" type="line" name="sh01" smooth="yes"/>
+      <point x="537" y="1636" type="line" smooth="yes" name="sh01"/>
       <point x="537" y="1616"/>
       <point x="527" y="1606"/>
       <point x="507" y="1606" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1606" type="line" name="sv01" smooth="yes"/>
+      <point x="726" y="1606" type="line" smooth="yes" name="sv01"/>
       <point x="706" y="1606"/>
       <point x="696" y="1616"/>
-      <point x="696" y="1636" type="curve" name="dh03" smooth="yes"/>
+      <point x="696" y="1636" type="curve" smooth="yes" name="dh03"/>
       <point x="696" y="1822" type="line" smooth="yes"/>
       <point x="696" y="1842"/>
       <point x="706" y="1852"/>
-      <point x="726" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="726" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="902" y="1852" type="line" smooth="yes"/>
       <point x="922" y="1852"/>
       <point x="932" y="1842"/>
-      <point x="932" y="1822" type="curve" name="hr01" smooth="yes"/>
-      <point x="932" y="1636" type="line" name="dh04" smooth="yes"/>
+      <point x="932" y="1822" type="curve" smooth="yes" name="hr01"/>
+      <point x="932" y="1636" type="line" smooth="yes" name="dh04"/>
       <point x="932" y="1616"/>
       <point x="922" y="1606"/>
       <point x="902" y="1606" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="617" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="270" y="-29"/>
       <point x="92" y="237"/>
-      <point x="92" y="746" type="curve" name="dh01" smooth="yes"/>
+      <point x="92" y="746" type="curve" smooth="yes" name="dh01"/>
       <point x="92" y="1255"/>
       <point x="270" y="1520"/>
-      <point x="617" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="617" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="962" y="1520"/>
       <point x="1141" y="1257"/>
-      <point x="1141" y="746" type="curve" name="sh02" smooth="yes"/>
+      <point x="1141" y="746" type="curve" smooth="yes" name="sh02"/>
       <point x="1141" y="235"/>
       <point x="962" y="-29"/>
     </contour>
@@ -57,13 +57,13 @@
       <point x="828" y="911" type="line" name="sh03"/>
       <point x="809" y="1108"/>
       <point x="768" y="1255"/>
-      <point x="616" y="1255" type="curve" name="sv03" smooth="yes"/>
+      <point x="616" y="1255" type="curve" smooth="yes" name="sv03"/>
       <point x="466" y="1255"/>
       <point x="424" y="1112"/>
       <point x="405" y="911" type="curve" name="sh04"/>
     </contour>
     <contour>
-      <point x="617" y="236" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="236" type="curve" smooth="yes" name="dv02"/>
       <point x="768" y="236"/>
       <point x="819" y="382"/>
       <point x="832" y="651" type="curve" name="ih02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04E_B_.glif b/source/Hack-Bold.ufo/glyphs/uni04E_B_.glif
index d9c37eee8..d6d11b1f0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04E_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04E_B_.glif
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04EB" format="1">
+<glyph name="uni04EB" format="2">
   <advance width="1233"/>
   <unicode hex="04EB"/>
   <outline>
     <contour>
-      <point x="331" y="1347" type="line" name="dv03" smooth="yes"/>
+      <point x="331" y="1347" type="line" smooth="yes" name="dv03"/>
       <point x="311" y="1347"/>
       <point x="301" y="1357"/>
-      <point x="301" y="1377" type="curve" name="sh01" smooth="yes"/>
+      <point x="301" y="1377" type="curve" smooth="yes" name="sh01"/>
       <point x="301" y="1563" type="line" smooth="yes"/>
       <point x="301" y="1583"/>
       <point x="311" y="1593"/>
-      <point x="331" y="1593" type="curve" name="dv04" smooth="yes"/>
+      <point x="331" y="1593" type="curve" smooth="yes" name="dv04"/>
       <point x="507" y="1593" type="line" smooth="yes"/>
       <point x="527" y="1593"/>
       <point x="537" y="1583"/>
       <point x="537" y="1563" type="curve" smooth="yes"/>
-      <point x="537" y="1377" type="line" name="dh02" smooth="yes"/>
+      <point x="537" y="1377" type="line" smooth="yes" name="dh02"/>
       <point x="537" y="1357"/>
       <point x="527" y="1347"/>
       <point x="507" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1347" type="line" name="sv01" smooth="yes"/>
+      <point x="726" y="1347" type="line" smooth="yes" name="sv01"/>
       <point x="706" y="1347"/>
       <point x="696" y="1357"/>
-      <point x="696" y="1377" type="curve" name="dh03" smooth="yes"/>
+      <point x="696" y="1377" type="curve" smooth="yes" name="dh03"/>
       <point x="696" y="1563" type="line" smooth="yes"/>
       <point x="696" y="1583"/>
       <point x="706" y="1593"/>
-      <point x="726" y="1593" type="curve" name="sv02" smooth="yes"/>
+      <point x="726" y="1593" type="curve" smooth="yes" name="sv02"/>
       <point x="902" y="1593" type="line" smooth="yes"/>
       <point x="922" y="1593"/>
       <point x="932" y="1583"/>
       <point x="932" y="1563" type="curve" smooth="yes"/>
-      <point x="932" y="1377" type="line" name="hr01" smooth="yes"/>
+      <point x="932" y="1377" type="line" smooth="yes" name="hr01"/>
       <point x="932" y="1357"/>
       <point x="922" y="1347"/>
       <point x="902" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="614" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="614" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="457" y="-29"/>
       <point x="332" y="24"/>
       <point x="238" y="130" type="curve" smooth="yes"/>
       <point x="145" y="235"/>
       <point x="98" y="379"/>
-      <point x="98" y="556" type="curve" name="dh01" smooth="yes"/>
+      <point x="98" y="556" type="curve" smooth="yes" name="dh01"/>
       <point x="98" y="921"/>
       <point x="300" y="1147"/>
-      <point x="616" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="933" y="1147"/>
       <point x="1135" y="920"/>
-      <point x="1135" y="559" type="curve" name="sh02" smooth="yes"/>
+      <point x="1135" y="559" type="curve" smooth="yes" name="sh02"/>
       <point x="1135" y="198"/>
       <point x="934" y="-29"/>
     </contour>
@@ -60,13 +60,13 @@
       <point x="839" y="632" type="line" name="dv06"/>
       <point x="823" y="783"/>
       <point x="758" y="909"/>
-      <point x="616" y="909" type="curve" name="sv03" smooth="yes"/>
+      <point x="616" y="909" type="curve" smooth="yes" name="sv03"/>
       <point x="475" y="909"/>
       <point x="410" y="783"/>
       <point x="394" y="632" type="curve"/>
     </contour>
     <contour>
-      <point x="616" y="209" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="209" type="curve" smooth="yes" name="dv02"/>
       <point x="756" y="209"/>
       <point x="814" y="330"/>
       <point x="832" y="438" type="curve" name="dv05"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04E_C_.glif b/source/Hack-Bold.ufo/glyphs/uni04E_C_.glif
index 8a6527d6f..134dd6e4e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04E_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04E_C_.glif
@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04EC" format="1">
+<glyph name="uni04EC" format="2">
   <advance width="1233"/>
   <unicode hex="04EC"/>
   <outline>
     <contour>
-      <point x="286" y="1606" type="line" name="dv03" smooth="yes"/>
+      <point x="286" y="1606" type="line" smooth="yes" name="dv03"/>
       <point x="266" y="1606"/>
       <point x="256" y="1616"/>
-      <point x="256" y="1636" type="curve" name="sh01" smooth="yes"/>
+      <point x="256" y="1636" type="curve" smooth="yes" name="sh01"/>
       <point x="256" y="1822" type="line" smooth="yes"/>
       <point x="256" y="1842"/>
       <point x="266" y="1852"/>
-      <point x="286" y="1852" type="curve" name="dv04" smooth="yes"/>
+      <point x="286" y="1852" type="curve" smooth="yes" name="dv04"/>
       <point x="462" y="1852" type="line" smooth="yes"/>
       <point x="482" y="1852"/>
       <point x="492" y="1842"/>
       <point x="492" y="1822" type="curve" smooth="yes"/>
-      <point x="492" y="1636" type="line" name="dh02" smooth="yes"/>
+      <point x="492" y="1636" type="line" smooth="yes" name="dh02"/>
       <point x="492" y="1616"/>
       <point x="482" y="1606"/>
       <point x="462" y="1606" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="681" y="1606" type="line" name="sv01" smooth="yes"/>
+      <point x="681" y="1606" type="line" smooth="yes" name="sv01"/>
       <point x="661" y="1606"/>
       <point x="651" y="1616"/>
-      <point x="651" y="1636" type="curve" name="dh03" smooth="yes"/>
+      <point x="651" y="1636" type="curve" smooth="yes" name="dh03"/>
       <point x="651" y="1822" type="line" smooth="yes"/>
       <point x="651" y="1842"/>
       <point x="661" y="1852"/>
-      <point x="681" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="681" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="857" y="1852" type="line" smooth="yes"/>
       <point x="877" y="1852"/>
       <point x="887" y="1842"/>
       <point x="887" y="1822" type="curve" smooth="yes"/>
-      <point x="887" y="1636" type="line" name="dh04" smooth="yes"/>
+      <point x="887" y="1636" type="line" smooth="yes" name="dh04"/>
       <point x="887" y="1616"/>
       <point x="877" y="1606"/>
-      <point x="857" y="1606" type="curve" name="hr01" smooth="yes"/>
+      <point x="857" y="1606" type="curve" smooth="yes" name="hr01"/>
     </contour>
     <contour>
-      <point x="490" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="490" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="371" y="-29"/>
       <point x="272" y="-5"/>
       <point x="177" y="43" type="curve"/>
       <point x="177" y="371" type="line"/>
       <point x="274" y="281"/>
       <point x="375" y="236"/>
-      <point x="481" y="236" type="curve" name="dv02" smooth="yes"/>
+      <point x="481" y="236" type="curve" smooth="yes" name="dv02"/>
       <point x="662" y="236"/>
       <point x="765" y="362"/>
       <point x="792" y="615" type="curve" name="dv05"/>
@@ -56,17 +56,17 @@
       <point x="792" y="875" type="line" name="dv06"/>
       <point x="765" y="1128"/>
       <point x="661" y="1255"/>
-      <point x="480" y="1255" type="curve" name="sv03" smooth="yes"/>
+      <point x="480" y="1255" type="curve" smooth="yes" name="sv03"/>
       <point x="375" y="1255"/>
       <point x="274" y="1210"/>
       <point x="177" y="1120" type="curve"/>
       <point x="177" y="1448" type="line"/>
       <point x="267" y="1496"/>
       <point x="371" y="1520"/>
-      <point x="488" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="488" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="888" y="1520"/>
       <point x="1106" y="1247"/>
-      <point x="1106" y="746" type="curve" name="sh02" smooth="yes"/>
+      <point x="1106" y="746" type="curve" smooth="yes" name="sh02"/>
       <point x="1106" y="244"/>
       <point x="887" y="-29"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04E_D_.glif b/source/Hack-Bold.ufo/glyphs/uni04E_D_.glif
index ba64b7f84..e2f5c4cc6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04E_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04E_D_.glif
@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04ED" format="1">
+<glyph name="uni04ED" format="2">
   <advance width="1233"/>
   <unicode hex="04ED"/>
   <outline>
     <contour>
-      <point x="299" y="1347" type="line" name="dv03" smooth="yes"/>
+      <point x="299" y="1347" type="line" smooth="yes" name="dv03"/>
       <point x="279" y="1347"/>
       <point x="269" y="1357"/>
-      <point x="269" y="1377" type="curve" name="dh01" smooth="yes"/>
+      <point x="269" y="1377" type="curve" smooth="yes" name="dh01"/>
       <point x="269" y="1563" type="line" smooth="yes"/>
       <point x="269" y="1583"/>
       <point x="279" y="1593"/>
-      <point x="299" y="1593" type="curve" name="dv04" smooth="yes"/>
+      <point x="299" y="1593" type="curve" smooth="yes" name="dv04"/>
       <point x="475" y="1593" type="line" smooth="yes"/>
       <point x="495" y="1593"/>
       <point x="505" y="1583"/>
       <point x="505" y="1563" type="curve" smooth="yes"/>
-      <point x="505" y="1377" type="line" name="dh02" smooth="yes"/>
+      <point x="505" y="1377" type="line" smooth="yes" name="dh02"/>
       <point x="505" y="1357"/>
       <point x="495" y="1347"/>
       <point x="475" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="694" y="1347" type="line" name="sv01" smooth="yes"/>
+      <point x="694" y="1347" type="line" smooth="yes" name="sv01"/>
       <point x="674" y="1347"/>
       <point x="664" y="1357"/>
-      <point x="664" y="1377" type="curve" name="dh03" smooth="yes"/>
+      <point x="664" y="1377" type="curve" smooth="yes" name="dh03"/>
       <point x="664" y="1563" type="line" smooth="yes"/>
       <point x="664" y="1583"/>
       <point x="674" y="1593"/>
-      <point x="694" y="1593" type="curve" name="sv02" smooth="yes"/>
+      <point x="694" y="1593" type="curve" smooth="yes" name="sv02"/>
       <point x="870" y="1593" type="line" smooth="yes"/>
       <point x="890" y="1593"/>
       <point x="900" y="1583"/>
       <point x="900" y="1563" type="curve" smooth="yes"/>
-      <point x="900" y="1377" type="line" name="dh04" smooth="yes"/>
+      <point x="900" y="1377" type="line" smooth="yes" name="dh04"/>
       <point x="900" y="1357"/>
       <point x="890" y="1347"/>
-      <point x="870" y="1347" type="curve" name="hr01" smooth="yes"/>
+      <point x="870" y="1347" type="curve" smooth="yes" name="hr01"/>
     </contour>
     <contour>
-      <point x="537" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="537" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="408" y="-29"/>
       <point x="295" y="0"/>
       <point x="198" y="57" type="curve"/>
       <point x="198" y="326" type="line"/>
       <point x="289" y="247"/>
       <point x="377" y="209"/>
-      <point x="489" y="209" type="curve" name="dv02" smooth="yes"/>
+      <point x="489" y="209" type="curve" smooth="yes" name="dv02"/>
       <point x="648" y="209"/>
       <point x="757" y="287"/>
       <point x="788" y="458" type="curve" name="dv05"/>
@@ -56,17 +56,17 @@
       <point x="783" y="677" type="line" name="dv06"/>
       <point x="748" y="832"/>
       <point x="653" y="909"/>
-      <point x="496" y="909" type="curve" name="sv03" smooth="yes"/>
+      <point x="496" y="909" type="curve" smooth="yes" name="sv03"/>
       <point x="385" y="909"/>
       <point x="286" y="871"/>
       <point x="198" y="795" type="curve"/>
       <point x="198" y="1063" type="line"/>
       <point x="302" y="1119"/>
       <point x="405" y="1147"/>
-      <point x="529" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="529" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="876" y="1147"/>
       <point x="1091" y="928"/>
-      <point x="1091" y="559" type="curve" name="sh01" smooth="yes"/>
+      <point x="1091" y="559" type="curve" smooth="yes" name="sh01"/>
       <point x="1091" y="192"/>
       <point x="889" y="-29"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04E_E_.glif b/source/Hack-Bold.ufo/glyphs/uni04E_E_.glif
index 086e60f5d..a168c3fc6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04E_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04E_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04EE" format="1">
+<glyph name="uni04EE" format="2">
   <advance width="1233"/>
   <unicode hex="04EE"/>
   <outline>
@@ -24,7 +24,7 @@
       <point x="727" y="303" type="line" smooth="yes"/>
       <point x="644" y="98"/>
       <point x="541" y="0"/>
-      <point x="385" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="385" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="185" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04E_F_.glif b/source/Hack-Bold.ufo/glyphs/uni04E_F_.glif
index f68bce29d..7cd448de7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04E_F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04E_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04EF" format="1">
+<glyph name="uni04EF" format="2">
   <advance width="1233"/>
   <unicode hex="04EF"/>
   <outline>
@@ -24,7 +24,7 @@
       <point x="711" y="-121" type="line" smooth="yes"/>
       <point x="632" y="-332"/>
       <point x="526" y="-424"/>
-      <point x="369" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="369" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="127" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04F_0.glif b/source/Hack-Bold.ufo/glyphs/uni04F_0.glif
index b540490d4..b6bf63edf 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04F_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04F_0.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F0" format="1">
+<glyph name="uni04F0" format="2">
   <advance width="1233"/>
   <unicode hex="04F0"/>
   <outline>
     <contour>
-      <point x="331" y="1606" type="line" name="hr00" smooth="yes"/>
+      <point x="331" y="1606" type="line" smooth="yes" name="hr00"/>
       <point x="311" y="1606"/>
       <point x="301" y="1616"/>
-      <point x="301" y="1636" type="curve" name="sh01" smooth="yes"/>
+      <point x="301" y="1636" type="curve" smooth="yes" name="sh01"/>
       <point x="301" y="1822" type="line" smooth="yes"/>
       <point x="301" y="1842"/>
       <point x="311" y="1852"/>
-      <point x="331" y="1852" type="curve" name="dv01" smooth="yes"/>
+      <point x="331" y="1852" type="curve" smooth="yes" name="dv01"/>
       <point x="507" y="1852" type="line" smooth="yes"/>
       <point x="527" y="1852"/>
       <point x="537" y="1842"/>
       <point x="537" y="1822" type="curve" smooth="yes"/>
-      <point x="537" y="1636" type="line" name="sh02" smooth="yes"/>
+      <point x="537" y="1636" type="line" smooth="yes" name="sh02"/>
       <point x="537" y="1616"/>
       <point x="527" y="1606"/>
       <point x="507" y="1606" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1606" type="line" name="sv01" smooth="yes"/>
+      <point x="726" y="1606" type="line" smooth="yes" name="sv01"/>
       <point x="706" y="1606"/>
       <point x="696" y="1616"/>
-      <point x="696" y="1636" type="curve" name="ah01" smooth="yes"/>
+      <point x="696" y="1636" type="curve" smooth="yes" name="ah01"/>
       <point x="696" y="1822" type="line" smooth="yes"/>
       <point x="696" y="1842"/>
       <point x="706" y="1852"/>
-      <point x="726" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="726" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="902" y="1852" type="line" smooth="yes"/>
       <point x="922" y="1852"/>
       <point x="932" y="1842"/>
       <point x="932" y="1822" type="curve" smooth="yes"/>
-      <point x="932" y="1636" type="line" name="sh03" smooth="yes"/>
+      <point x="932" y="1636" type="line" smooth="yes" name="sh03"/>
       <point x="932" y="1616"/>
       <point x="922" y="1606"/>
       <point x="902" y="1606" type="curve" smooth="yes"/>
@@ -54,7 +54,7 @@
       <point x="727" y="303" type="line" smooth="yes"/>
       <point x="644" y="98"/>
       <point x="541" y="0"/>
-      <point x="385" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="385" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="185" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04F_1.glif b/source/Hack-Bold.ufo/glyphs/uni04F_1.glif
index 139129b37..95c597957 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04F_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04F_1.glif
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F1" format="1">
+<glyph name="uni04F1" format="2">
   <advance width="1233"/>
   <unicode hex="04F1"/>
   <outline>
     <contour>
-      <point x="331" y="1320" type="line" name="hr00" smooth="yes"/>
+      <point x="331" y="1320" type="line" smooth="yes" name="hr00"/>
       <point x="311" y="1320"/>
       <point x="301" y="1330"/>
-      <point x="301" y="1350" type="curve" name="sh01" smooth="yes"/>
+      <point x="301" y="1350" type="curve" smooth="yes" name="sh01"/>
       <point x="301" y="1536" type="line" smooth="yes"/>
       <point x="301" y="1556"/>
       <point x="311" y="1566"/>
-      <point x="331" y="1566" type="curve" name="at03" smooth="yes"/>
+      <point x="331" y="1566" type="curve" smooth="yes" name="at03"/>
       <point x="507" y="1566" type="line" smooth="yes"/>
       <point x="527" y="1566"/>
       <point x="537" y="1556"/>
       <point x="537" y="1536" type="curve" smooth="yes"/>
-      <point x="537" y="1350" type="line" name="sh02" smooth="yes"/>
+      <point x="537" y="1350" type="line" smooth="yes" name="sh02"/>
       <point x="537" y="1330"/>
       <point x="527" y="1320"/>
       <point x="507" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="726" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="706" y="1320"/>
       <point x="696" y="1330"/>
-      <point x="696" y="1350" type="curve" name="ah01" smooth="yes"/>
+      <point x="696" y="1350" type="curve" smooth="yes" name="ah01"/>
       <point x="696" y="1536" type="line" smooth="yes"/>
       <point x="696" y="1556"/>
       <point x="706" y="1566"/>
-      <point x="726" y="1566" type="curve" name="at04" smooth="yes"/>
+      <point x="726" y="1566" type="curve" smooth="yes" name="at04"/>
       <point x="902" y="1566" type="line" smooth="yes"/>
       <point x="922" y="1566"/>
       <point x="932" y="1556"/>
       <point x="932" y="1536" type="curve" smooth="yes"/>
-      <point x="932" y="1350" type="line" name="sh03" smooth="yes"/>
+      <point x="932" y="1350" type="line" smooth="yes" name="sh03"/>
       <point x="932" y="1330"/>
       <point x="922" y="1320"/>
-      <point x="902" y="1320" type="curve" name="sv02" smooth="yes"/>
+      <point x="902" y="1320" type="curve" smooth="yes" name="sv02"/>
     </contour>
     <contour>
       <point x="127" y="-201" type="line" name="sv03"/>
@@ -54,7 +54,7 @@
       <point x="711" y="-121" type="line" smooth="yes"/>
       <point x="632" y="-332"/>
       <point x="526" y="-424"/>
-      <point x="369" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="369" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="127" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04F_2.glif b/source/Hack-Bold.ufo/glyphs/uni04F_2.glif
index c25e1e1bf..3a8fca86a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04F_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04F_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F2" format="1">
+<glyph name="uni04F2" format="2">
   <advance width="1233"/>
   <unicode hex="04F2"/>
   <outline>
@@ -30,7 +30,7 @@
       <point x="727" y="303" type="line" smooth="yes"/>
       <point x="644" y="98"/>
       <point x="541" y="0"/>
-      <point x="385" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="385" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="185" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04F_3.glif b/source/Hack-Bold.ufo/glyphs/uni04F_3.glif
index a5f320962..d22d8c78b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04F_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04F_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F3" format="1">
+<glyph name="uni04F3" format="2">
   <advance width="1233"/>
   <unicode hex="04F3"/>
   <outline>
@@ -30,7 +30,7 @@
       <point x="711" y="-121" type="line" smooth="yes"/>
       <point x="632" y="-332"/>
       <point x="526" y="-424"/>
-      <point x="369" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="369" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="127" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04F_4.glif b/source/Hack-Bold.ufo/glyphs/uni04F_4.glif
index 12a5b02af..ca4de1257 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04F_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04F_4.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F4" format="1">
+<glyph name="uni04F4" format="2">
   <advance width="1233"/>
   <unicode hex="04F4"/>
   <outline>
     <contour>
-      <point x="321" y="1627" type="line" name="dv01" smooth="yes"/>
+      <point x="321" y="1627" type="line" smooth="yes" name="dv01"/>
       <point x="301" y="1627"/>
       <point x="291" y="1637"/>
-      <point x="291" y="1657" type="curve" name="ih01" smooth="yes"/>
+      <point x="291" y="1657" type="curve" smooth="yes" name="ih01"/>
       <point x="291" y="1843" type="line" smooth="yes"/>
       <point x="291" y="1863"/>
       <point x="301" y="1873"/>
-      <point x="321" y="1873" type="curve" name="dv02" smooth="yes"/>
+      <point x="321" y="1873" type="curve" smooth="yes" name="dv02"/>
       <point x="497" y="1873" type="line" smooth="yes"/>
       <point x="517" y="1873"/>
       <point x="527" y="1863"/>
       <point x="527" y="1843" type="curve" smooth="yes"/>
-      <point x="527" y="1657" type="line" name="sh01" smooth="yes"/>
+      <point x="527" y="1657" type="line" smooth="yes" name="sh01"/>
       <point x="527" y="1637"/>
       <point x="517" y="1627"/>
       <point x="497" y="1627" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="716" y="1627" type="line" name="sv01" smooth="yes"/>
+      <point x="716" y="1627" type="line" smooth="yes" name="sv01"/>
       <point x="696" y="1627"/>
       <point x="686" y="1637"/>
-      <point x="686" y="1657" type="curve" name="dh03" smooth="yes"/>
+      <point x="686" y="1657" type="curve" smooth="yes" name="dh03"/>
       <point x="686" y="1843" type="line" smooth="yes"/>
       <point x="686" y="1863"/>
       <point x="696" y="1873"/>
-      <point x="716" y="1873" type="curve" name="sv02" smooth="yes"/>
+      <point x="716" y="1873" type="curve" smooth="yes" name="sv02"/>
       <point x="892" y="1873" type="line" smooth="yes"/>
       <point x="912" y="1873"/>
       <point x="922" y="1863"/>
-      <point x="922" y="1843" type="curve" name="hr01" smooth="yes"/>
-      <point x="922" y="1657" type="line" name="dh04" smooth="yes"/>
+      <point x="922" y="1843" type="curve" smooth="yes" name="hr01"/>
+      <point x="922" y="1657" type="line" smooth="yes" name="dh04"/>
       <point x="922" y="1637"/>
       <point x="912" y="1627"/>
       <point x="892" y="1627" type="curve" smooth="yes"/>
@@ -43,19 +43,19 @@
       <point x="826" y="766" type="line" name="ih02"/>
       <point x="786" y="663"/>
       <point x="679" y="607"/>
-      <point x="486" y="607" type="curve" name="dv03" smooth="yes"/>
+      <point x="486" y="607" type="curve" smooth="yes" name="dv03"/>
       <point x="201" y="607"/>
       <point x="91" y="731"/>
-      <point x="91" y="1027" type="curve" name="dh01" smooth="yes"/>
+      <point x="91" y="1027" type="curve" smooth="yes" name="dh01"/>
       <point x="91" y="1556" type="line"/>
       <point x="382" y="1556" type="line"/>
-      <point x="382" y="1095" type="line" name="dh02" smooth="yes"/>
+      <point x="382" y="1095" type="line" smooth="yes" name="dh02"/>
       <point x="382" y="904"/>
       <point x="483" y="870"/>
-      <point x="592" y="870" type="curve" name="dv04" smooth="yes"/>
+      <point x="592" y="870" type="curve" smooth="yes" name="dv04"/>
       <point x="778" y="870"/>
       <point x="826" y="965"/>
-      <point x="826" y="1136" type="curve" name="sh02" smooth="yes"/>
+      <point x="826" y="1136" type="curve" smooth="yes" name="sh02"/>
       <point x="826" y="1556" type="line"/>
       <point x="1117" y="1556" type="line"/>
       <point x="1117" y="0" type="line" name="sh03"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04F_5.glif b/source/Hack-Bold.ufo/glyphs/uni04F_5.glif
index 1888682d6..83511e8fa 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04F_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04F_5.glif
@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F5" format="1">
+<glyph name="uni04F5" format="2">
   <advance width="1233"/>
   <unicode hex="04F5"/>
   <outline>
     <contour>
-      <point x="316" y="1321" type="line" name="sv01" smooth="yes"/>
+      <point x="316" y="1321" type="line" smooth="yes" name="sv01"/>
       <point x="296" y="1321"/>
       <point x="286" y="1331"/>
-      <point x="286" y="1351" type="curve" name="ih01" smooth="yes"/>
+      <point x="286" y="1351" type="curve" smooth="yes" name="ih01"/>
       <point x="286" y="1537" type="line" smooth="yes"/>
       <point x="286" y="1557"/>
       <point x="296" y="1567"/>
-      <point x="316" y="1567" type="curve" name="at03" smooth="yes"/>
+      <point x="316" y="1567" type="curve" smooth="yes" name="at03"/>
       <point x="492" y="1567" type="line" smooth="yes"/>
       <point x="512" y="1567"/>
       <point x="522" y="1557"/>
       <point x="522" y="1537" type="curve" smooth="yes"/>
-      <point x="522" y="1351" type="line" name="sh01" smooth="yes"/>
+      <point x="522" y="1351" type="line" smooth="yes" name="sh01"/>
       <point x="522" y="1331"/>
       <point x="512" y="1321"/>
-      <point x="492" y="1321" type="curve" name="hr01" smooth="yes"/>
+      <point x="492" y="1321" type="curve" smooth="yes" name="hr01"/>
     </contour>
     <contour>
-      <point x="711" y="1321" type="line" name="sv02" smooth="yes"/>
+      <point x="711" y="1321" type="line" smooth="yes" name="sv02"/>
       <point x="691" y="1321"/>
       <point x="681" y="1331"/>
-      <point x="681" y="1351" type="curve" name="dh03" smooth="yes"/>
+      <point x="681" y="1351" type="curve" smooth="yes" name="dh03"/>
       <point x="681" y="1537" type="line" smooth="yes"/>
       <point x="681" y="1557"/>
       <point x="691" y="1567"/>
-      <point x="711" y="1567" type="curve" name="at04" smooth="yes"/>
+      <point x="711" y="1567" type="curve" smooth="yes" name="at04"/>
       <point x="887" y="1567" type="line" smooth="yes"/>
       <point x="907" y="1567"/>
       <point x="917" y="1557"/>
-      <point x="917" y="1537" type="curve" name="hr02" smooth="yes"/>
-      <point x="917" y="1351" type="line" name="dh04" smooth="yes"/>
+      <point x="917" y="1537" type="curve" smooth="yes" name="hr02"/>
+      <point x="917" y="1351" type="line" smooth="yes" name="dh04"/>
       <point x="917" y="1331"/>
       <point x="907" y="1321"/>
-      <point x="887" y="1321" type="curve" name="sv03" smooth="yes"/>
+      <point x="887" y="1321" type="curve" smooth="yes" name="sv03"/>
     </contour>
     <contour>
       <point x="755" y="416" type="line" name="dv01"/>
       <point x="565" y="416" type="line" smooth="yes"/>
       <point x="305" y="416"/>
       <point x="123" y="496"/>
-      <point x="123" y="813" type="curve" name="dh01" smooth="yes"/>
+      <point x="123" y="813" type="curve" smooth="yes" name="dh01"/>
       <point x="123" y="1120" type="line" name="at01"/>
       <point x="422" y="1120" type="line"/>
-      <point x="422" y="783" type="line" name="dh02" smooth="yes"/>
+      <point x="422" y="783" type="line" smooth="yes" name="dh02"/>
       <point x="422" y="662"/>
       <point x="468" y="633"/>
       <point x="648" y="633" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04F_6.glif b/source/Hack-Bold.ufo/glyphs/uni04F_6.glif
index 49d0a9431..44573d120 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04F_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04F_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F6" format="1">
+<glyph name="uni04F6" format="2">
   <advance width="1233"/>
   <unicode hex="04F6"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04F_7.glif b/source/Hack-Bold.ufo/glyphs/uni04F_7.glif
index 69253e7a2..31be3d881 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04F_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04F_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F7" format="1">
+<glyph name="uni04F7" format="2">
   <advance width="1233"/>
   <unicode hex="04F7"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04F_8.glif b/source/Hack-Bold.ufo/glyphs/uni04F_8.glif
index ba730374c..f219223b0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04F_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04F_8.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F8" format="1">
+<glyph name="uni04F8" format="2">
   <advance width="1233"/>
   <unicode hex="04F8"/>
   <outline>
     <contour>
-      <point x="371" y="1606" type="line" name="dv01" smooth="yes"/>
+      <point x="371" y="1606" type="line" smooth="yes" name="dv01"/>
       <point x="351" y="1606"/>
       <point x="341" y="1616"/>
-      <point x="341" y="1636" type="curve" name="dh02" smooth="yes"/>
+      <point x="341" y="1636" type="curve" smooth="yes" name="dh02"/>
       <point x="341" y="1822" type="line" smooth="yes"/>
       <point x="341" y="1842"/>
       <point x="351" y="1852"/>
-      <point x="371" y="1852" type="curve" name="dv02" smooth="yes"/>
+      <point x="371" y="1852" type="curve" smooth="yes" name="dv02"/>
       <point x="547" y="1852" type="line" smooth="yes"/>
       <point x="567" y="1852"/>
       <point x="577" y="1842"/>
       <point x="577" y="1822" type="curve" smooth="yes"/>
-      <point x="577" y="1636" type="line" name="dh03" smooth="yes"/>
+      <point x="577" y="1636" type="line" smooth="yes" name="dh03"/>
       <point x="577" y="1616"/>
       <point x="567" y="1606"/>
       <point x="547" y="1606" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="766" y="1606" type="line" name="sv01" smooth="yes"/>
+      <point x="766" y="1606" type="line" smooth="yes" name="sv01"/>
       <point x="746" y="1606"/>
       <point x="736" y="1616"/>
-      <point x="736" y="1636" type="curve" name="dh04" smooth="yes"/>
+      <point x="736" y="1636" type="curve" smooth="yes" name="dh04"/>
       <point x="736" y="1822" type="line" smooth="yes"/>
       <point x="736" y="1842"/>
       <point x="746" y="1852"/>
-      <point x="766" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="766" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="942" y="1852" type="line" smooth="yes"/>
       <point x="962" y="1852"/>
       <point x="972" y="1842"/>
       <point x="972" y="1822" type="curve" smooth="yes"/>
-      <point x="972" y="1636" type="line" name="dh05" smooth="yes"/>
+      <point x="972" y="1636" type="line" smooth="yes" name="dh05"/>
       <point x="972" y="1616"/>
       <point x="962" y="1606"/>
       <point x="942" y="1606" type="curve" smooth="yes"/>
@@ -43,13 +43,13 @@
       <point x="40" y="1493" type="line" name="dh01"/>
       <point x="295" y="1493" type="line" name="hr01"/>
       <point x="295" y="913" type="line"/>
-      <point x="305" y="913" type="line" name="dv03" smooth="yes"/>
+      <point x="305" y="913" type="line" smooth="yes" name="dv03"/>
       <point x="655" y="913"/>
       <point x="841" y="774"/>
-      <point x="841" y="456" type="curve" name="sh01" smooth="yes"/>
+      <point x="841" y="456" type="curve" smooth="yes" name="sh01"/>
       <point x="841" y="143"/>
       <point x="661" y="0"/>
-      <point x="305" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="305" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="40" y="0" type="line"/>
     </contour>
     <contour>
@@ -59,10 +59,10 @@
       <point x="938" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="316" y="236" type="line" name="sv03" smooth="yes"/>
+      <point x="316" y="236" type="line" smooth="yes" name="sv03"/>
       <point x="524" y="236"/>
       <point x="586" y="294"/>
-      <point x="586" y="455" type="curve" name="sh03" smooth="yes"/>
+      <point x="586" y="455" type="curve" smooth="yes" name="sh03"/>
       <point x="586" y="624"/>
       <point x="518" y="678"/>
       <point x="316" y="678" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni04F_9.glif b/source/Hack-Bold.ufo/glyphs/uni04F_9.glif
index 7b9740ed2..c3e576243 100644
--- a/source/Hack-Bold.ufo/glyphs/uni04F_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni04F_9.glif
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F9" format="1">
+<glyph name="uni04F9" format="2">
   <advance width="1233"/>
   <unicode hex="04F9"/>
   <outline>
     <contour>
-      <point x="331" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="331" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="311" y="1320"/>
       <point x="301" y="1330"/>
-      <point x="301" y="1350" type="curve" name="ih01" smooth="yes"/>
+      <point x="301" y="1350" type="curve" smooth="yes" name="ih01"/>
       <point x="301" y="1536" type="line" smooth="yes"/>
       <point x="301" y="1556"/>
       <point x="311" y="1566"/>
-      <point x="331" y="1566" type="curve" name="at01" smooth="yes"/>
+      <point x="331" y="1566" type="curve" smooth="yes" name="at01"/>
       <point x="507" y="1566" type="line" smooth="yes"/>
       <point x="527" y="1566"/>
       <point x="537" y="1556"/>
       <point x="537" y="1536" type="curve" smooth="yes"/>
-      <point x="537" y="1350" type="line" name="sh01" smooth="yes"/>
+      <point x="537" y="1350" type="line" smooth="yes" name="sh01"/>
       <point x="537" y="1330"/>
       <point x="527" y="1320"/>
       <point x="507" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1320" type="line" name="sv02" smooth="yes"/>
+      <point x="726" y="1320" type="line" smooth="yes" name="sv02"/>
       <point x="706" y="1320"/>
       <point x="696" y="1330"/>
-      <point x="696" y="1350" type="curve" name="ih02" smooth="yes"/>
+      <point x="696" y="1350" type="curve" smooth="yes" name="ih02"/>
       <point x="696" y="1536" type="line" smooth="yes"/>
       <point x="696" y="1556"/>
       <point x="706" y="1566"/>
-      <point x="726" y="1566" type="curve" name="at02" smooth="yes"/>
+      <point x="726" y="1566" type="curve" smooth="yes" name="at02"/>
       <point x="902" y="1566" type="line" smooth="yes"/>
       <point x="922" y="1566"/>
       <point x="932" y="1556"/>
       <point x="932" y="1536" type="curve" smooth="yes"/>
-      <point x="932" y="1350" type="line" name="sh02" smooth="yes"/>
+      <point x="932" y="1350" type="line" smooth="yes" name="sh02"/>
       <point x="932" y="1330"/>
       <point x="922" y="1320"/>
-      <point x="902" y="1320" type="curve" name="sv03" smooth="yes"/>
+      <point x="902" y="1320" type="curve" smooth="yes" name="sv03"/>
     </contour>
     <contour>
       <point x="31" y="1120" type="line" name="dh01"/>
@@ -46,10 +46,10 @@
       <point x="343" y="698" type="line" smooth="yes"/>
       <point x="626" y="698"/>
       <point x="798" y="585"/>
-      <point x="798" y="350" type="curve" name="dh03" smooth="yes"/>
+      <point x="798" y="350" type="curve" smooth="yes" name="dh03"/>
       <point x="798" y="114"/>
       <point x="626" y="0"/>
-      <point x="343" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="343" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="31" y="0" type="line"/>
     </contour>
     <contour>
@@ -59,10 +59,10 @@
       <point x="908" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="349" y="219" type="line" name="sv04" smooth="yes"/>
+      <point x="349" y="219" type="line" smooth="yes" name="sv04"/>
       <point x="416" y="219"/>
       <point x="505" y="257"/>
-      <point x="505" y="350" type="curve" name="dh02" smooth="yes"/>
+      <point x="505" y="350" type="curve" smooth="yes" name="dh02"/>
       <point x="505" y="443"/>
       <point x="416" y="479"/>
       <point x="349" y="479" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0510.glif b/source/Hack-Bold.ufo/glyphs/uni0510.glif
index aaa2c915d..668261156 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0510.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0510.glif
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0510" format="1">
+<glyph name="uni0510" format="2">
   <advance width="1233"/>
   <unicode hex="0510"/>
   <outline>
     <contour>
-      <point x="671" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="671" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="312" y="-29"/>
       <point x="125" y="125"/>
-      <point x="125" y="412" type="curve" name="dh01" smooth="yes"/>
+      <point x="125" y="412" type="curve" smooth="yes" name="dh01"/>
       <point x="125" y="641"/>
       <point x="246" y="769"/>
       <point x="453" y="805" type="curve" name="iv01"/>
       <point x="265" y="840"/>
       <point x="160" y="952"/>
-      <point x="160" y="1135" type="curve" name="sh01" smooth="yes"/>
+      <point x="160" y="1135" type="curve" smooth="yes" name="sh01"/>
       <point x="160" y="1373"/>
       <point x="345" y="1520"/>
-      <point x="659" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="659" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="784" y="1520"/>
       <point x="918" y="1497"/>
       <point x="1055" y="1456" type="curve"/>
       <point x="1055" y="1188" type="line"/>
       <point x="918" y="1241"/>
       <point x="785" y="1270"/>
-      <point x="681" y="1270" type="curve" name="sv01" smooth="yes"/>
+      <point x="681" y="1270" type="curve" smooth="yes" name="sv01"/>
       <point x="528" y="1270"/>
       <point x="445" y="1205"/>
-      <point x="445" y="1097" type="curve" name="sh02" smooth="yes"/>
+      <point x="445" y="1097" type="curve" smooth="yes" name="sh02"/>
       <point x="445" y="988"/>
       <point x="528" y="928"/>
-      <point x="676" y="928" type="curve" name="hr01" smooth="yes"/>
+      <point x="676" y="928" type="curve" smooth="yes" name="hr01"/>
       <point x="834" y="928" type="line" name="dv04"/>
       <point x="834" y="668" type="line" name="dv03"/>
       <point x="676" y="668" type="line" smooth="yes"/>
       <point x="504" y="668"/>
       <point x="408" y="578"/>
-      <point x="408" y="435" type="curve" name="dh02" smooth="yes"/>
+      <point x="408" y="435" type="curve" smooth="yes" name="dh02"/>
       <point x="408" y="303"/>
       <point x="493" y="223"/>
-      <point x="687" y="223" type="curve" name="dv02" smooth="yes"/>
+      <point x="687" y="223" type="curve" smooth="yes" name="dv02"/>
       <point x="806" y="223"/>
       <point x="972" y="252"/>
       <point x="1100" y="319" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0511.glif b/source/Hack-Bold.ufo/glyphs/uni0511.glif
index ecddef325..e1dd6bff9 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0511.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0511.glif
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0511" format="1">
+<glyph name="uni0511" format="2">
   <advance width="1233"/>
   <unicode hex="0511"/>
   <outline>
     <contour>
-      <point x="672" y="-22" type="curve" name="ab01" smooth="yes"/>
+      <point x="672" y="-22" type="curve" smooth="yes" name="ab01"/>
       <point x="324" y="-22"/>
       <point x="149" y="94"/>
-      <point x="149" y="309" type="curve" name="dh01" smooth="yes"/>
+      <point x="149" y="309" type="curve" smooth="yes" name="dh01"/>
       <point x="149" y="474"/>
       <point x="254" y="575"/>
       <point x="461" y="604" type="curve" name="iv01"/>
       <point x="276" y="631"/>
       <point x="182" y="717"/>
-      <point x="182" y="853" type="curve" name="ih01" smooth="yes"/>
+      <point x="182" y="853" type="curve" smooth="yes" name="ih01"/>
       <point x="182" y="1030"/>
       <point x="347" y="1140"/>
-      <point x="683" y="1140" type="curve" name="at01" smooth="yes"/>
+      <point x="683" y="1140" type="curve" smooth="yes" name="at01"/>
       <point x="795" y="1140"/>
       <point x="857" y="1127"/>
       <point x="1002" y="1092" type="curve"/>
       <point x="1002" y="877" type="line" name="iv02"/>
       <point x="861" y="922"/>
       <point x="771" y="938"/>
-      <point x="685" y="938" type="curve" name="sv01" smooth="yes"/>
+      <point x="685" y="938" type="curve" smooth="yes" name="sv01"/>
       <point x="532" y="938"/>
       <point x="453" y="887"/>
-      <point x="453" y="822" type="curve" name="sh01" smooth="yes"/>
+      <point x="453" y="822" type="curve" smooth="yes" name="sh01"/>
       <point x="453" y="757"/>
       <point x="532" y="710"/>
-      <point x="672" y="710" type="curve" name="hr01" smooth="yes"/>
+      <point x="672" y="710" type="curve" smooth="yes" name="hr01"/>
       <point x="823" y="710" type="line" name="dv02"/>
       <point x="823" y="487" type="line" name="dv01"/>
       <point x="672" y="487" type="line" smooth="yes"/>
       <point x="510" y="487"/>
       <point x="418" y="413"/>
-      <point x="418" y="325" type="curve" name="dh02" smooth="yes"/>
+      <point x="418" y="325" type="curve" smooth="yes" name="dh02"/>
       <point x="418" y="244"/>
       <point x="493" y="181"/>
-      <point x="713" y="181" type="curve" name="sv02" smooth="yes"/>
+      <point x="713" y="181" type="curve" smooth="yes" name="sv02"/>
       <point x="820" y="181"/>
       <point x="903" y="197"/>
       <point x="1045" y="253" type="curve" name="iv03"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni051A_.glif b/source/Hack-Bold.ufo/glyphs/uni051A_.glif
index 74fdaa2d0..74d438332 100644
--- a/source/Hack-Bold.ufo/glyphs/uni051A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni051A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni051A" format="1">
+<glyph name="uni051A" format="2">
   <advance width="1233"/>
   <unicode hex="051A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni051B_.glif b/source/Hack-Bold.ufo/glyphs/uni051B_.glif
index b36e6941e..15cc81724 100644
--- a/source/Hack-Bold.ufo/glyphs/uni051B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni051B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni051B" format="1">
+<glyph name="uni051B" format="2">
   <advance width="1233"/>
   <unicode hex="051B"/>
   <outline>
@@ -7,13 +7,13 @@
       <point x="791" y="158" type="line" name="iv01"/>
       <point x="714" y="27"/>
       <point x="624" y="-29"/>
-      <point x="495" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="495" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="244" y="-29"/>
       <point x="90" y="180"/>
-      <point x="90" y="559" type="curve" name="sh01" smooth="yes"/>
+      <point x="90" y="559" type="curve" smooth="yes" name="sh01"/>
       <point x="90" y="932"/>
       <point x="239" y="1147"/>
-      <point x="491" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="491" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="635" y="1147"/>
       <point x="728" y="1079"/>
       <point x="791" y="952" type="curve" name="sh02"/>
@@ -23,16 +23,16 @@
       <point x="791" y="-426" type="line" name="ah01"/>
     </contour>
     <contour>
-      <point x="586" y="215" type="curve" name="dv02" smooth="yes"/>
+      <point x="586" y="215" type="curve" smooth="yes" name="dv02"/>
       <point x="714" y="215"/>
       <point x="791" y="345"/>
-      <point x="791" y="561" type="curve" name="hr01" smooth="yes"/>
+      <point x="791" y="561" type="curve" smooth="yes" name="hr01"/>
       <point x="791" y="777"/>
       <point x="714" y="907"/>
-      <point x="586" y="907" type="curve" name="sv01" smooth="yes"/>
+      <point x="586" y="907" type="curve" smooth="yes" name="sv01"/>
       <point x="459" y="907"/>
       <point x="383" y="777"/>
-      <point x="383" y="561" type="curve" name="sh04" smooth="yes"/>
+      <point x="383" y="561" type="curve" smooth="yes" name="sh04"/>
       <point x="383" y="345"/>
       <point x="459" y="215"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni051C_.glif b/source/Hack-Bold.ufo/glyphs/uni051C_.glif
index cea209341..135afc390 100644
--- a/source/Hack-Bold.ufo/glyphs/uni051C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni051C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni051C" format="1">
+<glyph name="uni051C" format="2">
   <advance width="1233"/>
   <unicode hex="051C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni051D_.glif b/source/Hack-Bold.ufo/glyphs/uni051D_.glif
index c166e37ed..bbbfceaf0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni051D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni051D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni051D" format="1">
+<glyph name="uni051D" format="2">
   <advance width="1233"/>
   <unicode hex="051D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0531.glif b/source/Hack-Bold.ufo/glyphs/uni0531.glif
index 1f853ed80..7ecdd6659 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0531.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0531.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0531" format="1">
+<glyph name="uni0531" format="2">
   <advance width="1233"/>
   <unicode hex="0531"/>
   <outline>
@@ -10,16 +10,16 @@
       <point x="852" y="21" type="curve"/>
       <point x="780" y="-12"/>
       <point x="689" y="-29"/>
-      <point x="580" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="580" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="224" y="-29"/>
       <point x="71" y="145"/>
-      <point x="71" y="551" type="curve" name="sh01" smooth="yes"/>
+      <point x="71" y="551" type="curve" smooth="yes" name="sh01"/>
       <point x="71" y="1493" type="line" name="at01"/>
       <point x="366" y="1493" type="line"/>
-      <point x="366" y="477" type="line" name="sh02" smooth="yes"/>
+      <point x="366" y="477" type="line" smooth="yes" name="sh02"/>
       <point x="366" y="328"/>
       <point x="444" y="238"/>
-      <point x="581" y="238" type="curve" name="dv02" smooth="yes"/>
+      <point x="581" y="238" type="curve" smooth="yes" name="dv02"/>
       <point x="596" y="238"/>
       <point x="611" y="239"/>
       <point x="625" y="241" type="curve" name="ih01"/>
@@ -32,10 +32,10 @@
       <point x="792" y="420" type="curve" name="sh04"/>
       <point x="795" y="439"/>
       <point x="796" y="457"/>
-      <point x="796" y="477" type="curve" name="ah01" smooth="yes"/>
+      <point x="796" y="477" type="curve" smooth="yes" name="ah01"/>
       <point x="796" y="1493" type="line" name="at02"/>
       <point x="1091" y="1493" type="line"/>
-      <point x="1091" y="551" type="line" name="sh03" smooth="yes"/>
+      <point x="1091" y="551" type="line" smooth="yes" name="sh03"/>
       <point x="1091" y="430"/>
       <point x="1078" y="332"/>
       <point x="1050" y="252" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0532.glif b/source/Hack-Bold.ufo/glyphs/uni0532.glif
index cb8ba9f55..1c212c7b0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0532.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0532.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0532" format="1">
+<glyph name="uni0532" format="2">
   <advance width="1233"/>
   <unicode hex="0532"/>
   <outline>
     <contour>
-      <point x="98" y="942" type="line" name="hr00" smooth="yes"/>
+      <point x="98" y="942" type="line" smooth="yes" name="hr00"/>
       <point x="98" y="1350"/>
       <point x="250" y="1522"/>
-      <point x="608" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="608" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="966" y="1522"/>
       <point x="1118" y="1350"/>
       <point x="1118" y="942" type="curve" smooth="yes"/>
@@ -16,10 +16,10 @@
       <point x="823" y="1016" type="line" smooth="yes"/>
       <point x="823" y="1165"/>
       <point x="745" y="1255"/>
-      <point x="608" y="1255" type="curve" name="dv01" smooth="yes"/>
+      <point x="608" y="1255" type="curve" smooth="yes" name="dv01"/>
       <point x="471" y="1255"/>
       <point x="393" y="1165"/>
-      <point x="393" y="1016" type="curve" name="sh01" smooth="yes"/>
+      <point x="393" y="1016" type="curve" smooth="yes" name="sh01"/>
       <point x="393" y="674" type="line"/>
       <point x="1135" y="674" type="line" name="sh02"/>
       <point x="1135" y="414" type="line" name="dv03"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0533.glif b/source/Hack-Bold.ufo/glyphs/uni0533.glif
index b7c2461a8..67185003a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0533.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0533.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0533" format="1">
+<glyph name="uni0533" format="2">
   <advance width="1233"/>
   <unicode hex="0533"/>
   <outline>
@@ -8,13 +8,13 @@
       <point x="527" y="414" type="line" smooth="yes"/>
       <point x="180" y="414"/>
       <point x="33" y="606"/>
-      <point x="33" y="971" type="curve" name="sh01" smooth="yes"/>
+      <point x="33" y="971" type="curve" smooth="yes" name="sh01"/>
       <point x="33" y="1341"/>
       <point x="184" y="1522"/>
-      <point x="545" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="545" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="899" y="1522"/>
       <point x="1053" y="1350"/>
-      <point x="1053" y="942" type="curve" name="sh03" smooth="yes"/>
+      <point x="1053" y="942" type="curve" smooth="yes" name="sh03"/>
       <point x="1053" y="674" type="line" name="sv01"/>
       <point x="1199" y="674" type="line"/>
       <point x="1199" y="414" type="line" name="sv02"/>
@@ -27,10 +27,10 @@
       <point x="758" y="1016" type="line" smooth="yes"/>
       <point x="758" y="1165"/>
       <point x="680" y="1255"/>
-      <point x="543" y="1255" type="curve" name="dv01" smooth="yes"/>
+      <point x="543" y="1255" type="curve" smooth="yes" name="dv01"/>
       <point x="406" y="1255"/>
       <point x="328" y="1165"/>
-      <point x="328" y="1016" type="curve" name="sh05" smooth="yes"/>
+      <point x="328" y="1016" type="curve" smooth="yes" name="sh05"/>
       <point x="328" y="920" type="line" smooth="yes"/>
       <point x="328" y="845"/>
       <point x="347" y="785"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0534.glif b/source/Hack-Bold.ufo/glyphs/uni0534.glif
index db17da7bb..a50ffc391 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0534.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0534.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0534" format="1">
+<glyph name="uni0534" format="2">
   <advance width="1233"/>
   <unicode hex="0534"/>
   <outline>
     <contour>
-      <point x="758" y="1016" type="line" name="dh02" smooth="yes"/>
+      <point x="758" y="1016" type="line" smooth="yes" name="dh02"/>
       <point x="758" y="1165"/>
       <point x="680" y="1255"/>
-      <point x="543" y="1255" type="curve" name="dv01" smooth="yes"/>
+      <point x="543" y="1255" type="curve" smooth="yes" name="dv01"/>
       <point x="406" y="1255"/>
       <point x="328" y="1165"/>
       <point x="328" y="1016" type="curve" smooth="yes"/>
       <point x="328" y="875" type="line" name="hr01"/>
       <point x="33" y="875" type="line" name="dh01"/>
-      <point x="33" y="942" type="line" name="hr02" smooth="yes"/>
+      <point x="33" y="942" type="line" smooth="yes" name="hr02"/>
       <point x="33" y="1350"/>
       <point x="185" y="1522"/>
-      <point x="543" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="543" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="901" y="1522"/>
       <point x="1053" y="1350"/>
-      <point x="1053" y="942" type="curve" name="dh03" smooth="yes"/>
+      <point x="1053" y="942" type="curve" smooth="yes" name="dh03"/>
       <point x="1053" y="674" type="line"/>
       <point x="1199" y="674" type="line" name="sh01"/>
       <point x="1199" y="414" type="line" name="dv03"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0535.glif b/source/Hack-Bold.ufo/glyphs/uni0535.glif
index 41031f5ad..31314d607 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0535.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0535.glif
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0535" format="1">
+<glyph name="uni0535" format="2">
   <advance width="1233"/>
   <unicode hex="0535"/>
   <outline>
     <contour>
-      <point x="608" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="608" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="250" y="-29"/>
       <point x="98" y="145"/>
-      <point x="98" y="551" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="551" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="1493" type="line" name="at01"/>
       <point x="393" y="1493" type="line" name="sh03"/>
       <point x="393" y="1120" type="line" name="at02"/>
       <point x="1148" y="1120" type="line"/>
       <point x="1148" y="860" type="line" name="sv01"/>
       <point x="393" y="860" type="line"/>
-      <point x="393" y="477" type="line" name="sh02" smooth="yes"/>
+      <point x="393" y="477" type="line" smooth="yes" name="sh02"/>
       <point x="393" y="328"/>
       <point x="471" y="238"/>
-      <point x="608" y="238" type="curve" name="dv01" smooth="yes"/>
+      <point x="608" y="238" type="curve" smooth="yes" name="dv01"/>
       <point x="745" y="238"/>
       <point x="823" y="328"/>
       <point x="823" y="477" type="curve" smooth="yes"/>
       <point x="823" y="618" type="line" name="ah01"/>
       <point x="1118" y="618" type="line"/>
-      <point x="1118" y="551" type="line" name="sh04" smooth="yes"/>
+      <point x="1118" y="551" type="line" smooth="yes" name="sh04"/>
       <point x="1118" y="145"/>
       <point x="966" y="-29"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0536.glif b/source/Hack-Bold.ufo/glyphs/uni0536.glif
index 7c3d66e36..4b2a19468 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0536.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0536.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0536" format="1">
+<glyph name="uni0536" format="2">
   <advance width="1233"/>
   <unicode hex="0536"/>
   <outline>
@@ -12,10 +12,10 @@
       <point x="709" y="439" type="curve" smooth="yes"/>
       <point x="798" y="556"/>
       <point x="853" y="711"/>
-      <point x="853" y="906" type="curve" name="ah01" smooth="yes"/>
+      <point x="853" y="906" type="curve" smooth="yes" name="ah01"/>
       <point x="853" y="1137"/>
       <point x="777" y="1255"/>
-      <point x="614" y="1255" type="curve" name="dv01" smooth="yes"/>
+      <point x="614" y="1255" type="curve" smooth="yes" name="dv01"/>
       <point x="466" y="1255"/>
       <point x="372" y="1160"/>
       <point x="372" y="935" type="curve" smooth="yes"/>
@@ -24,13 +24,13 @@
       <point x="77" y="897" type="line" smooth="yes"/>
       <point x="77" y="1304"/>
       <point x="254" y="1522"/>
-      <point x="610" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="610" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="799" y="1522"/>
       <point x="933" y="1462"/>
       <point x="1021" y="1354" type="curve" smooth="yes"/>
       <point x="1109" y="1245"/>
       <point x="1155" y="1082"/>
-      <point x="1155" y="910" type="curve" name="sh03" smooth="yes"/>
+      <point x="1155" y="910" type="curve" smooth="yes" name="sh03"/>
       <point x="1155" y="785"/>
       <point x="1131" y="670"/>
       <point x="1079" y="557" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0537.glif b/source/Hack-Bold.ufo/glyphs/uni0537.glif
index fe619c4e1..4d64a31b3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0537.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0537.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0537" format="1">
+<glyph name="uni0537" format="2">
   <advance width="1233"/>
   <unicode hex="0537"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0538.glif b/source/Hack-Bold.ufo/glyphs/uni0538.glif
index 75f74aac1..8da2f447a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0538.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0538.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0538" format="1">
+<glyph name="uni0538" format="2">
   <advance width="1233"/>
   <unicode hex="0538"/>
   <outline>
     <contour>
-      <point x="98" y="942" type="line" name="hr00" smooth="yes"/>
+      <point x="98" y="942" type="line" smooth="yes" name="hr00"/>
       <point x="98" y="1350"/>
       <point x="250" y="1522"/>
-      <point x="608" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="608" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="966" y="1522"/>
       <point x="1118" y="1350"/>
       <point x="1118" y="942" type="curve" smooth="yes"/>
@@ -16,10 +16,10 @@
       <point x="823" y="1016" type="line" smooth="yes"/>
       <point x="823" y="1165"/>
       <point x="745" y="1255"/>
-      <point x="608" y="1255" type="curve" name="dv01" smooth="yes"/>
+      <point x="608" y="1255" type="curve" smooth="yes" name="dv01"/>
       <point x="471" y="1255"/>
       <point x="393" y="1165"/>
-      <point x="393" y="1016" type="curve" name="sh01" smooth="yes"/>
+      <point x="393" y="1016" type="curve" smooth="yes" name="sh01"/>
       <point x="393" y="260" type="line" name="sv01"/>
       <point x="1135" y="260" type="line" name="sh02"/>
       <point x="1135" y="0" type="line" name="ab01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0539.glif b/source/Hack-Bold.ufo/glyphs/uni0539.glif
index 79f3c2295..3e63db85a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0539.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0539.glif
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0539" format="1">
+<glyph name="uni0539" format="2">
   <advance width="1233"/>
   <unicode hex="0539"/>
   <outline>
     <contour>
-      <point x="739" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="739" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="528" y="-29"/>
       <point x="391" y="103"/>
-      <point x="391" y="412" type="curve" name="dh03" smooth="yes"/>
+      <point x="391" y="412" type="curve" smooth="yes" name="dh03"/>
       <point x="391" y="572"/>
       <point x="426" y="686"/>
       <point x="486" y="762" type="curve" smooth="yes"/>
       <point x="547" y="838"/>
       <point x="635" y="875"/>
-      <point x="743" y="875" type="curve" name="sv01" smooth="yes"/>
+      <point x="743" y="875" type="curve" smooth="yes" name="sv01"/>
       <point x="850" y="875" type="line" name="dh05"/>
       <point x="850" y="1016" type="line" smooth="yes"/>
       <point x="850" y="1196"/>
       <point x="777" y="1295"/>
-      <point x="573" y="1295" type="curve" name="dv03" smooth="yes"/>
+      <point x="573" y="1295" type="curve" smooth="yes" name="dv03"/>
       <point x="370" y="1295"/>
       <point x="297" y="1196"/>
       <point x="297" y="1016" type="curve" smooth="yes"/>
@@ -27,7 +27,7 @@
       <point x="43" y="942" type="line" smooth="yes"/>
       <point x="43" y="1350"/>
       <point x="215" y="1522"/>
-      <point x="573" y="1522" type="curve" name="dv04" smooth="yes"/>
+      <point x="573" y="1522" type="curve" smooth="yes" name="dv04"/>
       <point x="931" y="1522"/>
       <point x="1103" y="1350"/>
       <point x="1103" y="942" type="curve" smooth="yes"/>
@@ -43,18 +43,18 @@
       <point x="852" y="-29"/>
     </contour>
     <contour>
-      <point x="744" y="218" type="curve" name="dv02" smooth="yes"/>
+      <point x="744" y="218" type="curve" smooth="yes" name="dv02"/>
       <point x="783" y="218"/>
       <point x="809" y="231"/>
       <point x="826" y="263" type="curve" smooth="yes"/>
       <point x="843" y="294"/>
       <point x="850" y="341"/>
-      <point x="850" y="413" type="curve" name="sh02" smooth="yes"/>
+      <point x="850" y="413" type="curve" smooth="yes" name="sh02"/>
       <point x="850" y="615" type="line" name="sv02"/>
       <point x="743" y="615" type="line" smooth="yes"/>
       <point x="659" y="615"/>
       <point x="619" y="555"/>
-      <point x="619" y="416" type="curve" name="dh04" smooth="yes"/>
+      <point x="619" y="416" type="curve" smooth="yes" name="dh04"/>
       <point x="619" y="273"/>
       <point x="663" y="218"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni053A_.glif b/source/Hack-Bold.ufo/glyphs/uni053A_.glif
index 421bd8d04..861992d89 100644
--- a/source/Hack-Bold.ufo/glyphs/uni053A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni053A_.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni053A" format="1">
+<glyph name="uni053A" format="2">
   <advance width="1233"/>
   <unicode hex="053A"/>
   <outline>
     <contour>
-      <point x="544" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="544" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="361" y="-29"/>
       <point x="238" y="17"/>
       <point x="154" y="109" type="curve" smooth="yes"/>
       <point x="67" y="205"/>
       <point x="33" y="342"/>
-      <point x="33" y="521" type="curve" name="sh01" smooth="yes"/>
+      <point x="33" y="521" type="curve" smooth="yes" name="sh01"/>
       <point x="33" y="706"/>
       <point x="70" y="843"/>
       <point x="150" y="938" type="curve" smooth="yes"/>
       <point x="230" y="1032"/>
       <point x="356" y="1079"/>
-      <point x="527" y="1079" type="curve" name="sv01" smooth="yes"/>
+      <point x="527" y="1079" type="curve" smooth="yes" name="sv01"/>
       <point x="758" y="1079" type="line" name="ah01"/>
       <point x="758" y="1493" type="line" name="at01"/>
       <point x="1053" y="1493" type="line"/>
@@ -29,10 +29,10 @@
       <point x="900" y="-29"/>
     </contour>
     <contour>
-      <point x="543" y="238" type="curve" name="dv01" smooth="yes"/>
+      <point x="543" y="238" type="curve" smooth="yes" name="dv01"/>
       <point x="680" y="238"/>
       <point x="758" y="328"/>
-      <point x="758" y="477" type="curve" name="sh04" smooth="yes"/>
+      <point x="758" y="477" type="curve" smooth="yes" name="sh04"/>
       <point x="758" y="819" type="line" name="sv02"/>
       <point x="543" y="819" type="line" smooth="yes"/>
       <point x="475" y="819"/>
@@ -41,7 +41,7 @@
       <point x="347" y="708"/>
       <point x="328" y="648"/>
       <point x="328" y="573" type="curve" smooth="yes"/>
-      <point x="328" y="477" type="line" name="sh05" smooth="yes"/>
+      <point x="328" y="477" type="line" smooth="yes" name="sh05"/>
       <point x="328" y="328"/>
       <point x="406" y="238"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni053B_.glif b/source/Hack-Bold.ufo/glyphs/uni053B_.glif
index 9906c0708..6322f42f2 100644
--- a/source/Hack-Bold.ufo/glyphs/uni053B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni053B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni053B" format="1">
+<glyph name="uni053B" format="2">
   <advance width="1233"/>
   <unicode hex="053B"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="401" y="1093" type="line" name="iv01"/>
       <point x="464" y="1124"/>
       <point x="524" y="1141"/>
-      <point x="627" y="1141" type="curve" name="at01" smooth="yes"/>
+      <point x="627" y="1141" type="curve" smooth="yes" name="at01"/>
       <point x="966" y="1141"/>
       <point x="1126" y="969"/>
       <point x="1126" y="561" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="831" y="635" type="line" smooth="yes"/>
       <point x="831" y="784"/>
       <point x="752" y="874"/>
-      <point x="617" y="874" type="curve" name="sv01" smooth="yes"/>
+      <point x="617" y="874" type="curve" smooth="yes" name="sv01"/>
       <point x="484" y="874"/>
       <point x="401" y="785"/>
-      <point x="401" y="646" type="curve" name="sh03" smooth="yes"/>
+      <point x="401" y="646" type="curve" smooth="yes" name="sh03"/>
       <point x="401" y="0" type="line" name="ab01"/>
       <point x="106" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni053C_.glif b/source/Hack-Bold.ufo/glyphs/uni053C_.glif
index be01294c8..6f50b1ec3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni053C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni053C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni053C" format="1">
+<glyph name="uni053C" format="2">
   <advance width="1233"/>
   <unicode hex="053C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni053D_.glif b/source/Hack-Bold.ufo/glyphs/uni053D_.glif
index 9cf376231..cec58dc89 100644
--- a/source/Hack-Bold.ufo/glyphs/uni053D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni053D_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni053D" format="1">
+<glyph name="uni053D" format="2">
   <advance width="1233"/>
   <unicode hex="053D"/>
   <outline>
     <contour>
-      <point x="812" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="812" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="669" y="-27"/>
       <point x="583" y="9"/>
       <point x="531" y="86" type="curve" smooth="yes"/>
       <point x="478" y="163"/>
       <point x="461" y="280"/>
-      <point x="461" y="447" type="curve" name="dh03" smooth="yes"/>
+      <point x="461" y="447" type="curve" smooth="yes" name="dh03"/>
       <point x="461" y="880" type="line" name="sv01"/>
       <point x="332" y="880" type="line"/>
       <point x="332" y="0" type="line" name="dh02"/>
@@ -19,22 +19,22 @@
       <point x="332" y="1493" type="line" name="sh01"/>
       <point x="332" y="1120" type="line" name="at02"/>
       <point x="715" y="1120" type="line"/>
-      <point x="715" y="405" type="line" name="dh04" smooth="yes"/>
+      <point x="715" y="405" type="line" smooth="yes" name="dh04"/>
       <point x="715" y="329"/>
       <point x="724" y="282"/>
       <point x="741" y="251" type="curve" smooth="yes"/>
       <point x="756" y="222"/>
       <point x="780" y="208"/>
-      <point x="813" y="208" type="curve" name="sv02" smooth="yes"/>
+      <point x="813" y="208" type="curve" smooth="yes" name="sv02"/>
       <point x="845" y="208"/>
       <point x="866" y="220"/>
-      <point x="881" y="251" type="curve" name="hr01" smooth="yes"/>
+      <point x="881" y="251" type="curve" smooth="yes" name="hr01"/>
       <point x="894" y="280"/>
       <point x="901" y="332"/>
-      <point x="901" y="405" type="curve" name="dh05" smooth="yes"/>
+      <point x="901" y="405" type="curve" smooth="yes" name="dh05"/>
       <point x="901" y="1120" type="line" name="at03"/>
       <point x="1155" y="1120" type="line"/>
-      <point x="1155" y="447" type="line" name="dh06" smooth="yes"/>
+      <point x="1155" y="447" type="line" smooth="yes" name="dh06"/>
       <point x="1155" y="116"/>
       <point x="1098" y="-27"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni053E_.glif b/source/Hack-Bold.ufo/glyphs/uni053E_.glif
index f1d7befb3..c5a969ebf 100644
--- a/source/Hack-Bold.ufo/glyphs/uni053E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni053E_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni053E" format="1">
+<glyph name="uni053E" format="2">
   <advance width="1233"/>
   <unicode hex="053E"/>
   <outline>
     <contour>
-      <point x="631" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="631" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="420" y="-29"/>
       <point x="288" y="41"/>
       <point x="207" y="148" type="curve" smooth="yes"/>
       <point x="122" y="260"/>
       <point x="87" y="413"/>
-      <point x="87" y="589" type="curve" name="ih01" smooth="yes"/>
+      <point x="87" y="589" type="curve" smooth="yes" name="ih01"/>
       <point x="87" y="749"/>
       <point x="116" y="882"/>
       <point x="169" y="1007" type="curve" name="sv01"/>
@@ -21,20 +21,20 @@
       <point x="318" y="1248" type="line"/>
       <point x="462" y="1416"/>
       <point x="660" y="1520"/>
-      <point x="872" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="872" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="932" y="1520"/>
       <point x="996" y="1513"/>
-      <point x="1056" y="1498" type="curve" name="at03" smooth="yes"/>
+      <point x="1056" y="1498" type="curve" smooth="yes" name="at03"/>
       <point x="1120" y="1483"/>
       <point x="1165" y="1464"/>
       <point x="1188" y="1448" type="curve" name="sh01"/>
       <point x="1188" y="1131" type="line" name="ih02"/>
       <point x="1155" y="1172"/>
       <point x="1107" y="1205"/>
-      <point x="1044" y="1232" type="curve" name="hr01" smooth="yes"/>
+      <point x="1044" y="1232" type="curve" smooth="yes" name="hr01"/>
       <point x="984" y="1257"/>
       <point x="922" y="1272"/>
-      <point x="861" y="1272" type="curve" name="sv02" smooth="yes"/>
+      <point x="861" y="1272" type="curve" smooth="yes" name="sv02"/>
       <point x="798" y="1272"/>
       <point x="740" y="1257"/>
       <point x="687" y="1230" type="curve" name="ih03"/>
@@ -43,7 +43,7 @@
       <point x="1064" y="1030" type="curve" smooth="yes"/>
       <point x="1152" y="926"/>
       <point x="1197" y="783"/>
-      <point x="1197" y="598" type="curve" name="dh03" smooth="yes"/>
+      <point x="1197" y="598" type="curve" smooth="yes" name="dh03"/>
       <point x="1197" y="485"/>
       <point x="1180" y="377"/>
       <point x="1143" y="284" type="curve" smooth="yes"/>
@@ -54,13 +54,13 @@
       <point x="767" y="-29"/>
     </contour>
     <contour>
-      <point x="634" y="228" type="curve" name="dv02" smooth="yes"/>
+      <point x="634" y="228" type="curve" smooth="yes" name="dv02"/>
       <point x="751" y="228"/>
       <point x="811" y="260"/>
       <point x="846" y="323" type="curve" smooth="yes"/>
       <point x="881" y="387"/>
       <point x="887" y="485"/>
-      <point x="887" y="579" type="curve" name="hr02" smooth="yes"/>
+      <point x="887" y="579" type="curve" smooth="yes" name="hr02"/>
       <point x="887" y="728"/>
       <point x="872" y="819"/>
       <point x="814" y="888" type="curve" smooth="yes"/>
@@ -69,10 +69,10 @@
       <point x="479" y="1005" type="curve" name="sv03"/>
       <point x="418" y="878"/>
       <point x="393" y="764"/>
-      <point x="393" y="566" type="curve" name="sh02" smooth="yes"/>
+      <point x="393" y="566" type="curve" smooth="yes" name="sh02"/>
       <point x="393" y="459"/>
       <point x="399" y="375"/>
-      <point x="430" y="318" type="curve" name="hr03" smooth="yes"/>
+      <point x="430" y="318" type="curve" smooth="yes" name="hr03"/>
       <point x="462" y="257"/>
       <point x="523" y="228"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni053F_.glif b/source/Hack-Bold.ufo/glyphs/uni053F_.glif
index 95fcc5f82..556b4fe47 100644
--- a/source/Hack-Bold.ufo/glyphs/uni053F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni053F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni053F" format="1">
+<glyph name="uni053F" format="2">
   <advance width="1233"/>
   <unicode hex="053F"/>
   <outline>
@@ -7,19 +7,19 @@
       <point x="831" y="400" type="line" name="hr00"/>
       <point x="768" y="369"/>
       <point x="706" y="352"/>
-      <point x="605" y="352" type="curve" name="dv01" smooth="yes"/>
+      <point x="605" y="352" type="curve" smooth="yes" name="dv01"/>
       <point x="266" y="352"/>
       <point x="106" y="526"/>
-      <point x="106" y="932" type="curve" name="sh01" smooth="yes"/>
+      <point x="106" y="932" type="curve" smooth="yes" name="sh01"/>
       <point x="106" y="1493" type="line" name="at01"/>
       <point x="401" y="1493" type="line"/>
-      <point x="401" y="858" type="line" name="sh02" smooth="yes"/>
+      <point x="401" y="858" type="line" smooth="yes" name="sh02"/>
       <point x="401" y="709"/>
       <point x="480" y="619"/>
-      <point x="615" y="619" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="619" type="curve" smooth="yes" name="dv02"/>
       <point x="748" y="619"/>
       <point x="831" y="708"/>
-      <point x="831" y="847" type="curve" name="sh03" smooth="yes"/>
+      <point x="831" y="847" type="curve" smooth="yes" name="sh03"/>
       <point x="831" y="1120" type="line" name="at02"/>
       <point x="1126" y="1120" type="line"/>
       <point x="1126" y="0" type="line" name="sh04"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0540.glif b/source/Hack-Bold.ufo/glyphs/uni0540.glif
index 48fdbcc47..5692cd86c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0540.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0540.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0540" format="1">
+<glyph name="uni0540" format="2">
   <advance width="1233"/>
   <unicode hex="0540"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0541.glif b/source/Hack-Bold.ufo/glyphs/uni0541.glif
index 89fb06f77..e3ea7a976 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0541.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0541.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0541" format="1">
+<glyph name="uni0541" format="2">
   <advance width="1233"/>
   <unicode hex="0541"/>
   <outline>
@@ -10,25 +10,25 @@
       <point x="806" y="114" type="curve"/>
       <point x="697" y="14"/>
       <point x="573" y="-27"/>
-      <point x="441" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="441" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="332" y="-27"/>
       <point x="246" y="1"/>
       <point x="183" y="56" type="curve" smooth="yes"/>
       <point x="120" y="112"/>
       <point x="85" y="190"/>
-      <point x="85" y="297" type="curve" name="sh02" smooth="yes"/>
+      <point x="85" y="297" type="curve" smooth="yes" name="sh02"/>
       <point x="85" y="510"/>
       <point x="229" y="633"/>
-      <point x="437" y="633" type="curve" name="dv04" smooth="yes"/>
+      <point x="437" y="633" type="curve" smooth="yes" name="dv04"/>
       <point x="557" y="633"/>
       <point x="668" y="593"/>
       <point x="773" y="521" type="curve"/>
       <point x="818" y="629"/>
       <point x="847" y="741"/>
-      <point x="847" y="886" type="curve" name="ah01" smooth="yes"/>
+      <point x="847" y="886" type="curve" smooth="yes" name="ah01"/>
       <point x="847" y="1158"/>
       <point x="757" y="1255"/>
-      <point x="608" y="1255" type="curve" name="dv01" smooth="yes"/>
+      <point x="608" y="1255" type="curve" smooth="yes" name="dv01"/>
       <point x="544" y="1255"/>
       <point x="482" y="1240"/>
       <point x="435" y="1183" type="curve" smooth="yes"/>
@@ -40,13 +40,13 @@
       <point x="71" y="901" type="line" smooth="yes"/>
       <point x="71" y="1367"/>
       <point x="317" y="1522"/>
-      <point x="609" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="609" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="761" y="1522"/>
       <point x="894" y="1480"/>
       <point x="991" y="1380" type="curve" smooth="yes"/>
       <point x="1091" y="1276"/>
       <point x="1149" y="1112"/>
-      <point x="1149" y="896" type="curve" name="sh04" smooth="yes"/>
+      <point x="1149" y="896" type="curve" smooth="yes" name="sh04"/>
       <point x="1149" y="683"/>
       <point x="1093" y="501"/>
       <point x="989" y="328" type="curve"/>
@@ -55,16 +55,16 @@
       <point x="1162" y="86" type="curve" name="sh05"/>
     </contour>
     <contour>
-      <point x="449" y="226" type="curve" name="sv01" smooth="yes"/>
+      <point x="449" y="226" type="curve" smooth="yes" name="sv01"/>
       <point x="498" y="226"/>
       <point x="560" y="242"/>
       <point x="623" y="305" type="curve"/>
       <point x="560" y="352"/>
       <point x="495" y="380"/>
-      <point x="443" y="380" type="curve" name="dv03" smooth="yes"/>
+      <point x="443" y="380" type="curve" smooth="yes" name="dv03"/>
       <point x="390" y="380"/>
       <point x="364" y="352"/>
-      <point x="364" y="301" type="curve" name="sh06" smooth="yes"/>
+      <point x="364" y="301" type="curve" smooth="yes" name="sh06"/>
       <point x="364" y="251"/>
       <point x="392" y="226"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0542.glif b/source/Hack-Bold.ufo/glyphs/uni0542.glif
index ef512c179..b67ec5843 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0542.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0542.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0542" format="1">
+<glyph name="uni0542" format="2">
   <advance width="1233"/>
   <unicode hex="0542"/>
   <outline>
     <contour>
-      <point x="758" y="1016" type="line" name="dh02" smooth="yes"/>
+      <point x="758" y="1016" type="line" smooth="yes" name="dh02"/>
       <point x="758" y="1165"/>
       <point x="680" y="1255"/>
-      <point x="543" y="1255" type="curve" name="dv01" smooth="yes"/>
+      <point x="543" y="1255" type="curve" smooth="yes" name="dv01"/>
       <point x="406" y="1255"/>
       <point x="328" y="1165"/>
       <point x="328" y="1016" type="curve" smooth="yes"/>
@@ -16,10 +16,10 @@
       <point x="33" y="942" type="line" smooth="yes"/>
       <point x="33" y="1350"/>
       <point x="185" y="1522"/>
-      <point x="543" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="543" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="901" y="1522"/>
       <point x="1053" y="1350"/>
-      <point x="1053" y="942" type="curve" name="dh03" smooth="yes"/>
+      <point x="1053" y="942" type="curve" smooth="yes" name="dh03"/>
       <point x="1053" y="260" type="line" name="sv01"/>
       <point x="1199" y="260" type="line" name="sh01"/>
       <point x="1199" y="0" type="line" name="ab01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0543.glif b/source/Hack-Bold.ufo/glyphs/uni0543.glif
index a0c9049e5..abc1c34ab 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0543.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0543.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0543" format="1">
+<glyph name="uni0543" format="2">
   <advance width="1233"/>
   <unicode hex="0543"/>
   <outline>
     <contour>
-      <point x="380" y="0" type="line" name="hr00" smooth="yes"/>
+      <point x="380" y="0" type="line" smooth="yes" name="hr00"/>
       <point x="198" y="0"/>
       <point x="71" y="78"/>
-      <point x="71" y="262" type="curve" name="dh01" smooth="yes"/>
+      <point x="71" y="262" type="curve" smooth="yes" name="dh01"/>
       <point x="71" y="378"/>
       <point x="123" y="525"/>
       <point x="236" y="718" type="curve" smooth="yes"/>
@@ -41,7 +41,7 @@
       <point x="486" y="602" type="curve" smooth="yes"/>
       <point x="406" y="469"/>
       <point x="374" y="380"/>
-      <point x="374" y="331" type="curve" name="dh02" smooth="yes"/>
+      <point x="374" y="331" type="curve" smooth="yes" name="dh02"/>
       <point x="374" y="280"/>
       <point x="407" y="265"/>
       <point x="499" y="265" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0544.glif b/source/Hack-Bold.ufo/glyphs/uni0544.glif
index e011c78a9..d3a2f9f05 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0544.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0544.glif
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0544" format="1">
+<glyph name="uni0544" format="2">
   <advance width="1233"/>
   <unicode hex="0544"/>
   <outline>
     <contour>
-      <point x="543" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="543" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="185" y="-29"/>
       <point x="33" y="145"/>
-      <point x="33" y="551" type="curve" name="dh01" smooth="yes"/>
+      <point x="33" y="551" type="curve" smooth="yes" name="dh01"/>
       <point x="33" y="1493" type="line" name="at01"/>
       <point x="328" y="1493" type="line" name="hr01"/>
-      <point x="328" y="477" type="line" name="dh02" smooth="yes"/>
+      <point x="328" y="477" type="line" smooth="yes" name="dh02"/>
       <point x="328" y="328"/>
       <point x="406" y="238"/>
-      <point x="543" y="238" type="curve" name="dv02" smooth="yes"/>
+      <point x="543" y="238" type="curve" smooth="yes" name="dv02"/>
       <point x="680" y="238"/>
       <point x="758" y="328"/>
-      <point x="758" y="477" type="curve" name="dh03" smooth="yes"/>
+      <point x="758" y="477" type="curve" smooth="yes" name="dh03"/>
       <point x="758" y="1493" type="line" name="at02"/>
       <point x="1199" y="1493" type="line"/>
       <point x="1199" y="1233" type="line" name="sh01"/>
       <point x="1053" y="1233" type="line"/>
-      <point x="1053" y="551" type="line" name="dh04" smooth="yes"/>
+      <point x="1053" y="551" type="line" smooth="yes" name="dh04"/>
       <point x="1053" y="145"/>
       <point x="901" y="-29"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0545.glif b/source/Hack-Bold.ufo/glyphs/uni0545.glif
index 3692e6df9..eebc139da 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0545.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0545.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0545" format="1">
+<glyph name="uni0545" format="2">
   <advance width="1233"/>
   <unicode hex="0545"/>
   <outline>
     <contour>
-      <point x="659" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="659" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="480" y="-29"/>
       <point x="351" y="26"/>
       <point x="263" y="111" type="curve" smooth="yes"/>
@@ -13,31 +13,31 @@
       <point x="127" y="436" type="curve" smooth="yes"/>
       <point x="127" y="445" type="line"/>
       <point x="425" y="445" type="line" name="sv01"/>
-      <point x="425" y="436" type="line" name="hr01" smooth="yes"/>
+      <point x="425" y="436" type="line" smooth="yes" name="hr01"/>
       <point x="425" y="326"/>
       <point x="503" y="226"/>
-      <point x="657" y="226" type="curve" name="dv02" smooth="yes"/>
+      <point x="657" y="226" type="curve" smooth="yes" name="dv02"/>
       <point x="737" y="226"/>
       <point x="796" y="252"/>
       <point x="833" y="293" type="curve" smooth="yes"/>
       <point x="869" y="333"/>
       <point x="884" y="392"/>
-      <point x="884" y="449" type="curve" name="ih01" smooth="yes"/>
+      <point x="884" y="449" type="curve" smooth="yes" name="ih01"/>
       <point x="884" y="585"/>
       <point x="802" y="662"/>
-      <point x="653" y="662" type="curve" name="dv03" smooth="yes"/>
+      <point x="653" y="662" type="curve" smooth="yes" name="dv03"/>
       <point x="50" y="662" type="line" name="hr02"/>
       <point x="50" y="922" type="line"/>
-      <point x="653" y="922" type="line" name="dv04" smooth="yes"/>
+      <point x="653" y="922" type="line" smooth="yes" name="dv04"/>
       <point x="717" y="922"/>
       <point x="761" y="944"/>
       <point x="789" y="977" type="curve" smooth="yes"/>
       <point x="820" y="1012"/>
       <point x="829" y="1056"/>
-      <point x="829" y="1100" type="curve" name="dh02" smooth="yes"/>
+      <point x="829" y="1100" type="curve" smooth="yes" name="dh02"/>
       <point x="829" y="1213"/>
       <point x="766" y="1263"/>
-      <point x="655" y="1263" type="curve" name="sv02" smooth="yes"/>
+      <point x="655" y="1263" type="curve" smooth="yes" name="sv02"/>
       <point x="538" y="1263"/>
       <point x="480" y="1207"/>
       <point x="480" y="1094" type="curve" name="dh01"/>
@@ -47,19 +47,19 @@
       <point x="312" y="1406" type="curve" smooth="yes"/>
       <point x="393" y="1478"/>
       <point x="511" y="1518"/>
-      <point x="652" y="1518" type="curve" name="at01" smooth="yes"/>
+      <point x="652" y="1518" type="curve" smooth="yes" name="at01"/>
       <point x="793" y="1518"/>
       <point x="911" y="1477"/>
       <point x="995" y="1404" type="curve" smooth="yes"/>
       <point x="1082" y="1328"/>
       <point x="1127" y="1223"/>
-      <point x="1127" y="1098" type="curve" name="dh03" smooth="yes"/>
+      <point x="1127" y="1098" type="curve" smooth="yes" name="dh03"/>
       <point x="1127" y="953"/>
       <point x="1066" y="861"/>
       <point x="973" y="812" type="curve" name="hr04"/>
       <point x="1116" y="751"/>
       <point x="1182" y="612"/>
-      <point x="1182" y="453" type="curve" name="sh01" smooth="yes"/>
+      <point x="1182" y="453" type="curve" smooth="yes" name="sh01"/>
       <point x="1182" y="192"/>
       <point x="1019" y="-29"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0546.glif b/source/Hack-Bold.ufo/glyphs/uni0546.glif
index 9ab966733..a145c6388 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0546.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0546.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0546" format="1">
+<glyph name="uni0546" format="2">
   <advance width="1233"/>
   <unicode hex="0546"/>
   <outline>
     <contour>
-      <point x="689" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="689" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="331" y="-29"/>
       <point x="179" y="145"/>
-      <point x="179" y="551" type="curve" name="sh01" smooth="yes"/>
+      <point x="179" y="551" type="curve" smooth="yes" name="sh01"/>
       <point x="179" y="1233" type="line" name="sv01"/>
       <point x="33" y="1233" type="line"/>
       <point x="33" y="1493" type="line" name="dh01"/>
@@ -15,13 +15,13 @@
       <point x="474" y="477" type="line" smooth="yes"/>
       <point x="474" y="328"/>
       <point x="552" y="238"/>
-      <point x="689" y="238" type="curve" name="dv02" smooth="yes"/>
+      <point x="689" y="238" type="curve" smooth="yes" name="dv02"/>
       <point x="826" y="238"/>
       <point x="904" y="328"/>
       <point x="904" y="477" type="curve" smooth="yes"/>
       <point x="904" y="618" type="line" name="dh03"/>
       <point x="1199" y="618" type="line" name="hr01"/>
-      <point x="1199" y="551" type="line" name="dh04" smooth="yes"/>
+      <point x="1199" y="551" type="line" smooth="yes" name="dh04"/>
       <point x="1199" y="145"/>
       <point x="1047" y="-29"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0547.glif b/source/Hack-Bold.ufo/glyphs/uni0547.glif
index 320bfef28..beab3e3be 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0547.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0547.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0547" format="1">
+<glyph name="uni0547" format="2">
   <advance width="1233"/>
   <unicode hex="0547"/>
   <outline>
     <contour>
-      <point x="620" y="-27" type="curve" name="hr00" smooth="yes"/>
+      <point x="620" y="-27" type="curve" smooth="yes" name="hr00"/>
       <point x="465" y="-27"/>
       <point x="328" y="16"/>
       <point x="231" y="119" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="294" y="1493" type="line" smooth="yes"/>
       <point x="337" y="1493"/>
       <point x="358" y="1491"/>
-      <point x="421" y="1480" type="curve" name="at02" smooth="yes"/>
+      <point x="421" y="1480" type="curve" smooth="yes" name="at02"/>
       <point x="472" y="1471"/>
       <point x="521" y="1461"/>
       <point x="564" y="1442" type="curve"/>
@@ -40,19 +40,19 @@
       <point x="454" y="935" type="curve" smooth="yes"/>
       <point x="409" y="850"/>
       <point x="383" y="738"/>
-      <point x="383" y="598" type="curve" name="sh03" smooth="yes"/>
+      <point x="383" y="598" type="curve" smooth="yes" name="sh03"/>
       <point x="383" y="477"/>
       <point x="403" y="381"/>
       <point x="446" y="320" type="curve" smooth="yes"/>
       <point x="486" y="263"/>
       <point x="543" y="240"/>
-      <point x="618" y="240" type="curve" name="sv01" smooth="yes"/>
+      <point x="618" y="240" type="curve" smooth="yes" name="sv01"/>
       <point x="761" y="240"/>
       <point x="862" y="324"/>
-      <point x="862" y="602" type="curve" name="ah01" smooth="yes"/>
+      <point x="862" y="602" type="curve" smooth="yes" name="ah01"/>
       <point x="862" y="620" type="line"/>
       <point x="1157" y="620" type="line"/>
-      <point x="1157" y="602" type="line" name="sh02" smooth="yes"/>
+      <point x="1157" y="602" type="line" smooth="yes" name="sh02"/>
       <point x="1157" y="369"/>
       <point x="1099" y="213"/>
       <point x="1003" y="113" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0548.glif b/source/Hack-Bold.ufo/glyphs/uni0548.glif
index 716e16a53..946a38df1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0548.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0548.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0548" format="1">
+<glyph name="uni0548" format="2">
   <advance width="1233"/>
   <unicode hex="0548"/>
   <outline>
     <contour>
-      <point x="106" y="942" type="line" name="hr00" smooth="yes"/>
+      <point x="106" y="942" type="line" smooth="yes" name="hr00"/>
       <point x="106" y="1350"/>
       <point x="258" y="1522"/>
-      <point x="616" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="974" y="1522"/>
       <point x="1126" y="1350"/>
       <point x="1126" y="942" type="curve" smooth="yes"/>
@@ -16,10 +16,10 @@
       <point x="831" y="1016" type="line" smooth="yes"/>
       <point x="831" y="1165"/>
       <point x="753" y="1255"/>
-      <point x="616" y="1255" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1255" type="curve" smooth="yes" name="dv01"/>
       <point x="479" y="1255"/>
       <point x="401" y="1165"/>
-      <point x="401" y="1016" type="curve" name="sh02" smooth="yes"/>
+      <point x="401" y="1016" type="curve" smooth="yes" name="sh02"/>
       <point x="401" y="0" type="line" name="ab01"/>
       <point x="106" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0549.glif b/source/Hack-Bold.ufo/glyphs/uni0549.glif
index 49991dc36..ea8e12bc3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0549.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0549.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0549" format="1">
+<glyph name="uni0549" format="2">
   <advance width="1233"/>
   <unicode hex="0549"/>
   <outline>
@@ -18,7 +18,7 @@
       <point x="852" y="935" type="curve" name="ah01"/>
       <point x="841" y="1148"/>
       <point x="773" y="1255"/>
-      <point x="616" y="1255" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1255" type="curve" smooth="yes" name="dv01"/>
       <point x="464" y="1255"/>
       <point x="372" y="1160"/>
       <point x="372" y="935" type="curve" smooth="yes"/>
@@ -27,13 +27,13 @@
       <point x="77" y="897" type="line" smooth="yes"/>
       <point x="77" y="1304"/>
       <point x="253" y="1522"/>
-      <point x="612" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="612" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="789" y="1522"/>
       <point x="925" y="1468"/>
       <point x="1018" y="1360" type="curve" smooth="yes"/>
       <point x="1110" y="1253"/>
       <point x="1155" y="1104"/>
-      <point x="1155" y="917" type="curve" name="sh03" smooth="yes"/>
+      <point x="1155" y="917" type="curve" smooth="yes" name="sh03"/>
       <point x="1155" y="733"/>
       <point x="1110" y="598"/>
       <point x="1049" y="494" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni054A_.glif b/source/Hack-Bold.ufo/glyphs/uni054A_.glif
index 54cf04a6b..72c197d87 100644
--- a/source/Hack-Bold.ufo/glyphs/uni054A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni054A_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni054A" format="1">
+<glyph name="uni054A" format="2">
   <advance width="1233"/>
   <unicode hex="054A"/>
   <outline>
     <contour>
-      <point x="927" y="935" type="line" name="hr00" smooth="yes"/>
+      <point x="927" y="935" type="line" smooth="yes" name="hr00"/>
       <point x="927" y="1144"/>
       <point x="872" y="1256"/>
       <point x="743" y="1276" type="curve"/>
@@ -22,13 +22,13 @@
       <point x="184" y="1351" type="curve" smooth="yes"/>
       <point x="279" y="1460"/>
       <point x="420" y="1518"/>
-      <point x="621" y="1518" type="curve" name="at01" smooth="yes"/>
+      <point x="621" y="1518" type="curve" smooth="yes" name="at01"/>
       <point x="825" y="1518"/>
       <point x="971" y="1459"/>
       <point x="1060" y="1351" type="curve" smooth="yes"/>
       <point x="1148" y="1246"/>
       <point x="1181" y="1096"/>
-      <point x="1181" y="919" type="curve" name="dh05" smooth="yes"/>
+      <point x="1181" y="919" type="curve" smooth="yes" name="dh05"/>
       <point x="1181" y="0" type="line" name="ab01"/>
       <point x="927" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni054B_.glif b/source/Hack-Bold.ufo/glyphs/uni054B_.glif
index ade027804..71e1b2f3b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni054B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni054B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni054B" format="1">
+<glyph name="uni054B" format="2">
   <advance width="1233"/>
   <unicode hex="054B"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="586" y="320" type="curve"/>
       <point x="598" y="376"/>
       <point x="605" y="425"/>
-      <point x="605" y="464" type="curve" name="dh03" smooth="yes"/>
+      <point x="605" y="464" type="curve" smooth="yes" name="dh03"/>
       <point x="605" y="557"/>
       <point x="563" y="613"/>
       <point x="446" y="621" type="curve" name="dv01"/>
@@ -24,7 +24,7 @@
       <point x="87" y="819" type="curve" smooth="yes"/>
       <point x="74" y="869"/>
       <point x="72" y="927"/>
-      <point x="72" y="954" type="curve" name="dh01" smooth="yes"/>
+      <point x="72" y="954" type="curve" smooth="yes" name="dh01"/>
       <point x="72" y="1054"/>
       <point x="86" y="1133"/>
       <point x="121" y="1214" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="293" y="1427" type="curve" smooth="yes"/>
       <point x="374" y="1483"/>
       <point x="477" y="1518"/>
-      <point x="622" y="1518" type="curve" name="at01" smooth="yes"/>
+      <point x="622" y="1518" type="curve" smooth="yes" name="at01"/>
       <point x="827" y="1518"/>
       <point x="961" y="1447"/>
       <point x="1045" y="1331" type="curve" smooth="yes"/>
       <point x="1134" y="1207"/>
       <point x="1160" y="1047"/>
-      <point x="1160" y="914" type="curve" name="dh05" smooth="yes"/>
+      <point x="1160" y="914" type="curve" smooth="yes" name="dh05"/>
       <point x="1160" y="775"/>
       <point x="1132" y="651"/>
       <point x="1077" y="542" type="curve" smooth="yes"/>
@@ -57,31 +57,31 @@
       <point x="841" y="728" type="curve" smooth="yes"/>
       <point x="853" y="787"/>
       <point x="858" y="835"/>
-      <point x="858" y="895" type="curve" name="dh04" smooth="yes"/>
+      <point x="858" y="895" type="curve" smooth="yes" name="dh04"/>
       <point x="858" y="975"/>
       <point x="849" y="1072"/>
       <point x="814" y="1141" type="curve" smooth="yes"/>
       <point x="782" y="1208"/>
       <point x="723" y="1255"/>
-      <point x="620" y="1255" type="curve" name="sv04" smooth="yes"/>
+      <point x="620" y="1255" type="curve" smooth="yes" name="sv04"/>
       <point x="524" y="1255"/>
       <point x="459" y="1215"/>
       <point x="420" y="1159" type="curve" smooth="yes"/>
       <point x="380" y="1103"/>
       <point x="366" y="1031"/>
-      <point x="366" y="978" type="curve" name="dh02" smooth="yes"/>
+      <point x="366" y="978" type="curve" smooth="yes" name="dh02"/>
       <point x="366" y="950"/>
       <point x="369" y="918"/>
       <point x="388" y="894" type="curve" smooth="yes"/>
       <point x="412" y="862"/>
       <point x="445" y="860"/>
-      <point x="484" y="857" type="curve" name="dv02" smooth="yes"/>
+      <point x="484" y="857" type="curve" smooth="yes" name="dv02"/>
       <point x="557" y="853"/>
       <point x="634" y="840"/>
       <point x="698" y="787" type="curve" smooth="yes"/>
       <point x="753" y="740"/>
       <point x="787" y="674"/>
-      <point x="787" y="595" type="curve" name="hr01" smooth="yes"/>
+      <point x="787" y="595" type="curve" smooth="yes" name="hr01"/>
       <point x="787" y="582"/>
       <point x="786" y="569"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni054C_.glif b/source/Hack-Bold.ufo/glyphs/uni054C_.glif
index d770f03ec..bd32dc740 100644
--- a/source/Hack-Bold.ufo/glyphs/uni054C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni054C_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni054C" format="1">
+<glyph name="uni054C" format="2">
   <advance width="1233"/>
   <unicode hex="054C"/>
   <outline>
     <contour>
-      <point x="33" y="942" type="line" name="dh01" smooth="yes"/>
+      <point x="33" y="942" type="line" smooth="yes" name="dh01"/>
       <point x="33" y="1350"/>
       <point x="185" y="1522"/>
-      <point x="543" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="543" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="901" y="1522"/>
       <point x="1053" y="1350"/>
-      <point x="1053" y="942" type="curve" name="sh01" smooth="yes"/>
+      <point x="1053" y="942" type="curve" smooth="yes" name="sh01"/>
       <point x="1053" y="674" type="line"/>
       <point x="1199" y="674" type="line" name="dv03"/>
       <point x="1199" y="414" type="line" name="sh02"/>
@@ -20,10 +20,10 @@
       <point x="758" y="1016" type="line" smooth="yes"/>
       <point x="758" y="1165"/>
       <point x="680" y="1255"/>
-      <point x="543" y="1255" type="curve" name="dv01" smooth="yes"/>
+      <point x="543" y="1255" type="curve" smooth="yes" name="dv01"/>
       <point x="406" y="1255"/>
       <point x="328" y="1165"/>
-      <point x="328" y="1016" type="curve" name="dh02" smooth="yes"/>
+      <point x="328" y="1016" type="curve" smooth="yes" name="dh02"/>
       <point x="328" y="0" type="line" name="ab01"/>
       <point x="33" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni054D_.glif b/source/Hack-Bold.ufo/glyphs/uni054D_.glif
index 35f81e78d..3fab54a56 100644
--- a/source/Hack-Bold.ufo/glyphs/uni054D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni054D_.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni054D" format="1">
+<glyph name="uni054D" format="2">
   <advance width="1233"/>
   <unicode hex="054D"/>
   <outline>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="258" y="-29"/>
       <point x="106" y="145"/>
-      <point x="106" y="551" type="curve" name="sh01" smooth="yes"/>
+      <point x="106" y="551" type="curve" smooth="yes" name="sh01"/>
       <point x="106" y="1493" type="line" name="at01"/>
       <point x="401" y="1493" type="line"/>
-      <point x="401" y="477" type="line" name="sh02" smooth="yes"/>
+      <point x="401" y="477" type="line" smooth="yes" name="sh02"/>
       <point x="401" y="328"/>
       <point x="479" y="238"/>
-      <point x="616" y="238" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="238" type="curve" smooth="yes" name="dv01"/>
       <point x="753" y="238"/>
       <point x="831" y="328"/>
-      <point x="831" y="477" type="curve" name="ah01" smooth="yes"/>
+      <point x="831" y="477" type="curve" smooth="yes" name="ah01"/>
       <point x="831" y="1493" type="line" name="at02"/>
       <point x="1126" y="1493" type="line"/>
-      <point x="1126" y="551" type="line" name="sh03" smooth="yes"/>
+      <point x="1126" y="551" type="line" smooth="yes" name="sh03"/>
       <point x="1126" y="145"/>
       <point x="974" y="-29"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni054E_.glif b/source/Hack-Bold.ufo/glyphs/uni054E_.glif
index 95bd7d8a0..4f1590ec5 100644
--- a/source/Hack-Bold.ufo/glyphs/uni054E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni054E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni054E" format="1">
+<glyph name="uni054E" format="2">
   <advance width="1233"/>
   <unicode hex="054E"/>
   <outline>
@@ -7,19 +7,19 @@
       <point x="758" y="400" type="line" name="dh03"/>
       <point x="695" y="369"/>
       <point x="633" y="352"/>
-      <point x="532" y="352" type="curve" name="dv01" smooth="yes"/>
+      <point x="532" y="352" type="curve" smooth="yes" name="dv01"/>
       <point x="193" y="352"/>
       <point x="33" y="526"/>
-      <point x="33" y="932" type="curve" name="hr01" smooth="yes"/>
+      <point x="33" y="932" type="curve" smooth="yes" name="hr01"/>
       <point x="33" y="999" type="line" name="dh01"/>
       <point x="328" y="999" type="line" name="dh02"/>
       <point x="328" y="858" type="line" smooth="yes"/>
       <point x="328" y="709"/>
       <point x="407" y="619"/>
-      <point x="542" y="619" type="curve" name="dv02" smooth="yes"/>
+      <point x="542" y="619" type="curve" smooth="yes" name="dv02"/>
       <point x="675" y="619"/>
       <point x="758" y="708"/>
-      <point x="758" y="847" type="curve" name="sh01" smooth="yes"/>
+      <point x="758" y="847" type="curve" smooth="yes" name="sh01"/>
       <point x="758" y="1493" type="line" name="at01"/>
       <point x="1053" y="1493" type="line"/>
       <point x="1053" y="260" type="line" name="dh04"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni054F_.glif b/source/Hack-Bold.ufo/glyphs/uni054F_.glif
index 67c2e5323..394abb367 100644
--- a/source/Hack-Bold.ufo/glyphs/uni054F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni054F_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni054F" format="1">
+<glyph name="uni054F" format="2">
   <advance width="1233"/>
   <unicode hex="054F"/>
   <outline>
     <contour>
-      <point x="630" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="630" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="305" y="-29"/>
       <point x="105" y="163"/>
       <point x="105" y="447" type="curve" name="dh01"/>
@@ -14,13 +14,13 @@
       <point x="481" y="256" type="curve" smooth="yes"/>
       <point x="522" y="223"/>
       <point x="576" y="215"/>
-      <point x="629" y="215" type="curve" name="dv02" smooth="yes"/>
+      <point x="629" y="215" type="curve" smooth="yes" name="dv02"/>
       <point x="735" y="215"/>
       <point x="827" y="252"/>
-      <point x="827" y="401" type="curve" name="dh03" smooth="yes"/>
+      <point x="827" y="401" type="curve" smooth="yes" name="dh03"/>
       <point x="827" y="414"/>
       <point x="826" y="430"/>
-      <point x="824" y="447" type="curve" name="sh01" smooth="yes"/>
+      <point x="824" y="447" type="curve" smooth="yes" name="sh01"/>
       <point x="816" y="507"/>
       <point x="779" y="545"/>
       <point x="708" y="581" type="curve" smooth="yes"/>
@@ -35,7 +35,7 @@
       <point x="178" y="937" type="curve" smooth="yes"/>
       <point x="159" y="984"/>
       <point x="150" y="1034"/>
-      <point x="150" y="1095" type="curve" name="ih01" smooth="yes"/>
+      <point x="150" y="1095" type="curve" smooth="yes" name="ih01"/>
       <point x="150" y="1159"/>
       <point x="161" y="1222"/>
       <point x="189" y="1285" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="332" y="1450" type="curve" smooth="yes"/>
       <point x="400" y="1493"/>
       <point x="488" y="1520"/>
-      <point x="617" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="617" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="786" y="1520"/>
       <point x="909" y="1475"/>
       <point x="990" y="1400" type="curve" smooth="yes"/>
@@ -54,28 +54,28 @@
       <point x="808" y="1120" type="line"/>
       <point x="808" y="1257"/>
       <point x="693" y="1275"/>
-      <point x="617" y="1275" type="curve" name="sv02" smooth="yes"/>
+      <point x="617" y="1275" type="curve" smooth="yes" name="sv02"/>
       <point x="566" y="1275"/>
       <point x="526" y="1266"/>
       <point x="494" y="1242" type="curve" smooth="yes"/>
       <point x="457" y="1214"/>
       <point x="438" y="1175"/>
-      <point x="438" y="1124" type="curve" name="sh02" smooth="yes"/>
+      <point x="438" y="1124" type="curve" smooth="yes" name="sh02"/>
       <point x="438" y="1049"/>
       <point x="481" y="1006"/>
       <point x="545" y="969" type="curve" smooth="yes"/>
       <point x="585" y="946"/>
       <point x="627" y="929"/>
-      <point x="656" y="918" type="curve" name="hr02" smooth="yes"/>
+      <point x="656" y="918" type="curve" smooth="yes" name="hr02"/>
       <point x="736" y="887"/>
       <point x="830" y="852"/>
       <point x="909" y="805" type="curve" smooth="yes"/>
       <point x="986" y="758"/>
       <point x="1059" y="695"/>
-      <point x="1098" y="595" type="curve" name="hr03" smooth="yes"/>
+      <point x="1098" y="595" type="curve" smooth="yes" name="hr03"/>
       <point x="1117" y="546"/>
       <point x="1127" y="487"/>
-      <point x="1127" y="424" type="curve" name="dh04" smooth="yes"/>
+      <point x="1127" y="424" type="curve" smooth="yes" name="dh04"/>
       <point x="1127" y="293"/>
       <point x="1084" y="180"/>
       <point x="1000" y="100" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0550.glif b/source/Hack-Bold.ufo/glyphs/uni0550.glif
index c5bb5dc7b..8a7ce2b20 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0550.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0550.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0550" format="1">
+<glyph name="uni0550" format="2">
   <advance width="1233"/>
   <unicode hex="0550"/>
   <outline>
     <contour>
-      <point x="106" y="942" type="line" name="hr00" smooth="yes"/>
+      <point x="106" y="942" type="line" smooth="yes" name="hr00"/>
       <point x="106" y="1350"/>
       <point x="258" y="1522"/>
-      <point x="616" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="974" y="1522"/>
       <point x="1126" y="1350"/>
       <point x="1126" y="942" type="curve" smooth="yes"/>
@@ -16,10 +16,10 @@
       <point x="831" y="1016" type="line" smooth="yes"/>
       <point x="831" y="1165"/>
       <point x="753" y="1255"/>
-      <point x="616" y="1255" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1255" type="curve" smooth="yes" name="dv01"/>
       <point x="479" y="1255"/>
       <point x="401" y="1165"/>
-      <point x="401" y="1016" type="curve" name="sh02" smooth="yes"/>
+      <point x="401" y="1016" type="curve" smooth="yes" name="sh02"/>
       <point x="401" y="0" type="line" name="ab01"/>
       <point x="106" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0551.glif b/source/Hack-Bold.ufo/glyphs/uni0551.glif
index eeaa4916d..b99e51ea5 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0551.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0551.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0551" format="1">
+<glyph name="uni0551" format="2">
   <advance width="1233"/>
   <unicode hex="0551"/>
   <outline>
     <contour>
-      <point x="660" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="660" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="480" y="-27"/>
       <point x="351" y="28"/>
       <point x="263" y="113" type="curve" smooth="yes"/>
@@ -16,34 +16,34 @@
       <point x="425" y="438" type="line" smooth="yes"/>
       <point x="425" y="328"/>
       <point x="503" y="228"/>
-      <point x="657" y="228" type="curve" name="sv02" smooth="yes"/>
+      <point x="657" y="228" type="curve" smooth="yes" name="sv02"/>
       <point x="737" y="228"/>
       <point x="796" y="254"/>
       <point x="833" y="295" type="curve" smooth="yes"/>
       <point x="872" y="338"/>
       <point x="884" y="398"/>
-      <point x="884" y="450" type="curve" name="ih01" smooth="yes"/>
+      <point x="884" y="450" type="curve" smooth="yes" name="ih01"/>
       <point x="884" y="513"/>
       <point x="864" y="564"/>
       <point x="825" y="601" type="curve" smooth="yes"/>
       <point x="786" y="638"/>
       <point x="730" y="662"/>
-      <point x="654" y="662" type="curve" name="hr01" smooth="yes"/>
+      <point x="654" y="662" type="curve" smooth="yes" name="hr01"/>
       <point x="50" y="662" type="line"/>
       <point x="50" y="922" type="line" name="sv03"/>
       <point x="232" y="922" type="line" name="hr02"/>
       <point x="192" y="987"/>
       <point x="182" y="1045"/>
-      <point x="182" y="1101" type="curve" name="dh01" smooth="yes"/>
+      <point x="182" y="1101" type="curve" smooth="yes" name="dh01"/>
       <point x="182" y="1218"/>
       <point x="226" y="1325"/>
       <point x="307" y="1401" type="curve" smooth="yes"/>
       <point x="387" y="1476"/>
       <point x="505" y="1518"/>
-      <point x="654" y="1518" type="curve" name="at01" smooth="yes"/>
+      <point x="654" y="1518" type="curve" smooth="yes" name="at01"/>
       <point x="952" y="1518"/>
       <point x="1127" y="1345"/>
-      <point x="1127" y="1097" type="curve" name="dh04" smooth="yes"/>
+      <point x="1127" y="1097" type="curve" smooth="yes" name="dh04"/>
       <point x="1127" y="968"/>
       <point x="1078" y="865"/>
       <point x="973" y="812" type="curve" name="ih02"/>
@@ -52,7 +52,7 @@
       <point x="1136" y="655" type="curve" smooth="yes"/>
       <point x="1169" y="590"/>
       <point x="1182" y="522"/>
-      <point x="1182" y="450" type="curve" name="sh01" smooth="yes"/>
+      <point x="1182" y="450" type="curve" smooth="yes" name="sh01"/>
       <point x="1182" y="325"/>
       <point x="1143" y="205"/>
       <point x="1056" y="117" type="curve" smooth="yes"/>
@@ -60,22 +60,22 @@
       <point x="839" y="-27"/>
     </contour>
     <contour>
-      <point x="652" y="922" type="curve" name="hr03" smooth="yes"/>
+      <point x="652" y="922" type="curve" smooth="yes" name="hr03"/>
       <point x="720" y="922"/>
       <point x="762" y="942"/>
       <point x="790" y="974" type="curve" smooth="yes"/>
       <point x="816" y="1004"/>
       <point x="829" y="1044"/>
-      <point x="829" y="1095" type="curve" name="dh03" smooth="yes"/>
+      <point x="829" y="1095" type="curve" smooth="yes" name="dh03"/>
       <point x="829" y="1184"/>
       <point x="792" y="1263"/>
-      <point x="654" y="1263" type="curve" name="sv04" smooth="yes"/>
+      <point x="654" y="1263" type="curve" smooth="yes" name="sv04"/>
       <point x="586" y="1263"/>
       <point x="543" y="1244"/>
-      <point x="516" y="1213" type="curve" name="hr04" smooth="yes"/>
+      <point x="516" y="1213" type="curve" smooth="yes" name="hr04"/>
       <point x="489" y="1181"/>
       <point x="480" y="1136"/>
-      <point x="480" y="1092" type="curve" name="dh02" smooth="yes"/>
+      <point x="480" y="1092" type="curve" smooth="yes" name="dh02"/>
       <point x="480" y="1048"/>
       <point x="488" y="1005"/>
       <point x="515" y="974" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0552.glif b/source/Hack-Bold.ufo/glyphs/uni0552.glif
index 06563f94d..c2e5f0c8d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0552.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0552.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0552" format="1">
+<glyph name="uni0552" format="2">
   <advance width="1233"/>
   <unicode hex="0552"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0553.glif b/source/Hack-Bold.ufo/glyphs/uni0553.glif
index 3ab3647c7..eeed394e3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0553.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0553.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0553" format="1">
+<glyph name="uni0553" format="2">
   <advance width="1233"/>
   <unicode hex="0553"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="124" y="319" type="curve" smooth="yes"/>
       <point x="56" y="426"/>
       <point x="31" y="571"/>
-      <point x="31" y="763" type="curve" name="dh01" smooth="yes"/>
+      <point x="31" y="763" type="curve" smooth="yes" name="dh01"/>
       <point x="31" y="952"/>
       <point x="56" y="1098"/>
       <point x="125" y="1202" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="742" y="1371" type="line" name="sv01"/>
       <point x="1103" y="1358"/>
       <point x="1201" y="1136"/>
-      <point x="1201" y="765" type="curve" name="dh05" smooth="yes"/>
+      <point x="1201" y="765" type="curve" smooth="yes" name="dh05"/>
       <point x="1201" y="394"/>
       <point x="1103" y="150"/>
       <point x="742" y="137" type="curve" name="dh03"/>
@@ -36,7 +36,7 @@
       <point x="312" y="1052" type="curve" smooth="yes"/>
       <point x="284" y="992"/>
       <point x="282" y="898"/>
-      <point x="282" y="778" type="curve" name="dh02" smooth="yes"/>
+      <point x="282" y="778" type="curve" smooth="yes" name="dh02"/>
       <point x="282" y="631"/>
       <point x="285" y="534"/>
       <point x="313" y="467" type="curve"/>
@@ -51,7 +51,7 @@
       <point x="918" y="469" type="curve" smooth="yes"/>
       <point x="945" y="533"/>
       <point x="947" y="629"/>
-      <point x="947" y="764" type="curve" name="dh04" smooth="yes"/>
+      <point x="947" y="764" type="curve" smooth="yes" name="dh04"/>
       <point x="947" y="1034"/>
       <point x="938" y="1135"/>
       <point x="742" y="1143" type="curve" name="sv03"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0554.glif b/source/Hack-Bold.ufo/glyphs/uni0554.glif
index 99df1047b..fb1e648fd 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0554.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0554.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0554" format="1">
+<glyph name="uni0554" format="2">
   <advance width="1233"/>
   <unicode hex="0554"/>
   <outline>
@@ -14,16 +14,16 @@
       <point x="314" y="1388" type="curve" smooth="yes"/>
       <point x="391" y="1468"/>
       <point x="508" y="1518"/>
-      <point x="684" y="1518" type="curve" name="at01" smooth="yes"/>
+      <point x="684" y="1518" type="curve" smooth="yes" name="at01"/>
       <point x="1029" y="1518"/>
       <point x="1182" y="1318"/>
-      <point x="1182" y="1055" type="curve" name="sh02" smooth="yes"/>
+      <point x="1182" y="1055" type="curve" smooth="yes" name="sh02"/>
       <point x="1182" y="918"/>
       <point x="1141" y="803"/>
       <point x="1062" y="723" type="curve" smooth="yes"/>
       <point x="978" y="639"/>
       <point x="851" y="591"/>
-      <point x="698" y="591" type="curve" name="dv01" smooth="yes"/>
+      <point x="698" y="591" type="curve" smooth="yes" name="dv01"/>
       <point x="635" y="591"/>
       <point x="571" y="599"/>
       <point x="492" y="640" type="curve" name="sh04"/>
@@ -35,10 +35,10 @@
       <point x="197" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="692" y="846" type="curve" name="dv02" smooth="yes"/>
+      <point x="692" y="846" type="curve" smooth="yes" name="dv02"/>
       <point x="840" y="846"/>
       <point x="881" y="928"/>
-      <point x="881" y="1052" type="curve" name="ah01" smooth="yes"/>
+      <point x="881" y="1052" type="curve" smooth="yes" name="ah01"/>
       <point x="881" y="1109"/>
       <point x="872" y="1167"/>
       <point x="841" y="1206" type="curve" smooth="yes"/>
@@ -47,13 +47,13 @@
       <point x="782" y="1248" type="curve" smooth="yes"/>
       <point x="757" y="1258"/>
       <point x="725" y="1263"/>
-      <point x="687" y="1263" type="curve" name="sv03" smooth="yes"/>
+      <point x="687" y="1263" type="curve" smooth="yes" name="sv03"/>
       <point x="606" y="1263"/>
       <point x="560" y="1241"/>
       <point x="532" y="1206" type="curve" smooth="yes"/>
       <point x="503" y="1170"/>
       <point x="493" y="1118"/>
-      <point x="493" y="1057" type="curve" name="sh05" smooth="yes"/>
+      <point x="493" y="1057" type="curve" smooth="yes" name="sh05"/>
       <point x="493" y="932"/>
       <point x="538" y="846"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0555.glif b/source/Hack-Bold.ufo/glyphs/uni0555.glif
index 5ab92b9d9..0e3bc33ea 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0555.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0555.glif
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0555" format="1">
+<glyph name="uni0555" format="2">
   <advance width="1233"/>
   <unicode hex="0555"/>
   <outline>
     <contour>
-      <point x="617" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="270" y="-29"/>
       <point x="92" y="237"/>
-      <point x="92" y="746" type="curve" name="sh01" smooth="yes"/>
+      <point x="92" y="746" type="curve" smooth="yes" name="sh01"/>
       <point x="92" y="1255"/>
       <point x="270" y="1520"/>
-      <point x="617" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="617" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="962" y="1520"/>
       <point x="1141" y="1257"/>
-      <point x="1141" y="746" type="curve" name="sh02" smooth="yes"/>
+      <point x="1141" y="746" type="curve" smooth="yes" name="sh02"/>
       <point x="1141" y="235"/>
       <point x="962" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="236" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="236" type="curve" smooth="yes" name="dv01"/>
       <point x="692" y="236"/>
       <point x="747" y="276"/>
       <point x="782" y="357" type="curve" smooth="yes"/>
       <point x="817" y="436"/>
       <point x="834" y="566"/>
-      <point x="834" y="746" type="curve" name="ah01" smooth="yes"/>
+      <point x="834" y="746" type="curve" smooth="yes" name="ah01"/>
       <point x="834" y="925"/>
       <point x="817" y="1055"/>
       <point x="782" y="1134" type="curve" smooth="yes"/>
       <point x="747" y="1215"/>
       <point x="692" y="1255"/>
-      <point x="616" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="537" y="1255"/>
       <point x="486" y="1214"/>
       <point x="451" y="1134" type="curve" smooth="yes"/>
       <point x="416" y="1055"/>
       <point x="399" y="925"/>
-      <point x="399" y="746" type="curve" name="sh03" smooth="yes"/>
+      <point x="399" y="746" type="curve" smooth="yes" name="sh03"/>
       <point x="399" y="566"/>
       <point x="416" y="436"/>
       <point x="451" y="357" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0556.glif b/source/Hack-Bold.ufo/glyphs/uni0556.glif
index 8fb4ad096..5cc392299 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0556.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0556.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0556" format="1">
+<glyph name="uni0556" format="2">
   <advance width="1233"/>
   <unicode hex="0556"/>
   <outline>
     <contour>
-      <point x="614" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="614" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="96" y="-29"/>
       <point x="31" y="215"/>
       <point x="31" y="562" type="curve" name="dh01"/>
       <point x="282" y="562" type="line" name="dh02"/>
       <point x="282" y="445"/>
       <point x="285" y="360"/>
-      <point x="313" y="303" type="curve" name="hr01" smooth="yes"/>
+      <point x="313" y="303" type="curve" smooth="yes" name="hr01"/>
       <point x="340" y="247"/>
       <point x="388" y="217"/>
       <point x="487" y="213" type="curve" name="dh03"/>
@@ -21,12 +21,12 @@
       <point x="115" y="1198" type="curve" smooth="yes"/>
       <point x="115" y="1393"/>
       <point x="215" y="1493"/>
-      <point x="508" y="1493" type="curve" name="at01" smooth="yes"/>
+      <point x="508" y="1493" type="curve" smooth="yes" name="at01"/>
       <point x="742" y="1493" type="line" name="sh01"/>
       <point x="742" y="1118" type="line" name="at02"/>
       <point x="1103" y="1105"/>
       <point x="1201" y="916"/>
-      <point x="1201" y="555" type="curve" name="dh06" smooth="yes"/>
+      <point x="1201" y="555" type="curve" smooth="yes" name="dh06"/>
       <point x="1201" y="221"/>
       <point x="1133" y="-29"/>
     </contour>
@@ -49,7 +49,7 @@
       <point x="742" y="213" type="line" name="dh04"/>
       <point x="938" y="221"/>
       <point x="947" y="328"/>
-      <point x="947" y="562" type="curve" name="dh05" smooth="yes"/>
+      <point x="947" y="562" type="curve" smooth="yes" name="dh05"/>
       <point x="947" y="797"/>
       <point x="938" y="882"/>
       <point x="742" y="890" type="curve" name="sv02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0559.glif b/source/Hack-Bold.ufo/glyphs/uni0559.glif
index f929a157a..6c1dd98cd 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0559.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0559.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0559" format="1">
+<glyph name="uni0559" format="2">
   <advance width="1233"/>
   <unicode hex="0559"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="759" y="986" type="line" name="sh02"/>
       <point x="602" y="986"/>
       <point x="474" y="1114"/>
-      <point x="474" y="1271" type="curve" name="hr01" smooth="yes"/>
+      <point x="474" y="1271" type="curve" smooth="yes" name="hr01"/>
       <point x="474" y="1428"/>
       <point x="602" y="1556"/>
       <point x="759" y="1556" type="curve" name="hr02"/>
       <point x="759" y="1402" type="line" name="sh01"/>
       <point x="687" y="1402"/>
       <point x="628" y="1343"/>
-      <point x="628" y="1271" type="curve" name="dh01" smooth="yes"/>
+      <point x="628" y="1271" type="curve" smooth="yes" name="dh01"/>
       <point x="628" y="1199"/>
       <point x="686" y="1140"/>
       <point x="759" y="1140" type="curve" name="sh03"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni055A_.glif b/source/Hack-Bold.ufo/glyphs/uni055A_.glif
index a59fd0d98..5737016f6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni055A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni055A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni055A" format="1">
+<glyph name="uni055A" format="2">
   <advance width="1233"/>
   <unicode hex="055A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni055B_.glif b/source/Hack-Bold.ufo/glyphs/uni055B_.glif
index 821e3df4f..f41bcf4f2 100644
--- a/source/Hack-Bold.ufo/glyphs/uni055B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni055B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni055B" format="1">
+<glyph name="uni055B" format="2">
   <advance width="1233"/>
   <unicode hex="055B"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni055C_.glif b/source/Hack-Bold.ufo/glyphs/uni055C_.glif
index ec8840e7c..d0eb61875 100644
--- a/source/Hack-Bold.ufo/glyphs/uni055C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni055C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni055C" format="1">
+<glyph name="uni055C" format="2">
   <advance width="1233"/>
   <unicode hex="055C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni055D_.glif b/source/Hack-Bold.ufo/glyphs/uni055D_.glif
index 5e24b3379..86dfcf11f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni055D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni055D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni055D" format="1">
+<glyph name="uni055D" format="2">
   <advance width="1233"/>
   <unicode hex="055D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni055E_.glif b/source/Hack-Bold.ufo/glyphs/uni055E_.glif
index 2b57b034a..1237e50ee 100644
--- a/source/Hack-Bold.ufo/glyphs/uni055E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni055E_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni055E" format="1">
+<glyph name="uni055E" format="2">
   <advance width="1233"/>
   <unicode hex="055E"/>
   <outline>
     <contour>
-      <point x="840" y="1209" type="curve" name="dv01" smooth="yes"/>
+      <point x="840" y="1209" type="curve" smooth="yes" name="dv01"/>
       <point x="772" y="1209"/>
       <point x="706" y="1223"/>
       <point x="650" y="1262" type="curve" smooth="yes"/>
@@ -14,16 +14,16 @@
       <point x="707" y="1454" type="line" name="sv01"/>
       <point x="715" y="1411"/>
       <point x="754" y="1393"/>
-      <point x="799" y="1393" type="curve" name="dv02" smooth="yes"/>
+      <point x="799" y="1393" type="curve" smooth="yes" name="dv02"/>
       <point x="835" y="1393"/>
       <point x="859" y="1405"/>
       <point x="875" y="1425" type="curve" smooth="yes"/>
       <point x="892" y="1446"/>
       <point x="896" y="1472"/>
-      <point x="896" y="1492" type="curve" name="dh01" smooth="yes"/>
+      <point x="896" y="1492" type="curve" smooth="yes" name="dh01"/>
       <point x="896" y="1587"/>
       <point x="798" y="1624"/>
-      <point x="687" y="1624" type="curve" name="dv03" smooth="yes"/>
+      <point x="687" y="1624" type="curve" smooth="yes" name="dv03"/>
       <point x="574" y="1624"/>
       <point x="476" y="1584"/>
       <point x="401" y="1521" type="curve" smooth="yes"/>
@@ -39,13 +39,13 @@
       <point x="412" y="1782" type="curve" smooth="yes"/>
       <point x="507" y="1829"/>
       <point x="609" y="1856"/>
-      <point x="724" y="1856" type="curve" name="dv04" smooth="yes"/>
+      <point x="724" y="1856" type="curve" smooth="yes" name="dv04"/>
       <point x="861" y="1856"/>
       <point x="970" y="1817"/>
-      <point x="1046" y="1753" type="curve" name="hr01" smooth="yes"/>
+      <point x="1046" y="1753" type="curve" smooth="yes" name="hr01"/>
       <point x="1123" y="1689"/>
       <point x="1165" y="1601"/>
-      <point x="1165" y="1504" type="curve" name="dh02" smooth="yes"/>
+      <point x="1165" y="1504" type="curve" smooth="yes" name="dh02"/>
       <point x="1165" y="1424"/>
       <point x="1138" y="1354"/>
       <point x="1082" y="1299" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni055F_.glif b/source/Hack-Bold.ufo/glyphs/uni055F_.glif
index a0389a6b1..06d11090c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni055F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni055F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni055F" format="1">
+<glyph name="uni055F" format="2">
   <advance width="1233"/>
   <unicode hex="055F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0561.glif b/source/Hack-Bold.ufo/glyphs/uni0561.glif
index 0e2c1da6a..96879f985 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0561.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0561.glif
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0561" format="1">
+<glyph name="uni0561" format="2">
   <advance width="1233"/>
   <unicode hex="0561"/>
   <outline>
     <contour>
-      <point x="333" y="-27" type="curve" name="sh02" smooth="yes"/>
+      <point x="333" y="-27" type="curve" smooth="yes" name="sh02"/>
       <point x="236" y="-27"/>
       <point x="171" y="9"/>
       <point x="136" y="73" type="curve" smooth="yes"/>
       <point x="101" y="136"/>
       <point x="80" y="261"/>
-      <point x="80" y="489" type="curve" name="sh01" smooth="yes"/>
+      <point x="80" y="489" type="curve" smooth="yes" name="sh01"/>
       <point x="80" y="1120" type="line" name="at01"/>
       <point x="320" y="1120" type="line"/>
-      <point x="320" y="401" type="line" name="hr01" smooth="yes"/>
+      <point x="320" y="401" type="line" smooth="yes" name="hr01"/>
       <point x="320" y="316"/>
       <point x="325" y="264"/>
       <point x="340" y="233" type="curve"/>
       <point x="355" y="198"/>
       <point x="378" y="192"/>
-      <point x="407" y="192" type="curve" name="sv01" smooth="yes"/>
+      <point x="407" y="192" type="curve" smooth="yes" name="sv01"/>
       <point x="439" y="192"/>
       <point x="463" y="200"/>
       <point x="478" y="235" type="curve" smooth="yes"/>
       <point x="491" y="264"/>
       <point x="498" y="320"/>
-      <point x="498" y="401" type="curve" name="sh03" smooth="yes"/>
+      <point x="498" y="401" type="curve" smooth="yes" name="sh03"/>
       <point x="498" y="1120" type="line" name="at02"/>
       <point x="735" y="1120" type="line" name="hr02"/>
-      <point x="735" y="401" type="line" name="sh04" smooth="yes"/>
+      <point x="735" y="401" type="line" smooth="yes" name="sh04"/>
       <point x="735" y="317"/>
       <point x="741" y="266"/>
       <point x="756" y="235" type="curve"/>
       <point x="771" y="200"/>
       <point x="794" y="192"/>
-      <point x="826" y="192" type="curve" name="sv02" smooth="yes"/>
+      <point x="826" y="192" type="curve" smooth="yes" name="sv02"/>
       <point x="855" y="192"/>
       <point x="879" y="198"/>
       <point x="894" y="233" type="curve"/>
       <point x="909" y="264"/>
       <point x="913" y="316"/>
-      <point x="913" y="401" type="curve" name="sh05" smooth="yes"/>
+      <point x="913" y="401" type="curve" smooth="yes" name="sh05"/>
       <point x="913" y="1120" type="line" name="at03"/>
       <point x="1153" y="1120" type="line"/>
       <point x="1153" y="0" type="line" name="sh06"/>
@@ -48,10 +48,10 @@
       <point x="940" y="116" type="line" name="ih01"/>
       <point x="907" y="28"/>
       <point x="828" y="-27"/>
-      <point x="740" y="-27" type="curve" name="sh07" smooth="yes"/>
+      <point x="740" y="-27" type="curve" smooth="yes" name="sh07"/>
       <point x="692" y="-27"/>
       <point x="649" y="-11"/>
-      <point x="614" y="14" type="curve" name="ab01" smooth="yes"/>
+      <point x="614" y="14" type="curve" smooth="yes" name="ab01"/>
       <point x="573" y="43"/>
       <point x="553" y="76"/>
       <point x="545" y="112" type="curve" name="ih02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0562.glif b/source/Hack-Bold.ufo/glyphs/uni0562.glif
index 4f84324e6..3a7e209cd 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0562.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0562.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0562" format="1">
+<glyph name="uni0562" format="2">
   <advance width="1233"/>
   <unicode hex="0562"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="440" y="952" type="line" name="iv01"/>
       <point x="481" y="1076"/>
       <point x="581" y="1147"/>
-      <point x="730" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="730" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="939" y="1147"/>
       <point x="1048" y="1010"/>
       <point x="1048" y="727" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="757" y="682" type="line" smooth="yes"/>
       <point x="757" y="841"/>
       <point x="714" y="909"/>
-      <point x="617" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="617" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="500" y="909"/>
       <point x="440" y="810"/>
-      <point x="440" y="641" type="curve" name="sh04" smooth="yes"/>
+      <point x="440" y="641" type="curve" smooth="yes" name="sh04"/>
       <point x="440" y="225" type="line" name="sv02"/>
       <point x="1084" y="225" type="line"/>
       <point x="1084" y="0" type="line" name="ab01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0563.glif b/source/Hack-Bold.ufo/glyphs/uni0563.glif
index f1ae4161c..e6c1b37ba 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0563.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0563.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0563" format="1">
+<glyph name="uni0563" format="2">
   <advance width="1233"/>
   <unicode hex="0563"/>
   <outline>
@@ -7,19 +7,19 @@
       <point x="766" y="158" type="line" name="dh03"/>
       <point x="690" y="29"/>
       <point x="601" y="-29"/>
-      <point x="470" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="470" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="342" y="-29"/>
       <point x="242" y="25"/>
       <point x="173" y="124" type="curve" smooth="yes"/>
       <point x="102" y="224"/>
       <point x="65" y="367"/>
-      <point x="65" y="558" type="curve" name="dh01" smooth="yes"/>
+      <point x="65" y="558" type="curve" smooth="yes" name="dh01"/>
       <point x="65" y="746"/>
       <point x="102" y="892"/>
       <point x="171" y="993" type="curve" smooth="yes"/>
       <point x="240" y="1093"/>
       <point x="342" y="1147"/>
-      <point x="467" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="467" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="606" y="1147"/>
       <point x="702" y="1083"/>
       <point x="766" y="952" type="curve" name="sh01"/>
@@ -33,16 +33,16 @@
       <point x="766" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="560" y="215" type="curve" name="hr03" smooth="yes"/>
+      <point x="560" y="215" type="curve" smooth="yes" name="hr03"/>
       <point x="689" y="215"/>
       <point x="766" y="346"/>
-      <point x="766" y="561" type="curve" name="sh03" smooth="yes"/>
+      <point x="766" y="561" type="curve" smooth="yes" name="sh03"/>
       <point x="766" y="668"/>
       <point x="748" y="752"/>
       <point x="711" y="814" type="curve" smooth="yes"/>
       <point x="676" y="874"/>
       <point x="626" y="907"/>
-      <point x="561" y="907" type="curve" name="hr04" smooth="yes"/>
+      <point x="561" y="907" type="curve" smooth="yes" name="hr04"/>
       <point x="494" y="907"/>
       <point x="445" y="872"/>
       <point x="412" y="815" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="372" y="706" type="curve" smooth="yes"/>
       <point x="363" y="663"/>
       <point x="358" y="617"/>
-      <point x="358" y="561" type="curve" name="dh02" smooth="yes"/>
+      <point x="358" y="561" type="curve" smooth="yes" name="dh02"/>
       <point x="358" y="453"/>
       <point x="377" y="367"/>
       <point x="412" y="307" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0564.glif b/source/Hack-Bold.ufo/glyphs/uni0564.glif
index 1f27325f0..bce9ae57e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0564.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0564.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0564" format="1">
+<glyph name="uni0564" format="2">
   <advance width="1233"/>
   <unicode hex="0564"/>
   <outline>
     <contour>
-      <point x="711" y="682" type="line" name="dh02" smooth="yes"/>
+      <point x="711" y="682" type="line" smooth="yes" name="dh02"/>
       <point x="711" y="841"/>
       <point x="668" y="909"/>
-      <point x="571" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="571" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="454" y="909"/>
       <point x="394" y="810"/>
       <point x="394" y="641" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="394" y="952" type="line" name="sh01"/>
       <point x="435" y="1076"/>
       <point x="535" y="1147"/>
-      <point x="684" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="684" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="893" y="1147"/>
       <point x="1002" y="1010"/>
-      <point x="1002" y="727" type="curve" name="hr03" smooth="yes"/>
+      <point x="1002" y="727" type="curve" smooth="yes" name="hr03"/>
       <point x="1002" y="225" type="line" name="sv02"/>
       <point x="1130" y="225" type="line" name="sh02"/>
       <point x="1130" y="0" type="line" name="ab02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0565.glif b/source/Hack-Bold.ufo/glyphs/uni0565.glif
index 78ea144fa..ef74be035 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0565.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0565.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0565" format="1">
+<glyph name="uni0565" format="2">
   <advance width="1233"/>
   <unicode hex="0565"/>
   <outline>
     <contour>
-      <point x="462" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="462" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="251" y="-29"/>
       <point x="143" y="110"/>
-      <point x="143" y="391" type="curve" name="sh01" smooth="yes"/>
+      <point x="143" y="391" type="curve" smooth="yes" name="sh01"/>
       <point x="143" y="1556" type="line" name="hr01"/>
       <point x="436" y="1556" type="line" name="sh03"/>
       <point x="436" y="1120" type="line" name="at01"/>
       <point x="1090" y="1120" type="line"/>
       <point x="1090" y="895" type="line" name="sv03"/>
       <point x="436" y="895" type="line"/>
-      <point x="436" y="436" type="line" name="sh02" smooth="yes"/>
+      <point x="436" y="436" type="line" smooth="yes" name="sh02"/>
       <point x="436" y="279"/>
       <point x="477" y="211"/>
-      <point x="576" y="211" type="curve" name="sv01" smooth="yes"/>
+      <point x="576" y="211" type="curve" smooth="yes" name="sv01"/>
       <point x="693" y="211"/>
       <point x="751" y="308"/>
       <point x="751" y="477" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0566.glif b/source/Hack-Bold.ufo/glyphs/uni0566.glif
index 99e1f714a..fabb4cbcc 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0566.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0566.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0566" format="1">
+<glyph name="uni0566" format="2">
   <advance width="1233"/>
   <unicode hex="0566"/>
   <outline>
@@ -7,19 +7,19 @@
       <point x="766" y="158" type="line" name="iv01"/>
       <point x="690" y="29"/>
       <point x="601" y="-29"/>
-      <point x="470" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="470" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="342" y="-29"/>
       <point x="242" y="25"/>
       <point x="173" y="124" type="curve" smooth="yes"/>
       <point x="102" y="224"/>
       <point x="65" y="367"/>
-      <point x="65" y="558" type="curve" name="dh01" smooth="yes"/>
+      <point x="65" y="558" type="curve" smooth="yes" name="dh01"/>
       <point x="65" y="746"/>
       <point x="102" y="892"/>
       <point x="171" y="993" type="curve" smooth="yes"/>
       <point x="240" y="1093"/>
       <point x="342" y="1147"/>
-      <point x="467" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="467" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="606" y="1147"/>
       <point x="702" y="1083"/>
       <point x="766" y="952" type="curve" name="sh01"/>
@@ -31,16 +31,16 @@
       <point x="766" y="-426" type="line" name="dh03"/>
     </contour>
     <contour>
-      <point x="560" y="215" type="curve" name="hr02" smooth="yes"/>
+      <point x="560" y="215" type="curve" smooth="yes" name="hr02"/>
       <point x="689" y="215"/>
       <point x="766" y="346"/>
-      <point x="766" y="561" type="curve" name="sh03" smooth="yes"/>
+      <point x="766" y="561" type="curve" smooth="yes" name="sh03"/>
       <point x="766" y="668"/>
       <point x="748" y="752"/>
       <point x="711" y="814" type="curve" smooth="yes"/>
       <point x="676" y="874"/>
       <point x="626" y="907"/>
-      <point x="561" y="907" type="curve" name="hr03" smooth="yes"/>
+      <point x="561" y="907" type="curve" smooth="yes" name="hr03"/>
       <point x="494" y="907"/>
       <point x="445" y="872"/>
       <point x="412" y="815" type="curve" smooth="yes"/>
@@ -49,7 +49,7 @@
       <point x="372" y="706" type="curve" smooth="yes"/>
       <point x="363" y="663"/>
       <point x="358" y="617"/>
-      <point x="358" y="561" type="curve" name="dh02" smooth="yes"/>
+      <point x="358" y="561" type="curve" smooth="yes" name="dh02"/>
       <point x="358" y="453"/>
       <point x="377" y="367"/>
       <point x="412" y="307" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0567.glif b/source/Hack-Bold.ufo/glyphs/uni0567.glif
index 3c56d8198..9d627a48c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0567.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0567.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0567" format="1">
+<glyph name="uni0567" format="2">
   <advance width="1233"/>
   <unicode hex="0567"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0568.glif b/source/Hack-Bold.ufo/glyphs/uni0568.glif
index 559b9846d..c6b1888ab 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0568.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0568.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0568" format="1">
+<glyph name="uni0568" format="2">
   <advance width="1233"/>
   <unicode hex="0568"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="440" y="952" type="line" name="iv01"/>
       <point x="481" y="1076"/>
       <point x="581" y="1147"/>
-      <point x="730" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="730" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="939" y="1147"/>
       <point x="1048" y="1010"/>
       <point x="1048" y="727" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="757" y="682" type="line" smooth="yes"/>
       <point x="757" y="841"/>
       <point x="714" y="909"/>
-      <point x="617" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="617" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="500" y="909"/>
       <point x="440" y="810"/>
-      <point x="440" y="641" type="curve" name="sh04" smooth="yes"/>
+      <point x="440" y="641" type="curve" smooth="yes" name="sh04"/>
       <point x="440" y="-201" type="line" name="sv02"/>
       <point x="1084" y="-201" type="line"/>
       <point x="1084" y="-426" type="line" name="hr01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0569.glif b/source/Hack-Bold.ufo/glyphs/uni0569.glif
index 2a85b8b20..908b0d1d5 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0569.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0569.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0569" format="1">
+<glyph name="uni0569" format="2">
   <advance width="1233"/>
   <unicode hex="0569"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="345" y="952" type="line" name="iv01"/>
       <point x="385" y="1076"/>
       <point x="544" y="1147"/>
-      <point x="688" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="688" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="791" y="1147"/>
       <point x="897" y="1113"/>
       <point x="977" y="1021" type="curve" smooth="yes"/>
@@ -24,31 +24,31 @@
       <point x="951" y="63" type="curve" smooth="yes"/>
       <point x="878" y="-5"/>
       <point x="791" y="-29"/>
-      <point x="703" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="703" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="518" y="-29"/>
       <point x="393" y="78"/>
-      <point x="393" y="255" type="curve" name="dh03" smooth="yes"/>
+      <point x="393" y="255" type="curve" smooth="yes" name="dh03"/>
       <point x="393" y="462"/>
       <point x="547" y="559"/>
-      <point x="706" y="559" type="curve" name="sv02" smooth="yes"/>
+      <point x="706" y="559" type="curve" smooth="yes" name="sv02"/>
       <point x="808" y="559" type="line" name="dh05"/>
       <point x="808" y="631"/>
       <point x="802" y="728"/>
       <point x="770" y="795" type="curve" smooth="yes"/>
       <point x="737" y="863"/>
       <point x="672" y="909"/>
-      <point x="579" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="579" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="457" y="909"/>
       <point x="345" y="811"/>
-      <point x="345" y="641" type="curve" name="sh02" smooth="yes"/>
+      <point x="345" y="641" type="curve" smooth="yes" name="sh02"/>
       <point x="345" y="-426" type="line" name="ab01"/>
       <point x="54" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="704" y="107" type="curve" name="dv02" smooth="yes"/>
+      <point x="704" y="107" type="curve" smooth="yes" name="dv02"/>
       <point x="801" y="107"/>
       <point x="808" y="179"/>
-      <point x="808" y="386" type="curve" name="sh03" smooth="yes"/>
+      <point x="808" y="386" type="curve" smooth="yes" name="sh03"/>
       <point x="808" y="416" type="line" name="sv03"/>
       <point x="706" y="416" type="line" smooth="yes"/>
       <point x="671" y="416"/>
@@ -56,10 +56,10 @@
       <point x="610" y="376" type="curve" smooth="yes"/>
       <point x="583" y="348"/>
       <point x="565" y="307"/>
-      <point x="565" y="254" type="curve" name="dh04" smooth="yes"/>
+      <point x="565" y="254" type="curve" smooth="yes" name="dh04"/>
       <point x="565" y="214"/>
       <point x="575" y="178"/>
-      <point x="598" y="151" type="curve" name="hr01" smooth="yes"/>
+      <point x="598" y="151" type="curve" smooth="yes" name="hr01"/>
       <point x="623" y="122"/>
       <point x="658" y="107"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni056A_.glif b/source/Hack-Bold.ufo/glyphs/uni056A_.glif
index d315eb920..cbeed1ece 100644
--- a/source/Hack-Bold.ufo/glyphs/uni056A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni056A_.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni056A" format="1">
+<glyph name="uni056A" format="2">
   <advance width="1233"/>
   <unicode hex="056A"/>
   <outline>
     <contour>
-      <point x="561" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="561" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="381" y="-29"/>
       <point x="260" y="41"/>
       <point x="180" y="149" type="curve" smooth="yes"/>
       <point x="97" y="261"/>
       <point x="65" y="410"/>
-      <point x="65" y="557" type="curve" name="sh01" smooth="yes"/>
+      <point x="65" y="557" type="curve" smooth="yes" name="sh01"/>
       <point x="65" y="710"/>
       <point x="100" y="849"/>
       <point x="180" y="953" type="curve" smooth="yes"/>
       <point x="260" y="1056"/>
       <point x="384" y="1120"/>
-      <point x="561" y="1120" type="curve" name="at02" smooth="yes"/>
+      <point x="561" y="1120" type="curve" smooth="yes" name="at02"/>
       <point x="766" y="1120" type="line" name="ah01"/>
       <point x="766" y="1556" type="line" name="at01"/>
       <point x="1058" y="1556" type="line"/>
@@ -35,15 +35,15 @@
       <point x="681" y="-29"/>
     </contour>
     <contour>
-      <point x="560" y="211" type="curve" name="dv01" smooth="yes"/>
+      <point x="560" y="211" type="curve" smooth="yes" name="dv01"/>
       <point x="715" y="211"/>
       <point x="766" y="357"/>
-      <point x="766" y="557" type="curve" name="sh04" smooth="yes"/>
+      <point x="766" y="557" type="curve" smooth="yes" name="sh04"/>
       <point x="766" y="895" type="line" name="sv02"/>
-      <point x="561" y="895" type="line" name="sv03" smooth="yes"/>
+      <point x="561" y="895" type="line" smooth="yes" name="sv03"/>
       <point x="408" y="895"/>
       <point x="358" y="767"/>
-      <point x="358" y="557" type="curve" name="sh05" smooth="yes"/>
+      <point x="358" y="557" type="curve" smooth="yes" name="sh05"/>
       <point x="358" y="453"/>
       <point x="370" y="366"/>
       <point x="402" y="306" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni056B_.glif b/source/Hack-Bold.ufo/glyphs/uni056B_.glif
index 571a361cc..7d94ac55f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni056B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni056B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni056B" format="1">
+<glyph name="uni056B" format="2">
   <advance width="1233"/>
   <unicode hex="056B"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="458" y="952" type="line" name="iv01"/>
       <point x="499" y="1076"/>
       <point x="599" y="1147"/>
-      <point x="748" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="748" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="957" y="1147"/>
       <point x="1066" y="1010"/>
       <point x="1066" y="727" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="775" y="682" type="line" smooth="yes"/>
       <point x="775" y="841"/>
       <point x="732" y="909"/>
-      <point x="635" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="635" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="518" y="909"/>
       <point x="458" y="810"/>
-      <point x="458" y="641" type="curve" name="sh03" smooth="yes"/>
+      <point x="458" y="641" type="curve" smooth="yes" name="sh03"/>
       <point x="458" y="-426" type="line" name="ab01"/>
       <point x="167" y="-426" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni056C_.glif b/source/Hack-Bold.ufo/glyphs/uni056C_.glif
index cb1505f03..4691a2dfc 100644
--- a/source/Hack-Bold.ufo/glyphs/uni056C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni056C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni056C" format="1">
+<glyph name="uni056C" format="2">
   <advance width="1233"/>
   <unicode hex="056C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni056D_.glif b/source/Hack-Bold.ufo/glyphs/uni056D_.glif
index 1fb6c89a0..ff84549e3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni056D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni056D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni056D" format="1">
+<glyph name="uni056D" format="2">
   <advance width="1233"/>
   <unicode hex="056D"/>
   <outline>
@@ -9,13 +9,13 @@
       <point x="316" y="1040" type="line" name="iv01"/>
       <point x="332" y="1073"/>
       <point x="362" y="1101"/>
-      <point x="390" y="1118" type="curve" name="at01" smooth="yes"/>
+      <point x="390" y="1118" type="curve" smooth="yes" name="at01"/>
       <point x="421" y="1137"/>
       <point x="458" y="1147"/>
-      <point x="499" y="1147" type="curve" name="at04" smooth="yes"/>
+      <point x="499" y="1147" type="curve" smooth="yes" name="at04"/>
       <point x="523" y="1147"/>
       <point x="561" y="1144"/>
-      <point x="597" y="1125" type="curve" name="at02" smooth="yes"/>
+      <point x="597" y="1125" type="curve" smooth="yes" name="at02"/>
       <point x="667" y="1087"/>
       <point x="731" y="988"/>
       <point x="734" y="719" type="curve" name="dh04"/>
@@ -25,13 +25,13 @@
       <point x="756" y="235" type="curve"/>
       <point x="771" y="200"/>
       <point x="794" y="192"/>
-      <point x="826" y="192" type="curve" name="sv02" smooth="yes"/>
+      <point x="826" y="192" type="curve" smooth="yes" name="sv02"/>
       <point x="855" y="192"/>
       <point x="879" y="198"/>
       <point x="894" y="233" type="curve"/>
       <point x="909" y="264"/>
       <point x="913" y="316"/>
-      <point x="913" y="401" type="curve" name="hr01" smooth="yes"/>
+      <point x="913" y="401" type="curve" smooth="yes" name="hr01"/>
       <point x="913" y="1120" type="line" name="at03"/>
       <point x="1153" y="1120" type="line"/>
       <point x="1153" y="0" type="line" name="dh05"/>
@@ -39,10 +39,10 @@
       <point x="940" y="116" type="line" name="ih01"/>
       <point x="903" y="21"/>
       <point x="830" y="-27"/>
-      <point x="731" y="-27" type="curve" name="hr02" smooth="yes"/>
+      <point x="731" y="-27" type="curve" smooth="yes" name="hr02"/>
       <point x="711" y="-27"/>
       <point x="675" y="-25"/>
-      <point x="636" y="-5" type="curve" name="ab02" smooth="yes"/>
+      <point x="636" y="-5" type="curve" smooth="yes" name="ab02"/>
       <point x="566" y="31"/>
       <point x="498" y="135"/>
       <point x="498" y="401" type="curve"/>
@@ -52,10 +52,10 @@
       <point x="477" y="886" type="curve" smooth="yes"/>
       <point x="462" y="917"/>
       <point x="440" y="928"/>
-      <point x="407" y="928" type="curve" name="sv01" smooth="yes"/>
+      <point x="407" y="928" type="curve" smooth="yes" name="sv01"/>
       <point x="341" y="928"/>
       <point x="316" y="889"/>
-      <point x="316" y="719" type="curve" name="sh01" smooth="yes"/>
+      <point x="316" y="719" type="curve" smooth="yes" name="sh01"/>
       <point x="316" y="-426" type="line" name="ab01"/>
       <point x="79" y="-426" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni056E_.glif b/source/Hack-Bold.ufo/glyphs/uni056E_.glif
index cb5e53a5a..ea3408a4c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni056E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni056E_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni056E" format="1">
+<glyph name="uni056E" format="2">
   <advance width="1233"/>
   <unicode hex="056E"/>
   <outline>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="448" y="-29"/>
       <point x="320" y="31"/>
       <point x="232" y="135" type="curve" smooth="yes"/>
       <point x="143" y="240"/>
       <point x="98" y="383"/>
-      <point x="98" y="558" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="558" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="799"/>
       <point x="186" y="990"/>
       <point x="390" y="1074" type="curve" name="sh03"/>
@@ -24,7 +24,7 @@
       <point x="1033" y="895" type="line" name="ih01"/>
       <point x="1101" y="784"/>
       <point x="1135" y="681"/>
-      <point x="1135" y="546" type="curve" name="sh04" smooth="yes"/>
+      <point x="1135" y="546" type="curve" smooth="yes" name="sh04"/>
       <point x="1135" y="385"/>
       <point x="1088" y="238"/>
       <point x="1001" y="135" type="curve" smooth="yes"/>
@@ -32,21 +32,21 @@
       <point x="785" y="-29"/>
     </contour>
     <contour>
-      <point x="614" y="211" type="curve" name="dv01" smooth="yes"/>
+      <point x="614" y="211" type="curve" smooth="yes" name="dv01"/>
       <point x="694" y="211"/>
       <point x="751" y="248"/>
       <point x="788" y="312" type="curve" smooth="yes"/>
       <point x="824" y="375"/>
       <point x="842" y="463"/>
-      <point x="842" y="558" type="curve" name="ah01" smooth="yes"/>
+      <point x="842" y="558" type="curve" smooth="yes" name="ah01"/>
       <point x="842" y="726"/>
       <point x="786" y="809"/>
       <point x="681" y="879" type="curve" smooth="yes"/>
       <point x="657" y="895" type="line" name="sv02"/>
-      <point x="615" y="895" type="line" name="sv03" smooth="yes"/>
+      <point x="615" y="895" type="line" smooth="yes" name="sv03"/>
       <point x="470" y="895"/>
       <point x="391" y="777"/>
-      <point x="391" y="557" type="curve" name="sh02" smooth="yes"/>
+      <point x="391" y="557" type="curve" smooth="yes" name="sh02"/>
       <point x="391" y="453"/>
       <point x="409" y="366"/>
       <point x="446" y="306" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni056F_.glif b/source/Hack-Bold.ufo/glyphs/uni056F_.glif
index 94e583453..9a7e576a3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni056F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni056F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni056F" format="1">
+<glyph name="uni056F" format="2">
   <advance width="1233"/>
   <unicode hex="056F"/>
   <outline>
@@ -7,19 +7,19 @@
       <point x="774" y="166" type="line" name="hr00"/>
       <point x="733" y="42"/>
       <point x="636" y="-29"/>
-      <point x="485" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="485" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="274" y="-29"/>
       <point x="166" y="110"/>
-      <point x="166" y="391" type="curve" name="sh01" smooth="yes"/>
+      <point x="166" y="391" type="curve" smooth="yes" name="sh01"/>
       <point x="166" y="1556" type="line" name="at01"/>
       <point x="459" y="1556" type="line"/>
-      <point x="459" y="436" type="line" name="sh02" smooth="yes"/>
+      <point x="459" y="436" type="line" smooth="yes" name="sh02"/>
       <point x="459" y="279"/>
       <point x="500" y="211"/>
-      <point x="599" y="211" type="curve" name="dv02" smooth="yes"/>
+      <point x="599" y="211" type="curve" smooth="yes" name="dv02"/>
       <point x="716" y="211"/>
       <point x="774" y="308"/>
-      <point x="774" y="477" type="curve" name="sh03" smooth="yes"/>
+      <point x="774" y="477" type="curve" smooth="yes" name="sh03"/>
       <point x="774" y="1120" type="line" name="at02"/>
       <point x="1067" y="1120" type="line"/>
       <point x="1067" y="-426" type="line" name="sh04"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0570.glif b/source/Hack-Bold.ufo/glyphs/uni0570.glif
index eb8b2028d..a2520fda6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0570.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0570.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0570" format="1">
+<glyph name="uni0570" format="2">
   <advance width="1233"/>
   <unicode hex="0570"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="459" y="952" type="line" name="iv01"/>
       <point x="502" y="1081"/>
       <point x="606" y="1147"/>
-      <point x="749" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="749" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="957" y="1147"/>
       <point x="1067" y="1008"/>
       <point x="1067" y="727" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="776" y="682" type="line" smooth="yes"/>
       <point x="776" y="839"/>
       <point x="734" y="907"/>
-      <point x="635" y="907" type="curve" name="sv01" smooth="yes"/>
+      <point x="635" y="907" type="curve" smooth="yes" name="sv01"/>
       <point x="518" y="907"/>
       <point x="459" y="810"/>
-      <point x="459" y="641" type="curve" name="sh03" smooth="yes"/>
+      <point x="459" y="641" type="curve" smooth="yes" name="sh03"/>
       <point x="459" y="0" type="line" name="ab01"/>
       <point x="168" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0571.glif b/source/Hack-Bold.ufo/glyphs/uni0571.glif
index 84c2c500e..aebd1eb15 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0571.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0571.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0571" format="1">
+<glyph name="uni0571" format="2">
   <advance width="1233"/>
   <unicode hex="0571"/>
   <outline>
     <contour>
-      <point x="497" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="497" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="245" y="-29"/>
       <point x="153" y="173"/>
-      <point x="153" y="396" type="curve" name="dh01" smooth="yes"/>
+      <point x="153" y="396" type="curve" smooth="yes" name="dh01"/>
       <point x="153" y="524"/>
       <point x="183" y="644"/>
       <point x="243" y="768" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="496" y="1120" type="curve" name="ih02"/>
       <point x="335" y="1123"/>
       <point x="271" y="1228"/>
-      <point x="271" y="1338" type="curve" name="ih01" smooth="yes"/>
+      <point x="271" y="1338" type="curve" smooth="yes" name="ih01"/>
       <point x="271" y="1386"/>
       <point x="283" y="1434"/>
       <point x="311" y="1477" type="curve" smooth="yes"/>
@@ -25,10 +25,10 @@
       <point x="594" y="1471" type="line" smooth="yes"/>
       <point x="570" y="1435"/>
       <point x="561" y="1401"/>
-      <point x="561" y="1373" type="curve" name="sh01" smooth="yes"/>
+      <point x="561" y="1373" type="curve" smooth="yes" name="sh01"/>
       <point x="561" y="1314"/>
       <point x="600" y="1274"/>
-      <point x="657" y="1274" type="curve" name="hr01" smooth="yes"/>
+      <point x="657" y="1274" type="curve" smooth="yes" name="hr01"/>
       <point x="666" y="1274" type="line" smooth="yes"/>
       <point x="670" y="1274"/>
       <point x="673" y="1274"/>
@@ -56,23 +56,23 @@
       <point x="574" y="-29"/>
     </contour>
     <contour>
-      <point x="615" y="211" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="211" type="curve" smooth="yes" name="dv02"/>
       <point x="682" y="211"/>
       <point x="721" y="248"/>
       <point x="748" y="297" type="curve" smooth="yes"/>
       <point x="775" y="348"/>
       <point x="786" y="412"/>
-      <point x="786" y="472" type="curve" name="sh02" smooth="yes"/>
+      <point x="786" y="472" type="curve" smooth="yes" name="sh02"/>
       <point x="786" y="558" type="line" smooth="yes"/>
       <point x="786" y="695"/>
       <point x="767" y="855"/>
       <point x="600" y="924" type="curve"/>
       <point x="496" y="787"/>
       <point x="444" y="609"/>
-      <point x="444" y="449" type="curve" name="dh02" smooth="yes"/>
+      <point x="444" y="449" type="curve" smooth="yes" name="dh02"/>
       <point x="444" y="378"/>
       <point x="454" y="323"/>
-      <point x="485" y="279" type="curve" name="hr02" smooth="yes"/>
+      <point x="485" y="279" type="curve" smooth="yes" name="hr02"/>
       <point x="517" y="234"/>
       <point x="560" y="211"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0572.glif b/source/Hack-Bold.ufo/glyphs/uni0572.glif
index dbc10425a..ec7b4b3cf 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0572.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0572.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0572" format="1">
+<glyph name="uni0572" format="2">
   <advance width="1233"/>
   <unicode hex="0572"/>
   <outline>
     <contour>
-      <point x="711" y="682" type="line" name="dh02" smooth="yes"/>
+      <point x="711" y="682" type="line" smooth="yes" name="dh02"/>
       <point x="711" y="841"/>
       <point x="668" y="909"/>
-      <point x="571" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="571" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="454" y="909"/>
       <point x="394" y="810"/>
       <point x="394" y="641" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="394" y="952" type="line" name="hr02"/>
       <point x="435" y="1076"/>
       <point x="535" y="1147"/>
-      <point x="684" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="684" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="893" y="1147"/>
       <point x="1002" y="1010"/>
-      <point x="1002" y="727" type="curve" name="dh03" smooth="yes"/>
+      <point x="1002" y="727" type="curve" smooth="yes" name="dh03"/>
       <point x="1002" y="-201" type="line" name="sv02"/>
       <point x="1130" y="-201" type="line" name="sh01"/>
       <point x="1130" y="-426" type="line" name="ab01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0573.glif b/source/Hack-Bold.ufo/glyphs/uni0573.glif
index ca027e842..bb680e2f7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0573.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0573.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0573" format="1">
+<glyph name="uni0573" format="2">
   <advance width="1233"/>
   <unicode hex="0573"/>
   <outline>
     <contour>
-      <point x="516" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="516" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="265" y="-29"/>
       <point x="168" y="185"/>
       <point x="168" y="446" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="343" y="1120" type="line"/>
       <point x="479" y="1355"/>
       <point x="677" y="1517"/>
-      <point x="919" y="1517" type="curve" name="at03" smooth="yes"/>
+      <point x="919" y="1517" type="curve" smooth="yes" name="at03"/>
       <point x="955" y="1517"/>
       <point x="1016" y="1512"/>
       <point x="1048" y="1491" type="curve"/>
@@ -26,7 +26,7 @@
       <point x="964" y="1281" type="curve" smooth="yes"/>
       <point x="943" y="1286"/>
       <point x="924" y="1287"/>
-      <point x="909" y="1287" type="curve" name="sv03" smooth="yes"/>
+      <point x="909" y="1287" type="curve" smooth="yes" name="sv03"/>
       <point x="846" y="1287"/>
       <point x="800" y="1269"/>
       <point x="755" y="1237" type="curve" smooth="yes"/>
@@ -43,10 +43,10 @@
       <point x="657" y="-29"/>
     </contour>
     <contour>
-      <point x="620" y="211" type="curve" name="sv01" smooth="yes"/>
+      <point x="620" y="211" type="curve" smooth="yes" name="sv01"/>
       <point x="739" y="211"/>
       <point x="801" y="308"/>
-      <point x="801" y="477" type="curve" name="sh01" smooth="yes"/>
+      <point x="801" y="477" type="curve" smooth="yes" name="sh01"/>
       <point x="801" y="637" type="line" smooth="yes"/>
       <point x="801" y="684"/>
       <point x="778" y="745"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0574.glif b/source/Hack-Bold.ufo/glyphs/uni0574.glif
index d3ef9bcf4..95cacf19f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0574.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0574.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0574" format="1">
+<glyph name="uni0574" format="2">
   <advance width="1233"/>
   <unicode hex="0574"/>
   <outline>
     <contour>
-      <point x="485" y="-29" type="curve" name="sv01" smooth="yes"/>
+      <point x="485" y="-29" type="curve" smooth="yes" name="sv01"/>
       <point x="274" y="-29"/>
       <point x="166" y="110"/>
-      <point x="166" y="391" type="curve" name="dh01" smooth="yes"/>
+      <point x="166" y="391" type="curve" smooth="yes" name="dh01"/>
       <point x="166" y="1120" type="line" name="hr01"/>
       <point x="459" y="1120" type="line"/>
-      <point x="459" y="436" type="line" name="dh02" smooth="yes"/>
+      <point x="459" y="436" type="line" smooth="yes" name="dh02"/>
       <point x="459" y="279"/>
       <point x="500" y="211"/>
-      <point x="599" y="211" type="curve" name="hr02" smooth="yes"/>
+      <point x="599" y="211" type="curve" smooth="yes" name="hr02"/>
       <point x="716" y="211"/>
       <point x="774" y="308"/>
-      <point x="774" y="477" type="curve" name="sh01" smooth="yes"/>
+      <point x="774" y="477" type="curve" smooth="yes" name="sh01"/>
       <point x="774" y="1556" type="line" name="at01"/>
       <point x="1195" y="1556" type="line"/>
       <point x="1195" y="1331" type="line" name="sh02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0575.glif b/source/Hack-Bold.ufo/glyphs/uni0575.glif
index cfb73090b..9f4931958 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0575.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0575.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0575" format="1">
+<glyph name="uni0575" format="2">
   <advance width="1233"/>
   <unicode hex="0575"/>
   <outline>
@@ -11,13 +11,13 @@
       <point x="637" y="-144" type="curve" smooth="yes"/>
       <point x="665" y="-105"/>
       <point x="677" y="-45"/>
-      <point x="677" y="43" type="curve" name="dh01" smooth="yes"/>
+      <point x="677" y="43" type="curve" smooth="yes" name="dh01"/>
       <point x="677" y="1120" type="line" name="at01"/>
       <point x="970" y="1120" type="line"/>
-      <point x="970" y="43" type="line" name="dh02" smooth="yes"/>
+      <point x="970" y="43" type="line" smooth="yes" name="dh02"/>
       <point x="970" y="-294"/>
       <point x="858" y="-424"/>
-      <point x="579" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="579" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="263" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0576.glif b/source/Hack-Bold.ufo/glyphs/uni0576.glif
index 8f73948c5..249d45b29 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0576.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0576.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0576" format="1">
+<glyph name="uni0576" format="2">
   <advance width="1233"/>
   <unicode hex="0576"/>
   <outline>
     <contour>
-      <point x="549" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="549" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="340" y="-27"/>
       <point x="231" y="110"/>
-      <point x="231" y="393" type="curve" name="sh01" smooth="yes"/>
+      <point x="231" y="393" type="curve" smooth="yes" name="sh01"/>
       <point x="231" y="1331" type="line" name="hr01"/>
       <point x="103" y="1331" type="line"/>
       <point x="103" y="1556" type="line" name="dh01"/>
@@ -15,10 +15,10 @@
       <point x="522" y="438" type="line" smooth="yes"/>
       <point x="522" y="279"/>
       <point x="565" y="211"/>
-      <point x="662" y="211" type="curve" name="sv01" smooth="yes"/>
+      <point x="662" y="211" type="curve" smooth="yes" name="sv01"/>
       <point x="779" y="211"/>
       <point x="839" y="310"/>
-      <point x="839" y="479" type="curve" name="sh02" smooth="yes"/>
+      <point x="839" y="479" type="curve" smooth="yes" name="sh02"/>
       <point x="839" y="1120" type="line" name="at01"/>
       <point x="1130" y="1120" type="line"/>
       <point x="1130" y="0" type="line" name="dh03"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0577.glif b/source/Hack-Bold.ufo/glyphs/uni0577.glif
index 5e50851dd..12254245c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0577.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0577.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0577" format="1">
+<glyph name="uni0577" format="2">
   <advance width="1233"/>
   <unicode hex="0577"/>
   <outline>
     <contour>
-      <point x="386" y="-426" type="line" name="hr00" smooth="yes"/>
+      <point x="386" y="-426" type="line" smooth="yes" name="hr00"/>
       <point x="322" y="-426"/>
       <point x="268" y="-402"/>
       <point x="229" y="-363" type="curve" smooth="yes"/>
@@ -22,20 +22,20 @@
       <point x="707" y="500" type="curve" smooth="yes"/>
       <point x="759" y="577"/>
       <point x="781" y="647"/>
-      <point x="781" y="715" type="curve" name="dh01" smooth="yes"/>
+      <point x="781" y="715" type="curve" smooth="yes" name="dh01"/>
       <point x="781" y="837"/>
       <point x="703" y="917"/>
-      <point x="590" y="917" type="curve" name="sv01" smooth="yes"/>
+      <point x="590" y="917" type="curve" smooth="yes" name="sv01"/>
       <point x="492" y="917"/>
       <point x="397" y="846"/>
       <point x="367" y="752" type="curve" name="iv01"/>
       <point x="158" y="906" type="line"/>
       <point x="240" y="1058"/>
       <point x="420" y="1145"/>
-      <point x="604" y="1145" type="curve" name="at01" smooth="yes"/>
+      <point x="604" y="1145" type="curve" smooth="yes" name="at01"/>
       <point x="880" y="1145"/>
       <point x="1075" y="982"/>
-      <point x="1075" y="717" type="curve" name="dh02" smooth="yes"/>
+      <point x="1075" y="717" type="curve" smooth="yes" name="dh02"/>
       <point x="1075" y="591"/>
       <point x="1034" y="482"/>
       <point x="906" y="330" type="curve" smooth="yes"/>
@@ -50,7 +50,7 @@
       <point x="463" y="-173" type="curve" smooth="yes"/>
       <point x="463" y="-192"/>
       <point x="479" y="-201"/>
-      <point x="500" y="-201" type="curve" name="sv02" smooth="yes"/>
+      <point x="500" y="-201" type="curve" smooth="yes" name="sv02"/>
       <point x="1030" y="-201" type="line" name="sv03"/>
       <point x="1030" y="-426" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0578.glif b/source/Hack-Bold.ufo/glyphs/uni0578.glif
index 8c594a941..6d976b3dd 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0578.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0578.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0578" format="1">
+<glyph name="uni0578" format="2">
   <advance width="1233"/>
   <unicode hex="0578"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="459" y="952" type="line" name="sh02"/>
       <point x="502" y="1081"/>
       <point x="606" y="1147"/>
-      <point x="749" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="749" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="957" y="1147"/>
       <point x="1067" y="1008"/>
       <point x="1067" y="727" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="776" y="682" type="line" smooth="yes"/>
       <point x="776" y="839"/>
       <point x="733" y="909"/>
-      <point x="636" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="636" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="519" y="909"/>
       <point x="459" y="810"/>
-      <point x="459" y="641" type="curve" name="sh04" smooth="yes"/>
+      <point x="459" y="641" type="curve" smooth="yes" name="sh04"/>
       <point x="459" y="0" type="line" name="hr01"/>
       <point x="168" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0579.glif b/source/Hack-Bold.ufo/glyphs/uni0579.glif
index 4edb2a4d5..cce60f519 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0579.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0579.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0579" format="1">
+<glyph name="uni0579" format="2">
   <advance width="1233"/>
   <unicode hex="0579"/>
   <outline>
     <contour>
-      <point x="431" y="-426" type="line" name="ab01" smooth="yes"/>
+      <point x="431" y="-426" type="line" smooth="yes" name="ab01"/>
       <point x="375" y="-426"/>
       <point x="324" y="-405"/>
       <point x="287" y="-365" type="curve" smooth="yes"/>
       <point x="250" y="-326"/>
       <point x="226" y="-270"/>
-      <point x="226" y="-198" type="curve" name="dh01" smooth="yes"/>
+      <point x="226" y="-198" type="curve" smooth="yes" name="dh01"/>
       <point x="226" y="-59"/>
       <point x="303" y="129"/>
       <point x="414" y="308" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="413" y="624" type="curve" smooth="yes"/>
       <point x="365" y="671"/>
       <point x="334" y="733"/>
-      <point x="334" y="813" type="curve" name="ih01" smooth="yes"/>
+      <point x="334" y="813" type="curve" smooth="yes" name="ih01"/>
       <point x="334" y="892"/>
       <point x="362" y="982"/>
       <point x="442" y="1063" type="curve" smooth="yes"/>
@@ -31,7 +31,7 @@
       <point x="684" y="950" type="line" smooth="yes"/>
       <point x="628" y="897"/>
       <point x="602" y="853"/>
-      <point x="602" y="809" type="curve" name="sh01" smooth="yes"/>
+      <point x="602" y="809" type="curve" smooth="yes" name="sh01"/>
       <point x="602" y="754"/>
       <point x="644" y="703"/>
       <point x="723" y="703" type="curve" smooth="yes"/>
@@ -47,10 +47,10 @@
       <point x="570" y="75" type="curve" smooth="yes"/>
       <point x="529" y="-5"/>
       <point x="506" y="-75"/>
-      <point x="506" y="-131" type="curve" name="dh02" smooth="yes"/>
+      <point x="506" y="-131" type="curve" smooth="yes" name="dh02"/>
       <point x="506" y="-180"/>
       <point x="524" y="-201"/>
-      <point x="557" y="-201" type="curve" name="hr02" smooth="yes"/>
+      <point x="557" y="-201" type="curve" smooth="yes" name="hr02"/>
       <point x="1007" y="-201" type="line" name="sv01"/>
       <point x="1007" y="-426" type="line" name="ab02"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni057A_.glif b/source/Hack-Bold.ufo/glyphs/uni057A_.glif
index bd842537f..09b81f1fc 100644
--- a/source/Hack-Bold.ufo/glyphs/uni057A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni057A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni057A" format="1">
+<glyph name="uni057A" format="2">
   <advance width="1233"/>
   <unicode hex="057A"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="913" y="85" type="line" name="hr00"/>
       <point x="877" y="13"/>
       <point x="810" y="-27"/>
-      <point x="738" y="-27" type="curve" name="sh04" smooth="yes"/>
+      <point x="738" y="-27" type="curve" smooth="yes" name="sh04"/>
       <point x="693" y="-27"/>
       <point x="649" y="-11"/>
       <point x="614" y="14" type="curve" smooth="yes"/>
@@ -16,43 +16,43 @@
       <point x="545" y="112" type="curve" name="ih01"/>
       <point x="501" y="16"/>
       <point x="440" y="-27"/>
-      <point x="333" y="-27" type="curve" name="sh06" smooth="yes"/>
+      <point x="333" y="-27" type="curve" smooth="yes" name="sh06"/>
       <point x="236" y="-27"/>
       <point x="171" y="9"/>
       <point x="136" y="73" type="curve" smooth="yes"/>
       <point x="101" y="136"/>
       <point x="80" y="261"/>
-      <point x="80" y="489" type="curve" name="sh01" smooth="yes"/>
+      <point x="80" y="489" type="curve" smooth="yes" name="sh01"/>
       <point x="80" y="1120" type="line" name="at01"/>
       <point x="320" y="1120" type="line"/>
-      <point x="320" y="401" type="line" name="sh05" smooth="yes"/>
+      <point x="320" y="401" type="line" smooth="yes" name="sh05"/>
       <point x="320" y="316"/>
       <point x="325" y="264"/>
       <point x="340" y="233" type="curve"/>
       <point x="355" y="198"/>
       <point x="378" y="192"/>
-      <point x="407" y="192" type="curve" name="sv01" smooth="yes"/>
+      <point x="407" y="192" type="curve" smooth="yes" name="sv01"/>
       <point x="439" y="192"/>
       <point x="463" y="200"/>
       <point x="478" y="235" type="curve" smooth="yes"/>
       <point x="491" y="264"/>
       <point x="498" y="320"/>
-      <point x="498" y="401" type="curve" name="sh02" smooth="yes"/>
+      <point x="498" y="401" type="curve" smooth="yes" name="sh02"/>
       <point x="498" y="1120" type="line" name="at02"/>
       <point x="735" y="1120" type="line"/>
-      <point x="735" y="401" type="line" name="sh03" smooth="yes"/>
+      <point x="735" y="401" type="line" smooth="yes" name="sh03"/>
       <point x="735" y="317"/>
       <point x="741" y="266"/>
       <point x="756" y="235" type="curve"/>
       <point x="771" y="200"/>
       <point x="794" y="192"/>
-      <point x="826" y="192" type="curve" name="sv02" smooth="yes"/>
+      <point x="826" y="192" type="curve" smooth="yes" name="sv02"/>
       <point x="855" y="192"/>
       <point x="879" y="198"/>
       <point x="894" y="233" type="curve"/>
       <point x="909" y="264"/>
       <point x="913" y="316"/>
-      <point x="913" y="401" type="curve" name="sh08" smooth="yes"/>
+      <point x="913" y="401" type="curve" smooth="yes" name="sh08"/>
       <point x="913" y="1120" type="line" name="at03"/>
       <point x="1153" y="1120" type="line"/>
       <point x="1153" y="-426" type="line" name="sh09"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni057B_.glif b/source/Hack-Bold.ufo/glyphs/uni057B_.glif
index 9d3d7fce9..624a06020 100644
--- a/source/Hack-Bold.ufo/glyphs/uni057B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni057B_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni057B" format="1">
+<glyph name="uni057B" format="2">
   <advance width="1233"/>
   <unicode hex="057B"/>
   <outline>
     <contour>
-      <point x="406" y="-426" type="line" name="hr00" smooth="yes"/>
+      <point x="406" y="-426" type="line" smooth="yes" name="hr00"/>
       <point x="276" y="-426"/>
       <point x="187" y="-325"/>
       <point x="187" y="-223" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="354" y="102" type="curve" smooth="yes"/>
       <point x="379" y="129"/>
       <point x="416" y="169"/>
-      <point x="416" y="243" type="curve" name="sh03" smooth="yes"/>
+      <point x="416" y="243" type="curve" smooth="yes" name="sh03"/>
       <point x="416" y="312"/>
       <point x="381" y="359"/>
       <point x="344" y="399" type="curve" smooth="yes"/>
@@ -28,19 +28,19 @@
       <point x="159" y="623" type="curve" smooth="yes"/>
       <point x="146" y="658"/>
       <point x="138" y="694"/>
-      <point x="138" y="739" type="curve" name="sh01" smooth="yes"/>
+      <point x="138" y="739" type="curve" smooth="yes" name="sh01"/>
       <point x="138" y="855"/>
       <point x="190" y="954"/>
       <point x="281" y="1029" type="curve" smooth="yes"/>
       <point x="369" y="1101"/>
       <point x="486" y="1145"/>
-      <point x="627" y="1145" type="curve" name="at01" smooth="yes"/>
+      <point x="627" y="1145" type="curve" smooth="yes" name="at01"/>
       <point x="747" y="1145"/>
       <point x="868" y="1113"/>
       <point x="960" y="1037" type="curve" smooth="yes"/>
       <point x="1048" y="964"/>
       <point x="1095" y="862"/>
-      <point x="1095" y="726" type="curve" name="sh04" smooth="yes"/>
+      <point x="1095" y="726" type="curve" smooth="yes" name="sh04"/>
       <point x="1095" y="606"/>
       <point x="1058" y="505"/>
       <point x="983" y="400" type="curve" smooth="yes"/>
@@ -55,7 +55,7 @@
       <point x="482" y="-174" type="curve" smooth="yes"/>
       <point x="482" y="-192"/>
       <point x="495" y="-201"/>
-      <point x="520" y="-201" type="curve" name="sv01" smooth="yes"/>
+      <point x="520" y="-201" type="curve" smooth="yes" name="sv01"/>
       <point x="1050" y="-201" type="line"/>
       <point x="1050" y="-426" type="line"/>
     </contour>
@@ -63,19 +63,19 @@
       <point x="562" y="312" type="curve" name="ih01"/>
       <point x="772" y="530"/>
       <point x="801" y="611"/>
-      <point x="801" y="708" type="curve" name="ah01" smooth="yes"/>
+      <point x="801" y="708" type="curve" smooth="yes" name="ah01"/>
       <point x="801" y="775"/>
       <point x="785" y="821"/>
       <point x="754" y="856" type="curve" smooth="yes"/>
       <point x="722" y="892"/>
       <point x="670" y="917"/>
-      <point x="617" y="917" type="curve" name="sv02" smooth="yes"/>
+      <point x="617" y="917" type="curve" smooth="yes" name="sv02"/>
       <point x="566" y="917"/>
       <point x="515" y="894"/>
       <point x="479" y="866" type="curve" smooth="yes"/>
       <point x="440" y="835"/>
       <point x="410" y="793"/>
-      <point x="410" y="737" type="curve" name="sh02" smooth="yes"/>
+      <point x="410" y="737" type="curve" smooth="yes" name="sh02"/>
       <point x="410" y="694"/>
       <point x="428" y="651"/>
       <point x="455" y="615" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni057C_.glif b/source/Hack-Bold.ufo/glyphs/uni057C_.glif
index 58c21df48..28818ea09 100644
--- a/source/Hack-Bold.ufo/glyphs/uni057C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni057C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni057C" format="1">
+<glyph name="uni057C" format="2">
   <advance width="1233"/>
   <unicode hex="057C"/>
   <outline>
@@ -12,10 +12,10 @@
       <point x="510" y="1092" type="curve" smooth="yes"/>
       <point x="558" y="1127"/>
       <point x="621" y="1147"/>
-      <point x="697" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="697" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="939" y="1147"/>
       <point x="1051" y="948"/>
-      <point x="1051" y="723" type="curve" name="sh03" smooth="yes"/>
+      <point x="1051" y="723" type="curve" smooth="yes" name="sh03"/>
       <point x="1051" y="620"/>
       <point x="1029" y="524"/>
       <point x="994" y="440" type="curve" smooth="yes"/>
@@ -31,16 +31,16 @@
       <point x="723" y="379" type="curve" smooth="yes"/>
       <point x="748" y="452"/>
       <point x="760" y="536"/>
-      <point x="760" y="621" type="curve" name="ah01" smooth="yes"/>
+      <point x="760" y="621" type="curve" smooth="yes" name="ah01"/>
       <point x="760" y="704"/>
       <point x="749" y="772"/>
       <point x="721" y="824" type="curve" smooth="yes"/>
       <point x="692" y="877"/>
       <point x="645" y="909"/>
-      <point x="581" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="581" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="459" y="909"/>
       <point x="408" y="787"/>
-      <point x="408" y="645" type="curve" name="sh04" smooth="yes"/>
+      <point x="408" y="645" type="curve" smooth="yes" name="sh04"/>
       <point x="408" y="0" type="line" name="hr01"/>
       <point x="117" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni057D_.glif b/source/Hack-Bold.ufo/glyphs/uni057D_.glif
index 799ce0d85..53627f87c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni057D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni057D_.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni057D" format="1">
+<glyph name="uni057D" format="2">
   <advance width="1233"/>
   <unicode hex="057D"/>
   <outline>
     <contour>
-      <point x="486" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="486" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="277" y="-29"/>
       <point x="166" y="112"/>
-      <point x="166" y="391" type="curve" name="sh01" smooth="yes"/>
+      <point x="166" y="391" type="curve" smooth="yes" name="sh01"/>
       <point x="166" y="1120" type="line" name="hr01"/>
       <point x="459" y="1120" type="line"/>
-      <point x="459" y="436" type="line" name="sh02" smooth="yes"/>
+      <point x="459" y="436" type="line" smooth="yes" name="sh02"/>
       <point x="459" y="280"/>
       <point x="500" y="211"/>
-      <point x="599" y="211" type="curve" name="sv01" smooth="yes"/>
+      <point x="599" y="211" type="curve" smooth="yes" name="sv01"/>
       <point x="716" y="211"/>
       <point x="774" y="308"/>
-      <point x="774" y="477" type="curve" name="sh03" smooth="yes"/>
+      <point x="774" y="477" type="curve" smooth="yes" name="sh03"/>
       <point x="774" y="1120" type="line" name="at01"/>
       <point x="1067" y="1120" type="line"/>
       <point x="1067" y="0" type="line" name="sh04"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni057E_.glif b/source/Hack-Bold.ufo/glyphs/uni057E_.glif
index 9169ee384..bacda235a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni057E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni057E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni057E" format="1">
+<glyph name="uni057E" format="2">
   <advance width="1233"/>
   <unicode hex="057E"/>
   <outline>
@@ -7,19 +7,19 @@
       <point x="705" y="166" type="line" name="iv01"/>
       <point x="664" y="42"/>
       <point x="567" y="-29"/>
-      <point x="416" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="416" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="205" y="-29"/>
       <point x="97" y="110"/>
-      <point x="97" y="391" type="curve" name="dh01" smooth="yes"/>
+      <point x="97" y="391" type="curve" smooth="yes" name="dh01"/>
       <point x="97" y="1120" type="line" name="hr01"/>
       <point x="390" y="1120" type="line"/>
-      <point x="390" y="436" type="line" name="dh02" smooth="yes"/>
+      <point x="390" y="436" type="line" smooth="yes" name="dh02"/>
       <point x="390" y="279"/>
       <point x="431" y="211"/>
-      <point x="530" y="211" type="curve" name="dv02" smooth="yes"/>
+      <point x="530" y="211" type="curve" smooth="yes" name="dv02"/>
       <point x="647" y="211"/>
       <point x="705" y="308"/>
-      <point x="705" y="477" type="curve" name="sh01" smooth="yes"/>
+      <point x="705" y="477" type="curve" smooth="yes" name="sh01"/>
       <point x="705" y="1556" type="line" name="at01"/>
       <point x="998" y="1556" type="line"/>
       <point x="998" y="-201" type="line" name="dh04"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni057F_.glif b/source/Hack-Bold.ufo/glyphs/uni057F_.glif
index 8a9c50870..98e3463df 100644
--- a/source/Hack-Bold.ufo/glyphs/uni057F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni057F_.glif
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni057F" format="1">
+<glyph name="uni057F" format="2">
   <advance width="1233"/>
   <unicode hex="057F"/>
   <outline>
     <contour>
-      <point x="314" y="-27" type="curve" name="sh03" smooth="yes"/>
+      <point x="314" y="-27" type="curve" smooth="yes" name="sh03"/>
       <point x="149" y="-27"/>
       <point x="81" y="117"/>
-      <point x="81" y="401" type="curve" name="sh01" smooth="yes"/>
+      <point x="81" y="401" type="curve" smooth="yes" name="sh01"/>
       <point x="81" y="1120" type="line" name="hr01"/>
       <point x="318" y="1120" type="line"/>
-      <point x="318" y="401" type="line" name="sh02" smooth="yes"/>
+      <point x="318" y="401" type="line" smooth="yes" name="sh02"/>
       <point x="318" y="317"/>
       <point x="324" y="266"/>
       <point x="339" y="235" type="curve" smooth="yes"/>
       <point x="354" y="203"/>
       <point x="375" y="192"/>
-      <point x="408" y="192" type="curve" name="sv01" smooth="yes"/>
+      <point x="408" y="192" type="curve" smooth="yes" name="sv01"/>
       <point x="439" y="192"/>
       <point x="460" y="201"/>
       <point x="475" y="229" type="curve" smooth="yes"/>
       <point x="488" y="256"/>
       <point x="496" y="304"/>
-      <point x="496" y="376" type="curve" name="sh04" smooth="yes"/>
+      <point x="496" y="376" type="curve" smooth="yes" name="sh04"/>
       <point x="496" y="1120" type="line" name="at01"/>
       <point x="709" y="1120" type="line"/>
       <point x="709" y="1004" type="line" name="ih01"/>
       <point x="742" y="1091"/>
       <point x="813" y="1147"/>
-      <point x="917" y="1147" type="curve" name="sh06" smooth="yes"/>
+      <point x="917" y="1147" type="curve" smooth="yes" name="sh06"/>
       <point x="1081" y="1147"/>
       <point x="1151" y="1003"/>
       <point x="1151" y="719" type="curve" smooth="yes"/>
@@ -40,13 +40,13 @@
       <point x="894" y="886" type="curve" smooth="yes"/>
       <point x="879" y="917"/>
       <point x="857" y="928"/>
-      <point x="824" y="928" type="curve" name="sv02" smooth="yes"/>
+      <point x="824" y="928" type="curve" smooth="yes" name="sv02"/>
       <point x="789" y="928"/>
       <point x="770" y="916"/>
       <point x="758" y="892" type="curve" smooth="yes"/>
       <point x="743" y="864"/>
       <point x="736" y="810"/>
-      <point x="736" y="743" type="curve" name="sh07" smooth="yes"/>
+      <point x="736" y="743" type="curve" smooth="yes" name="sh07"/>
       <point x="736" y="0" type="line" name="ab01"/>
       <point x="523" y="0" type="line"/>
       <point x="523" y="116" type="line" name="ih02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0580.glif b/source/Hack-Bold.ufo/glyphs/uni0580.glif
index 0bf661fef..e8708fdb6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0580.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0580.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0580" format="1">
+<glyph name="uni0580" format="2">
   <advance width="1233"/>
   <unicode hex="0580"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="458" y="952" type="line" name="sh02"/>
       <point x="499" y="1076"/>
       <point x="599" y="1147"/>
-      <point x="748" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="748" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="957" y="1147"/>
       <point x="1066" y="1010"/>
       <point x="1066" y="727" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="775" y="682" type="line" smooth="yes"/>
       <point x="775" y="841"/>
       <point x="732" y="909"/>
-      <point x="635" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="635" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="518" y="909"/>
       <point x="458" y="810"/>
-      <point x="458" y="641" type="curve" name="sh04" smooth="yes"/>
+      <point x="458" y="641" type="curve" smooth="yes" name="sh04"/>
       <point x="458" y="-426" type="line" name="hr01"/>
       <point x="167" y="-426" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0581.glif b/source/Hack-Bold.ufo/glyphs/uni0581.glif
index fe13f5689..64f0c5da0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0581.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0581.glif
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0581" format="1">
+<glyph name="uni0581" format="2">
   <advance width="1233"/>
   <unicode hex="0581"/>
   <outline>
     <contour>
-      <point x="601" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="601" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="474" y="-424"/>
       <point x="359" y="-406"/>
       <point x="234" y="-369" type="curve"/>
       <point x="234" y="-100" type="line" name="ih01"/>
       <point x="345" y="-161"/>
       <point x="464" y="-190"/>
-      <point x="573" y="-190" type="curve" name="sv01" smooth="yes"/>
+      <point x="573" y="-190" type="curve" smooth="yes" name="sv01"/>
       <point x="745" y="-190"/>
       <point x="822" y="-117"/>
-      <point x="822" y="51" type="curve" name="ah01" smooth="yes"/>
+      <point x="822" y="51" type="curve" smooth="yes" name="ah01"/>
       <point x="822" y="172" type="line" name="iv01"/>
       <point x="763" y="61"/>
       <point x="664" y="14"/>
-      <point x="539" y="14" type="curve" name="dv01" smooth="yes"/>
+      <point x="539" y="14" type="curve" smooth="yes" name="dv01"/>
       <point x="276" y="14"/>
       <point x="117" y="228"/>
-      <point x="117" y="574" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="574" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="926"/>
       <point x="282" y="1149"/>
-      <point x="530" y="1149" type="curve" name="sv03" smooth="yes"/>
+      <point x="530" y="1149" type="curve" smooth="yes" name="sv03"/>
       <point x="663" y="1149"/>
       <point x="765" y="1086"/>
       <point x="822" y="977" type="curve" name="sh03"/>
       <point x="851" y="1120" type="line" name="hr01"/>
       <point x="1115" y="1120" type="line"/>
-      <point x="1115" y="84" type="line" name="sh04" smooth="yes"/>
+      <point x="1115" y="84" type="line" smooth="yes" name="sh04"/>
       <point x="1115" y="-274"/>
       <point x="963" y="-424"/>
     </contour>
     <contour>
-      <point x="615" y="246" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="246" type="curve" smooth="yes" name="dv02"/>
       <point x="739" y="246"/>
       <point x="822" y="377"/>
-      <point x="822" y="578" type="curve" name="sh05" smooth="yes"/>
+      <point x="822" y="578" type="curve" smooth="yes" name="sh05"/>
       <point x="822" y="778"/>
       <point x="739" y="909"/>
-      <point x="615" y="909" type="curve" name="sv02" smooth="yes"/>
+      <point x="615" y="909" type="curve" smooth="yes" name="sv02"/>
       <point x="491" y="909"/>
       <point x="410" y="779"/>
-      <point x="410" y="577" type="curve" name="sh02" smooth="yes"/>
+      <point x="410" y="577" type="curve" smooth="yes" name="sh02"/>
       <point x="410" y="375"/>
       <point x="491" y="246"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0582.glif b/source/Hack-Bold.ufo/glyphs/uni0582.glif
index 24ee266d6..e17d71a08 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0582.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0582.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0582" format="1">
+<glyph name="uni0582" format="2">
   <advance width="1233"/>
   <unicode hex="0582"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0583.glif b/source/Hack-Bold.ufo/glyphs/uni0583.glif
index 6b7e59e60..83418b3b0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0583.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0583.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0583" format="1">
+<glyph name="uni0583" format="2">
   <advance width="1233"/>
   <unicode hex="0583"/>
   <outline>
@@ -7,31 +7,31 @@
       <point x="496" y="104" type="line" name="iv01"/>
       <point x="461" y="17"/>
       <point x="400" y="-27"/>
-      <point x="312" y="-27" type="curve" name="sh03" smooth="yes"/>
+      <point x="312" y="-27" type="curve" smooth="yes" name="sh03"/>
       <point x="149" y="-27"/>
       <point x="81" y="120"/>
-      <point x="81" y="401" type="curve" name="sh01" smooth="yes"/>
+      <point x="81" y="401" type="curve" smooth="yes" name="sh01"/>
       <point x="81" y="1120" type="line" name="at02"/>
       <point x="318" y="1120" type="line"/>
-      <point x="318" y="401" type="line" name="sh02" smooth="yes"/>
+      <point x="318" y="401" type="line" smooth="yes" name="sh02"/>
       <point x="318" y="317"/>
       <point x="324" y="266"/>
       <point x="339" y="235" type="curve" smooth="yes"/>
       <point x="351" y="208"/>
       <point x="370" y="192"/>
-      <point x="401" y="192" type="curve" name="sv01" smooth="yes"/>
+      <point x="401" y="192" type="curve" smooth="yes" name="sv01"/>
       <point x="424" y="192"/>
       <point x="445" y="201"/>
       <point x="464" y="228" type="curve" smooth="yes"/>
       <point x="483" y="256"/>
       <point x="496" y="303"/>
-      <point x="496" y="376" type="curve" name="sh05" smooth="yes"/>
+      <point x="496" y="376" type="curve" smooth="yes" name="sh05"/>
       <point x="496" y="1556" type="line" name="at01"/>
       <point x="736" y="1556" type="line" name="sh07"/>
       <point x="736" y="1015" type="line" name="ih01"/>
       <point x="771" y="1103"/>
       <point x="833" y="1147"/>
-      <point x="921" y="1147" type="curve" name="sh08" smooth="yes"/>
+      <point x="921" y="1147" type="curve" smooth="yes" name="sh08"/>
       <point x="1081" y="1147"/>
       <point x="1151" y="999"/>
       <point x="1151" y="719" type="curve" smooth="yes"/>
@@ -43,7 +43,7 @@
       <point x="894" y="886" type="curve" smooth="yes"/>
       <point x="879" y="917"/>
       <point x="856" y="928"/>
-      <point x="827" y="928" type="curve" name="sv02" smooth="yes"/>
+      <point x="827" y="928" type="curve" smooth="yes" name="sv02"/>
       <point x="798" y="928"/>
       <point x="780" y="918"/>
       <point x="764" y="887" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0584.glif b/source/Hack-Bold.ufo/glyphs/uni0584.glif
index eeab9a0ff..0021dac19 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0584.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0584.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0584" format="1">
+<glyph name="uni0584" format="2">
   <advance width="1233"/>
   <unicode hex="0584"/>
   <outline>
@@ -13,19 +13,19 @@
       <point x="467" y="952" type="line" name="sh04"/>
       <point x="528" y="1082"/>
       <point x="627" y="1147"/>
-      <point x="765" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="765" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="897" y="1147"/>
       <point x="995" y="1089"/>
       <point x="1062" y="993" type="curve" smooth="yes"/>
       <point x="1131" y="892"/>
       <point x="1168" y="746"/>
-      <point x="1168" y="557" type="curve" name="sh05" smooth="yes"/>
+      <point x="1168" y="557" type="curve" smooth="yes" name="sh05"/>
       <point x="1168" y="370"/>
       <point x="1132" y="226"/>
       <point x="1061" y="125" type="curve" smooth="yes"/>
       <point x="989" y="24"/>
       <point x="887" y="-29"/>
-      <point x="762" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="762" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="631" y="-29"/>
       <point x="543" y="29"/>
       <point x="467" y="158" type="curve" name="sh06"/>
@@ -37,28 +37,28 @@
       <point x="175" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="673" y="215" type="curve" name="dv02" smooth="yes"/>
+      <point x="673" y="215" type="curve" smooth="yes" name="dv02"/>
       <point x="736" y="215"/>
       <point x="785" y="246"/>
       <point x="821" y="307" type="curve" smooth="yes"/>
       <point x="838" y="337"/>
       <point x="852" y="373"/>
-      <point x="861" y="416" type="curve" name="sh07" smooth="yes"/>
+      <point x="861" y="416" type="curve" smooth="yes" name="sh07"/>
       <point x="870" y="459"/>
       <point x="875" y="505"/>
-      <point x="875" y="561" type="curve" name="ah01" smooth="yes"/>
+      <point x="875" y="561" type="curve" smooth="yes" name="ah01"/>
       <point x="875" y="669"/>
       <point x="856" y="755"/>
-      <point x="821" y="815" type="curve" name="hr01" smooth="yes"/>
+      <point x="821" y="815" type="curve" smooth="yes" name="hr01"/>
       <point x="785" y="876"/>
       <point x="735" y="907"/>
-      <point x="672" y="907" type="curve" name="sv01" smooth="yes"/>
+      <point x="672" y="907" type="curve" smooth="yes" name="sv01"/>
       <point x="608" y="907"/>
       <point x="557" y="875"/>
       <point x="522" y="815" type="curve" smooth="yes"/>
       <point x="485" y="754"/>
       <point x="467" y="669"/>
-      <point x="467" y="561" type="curve" name="sh08" smooth="yes"/>
+      <point x="467" y="561" type="curve" smooth="yes" name="sh08"/>
       <point x="467" y="340"/>
       <point x="542" y="215"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0585.glif b/source/Hack-Bold.ufo/glyphs/uni0585.glif
index c2a2b0810..3e6cac6a4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0585.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0585.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0585" format="1">
+<glyph name="uni0585" format="2">
   <advance width="1233"/>
   <unicode hex="0585"/>
   <outline>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="300" y="-29"/>
       <point x="98" y="198"/>
-      <point x="98" y="559" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="559" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="920"/>
       <point x="300" y="1147"/>
-      <point x="616" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="933" y="1147"/>
       <point x="1135" y="920"/>
-      <point x="1135" y="559" type="curve" name="sh02" smooth="yes"/>
+      <point x="1135" y="559" type="curve" smooth="yes" name="sh02"/>
       <point x="1135" y="198"/>
       <point x="933" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="209" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="209" type="curve" smooth="yes" name="dv01"/>
       <point x="757" y="209"/>
       <point x="842" y="338"/>
-      <point x="842" y="559" type="curve" name="ah01" smooth="yes"/>
+      <point x="842" y="559" type="curve" smooth="yes" name="ah01"/>
       <point x="842" y="778"/>
       <point x="757" y="909"/>
-      <point x="616" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="476" y="909"/>
       <point x="391" y="778"/>
-      <point x="391" y="559" type="curve" name="sh03" smooth="yes"/>
+      <point x="391" y="559" type="curve" smooth="yes" name="sh03"/>
       <point x="391" y="338"/>
       <point x="476" y="209"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0586.glif b/source/Hack-Bold.ufo/glyphs/uni0586.glif
index 124c2c215..34252f029 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0586.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0586.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0586" format="1">
+<glyph name="uni0586" format="2">
   <advance width="1233"/>
   <unicode hex="0586"/>
   <outline>
@@ -24,15 +24,15 @@
       <point x="217" y="964" type="curve" smooth="yes"/>
       <point x="150" y="1025"/>
       <point x="116" y="1108"/>
-      <point x="116" y="1213" type="curve" name="dh01" smooth="yes"/>
+      <point x="116" y="1213" type="curve" smooth="yes" name="dh01"/>
       <point x="116" y="1418"/>
       <point x="256" y="1556"/>
-      <point x="534" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="534" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="743" y="1556" type="line" name="sh02"/>
       <point x="743" y="1114" type="line" name="dv02"/>
       <point x="1080" y="1095"/>
       <point x="1190" y="904"/>
-      <point x="1190" y="577" type="curve" name="dh05" smooth="yes"/>
+      <point x="1190" y="577" type="curve" smooth="yes" name="dh05"/>
       <point x="1190" y="248"/>
       <point x="1081" y="16"/>
       <point x="743" y="-3" type="curve" name="dh03"/>
@@ -43,7 +43,7 @@
       <point x="503" y="1325" type="line" name="sh03"/>
       <point x="402" y="1325"/>
       <point x="356" y="1299"/>
-      <point x="356" y="1219" type="curve" name="dh02" smooth="yes"/>
+      <point x="356" y="1219" type="curve" smooth="yes" name="dh02"/>
       <point x="356" y="1139"/>
       <point x="403" y="1118"/>
       <point x="503" y="1118" type="curve" name="sv01"/>
@@ -55,7 +55,7 @@
       <point x="902" y="343" type="curve" smooth="yes"/>
       <point x="933" y="403"/>
       <point x="945" y="485"/>
-      <point x="945" y="574" type="curve" name="dh04" smooth="yes"/>
+      <point x="945" y="574" type="curve" smooth="yes" name="dh04"/>
       <point x="945" y="661"/>
       <point x="934" y="728"/>
       <point x="903" y="777" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0587.glif b/source/Hack-Bold.ufo/glyphs/uni0587.glif
index 755721d14..23639d23c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0587.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0587.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0587" format="1">
+<glyph name="uni0587" format="2">
   <advance width="1233"/>
   <unicode hex="0587"/>
   <outline>
     <contour>
-      <point x="365" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="365" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="154" y="-29"/>
       <point x="46" y="110"/>
-      <point x="46" y="391" type="curve" name="sh01" smooth="yes"/>
+      <point x="46" y="391" type="curve" smooth="yes" name="sh01"/>
       <point x="46" y="1556" type="line" name="hr01"/>
       <point x="339" y="1556" type="line"/>
-      <point x="339" y="436" type="line" name="sh02" smooth="yes"/>
+      <point x="339" y="436" type="line" smooth="yes" name="sh02"/>
       <point x="339" y="279"/>
       <point x="380" y="211"/>
-      <point x="479" y="211" type="curve" name="sv01" smooth="yes"/>
+      <point x="479" y="211" type="curve" smooth="yes" name="sv01"/>
       <point x="596" y="211"/>
       <point x="654" y="308"/>
-      <point x="654" y="477" type="curve" name="sh03" smooth="yes"/>
+      <point x="654" y="477" type="curve" smooth="yes" name="sh03"/>
       <point x="654" y="1120" type="line" name="at01"/>
       <point x="947" y="1120" type="line"/>
       <point x="947" y="225" type="line" name="sh04"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0589.glif b/source/Hack-Bold.ufo/glyphs/uni0589.glif
index b954ca442..028cdf34e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0589.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0589.glif
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0589" format="1">
+<glyph name="uni0589" format="2">
   <advance width="1233"/>
   <unicode hex="0589"/>
   <outline>
     <contour>
-      <point x="480" y="698" type="line" name="hr00" smooth="yes"/>
+      <point x="480" y="698" type="line" smooth="yes" name="hr00"/>
       <point x="460" y="698"/>
       <point x="450" y="708"/>
-      <point x="450" y="728" type="curve" name="dh01" smooth="yes"/>
+      <point x="450" y="728" type="curve" smooth="yes" name="dh01"/>
       <point x="450" y="1033" type="line" smooth="yes"/>
       <point x="450" y="1053"/>
       <point x="460" y="1063"/>
-      <point x="480" y="1063" type="curve" name="dv01" smooth="yes"/>
+      <point x="480" y="1063" type="curve" smooth="yes" name="dv01"/>
       <point x="753" y="1063" type="line" smooth="yes"/>
       <point x="773" y="1063"/>
       <point x="783" y="1053"/>
       <point x="783" y="1033" type="curve" smooth="yes"/>
-      <point x="783" y="728" type="line" name="dh02" smooth="yes"/>
+      <point x="783" y="728" type="line" smooth="yes" name="dh02"/>
       <point x="783" y="708"/>
       <point x="773" y="698"/>
       <point x="753" y="698" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="480" y="0" type="line" name="ab01" smooth="yes"/>
+      <point x="480" y="0" type="line" smooth="yes" name="ab01"/>
       <point x="460" y="0"/>
       <point x="450" y="10"/>
-      <point x="450" y="30" type="curve" name="sh01" smooth="yes"/>
+      <point x="450" y="30" type="curve" smooth="yes" name="sh01"/>
       <point x="450" y="337" type="line" smooth="yes"/>
       <point x="450" y="357"/>
       <point x="460" y="367"/>
-      <point x="480" y="367" type="curve" name="sv01" smooth="yes"/>
+      <point x="480" y="367" type="curve" smooth="yes" name="sv01"/>
       <point x="753" y="367" type="line" smooth="yes"/>
       <point x="773" y="367"/>
       <point x="783" y="357"/>
-      <point x="783" y="337" type="curve" name="sh02" smooth="yes"/>
+      <point x="783" y="337" type="curve" smooth="yes" name="sh02"/>
       <point x="783" y="30" type="line" smooth="yes"/>
       <point x="783" y="10"/>
       <point x="773" y="0"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni058A_.glif b/source/Hack-Bold.ufo/glyphs/uni058A_.glif
index 4d60cb31a..269fe7628 100644
--- a/source/Hack-Bold.ufo/glyphs/uni058A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni058A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni058A" format="1">
+<glyph name="uni058A" format="2">
   <advance width="1233"/>
   <unicode hex="058A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni0E_3F_.glif b/source/Hack-Bold.ufo/glyphs/uni0E_3F_.glif
index 62583fb5e..b7c2ff03e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni0E_3F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni0E_3F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0E3F" format="1">
+<glyph name="uni0E3F" format="2">
   <advance width="1233"/>
   <unicode hex="0E3F"/>
   <outline>
@@ -13,13 +13,13 @@
       <point x="679" y="1305" type="line"/>
       <point x="929" y="1289"/>
       <point x="1089" y="1196"/>
-      <point x="1089" y="979" type="curve" name="dh06" smooth="yes"/>
+      <point x="1089" y="979" type="curve" smooth="yes" name="dh06"/>
       <point x="1089" y="808"/>
       <point x="993" y="714"/>
       <point x="809" y="699" type="curve" name="hr01"/>
       <point x="1034" y="678"/>
       <point x="1140" y="559"/>
-      <point x="1140" y="355" type="curve" name="sh04" smooth="yes"/>
+      <point x="1140" y="355" type="curve" smooth="yes" name="sh04"/>
       <point x="1140" y="106"/>
       <point x="983" y="14"/>
       <point x="679" y="1" type="curve" name="dh04"/>
@@ -36,7 +36,7 @@
       <point x="679" y="803" type="line" name="hr02"/>
       <point x="750" y="814"/>
       <point x="807" y="842"/>
-      <point x="807" y="948" type="curve" name="dh05" smooth="yes"/>
+      <point x="807" y="948" type="curve" smooth="yes" name="dh05"/>
       <point x="807" y="1057"/>
       <point x="747" y="1086"/>
       <point x="679" y="1097" type="curve" name="hr03"/>
@@ -51,7 +51,7 @@
       <point x="679" y="210" type="line" name="sh08"/>
       <point x="787" y="221"/>
       <point x="852" y="257"/>
-      <point x="852" y="392" type="curve" name="sh03" smooth="yes"/>
+      <point x="852" y="392" type="curve" smooth="yes" name="sh03"/>
       <point x="852" y="536"/>
       <point x="779" y="576"/>
       <point x="679" y="589" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10D_0.glif b/source/Hack-Bold.ufo/glyphs/uni10D_0.glif
index af9de3ba6..de9759cec 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10D_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10D_0.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D0" format="1">
+<glyph name="uni10D0" format="2">
   <advance width="1233"/>
   <unicode hex="10D0"/>
   <outline>
     <contour>
-      <point x="611" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="611" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="272" y="0"/>
       <point x="98" y="166"/>
-      <point x="98" y="449" type="curve" name="dh01" smooth="yes"/>
+      <point x="98" y="449" type="curve" smooth="yes" name="dh01"/>
       <point x="98" y="536"/>
       <point x="115" y="583"/>
       <point x="183" y="659" type="curve"/>
       <point x="430" y="625" type="line" name="ih02"/>
       <point x="403" y="582"/>
       <point x="392" y="543"/>
-      <point x="392" y="479" type="curve" name="dh02" smooth="yes"/>
+      <point x="392" y="479" type="curve" smooth="yes" name="dh02"/>
       <point x="392" y="308"/>
       <point x="476" y="214"/>
-      <point x="620" y="214" type="curve" name="sv01" smooth="yes"/>
+      <point x="620" y="214" type="curve" smooth="yes" name="sv01"/>
       <point x="761" y="214"/>
       <point x="842" y="305"/>
-      <point x="842" y="473" type="curve" name="dh03" smooth="yes"/>
+      <point x="842" y="473" type="curve" smooth="yes" name="dh03"/>
       <point x="842" y="609"/>
       <point x="787" y="684"/>
       <point x="678" y="727" type="curve"/>
@@ -35,7 +35,7 @@
       <point x="735" y="959" type="line"/>
       <point x="1018" y="855"/>
       <point x="1137" y="724"/>
-      <point x="1137" y="476" type="curve" name="dh04" smooth="yes"/>
+      <point x="1137" y="476" type="curve" smooth="yes" name="dh04"/>
       <point x="1137" y="179"/>
       <point x="964" y="0"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10D_1.glif b/source/Hack-Bold.ufo/glyphs/uni10D_1.glif
index 0120e52a0..7472baa4f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10D_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10D_1.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D1" format="1">
+<glyph name="uni10D1" format="2">
   <advance width="1233"/>
   <unicode hex="10D1"/>
   <outline>
     <contour>
-      <point x="613" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="613" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="273" y="0"/>
       <point x="102" y="178"/>
       <point x="100" y="535" type="curve" name="dh01"/>
@@ -28,15 +28,15 @@
       <point x="763" y="1059" type="line" name="dh04"/>
       <point x="1015" y="965"/>
       <point x="1134" y="801"/>
-      <point x="1134" y="521" type="curve" name="dh06" smooth="yes"/>
+      <point x="1134" y="521" type="curve" smooth="yes" name="dh06"/>
       <point x="1134" y="184"/>
       <point x="960" y="0"/>
     </contour>
     <contour>
-      <point x="614" y="214" type="curve" name="sv01" smooth="yes"/>
+      <point x="614" y="214" type="curve" smooth="yes" name="sv01"/>
       <point x="755" y="214"/>
       <point x="825" y="319"/>
-      <point x="825" y="543" type="curve" name="dh05" smooth="yes"/>
+      <point x="825" y="543" type="curve" smooth="yes" name="dh05"/>
       <point x="825" y="754"/>
       <point x="757" y="887"/>
       <point x="617" y="887" type="curve" smooth="yes"/>
@@ -45,7 +45,7 @@
       <point x="451" y="793" type="curve" smooth="yes"/>
       <point x="412" y="734"/>
       <point x="391" y="652"/>
-      <point x="391" y="539" type="curve" name="dh02" smooth="yes"/>
+      <point x="391" y="539" type="curve" smooth="yes" name="dh02"/>
       <point x="391" y="426"/>
       <point x="412" y="347"/>
       <point x="451" y="294" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10D_2.glif b/source/Hack-Bold.ufo/glyphs/uni10D_2.glif
index 5b67a699a..8e4640640 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10D_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10D_2.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D2" format="1">
+<glyph name="uni10D2" format="2">
   <advance width="1233"/>
   <unicode hex="10D2"/>
   <outline>
     <contour>
-      <point x="616" y="-402" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-402" type="curve" smooth="yes" name="dv01"/>
       <point x="257" y="-402"/>
       <point x="80" y="-241"/>
-      <point x="80" y="74" type="curve" name="dh01" smooth="yes"/>
+      <point x="80" y="74" type="curve" smooth="yes" name="dh01"/>
       <point x="80" y="389"/>
       <point x="262" y="546"/>
       <point x="622" y="557" type="curve"/>
@@ -16,16 +16,16 @@
       <point x="697" y="618" type="curve" smooth="yes"/>
       <point x="714" y="647"/>
       <point x="726" y="693"/>
-      <point x="726" y="740" type="curve" name="dh03" smooth="yes"/>
+      <point x="726" y="740" type="curve" smooth="yes" name="dh03"/>
       <point x="726" y="792"/>
       <point x="711" y="811"/>
       <point x="670" y="830" type="curve" smooth="yes"/>
       <point x="631" y="847"/>
       <point x="590" y="853"/>
-      <point x="547" y="853" type="curve" name="dv03" smooth="yes"/>
+      <point x="547" y="853" type="curve" smooth="yes" name="dv03"/>
       <point x="501" y="853"/>
       <point x="464" y="846"/>
-      <point x="435" y="831" type="curve" name="hr01" smooth="yes"/>
+      <point x="435" y="831" type="curve" smooth="yes" name="hr01"/>
       <point x="410" y="818"/>
       <point x="387" y="795"/>
       <point x="387" y="762" type="curve"/>
@@ -36,30 +36,30 @@
       <point x="178" y="679" type="curve" smooth="yes"/>
       <point x="167" y="710"/>
       <point x="163" y="737"/>
-      <point x="163" y="776" type="curve" name="sh01" smooth="yes"/>
+      <point x="163" y="776" type="curve" smooth="yes" name="sh01"/>
       <point x="163" y="969"/>
       <point x="295" y="1066"/>
-      <point x="560" y="1066" type="curve" name="dv04" smooth="yes"/>
+      <point x="560" y="1066" type="curve" smooth="yes" name="dv04"/>
       <point x="841" y="1066"/>
       <point x="983" y="962"/>
-      <point x="983" y="747" type="curve" name="dh04" smooth="yes"/>
+      <point x="983" y="747" type="curve" smooth="yes" name="dh04"/>
       <point x="983" y="651"/>
       <point x="954" y="576"/>
       <point x="882" y="512" type="curve" name="ih01"/>
       <point x="1069" y="423"/>
       <point x="1151" y="284"/>
-      <point x="1151" y="73" type="curve" name="sh03" smooth="yes"/>
+      <point x="1151" y="73" type="curve" smooth="yes" name="sh03"/>
       <point x="1151" y="-240"/>
       <point x="975" y="-402"/>
     </contour>
     <contour>
-      <point x="616" y="-185" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="-185" type="curve" smooth="yes" name="dv02"/>
       <point x="784" y="-185"/>
       <point x="868" y="-91"/>
-      <point x="868" y="64" type="curve" name="sh02" smooth="yes"/>
+      <point x="868" y="64" type="curve" smooth="yes" name="sh02"/>
       <point x="868" y="445"/>
       <point x="364" y="444"/>
-      <point x="364" y="64" type="curve" name="dh02" smooth="yes"/>
+      <point x="364" y="64" type="curve" smooth="yes" name="dh02"/>
       <point x="364" y="-91"/>
       <point x="447" y="-185"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10D_3.glif b/source/Hack-Bold.ufo/glyphs/uni10D_3.glif
index 6c4e1336f..a3074d9d3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10D_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10D_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D3" format="1">
+<glyph name="uni10D3" format="2">
   <advance width="1233"/>
   <unicode hex="10D3"/>
   <outline>
@@ -26,16 +26,16 @@
       <point x="73" y="212" type="curve" smooth="yes"/>
       <point x="38" y="324"/>
       <point x="27" y="447"/>
-      <point x="27" y="554" type="curve" name="dh01" smooth="yes"/>
+      <point x="27" y="554" type="curve" smooth="yes" name="dh01"/>
       <point x="27" y="893"/>
       <point x="151" y="1056"/>
-      <point x="394" y="1056" type="curve" name="dv02" smooth="yes"/>
+      <point x="394" y="1056" type="curve" smooth="yes" name="dv02"/>
       <point x="480" y="1056"/>
       <point x="521" y="1036"/>
       <point x="578" y="987" type="curve"/>
       <point x="629" y="1034"/>
       <point x="702" y="1056"/>
-      <point x="809" y="1056" type="curve" name="sv01" smooth="yes"/>
+      <point x="809" y="1056" type="curve" smooth="yes" name="sv01"/>
       <point x="938" y="1056"/>
       <point x="1037" y="1023"/>
       <point x="1105" y="951" type="curve" smooth="yes"/>
@@ -45,7 +45,7 @@
       <point x="1206" y="475" type="line" name="dh06"/>
       <point x="1213" y="133"/>
       <point x="1065" y="-2"/>
-      <point x="831" y="-1" type="curve" name="ab01" smooth="yes"/>
+      <point x="831" y="-1" type="curve" smooth="yes" name="ab01"/>
       <point x="637" y="1"/>
       <point x="558" y="106"/>
       <point x="502" y="229" type="curve"/>
@@ -56,13 +56,13 @@
       <point x="467" y="830"/>
       <point x="457" y="843"/>
       <point x="434" y="843" type="curve" smooth="yes"/>
-      <point x="367" y="843" type="line" name="dv01" smooth="yes"/>
+      <point x="367" y="843" type="line" smooth="yes" name="dv01"/>
       <point x="347" y="843"/>
       <point x="327" y="827"/>
       <point x="315" y="810" type="curve" smooth="yes"/>
       <point x="300" y="789"/>
       <point x="291" y="761"/>
-      <point x="291" y="730" type="curve" name="dh02" smooth="yes"/>
+      <point x="291" y="730" type="curve" smooth="yes" name="dh02"/>
       <point x="291" y="356" type="line" smooth="yes"/>
       <point x="291" y="219"/>
       <point x="335" y="126"/>
@@ -81,25 +81,25 @@
       <point x="997" y="-403" type="curve"/>
     </contour>
     <contour>
-      <point x="805" y="213" type="curve" name="sv02" smooth="yes"/>
+      <point x="805" y="213" type="curve" smooth="yes" name="sv02"/>
       <point x="848" y="213"/>
       <point x="883" y="237"/>
       <point x="906" y="278" type="curve" smooth="yes"/>
       <point x="929" y="318"/>
       <point x="941" y="376"/>
-      <point x="941" y="444" type="curve" name="dh05" smooth="yes"/>
+      <point x="941" y="444" type="curve" smooth="yes" name="dh05"/>
       <point x="941" y="621" type="line" smooth="yes"/>
       <point x="941" y="698"/>
       <point x="918" y="755"/>
       <point x="895" y="788" type="curve" smooth="yes"/>
       <point x="870" y="825"/>
       <point x="841" y="843"/>
-      <point x="826" y="843" type="curve" name="sv03" smooth="yes"/>
+      <point x="826" y="843" type="curve" smooth="yes" name="sv03"/>
       <point x="729" y="843" type="line" smooth="yes"/>
       <point x="709" y="843"/>
       <point x="696" y="830"/>
       <point x="696" y="807" type="curve" smooth="yes"/>
-      <point x="696" y="510" type="line" name="dh04" smooth="yes"/>
+      <point x="696" y="510" type="line" smooth="yes" name="dh04"/>
       <point x="696" y="359"/>
       <point x="705" y="213"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10D_4.glif b/source/Hack-Bold.ufo/glyphs/uni10D_4.glif
index 7870a38a2..4d7d82f87 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10D_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10D_4.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D4" format="1">
+<glyph name="uni10D4" format="2">
   <advance width="1233"/>
   <unicode hex="10D4"/>
   <outline>
     <contour>
-      <point x="631" y="-402" type="curve" name="dv01" smooth="yes"/>
+      <point x="631" y="-402" type="curve" smooth="yes" name="dv01"/>
       <point x="276" y="-402"/>
       <point x="97" y="-251"/>
-      <point x="97" y="-3" type="curve" name="dh01" smooth="yes"/>
+      <point x="97" y="-3" type="curve" smooth="yes" name="dh01"/>
       <point x="97" y="118"/>
       <point x="141" y="182"/>
       <point x="263" y="291" type="curve"/>
@@ -17,31 +17,31 @@
       <point x="401" y="106" type="curve" smooth="yes"/>
       <point x="394" y="78"/>
       <point x="392" y="48"/>
-      <point x="392" y="25" type="curve" name="dh02" smooth="yes"/>
+      <point x="392" y="25" type="curve" smooth="yes" name="dh02"/>
       <point x="392" y="-128"/>
       <point x="482" y="-191"/>
-      <point x="629" y="-191" type="curve" name="dv02" smooth="yes"/>
+      <point x="629" y="-191" type="curve" smooth="yes" name="dv02"/>
       <point x="773" y="-191"/>
       <point x="842" y="-132"/>
-      <point x="842" y="0" type="curve" name="dh03" smooth="yes"/>
+      <point x="842" y="0" type="curve" smooth="yes" name="dh03"/>
       <point x="842" y="639" type="line" smooth="yes"/>
       <point x="842" y="788"/>
       <point x="774" y="854"/>
       <point x="635" y="854" type="curve" smooth="yes"/>
       <point x="514" y="854"/>
       <point x="450" y="802"/>
-      <point x="450" y="665" type="curve" name="sh01" smooth="yes"/>
+      <point x="450" y="665" type="curve" smooth="yes" name="sh01"/>
       <point x="450" y="610"/>
       <point x="460" y="561"/>
       <point x="477" y="526" type="curve"/>
       <point x="263" y="436" type="line" name="hr01"/>
       <point x="190" y="524"/>
       <point x="172" y="582"/>
-      <point x="172" y="668" type="curve" name="ih01" smooth="yes"/>
+      <point x="172" y="668" type="curve" smooth="yes" name="ih01"/>
       <point x="172" y="1202"/>
       <point x="1136" y="1209"/>
       <point x="1136" y="637" type="curve" smooth="yes"/>
-      <point x="1136" y="8" type="line" name="dh04" smooth="yes"/>
+      <point x="1136" y="8" type="line" smooth="yes" name="dh04"/>
       <point x="1136" y="-265"/>
       <point x="968" y="-402"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10D_5.glif b/source/Hack-Bold.ufo/glyphs/uni10D_5.glif
index 3791daa49..858ddc406 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10D_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10D_5.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D5" format="1">
+<glyph name="uni10D5" format="2">
   <advance width="1233"/>
   <unicode hex="10D5"/>
   <outline>
     <contour>
-      <point x="619" y="-402" type="curve" name="dv01" smooth="yes"/>
+      <point x="619" y="-402" type="curve" smooth="yes" name="dv01"/>
       <point x="266" y="-402"/>
       <point x="99" y="-261"/>
       <point x="98" y="22" type="curve" name="dh01"/>
@@ -17,35 +17,35 @@
       <point x="425" y="178" type="line"/>
       <point x="396" y="127"/>
       <point x="392" y="68"/>
-      <point x="392" y="33" type="curve" name="dh02" smooth="yes"/>
+      <point x="392" y="33" type="curve" smooth="yes" name="dh02"/>
       <point x="392" y="-126"/>
       <point x="478" y="-191"/>
-      <point x="622" y="-191" type="curve" name="dv02" smooth="yes"/>
+      <point x="622" y="-191" type="curve" smooth="yes" name="dv02"/>
       <point x="757" y="-191"/>
       <point x="842" y="-135"/>
-      <point x="842" y="-18" type="curve" name="dh03" smooth="yes"/>
+      <point x="842" y="-18" type="curve" smooth="yes" name="dh03"/>
       <point x="842" y="74" type="line" smooth="yes"/>
       <point x="842" y="191"/>
       <point x="772" y="247"/>
-      <point x="655" y="247" type="curve" name="dv04" smooth="yes"/>
+      <point x="655" y="247" type="curve" smooth="yes" name="dv04"/>
       <point x="592" y="247" type="line"/>
       <point x="592" y="456" type="line"/>
-      <point x="655" y="456" type="line" name="dv05" smooth="yes"/>
+      <point x="655" y="456" type="line" smooth="yes" name="dv05"/>
       <point x="711" y="456"/>
       <point x="757" y="469"/>
       <point x="790" y="501" type="curve" smooth="yes"/>
       <point x="822" y="532"/>
       <point x="842" y="578"/>
-      <point x="842" y="646" type="curve" name="sh01" smooth="yes"/>
+      <point x="842" y="646" type="curve" smooth="yes" name="sh01"/>
       <point x="842" y="714"/>
       <point x="821" y="765"/>
       <point x="785" y="801" type="curve" smooth="yes"/>
       <point x="749" y="836"/>
       <point x="702" y="854"/>
-      <point x="630" y="854" type="curve" name="dv03" smooth="yes"/>
+      <point x="630" y="854" type="curve" smooth="yes" name="dv03"/>
       <point x="510" y="854"/>
       <point x="427" y="804"/>
-      <point x="427" y="695" type="curve" name="sh02" smooth="yes"/>
+      <point x="427" y="695" type="curve" smooth="yes" name="sh02"/>
       <point x="427" y="655"/>
       <point x="438" y="616"/>
       <point x="457" y="581" type="curve"/>
@@ -55,20 +55,20 @@
       <point x="175" y="576" type="curve" smooth="yes"/>
       <point x="152" y="616"/>
       <point x="141" y="658"/>
-      <point x="141" y="717" type="curve" name="ih01" smooth="yes"/>
+      <point x="141" y="717" type="curve" smooth="yes" name="ih01"/>
       <point x="141" y="933"/>
       <point x="304" y="1066"/>
-      <point x="628" y="1066" type="curve" name="hr01" smooth="yes"/>
+      <point x="628" y="1066" type="curve" smooth="yes" name="hr01"/>
       <point x="964" y="1066"/>
       <point x="1129" y="922"/>
-      <point x="1129" y="666" type="curve" name="sh03" smooth="yes"/>
+      <point x="1129" y="666" type="curve" smooth="yes" name="sh03"/>
       <point x="1129" y="528"/>
       <point x="1081" y="435"/>
       <point x="940" y="355" type="curve" name="ih02"/>
       <point x="1073" y="308"/>
       <point x="1136" y="216"/>
       <point x="1136" y="71" type="curve" smooth="yes"/>
-      <point x="1136" y="-4" type="line" name="dh04" smooth="yes"/>
+      <point x="1136" y="-4" type="line" smooth="yes" name="dh04"/>
       <point x="1136" y="-271"/>
       <point x="962" y="-402"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10D_6.glif b/source/Hack-Bold.ufo/glyphs/uni10D_6.glif
index 59638f6b6..b9066076b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10D_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10D_6.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D6" format="1">
+<glyph name="uni10D6" format="2">
   <advance width="1233"/>
   <unicode hex="10D6"/>
   <outline>
     <contour>
-      <point x="613" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="613" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="266" y="0"/>
       <point x="98" y="180"/>
-      <point x="98" y="519" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="519" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="710"/>
       <point x="150" y="838"/>
       <point x="278" y="910" type="curve" name="ih01"/>
@@ -16,50 +16,50 @@
       <point x="101" y="1194" type="curve" name="dh01"/>
       <point x="100" y="1431"/>
       <point x="233" y="1550"/>
-      <point x="500" y="1550" type="curve" name="dv02" smooth="yes"/>
+      <point x="500" y="1550" type="curve" smooth="yes" name="dv02"/>
       <point x="769" y="1550"/>
       <point x="902" y="1432"/>
-      <point x="902" y="1215" type="curve" name="dh03" smooth="yes"/>
+      <point x="902" y="1215" type="curve" smooth="yes" name="dh03"/>
       <point x="902" y="1123"/>
       <point x="877" y="1047"/>
       <point x="826" y="988" type="curve" name="ih02"/>
       <point x="1030" y="932"/>
       <point x="1136" y="780"/>
-      <point x="1136" y="519" type="curve" name="sh02" smooth="yes"/>
+      <point x="1136" y="519" type="curve" smooth="yes" name="sh02"/>
       <point x="1136" y="178"/>
       <point x="961" y="0"/>
     </contour>
     <contour>
-      <point x="508" y="1010" type="curve" name="dv04" smooth="yes"/>
+      <point x="508" y="1010" type="curve" smooth="yes" name="dv04"/>
       <point x="592" y="1010"/>
       <point x="636" y="1072"/>
-      <point x="636" y="1188" type="curve" name="dh02" smooth="yes"/>
+      <point x="636" y="1188" type="curve" smooth="yes" name="dh02"/>
       <point x="636" y="1285"/>
       <point x="603" y="1343"/>
-      <point x="508" y="1343" type="curve" name="dv01" smooth="yes"/>
+      <point x="508" y="1343" type="curve" smooth="yes" name="dv01"/>
       <point x="428" y="1343"/>
       <point x="389" y="1301"/>
-      <point x="389" y="1184" type="curve" name="hr01" smooth="yes"/>
+      <point x="389" y="1184" type="curve" smooth="yes" name="hr01"/>
       <point x="389" y="1064"/>
       <point x="429" y="1010"/>
     </contour>
     <contour>
-      <point x="623" y="214" type="curve" name="sv01" smooth="yes"/>
+      <point x="623" y="214" type="curve" smooth="yes" name="sv01"/>
       <point x="764" y="214"/>
       <point x="842" y="319"/>
-      <point x="842" y="522" type="curve" name="ih03" smooth="yes"/>
+      <point x="842" y="522" type="curve" smooth="yes" name="ih03"/>
       <point x="842" y="622"/>
       <point x="823" y="706"/>
-      <point x="782" y="766" type="curve" name="hr02" smooth="yes"/>
+      <point x="782" y="766" type="curve" smooth="yes" name="hr02"/>
       <point x="743" y="822"/>
       <point x="684" y="852"/>
-      <point x="615" y="852" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="852" type="curve" smooth="yes" name="dv03"/>
       <point x="546" y="852"/>
       <point x="491" y="823"/>
-      <point x="451" y="765" type="curve" name="hr03" smooth="yes"/>
+      <point x="451" y="765" type="curve" smooth="yes" name="hr03"/>
       <point x="412" y="708"/>
       <point x="391" y="626"/>
-      <point x="391" y="526" type="curve" name="sh03" smooth="yes"/>
+      <point x="391" y="526" type="curve" smooth="yes" name="sh03"/>
       <point x="391" y="422"/>
       <point x="414" y="345"/>
       <point x="455" y="293" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10D_7.glif b/source/Hack-Bold.ufo/glyphs/uni10D_7.glif
index 358063d80..94f471971 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10D_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10D_7.glif
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D7" format="1">
+<glyph name="uni10D7" format="2">
   <advance width="1233"/>
   <unicode hex="10D7"/>
   <outline>
     <contour>
-      <point x="425" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="425" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="168" y="0"/>
       <point x="27" y="178"/>
       <point x="27" y="529" type="curve" smooth="yes"/>
-      <point x="27" y="558" type="line" name="dh01" smooth="yes"/>
+      <point x="27" y="558" type="line" smooth="yes" name="dh01"/>
       <point x="27" y="890"/>
       <point x="165" y="1056"/>
-      <point x="437" y="1056" type="curve" name="sv01" smooth="yes"/>
+      <point x="437" y="1056" type="curve" smooth="yes" name="sv01"/>
       <point x="533" y="1056"/>
       <point x="601" y="1035"/>
       <point x="657" y="987" type="curve"/>
       <point x="708" y="1032"/>
       <point x="758" y="1056"/>
-      <point x="851" y="1056" type="curve" name="dv02" smooth="yes"/>
+      <point x="851" y="1056" type="curve" smooth="yes" name="dv02"/>
       <point x="1080" y="1056"/>
       <point x="1206" y="911"/>
       <point x="1206" y="620" type="curve" smooth="yes"/>
-      <point x="1206" y="527" type="line" name="dh06" smooth="yes"/>
+      <point x="1206" y="527" type="line" smooth="yes" name="dh06"/>
       <point x="1206" y="423"/>
       <point x="1193" y="339"/>
       <point x="1160" y="259" type="curve" smooth="yes"/>
@@ -31,21 +31,21 @@
       <point x="778" y="0" type="line" name="ih01"/>
       <point x="922" y="176"/>
       <point x="922" y="253"/>
-      <point x="922" y="448" type="curve" name="dh05" smooth="yes"/>
+      <point x="922" y="448" type="curve" smooth="yes" name="dh05"/>
       <point x="922" y="787" type="line" smooth="yes"/>
       <point x="922" y="830"/>
       <point x="899" y="843"/>
-      <point x="860" y="843" type="curve" name="dv01" smooth="yes"/>
+      <point x="860" y="843" type="curve" smooth="yes" name="dv01"/>
       <point x="765" y="843" type="line" smooth="yes"/>
       <point x="750" y="843"/>
       <point x="742" y="822"/>
-      <point x="742" y="802" type="curve" name="dh04" smooth="yes"/>
+      <point x="742" y="802" type="curve" smooth="yes" name="dh04"/>
       <point x="742" y="504" type="line" smooth="yes"/>
       <point x="742" y="167"/>
       <point x="671" y="0"/>
     </contour>
     <contour>
-      <point x="430" y="214" type="curve" name="sv02" smooth="yes"/>
+      <point x="430" y="214" type="curve" smooth="yes" name="sv02"/>
       <point x="502" y="214"/>
       <point x="534" y="268"/>
       <point x="535" y="356" type="curve"/>
@@ -55,11 +55,11 @@
       <point x="517" y="829" type="curve" smooth="yes"/>
       <point x="506" y="838"/>
       <point x="496" y="843"/>
-      <point x="487" y="843" type="curve" name="sv03" smooth="yes"/>
+      <point x="487" y="843" type="curve" smooth="yes" name="sv03"/>
       <point x="419" y="843" type="line" smooth="yes"/>
       <point x="343" y="843"/>
       <point x="312" y="763"/>
-      <point x="312" y="667" type="curve" name="dh02" smooth="yes"/>
+      <point x="312" y="667" type="curve" smooth="yes" name="dh02"/>
       <point x="312" y="358" type="line" smooth="yes"/>
       <point x="312" y="262"/>
       <point x="363" y="214"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10D_8.glif b/source/Hack-Bold.ufo/glyphs/uni10D_8.glif
index 97cb48137..ce2592892 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10D_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10D_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D8" format="1">
+<glyph name="uni10D8" format="2">
   <advance width="1233"/>
   <unicode hex="10D8"/>
   <outline>
@@ -13,13 +13,13 @@
       <point x="98" y="541" type="curve" name="sh01"/>
       <point x="97" y="877"/>
       <point x="272" y="1066"/>
-      <point x="623" y="1066" type="curve" name="dv02" smooth="yes"/>
+      <point x="623" y="1066" type="curve" smooth="yes" name="dv02"/>
       <point x="798" y="1066"/>
       <point x="924" y="1019"/>
       <point x="1009" y="931" type="curve" smooth="yes"/>
       <point x="1096" y="842"/>
       <point x="1136" y="717"/>
-      <point x="1136" y="530" type="curve" name="sh02" smooth="yes"/>
+      <point x="1136" y="530" type="curve" smooth="yes" name="sh02"/>
       <point x="1136" y="433"/>
       <point x="1125" y="334"/>
       <point x="1094" y="246" type="curve" smooth="yes"/>
@@ -29,19 +29,19 @@
       <point x="688" y="0" type="line" name="ih01"/>
       <point x="847" y="201"/>
       <point x="842" y="365"/>
-      <point x="842" y="541" type="curve" name="ah01" smooth="yes"/>
+      <point x="842" y="541" type="curve" smooth="yes" name="ah01"/>
       <point x="842" y="633"/>
       <point x="824" y="714"/>
       <point x="785" y="770" type="curve" smooth="yes"/>
       <point x="750" y="822"/>
       <point x="699" y="854"/>
-      <point x="624" y="854" type="curve" name="dv01" smooth="yes"/>
+      <point x="624" y="854" type="curve" smooth="yes" name="dv01"/>
       <point x="561" y="854"/>
       <point x="503" y="832"/>
       <point x="455" y="771" type="curve" smooth="yes"/>
       <point x="410" y="712"/>
       <point x="392" y="640"/>
-      <point x="392" y="497" type="curve" name="sh03" smooth="yes"/>
+      <point x="392" y="497" type="curve" smooth="yes" name="sh03"/>
       <point x="392" y="461"/>
       <point x="393" y="372"/>
       <point x="414" y="281" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10D_9.glif b/source/Hack-Bold.ufo/glyphs/uni10D_9.glif
index d3c56726c..6f72b8cbc 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10D_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10D_9.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D9" format="1">
+<glyph name="uni10D9" format="2">
   <advance width="1233"/>
   <unicode hex="10D9"/>
   <outline>
     <contour>
-      <point x="636" y="-402" type="curve" name="hr00" smooth="yes"/>
+      <point x="636" y="-402" type="curve" smooth="yes" name="hr00"/>
       <point x="273" y="-402"/>
       <point x="98" y="-250"/>
-      <point x="98" y="9" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="9" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="82"/>
       <point x="112" y="127"/>
       <point x="147" y="189" type="curve" smooth="yes"/>
@@ -17,29 +17,29 @@
       <point x="425" y="177" type="line"/>
       <point x="413" y="158"/>
       <point x="404" y="143"/>
-      <point x="400" y="123" type="curve" name="sh03" smooth="yes"/>
+      <point x="400" y="123" type="curve" smooth="yes" name="sh03"/>
       <point x="395" y="100"/>
       <point x="392" y="74"/>
-      <point x="392" y="45" type="curve" name="sh02" smooth="yes"/>
+      <point x="392" y="45" type="curve" smooth="yes" name="sh02"/>
       <point x="392" y="-116"/>
       <point x="479" y="-192"/>
-      <point x="631" y="-192" type="curve" name="dv01" smooth="yes"/>
+      <point x="631" y="-192" type="curve" smooth="yes" name="dv01"/>
       <point x="696" y="-192"/>
       <point x="749" y="-178"/>
       <point x="786" y="-146" type="curve" smooth="yes"/>
       <point x="822" y="-115"/>
       <point x="842" y="-68"/>
-      <point x="842" y="0" type="curve" name="ah01" smooth="yes"/>
+      <point x="842" y="0" type="curve" smooth="yes" name="ah01"/>
       <point x="842" y="47" type="line" smooth="yes"/>
       <point x="842" y="195"/>
       <point x="798" y="276"/>
-      <point x="681" y="276" type="curve" name="dv03" smooth="yes"/>
+      <point x="681" y="276" type="curve" smooth="yes" name="dv03"/>
       <point x="548" y="276" type="line"/>
       <point x="548" y="496" type="line"/>
-      <point x="681" y="496" type="line" name="dv04" smooth="yes"/>
+      <point x="681" y="496" type="line" smooth="yes" name="dv04"/>
       <point x="788" y="496"/>
       <point x="842" y="540"/>
-      <point x="842" y="627" type="curve" name="sh04" smooth="yes"/>
+      <point x="842" y="627" type="curve" smooth="yes" name="sh04"/>
       <point x="842" y="695"/>
       <point x="809" y="742"/>
       <point x="724" y="777" type="curve" smooth="yes"/>
@@ -56,7 +56,7 @@
       <point x="1055" y="340"/>
       <point x="1139" y="225"/>
       <point x="1136" y="58" type="curve" smooth="yes"/>
-      <point x="1135" y="0" type="line" name="sh06" smooth="yes"/>
+      <point x="1135" y="0" type="line" smooth="yes" name="sh06"/>
       <point x="1130" y="-267"/>
       <point x="977" y="-402"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10D_A_.glif b/source/Hack-Bold.ufo/glyphs/uni10D_A_.glif
index 6c1f08a1e..3e2201644 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10D_A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10D_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10DA" format="1">
+<glyph name="uni10DA" format="2">
   <advance width="1233"/>
   <unicode hex="10DA"/>
   <outline>
@@ -20,13 +20,13 @@
       <point x="317" y="-6" type="curve" name="hr01"/>
       <point x="165" y="159"/>
       <point x="98" y="371"/>
-      <point x="98" y="580" type="curve" name="dh01" smooth="yes"/>
+      <point x="98" y="580" type="curve" smooth="yes" name="dh01"/>
       <point x="98" y="907"/>
       <point x="262" y="1066"/>
-      <point x="605" y="1066" type="curve" name="hr02" smooth="yes"/>
+      <point x="605" y="1066" type="curve" smooth="yes" name="hr02"/>
       <point x="956" y="1066"/>
       <point x="1136" y="900"/>
-      <point x="1136" y="604" type="curve" name="sh01" smooth="yes"/>
+      <point x="1136" y="604" type="curve" smooth="yes" name="sh01"/>
       <point x="1136" y="482"/>
       <point x="1105" y="435"/>
       <point x="1057" y="368" type="curve" smooth="yes"/>
@@ -45,28 +45,28 @@
       <point x="801" y="147" type="line"/>
       <point x="794" y="174"/>
       <point x="788" y="193"/>
-      <point x="781" y="216" type="curve" name="hr03" smooth="yes"/>
+      <point x="781" y="216" type="curve" smooth="yes" name="hr03"/>
       <point x="773" y="244"/>
       <point x="772" y="255"/>
-      <point x="772" y="274" type="curve" name="dh03" smooth="yes"/>
+      <point x="772" y="274" type="curve" smooth="yes" name="dh03"/>
       <point x="772" y="330"/>
       <point x="782" y="383"/>
       <point x="794" y="406" type="curve" smooth="yes"/>
       <point x="824" y="463"/>
       <point x="842" y="504"/>
-      <point x="842" y="586" type="curve" name="ih01" smooth="yes"/>
+      <point x="842" y="586" type="curve" smooth="yes" name="ih01"/>
       <point x="842" y="686"/>
       <point x="815" y="749"/>
       <point x="776" y="789" type="curve" smooth="yes"/>
       <point x="734" y="832"/>
       <point x="677" y="853"/>
-      <point x="604" y="853" type="curve" name="dv01" smooth="yes"/>
+      <point x="604" y="853" type="curve" smooth="yes" name="dv01"/>
       <point x="456" y="853"/>
       <point x="392" y="764"/>
-      <point x="392" y="567" type="curve" name="dh02" smooth="yes"/>
+      <point x="392" y="567" type="curve" smooth="yes" name="dh02"/>
       <point x="392" y="229"/>
       <point x="586" y="69"/>
-      <point x="676" y="0" type="curve" name="hr04" smooth="yes"/>
+      <point x="676" y="0" type="curve" smooth="yes" name="hr04"/>
       <point x="818" y="-107"/>
       <point x="1007" y="-252"/>
       <point x="1007" y="-402" type="curve" name="dh04"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10D_B_.glif b/source/Hack-Bold.ufo/glyphs/uni10D_B_.glif
index 816656f30..4dab824c6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10D_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10D_B_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10DB" format="1">
+<glyph name="uni10DB" format="2">
   <advance width="1233"/>
   <unicode hex="10DB"/>
   <outline>
     <contour>
-      <point x="628" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="628" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="281" y="0"/>
       <point x="100" y="178"/>
       <point x="100" y="534" type="curve" smooth="yes"/>
@@ -13,14 +13,14 @@
       <point x="230" y="914" type="curve" smooth="yes"/>
       <point x="318" y="994"/>
       <point x="453" y="1027"/>
-      <point x="601" y="1027" type="curve" name="dv04" smooth="yes"/>
+      <point x="601" y="1027" type="curve" smooth="yes" name="dv04"/>
       <point x="712" y="1027"/>
       <point x="778" y="1008"/>
       <point x="839" y="931" type="curve" name="iv01"/>
-      <point x="839" y="1154" type="line" name="dh03" smooth="yes"/>
+      <point x="839" y="1154" type="line" smooth="yes" name="dh03"/>
       <point x="839" y="1279"/>
       <point x="757" y="1340"/>
-      <point x="606" y="1340" type="curve" name="dv01" smooth="yes"/>
+      <point x="606" y="1340" type="curve" smooth="yes" name="dv01"/>
       <point x="493" y="1340"/>
       <point x="426" y="1306"/>
       <point x="426" y="1234" type="curve" smooth="yes"/>
@@ -29,31 +29,31 @@
       <point x="120" y="1234" type="line" smooth="yes"/>
       <point x="120" y="1446"/>
       <point x="286" y="1551"/>
-      <point x="605" y="1551" type="curve" name="dv02" smooth="yes"/>
+      <point x="605" y="1551" type="curve" smooth="yes" name="dv02"/>
       <point x="957" y="1551"/>
       <point x="1136" y="1423"/>
-      <point x="1136" y="1158" type="curve" name="dh04" smooth="yes"/>
+      <point x="1136" y="1158" type="curve" smooth="yes" name="dh04"/>
       <point x="1136" y="471" type="line" smooth="yes"/>
       <point x="1136" y="184"/>
       <point x="973" y="0"/>
     </contour>
     <contour>
-      <point x="624" y="214" type="curve" name="sv01" smooth="yes"/>
+      <point x="624" y="214" type="curve" smooth="yes" name="sv01"/>
       <point x="768" y="214"/>
       <point x="842" y="313"/>
-      <point x="842" y="517" type="curve" name="hr02" smooth="yes"/>
+      <point x="842" y="517" type="curve" smooth="yes" name="hr02"/>
       <point x="842" y="624"/>
       <point x="822" y="702"/>
       <point x="782" y="750" type="curve" smooth="yes"/>
       <point x="743" y="797"/>
       <point x="686" y="814"/>
-      <point x="617" y="814" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="814" type="curve" smooth="yes" name="dv03"/>
       <point x="545" y="814"/>
       <point x="491" y="797"/>
       <point x="452" y="750" type="curve" smooth="yes"/>
       <point x="411" y="703"/>
       <point x="391" y="629"/>
-      <point x="391" y="528" type="curve" name="dh02" smooth="yes"/>
+      <point x="391" y="528" type="curve" smooth="yes" name="dh02"/>
       <point x="391" y="310"/>
       <point x="483" y="214"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10D_C_.glif b/source/Hack-Bold.ufo/glyphs/uni10D_C_.glif
index d4f1f3c44..ebeb579ac 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10D_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10D_C_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10DC" format="1">
+<glyph name="uni10DC" format="2">
   <advance width="1233"/>
   <unicode hex="10DC"/>
   <outline>
     <contour>
-      <point x="611" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="611" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="272" y="0"/>
       <point x="98" y="166"/>
-      <point x="98" y="501" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="501" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="1158" type="line"/>
       <point x="97" y="1403"/>
       <point x="229" y="1525"/>
@@ -17,28 +17,28 @@
       <point x="473" y="1303" type="line" smooth="yes"/>
       <point x="420" y="1303"/>
       <point x="393" y="1274"/>
-      <point x="393" y="1186" type="curve" name="sh03" smooth="yes"/>
+      <point x="393" y="1186" type="curve" smooth="yes" name="sh03"/>
       <point x="393" y="961" type="line" name="ih01"/>
       <point x="473" y="1044"/>
       <point x="523" y="1067"/>
-      <point x="637" y="1067" type="curve" name="dv04" smooth="yes"/>
+      <point x="637" y="1067" type="curve" smooth="yes" name="dv04"/>
       <point x="953" y="1067"/>
       <point x="1136" y="889"/>
-      <point x="1136" y="530" type="curve" name="sh04" smooth="yes"/>
+      <point x="1136" y="530" type="curve" smooth="yes" name="sh04"/>
       <point x="1136" y="179"/>
       <point x="963" y="0"/>
     </contour>
     <contour>
-      <point x="618" y="213" type="curve" name="sv01" smooth="yes"/>
+      <point x="618" y="213" type="curve" smooth="yes" name="sv01"/>
       <point x="759" y="213"/>
       <point x="842" y="315"/>
-      <point x="842" y="532" type="curve" name="ah01" smooth="yes"/>
+      <point x="842" y="532" type="curve" smooth="yes" name="ah01"/>
       <point x="842" y="747"/>
       <point x="763" y="853"/>
-      <point x="616" y="853" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="853" type="curve" smooth="yes" name="dv03"/>
       <point x="477" y="853"/>
       <point x="393" y="754"/>
-      <point x="393" y="535" type="curve" name="sh02" smooth="yes"/>
+      <point x="393" y="535" type="curve" smooth="yes" name="sh02"/>
       <point x="393" y="322"/>
       <point x="470" y="213"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10D_D_.glif b/source/Hack-Bold.ufo/glyphs/uni10D_D_.glif
index 5fdf786f6..3bc48efd6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10D_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10D_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10DD" format="1">
+<glyph name="uni10DD" format="2">
   <advance width="1233"/>
   <unicode hex="10DD"/>
   <outline>
@@ -7,21 +7,21 @@
       <point x="202" y="0" type="line" name="hr00"/>
       <point x="65" y="161"/>
       <point x="27" y="318"/>
-      <point x="27" y="468" type="curve" name="dh01" smooth="yes"/>
+      <point x="27" y="468" type="curve" smooth="yes" name="dh01"/>
       <point x="27" y="549" type="line" smooth="yes"/>
       <point x="27" y="882"/>
       <point x="161" y="1056"/>
-      <point x="420" y="1056" type="curve" name="sv01" smooth="yes"/>
+      <point x="420" y="1056" type="curve" smooth="yes" name="sv01"/>
       <point x="513" y="1056"/>
       <point x="567" y="1033"/>
       <point x="619" y="985" type="curve"/>
       <point x="671" y="1034"/>
       <point x="715" y="1056"/>
-      <point x="807" y="1056" type="curve" name="dv02" smooth="yes"/>
+      <point x="807" y="1056" type="curve" smooth="yes" name="dv02"/>
       <point x="1067" y="1056"/>
       <point x="1206" y="884"/>
       <point x="1206" y="559" type="curve" smooth="yes"/>
-      <point x="1206" y="468" type="line" name="dh06" smooth="yes"/>
+      <point x="1206" y="468" type="line" smooth="yes" name="dh06"/>
       <point x="1206" y="391"/>
       <point x="1197" y="314"/>
       <point x="1170" y="235" type="curve" smooth="yes"/>
@@ -31,11 +31,11 @@
       <point x="757" y="0" type="line" name="ih01"/>
       <point x="901" y="155"/>
       <point x="923" y="290"/>
-      <point x="923" y="416" type="curve" name="dh05" smooth="yes"/>
+      <point x="923" y="416" type="curve" smooth="yes" name="dh05"/>
       <point x="923" y="663" type="line" smooth="yes"/>
       <point x="923" y="783"/>
       <point x="887" y="843"/>
-      <point x="827" y="843" type="curve" name="dv01" smooth="yes"/>
+      <point x="827" y="843" type="curve" smooth="yes" name="dv01"/>
       <point x="764" y="843" type="line" smooth="yes"/>
       <point x="744" y="843"/>
       <point x="726" y="831"/>
@@ -45,12 +45,12 @@
       <point x="504" y="792" type="line" name="dh03"/>
       <point x="504" y="831"/>
       <point x="493" y="841"/>
-      <point x="460" y="842" type="curve" name="sv02" smooth="yes"/>
+      <point x="460" y="842" type="curve" smooth="yes" name="sv02"/>
       <point x="405" y="843" type="line" smooth="yes"/>
       <point x="352" y="844"/>
       <point x="313" y="788"/>
       <point x="313" y="663" type="curve" smooth="yes"/>
-      <point x="313" y="422" type="line" name="dh02" smooth="yes"/>
+      <point x="313" y="422" type="line" smooth="yes" name="dh02"/>
       <point x="313" y="358"/>
       <point x="318" y="292"/>
       <point x="345" y="221" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10D_E_.glif b/source/Hack-Bold.ufo/glyphs/uni10D_E_.glif
index ea7a894e9..66cb4a43a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10D_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10D_E_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10DE" format="1">
+<glyph name="uni10DE" format="2">
   <advance width="1233"/>
   <unicode hex="10DE"/>
   <outline>
     <contour>
-      <point x="613" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="613" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="273" y="0"/>
       <point x="98" y="149"/>
-      <point x="98" y="464" type="curve" name="dh01" smooth="yes"/>
+      <point x="98" y="464" type="curve" smooth="yes" name="dh01"/>
       <point x="98" y="488"/>
       <point x="99" y="517"/>
       <point x="110" y="552" type="curve" smooth="yes"/>
@@ -17,22 +17,22 @@
       <point x="433" y="667" type="line" name="ih01"/>
       <point x="402" y="583"/>
       <point x="392" y="523"/>
-      <point x="392" y="455" type="curve" name="dh02" smooth="yes"/>
+      <point x="392" y="455" type="curve" smooth="yes" name="dh02"/>
       <point x="392" y="290"/>
       <point x="481" y="214"/>
-      <point x="617" y="214" type="curve" name="sv01" smooth="yes"/>
+      <point x="617" y="214" type="curve" smooth="yes" name="sv01"/>
       <point x="766" y="214"/>
       <point x="842" y="302"/>
-      <point x="842" y="481" type="curve" name="sh01" smooth="yes"/>
+      <point x="842" y="481" type="curve" smooth="yes" name="sh01"/>
       <point x="842" y="672"/>
       <point x="753" y="761"/>
-      <point x="609" y="761" type="curve" name="dv01" smooth="yes"/>
+      <point x="609" y="761" type="curve" smooth="yes" name="dv01"/>
       <point x="486" y="761" type="line"/>
       <point x="486" y="965" type="line"/>
-      <point x="630" y="965" type="line" name="dv02" smooth="yes"/>
+      <point x="630" y="965" type="line" smooth="yes" name="dv02"/>
       <point x="751" y="965"/>
       <point x="806" y="1039"/>
-      <point x="806" y="1108" type="curve" name="dh03" smooth="yes"/>
+      <point x="806" y="1108" type="curve" smooth="yes" name="dh03"/>
       <point x="806" y="1189"/>
       <point x="730" y="1230"/>
       <point x="557" y="1250" type="curve" name="hr02"/>
@@ -46,13 +46,13 @@
       <point x="692" y="1439" type="line"/>
       <point x="957" y="1410"/>
       <point x="1088" y="1304"/>
-      <point x="1088" y="1112" type="curve" name="dh04" smooth="yes"/>
+      <point x="1088" y="1112" type="curve" smooth="yes" name="dh04"/>
       <point x="1088" y="991"/>
       <point x="1036" y="907"/>
       <point x="923" y="851" type="curve" name="ih02"/>
       <point x="1070" y="763"/>
       <point x="1136" y="659"/>
-      <point x="1136" y="468" type="curve" name="sh02" smooth="yes"/>
+      <point x="1136" y="468" type="curve" smooth="yes" name="sh02"/>
       <point x="1136" y="163"/>
       <point x="968" y="0"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10D_F_.glif b/source/Hack-Bold.ufo/glyphs/uni10D_F_.glif
index 50a3062f0..e9815395f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10D_F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10D_F_.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10DF" format="1">
+<glyph name="uni10DF" format="2">
   <advance width="1233"/>
   <unicode hex="10DF"/>
   <outline>
     <contour>
-      <point x="612" y="-402" type="curve" name="dv01" smooth="yes"/>
+      <point x="612" y="-402" type="curve" smooth="yes" name="dv01"/>
       <point x="268" y="-402"/>
       <point x="98" y="-263"/>
       <point x="97" y="22" type="curve" name="dh01"/>
       <point x="391" y="22" type="line" name="dh02"/>
       <point x="391" y="-115"/>
       <point x="459" y="-191"/>
-      <point x="610" y="-191" type="curve" name="dv02" smooth="yes"/>
+      <point x="610" y="-191" type="curve" smooth="yes" name="dv02"/>
       <point x="682" y="-191"/>
       <point x="748" y="-174"/>
       <point x="793" y="-138" type="curve" smooth="yes"/>
       <point x="837" y="-103"/>
       <point x="862" y="-50"/>
-      <point x="862" y="22" type="curve" name="dh05" smooth="yes"/>
+      <point x="862" y="22" type="curve" smooth="yes" name="dh05"/>
       <point x="862" y="863" type="line"/>
       <point x="819" y="858"/>
       <point x="778" y="854"/>
@@ -41,7 +41,7 @@
       <point x="666" y="688" type="curve" smooth="yes"/>
       <point x="690" y="633"/>
       <point x="697" y="562"/>
-      <point x="697" y="509" type="curve" name="dh04" smooth="yes"/>
+      <point x="697" y="509" type="curve" smooth="yes" name="dh04"/>
       <point x="697" y="396"/>
       <point x="666" y="305"/>
       <point x="559" y="246" type="curve" smooth="yes"/>
@@ -51,13 +51,13 @@
       <point x="97" y="399" type="line" name="dv03"/>
       <point x="376" y="399"/>
       <point x="457" y="430"/>
-      <point x="457" y="516" type="curve" name="dh03" smooth="yes"/>
+      <point x="457" y="516" type="curve" smooth="yes" name="dh03"/>
       <point x="457" y="618"/>
       <point x="341" y="735"/>
       <point x="97" y="781" type="curve" name="sh02"/>
       <point x="97" y="963" type="line" name="hr01"/>
       <point x="1137" y="1103" type="line" name="hr02"/>
-      <point x="1137" y="20" type="line" name="dh06" smooth="yes"/>
+      <point x="1137" y="20" type="line" smooth="yes" name="dh06"/>
       <point x="1137" y="-259"/>
       <point x="960" y="-402"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10E_0.glif b/source/Hack-Bold.ufo/glyphs/uni10E_0.glif
index 5f1a3f44e..ad6f8caf8 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10E_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10E_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E0" format="1">
+<glyph name="uni10E0" format="2">
   <advance width="1233"/>
   <unicode hex="10E0"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="215" y="0" type="line" name="hr00"/>
       <point x="63" y="152"/>
       <point x="27" y="376"/>
-      <point x="27" y="512" type="curve" name="dh01" smooth="yes"/>
+      <point x="27" y="512" type="curve" smooth="yes" name="dh01"/>
       <point x="27" y="599" type="line" smooth="yes"/>
       <point x="27" y="757"/>
       <point x="95" y="969"/>
@@ -24,11 +24,11 @@
       <point x="622" y="998" type="curve"/>
       <point x="675" y="1046"/>
       <point x="748" y="1066"/>
-      <point x="836" y="1066" type="curve" name="dv02" smooth="yes"/>
+      <point x="836" y="1066" type="curve" smooth="yes" name="dv02"/>
       <point x="1085" y="1066"/>
       <point x="1206" y="909"/>
       <point x="1206" y="602" type="curve" smooth="yes"/>
-      <point x="1206" y="468" type="line" name="dh06" smooth="yes"/>
+      <point x="1206" y="468" type="line" smooth="yes" name="dh06"/>
       <point x="1206" y="388"/>
       <point x="1203" y="311"/>
       <point x="1180" y="232" type="curve" smooth="yes"/>
@@ -48,7 +48,7 @@
       <point x="902" y="796" type="curve" smooth="yes"/>
       <point x="886" y="829"/>
       <point x="865" y="853"/>
-      <point x="842" y="853" type="curve" name="dv01" smooth="yes"/>
+      <point x="842" y="853" type="curve" smooth="yes" name="dv01"/>
       <point x="778" y="853" type="line" smooth="yes"/>
       <point x="751" y="853"/>
       <point x="737" y="843"/>
@@ -61,12 +61,12 @@
       <point x="499" y="843" type="curve" smooth="yes"/>
       <point x="490" y="851"/>
       <point x="477" y="853"/>
-      <point x="461" y="853" type="curve" name="sv01" smooth="yes"/>
+      <point x="461" y="853" type="curve" smooth="yes" name="sv01"/>
       <point x="392" y="853" type="line" smooth="yes"/>
       <point x="348" y="853"/>
       <point x="311" y="752"/>
       <point x="311" y="700" type="curve" smooth="yes"/>
-      <point x="311" y="446" type="line" name="dh02" smooth="yes"/>
+      <point x="311" y="446" type="line" smooth="yes" name="dh02"/>
       <point x="311" y="299"/>
       <point x="315" y="152"/>
       <point x="490" y="0" type="curve" name="ih03"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10E_1.glif b/source/Hack-Bold.ufo/glyphs/uni10E_1.glif
index 7c923cac1..024a928d6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10E_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10E_1.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E1" format="1">
+<glyph name="uni10E1" format="2">
   <advance width="1233"/>
   <unicode hex="10E1"/>
   <outline>
     <contour>
-      <point x="617" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="272" y="0"/>
       <point x="97" y="176"/>
-      <point x="97" y="525" type="curve" name="sh01" smooth="yes"/>
+      <point x="97" y="525" type="curve" smooth="yes" name="sh01"/>
       <point x="97" y="1517" type="line" name="at01"/>
       <point x="392" y="1517" type="line"/>
-      <point x="392" y="525" type="line" name="sh02" smooth="yes"/>
+      <point x="392" y="525" type="line" smooth="yes" name="sh02"/>
       <point x="392" y="314"/>
       <point x="480" y="214"/>
-      <point x="618" y="214" type="curve" name="sv01" smooth="yes"/>
+      <point x="618" y="214" type="curve" smooth="yes" name="sv01"/>
       <point x="763" y="214"/>
       <point x="842" y="322"/>
-      <point x="842" y="513" type="curve" name="ah01" smooth="yes"/>
+      <point x="842" y="513" type="curve" smooth="yes" name="ah01"/>
       <point x="842" y="640"/>
       <point x="805" y="680"/>
       <point x="722" y="734" type="curve" smooth="yes"/>
@@ -35,13 +35,13 @@
       <point x="790" y="962" type="curve" smooth="yes"/>
       <point x="790" y="946"/>
       <point x="810" y="930"/>
-      <point x="841" y="913" type="curve" name="sh04" smooth="yes"/>
+      <point x="841" y="913" type="curve" smooth="yes" name="sh04"/>
       <point x="881" y="892"/>
       <point x="942" y="862"/>
       <point x="955" y="854" type="curve"/>
       <point x="1078" y="791"/>
       <point x="1137" y="683"/>
-      <point x="1137" y="498" type="curve" name="sh05" smooth="yes"/>
+      <point x="1137" y="498" type="curve" smooth="yes" name="sh05"/>
       <point x="1137" y="183"/>
       <point x="966" y="0"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10E_2.glif b/source/Hack-Bold.ufo/glyphs/uni10E_2.glif
index a30600003..5288b9794 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10E_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10E_2.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E2" format="1">
+<glyph name="uni10E2" format="2">
   <advance width="1233"/>
   <unicode hex="10E2"/>
   <outline>
     <contour>
-      <point x="621" y="-403" type="curve" name="hr00" smooth="yes"/>
+      <point x="621" y="-403" type="curve" smooth="yes" name="hr00"/>
       <point x="221" y="-403"/>
       <point x="18" y="-147"/>
-      <point x="18" y="313" type="curve" name="sh01" smooth="yes"/>
+      <point x="18" y="313" type="curve" smooth="yes" name="sh01"/>
       <point x="18" y="534"/>
       <point x="63" y="689"/>
       <point x="155" y="808" type="curve" smooth="yes"/>
@@ -22,15 +22,15 @@
       <point x="1083" y="809" type="curve" smooth="yes"/>
       <point x="1171" y="692"/>
       <point x="1215" y="536"/>
-      <point x="1215" y="313" type="curve" name="sh02" smooth="yes"/>
+      <point x="1215" y="313" type="curve" smooth="yes" name="sh02"/>
       <point x="1215" y="-152"/>
       <point x="1017" y="-403"/>
     </contour>
     <contour>
-      <point x="618" y="-191" type="curve" name="dv01" smooth="yes"/>
+      <point x="618" y="-191" type="curve" smooth="yes" name="dv01"/>
       <point x="825" y="-191"/>
       <point x="927" y="-16"/>
-      <point x="927" y="327" type="curve" name="ah01" smooth="yes"/>
+      <point x="927" y="327" type="curve" smooth="yes" name="ah01"/>
       <point x="927" y="589"/>
       <point x="866" y="759"/>
       <point x="712" y="825" type="curve" name="ih01"/>
@@ -39,7 +39,7 @@
       <point x="526" y="824" type="line" name="ih02"/>
       <point x="377" y="757"/>
       <point x="311" y="598"/>
-      <point x="311" y="325" type="curve" name="sh03" smooth="yes"/>
+      <point x="311" y="325" type="curve" smooth="yes" name="sh03"/>
       <point x="311" y="-18"/>
       <point x="411" y="-191"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10E_3.glif b/source/Hack-Bold.ufo/glyphs/uni10E_3.glif
index 3d4089a56..d268c4639 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10E_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10E_3.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E3" format="1">
+<glyph name="uni10E3" format="2">
   <advance width="1233"/>
   <unicode hex="10E3"/>
   <outline>
     <contour>
-      <point x="649" y="-403" type="curve" name="hr00" smooth="yes"/>
+      <point x="649" y="-403" type="curve" smooth="yes" name="hr00"/>
       <point x="316" y="-403"/>
       <point x="144" y="-244"/>
-      <point x="144" y="16" type="curve" name="sh01" smooth="yes"/>
+      <point x="144" y="16" type="curve" smooth="yes" name="sh01"/>
       <point x="144" y="95"/>
       <point x="159" y="148"/>
       <point x="190" y="205" type="curve" smooth="yes"/>
@@ -17,20 +17,20 @@
       <point x="449" y="234" type="line"/>
       <point x="416" y="166"/>
       <point x="415" y="107"/>
-      <point x="415" y="36" type="curve" name="sh02" smooth="yes"/>
+      <point x="415" y="36" type="curve" smooth="yes" name="sh02"/>
       <point x="415" y="-117"/>
       <point x="514" y="-191"/>
-      <point x="647" y="-191" type="curve" name="dv01" smooth="yes"/>
+      <point x="647" y="-191" type="curve" smooth="yes" name="dv01"/>
       <point x="780" y="-191"/>
       <point x="842" y="-120"/>
-      <point x="842" y="44" type="curve" name="ah01" smooth="yes"/>
+      <point x="842" y="44" type="curve" smooth="yes" name="ah01"/>
       <point x="842" y="767" type="line" smooth="yes"/>
       <point x="842" y="799"/>
       <point x="836" y="820"/>
       <point x="824" y="830" type="curve" smooth="yes"/>
       <point x="811" y="841"/>
       <point x="786" y="843"/>
-      <point x="765" y="843" type="curve" name="dv02" smooth="yes"/>
+      <point x="765" y="843" type="curve" smooth="yes" name="dv02"/>
       <point x="722" y="843"/>
       <point x="692" y="834"/>
       <point x="676" y="785" type="curve" smooth="yes"/>
@@ -45,7 +45,7 @@
       <point x="470" y="784" type="curve" smooth="yes"/>
       <point x="458" y="827"/>
       <point x="432" y="843"/>
-      <point x="393" y="843" type="curve" name="sv01" smooth="yes"/>
+      <point x="393" y="843" type="curve" smooth="yes" name="sv01"/>
       <point x="345" y="843"/>
       <point x="320" y="816"/>
       <point x="295" y="785" type="curve" smooth="yes"/>
@@ -58,7 +58,7 @@
       <point x="83" y="1088" type="line" name="av01"/>
       <point x="99" y="1060"/>
       <point x="127" y="1022"/>
-      <point x="150" y="999" type="curve" name="sh03" smooth="yes"/>
+      <point x="150" y="999" type="curve" smooth="yes" name="sh03"/>
       <point x="177" y="972"/>
       <point x="205" y="953"/>
       <point x="229" y="953" type="curve" smooth="yes"/>
@@ -70,13 +70,13 @@
       <point x="349" y="1040" type="curve" smooth="yes"/>
       <point x="366" y="1051"/>
       <point x="386" y="1056"/>
-      <point x="410" y="1056" type="curve" name="sh04" smooth="yes"/>
+      <point x="410" y="1056" type="curve" smooth="yes" name="sh04"/>
       <point x="481" y="1056"/>
       <point x="524" y="1007"/>
       <point x="571" y="934" type="curve" name="ih01"/>
       <point x="634" y="1018"/>
       <point x="700" y="1056"/>
-      <point x="805" y="1056" type="curve" name="dv03" smooth="yes"/>
+      <point x="805" y="1056" type="curve" smooth="yes" name="dv03"/>
       <point x="1002" y="1056"/>
       <point x="1136" y="919"/>
       <point x="1136" y="632" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10E_4.glif b/source/Hack-Bold.ufo/glyphs/uni10E_4.glif
index 2b3711946..b1ae28981 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10E_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10E_4.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E4" format="1">
+<glyph name="uni10E4" format="2">
   <advance width="1233"/>
   <unicode hex="10E4"/>
   <outline>
     <contour>
-      <point x="681" y="-402" type="line" name="hr00" smooth="yes"/>
+      <point x="681" y="-402" type="line" smooth="yes" name="hr00"/>
       <point x="399" y="-402"/>
       <point x="198" y="-284"/>
       <point x="198" y="14" type="curve"/>
       <point x="457" y="-26" type="line"/>
       <point x="457" y="-183"/>
       <point x="552" y="-191"/>
-      <point x="683" y="-191" type="curve" name="dv01" smooth="yes"/>
+      <point x="683" y="-191" type="curve" smooth="yes" name="dv01"/>
       <point x="708" y="-191" type="line" smooth="yes"/>
       <point x="832" y="-191"/>
       <point x="932" y="-136"/>
-      <point x="932" y="-35" type="curve" name="sh01" smooth="yes"/>
+      <point x="932" y="-35" type="curve" smooth="yes" name="sh01"/>
       <point x="932" y="197" type="line"/>
       <point x="843" y="197" type="line"/>
       <point x="843" y="386" type="line"/>
@@ -28,29 +28,29 @@
       <point x="762" y="832"/>
       <point x="759" y="818"/>
       <point x="758" y="799" type="curve"/>
-      <point x="758" y="520" type="line" name="dh04" smooth="yes"/>
+      <point x="758" y="520" type="line" smooth="yes" name="dh04"/>
       <point x="758" y="380"/>
       <point x="740" y="271"/>
       <point x="687" y="195" type="curve" smooth="yes"/>
       <point x="636" y="122"/>
       <point x="559" y="85"/>
-      <point x="431" y="85" type="curve" name="dv03" smooth="yes"/>
+      <point x="431" y="85" type="curve" smooth="yes" name="dv03"/>
       <point x="164" y="85"/>
       <point x="27" y="250"/>
       <point x="27" y="585" type="curve" smooth="yes"/>
-      <point x="27" y="629" type="line" name="dh01" smooth="yes"/>
+      <point x="27" y="629" type="line" smooth="yes" name="dh01"/>
       <point x="27" y="916"/>
       <point x="166" y="1066"/>
-      <point x="430" y="1066" type="curve" name="sv01" smooth="yes"/>
+      <point x="430" y="1066" type="curve" smooth="yes" name="sv01"/>
       <point x="529" y="1066"/>
       <point x="598" y="1045"/>
       <point x="655" y="997" type="curve"/>
       <point x="711" y="1044"/>
       <point x="785" y="1066"/>
-      <point x="870" y="1066" type="curve" name="dv02" smooth="yes"/>
+      <point x="870" y="1066" type="curve" smooth="yes" name="dv02"/>
       <point x="1094" y="1066"/>
       <point x="1206" y="907"/>
-      <point x="1206" y="659" type="curve" name="dh06" smooth="yes"/>
+      <point x="1206" y="659" type="curve" smooth="yes" name="dh06"/>
       <point x="1206" y="559"/>
       <point x="1188" y="500"/>
       <point x="1154" y="445" type="curve" smooth="yes"/>
@@ -62,20 +62,20 @@
       <point x="1157" y="195" type="curve" smooth="yes"/>
       <point x="1188" y="151"/>
       <point x="1206" y="105"/>
-      <point x="1206" y="60" type="curve" name="sh02" smooth="yes"/>
+      <point x="1206" y="60" type="curve" smooth="yes" name="sh02"/>
       <point x="1206" y="-22" type="line" smooth="yes"/>
       <point x="1206" y="-303"/>
       <point x="1030" y="-402"/>
       <point x="715" y="-402" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="435" y="280" type="curve" name="dv04" smooth="yes"/>
+      <point x="435" y="280" type="curve" smooth="yes" name="dv04"/>
       <point x="474" y="280"/>
       <point x="500" y="297"/>
       <point x="516" y="321" type="curve" smooth="yes"/>
       <point x="535" y="348"/>
       <point x="543" y="386"/>
-      <point x="543" y="425" type="curve" name="dh03" smooth="yes"/>
+      <point x="543" y="425" type="curve" smooth="yes" name="dh03"/>
       <point x="543" y="802" type="line" smooth="yes"/>
       <point x="543" y="835"/>
       <point x="524" y="851"/>
@@ -86,7 +86,7 @@
       <point x="336" y="811" type="curve" smooth="yes"/>
       <point x="321" y="783"/>
       <point x="312" y="745"/>
-      <point x="312" y="700" type="curve" name="dh02" smooth="yes"/>
+      <point x="312" y="700" type="curve" smooth="yes" name="dh02"/>
       <point x="312" y="425" type="line" smooth="yes"/>
       <point x="312" y="316"/>
       <point x="374" y="280"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10E_5.glif b/source/Hack-Bold.ufo/glyphs/uni10E_5.glif
index cbc3373df..bb85d2982 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10E_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10E_5.glif
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E5" format="1">
+<glyph name="uni10E5" format="2">
   <advance width="1233"/>
   <unicode hex="10E5"/>
   <outline>
     <contour>
-      <point x="625" y="-402" type="curve" name="dv01" smooth="yes"/>
+      <point x="625" y="-402" type="curve" smooth="yes" name="dv01"/>
       <point x="293" y="-402"/>
       <point x="98" y="-255"/>
-      <point x="98" y="30" type="curve" name="dh01" smooth="yes"/>
+      <point x="98" y="30" type="curve" smooth="yes" name="dh01"/>
       <point x="98" y="140"/>
       <point x="130" y="203"/>
       <point x="230" y="300" type="curve"/>
       <point x="439" y="235" type="line"/>
       <point x="406" y="166"/>
       <point x="397" y="93"/>
-      <point x="397" y="42" type="curve" name="dh02" smooth="yes"/>
+      <point x="397" y="42" type="curve" smooth="yes" name="dh02"/>
       <point x="397" y="-117"/>
       <point x="485" y="-191"/>
-      <point x="632" y="-191" type="curve" name="dv02" smooth="yes"/>
+      <point x="632" y="-191" type="curve" smooth="yes" name="dv02"/>
       <point x="703" y="-191"/>
       <point x="758" y="-174"/>
       <point x="801" y="-121" type="curve" smooth="yes"/>
       <point x="841" y="-72"/>
       <point x="863" y="-2"/>
-      <point x="863" y="94" type="curve" name="dh03" smooth="yes"/>
+      <point x="863" y="94" type="curve" smooth="yes" name="dh03"/>
       <point x="863" y="374" type="line" smooth="yes"/>
       <point x="863" y="692"/>
       <point x="805" y="854"/>
-      <point x="609" y="854" type="curve" name="dv03" smooth="yes"/>
+      <point x="609" y="854" type="curve" smooth="yes" name="dv03"/>
       <point x="516" y="854"/>
       <point x="466" y="819"/>
-      <point x="466" y="732" type="curve" name="sh01" smooth="yes"/>
+      <point x="466" y="732" type="curve" smooth="yes" name="sh01"/>
       <point x="466" y="678"/>
       <point x="478" y="620"/>
       <point x="505" y="571" type="curve"/>
@@ -40,10 +40,10 @@
       <point x="196" y="607" type="curve" smooth="yes"/>
       <point x="187" y="650"/>
       <point x="184" y="690"/>
-      <point x="184" y="723" type="curve" name="ih01" smooth="yes"/>
+      <point x="184" y="723" type="curve" smooth="yes" name="ih01"/>
       <point x="184" y="959"/>
       <point x="335" y="1067"/>
-      <point x="583" y="1067" type="curve" name="dv04" smooth="yes"/>
+      <point x="583" y="1067" type="curve" smooth="yes" name="dv04"/>
       <point x="654" y="1067"/>
       <point x="696" y="1058"/>
       <point x="756" y="1032" type="curve" smooth="yes"/>
@@ -58,7 +58,7 @@
       <point x="863" y="1204" type="line" name="sh04"/>
       <point x="863" y="1517" type="line" name="at01"/>
       <point x="1135" y="1517" type="line"/>
-      <point x="1135" y="102" type="line" name="dh04" smooth="yes"/>
+      <point x="1135" y="102" type="line" smooth="yes" name="dh04"/>
       <point x="1135" y="-243"/>
       <point x="970" y="-402"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10E_6.glif b/source/Hack-Bold.ufo/glyphs/uni10E_6.glif
index 6ce0771f6..28c6d60f3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10E_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10E_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E6" format="1">
+<glyph name="uni10E6" format="2">
   <advance width="1233"/>
   <unicode hex="10E6"/>
   <outline>
@@ -23,21 +23,21 @@
       <point x="302" y="-51" type="curve" name="ih01"/>
       <point x="119" y="117"/>
       <point x="27" y="293"/>
-      <point x="27" y="476" type="curve" name="dh01" smooth="yes"/>
+      <point x="27" y="476" type="curve" smooth="yes" name="dh01"/>
       <point x="27" y="552" type="line" smooth="yes"/>
       <point x="27" y="891"/>
       <point x="159" y="1066"/>
-      <point x="412" y="1066" type="curve" name="sv01" smooth="yes"/>
+      <point x="412" y="1066" type="curve" smooth="yes" name="sv01"/>
       <point x="507" y="1066"/>
       <point x="567" y="1040"/>
       <point x="618" y="995" type="curve"/>
       <point x="671" y="1042"/>
       <point x="743" y="1066"/>
-      <point x="834" y="1066" type="curve" name="dv02" smooth="yes"/>
+      <point x="834" y="1066" type="curve" smooth="yes" name="dv02"/>
       <point x="1083" y="1066"/>
       <point x="1206" y="895"/>
       <point x="1206" y="564" type="curve" smooth="yes"/>
-      <point x="1206" y="498" type="line" name="dh06" smooth="yes"/>
+      <point x="1206" y="498" type="line" smooth="yes" name="dh06"/>
       <point x="1206" y="416"/>
       <point x="1192" y="342"/>
       <point x="1165" y="277" type="curve" smooth="yes"/>
@@ -50,11 +50,11 @@
       <point x="887" y="255" type="curve" smooth="yes"/>
       <point x="914" y="308"/>
       <point x="923" y="356"/>
-      <point x="923" y="399" type="curve" name="dh05" smooth="yes"/>
+      <point x="923" y="399" type="curve" smooth="yes" name="dh05"/>
       <point x="923" y="729" type="line" smooth="yes"/>
       <point x="923" y="837"/>
       <point x="894" y="853"/>
-      <point x="849" y="853" type="curve" name="dv01" smooth="yes"/>
+      <point x="849" y="853" type="curve" smooth="yes" name="dv01"/>
       <point x="762" y="853" type="line" smooth="yes"/>
       <point x="743" y="853"/>
       <point x="730" y="846"/>
@@ -64,12 +64,12 @@
       <point x="504" y="804" type="line" smooth="yes"/>
       <point x="504" y="837"/>
       <point x="494" y="853"/>
-      <point x="474" y="853" type="curve" name="sv02" smooth="yes"/>
+      <point x="474" y="853" type="curve" smooth="yes" name="sv02"/>
       <point x="408" y="853" type="line" smooth="yes"/>
       <point x="351" y="853"/>
       <point x="306" y="837"/>
       <point x="306" y="729" type="curve" smooth="yes"/>
-      <point x="306" y="506" type="line" name="dh02" smooth="yes"/>
+      <point x="306" y="506" type="line" smooth="yes" name="dh02"/>
       <point x="306" y="203"/>
       <point x="493" y="95"/>
       <point x="603" y="32" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10E_7.glif b/source/Hack-Bold.ufo/glyphs/uni10E_7.glif
index ca450ef8a..0c7b5f732 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10E_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10E_7.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E7" format="1">
+<glyph name="uni10E7" format="2">
   <advance width="1233"/>
   <unicode hex="10E7"/>
   <outline>
     <contour>
-      <point x="635" y="-402" type="curve" name="dv01" smooth="yes"/>
+      <point x="635" y="-402" type="curve" smooth="yes" name="dv01"/>
       <point x="278" y="-402"/>
       <point x="100" y="-250"/>
       <point x="100" y="54" type="curve" name="sh01"/>
       <point x="411" y="54" type="line" name="sh02"/>
       <point x="411" y="-110"/>
       <point x="486" y="-192"/>
-      <point x="637" y="-192" type="curve" name="dv02" smooth="yes"/>
+      <point x="637" y="-192" type="curve" smooth="yes" name="dv02"/>
       <point x="766" y="-192"/>
       <point x="843" y="-131"/>
-      <point x="843" y="-3" type="curve" name="ah01" smooth="yes"/>
+      <point x="843" y="-3" type="curve" smooth="yes" name="ah01"/>
       <point x="843" y="250" type="line" name="iv01"/>
       <point x="792" y="209"/>
       <point x="763" y="188"/>
@@ -37,22 +37,22 @@
       <point x="488" y="843" type="curve" smooth="yes"/>
       <point x="453" y="794"/>
       <point x="432" y="754"/>
-      <point x="421" y="713" type="curve" name="sh05" smooth="yes"/>
+      <point x="421" y="713" type="curve" smooth="yes" name="sh05"/>
       <point x="410" y="674"/>
       <point x="410" y="645"/>
-      <point x="410" y="614" type="curve" name="sh06" smooth="yes"/>
+      <point x="410" y="614" type="curve" smooth="yes" name="sh06"/>
       <point x="410" y="501"/>
       <point x="424" y="445"/>
       <point x="460" y="409" type="curve" smooth="yes"/>
       <point x="495" y="376"/>
       <point x="545" y="364"/>
-      <point x="613" y="364" type="curve" name="dv04" smooth="yes"/>
+      <point x="613" y="364" type="curve" smooth="yes" name="dv04"/>
       <point x="765" y="364"/>
       <point x="843" y="422"/>
-      <point x="843" y="547" type="curve" name="sh07" smooth="yes"/>
+      <point x="843" y="547" type="curve" smooth="yes" name="sh07"/>
       <point x="843" y="1030" type="line" name="av02"/>
       <point x="1136" y="1030" type="line" name="hr01"/>
-      <point x="1136" y="-7" type="line" name="sh04" smooth="yes"/>
+      <point x="1136" y="-7" type="line" smooth="yes" name="sh04"/>
       <point x="1136" y="-270"/>
       <point x="969" y="-402"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10E_8.glif b/source/Hack-Bold.ufo/glyphs/uni10E_8.glif
index 3ca414730..901a52b6b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10E_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10E_8.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E8" format="1">
+<glyph name="uni10E8" format="2">
   <advance width="1233"/>
   <unicode hex="10E8"/>
   <outline>
     <contour>
-      <point x="650" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="650" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="299" y="0"/>
       <point x="106" y="176"/>
-      <point x="106" y="535" type="curve" name="dh01" smooth="yes"/>
+      <point x="106" y="535" type="curve" smooth="yes" name="dh01"/>
       <point x="106" y="716"/>
       <point x="151" y="836"/>
       <point x="234" y="908" type="curve" smooth="yes"/>
       <point x="319" y="983"/>
       <point x="457" y="1017"/>
-      <point x="594" y="1017" type="curve" name="dv03" smooth="yes"/>
+      <point x="594" y="1017" type="curve" smooth="yes" name="dv03"/>
       <point x="705" y="1017"/>
       <point x="762" y="995"/>
       <point x="840" y="917" type="curve" name="iv01"/>
-      <point x="840" y="1179" type="line" name="dh05" smooth="yes"/>
+      <point x="840" y="1179" type="line" smooth="yes" name="dh05"/>
       <point x="840" y="1311"/>
       <point x="797" y="1342"/>
-      <point x="726" y="1342" type="curve" name="sv01" smooth="yes"/>
+      <point x="726" y="1342" type="curve" smooth="yes" name="sv01"/>
       <point x="695" y="1342"/>
       <point x="659" y="1336"/>
       <point x="646" y="1325" type="curve" smooth="yes"/>
@@ -35,7 +35,7 @@
       <point x="448" y="1326" type="curve" smooth="yes"/>
       <point x="436" y="1337"/>
       <point x="410" y="1343"/>
-      <point x="379" y="1343" type="curve" name="dv01" smooth="yes"/>
+      <point x="379" y="1343" type="curve" smooth="yes" name="dv01"/>
       <point x="335" y="1343"/>
       <point x="310" y="1330"/>
       <point x="295" y="1290" type="curve" smooth="yes"/>
@@ -45,16 +45,16 @@
       <point x="3" y="1128" type="line"/>
       <point x="3" y="1409"/>
       <point x="96" y="1550"/>
-      <point x="283" y="1550" type="curve" name="hr01" smooth="yes"/>
+      <point x="283" y="1550" type="curve" smooth="yes" name="hr01"/>
       <point x="404" y="1550"/>
       <point x="491" y="1491"/>
       <point x="540" y="1386" type="curve" name="ih01"/>
       <point x="596" y="1504"/>
       <point x="665" y="1550"/>
-      <point x="801" y="1550" type="curve" name="sv02" smooth="yes"/>
+      <point x="801" y="1550" type="curve" smooth="yes" name="sv02"/>
       <point x="1014" y="1550"/>
       <point x="1142" y="1436"/>
-      <point x="1142" y="1208" type="curve" name="hr02" smooth="yes"/>
+      <point x="1142" y="1208" type="curve" smooth="yes" name="hr02"/>
       <point x="1142" y="490" type="line" smooth="yes"/>
       <point x="1142" y="158"/>
       <point x="982" y="0"/>
@@ -63,10 +63,10 @@
       <point x="655" y="214" type="curve" name="sv04"/>
       <point x="784" y="214"/>
       <point x="848" y="316"/>
-      <point x="848" y="520" type="curve" name="sh01" smooth="yes"/>
+      <point x="848" y="520" type="curve" smooth="yes" name="sh01"/>
       <point x="848" y="753"/>
       <point x="758" y="803"/>
-      <point x="620" y="803" type="curve" name="dv02" smooth="yes"/>
+      <point x="620" y="803" type="curve" smooth="yes" name="dv02"/>
       <point x="479" y="803"/>
       <point x="398" y="742"/>
       <point x="398" y="535" type="curve" name="dh02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10E_9.glif b/source/Hack-Bold.ufo/glyphs/uni10E_9.glif
index 12a64dd8e..024f1a7fc 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10E_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10E_9.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E9" format="1">
+<glyph name="uni10E9" format="2">
   <advance width="1233"/>
   <unicode hex="10E9"/>
   <outline>
     <contour>
-      <point x="98" y="1183" type="line" name="hr00" smooth="yes"/>
+      <point x="98" y="1183" type="line" smooth="yes" name="hr00"/>
       <point x="98" y="1428"/>
       <point x="244" y="1550"/>
-      <point x="535" y="1550" type="curve" name="dv02" smooth="yes"/>
+      <point x="535" y="1550" type="curve" smooth="yes" name="dv02"/>
       <point x="822" y="1550"/>
       <point x="970" y="1432"/>
       <point x="970" y="1231" type="curve" smooth="yes"/>
@@ -16,23 +16,23 @@
       <point x="879" y="1000" type="curve"/>
       <point x="1018" y="925"/>
       <point x="1136" y="762"/>
-      <point x="1136" y="539" type="curve" name="sh01" smooth="yes"/>
+      <point x="1136" y="539" type="curve" smooth="yes" name="sh01"/>
       <point x="1136" y="347"/>
       <point x="1054" y="152"/>
       <point x="873" y="0" type="curve" name="ab01"/>
       <point x="557" y="0" type="line" name="ih01"/>
       <point x="738" y="173"/>
       <point x="842" y="350"/>
-      <point x="842" y="557" type="curve" name="ah01" smooth="yes"/>
+      <point x="842" y="557" type="curve" smooth="yes" name="ah01"/>
       <point x="842" y="654"/>
       <point x="819" y="732"/>
       <point x="776" y="781" type="curve" smooth="yes"/>
       <point x="732" y="832"/>
       <point x="667" y="853"/>
-      <point x="599" y="853" type="curve" name="dv03" smooth="yes"/>
+      <point x="599" y="853" type="curve" smooth="yes" name="dv03"/>
       <point x="460" y="853"/>
       <point x="392" y="759"/>
-      <point x="392" y="595" type="curve" name="sh03" smooth="yes"/>
+      <point x="392" y="595" type="curve" smooth="yes" name="sh03"/>
       <point x="392" y="0" type="line" name="ab02"/>
       <point x="98" y="0" type="line"/>
     </contour>
@@ -43,7 +43,7 @@
       <point x="493" y="1033" type="curve" smooth="yes"/>
       <point x="527" y="1045"/>
       <point x="575" y="1051"/>
-      <point x="636" y="1050" type="curve" name="dv04" smooth="yes"/>
+      <point x="636" y="1050" type="curve" smooth="yes" name="dv04"/>
       <point x="692" y="1049" type="line"/>
       <point x="706" y="1191" type="line"/>
       <point x="706" y="1255"/>
@@ -51,10 +51,10 @@
       <point x="659" y="1315" type="curve" smooth="yes"/>
       <point x="628" y="1336"/>
       <point x="577" y="1343"/>
-      <point x="542" y="1343" type="curve" name="dv01" smooth="yes"/>
+      <point x="542" y="1343" type="curve" smooth="yes" name="dv01"/>
       <point x="442" y="1343"/>
       <point x="392" y="1294"/>
-      <point x="392" y="1175" type="curve" name="sh02" smooth="yes"/>
+      <point x="392" y="1175" type="curve" smooth="yes" name="sh02"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10E_A_.glif b/source/Hack-Bold.ufo/glyphs/uni10E_A_.glif
index 9cb2c7354..82fd93fda 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10E_A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10E_A_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10EA" format="1">
+<glyph name="uni10EA" format="2">
   <advance width="1233"/>
   <unicode hex="10EA"/>
   <outline>
     <contour>
-      <point x="643" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="643" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="244" y="-401"/>
       <point x="57" y="-176"/>
-      <point x="57" y="307" type="curve" name="dh01" smooth="yes"/>
+      <point x="57" y="307" type="curve" smooth="yes" name="dh01"/>
       <point x="57" y="399" type="line" smooth="yes"/>
       <point x="57" y="607"/>
       <point x="114" y="841"/>
@@ -19,22 +19,22 @@
       <point x="361" y="638"/>
       <point x="350" y="557"/>
       <point x="350" y="456" type="curve" smooth="yes"/>
-      <point x="350" y="307" type="line" name="dh02" smooth="yes"/>
+      <point x="350" y="307" type="line" smooth="yes" name="dh02"/>
       <point x="350" y="-40"/>
       <point x="441" y="-191"/>
-      <point x="644" y="-191" type="curve" name="dv02" smooth="yes"/>
+      <point x="644" y="-191" type="curve" smooth="yes" name="dv02"/>
       <point x="724" y="-191"/>
       <point x="800" y="-167"/>
       <point x="839" y="-115" type="curve"/>
       <point x="879" y="-65"/>
       <point x="890" y="30"/>
-      <point x="890" y="115" type="curve" name="ih01" smooth="yes"/>
+      <point x="890" y="115" type="curve" smooth="yes" name="ih01"/>
       <point x="890" y="248"/>
       <point x="861" y="304"/>
-      <point x="776" y="304" type="curve" name="dv03" smooth="yes"/>
+      <point x="776" y="304" type="curve" smooth="yes" name="dv03"/>
       <point x="544" y="304" type="line"/>
       <point x="544" y="510" type="line" name="hr02"/>
-      <point x="769" y="510" type="line" name="dv04" smooth="yes"/>
+      <point x="769" y="510" type="line" smooth="yes" name="dv04"/>
       <point x="834" y="510"/>
       <point x="866" y="555"/>
       <point x="865" y="645" type="curve" name="dh03"/>
@@ -50,13 +50,13 @@
       <point x="950" y="884" type="curve" smooth="yes"/>
       <point x="1015" y="857"/>
       <point x="1147" y="802"/>
-      <point x="1147" y="652" type="curve" name="dh04" smooth="yes"/>
+      <point x="1147" y="652" type="curve" smooth="yes" name="dh04"/>
       <point x="1147" y="555"/>
       <point x="1091" y="474"/>
       <point x="995" y="409" type="curve" name="ih02"/>
       <point x="1126" y="310"/>
       <point x="1175" y="230"/>
-      <point x="1175" y="79" type="curve" name="sh02" smooth="yes"/>
+      <point x="1175" y="79" type="curve" smooth="yes" name="sh02"/>
       <point x="1175" y="-49"/>
       <point x="1139" y="-186"/>
       <point x="1051" y="-274" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10E_B_.glif b/source/Hack-Bold.ufo/glyphs/uni10E_B_.glif
index 490db5029..686823d37 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10E_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10E_B_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10EB" format="1">
+<glyph name="uni10EB" format="2">
   <advance width="1233"/>
   <unicode hex="10EB"/>
   <outline>
     <contour>
-      <point x="621" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="621" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="269" y="0"/>
       <point x="98" y="166"/>
-      <point x="98" y="521" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="521" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="884"/>
       <point x="277" y="1067"/>
-      <point x="598" y="1067" type="curve" name="dv02" smooth="yes"/>
+      <point x="598" y="1067" type="curve" smooth="yes" name="dv02"/>
       <point x="657" y="1067"/>
       <point x="704" y="1061"/>
       <point x="751" y="1040" type="curve" smooth="yes"/>
@@ -19,12 +19,12 @@
       <point x="862" y="947" type="curve" name="ah01"/>
       <point x="862" y="1517" type="line" name="at01"/>
       <point x="1136" y="1516" type="line"/>
-      <point x="1136" y="506" type="line" name="sh02" smooth="yes"/>
+      <point x="1136" y="506" type="line" smooth="yes" name="sh02"/>
       <point x="1136" y="158"/>
       <point x="962" y="0"/>
     </contour>
     <contour>
-      <point x="614" y="214" type="curve" name="sv01" smooth="yes"/>
+      <point x="614" y="214" type="curve" smooth="yes" name="sv01"/>
       <point x="686" y="214"/>
       <point x="741" y="237"/>
       <point x="780" y="283" type="curve" smooth="yes"/>
@@ -33,10 +33,10 @@
       <point x="842" y="517" type="curve" smooth="yes"/>
       <point x="842" y="753"/>
       <point x="751" y="854"/>
-      <point x="615" y="854" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="854" type="curve" smooth="yes" name="dv01"/>
       <point x="476" y="854"/>
       <point x="407" y="745"/>
-      <point x="407" y="526" type="curve" name="sh03" smooth="yes"/>
+      <point x="407" y="526" type="curve" smooth="yes" name="sh03"/>
       <point x="407" y="309"/>
       <point x="474" y="214"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10E_C_.glif b/source/Hack-Bold.ufo/glyphs/uni10E_C_.glif
index d1bf61332..8fc39e211 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10E_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10E_C_.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10EC" format="1">
+<glyph name="uni10EC" format="2">
   <advance width="1233"/>
   <unicode hex="10EC"/>
   <outline>
     <contour>
-      <point x="603" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="603" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="411" y="0"/>
       <point x="293" y="52"/>
       <point x="214" y="147" type="curve" smooth="yes"/>
       <point x="139" y="235"/>
       <point x="94" y="368"/>
       <point x="94" y="540" type="curve" smooth="yes"/>
-      <point x="94" y="1248" type="line" name="dh01" smooth="yes"/>
+      <point x="94" y="1248" type="line" smooth="yes" name="dh01"/>
       <point x="94" y="1348"/>
       <point x="128" y="1422"/>
       <point x="188" y="1473" type="curve" smooth="yes"/>
       <point x="245" y="1522"/>
       <point x="330" y="1550"/>
-      <point x="419" y="1550" type="curve" name="dv01" smooth="yes"/>
+      <point x="419" y="1550" type="curve" smooth="yes" name="dv01"/>
       <point x="482" y="1550"/>
       <point x="536" y="1536"/>
       <point x="583" y="1509" type="curve" smooth="yes"/>
@@ -26,7 +26,7 @@
       <point x="696" y="1386" type="curve" name="ih01"/>
       <point x="747" y="1495"/>
       <point x="833" y="1550"/>
-      <point x="952" y="1550" type="curve" name="sv01" smooth="yes"/>
+      <point x="952" y="1550" type="curve" smooth="yes" name="sv01"/>
       <point x="1139" y="1550"/>
       <point x="1233" y="1409"/>
       <point x="1233" y="1128" type="curve"/>
@@ -36,7 +36,7 @@
       <point x="941" y="1290" type="curve" smooth="yes"/>
       <point x="926" y="1333"/>
       <point x="898" y="1343"/>
-      <point x="857" y="1343" type="curve" name="sv03" smooth="yes"/>
+      <point x="857" y="1343" type="curve" smooth="yes" name="sv03"/>
       <point x="826" y="1343"/>
       <point x="801" y="1337"/>
       <point x="789" y="1326" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="590" y="1325" type="curve" smooth="yes"/>
       <point x="575" y="1336"/>
       <point x="548" y="1342"/>
-      <point x="501" y="1342" type="curve" name="hr01" smooth="yes"/>
+      <point x="501" y="1342" type="curve" smooth="yes" name="hr01"/>
       <point x="462" y="1342"/>
       <point x="435" y="1338"/>
       <point x="416" y="1322" type="curve" smooth="yes"/>
@@ -61,33 +61,33 @@
       <point x="386" y="917" type="line" name="dh02"/>
       <point x="457" y="983"/>
       <point x="519" y="1017"/>
-      <point x="647" y="1017" type="curve" name="dv03" smooth="yes"/>
+      <point x="647" y="1017" type="curve" smooth="yes" name="dv03"/>
       <point x="784" y="1017"/>
       <point x="913" y="980"/>
       <point x="1001" y="897" type="curve" smooth="yes"/>
       <point x="1085" y="817"/>
       <point x="1130" y="698"/>
-      <point x="1130" y="523" type="curve" name="hr02" smooth="yes"/>
+      <point x="1130" y="523" type="curve" smooth="yes" name="hr02"/>
       <point x="1130" y="170"/>
       <point x="946" y="0"/>
     </contour>
     <contour>
-      <point x="606" y="213" type="curve" name="sv04" smooth="yes"/>
+      <point x="606" y="213" type="curve" smooth="yes" name="sv04"/>
       <point x="674" y="213"/>
       <point x="734" y="235"/>
       <point x="777" y="283" type="curve" smooth="yes"/>
       <point x="817" y="330"/>
       <point x="838" y="396"/>
-      <point x="838" y="509" type="curve" name="dh05" smooth="yes"/>
+      <point x="838" y="509" type="curve" smooth="yes" name="dh05"/>
       <point x="838" y="728"/>
       <point x="763" y="803"/>
-      <point x="611" y="803" type="curve" name="dv02" smooth="yes"/>
+      <point x="611" y="803" type="curve" smooth="yes" name="dv02"/>
       <point x="542" y="803"/>
       <point x="489" y="788"/>
       <point x="450" y="747" type="curve" smooth="yes"/>
       <point x="411" y="707"/>
       <point x="388" y="642"/>
-      <point x="388" y="533" type="curve" name="sh01" smooth="yes"/>
+      <point x="388" y="533" type="curve" smooth="yes" name="sh01"/>
       <point x="388" y="318"/>
       <point x="469" y="213"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10E_D_.glif b/source/Hack-Bold.ufo/glyphs/uni10E_D_.glif
index d575e6288..5686feb90 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10E_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10E_D_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10ED" format="1">
+<glyph name="uni10ED" format="2">
   <advance width="1233"/>
   <unicode hex="10ED"/>
   <outline>
     <contour>
-      <point x="616" y="-402" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-402" type="curve" smooth="yes" name="dv01"/>
       <point x="268" y="-402"/>
       <point x="98" y="-251"/>
-      <point x="98" y="-3" type="curve" name="dh01" smooth="yes"/>
+      <point x="98" y="-3" type="curve" smooth="yes" name="dh01"/>
       <point x="98" y="87"/>
       <point x="119" y="150"/>
       <point x="228" y="272" type="curve"/>
@@ -17,10 +17,10 @@
       <point x="403" y="69" type="curve" smooth="yes"/>
       <point x="395" y="45"/>
       <point x="392" y="21"/>
-      <point x="392" y="-3" type="curve" name="dh02" smooth="yes"/>
+      <point x="392" y="-3" type="curve" smooth="yes" name="dh02"/>
       <point x="392" y="-130"/>
       <point x="473" y="-193"/>
-      <point x="613" y="-193" type="curve" name="dv02" smooth="yes"/>
+      <point x="613" y="-193" type="curve" smooth="yes" name="dv02"/>
       <point x="685" y="-193"/>
       <point x="742" y="-176"/>
       <point x="782" y="-140" type="curve" smooth="yes"/>
@@ -41,7 +41,7 @@
       <point x="519" y="410" type="curve"/>
       <point x="264" y="410"/>
       <point x="136" y="526"/>
-      <point x="136" y="759" type="curve" name="sh01" smooth="yes"/>
+      <point x="136" y="759" type="curve" smooth="yes" name="sh01"/>
       <point x="136" y="994"/>
       <point x="265" y="1112"/>
       <point x="522" y="1112" type="curve" name="dv04"/>
@@ -64,7 +64,7 @@
       <point x="963" y="336" type="curve"/>
       <point x="1079" y="257"/>
       <point x="1134" y="157"/>
-      <point x="1134" y="8" type="curve" name="dh04" smooth="yes"/>
+      <point x="1134" y="8" type="curve" smooth="yes" name="dh04"/>
       <point x="1134" y="-256"/>
       <point x="960" y="-402"/>
     </contour>
@@ -75,19 +75,19 @@
       <point x="639" y="631" type="curve" smooth="yes"/>
       <point x="672" y="666"/>
       <point x="691" y="711"/>
-      <point x="691" y="759" type="curve" name="ih01" smooth="yes"/>
+      <point x="691" y="759" type="curve" smooth="yes" name="ih01"/>
       <point x="691" y="811"/>
       <point x="669" y="856"/>
       <point x="642" y="885" type="curve" smooth="yes"/>
       <point x="613" y="916"/>
       <point x="576" y="935"/>
-      <point x="541" y="935" type="curve" name="dv03" smooth="yes"/>
+      <point x="541" y="935" type="curve" smooth="yes" name="dv03"/>
       <point x="506" y="935"/>
       <point x="465" y="916"/>
       <point x="434" y="885" type="curve" smooth="yes"/>
       <point x="402" y="853"/>
       <point x="381" y="810"/>
-      <point x="381" y="759" type="curve" name="sh04" smooth="yes"/>
+      <point x="381" y="759" type="curve" smooth="yes" name="sh04"/>
       <point x="381" y="711"/>
       <point x="400" y="666"/>
       <point x="431" y="631" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10E_E_.glif b/source/Hack-Bold.ufo/glyphs/uni10E_E_.glif
index debda8d58..b7cdcea25 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10E_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10E_E_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10EE" format="1">
+<glyph name="uni10EE" format="2">
   <advance width="1233"/>
   <unicode hex="10EE"/>
   <outline>
     <contour>
-      <point x="623" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="623" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="267" y="0"/>
       <point x="98" y="206"/>
       <point x="98" y="563" type="curve"/>
@@ -13,24 +13,24 @@
       <point x="389" y="954" type="line" name="iv01"/>
       <point x="466" y="1047"/>
       <point x="532" y="1067"/>
-      <point x="636" y="1067" type="curve" name="dv02" smooth="yes"/>
+      <point x="636" y="1067" type="curve" smooth="yes" name="dv02"/>
       <point x="953" y="1067"/>
       <point x="1135" y="889"/>
-      <point x="1135" y="532" type="curve" name="sh03" smooth="yes"/>
+      <point x="1135" y="532" type="curve" smooth="yes" name="sh03"/>
       <point x="1135" y="184"/>
       <point x="963" y="0"/>
     </contour>
     <contour>
-      <point x="618" y="214" type="curve" name="sv01" smooth="yes"/>
+      <point x="618" y="214" type="curve" smooth="yes" name="sv01"/>
       <point x="758" y="214"/>
       <point x="842" y="315"/>
-      <point x="842" y="530" type="curve" name="ah01" smooth="yes"/>
+      <point x="842" y="530" type="curve" smooth="yes" name="ah01"/>
       <point x="842" y="747"/>
       <point x="757" y="853"/>
-      <point x="616" y="853" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="853" type="curve" smooth="yes" name="dv01"/>
       <point x="472" y="853"/>
       <point x="392" y="745"/>
-      <point x="392" y="532" type="curve" name="sh04" smooth="yes"/>
+      <point x="392" y="532" type="curve" smooth="yes" name="sh04"/>
       <point x="392" y="316"/>
       <point x="475" y="214"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10E_F_.glif b/source/Hack-Bold.ufo/glyphs/uni10E_F_.glif
index c57b4eb61..499663609 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10E_F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10E_F_.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10EF" format="1">
+<glyph name="uni10EF" format="2">
   <advance width="1233"/>
   <unicode hex="10EF"/>
   <outline>
     <contour>
-      <point x="613" y="-402" type="curve" name="hr00" smooth="yes"/>
+      <point x="613" y="-402" type="curve" smooth="yes" name="hr00"/>
       <point x="266" y="-402"/>
       <point x="97" y="-251"/>
-      <point x="97" y="21" type="curve" name="sh01" smooth="yes"/>
+      <point x="97" y="21" type="curve" smooth="yes" name="sh01"/>
       <point x="97" y="155"/>
       <point x="138" y="253"/>
       <point x="226" y="370" type="curve"/>
       <point x="435" y="234" type="line"/>
       <point x="402" y="171"/>
       <point x="392" y="108"/>
-      <point x="392" y="48" type="curve" name="sh02" smooth="yes"/>
+      <point x="392" y="48" type="curve" smooth="yes" name="sh02"/>
       <point x="392" y="-111"/>
       <point x="465" y="-191"/>
-      <point x="611" y="-191" type="curve" name="dv01" smooth="yes"/>
+      <point x="611" y="-191" type="curve" smooth="yes" name="dv01"/>
       <point x="752" y="-191"/>
       <point x="842" y="-119"/>
-      <point x="842" y="21" type="curve" name="ah01" smooth="yes"/>
+      <point x="842" y="21" type="curve" smooth="yes" name="ah01"/>
       <point x="842" y="147"/>
       <point x="769" y="228"/>
       <point x="669" y="279" type="curve"/>
@@ -46,7 +46,7 @@
       <point x="939" y="397" type="curve"/>
       <point x="1067" y="301"/>
       <point x="1136" y="182"/>
-      <point x="1136" y="15" type="curve" name="sh03" smooth="yes"/>
+      <point x="1136" y="15" type="curve" smooth="yes" name="sh03"/>
       <point x="1136" y="-257"/>
       <point x="956" y="-402"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10F_0.glif b/source/Hack-Bold.ufo/glyphs/uni10F_0.glif
index 6c797f555..f2bb0b188 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10F_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10F_0.glif
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F0" format="1">
+<glyph name="uni10F0" format="2">
   <advance width="1233"/>
   <unicode hex="10F0"/>
   <outline>
     <contour>
-      <point x="622" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="622" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="273" y="0"/>
       <point x="98" y="144"/>
-      <point x="98" y="432" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="432" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="566" type="line"/>
       <point x="391" y="566" type="line"/>
-      <point x="391" y="432" type="line" name="sh02" smooth="yes"/>
+      <point x="391" y="432" type="line" smooth="yes" name="sh02"/>
       <point x="391" y="277"/>
       <point x="469" y="214"/>
-      <point x="620" y="214" type="curve" name="sv01" smooth="yes"/>
+      <point x="620" y="214" type="curve" smooth="yes" name="sv01"/>
       <point x="749" y="214"/>
       <point x="841" y="260"/>
-      <point x="841" y="381" type="curve" name="sh03" smooth="yes"/>
+      <point x="841" y="381" type="curve" smooth="yes" name="sh03"/>
       <point x="841" y="412"/>
       <point x="835" y="457"/>
-      <point x="822" y="477" type="curve" name="sh04" smooth="yes"/>
+      <point x="822" y="477" type="curve" smooth="yes" name="sh04"/>
       <point x="810" y="496"/>
       <point x="794" y="499"/>
-      <point x="778" y="499" type="curve" name="dv01" smooth="yes"/>
+      <point x="778" y="499" type="curve" smooth="yes" name="dv01"/>
       <point x="499" y="499" type="line"/>
       <point x="499" y="718" type="line"/>
-      <point x="779" y="718" type="line" name="dv02" smooth="yes"/>
+      <point x="779" y="718" type="line" smooth="yes" name="dv02"/>
       <point x="805" y="718"/>
       <point x="840" y="724"/>
-      <point x="840" y="795" type="curve" name="sh06" smooth="yes"/>
+      <point x="840" y="795" type="curve" smooth="yes" name="sh06"/>
       <point x="840" y="862"/>
       <point x="807" y="865"/>
-      <point x="779" y="865" type="curve" name="dv03" smooth="yes"/>
+      <point x="779" y="865" type="curve" smooth="yes" name="dv03"/>
       <point x="499" y="865" type="line"/>
       <point x="499" y="1086" type="line"/>
-      <point x="777" y="1086" type="line" name="dv04" smooth="yes"/>
+      <point x="777" y="1086" type="line" smooth="yes" name="dv04"/>
       <point x="788" y="1086"/>
       <point x="801" y="1088"/>
       <point x="813" y="1097" type="curve" smooth="yes"/>
       <point x="824" y="1106"/>
       <point x="833" y="1123"/>
-      <point x="833" y="1146" type="curve" name="ah01" smooth="yes"/>
+      <point x="833" y="1146" type="curve" smooth="yes" name="ah01"/>
       <point x="833" y="1178"/>
       <point x="817" y="1199"/>
       <point x="770" y="1215" type="curve" smooth="yes"/>
@@ -56,7 +56,7 @@
       <point x="638" y="1471" type="curve" smooth="yes"/>
       <point x="702" y="1446"/>
       <point x="763" y="1438"/>
-      <point x="828" y="1430" type="curve" name="sh08" smooth="yes"/>
+      <point x="828" y="1430" type="curve" smooth="yes" name="sh08"/>
       <point x="916" y="1418"/>
       <point x="1114" y="1389"/>
       <point x="1114" y="1175" type="curve" smooth="yes"/>
@@ -65,13 +65,13 @@
       <point x="997" y="982" type="curve" name="ih01"/>
       <point x="1078" y="938"/>
       <point x="1125" y="872"/>
-      <point x="1125" y="791" type="curve" name="sh10" smooth="yes"/>
+      <point x="1125" y="791" type="curve" smooth="yes" name="sh10"/>
       <point x="1125" y="713"/>
       <point x="1081" y="651"/>
       <point x="992" y="604" type="curve" name="ih02"/>
       <point x="1105" y="524"/>
       <point x="1136" y="461"/>
-      <point x="1136" y="364" type="curve" name="sh09" smooth="yes"/>
+      <point x="1136" y="364" type="curve" smooth="yes" name="sh09"/>
       <point x="1136" y="137"/>
       <point x="965" y="0"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10F_1.glif b/source/Hack-Bold.ufo/glyphs/uni10F_1.glif
index e529f7dec..34c209b35 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10F_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10F_1.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F1" format="1">
+<glyph name="uni10F1" format="2">
   <advance width="1233"/>
   <unicode hex="10F1"/>
   <outline>
     <contour>
-      <point x="661" y="-402" type="curve" name="hr00" smooth="yes"/>
+      <point x="661" y="-402" type="curve" smooth="yes" name="hr00"/>
       <point x="256" y="-402"/>
       <point x="108" y="-229"/>
-      <point x="108" y="146" type="curve" name="sh01" smooth="yes"/>
+      <point x="108" y="146" type="curve" smooth="yes" name="sh01"/>
       <point x="108" y="297"/>
       <point x="131" y="442"/>
       <point x="163" y="629" type="curve"/>
@@ -26,37 +26,37 @@
       <point x="431" y="624" type="curve" smooth="yes"/>
       <point x="411" y="469"/>
       <point x="392" y="305"/>
-      <point x="392" y="168" type="curve" name="sh03" smooth="yes"/>
+      <point x="392" y="168" type="curve" smooth="yes" name="sh03"/>
       <point x="392" y="-108"/>
       <point x="470" y="-193"/>
-      <point x="627" y="-193" type="curve" name="dv01" smooth="yes"/>
+      <point x="627" y="-193" type="curve" smooth="yes" name="dv01"/>
       <point x="904" y="-193"/>
       <point x="898" y="71"/>
-      <point x="779" y="71" type="curve" name="dv02" smooth="yes"/>
+      <point x="779" y="71" type="curve" smooth="yes" name="dv02"/>
       <point x="592" y="71" type="line"/>
       <point x="592" y="282" type="line"/>
-      <point x="779" y="282" type="line" name="dv03" smooth="yes"/>
+      <point x="779" y="282" type="line" smooth="yes" name="dv03"/>
       <point x="834" y="282"/>
       <point x="849" y="312"/>
-      <point x="849" y="379" type="curve" name="ah01" smooth="yes"/>
+      <point x="849" y="379" type="curve" smooth="yes" name="ah01"/>
       <point x="849" y="419"/>
       <point x="843" y="451"/>
       <point x="832" y="468" type="curve"/>
       <point x="820" y="484"/>
       <point x="803" y="489"/>
-      <point x="780" y="489" type="curve" name="dv06" smooth="yes"/>
+      <point x="780" y="489" type="curve" smooth="yes" name="dv06"/>
       <point x="592" y="489" type="line"/>
       <point x="592" y="696" type="line"/>
-      <point x="780" y="696" type="line" name="dv07" smooth="yes"/>
+      <point x="780" y="696" type="line" smooth="yes" name="dv07"/>
       <point x="825" y="696"/>
       <point x="849" y="723"/>
-      <point x="849" y="804" type="curve" name="sh04" smooth="yes"/>
+      <point x="849" y="804" type="curve" smooth="yes" name="sh04"/>
       <point x="849" y="886"/>
       <point x="824" y="891"/>
-      <point x="779" y="891" type="curve" name="dv04" smooth="yes"/>
+      <point x="779" y="891" type="curve" smooth="yes" name="dv04"/>
       <point x="592" y="891" type="line"/>
       <point x="592" y="1105" type="line"/>
-      <point x="779" y="1105" type="line" name="dv05" smooth="yes"/>
+      <point x="779" y="1105" type="line" smooth="yes" name="dv05"/>
       <point x="871" y="1105"/>
       <point x="893" y="1239"/>
       <point x="717" y="1271" type="curve"/>
@@ -69,25 +69,25 @@
       <point x="944" y="1428" type="curve"/>
       <point x="1072" y="1387"/>
       <point x="1136" y="1310"/>
-      <point x="1136" y="1198" type="curve" name="sh06" smooth="yes"/>
+      <point x="1136" y="1198" type="curve" smooth="yes" name="sh06"/>
       <point x="1136" y="1110"/>
       <point x="1097" y="1042"/>
       <point x="1009" y="1003" type="curve" name="ih01"/>
       <point x="1100" y="962"/>
       <point x="1136" y="891"/>
-      <point x="1136" y="808" type="curve" name="sh07" smooth="yes"/>
+      <point x="1136" y="808" type="curve" smooth="yes" name="sh07"/>
       <point x="1136" y="707"/>
       <point x="1081" y="629"/>
       <point x="1009" y="589" type="curve" name="ih02"/>
       <point x="1092" y="550"/>
       <point x="1136" y="470"/>
-      <point x="1136" y="378" type="curve" name="sh05" smooth="yes"/>
+      <point x="1136" y="378" type="curve" smooth="yes" name="sh05"/>
       <point x="1136" y="279"/>
       <point x="1086" y="218"/>
       <point x="995" y="175" type="curve" name="ih03"/>
       <point x="1089" y="122"/>
       <point x="1136" y="37"/>
-      <point x="1136" y="-81" type="curve" name="sh08" smooth="yes"/>
+      <point x="1136" y="-81" type="curve" smooth="yes" name="sh08"/>
       <point x="1136" y="-295"/>
       <point x="978" y="-402"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10F_2.glif b/source/Hack-Bold.ufo/glyphs/uni10F_2.glif
index 3db50a42e..3c76bec60 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10F_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10F_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F2" format="1">
+<glyph name="uni10F2" format="2">
   <advance width="1233"/>
   <unicode hex="10F2"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="346" y="64" type="curve" name="ih01"/>
       <point x="173" y="189"/>
       <point x="98" y="332"/>
-      <point x="98" y="548" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="548" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="877"/>
       <point x="271" y="1066"/>
-      <point x="615" y="1066" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="1066" type="curve" smooth="yes" name="dv02"/>
       <point x="962" y="1066"/>
       <point x="1136" y="875"/>
-      <point x="1136" y="551" type="curve" name="sh03" smooth="yes"/>
+      <point x="1136" y="551" type="curve" smooth="yes" name="sh03"/>
       <point x="1136" y="328"/>
       <point x="1053" y="190"/>
       <point x="872" y="65" type="curve" name="ih02"/>
@@ -38,10 +38,10 @@
       <point x="843" y="530" type="curve" name="ah01"/>
       <point x="846" y="741"/>
       <point x="756" y="853"/>
-      <point x="614" y="853" type="curve" name="dv01" smooth="yes"/>
+      <point x="614" y="853" type="curve" smooth="yes" name="dv01"/>
       <point x="473" y="853"/>
       <point x="392" y="747"/>
-      <point x="392" y="540" type="curve" name="sh02" smooth="yes"/>
+      <point x="392" y="540" type="curve" smooth="yes" name="sh02"/>
       <point x="392" y="353"/>
       <point x="459" y="247"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10F_3.glif b/source/Hack-Bold.ufo/glyphs/uni10F_3.glif
index 853b8d669..f704c9438 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10F_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10F_3.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F3" format="1">
+<glyph name="uni10F3" format="2">
   <advance width="1233"/>
   <unicode hex="10F3"/>
   <outline>
     <contour>
-      <point x="609" y="-191" type="curve" name="dv01" smooth="yes"/>
+      <point x="609" y="-191" type="curve" smooth="yes" name="dv01"/>
       <point x="756" y="-191"/>
       <point x="842" y="-110"/>
-      <point x="842" y="31" type="curve" name="dh03" smooth="yes"/>
+      <point x="842" y="31" type="curve" smooth="yes" name="dh03"/>
       <point x="842" y="62" type="line" smooth="yes"/>
       <point x="842" y="223"/>
       <point x="737" y="295"/>
       <point x="565" y="294" type="curve" name="dv02"/>
       <point x="391" y="294" type="line" name="sh01"/>
       <point x="391" y="489" type="line" name="dv03"/>
-      <point x="565" y="489" type="line" name="sv01" smooth="yes"/>
+      <point x="565" y="489" type="line" smooth="yes" name="sv01"/>
       <point x="717" y="489"/>
       <point x="790" y="619"/>
       <point x="789" y="847" type="curve"/>
@@ -29,7 +29,7 @@
       <point x="1053" y="337"/>
       <point x="1136" y="214"/>
       <point x="1136" y="47" type="curve" smooth="yes"/>
-      <point x="1136" y="16" type="line" name="hr02" smooth="yes"/>
+      <point x="1136" y="16" type="line" smooth="yes" name="hr02"/>
       <point x="1136" y="-539"/>
       <point x="97" y="-543"/>
       <point x="97" y="21" type="curve" name="dh01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10F_4.glif b/source/Hack-Bold.ufo/glyphs/uni10F_4.glif
index 5fe529626..f429a638e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10F_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10F_4.glif
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F4" format="1">
+<glyph name="uni10F4" format="2">
   <advance width="1233"/>
   <unicode hex="10F4"/>
   <outline>
     <contour>
-      <point x="619" y="-402" type="curve" name="dv01" smooth="yes"/>
+      <point x="619" y="-402" type="curve" smooth="yes" name="dv01"/>
       <point x="267" y="-402"/>
       <point x="97" y="-254"/>
       <point x="97" y="57" type="curve" name="sh01"/>
       <point x="391" y="58" type="line" name="sh03"/>
       <point x="391" y="-110"/>
       <point x="473" y="-192"/>
-      <point x="616" y="-192" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="-192" type="curve" smooth="yes" name="dv02"/>
       <point x="680" y="-192"/>
       <point x="740" y="-176"/>
       <point x="780" y="-141" type="curve" smooth="yes"/>
       <point x="821" y="-106"/>
       <point x="842" y="-53"/>
-      <point x="842" y="16" type="curve" name="dh02" smooth="yes"/>
+      <point x="842" y="16" type="curve" smooth="yes" name="dh02"/>
       <point x="842" y="69" type="line" smooth="yes"/>
       <point x="842" y="130"/>
       <point x="819" y="178"/>
       <point x="778" y="210" type="curve" smooth="yes"/>
       <point x="737" y="241"/>
       <point x="680" y="257"/>
-      <point x="607" y="257" type="curve" name="dv05" smooth="yes"/>
+      <point x="607" y="257" type="curve" smooth="yes" name="dv05"/>
       <point x="391" y="257" type="line"/>
       <point x="391" y="482" type="line" name="sh02"/>
       <point x="604" y="482" type="line" name="dv06"/>
@@ -42,23 +42,23 @@
       <point x="671" y="776" type="curve" name="sv01"/>
       <point x="651" y="773"/>
       <point x="634" y="772"/>
-      <point x="606" y="772" type="curve" name="dv07" smooth="yes"/>
+      <point x="606" y="772" type="curve" smooth="yes" name="dv07"/>
       <point x="439" y="772"/>
       <point x="315" y="806"/>
       <point x="228" y="873" type="curve" smooth="yes"/>
       <point x="141" y="940"/>
       <point x="98" y="1036"/>
-      <point x="98" y="1163" type="curve" name="hr01" smooth="yes"/>
+      <point x="98" y="1163" type="curve" smooth="yes" name="hr01"/>
       <point x="98" y="1428"/>
       <point x="291" y="1552"/>
       <point x="676" y="1551" type="curve" name="dv04"/>
       <point x="675" y="1343" type="line" name="dv03"/>
       <point x="466" y="1343"/>
       <point x="365" y="1274"/>
-      <point x="365" y="1150" type="curve" name="dh01" smooth="yes"/>
+      <point x="365" y="1150" type="curve" smooth="yes" name="dh01"/>
       <point x="365" y="1037"/>
       <point x="450" y="985"/>
-      <point x="598" y="985" type="curve" name="dv08" smooth="yes"/>
+      <point x="598" y="985" type="curve" smooth="yes" name="dv08"/>
       <point x="765" y="985"/>
       <point x="928" y="1053"/>
       <point x="1136" y="1203" type="curve" name="sh05"/>
@@ -69,7 +69,7 @@
       <point x="1049" y="322"/>
       <point x="1136" y="226"/>
       <point x="1136" y="73" type="curve" smooth="yes"/>
-      <point x="1136" y="20" type="line" name="hr02" smooth="yes"/>
+      <point x="1136" y="20" type="line" smooth="yes" name="hr02"/>
       <point x="1136" y="-263"/>
       <point x="962" y="-402"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10F_5.glif b/source/Hack-Bold.ufo/glyphs/uni10F_5.glif
index 54a2eefb6..50d62bf7c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10F_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10F_5.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F5" format="1">
+<glyph name="uni10F5" format="2">
   <advance width="1233"/>
   <unicode hex="10F5"/>
   <outline>
     <contour>
-      <point x="593" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="593" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="268" y="0"/>
       <point x="109" y="117"/>
-      <point x="109" y="362" type="curve" name="dh01" smooth="yes"/>
+      <point x="109" y="362" type="curve" smooth="yes" name="dh01"/>
       <point x="109" y="605"/>
       <point x="270" y="734"/>
       <point x="593" y="734" type="curve" smooth="yes"/>
@@ -16,13 +16,13 @@
       <point x="593" y="810" type="line" smooth="yes"/>
       <point x="270" y="810"/>
       <point x="109" y="943"/>
-      <point x="109" y="1187" type="curve" name="sh01" smooth="yes"/>
+      <point x="109" y="1187" type="curve" smooth="yes" name="sh01"/>
       <point x="109" y="1434"/>
       <point x="270" y="1551"/>
-      <point x="595" y="1551" type="curve" name="dv01" smooth="yes"/>
+      <point x="595" y="1551" type="curve" smooth="yes" name="dv01"/>
       <point x="916" y="1551"/>
       <point x="1071" y="1436"/>
-      <point x="1071" y="1193" type="curve" name="sh02" smooth="yes"/>
+      <point x="1071" y="1193" type="curve" smooth="yes" name="sh02"/>
       <point x="1071" y="1027" type="line" name="sv01"/>
       <point x="1178" y="1027" type="line" name="sh03"/>
       <point x="1178" y="810" type="line" name="sv02"/>
@@ -40,24 +40,24 @@
       <point x="795" y="1193" type="line" smooth="yes"/>
       <point x="795" y="1291"/>
       <point x="730" y="1340"/>
-      <point x="600" y="1340" type="curve" name="hr04" smooth="yes"/>
+      <point x="600" y="1340" type="curve" smooth="yes" name="hr04"/>
       <point x="469" y="1340"/>
       <point x="404" y="1289"/>
-      <point x="404" y="1187" type="curve" name="sh04" smooth="yes"/>
+      <point x="404" y="1187" type="curve" smooth="yes" name="sh04"/>
       <point x="404" y="1083"/>
       <point x="468" y="1027"/>
       <point x="593" y="1027" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="599" y="209" type="curve" name="sv03" smooth="yes"/>
+      <point x="599" y="209" type="curve" smooth="yes" name="sv03"/>
       <point x="730" y="209"/>
       <point x="795" y="263"/>
-      <point x="795" y="371" type="curve" name="sh05" smooth="yes"/>
+      <point x="795" y="371" type="curve" smooth="yes" name="sh05"/>
       <point x="795" y="518" type="line" name="dv02"/>
       <point x="593" y="518" type="line" smooth="yes"/>
       <point x="467" y="518"/>
       <point x="404" y="467"/>
-      <point x="404" y="364" type="curve" name="dh02" smooth="yes"/>
+      <point x="404" y="364" type="curve" smooth="yes" name="dh02"/>
       <point x="404" y="261"/>
       <point x="469" y="209"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10F_6.glif b/source/Hack-Bold.ufo/glyphs/uni10F_6.glif
index 0cf822819..905850920 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10F_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10F_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F6" format="1">
+<glyph name="uni10F6" format="2">
   <advance width="1233"/>
   <unicode hex="10F6"/>
   <outline>
@@ -19,31 +19,31 @@
       <point x="327" y="798"/>
       <point x="322" y="763"/>
       <point x="322" y="715" type="curve" smooth="yes"/>
-      <point x="322" y="413" type="line" name="hr01" smooth="yes"/>
+      <point x="322" y="413" type="line" smooth="yes" name="hr01"/>
       <point x="322" y="302"/>
       <point x="363" y="246"/>
       <point x="444" y="246" type="curve" name="sh02"/>
       <point x="444" y="29" type="line"/>
       <point x="166" y="32"/>
       <point x="27" y="164"/>
-      <point x="27" y="426" type="curve" name="dh01" smooth="yes"/>
+      <point x="27" y="426" type="curve" smooth="yes" name="dh01"/>
       <point x="27" y="654" type="line" smooth="yes"/>
       <point x="27" y="929"/>
       <point x="143" y="1066"/>
-      <point x="374" y="1066" type="curve" name="dv02" smooth="yes"/>
+      <point x="374" y="1066" type="curve" smooth="yes" name="dv02"/>
       <point x="481" y="1066"/>
       <point x="561" y="1037"/>
       <point x="616" y="978" type="curve"/>
       <point x="669" y="1039"/>
       <point x="751" y="1066"/>
-      <point x="855" y="1066" type="curve" name="sv01" smooth="yes"/>
+      <point x="855" y="1066" type="curve" smooth="yes" name="sv01"/>
       <point x="1089" y="1066"/>
       <point x="1206" y="929"/>
       <point x="1206" y="654" type="curve" smooth="yes"/>
-      <point x="1206" y="422" type="line" name="hr02" smooth="yes"/>
+      <point x="1206" y="422" type="line" smooth="yes" name="hr02"/>
       <point x="1206" y="139"/>
       <point x="1090" y="0"/>
-      <point x="862" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="862" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="815" y="0"/>
       <point x="784" y="6"/>
       <point x="757" y="18" type="curve" name="hr03"/>
@@ -53,14 +53,14 @@
       <point x="316" y="-401" type="curve" name="hr04"/>
     </contour>
     <contour>
-      <point x="828" y="214" type="curve" name="sv02" smooth="yes"/>
+      <point x="828" y="214" type="curve" smooth="yes" name="sv02"/>
       <point x="896" y="214"/>
       <point x="912" y="253"/>
-      <point x="912" y="334" type="curve" name="dh04" smooth="yes"/>
+      <point x="912" y="334" type="curve" smooth="yes" name="dh04"/>
       <point x="912" y="729" type="line" smooth="yes"/>
       <point x="912" y="814"/>
       <point x="889" y="853"/>
-      <point x="842" y="853" type="curve" name="sv03" smooth="yes"/>
+      <point x="842" y="853" type="curve" smooth="yes" name="sv03"/>
       <point x="762" y="853" type="line" smooth="yes"/>
       <point x="739" y="853"/>
       <point x="727" y="833"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10F_7.glif b/source/Hack-Bold.ufo/glyphs/uni10F_7.glif
index 886e6c670..a0235335e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10F_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10F_7.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F7" format="1">
+<glyph name="uni10F7" format="2">
   <advance width="1233"/>
   <unicode hex="10F7"/>
   <outline>
     <contour>
-      <point x="609" y="-403" type="curve" name="dv01" smooth="yes"/>
+      <point x="609" y="-403" type="curve" smooth="yes" name="dv01"/>
       <point x="262" y="-403"/>
       <point x="80" y="-263"/>
       <point x="77" y="38" type="curve"/>
@@ -13,10 +13,10 @@
       <point x="424" y="533" type="curve"/>
       <point x="598" y="603"/>
       <point x="693" y="619"/>
-      <point x="693" y="738" type="curve" name="dh01" smooth="yes"/>
+      <point x="693" y="738" type="curve" smooth="yes" name="dh01"/>
       <point x="693" y="803"/>
       <point x="664" y="854"/>
-      <point x="597" y="854" type="curve" name="dv03" smooth="yes"/>
+      <point x="597" y="854" type="curve" smooth="yes" name="dv03"/>
       <point x="536" y="854"/>
       <point x="441" y="820"/>
       <point x="441" y="744" type="curve"/>
@@ -25,26 +25,26 @@
       <point x="216" y="726" type="line"/>
       <point x="216" y="955"/>
       <point x="353" y="1066"/>
-      <point x="601" y="1066" type="curve" name="dv04" smooth="yes"/>
+      <point x="601" y="1066" type="curve" smooth="yes" name="dv04"/>
       <point x="867" y="1066"/>
       <point x="987" y="936"/>
-      <point x="987" y="731" type="curve" name="dh02" smooth="yes"/>
+      <point x="987" y="731" type="curve" smooth="yes" name="dh02"/>
       <point x="987" y="551"/>
       <point x="895" y="451"/>
       <point x="644" y="347" type="curve"/>
       <point x="281" y="255"/>
       <point x="280" y="-192"/>
-      <point x="625" y="-192" type="curve" name="dv02" smooth="yes"/>
+      <point x="625" y="-192" type="curve" smooth="yes" name="dv02"/>
       <point x="772" y="-192"/>
       <point x="861" y="-112"/>
-      <point x="861" y="63" type="curve" name="ih01" smooth="yes"/>
+      <point x="861" y="63" type="curve" smooth="yes" name="ih01"/>
       <point x="861" y="110"/>
       <point x="856" y="170"/>
       <point x="802" y="214" type="curve" name="ih02"/>
       <point x="1018" y="363" type="line"/>
       <point x="1109" y="258"/>
       <point x="1156" y="158"/>
-      <point x="1156" y="23" type="curve" name="sh01" smooth="yes"/>
+      <point x="1156" y="23" type="curve" smooth="yes" name="sh01"/>
       <point x="1156" y="-245"/>
       <point x="977" y="-403"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10F_8.glif b/source/Hack-Bold.ufo/glyphs/uni10F_8.glif
index a878129ca..29673a255 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10F_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10F_8.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F8" format="1">
+<glyph name="uni10F8" format="2">
   <advance width="1233"/>
   <unicode hex="10F8"/>
   <outline>
     <contour>
-      <point x="617" y="-403" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="-403" type="curve" smooth="yes" name="dv01"/>
       <point x="278" y="-403"/>
       <point x="99" y="-263"/>
-      <point x="99" y="12" type="curve" name="sh01" smooth="yes"/>
+      <point x="99" y="12" type="curve" smooth="yes" name="sh01"/>
       <point x="99" y="1044" type="line"/>
       <point x="393" y="1044" type="line" name="hr01"/>
       <point x="393" y="471" type="line" smooth="yes"/>
       <point x="393" y="375"/>
       <point x="481" y="330"/>
-      <point x="605" y="330" type="curve" name="dv04" smooth="yes"/>
+      <point x="605" y="330" type="curve" smooth="yes" name="dv04"/>
       <point x="758" y="330"/>
       <point x="843" y="399"/>
-      <point x="843" y="575" type="curve" name="ah01" smooth="yes"/>
+      <point x="843" y="575" type="curve" smooth="yes" name="ah01"/>
       <point x="843" y="652"/>
       <point x="828" y="725"/>
       <point x="785" y="794" type="curve" smooth="yes"/>
@@ -29,17 +29,17 @@
       <point x="1078" y="842" type="curve" smooth="yes"/>
       <point x="1122" y="754"/>
       <point x="1136" y="665"/>
-      <point x="1136" y="576" type="curve" name="sh03" smooth="yes"/>
+      <point x="1136" y="576" type="curve" smooth="yes" name="sh03"/>
       <point x="1136" y="265"/>
       <point x="965" y="108"/>
-      <point x="625" y="108" type="curve" name="dv03" smooth="yes"/>
+      <point x="625" y="108" type="curve" smooth="yes" name="dv03"/>
       <point x="526" y="108"/>
       <point x="453" y="121"/>
       <point x="393" y="146" type="curve" name="iv01"/>
-      <point x="393" y="16" type="line" name="sh02" smooth="yes"/>
+      <point x="393" y="16" type="line" smooth="yes" name="sh02"/>
       <point x="393" y="-124"/>
       <point x="472" y="-191"/>
-      <point x="612" y="-191" type="curve" name="dv02" smooth="yes"/>
+      <point x="612" y="-191" type="curve" smooth="yes" name="dv02"/>
       <point x="765" y="-191"/>
       <point x="843" y="-111"/>
       <point x="843" y="54" type="curve" name="sh05"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10F_9.glif b/source/Hack-Bold.ufo/glyphs/uni10F_9.glif
index 15708f86b..9a2d1ae9f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10F_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10F_9.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F9" format="1">
+<glyph name="uni10F9" format="2">
   <advance width="1233"/>
   <unicode hex="10F9"/>
   <outline>
     <contour>
-      <point x="635" y="-402" type="curve" name="dv01" smooth="yes"/>
+      <point x="635" y="-402" type="curve" smooth="yes" name="dv01"/>
       <point x="368" y="-402"/>
       <point x="243" y="-292"/>
-      <point x="243" y="-76" type="curve" name="ih01" smooth="yes"/>
+      <point x="243" y="-76" type="curve" smooth="yes" name="ih01"/>
       <point x="243" y="57"/>
       <point x="292" y="149"/>
       <point x="407" y="220" type="curve" name="ih02"/>
@@ -16,22 +16,22 @@
       <point x="80" y="625" type="curve" name="dh01"/>
       <point x="75" y="1232"/>
       <point x="1153" y="1225"/>
-      <point x="1153" y="633" type="curve" name="sh01" smooth="yes"/>
+      <point x="1153" y="633" type="curve" smooth="yes" name="sh01"/>
       <point x="1153" y="433"/>
       <point x="1033" y="286"/>
       <point x="777" y="165" type="curve"/>
       <point x="586" y="87"/>
       <point x="532" y="20"/>
-      <point x="532" y="-74" type="curve" name="hr01" smooth="yes"/>
+      <point x="532" y="-74" type="curve" smooth="yes" name="hr01"/>
       <point x="532" y="-146"/>
       <point x="562" y="-192"/>
-      <point x="638" y="-192" type="curve" name="dv02" smooth="yes"/>
+      <point x="638" y="-192" type="curve" smooth="yes" name="dv02"/>
       <point x="701" y="-192"/>
       <point x="751" y="-160"/>
-      <point x="751" y="-97" type="curve" name="dh03" smooth="yes"/>
+      <point x="751" y="-97" type="curve" smooth="yes" name="dh03"/>
       <point x="751" y="14" type="line"/>
       <point x="1035" y="14" type="line"/>
-      <point x="1035" y="-97" type="line" name="dh04" smooth="yes"/>
+      <point x="1035" y="-97" type="line" smooth="yes" name="dh04"/>
       <point x="1035" y="-301"/>
       <point x="891" y="-402"/>
     </contour>
@@ -39,13 +39,13 @@
       <point x="620" y="386" type="curve"/>
       <point x="793" y="411"/>
       <point x="861" y="493"/>
-      <point x="861" y="633" type="curve" name="hr02" smooth="yes"/>
+      <point x="861" y="633" type="curve" smooth="yes" name="hr02"/>
       <point x="861" y="785"/>
       <point x="781" y="868"/>
       <point x="620" y="868" type="curve" smooth="yes"/>
       <point x="457" y="868"/>
       <point x="376" y="782"/>
-      <point x="376" y="633" type="curve" name="dh02" smooth="yes"/>
+      <point x="376" y="633" type="curve" smooth="yes" name="dh02"/>
       <point x="376" y="490"/>
       <point x="449" y="410"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10F_A_.glif b/source/Hack-Bold.ufo/glyphs/uni10F_A_.glif
index 2833b5028..99810a1e5 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10F_A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10F_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10FA" format="1">
+<glyph name="uni10FA" format="2">
   <advance width="1233"/>
   <unicode hex="10FA"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="648" y="-52" type="curve" smooth="yes"/>
       <point x="625" y="-27"/>
       <point x="586" y="-8"/>
-      <point x="547" y="-8" type="curve" name="ab01" smooth="yes"/>
+      <point x="547" y="-8" type="curve" smooth="yes" name="ab01"/>
       <point x="486" y="-8"/>
       <point x="435" y="-54"/>
       <point x="383" y="-142" type="curve"/>
@@ -23,23 +23,23 @@
       <point x="187" y="342" type="curve" smooth="yes"/>
       <point x="148" y="426"/>
       <point x="127" y="514"/>
-      <point x="127" y="618" type="curve" name="sh01" smooth="yes"/>
+      <point x="127" y="618" type="curve" smooth="yes" name="sh01"/>
       <point x="127" y="918"/>
       <point x="303" y="1067"/>
       <point x="647" y="1067" type="curve" name="dv02"/>
       <point x="952" y="1042"/>
       <point x="1108" y="917"/>
-      <point x="1108" y="698" type="curve" name="sh03" smooth="yes"/>
+      <point x="1108" y="698" type="curve" smooth="yes" name="sh03"/>
       <point x="1108" y="570"/>
       <point x="1055" y="409"/>
       <point x="947" y="197" type="curve"/>
       <point x="712" y="295" type="line"/>
       <point x="788" y="459"/>
       <point x="822" y="584"/>
-      <point x="822" y="675" type="curve" name="ah01" smooth="yes"/>
+      <point x="822" y="675" type="curve" smooth="yes" name="ah01"/>
       <point x="822" y="794"/>
       <point x="760" y="854"/>
-      <point x="637" y="854" type="curve" name="dv01" smooth="yes"/>
+      <point x="637" y="854" type="curve" smooth="yes" name="dv01"/>
       <point x="490" y="854"/>
       <point x="422" y="769"/>
       <point x="422" y="616" type="curve" name="sh02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10F_B_.glif b/source/Hack-Bold.ufo/glyphs/uni10F_B_.glif
index 2c81568f2..2d4aaa19d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10F_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10F_B_.glif
@@ -1,57 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10FB" format="1">
+<glyph name="uni10FB" format="2">
   <advance width="1233"/>
   <unicode hex="10FB"/>
   <outline>
     <contour>
-      <point x="301" y="797" type="line" name="hr00" smooth="yes"/>
+      <point x="301" y="797" type="line" smooth="yes" name="hr00"/>
       <point x="281" y="797"/>
       <point x="271" y="807"/>
-      <point x="271" y="827" type="curve" name="sh01" smooth="yes"/>
+      <point x="271" y="827" type="curve" smooth="yes" name="sh01"/>
       <point x="271" y="977" type="line" smooth="yes"/>
       <point x="271" y="997"/>
       <point x="281" y="1007"/>
-      <point x="301" y="1007" type="curve" name="dv03" smooth="yes"/>
+      <point x="301" y="1007" type="curve" smooth="yes" name="dv03"/>
       <point x="486" y="1007" type="line" smooth="yes"/>
       <point x="506" y="1007"/>
       <point x="516" y="997"/>
       <point x="516" y="977" type="curve" smooth="yes"/>
-      <point x="516" y="827" type="line" name="sh02" smooth="yes"/>
+      <point x="516" y="827" type="line" smooth="yes" name="sh02"/>
       <point x="516" y="807"/>
       <point x="506" y="797"/>
       <point x="486" y="797" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="753" y="444" type="line" name="dv04" smooth="yes"/>
+      <point x="753" y="444" type="line" smooth="yes" name="dv04"/>
       <point x="733" y="444"/>
       <point x="723" y="454"/>
-      <point x="723" y="474" type="curve" name="ah01" smooth="yes"/>
+      <point x="723" y="474" type="curve" smooth="yes" name="ah01"/>
       <point x="723" y="622" type="line" smooth="yes"/>
       <point x="723" y="642"/>
       <point x="733" y="652"/>
-      <point x="753" y="652" type="curve" name="dv05" smooth="yes"/>
+      <point x="753" y="652" type="curve" smooth="yes" name="dv05"/>
       <point x="932" y="652" type="line" smooth="yes"/>
       <point x="952" y="652"/>
       <point x="962" y="642"/>
       <point x="962" y="622" type="curve" smooth="yes"/>
-      <point x="962" y="474" type="line" name="sh03" smooth="yes"/>
+      <point x="962" y="474" type="line" smooth="yes" name="sh03"/>
       <point x="962" y="454"/>
       <point x="952" y="444"/>
       <point x="932" y="444" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="301" y="49" type="line" name="dv01" smooth="yes"/>
+      <point x="301" y="49" type="line" smooth="yes" name="dv01"/>
       <point x="281" y="49"/>
       <point x="271" y="59"/>
-      <point x="271" y="79" type="curve" name="sh04" smooth="yes"/>
+      <point x="271" y="79" type="curve" smooth="yes" name="sh04"/>
       <point x="271" y="227" type="line" smooth="yes"/>
       <point x="271" y="247"/>
       <point x="281" y="257"/>
-      <point x="301" y="257" type="curve" name="dv02" smooth="yes"/>
+      <point x="301" y="257" type="curve" smooth="yes" name="dv02"/>
       <point x="483" y="257" type="line" smooth="yes"/>
       <point x="503" y="257"/>
       <point x="513" y="247"/>
-      <point x="513" y="227" type="curve" name="sh05" smooth="yes"/>
+      <point x="513" y="227" type="curve" smooth="yes" name="sh05"/>
       <point x="513" y="79" type="line" smooth="yes"/>
       <point x="513" y="59"/>
       <point x="503" y="49"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni10F_C_.glif b/source/Hack-Bold.ufo/glyphs/uni10F_C_.glif
index cf8dfbb68..cbd86bb76 100644
--- a/source/Hack-Bold.ufo/glyphs/uni10F_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni10F_C_.glif
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10FC" format="1">
+<glyph name="uni10FC" format="2">
   <advance width="1233"/>
   <unicode hex="10FC"/>
   <outline>
     <contour>
-      <point x="602" y="736" type="curve" name="dv01" smooth="yes"/>
+      <point x="602" y="736" type="curve" smooth="yes" name="dv01"/>
       <point x="465" y="736"/>
       <point x="382" y="834"/>
       <point x="382" y="1034" type="curve" smooth="yes"/>
-      <point x="382" y="1357" type="line" name="dh01" smooth="yes"/>
+      <point x="382" y="1357" type="line" smooth="yes" name="dh01"/>
       <point x="382" y="1488"/>
       <point x="452" y="1553"/>
       <point x="591" y="1553" type="curve" smooth="yes"/>
@@ -24,13 +24,13 @@
       <point x="936" y="736"/>
     </contour>
     <contour>
-      <point x="619" y="852" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="852" type="curve" smooth="yes" name="dv02"/>
       <point x="670" y="852"/>
       <point x="702" y="913"/>
-      <point x="702" y="1026" type="curve" name="sh01" smooth="yes"/>
+      <point x="702" y="1026" type="curve" smooth="yes" name="sh01"/>
       <point x="702" y="1138"/>
       <point x="670" y="1190"/>
-      <point x="619" y="1190" type="curve" name="hr01" smooth="yes"/>
+      <point x="619" y="1190" type="curve" smooth="yes" name="hr01"/>
       <point x="494" y="1190"/>
       <point x="500" y="852"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni1E_B_C_.glif b/source/Hack-Bold.ufo/glyphs/uni1E_B_C_.glif
index d08caad8d..64d08f797 100644
--- a/source/Hack-Bold.ufo/glyphs/uni1E_B_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni1E_B_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni1EBC" format="1">
+<glyph name="uni1EBC" format="2">
   <advance width="1233"/>
   <unicode hex="1EBC"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="438" y="1594" type="line" smooth="yes"/>
       <point x="438" y="1662"/>
       <point x="466" y="1704"/>
-      <point x="510" y="1704" type="curve" name="hr01" smooth="yes"/>
+      <point x="510" y="1704" type="curve" smooth="yes" name="hr01"/>
       <point x="531" y="1704"/>
       <point x="550" y="1695"/>
       <point x="582" y="1678" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="648" y="1637" type="line" smooth="yes"/>
       <point x="704" y="1602"/>
       <point x="747" y="1588"/>
-      <point x="795" y="1588" type="curve" name="hr02" smooth="yes"/>
+      <point x="795" y="1588" type="curve" smooth="yes" name="hr02"/>
       <point x="917" y="1588"/>
       <point x="993" y="1682"/>
       <point x="993" y="1826" type="curve" smooth="yes"/>
@@ -28,14 +28,14 @@
       <point x="855" y="1854" type="line"/>
       <point x="855" y="1778"/>
       <point x="828" y="1737"/>
-      <point x="781" y="1737" type="curve" name="hr04" smooth="yes"/>
+      <point x="781" y="1737" type="curve" smooth="yes" name="hr04"/>
       <point x="756" y="1737"/>
       <point x="735" y="1746"/>
       <point x="704" y="1766" type="curve" smooth="yes"/>
       <point x="644" y="1805" type="line" smooth="yes"/>
       <point x="593" y="1838"/>
       <point x="543" y="1854"/>
-      <point x="493" y="1854" type="curve" name="hr05" smooth="yes"/>
+      <point x="493" y="1854" type="curve" smooth="yes" name="hr05"/>
       <point x="380" y="1854"/>
       <point x="298" y="1759"/>
       <point x="298" y="1618" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni1E_B_D_.glif b/source/Hack-Bold.ufo/glyphs/uni1E_B_D_.glif
index 0929b2a18..e73befb5b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni1E_B_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni1E_B_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni1EBD" format="1">
+<glyph name="uni1EBD" format="2">
   <advance width="1233"/>
   <unicode hex="1EBD"/>
   <outline>
@@ -16,7 +16,7 @@
       <point x="614" y="1499" type="line" smooth="yes"/>
       <point x="555" y="1540"/>
       <point x="516" y="1556"/>
-      <point x="465" y="1556" type="curve" name="hr01" smooth="yes"/>
+      <point x="465" y="1556" type="curve" smooth="yes" name="hr01"/>
       <point x="340" y="1556"/>
       <point x="268" y="1455"/>
       <point x="268" y="1272" type="curve"/>
@@ -34,7 +34,7 @@
       <point x="701" y="1282" type="curve" smooth="yes"/>
       <point x="722" y="1274"/>
       <point x="743" y="1270"/>
-      <point x="764" y="1270" type="curve" name="hr02" smooth="yes"/>
+      <point x="764" y="1270" type="curve" smooth="yes" name="hr02"/>
       <point x="895" y="1270"/>
       <point x="965" y="1370"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni1E_F_8.glif b/source/Hack-Bold.ufo/glyphs/uni1E_F_8.glif
index 782ab037b..e3bfe0c83 100644
--- a/source/Hack-Bold.ufo/glyphs/uni1E_F_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni1E_F_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni1EF8" format="1">
+<glyph name="uni1EF8" format="2">
   <advance width="1233"/>
   <unicode hex="1EF8"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="428" y="1594" type="line" smooth="yes"/>
       <point x="428" y="1662"/>
       <point x="456" y="1704"/>
-      <point x="500" y="1704" type="curve" name="hr01" smooth="yes"/>
+      <point x="500" y="1704" type="curve" smooth="yes" name="hr01"/>
       <point x="521" y="1704"/>
       <point x="540" y="1695"/>
       <point x="572" y="1678" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="638" y="1637" type="line" smooth="yes"/>
       <point x="694" y="1602"/>
       <point x="737" y="1588"/>
-      <point x="785" y="1588" type="curve" name="hr02" smooth="yes"/>
+      <point x="785" y="1588" type="curve" smooth="yes" name="hr02"/>
       <point x="907" y="1588"/>
       <point x="983" y="1682"/>
       <point x="983" y="1826" type="curve" smooth="yes"/>
@@ -28,14 +28,14 @@
       <point x="845" y="1854" type="line"/>
       <point x="845" y="1778"/>
       <point x="818" y="1737"/>
-      <point x="771" y="1737" type="curve" name="hr04" smooth="yes"/>
+      <point x="771" y="1737" type="curve" smooth="yes" name="hr04"/>
       <point x="746" y="1737"/>
       <point x="725" y="1746"/>
       <point x="694" y="1766" type="curve" smooth="yes"/>
       <point x="634" y="1805" type="line" smooth="yes"/>
       <point x="583" y="1838"/>
       <point x="533" y="1854"/>
-      <point x="483" y="1854" type="curve" name="hr05" smooth="yes"/>
+      <point x="483" y="1854" type="curve" smooth="yes" name="hr05"/>
       <point x="370" y="1854"/>
       <point x="288" y="1759"/>
       <point x="288" y="1618" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni1E_F_9.glif b/source/Hack-Bold.ufo/glyphs/uni1E_F_9.glif
index e15e1cfa0..70abd99f1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni1E_F_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni1E_F_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni1EF9" format="1">
+<glyph name="uni1EF9" format="2">
   <advance width="1233"/>
   <unicode hex="1EF9"/>
   <outline>
@@ -16,7 +16,7 @@
       <point x="644" y="1499" type="line" smooth="yes"/>
       <point x="585" y="1540"/>
       <point x="546" y="1556"/>
-      <point x="495" y="1556" type="curve" name="hr01" smooth="yes"/>
+      <point x="495" y="1556" type="curve" smooth="yes" name="hr01"/>
       <point x="370" y="1556"/>
       <point x="298" y="1455"/>
       <point x="298" y="1272" type="curve"/>
@@ -34,7 +34,7 @@
       <point x="731" y="1282" type="curve" smooth="yes"/>
       <point x="752" y="1274"/>
       <point x="773" y="1270"/>
-      <point x="794" y="1270" type="curve" name="hr02" smooth="yes"/>
+      <point x="794" y="1270" type="curve" smooth="yes" name="hr02"/>
       <point x="925" y="1270"/>
       <point x="995" y="1370"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2000.glif b/source/Hack-Bold.ufo/glyphs/uni2000.glif
index d0ebf1f93..fcf33b66d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2000.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2000.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2000" format="1">
+<glyph name="uni2000" format="2">
   <advance width="1233"/>
   <unicode hex="2000"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2001.glif b/source/Hack-Bold.ufo/glyphs/uni2001.glif
index 2d9044ed7..52cc3eb33 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2001.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2001.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2001" format="1">
+<glyph name="uni2001" format="2">
   <advance width="1233"/>
   <unicode hex="2001"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2002.glif b/source/Hack-Bold.ufo/glyphs/uni2002.glif
index 118881251..d3ed2c892 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2002.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2002.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2002" format="1">
+<glyph name="uni2002" format="2">
   <advance width="1233"/>
   <unicode hex="2002"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2003.glif b/source/Hack-Bold.ufo/glyphs/uni2003.glif
index ed1727198..6c33cbbb4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2003.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2003.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2003" format="1">
+<glyph name="uni2003" format="2">
   <advance width="1233"/>
   <unicode hex="2003"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2004.glif b/source/Hack-Bold.ufo/glyphs/uni2004.glif
index 7760d1614..832cf5e86 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2004.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2004.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2004" format="1">
+<glyph name="uni2004" format="2">
   <advance width="1233"/>
   <unicode hex="2004"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2005.glif b/source/Hack-Bold.ufo/glyphs/uni2005.glif
index c74724fd0..d3890d22c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2005.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2005.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2005" format="1">
+<glyph name="uni2005" format="2">
   <advance width="1233"/>
   <unicode hex="2005"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2006.glif b/source/Hack-Bold.ufo/glyphs/uni2006.glif
index 8ebfe7b0f..38d77599d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2006.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2006.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2006" format="1">
+<glyph name="uni2006" format="2">
   <advance width="1233"/>
   <unicode hex="2006"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2007.glif b/source/Hack-Bold.ufo/glyphs/uni2007.glif
index 9feeb6e4e..efb323052 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2007.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2007.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2007" format="1">
+<glyph name="uni2007" format="2">
   <advance width="1233"/>
   <unicode hex="2007"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2008.glif b/source/Hack-Bold.ufo/glyphs/uni2008.glif
index ead1bfbab..98b293250 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2008.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2008.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2008" format="1">
+<glyph name="uni2008" format="2">
   <advance width="1233"/>
   <unicode hex="2008"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2009.glif b/source/Hack-Bold.ufo/glyphs/uni2009.glif
index 6bcafac01..ccc5dddc7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2009.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2009.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2009" format="1">
+<glyph name="uni2009" format="2">
   <advance width="1233"/>
   <unicode hex="2009"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni200A_.glif b/source/Hack-Bold.ufo/glyphs/uni200A_.glif
index 7f7754a85..e24c197d9 100644
--- a/source/Hack-Bold.ufo/glyphs/uni200A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni200A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni200A" format="1">
+<glyph name="uni200A" format="2">
   <advance width="1233"/>
   <unicode hex="200A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2010.glif b/source/Hack-Bold.ufo/glyphs/uni2010.glif
index 737d9598e..f0378cd54 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2010.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2010.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2010" format="1">
+<glyph name="uni2010" format="2">
   <advance width="1233"/>
   <unicode hex="2010"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2011.glif b/source/Hack-Bold.ufo/glyphs/uni2011.glif
index f1b402d48..60a535526 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2011.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2011.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2011" format="1">
+<glyph name="uni2011" format="2">
   <advance width="1233"/>
   <unicode hex="2011"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2015.glif b/source/Hack-Bold.ufo/glyphs/uni2015.glif
index ae862f8ff..438af97c3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2015.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2015.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2015" format="1">
+<glyph name="uni2015" format="2">
   <advance width="1233"/>
   <unicode hex="2015"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2016.glif b/source/Hack-Bold.ufo/glyphs/uni2016.glif
index 85cf9fb51..3096e137d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2016.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2016.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2016" format="1">
+<glyph name="uni2016" format="2">
   <advance width="1233"/>
   <unicode hex="2016"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni201F_.glif b/source/Hack-Bold.ufo/glyphs/uni201F_.glif
index bb0266fab..d3dc41f3c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni201F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni201F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni201F" format="1">
+<glyph name="uni201F" format="2">
   <advance width="1233"/>
   <unicode hex="201F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2023.glif b/source/Hack-Bold.ufo/glyphs/uni2023.glif
index 2eecf46b8..14f028134 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2023.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2023.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2023" format="1">
+<glyph name="uni2023" format="2">
   <advance width="1233"/>
   <unicode hex="2023"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni202F_.glif b/source/Hack-Bold.ufo/glyphs/uni202F_.glif
index 33cb9cc4c..ce697df98 100644
--- a/source/Hack-Bold.ufo/glyphs/uni202F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni202F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni202F" format="1">
+<glyph name="uni202F" format="2">
   <advance width="1233"/>
   <unicode hex="202F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2031.glif b/source/Hack-Bold.ufo/glyphs/uni2031.glif
index 6ff156894..c75d60fd4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2031.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2031.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2031" format="1">
+<glyph name="uni2031" format="2">
   <advance width="1233"/>
   <unicode hex="2031"/>
   <outline>
     <contour>
-      <point x="286" y="856" type="curve" name="dv05" smooth="yes"/>
+      <point x="286" y="856" type="curve" smooth="yes" name="dv05"/>
       <point x="129" y="856"/>
       <point x="0" y="984"/>
-      <point x="0" y="1145" type="curve" name="dh01" smooth="yes"/>
+      <point x="0" y="1145" type="curve" smooth="yes" name="dh01"/>
       <point x="0" y="1305"/>
       <point x="129" y="1432"/>
-      <point x="286" y="1432" type="curve" name="dv02" smooth="yes"/>
+      <point x="286" y="1432" type="curve" smooth="yes" name="dv02"/>
       <point x="446" y="1432"/>
       <point x="571" y="1304"/>
-      <point x="571" y="1145" type="curve" name="sh01" smooth="yes"/>
+      <point x="571" y="1145" type="curve" smooth="yes" name="sh01"/>
       <point x="571" y="985"/>
       <point x="443" y="856"/>
     </contour>
     <contour>
-      <point x="285" y="1018" type="curve" name="dv06" smooth="yes"/>
+      <point x="285" y="1018" type="curve" smooth="yes" name="dv06"/>
       <point x="353" y="1018"/>
       <point x="410" y="1078"/>
-      <point x="410" y="1146" type="curve" name="ih01" smooth="yes"/>
+      <point x="410" y="1146" type="curve" smooth="yes" name="ih01"/>
       <point x="410" y="1213"/>
       <point x="353" y="1270"/>
-      <point x="284" y="1270" type="curve" name="dv01" smooth="yes"/>
+      <point x="284" y="1270" type="curve" smooth="yes" name="dv01"/>
       <point x="216" y="1270"/>
       <point x="162" y="1216"/>
-      <point x="162" y="1147" type="curve" name="dh02" smooth="yes"/>
+      <point x="162" y="1147" type="curve" smooth="yes" name="dh02"/>
       <point x="162" y="1078"/>
       <point x="217" y="1018"/>
     </contour>
@@ -38,13 +38,13 @@
       <point x="72" y="565" type="line"/>
     </contour>
     <contour>
-      <point x="254" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="254" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="111" y="0"/>
       <point x="0" y="127"/>
-      <point x="0" y="290" type="curve" name="sh02" smooth="yes"/>
+      <point x="0" y="290" type="curve" smooth="yes" name="sh02"/>
       <point x="0" y="450"/>
       <point x="108" y="575"/>
-      <point x="256" y="575" type="curve" name="dv04" smooth="yes"/>
+      <point x="256" y="575" type="curve" smooth="yes" name="dv04"/>
       <point x="325" y="575"/>
       <point x="383" y="547"/>
       <point x="432" y="492" type="curve" smooth="yes"/>
@@ -57,13 +57,13 @@
       <point x="800" y="492" type="line" smooth="yes"/>
       <point x="849" y="547"/>
       <point x="908" y="575"/>
-      <point x="976" y="575" type="curve" name="sv01" smooth="yes"/>
+      <point x="976" y="575" type="curve" smooth="yes" name="sv01"/>
       <point x="1120" y="575"/>
       <point x="1233" y="448"/>
-      <point x="1233" y="289" type="curve" name="dh06" smooth="yes"/>
+      <point x="1233" y="289" type="curve" smooth="yes" name="dh06"/>
       <point x="1233" y="129"/>
       <point x="1120" y="0"/>
-      <point x="977" y="0" type="curve" name="ab02" smooth="yes"/>
+      <point x="977" y="0" type="curve" smooth="yes" name="ab02"/>
       <point x="909" y="0"/>
       <point x="850" y="28"/>
       <point x="801" y="83" type="curve" smooth="yes"/>
@@ -71,7 +71,7 @@
       <point x="796" y="84" type="line"/>
       <point x="746" y="28"/>
       <point x="686" y="0"/>
-      <point x="616" y="0" type="curve" name="ab03" smooth="yes"/>
+      <point x="616" y="0" type="curve" smooth="yes" name="ab03"/>
       <point x="547" y="0"/>
       <point x="487" y="28"/>
       <point x="438" y="83" type="curve" smooth="yes"/>
@@ -81,13 +81,13 @@
       <point x="323" y="0"/>
     </contour>
     <contour>
-      <point x="253" y="162" type="curve" name="sv02" smooth="yes"/>
+      <point x="253" y="162" type="curve" smooth="yes" name="sv02"/>
       <point x="313" y="162"/>
       <point x="364" y="223"/>
-      <point x="364" y="290" type="curve" name="dh03" smooth="yes"/>
+      <point x="364" y="290" type="curve" smooth="yes" name="dh03"/>
       <point x="364" y="357"/>
       <point x="312" y="414"/>
-      <point x="252" y="414" type="curve" name="dv03" smooth="yes"/>
+      <point x="252" y="414" type="curve" smooth="yes" name="dv03"/>
       <point x="193" y="414"/>
       <point x="144" y="359"/>
       <point x="144" y="290" type="curve" smooth="yes"/>
@@ -95,25 +95,25 @@
       <point x="193" y="162"/>
     </contour>
     <contour>
-      <point x="616" y="162" type="curve" name="sv03" smooth="yes"/>
+      <point x="616" y="162" type="curve" smooth="yes" name="sv03"/>
       <point x="675" y="162"/>
       <point x="726" y="220"/>
       <point x="726" y="285" type="curve" smooth="yes"/>
-      <point x="726" y="289" type="line" name="dh05" smooth="yes"/>
+      <point x="726" y="289" type="line" smooth="yes" name="dh05"/>
       <point x="726" y="357"/>
       <point x="674" y="414"/>
-      <point x="615" y="414" type="curve" name="sv04" smooth="yes"/>
+      <point x="615" y="414" type="curve" smooth="yes" name="sv04"/>
       <point x="556" y="414"/>
       <point x="507" y="356"/>
-      <point x="507" y="288" type="curve" name="dh04" smooth="yes"/>
+      <point x="507" y="288" type="curve" smooth="yes" name="dh04"/>
       <point x="507" y="221"/>
       <point x="555" y="162"/>
     </contour>
     <contour>
-      <point x="978" y="162" type="curve" name="sv05" smooth="yes"/>
+      <point x="978" y="162" type="curve" smooth="yes" name="sv05"/>
       <point x="1038" y="162"/>
       <point x="1089" y="220"/>
-      <point x="1089" y="288" type="curve" name="sh03" smooth="yes"/>
+      <point x="1089" y="288" type="curve" smooth="yes" name="sh03"/>
       <point x="1089" y="357"/>
       <point x="1038" y="411"/>
       <point x="978" y="414" type="curve" name="sv06"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2035.glif b/source/Hack-Bold.ufo/glyphs/uni2035.glif
index c9d5f38b8..cae52c272 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2035.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2035.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2035" format="1">
+<glyph name="uni2035" format="2">
   <advance width="1233"/>
   <unicode hex="2035"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2036.glif b/source/Hack-Bold.ufo/glyphs/uni2036.glif
index 48ffd0c2f..4d822a92a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2036.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2036.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2036" format="1">
+<glyph name="uni2036" format="2">
   <advance width="1233"/>
   <unicode hex="2036"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2037.glif b/source/Hack-Bold.ufo/glyphs/uni2037.glif
index 301412531..fca44686b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2037.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2037.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2037" format="1">
+<glyph name="uni2037" format="2">
   <advance width="1233"/>
   <unicode hex="2037"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni203D_.glif b/source/Hack-Bold.ufo/glyphs/uni203D_.glif
index 4cf78be90..8d95d03c4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni203D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni203D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni203D" format="1">
+<glyph name="uni203D" format="2">
   <advance width="1233"/>
   <unicode hex="203D"/>
   <outline>
@@ -12,17 +12,17 @@
       <point x="233" y="1407" type="line"/>
       <point x="365" y="1483"/>
       <point x="495" y="1520"/>
-      <point x="636" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="636" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="899" y="1520"/>
       <point x="1065" y="1388"/>
-      <point x="1065" y="1168" type="curve" name="dh03" smooth="yes"/>
+      <point x="1065" y="1168" type="curve" smooth="yes" name="dh03"/>
       <point x="1065" y="1069"/>
       <point x="1031" y="993"/>
       <point x="903" y="868" type="curve" smooth="yes"/>
       <point x="815" y="782" type="line" smooth="yes"/>
       <point x="717" y="687"/>
       <point x="712" y="653"/>
-      <point x="709" y="571" type="curve" name="sh02" smooth="yes"/>
+      <point x="709" y="571" type="curve" smooth="yes" name="sh02"/>
       <point x="707" y="524" type="line"/>
       <point x="707" y="401" type="line" name="sh03"/>
       <point x="440" y="401" type="line"/>
@@ -31,7 +31,7 @@
       <point x="707" y="997" type="line" name="iv01"/>
       <point x="754" y="1046"/>
       <point x="780" y="1087"/>
-      <point x="780" y="1146" type="curve" name="hr01" smooth="yes"/>
+      <point x="780" y="1146" type="curve" smooth="yes" name="hr01"/>
       <point x="780" y="1190"/>
       <point x="765" y="1223"/>
       <point x="734" y="1246" type="curve" smooth="yes"/>
@@ -40,10 +40,10 @@
       <point x="707" y="1261" type="curve" name="dh02"/>
     </contour>
     <contour>
-      <point x="574" y="-50" type="curve" name="av01" smooth="yes"/>
+      <point x="574" y="-50" type="curve" smooth="yes" name="av01"/>
       <point x="485" y="-50"/>
       <point x="413" y="20"/>
-      <point x="413" y="117" type="curve" name="ih01" smooth="yes"/>
+      <point x="413" y="117" type="curve" smooth="yes" name="ih01"/>
       <point x="413" y="166"/>
       <point x="429" y="208"/>
       <point x="460" y="239" type="curve" smooth="yes"/>
@@ -61,10 +61,10 @@
       <point x="688" y="237" type="curve" smooth="yes"/>
       <point x="701" y="224"/>
       <point x="714" y="207"/>
-      <point x="723" y="184" type="curve" name="hr03" smooth="yes"/>
+      <point x="723" y="184" type="curve" smooth="yes" name="hr03"/>
       <point x="731" y="164"/>
       <point x="735" y="142"/>
-      <point x="735" y="118" type="curve" name="sh04" smooth="yes"/>
+      <point x="735" y="118" type="curve" smooth="yes" name="sh04"/>
       <point x="735" y="19"/>
       <point x="663" y="-50"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni203E_.glif b/source/Hack-Bold.ufo/glyphs/uni203E_.glif
index 30bfeccbb..5c14d6dbf 100644
--- a/source/Hack-Bold.ufo/glyphs/uni203E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni203E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni203E" format="1">
+<glyph name="uni203E" format="2">
   <advance width="1233"/>
   <unicode hex="203E"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni203F_.glif b/source/Hack-Bold.ufo/glyphs/uni203F_.glif
index 862455d75..d61c2c974 100644
--- a/source/Hack-Bold.ufo/glyphs/uni203F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni203F_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni203F" format="1">
+<glyph name="uni203F" format="2">
   <advance width="1233"/>
   <unicode hex="203F"/>
   <outline>
     <contour>
-      <point x="618" y="-485" type="curve" name="hr00" smooth="yes"/>
+      <point x="618" y="-485" type="curve" smooth="yes" name="hr00"/>
       <point x="399" y="-485"/>
       <point x="178" y="-433"/>
       <point x="-67" y="-322" type="curve"/>
       <point x="-67" y="-161" type="line" name="av01"/>
       <point x="172" y="-253"/>
       <point x="393" y="-300"/>
-      <point x="617" y="-300" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="-300" type="curve" smooth="yes" name="dv01"/>
       <point x="837" y="-300"/>
       <point x="1065" y="-254"/>
       <point x="1301" y="-161" type="curve" name="av02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2045.glif b/source/Hack-Bold.ufo/glyphs/uni2045.glif
index dab4ad0b4..8e92b1ed9 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2045.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2045.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2045" format="1">
+<glyph name="uni2045" format="2">
   <advance width="1233"/>
   <unicode hex="2045"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2046.glif b/source/Hack-Bold.ufo/glyphs/uni2046.glif
index 260f5e3f6..7f2ce566c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2046.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2046.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2046" format="1">
+<glyph name="uni2046" format="2">
   <advance width="1233"/>
   <unicode hex="2046"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2047.glif b/source/Hack-Bold.ufo/glyphs/uni2047.glif
index 5bbf9d32d..90b7531d2 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2047.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2047.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2047" format="1">
+<glyph name="uni2047" format="2">
   <advance width="1233"/>
   <unicode hex="2047"/>
   <outline>
@@ -11,7 +11,7 @@
       <point x="242" y="920" type="curve" smooth="yes"/>
       <point x="295" y="1000"/>
       <point x="312" y="1051"/>
-      <point x="312" y="1103" type="curve" name="ih01" smooth="yes"/>
+      <point x="312" y="1103" type="curve" smooth="yes" name="ih01"/>
       <point x="312" y="1196"/>
       <point x="261" y="1269"/>
       <point x="173" y="1213" type="curve"/>
@@ -21,10 +21,10 @@
       <point x="38" y="1407" type="line"/>
       <point x="123" y="1482"/>
       <point x="210" y="1520"/>
-      <point x="299" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="299" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="472" y="1520"/>
       <point x="579" y="1380"/>
-      <point x="579" y="1179" type="curve" name="sh01" smooth="yes"/>
+      <point x="579" y="1179" type="curve" smooth="yes" name="sh01"/>
       <point x="579" y="1071"/>
       <point x="549" y="979"/>
       <point x="496" y="884" type="curve" smooth="yes"/>
@@ -46,7 +46,7 @@
       <point x="858" y="920" type="curve" smooth="yes"/>
       <point x="911" y="1000"/>
       <point x="928" y="1051"/>
-      <point x="928" y="1103" type="curve" name="ih02" smooth="yes"/>
+      <point x="928" y="1103" type="curve" smooth="yes" name="ih02"/>
       <point x="928" y="1196"/>
       <point x="877" y="1269"/>
       <point x="789" y="1213" type="curve"/>
@@ -56,10 +56,10 @@
       <point x="654" y="1407" type="line"/>
       <point x="739" y="1482"/>
       <point x="826" y="1520"/>
-      <point x="915" y="1520" type="curve" name="at02" smooth="yes"/>
+      <point x="915" y="1520" type="curve" smooth="yes" name="at02"/>
       <point x="1088" y="1520"/>
       <point x="1195" y="1380"/>
-      <point x="1195" y="1179" type="curve" name="sh02" smooth="yes"/>
+      <point x="1195" y="1179" type="curve" smooth="yes" name="sh02"/>
       <point x="1195" y="1071"/>
       <point x="1165" y="979"/>
       <point x="1112" y="884" type="curve" smooth="yes"/>
@@ -74,19 +74,19 @@
       <point x="748" y="401" type="line"/>
     </contour>
     <contour>
-      <point x="270" y="-50" type="curve" name="dv01" smooth="yes"/>
+      <point x="270" y="-50" type="curve" smooth="yes" name="dv01"/>
       <point x="181" y="-50"/>
       <point x="109" y="20"/>
-      <point x="109" y="117" type="curve" name="hr02" smooth="yes"/>
+      <point x="109" y="117" type="curve" smooth="yes" name="hr02"/>
       <point x="109" y="166"/>
       <point x="125" y="208"/>
       <point x="156" y="239" type="curve" smooth="yes"/>
       <point x="188" y="270"/>
       <point x="230" y="284"/>
-      <point x="270" y="284" type="curve" name="dv02" smooth="yes"/>
+      <point x="270" y="284" type="curve" smooth="yes" name="dv02"/>
       <point x="281" y="284"/>
       <point x="292" y="283"/>
-      <point x="303" y="281" type="curve" name="sv01" smooth="yes"/>
+      <point x="303" y="281" type="curve" smooth="yes" name="sv01"/>
       <point x="308" y="280"/>
       <point x="321" y="277"/>
       <point x="332" y="272" type="curve" smooth="yes"/>
@@ -98,12 +98,12 @@
       <point x="419" y="184" type="curve" smooth="yes"/>
       <point x="427" y="164"/>
       <point x="431" y="142"/>
-      <point x="431" y="118" type="curve" name="sh03" smooth="yes"/>
+      <point x="431" y="118" type="curve" smooth="yes" name="sh03"/>
       <point x="431" y="19"/>
       <point x="359" y="-50"/>
     </contour>
     <contour>
-      <point x="889" y="-50" type="curve" name="sv02" smooth="yes"/>
+      <point x="889" y="-50" type="curve" smooth="yes" name="sv02"/>
       <point x="800" y="-50"/>
       <point x="728" y="20"/>
       <point x="728" y="117" type="curve" smooth="yes"/>
@@ -112,10 +112,10 @@
       <point x="775" y="239" type="curve" smooth="yes"/>
       <point x="807" y="270"/>
       <point x="849" y="284"/>
-      <point x="889" y="284" type="curve" name="sv03" smooth="yes"/>
+      <point x="889" y="284" type="curve" smooth="yes" name="sv03"/>
       <point x="900" y="284"/>
       <point x="911" y="283"/>
-      <point x="922" y="281" type="curve" name="hr03" smooth="yes"/>
+      <point x="922" y="281" type="curve" smooth="yes" name="hr03"/>
       <point x="927" y="280"/>
       <point x="940" y="277"/>
       <point x="951" y="272" type="curve" smooth="yes"/>
@@ -127,7 +127,7 @@
       <point x="1038" y="184" type="curve" smooth="yes"/>
       <point x="1046" y="164"/>
       <point x="1050" y="142"/>
-      <point x="1050" y="118" type="curve" name="sh04" smooth="yes"/>
+      <point x="1050" y="118" type="curve" smooth="yes" name="sh04"/>
       <point x="1050" y="19"/>
       <point x="978" y="-50"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2048.glif b/source/Hack-Bold.ufo/glyphs/uni2048.glif
index c856ec34b..4e8ec9eb6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2048.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2048.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2048" format="1">
+<glyph name="uni2048" format="2">
   <advance width="1233"/>
   <unicode hex="2048"/>
   <outline>
@@ -11,7 +11,7 @@
       <point x="242" y="920" type="curve" smooth="yes"/>
       <point x="295" y="1000"/>
       <point x="312" y="1051"/>
-      <point x="312" y="1103" type="curve" name="ih01" smooth="yes"/>
+      <point x="312" y="1103" type="curve" smooth="yes" name="ih01"/>
       <point x="312" y="1196"/>
       <point x="261" y="1269"/>
       <point x="173" y="1213" type="curve"/>
@@ -21,10 +21,10 @@
       <point x="38" y="1407" type="line"/>
       <point x="123" y="1482"/>
       <point x="210" y="1520"/>
-      <point x="299" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="299" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="472" y="1520"/>
       <point x="579" y="1380"/>
-      <point x="579" y="1179" type="curve" name="sh01" smooth="yes"/>
+      <point x="579" y="1179" type="curve" smooth="yes" name="sh01"/>
       <point x="579" y="1071"/>
       <point x="549" y="979"/>
       <point x="496" y="884" type="curve" smooth="yes"/>
@@ -47,7 +47,7 @@
       <point x="842" y="481" type="line"/>
     </contour>
     <contour>
-      <point x="271" y="-50" type="curve" name="dv01" smooth="yes"/>
+      <point x="271" y="-50" type="curve" smooth="yes" name="dv01"/>
       <point x="182" y="-50"/>
       <point x="110" y="20"/>
       <point x="110" y="117" type="curve" smooth="yes"/>
@@ -56,10 +56,10 @@
       <point x="157" y="239" type="curve" smooth="yes"/>
       <point x="189" y="270"/>
       <point x="231" y="284"/>
-      <point x="271" y="284" type="curve" name="dv02" smooth="yes"/>
+      <point x="271" y="284" type="curve" smooth="yes" name="dv02"/>
       <point x="282" y="284"/>
       <point x="293" y="283"/>
-      <point x="304" y="281" type="curve" name="sv01" smooth="yes"/>
+      <point x="304" y="281" type="curve" smooth="yes" name="sv01"/>
       <point x="309" y="280"/>
       <point x="322" y="277"/>
       <point x="333" y="272" type="curve" smooth="yes"/>
@@ -71,12 +71,12 @@
       <point x="420" y="184" type="curve" smooth="yes"/>
       <point x="428" y="164"/>
       <point x="432" y="142"/>
-      <point x="432" y="118" type="curve" name="sh02" smooth="yes"/>
+      <point x="432" y="118" type="curve" smooth="yes" name="sh02"/>
       <point x="432" y="19"/>
       <point x="360" y="-50"/>
     </contour>
     <contour>
-      <point x="947" y="-50" type="curve" name="sv02" smooth="yes"/>
+      <point x="947" y="-50" type="curve" smooth="yes" name="sv02"/>
       <point x="858" y="-50"/>
       <point x="786" y="20"/>
       <point x="786" y="117" type="curve" smooth="yes"/>
@@ -85,10 +85,10 @@
       <point x="833" y="239" type="curve" smooth="yes"/>
       <point x="865" y="270"/>
       <point x="907" y="284"/>
-      <point x="947" y="284" type="curve" name="sv03" smooth="yes"/>
+      <point x="947" y="284" type="curve" smooth="yes" name="sv03"/>
       <point x="958" y="284"/>
       <point x="969" y="283"/>
-      <point x="980" y="281" type="curve" name="hr02" smooth="yes"/>
+      <point x="980" y="281" type="curve" smooth="yes" name="hr02"/>
       <point x="985" y="280"/>
       <point x="998" y="277"/>
       <point x="1009" y="272" type="curve" smooth="yes"/>
@@ -100,7 +100,7 @@
       <point x="1096" y="184" type="curve" smooth="yes"/>
       <point x="1104" y="164"/>
       <point x="1108" y="142"/>
-      <point x="1108" y="118" type="curve" name="sh03" smooth="yes"/>
+      <point x="1108" y="118" type="curve" smooth="yes" name="sh03"/>
       <point x="1108" y="19"/>
       <point x="1036" y="-50"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2049.glif b/source/Hack-Bold.ufo/glyphs/uni2049.glif
index 7e42e5dcf..16e38d24d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2049.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2049.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2049" format="1">
+<glyph name="uni2049" format="2">
   <advance width="1233"/>
   <unicode hex="2049"/>
   <outline>
@@ -11,7 +11,7 @@
       <point x="858" y="920" type="curve" smooth="yes"/>
       <point x="911" y="1000"/>
       <point x="928" y="1051"/>
-      <point x="928" y="1103" type="curve" name="ih01" smooth="yes"/>
+      <point x="928" y="1103" type="curve" smooth="yes" name="ih01"/>
       <point x="928" y="1196"/>
       <point x="877" y="1269"/>
       <point x="789" y="1213" type="curve"/>
@@ -21,10 +21,10 @@
       <point x="654" y="1407" type="line"/>
       <point x="739" y="1482"/>
       <point x="826" y="1520"/>
-      <point x="915" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="915" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1088" y="1520"/>
       <point x="1195" y="1380"/>
-      <point x="1195" y="1179" type="curve" name="sh01" smooth="yes"/>
+      <point x="1195" y="1179" type="curve" smooth="yes" name="sh01"/>
       <point x="1195" y="1071"/>
       <point x="1165" y="979"/>
       <point x="1112" y="884" type="curve" smooth="yes"/>
@@ -47,19 +47,19 @@
       <point x="194" y="481" type="line"/>
     </contour>
     <contour>
-      <point x="290" y="-50" type="curve" name="dv01" smooth="yes"/>
+      <point x="290" y="-50" type="curve" smooth="yes" name="dv01"/>
       <point x="201" y="-50"/>
       <point x="129" y="20"/>
-      <point x="129" y="117" type="curve" name="dh01" smooth="yes"/>
+      <point x="129" y="117" type="curve" smooth="yes" name="dh01"/>
       <point x="129" y="166"/>
       <point x="145" y="208"/>
       <point x="176" y="239" type="curve" smooth="yes"/>
       <point x="208" y="270"/>
       <point x="250" y="284"/>
-      <point x="290" y="284" type="curve" name="dv02" smooth="yes"/>
+      <point x="290" y="284" type="curve" smooth="yes" name="dv02"/>
       <point x="301" y="284"/>
       <point x="312" y="283"/>
-      <point x="323" y="281" type="curve" name="sv01" smooth="yes"/>
+      <point x="323" y="281" type="curve" smooth="yes" name="sv01"/>
       <point x="328" y="280"/>
       <point x="341" y="277"/>
       <point x="352" y="272" type="curve" smooth="yes"/>
@@ -71,12 +71,12 @@
       <point x="439" y="184" type="curve" smooth="yes"/>
       <point x="447" y="164"/>
       <point x="451" y="142"/>
-      <point x="451" y="118" type="curve" name="dh02" smooth="yes"/>
+      <point x="451" y="118" type="curve" smooth="yes" name="dh02"/>
       <point x="451" y="19"/>
       <point x="379" y="-50"/>
     </contour>
     <contour>
-      <point x="894" y="-50" type="curve" name="sv02" smooth="yes"/>
+      <point x="894" y="-50" type="curve" smooth="yes" name="sv02"/>
       <point x="805" y="-50"/>
       <point x="733" y="20"/>
       <point x="733" y="117" type="curve" smooth="yes"/>
@@ -85,10 +85,10 @@
       <point x="780" y="239" type="curve" smooth="yes"/>
       <point x="812" y="270"/>
       <point x="854" y="284"/>
-      <point x="894" y="284" type="curve" name="sv03" smooth="yes"/>
+      <point x="894" y="284" type="curve" smooth="yes" name="sv03"/>
       <point x="905" y="284"/>
       <point x="916" y="283"/>
-      <point x="927" y="281" type="curve" name="hr02" smooth="yes"/>
+      <point x="927" y="281" type="curve" smooth="yes" name="hr02"/>
       <point x="932" y="280"/>
       <point x="945" y="277"/>
       <point x="956" y="272" type="curve" smooth="yes"/>
@@ -100,7 +100,7 @@
       <point x="1043" y="184" type="curve" smooth="yes"/>
       <point x="1051" y="164"/>
       <point x="1055" y="142"/>
-      <point x="1055" y="118" type="curve" name="sh03" smooth="yes"/>
+      <point x="1055" y="118" type="curve" smooth="yes" name="sh03"/>
       <point x="1055" y="19"/>
       <point x="983" y="-50"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni204B_.glif b/source/Hack-Bold.ufo/glyphs/uni204B_.glif
index 9fb321113..403223c74 100644
--- a/source/Hack-Bold.ufo/glyphs/uni204B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni204B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni204B" format="1">
+<glyph name="uni204B" format="2">
   <advance width="1233"/>
   <unicode hex="204B"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni205F_.glif b/source/Hack-Bold.ufo/glyphs/uni205F_.glif
index 94f3ccd11..5eac8ab7f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni205F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni205F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni205F" format="1">
+<glyph name="uni205F" format="2">
   <advance width="1233"/>
   <unicode hex="205F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2070.glif b/source/Hack-Bold.ufo/glyphs/uni2070.glif
index 9fee02577..f91352313 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2070.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2070.glif
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2070" format="1">
+<glyph name="uni2070" format="2">
   <advance width="1233"/>
   <unicode hex="2070"/>
   <outline>
     <contour>
-      <point x="615" y="1113" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="1113" type="curve" smooth="yes" name="dv01"/>
       <point x="390" y="1113"/>
       <point x="278" y="1258"/>
-      <point x="278" y="1547" type="curve" name="dh01" smooth="yes"/>
+      <point x="278" y="1547" type="curve" smooth="yes" name="dh01"/>
       <point x="278" y="1836"/>
       <point x="390" y="1980"/>
-      <point x="615" y="1980" type="curve" name="dv04" smooth="yes"/>
+      <point x="615" y="1980" type="curve" smooth="yes" name="dv04"/>
       <point x="841" y="1980"/>
       <point x="954" y="1836"/>
-      <point x="954" y="1547" type="curve" name="dh05" smooth="yes"/>
+      <point x="954" y="1547" type="curve" smooth="yes" name="dh05"/>
       <point x="954" y="1258"/>
       <point x="841" y="1113"/>
     </contour>
     <contour>
-      <point x="616" y="1253" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1253" type="curve" smooth="yes" name="dv02"/>
       <point x="663" y="1253"/>
       <point x="697" y="1276"/>
       <point x="718" y="1323" type="curve" smooth="yes"/>
       <point x="739" y="1370"/>
       <point x="750" y="1444"/>
-      <point x="750" y="1546" type="curve" name="hr01" smooth="yes"/>
+      <point x="750" y="1546" type="curve" smooth="yes" name="hr01"/>
       <point x="750" y="1647"/>
       <point x="739" y="1722"/>
       <point x="718" y="1770" type="curve" smooth="yes"/>
       <point x="697" y="1817"/>
       <point x="663" y="1840"/>
-      <point x="616" y="1840" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1840" type="curve" smooth="yes" name="dv03"/>
       <point x="564" y="1840"/>
       <point x="534" y="1813"/>
       <point x="514" y="1770" type="curve" smooth="yes"/>
       <point x="492" y="1723"/>
       <point x="481" y="1648"/>
-      <point x="481" y="1546" type="curve" name="dh02" smooth="yes"/>
+      <point x="481" y="1546" type="curve" smooth="yes" name="dh02"/>
       <point x="481" y="1445"/>
       <point x="492" y="1371"/>
       <point x="514" y="1323" type="curve" smooth="yes"/>
@@ -50,13 +50,13 @@
       <point x="555" y="1496" type="curve" smooth="yes"/>
       <point x="539" y="1509"/>
       <point x="531" y="1525"/>
-      <point x="531" y="1545" type="curve" name="dh03" smooth="yes"/>
+      <point x="531" y="1545" type="curve" smooth="yes" name="dh03"/>
       <point x="531" y="1586"/>
       <point x="568" y="1617"/>
-      <point x="615" y="1617" type="curve" name="sv01" smooth="yes"/>
+      <point x="615" y="1617" type="curve" smooth="yes" name="sv01"/>
       <point x="662" y="1617"/>
       <point x="701" y="1586"/>
-      <point x="701" y="1546" type="curve" name="dh04" smooth="yes"/>
+      <point x="701" y="1546" type="curve" smooth="yes" name="dh04"/>
       <point x="701" y="1507"/>
       <point x="664" y="1476"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2074.glif b/source/Hack-Bold.ufo/glyphs/uni2074.glif
index 2338b76a7..55e0128a0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2074.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2074.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2074" format="1">
+<glyph name="uni2074" format="2">
   <advance width="1233"/>
   <unicode hex="2074"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2075.glif b/source/Hack-Bold.ufo/glyphs/uni2075.glif
index d3bc5c7b6..6ca62b7d2 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2075.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2075.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2075" format="1">
+<glyph name="uni2075" format="2">
   <advance width="1233"/>
   <unicode hex="2075"/>
   <outline>
     <contour>
-      <point x="557" y="1113" type="curve" name="hr00" smooth="yes"/>
+      <point x="557" y="1113" type="curve" smooth="yes" name="hr00"/>
       <point x="477" y="1113"/>
       <point x="386" y="1125"/>
       <point x="293" y="1149" type="curve"/>
       <point x="293" y="1297" type="line"/>
       <point x="361" y="1269"/>
       <point x="448" y="1251"/>
-      <point x="531" y="1251" type="curve" name="dv01" smooth="yes"/>
+      <point x="531" y="1251" type="curve" smooth="yes" name="dv01"/>
       <point x="672" y="1251"/>
       <point x="747" y="1303"/>
-      <point x="747" y="1394" type="curve" name="ah01" smooth="yes"/>
+      <point x="747" y="1394" type="curve" smooth="yes" name="ah01"/>
       <point x="747" y="1487"/>
       <point x="668" y="1541"/>
-      <point x="541" y="1541" type="curve" name="dv04" smooth="yes"/>
+      <point x="541" y="1541" type="curve" smooth="yes" name="dv04"/>
       <point x="474" y="1541"/>
       <point x="400" y="1526"/>
       <point x="327" y="1498" type="curve" name="sh01"/>
@@ -28,10 +28,10 @@
       <point x="491" y="1664" type="line" name="sh02"/>
       <point x="523" y="1673"/>
       <point x="558" y="1679"/>
-      <point x="605" y="1679" type="curve" name="dv05" smooth="yes"/>
+      <point x="605" y="1679" type="curve" smooth="yes" name="dv05"/>
       <point x="803" y="1679"/>
       <point x="944" y="1565"/>
-      <point x="944" y="1394" type="curve" name="sh03" smooth="yes"/>
+      <point x="944" y="1394" type="curve" smooth="yes" name="sh03"/>
       <point x="944" y="1221"/>
       <point x="798" y="1113"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2076.glif b/source/Hack-Bold.ufo/glyphs/uni2076.glif
index 289ff3a96..e16005e5b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2076.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2076.glif
@@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2076" format="1">
+<glyph name="uni2076" format="2">
   <advance width="1233"/>
   <unicode hex="2076"/>
   <outline>
     <contour>
-      <point x="637" y="1112" type="curve" name="dv01" smooth="yes"/>
+      <point x="637" y="1112" type="curve" smooth="yes" name="dv01"/>
       <point x="402" y="1112"/>
       <point x="287" y="1241"/>
-      <point x="287" y="1529" type="curve" name="dh01" smooth="yes"/>
+      <point x="287" y="1529" type="curve" smooth="yes" name="dh01"/>
       <point x="287" y="1837"/>
       <point x="419" y="1980"/>
-      <point x="694" y="1980" type="curve" name="dv03" smooth="yes"/>
+      <point x="694" y="1980" type="curve" smooth="yes" name="dv03"/>
       <point x="759" y="1980"/>
       <point x="822" y="1973"/>
       <point x="902" y="1946" type="curve"/>
       <point x="902" y="1797" type="line" name="ih01"/>
       <point x="837" y="1826"/>
       <point x="769" y="1847"/>
-      <point x="698" y="1847" type="curve" name="dv02" smooth="yes"/>
+      <point x="698" y="1847" type="curve" smooth="yes" name="dv02"/>
       <point x="558" y="1847"/>
       <point x="479" y="1766"/>
       <point x="476" y="1609" type="curve" name="dh02"/>
       <point x="519" y="1658"/>
       <point x="585" y="1682"/>
-      <point x="676" y="1682" type="curve" name="dv05" smooth="yes"/>
+      <point x="676" y="1682" type="curve" smooth="yes" name="dv05"/>
       <point x="861" y="1682"/>
       <point x="965" y="1584"/>
-      <point x="965" y="1405" type="curve" name="dh04" smooth="yes"/>
+      <point x="965" y="1405" type="curve" smooth="yes" name="dh04"/>
       <point x="965" y="1218"/>
       <point x="852" y="1112"/>
     </contour>
     <contour>
-      <point x="637" y="1245" type="curve" name="hr01" smooth="yes"/>
+      <point x="637" y="1245" type="curve" smooth="yes" name="hr01"/>
       <point x="725" y="1245"/>
       <point x="773" y="1299"/>
-      <point x="773" y="1396" type="curve" name="dh03" smooth="yes"/>
+      <point x="773" y="1396" type="curve" smooth="yes" name="dh03"/>
       <point x="773" y="1444"/>
       <point x="761" y="1481"/>
       <point x="738" y="1508" type="curve" smooth="yes"/>
       <point x="715" y="1534"/>
       <point x="681" y="1547"/>
-      <point x="637" y="1547" type="curve" name="dv04" smooth="yes"/>
+      <point x="637" y="1547" type="curve" smooth="yes" name="dv04"/>
       <point x="549" y="1547"/>
       <point x="502" y="1496"/>
-      <point x="502" y="1397" type="curve" name="sh01" smooth="yes"/>
+      <point x="502" y="1397" type="curve" smooth="yes" name="sh01"/>
       <point x="502" y="1298"/>
       <point x="549" y="1245"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2077.glif b/source/Hack-Bold.ufo/glyphs/uni2077.glif
index 31b6b700b..5fe7a23a6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2077.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2077.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2077" format="1">
+<glyph name="uni2077" format="2">
   <advance width="1233"/>
   <unicode hex="2077"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2078.glif b/source/Hack-Bold.ufo/glyphs/uni2078.glif
index d3117b6f5..508a28987 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2078.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2078.glif
@@ -1,59 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2078" format="1">
+<glyph name="uni2078" format="2">
   <advance width="1233"/>
   <unicode hex="2078"/>
   <outline>
     <contour>
-      <point x="617" y="1113" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="1113" type="curve" smooth="yes" name="dv01"/>
       <point x="402" y="1113"/>
       <point x="282" y="1206"/>
-      <point x="282" y="1357" type="curve" name="dh01" smooth="yes"/>
+      <point x="282" y="1357" type="curve" smooth="yes" name="dh01"/>
       <point x="282" y="1468"/>
       <point x="347" y="1541"/>
       <point x="466" y="1572" type="curve" name="ih01"/>
       <point x="359" y="1603"/>
       <point x="308" y="1665"/>
-      <point x="308" y="1757" type="curve" name="sh01" smooth="yes"/>
+      <point x="308" y="1757" type="curve" smooth="yes" name="sh01"/>
       <point x="308" y="1895"/>
       <point x="426" y="1980"/>
-      <point x="615" y="1980" type="curve" name="dv04" smooth="yes"/>
+      <point x="615" y="1980" type="curve" smooth="yes" name="dv04"/>
       <point x="807" y="1980"/>
       <point x="924" y="1893"/>
-      <point x="924" y="1757" type="curve" name="dh04" smooth="yes"/>
+      <point x="924" y="1757" type="curve" smooth="yes" name="dh04"/>
       <point x="924" y="1665"/>
       <point x="870" y="1603"/>
       <point x="769" y="1572" type="curve" name="ih02"/>
       <point x="882" y="1543"/>
       <point x="949" y="1473"/>
-      <point x="949" y="1357" type="curve" name="sh02" smooth="yes"/>
+      <point x="949" y="1357" type="curve" smooth="yes" name="sh02"/>
       <point x="949" y="1204"/>
       <point x="830" y="1113"/>
     </contour>
     <contour>
-      <point x="616" y="1635" type="curve" name="dv06" smooth="yes"/>
+      <point x="616" y="1635" type="curve" smooth="yes" name="dv06"/>
       <point x="696" y="1635"/>
       <point x="745" y="1677"/>
-      <point x="745" y="1742" type="curve" name="dh03" smooth="yes"/>
+      <point x="745" y="1742" type="curve" smooth="yes" name="dh03"/>
       <point x="745" y="1807"/>
       <point x="696" y="1847"/>
-      <point x="616" y="1847" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1847" type="curve" smooth="yes" name="dv03"/>
       <point x="536" y="1847"/>
       <point x="487" y="1806"/>
-      <point x="487" y="1742" type="curve" name="dh02" smooth="yes"/>
+      <point x="487" y="1742" type="curve" smooth="yes" name="dh02"/>
       <point x="487" y="1677"/>
       <point x="536" y="1635"/>
     </contour>
     <contour>
-      <point x="615" y="1246" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="1246" type="curve" smooth="yes" name="dv02"/>
       <point x="706" y="1246"/>
       <point x="767" y="1296"/>
       <point x="767" y="1375" type="curve" smooth="yes"/>
       <point x="767" y="1416"/>
       <point x="750" y="1447"/>
-      <point x="726" y="1467" type="curve" name="hr01" smooth="yes"/>
+      <point x="726" y="1467" type="curve" smooth="yes" name="hr01"/>
       <point x="699" y="1490"/>
       <point x="663" y="1501"/>
-      <point x="618" y="1501" type="curve" name="dv05" smooth="yes"/>
+      <point x="618" y="1501" type="curve" smooth="yes" name="dv05"/>
       <point x="525" y="1501"/>
       <point x="464" y="1451"/>
       <point x="464" y="1374" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2079.glif b/source/Hack-Bold.ufo/glyphs/uni2079.glif
index 254de7fc5..53a3055fe 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2079.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2079.glif
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2079" format="1">
+<glyph name="uni2079" format="2">
   <advance width="1233"/>
   <unicode hex="2079"/>
   <outline>
     <contour>
-      <point x="539" y="1113" type="curve" name="dv01" smooth="yes"/>
+      <point x="539" y="1113" type="curve" smooth="yes" name="dv01"/>
       <point x="471" y="1113"/>
       <point x="410" y="1122"/>
       <point x="330" y="1146" type="curve"/>
       <point x="330" y="1297" type="line" name="ih01"/>
       <point x="398" y="1265"/>
       <point x="465" y="1246"/>
-      <point x="533" y="1246" type="curve" name="dv02" smooth="yes"/>
+      <point x="533" y="1246" type="curve" smooth="yes" name="dv02"/>
       <point x="676" y="1246"/>
       <point x="752" y="1329"/>
       <point x="756" y="1484" type="curve" name="sh01"/>
       <point x="712" y="1436"/>
       <point x="646" y="1411"/>
-      <point x="554" y="1411" type="curve" name="dv05" smooth="yes"/>
+      <point x="554" y="1411" type="curve" smooth="yes" name="dv05"/>
       <point x="370" y="1411"/>
       <point x="267" y="1508"/>
-      <point x="267" y="1687" type="curve" name="dh01" smooth="yes"/>
+      <point x="267" y="1687" type="curve" smooth="yes" name="dh01"/>
       <point x="267" y="1875"/>
       <point x="380" y="1980"/>
-      <point x="595" y="1980" type="curve" name="dv04" smooth="yes"/>
+      <point x="595" y="1980" type="curve" smooth="yes" name="dv04"/>
       <point x="828" y="1980"/>
       <point x="945" y="1852"/>
-      <point x="945" y="1564" type="curve" name="dh03" smooth="yes"/>
+      <point x="945" y="1564" type="curve" smooth="yes" name="dh03"/>
       <point x="945" y="1255"/>
       <point x="811" y="1113"/>
     </contour>
     <contour>
-      <point x="595" y="1551" type="curve" name="dv06" smooth="yes"/>
+      <point x="595" y="1551" type="curve" smooth="yes" name="dv06"/>
       <point x="683" y="1551"/>
       <point x="729" y="1603"/>
-      <point x="729" y="1702" type="curve" name="hr01" smooth="yes"/>
+      <point x="729" y="1702" type="curve" smooth="yes" name="hr01"/>
       <point x="729" y="1801"/>
       <point x="683" y="1854"/>
-      <point x="595" y="1854" type="curve" name="dv03" smooth="yes"/>
+      <point x="595" y="1854" type="curve" smooth="yes" name="dv03"/>
       <point x="507" y="1854"/>
       <point x="459" y="1800"/>
-      <point x="459" y="1703" type="curve" name="dh02" smooth="yes"/>
+      <point x="459" y="1703" type="curve" smooth="yes" name="dh02"/>
       <point x="459" y="1606"/>
       <point x="507" y="1551"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni207A_.glif b/source/Hack-Bold.ufo/glyphs/uni207A_.glif
index 588be9938..ade849746 100644
--- a/source/Hack-Bold.ufo/glyphs/uni207A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni207A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni207A" format="1">
+<glyph name="uni207A" format="2">
   <advance width="1233"/>
   <unicode hex="207A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni207B_.glif b/source/Hack-Bold.ufo/glyphs/uni207B_.glif
index b03f6bb9a..0d76a04a0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni207B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni207B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni207B" format="1">
+<glyph name="uni207B" format="2">
   <advance width="1233"/>
   <unicode hex="207B"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni207C_.glif b/source/Hack-Bold.ufo/glyphs/uni207C_.glif
index 6ab85d091..f4fcf4ed3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni207C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni207C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni207C" format="1">
+<glyph name="uni207C" format="2">
   <advance width="1233"/>
   <unicode hex="207C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni207D_.glif b/source/Hack-Bold.ufo/glyphs/uni207D_.glif
index edf2c0af9..9ecd76c75 100644
--- a/source/Hack-Bold.ufo/glyphs/uni207D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni207D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni207D" format="1">
+<glyph name="uni207D" format="2">
   <advance width="1233"/>
   <unicode hex="207D"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="643" y="517" type="line" name="hr00"/>
       <point x="510" y="690"/>
       <point x="446" y="853"/>
-      <point x="446" y="1028" type="curve" name="dh01" smooth="yes"/>
+      <point x="446" y="1028" type="curve" smooth="yes" name="dh01"/>
       <point x="446" y="1200"/>
       <point x="512" y="1370"/>
       <point x="643" y="1538" type="curve" name="av01"/>
       <point x="787" y="1538" type="line"/>
       <point x="675" y="1358"/>
       <point x="623" y="1197"/>
-      <point x="623" y="1030" type="curve" name="dh02" smooth="yes"/>
+      <point x="623" y="1030" type="curve" smooth="yes" name="dh02"/>
       <point x="623" y="862"/>
       <point x="675" y="697"/>
       <point x="787" y="517" type="curve" name="av02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni207E_.glif b/source/Hack-Bold.ufo/glyphs/uni207E_.glif
index e214c106c..0b0665f4a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni207E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni207E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni207E" format="1">
+<glyph name="uni207E" format="2">
   <advance width="1233"/>
   <unicode hex="207E"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="446" y="517" type="line" name="hr00"/>
       <point x="558" y="697"/>
       <point x="609" y="862"/>
-      <point x="609" y="1030" type="curve" name="dh01" smooth="yes"/>
+      <point x="609" y="1030" type="curve" smooth="yes" name="dh01"/>
       <point x="609" y="1197"/>
       <point x="558" y="1358"/>
       <point x="446" y="1538" type="curve" name="av01"/>
       <point x="589" y="1538" type="line"/>
       <point x="721" y="1370"/>
       <point x="787" y="1200"/>
-      <point x="787" y="1028" type="curve" name="dh02" smooth="yes"/>
+      <point x="787" y="1028" type="curve" smooth="yes" name="dh02"/>
       <point x="787" y="853"/>
       <point x="722" y="690"/>
       <point x="589" y="517" type="curve" name="av02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni208A_.glif b/source/Hack-Bold.ufo/glyphs/uni208A_.glif
index a71322b00..19f859e48 100644
--- a/source/Hack-Bold.ufo/glyphs/uni208A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni208A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni208A" format="1">
+<glyph name="uni208A" format="2">
   <advance width="1233"/>
   <unicode hex="208A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni208B_.glif b/source/Hack-Bold.ufo/glyphs/uni208B_.glif
index d7513cda3..ad53d7a22 100644
--- a/source/Hack-Bold.ufo/glyphs/uni208B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni208B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni208B" format="1">
+<glyph name="uni208B" format="2">
   <advance width="1233"/>
   <unicode hex="208B"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni208C_.glif b/source/Hack-Bold.ufo/glyphs/uni208C_.glif
index bd415ad98..7ab92b57d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni208C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni208C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni208C" format="1">
+<glyph name="uni208C" format="2">
   <advance width="1233"/>
   <unicode hex="208C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni208D_.glif b/source/Hack-Bold.ufo/glyphs/uni208D_.glif
index ef8d756d8..61a8637b4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni208D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni208D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni208D" format="1">
+<glyph name="uni208D" format="2">
   <advance width="1233"/>
   <unicode hex="208D"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="643" y="-151" type="line" name="hr00"/>
       <point x="510" y="22"/>
       <point x="446" y="185"/>
-      <point x="446" y="360" type="curve" name="dh01" smooth="yes"/>
+      <point x="446" y="360" type="curve" smooth="yes" name="dh01"/>
       <point x="446" y="532"/>
       <point x="512" y="702"/>
       <point x="643" y="870" type="curve" name="av01"/>
       <point x="787" y="870" type="line"/>
       <point x="675" y="690"/>
       <point x="623" y="529"/>
-      <point x="623" y="362" type="curve" name="dh02" smooth="yes"/>
+      <point x="623" y="362" type="curve" smooth="yes" name="dh02"/>
       <point x="623" y="194"/>
       <point x="675" y="29"/>
       <point x="787" y="-151" type="curve" name="av02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni208E_.glif b/source/Hack-Bold.ufo/glyphs/uni208E_.glif
index f99803e21..29ee02cdf 100644
--- a/source/Hack-Bold.ufo/glyphs/uni208E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni208E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni208E" format="1">
+<glyph name="uni208E" format="2">
   <advance width="1233"/>
   <unicode hex="208E"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="446" y="-151" type="line" name="hr00"/>
       <point x="558" y="29"/>
       <point x="609" y="194"/>
-      <point x="609" y="362" type="curve" name="dh01" smooth="yes"/>
+      <point x="609" y="362" type="curve" smooth="yes" name="dh01"/>
       <point x="609" y="529"/>
       <point x="558" y="690"/>
       <point x="446" y="870" type="curve" name="av01"/>
       <point x="589" y="870" type="line"/>
       <point x="721" y="702"/>
       <point x="787" y="532"/>
-      <point x="787" y="360" type="curve" name="dh02" smooth="yes"/>
+      <point x="787" y="360" type="curve" smooth="yes" name="dh02"/>
       <point x="787" y="185"/>
       <point x="722" y="22"/>
       <point x="589" y="-151" type="curve" name="av02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni20A_0.glif b/source/Hack-Bold.ufo/glyphs/uni20A_0.glif
index 1ab45390c..90744a679 100644
--- a/source/Hack-Bold.ufo/glyphs/uni20A_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni20A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20A0" format="1">
+<glyph name="uni20A0" format="2">
   <advance width="1233"/>
   <unicode hex="20A0"/>
   <outline>
@@ -7,26 +7,26 @@
       <point x="659" y="416" type="line" name="ah01"/>
       <point x="583" y="360"/>
       <point x="507" y="332"/>
-      <point x="416" y="332" type="curve" name="dv01" smooth="yes"/>
+      <point x="416" y="332" type="curve" smooth="yes" name="dv01"/>
       <point x="163" y="332"/>
       <point x="0" y="557"/>
-      <point x="0" y="913" type="curve" name="sh01" smooth="yes"/>
+      <point x="0" y="913" type="curve" smooth="yes" name="sh01"/>
       <point x="0" y="1269"/>
       <point x="162" y="1494"/>
-      <point x="418" y="1494" type="curve" name="at01" smooth="yes"/>
+      <point x="418" y="1494" type="curve" smooth="yes" name="at01"/>
       <point x="502" y="1494"/>
       <point x="578" y="1471"/>
       <point x="659" y="1411" type="curve" name="sh02"/>
       <point x="659" y="1179" type="line" name="ih01"/>
       <point x="583" y="1252"/>
       <point x="513" y="1285"/>
-      <point x="440" y="1285" type="curve" name="sv01" smooth="yes"/>
+      <point x="440" y="1285" type="curve" smooth="yes" name="sv01"/>
       <point x="291" y="1285"/>
       <point x="206" y="1145"/>
-      <point x="206" y="913" type="curve" name="sh04" smooth="yes"/>
+      <point x="206" y="913" type="curve" smooth="yes" name="sh04"/>
       <point x="206" y="683"/>
       <point x="290" y="542"/>
-      <point x="439" y="542" type="curve" name="dv02" smooth="yes"/>
+      <point x="439" y="542" type="curve" smooth="yes" name="dv02"/>
       <point x="511" y="542"/>
       <point x="584" y="574"/>
       <point x="659" y="647" type="curve" name="sh05"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni20A_2.glif b/source/Hack-Bold.ufo/glyphs/uni20A_2.glif
index 9cfd46015..bad601765 100644
--- a/source/Hack-Bold.ufo/glyphs/uni20A_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni20A_2.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20A2" format="1">
+<glyph name="uni20A2" format="2">
   <advance width="1233"/>
   <unicode hex="20A2"/>
   <outline>
     <contour>
-      <point x="684" y="-28" type="curve" name="av01" smooth="yes"/>
+      <point x="684" y="-28" type="curve" smooth="yes" name="av01"/>
       <point x="309" y="-28"/>
       <point x="69" y="268"/>
-      <point x="69" y="745" type="curve" name="dh01" smooth="yes"/>
+      <point x="69" y="745" type="curve" smooth="yes" name="dh01"/>
       <point x="69" y="1222"/>
       <point x="310" y="1520"/>
-      <point x="683" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="683" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="816" y="1520"/>
       <point x="928" y="1484"/>
       <point x="1039" y="1409" type="curve" name="sh02"/>
       <point x="1039" y="1100" type="line" name="hr01"/>
       <point x="935" y="1194"/>
       <point x="828" y="1241"/>
-      <point x="717" y="1241" type="curve" name="sv01" smooth="yes"/>
+      <point x="717" y="1241" type="curve" smooth="yes" name="sv01"/>
       <point x="498" y="1241"/>
       <point x="373" y="1053"/>
-      <point x="373" y="744" type="curve" name="dh02" smooth="yes"/>
+      <point x="373" y="744" type="curve" smooth="yes" name="dh02"/>
       <point x="373" y="591"/>
       <point x="403" y="470"/>
       <point x="463" y="382" type="curve" smooth="yes"/>
@@ -32,14 +32,14 @@
       <point x="801" y="842" type="line" name="hr02"/>
       <point x="865" y="974"/>
       <point x="941" y="1032"/>
-      <point x="1068" y="1032" type="curve" name="sv02" smooth="yes"/>
+      <point x="1068" y="1032" type="curve" smooth="yes" name="sv02"/>
       <point x="1084" y="1032"/>
       <point x="1092" y="1030"/>
       <point x="1127" y="1025" type="curve" name="sv03"/>
       <point x="1128" y="734" type="line"/>
       <point x="1084" y="759"/>
       <point x="1042" y="772"/>
-      <point x="998" y="772" type="curve" name="dv01" smooth="yes"/>
+      <point x="998" y="772" type="curve" smooth="yes" name="dv01"/>
       <point x="870" y="772"/>
       <point x="801" y="664"/>
       <point x="801" y="464" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni20A_5.glif b/source/Hack-Bold.ufo/glyphs/uni20A_5.glif
index c8849e9cb..9895842d2 100644
--- a/source/Hack-Bold.ufo/glyphs/uni20A_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni20A_5.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20A5" format="1">
+<glyph name="uni20A5" format="2">
   <advance width="1233"/>
   <unicode hex="20A5"/>
   <outline>
     <contour>
       <point x="500" y="306" type="line" name="hr00"/>
-      <point x="500" y="584" type="line" name="sh02" smooth="yes"/>
+      <point x="500" y="584" type="line" smooth="yes" name="sh02"/>
       <point x="500" y="706"/>
       <point x="493" y="786"/>
       <point x="480" y="824" type="curve"/>
       <point x="466" y="859"/>
       <point x="441" y="877"/>
-      <point x="406" y="877" type="curve" name="sv01" smooth="yes"/>
+      <point x="406" y="877" type="curve" smooth="yes" name="sv01"/>
       <point x="363" y="877"/>
       <point x="329" y="849"/>
       <point x="305" y="792" type="curve" smooth="yes"/>
@@ -25,7 +25,7 @@
       <point x="269" y="956" type="line" name="ih01"/>
       <point x="326" y="1083"/>
       <point x="398" y="1147"/>
-      <point x="487" y="1147" type="curve" name="sh05" smooth="yes"/>
+      <point x="487" y="1147" type="curve" smooth="yes" name="sh05"/>
       <point x="587" y="1147"/>
       <point x="663" y="1072"/>
       <point x="703" y="939" type="curve" name="ih02"/>
@@ -34,7 +34,7 @@
       <point x="876" y="1136" type="line" name="ih04"/>
       <point x="897" y="1143"/>
       <point x="917" y="1147"/>
-      <point x="942" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="942" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1103" y="1147"/>
       <point x="1192" y="987"/>
       <point x="1192" y="682" type="curve" smooth="yes"/>
@@ -42,17 +42,17 @@
       <point x="962" y="0" type="line" name="sh06"/>
       <point x="962" y="584" type="line"/>
       <point x="963" y="610" type="line" name="sh08"/>
-      <point x="963" y="651" type="line" name="hr01" smooth="yes"/>
+      <point x="963" y="651" type="line" smooth="yes" name="hr01"/>
       <point x="963" y="807"/>
       <point x="934" y="877"/>
-      <point x="867" y="877" type="curve" name="sv02" smooth="yes"/>
+      <point x="867" y="877" type="curve" smooth="yes" name="sv02"/>
       <point x="824" y="877"/>
       <point x="791" y="848"/>
       <point x="767" y="793" type="curve"/>
       <point x="757" y="764" type="line" smooth="yes"/>
       <point x="742" y="720"/>
       <point x="731" y="642"/>
-      <point x="731" y="550" type="curve" name="sh09" smooth="yes"/>
+      <point x="731" y="550" type="curve" smooth="yes" name="sh09"/>
       <point x="731" y="0" type="line" name="hr02"/>
       <point x="512" y="0" type="line" name="sh10"/>
       <point x="451" y="-190" type="line" name="av01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni20A_6.glif b/source/Hack-Bold.ufo/glyphs/uni20A_6.glif
index 0f9f11b33..2a679a67d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni20A_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni20A_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20A6" format="1">
+<glyph name="uni20A6" format="2">
   <advance width="1233"/>
   <unicode hex="20A6"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni20A_8.glif b/source/Hack-Bold.ufo/glyphs/uni20A_8.glif
index 1aa6cdd11..32e65c271 100644
--- a/source/Hack-Bold.ufo/glyphs/uni20A_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni20A_8.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20A8" format="1">
+<glyph name="uni20A8" format="2">
   <advance width="1233"/>
   <unicode hex="20A8"/>
   <outline>
     <contour>
-      <point x="932" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="932" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="884" y="-29"/>
       <point x="845" y="-22"/>
-      <point x="804" y="-11" type="curve" name="ab01" smooth="yes"/>
+      <point x="804" y="-11" type="curve" smooth="yes" name="ab01"/>
       <point x="789" y="-7"/>
       <point x="774" y="-3"/>
       <point x="759" y="2" type="curve" name="ab02"/>
@@ -27,7 +27,7 @@
       <point x="336" y="1493" type="line" smooth="yes"/>
       <point x="553" y="1493"/>
       <point x="654" y="1367"/>
-      <point x="654" y="1086" type="curve" name="dh04" smooth="yes"/>
+      <point x="654" y="1086" type="curve" smooth="yes" name="dh04"/>
       <point x="654" y="881"/>
       <point x="602" y="758"/>
       <point x="494" y="698" type="curve" name="ih01"/>
@@ -37,37 +37,37 @@
       <point x="675" y="306" type="line"/>
       <point x="747" y="245"/>
       <point x="831" y="209"/>
-      <point x="914" y="209" type="curve" name="sv01" smooth="yes"/>
+      <point x="914" y="209" type="curve" smooth="yes" name="sv01"/>
       <point x="998" y="209"/>
       <point x="1035" y="245"/>
-      <point x="1035" y="329" type="curve" name="dh05" smooth="yes"/>
+      <point x="1035" y="329" type="curve" smooth="yes" name="dh05"/>
       <point x="1035" y="385"/>
       <point x="1018" y="413"/>
       <point x="933" y="432" type="curve" smooth="yes"/>
       <point x="898" y="440" type="line" smooth="yes"/>
       <point x="721" y="480"/>
       <point x="658" y="581"/>
-      <point x="658" y="789" type="curve" name="sh01" smooth="yes"/>
+      <point x="658" y="789" type="curve" smooth="yes" name="sh01"/>
       <point x="658" y="1034"/>
       <point x="745" y="1147"/>
-      <point x="932" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="932" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1009" y="1147"/>
       <point x="1087" y="1128"/>
       <point x="1183" y="1085" type="curve"/>
       <point x="1183" y="813" type="line" name="ih02"/>
       <point x="1098" y="877"/>
       <point x="1018" y="909"/>
-      <point x="945" y="909" type="curve" name="hr01" smooth="yes"/>
+      <point x="945" y="909" type="curve" smooth="yes" name="hr01"/>
       <point x="871" y="909"/>
       <point x="834" y="874"/>
-      <point x="834" y="805" type="curve" name="sh02" smooth="yes"/>
+      <point x="834" y="805" type="curve" smooth="yes" name="sh02"/>
       <point x="834" y="748"/>
       <point x="858" y="720"/>
       <point x="930" y="705" type="curve"/>
       <point x="965" y="696" type="line" smooth="yes"/>
       <point x="1160" y="648"/>
       <point x="1224" y="568"/>
-      <point x="1224" y="350" type="curve" name="dh06" smooth="yes"/>
+      <point x="1224" y="350" type="curve" smooth="yes" name="dh06"/>
       <point x="1224" y="90"/>
       <point x="1133" y="-29"/>
     </contour>
@@ -75,10 +75,10 @@
       <point x="313" y="831" type="line" smooth="yes"/>
       <point x="402" y="831"/>
       <point x="439" y="887"/>
-      <point x="439" y="1024" type="curve" name="dh03" smooth="yes"/>
+      <point x="439" y="1024" type="curve" smooth="yes" name="dh03"/>
       <point x="439" y="1160"/>
       <point x="402" y="1214"/>
-      <point x="313" y="1214" type="curve" name="sv03" smooth="yes"/>
+      <point x="313" y="1214" type="curve" smooth="yes" name="sv03"/>
       <point x="223" y="1214" type="line" name="sh03"/>
       <point x="223" y="831" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni20A_9.glif b/source/Hack-Bold.ufo/glyphs/uni20A_9.glif
index 10fb49515..d6704cf6a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni20A_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni20A_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20A9" format="1">
+<glyph name="uni20A9" format="2">
   <advance width="1233"/>
   <unicode hex="20A9"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni20A_A_.glif b/source/Hack-Bold.ufo/glyphs/uni20A_A_.glif
index fadb68566..8e5ac210c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni20A_A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni20A_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20AA" format="1">
+<glyph name="uni20AA" format="2">
   <advance width="1233"/>
   <unicode hex="20AA"/>
   <outline>
@@ -14,7 +14,7 @@
       <point x="675" y="866" type="line" smooth="yes"/>
       <point x="675" y="1113"/>
       <point x="636" y="1210"/>
-      <point x="468" y="1210" type="curve" name="sv01" smooth="yes"/>
+      <point x="468" y="1210" type="curve" smooth="yes" name="sv01"/>
       <point x="263" y="1210" type="line" name="dh02"/>
       <point x="261" y="-28" type="line" name="hr02"/>
       <point x="4" y="-28" type="line" name="sv02"/>
@@ -23,13 +23,13 @@
       <point x="799" y="-28" type="line" name="hr03"/>
       <point x="515" y="-28"/>
       <point x="368" y="166"/>
-      <point x="368" y="598" type="curve" name="dh03" smooth="yes"/>
+      <point x="368" y="598" type="curve" smooth="yes" name="dh03"/>
       <point x="368" y="943" type="line"/>
       <point x="559" y="943" type="line"/>
-      <point x="559" y="598" type="line" name="dh04" smooth="yes"/>
+      <point x="559" y="598" type="line" smooth="yes" name="dh04"/>
       <point x="559" y="351"/>
       <point x="598" y="254"/>
-      <point x="766" y="254" type="curve" name="dv01" smooth="yes"/>
+      <point x="766" y="254" type="curve" smooth="yes" name="dv01"/>
       <point x="973" y="254" type="line" name="dh06"/>
       <point x="973" y="1493" type="line" name="at01"/>
       <point x="1231" y="1493" type="line"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni20A_D_.glif b/source/Hack-Bold.ufo/glyphs/uni20A_D_.glif
index 56c1fc3b2..8c9881287 100644
--- a/source/Hack-Bold.ufo/glyphs/uni20A_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni20A_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20AD" format="1">
+<glyph name="uni20AD" format="2">
   <advance width="1233"/>
   <unicode hex="20AD"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni20A_E_.glif b/source/Hack-Bold.ufo/glyphs/uni20A_E_.glif
index d0982af9a..165655b8d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni20A_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni20A_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20AE" format="1">
+<glyph name="uni20AE" format="2">
   <advance width="1233"/>
   <unicode hex="20AE"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni20A_F_.glif b/source/Hack-Bold.ufo/glyphs/uni20A_F_.glif
index 88296f282..f946cc819 100644
--- a/source/Hack-Bold.ufo/glyphs/uni20A_F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni20A_F_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20AF" format="1">
+<glyph name="uni20AF" format="2">
   <advance width="1233"/>
   <unicode hex="20AF"/>
   <outline>
     <contour>
-      <point x="163" y="-29" type="curve" name="sv01" smooth="yes"/>
+      <point x="163" y="-29" type="curve" smooth="yes" name="sv01"/>
       <point x="67" y="-29"/>
       <point x="9" y="67"/>
-      <point x="9" y="201" type="curve" name="dh01" smooth="yes"/>
+      <point x="9" y="201" type="curve" smooth="yes" name="dh01"/>
       <point x="9" y="324"/>
       <point x="58" y="434"/>
-      <point x="151" y="434" type="curve" name="sv02" smooth="yes"/>
+      <point x="151" y="434" type="curve" smooth="yes" name="sv02"/>
       <point x="171" y="434"/>
       <point x="194" y="429"/>
       <point x="213" y="418" type="curve" name="ih01"/>
@@ -30,13 +30,13 @@
       <point x="235" y="1455" type="curve" smooth="yes"/>
       <point x="274" y="1496"/>
       <point x="320" y="1520"/>
-      <point x="396" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="396" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="536" y="1520"/>
       <point x="640" y="1440"/>
       <point x="709" y="1288" type="curve" smooth="yes"/>
       <point x="769" y="1159"/>
       <point x="795" y="989"/>
-      <point x="795" y="810" type="curve" name="dh04" smooth="yes"/>
+      <point x="795" y="810" type="curve" smooth="yes" name="dh04"/>
       <point x="795" y="668"/>
       <point x="778" y="474"/>
       <point x="733" y="307" type="curve" smooth="yes"/>
@@ -45,7 +45,7 @@
       <point x="634" y="75" type="curve" smooth="yes"/>
       <point x="585" y="4"/>
       <point x="529" y="-29"/>
-      <point x="470" y="-29" type="curve" name="sv03" smooth="yes"/>
+      <point x="470" y="-29" type="curve" smooth="yes" name="sv03"/>
       <point x="430" y="-29"/>
       <point x="399" y="-13"/>
       <point x="368" y="12" type="curve"/>
@@ -66,10 +66,10 @@
       <point x="548" y="242" type="curve" smooth="yes"/>
       <point x="591" y="315"/>
       <point x="626" y="451"/>
-      <point x="643" y="612" type="curve" name="sh01" smooth="yes"/>
+      <point x="643" y="612" type="curve" smooth="yes" name="sh01"/>
       <point x="650" y="680"/>
       <point x="654" y="744"/>
-      <point x="654" y="805" type="curve" name="dh03" smooth="yes"/>
+      <point x="654" y="805" type="curve" smooth="yes" name="dh03"/>
       <point x="654" y="929"/>
       <point x="638" y="1053"/>
       <point x="601" y="1146" type="curve" smooth="yes"/>
@@ -101,26 +101,26 @@
       <point x="1182" y="654" type="curve" smooth="yes"/>
       <point x="1205" y="594"/>
       <point x="1215" y="511"/>
-      <point x="1215" y="419" type="curve" name="dh06" smooth="yes"/>
+      <point x="1215" y="419" type="curve" smooth="yes" name="dh06"/>
       <point x="1215" y="240"/>
       <point x="1173" y="92"/>
       <point x="1120" y="23" type="curve" smooth="yes"/>
       <point x="1093" y="-12"/>
       <point x="1062" y="-29"/>
-      <point x="1026" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="1026" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="983" y="-29"/>
       <point x="956" y="-4"/>
       <point x="928" y="83" type="curve" name="ih04"/>
       <point x="867" y="-457" type="line" name="ih05"/>
     </contour>
     <contour>
-      <point x="1018" y="149" type="curve" name="dv02" smooth="yes"/>
+      <point x="1018" y="149" type="curve" smooth="yes" name="dv02"/>
       <point x="1039" y="149"/>
       <point x="1062" y="171"/>
       <point x="1081" y="218" type="curve" smooth="yes"/>
       <point x="1098" y="262"/>
       <point x="1110" y="329"/>
-      <point x="1110" y="414" type="curve" name="dh05" smooth="yes"/>
+      <point x="1110" y="414" type="curve" smooth="yes" name="dh05"/>
       <point x="1110" y="467"/>
       <point x="1105" y="508"/>
       <point x="1096" y="536" type="curve" smooth="yes"/>
@@ -137,7 +137,7 @@
       <point x="980" y="149"/>
     </contour>
     <contour>
-      <point x="150" y="154" type="curve" name="sv04" smooth="yes"/>
+      <point x="150" y="154" type="curve" smooth="yes" name="sv04"/>
       <point x="165" y="154"/>
       <point x="172" y="171"/>
       <point x="180" y="218" type="curve"/>
@@ -146,7 +146,7 @@
       <point x="145" y="248" type="curve" smooth="yes"/>
       <point x="126" y="248"/>
       <point x="117" y="226"/>
-      <point x="117" y="203" type="curve" name="dh02" smooth="yes"/>
+      <point x="117" y="203" type="curve" smooth="yes" name="dh02"/>
       <point x="117" y="172"/>
       <point x="134" y="154"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni20B_0.glif b/source/Hack-Bold.ufo/glyphs/uni20B_0.glif
index ca557d0ec..bc7d223a3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni20B_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni20B_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B0" format="1">
+<glyph name="uni20B0" format="2">
   <advance width="1233"/>
   <unicode hex="20B0"/>
   <outline>
@@ -7,26 +7,26 @@
       <point x="723" y="198" type="line" name="ih01"/>
       <point x="872" y="198"/>
       <point x="948" y="275"/>
-      <point x="948" y="407" type="curve" name="sh02" smooth="yes"/>
+      <point x="948" y="407" type="curve" smooth="yes" name="sh02"/>
       <point x="948" y="471"/>
       <point x="930" y="518"/>
       <point x="885" y="566" type="curve"/>
       <point x="812" y="485"/>
       <point x="723" y="450"/>
-      <point x="638" y="450" type="curve" name="dv02" smooth="yes"/>
+      <point x="638" y="450" type="curve" smooth="yes" name="dv02"/>
       <point x="551" y="450"/>
       <point x="496" y="488"/>
       <point x="446" y="554" type="curve" smooth="yes"/>
       <point x="420" y="588"/>
       <point x="383" y="634"/>
-      <point x="350" y="634" type="curve" name="hr01" smooth="yes"/>
+      <point x="350" y="634" type="curve" smooth="yes" name="hr01"/>
       <point x="317" y="634"/>
       <point x="276" y="590"/>
       <point x="216" y="490" type="curve"/>
       <point x="25" y="622" type="line"/>
       <point x="130" y="802"/>
       <point x="218" y="892"/>
-      <point x="336" y="892" type="curve" name="hr02" smooth="yes"/>
+      <point x="336" y="892" type="curve" smooth="yes" name="hr02"/>
       <point x="393" y="892"/>
       <point x="452" y="871"/>
       <point x="501" y="824" type="curve" smooth="yes"/>
@@ -38,19 +38,19 @@
       <point x="695" y="743" type="curve"/>
       <point x="571" y="863"/>
       <point x="511" y="998"/>
-      <point x="511" y="1169" type="curve" name="dh01" smooth="yes"/>
+      <point x="511" y="1169" type="curve" smooth="yes" name="dh01"/>
       <point x="511" y="1392"/>
       <point x="612" y="1520"/>
-      <point x="827" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="827" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1034" y="1520"/>
       <point x="1146" y="1404"/>
-      <point x="1146" y="1155" type="curve" name="dh03" smooth="yes"/>
+      <point x="1146" y="1155" type="curve" smooth="yes" name="dh03"/>
       <point x="1146" y="1024"/>
       <point x="1116" y="883"/>
       <point x="1048" y="766" type="curve"/>
       <point x="1158" y="651"/>
       <point x="1208" y="545"/>
-      <point x="1208" y="400" type="curve" name="sh01" smooth="yes"/>
+      <point x="1208" y="400" type="curve" smooth="yes" name="sh01"/>
       <point x="1208" y="119"/>
       <point x="1018" y="-29"/>
       <point x="723" y="-29" type="curve" name="dv01"/>
@@ -59,13 +59,13 @@
       <point x="849" y="925" type="curve"/>
       <point x="884" y="997"/>
       <point x="900" y="1081"/>
-      <point x="900" y="1157" type="curve" name="hr03" smooth="yes"/>
+      <point x="900" y="1157" type="curve" smooth="yes" name="hr03"/>
       <point x="900" y="1265"/>
       <point x="865" y="1336"/>
-      <point x="820" y="1336" type="curve" name="sv01" smooth="yes"/>
+      <point x="820" y="1336" type="curve" smooth="yes" name="sv01"/>
       <point x="772" y="1336"/>
       <point x="743" y="1253"/>
-      <point x="743" y="1163" type="curve" name="dh02" smooth="yes"/>
+      <point x="743" y="1163" type="curve" smooth="yes" name="dh02"/>
       <point x="743" y="1063"/>
       <point x="778" y="984"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni20B_1.glif b/source/Hack-Bold.ufo/glyphs/uni20B_1.glif
index 4a3ab1a70..bb747b27e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni20B_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni20B_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B1" format="1">
+<glyph name="uni20B1" format="2">
   <advance width="1233"/>
   <unicode hex="20B1"/>
   <outline>
@@ -34,7 +34,7 @@
       <point x="1012" y="669" type="curve" smooth="yes"/>
       <point x="920" y="593"/>
       <point x="766" y="559"/>
-      <point x="567" y="559" type="curve" name="dv02" smooth="yes"/>
+      <point x="567" y="559" type="curve" smooth="yes" name="dv02"/>
       <point x="457" y="559" type="line" name="sh03"/>
       <point x="457" y="0" type="line" name="ab01"/>
       <point x="162" y="0" type="line"/>
@@ -46,7 +46,7 @@
       <point x="782" y="1196" type="curve"/>
       <point x="743" y="1229"/>
       <point x="675" y="1245"/>
-      <point x="578" y="1245" type="curve" name="sv06" smooth="yes"/>
+      <point x="578" y="1245" type="curve" smooth="yes" name="sv06"/>
       <point x="457" y="1245" type="line" name="sh04"/>
       <point x="457" y="1170" type="line"/>
     </contour>
@@ -59,7 +59,7 @@
       <point x="457" y="987" type="line"/>
     </contour>
     <contour>
-      <point x="578" y="807" type="line" name="dv03" smooth="yes"/>
+      <point x="578" y="807" type="line" smooth="yes" name="dv03"/>
       <point x="670" y="807"/>
       <point x="743" y="821"/>
       <point x="782" y="856" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni20B_2.glif b/source/Hack-Bold.ufo/glyphs/uni20B_2.glif
index 7c74b2089..116e221d0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni20B_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni20B_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B2" format="1">
+<glyph name="uni20B2" format="2">
   <advance width="1233"/>
   <unicode hex="20B2"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="583" y="-22" type="line" name="dh03"/>
       <point x="283" y="18"/>
       <point x="44" y="267"/>
-      <point x="44" y="746" type="curve" name="dh01" smooth="yes"/>
+      <point x="44" y="746" type="curve" smooth="yes" name="dh01"/>
       <point x="44" y="1224"/>
       <point x="283" y="1467"/>
       <point x="583" y="1512" type="curve" name="sh01"/>
@@ -46,7 +46,7 @@
       <point x="429" y="1150" type="curve" smooth="yes"/>
       <point x="356" y="1055"/>
       <point x="320" y="920"/>
-      <point x="320" y="745" type="curve" name="dh02" smooth="yes"/>
+      <point x="320" y="745" type="curve" smooth="yes" name="dh02"/>
       <point x="320" y="566"/>
       <point x="357" y="434"/>
       <point x="425" y="342" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni20B_3.glif b/source/Hack-Bold.ufo/glyphs/uni20B_3.glif
index a36fdf63a..45b590959 100644
--- a/source/Hack-Bold.ufo/glyphs/uni20B_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni20B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B3" format="1">
+<glyph name="uni20B3" format="2">
   <advance width="1233"/>
   <unicode hex="20B3"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni20B_4.glif b/source/Hack-Bold.ufo/glyphs/uni20B_4.glif
index 013e430cf..cc6390715 100644
--- a/source/Hack-Bold.ufo/glyphs/uni20B_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni20B_4.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B4" format="1">
+<glyph name="uni20B4" format="2">
   <advance width="1233"/>
   <unicode hex="20B4"/>
   <outline>
     <contour>
-      <point x="655" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="655" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="312" y="-29"/>
       <point x="129" y="119"/>
-      <point x="129" y="420" type="curve" name="sh01" smooth="yes"/>
+      <point x="129" y="420" type="curve" smooth="yes" name="sh01"/>
       <point x="129" y="438" type="line" name="dv02"/>
       <point x="0" y="438" type="line"/>
       <point x="0" y="632" type="line"/>
@@ -23,20 +23,20 @@
       <point x="811" y="1055" type="line" name="sh03"/>
       <point x="818" y="1071"/>
       <point x="821" y="1090"/>
-      <point x="821" y="1111" type="curve" name="ah01" smooth="yes"/>
+      <point x="821" y="1111" type="curve" smooth="yes" name="ah01"/>
       <point x="821" y="1218"/>
       <point x="744" y="1276"/>
-      <point x="600" y="1276" type="curve" name="sv01" smooth="yes"/>
+      <point x="600" y="1276" type="curve" smooth="yes" name="sv01"/>
       <point x="471" y="1276"/>
       <point x="341" y="1228"/>
       <point x="213" y="1139" type="curve" name="ih02"/>
       <point x="213" y="1427" type="line"/>
       <point x="349" y="1488"/>
       <point x="486" y="1520"/>
-      <point x="622" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="622" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="926" y="1520"/>
       <point x="1110" y="1356"/>
-      <point x="1110" y="1085" type="curve" name="sh02" smooth="yes"/>
+      <point x="1110" y="1085" type="curve" smooth="yes" name="sh02"/>
       <point x="1110" y="1074"/>
       <point x="1110" y="1066"/>
       <point x="1109" y="1055" type="curve" name="sh05"/>
@@ -55,10 +55,10 @@
       <point x="431" y="438" type="line" name="sh06"/>
       <point x="429" y="427"/>
       <point x="428" y="415"/>
-      <point x="428" y="402" type="curve" name="sh04" smooth="yes"/>
+      <point x="428" y="402" type="curve" smooth="yes" name="sh04"/>
       <point x="428" y="283"/>
       <point x="509" y="215"/>
-      <point x="662" y="215" type="curve" name="dv01" smooth="yes"/>
+      <point x="662" y="215" type="curve" smooth="yes" name="dv01"/>
       <point x="802" y="215"/>
       <point x="951" y="272"/>
       <point x="1104" y="381" type="curve" name="sh07"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni20B_5.glif b/source/Hack-Bold.ufo/glyphs/uni20B_5.glif
index 048f61d21..6af538a83 100644
--- a/source/Hack-Bold.ufo/glyphs/uni20B_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni20B_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B5" format="1">
+<glyph name="uni20B5" format="2">
   <advance width="1233"/>
   <unicode hex="20B5"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="712" y="-27" type="line" name="dh03"/>
       <point x="439" y="-7"/>
       <point x="46" y="162"/>
-      <point x="46" y="670" type="curve" name="dh01" smooth="yes"/>
+      <point x="46" y="670" type="curve" smooth="yes" name="dh01"/>
       <point x="46" y="1162"/>
       <point x="412" y="1349"/>
       <point x="712" y="1369" type="curve" name="sh01"/>
@@ -45,7 +45,7 @@
       <point x="606" y="1047" type="curve" smooth="yes"/>
       <point x="493" y="971"/>
       <point x="431" y="837"/>
-      <point x="431" y="677" type="curve" name="dh02" smooth="yes"/>
+      <point x="431" y="677" type="curve" smooth="yes" name="dh02"/>
       <point x="431" y="509"/>
       <point x="498" y="370"/>
       <point x="610" y="293" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni20B_7.glif b/source/Hack-Bold.ufo/glyphs/uni20B_7.glif
index 7d42e579c..312f3e831 100644
--- a/source/Hack-Bold.ufo/glyphs/uni20B_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni20B_7.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B7" format="1">
+<glyph name="uni20B7" format="2">
   <advance width="1233"/>
   <unicode hex="20B7"/>
   <outline>
     <contour>
-      <point x="822" y="1278" type="curve" name="hr00" smooth="yes"/>
+      <point x="822" y="1278" type="curve" smooth="yes" name="hr00"/>
       <point x="963" y="1278"/>
       <point x="1085" y="1236"/>
       <point x="1176" y="1153" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni20B_8.glif b/source/Hack-Bold.ufo/glyphs/uni20B_8.glif
index 8f0091145..e952e5bcc 100644
--- a/source/Hack-Bold.ufo/glyphs/uni20B_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni20B_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B8" format="1">
+<glyph name="uni20B8" format="2">
   <advance width="1233"/>
   <unicode hex="20B8"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni20B_9.glif b/source/Hack-Bold.ufo/glyphs/uni20B_9.glif
index 673d67864..99aece9e7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni20B_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni20B_9.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B9" format="1">
+<glyph name="uni20B9" format="2">
   <advance width="1233"/>
   <unicode hex="20B9"/>
   <outline>
     <contour>
-      <point x="496" y="421" type="line" name="hr00" smooth="yes"/>
+      <point x="496" y="421" type="line" smooth="yes" name="hr00"/>
       <point x="440" y="538"/>
       <point x="381" y="590"/>
-      <point x="310" y="590" type="curve" name="dv03" smooth="yes"/>
+      <point x="310" y="590" type="curve" smooth="yes" name="dv03"/>
       <point x="144" y="590" type="line"/>
       <point x="144" y="838" type="line"/>
-      <point x="355" y="838" type="line" name="dv04" smooth="yes"/>
+      <point x="355" y="838" type="line" smooth="yes" name="dv04"/>
       <point x="439" y="838"/>
       <point x="493" y="860"/>
       <point x="528" y="900" type="curve" smooth="yes"/>
@@ -25,7 +25,7 @@
       <point x="529" y="1239" type="curve" smooth="yes"/>
       <point x="494" y="1278"/>
       <point x="436" y="1298"/>
-      <point x="355" y="1298" type="curve" name="sv01" smooth="yes"/>
+      <point x="355" y="1298" type="curve" smooth="yes" name="sv01"/>
       <point x="103" y="1298" type="line"/>
       <point x="191" y="1493" type="line" name="at01"/>
       <point x="1146" y="1493" type="line"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2116.glif b/source/Hack-Bold.ufo/glyphs/uni2116.glif
index 325b30b11..ae8891f71 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2116.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2116.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2116" format="1">
+<glyph name="uni2116" format="2">
   <advance width="1233"/>
   <unicode hex="2116"/>
   <outline>
@@ -25,7 +25,7 @@
       <point x="1130" y="1364" type="curve"/>
       <point x="1086" y="1443"/>
       <point x="1028" y="1492"/>
-      <point x="953" y="1492" type="curve" name="hr01" smooth="yes"/>
+      <point x="953" y="1492" type="curve" smooth="yes" name="hr01"/>
       <point x="885" y="1492"/>
       <point x="826" y="1450"/>
       <point x="776" y="1365" type="curve" smooth="yes"/>
@@ -48,7 +48,7 @@
       <point x="958" y="1277" type="curve" smooth="yes"/>
       <point x="1010" y="1277"/>
       <point x="1053" y="1173"/>
-      <point x="1053" y="1048" type="curve" name="hr02" smooth="yes"/>
+      <point x="1053" y="1048" type="curve" smooth="yes" name="hr02"/>
       <point x="1053" y="923"/>
       <point x="1010" y="819"/>
       <point x="958" y="819" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2126.glif b/source/Hack-Bold.ufo/glyphs/uni2126.glif
index c33ea87f0..4d5a9df1e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2126.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2126.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2126" format="1">
+<glyph name="uni2126" format="2">
   <advance width="1233"/>
   <unicode hex="2126"/>
   <outline>
@@ -8,13 +8,13 @@
       <point x="328" y="211" type="line" name="ih01"/>
       <point x="173" y="350"/>
       <point x="100" y="523"/>
-      <point x="100" y="777" type="curve" name="dh01" smooth="yes"/>
+      <point x="100" y="777" type="curve" smooth="yes" name="dh01"/>
       <point x="100" y="1201"/>
       <point x="301" y="1460"/>
-      <point x="615" y="1460" type="curve" name="hr01" smooth="yes"/>
+      <point x="615" y="1460" type="curve" smooth="yes" name="hr01"/>
       <point x="931" y="1460"/>
       <point x="1133" y="1201"/>
-      <point x="1133" y="777" type="curve" name="dh04" smooth="yes"/>
+      <point x="1133" y="777" type="curve" smooth="yes" name="dh04"/>
       <point x="1133" y="521"/>
       <point x="1059" y="349"/>
       <point x="905" y="211" type="curve" name="ih02"/>
@@ -24,13 +24,13 @@
       <point x="672" y="268" type="line" name="dh03"/>
       <point x="780" y="373"/>
       <point x="831" y="524"/>
-      <point x="831" y="751" type="curve" name="sh02" smooth="yes"/>
+      <point x="831" y="751" type="curve" smooth="yes" name="sh02"/>
       <point x="831" y="1031"/>
       <point x="752" y="1194"/>
-      <point x="616" y="1194" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1194" type="curve" smooth="yes" name="dv01"/>
       <point x="480" y="1194"/>
       <point x="401" y="1031"/>
-      <point x="401" y="752" type="curve" name="dh02" smooth="yes"/>
+      <point x="401" y="752" type="curve" smooth="yes" name="dh02"/>
       <point x="401" y="536"/>
       <point x="447" y="377"/>
       <point x="563" y="268" type="curve" name="sh03"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2150.glif b/source/Hack-Bold.ufo/glyphs/uni2150.glif
index fbdd8bdd1..dff2be9af 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2150.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2150.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2150" format="1">
+<glyph name="uni2150" format="2">
   <advance width="1233"/>
   <unicode hex="2150"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2151.glif b/source/Hack-Bold.ufo/glyphs/uni2151.glif
index dc46465f3..e2188840f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2151.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2151.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2151" format="1">
+<glyph name="uni2151" format="2">
   <advance width="1233"/>
   <unicode hex="2151"/>
   <outline>
@@ -23,43 +23,43 @@
       <point x="84" y="500" type="line"/>
     </contour>
     <contour>
-      <point x="740" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="740" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="672" y="-285"/>
       <point x="611" y="-276"/>
       <point x="531" y="-252" type="curve"/>
       <point x="531" y="-101" type="line" name="ih01"/>
       <point x="599" y="-133"/>
       <point x="666" y="-152"/>
-      <point x="734" y="-152" type="curve" name="dv02" smooth="yes"/>
+      <point x="734" y="-152" type="curve" smooth="yes" name="dv02"/>
       <point x="877" y="-152"/>
       <point x="953" y="-69"/>
       <point x="957" y="86" type="curve" name="sh03"/>
       <point x="913" y="38"/>
       <point x="847" y="13"/>
-      <point x="755" y="13" type="curve" name="dv03" smooth="yes"/>
+      <point x="755" y="13" type="curve" smooth="yes" name="dv03"/>
       <point x="571" y="13"/>
       <point x="468" y="110"/>
-      <point x="468" y="289" type="curve" name="sh04" smooth="yes"/>
+      <point x="468" y="289" type="curve" smooth="yes" name="sh04"/>
       <point x="468" y="477"/>
       <point x="581" y="582"/>
-      <point x="796" y="582" type="curve" name="dv06" smooth="yes"/>
+      <point x="796" y="582" type="curve" smooth="yes" name="dv06"/>
       <point x="1029" y="582"/>
       <point x="1146" y="454"/>
-      <point x="1146" y="166" type="curve" name="dh04" smooth="yes"/>
+      <point x="1146" y="166" type="curve" smooth="yes" name="dh04"/>
       <point x="1146" y="-143"/>
       <point x="1012" y="-285"/>
     </contour>
     <contour>
-      <point x="796" y="153" type="curve" name="dv04" smooth="yes"/>
+      <point x="796" y="153" type="curve" smooth="yes" name="dv04"/>
       <point x="884" y="153"/>
       <point x="930" y="205"/>
-      <point x="930" y="304" type="curve" name="dh03" smooth="yes"/>
+      <point x="930" y="304" type="curve" smooth="yes" name="dh03"/>
       <point x="930" y="403"/>
       <point x="884" y="456"/>
-      <point x="796" y="456" type="curve" name="dv05" smooth="yes"/>
+      <point x="796" y="456" type="curve" smooth="yes" name="dv05"/>
       <point x="708" y="456"/>
       <point x="660" y="402"/>
-      <point x="660" y="305" type="curve" name="hr02" smooth="yes"/>
+      <point x="660" y="305" type="curve" smooth="yes" name="hr02"/>
       <point x="660" y="208"/>
       <point x="708" y="153"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2153.glif b/source/Hack-Bold.ufo/glyphs/uni2153.glif
index b915f3ba2..cd546d456 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2153.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2153.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2153" format="1">
+<glyph name="uni2153" format="2">
   <advance width="1233"/>
   <unicode hex="2153"/>
   <outline>
@@ -23,45 +23,45 @@
       <point x="84" y="500" type="line"/>
     </contour>
     <contour>
-      <point x="786" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="786" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="687" y="-285"/>
       <point x="588" y="-271"/>
       <point x="488" y="-244" type="curve" name="sh03"/>
       <point x="488" y="-90" type="line" name="sh05"/>
       <point x="575" y="-127"/>
       <point x="689" y="-145"/>
-      <point x="774" y="-145" type="curve" name="dv02" smooth="yes"/>
+      <point x="774" y="-145" type="curve" smooth="yes" name="dv02"/>
       <point x="907" y="-145"/>
       <point x="967" y="-101"/>
-      <point x="967" y="-25" type="curve" name="sh06" smooth="yes"/>
+      <point x="967" y="-25" type="curve" smooth="yes" name="sh06"/>
       <point x="967" y="56"/>
       <point x="899" y="104"/>
-      <point x="783" y="104" type="curve" name="dv03" smooth="yes"/>
+      <point x="783" y="104" type="curve" smooth="yes" name="dv03"/>
       <point x="672" y="104" type="line"/>
       <point x="672" y="250" type="line" name="dh03"/>
-      <point x="783" y="250" type="line" name="dv04" smooth="yes"/>
+      <point x="783" y="250" type="line" smooth="yes" name="dv04"/>
       <point x="883" y="250"/>
       <point x="942" y="283"/>
-      <point x="942" y="346" type="curve" name="sh07" smooth="yes"/>
+      <point x="942" y="346" type="curve" smooth="yes" name="sh07"/>
       <point x="942" y="405"/>
       <point x="892" y="440"/>
-      <point x="781" y="440" type="curve" name="dv05" smooth="yes"/>
+      <point x="781" y="440" type="curve" smooth="yes" name="dv05"/>
       <point x="717" y="440"/>
       <point x="614" y="427"/>
       <point x="518" y="395" type="curve" name="ih01"/>
       <point x="518" y="547" type="line"/>
       <point x="610" y="570"/>
       <point x="705" y="582"/>
-      <point x="789" y="582" type="curve" name="dv06" smooth="yes"/>
+      <point x="789" y="582" type="curve" smooth="yes" name="dv06"/>
       <point x="1008" y="582"/>
       <point x="1139" y="499"/>
-      <point x="1139" y="366" type="curve" name="dh04" smooth="yes"/>
+      <point x="1139" y="366" type="curve" smooth="yes" name="dh04"/>
       <point x="1139" y="266"/>
       <point x="1068" y="203"/>
       <point x="936" y="182" type="curve" name="hr04"/>
       <point x="1079" y="163"/>
       <point x="1164" y="91"/>
-      <point x="1164" y="-38" type="curve" name="sh08" smooth="yes"/>
+      <point x="1164" y="-38" type="curve" smooth="yes" name="sh08"/>
       <point x="1164" y="-199"/>
       <point x="1034" y="-285"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2154.glif b/source/Hack-Bold.ufo/glyphs/uni2154.glif
index 5b59924e9..a49c67518 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2154.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2154.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2154" format="1">
+<glyph name="uni2154" format="2">
   <advance width="1233"/>
   <unicode hex="2154"/>
   <outline>
@@ -10,20 +10,20 @@
       <point x="157" y="1083" type="curve"/>
       <point x="372" y="1260"/>
       <point x="471" y="1370"/>
-      <point x="471" y="1434" type="curve" name="dh01" smooth="yes"/>
+      <point x="471" y="1434" type="curve" smooth="yes" name="dh01"/>
       <point x="471" y="1479"/>
       <point x="419" y="1536"/>
-      <point x="307" y="1536" type="curve" name="hr01" smooth="yes"/>
+      <point x="307" y="1536" type="curve" smooth="yes" name="hr01"/>
       <point x="234" y="1536"/>
       <point x="145" y="1512"/>
       <point x="41" y="1467" type="curve"/>
       <point x="41" y="1631" type="line"/>
       <point x="141" y="1660"/>
       <point x="234" y="1676"/>
-      <point x="326" y="1676" type="curve" name="dv03" smooth="yes"/>
+      <point x="326" y="1676" type="curve" smooth="yes" name="dv03"/>
       <point x="557" y="1676"/>
       <point x="680" y="1573"/>
-      <point x="680" y="1458" type="curve" name="dh02" smooth="yes"/>
+      <point x="680" y="1458" type="curve" smooth="yes" name="dh02"/>
       <point x="680" y="1343"/>
       <point x="560" y="1221"/>
       <point x="325" y="1034" type="curve" smooth="yes"/>
@@ -39,45 +39,45 @@
       <point x="84" y="500" type="line"/>
     </contour>
     <contour>
-      <point x="786" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="786" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="687" y="-285"/>
       <point x="588" y="-271"/>
       <point x="488" y="-244" type="curve"/>
       <point x="488" y="-90" type="line" name="ih01"/>
       <point x="575" y="-127"/>
       <point x="689" y="-145"/>
-      <point x="774" y="-145" type="curve" name="dv02" smooth="yes"/>
+      <point x="774" y="-145" type="curve" smooth="yes" name="dv02"/>
       <point x="907" y="-145"/>
       <point x="967" y="-101"/>
-      <point x="967" y="-25" type="curve" name="sh04" smooth="yes"/>
+      <point x="967" y="-25" type="curve" smooth="yes" name="sh04"/>
       <point x="967" y="56"/>
       <point x="899" y="104"/>
-      <point x="783" y="104" type="curve" name="dv04" smooth="yes"/>
+      <point x="783" y="104" type="curve" smooth="yes" name="dv04"/>
       <point x="672" y="104" type="line" name="sh05"/>
       <point x="672" y="250" type="line" name="sh01"/>
-      <point x="783" y="250" type="line" name="dv05" smooth="yes"/>
+      <point x="783" y="250" type="line" smooth="yes" name="dv05"/>
       <point x="883" y="250"/>
       <point x="942" y="283"/>
-      <point x="942" y="346" type="curve" name="sh06" smooth="yes"/>
+      <point x="942" y="346" type="curve" smooth="yes" name="sh06"/>
       <point x="942" y="405"/>
       <point x="892" y="440"/>
-      <point x="781" y="440" type="curve" name="dv06" smooth="yes"/>
+      <point x="781" y="440" type="curve" smooth="yes" name="dv06"/>
       <point x="717" y="440"/>
       <point x="614" y="427"/>
       <point x="518" y="395" type="curve" name="ih02"/>
       <point x="518" y="547" type="line"/>
       <point x="610" y="570"/>
       <point x="705" y="582"/>
-      <point x="789" y="582" type="curve" name="dv07" smooth="yes"/>
+      <point x="789" y="582" type="curve" smooth="yes" name="dv07"/>
       <point x="1008" y="582"/>
       <point x="1139" y="499"/>
-      <point x="1139" y="366" type="curve" name="sh03" smooth="yes"/>
+      <point x="1139" y="366" type="curve" smooth="yes" name="sh03"/>
       <point x="1139" y="266"/>
       <point x="1068" y="203"/>
       <point x="936" y="182" type="curve" name="ih03"/>
       <point x="1079" y="163"/>
       <point x="1164" y="91"/>
-      <point x="1164" y="-38" type="curve" name="sh07" smooth="yes"/>
+      <point x="1164" y="-38" type="curve" smooth="yes" name="sh07"/>
       <point x="1164" y="-199"/>
       <point x="1034" y="-285"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2155.glif b/source/Hack-Bold.ufo/glyphs/uni2155.glif
index 46b92dc4a..12255e3c0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2155.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2155.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2155" format="1">
+<glyph name="uni2155" format="2">
   <advance width="1233"/>
   <unicode hex="2155"/>
   <outline>
@@ -23,20 +23,20 @@
       <point x="84" y="500" type="line"/>
     </contour>
     <contour>
-      <point x="758" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="758" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="678" y="-285"/>
       <point x="587" y="-273"/>
       <point x="494" y="-249" type="curve"/>
       <point x="494" y="-101" type="line" name="ih01"/>
       <point x="562" y="-129"/>
       <point x="649" y="-147"/>
-      <point x="732" y="-147" type="curve" name="dv02" smooth="yes"/>
+      <point x="732" y="-147" type="curve" smooth="yes" name="dv02"/>
       <point x="873" y="-147"/>
       <point x="948" y="-95"/>
-      <point x="948" y="-4" type="curve" name="dh05" smooth="yes"/>
+      <point x="948" y="-4" type="curve" smooth="yes" name="dh05"/>
       <point x="948" y="89"/>
       <point x="869" y="143"/>
-      <point x="742" y="143" type="curve" name="dv03" smooth="yes"/>
+      <point x="742" y="143" type="curve" smooth="yes" name="dv03"/>
       <point x="675" y="143"/>
       <point x="601" y="128"/>
       <point x="528" y="100" type="curve" name="dh03"/>
@@ -47,10 +47,10 @@
       <point x="692" y="266" type="line" name="dh04"/>
       <point x="724" y="275"/>
       <point x="759" y="281"/>
-      <point x="806" y="281" type="curve" name="hr01" smooth="yes"/>
+      <point x="806" y="281" type="curve" smooth="yes" name="hr01"/>
       <point x="1004" y="281"/>
       <point x="1145" y="167"/>
-      <point x="1145" y="-4" type="curve" name="dh06" smooth="yes"/>
+      <point x="1145" y="-4" type="curve" smooth="yes" name="dh06"/>
       <point x="1145" y="-177"/>
       <point x="999" y="-285"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2156.glif b/source/Hack-Bold.ufo/glyphs/uni2156.glif
index 0f527a4b4..497588ded 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2156.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2156.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2156" format="1">
+<glyph name="uni2156" format="2">
   <advance width="1233"/>
   <unicode hex="2156"/>
   <outline>
@@ -10,20 +10,20 @@
       <point x="157" y="1083" type="curve"/>
       <point x="372" y="1260"/>
       <point x="471" y="1370"/>
-      <point x="471" y="1434" type="curve" name="dh01" smooth="yes"/>
+      <point x="471" y="1434" type="curve" smooth="yes" name="dh01"/>
       <point x="471" y="1479"/>
       <point x="419" y="1536"/>
-      <point x="307" y="1536" type="curve" name="dv03" smooth="yes"/>
+      <point x="307" y="1536" type="curve" smooth="yes" name="dv03"/>
       <point x="234" y="1536"/>
       <point x="145" y="1512"/>
       <point x="41" y="1467" type="curve"/>
       <point x="41" y="1631" type="line"/>
       <point x="141" y="1660"/>
       <point x="234" y="1676"/>
-      <point x="326" y="1676" type="curve" name="dv04" smooth="yes"/>
+      <point x="326" y="1676" type="curve" smooth="yes" name="dv04"/>
       <point x="557" y="1676"/>
       <point x="680" y="1573"/>
-      <point x="680" y="1458" type="curve" name="hr01" smooth="yes"/>
+      <point x="680" y="1458" type="curve" smooth="yes" name="hr01"/>
       <point x="680" y="1343"/>
       <point x="560" y="1221"/>
       <point x="325" y="1034" type="curve" smooth="yes"/>
@@ -39,20 +39,20 @@
       <point x="84" y="500" type="line"/>
     </contour>
     <contour>
-      <point x="758" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="758" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="678" y="-285"/>
       <point x="587" y="-273"/>
       <point x="494" y="-249" type="curve"/>
       <point x="494" y="-101" type="line" name="ih01"/>
       <point x="562" y="-129"/>
       <point x="649" y="-147"/>
-      <point x="732" y="-147" type="curve" name="dv02" smooth="yes"/>
+      <point x="732" y="-147" type="curve" smooth="yes" name="dv02"/>
       <point x="873" y="-147"/>
       <point x="948" y="-95"/>
-      <point x="948" y="-4" type="curve" name="dh02" smooth="yes"/>
+      <point x="948" y="-4" type="curve" smooth="yes" name="dh02"/>
       <point x="948" y="89"/>
       <point x="869" y="143"/>
-      <point x="742" y="143" type="curve" name="dv05" smooth="yes"/>
+      <point x="742" y="143" type="curve" smooth="yes" name="dv05"/>
       <point x="675" y="143"/>
       <point x="601" y="128"/>
       <point x="528" y="100" type="curve" name="ih02"/>
@@ -63,10 +63,10 @@
       <point x="692" y="266" type="line" name="iv01"/>
       <point x="724" y="275"/>
       <point x="759" y="281"/>
-      <point x="806" y="281" type="curve" name="dv06" smooth="yes"/>
+      <point x="806" y="281" type="curve" smooth="yes" name="dv06"/>
       <point x="1004" y="281"/>
       <point x="1145" y="167"/>
-      <point x="1145" y="-4" type="curve" name="dh03" smooth="yes"/>
+      <point x="1145" y="-4" type="curve" smooth="yes" name="dh03"/>
       <point x="1145" y="-177"/>
       <point x="999" y="-285"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2157.glif b/source/Hack-Bold.ufo/glyphs/uni2157.glif
index bcbb88621..06eb92223 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2157.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2157.glif
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2157" format="1">
+<glyph name="uni2157" format="2">
   <advance width="1233"/>
   <unicode hex="2157"/>
   <outline>
     <contour>
-      <point x="327" y="809" type="curve" name="dv11" smooth="yes"/>
+      <point x="327" y="809" type="curve" smooth="yes" name="dv11"/>
       <point x="228" y="809"/>
       <point x="129" y="823"/>
       <point x="29" y="850" type="curve"/>
       <point x="29" y="1004" type="line"/>
       <point x="116" y="967"/>
       <point x="230" y="949"/>
-      <point x="315" y="949" type="curve" name="dv12" smooth="yes"/>
+      <point x="315" y="949" type="curve" smooth="yes" name="dv12"/>
       <point x="448" y="949"/>
       <point x="508" y="993"/>
       <point x="508" y="1069" type="curve" smooth="yes"/>
       <point x="508" y="1150"/>
       <point x="440" y="1198"/>
-      <point x="324" y="1198" type="curve" name="dv07" smooth="yes"/>
+      <point x="324" y="1198" type="curve" smooth="yes" name="dv07"/>
       <point x="213" y="1198" type="line"/>
       <point x="213" y="1344" type="line" name="dh01"/>
-      <point x="324" y="1344" type="line" name="dv08" smooth="yes"/>
+      <point x="324" y="1344" type="line" smooth="yes" name="dv08"/>
       <point x="424" y="1344"/>
       <point x="483" y="1377"/>
-      <point x="483" y="1440" type="curve" name="sh01" smooth="yes"/>
+      <point x="483" y="1440" type="curve" smooth="yes" name="sh01"/>
       <point x="483" y="1499"/>
       <point x="433" y="1534"/>
-      <point x="322" y="1534" type="curve" name="dv03" smooth="yes"/>
+      <point x="322" y="1534" type="curve" smooth="yes" name="dv03"/>
       <point x="258" y="1534"/>
       <point x="155" y="1521"/>
       <point x="59" y="1489" type="curve"/>
       <point x="59" y="1641" type="line" name="hr01"/>
       <point x="151" y="1664"/>
       <point x="246" y="1676"/>
-      <point x="330" y="1676" type="curve" name="dv04" smooth="yes"/>
+      <point x="330" y="1676" type="curve" smooth="yes" name="dv04"/>
       <point x="549" y="1676"/>
       <point x="680" y="1593"/>
-      <point x="680" y="1460" type="curve" name="dh02" smooth="yes"/>
+      <point x="680" y="1460" type="curve" smooth="yes" name="dh02"/>
       <point x="680" y="1360"/>
       <point x="609" y="1297"/>
       <point x="477" y="1276" type="curve" name="ih01"/>
@@ -53,20 +53,20 @@
       <point x="84" y="500" type="line" name="hr02"/>
     </contour>
     <contour>
-      <point x="758" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="758" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="678" y="-285"/>
       <point x="587" y="-273"/>
       <point x="494" y="-249" type="curve" name="hr03"/>
       <point x="494" y="-101" type="line" name="ih02"/>
       <point x="562" y="-129"/>
       <point x="649" y="-147"/>
-      <point x="732" y="-147" type="curve" name="dv02" smooth="yes"/>
+      <point x="732" y="-147" type="curve" smooth="yes" name="dv02"/>
       <point x="873" y="-147"/>
       <point x="948" y="-95"/>
-      <point x="948" y="-4" type="curve" name="dh03" smooth="yes"/>
+      <point x="948" y="-4" type="curve" smooth="yes" name="dh03"/>
       <point x="948" y="89"/>
       <point x="869" y="143"/>
-      <point x="742" y="143" type="curve" name="dv05" smooth="yes"/>
+      <point x="742" y="143" type="curve" smooth="yes" name="dv05"/>
       <point x="675" y="143"/>
       <point x="601" y="128"/>
       <point x="528" y="100" type="curve" name="ih03"/>
@@ -77,10 +77,10 @@
       <point x="692" y="266" type="line" name="iv01"/>
       <point x="724" y="275"/>
       <point x="759" y="281"/>
-      <point x="806" y="281" type="curve" name="dv06" smooth="yes"/>
+      <point x="806" y="281" type="curve" smooth="yes" name="dv06"/>
       <point x="1004" y="281"/>
       <point x="1145" y="167"/>
-      <point x="1145" y="-4" type="curve" name="dh04" smooth="yes"/>
+      <point x="1145" y="-4" type="curve" smooth="yes" name="dh04"/>
       <point x="1145" y="-177"/>
       <point x="999" y="-285"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2158.glif b/source/Hack-Bold.ufo/glyphs/uni2158.glif
index 49dfcf2b6..d83ea9cb4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2158.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2158.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2158" format="1">
+<glyph name="uni2158" format="2">
   <advance width="1233"/>
   <unicode hex="2158"/>
   <outline>
@@ -28,20 +28,20 @@
       <point x="84" y="500" type="line"/>
     </contour>
     <contour>
-      <point x="758" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="758" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="678" y="-285"/>
       <point x="587" y="-273"/>
       <point x="494" y="-249" type="curve"/>
       <point x="494" y="-101" type="line" name="hr01"/>
       <point x="562" y="-129"/>
       <point x="649" y="-147"/>
-      <point x="732" y="-147" type="curve" name="dv02" smooth="yes"/>
+      <point x="732" y="-147" type="curve" smooth="yes" name="dv02"/>
       <point x="873" y="-147"/>
       <point x="948" y="-95"/>
-      <point x="948" y="-4" type="curve" name="dh03" smooth="yes"/>
+      <point x="948" y="-4" type="curve" smooth="yes" name="dh03"/>
       <point x="948" y="89"/>
       <point x="869" y="143"/>
-      <point x="742" y="143" type="curve" name="dv03" smooth="yes"/>
+      <point x="742" y="143" type="curve" smooth="yes" name="dv03"/>
       <point x="675" y="143"/>
       <point x="601" y="128"/>
       <point x="528" y="100" type="curve" name="ih01"/>
@@ -52,10 +52,10 @@
       <point x="692" y="266" type="line" name="sh03"/>
       <point x="724" y="275"/>
       <point x="759" y="281"/>
-      <point x="806" y="281" type="curve" name="dv04" smooth="yes"/>
+      <point x="806" y="281" type="curve" smooth="yes" name="dv04"/>
       <point x="1004" y="281"/>
       <point x="1145" y="167"/>
-      <point x="1145" y="-4" type="curve" name="dh04" smooth="yes"/>
+      <point x="1145" y="-4" type="curve" smooth="yes" name="dh04"/>
       <point x="1145" y="-177"/>
       <point x="999" y="-285"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2159.glif b/source/Hack-Bold.ufo/glyphs/uni2159.glif
index 44f430cc2..6be2dff48 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2159.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2159.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2159" format="1">
+<glyph name="uni2159" format="2">
   <advance width="1233"/>
   <unicode hex="2159"/>
   <outline>
@@ -23,46 +23,46 @@
       <point x="84" y="500" type="line"/>
     </contour>
     <contour>
-      <point x="838" y="-286" type="curve" name="dv01" smooth="yes"/>
+      <point x="838" y="-286" type="curve" smooth="yes" name="dv01"/>
       <point x="603" y="-286"/>
       <point x="488" y="-157"/>
-      <point x="488" y="131" type="curve" name="sh04" smooth="yes"/>
+      <point x="488" y="131" type="curve" smooth="yes" name="sh04"/>
       <point x="488" y="439"/>
       <point x="620" y="582"/>
-      <point x="895" y="582" type="curve" name="dv06" smooth="yes"/>
+      <point x="895" y="582" type="curve" smooth="yes" name="dv06"/>
       <point x="960" y="582"/>
       <point x="1023" y="575"/>
       <point x="1103" y="548" type="curve"/>
       <point x="1103" y="399" type="line" name="ih01"/>
       <point x="1038" y="428"/>
       <point x="970" y="449"/>
-      <point x="899" y="449" type="curve" name="dv05" smooth="yes"/>
+      <point x="899" y="449" type="curve" smooth="yes" name="dv05"/>
       <point x="759" y="449"/>
       <point x="680" y="368"/>
       <point x="677" y="211" type="curve" name="hr02"/>
       <point x="720" y="260"/>
       <point x="786" y="284"/>
-      <point x="877" y="284" type="curve" name="dv04" smooth="yes"/>
+      <point x="877" y="284" type="curve" smooth="yes" name="dv04"/>
       <point x="1062" y="284"/>
       <point x="1166" y="186"/>
-      <point x="1166" y="7" type="curve" name="dh04" smooth="yes"/>
+      <point x="1166" y="7" type="curve" smooth="yes" name="dh04"/>
       <point x="1166" y="-180"/>
       <point x="1053" y="-286"/>
     </contour>
     <contour>
-      <point x="838" y="-153" type="curve" name="dv02" smooth="yes"/>
+      <point x="838" y="-153" type="curve" smooth="yes" name="dv02"/>
       <point x="926" y="-153"/>
       <point x="974" y="-99"/>
-      <point x="974" y="-2" type="curve" name="dh03" smooth="yes"/>
+      <point x="974" y="-2" type="curve" smooth="yes" name="dh03"/>
       <point x="974" y="46"/>
       <point x="962" y="83"/>
       <point x="939" y="110" type="curve" smooth="yes"/>
       <point x="916" y="136"/>
       <point x="882" y="149"/>
-      <point x="838" y="149" type="curve" name="dv03" smooth="yes"/>
+      <point x="838" y="149" type="curve" smooth="yes" name="dv03"/>
       <point x="750" y="149"/>
       <point x="703" y="98"/>
-      <point x="703" y="-1" type="curve" name="hr03" smooth="yes"/>
+      <point x="703" y="-1" type="curve" smooth="yes" name="hr03"/>
       <point x="703" y="-100"/>
       <point x="750" y="-153"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni215A_.glif b/source/Hack-Bold.ufo/glyphs/uni215A_.glif
index 7558da01c..85d5824ba 100644
--- a/source/Hack-Bold.ufo/glyphs/uni215A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni215A_.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni215A" format="1">
+<glyph name="uni215A" format="2">
   <advance width="1233"/>
   <unicode hex="215A"/>
   <outline>
     <contour>
-      <point x="299" y="809" type="curve" name="dv10" smooth="yes"/>
+      <point x="299" y="809" type="curve" smooth="yes" name="dv10"/>
       <point x="219" y="809"/>
       <point x="128" y="821"/>
       <point x="35" y="845" type="curve"/>
       <point x="35" y="993" type="line"/>
       <point x="103" y="965"/>
       <point x="190" y="947"/>
-      <point x="273" y="947" type="curve" name="dv11" smooth="yes"/>
+      <point x="273" y="947" type="curve" smooth="yes" name="dv11"/>
       <point x="414" y="947"/>
       <point x="489" y="999"/>
-      <point x="489" y="1090" type="curve" name="sh01" smooth="yes"/>
+      <point x="489" y="1090" type="curve" smooth="yes" name="sh01"/>
       <point x="489" y="1183"/>
       <point x="410" y="1237"/>
-      <point x="283" y="1237" type="curve" name="dv04" smooth="yes"/>
+      <point x="283" y="1237" type="curve" smooth="yes" name="dv04"/>
       <point x="216" y="1237"/>
       <point x="142" y="1222"/>
       <point x="69" y="1194" type="curve" name="dh01"/>
@@ -28,10 +28,10 @@
       <point x="233" y="1360" type="line" name="dh02"/>
       <point x="265" y="1369"/>
       <point x="300" y="1375"/>
-      <point x="347" y="1375" type="curve" name="dv05" smooth="yes"/>
+      <point x="347" y="1375" type="curve" smooth="yes" name="dv05"/>
       <point x="545" y="1375"/>
       <point x="686" y="1261"/>
-      <point x="686" y="1090" type="curve" name="dh04" smooth="yes"/>
+      <point x="686" y="1090" type="curve" smooth="yes" name="dh04"/>
       <point x="686" y="917"/>
       <point x="540" y="809"/>
     </contour>
@@ -42,43 +42,43 @@
       <point x="84" y="500" type="line"/>
     </contour>
     <contour>
-      <point x="838" y="-286" type="curve" name="dv01" smooth="yes"/>
+      <point x="838" y="-286" type="curve" smooth="yes" name="dv01"/>
       <point x="603" y="-286"/>
       <point x="488" y="-157"/>
-      <point x="488" y="131" type="curve" name="dh03" smooth="yes"/>
+      <point x="488" y="131" type="curve" smooth="yes" name="dh03"/>
       <point x="488" y="439"/>
       <point x="620" y="582"/>
-      <point x="895" y="582" type="curve" name="dv09" smooth="yes"/>
+      <point x="895" y="582" type="curve" smooth="yes" name="dv09"/>
       <point x="960" y="582"/>
       <point x="1023" y="575"/>
       <point x="1103" y="548" type="curve"/>
       <point x="1103" y="399" type="line" name="ih01"/>
       <point x="1038" y="428"/>
       <point x="970" y="449"/>
-      <point x="899" y="449" type="curve" name="dv08" smooth="yes"/>
+      <point x="899" y="449" type="curve" smooth="yes" name="dv08"/>
       <point x="759" y="449"/>
       <point x="680" y="368"/>
       <point x="677" y="211" type="curve" name="sh02"/>
       <point x="720" y="260"/>
       <point x="786" y="284"/>
-      <point x="877" y="284" type="curve" name="dv07" smooth="yes"/>
+      <point x="877" y="284" type="curve" smooth="yes" name="dv07"/>
       <point x="1062" y="284"/>
       <point x="1166" y="186"/>
-      <point x="1166" y="7" type="curve" name="dh06" smooth="yes"/>
+      <point x="1166" y="7" type="curve" smooth="yes" name="dh06"/>
       <point x="1166" y="-180"/>
       <point x="1053" y="-286"/>
     </contour>
     <contour>
-      <point x="838" y="-153" type="curve" name="dv02" smooth="yes"/>
+      <point x="838" y="-153" type="curve" smooth="yes" name="dv02"/>
       <point x="926" y="-153"/>
       <point x="974" y="-99"/>
-      <point x="974" y="-2" type="curve" name="dh05" smooth="yes"/>
+      <point x="974" y="-2" type="curve" smooth="yes" name="dh05"/>
       <point x="974" y="46"/>
       <point x="962" y="83"/>
       <point x="939" y="110" type="curve" smooth="yes"/>
       <point x="916" y="136"/>
       <point x="882" y="149"/>
-      <point x="838" y="149" type="curve" name="dv06" smooth="yes"/>
+      <point x="838" y="149" type="curve" smooth="yes" name="dv06"/>
       <point x="750" y="149"/>
       <point x="703" y="98"/>
       <point x="703" y="-1" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni215F_.glif b/source/Hack-Bold.ufo/glyphs/uni215F_.glif
index 07354ef9f..bf385e64c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni215F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni215F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni215F" format="1">
+<glyph name="uni215F" format="2">
   <advance width="1233"/>
   <unicode hex="215F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2189.glif b/source/Hack-Bold.ufo/glyphs/uni2189.glif
index d8f0b735b..9ff112184 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2189.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2189.glif
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2189" format="1">
+<glyph name="uni2189" format="2">
   <advance width="1233"/>
   <unicode hex="2189"/>
   <outline>
     <contour>
-      <point x="357" y="809" type="curve" name="dv09" smooth="yes"/>
+      <point x="357" y="809" type="curve" smooth="yes" name="dv09"/>
       <point x="132" y="809"/>
       <point x="20" y="954"/>
-      <point x="20" y="1243" type="curve" name="dh01" smooth="yes"/>
+      <point x="20" y="1243" type="curve" smooth="yes" name="dh01"/>
       <point x="20" y="1532"/>
       <point x="132" y="1676"/>
-      <point x="357" y="1676" type="curve" name="dv04" smooth="yes"/>
+      <point x="357" y="1676" type="curve" smooth="yes" name="dv04"/>
       <point x="583" y="1676"/>
       <point x="696" y="1532"/>
-      <point x="696" y="1243" type="curve" name="hr01" smooth="yes"/>
+      <point x="696" y="1243" type="curve" smooth="yes" name="hr01"/>
       <point x="696" y="954"/>
       <point x="583" y="809"/>
     </contour>
     <contour>
-      <point x="358" y="949" type="curve" name="dv10" smooth="yes"/>
+      <point x="358" y="949" type="curve" smooth="yes" name="dv10"/>
       <point x="405" y="949"/>
       <point x="439" y="972"/>
       <point x="460" y="1019" type="curve" smooth="yes"/>
       <point x="481" y="1066"/>
       <point x="492" y="1140"/>
-      <point x="492" y="1242" type="curve" name="dh04" smooth="yes"/>
+      <point x="492" y="1242" type="curve" smooth="yes" name="dh04"/>
       <point x="492" y="1343"/>
       <point x="481" y="1418"/>
       <point x="460" y="1466" type="curve" smooth="yes"/>
       <point x="439" y="1513"/>
       <point x="405" y="1536"/>
-      <point x="358" y="1536" type="curve" name="dv03" smooth="yes"/>
+      <point x="358" y="1536" type="curve" smooth="yes" name="dv03"/>
       <point x="306" y="1536"/>
       <point x="276" y="1509"/>
       <point x="256" y="1466" type="curve" smooth="yes"/>
       <point x="234" y="1419"/>
       <point x="223" y="1344"/>
-      <point x="223" y="1242" type="curve" name="hr02" smooth="yes"/>
+      <point x="223" y="1242" type="curve" smooth="yes" name="hr02"/>
       <point x="223" y="1141"/>
       <point x="234" y="1067"/>
       <point x="256" y="1019" type="curve" smooth="yes"/>
@@ -47,16 +47,16 @@
       <point x="358" y="1172" type="curve" smooth="yes"/>
       <point x="333" y="1172"/>
       <point x="312" y="1180"/>
-      <point x="297" y="1192" type="curve" name="hr03" smooth="yes"/>
+      <point x="297" y="1192" type="curve" smooth="yes" name="hr03"/>
       <point x="281" y="1205"/>
       <point x="273" y="1221"/>
-      <point x="273" y="1241" type="curve" name="dh02" smooth="yes"/>
+      <point x="273" y="1241" type="curve" smooth="yes" name="dh02"/>
       <point x="273" y="1282"/>
       <point x="310" y="1313"/>
-      <point x="357" y="1313" type="curve" name="sv01" smooth="yes"/>
+      <point x="357" y="1313" type="curve" smooth="yes" name="sv01"/>
       <point x="404" y="1313"/>
       <point x="443" y="1282"/>
-      <point x="443" y="1242" type="curve" name="dh03" smooth="yes"/>
+      <point x="443" y="1242" type="curve" smooth="yes" name="dh03"/>
       <point x="443" y="1203"/>
       <point x="406" y="1172"/>
     </contour>
@@ -67,45 +67,45 @@
       <point x="84" y="500" type="line"/>
     </contour>
     <contour>
-      <point x="786" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="786" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="687" y="-285"/>
       <point x="588" y="-271"/>
       <point x="488" y="-244" type="curve" name="sh01"/>
       <point x="488" y="-90" type="line"/>
       <point x="575" y="-127"/>
       <point x="689" y="-145"/>
-      <point x="774" y="-145" type="curve" name="dv02" smooth="yes"/>
+      <point x="774" y="-145" type="curve" smooth="yes" name="dv02"/>
       <point x="907" y="-145"/>
       <point x="967" y="-101"/>
-      <point x="967" y="-25" type="curve" name="sh03" smooth="yes"/>
+      <point x="967" y="-25" type="curve" smooth="yes" name="sh03"/>
       <point x="967" y="56"/>
       <point x="899" y="104"/>
-      <point x="783" y="104" type="curve" name="dv05" smooth="yes"/>
+      <point x="783" y="104" type="curve" smooth="yes" name="dv05"/>
       <point x="672" y="104" type="line"/>
       <point x="672" y="250" type="line" name="hr04"/>
-      <point x="783" y="250" type="line" name="dv06" smooth="yes"/>
+      <point x="783" y="250" type="line" smooth="yes" name="dv06"/>
       <point x="883" y="250"/>
       <point x="942" y="283"/>
-      <point x="942" y="346" type="curve" name="sh04" smooth="yes"/>
+      <point x="942" y="346" type="curve" smooth="yes" name="sh04"/>
       <point x="942" y="405"/>
       <point x="892" y="440"/>
-      <point x="781" y="440" type="curve" name="dv07" smooth="yes"/>
+      <point x="781" y="440" type="curve" smooth="yes" name="dv07"/>
       <point x="717" y="440"/>
       <point x="614" y="427"/>
       <point x="518" y="395" type="curve" name="ih01"/>
       <point x="518" y="547" type="line"/>
       <point x="610" y="570"/>
       <point x="705" y="582"/>
-      <point x="789" y="582" type="curve" name="dv08" smooth="yes"/>
+      <point x="789" y="582" type="curve" smooth="yes" name="dv08"/>
       <point x="1008" y="582"/>
       <point x="1139" y="499"/>
-      <point x="1139" y="366" type="curve" name="sh02" smooth="yes"/>
+      <point x="1139" y="366" type="curve" smooth="yes" name="sh02"/>
       <point x="1139" y="266"/>
       <point x="1068" y="203"/>
       <point x="936" y="182" type="curve" name="ih02"/>
       <point x="1079" y="163"/>
       <point x="1164" y="91"/>
-      <point x="1164" y="-38" type="curve" name="sh05" smooth="yes"/>
+      <point x="1164" y="-38" type="curve" smooth="yes" name="sh05"/>
       <point x="1164" y="-199"/>
       <point x="1034" y="-285"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2196.glif b/source/Hack-Bold.ufo/glyphs/uni2196.glif
index 91899269f..4cb02437b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2196.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2196.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2196" format="1">
+<glyph name="uni2196" format="2">
   <advance width="1233"/>
   <unicode hex="2196"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2197.glif b/source/Hack-Bold.ufo/glyphs/uni2197.glif
index 34d37ee1a..d3c17b60f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2197.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2197.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2197" format="1">
+<glyph name="uni2197" format="2">
   <advance width="1233"/>
   <unicode hex="2197"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2198.glif b/source/Hack-Bold.ufo/glyphs/uni2198.glif
index 94fdf82a7..a8dbf5303 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2198.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2198.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2198" format="1">
+<glyph name="uni2198" format="2">
   <advance width="1233"/>
   <unicode hex="2198"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2199.glif b/source/Hack-Bold.ufo/glyphs/uni2199.glif
index 0cc3a3b90..dc5ab4cbe 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2199.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2199.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2199" format="1">
+<glyph name="uni2199" format="2">
   <advance width="1233"/>
   <unicode hex="2199"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni219A_.glif b/source/Hack-Bold.ufo/glyphs/uni219A_.glif
index 8ce0e62e2..0435e0cf2 100644
--- a/source/Hack-Bold.ufo/glyphs/uni219A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni219A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni219A" format="1">
+<glyph name="uni219A" format="2">
   <advance width="1233"/>
   <unicode hex="219A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni219B_.glif b/source/Hack-Bold.ufo/glyphs/uni219B_.glif
index ae1b5fb43..2667857c6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni219B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni219B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni219B" format="1">
+<glyph name="uni219B" format="2">
   <advance width="1233"/>
   <unicode hex="219B"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni219C_.glif b/source/Hack-Bold.ufo/glyphs/uni219C_.glif
index dee1a0589..9b77858c7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni219C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni219C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni219C" format="1">
+<glyph name="uni219C" format="2">
   <advance width="1233"/>
   <unicode hex="219C"/>
   <outline>
@@ -14,7 +14,7 @@
       <point x="462" y="611" type="curve" smooth="yes"/>
       <point x="478" y="601"/>
       <point x="494" y="596"/>
-      <point x="509" y="596" type="curve" name="dv02" smooth="yes"/>
+      <point x="509" y="596" type="curve" smooth="yes" name="dv02"/>
       <point x="555" y="596"/>
       <point x="606" y="649"/>
       <point x="606" y="652" type="curve"/>
@@ -48,7 +48,7 @@
       <point x="611" y="393" type="curve" smooth="yes"/>
       <point x="579" y="376"/>
       <point x="546" y="369"/>
-      <point x="511" y="369" type="curve" name="sv01" smooth="yes"/>
+      <point x="511" y="369" type="curve" smooth="yes" name="sv01"/>
       <point x="435" y="369"/>
       <point x="377" y="402"/>
       <point x="326" y="461" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni219D_.glif b/source/Hack-Bold.ufo/glyphs/uni219D_.glif
index ae67fa1af..dcae18180 100644
--- a/source/Hack-Bold.ufo/glyphs/uni219D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni219D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni219D" format="1">
+<glyph name="uni219D" format="2">
   <advance width="1233"/>
   <unicode hex="219D"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="907" y="461" type="line" smooth="yes"/>
       <point x="855" y="401"/>
       <point x="794" y="369"/>
-      <point x="726" y="369" type="curve" name="sv01" smooth="yes"/>
+      <point x="726" y="369" type="curve" smooth="yes" name="sv01"/>
       <point x="646" y="369"/>
       <point x="570" y="413"/>
       <point x="537" y="459" type="curve" smooth="yes"/>
@@ -45,7 +45,7 @@
       <point x="627" y="652" type="curve"/>
       <point x="630" y="644"/>
       <point x="679" y="596"/>
-      <point x="722" y="596" type="curve" name="dv01" smooth="yes"/>
+      <point x="722" y="596" type="curve" smooth="yes" name="dv01"/>
       <point x="756" y="596"/>
       <point x="803" y="625"/>
       <point x="824" y="653" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni219E_.glif b/source/Hack-Bold.ufo/glyphs/uni219E_.glif
index 3bb6430ce..a66b90fea 100644
--- a/source/Hack-Bold.ufo/glyphs/uni219E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni219E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni219E" format="1">
+<glyph name="uni219E" format="2">
   <advance width="1233"/>
   <unicode hex="219E"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni219F_.glif b/source/Hack-Bold.ufo/glyphs/uni219F_.glif
index 95a541e48..622471ac2 100644
--- a/source/Hack-Bold.ufo/glyphs/uni219F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni219F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni219F" format="1">
+<glyph name="uni219F" format="2">
   <advance width="1233"/>
   <unicode hex="219F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21A_0.glif b/source/Hack-Bold.ufo/glyphs/uni21A_0.glif
index 864eb268b..0a6e03d88 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21A_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A0" format="1">
+<glyph name="uni21A0" format="2">
   <advance width="1233"/>
   <unicode hex="21A0"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21A_1.glif b/source/Hack-Bold.ufo/glyphs/uni21A_1.glif
index 8b31bd2c6..79a8cfae5 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21A_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21A_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A1" format="1">
+<glyph name="uni21A1" format="2">
   <advance width="1233"/>
   <unicode hex="21A1"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21A_2.glif b/source/Hack-Bold.ufo/glyphs/uni21A_2.glif
index 4ec18ccfc..765f28d69 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21A_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21A_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A2" format="1">
+<glyph name="uni21A2" format="2">
   <advance width="1233"/>
   <unicode hex="21A2"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21A_3.glif b/source/Hack-Bold.ufo/glyphs/uni21A_3.glif
index 8842181ae..ccc54a7c7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21A_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21A_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A3" format="1">
+<glyph name="uni21A3" format="2">
   <advance width="1233"/>
   <unicode hex="21A3"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21A_4.glif b/source/Hack-Bold.ufo/glyphs/uni21A_4.glif
index fc3f07abf..ca55a897d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21A_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A4" format="1">
+<glyph name="uni21A4" format="2">
   <advance width="1233"/>
   <unicode hex="21A4"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21A_5.glif b/source/Hack-Bold.ufo/glyphs/uni21A_5.glif
index 96349ee28..ae56834e0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21A_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21A_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A5" format="1">
+<glyph name="uni21A5" format="2">
   <advance width="1233"/>
   <unicode hex="21A5"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21A_6.glif b/source/Hack-Bold.ufo/glyphs/uni21A_6.glif
index 81ed3d819..46410d269 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21A_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21A_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A6" format="1">
+<glyph name="uni21A6" format="2">
   <advance width="1233"/>
   <unicode hex="21A6"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21A_7.glif b/source/Hack-Bold.ufo/glyphs/uni21A_7.glif
index f3d9ff15d..fc5d79141 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21A_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21A_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A7" format="1">
+<glyph name="uni21A7" format="2">
   <advance width="1233"/>
   <unicode hex="21A7"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21A_9.glif b/source/Hack-Bold.ufo/glyphs/uni21A_9.glif
index 56c8601f8..3ffd6fb92 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21A_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21A_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A9" format="1">
+<glyph name="uni21A9" format="2">
   <advance width="1233"/>
   <unicode hex="21A9"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="357" y="923" type="line"/>
       <point x="477" y="803" type="line"/>
       <point x="347" y="673" type="line"/>
-      <point x="871" y="673" type="line" name="dv02" smooth="yes"/>
+      <point x="871" y="673" type="line" smooth="yes" name="dv02"/>
       <point x="887" y="673"/>
       <point x="907" y="679"/>
       <point x="922" y="694" type="curve" smooth="yes"/>
@@ -28,13 +28,13 @@
       <point x="1080" y="956" type="curve" smooth="yes"/>
       <point x="1141" y="895"/>
       <point x="1167" y="821"/>
-      <point x="1167" y="746" type="curve" name="dh02" smooth="yes"/>
+      <point x="1167" y="746" type="curve" smooth="yes" name="dh02"/>
       <point x="1167" y="662"/>
       <point x="1135" y="589"/>
       <point x="1080" y="534" type="curve" smooth="yes"/>
       <point x="1035" y="489"/>
       <point x="964" y="449"/>
-      <point x="871" y="449" type="curve" name="dv01" smooth="yes"/>
+      <point x="871" y="449" type="curve" smooth="yes" name="dv01"/>
       <point x="347" y="449" type="line"/>
       <point x="477" y="319" type="line"/>
       <point x="357" y="199" type="line" name="av02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21A_A_.glif b/source/Hack-Bold.ufo/glyphs/uni21A_A_.glif
index ce65a4f1b..332a6edac 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21A_A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21A_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21AA" format="1">
+<glyph name="uni21AA" format="2">
   <advance width="1233"/>
   <unicode hex="21AA"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="153" y="534" type="curve" smooth="yes"/>
       <point x="98" y="589"/>
       <point x="66" y="662"/>
-      <point x="66" y="746" type="curve" name="dh01" smooth="yes"/>
+      <point x="66" y="746" type="curve" smooth="yes" name="dh01"/>
       <point x="66" y="821"/>
       <point x="92" y="895"/>
       <point x="153" y="956" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21A_B_.glif b/source/Hack-Bold.ufo/glyphs/uni21A_B_.glif
index b6bf13fde..82df60b9b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21A_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21A_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21AB" format="1">
+<glyph name="uni21AB" format="2">
   <advance width="1233"/>
   <unicode hex="21AB"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="575" y="745" type="line" smooth="yes"/>
       <point x="575" y="911"/>
       <point x="708" y="1042"/>
-      <point x="870" y="1042" type="curve" name="av01" smooth="yes"/>
+      <point x="870" y="1042" type="curve" smooth="yes" name="av01"/>
       <point x="957" y="1042"/>
       <point x="1028" y="1008"/>
       <point x="1080" y="956" type="curve" smooth="yes"/>
@@ -25,7 +25,7 @@
       <point x="1081" y="535" type="curve" smooth="yes"/>
       <point x="1032" y="484"/>
       <point x="960" y="449"/>
-      <point x="871" y="449" type="curve" name="dv01" smooth="yes"/>
+      <point x="871" y="449" type="curve" smooth="yes" name="dv01"/>
       <point x="800" y="449" type="line" name="sh01"/>
       <point x="800" y="225" type="line"/>
       <point x="575" y="225" type="line" name="sh02"/>
@@ -35,7 +35,7 @@
       <point x="357" y="199" type="line" name="av02"/>
     </contour>
     <contour>
-      <point x="871" y="673" type="line" name="dv02" smooth="yes"/>
+      <point x="871" y="673" type="line" smooth="yes" name="dv02"/>
       <point x="908" y="673"/>
       <point x="943" y="705"/>
       <point x="943" y="747" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21A_C_.glif b/source/Hack-Bold.ufo/glyphs/uni21A_C_.glif
index a1c84a434..fea1a6968 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21A_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21A_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21AC" format="1">
+<glyph name="uni21AC" format="2">
   <advance width="1233"/>
   <unicode hex="21AC"/>
   <outline>
@@ -22,10 +22,10 @@
       <point x="153" y="956" type="curve" smooth="yes"/>
       <point x="205" y="1008"/>
       <point x="276" y="1042"/>
-      <point x="363" y="1042" type="curve" name="av01" smooth="yes"/>
+      <point x="363" y="1042" type="curve" smooth="yes" name="av01"/>
       <point x="525" y="1042"/>
       <point x="658" y="911"/>
-      <point x="658" y="745" type="curve" name="sh01" smooth="yes"/>
+      <point x="658" y="745" type="curve" smooth="yes" name="sh01"/>
       <point x="658" y="673" type="line"/>
       <point x="886" y="673" type="line" name="dv02"/>
       <point x="756" y="803" type="line"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21A_D_.glif b/source/Hack-Bold.ufo/glyphs/uni21A_D_.glif
index 670cb58d4..1cd14f2bc 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21A_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21A_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21AD" format="1">
+<glyph name="uni21AD" format="2">
   <advance width="1233"/>
   <unicode hex="21AD"/>
   <outline>
@@ -26,7 +26,7 @@
       <point x="552" y="774" type="curve" smooth="yes"/>
       <point x="572" y="784"/>
       <point x="594" y="789"/>
-      <point x="617" y="789" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="789" type="curve" smooth="yes" name="dv02"/>
       <point x="662" y="789"/>
       <point x="702" y="769"/>
       <point x="735" y="730" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="886" y="449" type="line" name="iv01"/>
       <point x="871" y="440"/>
       <point x="847" y="436"/>
-      <point x="824" y="436" type="curve" name="dv01" smooth="yes"/>
+      <point x="824" y="436" type="curve" smooth="yes" name="dv01"/>
       <point x="773" y="436"/>
       <point x="737" y="456"/>
       <point x="702" y="495" type="curve" smooth="yes"/>
@@ -75,7 +75,7 @@
       <point x="478" y="451" type="curve" smooth="yes"/>
       <point x="458" y="440"/>
       <point x="439" y="436"/>
-      <point x="410" y="436" type="curve" name="sv01" smooth="yes"/>
+      <point x="410" y="436" type="curve" smooth="yes" name="sv01"/>
       <point x="385" y="436"/>
       <point x="360" y="440"/>
       <point x="347" y="449" type="curve" name="iv02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21A_E_.glif b/source/Hack-Bold.ufo/glyphs/uni21A_E_.glif
index a499c184b..efddd812c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21A_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21A_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21AE" format="1">
+<glyph name="uni21AE" format="2">
   <advance width="1233"/>
   <unicode hex="21AE"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21A_F_.glif b/source/Hack-Bold.ufo/glyphs/uni21A_F_.glif
index bd52a4532..652012e47 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21A_F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21A_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21AF" format="1">
+<glyph name="uni21AF" format="2">
   <advance width="1233"/>
   <unicode hex="21AF"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21B_0.glif b/source/Hack-Bold.ufo/glyphs/uni21B_0.glif
index e1897faf0..2a1138586 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21B_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21B_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B0" format="1">
+<glyph name="uni21B0" format="2">
   <advance width="1233"/>
   <unicode hex="21B0"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21B_1.glif b/source/Hack-Bold.ufo/glyphs/uni21B_1.glif
index 14caef5d7..0c3e96df5 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21B_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21B_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B1" format="1">
+<glyph name="uni21B1" format="2">
   <advance width="1233"/>
   <unicode hex="21B1"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21B_2.glif b/source/Hack-Bold.ufo/glyphs/uni21B_2.glif
index fcb071e65..ef84eb313 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21B_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21B_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B2" format="1">
+<glyph name="uni21B2" format="2">
   <advance width="1233"/>
   <unicode hex="21B2"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21B_3.glif b/source/Hack-Bold.ufo/glyphs/uni21B_3.glif
index 0b6ca701f..e2b7f3015 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21B_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B3" format="1">
+<glyph name="uni21B3" format="2">
   <advance width="1233"/>
   <unicode hex="21B3"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21B_4.glif b/source/Hack-Bold.ufo/glyphs/uni21B_4.glif
index 56b7f1f8a..1fc77a451 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21B_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21B_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B4" format="1">
+<glyph name="uni21B4" format="2">
   <advance width="1233"/>
   <unicode hex="21B4"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21B_6.glif b/source/Hack-Bold.ufo/glyphs/uni21B_6.glif
index 693cd0b57..e1e1f7667 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21B_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21B_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B6" format="1">
+<glyph name="uni21B6" format="2">
   <advance width="1233"/>
   <unicode hex="21B6"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="433" y="910" type="curve" smooth="yes"/>
       <point x="514" y="994"/>
       <point x="621" y="1037"/>
-      <point x="742" y="1037" type="curve" name="dv02" smooth="yes"/>
+      <point x="742" y="1037" type="curve" smooth="yes" name="dv02"/>
       <point x="863" y="1037"/>
       <point x="968" y="994"/>
       <point x="1052" y="910" type="curve" smooth="yes"/>
@@ -26,7 +26,7 @@
       <point x="903" y="758" type="curve" smooth="yes"/>
       <point x="862" y="801"/>
       <point x="813" y="824"/>
-      <point x="749" y="824" type="curve" name="dv01" smooth="yes"/>
+      <point x="749" y="824" type="curve" smooth="yes" name="dv01"/>
       <point x="689" y="824"/>
       <point x="631" y="804"/>
       <point x="587" y="759" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21B_7.glif b/source/Hack-Bold.ufo/glyphs/uni21B_7.glif
index 2ec1c1a68..242273bda 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21B_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21B_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B7" format="1">
+<glyph name="uni21B7" format="2">
   <advance width="1233"/>
   <unicode hex="21B7"/>
   <outline>
@@ -22,7 +22,7 @@
       <point x="181" y="910" type="curve" smooth="yes"/>
       <point x="265" y="994"/>
       <point x="370" y="1037"/>
-      <point x="491" y="1037" type="curve" name="dv02" smooth="yes"/>
+      <point x="491" y="1037" type="curve" smooth="yes" name="dv02"/>
       <point x="612" y="1037"/>
       <point x="719" y="994"/>
       <point x="800" y="910" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21B_8.glif b/source/Hack-Bold.ufo/glyphs/uni21B_8.glif
index 999bd5595..182b7c075 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21B_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21B_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B8" format="1">
+<glyph name="uni21B8" format="2">
   <advance width="1233"/>
   <unicode hex="21B8"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21B_9.glif b/source/Hack-Bold.ufo/glyphs/uni21B_9.glif
index cd4dc913c..6f06c37f8 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21B_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21B_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B9" format="1">
+<glyph name="uni21B9" format="2">
   <advance width="1233"/>
   <unicode hex="21B9"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21B_A_.glif b/source/Hack-Bold.ufo/glyphs/uni21B_A_.glif
index fe738003c..8ed58dd86 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21B_A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21B_A_.glif
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21BA" format="1">
+<glyph name="uni21BA" format="2">
   <advance width="1233"/>
   <unicode hex="21BA"/>
   <outline>
     <contour>
-      <point x="593" y="-39" type="curve" name="hr00" smooth="yes"/>
+      <point x="593" y="-39" type="curve" smooth="yes" name="hr00"/>
       <point x="445" y="-39"/>
       <point x="315" y="18"/>
       <point x="214" y="118" type="curve" smooth="yes"/>
       <point x="109" y="222"/>
       <point x="55" y="353"/>
-      <point x="55" y="502" type="curve" name="dh01" smooth="yes"/>
+      <point x="55" y="502" type="curve" smooth="yes" name="dh01"/>
       <point x="55" y="646"/>
       <point x="105" y="769"/>
       <point x="214" y="882" type="curve"/>
       <point x="385" y="733" type="line"/>
       <point x="324" y="673"/>
       <point x="294" y="594"/>
-      <point x="294" y="513" type="curve" name="dh02" smooth="yes"/>
+      <point x="294" y="513" type="curve" smooth="yes" name="dh02"/>
       <point x="294" y="425"/>
       <point x="328" y="349"/>
       <point x="384" y="293" type="curve" smooth="yes"/>
       <point x="436" y="240"/>
       <point x="508" y="203"/>
-      <point x="601" y="203" type="curve" name="dv01" smooth="yes"/>
+      <point x="601" y="203" type="curve" smooth="yes" name="dv01"/>
       <point x="684" y="203"/>
       <point x="756" y="233"/>
       <point x="816" y="293" type="curve" smooth="yes"/>
       <point x="881" y="358"/>
       <point x="906" y="434"/>
-      <point x="906" y="519" type="curve" name="dh05" smooth="yes"/>
+      <point x="906" y="519" type="curve" smooth="yes" name="dh05"/>
       <point x="906" y="570"/>
       <point x="898" y="615"/>
       <point x="883" y="632" type="curve"/>
@@ -40,10 +40,10 @@
       <point x="766" y="1047" type="line"/>
       <point x="1178" y="1047" type="line" name="dv03"/>
       <point x="1178" y="860" type="line" name="dv02"/>
-      <point x="991" y="860" type="line" name="ih01" smooth="yes"/>
+      <point x="991" y="860" type="line" smooth="yes" name="ih01"/>
       <point x="1043" y="860"/>
       <point x="1131" y="653"/>
-      <point x="1131" y="488" type="curve" name="dh06" smooth="yes"/>
+      <point x="1131" y="488" type="curve" smooth="yes" name="dh06"/>
       <point x="1131" y="356"/>
       <point x="1076" y="222"/>
       <point x="972" y="118" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21B_B_.glif b/source/Hack-Bold.ufo/glyphs/uni21B_B_.glif
index c612b8836..0fa629f50 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21B_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21B_B_.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21BB" format="1">
+<glyph name="uni21BB" format="2">
   <advance width="1233"/>
   <unicode hex="21BB"/>
   <outline>
     <contour>
-      <point x="640" y="-39" type="curve" name="hr00" smooth="yes"/>
+      <point x="640" y="-39" type="curve" smooth="yes" name="hr00"/>
       <point x="487" y="-39"/>
       <point x="357" y="22"/>
       <point x="261" y="118" type="curve" smooth="yes"/>
       <point x="157" y="222"/>
       <point x="102" y="357"/>
-      <point x="102" y="488" type="curve" name="dh01" smooth="yes"/>
+      <point x="102" y="488" type="curve" smooth="yes" name="dh01"/>
       <point x="102" y="652"/>
       <point x="190" y="860"/>
-      <point x="242" y="860" type="curve" name="ih01" smooth="yes"/>
+      <point x="242" y="860" type="curve" smooth="yes" name="ih01"/>
       <point x="55" y="860" type="line" name="dv02"/>
       <point x="55" y="1047" type="line" name="dv03"/>
       <point x="467" y="1047" type="line"/>
@@ -24,26 +24,26 @@
       <point x="350" y="632" type="line"/>
       <point x="335" y="615"/>
       <point x="327" y="570"/>
-      <point x="327" y="519" type="curve" name="dh02" smooth="yes"/>
+      <point x="327" y="519" type="curve" smooth="yes" name="dh02"/>
       <point x="327" y="434"/>
       <point x="352" y="358"/>
       <point x="417" y="293" type="curve" smooth="yes"/>
       <point x="477" y="233"/>
       <point x="549" y="203"/>
-      <point x="632" y="203" type="curve" name="dv01" smooth="yes"/>
+      <point x="632" y="203" type="curve" smooth="yes" name="dv01"/>
       <point x="725" y="203"/>
       <point x="797" y="240"/>
       <point x="849" y="293" type="curve" smooth="yes"/>
       <point x="905" y="349"/>
       <point x="939" y="425"/>
-      <point x="939" y="513" type="curve" name="dh05" smooth="yes"/>
+      <point x="939" y="513" type="curve" smooth="yes" name="dh05"/>
       <point x="939" y="594"/>
       <point x="909" y="673"/>
       <point x="848" y="733" type="curve"/>
       <point x="1019" y="882" type="line"/>
       <point x="1128" y="769"/>
       <point x="1178" y="646"/>
-      <point x="1178" y="502" type="curve" name="dh06" smooth="yes"/>
+      <point x="1178" y="502" type="curve" smooth="yes" name="dh06"/>
       <point x="1178" y="353"/>
       <point x="1124" y="222"/>
       <point x="1019" y="118" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21B_C_.glif b/source/Hack-Bold.ufo/glyphs/uni21B_C_.glif
index d570c0cc6..16cc04b3c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21B_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21B_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21BC" format="1">
+<glyph name="uni21BC" format="2">
   <advance width="1233"/>
   <unicode hex="21BC"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21B_D_.glif b/source/Hack-Bold.ufo/glyphs/uni21B_D_.glif
index 0769e3c72..275978c53 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21B_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21B_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21BD" format="1">
+<glyph name="uni21BD" format="2">
   <advance width="1233"/>
   <unicode hex="21BD"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21B_E_.glif b/source/Hack-Bold.ufo/glyphs/uni21B_E_.glif
index 38311ddb0..c30de15c3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21B_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21B_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21BE" format="1">
+<glyph name="uni21BE" format="2">
   <advance width="1233"/>
   <unicode hex="21BE"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21B_F_.glif b/source/Hack-Bold.ufo/glyphs/uni21B_F_.glif
index b0a3caad2..22362708f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21B_F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21B_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21BF" format="1">
+<glyph name="uni21BF" format="2">
   <advance width="1233"/>
   <unicode hex="21BF"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21C_0.glif b/source/Hack-Bold.ufo/glyphs/uni21C_0.glif
index ff4f9e5af..0a38d53bf 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21C_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21C_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C0" format="1">
+<glyph name="uni21C0" format="2">
   <advance width="1233"/>
   <unicode hex="21C0"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21C_1.glif b/source/Hack-Bold.ufo/glyphs/uni21C_1.glif
index edecfde8c..5c4de0f54 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21C_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21C_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C1" format="1">
+<glyph name="uni21C1" format="2">
   <advance width="1233"/>
   <unicode hex="21C1"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21C_2.glif b/source/Hack-Bold.ufo/glyphs/uni21C_2.glif
index 4b128d383..af7583f94 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21C_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21C_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C2" format="1">
+<glyph name="uni21C2" format="2">
   <advance width="1233"/>
   <unicode hex="21C2"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21C_3.glif b/source/Hack-Bold.ufo/glyphs/uni21C_3.glif
index 68cef44e4..038a4bc3e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21C_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21C_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C3" format="1">
+<glyph name="uni21C3" format="2">
   <advance width="1233"/>
   <unicode hex="21C3"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21C_4.glif b/source/Hack-Bold.ufo/glyphs/uni21C_4.glif
index eef8ce437..d5c047a74 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21C_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21C_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C4" format="1">
+<glyph name="uni21C4" format="2">
   <advance width="1233"/>
   <unicode hex="21C4"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21C_5.glif b/source/Hack-Bold.ufo/glyphs/uni21C_5.glif
index 221468728..e7d2f2cd6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21C_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21C_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C5" format="1">
+<glyph name="uni21C5" format="2">
   <advance width="1233"/>
   <unicode hex="21C5"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21C_6.glif b/source/Hack-Bold.ufo/glyphs/uni21C_6.glif
index a52aaeb2b..3e1c82f55 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21C_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21C_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C6" format="1">
+<glyph name="uni21C6" format="2">
   <advance width="1233"/>
   <unicode hex="21C6"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21C_7.glif b/source/Hack-Bold.ufo/glyphs/uni21C_7.glif
index 9d06c9c52..86ee0a139 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21C_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21C_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C7" format="1">
+<glyph name="uni21C7" format="2">
   <advance width="1233"/>
   <unicode hex="21C7"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21C_8.glif b/source/Hack-Bold.ufo/glyphs/uni21C_8.glif
index 67f84022b..dd0b9b253 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21C_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21C_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C8" format="1">
+<glyph name="uni21C8" format="2">
   <advance width="1233"/>
   <unicode hex="21C8"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21C_9.glif b/source/Hack-Bold.ufo/glyphs/uni21C_9.glif
index 21df4238d..0b64c6900 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21C_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21C_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C9" format="1">
+<glyph name="uni21C9" format="2">
   <advance width="1233"/>
   <unicode hex="21C9"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21C_A_.glif b/source/Hack-Bold.ufo/glyphs/uni21C_A_.glif
index 02a88ac0d..b8801804d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21C_A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21C_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21CA" format="1">
+<glyph name="uni21CA" format="2">
   <advance width="1233"/>
   <unicode hex="21CA"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21C_B_.glif b/source/Hack-Bold.ufo/glyphs/uni21C_B_.glif
index ed1d8efdf..0818ce158 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21C_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21C_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21CB" format="1">
+<glyph name="uni21CB" format="2">
   <advance width="1233"/>
   <unicode hex="21CB"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21C_C_.glif b/source/Hack-Bold.ufo/glyphs/uni21C_C_.glif
index 96700f464..a8499baef 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21C_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21C_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21CC" format="1">
+<glyph name="uni21CC" format="2">
   <advance width="1233"/>
   <unicode hex="21CC"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21C_D_.glif b/source/Hack-Bold.ufo/glyphs/uni21C_D_.glif
index f70828afd..ba3fbe6e7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21C_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21C_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21CD" format="1">
+<glyph name="uni21CD" format="2">
   <advance width="1233"/>
   <unicode hex="21CD"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21C_E_.glif b/source/Hack-Bold.ufo/glyphs/uni21C_E_.glif
index d885d3999..b78a4b05f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21C_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21C_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21CE" format="1">
+<glyph name="uni21CE" format="2">
   <advance width="1233"/>
   <unicode hex="21CE"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21C_F_.glif b/source/Hack-Bold.ufo/glyphs/uni21C_F_.glif
index 1d64b4b24..ca546e6f3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21C_F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21C_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21CF" format="1">
+<glyph name="uni21CF" format="2">
   <advance width="1233"/>
   <unicode hex="21CF"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21D_5.glif b/source/Hack-Bold.ufo/glyphs/uni21D_5.glif
index 269e3777c..86cbe0e16 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21D_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21D_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21D5" format="1">
+<glyph name="uni21D5" format="2">
   <advance width="1233"/>
   <unicode hex="21D5"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21D_6.glif b/source/Hack-Bold.ufo/glyphs/uni21D_6.glif
index 698b13d6b..f17ecd0e8 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21D_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21D_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21D6" format="1">
+<glyph name="uni21D6" format="2">
   <advance width="1233"/>
   <unicode hex="21D6"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21D_7.glif b/source/Hack-Bold.ufo/glyphs/uni21D_7.glif
index 5db555343..c4140dcf1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21D_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21D_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21D7" format="1">
+<glyph name="uni21D7" format="2">
   <advance width="1233"/>
   <unicode hex="21D7"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21D_8.glif b/source/Hack-Bold.ufo/glyphs/uni21D_8.glif
index 94c793b0a..cbaac5d68 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21D_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21D_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21D8" format="1">
+<glyph name="uni21D8" format="2">
   <advance width="1233"/>
   <unicode hex="21D8"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21D_9.glif b/source/Hack-Bold.ufo/glyphs/uni21D_9.glif
index da52e0229..f687e3d94 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21D_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21D_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21D9" format="1">
+<glyph name="uni21D9" format="2">
   <advance width="1233"/>
   <unicode hex="21D9"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21D_A_.glif b/source/Hack-Bold.ufo/glyphs/uni21D_A_.glif
index 64bb38780..99015c792 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21D_A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21D_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21DA" format="1">
+<glyph name="uni21DA" format="2">
   <advance width="1233"/>
   <unicode hex="21DA"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21D_B_.glif b/source/Hack-Bold.ufo/glyphs/uni21D_B_.glif
index da67f1620..8931a3631 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21D_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21D_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21DB" format="1">
+<glyph name="uni21DB" format="2">
   <advance width="1233"/>
   <unicode hex="21DB"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21D_C_.glif b/source/Hack-Bold.ufo/glyphs/uni21D_C_.glif
index efdb36784..e6bb9e743 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21D_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21D_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21DC" format="1">
+<glyph name="uni21DC" format="2">
   <advance width="1233"/>
   <unicode hex="21DC"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21D_D_.glif b/source/Hack-Bold.ufo/glyphs/uni21D_D_.glif
index 2ab629d5f..0521f9d95 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21D_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21D_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21DD" format="1">
+<glyph name="uni21DD" format="2">
   <advance width="1233"/>
   <unicode hex="21DD"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21E_0.glif b/source/Hack-Bold.ufo/glyphs/uni21E_0.glif
index 536923091..c3ec992b8 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21E_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21E_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E0" format="1">
+<glyph name="uni21E0" format="2">
   <advance width="1233"/>
   <unicode hex="21E0"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21E_1.glif b/source/Hack-Bold.ufo/glyphs/uni21E_1.glif
index 29bf8105a..a16f665ec 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21E_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21E_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E1" format="1">
+<glyph name="uni21E1" format="2">
   <advance width="1233"/>
   <unicode hex="21E1"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21E_2.glif b/source/Hack-Bold.ufo/glyphs/uni21E_2.glif
index a27f62d8e..40798f89d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21E_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21E_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E2" format="1">
+<glyph name="uni21E2" format="2">
   <advance width="1233"/>
   <unicode hex="21E2"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21E_3.glif b/source/Hack-Bold.ufo/glyphs/uni21E_3.glif
index f29c2aca0..88d288a5c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21E_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21E_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E3" format="1">
+<glyph name="uni21E3" format="2">
   <advance width="1233"/>
   <unicode hex="21E3"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21E_4.glif b/source/Hack-Bold.ufo/glyphs/uni21E_4.glif
index 0f8d11a44..f9e61244f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21E_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21E_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E4" format="1">
+<glyph name="uni21E4" format="2">
   <advance width="1233"/>
   <unicode hex="21E4"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21E_5.glif b/source/Hack-Bold.ufo/glyphs/uni21E_5.glif
index d031f5be2..2b8a04403 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21E_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21E_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E5" format="1">
+<glyph name="uni21E5" format="2">
   <advance width="1233"/>
   <unicode hex="21E5"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21E_6.glif b/source/Hack-Bold.ufo/glyphs/uni21E_6.glif
index b013c6602..a6f587b68 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21E_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21E_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E6" format="1">
+<glyph name="uni21E6" format="2">
   <advance width="1233"/>
   <unicode hex="21E6"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21E_7.glif b/source/Hack-Bold.ufo/glyphs/uni21E_7.glif
index 0e0ebce11..431b4ad5d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21E_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21E_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E7" format="1">
+<glyph name="uni21E7" format="2">
   <advance width="1233"/>
   <unicode hex="21E7"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21E_8.glif b/source/Hack-Bold.ufo/glyphs/uni21E_8.glif
index 9a8f598b1..0d6a89210 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21E_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21E_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E8" format="1">
+<glyph name="uni21E8" format="2">
   <advance width="1233"/>
   <unicode hex="21E8"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21E_9.glif b/source/Hack-Bold.ufo/glyphs/uni21E_9.glif
index 87f19620a..556795ccb 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21E_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21E_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E9" format="1">
+<glyph name="uni21E9" format="2">
   <advance width="1233"/>
   <unicode hex="21E9"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21E_B_.glif b/source/Hack-Bold.ufo/glyphs/uni21E_B_.glif
index 2ae37a87b..31bb58e48 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21E_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21E_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21EB" format="1">
+<glyph name="uni21EB" format="2">
   <advance width="1233"/>
   <unicode hex="21EB"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21E_C_.glif b/source/Hack-Bold.ufo/glyphs/uni21E_C_.glif
index e77358a4e..3f28c37a7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21E_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21E_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21EC" format="1">
+<glyph name="uni21EC" format="2">
   <advance width="1233"/>
   <unicode hex="21EC"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21E_D_.glif b/source/Hack-Bold.ufo/glyphs/uni21E_D_.glif
index 6cfa59cde..c43596829 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21E_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21E_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21ED" format="1">
+<glyph name="uni21ED" format="2">
   <advance width="1233"/>
   <unicode hex="21ED"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21E_E_.glif b/source/Hack-Bold.ufo/glyphs/uni21E_E_.glif
index 5b0e758b8..93d745cb2 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21E_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21E_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21EE" format="1">
+<glyph name="uni21EE" format="2">
   <advance width="1233"/>
   <unicode hex="21EE"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21E_F_.glif b/source/Hack-Bold.ufo/glyphs/uni21E_F_.glif
index 76723b660..ad52ad786 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21E_F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21E_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21EF" format="1">
+<glyph name="uni21EF" format="2">
   <advance width="1233"/>
   <unicode hex="21EF"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21F_0.glif b/source/Hack-Bold.ufo/glyphs/uni21F_0.glif
index f3fa4b469..ad6d72027 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21F_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21F_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F0" format="1">
+<glyph name="uni21F0" format="2">
   <advance width="1233"/>
   <unicode hex="21F0"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21F_1.glif b/source/Hack-Bold.ufo/glyphs/uni21F_1.glif
index 6c48c0ab6..3c0b6565b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21F_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21F_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F1" format="1">
+<glyph name="uni21F1" format="2">
   <advance width="1233"/>
   <unicode hex="21F1"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21F_2.glif b/source/Hack-Bold.ufo/glyphs/uni21F_2.glif
index be1ea2e72..c73a3bb41 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21F_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21F_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F2" format="1">
+<glyph name="uni21F2" format="2">
   <advance width="1233"/>
   <unicode hex="21F2"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21F_3.glif b/source/Hack-Bold.ufo/glyphs/uni21F_3.glif
index b1ab377fb..ace256a2b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21F_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21F_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F3" format="1">
+<glyph name="uni21F3" format="2">
   <advance width="1233"/>
   <unicode hex="21F3"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21F_4.glif b/source/Hack-Bold.ufo/glyphs/uni21F_4.glif
index 8bf45058c..b869c312e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21F_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21F_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F4" format="1">
+<glyph name="uni21F4" format="2">
   <advance width="1233"/>
   <unicode hex="21F4"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="739" y="449" type="line"/>
       <point x="713" y="357"/>
       <point x="616" y="230"/>
-      <point x="437" y="230" type="curve" name="dv01" smooth="yes"/>
+      <point x="437" y="230" type="curve" smooth="yes" name="dv01"/>
       <point x="265" y="230"/>
       <point x="173" y="345"/>
       <point x="144" y="449" type="curve" name="sv01"/>
@@ -18,10 +18,10 @@
       <point x="144" y="673" type="line" name="dv02"/>
       <point x="171" y="773"/>
       <point x="273" y="896"/>
-      <point x="433" y="896" type="curve" name="hr01" smooth="yes"/>
+      <point x="433" y="896" type="curve" smooth="yes" name="hr01"/>
       <point x="487" y="896"/>
       <point x="573" y="882"/>
-      <point x="662" y="807" type="curve" name="hr02" smooth="yes"/>
+      <point x="662" y="807" type="curve" smooth="yes" name="hr02"/>
       <point x="707" y="768"/>
       <point x="728" y="733"/>
       <point x="739" y="673" type="curve" name="sv02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21F_5.glif b/source/Hack-Bold.ufo/glyphs/uni21F_5.glif
index 65d1e027d..a6a02451f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21F_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21F_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F5" format="1">
+<glyph name="uni21F5" format="2">
   <advance width="1233"/>
   <unicode hex="21F5"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21F_6.glif b/source/Hack-Bold.ufo/glyphs/uni21F_6.glif
index 3037dd63e..026d78f84 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21F_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21F_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F6" format="1">
+<glyph name="uni21F6" format="2">
   <advance width="1233"/>
   <unicode hex="21F6"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21F_7.glif b/source/Hack-Bold.ufo/glyphs/uni21F_7.glif
index 1d21b24f3..3e1d76405 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21F_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21F_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F7" format="1">
+<glyph name="uni21F7" format="2">
   <advance width="1233"/>
   <unicode hex="21F7"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21F_8.glif b/source/Hack-Bold.ufo/glyphs/uni21F_8.glif
index abee08574..6f95e0ac0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21F_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21F_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F8" format="1">
+<glyph name="uni21F8" format="2">
   <advance width="1233"/>
   <unicode hex="21F8"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21F_9.glif b/source/Hack-Bold.ufo/glyphs/uni21F_9.glif
index fee831336..9a287cdc8 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21F_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21F_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F9" format="1">
+<glyph name="uni21F9" format="2">
   <advance width="1233"/>
   <unicode hex="21F9"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21F_A_.glif b/source/Hack-Bold.ufo/glyphs/uni21F_A_.glif
index 2b64bfa04..ee333e062 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21F_A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21F_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21FA" format="1">
+<glyph name="uni21FA" format="2">
   <advance width="1233"/>
   <unicode hex="21FA"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21F_B_.glif b/source/Hack-Bold.ufo/glyphs/uni21F_B_.glif
index 7c824316d..f4e3f5343 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21F_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21F_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21FB" format="1">
+<glyph name="uni21FB" format="2">
   <advance width="1233"/>
   <unicode hex="21FB"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21F_C_.glif b/source/Hack-Bold.ufo/glyphs/uni21F_C_.glif
index 765750813..8677c3cd9 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21F_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21F_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21FC" format="1">
+<glyph name="uni21FC" format="2">
   <advance width="1233"/>
   <unicode hex="21FC"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21F_D_.glif b/source/Hack-Bold.ufo/glyphs/uni21F_D_.glif
index b750d9f4a..8ff29da36 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21F_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21F_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21FD" format="1">
+<glyph name="uni21FD" format="2">
   <advance width="1233"/>
   <unicode hex="21FD"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21F_E_.glif b/source/Hack-Bold.ufo/glyphs/uni21F_E_.glif
index 777ba614c..1100b4e1a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21F_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21F_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21FE" format="1">
+<glyph name="uni21FE" format="2">
   <advance width="1233"/>
   <unicode hex="21FE"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni21F_F_.glif b/source/Hack-Bold.ufo/glyphs/uni21F_F_.glif
index 58b0d6fb3..297c1587e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni21F_F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni21F_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21FF" format="1">
+<glyph name="uni21FF" format="2">
   <advance width="1233"/>
   <unicode hex="21FF"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2201.glif b/source/Hack-Bold.ufo/glyphs/uni2201.glif
index 7dacc5a4c..839e78ef9 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2201.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2201.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2201" format="1">
+<glyph name="uni2201" format="2">
   <advance width="1233"/>
   <unicode hex="2201"/>
   <outline>
     <contour>
-      <point x="639" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="639" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="243" y="-29"/>
       <point x="23" y="252"/>
       <point x="23" y="745" type="curve" name="dh01"/>
       <point x="23" y="746" type="line"/>
       <point x="23" y="1239"/>
       <point x="243" y="1520"/>
-      <point x="639" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="639" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="838" y="1520"/>
       <point x="988" y="1451"/>
       <point x="1092" y="1319" type="curve" smooth="yes"/>
@@ -24,20 +24,20 @@
       <point x="815" y="1143" type="curve" smooth="yes"/>
       <point x="784" y="1215"/>
       <point x="724" y="1257"/>
-      <point x="637" y="1257" type="curve" name="sv01" smooth="yes"/>
+      <point x="637" y="1257" type="curve" smooth="yes" name="sv01"/>
       <point x="554" y="1257"/>
       <point x="496" y="1219"/>
       <point x="461" y="1143" type="curve" smooth="yes"/>
       <point x="426" y="1065"/>
       <point x="408" y="933"/>
       <point x="408" y="748" type="curve" smooth="yes"/>
-      <point x="408" y="743" type="line" name="dh02" smooth="yes"/>
+      <point x="408" y="743" type="line" smooth="yes" name="dh02"/>
       <point x="408" y="536"/>
       <point x="427" y="424"/>
-      <point x="462" y="349" type="curve" name="hr02" smooth="yes"/>
+      <point x="462" y="349" type="curve" smooth="yes" name="hr02"/>
       <point x="497" y="276"/>
       <point x="548" y="234"/>
-      <point x="636" y="234" type="curve" name="dv02" smooth="yes"/>
+      <point x="636" y="234" type="curve" smooth="yes" name="dv02"/>
       <point x="724" y="234"/>
       <point x="784" y="276"/>
       <point x="815" y="348" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2204.glif b/source/Hack-Bold.ufo/glyphs/uni2204.glif
index ce7168eae..fa10abb79 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2204.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2204.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2204" format="1">
+<glyph name="uni2204" format="2">
   <advance width="1233"/>
   <unicode hex="2204"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2206.glif b/source/Hack-Bold.ufo/glyphs/uni2206.glif
index ec3570828..20b48111d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2206.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2206.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2206" format="1">
+<glyph name="uni2206" format="2">
   <advance width="1233"/>
   <unicode hex="2206"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni220A_.glif b/source/Hack-Bold.ufo/glyphs/uni220A_.glif
index e5ece41f6..d8e5f20aa 100644
--- a/source/Hack-Bold.ufo/glyphs/uni220A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni220A_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni220A" format="1">
+<glyph name="uni220A" format="2">
   <advance width="1233"/>
   <unicode hex="220A"/>
   <outline>
     <contour>
-      <point x="636" y="129" type="line" name="hr00" smooth="yes"/>
+      <point x="636" y="129" type="line" smooth="yes" name="hr00"/>
       <point x="440" y="129"/>
       <point x="267" y="228"/>
       <point x="171" y="385" type="curve" smooth="yes"/>
@@ -34,7 +34,7 @@
       <point x="402" y="449" type="curve" smooth="yes"/>
       <point x="465" y="384"/>
       <point x="543" y="351"/>
-      <point x="636" y="351" type="curve" name="dv01" smooth="yes"/>
+      <point x="636" y="351" type="curve" smooth="yes" name="dv01"/>
       <point x="1134" y="351" type="line"/>
       <point x="1134" y="129" type="line" name="sv01"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni220C_.glif b/source/Hack-Bold.ufo/glyphs/uni220C_.glif
index 3e2cfba81..7cdecf464 100644
--- a/source/Hack-Bold.ufo/glyphs/uni220C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni220C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni220C" format="1">
+<glyph name="uni220C" format="2">
   <advance width="1233"/>
   <unicode hex="220C"/>
   <outline>
@@ -16,10 +16,10 @@
       <point x="628" y="1293" type="line"/>
       <point x="621" y="1294"/>
       <point x="614" y="1294"/>
-      <point x="607" y="1294" type="curve" name="dv01" smooth="yes"/>
+      <point x="607" y="1294" type="curve" smooth="yes" name="dv01"/>
       <point x="110" y="1294" type="line"/>
       <point x="110" y="1524" type="line"/>
-      <point x="607" y="1524" type="line" name="dv02" smooth="yes"/>
+      <point x="607" y="1524" type="line" smooth="yes" name="dv02"/>
       <point x="651" y="1524"/>
       <point x="677" y="1518"/>
       <point x="710" y="1510" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="876" y="102" type="curve" smooth="yes"/>
       <point x="794" y="34"/>
       <point x="704" y="0"/>
-      <point x="607" y="0" type="curve" name="ab02" smooth="yes"/>
+      <point x="607" y="0" type="curve" smooth="yes" name="ab02"/>
       <point x="390" y="0" type="line"/>
       <point x="315" y="-197" type="line" name="av01"/>
     </contour>
@@ -48,7 +48,7 @@
       <point x="718" y="877" type="line" name="iv02"/>
     </contour>
     <contour>
-      <point x="607" y="230" type="line" name="sv03" smooth="yes"/>
+      <point x="607" y="230" type="line" smooth="yes" name="sv03"/>
       <point x="717" y="230"/>
       <point x="816" y="330"/>
       <point x="872" y="495" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni220D_.glif b/source/Hack-Bold.ufo/glyphs/uni220D_.glif
index 1c8ea1362..10d202ab2 100644
--- a/source/Hack-Bold.ufo/glyphs/uni220D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni220D_.glif
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni220D" format="1">
+<glyph name="uni220D" format="2">
   <advance width="1233"/>
   <unicode hex="220D"/>
   <outline>
     <contour>
       <point x="99" y="353" type="line" name="hr00"/>
-      <point x="597" y="353" type="line" name="dv02" smooth="yes"/>
+      <point x="597" y="353" type="line" smooth="yes" name="dv02"/>
       <point x="697" y="353"/>
       <point x="767" y="388"/>
       <point x="830" y="449" type="curve" smooth="yes"/>
@@ -20,10 +20,10 @@
       <point x="830" y="835" type="curve" smooth="yes"/>
       <point x="767" y="900"/>
       <point x="689" y="933"/>
-      <point x="597" y="933" type="curve" name="dv03" smooth="yes"/>
+      <point x="597" y="933" type="curve" smooth="yes" name="dv03"/>
       <point x="99" y="933" type="line"/>
       <point x="99" y="1155" type="line"/>
-      <point x="597" y="1155" type="line" name="dv04" smooth="yes"/>
+      <point x="597" y="1155" type="line" smooth="yes" name="dv04"/>
       <point x="793" y="1155"/>
       <point x="966" y="1058"/>
       <point x="1062" y="900" type="curve" smooth="yes"/>
@@ -35,7 +35,7 @@
       <point x="867" y="198" type="curve" smooth="yes"/>
       <point x="784" y="152"/>
       <point x="694" y="129"/>
-      <point x="597" y="129" type="curve" name="dv01" smooth="yes"/>
+      <point x="597" y="129" type="curve" smooth="yes" name="dv01"/>
       <point x="99" y="129" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni220E_.glif b/source/Hack-Bold.ufo/glyphs/uni220E_.glif
index 6daf54592..eeaff1bf1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni220E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni220E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni220E" format="1">
+<glyph name="uni220E" format="2">
   <advance width="1233"/>
   <unicode hex="220E"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2210.glif b/source/Hack-Bold.ufo/glyphs/uni2210.glif
index 39f518dea..10a94a884 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2210.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2210.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2210" format="1">
+<glyph name="uni2210" format="2">
   <advance width="1233"/>
   <unicode hex="2210"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2213.glif b/source/Hack-Bold.ufo/glyphs/uni2213.glif
index 2251a35d9..3794caa8d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2213.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2213.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2213" format="1">
+<glyph name="uni2213" format="2">
   <advance width="1233"/>
   <unicode hex="2213"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2218.glif b/source/Hack-Bold.ufo/glyphs/uni2218.glif
index 4d64b24a4..f6147c06e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2218.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2218.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2218" format="1">
+<glyph name="uni2218" format="2">
   <advance width="1233"/>
   <unicode hex="2218"/>
   <outline>
     <contour>
-      <point x="613" y="372" type="curve" name="hr00" smooth="yes"/>
+      <point x="613" y="372" type="curve" smooth="yes" name="hr00"/>
       <point x="427" y="372"/>
       <point x="283" y="515"/>
-      <point x="283" y="703" type="curve" name="sh01" smooth="yes"/>
+      <point x="283" y="703" type="curve" smooth="yes" name="sh01"/>
       <point x="283" y="891"/>
       <point x="429" y="1038"/>
-      <point x="614" y="1038" type="curve" name="dv03" smooth="yes"/>
+      <point x="614" y="1038" type="curve" smooth="yes" name="dv03"/>
       <point x="710" y="1038"/>
       <point x="793" y="999"/>
       <point x="853" y="939" type="curve" smooth="yes"/>
       <point x="916" y="875"/>
       <point x="948" y="793"/>
-      <point x="948" y="705" type="curve" name="sh02" smooth="yes"/>
+      <point x="948" y="705" type="curve" smooth="yes" name="sh02"/>
       <point x="948" y="616"/>
       <point x="913" y="531"/>
       <point x="852" y="470" type="curve" smooth="yes"/>
@@ -24,16 +24,16 @@
       <point x="704" y="372"/>
     </contour>
     <contour>
-      <point x="614" y="534" type="curve" name="dv01" smooth="yes"/>
+      <point x="614" y="534" type="curve" smooth="yes" name="dv01"/>
       <point x="710" y="534"/>
       <point x="786" y="609"/>
-      <point x="786" y="705" type="curve" name="ah01" smooth="yes"/>
+      <point x="786" y="705" type="curve" smooth="yes" name="ah01"/>
       <point x="786" y="800"/>
       <point x="712" y="876"/>
-      <point x="616" y="876" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="876" type="curve" smooth="yes" name="dv02"/>
       <point x="520" y="876"/>
       <point x="444" y="800"/>
-      <point x="444" y="704" type="curve" name="sh03" smooth="yes"/>
+      <point x="444" y="704" type="curve" smooth="yes" name="sh03"/>
       <point x="444" y="608"/>
       <point x="518" y="534"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni221B_.glif b/source/Hack-Bold.ufo/glyphs/uni221B_.glif
index 98e8d88e1..c237a93b5 100644
--- a/source/Hack-Bold.ufo/glyphs/uni221B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni221B_.glif
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni221B" format="1">
+<glyph name="uni221B" format="2">
   <advance width="1233"/>
   <unicode hex="221B"/>
   <outline>
     <contour>
-      <point x="370" y="1043" type="curve" name="dv05" smooth="yes"/>
+      <point x="370" y="1043" type="curve" smooth="yes" name="dv05"/>
       <point x="271" y="1043"/>
       <point x="172" y="1057"/>
       <point x="72" y="1084" type="curve"/>
       <point x="72" y="1238" type="line" name="iv01"/>
       <point x="159" y="1201"/>
       <point x="273" y="1183"/>
-      <point x="358" y="1183" type="curve" name="dv06" smooth="yes"/>
+      <point x="358" y="1183" type="curve" smooth="yes" name="dv06"/>
       <point x="491" y="1183"/>
       <point x="551" y="1227"/>
-      <point x="551" y="1303" type="curve" name="sh01" smooth="yes"/>
+      <point x="551" y="1303" type="curve" smooth="yes" name="sh01"/>
       <point x="551" y="1384"/>
       <point x="483" y="1432"/>
-      <point x="367" y="1432" type="curve" name="dv03" smooth="yes"/>
+      <point x="367" y="1432" type="curve" smooth="yes" name="dv03"/>
       <point x="256" y="1432" type="line"/>
       <point x="256" y="1578" type="line" name="dh01"/>
-      <point x="367" y="1578" type="line" name="dv04" smooth="yes"/>
+      <point x="367" y="1578" type="line" smooth="yes" name="dv04"/>
       <point x="467" y="1578"/>
       <point x="526" y="1611"/>
-      <point x="526" y="1674" type="curve" name="sh02" smooth="yes"/>
+      <point x="526" y="1674" type="curve" smooth="yes" name="sh02"/>
       <point x="526" y="1733"/>
       <point x="476" y="1768"/>
-      <point x="365" y="1768" type="curve" name="dv01" smooth="yes"/>
+      <point x="365" y="1768" type="curve" smooth="yes" name="dv01"/>
       <point x="301" y="1768"/>
       <point x="198" y="1755"/>
       <point x="102" y="1723" type="curve"/>
       <point x="102" y="1875" type="line" name="hr01"/>
       <point x="194" y="1898"/>
       <point x="289" y="1910"/>
-      <point x="373" y="1910" type="curve" name="dv02" smooth="yes"/>
+      <point x="373" y="1910" type="curve" smooth="yes" name="dv02"/>
       <point x="592" y="1910"/>
       <point x="723" y="1827"/>
-      <point x="723" y="1694" type="curve" name="hr02" smooth="yes"/>
+      <point x="723" y="1694" type="curve" smooth="yes" name="hr02"/>
       <point x="723" y="1594"/>
       <point x="652" y="1531"/>
       <point x="520" y="1510" type="curve" name="ih01"/>
       <point x="663" y="1491"/>
       <point x="748" y="1419"/>
-      <point x="748" y="1290" type="curve" name="sh03" smooth="yes"/>
+      <point x="748" y="1290" type="curve" smooth="yes" name="sh03"/>
       <point x="748" y="1129"/>
       <point x="618" y="1043"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni221C_.glif b/source/Hack-Bold.ufo/glyphs/uni221C_.glif
index 3d672f6b2..18dd9fe2c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni221C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni221C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni221C" format="1">
+<glyph name="uni221C" format="2">
   <advance width="1233"/>
   <unicode hex="221C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2223.glif b/source/Hack-Bold.ufo/glyphs/uni2223.glif
index b5c335234..ec5f9d561 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2223.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2223.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2223" format="1">
+<glyph name="uni2223" format="2">
   <advance width="1233"/>
   <unicode hex="2223"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni222C_.glif b/source/Hack-Bold.ufo/glyphs/uni222C_.glif
index 9c38b6b26..8f1a47de5 100644
--- a/source/Hack-Bold.ufo/glyphs/uni222C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni222C_.glif
@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni222C" format="1">
+<glyph name="uni222C" format="2">
   <advance width="1233"/>
   <unicode hex="222C"/>
   <outline>
     <contour>
-      <point x="242" y="-418" type="curve" name="hr00" smooth="yes"/>
+      <point x="242" y="-418" type="curve" smooth="yes" name="hr00"/>
       <point x="170" y="-418"/>
       <point x="72" y="-394"/>
       <point x="0" y="-343" type="curve"/>
       <point x="81" y="-199" type="line"/>
       <point x="110" y="-224"/>
       <point x="157" y="-237"/>
-      <point x="180" y="-237" type="curve" name="dv01" smooth="yes"/>
+      <point x="180" y="-237" type="curve" smooth="yes" name="dv01"/>
       <point x="217" y="-237"/>
       <point x="230" y="-202"/>
-      <point x="230" y="-68" type="curve" name="sh01" smooth="yes"/>
+      <point x="230" y="-68" type="curve" smooth="yes" name="sh01"/>
       <point x="230" y="1502" type="line" smooth="yes"/>
       <point x="230" y="1695"/>
       <point x="300" y="1827"/>
-      <point x="468" y="1827" type="curve" name="sh03" smooth="yes"/>
+      <point x="468" y="1827" type="curve" smooth="yes" name="sh03"/>
       <point x="540" y="1827"/>
       <point x="638" y="1803"/>
       <point x="710" y="1752" type="curve"/>
       <point x="629" y="1608" type="line"/>
       <point x="600" y="1633"/>
       <point x="553" y="1646"/>
-      <point x="530" y="1646" type="curve" name="dv02" smooth="yes"/>
+      <point x="530" y="1646" type="curve" smooth="yes" name="dv02"/>
       <point x="493" y="1646"/>
       <point x="480" y="1611"/>
       <point x="480" y="1477" type="curve" smooth="yes"/>
-      <point x="480" y="-93" type="line" name="sh02" smooth="yes"/>
+      <point x="480" y="-93" type="line" smooth="yes" name="sh02"/>
       <point x="480" y="-286"/>
       <point x="410" y="-418"/>
     </contour>
     <contour>
-      <point x="765" y="-418" type="curve" name="sh04" smooth="yes"/>
+      <point x="765" y="-418" type="curve" smooth="yes" name="sh04"/>
       <point x="693" y="-418"/>
       <point x="595" y="-394"/>
       <point x="523" y="-343" type="curve"/>
       <point x="604" y="-199" type="line"/>
       <point x="633" y="-224"/>
       <point x="680" y="-237"/>
-      <point x="703" y="-237" type="curve" name="sv01" smooth="yes"/>
+      <point x="703" y="-237" type="curve" smooth="yes" name="sv01"/>
       <point x="740" y="-237"/>
       <point x="753" y="-202"/>
-      <point x="753" y="-68" type="curve" name="ah01" smooth="yes"/>
+      <point x="753" y="-68" type="curve" smooth="yes" name="ah01"/>
       <point x="753" y="1502" type="line" smooth="yes"/>
       <point x="753" y="1695"/>
       <point x="823" y="1827"/>
-      <point x="991" y="1827" type="curve" name="sh06" smooth="yes"/>
+      <point x="991" y="1827" type="curve" smooth="yes" name="sh06"/>
       <point x="1063" y="1827"/>
       <point x="1161" y="1803"/>
       <point x="1233" y="1752" type="curve"/>
       <point x="1152" y="1608" type="line"/>
       <point x="1123" y="1633"/>
       <point x="1076" y="1646"/>
-      <point x="1053" y="1646" type="curve" name="sv02" smooth="yes"/>
+      <point x="1053" y="1646" type="curve" smooth="yes" name="sv02"/>
       <point x="1016" y="1646"/>
       <point x="1003" y="1611"/>
       <point x="1003" y="1477" type="curve" smooth="yes"/>
-      <point x="1003" y="-93" type="line" name="sh05" smooth="yes"/>
+      <point x="1003" y="-93" type="line" smooth="yes" name="sh05"/>
       <point x="1003" y="-286"/>
       <point x="933" y="-418"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni222D_.glif b/source/Hack-Bold.ufo/glyphs/uni222D_.glif
index b2c3114ef..752243202 100644
--- a/source/Hack-Bold.ufo/glyphs/uni222D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni222D_.glif
@@ -1,95 +1,95 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni222D" format="1">
+<glyph name="uni222D" format="2">
   <advance width="1233"/>
   <unicode hex="222D"/>
   <outline>
     <contour>
-      <point x="149" y="-418" type="curve" name="hr00" smooth="yes"/>
+      <point x="149" y="-418" type="curve" smooth="yes" name="hr00"/>
       <point x="97" y="-418"/>
       <point x="42" y="-400"/>
       <point x="-42" y="-343" type="curve"/>
       <point x="40" y="-221" type="line"/>
       <point x="49" y="-232"/>
       <point x="65" y="-237"/>
-      <point x="76" y="-237" type="curve" name="dv01" smooth="yes"/>
+      <point x="76" y="-237" type="curve" smooth="yes" name="dv01"/>
       <point x="105" y="-237"/>
       <point x="118" y="-189"/>
-      <point x="118" y="-68" type="curve" name="dh01" smooth="yes"/>
+      <point x="118" y="-68" type="curve" smooth="yes" name="dh01"/>
       <point x="118" y="1502" type="line" smooth="yes"/>
       <point x="118" y="1695"/>
       <point x="197" y="1827"/>
-      <point x="337" y="1827" type="curve" name="dv03" smooth="yes"/>
+      <point x="337" y="1827" type="curve" smooth="yes" name="dv03"/>
       <point x="389" y="1827"/>
       <point x="444" y="1809"/>
       <point x="528" y="1752" type="curve"/>
       <point x="446" y="1630" type="line" name="ih01"/>
       <point x="437" y="1641"/>
       <point x="421" y="1646"/>
-      <point x="410" y="1646" type="curve" name="dv02" smooth="yes"/>
+      <point x="410" y="1646" type="curve" smooth="yes" name="dv02"/>
       <point x="381" y="1646"/>
       <point x="368" y="1598"/>
       <point x="368" y="1477" type="curve" smooth="yes"/>
-      <point x="368" y="-93" type="line" name="dh02" smooth="yes"/>
+      <point x="368" y="-93" type="line" smooth="yes" name="dh02"/>
       <point x="368" y="-286"/>
       <point x="289" y="-418"/>
     </contour>
     <contour>
-      <point x="522" y="-418" type="curve" name="sv01" smooth="yes"/>
+      <point x="522" y="-418" type="curve" smooth="yes" name="sv01"/>
       <point x="466" y="-418"/>
       <point x="413" y="-399"/>
       <point x="332" y="-343" type="curve"/>
       <point x="414" y="-221" type="line" name="ih02"/>
       <point x="423" y="-232"/>
       <point x="439" y="-237"/>
-      <point x="450" y="-237" type="curve" name="sv02" smooth="yes"/>
+      <point x="450" y="-237" type="curve" smooth="yes" name="sv02"/>
       <point x="479" y="-237"/>
       <point x="492" y="-189"/>
-      <point x="492" y="-68" type="curve" name="dh03" smooth="yes"/>
+      <point x="492" y="-68" type="curve" smooth="yes" name="dh03"/>
       <point x="492" y="1502" type="line" smooth="yes"/>
       <point x="492" y="1695"/>
       <point x="571" y="1827"/>
-      <point x="711" y="1827" type="curve" name="sv03" smooth="yes"/>
+      <point x="711" y="1827" type="curve" smooth="yes" name="sv03"/>
       <point x="771" y="1827"/>
       <point x="827" y="1803"/>
       <point x="902" y="1752" type="curve"/>
       <point x="820" y="1630" type="line" name="ih03"/>
       <point x="811" y="1641"/>
       <point x="795" y="1646"/>
-      <point x="784" y="1646" type="curve" name="sv04" smooth="yes"/>
+      <point x="784" y="1646" type="curve" smooth="yes" name="sv04"/>
       <point x="755" y="1646"/>
       <point x="742" y="1598"/>
       <point x="742" y="1477" type="curve" smooth="yes"/>
-      <point x="742" y="-93" type="line" name="dh04" smooth="yes"/>
+      <point x="742" y="-93" type="line" smooth="yes" name="dh04"/>
       <point x="742" y="-286"/>
       <point x="662" y="-418"/>
     </contour>
     <contour>
-      <point x="896" y="-418" type="curve" name="sv05" smooth="yes"/>
+      <point x="896" y="-418" type="curve" smooth="yes" name="sv05"/>
       <point x="844" y="-418"/>
       <point x="789" y="-400"/>
       <point x="705" y="-343" type="curve"/>
       <point x="787" y="-221" type="line" name="ih04"/>
       <point x="796" y="-232"/>
       <point x="812" y="-237"/>
-      <point x="823" y="-237" type="curve" name="sv06" smooth="yes"/>
+      <point x="823" y="-237" type="curve" smooth="yes" name="sv06"/>
       <point x="852" y="-237"/>
       <point x="865" y="-189"/>
-      <point x="865" y="-68" type="curve" name="dh05" smooth="yes"/>
+      <point x="865" y="-68" type="curve" smooth="yes" name="dh05"/>
       <point x="865" y="1502" type="line" smooth="yes"/>
       <point x="865" y="1695"/>
       <point x="944" y="1827"/>
-      <point x="1084" y="1827" type="curve" name="sv07" smooth="yes"/>
+      <point x="1084" y="1827" type="curve" smooth="yes" name="sv07"/>
       <point x="1136" y="1827"/>
       <point x="1191" y="1809"/>
       <point x="1275" y="1752" type="curve"/>
       <point x="1193" y="1630" type="line"/>
       <point x="1184" y="1641"/>
       <point x="1168" y="1646"/>
-      <point x="1157" y="1646" type="curve" name="sv08" smooth="yes"/>
+      <point x="1157" y="1646" type="curve" smooth="yes" name="sv08"/>
       <point x="1128" y="1646"/>
       <point x="1115" y="1598"/>
       <point x="1115" y="1477" type="curve" smooth="yes"/>
-      <point x="1115" y="-93" type="line" name="dh06" smooth="yes"/>
+      <point x="1115" y="-93" type="line" smooth="yes" name="dh06"/>
       <point x="1115" y="-286"/>
       <point x="1036" y="-418"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2235.glif b/source/Hack-Bold.ufo/glyphs/uni2235.glif
index ba29b2a27..af91c5e60 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2235.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2235.glif
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2235" format="1">
+<glyph name="uni2235" format="2">
   <advance width="1233"/>
   <unicode hex="2235"/>
   <outline>
     <contour>
-      <point x="178" y="822" type="line" name="dv03" smooth="yes"/>
+      <point x="178" y="822" type="line" smooth="yes" name="dv03"/>
       <point x="158" y="822"/>
       <point x="148" y="832"/>
-      <point x="148" y="852" type="curve" name="dh01" smooth="yes"/>
+      <point x="148" y="852" type="curve" smooth="yes" name="dh01"/>
       <point x="148" y="1157" type="line" smooth="yes"/>
       <point x="148" y="1177"/>
       <point x="158" y="1187"/>
-      <point x="178" y="1187" type="curve" name="dv04" smooth="yes"/>
+      <point x="178" y="1187" type="curve" smooth="yes" name="dv04"/>
       <point x="451" y="1187" type="line" smooth="yes"/>
       <point x="471" y="1187"/>
       <point x="481" y="1177"/>
       <point x="481" y="1157" type="curve" smooth="yes"/>
-      <point x="481" y="852" type="line" name="dh02" smooth="yes"/>
+      <point x="481" y="852" type="line" smooth="yes" name="dh02"/>
       <point x="481" y="832"/>
       <point x="471" y="822"/>
       <point x="451" y="822" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="783" y="822" type="line" name="sv01" smooth="yes"/>
+      <point x="783" y="822" type="line" smooth="yes" name="sv01"/>
       <point x="763" y="822"/>
       <point x="753" y="832"/>
-      <point x="753" y="852" type="curve" name="hr01" smooth="yes"/>
+      <point x="753" y="852" type="curve" smooth="yes" name="hr01"/>
       <point x="753" y="1157" type="line" smooth="yes"/>
       <point x="753" y="1177"/>
       <point x="763" y="1187"/>
-      <point x="783" y="1187" type="curve" name="sv02" smooth="yes"/>
+      <point x="783" y="1187" type="curve" smooth="yes" name="sv02"/>
       <point x="1056" y="1187" type="line" smooth="yes"/>
       <point x="1076" y="1187"/>
       <point x="1086" y="1177"/>
       <point x="1086" y="1157" type="curve" smooth="yes"/>
-      <point x="1086" y="852" type="line" name="dh03" smooth="yes"/>
+      <point x="1086" y="852" type="line" smooth="yes" name="dh03"/>
       <point x="1086" y="832"/>
       <point x="1076" y="822"/>
       <point x="1056" y="822" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="482" y="105" type="line" name="dv01" smooth="yes"/>
+      <point x="482" y="105" type="line" smooth="yes" name="dv01"/>
       <point x="462" y="105"/>
       <point x="452" y="115"/>
-      <point x="452" y="135" type="curve" name="ih01" smooth="yes"/>
+      <point x="452" y="135" type="curve" smooth="yes" name="ih01"/>
       <point x="452" y="440" type="line" smooth="yes"/>
       <point x="452" y="460"/>
       <point x="462" y="470"/>
-      <point x="482" y="470" type="curve" name="dv02" smooth="yes"/>
+      <point x="482" y="470" type="curve" smooth="yes" name="dv02"/>
       <point x="755" y="470" type="line" smooth="yes"/>
       <point x="775" y="470"/>
       <point x="785" y="460"/>
       <point x="785" y="440" type="curve" smooth="yes"/>
-      <point x="785" y="135" type="line" name="sh01" smooth="yes"/>
+      <point x="785" y="135" type="line" smooth="yes" name="sh01"/>
       <point x="785" y="115"/>
       <point x="775" y="105"/>
       <point x="755" y="105" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2236.glif b/source/Hack-Bold.ufo/glyphs/uni2236.glif
index cc25adc67..a01173dd0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2236.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2236.glif
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2236" format="1">
+<glyph name="uni2236" format="2">
   <advance width="1233"/>
   <unicode hex="2236"/>
   <outline>
     <contour>
-      <point x="478" y="822" type="line" name="hr00" smooth="yes"/>
+      <point x="478" y="822" type="line" smooth="yes" name="hr00"/>
       <point x="458" y="822"/>
       <point x="448" y="832"/>
-      <point x="448" y="852" type="curve" name="dh01" smooth="yes"/>
+      <point x="448" y="852" type="curve" smooth="yes" name="dh01"/>
       <point x="448" y="1157" type="line" smooth="yes"/>
       <point x="448" y="1177"/>
       <point x="458" y="1187"/>
-      <point x="478" y="1187" type="curve" name="dv03" smooth="yes"/>
+      <point x="478" y="1187" type="curve" smooth="yes" name="dv03"/>
       <point x="751" y="1187" type="line" smooth="yes"/>
       <point x="771" y="1187"/>
       <point x="781" y="1177"/>
       <point x="781" y="1157" type="curve" smooth="yes"/>
-      <point x="781" y="852" type="line" name="dh02" smooth="yes"/>
+      <point x="781" y="852" type="line" smooth="yes" name="dh02"/>
       <point x="781" y="832"/>
       <point x="771" y="822"/>
       <point x="751" y="822" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="482" y="105" type="line" name="dv01" smooth="yes"/>
+      <point x="482" y="105" type="line" smooth="yes" name="dv01"/>
       <point x="462" y="105"/>
       <point x="452" y="115"/>
-      <point x="452" y="135" type="curve" name="sh01" smooth="yes"/>
+      <point x="452" y="135" type="curve" smooth="yes" name="sh01"/>
       <point x="452" y="440" type="line" smooth="yes"/>
       <point x="452" y="460"/>
       <point x="462" y="470"/>
-      <point x="482" y="470" type="curve" name="dv02" smooth="yes"/>
+      <point x="482" y="470" type="curve" smooth="yes" name="dv02"/>
       <point x="755" y="470" type="line" smooth="yes"/>
       <point x="775" y="470"/>
       <point x="785" y="460"/>
-      <point x="785" y="440" type="curve" name="sh02" smooth="yes"/>
+      <point x="785" y="440" type="curve" smooth="yes" name="sh02"/>
       <point x="785" y="135" type="line" smooth="yes"/>
       <point x="785" y="115"/>
       <point x="775" y="105"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2237.glif b/source/Hack-Bold.ufo/glyphs/uni2237.glif
index bd470af4b..d159af621 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2237.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2237.glif
@@ -1,75 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2237" format="1">
+<glyph name="uni2237" format="2">
   <advance width="1233"/>
   <unicode hex="2237"/>
   <outline>
     <contour>
-      <point x="178" y="822" type="line" name="hr00" smooth="yes"/>
+      <point x="178" y="822" type="line" smooth="yes" name="hr00"/>
       <point x="158" y="822"/>
       <point x="148" y="832"/>
-      <point x="148" y="852" type="curve" name="sh01" smooth="yes"/>
+      <point x="148" y="852" type="curve" smooth="yes" name="sh01"/>
       <point x="148" y="1157" type="line" smooth="yes"/>
       <point x="148" y="1177"/>
       <point x="158" y="1187"/>
-      <point x="178" y="1187" type="curve" name="dv03" smooth="yes"/>
+      <point x="178" y="1187" type="curve" smooth="yes" name="dv03"/>
       <point x="451" y="1187" type="line" smooth="yes"/>
       <point x="471" y="1187"/>
       <point x="481" y="1177"/>
       <point x="481" y="1157" type="curve" smooth="yes"/>
-      <point x="481" y="852" type="line" name="sh02" smooth="yes"/>
+      <point x="481" y="852" type="line" smooth="yes" name="sh02"/>
       <point x="481" y="832"/>
       <point x="471" y="822"/>
       <point x="451" y="822" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="783" y="822" type="line" name="sv01" smooth="yes"/>
+      <point x="783" y="822" type="line" smooth="yes" name="sv01"/>
       <point x="763" y="822"/>
       <point x="753" y="832"/>
-      <point x="753" y="852" type="curve" name="ah01" smooth="yes"/>
+      <point x="753" y="852" type="curve" smooth="yes" name="ah01"/>
       <point x="753" y="1157" type="line" smooth="yes"/>
       <point x="753" y="1177"/>
       <point x="763" y="1187"/>
-      <point x="783" y="1187" type="curve" name="sv02" smooth="yes"/>
+      <point x="783" y="1187" type="curve" smooth="yes" name="sv02"/>
       <point x="1056" y="1187" type="line" smooth="yes"/>
       <point x="1076" y="1187"/>
       <point x="1086" y="1177"/>
       <point x="1086" y="1157" type="curve" smooth="yes"/>
-      <point x="1086" y="852" type="line" name="sh03" smooth="yes"/>
+      <point x="1086" y="852" type="line" smooth="yes" name="sh03"/>
       <point x="1086" y="832"/>
       <point x="1076" y="822"/>
       <point x="1056" y="822" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="177" y="105" type="line" name="dv01" smooth="yes"/>
+      <point x="177" y="105" type="line" smooth="yes" name="dv01"/>
       <point x="157" y="105"/>
       <point x="147" y="115"/>
-      <point x="147" y="135" type="curve" name="sh04" smooth="yes"/>
+      <point x="147" y="135" type="curve" smooth="yes" name="sh04"/>
       <point x="147" y="440" type="line" smooth="yes"/>
       <point x="147" y="460"/>
       <point x="157" y="470"/>
-      <point x="177" y="470" type="curve" name="dv02" smooth="yes"/>
+      <point x="177" y="470" type="curve" smooth="yes" name="dv02"/>
       <point x="450" y="470" type="line" smooth="yes"/>
       <point x="470" y="470"/>
       <point x="480" y="460"/>
-      <point x="480" y="440" type="curve" name="sh05" smooth="yes"/>
+      <point x="480" y="440" type="curve" smooth="yes" name="sh05"/>
       <point x="480" y="135" type="line" smooth="yes"/>
       <point x="480" y="115"/>
       <point x="470" y="105"/>
       <point x="450" y="105" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="787" y="105" type="line" name="sv03" smooth="yes"/>
+      <point x="787" y="105" type="line" smooth="yes" name="sv03"/>
       <point x="767" y="105"/>
       <point x="757" y="115"/>
-      <point x="757" y="135" type="curve" name="sh06" smooth="yes"/>
+      <point x="757" y="135" type="curve" smooth="yes" name="sh06"/>
       <point x="757" y="440" type="line" smooth="yes"/>
       <point x="757" y="460"/>
       <point x="767" y="470"/>
-      <point x="787" y="470" type="curve" name="sv04" smooth="yes"/>
+      <point x="787" y="470" type="curve" smooth="yes" name="sv04"/>
       <point x="1060" y="470" type="line" smooth="yes"/>
       <point x="1080" y="470"/>
       <point x="1090" y="460"/>
-      <point x="1090" y="440" type="curve" name="sh07" smooth="yes"/>
+      <point x="1090" y="440" type="curve" smooth="yes" name="sh07"/>
       <point x="1090" y="135" type="line" smooth="yes"/>
       <point x="1090" y="115"/>
       <point x="1080" y="105"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2238.glif b/source/Hack-Bold.ufo/glyphs/uni2238.glif
index 24b20bc30..31042ba7c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2238.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2238.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2238" format="1">
+<glyph name="uni2238" format="2">
   <advance width="1233"/>
   <unicode hex="2238"/>
   <outline>
     <contour>
-      <point x="480" y="902" type="line" name="hr00" smooth="yes"/>
+      <point x="480" y="902" type="line" smooth="yes" name="hr00"/>
       <point x="460" y="902"/>
       <point x="450" y="912"/>
-      <point x="450" y="932" type="curve" name="dh01" smooth="yes"/>
+      <point x="450" y="932" type="curve" smooth="yes" name="dh01"/>
       <point x="450" y="1237" type="line" smooth="yes"/>
       <point x="450" y="1257"/>
       <point x="460" y="1267"/>
-      <point x="480" y="1267" type="curve" name="dv03" smooth="yes"/>
+      <point x="480" y="1267" type="curve" smooth="yes" name="dv03"/>
       <point x="753" y="1267" type="line" smooth="yes"/>
       <point x="773" y="1267"/>
       <point x="783" y="1257"/>
       <point x="783" y="1237" type="curve" smooth="yes"/>
-      <point x="783" y="932" type="line" name="dh02" smooth="yes"/>
+      <point x="783" y="932" type="line" smooth="yes" name="dh02"/>
       <point x="783" y="912"/>
       <point x="773" y="902"/>
       <point x="753" y="902" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2239.glif b/source/Hack-Bold.ufo/glyphs/uni2239.glif
index 4375561a8..7a9383cde 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2239.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2239.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2239" format="1">
+<glyph name="uni2239" format="2">
   <advance width="1233"/>
   <unicode hex="2239"/>
   <outline>
     <contour>
-      <point x="880" y="822" type="line" name="hr00" smooth="yes"/>
+      <point x="880" y="822" type="line" smooth="yes" name="hr00"/>
       <point x="860" y="822"/>
       <point x="850" y="832"/>
-      <point x="850" y="852" type="curve" name="dh01" smooth="yes"/>
+      <point x="850" y="852" type="curve" smooth="yes" name="dh01"/>
       <point x="850" y="1157" type="line" smooth="yes"/>
       <point x="850" y="1177"/>
       <point x="860" y="1187"/>
-      <point x="880" y="1187" type="curve" name="dv03" smooth="yes"/>
+      <point x="880" y="1187" type="curve" smooth="yes" name="dv03"/>
       <point x="1153" y="1187" type="line" smooth="yes"/>
       <point x="1173" y="1187"/>
       <point x="1183" y="1177"/>
       <point x="1183" y="1157" type="curve" smooth="yes"/>
-      <point x="1183" y="852" type="line" name="dh02" smooth="yes"/>
+      <point x="1183" y="852" type="line" smooth="yes" name="dh02"/>
       <point x="1183" y="832"/>
       <point x="1173" y="822"/>
       <point x="1153" y="822" type="curve" smooth="yes"/>
@@ -28,18 +28,18 @@
       <point x="74" y="525" type="line"/>
     </contour>
     <contour>
-      <point x="878" y="105" type="line" name="dv01" smooth="yes"/>
+      <point x="878" y="105" type="line" smooth="yes" name="dv01"/>
       <point x="858" y="105"/>
       <point x="848" y="115"/>
-      <point x="848" y="135" type="curve" name="sh01" smooth="yes"/>
+      <point x="848" y="135" type="curve" smooth="yes" name="sh01"/>
       <point x="848" y="440" type="line" smooth="yes"/>
       <point x="848" y="460"/>
       <point x="858" y="470"/>
-      <point x="878" y="470" type="curve" name="dv02" smooth="yes"/>
+      <point x="878" y="470" type="curve" smooth="yes" name="dv02"/>
       <point x="1151" y="470" type="line" smooth="yes"/>
       <point x="1171" y="470"/>
       <point x="1181" y="460"/>
-      <point x="1181" y="440" type="curve" name="sh02" smooth="yes"/>
+      <point x="1181" y="440" type="curve" smooth="yes" name="sh02"/>
       <point x="1181" y="135" type="line" smooth="yes"/>
       <point x="1181" y="115"/>
       <point x="1171" y="105"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni223A_.glif b/source/Hack-Bold.ufo/glyphs/uni223A_.glif
index f4ff7b377..9c6625dba 100644
--- a/source/Hack-Bold.ufo/glyphs/uni223A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni223A_.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni223A" format="1">
+<glyph name="uni223A" format="2">
   <advance width="1233"/>
   <unicode hex="223A"/>
   <outline>
     <contour>
-      <point x="78" y="870" type="line" name="hr00" smooth="yes"/>
+      <point x="78" y="870" type="line" smooth="yes" name="hr00"/>
       <point x="58" y="870"/>
       <point x="48" y="880"/>
-      <point x="48" y="900" type="curve" name="sh01" smooth="yes"/>
+      <point x="48" y="900" type="curve" smooth="yes" name="sh01"/>
       <point x="48" y="1205" type="line" smooth="yes"/>
       <point x="48" y="1225"/>
       <point x="58" y="1235"/>
-      <point x="78" y="1235" type="curve" name="dv03" smooth="yes"/>
+      <point x="78" y="1235" type="curve" smooth="yes" name="dv03"/>
       <point x="351" y="1235" type="line" smooth="yes"/>
       <point x="371" y="1235"/>
       <point x="381" y="1225"/>
       <point x="381" y="1205" type="curve" smooth="yes"/>
-      <point x="381" y="900" type="line" name="sh02" smooth="yes"/>
+      <point x="381" y="900" type="line" smooth="yes" name="sh02"/>
       <point x="381" y="880"/>
       <point x="371" y="870"/>
       <point x="351" y="870" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="883" y="870" type="line" name="sv01" smooth="yes"/>
+      <point x="883" y="870" type="line" smooth="yes" name="sv01"/>
       <point x="863" y="870"/>
       <point x="853" y="880"/>
-      <point x="853" y="900" type="curve" name="ah01" smooth="yes"/>
+      <point x="853" y="900" type="curve" smooth="yes" name="ah01"/>
       <point x="853" y="1205" type="line" smooth="yes"/>
       <point x="853" y="1225"/>
       <point x="863" y="1235"/>
-      <point x="883" y="1235" type="curve" name="sv02" smooth="yes"/>
+      <point x="883" y="1235" type="curve" smooth="yes" name="sv02"/>
       <point x="1156" y="1235" type="line" smooth="yes"/>
       <point x="1176" y="1235"/>
       <point x="1186" y="1225"/>
       <point x="1186" y="1205" type="curve" smooth="yes"/>
-      <point x="1186" y="900" type="line" name="sh03" smooth="yes"/>
+      <point x="1186" y="900" type="line" smooth="yes" name="sh03"/>
       <point x="1186" y="880"/>
       <point x="1176" y="870"/>
       <point x="1156" y="870" type="curve" smooth="yes"/>
@@ -46,36 +46,36 @@
       <point x="66" y="524" type="line"/>
     </contour>
     <contour>
-      <point x="77" y="54" type="line" name="dv01" smooth="yes"/>
+      <point x="77" y="54" type="line" smooth="yes" name="dv01"/>
       <point x="57" y="54"/>
       <point x="47" y="64"/>
-      <point x="47" y="84" type="curve" name="sh04" smooth="yes"/>
+      <point x="47" y="84" type="curve" smooth="yes" name="sh04"/>
       <point x="47" y="389" type="line" smooth="yes"/>
       <point x="47" y="409"/>
       <point x="57" y="419"/>
-      <point x="77" y="419" type="curve" name="dv02" smooth="yes"/>
+      <point x="77" y="419" type="curve" smooth="yes" name="dv02"/>
       <point x="350" y="419" type="line" smooth="yes"/>
       <point x="370" y="419"/>
       <point x="380" y="409"/>
-      <point x="380" y="389" type="curve" name="sh05" smooth="yes"/>
+      <point x="380" y="389" type="curve" smooth="yes" name="sh05"/>
       <point x="380" y="84" type="line" smooth="yes"/>
       <point x="380" y="64"/>
       <point x="370" y="54"/>
       <point x="350" y="54" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="887" y="54" type="line" name="sv03" smooth="yes"/>
+      <point x="887" y="54" type="line" smooth="yes" name="sv03"/>
       <point x="867" y="54"/>
       <point x="857" y="64"/>
-      <point x="857" y="84" type="curve" name="sh06" smooth="yes"/>
+      <point x="857" y="84" type="curve" smooth="yes" name="sh06"/>
       <point x="857" y="389" type="line" smooth="yes"/>
       <point x="857" y="409"/>
       <point x="867" y="419"/>
-      <point x="887" y="419" type="curve" name="sv04" smooth="yes"/>
+      <point x="887" y="419" type="curve" smooth="yes" name="sv04"/>
       <point x="1160" y="419" type="line" smooth="yes"/>
       <point x="1180" y="419"/>
       <point x="1190" y="409"/>
-      <point x="1190" y="389" type="curve" name="sh07" smooth="yes"/>
+      <point x="1190" y="389" type="curve" smooth="yes" name="sh07"/>
       <point x="1190" y="84" type="line" smooth="yes"/>
       <point x="1190" y="64"/>
       <point x="1180" y="54"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni223B_.glif b/source/Hack-Bold.ufo/glyphs/uni223B_.glif
index 591e1360e..45bcfd8f5 100644
--- a/source/Hack-Bold.ufo/glyphs/uni223B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni223B_.glif
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni223B" format="1">
+<glyph name="uni223B" format="2">
   <advance width="1233"/>
   <unicode hex="223B"/>
   <outline>
     <contour>
-      <point x="481" y="912" type="line" name="dv01" smooth="yes"/>
+      <point x="481" y="912" type="line" smooth="yes" name="dv01"/>
       <point x="461" y="912"/>
       <point x="451" y="922"/>
-      <point x="451" y="942" type="curve" name="dh01" smooth="yes"/>
+      <point x="451" y="942" type="curve" smooth="yes" name="dh01"/>
       <point x="451" y="1247" type="line" smooth="yes"/>
       <point x="451" y="1267"/>
       <point x="461" y="1277"/>
-      <point x="481" y="1277" type="curve" name="dv02" smooth="yes"/>
+      <point x="481" y="1277" type="curve" smooth="yes" name="dv02"/>
       <point x="754" y="1277" type="line" smooth="yes"/>
       <point x="774" y="1277"/>
       <point x="784" y="1267"/>
       <point x="784" y="1247" type="curve" smooth="yes"/>
-      <point x="784" y="942" type="line" name="dh02" smooth="yes"/>
+      <point x="784" y="942" type="line" smooth="yes" name="dh02"/>
       <point x="784" y="922"/>
       <point x="774" y="912"/>
       <point x="754" y="912" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="850" y="468" type="curve" name="dv03" smooth="yes"/>
+      <point x="850" y="468" type="curve" smooth="yes" name="dv03"/>
       <point x="778" y="468"/>
       <point x="726" y="484"/>
       <point x="645" y="519" type="curve" smooth="yes"/>
       <point x="612" y="533" type="line" smooth="yes"/>
       <point x="522" y="570"/>
       <point x="468" y="591"/>
-      <point x="385" y="591" type="curve" name="dv05" smooth="yes"/>
+      <point x="385" y="591" type="curve" smooth="yes" name="dv05"/>
       <point x="280" y="591"/>
       <point x="192" y="558"/>
       <point x="88" y="470" type="curve" name="iv01"/>
       <point x="88" y="699" type="line"/>
       <point x="192" y="779"/>
       <point x="287" y="814"/>
-      <point x="390" y="814" type="curve" name="dv06" smooth="yes"/>
+      <point x="390" y="814" type="curve" smooth="yes" name="dv06"/>
       <point x="463" y="814"/>
       <point x="533" y="796"/>
       <point x="621" y="759" type="curve" name="hr01"/>
@@ -44,7 +44,7 @@
       <point x="652" y="745" type="line" smooth="yes"/>
       <point x="725" y="710"/>
       <point x="797" y="691"/>
-      <point x="865" y="691" type="curve" name="dv04" smooth="yes"/>
+      <point x="865" y="691" type="curve" smooth="yes" name="dv04"/>
       <point x="958" y="691"/>
       <point x="1045" y="728"/>
       <point x="1145" y="816" type="curve"/>
@@ -53,18 +53,18 @@
       <point x="959" y="468"/>
     </contour>
     <contour>
-      <point x="480" y="0" type="line" name="hr02" smooth="yes"/>
+      <point x="480" y="0" type="line" smooth="yes" name="hr02"/>
       <point x="460" y="0"/>
       <point x="450" y="10"/>
-      <point x="450" y="30" type="curve" name="sh01" smooth="yes"/>
+      <point x="450" y="30" type="curve" smooth="yes" name="sh01"/>
       <point x="450" y="335" type="line" smooth="yes"/>
       <point x="450" y="355"/>
       <point x="460" y="365"/>
-      <point x="480" y="365" type="curve" name="sv01" smooth="yes"/>
+      <point x="480" y="365" type="curve" smooth="yes" name="sv01"/>
       <point x="753" y="365" type="line" smooth="yes"/>
       <point x="773" y="365"/>
       <point x="783" y="355"/>
-      <point x="783" y="335" type="curve" name="sh02" smooth="yes"/>
+      <point x="783" y="335" type="curve" smooth="yes" name="sh02"/>
       <point x="783" y="30" type="line" smooth="yes"/>
       <point x="783" y="10"/>
       <point x="773" y="0"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni223D_.glif b/source/Hack-Bold.ufo/glyphs/uni223D_.glif
index 7e19c0aca..4070e57ff 100644
--- a/source/Hack-Bold.ufo/glyphs/uni223D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni223D_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni223D" format="1">
+<glyph name="uni223D" format="2">
   <advance width="1233"/>
   <unicode hex="223D"/>
   <outline>
     <contour>
-      <point x="381" y="468" type="curve" name="dv01" smooth="yes"/>
+      <point x="381" y="468" type="curve" smooth="yes" name="dv01"/>
       <point x="281" y="468"/>
       <point x="188" y="502"/>
       <point x="88" y="582" type="curve"/>
       <point x="88" y="816" type="line" name="av01"/>
       <point x="188" y="728"/>
       <point x="275" y="691"/>
-      <point x="368" y="691" type="curve" name="hr01" smooth="yes"/>
+      <point x="368" y="691" type="curve" smooth="yes" name="hr01"/>
       <point x="436" y="691"/>
       <point x="508" y="710"/>
       <point x="581" y="745" type="curve" smooth="yes"/>
@@ -19,14 +19,14 @@
       <point x="612" y="759" type="line"/>
       <point x="700" y="796"/>
       <point x="770" y="814"/>
-      <point x="843" y="814" type="curve" name="av02" smooth="yes"/>
+      <point x="843" y="814" type="curve" smooth="yes" name="av02"/>
       <point x="946" y="814"/>
       <point x="1041" y="779"/>
       <point x="1145" y="699" type="curve"/>
       <point x="1145" y="470" type="line" name="iv01"/>
       <point x="1041" y="558"/>
       <point x="953" y="591"/>
-      <point x="848" y="591" type="curve" name="hr02" smooth="yes"/>
+      <point x="848" y="591" type="curve" smooth="yes" name="hr02"/>
       <point x="765" y="591"/>
       <point x="711" y="570"/>
       <point x="621" y="533" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2241.glif b/source/Hack-Bold.ufo/glyphs/uni2241.glif
index a8daefb6b..525b3a2cd 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2241.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2241.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2241" format="1">
+<glyph name="uni2241" format="2">
   <advance width="1233"/>
   <unicode hex="2241"/>
   <outline>
@@ -8,14 +8,14 @@
       <point x="484" y="579" type="line"/>
       <point x="449" y="587"/>
       <point x="414" y="591"/>
-      <point x="381" y="591" type="curve" name="dv02" smooth="yes"/>
+      <point x="381" y="591" type="curve" smooth="yes" name="dv02"/>
       <point x="277" y="591"/>
       <point x="188" y="554"/>
       <point x="88" y="470" type="curve" name="iv01"/>
       <point x="88" y="699" type="line"/>
       <point x="191" y="779"/>
       <point x="285" y="814"/>
-      <point x="389" y="814" type="curve" name="dv03" smooth="yes"/>
+      <point x="389" y="814" type="curve" smooth="yes" name="dv03"/>
       <point x="445" y="814"/>
       <point x="493" y="804"/>
       <point x="553" y="785" type="curve"/>
@@ -24,14 +24,14 @@
       <point x="752" y="708" type="line"/>
       <point x="792" y="697"/>
       <point x="830" y="691"/>
-      <point x="865" y="691" type="curve" name="hr01" smooth="yes"/>
+      <point x="865" y="691" type="curve" smooth="yes" name="hr01"/>
       <point x="958" y="691"/>
       <point x="1045" y="728"/>
       <point x="1145" y="816" type="curve" name="iv02"/>
       <point x="1145" y="582" type="line"/>
       <point x="1049" y="506"/>
       <point x="952" y="468"/>
-      <point x="853" y="468" type="curve" name="dv01" smooth="yes"/>
+      <point x="853" y="468" type="curve" smooth="yes" name="dv01"/>
       <point x="796" y="468"/>
       <point x="743" y="480"/>
       <point x="682" y="503" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2242.glif b/source/Hack-Bold.ufo/glyphs/uni2242.glif
index d1008f14f..e55565885 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2242.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2242.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2242" format="1">
+<glyph name="uni2242" format="2">
   <advance width="1233"/>
   <unicode hex="2242"/>
   <outline>
@@ -10,29 +10,29 @@
       <point x="88" y="752" type="line"/>
     </contour>
     <contour>
-      <point x="850" y="254" type="curve" name="dv01" smooth="yes"/>
+      <point x="850" y="254" type="curve" smooth="yes" name="dv01"/>
       <point x="778" y="254"/>
       <point x="726" y="270"/>
       <point x="645" y="305" type="curve" smooth="yes"/>
       <point x="612" y="319" type="line" smooth="yes"/>
       <point x="522" y="356"/>
       <point x="468" y="377"/>
-      <point x="385" y="377" type="curve" name="hr01" smooth="yes"/>
+      <point x="385" y="377" type="curve" smooth="yes" name="hr01"/>
       <point x="280" y="377"/>
       <point x="192" y="344"/>
       <point x="88" y="256" type="curve" name="iv01"/>
       <point x="88" y="485" type="line"/>
       <point x="192" y="566"/>
       <point x="287" y="600"/>
-      <point x="390" y="600" type="curve" name="dv03" smooth="yes"/>
+      <point x="390" y="600" type="curve" smooth="yes" name="dv03"/>
       <point x="455" y="600"/>
       <point x="524" y="586"/>
       <point x="621" y="545" type="curve"/>
       <point x="622" y="545" type="line"/>
-      <point x="653" y="531" type="line" name="hr02" smooth="yes"/>
+      <point x="653" y="531" type="line" smooth="yes" name="hr02"/>
       <point x="729" y="496"/>
       <point x="795" y="477"/>
-      <point x="863" y="477" type="curve" name="dv02" smooth="yes"/>
+      <point x="863" y="477" type="curve" smooth="yes" name="dv02"/>
       <point x="959" y="477"/>
       <point x="1048" y="517"/>
       <point x="1145" y="602" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2243.glif b/source/Hack-Bold.ufo/glyphs/uni2243.glif
index 4dfc38d6f..555052865 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2243.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2243.glif
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2243" format="1">
+<glyph name="uni2243" format="2">
   <advance width="1233"/>
   <unicode hex="2243"/>
   <outline>
     <contour>
-      <point x="850" y="672" type="curve" name="dv03" smooth="yes"/>
+      <point x="850" y="672" type="curve" smooth="yes" name="dv03"/>
       <point x="778" y="672"/>
       <point x="726" y="688"/>
       <point x="645" y="723" type="curve" smooth="yes"/>
       <point x="612" y="737" type="line" smooth="yes"/>
       <point x="522" y="774"/>
       <point x="468" y="795"/>
-      <point x="385" y="795" type="curve" name="sv01" smooth="yes"/>
+      <point x="385" y="795" type="curve" smooth="yes" name="sv01"/>
       <point x="280" y="795"/>
       <point x="192" y="762"/>
       <point x="88" y="674" type="curve" name="iv01"/>
       <point x="88" y="903" type="line"/>
       <point x="192" y="983"/>
       <point x="287" y="1018"/>
-      <point x="390" y="1018" type="curve" name="av01" smooth="yes"/>
+      <point x="390" y="1018" type="curve" smooth="yes" name="av01"/>
       <point x="463" y="1018"/>
       <point x="533" y="1000"/>
       <point x="621" y="963" type="curve"/>
@@ -26,7 +26,7 @@
       <point x="652" y="949" type="line" smooth="yes"/>
       <point x="725" y="914"/>
       <point x="797" y="895"/>
-      <point x="865" y="895" type="curve" name="dv04" smooth="yes"/>
+      <point x="865" y="895" type="curve" smooth="yes" name="dv04"/>
       <point x="958" y="895"/>
       <point x="1045" y="932"/>
       <point x="1145" y="1020" type="curve" name="hr01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2244.glif b/source/Hack-Bold.ufo/glyphs/uni2244.glif
index 5ec916632..79afcd1ee 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2244.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2244.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2244" format="1">
+<glyph name="uni2244" format="2">
   <advance width="1233"/>
   <unicode hex="2244"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2246.glif b/source/Hack-Bold.ufo/glyphs/uni2246.glif
index 7d4edc979..76e510441 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2246.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2246.glif
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2246" format="1">
+<glyph name="uni2246" format="2">
   <advance width="1233"/>
   <unicode hex="2246"/>
   <outline>
     <contour>
-      <point x="850" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="850" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="778" y="909"/>
       <point x="726" y="925"/>
       <point x="645" y="960" type="curve" smooth="yes"/>
       <point x="612" y="974" type="line" smooth="yes"/>
       <point x="522" y="1011"/>
       <point x="468" y="1032"/>
-      <point x="385" y="1032" type="curve" name="sv02" smooth="yes"/>
+      <point x="385" y="1032" type="curve" smooth="yes" name="sv02"/>
       <point x="280" y="1032"/>
       <point x="192" y="999"/>
       <point x="88" y="911" type="curve" name="iv01"/>
       <point x="88" y="1140" type="line" name="at01"/>
       <point x="192" y="1220"/>
       <point x="287" y="1255"/>
-      <point x="390" y="1255" type="curve" name="av01" smooth="yes"/>
+      <point x="390" y="1255" type="curve" smooth="yes" name="av01"/>
       <point x="463" y="1255"/>
       <point x="533" y="1237"/>
       <point x="621" y="1200" type="curve"/>
@@ -26,7 +26,7 @@
       <point x="652" y="1186" type="line" smooth="yes"/>
       <point x="725" y="1151"/>
       <point x="797" y="1132"/>
-      <point x="865" y="1132" type="curve" name="at02" smooth="yes"/>
+      <point x="865" y="1132" type="curve" smooth="yes" name="at02"/>
       <point x="958" y="1132"/>
       <point x="1045" y="1169"/>
       <point x="1145" y="1257" type="curve" name="av02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2247.glif b/source/Hack-Bold.ufo/glyphs/uni2247.glif
index 043ea06f6..54b0296db 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2247.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2247.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2247" format="1">
+<glyph name="uni2247" format="2">
   <advance width="1233"/>
   <unicode hex="2247"/>
   <outline>
@@ -16,14 +16,14 @@
       <point x="623" y="970" type="line"/>
       <point x="515" y="1017"/>
       <point x="448" y="1032"/>
-      <point x="382" y="1032" type="curve" name="dv03" smooth="yes"/>
+      <point x="382" y="1032" type="curve" smooth="yes" name="dv03"/>
       <point x="277" y="1032"/>
       <point x="188" y="995"/>
       <point x="88" y="911" type="curve" name="iv01"/>
       <point x="88" y="1140" type="line"/>
       <point x="192" y="1220"/>
       <point x="287" y="1255"/>
-      <point x="390" y="1255" type="curve" name="dv04" smooth="yes"/>
+      <point x="390" y="1255" type="curve" smooth="yes" name="dv04"/>
       <point x="463" y="1255"/>
       <point x="533" y="1237"/>
       <point x="621" y="1200" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2249.glif b/source/Hack-Bold.ufo/glyphs/uni2249.glif
index 36a65474a..1a502032e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2249.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2249.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2249" format="1">
+<glyph name="uni2249" format="2">
   <advance width="1233"/>
   <unicode hex="2249"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="88" y="485" type="line"/>
       <point x="192" y="566"/>
       <point x="285" y="600"/>
-      <point x="393" y="600" type="curve" name="dv04" smooth="yes"/>
+      <point x="393" y="600" type="curve" smooth="yes" name="dv04"/>
       <point x="419" y="600"/>
       <point x="445" y="598"/>
       <point x="470" y="593" type="curve" name="sv01"/>
@@ -22,14 +22,14 @@
       <point x="484" y="783" type="curve" smooth="yes"/>
       <point x="455" y="790"/>
       <point x="418" y="795"/>
-      <point x="381" y="795" type="curve" name="dv05" smooth="yes"/>
+      <point x="381" y="795" type="curve" smooth="yes" name="dv05"/>
       <point x="278" y="795"/>
       <point x="188" y="758"/>
       <point x="88" y="674" type="curve" name="iv02"/>
       <point x="88" y="903" type="line"/>
       <point x="192" y="983"/>
       <point x="287" y="1018"/>
-      <point x="390" y="1018" type="curve" name="dv06" smooth="yes"/>
+      <point x="390" y="1018" type="curve" smooth="yes" name="dv06"/>
       <point x="463" y="1018"/>
       <point x="532" y="1000"/>
       <point x="620" y="964" type="curve"/>
@@ -43,21 +43,21 @@
       <point x="1145" y="786" type="line"/>
       <point x="1045" y="706"/>
       <point x="952" y="672"/>
-      <point x="852" y="672" type="curve" name="dv07" smooth="yes"/>
+      <point x="852" y="672" type="curve" smooth="yes" name="dv07"/>
       <point x="819" y="672"/>
       <point x="793" y="676"/>
       <point x="762" y="683" type="curve"/>
       <point x="694" y="514" type="line"/>
       <point x="754" y="489"/>
       <point x="811" y="477"/>
-      <point x="864" y="477" type="curve" name="dv02" smooth="yes"/>
+      <point x="864" y="477" type="curve" smooth="yes" name="dv02"/>
       <point x="957" y="477"/>
       <point x="1048" y="517"/>
       <point x="1145" y="602" type="curve" name="iv03"/>
       <point x="1145" y="369" type="line"/>
       <point x="1049" y="292"/>
       <point x="955" y="254"/>
-      <point x="852" y="254" type="curve" name="dv01" smooth="yes"/>
+      <point x="852" y="254" type="curve" smooth="yes" name="dv01"/>
       <point x="783" y="254"/>
       <point x="722" y="270"/>
       <point x="645" y="305" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni224A_.glif b/source/Hack-Bold.ufo/glyphs/uni224A_.glif
index e03ad11a9..4b94698bd 100644
--- a/source/Hack-Bold.ufo/glyphs/uni224A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni224A_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni224A" format="1">
+<glyph name="uni224A" format="2">
   <advance width="1233"/>
   <unicode hex="224A"/>
   <outline>
     <contour>
-      <point x="850" y="854" type="curve" name="dv03" smooth="yes"/>
+      <point x="850" y="854" type="curve" smooth="yes" name="dv03"/>
       <point x="778" y="854"/>
       <point x="726" y="870"/>
       <point x="645" y="905" type="curve" smooth="yes"/>
@@ -13,22 +13,22 @@
       <point x="612" y="919" type="curve" smooth="yes"/>
       <point x="524" y="956"/>
       <point x="466" y="977"/>
-      <point x="384" y="977" type="curve" name="sv01" smooth="yes"/>
+      <point x="384" y="977" type="curve" smooth="yes" name="sv01"/>
       <point x="280" y="977"/>
       <point x="192" y="944"/>
       <point x="88" y="856" type="curve" name="iv01"/>
       <point x="88" y="1085" type="line"/>
       <point x="192" y="1165"/>
       <point x="287" y="1200"/>
-      <point x="390" y="1200" type="curve" name="av01" smooth="yes"/>
+      <point x="390" y="1200" type="curve" smooth="yes" name="av01"/>
       <point x="463" y="1200"/>
       <point x="533" y="1182"/>
       <point x="621" y="1145" type="curve" name="at01"/>
       <point x="622" y="1145" type="line"/>
-      <point x="652" y="1131" type="line" name="at02" smooth="yes"/>
+      <point x="652" y="1131" type="line" smooth="yes" name="at02"/>
       <point x="730" y="1095"/>
       <point x="801" y="1077"/>
-      <point x="865" y="1077" type="curve" name="dv04" smooth="yes"/>
+      <point x="865" y="1077" type="curve" smooth="yes" name="dv04"/>
       <point x="960" y="1077"/>
       <point x="1045" y="1114"/>
       <point x="1145" y="1202" type="curve" name="hr01"/>
@@ -37,7 +37,7 @@
       <point x="959" y="854"/>
     </contour>
     <contour>
-      <point x="850" y="437" type="curve" name="dv05" smooth="yes"/>
+      <point x="850" y="437" type="curve" smooth="yes" name="dv05"/>
       <point x="778" y="437"/>
       <point x="726" y="453"/>
       <point x="645" y="488" type="curve" smooth="yes"/>
@@ -46,14 +46,14 @@
       <point x="612" y="502" type="curve" smooth="yes"/>
       <point x="524" y="539"/>
       <point x="466" y="560"/>
-      <point x="384" y="560" type="curve" name="dv07" smooth="yes"/>
+      <point x="384" y="560" type="curve" smooth="yes" name="dv07"/>
       <point x="280" y="560"/>
       <point x="192" y="527"/>
       <point x="88" y="439" type="curve" name="hr02"/>
       <point x="88" y="668" type="line"/>
       <point x="192" y="748"/>
       <point x="287" y="783"/>
-      <point x="390" y="783" type="curve" name="dv08" smooth="yes"/>
+      <point x="390" y="783" type="curve" smooth="yes" name="dv08"/>
       <point x="463" y="783"/>
       <point x="533" y="765"/>
       <point x="621" y="728" type="curve"/>
@@ -61,7 +61,7 @@
       <point x="652" y="714" type="line" smooth="yes"/>
       <point x="725" y="679"/>
       <point x="797" y="660"/>
-      <point x="865" y="660" type="curve" name="dv06" smooth="yes"/>
+      <point x="865" y="660" type="curve" smooth="yes" name="dv06"/>
       <point x="958" y="660"/>
       <point x="1045" y="697"/>
       <point x="1145" y="785" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni224B_.glif b/source/Hack-Bold.ufo/glyphs/uni224B_.glif
index 00c9e581a..49bb842d8 100644
--- a/source/Hack-Bold.ufo/glyphs/uni224B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni224B_.glif
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni224B" format="1">
+<glyph name="uni224B" format="2">
   <advance width="1233"/>
   <unicode hex="224B"/>
   <outline>
     <contour>
-      <point x="850" y="854" type="curve" name="dv05" smooth="yes"/>
+      <point x="850" y="854" type="curve" smooth="yes" name="dv05"/>
       <point x="778" y="854"/>
       <point x="726" y="870"/>
       <point x="645" y="905" type="curve" smooth="yes"/>
       <point x="612" y="919" type="line" smooth="yes"/>
       <point x="522" y="956"/>
       <point x="468" y="977"/>
-      <point x="385" y="977" type="curve" name="sv01" smooth="yes"/>
+      <point x="385" y="977" type="curve" smooth="yes" name="sv01"/>
       <point x="280" y="977"/>
       <point x="192" y="944"/>
       <point x="88" y="856" type="curve" name="iv01"/>
       <point x="88" y="1085" type="line"/>
       <point x="192" y="1165"/>
       <point x="287" y="1200"/>
-      <point x="390" y="1200" type="curve" name="av01" smooth="yes"/>
+      <point x="390" y="1200" type="curve" smooth="yes" name="av01"/>
       <point x="463" y="1200"/>
       <point x="533" y="1182"/>
       <point x="621" y="1145" type="curve" name="hr01"/>
       <point x="622" y="1145" type="line"/>
-      <point x="652" y="1131" type="line" name="at01" smooth="yes"/>
+      <point x="652" y="1131" type="line" smooth="yes" name="at01"/>
       <point x="730" y="1095"/>
       <point x="801" y="1077"/>
-      <point x="865" y="1077" type="curve" name="dv06" smooth="yes"/>
+      <point x="865" y="1077" type="curve" smooth="yes" name="dv06"/>
       <point x="960" y="1077"/>
       <point x="1045" y="1114"/>
       <point x="1145" y="1202" type="curve" name="av02"/>
@@ -35,21 +35,21 @@
       <point x="959" y="854"/>
     </contour>
     <contour>
-      <point x="850" y="437" type="curve" name="hr02" smooth="yes"/>
+      <point x="850" y="437" type="curve" smooth="yes" name="hr02"/>
       <point x="778" y="437"/>
       <point x="726" y="453"/>
       <point x="645" y="488" type="curve" smooth="yes"/>
       <point x="612" y="502" type="line" smooth="yes"/>
       <point x="522" y="539"/>
       <point x="468" y="560"/>
-      <point x="385" y="560" type="curve" name="dv08" smooth="yes"/>
+      <point x="385" y="560" type="curve" smooth="yes" name="dv08"/>
       <point x="280" y="560"/>
       <point x="192" y="527"/>
       <point x="88" y="439" type="curve" name="iv02"/>
       <point x="88" y="668" type="line"/>
       <point x="192" y="748"/>
       <point x="287" y="783"/>
-      <point x="390" y="783" type="curve" name="dv09" smooth="yes"/>
+      <point x="390" y="783" type="curve" smooth="yes" name="dv09"/>
       <point x="463" y="783"/>
       <point x="533" y="765"/>
       <point x="621" y="728" type="curve"/>
@@ -57,7 +57,7 @@
       <point x="652" y="714" type="line" smooth="yes"/>
       <point x="725" y="679"/>
       <point x="797" y="660"/>
-      <point x="865" y="660" type="curve" name="dv07" smooth="yes"/>
+      <point x="865" y="660" type="curve" smooth="yes" name="dv07"/>
       <point x="958" y="660"/>
       <point x="1045" y="697"/>
       <point x="1145" y="785" type="curve"/>
@@ -66,29 +66,29 @@
       <point x="959" y="437"/>
     </contour>
     <contour>
-      <point x="850" y="25" type="curve" name="dv01" smooth="yes"/>
+      <point x="850" y="25" type="curve" smooth="yes" name="dv01"/>
       <point x="778" y="25"/>
       <point x="726" y="41"/>
-      <point x="645" y="76" type="curve" name="hr04" smooth="yes"/>
+      <point x="645" y="76" type="curve" smooth="yes" name="hr04"/>
       <point x="612" y="90" type="line" smooth="yes"/>
       <point x="522" y="127"/>
       <point x="468" y="148"/>
-      <point x="385" y="148" type="curve" name="dv03" smooth="yes"/>
+      <point x="385" y="148" type="curve" smooth="yes" name="dv03"/>
       <point x="280" y="148"/>
       <point x="192" y="115"/>
       <point x="88" y="27" type="curve" name="iv03"/>
       <point x="88" y="256" type="line"/>
       <point x="192" y="337"/>
       <point x="287" y="371"/>
-      <point x="390" y="371" type="curve" name="dv04" smooth="yes"/>
+      <point x="390" y="371" type="curve" smooth="yes" name="dv04"/>
       <point x="455" y="371"/>
       <point x="524" y="357"/>
       <point x="621" y="316" type="curve"/>
       <point x="622" y="316" type="line"/>
-      <point x="653" y="302" type="line" name="hr05" smooth="yes"/>
+      <point x="653" y="302" type="line" smooth="yes" name="hr05"/>
       <point x="729" y="267"/>
       <point x="794" y="248"/>
-      <point x="862" y="248" type="curve" name="dv02" smooth="yes"/>
+      <point x="862" y="248" type="curve" smooth="yes" name="dv02"/>
       <point x="958" y="248"/>
       <point x="1048" y="288"/>
       <point x="1145" y="373" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni224C_.glif b/source/Hack-Bold.ufo/glyphs/uni224C_.glif
index 217afa41b..ed99583c2 100644
--- a/source/Hack-Bold.ufo/glyphs/uni224C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni224C_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni224C" format="1">
+<glyph name="uni224C" format="2">
   <advance width="1233"/>
   <unicode hex="224C"/>
   <outline>
     <contour>
-      <point x="381" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="381" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="281" y="909"/>
       <point x="188" y="943"/>
       <point x="88" y="1023" type="curve"/>
       <point x="88" y="1257" type="line" name="av01"/>
       <point x="188" y="1169"/>
       <point x="275" y="1132"/>
-      <point x="368" y="1132" type="curve" name="at01" smooth="yes"/>
+      <point x="368" y="1132" type="curve" smooth="yes" name="at01"/>
       <point x="436" y="1132"/>
       <point x="508" y="1151"/>
       <point x="581" y="1186" type="curve" smooth="yes"/>
@@ -19,14 +19,14 @@
       <point x="612" y="1200" type="line"/>
       <point x="700" y="1237"/>
       <point x="770" y="1255"/>
-      <point x="843" y="1255" type="curve" name="av02" smooth="yes"/>
+      <point x="843" y="1255" type="curve" smooth="yes" name="av02"/>
       <point x="946" y="1255"/>
       <point x="1041" y="1220"/>
       <point x="1145" y="1140" type="curve" name="at02"/>
       <point x="1145" y="911" type="line" name="iv01"/>
       <point x="1041" y="999"/>
       <point x="953" y="1032"/>
-      <point x="848" y="1032" type="curve" name="sv02" smooth="yes"/>
+      <point x="848" y="1032" type="curve" smooth="yes" name="sv02"/>
       <point x="765" y="1032"/>
       <point x="711" y="1011"/>
       <point x="621" y="974" type="curve" name="hr01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni224D_.glif b/source/Hack-Bold.ufo/glyphs/uni224D_.glif
index 04c6130fa..fa35202e5 100644
--- a/source/Hack-Bold.ufo/glyphs/uni224D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni224D_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni224D" format="1">
+<glyph name="uni224D" format="2">
   <advance width="1233"/>
   <unicode hex="224D"/>
   <outline>
     <contour>
-      <point x="617" y="728" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="728" type="curve" smooth="yes" name="hr00"/>
       <point x="484" y="728"/>
       <point x="307" y="780"/>
       <point x="87" y="884" type="curve"/>
@@ -23,7 +23,7 @@
       <point x="88" y="398" type="line"/>
       <point x="307" y="502"/>
       <point x="483" y="554"/>
-      <point x="616" y="554" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="554" type="curve" smooth="yes" name="dv02"/>
       <point x="749" y="554"/>
       <point x="926" y="502"/>
       <point x="1145" y="398" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni224E_.glif b/source/Hack-Bold.ufo/glyphs/uni224E_.glif
index cef510dec..ca0a60f05 100644
--- a/source/Hack-Bold.ufo/glyphs/uni224E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni224E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni224E" format="1">
+<glyph name="uni224E" format="2">
   <advance width="1233"/>
   <unicode hex="224E"/>
   <outline>
@@ -11,7 +11,7 @@
       <point x="461" y="1213" type="curve" smooth="yes"/>
       <point x="515" y="1242"/>
       <point x="585" y="1264"/>
-      <point x="624" y="1264" type="curve" name="dv04" smooth="yes"/>
+      <point x="624" y="1264" type="curve" smooth="yes" name="dv04"/>
       <point x="694" y="1264"/>
       <point x="831" y="1201"/>
       <point x="893" y="1088" type="curve" smooth="yes"/>
@@ -26,7 +26,7 @@
       <point x="708" y="979" type="curve" smooth="yes"/>
       <point x="681" y="1004"/>
       <point x="653" y="1014"/>
-      <point x="617" y="1013" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="1013" type="curve" smooth="yes" name="dv03"/>
       <point x="541" y="1010"/>
       <point x="491" y="961"/>
       <point x="456" y="868" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="88" y="752" type="line" name="sh02"/>
     </contour>
     <contour>
-      <point x="615" y="20" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="20" type="curve" smooth="yes" name="dv01"/>
       <point x="546" y="20"/>
       <point x="409" y="72"/>
       <point x="340" y="196" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni224F_.glif b/source/Hack-Bold.ufo/glyphs/uni224F_.glif
index fd5a7901a..9a439f6d4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni224F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni224F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni224F" format="1">
+<glyph name="uni224F" format="2">
   <advance width="1233"/>
   <unicode hex="224F"/>
   <outline>
@@ -11,7 +11,7 @@
       <point x="461" y="1213" type="curve" smooth="yes"/>
       <point x="515" y="1242"/>
       <point x="585" y="1264"/>
-      <point x="624" y="1264" type="curve" name="dv04" smooth="yes"/>
+      <point x="624" y="1264" type="curve" smooth="yes" name="dv04"/>
       <point x="694" y="1264"/>
       <point x="831" y="1201"/>
       <point x="893" y="1088" type="curve" smooth="yes"/>
@@ -26,7 +26,7 @@
       <point x="708" y="979" type="curve" smooth="yes"/>
       <point x="681" y="1004"/>
       <point x="653" y="1014"/>
-      <point x="617" y="1013" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="1013" type="curve" smooth="yes" name="dv03"/>
       <point x="541" y="1010"/>
       <point x="491" y="961"/>
       <point x="456" y="868" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2250.glif b/source/Hack-Bold.ufo/glyphs/uni2250.glif
index 29950a34c..62309fbb4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2250.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2250.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2250" format="1">
+<glyph name="uni2250" format="2">
   <advance width="1233"/>
   <unicode hex="2250"/>
   <outline>
     <contour>
-      <point x="480" y="1083" type="line" name="hr00" smooth="yes"/>
+      <point x="480" y="1083" type="line" smooth="yes" name="hr00"/>
       <point x="460" y="1083"/>
       <point x="450" y="1093"/>
-      <point x="450" y="1113" type="curve" name="dh01" smooth="yes"/>
+      <point x="450" y="1113" type="curve" smooth="yes" name="dh01"/>
       <point x="450" y="1418" type="line" smooth="yes"/>
       <point x="450" y="1438"/>
       <point x="460" y="1448"/>
-      <point x="480" y="1448" type="curve" name="dv03" smooth="yes"/>
+      <point x="480" y="1448" type="curve" smooth="yes" name="dv03"/>
       <point x="753" y="1448" type="line" smooth="yes"/>
       <point x="773" y="1448"/>
       <point x="783" y="1438"/>
       <point x="783" y="1418" type="curve" smooth="yes"/>
-      <point x="783" y="1113" type="line" name="dh02" smooth="yes"/>
+      <point x="783" y="1113" type="line" smooth="yes" name="dh02"/>
       <point x="783" y="1093"/>
       <point x="773" y="1083"/>
       <point x="753" y="1083" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2251.glif b/source/Hack-Bold.ufo/glyphs/uni2251.glif
index b8ad231bb..3259f2a17 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2251.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2251.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2251" format="1">
+<glyph name="uni2251" format="2">
   <advance width="1233"/>
   <unicode hex="2251"/>
   <outline>
     <contour>
-      <point x="480" y="1083" type="line" name="hr00" smooth="yes"/>
+      <point x="480" y="1083" type="line" smooth="yes" name="hr00"/>
       <point x="460" y="1083"/>
       <point x="450" y="1093"/>
-      <point x="450" y="1113" type="curve" name="dh01" smooth="yes"/>
+      <point x="450" y="1113" type="curve" smooth="yes" name="dh01"/>
       <point x="450" y="1418" type="line" smooth="yes"/>
       <point x="450" y="1438"/>
       <point x="460" y="1448"/>
-      <point x="480" y="1448" type="curve" name="dv03" smooth="yes"/>
+      <point x="480" y="1448" type="curve" smooth="yes" name="dv03"/>
       <point x="753" y="1448" type="line" smooth="yes"/>
       <point x="773" y="1448"/>
       <point x="783" y="1438"/>
       <point x="783" y="1418" type="curve" smooth="yes"/>
-      <point x="783" y="1113" type="line" name="dh02" smooth="yes"/>
+      <point x="783" y="1113" type="line" smooth="yes" name="dh02"/>
       <point x="783" y="1093"/>
       <point x="773" y="1083"/>
       <point x="753" y="1083" type="curve" smooth="yes"/>
@@ -34,18 +34,18 @@
       <point x="88" y="295" type="line"/>
     </contour>
     <contour>
-      <point x="480" y="-166" type="line" name="dv01" smooth="yes"/>
+      <point x="480" y="-166" type="line" smooth="yes" name="dv01"/>
       <point x="460" y="-166"/>
       <point x="450" y="-156"/>
-      <point x="450" y="-136" type="curve" name="sh01" smooth="yes"/>
+      <point x="450" y="-136" type="curve" smooth="yes" name="sh01"/>
       <point x="450" y="169" type="line" smooth="yes"/>
       <point x="450" y="189"/>
       <point x="460" y="199"/>
-      <point x="480" y="199" type="curve" name="dv02" smooth="yes"/>
+      <point x="480" y="199" type="curve" smooth="yes" name="dv02"/>
       <point x="753" y="199" type="line" smooth="yes"/>
       <point x="773" y="199"/>
       <point x="783" y="189"/>
-      <point x="783" y="169" type="curve" name="sh02" smooth="yes"/>
+      <point x="783" y="169" type="curve" smooth="yes" name="sh02"/>
       <point x="783" y="-136" type="line" smooth="yes"/>
       <point x="783" y="-156"/>
       <point x="773" y="-166"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2252.glif b/source/Hack-Bold.ufo/glyphs/uni2252.glif
index 772a99038..4b83016ab 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2252.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2252.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2252" format="1">
+<glyph name="uni2252" format="2">
   <advance width="1233"/>
   <unicode hex="2252"/>
   <outline>
     <contour>
-      <point x="118" y="1083" type="line" name="hr00" smooth="yes"/>
+      <point x="118" y="1083" type="line" smooth="yes" name="hr00"/>
       <point x="98" y="1083"/>
       <point x="88" y="1093"/>
-      <point x="88" y="1113" type="curve" name="sh01" smooth="yes"/>
+      <point x="88" y="1113" type="curve" smooth="yes" name="sh01"/>
       <point x="88" y="1418" type="line" smooth="yes"/>
       <point x="88" y="1438"/>
       <point x="98" y="1448"/>
-      <point x="118" y="1448" type="curve" name="dv03" smooth="yes"/>
+      <point x="118" y="1448" type="curve" smooth="yes" name="dv03"/>
       <point x="391" y="1448" type="line" smooth="yes"/>
       <point x="411" y="1448"/>
       <point x="421" y="1438"/>
       <point x="421" y="1418" type="curve" smooth="yes"/>
-      <point x="421" y="1113" type="line" name="sh02" smooth="yes"/>
+      <point x="421" y="1113" type="line" smooth="yes" name="sh02"/>
       <point x="421" y="1093"/>
       <point x="411" y="1083"/>
       <point x="391" y="1083" type="curve" smooth="yes"/>
@@ -34,19 +34,19 @@
       <point x="88" y="295" type="line"/>
     </contour>
     <contour>
-      <point x="842" y="-166" type="line" name="dv01" smooth="yes"/>
+      <point x="842" y="-166" type="line" smooth="yes" name="dv01"/>
       <point x="822" y="-166"/>
       <point x="812" y="-156"/>
-      <point x="812" y="-136" type="curve" name="ah01" smooth="yes"/>
+      <point x="812" y="-136" type="curve" smooth="yes" name="ah01"/>
       <point x="812" y="169" type="line" smooth="yes"/>
       <point x="812" y="189"/>
       <point x="822" y="199"/>
-      <point x="842" y="199" type="curve" name="dv02" smooth="yes"/>
+      <point x="842" y="199" type="curve" smooth="yes" name="dv02"/>
       <point x="1115" y="199" type="line" smooth="yes"/>
       <point x="1135" y="199"/>
       <point x="1145" y="189"/>
       <point x="1145" y="169" type="curve" smooth="yes"/>
-      <point x="1145" y="-136" type="line" name="sh04" smooth="yes"/>
+      <point x="1145" y="-136" type="line" smooth="yes" name="sh04"/>
       <point x="1145" y="-156"/>
       <point x="1135" y="-166"/>
       <point x="1115" y="-166" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2253.glif b/source/Hack-Bold.ufo/glyphs/uni2253.glif
index b14fac7dc..41a4d63b7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2253.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2253.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2253" format="1">
+<glyph name="uni2253" format="2">
   <advance width="1233"/>
   <unicode hex="2253"/>
   <outline>
     <contour>
-      <point x="843" y="1083" type="line" name="hr00" smooth="yes"/>
+      <point x="843" y="1083" type="line" smooth="yes" name="hr00"/>
       <point x="823" y="1083"/>
       <point x="813" y="1093"/>
-      <point x="813" y="1113" type="curve" name="ah01" smooth="yes"/>
+      <point x="813" y="1113" type="curve" smooth="yes" name="ah01"/>
       <point x="813" y="1418" type="line" smooth="yes"/>
       <point x="813" y="1438"/>
       <point x="823" y="1448"/>
-      <point x="843" y="1448" type="curve" name="dv03" smooth="yes"/>
+      <point x="843" y="1448" type="curve" smooth="yes" name="dv03"/>
       <point x="1116" y="1448" type="line" smooth="yes"/>
       <point x="1136" y="1448"/>
       <point x="1146" y="1438"/>
       <point x="1146" y="1418" type="curve" smooth="yes"/>
-      <point x="1146" y="1113" type="line" name="sh01" smooth="yes"/>
+      <point x="1146" y="1113" type="line" smooth="yes" name="sh01"/>
       <point x="1146" y="1093"/>
       <point x="1136" y="1083"/>
       <point x="1116" y="1083" type="curve" smooth="yes"/>
@@ -34,18 +34,18 @@
       <point x="88" y="295" type="line"/>
     </contour>
     <contour>
-      <point x="118" y="-166" type="line" name="dv01" smooth="yes"/>
+      <point x="118" y="-166" type="line" smooth="yes" name="dv01"/>
       <point x="98" y="-166"/>
       <point x="88" y="-156"/>
       <point x="88" y="-136" type="curve" smooth="yes"/>
-      <point x="88" y="169" type="line" name="sh02" smooth="yes"/>
+      <point x="88" y="169" type="line" smooth="yes" name="sh02"/>
       <point x="88" y="189"/>
       <point x="98" y="199"/>
-      <point x="118" y="199" type="curve" name="dv02" smooth="yes"/>
+      <point x="118" y="199" type="curve" smooth="yes" name="dv02"/>
       <point x="391" y="199" type="line" smooth="yes"/>
       <point x="411" y="199"/>
       <point x="421" y="189"/>
-      <point x="421" y="169" type="curve" name="sh07" smooth="yes"/>
+      <point x="421" y="169" type="curve" smooth="yes" name="sh07"/>
       <point x="421" y="-136" type="line" smooth="yes"/>
       <point x="421" y="-156"/>
       <point x="411" y="-166"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2254.glif b/source/Hack-Bold.ufo/glyphs/uni2254.glif
index 4ef375dfe..3b2b95885 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2254.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2254.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2254" format="1">
+<glyph name="uni2254" format="2">
   <advance width="1233"/>
   <unicode hex="2254"/>
   <outline>
     <contour>
-      <point x="111" y="708" type="line" name="dv07" smooth="yes"/>
+      <point x="111" y="708" type="line" smooth="yes" name="dv07"/>
       <point x="91" y="708"/>
       <point x="81" y="718"/>
-      <point x="81" y="738" type="curve" name="dh01" smooth="yes"/>
+      <point x="81" y="738" type="curve" smooth="yes" name="dh01"/>
       <point x="81" y="1000" type="line" smooth="yes"/>
       <point x="81" y="1020"/>
       <point x="91" y="1030"/>
-      <point x="111" y="1030" type="curve" name="dv08" smooth="yes"/>
-      <point x="287" y="1030" type="line" name="hr01" smooth="yes"/>
+      <point x="111" y="1030" type="curve" smooth="yes" name="dv08"/>
+      <point x="287" y="1030" type="line" smooth="yes" name="hr01"/>
       <point x="307" y="1030"/>
       <point x="317" y="1020"/>
       <point x="317" y="1000" type="curve" smooth="yes"/>
-      <point x="317" y="738" type="line" name="dh02" smooth="yes"/>
+      <point x="317" y="738" type="line" smooth="yes" name="dh02"/>
       <point x="317" y="718"/>
       <point x="307" y="708"/>
       <point x="287" y="708" type="curve" smooth="yes"/>
@@ -28,18 +28,18 @@
       <point x="407" y="752" type="line"/>
     </contour>
     <contour>
-      <point x="111" y="253" type="line" name="dv01" smooth="yes"/>
+      <point x="111" y="253" type="line" smooth="yes" name="dv01"/>
       <point x="91" y="253"/>
       <point x="81" y="263"/>
-      <point x="81" y="283" type="curve" name="sh01" smooth="yes"/>
+      <point x="81" y="283" type="curve" smooth="yes" name="sh01"/>
       <point x="81" y="544" type="line" smooth="yes"/>
       <point x="81" y="564"/>
       <point x="91" y="574"/>
-      <point x="111" y="574" type="curve" name="dv02" smooth="yes"/>
-      <point x="287" y="574" type="line" name="hr02" smooth="yes"/>
+      <point x="111" y="574" type="curve" smooth="yes" name="dv02"/>
+      <point x="287" y="574" type="line" smooth="yes" name="hr02"/>
       <point x="307" y="574"/>
       <point x="317" y="564"/>
-      <point x="317" y="544" type="curve" name="sh02" smooth="yes"/>
+      <point x="317" y="544" type="curve" smooth="yes" name="sh02"/>
       <point x="317" y="283" type="line" smooth="yes"/>
       <point x="317" y="263"/>
       <point x="307" y="253"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2255.glif b/source/Hack-Bold.ufo/glyphs/uni2255.glif
index d5f1d9fbc..2028c3341 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2255.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2255.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2255" format="1">
+<glyph name="uni2255" format="2">
   <advance width="1233"/>
   <unicode hex="2255"/>
   <outline>
     <contour>
-      <point x="946" y="708" type="line" name="dv07" smooth="yes"/>
+      <point x="946" y="708" type="line" smooth="yes" name="dv07"/>
       <point x="926" y="708"/>
       <point x="916" y="718"/>
-      <point x="916" y="738" type="curve" name="dh01" smooth="yes"/>
+      <point x="916" y="738" type="curve" smooth="yes" name="dh01"/>
       <point x="916" y="1000" type="line" smooth="yes"/>
       <point x="916" y="1020"/>
       <point x="926" y="1030"/>
-      <point x="946" y="1030" type="curve" name="dv08" smooth="yes"/>
-      <point x="1122" y="1030" type="line" name="hr01" smooth="yes"/>
+      <point x="946" y="1030" type="curve" smooth="yes" name="dv08"/>
+      <point x="1122" y="1030" type="line" smooth="yes" name="hr01"/>
       <point x="1142" y="1030"/>
       <point x="1152" y="1020"/>
       <point x="1152" y="1000" type="curve" smooth="yes"/>
-      <point x="1152" y="738" type="line" name="dh02" smooth="yes"/>
+      <point x="1152" y="738" type="line" smooth="yes" name="dh02"/>
       <point x="1152" y="718"/>
       <point x="1142" y="708"/>
       <point x="1122" y="708" type="curve" smooth="yes"/>
@@ -28,18 +28,18 @@
       <point x="81" y="752" type="line"/>
     </contour>
     <contour>
-      <point x="946" y="253" type="line" name="dv01" smooth="yes"/>
+      <point x="946" y="253" type="line" smooth="yes" name="dv01"/>
       <point x="926" y="253"/>
       <point x="916" y="263"/>
-      <point x="916" y="283" type="curve" name="sh01" smooth="yes"/>
+      <point x="916" y="283" type="curve" smooth="yes" name="sh01"/>
       <point x="916" y="544" type="line" smooth="yes"/>
       <point x="916" y="564"/>
       <point x="926" y="574"/>
-      <point x="946" y="574" type="curve" name="dv02" smooth="yes"/>
-      <point x="1122" y="574" type="line" name="hr02" smooth="yes"/>
+      <point x="946" y="574" type="curve" smooth="yes" name="dv02"/>
+      <point x="1122" y="574" type="line" smooth="yes" name="hr02"/>
       <point x="1142" y="574"/>
       <point x="1152" y="564"/>
-      <point x="1152" y="544" type="curve" name="sh02" smooth="yes"/>
+      <point x="1152" y="544" type="curve" smooth="yes" name="sh02"/>
       <point x="1152" y="283" type="line" smooth="yes"/>
       <point x="1152" y="263"/>
       <point x="1142" y="253"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2256.glif b/source/Hack-Bold.ufo/glyphs/uni2256.glif
index 2b10f25f2..6d5159deb 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2256.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2256.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2256" format="1">
+<glyph name="uni2256" format="2">
   <advance width="1233"/>
   <unicode hex="2256"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="344" y="532" type="line" name="ih01"/>
       <point x="327" y="573"/>
       <point x="319" y="610"/>
-      <point x="319" y="642" type="curve" name="dh01" smooth="yes"/>
+      <point x="319" y="642" type="curve" smooth="yes" name="dh01"/>
       <point x="319" y="676"/>
       <point x="328" y="713"/>
       <point x="346" y="752" type="curve" name="ih02"/>
@@ -35,7 +35,7 @@
       <point x="549" y="752" type="line"/>
       <point x="514" y="720"/>
       <point x="497" y="683"/>
-      <point x="497" y="641" type="curve" name="dh02" smooth="yes"/>
+      <point x="497" y="641" type="curve" smooth="yes" name="dh02"/>
       <point x="497" y="600"/>
       <point x="514" y="564"/>
       <point x="548" y="532" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2257.glif b/source/Hack-Bold.ufo/glyphs/uni2257.glif
index 91c65783a..666ef5d5a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2257.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2257.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2257" format="1">
+<glyph name="uni2257" format="2">
   <advance width="1233"/>
   <unicode hex="2257"/>
   <outline>
     <contour>
-      <point x="614" y="1082" type="curve" name="hr00" smooth="yes"/>
+      <point x="614" y="1082" type="curve" smooth="yes" name="hr00"/>
       <point x="443" y="1082"/>
       <point x="314" y="1207"/>
-      <point x="314" y="1371" type="curve" name="sh01" smooth="yes"/>
+      <point x="314" y="1371" type="curve" smooth="yes" name="sh01"/>
       <point x="314" y="1537"/>
       <point x="449" y="1670"/>
-      <point x="617" y="1667" type="curve" name="dv04" smooth="yes"/>
+      <point x="617" y="1667" type="curve" smooth="yes" name="dv04"/>
       <point x="776" y="1664"/>
       <point x="920" y="1541"/>
-      <point x="920" y="1372" type="curve" name="sh02" smooth="yes"/>
+      <point x="920" y="1372" type="curve" smooth="yes" name="sh02"/>
       <point x="920" y="1207"/>
       <point x="784" y="1082"/>
     </contour>
     <contour>
-      <point x="617" y="1257" type="curve" name="dv07" smooth="yes"/>
+      <point x="617" y="1257" type="curve" smooth="yes" name="dv07"/>
       <point x="685" y="1257"/>
       <point x="738" y="1308"/>
-      <point x="738" y="1372" type="curve" name="ah01" smooth="yes"/>
+      <point x="738" y="1372" type="curve" smooth="yes" name="ah01"/>
       <point x="738" y="1436"/>
       <point x="684" y="1490"/>
-      <point x="616" y="1490" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1490" type="curve" smooth="yes" name="dv03"/>
       <point x="549" y="1490"/>
       <point x="496" y="1438"/>
-      <point x="496" y="1373" type="curve" name="sh03" smooth="yes"/>
+      <point x="496" y="1373" type="curve" smooth="yes" name="sh03"/>
       <point x="496" y="1308"/>
       <point x="549" y="1257"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2258.glif b/source/Hack-Bold.ufo/glyphs/uni2258.glif
index cd570298c..fd513bdcc 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2258.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2258.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2258" format="1">
+<glyph name="uni2258" format="2">
   <advance width="1233"/>
   <unicode hex="2258"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="182" y="1314" type="line" name="hr00"/>
       <point x="321" y="1415"/>
       <point x="467" y="1465"/>
-      <point x="618" y="1465" type="curve" name="dv04" smooth="yes"/>
+      <point x="618" y="1465" type="curve" smooth="yes" name="dv04"/>
       <point x="771" y="1465"/>
       <point x="915" y="1415"/>
       <point x="1050" y="1314" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2259.glif b/source/Hack-Bold.ufo/glyphs/uni2259.glif
index 2557a5fb2..ce30d748a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2259.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2259.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2259" format="1">
+<glyph name="uni2259" format="2">
   <advance width="1233"/>
   <unicode hex="2259"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni225A_.glif b/source/Hack-Bold.ufo/glyphs/uni225A_.glif
index f72663c60..226164822 100644
--- a/source/Hack-Bold.ufo/glyphs/uni225A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni225A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni225A" format="1">
+<glyph name="uni225A" format="2">
   <advance width="1233"/>
   <unicode hex="225A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni225B_.glif b/source/Hack-Bold.ufo/glyphs/uni225B_.glif
index 7193166a2..b1506d6b6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni225B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni225B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni225B" format="1">
+<glyph name="uni225B" format="2">
   <advance width="1233"/>
   <unicode hex="225B"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni225C_.glif b/source/Hack-Bold.ufo/glyphs/uni225C_.glif
index ae5906f40..e55bc3ce3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni225C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni225C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni225C" format="1">
+<glyph name="uni225C" format="2">
   <advance width="1233"/>
   <unicode hex="225C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni225D_.glif b/source/Hack-Bold.ufo/glyphs/uni225D_.glif
index 9c9681c79..1dd85122f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni225D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni225D_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni225D" format="1">
+<glyph name="uni225D" format="2">
   <advance width="1233"/>
   <unicode hex="225D"/>
   <outline>
     <contour>
-      <point x="257" y="1073" type="curve" name="sv01" smooth="yes"/>
+      <point x="257" y="1073" type="curve" smooth="yes" name="sv01"/>
       <point x="173" y="1073"/>
       <point x="116" y="1143"/>
-      <point x="116" y="1245" type="curve" name="dh01" smooth="yes"/>
+      <point x="116" y="1245" type="curve" smooth="yes" name="dh01"/>
       <point x="116" y="1346"/>
       <point x="173" y="1416"/>
-      <point x="257" y="1416" type="curve" name="sv02" smooth="yes"/>
+      <point x="257" y="1416" type="curve" smooth="yes" name="sv02"/>
       <point x="298" y="1416"/>
       <point x="333" y="1399"/>
       <point x="362" y="1360" type="curve" name="iv01"/>
@@ -30,13 +30,13 @@
       <point x="915" y="1431" type="line" smooth="yes"/>
       <point x="915" y="1503"/>
       <point x="953" y="1535"/>
-      <point x="1037" y="1535" type="curve" name="dv03" smooth="yes"/>
+      <point x="1037" y="1535" type="curve" smooth="yes" name="dv03"/>
       <point x="1117" y="1535" type="line" name="sh04"/>
       <point x="1117" y="1467" type="line"/>
       <point x="1059" y="1467" type="line" smooth="yes"/>
       <point x="1030" y="1467"/>
       <point x="1019" y="1458"/>
-      <point x="1019" y="1431" type="curve" name="sh05" smooth="yes"/>
+      <point x="1019" y="1431" type="curve" smooth="yes" name="sh05"/>
       <point x="1019" y="1408" type="line" name="hr01"/>
       <point x="1108" y="1408" type="line"/>
       <point x="1108" y="1333" type="line" name="sh03"/>
@@ -45,21 +45,21 @@
       <point x="915" y="1081" type="line" name="sv06"/>
     </contour>
     <contour>
-      <point x="676" y="1073" type="curve" name="hr02" smooth="yes"/>
+      <point x="676" y="1073" type="curve" smooth="yes" name="hr02"/>
       <point x="555" y="1073"/>
       <point x="487" y="1135"/>
-      <point x="487" y="1243" type="curve" name="dh05" smooth="yes"/>
+      <point x="487" y="1243" type="curve" smooth="yes" name="dh05"/>
       <point x="487" y="1351"/>
       <point x="556" y="1416"/>
-      <point x="664" y="1416" type="curve" name="dv05" smooth="yes"/>
+      <point x="664" y="1416" type="curve" smooth="yes" name="dv05"/>
       <point x="773" y="1416"/>
       <point x="838" y="1350"/>
-      <point x="838" y="1246" type="curve" name="dh06" smooth="yes"/>
+      <point x="838" y="1246" type="curve" smooth="yes" name="dh06"/>
       <point x="838" y="1216" type="line" name="hr03"/>
       <point x="594" y="1216" type="line"/>
       <point x="598" y="1167"/>
       <point x="629" y="1142"/>
-      <point x="686" y="1142" type="curve" name="hr04" smooth="yes"/>
+      <point x="686" y="1142" type="curve" smooth="yes" name="hr04"/>
       <point x="727" y="1142"/>
       <point x="774" y="1155"/>
       <point x="822" y="1182" type="curve" name="ih01"/>
@@ -71,22 +71,22 @@
       <point x="730" y="1280" type="line" name="dv06"/>
       <point x="730" y="1320"/>
       <point x="706" y="1346"/>
-      <point x="666" y="1346" type="curve" name="sv07" smooth="yes"/>
+      <point x="666" y="1346" type="curve" smooth="yes" name="sv07"/>
       <point x="627" y="1346"/>
       <point x="600" y="1323"/>
       <point x="595" y="1280" type="curve"/>
     </contour>
     <contour>
-      <point x="293" y="1149" type="curve" name="av01" smooth="yes"/>
+      <point x="293" y="1149" type="curve" smooth="yes" name="av01"/>
       <point x="338" y="1149"/>
       <point x="362" y="1182"/>
-      <point x="362" y="1245" type="curve" name="sh06" smooth="yes"/>
+      <point x="362" y="1245" type="curve" smooth="yes" name="sh06"/>
       <point x="362" y="1308"/>
       <point x="339" y="1340"/>
-      <point x="293" y="1340" type="curve" name="sv08" smooth="yes"/>
+      <point x="293" y="1340" type="curve" smooth="yes" name="sv08"/>
       <point x="248" y="1340"/>
       <point x="225" y="1308"/>
-      <point x="225" y="1245" type="curve" name="dh02" smooth="yes"/>
+      <point x="225" y="1245" type="curve" smooth="yes" name="dh02"/>
       <point x="225" y="1182"/>
       <point x="249" y="1149"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni225E_.glif b/source/Hack-Bold.ufo/glyphs/uni225E_.glif
index 3d78354d2..679312a1f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni225E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni225E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni225E" format="1">
+<glyph name="uni225E" format="2">
   <advance width="1233"/>
   <unicode hex="225E"/>
   <outline>
@@ -9,13 +9,13 @@
       <point x="355" y="1546" type="line" name="iv01"/>
       <point x="398" y="1609"/>
       <point x="452" y="1640"/>
-      <point x="519" y="1640" type="curve" name="sh03" smooth="yes"/>
+      <point x="519" y="1640" type="curve" smooth="yes" name="sh03"/>
       <point x="595" y="1640"/>
       <point x="655" y="1601"/>
       <point x="684" y="1536" type="curve" name="ih01"/>
       <point x="729" y="1605"/>
       <point x="790" y="1640"/>
-      <point x="865" y="1640" type="curve" name="sh05" smooth="yes"/>
+      <point x="865" y="1640" type="curve" smooth="yes" name="sh05"/>
       <point x="985" y="1640"/>
       <point x="1053" y="1561"/>
       <point x="1053" y="1412" type="curve" smooth="yes"/>
@@ -24,11 +24,11 @@
       <point x="878" y="1364" type="line"/>
       <point x="879" y="1367"/>
       <point x="879" y="1372"/>
-      <point x="879" y="1378" type="curve" name="sh07" smooth="yes"/>
+      <point x="879" y="1378" type="curve" smooth="yes" name="sh07"/>
       <point x="879" y="1397" type="line" smooth="yes"/>
       <point x="879" y="1474"/>
       <point x="858" y="1508"/>
-      <point x="807" y="1508" type="curve" name="dv03" smooth="yes"/>
+      <point x="807" y="1508" type="curve" smooth="yes" name="dv03"/>
       <point x="740" y="1508"/>
       <point x="704" y="1448"/>
       <point x="704" y="1347" type="curve" smooth="yes"/>
@@ -40,10 +40,10 @@
       <point x="514" y="1482" type="curve"/>
       <point x="503" y="1499"/>
       <point x="484" y="1508"/>
-      <point x="459" y="1508" type="curve" name="sv01" smooth="yes"/>
+      <point x="459" y="1508" type="curve" smooth="yes" name="sv01"/>
       <point x="391" y="1508"/>
       <point x="355" y="1452"/>
-      <point x="355" y="1348" type="curve" name="sh09" smooth="yes"/>
+      <point x="355" y="1348" type="curve" smooth="yes" name="sh09"/>
       <point x="355" y="1078" type="line"/>
       <point x="180" y="1078" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni225F_.glif b/source/Hack-Bold.ufo/glyphs/uni225F_.glif
index 31039fa04..f78ad8ea6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni225F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni225F_.glif
@@ -1,57 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni225F" format="1">
+<glyph name="uni225F" format="2">
   <advance width="1233"/>
   <unicode hex="225F"/>
   <outline>
     <contour>
-      <point x="492" y="1366" type="line" name="ih01" smooth="yes"/>
+      <point x="492" y="1366" type="line" smooth="yes" name="ih01"/>
       <point x="492" y="1421"/>
       <point x="506" y="1456"/>
       <point x="578" y="1520" type="curve" smooth="yes"/>
       <point x="610" y="1549" type="line" smooth="yes"/>
       <point x="646" y="1582"/>
       <point x="664" y="1614"/>
-      <point x="664" y="1646" type="curve" name="sh02" smooth="yes"/>
+      <point x="664" y="1646" type="curve" smooth="yes" name="sh02"/>
       <point x="664" y="1691"/>
       <point x="631" y="1718"/>
-      <point x="572" y="1718" type="curve" name="dv03" smooth="yes"/>
+      <point x="572" y="1718" type="curve" smooth="yes" name="dv03"/>
       <point x="520" y="1718"/>
       <point x="456" y="1696"/>
       <point x="388" y="1652" type="curve" name="dh01"/>
       <point x="388" y="1809" type="line"/>
       <point x="468" y="1837"/>
       <point x="530" y="1850"/>
-      <point x="598" y="1850" type="curve" name="dv04" smooth="yes"/>
+      <point x="598" y="1850" type="curve" smooth="yes" name="dv04"/>
       <point x="755" y="1850"/>
       <point x="845" y="1782"/>
-      <point x="845" y="1657" type="curve" name="dh02" smooth="yes"/>
+      <point x="845" y="1657" type="curve" smooth="yes" name="dh02"/>
       <point x="845" y="1592"/>
       <point x="820" y="1539"/>
       <point x="759" y="1484" type="curve" smooth="yes"/>
       <point x="727" y="1456" type="line"/>
       <point x="682" y="1414"/>
       <point x="672" y="1394"/>
-      <point x="672" y="1364" type="curve" name="sh01" smooth="yes"/>
+      <point x="672" y="1364" type="curve" smooth="yes" name="sh01"/>
       <point x="672" y="1342" type="line" name="sv01"/>
       <point x="492" y="1342" type="line"/>
     </contour>
     <contour>
-      <point x="522" y="1090" type="line" name="dv07" smooth="yes"/>
+      <point x="522" y="1090" type="line" smooth="yes" name="dv07"/>
       <point x="502" y="1090"/>
       <point x="492" y="1100"/>
-      <point x="492" y="1120" type="curve" name="sh03" smooth="yes"/>
+      <point x="492" y="1120" type="curve" smooth="yes" name="sh03"/>
       <point x="492" y="1238" type="line" smooth="yes"/>
       <point x="492" y="1258"/>
       <point x="502" y="1268"/>
-      <point x="522" y="1268" type="curve" name="dv08" smooth="yes"/>
+      <point x="522" y="1268" type="curve" smooth="yes" name="dv08"/>
       <point x="642" y="1268" type="line" smooth="yes"/>
       <point x="662" y="1268"/>
       <point x="672" y="1258"/>
-      <point x="672" y="1238" type="curve" name="sh04" smooth="yes"/>
+      <point x="672" y="1238" type="curve" smooth="yes" name="sh04"/>
       <point x="672" y="1120" type="line" smooth="yes"/>
       <point x="672" y="1100"/>
       <point x="662" y="1090"/>
-      <point x="642" y="1090" type="curve" name="hr01" smooth="yes"/>
+      <point x="642" y="1090" type="curve" smooth="yes" name="hr01"/>
     </contour>
     <contour>
       <point x="86" y="987" type="line"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2262.glif b/source/Hack-Bold.ufo/glyphs/uni2262.glif
index c7d89d4a9..6cf1b9936 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2262.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2262.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2262" format="1">
+<glyph name="uni2262" format="2">
   <advance width="1233"/>
   <unicode hex="2262"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2263.glif b/source/Hack-Bold.ufo/glyphs/uni2263.glif
index cbe33acdc..f8a298abd 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2263.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2263.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2263" format="1">
+<glyph name="uni2263" format="2">
   <advance width="1233"/>
   <unicode hex="2263"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2266.glif b/source/Hack-Bold.ufo/glyphs/uni2266.glif
index e979c06d5..04cb41d38 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2266.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2266.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2266" format="1">
+<glyph name="uni2266" format="2">
   <advance width="1233"/>
   <unicode hex="2266"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2267.glif b/source/Hack-Bold.ufo/glyphs/uni2267.glif
index 523c303a0..4cbc1cd8e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2267.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2267.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2267" format="1">
+<glyph name="uni2267" format="2">
   <advance width="1233"/>
   <unicode hex="2267"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2268.glif b/source/Hack-Bold.ufo/glyphs/uni2268.glif
index 4c20ed473..b1234094c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2268.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2268.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2268" format="1">
+<glyph name="uni2268" format="2">
   <advance width="1233"/>
   <unicode hex="2268"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2269.glif b/source/Hack-Bold.ufo/glyphs/uni2269.glif
index 99bbe802b..76d8c8079 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2269.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2269.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2269" format="1">
+<glyph name="uni2269" format="2">
   <advance width="1233"/>
   <unicode hex="2269"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni226D_.glif b/source/Hack-Bold.ufo/glyphs/uni226D_.glif
index 5c5130b6f..22c7ac471 100644
--- a/source/Hack-Bold.ufo/glyphs/uni226D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni226D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni226D" format="1">
+<glyph name="uni226D" format="2">
   <advance width="1233"/>
   <unicode hex="226D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni226E_.glif b/source/Hack-Bold.ufo/glyphs/uni226E_.glif
index 3cfad470f..77994ba7a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni226E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni226E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni226E" format="1">
+<glyph name="uni226E" format="2">
   <advance width="1233"/>
   <unicode hex="226E"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni226F_.glif b/source/Hack-Bold.ufo/glyphs/uni226F_.glif
index dec9f215b..f1a75c197 100644
--- a/source/Hack-Bold.ufo/glyphs/uni226F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni226F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni226F" format="1">
+<glyph name="uni226F" format="2">
   <advance width="1233"/>
   <unicode hex="226F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2270.glif b/source/Hack-Bold.ufo/glyphs/uni2270.glif
index 2edf75ef1..ea857e71c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2270.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2270.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2270" format="1">
+<glyph name="uni2270" format="2">
   <advance width="1233"/>
   <unicode hex="2270"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2271.glif b/source/Hack-Bold.ufo/glyphs/uni2271.glif
index acf3b58cd..a7710b97b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2271.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2271.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2271" format="1">
+<glyph name="uni2271" format="2">
   <advance width="1233"/>
   <unicode hex="2271"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2272.glif b/source/Hack-Bold.ufo/glyphs/uni2272.glif
index 617a53e19..c1c5c2cbc 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2272.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2272.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2272" format="1">
+<glyph name="uni2272" format="2">
   <advance width="1233"/>
   <unicode hex="2272"/>
   <outline>
@@ -13,21 +13,21 @@
       <point x="1145" y="287" type="line"/>
     </contour>
     <contour>
-      <point x="850" y="-78" type="curve" name="hr01" smooth="yes"/>
+      <point x="850" y="-78" type="curve" smooth="yes" name="hr01"/>
       <point x="778" y="-78"/>
       <point x="726" y="-62"/>
       <point x="645" y="-27" type="curve" smooth="yes"/>
       <point x="612" y="-13" type="line" smooth="yes"/>
       <point x="522" y="24"/>
       <point x="468" y="45"/>
-      <point x="385" y="45" type="curve" name="dv02" smooth="yes"/>
+      <point x="385" y="45" type="curve" smooth="yes" name="dv02"/>
       <point x="280" y="45"/>
       <point x="192" y="12"/>
       <point x="88" y="-76" type="curve" name="iv01"/>
       <point x="88" y="153" type="line"/>
       <point x="192" y="233"/>
       <point x="287" y="268"/>
-      <point x="390" y="268" type="curve" name="hr02" smooth="yes"/>
+      <point x="390" y="268" type="curve" smooth="yes" name="hr02"/>
       <point x="463" y="268"/>
       <point x="533" y="250"/>
       <point x="621" y="213" type="curve"/>
@@ -35,7 +35,7 @@
       <point x="652" y="199" type="line" smooth="yes"/>
       <point x="725" y="164"/>
       <point x="797" y="145"/>
-      <point x="865" y="145" type="curve" name="dv01" smooth="yes"/>
+      <point x="865" y="145" type="curve" smooth="yes" name="dv01"/>
       <point x="958" y="145"/>
       <point x="1045" y="182"/>
       <point x="1145" y="270" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2273.glif b/source/Hack-Bold.ufo/glyphs/uni2273.glif
index 9d3d58ab5..6b96876a2 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2273.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2273.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2273" format="1">
+<glyph name="uni2273" format="2">
   <advance width="1233"/>
   <unicode hex="2273"/>
   <outline>
@@ -13,21 +13,21 @@
       <point x="88" y="287" type="line"/>
     </contour>
     <contour>
-      <point x="850" y="-78" type="curve" name="hr01" smooth="yes"/>
+      <point x="850" y="-78" type="curve" smooth="yes" name="hr01"/>
       <point x="778" y="-78"/>
       <point x="726" y="-62"/>
       <point x="645" y="-27" type="curve" smooth="yes"/>
       <point x="612" y="-13" type="line" smooth="yes"/>
       <point x="522" y="24"/>
       <point x="468" y="45"/>
-      <point x="385" y="45" type="curve" name="dv02" smooth="yes"/>
+      <point x="385" y="45" type="curve" smooth="yes" name="dv02"/>
       <point x="280" y="45"/>
       <point x="192" y="12"/>
       <point x="88" y="-76" type="curve" name="iv01"/>
       <point x="88" y="153" type="line"/>
       <point x="192" y="233"/>
       <point x="287" y="268"/>
-      <point x="390" y="268" type="curve" name="hr02" smooth="yes"/>
+      <point x="390" y="268" type="curve" smooth="yes" name="hr02"/>
       <point x="463" y="268"/>
       <point x="533" y="250"/>
       <point x="621" y="213" type="curve"/>
@@ -35,7 +35,7 @@
       <point x="652" y="199" type="line" smooth="yes"/>
       <point x="725" y="164"/>
       <point x="797" y="145"/>
-      <point x="865" y="145" type="curve" name="dv01" smooth="yes"/>
+      <point x="865" y="145" type="curve" smooth="yes" name="dv01"/>
       <point x="958" y="145"/>
       <point x="1045" y="182"/>
       <point x="1145" y="270" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2274.glif b/source/Hack-Bold.ufo/glyphs/uni2274.glif
index 31de81180..0692c16ac 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2274.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2274.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2274" format="1">
+<glyph name="uni2274" format="2">
   <advance width="1233"/>
   <unicode hex="2274"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="88" y="153" type="line"/>
       <point x="192" y="233"/>
       <point x="285" y="268"/>
-      <point x="393" y="268" type="curve" name="dv04" smooth="yes"/>
+      <point x="393" y="268" type="curve" smooth="yes" name="dv04"/>
       <point x="410" y="268"/>
       <point x="427" y="267"/>
       <point x="444" y="265" type="curve" name="sv01"/>
@@ -34,14 +34,14 @@
       <point x="652" y="199" type="line" smooth="yes"/>
       <point x="727" y="164"/>
       <point x="798" y="145"/>
-      <point x="865" y="145" type="curve" name="dv02" smooth="yes"/>
+      <point x="865" y="145" type="curve" smooth="yes" name="dv02"/>
       <point x="960" y="145"/>
       <point x="1045" y="182"/>
       <point x="1145" y="270" type="curve" name="iv05"/>
       <point x="1145" y="36" type="line"/>
       <point x="1049" y="-40"/>
       <point x="951" y="-78"/>
-      <point x="852" y="-78" type="curve" name="dv01" smooth="yes"/>
+      <point x="852" y="-78" type="curve" smooth="yes" name="dv01"/>
       <point x="787" y="-78"/>
       <point x="726" y="-63"/>
       <point x="645" y="-27" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2275.glif b/source/Hack-Bold.ufo/glyphs/uni2275.glif
index 002aa4eda..2b24c2cf7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2275.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2275.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2275" format="1">
+<glyph name="uni2275" format="2">
   <advance width="1233"/>
   <unicode hex="2275"/>
   <outline>
@@ -38,14 +38,14 @@
       <point x="652" y="199" type="line" smooth="yes"/>
       <point x="729" y="163"/>
       <point x="800" y="145"/>
-      <point x="865" y="145" type="curve" name="dv02" smooth="yes"/>
+      <point x="865" y="145" type="curve" smooth="yes" name="dv02"/>
       <point x="960" y="145"/>
       <point x="1045" y="182"/>
       <point x="1145" y="270" type="curve" name="iv06"/>
       <point x="1145" y="36" type="line"/>
       <point x="1045" y="-44"/>
       <point x="953" y="-78"/>
-      <point x="850" y="-78" type="curve" name="dv01" smooth="yes"/>
+      <point x="850" y="-78" type="curve" smooth="yes" name="dv01"/>
       <point x="778" y="-78"/>
       <point x="726" y="-62"/>
       <point x="645" y="-27" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2276.glif b/source/Hack-Bold.ufo/glyphs/uni2276.glif
index 27911c9b1..18593a82c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2276.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2276.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2276" format="1">
+<glyph name="uni2276" format="2">
   <advance width="1233"/>
   <unicode hex="2276"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2277.glif b/source/Hack-Bold.ufo/glyphs/uni2277.glif
index 71243c601..b2df02af9 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2277.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2277.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2277" format="1">
+<glyph name="uni2277" format="2">
   <advance width="1233"/>
   <unicode hex="2277"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2278.glif b/source/Hack-Bold.ufo/glyphs/uni2278.glif
index e66d77f3c..3cfea8d27 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2278.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2278.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2278" format="1">
+<glyph name="uni2278" format="2">
   <advance width="1233"/>
   <unicode hex="2278"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2279.glif b/source/Hack-Bold.ufo/glyphs/uni2279.glif
index cdb6d4c78..be45993b1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2279.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2279.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2279" format="1">
+<glyph name="uni2279" format="2">
   <advance width="1233"/>
   <unicode hex="2279"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni227A_.glif b/source/Hack-Bold.ufo/glyphs/uni227A_.glif
index 279616087..0b12efbce 100644
--- a/source/Hack-Bold.ufo/glyphs/uni227A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni227A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni227A" format="1">
+<glyph name="uni227A" format="2">
   <advance width="1233"/>
   <unicode hex="227A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni227B_.glif b/source/Hack-Bold.ufo/glyphs/uni227B_.glif
index ff669e8d8..91bda208e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni227B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni227B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni227B" format="1">
+<glyph name="uni227B" format="2">
   <advance width="1233"/>
   <unicode hex="227B"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni227C_.glif b/source/Hack-Bold.ufo/glyphs/uni227C_.glif
index 08547d55c..e73f02dae 100644
--- a/source/Hack-Bold.ufo/glyphs/uni227C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni227C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni227C" format="1">
+<glyph name="uni227C" format="2">
   <advance width="1233"/>
   <unicode hex="227C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni227D_.glif b/source/Hack-Bold.ufo/glyphs/uni227D_.glif
index 14c978ba1..d0f4864a5 100644
--- a/source/Hack-Bold.ufo/glyphs/uni227D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni227D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni227D" format="1">
+<glyph name="uni227D" format="2">
   <advance width="1233"/>
   <unicode hex="227D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni227E_.glif b/source/Hack-Bold.ufo/glyphs/uni227E_.glif
index 6663ca46f..99590973a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni227E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni227E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni227E" format="1">
+<glyph name="uni227E" format="2">
   <advance width="1233"/>
   <unicode hex="227E"/>
   <outline>
@@ -21,21 +21,21 @@
       <point x="1145" y="485" type="curve"/>
     </contour>
     <contour>
-      <point x="850" y="-206" type="curve" name="hr01" smooth="yes"/>
+      <point x="850" y="-206" type="curve" smooth="yes" name="hr01"/>
       <point x="778" y="-206"/>
       <point x="726" y="-190"/>
       <point x="645" y="-155" type="curve" smooth="yes"/>
       <point x="612" y="-141" type="line" smooth="yes"/>
       <point x="522" y="-104"/>
       <point x="468" y="-83"/>
-      <point x="385" y="-83" type="curve" name="dv02" smooth="yes"/>
+      <point x="385" y="-83" type="curve" smooth="yes" name="dv02"/>
       <point x="280" y="-83"/>
       <point x="192" y="-116"/>
       <point x="88" y="-204" type="curve" name="iv01"/>
       <point x="88" y="25" type="line"/>
       <point x="192" y="105"/>
       <point x="287" y="140"/>
-      <point x="390" y="140" type="curve" name="hr02" smooth="yes"/>
+      <point x="390" y="140" type="curve" smooth="yes" name="hr02"/>
       <point x="463" y="140"/>
       <point x="533" y="122"/>
       <point x="621" y="85" type="curve"/>
@@ -43,7 +43,7 @@
       <point x="652" y="71" type="line" smooth="yes"/>
       <point x="725" y="36"/>
       <point x="797" y="17"/>
-      <point x="865" y="17" type="curve" name="dv01" smooth="yes"/>
+      <point x="865" y="17" type="curve" smooth="yes" name="dv01"/>
       <point x="958" y="17"/>
       <point x="1045" y="54"/>
       <point x="1145" y="142" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni227F_.glif b/source/Hack-Bold.ufo/glyphs/uni227F_.glif
index d6208bf17..e74437eb3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni227F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni227F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni227F" format="1">
+<glyph name="uni227F" format="2">
   <advance width="1233"/>
   <unicode hex="227F"/>
   <outline>
@@ -21,21 +21,21 @@
       <point x="88" y="147" type="curve"/>
     </contour>
     <contour>
-      <point x="850" y="-206" type="curve" name="hr01" smooth="yes"/>
+      <point x="850" y="-206" type="curve" smooth="yes" name="hr01"/>
       <point x="778" y="-206"/>
       <point x="726" y="-190"/>
       <point x="645" y="-155" type="curve" smooth="yes"/>
       <point x="612" y="-141" type="line" smooth="yes"/>
       <point x="522" y="-104"/>
       <point x="468" y="-83"/>
-      <point x="385" y="-83" type="curve" name="dv02" smooth="yes"/>
+      <point x="385" y="-83" type="curve" smooth="yes" name="dv02"/>
       <point x="280" y="-83"/>
       <point x="192" y="-116"/>
       <point x="88" y="-204" type="curve" name="iv01"/>
       <point x="88" y="25" type="line"/>
       <point x="192" y="105"/>
       <point x="287" y="140"/>
-      <point x="390" y="140" type="curve" name="hr02" smooth="yes"/>
+      <point x="390" y="140" type="curve" smooth="yes" name="hr02"/>
       <point x="463" y="140"/>
       <point x="533" y="122"/>
       <point x="621" y="85" type="curve"/>
@@ -43,7 +43,7 @@
       <point x="652" y="71" type="line" smooth="yes"/>
       <point x="725" y="36"/>
       <point x="797" y="17"/>
-      <point x="865" y="17" type="curve" name="dv01" smooth="yes"/>
+      <point x="865" y="17" type="curve" smooth="yes" name="dv01"/>
       <point x="958" y="17"/>
       <point x="1045" y="54"/>
       <point x="1145" y="142" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2280.glif b/source/Hack-Bold.ufo/glyphs/uni2280.glif
index 5e371cc13..92268cf33 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2280.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2280.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2280" format="1">
+<glyph name="uni2280" format="2">
   <advance width="1233"/>
   <unicode hex="2280"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2281.glif b/source/Hack-Bold.ufo/glyphs/uni2281.glif
index 55439594e..942aef471 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2281.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2281.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2281" format="1">
+<glyph name="uni2281" format="2">
   <advance width="1233"/>
   <unicode hex="2281"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2285.glif b/source/Hack-Bold.ufo/glyphs/uni2285.glif
index b1fbf0f00..a7b5fe465 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2285.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2285.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2285" format="1">
+<glyph name="uni2285" format="2">
   <advance width="1233"/>
   <unicode hex="2285"/>
   <outline>
@@ -24,18 +24,18 @@
       <point x="1003" y="1003" type="curve" smooth="yes"/>
       <point x="1099" y="902"/>
       <point x="1145" y="778"/>
-      <point x="1145" y="642" type="curve" name="dh02" smooth="yes"/>
+      <point x="1145" y="642" type="curve" smooth="yes" name="dh02"/>
       <point x="1145" y="353"/>
       <point x="930" y="139"/>
-      <point x="658" y="139" type="curve" name="sv03" smooth="yes"/>
+      <point x="658" y="139" type="curve" smooth="yes" name="sv03"/>
       <point x="524" y="139" type="line"/>
       <point x="425" y="-118" type="line" name="av02"/>
     </contour>
     <contour>
-      <point x="658" y="364" type="line" name="sv04" smooth="yes"/>
+      <point x="658" y="364" type="line" smooth="yes" name="sv04"/>
       <point x="805" y="364"/>
       <point x="920" y="475"/>
-      <point x="920" y="646" type="curve" name="dh01" smooth="yes"/>
+      <point x="920" y="646" type="curve" smooth="yes" name="dh01"/>
       <point x="920" y="725"/>
       <point x="896" y="791"/>
       <point x="844" y="843" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2288.glif b/source/Hack-Bold.ufo/glyphs/uni2288.glif
index 70e0b16d6..7e02dc9c3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2288.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2288.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2288" format="1">
+<glyph name="uni2288" format="2">
   <advance width="1233"/>
   <unicode hex="2288"/>
   <outline>
@@ -15,10 +15,10 @@
       <point x="230" y="457" type="curve" smooth="yes"/>
       <point x="137" y="557"/>
       <point x="88" y="679"/>
-      <point x="88" y="818" type="curve" name="dh01" smooth="yes"/>
+      <point x="88" y="818" type="curve" smooth="yes" name="dh01"/>
       <point x="88" y="1107"/>
       <point x="303" y="1321"/>
-      <point x="575" y="1321" type="curve" name="sv01" smooth="yes"/>
+      <point x="575" y="1321" type="curve" smooth="yes" name="sv01"/>
       <point x="741" y="1321" type="line"/>
       <point x="808" y="1494" type="line" name="at01"/>
       <point x="987" y="1425" type="line"/>
@@ -42,7 +42,7 @@
       <point x="575" y="1096" type="line" smooth="yes"/>
       <point x="428" y="1096"/>
       <point x="313" y="985"/>
-      <point x="313" y="814" type="curve" name="dh02" smooth="yes"/>
+      <point x="313" y="814" type="curve" smooth="yes" name="dh02"/>
       <point x="313" y="733"/>
       <point x="338" y="668"/>
       <point x="389" y="617" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2289.glif b/source/Hack-Bold.ufo/glyphs/uni2289.glif
index a43ba9cf4..4998cb91f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2289.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2289.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2289" format="1">
+<glyph name="uni2289" format="2">
   <advance width="1233"/>
   <unicode hex="2289"/>
   <outline>
@@ -16,7 +16,7 @@
       <point x="654" y="1096" type="line" name="dv03"/>
       <point x="88" y="1096" type="line"/>
       <point x="88" y="1321" type="line"/>
-      <point x="658" y="1321" type="line" name="dv04" smooth="yes"/>
+      <point x="658" y="1321" type="line" smooth="yes" name="dv04"/>
       <point x="686" y="1321"/>
       <point x="713" y="1319"/>
       <point x="739" y="1315" type="curve" name="sv01"/>
@@ -28,10 +28,10 @@
       <point x="1004" y="1179" type="curve" smooth="yes"/>
       <point x="1100" y="1082"/>
       <point x="1145" y="947"/>
-      <point x="1145" y="816" type="curve" name="dh02" smooth="yes"/>
+      <point x="1145" y="816" type="curve" smooth="yes" name="dh02"/>
       <point x="1145" y="541"/>
       <point x="944" y="315"/>
-      <point x="657" y="315" type="curve" name="sv02" smooth="yes"/>
+      <point x="657" y="315" type="curve" smooth="yes" name="sv02"/>
       <point x="561" y="315" type="line"/>
       <point x="516" y="198" type="line" name="sv03"/>
       <point x="1145" y="198" type="line" name="sh01"/>
@@ -40,10 +40,10 @@
       <point x="349" y="-236" type="line" name="av01"/>
     </contour>
     <contour>
-      <point x="658" y="540" type="line" name="sv05" smooth="yes"/>
+      <point x="658" y="540" type="line" smooth="yes" name="sv05"/>
       <point x="803" y="540"/>
       <point x="920" y="649"/>
-      <point x="920" y="821" type="curve" name="dh01" smooth="yes"/>
+      <point x="920" y="821" type="curve" smooth="yes" name="dh01"/>
       <point x="920" y="901"/>
       <point x="895" y="968"/>
       <point x="844" y="1019" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni228A_.glif b/source/Hack-Bold.ufo/glyphs/uni228A_.glif
index 46c98c3d1..4965984a1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni228A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni228A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni228A" format="1">
+<glyph name="uni228A" format="2">
   <advance width="1233"/>
   <unicode hex="228A"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="88" y="198" type="line"/>
       <point x="560" y="198" type="line" name="dv02"/>
       <point x="654" y="315" type="line"/>
-      <point x="576" y="315" type="line" name="dv05" smooth="yes"/>
+      <point x="576" y="315" type="line" smooth="yes" name="dv05"/>
       <point x="289" y="315"/>
       <point x="88" y="541"/>
-      <point x="88" y="819" type="curve" name="dh01" smooth="yes"/>
+      <point x="88" y="819" type="curve" smooth="yes" name="dh01"/>
       <point x="88" y="1106"/>
       <point x="303" y="1321"/>
       <point x="575" y="1321" type="curve" smooth="yes"/>
@@ -22,10 +22,10 @@
       <point x="575" y="1096" type="line" smooth="yes"/>
       <point x="428" y="1096"/>
       <point x="313" y="983"/>
-      <point x="313" y="818" type="curve" name="dh02" smooth="yes"/>
+      <point x="313" y="818" type="curve" smooth="yes" name="dh02"/>
       <point x="313" y="650"/>
       <point x="431" y="540"/>
-      <point x="575" y="540" type="curve" name="dv06" smooth="yes"/>
+      <point x="575" y="540" type="curve" smooth="yes" name="dv06"/>
       <point x="1145" y="540" type="line"/>
       <point x="1145" y="315" type="line" name="sv02"/>
       <point x="856" y="315" type="line"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni228B_.glif b/source/Hack-Bold.ufo/glyphs/uni228B_.glif
index 0064a3f27..85ea59fb4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni228B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni228B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni228B" format="1">
+<glyph name="uni228B" format="2">
   <advance width="1233"/>
   <unicode hex="228B"/>
   <outline>
@@ -12,19 +12,19 @@
       <point x="654" y="315" type="line" name="dv05"/>
       <point x="88" y="315" type="line"/>
       <point x="88" y="540" type="line"/>
-      <point x="658" y="540" type="line" name="dv06" smooth="yes"/>
+      <point x="658" y="540" type="line" smooth="yes" name="dv06"/>
       <point x="802" y="540"/>
       <point x="920" y="650"/>
-      <point x="920" y="818" type="curve" name="dh01" smooth="yes"/>
+      <point x="920" y="818" type="curve" smooth="yes" name="dh01"/>
       <point x="920" y="983"/>
       <point x="805" y="1096"/>
-      <point x="658" y="1096" type="curve" name="dv03" smooth="yes"/>
+      <point x="658" y="1096" type="curve" smooth="yes" name="dv03"/>
       <point x="88" y="1096" type="line"/>
       <point x="88" y="1321" type="line"/>
-      <point x="658" y="1321" type="line" name="dv04" smooth="yes"/>
+      <point x="658" y="1321" type="line" smooth="yes" name="dv04"/>
       <point x="930" y="1321"/>
       <point x="1145" y="1107"/>
-      <point x="1145" y="817" type="curve" name="dh02" smooth="yes"/>
+      <point x="1145" y="817" type="curve" smooth="yes" name="dh02"/>
       <point x="1145" y="684"/>
       <point x="1100" y="561"/>
       <point x="1003" y="457" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni228D_.glif b/source/Hack-Bold.ufo/glyphs/uni228D_.glif
index 4cac46241..89e558b28 100644
--- a/source/Hack-Bold.ufo/glyphs/uni228D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni228D_.glif
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni228D" format="1">
+<glyph name="uni228D" format="2">
   <advance width="1233"/>
   <unicode hex="228D"/>
   <outline>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="232" y="-29"/>
       <point x="90" y="134"/>
-      <point x="90" y="582" type="curve" name="dh01" smooth="yes"/>
+      <point x="90" y="582" type="curve" smooth="yes" name="dh01"/>
       <point x="90" y="1284" type="line" name="av01"/>
       <point x="328" y="1284" type="line"/>
-      <point x="328" y="602" type="line" name="dh02" smooth="yes"/>
+      <point x="328" y="602" type="line" smooth="yes" name="dh02"/>
       <point x="328" y="291"/>
       <point x="392" y="214"/>
-      <point x="616" y="214" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="214" type="curve" smooth="yes" name="dv01"/>
       <point x="840" y="214"/>
       <point x="905" y="293"/>
-      <point x="905" y="602" type="curve" name="dh05" smooth="yes"/>
+      <point x="905" y="602" type="curve" smooth="yes" name="dh05"/>
       <point x="905" y="1284" type="line" name="av02"/>
       <point x="1143" y="1284" type="line"/>
-      <point x="1143" y="582" type="line" name="dh06" smooth="yes"/>
+      <point x="1143" y="582" type="line" smooth="yes" name="dh06"/>
       <point x="1143" y="134"/>
       <point x="999" y="-29"/>
     </contour>
     <contour>
-      <point x="519" y="500" type="line" name="dv02" smooth="yes"/>
+      <point x="519" y="500" type="line" smooth="yes" name="dv02"/>
       <point x="499" y="500"/>
       <point x="489" y="510"/>
-      <point x="489" y="530" type="curve" name="dh03" smooth="yes"/>
+      <point x="489" y="530" type="curve" smooth="yes" name="dh03"/>
       <point x="489" y="735" type="line" smooth="yes"/>
       <point x="489" y="755"/>
       <point x="499" y="765"/>
-      <point x="519" y="765" type="curve" name="dv03" smooth="yes"/>
+      <point x="519" y="765" type="curve" smooth="yes" name="dv03"/>
       <point x="712" y="765" type="line" smooth="yes"/>
       <point x="732" y="765"/>
       <point x="742" y="755"/>
       <point x="742" y="735" type="curve" smooth="yes"/>
-      <point x="742" y="530" type="line" name="dh04" smooth="yes"/>
+      <point x="742" y="530" type="line" smooth="yes" name="dh04"/>
       <point x="742" y="510"/>
       <point x="732" y="500"/>
       <point x="712" y="500" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni228E_.glif b/source/Hack-Bold.ufo/glyphs/uni228E_.glif
index 5a68d132e..4c7fdc777 100644
--- a/source/Hack-Bold.ufo/glyphs/uni228E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni228E_.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni228E" format="1">
+<glyph name="uni228E" format="2">
   <advance width="1233"/>
   <unicode hex="228E"/>
   <outline>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="232" y="-29"/>
       <point x="90" y="134"/>
-      <point x="90" y="582" type="curve" name="dh01" smooth="yes"/>
+      <point x="90" y="582" type="curve" smooth="yes" name="dh01"/>
       <point x="90" y="1284" type="line" name="av01"/>
       <point x="328" y="1284" type="line"/>
-      <point x="328" y="602" type="line" name="dh02" smooth="yes"/>
+      <point x="328" y="602" type="line" smooth="yes" name="dh02"/>
       <point x="328" y="291"/>
       <point x="392" y="214"/>
-      <point x="616" y="214" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="214" type="curve" smooth="yes" name="dv01"/>
       <point x="840" y="214"/>
       <point x="905" y="293"/>
-      <point x="905" y="602" type="curve" name="dh05" smooth="yes"/>
+      <point x="905" y="602" type="curve" smooth="yes" name="dh05"/>
       <point x="905" y="1284" type="line" name="av02"/>
       <point x="1143" y="1284" type="line"/>
-      <point x="1143" y="582" type="line" name="dh06" smooth="yes"/>
+      <point x="1143" y="582" type="line" smooth="yes" name="dh06"/>
       <point x="1143" y="134"/>
       <point x="999" y="-29"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni228F_.glif b/source/Hack-Bold.ufo/glyphs/uni228F_.glif
index 3ce7872ec..2ba909164 100644
--- a/source/Hack-Bold.ufo/glyphs/uni228F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni228F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni228F" format="1">
+<glyph name="uni228F" format="2">
   <advance width="1233"/>
   <unicode hex="228F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2290.glif b/source/Hack-Bold.ufo/glyphs/uni2290.glif
index b903de39c..36c6d8a40 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2290.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2290.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2290" format="1">
+<glyph name="uni2290" format="2">
   <advance width="1233"/>
   <unicode hex="2290"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2291.glif b/source/Hack-Bold.ufo/glyphs/uni2291.glif
index fb312e330..a44615bc8 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2291.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2291.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2291" format="1">
+<glyph name="uni2291" format="2">
   <advance width="1233"/>
   <unicode hex="2291"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2292.glif b/source/Hack-Bold.ufo/glyphs/uni2292.glif
index f3de0fba1..2bcd77157 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2292.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2292.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2292" format="1">
+<glyph name="uni2292" format="2">
   <advance width="1233"/>
   <unicode hex="2292"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2293.glif b/source/Hack-Bold.ufo/glyphs/uni2293.glif
index f53b75fed..fc807f691 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2293.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2293.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2293" format="1">
+<glyph name="uni2293" format="2">
   <advance width="1233"/>
   <unicode hex="2293"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2294.glif b/source/Hack-Bold.ufo/glyphs/uni2294.glif
index 8b3785775..cb29aae10 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2294.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2294.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2294" format="1">
+<glyph name="uni2294" format="2">
   <advance width="1233"/>
   <unicode hex="2294"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2296.glif b/source/Hack-Bold.ufo/glyphs/uni2296.glif
index f6ac4f3cb..629ef5bb2 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2296.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2296.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2296" format="1">
+<glyph name="uni2296" format="2">
   <advance width="1233"/>
   <unicode hex="2296"/>
   <outline>
     <contour>
-      <point x="617" y="52" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="52" type="curve" smooth="yes" name="hr00"/>
       <point x="448" y="52"/>
       <point x="302" y="121"/>
       <point x="198" y="225" type="curve" smooth="yes"/>
       <point x="82" y="341"/>
       <point x="26" y="488"/>
-      <point x="26" y="643" type="curve" name="sh01" smooth="yes"/>
+      <point x="26" y="643" type="curve" smooth="yes" name="sh01"/>
       <point x="26" y="810"/>
       <point x="90" y="954"/>
       <point x="198" y="1061" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="391" y="1191" type="curve" smooth="yes"/>
       <point x="461" y="1220"/>
       <point x="536" y="1235"/>
-      <point x="615" y="1235" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1235" type="curve" smooth="yes" name="dv03"/>
       <point x="772" y="1235"/>
       <point x="922" y="1175"/>
       <point x="1035" y="1062" type="curve" smooth="yes"/>
       <point x="1140" y="957"/>
       <point x="1207" y="810"/>
-      <point x="1207" y="643" type="curve" name="sh02" smooth="yes"/>
+      <point x="1207" y="643" type="curve" smooth="yes" name="sh02"/>
       <point x="1207" y="487"/>
       <point x="1150" y="340"/>
       <point x="1035" y="225" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="786" y="52"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="533"/>
-      <point x="1012" y="646" type="curve" name="ah01" smooth="yes"/>
+      <point x="1012" y="646" type="curve" smooth="yes" name="ah01"/>
       <point x="1012" y="747"/>
       <point x="977" y="844"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="412" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2298.glif b/source/Hack-Bold.ufo/glyphs/uni2298.glif
index d085aea82..cff7bbc33 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2298.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2298.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2298" format="1">
+<glyph name="uni2298" format="2">
   <advance width="1233"/>
   <unicode hex="2298"/>
   <outline>
     <contour>
-      <point x="617" y="52" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="52" type="curve" smooth="yes" name="hr00"/>
       <point x="448" y="52"/>
       <point x="302" y="121"/>
       <point x="198" y="225" type="curve" smooth="yes"/>
       <point x="82" y="341"/>
       <point x="26" y="488"/>
-      <point x="26" y="643" type="curve" name="sh01" smooth="yes"/>
+      <point x="26" y="643" type="curve" smooth="yes" name="sh01"/>
       <point x="26" y="810"/>
       <point x="90" y="954"/>
       <point x="198" y="1061" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="391" y="1191" type="curve" smooth="yes"/>
       <point x="461" y="1220"/>
       <point x="536" y="1235"/>
-      <point x="615" y="1235" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1235" type="curve" smooth="yes" name="dv03"/>
       <point x="772" y="1235"/>
       <point x="922" y="1175"/>
       <point x="1035" y="1062" type="curve" smooth="yes"/>
       <point x="1140" y="957"/>
       <point x="1207" y="810"/>
-      <point x="1207" y="643" type="curve" name="sh02" smooth="yes"/>
+      <point x="1207" y="643" type="curve" smooth="yes" name="sh02"/>
       <point x="1207" y="487"/>
       <point x="1150" y="340"/>
       <point x="1035" y="225" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="786" y="52"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="533"/>
-      <point x="1012" y="646" type="curve" name="ah01" smooth="yes"/>
+      <point x="1012" y="646" type="curve" smooth="yes" name="ah01"/>
       <point x="1012" y="747"/>
       <point x="977" y="844"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="412" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2299.glif b/source/Hack-Bold.ufo/glyphs/uni2299.glif
index 4fac4b927..cd58b4d49 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2299.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2299.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2299" format="1">
+<glyph name="uni2299" format="2">
   <advance width="1233"/>
   <unicode hex="2299"/>
   <outline>
     <contour>
-      <point x="617" y="52" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="52" type="curve" smooth="yes" name="hr00"/>
       <point x="448" y="52"/>
       <point x="302" y="121"/>
       <point x="198" y="225" type="curve" smooth="yes"/>
       <point x="82" y="341"/>
       <point x="26" y="488"/>
-      <point x="26" y="643" type="curve" name="dh01" smooth="yes"/>
+      <point x="26" y="643" type="curve" smooth="yes" name="dh01"/>
       <point x="26" y="810"/>
       <point x="90" y="954"/>
       <point x="198" y="1061" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="391" y="1191" type="curve" smooth="yes"/>
       <point x="461" y="1220"/>
       <point x="536" y="1235"/>
-      <point x="615" y="1235" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1235" type="curve" smooth="yes" name="dv03"/>
       <point x="772" y="1235"/>
       <point x="922" y="1175"/>
       <point x="1035" y="1062" type="curve" smooth="yes"/>
       <point x="1140" y="957"/>
       <point x="1207" y="810"/>
-      <point x="1207" y="643" type="curve" name="dh06" smooth="yes"/>
+      <point x="1207" y="643" type="curve" smooth="yes" name="dh06"/>
       <point x="1207" y="487"/>
       <point x="1150" y="340"/>
       <point x="1035" y="225" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="786" y="52"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="533"/>
-      <point x="1012" y="646" type="curve" name="dh05" smooth="yes"/>
+      <point x="1012" y="646" type="curve" smooth="yes" name="dh05"/>
       <point x="1012" y="747"/>
       <point x="977" y="844"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="412" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="dh02" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="dh02"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni229A_.glif b/source/Hack-Bold.ufo/glyphs/uni229A_.glif
index 4324aaa3b..932cf9a62 100644
--- a/source/Hack-Bold.ufo/glyphs/uni229A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni229A_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni229A" format="1">
+<glyph name="uni229A" format="2">
   <advance width="1233"/>
   <unicode hex="229A"/>
   <outline>
     <contour>
-      <point x="617" y="52" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="52" type="curve" smooth="yes" name="hr00"/>
       <point x="448" y="52"/>
       <point x="302" y="121"/>
       <point x="198" y="225" type="curve" smooth="yes"/>
       <point x="82" y="341"/>
       <point x="26" y="488"/>
-      <point x="26" y="643" type="curve" name="dh01" smooth="yes"/>
+      <point x="26" y="643" type="curve" smooth="yes" name="dh01"/>
       <point x="26" y="810"/>
       <point x="90" y="954"/>
       <point x="198" y="1061" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="391" y="1191" type="curve" smooth="yes"/>
       <point x="461" y="1220"/>
       <point x="536" y="1235"/>
-      <point x="615" y="1235" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1235" type="curve" smooth="yes" name="dv03"/>
       <point x="772" y="1235"/>
       <point x="922" y="1175"/>
       <point x="1035" y="1062" type="curve" smooth="yes"/>
       <point x="1140" y="957"/>
       <point x="1207" y="810"/>
-      <point x="1207" y="643" type="curve" name="dh08" smooth="yes"/>
+      <point x="1207" y="643" type="curve" smooth="yes" name="dh08"/>
       <point x="1207" y="487"/>
       <point x="1150" y="340"/>
       <point x="1035" y="225" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="786" y="52"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="533"/>
-      <point x="1012" y="646" type="curve" name="dh07" smooth="yes"/>
+      <point x="1012" y="646" type="curve" smooth="yes" name="dh07"/>
       <point x="1012" y="747"/>
       <point x="977" y="844"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="412" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="dh02" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="dh02"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
@@ -62,36 +62,36 @@
       <point x="509" y="246"/>
     </contour>
     <contour>
-      <point x="614" y="378" type="curve" name="dv04" smooth="yes"/>
+      <point x="614" y="378" type="curve" smooth="yes" name="dv04"/>
       <point x="463" y="378"/>
       <point x="350" y="492"/>
-      <point x="350" y="641" type="curve" name="dh03" smooth="yes"/>
+      <point x="350" y="641" type="curve" smooth="yes" name="dh03"/>
       <point x="350" y="793"/>
       <point x="467" y="911"/>
-      <point x="616" y="911" type="curve" name="dv07" smooth="yes"/>
+      <point x="616" y="911" type="curve" smooth="yes" name="dv07"/>
       <point x="689" y="911"/>
       <point x="757" y="883"/>
       <point x="806" y="831" type="curve"/>
       <point x="857" y="782"/>
       <point x="883" y="717"/>
-      <point x="883" y="645" type="curve" name="dh06" smooth="yes"/>
+      <point x="883" y="645" type="curve" smooth="yes" name="dh06"/>
       <point x="883" y="493"/>
       <point x="765" y="378"/>
     </contour>
     <contour>
-      <point x="615" y="538" type="curve" name="dv05" smooth="yes"/>
+      <point x="615" y="538" type="curve" smooth="yes" name="dv05"/>
       <point x="675" y="538"/>
       <point x="723" y="584"/>
-      <point x="723" y="644" type="curve" name="dh05" smooth="yes"/>
+      <point x="723" y="644" type="curve" smooth="yes" name="dh05"/>
       <point x="723" y="671"/>
       <point x="715" y="696"/>
       <point x="692" y="719" type="curve" smooth="yes"/>
       <point x="671" y="740"/>
       <point x="646" y="750"/>
-      <point x="617" y="750" type="curve" name="dv06" smooth="yes"/>
+      <point x="617" y="750" type="curve" smooth="yes" name="dv06"/>
       <point x="556" y="750"/>
       <point x="510" y="703"/>
-      <point x="510" y="643" type="curve" name="dh04" smooth="yes"/>
+      <point x="510" y="643" type="curve" smooth="yes" name="dh04"/>
       <point x="510" y="583"/>
       <point x="556" y="538"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni229B_.glif b/source/Hack-Bold.ufo/glyphs/uni229B_.glif
index 7a5a5f32b..fc64362ad 100644
--- a/source/Hack-Bold.ufo/glyphs/uni229B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni229B_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni229B" format="1">
+<glyph name="uni229B" format="2">
   <advance width="1233"/>
   <unicode hex="229B"/>
   <outline>
     <contour>
-      <point x="617" y="52" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="52" type="curve" smooth="yes" name="hr00"/>
       <point x="448" y="52"/>
       <point x="302" y="121"/>
       <point x="198" y="225" type="curve" smooth="yes"/>
       <point x="82" y="341"/>
       <point x="26" y="488"/>
-      <point x="26" y="643" type="curve" name="dh01" smooth="yes"/>
+      <point x="26" y="643" type="curve" smooth="yes" name="dh01"/>
       <point x="26" y="810"/>
       <point x="90" y="954"/>
       <point x="198" y="1061" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="391" y="1191" type="curve" smooth="yes"/>
       <point x="461" y="1220"/>
       <point x="536" y="1235"/>
-      <point x="615" y="1235" type="curve" name="av01" smooth="yes"/>
+      <point x="615" y="1235" type="curve" smooth="yes" name="av01"/>
       <point x="772" y="1235"/>
       <point x="922" y="1175"/>
       <point x="1035" y="1062" type="curve" smooth="yes"/>
       <point x="1140" y="957"/>
       <point x="1207" y="810"/>
-      <point x="1207" y="643" type="curve" name="dh06" smooth="yes"/>
+      <point x="1207" y="643" type="curve" smooth="yes" name="dh06"/>
       <point x="1207" y="487"/>
       <point x="1150" y="340"/>
       <point x="1035" y="225" type="curve" smooth="yes"/>
@@ -62,7 +62,7 @@
       <point x="994" y="519" type="line"/>
       <point x="1006" y="558"/>
       <point x="1012" y="599"/>
-      <point x="1012" y="644" type="curve" name="dh05" smooth="yes"/>
+      <point x="1012" y="644" type="curve" smooth="yes" name="dh05"/>
       <point x="1012" y="680"/>
       <point x="1008" y="716"/>
       <point x="999" y="749" type="curve"/>
@@ -73,7 +73,7 @@
       <point x="233" y="747" type="line"/>
       <point x="225" y="714"/>
       <point x="221" y="679"/>
-      <point x="221" y="643" type="curve" name="dh02" smooth="yes"/>
+      <point x="221" y="643" type="curve" smooth="yes" name="dh02"/>
       <point x="221" y="600"/>
       <point x="227" y="559"/>
       <point x="239" y="521" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni229C_.glif b/source/Hack-Bold.ufo/glyphs/uni229C_.glif
index 4b580eb0f..9cc580bb1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni229C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni229C_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni229C" format="1">
+<glyph name="uni229C" format="2">
   <advance width="1233"/>
   <unicode hex="229C"/>
   <outline>
     <contour>
-      <point x="617" y="52" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="52" type="curve" smooth="yes" name="hr00"/>
       <point x="448" y="52"/>
       <point x="302" y="121"/>
       <point x="198" y="225" type="curve" smooth="yes"/>
       <point x="82" y="341"/>
       <point x="26" y="488"/>
-      <point x="26" y="643" type="curve" name="sh01" smooth="yes"/>
+      <point x="26" y="643" type="curve" smooth="yes" name="sh01"/>
       <point x="26" y="810"/>
       <point x="90" y="954"/>
       <point x="198" y="1061" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="391" y="1191" type="curve" smooth="yes"/>
       <point x="461" y="1220"/>
       <point x="536" y="1235"/>
-      <point x="615" y="1235" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1235" type="curve" smooth="yes" name="dv03"/>
       <point x="772" y="1235"/>
       <point x="922" y="1175"/>
       <point x="1035" y="1062" type="curve" smooth="yes"/>
       <point x="1140" y="957"/>
       <point x="1207" y="810"/>
-      <point x="1207" y="643" type="curve" name="sh02" smooth="yes"/>
+      <point x="1207" y="643" type="curve" smooth="yes" name="sh02"/>
       <point x="1207" y="487"/>
       <point x="1150" y="340"/>
       <point x="1035" y="225" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="786" y="52"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="533"/>
-      <point x="1012" y="646" type="curve" name="ah01" smooth="yes"/>
+      <point x="1012" y="646" type="curve" smooth="yes" name="ah01"/>
       <point x="1012" y="747"/>
       <point x="977" y="844"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="412" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni229D_.glif b/source/Hack-Bold.ufo/glyphs/uni229D_.glif
index 2f2c01912..feafd74e4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni229D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni229D_.glif
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni229D" format="1">
+<glyph name="uni229D" format="2">
   <advance width="1233"/>
   <unicode hex="229D"/>
   <outline>
     <contour>
-      <point x="617" y="52" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="52" type="curve" smooth="yes" name="hr00"/>
       <point x="448" y="52"/>
       <point x="302" y="121"/>
       <point x="198" y="225" type="curve" smooth="yes"/>
       <point x="82" y="341"/>
       <point x="26" y="488"/>
-      <point x="26" y="643" type="curve" name="sh01" smooth="yes"/>
+      <point x="26" y="643" type="curve" smooth="yes" name="sh01"/>
       <point x="26" y="810"/>
       <point x="90" y="954"/>
       <point x="198" y="1061" type="curve" smooth="yes"/>
       <point x="254" y="1117"/>
       <point x="320" y="1160"/>
-      <point x="391" y="1191" type="curve" name="sh03" smooth="yes"/>
+      <point x="391" y="1191" type="curve" smooth="yes" name="sh03"/>
       <point x="461" y="1220"/>
       <point x="536" y="1235"/>
-      <point x="615" y="1235" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1235" type="curve" smooth="yes" name="dv03"/>
       <point x="772" y="1235"/>
       <point x="922" y="1175"/>
       <point x="1035" y="1062" type="curve" smooth="yes"/>
       <point x="1140" y="957"/>
       <point x="1207" y="810"/>
-      <point x="1207" y="643" type="curve" name="sh05" smooth="yes"/>
+      <point x="1207" y="643" type="curve" smooth="yes" name="sh05"/>
       <point x="1207" y="487"/>
       <point x="1150" y="340"/>
       <point x="1035" y="225" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="786" y="52"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="533"/>
-      <point x="1012" y="646" type="curve" name="sh04" smooth="yes"/>
+      <point x="1012" y="646" type="curve" smooth="yes" name="sh04"/>
       <point x="1012" y="747"/>
       <point x="977" y="844"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="412" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="sh06" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="sh06"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni229E_.glif b/source/Hack-Bold.ufo/glyphs/uni229E_.glif
index fa93e467e..73445d488 100644
--- a/source/Hack-Bold.ufo/glyphs/uni229E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni229E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni229E" format="1">
+<glyph name="uni229E" format="2">
   <advance width="1233"/>
   <unicode hex="229E"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni229F_.glif b/source/Hack-Bold.ufo/glyphs/uni229F_.glif
index 0b32d9a75..40fd2ed68 100644
--- a/source/Hack-Bold.ufo/glyphs/uni229F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni229F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni229F" format="1">
+<glyph name="uni229F" format="2">
   <advance width="1233"/>
   <unicode hex="229F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22A_0.glif b/source/Hack-Bold.ufo/glyphs/uni22A_0.glif
index 0cf18482d..fad7b6307 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22A_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22A0" format="1">
+<glyph name="uni22A0" format="2">
   <advance width="1233"/>
   <unicode hex="22A0"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22A_1.glif b/source/Hack-Bold.ufo/glyphs/uni22A_1.glif
index e4b6db101..a949f80b1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22A_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22A_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22A1" format="1">
+<glyph name="uni22A1" format="2">
   <advance width="1233"/>
   <unicode hex="22A1"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22A_2.glif b/source/Hack-Bold.ufo/glyphs/uni22A_2.glif
index 6c0dcd644..343508b6a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22A_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22A_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22A2" format="1">
+<glyph name="uni22A2" format="2">
   <advance width="1233"/>
   <unicode hex="22A2"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22A_3.glif b/source/Hack-Bold.ufo/glyphs/uni22A_3.glif
index abea865a0..31c4b6a7b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22A_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22A_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22A3" format="1">
+<glyph name="uni22A3" format="2">
   <advance width="1233"/>
   <unicode hex="22A3"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22A_4.glif b/source/Hack-Bold.ufo/glyphs/uni22A_4.glif
index abe8467de..00f9e4cf6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22A_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22A4" format="1">
+<glyph name="uni22A4" format="2">
   <advance width="1233"/>
   <unicode hex="22A4"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22B_2.glif b/source/Hack-Bold.ufo/glyphs/uni22B_2.glif
index 5f82cc355..723bb77e0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22B_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22B_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22B2" format="1">
+<glyph name="uni22B2" format="2">
   <advance width="1233"/>
   <unicode hex="22B2"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22B_3.glif b/source/Hack-Bold.ufo/glyphs/uni22B_3.glif
index 1c3a8d1d4..9b2ad8843 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22B_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22B3" format="1">
+<glyph name="uni22B3" format="2">
   <advance width="1233"/>
   <unicode hex="22B3"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22B_4.glif b/source/Hack-Bold.ufo/glyphs/uni22B_4.glif
index cf8b56e58..9ae92c604 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22B_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22B_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22B4" format="1">
+<glyph name="uni22B4" format="2">
   <advance width="1233"/>
   <unicode hex="22B4"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22B_5.glif b/source/Hack-Bold.ufo/glyphs/uni22B_5.glif
index 0309960a9..e9b5799df 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22B_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22B_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22B5" format="1">
+<glyph name="uni22B5" format="2">
   <advance width="1233"/>
   <unicode hex="22B5"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22B_8.glif b/source/Hack-Bold.ufo/glyphs/uni22B_8.glif
index c98de3098..9d25201b5 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22B_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22B_8.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22B8" format="1">
+<glyph name="uni22B8" format="2">
   <advance width="1233"/>
   <unicode hex="22B8"/>
   <outline>
     <contour>
-      <point x="918" y="359" type="curve" name="hr00" smooth="yes"/>
+      <point x="918" y="359" type="curve" smooth="yes" name="hr00"/>
       <point x="837" y="359"/>
       <point x="774" y="388"/>
       <point x="718" y="441" type="curve" smooth="yes"/>
@@ -19,21 +19,21 @@
       <point x="714" y="841" type="curve" smooth="yes"/>
       <point x="774" y="901"/>
       <point x="847" y="930"/>
-      <point x="923" y="930" type="curve" name="dv03" smooth="yes"/>
+      <point x="923" y="930" type="curve" smooth="yes" name="dv03"/>
       <point x="1079" y="930"/>
       <point x="1205" y="805"/>
-      <point x="1205" y="641" type="curve" name="dh02" smooth="yes"/>
+      <point x="1205" y="641" type="curve" smooth="yes" name="dh02"/>
       <point x="1205" y="481"/>
       <point x="1083" y="359"/>
     </contour>
     <contour>
-      <point x="920" y="507" type="curve" name="dv01" smooth="yes"/>
+      <point x="920" y="507" type="curve" smooth="yes" name="dv01"/>
       <point x="997" y="507"/>
       <point x="1057" y="567"/>
-      <point x="1057" y="643" type="curve" name="dh01" smooth="yes"/>
+      <point x="1057" y="643" type="curve" smooth="yes" name="dh01"/>
       <point x="1057" y="719"/>
       <point x="997" y="780"/>
-      <point x="921" y="780" type="curve" name="dv02" smooth="yes"/>
+      <point x="921" y="780" type="curve" smooth="yes" name="dv02"/>
       <point x="844" y="780"/>
       <point x="783" y="718"/>
       <point x="783" y="642" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22C_2.glif b/source/Hack-Bold.ufo/glyphs/uni22C_2.glif
index 199242d04..331329a1d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22C_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22C_2.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22C2" format="1">
+<glyph name="uni22C2" format="2">
   <advance width="1233"/>
   <unicode hex="22C2"/>
   <outline>
     <contour>
-      <point x="90" y="936" type="line" name="hr00" smooth="yes"/>
+      <point x="90" y="936" type="line" smooth="yes" name="hr00"/>
       <point x="90" y="1384"/>
       <point x="234" y="1547"/>
-      <point x="617" y="1547" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="1547" type="curve" smooth="yes" name="dv02"/>
       <point x="1001" y="1547"/>
       <point x="1143" y="1384"/>
       <point x="1143" y="936" type="curve" smooth="yes"/>
@@ -16,10 +16,10 @@
       <point x="905" y="916" type="line" smooth="yes"/>
       <point x="905" y="1227"/>
       <point x="841" y="1304"/>
-      <point x="617" y="1304" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="1304" type="curve" smooth="yes" name="dv01"/>
       <point x="393" y="1304"/>
       <point x="328" y="1225"/>
-      <point x="328" y="916" type="curve" name="sh02" smooth="yes"/>
+      <point x="328" y="916" type="curve" smooth="yes" name="sh02"/>
       <point x="328" y="-436" type="line" name="av01"/>
       <point x="90" y="-436" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22C_3.glif b/source/Hack-Bold.ufo/glyphs/uni22C_3.glif
index f4419a4e5..2fa0db86e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22C_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22C_3.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22C3" format="1">
+<glyph name="uni22C3" format="2">
   <advance width="1233"/>
   <unicode hex="22C3"/>
   <outline>
     <contour>
-      <point x="616" y="-465" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-465" type="curve" smooth="yes" name="hr00"/>
       <point x="232" y="-465"/>
       <point x="90" y="-302"/>
-      <point x="90" y="146" type="curve" name="sh01" smooth="yes"/>
+      <point x="90" y="146" type="curve" smooth="yes" name="sh01"/>
       <point x="90" y="1518" type="line" name="at01"/>
       <point x="328" y="1518" type="line"/>
-      <point x="328" y="166" type="line" name="sh02" smooth="yes"/>
+      <point x="328" y="166" type="line" smooth="yes" name="sh02"/>
       <point x="328" y="-145"/>
       <point x="392" y="-222"/>
-      <point x="616" y="-222" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-222" type="curve" smooth="yes" name="dv01"/>
       <point x="840" y="-222"/>
       <point x="905" y="-143"/>
-      <point x="905" y="166" type="curve" name="ah01" smooth="yes"/>
+      <point x="905" y="166" type="curve" smooth="yes" name="ah01"/>
       <point x="905" y="1518" type="line" name="at02"/>
       <point x="1143" y="1518" type="line"/>
-      <point x="1143" y="146" type="line" name="sh03" smooth="yes"/>
+      <point x="1143" y="146" type="line" smooth="yes" name="sh03"/>
       <point x="1143" y="-302"/>
       <point x="999" y="-465"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22C_4.glif b/source/Hack-Bold.ufo/glyphs/uni22C_4.glif
index 6f781276f..20b7fd2d0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22C_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22C_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22C4" format="1">
+<glyph name="uni22C4" format="2">
   <advance width="1233"/>
   <unicode hex="22C4"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22C_6.glif b/source/Hack-Bold.ufo/glyphs/uni22C_6.glif
index 72bc367df..de4f01806 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22C_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22C_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22C6" format="1">
+<glyph name="uni22C6" format="2">
   <advance width="1233"/>
   <unicode hex="22C6"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22C_D_.glif b/source/Hack-Bold.ufo/glyphs/uni22C_D_.glif
index 296eb627b..ae4a030be 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22C_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22C_D_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22CD" format="1">
+<glyph name="uni22CD" format="2">
   <advance width="1233"/>
   <unicode hex="22CD"/>
   <outline>
     <contour>
-      <point x="381" y="672" type="curve" name="dv02" smooth="yes"/>
+      <point x="381" y="672" type="curve" smooth="yes" name="dv02"/>
       <point x="281" y="672"/>
       <point x="188" y="706"/>
       <point x="88" y="786" type="curve"/>
       <point x="88" y="1020" type="line" name="av01"/>
       <point x="188" y="932"/>
       <point x="275" y="895"/>
-      <point x="368" y="895" type="curve" name="dv03" smooth="yes"/>
+      <point x="368" y="895" type="curve" smooth="yes" name="dv03"/>
       <point x="436" y="895"/>
       <point x="508" y="914"/>
       <point x="581" y="949" type="curve" smooth="yes"/>
@@ -19,14 +19,14 @@
       <point x="612" y="963" type="line"/>
       <point x="700" y="1000"/>
       <point x="770" y="1018"/>
-      <point x="843" y="1018" type="curve" name="hr01" smooth="yes"/>
+      <point x="843" y="1018" type="curve" smooth="yes" name="hr01"/>
       <point x="946" y="1018"/>
       <point x="1041" y="983"/>
       <point x="1145" y="903" type="curve"/>
       <point x="1145" y="674" type="line" name="iv01"/>
       <point x="1041" y="762"/>
       <point x="953" y="795"/>
-      <point x="848" y="795" type="curve" name="sv01" smooth="yes"/>
+      <point x="848" y="795" type="curve" smooth="yes" name="sv01"/>
       <point x="765" y="795"/>
       <point x="711" y="774"/>
       <point x="621" y="737" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22C_E_.glif b/source/Hack-Bold.ufo/glyphs/uni22C_E_.glif
index 0644a1fff..2037ea0c4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22C_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22C_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22CE" format="1">
+<glyph name="uni22CE" format="2">
   <advance width="1233"/>
   <unicode hex="22CE"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22C_F_.glif b/source/Hack-Bold.ufo/glyphs/uni22C_F_.glif
index 6dbf1cde0..82b545765 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22C_F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22C_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22CF" format="1">
+<glyph name="uni22CF" format="2">
   <advance width="1233"/>
   <unicode hex="22CF"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22D_0.glif b/source/Hack-Bold.ufo/glyphs/uni22D_0.glif
index ef1258736..93e862d84 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22D_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22D_0.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22D0" format="1">
+<glyph name="uni22D0" format="2">
   <advance width="1233"/>
   <unicode hex="22D0"/>
   <outline>
     <contour>
-      <point x="778" y="-46" type="line" name="hr00" smooth="yes"/>
+      <point x="778" y="-46" type="line" smooth="yes" name="hr00"/>
       <point x="398" y="-46"/>
       <point x="90" y="262"/>
-      <point x="90" y="642" type="curve" name="sh01" smooth="yes"/>
+      <point x="90" y="642" type="curve" smooth="yes" name="sh01"/>
       <point x="90" y="1022"/>
       <point x="398" y="1330"/>
       <point x="778" y="1330" type="curve" smooth="yes"/>
@@ -16,18 +16,18 @@
       <point x="778" y="1110" type="line" smooth="yes"/>
       <point x="518" y="1110"/>
       <point x="310" y="902"/>
-      <point x="310" y="642" type="curve" name="sh02" smooth="yes"/>
+      <point x="310" y="642" type="curve" smooth="yes" name="sh02"/>
       <point x="310" y="382"/>
       <point x="518" y="174"/>
-      <point x="778" y="174" type="curve" name="dv01" smooth="yes"/>
+      <point x="778" y="174" type="curve" smooth="yes" name="dv01"/>
       <point x="1143" y="174" type="line"/>
       <point x="1143" y="-46" type="line"/>
     </contour>
     <contour>
-      <point x="778" y="324" type="line" name="dv04" smooth="yes"/>
+      <point x="778" y="324" type="line" smooth="yes" name="dv04"/>
       <point x="602" y="324"/>
       <point x="460" y="466"/>
-      <point x="460" y="642" type="curve" name="ah01" smooth="yes"/>
+      <point x="460" y="642" type="curve" smooth="yes" name="ah01"/>
       <point x="460" y="818"/>
       <point x="602" y="960"/>
       <point x="778" y="960" type="curve" smooth="yes"/>
@@ -36,10 +36,10 @@
       <point x="778" y="740" type="line" smooth="yes"/>
       <point x="722" y="740"/>
       <point x="680" y="698"/>
-      <point x="680" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="680" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="680" y="586"/>
       <point x="722" y="544"/>
-      <point x="778" y="544" type="curve" name="dv05" smooth="yes"/>
+      <point x="778" y="544" type="curve" smooth="yes" name="dv05"/>
       <point x="1143" y="544" type="line"/>
       <point x="1143" y="324" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22D_1.glif b/source/Hack-Bold.ufo/glyphs/uni22D_1.glif
index 1d4d646d8..ae4ba8740 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22D_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22D_1.glif
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22D1" format="1">
+<glyph name="uni22D1" format="2">
   <advance width="1233"/>
   <unicode hex="22D1"/>
   <outline>
     <contour>
       <point x="90" y="174" type="line" name="hr00"/>
-      <point x="455" y="174" type="line" name="dv02" smooth="yes"/>
+      <point x="455" y="174" type="line" smooth="yes" name="dv02"/>
       <point x="715" y="174"/>
       <point x="923" y="382"/>
-      <point x="923" y="642" type="curve" name="ah01" smooth="yes"/>
+      <point x="923" y="642" type="curve" smooth="yes" name="ah01"/>
       <point x="923" y="902"/>
       <point x="715" y="1110"/>
-      <point x="455" y="1110" type="curve" name="dv03" smooth="yes"/>
+      <point x="455" y="1110" type="curve" smooth="yes" name="dv03"/>
       <point x="90" y="1110" type="line"/>
       <point x="90" y="1330" type="line"/>
-      <point x="455" y="1330" type="line" name="dv04" smooth="yes"/>
+      <point x="455" y="1330" type="line" smooth="yes" name="dv04"/>
       <point x="835" y="1330"/>
       <point x="1143" y="1022"/>
-      <point x="1143" y="642" type="curve" name="sh01" smooth="yes"/>
+      <point x="1143" y="642" type="curve" smooth="yes" name="sh01"/>
       <point x="1143" y="262"/>
       <point x="835" y="-46"/>
-      <point x="455" y="-46" type="curve" name="dv01" smooth="yes"/>
+      <point x="455" y="-46" type="curve" smooth="yes" name="dv01"/>
       <point x="90" y="-46" type="line"/>
     </contour>
     <contour>
       <point x="90" y="544" type="line"/>
-      <point x="455" y="544" type="line" name="dv06" smooth="yes"/>
+      <point x="455" y="544" type="line" smooth="yes" name="dv06"/>
       <point x="511" y="544"/>
       <point x="553" y="586"/>
-      <point x="553" y="642" type="curve" name="sh02" smooth="yes"/>
+      <point x="553" y="642" type="curve" smooth="yes" name="sh02"/>
       <point x="553" y="698"/>
       <point x="511" y="740"/>
-      <point x="455" y="740" type="curve" name="dv07" smooth="yes"/>
+      <point x="455" y="740" type="curve" smooth="yes" name="dv07"/>
       <point x="90" y="740" type="line"/>
       <point x="90" y="960" type="line"/>
-      <point x="455" y="960" type="line" name="dv08" smooth="yes"/>
+      <point x="455" y="960" type="line" smooth="yes" name="dv08"/>
       <point x="631" y="960"/>
       <point x="773" y="818"/>
-      <point x="773" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="773" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="773" y="466"/>
       <point x="631" y="324"/>
-      <point x="455" y="324" type="curve" name="dv05" smooth="yes"/>
+      <point x="455" y="324" type="curve" smooth="yes" name="dv05"/>
       <point x="90" y="324" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22D_A_.glif b/source/Hack-Bold.ufo/glyphs/uni22D_A_.glif
index e401f1915..55a5f620b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22D_A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22D_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22DA" format="1">
+<glyph name="uni22DA" format="2">
   <advance width="1233"/>
   <unicode hex="22DA"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22D_B_.glif b/source/Hack-Bold.ufo/glyphs/uni22D_B_.glif
index 20a3e393e..0925bd6a7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22D_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22D_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22DB" format="1">
+<glyph name="uni22DB" format="2">
   <advance width="1233"/>
   <unicode hex="22DB"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22D_C_.glif b/source/Hack-Bold.ufo/glyphs/uni22D_C_.glif
index 04eb1b478..738082bc7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22D_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22D_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22DC" format="1">
+<glyph name="uni22DC" format="2">
   <advance width="1233"/>
   <unicode hex="22DC"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22D_D_.glif b/source/Hack-Bold.ufo/glyphs/uni22D_D_.glif
index 2becc814c..7eeed144b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22D_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22D_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22DD" format="1">
+<glyph name="uni22DD" format="2">
   <advance width="1233"/>
   <unicode hex="22DD"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22D_E_.glif b/source/Hack-Bold.ufo/glyphs/uni22D_E_.glif
index 9860708eb..def396d57 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22D_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22D_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22DE" format="1">
+<glyph name="uni22DE" format="2">
   <advance width="1233"/>
   <unicode hex="22DE"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22D_F_.glif b/source/Hack-Bold.ufo/glyphs/uni22D_F_.glif
index 40251698e..7698fc0da 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22D_F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22D_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22DF" format="1">
+<glyph name="uni22DF" format="2">
   <advance width="1233"/>
   <unicode hex="22DF"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22E_0.glif b/source/Hack-Bold.ufo/glyphs/uni22E_0.glif
index 47d710229..aec616bf9 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22E_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22E_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E0" format="1">
+<glyph name="uni22E0" format="2">
   <advance width="1233"/>
   <unicode hex="22E0"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22E_1.glif b/source/Hack-Bold.ufo/glyphs/uni22E_1.glif
index bcccc0273..5c2b69cd6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22E_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22E_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E1" format="1">
+<glyph name="uni22E1" format="2">
   <advance width="1233"/>
   <unicode hex="22E1"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22E_2.glif b/source/Hack-Bold.ufo/glyphs/uni22E_2.glif
index aa99bbf16..a44e98341 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22E_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22E_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E2" format="1">
+<glyph name="uni22E2" format="2">
   <advance width="1233"/>
   <unicode hex="22E2"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22E_3.glif b/source/Hack-Bold.ufo/glyphs/uni22E_3.glif
index 0563e76c4..b8c30d012 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22E_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22E_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E3" format="1">
+<glyph name="uni22E3" format="2">
   <advance width="1233"/>
   <unicode hex="22E3"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22E_4.glif b/source/Hack-Bold.ufo/glyphs/uni22E_4.glif
index e714286e2..20620dc6d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22E_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22E_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E4" format="1">
+<glyph name="uni22E4" format="2">
   <advance width="1233"/>
   <unicode hex="22E4"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22E_5.glif b/source/Hack-Bold.ufo/glyphs/uni22E_5.glif
index 4d9844301..cd6138e5a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22E_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22E_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E5" format="1">
+<glyph name="uni22E5" format="2">
   <advance width="1233"/>
   <unicode hex="22E5"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22E_6.glif b/source/Hack-Bold.ufo/glyphs/uni22E_6.glif
index 7283b62b9..0e99fed1d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22E_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22E_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E6" format="1">
+<glyph name="uni22E6" format="2">
   <advance width="1233"/>
   <unicode hex="22E6"/>
   <outline>
@@ -8,14 +8,14 @@
       <point x="484" y="33" type="line"/>
       <point x="449" y="41"/>
       <point x="414" y="45"/>
-      <point x="381" y="45" type="curve" name="dv02" smooth="yes"/>
+      <point x="381" y="45" type="curve" smooth="yes" name="dv02"/>
       <point x="277" y="45"/>
       <point x="188" y="8"/>
       <point x="88" y="-76" type="curve" name="iv01"/>
       <point x="88" y="153" type="line"/>
       <point x="191" y="233"/>
       <point x="285" y="268"/>
-      <point x="389" y="268" type="curve" name="dv03" smooth="yes"/>
+      <point x="389" y="268" type="curve" smooth="yes" name="dv03"/>
       <point x="445" y="268"/>
       <point x="493" y="258"/>
       <point x="553" y="239" type="curve"/>
@@ -31,14 +31,14 @@
       <point x="752" y="162" type="line"/>
       <point x="792" y="151"/>
       <point x="830" y="145"/>
-      <point x="865" y="145" type="curve" name="hr01" smooth="yes"/>
+      <point x="865" y="145" type="curve" smooth="yes" name="hr01"/>
       <point x="958" y="145"/>
       <point x="1045" y="182"/>
       <point x="1145" y="270" type="curve" name="iv04"/>
       <point x="1145" y="36" type="line"/>
       <point x="1049" y="-40"/>
       <point x="952" y="-78"/>
-      <point x="853" y="-78" type="curve" name="dv01" smooth="yes"/>
+      <point x="853" y="-78" type="curve" smooth="yes" name="dv01"/>
       <point x="796" y="-78"/>
       <point x="743" y="-66"/>
       <point x="682" y="-42" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22E_7.glif b/source/Hack-Bold.ufo/glyphs/uni22E_7.glif
index b54735378..e2447fb7e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22E_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22E_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E7" format="1">
+<glyph name="uni22E7" format="2">
   <advance width="1233"/>
   <unicode hex="22E7"/>
   <outline>
@@ -8,14 +8,14 @@
       <point x="484" y="33" type="line"/>
       <point x="449" y="41"/>
       <point x="414" y="45"/>
-      <point x="381" y="45" type="curve" name="dv02" smooth="yes"/>
+      <point x="381" y="45" type="curve" smooth="yes" name="dv02"/>
       <point x="277" y="45"/>
       <point x="188" y="8"/>
       <point x="88" y="-76" type="curve" name="iv01"/>
       <point x="88" y="153" type="line"/>
       <point x="191" y="233"/>
       <point x="285" y="268"/>
-      <point x="389" y="268" type="curve" name="dv03" smooth="yes"/>
+      <point x="389" y="268" type="curve" smooth="yes" name="dv03"/>
       <point x="445" y="268"/>
       <point x="493" y="258"/>
       <point x="553" y="239" type="curve"/>
@@ -32,14 +32,14 @@
       <point x="752" y="162" type="line"/>
       <point x="792" y="151"/>
       <point x="830" y="145"/>
-      <point x="865" y="145" type="curve" name="hr01" smooth="yes"/>
+      <point x="865" y="145" type="curve" smooth="yes" name="hr01"/>
       <point x="958" y="145"/>
       <point x="1045" y="182"/>
       <point x="1145" y="270" type="curve" name="iv06"/>
       <point x="1145" y="36" type="line"/>
       <point x="1049" y="-40"/>
       <point x="952" y="-78"/>
-      <point x="853" y="-78" type="curve" name="dv01" smooth="yes"/>
+      <point x="853" y="-78" type="curve" smooth="yes" name="dv01"/>
       <point x="796" y="-78"/>
       <point x="743" y="-66"/>
       <point x="682" y="-42" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22E_8.glif b/source/Hack-Bold.ufo/glyphs/uni22E_8.glif
index c18d7e681..9a8400794 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22E_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22E_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E8" format="1">
+<glyph name="uni22E8" format="2">
   <advance width="1233"/>
   <unicode hex="22E8"/>
   <outline>
@@ -25,14 +25,14 @@
       <point x="484" y="-95" type="line"/>
       <point x="449" y="-87"/>
       <point x="414" y="-83"/>
-      <point x="381" y="-83" type="curve" name="dv03" smooth="yes"/>
+      <point x="381" y="-83" type="curve" smooth="yes" name="dv03"/>
       <point x="277" y="-83"/>
       <point x="188" y="-120"/>
       <point x="88" y="-204" type="curve" name="hr01"/>
       <point x="88" y="25" type="line"/>
       <point x="191" y="105"/>
       <point x="285" y="140"/>
-      <point x="389" y="140" type="curve" name="dv04" smooth="yes"/>
+      <point x="389" y="140" type="curve" smooth="yes" name="dv04"/>
       <point x="445" y="140"/>
       <point x="493" y="130"/>
       <point x="553" y="111" type="curve"/>
@@ -41,14 +41,14 @@
       <point x="752" y="34" type="line"/>
       <point x="792" y="23"/>
       <point x="830" y="17"/>
-      <point x="865" y="17" type="curve" name="dv02" smooth="yes"/>
+      <point x="865" y="17" type="curve" smooth="yes" name="dv02"/>
       <point x="958" y="17"/>
       <point x="1045" y="54"/>
       <point x="1145" y="142" type="curve" name="iv03"/>
       <point x="1145" y="-92" type="line"/>
       <point x="1049" y="-168"/>
       <point x="952" y="-206"/>
-      <point x="853" y="-206" type="curve" name="dv01" smooth="yes"/>
+      <point x="853" y="-206" type="curve" smooth="yes" name="dv01"/>
       <point x="796" y="-206"/>
       <point x="743" y="-194"/>
       <point x="682" y="-171" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22E_9.glif b/source/Hack-Bold.ufo/glyphs/uni22E_9.glif
index ad5ef059b..b4bb9dbe6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22E_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22E_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E9" format="1">
+<glyph name="uni22E9" format="2">
   <advance width="1233"/>
   <unicode hex="22E9"/>
   <outline>
@@ -25,14 +25,14 @@
       <point x="484" y="-95" type="line"/>
       <point x="449" y="-87"/>
       <point x="414" y="-83"/>
-      <point x="381" y="-83" type="curve" name="dv03" smooth="yes"/>
+      <point x="381" y="-83" type="curve" smooth="yes" name="dv03"/>
       <point x="277" y="-83"/>
       <point x="188" y="-120"/>
       <point x="88" y="-204" type="curve" name="hr01"/>
       <point x="88" y="25" type="line"/>
       <point x="191" y="105"/>
       <point x="285" y="140"/>
-      <point x="389" y="140" type="curve" name="dv04" smooth="yes"/>
+      <point x="389" y="140" type="curve" smooth="yes" name="dv04"/>
       <point x="445" y="140"/>
       <point x="493" y="130"/>
       <point x="553" y="111" type="curve"/>
@@ -41,14 +41,14 @@
       <point x="752" y="34" type="line"/>
       <point x="792" y="23"/>
       <point x="830" y="17"/>
-      <point x="865" y="17" type="curve" name="dv02" smooth="yes"/>
+      <point x="865" y="17" type="curve" smooth="yes" name="dv02"/>
       <point x="958" y="17"/>
       <point x="1045" y="54"/>
       <point x="1145" y="142" type="curve" name="iv03"/>
       <point x="1145" y="-92" type="line"/>
       <point x="1049" y="-168"/>
       <point x="952" y="-206"/>
-      <point x="853" y="-206" type="curve" name="dv01" smooth="yes"/>
+      <point x="853" y="-206" type="curve" smooth="yes" name="dv01"/>
       <point x="796" y="-206"/>
       <point x="743" y="-194"/>
       <point x="682" y="-171" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni22E_F_.glif b/source/Hack-Bold.ufo/glyphs/uni22E_F_.glif
index af7064973..266eec113 100644
--- a/source/Hack-Bold.ufo/glyphs/uni22E_F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni22E_F_.glif
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22EF" format="1">
+<glyph name="uni22EF" format="2">
   <advance width="1233"/>
   <unicode hex="22EF"/>
   <outline>
     <contour>
-      <point x="87" y="460" type="line" name="hr00" smooth="yes"/>
+      <point x="87" y="460" type="line" smooth="yes" name="hr00"/>
       <point x="67" y="460"/>
       <point x="57" y="470"/>
-      <point x="57" y="490" type="curve" name="sh01" smooth="yes"/>
+      <point x="57" y="490" type="curve" smooth="yes" name="sh01"/>
       <point x="57" y="797" type="line" smooth="yes"/>
       <point x="57" y="817"/>
       <point x="67" y="827"/>
-      <point x="87" y="827" type="curve" name="dv01" smooth="yes"/>
+      <point x="87" y="827" type="curve" smooth="yes" name="dv01"/>
       <point x="322" y="827" type="line" smooth="yes"/>
       <point x="342" y="827"/>
       <point x="352" y="817"/>
       <point x="352" y="797" type="curve" smooth="yes"/>
-      <point x="352" y="490" type="line" name="sh02" smooth="yes"/>
+      <point x="352" y="490" type="line" smooth="yes" name="sh02"/>
       <point x="352" y="470"/>
       <point x="342" y="460"/>
       <point x="322" y="460" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="499" y="460" type="line" name="sv01" smooth="yes"/>
+      <point x="499" y="460" type="line" smooth="yes" name="sv01"/>
       <point x="479" y="460"/>
       <point x="469" y="470"/>
-      <point x="469" y="490" type="curve" name="sh03" smooth="yes"/>
+      <point x="469" y="490" type="curve" smooth="yes" name="sh03"/>
       <point x="469" y="797" type="line" smooth="yes"/>
       <point x="469" y="817"/>
       <point x="479" y="827"/>
-      <point x="499" y="827" type="curve" name="sv02" smooth="yes"/>
+      <point x="499" y="827" type="curve" smooth="yes" name="sv02"/>
       <point x="734" y="827" type="line" smooth="yes"/>
       <point x="754" y="827"/>
       <point x="764" y="817"/>
       <point x="764" y="797" type="curve" smooth="yes"/>
-      <point x="764" y="490" type="line" name="sh04" smooth="yes"/>
+      <point x="764" y="490" type="line" smooth="yes" name="sh04"/>
       <point x="764" y="470"/>
       <point x="754" y="460"/>
       <point x="734" y="460" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="911" y="460" type="line" name="sv03" smooth="yes"/>
+      <point x="911" y="460" type="line" smooth="yes" name="sv03"/>
       <point x="891" y="460"/>
       <point x="881" y="470"/>
-      <point x="881" y="490" type="curve" name="sh05" smooth="yes"/>
+      <point x="881" y="490" type="curve" smooth="yes" name="sh05"/>
       <point x="881" y="797" type="line" smooth="yes"/>
       <point x="881" y="817"/>
       <point x="891" y="827"/>
-      <point x="911" y="827" type="curve" name="sv04" smooth="yes"/>
+      <point x="911" y="827" type="curve" smooth="yes" name="sv04"/>
       <point x="1146" y="827" type="line" smooth="yes"/>
       <point x="1166" y="827"/>
       <point x="1176" y="817"/>
       <point x="1176" y="797" type="curve" smooth="yes"/>
-      <point x="1176" y="490" type="line" name="sh06" smooth="yes"/>
+      <point x="1176" y="490" type="line" smooth="yes" name="sh06"/>
       <point x="1176" y="470"/>
       <point x="1166" y="460"/>
       <point x="1146" y="460" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2304.glif b/source/Hack-Bold.ufo/glyphs/uni2304.glif
index f27b8a3ca..fa13d6261 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2304.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2304.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2304" format="1">
+<glyph name="uni2304" format="2">
   <advance width="1233"/>
   <unicode hex="2304"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2308.glif b/source/Hack-Bold.ufo/glyphs/uni2308.glif
index 5ba312a5c..509411bb2 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2308.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2308.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2308" format="1">
+<glyph name="uni2308" format="2">
   <advance width="1233"/>
   <unicode hex="2308"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2309.glif b/source/Hack-Bold.ufo/glyphs/uni2309.glif
index 17e78088f..d29719d0c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2309.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2309.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2309" format="1">
+<glyph name="uni2309" format="2">
   <advance width="1233"/>
   <unicode hex="2309"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni230A_.glif b/source/Hack-Bold.ufo/glyphs/uni230A_.glif
index bbf781d35..6e2da4915 100644
--- a/source/Hack-Bold.ufo/glyphs/uni230A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni230A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni230A" format="1">
+<glyph name="uni230A" format="2">
   <advance width="1233"/>
   <unicode hex="230A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni230B_.glif b/source/Hack-Bold.ufo/glyphs/uni230B_.glif
index 1a3bb82c9..19359491d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni230B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni230B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni230B" format="1">
+<glyph name="uni230B" format="2">
   <advance width="1233"/>
   <unicode hex="230B"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni239B_.glif b/source/Hack-Bold.ufo/glyphs/uni239B_.glif
index 32b75b130..78694ee9e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni239B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni239B_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni239B" format="1">
+<glyph name="uni239B" format="2">
   <advance width="1233"/>
   <unicode hex="239B"/>
   <outline>
     <contour>
-      <point x="232" y="-282" type="line" name="hr00" smooth="yes"/>
+      <point x="232" y="-282" type="line" smooth="yes" name="hr00"/>
       <point x="232" y="894"/>
       <point x="523" y="1556"/>
       <point x="744" y="1901" type="curve" name="av01"/>
       <point x="1000" y="1901" type="line"/>
       <point x="764" y="1422"/>
       <point x="523" y="891"/>
-      <point x="523" y="-282" type="curve" name="dh01" smooth="yes"/>
+      <point x="523" y="-282" type="curve" smooth="yes" name="dh01"/>
       <point x="523" y="-516" type="line" name="av02"/>
       <point x="232" y="-516" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni239C_.glif b/source/Hack-Bold.ufo/glyphs/uni239C_.glif
index 4425f28ce..ed39639f3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni239C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni239C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni239C" format="1">
+<glyph name="uni239C" format="2">
   <advance width="1233"/>
   <unicode hex="239C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni239D_.glif b/source/Hack-Bold.ufo/glyphs/uni239D_.glif
index 75d06994b..6a4ea46fa 100644
--- a/source/Hack-Bold.ufo/glyphs/uni239D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni239D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni239D" format="1">
+<glyph name="uni239D" format="2">
   <advance width="1233"/>
   <unicode hex="239D"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="744" y="-492" type="line" name="hr00"/>
       <point x="539" y="-171"/>
       <point x="232" y="495"/>
-      <point x="232" y="1692" type="curve" name="dh01" smooth="yes"/>
+      <point x="232" y="1692" type="curve" smooth="yes" name="dh01"/>
       <point x="232" y="1926" type="line" name="av01"/>
       <point x="523" y="1926" type="line"/>
-      <point x="523" y="1692" type="line" name="dh02" smooth="yes"/>
+      <point x="523" y="1692" type="line" smooth="yes" name="dh02"/>
       <point x="523" y="555"/>
       <point x="724" y="64"/>
       <point x="1000" y="-492" type="curve" name="ab01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni239E_.glif b/source/Hack-Bold.ufo/glyphs/uni239E_.glif
index d0926320e..5fa6ffdba 100644
--- a/source/Hack-Bold.ufo/glyphs/uni239E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni239E_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni239E" format="1">
+<glyph name="uni239E" format="2">
   <advance width="1233"/>
   <unicode hex="239E"/>
   <outline>
     <contour>
-      <point x="710" y="-282" type="line" name="hr00" smooth="yes"/>
+      <point x="710" y="-282" type="line" smooth="yes" name="hr00"/>
       <point x="710" y="891"/>
       <point x="469" y="1422"/>
       <point x="233" y="1901" type="curve" name="av01"/>
       <point x="489" y="1901" type="line"/>
       <point x="710" y="1556"/>
       <point x="1001" y="894"/>
-      <point x="1001" y="-282" type="curve" name="dh01" smooth="yes"/>
+      <point x="1001" y="-282" type="curve" smooth="yes" name="dh01"/>
       <point x="1001" y="-516" type="line" name="av02"/>
       <point x="710" y="-516" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni239F_.glif b/source/Hack-Bold.ufo/glyphs/uni239F_.glif
index f7a3bb46e..bb8147883 100644
--- a/source/Hack-Bold.ufo/glyphs/uni239F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni239F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni239F" format="1">
+<glyph name="uni239F" format="2">
   <advance width="1233"/>
   <unicode hex="239F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni23A_0.glif b/source/Hack-Bold.ufo/glyphs/uni23A_0.glif
index 2b0835ea5..ab8411dc5 100644
--- a/source/Hack-Bold.ufo/glyphs/uni23A_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni23A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A0" format="1">
+<glyph name="uni23A0" format="2">
   <advance width="1233"/>
   <unicode hex="23A0"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="233" y="-492" type="line" name="hr00"/>
       <point x="509" y="64"/>
       <point x="710" y="555"/>
-      <point x="710" y="1692" type="curve" name="dh01" smooth="yes"/>
+      <point x="710" y="1692" type="curve" smooth="yes" name="dh01"/>
       <point x="710" y="1926" type="line" name="av01"/>
       <point x="1001" y="1926" type="line"/>
-      <point x="1001" y="1692" type="line" name="dh02" smooth="yes"/>
+      <point x="1001" y="1692" type="line" smooth="yes" name="dh02"/>
       <point x="1001" y="495"/>
       <point x="694" y="-171"/>
       <point x="489" y="-492" type="curve" name="ab01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni23A_1.glif b/source/Hack-Bold.ufo/glyphs/uni23A_1.glif
index 6a6ffe766..954d19e20 100644
--- a/source/Hack-Bold.ufo/glyphs/uni23A_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni23A_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A1" format="1">
+<glyph name="uni23A1" format="2">
   <advance width="1233"/>
   <unicode hex="23A1"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni23A_2.glif b/source/Hack-Bold.ufo/glyphs/uni23A_2.glif
index ab8a3e0ae..bb1dba39b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni23A_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni23A_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A2" format="1">
+<glyph name="uni23A2" format="2">
   <advance width="1233"/>
   <unicode hex="23A2"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni23A_3.glif b/source/Hack-Bold.ufo/glyphs/uni23A_3.glif
index b43a83b8e..a14484b68 100644
--- a/source/Hack-Bold.ufo/glyphs/uni23A_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni23A_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A3" format="1">
+<glyph name="uni23A3" format="2">
   <advance width="1233"/>
   <unicode hex="23A3"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni23A_4.glif b/source/Hack-Bold.ufo/glyphs/uni23A_4.glif
index fc8b65725..9aa68b3a3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni23A_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni23A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A4" format="1">
+<glyph name="uni23A4" format="2">
   <advance width="1233"/>
   <unicode hex="23A4"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni23A_5.glif b/source/Hack-Bold.ufo/glyphs/uni23A_5.glif
index 8e6f254e6..47457c4fc 100644
--- a/source/Hack-Bold.ufo/glyphs/uni23A_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni23A_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A5" format="1">
+<glyph name="uni23A5" format="2">
   <advance width="1233"/>
   <unicode hex="23A5"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni23A_6.glif b/source/Hack-Bold.ufo/glyphs/uni23A_6.glif
index 1f5e21495..646c3c9d8 100644
--- a/source/Hack-Bold.ufo/glyphs/uni23A_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni23A_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A6" format="1">
+<glyph name="uni23A6" format="2">
   <advance width="1233"/>
   <unicode hex="23A6"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni23A_7.glif b/source/Hack-Bold.ufo/glyphs/uni23A_7.glif
index fd9921050..a25a8824d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni23A_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni23A_7.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A7" format="1">
+<glyph name="uni23A7" format="2">
   <advance width="1233"/>
   <unicode hex="23A7"/>
   <outline>
     <contour>
-      <point x="476" y="1375" type="line" name="hr00" smooth="yes"/>
+      <point x="476" y="1375" type="line" smooth="yes" name="hr00"/>
       <point x="476" y="1703"/>
       <point x="647" y="1901"/>
       <point x="942" y="1901" type="curve" smooth="yes"/>
@@ -13,7 +13,7 @@
       <point x="936" y="1629" type="line" smooth="yes"/>
       <point x="800" y="1629"/>
       <point x="758" y="1599"/>
-      <point x="758" y="1383" type="curve" name="dh01" smooth="yes"/>
+      <point x="758" y="1383" type="curve" smooth="yes" name="dh01"/>
       <point x="758" y="-534" type="line" name="av01"/>
       <point x="476" y="-534" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni23A_8.glif b/source/Hack-Bold.ufo/glyphs/uni23A_8.glif
index cf08a96e0..10e7d67e2 100644
--- a/source/Hack-Bold.ufo/glyphs/uni23A_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni23A_8.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A8" format="1">
+<glyph name="uni23A8" format="2">
   <advance width="1233"/>
   <unicode hex="23A8"/>
   <outline>
     <contour>
-      <point x="476" y="181" type="line" name="hr00" smooth="yes"/>
+      <point x="476" y="181" type="line" smooth="yes" name="hr00"/>
       <point x="476" y="433"/>
       <point x="385" y="558"/>
-      <point x="78" y="563" type="curve" name="dv01" smooth="yes"/>
+      <point x="78" y="563" type="curve" smooth="yes" name="dv01"/>
       <point x="17" y="564" type="line"/>
       <point x="17" y="847" type="line"/>
-      <point x="78" y="847" type="line" name="dv02" smooth="yes"/>
+      <point x="78" y="847" type="line" smooth="yes" name="dv02"/>
       <point x="378" y="847"/>
       <point x="476" y="968"/>
-      <point x="476" y="1229" type="curve" name="sh01" smooth="yes"/>
+      <point x="476" y="1229" type="curve" smooth="yes" name="sh01"/>
       <point x="476" y="1913" type="line" name="av01"/>
       <point x="758" y="1913" type="line" name="sh02"/>
       <point x="758" y="1217" type="line" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="657" y="612" type="curve" smooth="yes"/>
       <point x="725" y="515"/>
       <point x="758" y="372"/>
-      <point x="758" y="193" type="curve" name="dh01" smooth="yes"/>
+      <point x="758" y="193" type="curve" smooth="yes" name="dh01"/>
       <point x="758" y="-505" type="line" name="ab01"/>
       <point x="476" y="-505" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni23A_9.glif b/source/Hack-Bold.ufo/glyphs/uni23A_9.glif
index 74efaede4..bd9d5d074 100644
--- a/source/Hack-Bold.ufo/glyphs/uni23A_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni23A_9.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A9" format="1">
+<glyph name="uni23A9" format="2">
   <advance width="1233"/>
   <unicode hex="23A9"/>
   <outline>
     <contour>
-      <point x="942" y="-492" type="line" name="hr00" smooth="yes"/>
+      <point x="942" y="-492" type="line" smooth="yes" name="hr00"/>
       <point x="651" y="-492"/>
       <point x="476" y="-298"/>
-      <point x="476" y="34" type="curve" name="dh01" smooth="yes"/>
+      <point x="476" y="34" type="curve" smooth="yes" name="dh01"/>
       <point x="476" y="1913" type="line" name="av01"/>
       <point x="758" y="1913" type="line"/>
-      <point x="758" y="26" type="line" name="dh02" smooth="yes"/>
+      <point x="758" y="26" type="line" smooth="yes" name="dh02"/>
       <point x="758" y="-190"/>
       <point x="800" y="-220"/>
-      <point x="936" y="-220" type="curve" name="sv01" smooth="yes"/>
+      <point x="936" y="-220" type="curve" smooth="yes" name="sv01"/>
       <point x="1217" y="-220" type="line" name="sv02"/>
       <point x="1217" y="-492" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni23A_A_.glif b/source/Hack-Bold.ufo/glyphs/uni23A_A_.glif
index 8d144ba5a..0453ee1ca 100644
--- a/source/Hack-Bold.ufo/glyphs/uni23A_A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni23A_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23AA" format="1">
+<glyph name="uni23AA" format="2">
   <advance width="1233"/>
   <unicode hex="23AA"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni23A_B_.glif b/source/Hack-Bold.ufo/glyphs/uni23A_B_.glif
index d0898a1d6..758d1f0e7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni23A_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni23A_B_.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23AB" format="1">
+<glyph name="uni23AB" format="2">
   <advance width="1233"/>
   <unicode hex="23AB"/>
   <outline>
     <contour>
-      <point x="475" y="1383" type="line" name="hr00" smooth="yes"/>
+      <point x="475" y="1383" type="line" smooth="yes" name="hr00"/>
       <point x="475" y="1599"/>
       <point x="433" y="1629"/>
-      <point x="297" y="1629" type="curve" name="dv01" smooth="yes"/>
+      <point x="297" y="1629" type="curve" smooth="yes" name="dv01"/>
       <point x="16" y="1629" type="line"/>
       <point x="16" y="1901" type="line"/>
-      <point x="291" y="1901" type="line" name="dv02" smooth="yes"/>
+      <point x="291" y="1901" type="line" smooth="yes" name="dv02"/>
       <point x="586" y="1901"/>
       <point x="757" y="1703"/>
-      <point x="757" y="1375" type="curve" name="dh01" smooth="yes"/>
+      <point x="757" y="1375" type="curve" smooth="yes" name="dh01"/>
       <point x="757" y="-534" type="line" name="av01"/>
       <point x="475" y="-534" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni23A_C_.glif b/source/Hack-Bold.ufo/glyphs/uni23A_C_.glif
index c72f1c02d..92aff1758 100644
--- a/source/Hack-Bold.ufo/glyphs/uni23A_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni23A_C_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23AC" format="1">
+<glyph name="uni23AC" format="2">
   <advance width="1233"/>
   <unicode hex="23AC"/>
   <outline>
     <contour>
-      <point x="475" y="193" type="line" name="hr00" smooth="yes"/>
+      <point x="475" y="193" type="line" smooth="yes" name="hr00"/>
       <point x="475" y="372"/>
       <point x="508" y="515"/>
       <point x="576" y="612" type="curve" smooth="yes"/>
@@ -16,19 +16,19 @@
       <point x="576" y="798" type="curve" smooth="yes"/>
       <point x="509" y="895"/>
       <point x="475" y="1038"/>
-      <point x="475" y="1217" type="curve" name="sh01" smooth="yes"/>
+      <point x="475" y="1217" type="curve" smooth="yes" name="sh01"/>
       <point x="475" y="1913" type="line" name="av01"/>
       <point x="757" y="1913" type="line" name="sh02"/>
       <point x="757" y="1229" type="line" smooth="yes"/>
       <point x="757" y="968"/>
       <point x="855" y="847"/>
-      <point x="1155" y="847" type="curve" name="dv02" smooth="yes"/>
+      <point x="1155" y="847" type="curve" smooth="yes" name="dv02"/>
       <point x="1216" y="847" type="line"/>
       <point x="1216" y="564" type="line"/>
-      <point x="1155" y="563" type="line" name="dv01" smooth="yes"/>
+      <point x="1155" y="563" type="line" smooth="yes" name="dv01"/>
       <point x="848" y="558"/>
       <point x="757" y="433"/>
-      <point x="757" y="181" type="curve" name="dh01" smooth="yes"/>
+      <point x="757" y="181" type="curve" smooth="yes" name="dh01"/>
       <point x="757" y="-505" type="line" name="ab01"/>
       <point x="475" y="-505" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni23A_D_.glif b/source/Hack-Bold.ufo/glyphs/uni23A_D_.glif
index 922ff1fed..775c1ed70 100644
--- a/source/Hack-Bold.ufo/glyphs/uni23A_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni23A_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23AD" format="1">
+<glyph name="uni23AD" format="2">
   <advance width="1233"/>
   <unicode hex="23AD"/>
   <outline>
@@ -8,13 +8,13 @@
       <point x="297" y="-220" type="line" smooth="yes"/>
       <point x="433" y="-220"/>
       <point x="475" y="-190"/>
-      <point x="475" y="26" type="curve" name="dh01" smooth="yes"/>
+      <point x="475" y="26" type="curve" smooth="yes" name="dh01"/>
       <point x="475" y="1913" type="line" name="av01"/>
       <point x="757" y="1913" type="line"/>
-      <point x="757" y="34" type="line" name="dh02" smooth="yes"/>
+      <point x="757" y="34" type="line" smooth="yes" name="dh02"/>
       <point x="757" y="-298"/>
       <point x="582" y="-492"/>
-      <point x="291" y="-492" type="curve" name="ab01" smooth="yes"/>
+      <point x="291" y="-492" type="curve" smooth="yes" name="ab01"/>
       <point x="16" y="-492" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni23A_E_.glif b/source/Hack-Bold.ufo/glyphs/uni23A_E_.glif
index b8c3dc4c8..8704b9271 100644
--- a/source/Hack-Bold.ufo/glyphs/uni23A_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni23A_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23AE" format="1">
+<glyph name="uni23AE" format="2">
   <advance width="1233"/>
   <unicode hex="23AE"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2500.glif b/source/Hack-Bold.ufo/glyphs/uni2500.glif
index 73488f5b9..4c3c724bd 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2500.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2500.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2500" format="1">
+<glyph name="uni2500" format="2">
   <advance width="1233"/>
   <unicode hex="2500"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2501.glif b/source/Hack-Bold.ufo/glyphs/uni2501.glif
index 407b806a5..b4b7c57cb 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2501.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2501.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2501" format="1">
+<glyph name="uni2501" format="2">
   <advance width="1233"/>
   <unicode hex="2501"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2502.glif b/source/Hack-Bold.ufo/glyphs/uni2502.glif
index fa8872f18..13a2c6442 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2502.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2502.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2502" format="1">
+<glyph name="uni2502" format="2">
   <advance width="1233"/>
   <unicode hex="2502"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2503.glif b/source/Hack-Bold.ufo/glyphs/uni2503.glif
index 0e067d62b..1e6d150a4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2503.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2503.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2503" format="1">
+<glyph name="uni2503" format="2">
   <advance width="1233"/>
   <unicode hex="2503"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2504.glif b/source/Hack-Bold.ufo/glyphs/uni2504.glif
index d50a36d0e..5d4329be7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2504.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2504.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2504" format="1">
+<glyph name="uni2504" format="2">
   <advance width="1233"/>
   <unicode hex="2504"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2505.glif b/source/Hack-Bold.ufo/glyphs/uni2505.glif
index 5ba7c8463..754eec4a6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2505.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2505.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2505" format="1">
+<glyph name="uni2505" format="2">
   <advance width="1233"/>
   <unicode hex="2505"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2506.glif b/source/Hack-Bold.ufo/glyphs/uni2506.glif
index 5efa3b8d6..f78770484 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2506.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2506.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2506" format="1">
+<glyph name="uni2506" format="2">
   <advance width="1233"/>
   <unicode hex="2506"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2507.glif b/source/Hack-Bold.ufo/glyphs/uni2507.glif
index 5708e0d89..b4eba2c2b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2507.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2507.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2507" format="1">
+<glyph name="uni2507" format="2">
   <advance width="1233"/>
   <unicode hex="2507"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2508.glif b/source/Hack-Bold.ufo/glyphs/uni2508.glif
index 36048e87f..24c5f527c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2508.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2508.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2508" format="1">
+<glyph name="uni2508" format="2">
   <advance width="1233"/>
   <unicode hex="2508"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2509.glif b/source/Hack-Bold.ufo/glyphs/uni2509.glif
index 72288fcc1..5ba4882de 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2509.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2509.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2509" format="1">
+<glyph name="uni2509" format="2">
   <advance width="1233"/>
   <unicode hex="2509"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni250A_.glif b/source/Hack-Bold.ufo/glyphs/uni250A_.glif
index 326419d4f..cc5657bf8 100644
--- a/source/Hack-Bold.ufo/glyphs/uni250A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni250A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni250A" format="1">
+<glyph name="uni250A" format="2">
   <advance width="1233"/>
   <unicode hex="250A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni250B_.glif b/source/Hack-Bold.ufo/glyphs/uni250B_.glif
index c3ee89732..62cafe2d5 100644
--- a/source/Hack-Bold.ufo/glyphs/uni250B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni250B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni250B" format="1">
+<glyph name="uni250B" format="2">
   <advance width="1233"/>
   <unicode hex="250B"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni250C_.glif b/source/Hack-Bold.ufo/glyphs/uni250C_.glif
index 3bb58457a..fc997d4f4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni250C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni250C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni250C" format="1">
+<glyph name="uni250C" format="2">
   <advance width="1233"/>
   <unicode hex="250C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni250D_.glif b/source/Hack-Bold.ufo/glyphs/uni250D_.glif
index c13da916a..e34115b1f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni250D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni250D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni250D" format="1">
+<glyph name="uni250D" format="2">
   <advance width="1233"/>
   <unicode hex="250D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni250E_.glif b/source/Hack-Bold.ufo/glyphs/uni250E_.glif
index 4c1a00c1f..7696eb5f3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni250E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni250E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni250E" format="1">
+<glyph name="uni250E" format="2">
   <advance width="1233"/>
   <unicode hex="250E"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni250F_.glif b/source/Hack-Bold.ufo/glyphs/uni250F_.glif
index de7ebbd8c..8ce72f96a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni250F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni250F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni250F" format="1">
+<glyph name="uni250F" format="2">
   <advance width="1233"/>
   <unicode hex="250F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2510.glif b/source/Hack-Bold.ufo/glyphs/uni2510.glif
index ca6ae96b8..b619a2b32 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2510.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2510.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2510" format="1">
+<glyph name="uni2510" format="2">
   <advance width="1233"/>
   <unicode hex="2510"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2511.glif b/source/Hack-Bold.ufo/glyphs/uni2511.glif
index 730313a7f..49566b695 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2511.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2511.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2511" format="1">
+<glyph name="uni2511" format="2">
   <advance width="1233"/>
   <unicode hex="2511"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2512.glif b/source/Hack-Bold.ufo/glyphs/uni2512.glif
index 6ac0b73da..57d91c592 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2512.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2512.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2512" format="1">
+<glyph name="uni2512" format="2">
   <advance width="1233"/>
   <unicode hex="2512"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2513.glif b/source/Hack-Bold.ufo/glyphs/uni2513.glif
index 07da56005..939e456bd 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2513.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2513.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2513" format="1">
+<glyph name="uni2513" format="2">
   <advance width="1233"/>
   <unicode hex="2513"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2514.glif b/source/Hack-Bold.ufo/glyphs/uni2514.glif
index 6ea01e67e..cd4e6db7a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2514.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2514.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2514" format="1">
+<glyph name="uni2514" format="2">
   <advance width="1233"/>
   <unicode hex="2514"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2515.glif b/source/Hack-Bold.ufo/glyphs/uni2515.glif
index d80bfefe6..8a437d13f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2515.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2515.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2515" format="1">
+<glyph name="uni2515" format="2">
   <advance width="1233"/>
   <unicode hex="2515"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2516.glif b/source/Hack-Bold.ufo/glyphs/uni2516.glif
index a1e7786d8..a4d2007fb 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2516.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2516.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2516" format="1">
+<glyph name="uni2516" format="2">
   <advance width="1233"/>
   <unicode hex="2516"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2517.glif b/source/Hack-Bold.ufo/glyphs/uni2517.glif
index 80b5b9a16..e1218e29e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2517.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2517.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2517" format="1">
+<glyph name="uni2517" format="2">
   <advance width="1233"/>
   <unicode hex="2517"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2518.glif b/source/Hack-Bold.ufo/glyphs/uni2518.glif
index 017273e68..837c14e81 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2518.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2518.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2518" format="1">
+<glyph name="uni2518" format="2">
   <advance width="1233"/>
   <unicode hex="2518"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2519.glif b/source/Hack-Bold.ufo/glyphs/uni2519.glif
index 754033b48..16fd46687 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2519.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2519.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2519" format="1">
+<glyph name="uni2519" format="2">
   <advance width="1233"/>
   <unicode hex="2519"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni251A_.glif b/source/Hack-Bold.ufo/glyphs/uni251A_.glif
index 0079f5dcb..29771eed8 100644
--- a/source/Hack-Bold.ufo/glyphs/uni251A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni251A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni251A" format="1">
+<glyph name="uni251A" format="2">
   <advance width="1233"/>
   <unicode hex="251A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni251B_.glif b/source/Hack-Bold.ufo/glyphs/uni251B_.glif
index 0975ba76c..4d876080f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni251B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni251B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni251B" format="1">
+<glyph name="uni251B" format="2">
   <advance width="1233"/>
   <unicode hex="251B"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni251C_.glif b/source/Hack-Bold.ufo/glyphs/uni251C_.glif
index 317eef6ff..035384e8e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni251C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni251C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni251C" format="1">
+<glyph name="uni251C" format="2">
   <advance width="1233"/>
   <unicode hex="251C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni251D_.glif b/source/Hack-Bold.ufo/glyphs/uni251D_.glif
index 7917d89b5..82133e678 100644
--- a/source/Hack-Bold.ufo/glyphs/uni251D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni251D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni251D" format="1">
+<glyph name="uni251D" format="2">
   <advance width="1233"/>
   <unicode hex="251D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni251E_.glif b/source/Hack-Bold.ufo/glyphs/uni251E_.glif
index ec76929ee..6f8e608a6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni251E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni251E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni251E" format="1">
+<glyph name="uni251E" format="2">
   <advance width="1233"/>
   <unicode hex="251E"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni251F_.glif b/source/Hack-Bold.ufo/glyphs/uni251F_.glif
index 7951311b3..0ba4a983e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni251F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni251F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni251F" format="1">
+<glyph name="uni251F" format="2">
   <advance width="1233"/>
   <unicode hex="251F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2520.glif b/source/Hack-Bold.ufo/glyphs/uni2520.glif
index 48b8d811d..d7db40b19 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2520.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2520.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2520" format="1">
+<glyph name="uni2520" format="2">
   <advance width="1233"/>
   <unicode hex="2520"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2521.glif b/source/Hack-Bold.ufo/glyphs/uni2521.glif
index 9a9189030..99d8e5651 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2521.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2521.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2521" format="1">
+<glyph name="uni2521" format="2">
   <advance width="1233"/>
   <unicode hex="2521"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2522.glif b/source/Hack-Bold.ufo/glyphs/uni2522.glif
index beec610ae..e46fe28b7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2522.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2522.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2522" format="1">
+<glyph name="uni2522" format="2">
   <advance width="1233"/>
   <unicode hex="2522"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2523.glif b/source/Hack-Bold.ufo/glyphs/uni2523.glif
index 64dbc41bc..f4dacb474 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2523.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2523.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2523" format="1">
+<glyph name="uni2523" format="2">
   <advance width="1233"/>
   <unicode hex="2523"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2524.glif b/source/Hack-Bold.ufo/glyphs/uni2524.glif
index e25dd4855..7c1c49f3b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2524.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2524.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2524" format="1">
+<glyph name="uni2524" format="2">
   <advance width="1233"/>
   <unicode hex="2524"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2525.glif b/source/Hack-Bold.ufo/glyphs/uni2525.glif
index 3a2ba11c6..ebd9cd8f1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2525.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2525.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2525" format="1">
+<glyph name="uni2525" format="2">
   <advance width="1233"/>
   <unicode hex="2525"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2526.glif b/source/Hack-Bold.ufo/glyphs/uni2526.glif
index b23927ce0..fd5234524 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2526.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2526.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2526" format="1">
+<glyph name="uni2526" format="2">
   <advance width="1233"/>
   <unicode hex="2526"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2527.glif b/source/Hack-Bold.ufo/glyphs/uni2527.glif
index f08eebe71..f746e9af2 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2527.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2527.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2527" format="1">
+<glyph name="uni2527" format="2">
   <advance width="1233"/>
   <unicode hex="2527"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2528.glif b/source/Hack-Bold.ufo/glyphs/uni2528.glif
index fc50e2952..dddc9bfb3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2528.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2528.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2528" format="1">
+<glyph name="uni2528" format="2">
   <advance width="1233"/>
   <unicode hex="2528"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2529.glif b/source/Hack-Bold.ufo/glyphs/uni2529.glif
index 4c4a6320d..36019c98c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2529.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2529.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2529" format="1">
+<glyph name="uni2529" format="2">
   <advance width="1233"/>
   <unicode hex="2529"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni252A_.glif b/source/Hack-Bold.ufo/glyphs/uni252A_.glif
index de1e3f6ca..58ce526ba 100644
--- a/source/Hack-Bold.ufo/glyphs/uni252A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni252A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni252A" format="1">
+<glyph name="uni252A" format="2">
   <advance width="1233"/>
   <unicode hex="252A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni252B_.glif b/source/Hack-Bold.ufo/glyphs/uni252B_.glif
index 9af4bb7e3..1bb97939d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni252B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni252B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni252B" format="1">
+<glyph name="uni252B" format="2">
   <advance width="1233"/>
   <unicode hex="252B"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni252C_.glif b/source/Hack-Bold.ufo/glyphs/uni252C_.glif
index 71c9aebce..a5ceefa4a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni252C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni252C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni252C" format="1">
+<glyph name="uni252C" format="2">
   <advance width="1233"/>
   <unicode hex="252C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni252D_.glif b/source/Hack-Bold.ufo/glyphs/uni252D_.glif
index 7870a65dc..3adb19018 100644
--- a/source/Hack-Bold.ufo/glyphs/uni252D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni252D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni252D" format="1">
+<glyph name="uni252D" format="2">
   <advance width="1233"/>
   <unicode hex="252D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni252E_.glif b/source/Hack-Bold.ufo/glyphs/uni252E_.glif
index 3a5c6d74d..1d2a8974d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni252E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni252E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni252E" format="1">
+<glyph name="uni252E" format="2">
   <advance width="1233"/>
   <unicode hex="252E"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni252F_.glif b/source/Hack-Bold.ufo/glyphs/uni252F_.glif
index 3e6e9d1f0..b4b65ba37 100644
--- a/source/Hack-Bold.ufo/glyphs/uni252F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni252F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni252F" format="1">
+<glyph name="uni252F" format="2">
   <advance width="1233"/>
   <unicode hex="252F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2530.glif b/source/Hack-Bold.ufo/glyphs/uni2530.glif
index 50e93e19a..c37b0a903 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2530.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2530.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2530" format="1">
+<glyph name="uni2530" format="2">
   <advance width="1233"/>
   <unicode hex="2530"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2531.glif b/source/Hack-Bold.ufo/glyphs/uni2531.glif
index fe41525b6..ab1daaa5b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2531.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2531.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2531" format="1">
+<glyph name="uni2531" format="2">
   <advance width="1233"/>
   <unicode hex="2531"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2532.glif b/source/Hack-Bold.ufo/glyphs/uni2532.glif
index 2113c7f6e..d27193aee 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2532.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2532.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2532" format="1">
+<glyph name="uni2532" format="2">
   <advance width="1233"/>
   <unicode hex="2532"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2533.glif b/source/Hack-Bold.ufo/glyphs/uni2533.glif
index 7158447b9..b2340787d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2533.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2533.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2533" format="1">
+<glyph name="uni2533" format="2">
   <advance width="1233"/>
   <unicode hex="2533"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2534.glif b/source/Hack-Bold.ufo/glyphs/uni2534.glif
index fc64d96bd..44f1e90ec 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2534.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2534.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2534" format="1">
+<glyph name="uni2534" format="2">
   <advance width="1233"/>
   <unicode hex="2534"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2535.glif b/source/Hack-Bold.ufo/glyphs/uni2535.glif
index 86b705611..92b5d9fb4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2535.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2535.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2535" format="1">
+<glyph name="uni2535" format="2">
   <advance width="1233"/>
   <unicode hex="2535"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2536.glif b/source/Hack-Bold.ufo/glyphs/uni2536.glif
index 5ba854889..0bc16e000 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2536.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2536.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2536" format="1">
+<glyph name="uni2536" format="2">
   <advance width="1233"/>
   <unicode hex="2536"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2537.glif b/source/Hack-Bold.ufo/glyphs/uni2537.glif
index d06adad76..50634f1f0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2537.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2537.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2537" format="1">
+<glyph name="uni2537" format="2">
   <advance width="1233"/>
   <unicode hex="2537"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2538.glif b/source/Hack-Bold.ufo/glyphs/uni2538.glif
index 63679b811..3fbe88513 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2538.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2538.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2538" format="1">
+<glyph name="uni2538" format="2">
   <advance width="1233"/>
   <unicode hex="2538"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2539.glif b/source/Hack-Bold.ufo/glyphs/uni2539.glif
index 0aeb1ae5b..871292d9f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2539.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2539.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2539" format="1">
+<glyph name="uni2539" format="2">
   <advance width="1233"/>
   <unicode hex="2539"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni253A_.glif b/source/Hack-Bold.ufo/glyphs/uni253A_.glif
index d1f9403e1..6f14e3242 100644
--- a/source/Hack-Bold.ufo/glyphs/uni253A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni253A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni253A" format="1">
+<glyph name="uni253A" format="2">
   <advance width="1233"/>
   <unicode hex="253A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni253B_.glif b/source/Hack-Bold.ufo/glyphs/uni253B_.glif
index 6d1f8b5c9..14fe114d1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni253B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni253B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni253B" format="1">
+<glyph name="uni253B" format="2">
   <advance width="1233"/>
   <unicode hex="253B"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni253C_.glif b/source/Hack-Bold.ufo/glyphs/uni253C_.glif
index 581841704..74676cf9e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni253C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni253C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni253C" format="1">
+<glyph name="uni253C" format="2">
   <advance width="1233"/>
   <unicode hex="253C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni253D_.glif b/source/Hack-Bold.ufo/glyphs/uni253D_.glif
index f5841e09a..c4b47a679 100644
--- a/source/Hack-Bold.ufo/glyphs/uni253D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni253D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni253D" format="1">
+<glyph name="uni253D" format="2">
   <advance width="1233"/>
   <unicode hex="253D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni253E_.glif b/source/Hack-Bold.ufo/glyphs/uni253E_.glif
index 7ba89e7b1..5b551a63a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni253E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni253E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni253E" format="1">
+<glyph name="uni253E" format="2">
   <advance width="1233"/>
   <unicode hex="253E"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni253F_.glif b/source/Hack-Bold.ufo/glyphs/uni253F_.glif
index 1fcc62cbd..fefe01919 100644
--- a/source/Hack-Bold.ufo/glyphs/uni253F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni253F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni253F" format="1">
+<glyph name="uni253F" format="2">
   <advance width="1233"/>
   <unicode hex="253F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2540.glif b/source/Hack-Bold.ufo/glyphs/uni2540.glif
index 8734d3ccf..2ad2367f8 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2540.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2540.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2540" format="1">
+<glyph name="uni2540" format="2">
   <advance width="1233"/>
   <unicode hex="2540"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2541.glif b/source/Hack-Bold.ufo/glyphs/uni2541.glif
index 9bef0eee8..874c8ee08 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2541.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2541.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2541" format="1">
+<glyph name="uni2541" format="2">
   <advance width="1233"/>
   <unicode hex="2541"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2542.glif b/source/Hack-Bold.ufo/glyphs/uni2542.glif
index ad562119e..99e2e676f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2542.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2542.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2542" format="1">
+<glyph name="uni2542" format="2">
   <advance width="1233"/>
   <unicode hex="2542"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2543.glif b/source/Hack-Bold.ufo/glyphs/uni2543.glif
index 5166af2b6..0a2c4cf84 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2543.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2543.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2543" format="1">
+<glyph name="uni2543" format="2">
   <advance width="1233"/>
   <unicode hex="2543"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2544.glif b/source/Hack-Bold.ufo/glyphs/uni2544.glif
index 48e31de5c..58ec46752 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2544.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2544.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2544" format="1">
+<glyph name="uni2544" format="2">
   <advance width="1233"/>
   <unicode hex="2544"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2545.glif b/source/Hack-Bold.ufo/glyphs/uni2545.glif
index b9f2378bd..b005e36e2 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2545.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2545.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2545" format="1">
+<glyph name="uni2545" format="2">
   <advance width="1233"/>
   <unicode hex="2545"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2546.glif b/source/Hack-Bold.ufo/glyphs/uni2546.glif
index cdaaf29e8..6e0d525bd 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2546.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2546.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2546" format="1">
+<glyph name="uni2546" format="2">
   <advance width="1233"/>
   <unicode hex="2546"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2547.glif b/source/Hack-Bold.ufo/glyphs/uni2547.glif
index fbbbae3de..9dc7aeab4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2547.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2547.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2547" format="1">
+<glyph name="uni2547" format="2">
   <advance width="1233"/>
   <unicode hex="2547"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2548.glif b/source/Hack-Bold.ufo/glyphs/uni2548.glif
index 3c3e28a92..c34823556 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2548.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2548.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2548" format="1">
+<glyph name="uni2548" format="2">
   <advance width="1233"/>
   <unicode hex="2548"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2549.glif b/source/Hack-Bold.ufo/glyphs/uni2549.glif
index b3d0471df..5d6be817d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2549.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2549.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2549" format="1">
+<glyph name="uni2549" format="2">
   <advance width="1233"/>
   <unicode hex="2549"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni254A_.glif b/source/Hack-Bold.ufo/glyphs/uni254A_.glif
index f2328d0bc..01a40ee11 100644
--- a/source/Hack-Bold.ufo/glyphs/uni254A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni254A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni254A" format="1">
+<glyph name="uni254A" format="2">
   <advance width="1233"/>
   <unicode hex="254A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni254B_.glif b/source/Hack-Bold.ufo/glyphs/uni254B_.glif
index 89e3ecc7c..86d15e211 100644
--- a/source/Hack-Bold.ufo/glyphs/uni254B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni254B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni254B" format="1">
+<glyph name="uni254B" format="2">
   <advance width="1233"/>
   <unicode hex="254B"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni254C_.glif b/source/Hack-Bold.ufo/glyphs/uni254C_.glif
index bf16884c5..0d7049383 100644
--- a/source/Hack-Bold.ufo/glyphs/uni254C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni254C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni254C" format="1">
+<glyph name="uni254C" format="2">
   <advance width="1233"/>
   <unicode hex="254C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni254D_.glif b/source/Hack-Bold.ufo/glyphs/uni254D_.glif
index 79d4abc50..2f595fd35 100644
--- a/source/Hack-Bold.ufo/glyphs/uni254D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni254D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni254D" format="1">
+<glyph name="uni254D" format="2">
   <advance width="1233"/>
   <unicode hex="254D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni254E_.glif b/source/Hack-Bold.ufo/glyphs/uni254E_.glif
index 170dcfdd4..7fe74afe7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni254E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni254E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni254E" format="1">
+<glyph name="uni254E" format="2">
   <advance width="1233"/>
   <unicode hex="254E"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni254F_.glif b/source/Hack-Bold.ufo/glyphs/uni254F_.glif
index 7a00fdbf5..598352872 100644
--- a/source/Hack-Bold.ufo/glyphs/uni254F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni254F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni254F" format="1">
+<glyph name="uni254F" format="2">
   <advance width="1233"/>
   <unicode hex="254F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2550.glif b/source/Hack-Bold.ufo/glyphs/uni2550.glif
index b47e7f6cf..3a3127b08 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2550.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2550.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2550" format="1">
+<glyph name="uni2550" format="2">
   <advance width="1233"/>
   <unicode hex="2550"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2551.glif b/source/Hack-Bold.ufo/glyphs/uni2551.glif
index 261f33ce0..b86f5797d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2551.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2551.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2551" format="1">
+<glyph name="uni2551" format="2">
   <advance width="1233"/>
   <unicode hex="2551"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2552.glif b/source/Hack-Bold.ufo/glyphs/uni2552.glif
index 5e8a62bfd..5cf675e17 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2552.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2552.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2552" format="1">
+<glyph name="uni2552" format="2">
   <advance width="1233"/>
   <unicode hex="2552"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2553.glif b/source/Hack-Bold.ufo/glyphs/uni2553.glif
index 03e805d83..b79ca303d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2553.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2553.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2553" format="1">
+<glyph name="uni2553" format="2">
   <advance width="1233"/>
   <unicode hex="2553"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2554.glif b/source/Hack-Bold.ufo/glyphs/uni2554.glif
index 97badf786..2dd8ae161 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2554.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2554.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2554" format="1">
+<glyph name="uni2554" format="2">
   <advance width="1233"/>
   <unicode hex="2554"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2555.glif b/source/Hack-Bold.ufo/glyphs/uni2555.glif
index 94103017c..68866dfb1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2555.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2555.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2555" format="1">
+<glyph name="uni2555" format="2">
   <advance width="1233"/>
   <unicode hex="2555"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2556.glif b/source/Hack-Bold.ufo/glyphs/uni2556.glif
index b3208e323..cdab621c7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2556.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2556.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2556" format="1">
+<glyph name="uni2556" format="2">
   <advance width="1233"/>
   <unicode hex="2556"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2557.glif b/source/Hack-Bold.ufo/glyphs/uni2557.glif
index bb82a4b47..e2af7ab8d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2557.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2557.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2557" format="1">
+<glyph name="uni2557" format="2">
   <advance width="1233"/>
   <unicode hex="2557"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2558.glif b/source/Hack-Bold.ufo/glyphs/uni2558.glif
index 396f9de67..4e262549a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2558.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2558.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2558" format="1">
+<glyph name="uni2558" format="2">
   <advance width="1233"/>
   <unicode hex="2558"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2559.glif b/source/Hack-Bold.ufo/glyphs/uni2559.glif
index ba1eeeb4e..c122a93c1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2559.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2559.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2559" format="1">
+<glyph name="uni2559" format="2">
   <advance width="1233"/>
   <unicode hex="2559"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni255A_.glif b/source/Hack-Bold.ufo/glyphs/uni255A_.glif
index 1136c2a8e..f017411f2 100644
--- a/source/Hack-Bold.ufo/glyphs/uni255A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni255A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni255A" format="1">
+<glyph name="uni255A" format="2">
   <advance width="1233"/>
   <unicode hex="255A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni255B_.glif b/source/Hack-Bold.ufo/glyphs/uni255B_.glif
index 904566700..0d441cda2 100644
--- a/source/Hack-Bold.ufo/glyphs/uni255B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni255B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni255B" format="1">
+<glyph name="uni255B" format="2">
   <advance width="1233"/>
   <unicode hex="255B"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni255C_.glif b/source/Hack-Bold.ufo/glyphs/uni255C_.glif
index fc8692c05..8419d131f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni255C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni255C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni255C" format="1">
+<glyph name="uni255C" format="2">
   <advance width="1233"/>
   <unicode hex="255C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni255D_.glif b/source/Hack-Bold.ufo/glyphs/uni255D_.glif
index d1873f016..b093d68da 100644
--- a/source/Hack-Bold.ufo/glyphs/uni255D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni255D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni255D" format="1">
+<glyph name="uni255D" format="2">
   <advance width="1233"/>
   <unicode hex="255D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni255E_.glif b/source/Hack-Bold.ufo/glyphs/uni255E_.glif
index 18076afa2..b1469a4aa 100644
--- a/source/Hack-Bold.ufo/glyphs/uni255E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni255E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni255E" format="1">
+<glyph name="uni255E" format="2">
   <advance width="1233"/>
   <unicode hex="255E"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni255F_.glif b/source/Hack-Bold.ufo/glyphs/uni255F_.glif
index 40de34e6f..a1b53b07d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni255F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni255F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni255F" format="1">
+<glyph name="uni255F" format="2">
   <advance width="1233"/>
   <unicode hex="255F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2560.glif b/source/Hack-Bold.ufo/glyphs/uni2560.glif
index 256d00fbc..e06097e96 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2560.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2560.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2560" format="1">
+<glyph name="uni2560" format="2">
   <advance width="1233"/>
   <unicode hex="2560"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2561.glif b/source/Hack-Bold.ufo/glyphs/uni2561.glif
index 217236652..9da45f067 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2561.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2561.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2561" format="1">
+<glyph name="uni2561" format="2">
   <advance width="1233"/>
   <unicode hex="2561"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2562.glif b/source/Hack-Bold.ufo/glyphs/uni2562.glif
index 852242a73..be486e9ba 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2562.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2562.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2562" format="1">
+<glyph name="uni2562" format="2">
   <advance width="1233"/>
   <unicode hex="2562"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2563.glif b/source/Hack-Bold.ufo/glyphs/uni2563.glif
index 3135ce979..2f5b42d98 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2563.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2563.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2563" format="1">
+<glyph name="uni2563" format="2">
   <advance width="1233"/>
   <unicode hex="2563"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2564.glif b/source/Hack-Bold.ufo/glyphs/uni2564.glif
index f38dc6867..b3e049b39 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2564.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2564.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2564" format="1">
+<glyph name="uni2564" format="2">
   <advance width="1233"/>
   <unicode hex="2564"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2565.glif b/source/Hack-Bold.ufo/glyphs/uni2565.glif
index 32918026a..d73b072df 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2565.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2565.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2565" format="1">
+<glyph name="uni2565" format="2">
   <advance width="1233"/>
   <unicode hex="2565"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2566.glif b/source/Hack-Bold.ufo/glyphs/uni2566.glif
index 56e6dd721..a94f7d09c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2566.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2566.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2566" format="1">
+<glyph name="uni2566" format="2">
   <advance width="1233"/>
   <unicode hex="2566"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2567.glif b/source/Hack-Bold.ufo/glyphs/uni2567.glif
index 68b908f96..223af2028 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2567.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2567.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2567" format="1">
+<glyph name="uni2567" format="2">
   <advance width="1233"/>
   <unicode hex="2567"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2568.glif b/source/Hack-Bold.ufo/glyphs/uni2568.glif
index f549fa3bb..d38e8939e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2568.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2568.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2568" format="1">
+<glyph name="uni2568" format="2">
   <advance width="1233"/>
   <unicode hex="2568"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2569.glif b/source/Hack-Bold.ufo/glyphs/uni2569.glif
index 1a12528ef..b4e716f26 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2569.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2569.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2569" format="1">
+<glyph name="uni2569" format="2">
   <advance width="1233"/>
   <unicode hex="2569"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni256A_.glif b/source/Hack-Bold.ufo/glyphs/uni256A_.glif
index 04e260d1f..2ef579caa 100644
--- a/source/Hack-Bold.ufo/glyphs/uni256A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni256A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni256A" format="1">
+<glyph name="uni256A" format="2">
   <advance width="1233"/>
   <unicode hex="256A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni256B_.glif b/source/Hack-Bold.ufo/glyphs/uni256B_.glif
index 7333d3239..6d45122c3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni256B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni256B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni256B" format="1">
+<glyph name="uni256B" format="2">
   <advance width="1233"/>
   <unicode hex="256B"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni256C_.glif b/source/Hack-Bold.ufo/glyphs/uni256C_.glif
index cd88ad20e..496a383b9 100644
--- a/source/Hack-Bold.ufo/glyphs/uni256C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni256C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni256C" format="1">
+<glyph name="uni256C" format="2">
   <advance width="1233"/>
   <unicode hex="256C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni256D_.glif b/source/Hack-Bold.ufo/glyphs/uni256D_.glif
index 8760acadf..d93b489d4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni256D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni256D_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni256D" format="1">
+<glyph name="uni256D" format="2">
   <advance width="1233"/>
   <unicode hex="256D"/>
   <outline>
     <contour>
-      <point x="536" y="368" type="line" name="hr00" smooth="yes"/>
+      <point x="536" y="368" type="line" smooth="yes" name="hr00"/>
       <point x="536" y="588"/>
       <point x="648" y="790"/>
       <point x="876" y="790" type="curve" smooth="yes"/>
@@ -13,7 +13,7 @@
       <point x="876" y="618" type="line" smooth="yes"/>
       <point x="756" y="618"/>
       <point x="696" y="535"/>
-      <point x="696" y="368" type="curve" name="dh01" smooth="yes"/>
+      <point x="696" y="368" type="curve" smooth="yes" name="dh01"/>
       <point x="696" y="-530" type="line" name="av01"/>
       <point x="536" y="-530" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni256E_.glif b/source/Hack-Bold.ufo/glyphs/uni256E_.glif
index 8e445e2ab..e58b7c33a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni256E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni256E_.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni256E" format="1">
+<glyph name="uni256E" format="2">
   <advance width="1233"/>
   <unicode hex="256E"/>
   <outline>
     <contour>
-      <point x="536" y="368" type="line" name="hr00" smooth="yes"/>
+      <point x="536" y="368" type="line" smooth="yes" name="hr00"/>
       <point x="536" y="535"/>
       <point x="476" y="618"/>
-      <point x="356" y="618" type="curve" name="dv01" smooth="yes"/>
+      <point x="356" y="618" type="curve" smooth="yes" name="dv01"/>
       <point x="-20" y="618" type="line"/>
       <point x="-20" y="790" type="line"/>
-      <point x="356" y="790" type="line" name="dv02" smooth="yes"/>
+      <point x="356" y="790" type="line" smooth="yes" name="dv02"/>
       <point x="580" y="790"/>
       <point x="696" y="592"/>
-      <point x="696" y="368" type="curve" name="dh01" smooth="yes"/>
+      <point x="696" y="368" type="curve" smooth="yes" name="dh01"/>
       <point x="696" y="-530" type="line" name="av01"/>
       <point x="536" y="-530" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni256F_.glif b/source/Hack-Bold.ufo/glyphs/uni256F_.glif
index 5351c8523..e21cf5a0a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni256F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni256F_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni256F" format="1">
+<glyph name="uni256F" format="2">
   <advance width="1233"/>
   <unicode hex="256F"/>
   <outline>
     <contour>
       <point x="-20" y="790" type="line" name="hr00"/>
-      <point x="356" y="790" type="line" name="dv02" smooth="yes"/>
+      <point x="356" y="790" type="line" smooth="yes" name="dv02"/>
       <point x="476" y="790"/>
       <point x="536" y="873"/>
-      <point x="536" y="1040" type="curve" name="dh01" smooth="yes"/>
+      <point x="536" y="1040" type="curve" smooth="yes" name="dh01"/>
       <point x="536" y="1950" type="line" name="av01"/>
       <point x="696" y="1950" type="line"/>
-      <point x="696" y="1040" type="line" name="dh02" smooth="yes"/>
+      <point x="696" y="1040" type="line" smooth="yes" name="dh02"/>
       <point x="696" y="816"/>
       <point x="580" y="618"/>
-      <point x="356" y="618" type="curve" name="dv01" smooth="yes"/>
+      <point x="356" y="618" type="curve" smooth="yes" name="dv01"/>
       <point x="-20" y="618" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2570.glif b/source/Hack-Bold.ufo/glyphs/uni2570.glif
index 4aa6427df..cd040d380 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2570.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2570.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2570" format="1">
+<glyph name="uni2570" format="2">
   <advance width="1233"/>
   <unicode hex="2570"/>
   <outline>
     <contour>
-      <point x="876" y="618" type="line" name="hr00" smooth="yes"/>
+      <point x="876" y="618" type="line" smooth="yes" name="hr00"/>
       <point x="652" y="618"/>
       <point x="536" y="816"/>
-      <point x="536" y="1040" type="curve" name="dh01" smooth="yes"/>
+      <point x="536" y="1040" type="curve" smooth="yes" name="dh01"/>
       <point x="536" y="1950" type="line" name="av01"/>
       <point x="696" y="1950" type="line"/>
-      <point x="696" y="1040" type="line" name="dh02" smooth="yes"/>
+      <point x="696" y="1040" type="line" smooth="yes" name="dh02"/>
       <point x="696" y="873"/>
       <point x="756" y="790"/>
-      <point x="876" y="790" type="curve" name="dv01" smooth="yes"/>
+      <point x="876" y="790" type="curve" smooth="yes" name="dv01"/>
       <point x="1253" y="790" type="line"/>
       <point x="1253" y="618" type="line" name="sv01"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2571.glif b/source/Hack-Bold.ufo/glyphs/uni2571.glif
index 44ff55c93..eef474427 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2571.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2571.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2571" format="1">
+<glyph name="uni2571" format="2">
   <advance width="1233"/>
   <unicode hex="2571"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2572.glif b/source/Hack-Bold.ufo/glyphs/uni2572.glif
index ca5e423c0..498ab0ee7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2572.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2572.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2572" format="1">
+<glyph name="uni2572" format="2">
   <advance width="1233"/>
   <unicode hex="2572"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2573.glif b/source/Hack-Bold.ufo/glyphs/uni2573.glif
index 159f35381..8fbf5b682 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2573.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2573.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2573" format="1">
+<glyph name="uni2573" format="2">
   <advance width="1233"/>
   <unicode hex="2573"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2574.glif b/source/Hack-Bold.ufo/glyphs/uni2574.glif
index e7c84c71f..0e09ba91f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2574.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2574.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2574" format="1">
+<glyph name="uni2574" format="2">
   <advance width="1233"/>
   <unicode hex="2574"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2575.glif b/source/Hack-Bold.ufo/glyphs/uni2575.glif
index 96e280131..ec944d0a4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2575.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2575.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2575" format="1">
+<glyph name="uni2575" format="2">
   <advance width="1233"/>
   <unicode hex="2575"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2576.glif b/source/Hack-Bold.ufo/glyphs/uni2576.glif
index 1b39e2a22..11ed02cb6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2576.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2576.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2576" format="1">
+<glyph name="uni2576" format="2">
   <advance width="1233"/>
   <unicode hex="2576"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2577.glif b/source/Hack-Bold.ufo/glyphs/uni2577.glif
index aa48e51a7..53060389c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2577.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2577.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2577" format="1">
+<glyph name="uni2577" format="2">
   <advance width="1233"/>
   <unicode hex="2577"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2578.glif b/source/Hack-Bold.ufo/glyphs/uni2578.glif
index 00736562c..0945fca2e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2578.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2578.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2578" format="1">
+<glyph name="uni2578" format="2">
   <advance width="1233"/>
   <unicode hex="2578"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2579.glif b/source/Hack-Bold.ufo/glyphs/uni2579.glif
index 8c11f2f6e..128bd20e7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2579.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2579.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2579" format="1">
+<glyph name="uni2579" format="2">
   <advance width="1233"/>
   <unicode hex="2579"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni257A_.glif b/source/Hack-Bold.ufo/glyphs/uni257A_.glif
index b3693128a..a0d9bff9c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni257A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni257A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni257A" format="1">
+<glyph name="uni257A" format="2">
   <advance width="1233"/>
   <unicode hex="257A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni257B_.glif b/source/Hack-Bold.ufo/glyphs/uni257B_.glif
index 2393151f1..5912156b3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni257B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni257B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni257B" format="1">
+<glyph name="uni257B" format="2">
   <advance width="1233"/>
   <unicode hex="257B"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni257C_.glif b/source/Hack-Bold.ufo/glyphs/uni257C_.glif
index 283219c78..b38ca326b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni257C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni257C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni257C" format="1">
+<glyph name="uni257C" format="2">
   <advance width="1233"/>
   <unicode hex="257C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni257D_.glif b/source/Hack-Bold.ufo/glyphs/uni257D_.glif
index 194dbdb46..3f8e9ceeb 100644
--- a/source/Hack-Bold.ufo/glyphs/uni257D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni257D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni257D" format="1">
+<glyph name="uni257D" format="2">
   <advance width="1233"/>
   <unicode hex="257D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni257E_.glif b/source/Hack-Bold.ufo/glyphs/uni257E_.glif
index 2aff928e0..7115d7f36 100644
--- a/source/Hack-Bold.ufo/glyphs/uni257E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni257E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni257E" format="1">
+<glyph name="uni257E" format="2">
   <advance width="1233"/>
   <unicode hex="257E"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni257F_.glif b/source/Hack-Bold.ufo/glyphs/uni257F_.glif
index d48717c62..4d3d7d4d6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni257F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni257F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni257F" format="1">
+<glyph name="uni257F" format="2">
   <advance width="1233"/>
   <unicode hex="257F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2581.glif b/source/Hack-Bold.ufo/glyphs/uni2581.glif
index 8405625ca..079423173 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2581.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2581.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2581" format="1">
+<glyph name="uni2581" format="2">
   <advance width="1233"/>
   <unicode hex="2581"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2582.glif b/source/Hack-Bold.ufo/glyphs/uni2582.glif
index 7f765cf2a..f63f6933a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2582.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2582.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2582" format="1">
+<glyph name="uni2582" format="2">
   <advance width="1233"/>
   <unicode hex="2582"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2583.glif b/source/Hack-Bold.ufo/glyphs/uni2583.glif
index 6fbe0d6eb..120b07d2c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2583.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2583.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2583" format="1">
+<glyph name="uni2583" format="2">
   <advance width="1233"/>
   <unicode hex="2583"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2585.glif b/source/Hack-Bold.ufo/glyphs/uni2585.glif
index ed0ee82ae..bb0e93e9a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2585.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2585.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2585" format="1">
+<glyph name="uni2585" format="2">
   <advance width="1233"/>
   <unicode hex="2585"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2586.glif b/source/Hack-Bold.ufo/glyphs/uni2586.glif
index 5a8fa5b09..d263128b3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2586.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2586.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2586" format="1">
+<glyph name="uni2586" format="2">
   <advance width="1233"/>
   <unicode hex="2586"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2587.glif b/source/Hack-Bold.ufo/glyphs/uni2587.glif
index e8035ccb0..56c99eafd 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2587.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2587.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2587" format="1">
+<glyph name="uni2587" format="2">
   <advance width="1233"/>
   <unicode hex="2587"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2589.glif b/source/Hack-Bold.ufo/glyphs/uni2589.glif
index 786359c88..8f262f1f7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2589.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2589.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2589" format="1">
+<glyph name="uni2589" format="2">
   <advance width="1233"/>
   <unicode hex="2589"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni258A_.glif b/source/Hack-Bold.ufo/glyphs/uni258A_.glif
index 0d4a83b45..93a17e9c0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni258A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni258A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni258A" format="1">
+<glyph name="uni258A" format="2">
   <advance width="1233"/>
   <unicode hex="258A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni258B_.glif b/source/Hack-Bold.ufo/glyphs/uni258B_.glif
index be5747641..5bae0499b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni258B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni258B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni258B" format="1">
+<glyph name="uni258B" format="2">
   <advance width="1233"/>
   <unicode hex="258B"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni258D_.glif b/source/Hack-Bold.ufo/glyphs/uni258D_.glif
index dbf54fe4e..869644627 100644
--- a/source/Hack-Bold.ufo/glyphs/uni258D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni258D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni258D" format="1">
+<glyph name="uni258D" format="2">
   <advance width="1233"/>
   <unicode hex="258D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni258E_.glif b/source/Hack-Bold.ufo/glyphs/uni258E_.glif
index b5dd2b7f4..1845ea7c8 100644
--- a/source/Hack-Bold.ufo/glyphs/uni258E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni258E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni258E" format="1">
+<glyph name="uni258E" format="2">
   <advance width="1233"/>
   <unicode hex="258E"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni258F_.glif b/source/Hack-Bold.ufo/glyphs/uni258F_.glif
index d02cd90c7..73576f872 100644
--- a/source/Hack-Bold.ufo/glyphs/uni258F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni258F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni258F" format="1">
+<glyph name="uni258F" format="2">
   <advance width="1233"/>
   <unicode hex="258F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2594.glif b/source/Hack-Bold.ufo/glyphs/uni2594.glif
index f2265c59a..ffe1c0bc6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2594.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2594.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2594" format="1">
+<glyph name="uni2594" format="2">
   <advance width="1233"/>
   <unicode hex="2594"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2595.glif b/source/Hack-Bold.ufo/glyphs/uni2595.glif
index b10165576..e6e015d6a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2595.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2595.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2595" format="1">
+<glyph name="uni2595" format="2">
   <advance width="1233"/>
   <unicode hex="2595"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2596.glif b/source/Hack-Bold.ufo/glyphs/uni2596.glif
index 1f57b343a..b6179a5f7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2596.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2596.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2596" format="1">
+<glyph name="uni2596" format="2">
   <advance width="1233"/>
   <unicode hex="2596"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2597.glif b/source/Hack-Bold.ufo/glyphs/uni2597.glif
index d427aa9da..2c11348a4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2597.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2597.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2597" format="1">
+<glyph name="uni2597" format="2">
   <advance width="1233"/>
   <unicode hex="2597"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2598.glif b/source/Hack-Bold.ufo/glyphs/uni2598.glif
index 819a90323..b00f88201 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2598.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2598.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2598" format="1">
+<glyph name="uni2598" format="2">
   <advance width="1233"/>
   <unicode hex="2598"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2599.glif b/source/Hack-Bold.ufo/glyphs/uni2599.glif
index f90045b44..b5ba9b42e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2599.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2599.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2599" format="1">
+<glyph name="uni2599" format="2">
   <advance width="1233"/>
   <unicode hex="2599"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni259A_.glif b/source/Hack-Bold.ufo/glyphs/uni259A_.glif
index 633681312..1a4e2ca22 100644
--- a/source/Hack-Bold.ufo/glyphs/uni259A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni259A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni259A" format="1">
+<glyph name="uni259A" format="2">
   <advance width="1233"/>
   <unicode hex="259A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni259B_.glif b/source/Hack-Bold.ufo/glyphs/uni259B_.glif
index 5baba3b40..e59de2ffa 100644
--- a/source/Hack-Bold.ufo/glyphs/uni259B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni259B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni259B" format="1">
+<glyph name="uni259B" format="2">
   <advance width="1233"/>
   <unicode hex="259B"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni259C_.glif b/source/Hack-Bold.ufo/glyphs/uni259C_.glif
index 7f2559138..2fd4f9fd3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni259C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni259C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni259C" format="1">
+<glyph name="uni259C" format="2">
   <advance width="1233"/>
   <unicode hex="259C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni259D_.glif b/source/Hack-Bold.ufo/glyphs/uni259D_.glif
index 0fdf62a17..093f5d2c9 100644
--- a/source/Hack-Bold.ufo/glyphs/uni259D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni259D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni259D" format="1">
+<glyph name="uni259D" format="2">
   <advance width="1233"/>
   <unicode hex="259D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni259E_.glif b/source/Hack-Bold.ufo/glyphs/uni259E_.glif
index 95413af23..927d3fd52 100644
--- a/source/Hack-Bold.ufo/glyphs/uni259E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni259E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni259E" format="1">
+<glyph name="uni259E" format="2">
   <advance width="1233"/>
   <unicode hex="259E"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni259F_.glif b/source/Hack-Bold.ufo/glyphs/uni259F_.glif
index 051cb47ed..022450334 100644
--- a/source/Hack-Bold.ufo/glyphs/uni259F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni259F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni259F" format="1">
+<glyph name="uni259F" format="2">
   <advance width="1233"/>
   <unicode hex="259F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25A_1.glif b/source/Hack-Bold.ufo/glyphs/uni25A_1.glif
index c26194bf7..6315b4736 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25A_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25A_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A1" format="1">
+<glyph name="uni25A1" format="2">
   <advance width="1233"/>
   <unicode hex="25A1"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25A_2.glif b/source/Hack-Bold.ufo/glyphs/uni25A_2.glif
index f2127405e..858066667 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25A_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25A_2.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A2" format="1">
+<glyph name="uni25A2" format="2">
   <advance width="1233"/>
   <unicode hex="25A2"/>
   <outline>
     <contour>
-      <point x="348" y="-78" type="line" name="hr00" smooth="yes"/>
+      <point x="348" y="-78" type="line" smooth="yes" name="hr00"/>
       <point x="120" y="-78"/>
       <point x="6" y="36"/>
-      <point x="6" y="264" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="264" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="800" type="line" smooth="yes"/>
       <point x="6" y="1028"/>
       <point x="120" y="1142"/>
-      <point x="348" y="1142" type="curve" name="at01" smooth="yes"/>
+      <point x="348" y="1142" type="curve" smooth="yes" name="at01"/>
       <point x="885" y="1142" type="line" smooth="yes"/>
       <point x="1113" y="1142"/>
       <point x="1227" y="1028"/>
       <point x="1227" y="800" type="curve" smooth="yes"/>
-      <point x="1227" y="264" type="line" name="sh02" smooth="yes"/>
+      <point x="1227" y="264" type="line" smooth="yes" name="sh02"/>
       <point x="1227" y="36"/>
       <point x="1113" y="-78"/>
       <point x="885" y="-78" type="curve" smooth="yes"/>
@@ -25,19 +25,19 @@
       <point x="885" y="36" type="line" smooth="yes"/>
       <point x="1037" y="36"/>
       <point x="1113" y="112"/>
-      <point x="1113" y="264" type="curve" name="ah01" smooth="yes"/>
+      <point x="1113" y="264" type="curve" smooth="yes" name="ah01"/>
       <point x="1113" y="800" type="line" smooth="yes"/>
       <point x="1113" y="952"/>
       <point x="1037" y="1028"/>
-      <point x="885" y="1028" type="curve" name="sv01" smooth="yes"/>
+      <point x="885" y="1028" type="curve" smooth="yes" name="sv01"/>
       <point x="348" y="1028" type="line" smooth="yes"/>
       <point x="196" y="1028"/>
       <point x="120" y="952"/>
       <point x="120" y="800" type="curve" smooth="yes"/>
-      <point x="120" y="264" type="line" name="sh03" smooth="yes"/>
+      <point x="120" y="264" type="line" smooth="yes" name="sh03"/>
       <point x="120" y="112"/>
       <point x="196" y="36"/>
-      <point x="348" y="36" type="curve" name="dv01" smooth="yes"/>
+      <point x="348" y="36" type="curve" smooth="yes" name="dv01"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25A_3.glif b/source/Hack-Bold.ufo/glyphs/uni25A_3.glif
index 36c94bbfe..c042b6bc1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25A_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25A_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A3" format="1">
+<glyph name="uni25A3" format="2">
   <advance width="1233"/>
   <unicode hex="25A3"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25A_4.glif b/source/Hack-Bold.ufo/glyphs/uni25A_4.glif
index 5e3714ff2..21fdb7759 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25A_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A4" format="1">
+<glyph name="uni25A4" format="2">
   <advance width="1233"/>
   <unicode hex="25A4"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25A_5.glif b/source/Hack-Bold.ufo/glyphs/uni25A_5.glif
index 0fbe65d2c..812b2bcc5 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25A_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25A_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A5" format="1">
+<glyph name="uni25A5" format="2">
   <advance width="1233"/>
   <unicode hex="25A5"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25A_6.glif b/source/Hack-Bold.ufo/glyphs/uni25A_6.glif
index c26e2bbc0..6144835f6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25A_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25A_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A6" format="1">
+<glyph name="uni25A6" format="2">
   <advance width="1233"/>
   <unicode hex="25A6"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25A_7.glif b/source/Hack-Bold.ufo/glyphs/uni25A_7.glif
index ab64b0c85..e6dce2a0d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25A_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25A_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A7" format="1">
+<glyph name="uni25A7" format="2">
   <advance width="1233"/>
   <unicode hex="25A7"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25A_8.glif b/source/Hack-Bold.ufo/glyphs/uni25A_8.glif
index 401d22e1b..5e76c45f1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25A_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25A_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A8" format="1">
+<glyph name="uni25A8" format="2">
   <advance width="1233"/>
   <unicode hex="25A8"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25A_9.glif b/source/Hack-Bold.ufo/glyphs/uni25A_9.glif
index 61797e14b..4ed18f324 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25A_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25A_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A9" format="1">
+<glyph name="uni25A9" format="2">
   <advance width="1233"/>
   <unicode hex="25A9"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25A_A_.glif b/source/Hack-Bold.ufo/glyphs/uni25A_A_.glif
index 959453953..16104d2c6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25A_A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25A_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25AA" format="1">
+<glyph name="uni25AA" format="2">
   <advance width="1233"/>
   <unicode hex="25AA"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25A_B_.glif b/source/Hack-Bold.ufo/glyphs/uni25A_B_.glif
index 0b3cb50c9..638b2ab31 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25A_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25A_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25AB" format="1">
+<glyph name="uni25AB" format="2">
   <advance width="1233"/>
   <unicode hex="25AB"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25A_D_.glif b/source/Hack-Bold.ufo/glyphs/uni25A_D_.glif
index b22543c04..2eb4c8ecb 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25A_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25A_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25AD" format="1">
+<glyph name="uni25AD" format="2">
   <advance width="1233"/>
   <unicode hex="25AD"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25A_E_.glif b/source/Hack-Bold.ufo/glyphs/uni25A_E_.glif
index 813bd9b32..24040b324 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25A_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25A_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25AE" format="1">
+<glyph name="uni25AE" format="2">
   <advance width="1233"/>
   <unicode hex="25AE"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25A_F_.glif b/source/Hack-Bold.ufo/glyphs/uni25A_F_.glif
index 7c8ab6805..fb0cb65b0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25A_F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25A_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25AF" format="1">
+<glyph name="uni25AF" format="2">
   <advance width="1233"/>
   <unicode hex="25AF"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25B_0.glif b/source/Hack-Bold.ufo/glyphs/uni25B_0.glif
index 32067171c..36e07ee33 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25B_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25B_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B0" format="1">
+<glyph name="uni25B0" format="2">
   <advance width="1233"/>
   <unicode hex="25B0"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25B_1.glif b/source/Hack-Bold.ufo/glyphs/uni25B_1.glif
index accea48ba..880415fd6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25B_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25B_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B1" format="1">
+<glyph name="uni25B1" format="2">
   <advance width="1233"/>
   <unicode hex="25B1"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25B_3.glif b/source/Hack-Bold.ufo/glyphs/uni25B_3.glif
index fd52a7831..8eeebcbe8 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25B_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B3" format="1">
+<glyph name="uni25B3" format="2">
   <advance width="1233"/>
   <unicode hex="25B3"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25B_4.glif b/source/Hack-Bold.ufo/glyphs/uni25B_4.glif
index 2f4c8ad2d..a7300a0c1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25B_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25B_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B4" format="1">
+<glyph name="uni25B4" format="2">
   <advance width="1233"/>
   <unicode hex="25B4"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25B_5.glif b/source/Hack-Bold.ufo/glyphs/uni25B_5.glif
index 3da52a099..3d8d86a09 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25B_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25B_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B5" format="1">
+<glyph name="uni25B5" format="2">
   <advance width="1233"/>
   <unicode hex="25B5"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25B_6.glif b/source/Hack-Bold.ufo/glyphs/uni25B_6.glif
index b24ca8021..a353e767f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25B_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25B_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B6" format="1">
+<glyph name="uni25B6" format="2">
   <advance width="1233"/>
   <unicode hex="25B6"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25B_7.glif b/source/Hack-Bold.ufo/glyphs/uni25B_7.glif
index 0e05e4231..efa8ffeea 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25B_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25B_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B7" format="1">
+<glyph name="uni25B7" format="2">
   <advance width="1233"/>
   <unicode hex="25B7"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25B_8.glif b/source/Hack-Bold.ufo/glyphs/uni25B_8.glif
index 283363ed9..d95e6bf41 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25B_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25B_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B8" format="1">
+<glyph name="uni25B8" format="2">
   <advance width="1233"/>
   <unicode hex="25B8"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25B_9.glif b/source/Hack-Bold.ufo/glyphs/uni25B_9.glif
index 6ee625376..385aca318 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25B_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25B_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B9" format="1">
+<glyph name="uni25B9" format="2">
   <advance width="1233"/>
   <unicode hex="25B9"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25B_B_.glif b/source/Hack-Bold.ufo/glyphs/uni25B_B_.glif
index 129f3d1dc..140725d5b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25B_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25B_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25BB" format="1">
+<glyph name="uni25BB" format="2">
   <advance width="1233"/>
   <unicode hex="25BB"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25B_D_.glif b/source/Hack-Bold.ufo/glyphs/uni25B_D_.glif
index c31e03aff..dac5c1954 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25B_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25B_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25BD" format="1">
+<glyph name="uni25BD" format="2">
   <advance width="1233"/>
   <unicode hex="25BD"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25B_E_.glif b/source/Hack-Bold.ufo/glyphs/uni25B_E_.glif
index ab81e1a04..c8b768042 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25B_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25B_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25BE" format="1">
+<glyph name="uni25BE" format="2">
   <advance width="1233"/>
   <unicode hex="25BE"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25B_F_.glif b/source/Hack-Bold.ufo/glyphs/uni25B_F_.glif
index ad009b48a..79b3c7447 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25B_F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25B_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25BF" format="1">
+<glyph name="uni25BF" format="2">
   <advance width="1233"/>
   <unicode hex="25BF"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25C_0.glif b/source/Hack-Bold.ufo/glyphs/uni25C_0.glif
index fc2633cbd..f87fcba59 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25C_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25C_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C0" format="1">
+<glyph name="uni25C0" format="2">
   <advance width="1233"/>
   <unicode hex="25C0"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25C_1.glif b/source/Hack-Bold.ufo/glyphs/uni25C_1.glif
index 219fd6c09..fa5e5e82b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25C_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25C_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C1" format="1">
+<glyph name="uni25C1" format="2">
   <advance width="1233"/>
   <unicode hex="25C1"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25C_2.glif b/source/Hack-Bold.ufo/glyphs/uni25C_2.glif
index 93b5430fb..92d86f80b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25C_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25C_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C2" format="1">
+<glyph name="uni25C2" format="2">
   <advance width="1233"/>
   <unicode hex="25C2"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25C_3.glif b/source/Hack-Bold.ufo/glyphs/uni25C_3.glif
index 426dc11ea..ebc3ff8c4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25C_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25C_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C3" format="1">
+<glyph name="uni25C3" format="2">
   <advance width="1233"/>
   <unicode hex="25C3"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25C_5.glif b/source/Hack-Bold.ufo/glyphs/uni25C_5.glif
index 8f0472fdc..097675f8b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25C_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25C_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C5" format="1">
+<glyph name="uni25C5" format="2">
   <advance width="1233"/>
   <unicode hex="25C5"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25C_6.glif b/source/Hack-Bold.ufo/glyphs/uni25C_6.glif
index bbd364d75..0cc721da9 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25C_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25C_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C6" format="1">
+<glyph name="uni25C6" format="2">
   <advance width="1233"/>
   <unicode hex="25C6"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25C_7.glif b/source/Hack-Bold.ufo/glyphs/uni25C_7.glif
index a8339f14f..fabe1cfa1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25C_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25C_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C7" format="1">
+<glyph name="uni25C7" format="2">
   <advance width="1233"/>
   <unicode hex="25C7"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25C_8.glif b/source/Hack-Bold.ufo/glyphs/uni25C_8.glif
index c7309c626..f5ee8c31b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25C_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25C_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C8" format="1">
+<glyph name="uni25C8" format="2">
   <advance width="1233"/>
   <unicode hex="25C8"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25C_9.glif b/source/Hack-Bold.ufo/glyphs/uni25C_9.glif
index 8fa8f4de4..d332acdad 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25C_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25C_9.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C9" format="1">
+<glyph name="uni25C9" format="2">
   <advance width="1233"/>
   <unicode hex="25C9"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv03"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="616" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="692" y="39"/>
       <point x="778" y="62"/>
       <point x="861" y="109" type="curve" smooth="yes"/>
       <point x="1021" y="200"/>
       <point x="1105" y="349"/>
-      <point x="1105" y="532" type="curve" name="ah01" smooth="yes"/>
+      <point x="1105" y="532" type="curve" smooth="yes" name="ah01"/>
       <point x="1105" y="715"/>
       <point x="1021" y="864"/>
       <point x="861" y="955" type="curve" smooth="yes"/>
       <point x="778" y="1002"/>
       <point x="692" y="1025"/>
-      <point x="616" y="1025" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1025" type="curve" smooth="yes" name="dv02"/>
       <point x="540" y="1025"/>
       <point x="454" y="1002"/>
       <point x="371" y="955" type="curve" smooth="yes"/>
       <point x="216" y="867"/>
       <point x="128" y="723"/>
-      <point x="128" y="532" type="curve" name="sh03" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="sh03"/>
       <point x="128" y="341"/>
       <point x="216" y="197"/>
       <point x="371" y="109" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25C_C_.glif b/source/Hack-Bold.ufo/glyphs/uni25C_C_.glif
index 3177e0fe4..aa01bcc3c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25C_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25C_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25CC" format="1">
+<glyph name="uni25CC" format="2">
   <advance width="1233"/>
   <unicode hex="25CC"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="466" y="1127" type="line" name="hr00"/>
       <point x="516" y="1141"/>
       <point x="566" y="1148"/>
-      <point x="616" y="1148" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="1148" type="curve" smooth="yes" name="dv04"/>
       <point x="666" y="1148"/>
       <point x="716" y="1141"/>
       <point x="766" y="1127" type="curve"/>
       <point x="726" y="970" type="line"/>
       <point x="690" y="981"/>
       <point x="653" y="986"/>
-      <point x="616" y="986" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="986" type="curve" smooth="yes" name="dv03"/>
       <point x="579" y="986"/>
       <point x="542" y="981"/>
       <point x="506" y="970" type="curve"/>
@@ -43,14 +43,14 @@
       <point x="22" y="382" type="line"/>
       <point x="11" y="427"/>
       <point x="6" y="477"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="587"/>
       <point x="11" y="637"/>
       <point x="22" y="682" type="curve"/>
       <point x="179" y="642" type="line" name="sh03"/>
       <point x="171" y="607"/>
       <point x="167" y="570"/>
-      <point x="167" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="167" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="167" y="493"/>
       <point x="171" y="457"/>
       <point x="179" y="422" type="curve" name="sh04"/>
@@ -59,14 +59,14 @@
       <point x="1054" y="422" type="line" name="sh05"/>
       <point x="1062" y="457"/>
       <point x="1066" y="493"/>
-      <point x="1066" y="532" type="curve" name="ah01" smooth="yes"/>
+      <point x="1066" y="532" type="curve" smooth="yes" name="ah01"/>
       <point x="1066" y="570"/>
       <point x="1062" y="607"/>
       <point x="1054" y="642" type="curve" name="sh06"/>
       <point x="1211" y="682" type="line"/>
       <point x="1222" y="637"/>
       <point x="1227" y="587"/>
-      <point x="1227" y="532" type="curve" name="sh07" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh07"/>
       <point x="1227" y="477"/>
       <point x="1222" y="427"/>
       <point x="1211" y="382" type="curve"/>
@@ -92,14 +92,14 @@
       <point x="921" y="4" type="curve"/>
     </contour>
     <contour>
-      <point x="616" y="-84" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-84" type="curve" smooth="yes" name="dv01"/>
       <point x="566" y="-84"/>
       <point x="516" y="-77"/>
       <point x="466" y="-63" type="curve"/>
       <point x="506" y="94" type="line"/>
       <point x="542" y="83"/>
       <point x="579" y="78"/>
-      <point x="616" y="78" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="78" type="curve" smooth="yes" name="dv02"/>
       <point x="653" y="78"/>
       <point x="690" y="83"/>
       <point x="726" y="94" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25C_D_.glif b/source/Hack-Bold.ufo/glyphs/uni25C_D_.glif
index edbff584f..0af4260c5 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25C_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25C_D_.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25CD" format="1">
+<glyph name="uni25CD" format="2">
   <advance width="1233"/>
   <unicode hex="25CD"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="dh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="dh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="dh12" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="dh12"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -81,7 +81,7 @@
       <point x="1002" y="226" type="line" name="dh10"/>
       <point x="1071" y="309"/>
       <point x="1105" y="411"/>
-      <point x="1105" y="532" type="curve" name="dh11" smooth="yes"/>
+      <point x="1105" y="532" type="curve" smooth="yes" name="dh11"/>
       <point x="1105" y="653"/>
       <point x="1071" y="755"/>
       <point x="1002" y="838" type="curve" name="iv03"/>
@@ -90,7 +90,7 @@
       <point x="226" y="832" type="line" name="dh03"/>
       <point x="161" y="751"/>
       <point x="128" y="651"/>
-      <point x="128" y="532" type="curve" name="dh02" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="dh02"/>
       <point x="128" y="413"/>
       <point x="161" y="313"/>
       <point x="226" y="232" type="curve" name="iv04"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25C_E_.glif b/source/Hack-Bold.ufo/glyphs/uni25C_E_.glif
index 7dcea4c87..296c2acbd 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25C_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25C_E_.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25CE" format="1">
+<glyph name="uni25CE" format="2">
   <advance width="1233"/>
   <unicode hex="25CE"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="dh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="dh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv03"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="dh08" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="dh08"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -30,13 +30,13 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="616" y="79" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="79" type="curve" smooth="yes" name="dv01"/>
       <point x="691" y="79"/>
       <point x="766" y="100"/>
       <point x="841" y="143" type="curve" smooth="yes"/>
       <point x="990" y="228"/>
       <point x="1066" y="357"/>
-      <point x="1066" y="532" type="curve" name="dh07" smooth="yes"/>
+      <point x="1066" y="532" type="curve" smooth="yes" name="dh07"/>
       <point x="1066" y="619"/>
       <point x="1047" y="695"/>
       <point x="1010" y="760" type="curve" smooth="yes"/>
@@ -45,13 +45,13 @@
       <point x="841" y="921" type="curve" smooth="yes"/>
       <point x="766" y="964"/>
       <point x="691" y="985"/>
-      <point x="616" y="985" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="985" type="curve" smooth="yes" name="dv02"/>
       <point x="541" y="985"/>
       <point x="467" y="964"/>
       <point x="392" y="921" type="curve" smooth="yes"/>
       <point x="243" y="836"/>
       <point x="167" y="707"/>
-      <point x="167" y="532" type="curve" name="dh02" smooth="yes"/>
+      <point x="167" y="532" type="curve" smooth="yes" name="dh02"/>
       <point x="167" y="445"/>
       <point x="186" y="369"/>
       <point x="224" y="304" type="curve" smooth="yes"/>
@@ -62,25 +62,25 @@
       <point x="541" y="79"/>
     </contour>
     <contour>
-      <point x="616" y="286" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="286" type="curve" smooth="yes" name="dv04"/>
       <point x="580" y="286"/>
       <point x="536" y="297"/>
       <point x="493" y="321" type="curve" smooth="yes"/>
       <point x="414" y="365"/>
       <point x="372" y="440"/>
-      <point x="372" y="532" type="curve" name="dh03" smooth="yes"/>
+      <point x="372" y="532" type="curve" smooth="yes" name="dh03"/>
       <point x="372" y="624"/>
       <point x="414" y="699"/>
       <point x="493" y="743" type="curve" smooth="yes"/>
       <point x="536" y="767"/>
       <point x="580" y="778"/>
-      <point x="616" y="778" type="curve" name="dv05" smooth="yes"/>
+      <point x="616" y="778" type="curve" smooth="yes" name="dv05"/>
       <point x="655" y="778"/>
       <point x="700" y="766"/>
       <point x="739" y="743" type="curve" smooth="yes"/>
       <point x="812" y="702"/>
       <point x="861" y="632"/>
-      <point x="861" y="532" type="curve" name="dh06" smooth="yes"/>
+      <point x="861" y="532" type="curve" smooth="yes" name="dh06"/>
       <point x="861" y="432"/>
       <point x="812" y="362"/>
       <point x="739" y="321" type="curve" smooth="yes"/>
@@ -94,7 +94,7 @@
       <point x="684" y="416" type="curve" smooth="yes"/>
       <point x="729" y="443"/>
       <point x="751" y="481"/>
-      <point x="751" y="532" type="curve" name="dh05" smooth="yes"/>
+      <point x="751" y="532" type="curve" smooth="yes" name="dh05"/>
       <point x="751" y="583"/>
       <point x="729" y="621"/>
       <point x="684" y="648" type="curve" smooth="yes"/>
@@ -106,7 +106,7 @@
       <point x="549" y="648" type="curve" smooth="yes"/>
       <point x="504" y="622"/>
       <point x="482" y="583"/>
-      <point x="482" y="532" type="curve" name="dh04" smooth="yes"/>
+      <point x="482" y="532" type="curve" smooth="yes" name="dh04"/>
       <point x="482" y="481"/>
       <point x="504" y="442"/>
       <point x="549" y="416" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25C_F_.glif b/source/Hack-Bold.ufo/glyphs/uni25C_F_.glif
index 46c39961b..309ec8c30 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25C_F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25C_F_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25CF" format="1">
+<glyph name="uni25CF" format="2">
   <advance width="1233"/>
   <unicode hex="25CF"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25D_0.glif b/source/Hack-Bold.ufo/glyphs/uni25D_0.glif
index 718c14e9a..b2dc1c3b4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25D_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25D_0.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D0" format="1">
+<glyph name="uni25D0" format="2">
   <advance width="1233"/>
   <unicode hex="25D0"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
@@ -16,13 +16,13 @@
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="dh02" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="dh02"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="861" y="109" type="curve" smooth="yes"/>
       <point x="1021" y="200"/>
       <point x="1105" y="349"/>
-      <point x="1105" y="532" type="curve" name="dh01" smooth="yes"/>
+      <point x="1105" y="532" type="curve" smooth="yes" name="dh01"/>
       <point x="1105" y="715"/>
       <point x="1021" y="864"/>
       <point x="861" y="955" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25D_1.glif b/source/Hack-Bold.ufo/glyphs/uni25D_1.glif
index bc2550c08..0b5101c8b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25D_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25D_1.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D1" format="1">
+<glyph name="uni25D1" format="2">
   <advance width="1233"/>
   <unicode hex="25D1"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="dh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="dh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="372" y="954" type="curve" smooth="yes"/>
       <point x="211" y="861"/>
       <point x="128" y="725"/>
-      <point x="128" y="532" type="curve" name="dh02" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="dh02"/>
       <point x="128" y="339"/>
       <point x="211" y="203"/>
       <point x="372" y="110" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25D_2.glif b/source/Hack-Bold.ufo/glyphs/uni25D_2.glif
index ef60c8abd..351ade671 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25D_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25D_2.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D2" format="1">
+<glyph name="uni25D2" format="2">
   <advance width="1233"/>
   <unicode hex="25D2"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="860" y="954" type="curve" smooth="yes"/>
       <point x="779" y="1001"/>
       <point x="697" y="1025"/>
-      <point x="616" y="1025" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1025" type="curve" smooth="yes" name="dv01"/>
       <point x="535" y="1025"/>
       <point x="453" y="1001"/>
       <point x="372" y="954" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25D_3.glif b/source/Hack-Bold.ufo/glyphs/uni25D_3.glif
index 874e183a5..cca1ef30a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25D_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25D_3.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D3" format="1">
+<glyph name="uni25D3" format="2">
   <advance width="1233"/>
   <unicode hex="25D3"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -30,7 +30,7 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="616" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="692" y="39"/>
       <point x="778" y="62"/>
       <point x="861" y="109" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25D_4.glif b/source/Hack-Bold.ufo/glyphs/uni25D_4.glif
index 0cc033e00..edb500728 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25D_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25D_4.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D4" format="1">
+<glyph name="uni25D4" format="2">
   <advance width="1233"/>
   <unicode hex="25D4"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -30,7 +30,7 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="616" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="692" y="39"/>
       <point x="778" y="62"/>
       <point x="861" y="109" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="371" y="955" type="curve" smooth="yes"/>
       <point x="216" y="867"/>
       <point x="128" y="723"/>
-      <point x="128" y="532" type="curve" name="sh03" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="sh03"/>
       <point x="128" y="341"/>
       <point x="216" y="197"/>
       <point x="371" y="109" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25D_5.glif b/source/Hack-Bold.ufo/glyphs/uni25D_5.glif
index 9f56ce75e..06acd4559 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25D_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25D_5.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D5" format="1">
+<glyph name="uni25D5" format="2">
   <advance width="1233"/>
   <unicode hex="25D5"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="dh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="dh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25D_6.glif b/source/Hack-Bold.ufo/glyphs/uni25D_6.glif
index a98f8f614..4416ff83d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25D_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25D_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D6" format="1">
+<glyph name="uni25D6" format="2">
   <advance width="1233"/>
   <unicode hex="25D6"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25D_7.glif b/source/Hack-Bold.ufo/glyphs/uni25D_7.glif
index 61e4f5dc1..946edb7a2 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25D_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25D_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D7" format="1">
+<glyph name="uni25D7" format="2">
   <advance width="1233"/>
   <unicode hex="25D7"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25D_A_.glif b/source/Hack-Bold.ufo/glyphs/uni25D_A_.glif
index 7857beb74..6d2901ac1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25D_A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25D_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25DA" format="1">
+<glyph name="uni25DA" format="2">
   <advance width="1233"/>
   <unicode hex="25DA"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="818" y="1120"/>
       <point x="710" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv03"/>
       <point x="524" y="1148"/>
       <point x="413" y="1119"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
@@ -29,7 +29,7 @@
       <point x="371" y="955" type="curve" smooth="yes"/>
       <point x="454" y="1002"/>
       <point x="540" y="1025"/>
-      <point x="616" y="1025" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1025" type="curve" smooth="yes" name="dv02"/>
       <point x="692" y="1025"/>
       <point x="778" y="1002"/>
       <point x="861" y="955" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25D_B_.glif b/source/Hack-Bold.ufo/glyphs/uni25D_B_.glif
index ab0e28865..aa100b37b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25D_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25D_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25DB" format="1">
+<glyph name="uni25DB" format="2">
   <advance width="1233"/>
   <unicode hex="25DB"/>
   <outline>
@@ -11,7 +11,7 @@
       <point x="311" y="4" type="curve" smooth="yes"/>
       <point x="416" y="-57"/>
       <point x="516" y="-84"/>
-      <point x="615" y="-84" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="-84" type="curve" smooth="yes" name="dv02"/>
       <point x="718" y="-84"/>
       <point x="820" y="-55"/>
       <point x="921" y="4" type="curve" smooth="yes"/>
@@ -23,7 +23,7 @@
       <point x="-20" y="-512" type="line" name="dv01"/>
     </contour>
     <contour>
-      <point x="616" y="39" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv03"/>
       <point x="535" y="39"/>
       <point x="453" y="63"/>
       <point x="372" y="110" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25D_C_.glif b/source/Hack-Bold.ufo/glyphs/uni25D_C_.glif
index ab269c712..5e74179ce 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25D_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25D_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25DC" format="1">
+<glyph name="uni25DC" format="2">
   <advance width="1233"/>
   <unicode hex="25DC"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25D_D_.glif b/source/Hack-Bold.ufo/glyphs/uni25D_D_.glif
index 1ea0f735d..669f3e26b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25D_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25D_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25DD" format="1">
+<glyph name="uni25DD" format="2">
   <advance width="1233"/>
   <unicode hex="25DD"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25D_E_.glif b/source/Hack-Bold.ufo/glyphs/uni25D_E_.glif
index 740a2bcbf..3480c12da 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25D_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25D_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25DE" format="1">
+<glyph name="uni25DE" format="2">
   <advance width="1233"/>
   <unicode hex="25DE"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25D_F_.glif b/source/Hack-Bold.ufo/glyphs/uni25D_F_.glif
index 10dbdd9ff..dbb34517f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25D_F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25D_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25DF" format="1">
+<glyph name="uni25DF" format="2">
   <advance width="1233"/>
   <unicode hex="25DF"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25E_0.glif b/source/Hack-Bold.ufo/glyphs/uni25E_0.glif
index ab19b61aa..17e386dd6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25E_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25E_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E0" format="1">
+<glyph name="uni25E0" format="2">
   <advance width="1233"/>
   <unicode hex="25E0"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="311" y="1060" type="curve" smooth="yes"/>
       <point x="416" y="1121"/>
       <point x="516" y="1148"/>
-      <point x="615" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="615" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="718" y="1148"/>
       <point x="820" y="1119"/>
       <point x="921" y="1060" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25E_1.glif b/source/Hack-Bold.ufo/glyphs/uni25E_1.glif
index 459e25ead..fef286646 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25E_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25E_1.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E1" format="1">
+<glyph name="uni25E1" format="2">
   <advance width="1233"/>
   <unicode hex="25E1"/>
   <outline>
     <contour>
-      <point x="615" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="615" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="516" y="-84"/>
       <point x="416" y="-57"/>
       <point x="311" y="4" type="curve" smooth="yes"/>
@@ -17,7 +17,7 @@
       <point x="391" y="142" type="curve" smooth="yes"/>
       <point x="467" y="99"/>
       <point x="546" y="79"/>
-      <point x="617" y="79" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="79" type="curve" smooth="yes" name="dv01"/>
       <point x="686" y="79"/>
       <point x="765" y="99"/>
       <point x="841" y="142" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25E_2.glif b/source/Hack-Bold.ufo/glyphs/uni25E_2.glif
index 9812325a2..2273a2640 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25E_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25E_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E2" format="1">
+<glyph name="uni25E2" format="2">
   <advance width="1233"/>
   <unicode hex="25E2"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25E_3.glif b/source/Hack-Bold.ufo/glyphs/uni25E_3.glif
index 2c0c2bed2..9395dfd74 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25E_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25E_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E3" format="1">
+<glyph name="uni25E3" format="2">
   <advance width="1233"/>
   <unicode hex="25E3"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25E_4.glif b/source/Hack-Bold.ufo/glyphs/uni25E_4.glif
index 3cdf55d01..d928816df 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25E_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25E_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E4" format="1">
+<glyph name="uni25E4" format="2">
   <advance width="1233"/>
   <unicode hex="25E4"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25E_5.glif b/source/Hack-Bold.ufo/glyphs/uni25E_5.glif
index cf4b9096d..36495ab5b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25E_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25E_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E5" format="1">
+<glyph name="uni25E5" format="2">
   <advance width="1233"/>
   <unicode hex="25E5"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25E_7.glif b/source/Hack-Bold.ufo/glyphs/uni25E_7.glif
index 34b659d78..09d1bd3b3 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25E_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25E_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E7" format="1">
+<glyph name="uni25E7" format="2">
   <advance width="1233"/>
   <unicode hex="25E7"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25E_8.glif b/source/Hack-Bold.ufo/glyphs/uni25E_8.glif
index ff7393846..be563b66d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25E_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25E_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E8" format="1">
+<glyph name="uni25E8" format="2">
   <advance width="1233"/>
   <unicode hex="25E8"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25E_9.glif b/source/Hack-Bold.ufo/glyphs/uni25E_9.glif
index a4a76e740..a3fe5337a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25E_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25E_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E9" format="1">
+<glyph name="uni25E9" format="2">
   <advance width="1233"/>
   <unicode hex="25E9"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25E_A_.glif b/source/Hack-Bold.ufo/glyphs/uni25E_A_.glif
index 5b8b31cce..89cb828c5 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25E_A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25E_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25EA" format="1">
+<glyph name="uni25EA" format="2">
   <advance width="1233"/>
   <unicode hex="25EA"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25E_B_.glif b/source/Hack-Bold.ufo/glyphs/uni25E_B_.glif
index da4f0b67f..9f6d2d523 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25E_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25E_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25EB" format="1">
+<glyph name="uni25EB" format="2">
   <advance width="1233"/>
   <unicode hex="25EB"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25E_C_.glif b/source/Hack-Bold.ufo/glyphs/uni25E_C_.glif
index 6e64bb63c..16c28af2c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25E_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25E_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25EC" format="1">
+<glyph name="uni25EC" format="2">
   <advance width="1233"/>
   <unicode hex="25EC"/>
   <outline>
@@ -14,16 +14,16 @@
       <point x="177" y="36" type="line"/>
     </contour>
     <contour>
-      <point x="615" y="229" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="229" type="curve" smooth="yes" name="dv03"/>
       <point x="539" y="229"/>
       <point x="482" y="286"/>
-      <point x="482" y="362" type="curve" name="dh01" smooth="yes"/>
+      <point x="482" y="362" type="curve" smooth="yes" name="dh01"/>
       <point x="482" y="438"/>
       <point x="541" y="495"/>
-      <point x="616" y="495" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="495" type="curve" smooth="yes" name="dv04"/>
       <point x="691" y="495"/>
       <point x="750" y="438"/>
-      <point x="750" y="362" type="curve" name="dh02" smooth="yes"/>
+      <point x="750" y="362" type="curve" smooth="yes" name="dh02"/>
       <point x="750" y="289"/>
       <point x="690" y="229"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25E_D_.glif b/source/Hack-Bold.ufo/glyphs/uni25E_D_.glif
index 023c62b95..718ea1d30 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25E_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25E_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25ED" format="1">
+<glyph name="uni25ED" format="2">
   <advance width="1233"/>
   <unicode hex="25ED"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25E_E_.glif b/source/Hack-Bold.ufo/glyphs/uni25E_E_.glif
index 65a848776..08d9455fb 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25E_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25E_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25EE" format="1">
+<glyph name="uni25EE" format="2">
   <advance width="1233"/>
   <unicode hex="25EE"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25E_F_.glif b/source/Hack-Bold.ufo/glyphs/uni25E_F_.glif
index 018ff748c..c63414932 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25E_F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25E_F_.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25EF" format="1">
+<glyph name="uni25EF" format="2">
   <advance width="1233"/>
   <unicode hex="25EF"/>
   <outline>
     <contour>
-      <point x="615" y="-110" type="curve" name="hr00" smooth="yes"/>
+      <point x="615" y="-110" type="curve" smooth="yes" name="hr00"/>
       <point x="511" y="-110"/>
       <point x="407" y="-83"/>
       <point x="298" y="-19" type="curve" smooth="yes"/>
       <point x="91" y="101"/>
       <point x="-20" y="280"/>
-      <point x="-20" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="-20" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="-20" y="784"/>
       <point x="91" y="963"/>
       <point x="298" y="1083" type="curve" smooth="yes"/>
       <point x="407" y="1147"/>
       <point x="511" y="1174"/>
-      <point x="615" y="1174" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1174" type="curve" smooth="yes" name="dv03"/>
       <point x="722" y="1174"/>
       <point x="829" y="1144"/>
       <point x="934" y="1083" type="curve" smooth="yes"/>
       <point x="1142" y="963"/>
       <point x="1253" y="784"/>
-      <point x="1253" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="1253" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="1253" y="280"/>
       <point x="1142" y="101"/>
       <point x="934" y="-19" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="722" y="-110"/>
     </contour>
     <contour>
-      <point x="616" y="18" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="18" type="curve" smooth="yes" name="dv01"/>
       <point x="700" y="18"/>
       <point x="792" y="45"/>
       <point x="872" y="90" type="curve" smooth="yes"/>
       <point x="1033" y="181"/>
       <point x="1126" y="333"/>
-      <point x="1126" y="532" type="curve" name="ah01" smooth="yes"/>
+      <point x="1126" y="532" type="curve" smooth="yes" name="ah01"/>
       <point x="1126" y="731"/>
       <point x="1033" y="883"/>
       <point x="872" y="974" type="curve" smooth="yes"/>
       <point x="792" y="1019"/>
       <point x="700" y="1046"/>
-      <point x="616" y="1046" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1046" type="curve" smooth="yes" name="dv02"/>
       <point x="540" y="1046"/>
       <point x="450" y="1025"/>
       <point x="361" y="974" type="curve" smooth="yes"/>
       <point x="204" y="886"/>
       <point x="107" y="734"/>
-      <point x="107" y="532" type="curve" name="sh03" smooth="yes"/>
+      <point x="107" y="532" type="curve" smooth="yes" name="sh03"/>
       <point x="107" y="329"/>
       <point x="205" y="178"/>
       <point x="361" y="90" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25F_0.glif b/source/Hack-Bold.ufo/glyphs/uni25F_0.glif
index 95a4712e3..dfa5bb855 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25F_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25F_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F0" format="1">
+<glyph name="uni25F0" format="2">
   <advance width="1233"/>
   <unicode hex="25F0"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25F_1.glif b/source/Hack-Bold.ufo/glyphs/uni25F_1.glif
index c3724eede..0930ad292 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25F_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25F_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F1" format="1">
+<glyph name="uni25F1" format="2">
   <advance width="1233"/>
   <unicode hex="25F1"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25F_2.glif b/source/Hack-Bold.ufo/glyphs/uni25F_2.glif
index fd3427be5..cfb1f711c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25F_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25F_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F2" format="1">
+<glyph name="uni25F2" format="2">
   <advance width="1233"/>
   <unicode hex="25F2"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25F_3.glif b/source/Hack-Bold.ufo/glyphs/uni25F_3.glif
index 333a31b57..8b36f1ebe 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25F_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25F_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F3" format="1">
+<glyph name="uni25F3" format="2">
   <advance width="1233"/>
   <unicode hex="25F3"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25F_4.glif b/source/Hack-Bold.ufo/glyphs/uni25F_4.glif
index 6b5bdbb8e..8540a59c1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25F_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25F_4.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F4" format="1">
+<glyph name="uni25F4" format="2">
   <advance width="1233"/>
   <unicode hex="25F4"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
@@ -16,13 +16,13 @@
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -30,13 +30,13 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="619" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="619" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="695" y="39"/>
       <point x="779" y="63"/>
       <point x="860" y="110" type="curve" smooth="yes"/>
       <point x="1023" y="204"/>
       <point x="1105" y="345"/>
-      <point x="1105" y="532" type="curve" name="ah01" smooth="yes"/>
+      <point x="1105" y="532" type="curve" smooth="yes" name="ah01"/>
       <point x="1105" y="719"/>
       <point x="1023" y="860"/>
       <point x="860" y="954" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25F_5.glif b/source/Hack-Bold.ufo/glyphs/uni25F_5.glif
index ee34f5d27..a7100203e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25F_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25F_5.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F5" format="1">
+<glyph name="uni25F5" format="2">
   <advance width="1233"/>
   <unicode hex="25F5"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
@@ -16,13 +16,13 @@
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -36,13 +36,13 @@
       <point x="861" y="110" type="curve" smooth="yes"/>
       <point x="1008" y="193"/>
       <point x="1105" y="334"/>
-      <point x="1105" y="530" type="curve" name="ah01" smooth="yes"/>
+      <point x="1105" y="530" type="curve" smooth="yes" name="ah01"/>
       <point x="1105" y="713"/>
       <point x="1022" y="863"/>
       <point x="861" y="955" type="curve" smooth="yes"/>
       <point x="778" y="1002"/>
       <point x="691" y="1025"/>
-      <point x="615" y="1025" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="1025" type="curve" smooth="yes" name="dv01"/>
       <point x="448" y="1025"/>
       <point x="159" y="903"/>
       <point x="131" y="588" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25F_6.glif b/source/Hack-Bold.ufo/glyphs/uni25F_6.glif
index 7a25ab7dd..4a05da63c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25F_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25F_6.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F6" format="1">
+<glyph name="uni25F6" format="2">
   <advance width="1233"/>
   <unicode hex="25F6"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
@@ -34,13 +34,13 @@
       <point x="1102" y="588" type="line" name="dv04"/>
       <point x="1074" y="905"/>
       <point x="785" y="1025"/>
-      <point x="613" y="1025" type="curve" name="dv01" smooth="yes"/>
+      <point x="613" y="1025" type="curve" smooth="yes" name="dv01"/>
       <point x="540" y="1025"/>
       <point x="457" y="1003"/>
       <point x="372" y="954" type="curve" smooth="yes"/>
       <point x="209" y="860"/>
       <point x="128" y="719"/>
-      <point x="128" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="128" y="345"/>
       <point x="209" y="204"/>
       <point x="372" y="110" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25F_7.glif b/source/Hack-Bold.ufo/glyphs/uni25F_7.glif
index 27b1d258e..caa6425eb 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25F_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25F_7.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F7" format="1">
+<glyph name="uni25F7" format="2">
   <advance width="1233"/>
   <unicode hex="25F7"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
@@ -30,7 +30,7 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="616" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="782" y="39"/>
       <point x="1070" y="158"/>
       <point x="1102" y="474" type="curve" name="dv02"/>
@@ -41,7 +41,7 @@
       <point x="371" y="954" type="curve" smooth="yes"/>
       <point x="214" y="865"/>
       <point x="128" y="722"/>
-      <point x="128" y="534" type="curve" name="sh02" smooth="yes"/>
+      <point x="128" y="534" type="curve" smooth="yes" name="sh02"/>
       <point x="128" y="351"/>
       <point x="210" y="201"/>
       <point x="371" y="109" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25F_8.glif b/source/Hack-Bold.ufo/glyphs/uni25F_8.glif
index 9267c054b..a42fa75c0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25F_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25F_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F8" format="1">
+<glyph name="uni25F8" format="2">
   <advance width="1233"/>
   <unicode hex="25F8"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25F_9.glif b/source/Hack-Bold.ufo/glyphs/uni25F_9.glif
index 1f5a37479..cc8543602 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25F_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25F_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F9" format="1">
+<glyph name="uni25F9" format="2">
   <advance width="1233"/>
   <unicode hex="25F9"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25F_A_.glif b/source/Hack-Bold.ufo/glyphs/uni25F_A_.glif
index fc9bc6d69..3194c7f3f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25F_A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25F_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25FA" format="1">
+<glyph name="uni25FA" format="2">
   <advance width="1233"/>
   <unicode hex="25FA"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25F_B_.glif b/source/Hack-Bold.ufo/glyphs/uni25F_B_.glif
index 3b80d593c..d0c40cedb 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25F_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25F_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25FB" format="1">
+<glyph name="uni25FB" format="2">
   <advance width="1233"/>
   <unicode hex="25FB"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25F_C_.glif b/source/Hack-Bold.ufo/glyphs/uni25F_C_.glif
index 3be0a387b..212ba910f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25F_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25F_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25FC" format="1">
+<glyph name="uni25FC" format="2">
   <advance width="1233"/>
   <unicode hex="25FC"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25F_D_.glif b/source/Hack-Bold.ufo/glyphs/uni25F_D_.glif
index 8814150b8..ef2bba730 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25F_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25F_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25FD" format="1">
+<glyph name="uni25FD" format="2">
   <advance width="1233"/>
   <unicode hex="25FD"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25F_E_.glif b/source/Hack-Bold.ufo/glyphs/uni25F_E_.glif
index 00ff683ce..5b20fe01a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25F_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25F_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25FE" format="1">
+<glyph name="uni25FE" format="2">
   <advance width="1233"/>
   <unicode hex="25FE"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni25F_F_.glif b/source/Hack-Bold.ufo/glyphs/uni25F_F_.glif
index 32d916c21..1e6646d70 100644
--- a/source/Hack-Bold.ufo/glyphs/uni25F_F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni25F_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25FF" format="1">
+<glyph name="uni25FF" format="2">
   <advance width="1233"/>
   <unicode hex="25FF"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2756.glif b/source/Hack-Bold.ufo/glyphs/uni2756.glif
index 518de22d1..9df0b0453 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2756.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2756.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2756" format="1">
+<glyph name="uni2756" format="2">
   <advance width="1233"/>
   <unicode hex="2756"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2768.glif b/source/Hack-Bold.ufo/glyphs/uni2768.glif
index 864ad86d5..1f463e6a2 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2768.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2768.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2768" format="1">
+<glyph name="uni2768" format="2">
   <advance width="1233"/>
   <unicode hex="2768"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="461" y="123" type="curve" smooth="yes"/>
       <point x="318" y="266"/>
       <point x="240" y="442"/>
-      <point x="240" y="653" type="curve" name="dh01" smooth="yes"/>
+      <point x="240" y="653" type="curve" smooth="yes" name="dh01"/>
       <point x="240" y="862"/>
       <point x="317" y="1042"/>
       <point x="461" y="1186" type="curve" smooth="yes"/>
@@ -23,7 +23,7 @@
       <point x="675" y="1161" type="curve" smooth="yes"/>
       <point x="584" y="1018"/>
       <point x="542" y="851"/>
-      <point x="542" y="655" type="curve" name="dh02" smooth="yes"/>
+      <point x="542" y="655" type="curve" smooth="yes" name="dh02"/>
       <point x="542" y="458"/>
       <point x="585" y="290"/>
       <point x="674" y="149" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2769.glif b/source/Hack-Bold.ufo/glyphs/uni2769.glif
index b58fbad4e..bc1936210 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2769.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2769.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2769" format="1">
+<glyph name="uni2769" format="2">
   <advance width="1233"/>
   <unicode hex="2769"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="559" y="149" type="curve" smooth="yes"/>
       <point x="648" y="290"/>
       <point x="691" y="456"/>
-      <point x="691" y="655" type="curve" name="dh01" smooth="yes"/>
+      <point x="691" y="655" type="curve" smooth="yes" name="dh01"/>
       <point x="691" y="850"/>
       <point x="650" y="1018"/>
       <point x="559" y="1161" type="curve" smooth="yes"/>
@@ -23,7 +23,7 @@
       <point x="772" y="1186" type="curve" smooth="yes"/>
       <point x="916" y="1042"/>
       <point x="993" y="862"/>
-      <point x="993" y="653" type="curve" name="dh02" smooth="yes"/>
+      <point x="993" y="653" type="curve" smooth="yes" name="dh02"/>
       <point x="993" y="449"/>
       <point x="920" y="271"/>
       <point x="772" y="123" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni276A_.glif b/source/Hack-Bold.ufo/glyphs/uni276A_.glif
index 80825423e..a7bbe6355 100644
--- a/source/Hack-Bold.ufo/glyphs/uni276A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni276A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni276A" format="1">
+<glyph name="uni276A" format="2">
   <advance width="1233"/>
   <unicode hex="276A"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="601" y="-121" type="line" name="hr00"/>
       <point x="440" y="135"/>
       <point x="359" y="377"/>
-      <point x="359" y="621" type="curve" name="dh01" smooth="yes"/>
+      <point x="359" y="621" type="curve" smooth="yes" name="dh01"/>
       <point x="359" y="864"/>
       <point x="437" y="1105"/>
       <point x="601" y="1361" type="curve" name="av02"/>
       <point x="874" y="1361" type="line"/>
       <point x="730" y="1112"/>
       <point x="660" y="871"/>
-      <point x="660" y="622" type="curve" name="dh02" smooth="yes"/>
+      <point x="660" y="622" type="curve" smooth="yes" name="dh02"/>
       <point x="660" y="370"/>
       <point x="729" y="128"/>
       <point x="874" y="-121" type="curve" name="av01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni276B_.glif b/source/Hack-Bold.ufo/glyphs/uni276B_.glif
index 0eb0beded..bcada30fa 100644
--- a/source/Hack-Bold.ufo/glyphs/uni276B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni276B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni276B" format="1">
+<glyph name="uni276B" format="2">
   <advance width="1233"/>
   <unicode hex="276B"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="366" y="-121" type="line" name="hr00"/>
       <point x="506" y="120"/>
       <point x="574" y="355"/>
-      <point x="574" y="599" type="curve" name="dh01" smooth="yes"/>
+      <point x="574" y="599" type="curve" smooth="yes" name="dh01"/>
       <point x="574" y="843"/>
       <point x="507" y="1073"/>
       <point x="366" y="1316" type="curve" name="av01"/>
       <point x="631" y="1316" type="line"/>
       <point x="791" y="1067"/>
       <point x="867" y="835"/>
-      <point x="867" y="600" type="curve" name="dh02" smooth="yes"/>
+      <point x="867" y="600" type="curve" smooth="yes" name="dh02"/>
       <point x="867" y="361"/>
       <point x="788" y="127"/>
       <point x="631" y="-121" type="curve" name="av02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni276C_.glif b/source/Hack-Bold.ufo/glyphs/uni276C_.glif
index 52addd269..b56a4991d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni276C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni276C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni276C" format="1">
+<glyph name="uni276C" format="2">
   <advance width="1233"/>
   <unicode hex="276C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni276D_.glif b/source/Hack-Bold.ufo/glyphs/uni276D_.glif
index 82966ed32..4218e36fa 100644
--- a/source/Hack-Bold.ufo/glyphs/uni276D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni276D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni276D" format="1">
+<glyph name="uni276D" format="2">
   <advance width="1233"/>
   <unicode hex="276D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni276E_.glif b/source/Hack-Bold.ufo/glyphs/uni276E_.glif
index 6a77d7332..d485f90c0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni276E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni276E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni276E" format="1">
+<glyph name="uni276E" format="2">
   <advance width="1233"/>
   <unicode hex="276E"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni276F_.glif b/source/Hack-Bold.ufo/glyphs/uni276F_.glif
index 55c989008..1d43b367a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni276F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni276F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni276F" format="1">
+<glyph name="uni276F" format="2">
   <advance width="1233"/>
   <unicode hex="276F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2770.glif b/source/Hack-Bold.ufo/glyphs/uni2770.glif
index 0567c8ac0..283395f94 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2770.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2770.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2770" format="1">
+<glyph name="uni2770" format="2">
   <advance width="1233"/>
   <unicode hex="2770"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2771.glif b/source/Hack-Bold.ufo/glyphs/uni2771.glif
index f883c2582..07d29a8fb 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2771.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2771.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2771" format="1">
+<glyph name="uni2771" format="2">
   <advance width="1233"/>
   <unicode hex="2771"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2772.glif b/source/Hack-Bold.ufo/glyphs/uni2772.glif
index dfd00782e..b99d6924c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2772.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2772.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2772" format="1">
+<glyph name="uni2772" format="2">
   <advance width="1233"/>
   <unicode hex="2772"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2773.glif b/source/Hack-Bold.ufo/glyphs/uni2773.glif
index f63652bf3..346235637 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2773.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2773.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2773" format="1">
+<glyph name="uni2773" format="2">
   <advance width="1233"/>
   <unicode hex="2773"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2774.glif b/source/Hack-Bold.ufo/glyphs/uni2774.glif
index 72b32200a..23049a78c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2774.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2774.glif
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2774" format="1">
+<glyph name="uni2774" format="2">
   <advance width="1233"/>
   <unicode hex="2774"/>
   <outline>
     <contour>
-      <point x="801" y="-328" type="line" name="sv01" smooth="yes"/>
+      <point x="801" y="-328" type="line" smooth="yes" name="sv01"/>
       <point x="564" y="-328"/>
       <point x="503" y="-261"/>
-      <point x="503" y="4" type="curve" name="sh01" smooth="yes"/>
+      <point x="503" y="4" type="curve" smooth="yes" name="sh01"/>
       <point x="503" y="219" type="line" smooth="yes"/>
       <point x="503" y="400"/>
       <point x="460" y="460"/>
-      <point x="325" y="460" type="curve" name="hr01" smooth="yes"/>
+      <point x="325" y="460" type="curve" smooth="yes" name="hr01"/>
       <point x="281" y="460" type="line" name="dh01"/>
       <point x="281" y="588" type="line"/>
-      <point x="325" y="588" type="line" name="dv03" smooth="yes"/>
+      <point x="325" y="588" type="line" smooth="yes" name="dv03"/>
       <point x="461" y="588"/>
       <point x="503" y="647"/>
-      <point x="503" y="826" type="curve" name="sh02" smooth="yes"/>
+      <point x="503" y="826" type="curve" smooth="yes" name="sh02"/>
       <point x="503" y="1042" type="line" smooth="yes"/>
       <point x="503" y="1307"/>
       <point x="564" y="1373"/>
-      <point x="801" y="1373" type="curve" name="hr02" smooth="yes"/>
+      <point x="801" y="1373" type="curve" smooth="yes" name="hr02"/>
       <point x="952" y="1373" type="line" name="sh03"/>
       <point x="952" y="1244" type="line" name="dv02"/>
       <point x="903" y="1244" type="line" smooth="yes"/>
       <point x="770" y="1244"/>
       <point x="742" y="1207"/>
-      <point x="742" y="1038" type="curve" name="sh04" smooth="yes"/>
-      <point x="742" y="815" type="line" name="sh06" smooth="yes"/>
+      <point x="742" y="1038" type="curve" smooth="yes" name="sh04"/>
+      <point x="742" y="815" type="line" smooth="yes" name="sh06"/>
       <point x="742" y="625"/>
       <point x="703" y="555"/>
       <point x="598" y="523" type="curve" name="hr03"/>
       <point x="703" y="491"/>
       <point x="742" y="418"/>
-      <point x="742" y="231" type="curve" name="dh02" smooth="yes"/>
-      <point x="742" y="8" type="line" name="sh05" smooth="yes"/>
+      <point x="742" y="231" type="curve" smooth="yes" name="dh02"/>
+      <point x="742" y="8" type="line" smooth="yes" name="sh05"/>
       <point x="742" y="-161"/>
       <point x="770" y="-198"/>
-      <point x="903" y="-198" type="curve" name="hr04" smooth="yes"/>
+      <point x="903" y="-198" type="curve" smooth="yes" name="hr04"/>
       <point x="952" y="-198" type="line" name="hr05"/>
       <point x="952" y="-328" type="line" name="dv01"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2775.glif b/source/Hack-Bold.ufo/glyphs/uni2775.glif
index 25b5aed81..897e6573c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2775.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2775.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2775" format="1">
+<glyph name="uni2775" format="2">
   <advance width="1233"/>
   <unicode hex="2775"/>
   <outline>
     <contour>
       <point x="250" y="-204" type="line" name="dh01"/>
-      <point x="303" y="-204" type="line" name="dv01" smooth="yes"/>
+      <point x="303" y="-204" type="line" smooth="yes" name="dv01"/>
       <point x="450" y="-204"/>
       <point x="480" y="-167"/>
-      <point x="480" y="4" type="curve" name="sh01" smooth="yes"/>
-      <point x="480" y="230" type="line" name="sh02" smooth="yes"/>
+      <point x="480" y="4" type="curve" smooth="yes" name="sh01"/>
+      <point x="480" y="230" type="line" smooth="yes" name="sh02"/>
       <point x="480" y="419"/>
       <point x="520" y="494"/>
       <point x="636" y="526" type="curve" name="ih01"/>
       <point x="523" y="556"/>
       <point x="480" y="629"/>
-      <point x="480" y="821" type="curve" name="hr01" smooth="yes"/>
-      <point x="480" y="1046" type="line" name="sh03" smooth="yes"/>
+      <point x="480" y="821" type="curve" smooth="yes" name="hr01"/>
+      <point x="480" y="1046" type="line" smooth="yes" name="sh03"/>
       <point x="480" y="1218"/>
       <point x="450" y="1255"/>
       <point x="303" y="1255" type="curve" smooth="yes"/>
@@ -25,7 +25,7 @@
       <point x="415" y="1385" type="line" smooth="yes"/>
       <point x="674" y="1385"/>
       <point x="741" y="1318"/>
-      <point x="741" y="1050" type="curve" name="sh04" smooth="yes"/>
+      <point x="741" y="1050" type="curve" smooth="yes" name="sh04"/>
       <point x="741" y="831" type="line" smooth="yes"/>
       <point x="741" y="651"/>
       <point x="787" y="591"/>
@@ -36,7 +36,7 @@
       <point x="788" y="461"/>
       <point x="741" y="402"/>
       <point x="741" y="218" type="curve" smooth="yes"/>
-      <point x="741" y="1" type="line" name="dh02" smooth="yes"/>
+      <point x="741" y="1" type="line" smooth="yes" name="dh02"/>
       <point x="741" y="-267"/>
       <point x="674" y="-335"/>
       <point x="415" y="-335" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2794.glif b/source/Hack-Bold.ufo/glyphs/uni2794.glif
index b0de26c62..1f5e538fd 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2794.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2794.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2794" format="1">
+<glyph name="uni2794" format="2">
   <advance width="1233"/>
   <unicode hex="2794"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2798.glif b/source/Hack-Bold.ufo/glyphs/uni2798.glif
index 084bf95b8..9f84df30f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2798.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2798.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2798" format="1">
+<glyph name="uni2798" format="2">
   <advance width="1233"/>
   <unicode hex="2798"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2799.glif b/source/Hack-Bold.ufo/glyphs/uni2799.glif
index fd35bba38..c7a6570b5 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2799.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2799.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2799" format="1">
+<glyph name="uni2799" format="2">
   <advance width="1233"/>
   <unicode hex="2799"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni279A_.glif b/source/Hack-Bold.ufo/glyphs/uni279A_.glif
index d0c05f97b..b29710137 100644
--- a/source/Hack-Bold.ufo/glyphs/uni279A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni279A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni279A" format="1">
+<glyph name="uni279A" format="2">
   <advance width="1233"/>
   <unicode hex="279A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni279B_.glif b/source/Hack-Bold.ufo/glyphs/uni279B_.glif
index 9b6df9c0d..a618e85ad 100644
--- a/source/Hack-Bold.ufo/glyphs/uni279B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni279B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni279B" format="1">
+<glyph name="uni279B" format="2">
   <advance width="1233"/>
   <unicode hex="279B"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni279C_.glif b/source/Hack-Bold.ufo/glyphs/uni279C_.glif
index 6ce77211c..e104347ce 100644
--- a/source/Hack-Bold.ufo/glyphs/uni279C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni279C_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni279C" format="1">
+<glyph name="uni279C" format="2">
   <advance width="1233"/>
   <unicode hex="279C"/>
   <outline>
     <contour>
-      <point x="765" y="298" type="curve" name="av02" smooth="yes"/>
+      <point x="765" y="298" type="curve" smooth="yes" name="av02"/>
       <point x="740" y="298"/>
       <point x="718" y="307"/>
       <point x="700" y="325" type="curve" smooth="yes"/>
@@ -29,7 +29,7 @@
       <point x="142" y="785"/>
       <point x="167" y="785" type="curve" smooth="yes"/>
       <point x="839" y="785" type="line" name="dv02"/>
-      <point x="700" y="924" type="line" name="hr01" smooth="yes"/>
+      <point x="700" y="924" type="line" smooth="yes" name="hr01"/>
       <point x="683" y="941"/>
       <point x="672" y="965"/>
       <point x="672" y="992" type="curve" smooth="yes"/>
@@ -38,7 +38,7 @@
       <point x="700" y="1057" type="curve" smooth="yes"/>
       <point x="717" y="1074"/>
       <point x="739" y="1085"/>
-      <point x="766" y="1085" type="curve" name="av01" smooth="yes"/>
+      <point x="766" y="1085" type="curve" smooth="yes" name="av01"/>
       <point x="793" y="1085"/>
       <point x="816" y="1073"/>
       <point x="832" y="1057" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni279D_.glif b/source/Hack-Bold.ufo/glyphs/uni279D_.glif
index 1ae260b33..f51191e51 100644
--- a/source/Hack-Bold.ufo/glyphs/uni279D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni279D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni279D" format="1">
+<glyph name="uni279D" format="2">
   <advance width="1233"/>
   <unicode hex="279D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni279E_.glif b/source/Hack-Bold.ufo/glyphs/uni279E_.glif
index 679ccfabe..d6313a215 100644
--- a/source/Hack-Bold.ufo/glyphs/uni279E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni279E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni279E" format="1">
+<glyph name="uni279E" format="2">
   <advance width="1233"/>
   <unicode hex="279E"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni279F_.glif b/source/Hack-Bold.ufo/glyphs/uni279F_.glif
index 24fe36709..a540979ff 100644
--- a/source/Hack-Bold.ufo/glyphs/uni279F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni279F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni279F" format="1">
+<glyph name="uni279F" format="2">
   <advance width="1233"/>
   <unicode hex="279F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27A_0.glif b/source/Hack-Bold.ufo/glyphs/uni27A_0.glif
index 6b4a793e3..8ec5e5084 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27A_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27A0" format="1">
+<glyph name="uni27A0" format="2">
   <advance width="1233"/>
   <unicode hex="27A0"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27A_1.glif b/source/Hack-Bold.ufo/glyphs/uni27A_1.glif
index 1041b94f2..5e21f8ce0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27A_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27A_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27A1" format="1">
+<glyph name="uni27A1" format="2">
   <advance width="1233"/>
   <unicode hex="27A1"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27A_2.glif b/source/Hack-Bold.ufo/glyphs/uni27A_2.glif
index 029f24815..0ccc5e527 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27A_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27A_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27A2" format="1">
+<glyph name="uni27A2" format="2">
   <advance width="1233"/>
   <unicode hex="27A2"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27A_3.glif b/source/Hack-Bold.ufo/glyphs/uni27A_3.glif
index d4711f359..2965a3167 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27A_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27A_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27A3" format="1">
+<glyph name="uni27A3" format="2">
   <advance width="1233"/>
   <unicode hex="27A3"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27A_4.glif b/source/Hack-Bold.ufo/glyphs/uni27A_4.glif
index 69bef6327..94ecde205 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27A_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27A4" format="1">
+<glyph name="uni27A4" format="2">
   <advance width="1233"/>
   <unicode hex="27A4"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27A_5.glif b/source/Hack-Bold.ufo/glyphs/uni27A_5.glif
index 0d40affef..3255442f4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27A_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27A_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27A5" format="1">
+<glyph name="uni27A5" format="2">
   <advance width="1233"/>
   <unicode hex="27A5"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="71" y="634"/>
       <point x="54" y="680"/>
       <point x="54" y="725" type="curve" smooth="yes"/>
-      <point x="54" y="1085" type="line" name="av01" smooth="yes"/>
+      <point x="54" y="1085" type="line" smooth="yes" name="av01"/>
       <point x="54" y="1040"/>
       <point x="71" y="994"/>
       <point x="108" y="958" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27A_6.glif b/source/Hack-Bold.ufo/glyphs/uni27A_6.glif
index 6121917bc..ed77b275c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27A_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27A_6.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27A6" format="1">
+<glyph name="uni27A6" format="2">
   <advance width="1233"/>
   <unicode hex="27A6"/>
   <outline>
     <contour>
-      <point x="54" y="755" type="line" name="hr00" smooth="yes"/>
+      <point x="54" y="755" type="line" smooth="yes" name="hr00"/>
       <point x="54" y="800"/>
       <point x="71" y="846"/>
       <point x="108" y="882" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="108" y="522" type="curve" smooth="yes"/>
       <point x="71" y="486"/>
       <point x="54" y="440"/>
-      <point x="54" y="395" type="curve" name="av02" smooth="yes"/>
+      <point x="54" y="395" type="curve" smooth="yes" name="av02"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27A_7.glif b/source/Hack-Bold.ufo/glyphs/uni27A_7.glif
index 1c79bf547..9d39df232 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27A_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27A_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27A7" format="1">
+<glyph name="uni27A7" format="2">
   <advance width="1233"/>
   <unicode hex="27A7"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27A_8.glif b/source/Hack-Bold.ufo/glyphs/uni27A_8.glif
index dd764c8db..a094d97d6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27A_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27A_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27A8" format="1">
+<glyph name="uni27A8" format="2">
   <advance width="1233"/>
   <unicode hex="27A8"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27A_9.glif b/source/Hack-Bold.ufo/glyphs/uni27A_9.glif
index f0b877ee1..262fcd357 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27A_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27A_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27A9" format="1">
+<glyph name="uni27A9" format="2">
   <advance width="1233"/>
   <unicode hex="27A9"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27A_A_.glif b/source/Hack-Bold.ufo/glyphs/uni27A_A_.glif
index 345e06150..2e60ba1cc 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27A_A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27A_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27AA" format="1">
+<glyph name="uni27AA" format="2">
   <advance width="1233"/>
   <unicode hex="27AA"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27A_B_.glif b/source/Hack-Bold.ufo/glyphs/uni27A_B_.glif
index 62e9fe89f..88a6f468b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27A_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27A_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27AB" format="1">
+<glyph name="uni27AB" format="2">
   <advance width="1233"/>
   <unicode hex="27AB"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27A_C_.glif b/source/Hack-Bold.ufo/glyphs/uni27A_C_.glif
index 3d1a83b1c..b4113e177 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27A_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27A_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27AC" format="1">
+<glyph name="uni27AC" format="2">
   <advance width="1233"/>
   <unicode hex="27AC"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27A_D_.glif b/source/Hack-Bold.ufo/glyphs/uni27A_D_.glif
index 13b1bb802..281231dda 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27A_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27A_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27AD" format="1">
+<glyph name="uni27AD" format="2">
   <advance width="1233"/>
   <unicode hex="27AD"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27A_E_.glif b/source/Hack-Bold.ufo/glyphs/uni27A_E_.glif
index bdea22ec6..a95b572ea 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27A_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27A_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27AE" format="1">
+<glyph name="uni27AE" format="2">
   <advance width="1233"/>
   <unicode hex="27AE"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27A_F_.glif b/source/Hack-Bold.ufo/glyphs/uni27A_F_.glif
index 88cd18b0a..708af23ed 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27A_F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27A_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27AF" format="1">
+<glyph name="uni27AF" format="2">
   <advance width="1233"/>
   <unicode hex="27AF"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27B_1.glif b/source/Hack-Bold.ufo/glyphs/uni27B_1.glif
index 82ba4f0e0..489675e77 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27B_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27B_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27B1" format="1">
+<glyph name="uni27B1" format="2">
   <advance width="1233"/>
   <unicode hex="27B1"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27B_2.glif b/source/Hack-Bold.ufo/glyphs/uni27B_2.glif
index 40a00489c..573e789c4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27B_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27B_2.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27B2" format="1">
+<glyph name="uni27B2" format="2">
   <advance width="1233"/>
   <unicode hex="27B2"/>
   <outline>
     <contour>
-      <point x="586" y="189" type="curve" name="hr00" smooth="yes"/>
+      <point x="586" y="189" type="curve" smooth="yes" name="hr00"/>
       <point x="449" y="189"/>
       <point x="322" y="245"/>
       <point x="231" y="337" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="394" y="1158" type="curve" smooth="yes"/>
       <point x="454" y="1183"/>
       <point x="517" y="1196"/>
-      <point x="582" y="1196" type="curve" name="dv03" smooth="yes"/>
+      <point x="582" y="1196" type="curve" smooth="yes" name="dv03"/>
       <point x="727" y="1196"/>
       <point x="853" y="1136"/>
       <point x="941" y="1048" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27B_3.glif b/source/Hack-Bold.ufo/glyphs/uni27B_3.glif
index 1d2cb3677..657ae5689 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27B_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27B3" format="1">
+<glyph name="uni27B3" format="2">
   <advance width="1233"/>
   <unicode hex="27B3"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27B_4.glif b/source/Hack-Bold.ufo/glyphs/uni27B_4.glif
index 3d9758713..e0e36e223 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27B_4.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27B_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27B4" format="1">
+<glyph name="uni27B4" format="2">
   <advance width="1233"/>
   <unicode hex="27B4"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27B_5.glif b/source/Hack-Bold.ufo/glyphs/uni27B_5.glif
index 380c91430..ab211ac6b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27B_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27B_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27B5" format="1">
+<glyph name="uni27B5" format="2">
   <advance width="1233"/>
   <unicode hex="27B5"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27B_6.glif b/source/Hack-Bold.ufo/glyphs/uni27B_6.glif
index 576032a90..b8b2dea72 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27B_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27B_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27B6" format="1">
+<glyph name="uni27B6" format="2">
   <advance width="1233"/>
   <unicode hex="27B6"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27B_7.glif b/source/Hack-Bold.ufo/glyphs/uni27B_7.glif
index eba521efd..e5418c107 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27B_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27B_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27B7" format="1">
+<glyph name="uni27B7" format="2">
   <advance width="1233"/>
   <unicode hex="27B7"/>
   <outline>
@@ -30,7 +30,7 @@
       <point x="225" y="1026" type="curve" smooth="yes"/>
       <point x="281" y="1026"/>
       <point x="336" y="1005"/>
-      <point x="375" y="964" type="curve" name="iv03" smooth="yes"/>
+      <point x="375" y="964" type="curve" smooth="yes" name="iv03"/>
       <point x="336" y="1005"/>
       <point x="314" y="1059"/>
       <point x="314" y="1114" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27B_8.glif b/source/Hack-Bold.ufo/glyphs/uni27B_8.glif
index 5df279c64..e3f202f7d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27B_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27B_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27B8" format="1">
+<glyph name="uni27B8" format="2">
   <advance width="1233"/>
   <unicode hex="27B8"/>
   <outline>
@@ -18,10 +18,10 @@
       <point x="43" y="431" type="line"/>
       <point x="43" y="480"/>
       <point x="61" y="526"/>
-      <point x="97" y="561" type="curve" name="hr01" smooth="yes"/>
+      <point x="97" y="561" type="curve" smooth="yes" name="hr01"/>
       <point x="132" y="594"/>
       <point x="177" y="615"/>
-      <point x="226" y="615" type="curve" name="iv01" smooth="yes"/>
+      <point x="226" y="615" type="curve" smooth="yes" name="iv01"/>
       <point x="177" y="615"/>
       <point x="129" y="637"/>
       <point x="97" y="669" type="curve" smooth="yes"/>
@@ -35,7 +35,7 @@
       <point x="983" y="646" type="line" name="dv04"/>
       <point x="976" y="655"/>
       <point x="968" y="670"/>
-      <point x="960" y="690" type="curve" name="hr02" smooth="yes"/>
+      <point x="960" y="690" type="curve" smooth="yes" name="hr02"/>
       <point x="941" y="735"/>
       <point x="932" y="784"/>
       <point x="932" y="836" type="curve" name="av02"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27B_9.glif b/source/Hack-Bold.ufo/glyphs/uni27B_9.glif
index 8f1c8aa0e..4c2d6a66d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27B_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27B_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27B9" format="1">
+<glyph name="uni27B9" format="2">
   <advance width="1233"/>
   <unicode hex="27B9"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="336" y="314" type="curve" smooth="yes"/>
       <point x="336" y="363"/>
       <point x="356" y="413"/>
-      <point x="393" y="452" type="curve" name="iv01" smooth="yes"/>
+      <point x="393" y="452" type="curve" smooth="yes" name="iv01"/>
       <point x="356" y="413"/>
       <point x="303" y="395"/>
       <point x="255" y="395" type="curve" smooth="yes"/>
@@ -33,7 +33,7 @@
       <point x="756" y="1147" type="curve" name="at01"/>
       <point x="793" y="1143"/>
       <point x="830" y="1141"/>
-      <point x="867" y="1141" type="curve" name="at02" smooth="yes"/>
+      <point x="867" y="1141" type="curve" smooth="yes" name="at02"/>
       <point x="955" y="1141"/>
       <point x="1039" y="1152"/>
       <point x="1116" y="1175" type="curve" name="av01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27B_A_.glif b/source/Hack-Bold.ufo/glyphs/uni27B_A_.glif
index 5a5a86878..b3cdcdcb1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27B_A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27B_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27BA" format="1">
+<glyph name="uni27BA" format="2">
   <advance width="1233"/>
   <unicode hex="27BA"/>
   <outline>
@@ -19,7 +19,7 @@
       <point x="734" y="970" type="curve" smooth="yes"/>
       <point x="756" y="992"/>
       <point x="783" y="1003"/>
-      <point x="814" y="1003" type="curve" name="dv02" smooth="yes"/>
+      <point x="814" y="1003" type="curve" smooth="yes" name="dv02"/>
       <point x="845" y="1003"/>
       <point x="870" y="991"/>
       <point x="893" y="970" type="curve" smooth="yes"/>
@@ -59,7 +59,7 @@
       <point x="225" y="500"/>
     </contour>
     <contour>
-      <point x="814" y="298" type="curve" name="av01" smooth="yes"/>
+      <point x="814" y="298" type="curve" smooth="yes" name="av01"/>
       <point x="782" y="298"/>
       <point x="755" y="311"/>
       <point x="734" y="331" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27B_B_.glif b/source/Hack-Bold.ufo/glyphs/uni27B_B_.glif
index 42d0380f8..b6e6c994d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27B_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27B_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27BB" format="1">
+<glyph name="uni27BB" format="2">
   <advance width="1233"/>
   <unicode hex="27BB"/>
   <outline>
@@ -24,7 +24,7 @@
       <point x="973" y="498"/>
     </contour>
     <contour>
-      <point x="290" y="451" type="curve" name="dv01" smooth="yes"/>
+      <point x="290" y="451" type="curve" smooth="yes" name="dv01"/>
       <point x="226" y="451"/>
       <point x="175" y="482"/>
       <point x="148" y="510" type="curve"/>
@@ -42,7 +42,7 @@
       <point x="212" y="844" type="curve" smooth="yes"/>
       <point x="235" y="854"/>
       <point x="260" y="859"/>
-      <point x="287" y="859" type="curve" name="dv02" smooth="yes"/>
+      <point x="287" y="859" type="curve" smooth="yes" name="dv02"/>
       <point x="361" y="859"/>
       <point x="414" y="824"/>
       <point x="460" y="800" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27B_C_.glif b/source/Hack-Bold.ufo/glyphs/uni27B_C_.glif
index c1e320720..db32193d1 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27B_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27B_C_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27BC" format="1">
+<glyph name="uni27BC" format="2">
   <advance width="1233"/>
   <unicode hex="27BC"/>
   <outline>
     <contour>
-      <point x="70" y="446" type="line" name="dv01" smooth="yes"/>
+      <point x="70" y="446" type="line" smooth="yes" name="dv01"/>
       <point x="54" y="446"/>
       <point x="38" y="461"/>
       <point x="38" y="480" type="curve" smooth="yes"/>
@@ -14,7 +14,7 @@
       <point x="133" y="677" type="line" smooth="yes"/>
       <point x="135" y="680"/>
       <point x="136" y="684"/>
-      <point x="136" y="690" type="curve" name="hr01" smooth="yes"/>
+      <point x="136" y="690" type="curve" smooth="yes" name="hr01"/>
       <point x="136" y="695"/>
       <point x="135" y="700"/>
       <point x="133" y="703" type="curve" smooth="yes"/>
@@ -27,7 +27,7 @@
       <point x="48" y="924" type="curve" smooth="yes"/>
       <point x="55" y="929"/>
       <point x="62" y="934"/>
-      <point x="70" y="934" type="curve" name="dv02" smooth="yes"/>
+      <point x="70" y="934" type="curve" smooth="yes" name="dv02"/>
       <point x="568" y="934" type="line" smooth="yes"/>
       <point x="576" y="934"/>
       <point x="585" y="931"/>
@@ -42,7 +42,7 @@
       <point x="693" y="748"/>
       <point x="697" y="747"/>
       <point x="700" y="747" type="curve" smooth="yes"/>
-      <point x="929" y="747" type="line" name="dv04" smooth="yes"/>
+      <point x="929" y="747" type="line" smooth="yes" name="dv04"/>
       <point x="937" y="747"/>
       <point x="947" y="752"/>
       <point x="952" y="757" type="curve" smooth="yes"/>
@@ -84,7 +84,7 @@
       <point x="945" y="471" type="curve" smooth="yes"/>
       <point x="938" y="478"/>
       <point x="935" y="485"/>
-      <point x="935" y="494" type="curve" name="hr02" smooth="yes"/>
+      <point x="935" y="494" type="curve" smooth="yes" name="hr02"/>
       <point x="935" y="499"/>
       <point x="936" y="500"/>
       <point x="937" y="507" type="curve" smooth="yes"/>
@@ -97,7 +97,7 @@
       <point x="952" y="623" type="curve" smooth="yes"/>
       <point x="947" y="628"/>
       <point x="937" y="633"/>
-      <point x="929" y="633" type="curve" name="dv03" smooth="yes"/>
+      <point x="929" y="633" type="curve" smooth="yes" name="dv03"/>
       <point x="700" y="633" type="line" smooth="yes"/>
       <point x="692" y="633"/>
       <point x="684" y="628"/>
@@ -111,7 +111,7 @@
       <point x="579" y="449" type="curve" smooth="yes"/>
       <point x="576" y="447"/>
       <point x="572" y="446"/>
-      <point x="568" y="446" type="curve" name="sv01" smooth="yes"/>
+      <point x="568" y="446" type="curve" smooth="yes" name="sv01"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27B_D_.glif b/source/Hack-Bold.ufo/glyphs/uni27B_D_.glif
index 84f941453..9a5b79d1c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27B_D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27B_D_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27BD" format="1">
+<glyph name="uni27BD" format="2">
   <advance width="1233"/>
   <unicode hex="27BD"/>
   <outline>
     <contour>
-      <point x="838" y="357" type="curve" name="hr00" smooth="yes"/>
+      <point x="838" y="357" type="curve" smooth="yes" name="hr00"/>
       <point x="829" y="357"/>
       <point x="822" y="362"/>
-      <point x="815" y="367" type="curve" name="av01" smooth="yes"/>
+      <point x="815" y="367" type="curve" smooth="yes" name="av01"/>
       <point x="808" y="374"/>
       <point x="805" y="381"/>
       <point x="805" y="390" type="curve" smooth="yes"/>
@@ -92,13 +92,13 @@
       <point x="805" y="976" type="curve" smooth="yes"/>
       <point x="805" y="985"/>
       <point x="808" y="992"/>
-      <point x="815" y="999" type="curve" name="av03" smooth="yes"/>
+      <point x="815" y="999" type="curve" smooth="yes" name="av03"/>
       <point x="822" y="1004"/>
       <point x="829" y="1009"/>
-      <point x="838" y="1009" type="curve" name="av04" smooth="yes"/>
+      <point x="838" y="1009" type="curve" smooth="yes" name="av04"/>
       <point x="846" y="1009"/>
       <point x="855" y="1004"/>
-      <point x="860" y="999" type="curve" name="av05" smooth="yes"/>
+      <point x="860" y="999" type="curve" smooth="yes" name="av05"/>
       <point x="1185" y="707" type="line" smooth="yes"/>
       <point x="1188" y="704"/>
       <point x="1191" y="700"/>
@@ -109,7 +109,7 @@
       <point x="1195" y="674"/>
       <point x="1192" y="666"/>
       <point x="1185" y="659" type="curve" smooth="yes"/>
-      <point x="860" y="367" type="line" name="av02" smooth="yes"/>
+      <point x="860" y="367" type="line" smooth="yes" name="av02"/>
       <point x="855" y="362"/>
       <point x="846" y="357"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27B_E_.glif b/source/Hack-Bold.ufo/glyphs/uni27B_E_.glif
index e63a0f476..9e6c552ae 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27B_E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27B_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27BE" format="1">
+<glyph name="uni27BE" format="2">
   <advance width="1233"/>
   <unicode hex="27BE"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="654" y="945" type="line"/>
       <point x="661" y="926"/>
       <point x="668" y="906"/>
-      <point x="677" y="887" type="curve" name="hr01" smooth="yes"/>
+      <point x="677" y="887" type="curve" smooth="yes" name="hr01"/>
       <point x="707" y="822"/>
       <point x="734" y="770"/>
       <point x="803" y="685" type="curve" name="dv03"/>
@@ -55,7 +55,7 @@
       <point x="803" y="529" type="line" name="dv02"/>
       <point x="737" y="449"/>
       <point x="706" y="390"/>
-      <point x="677" y="327" type="curve" name="hr03" smooth="yes"/>
+      <point x="677" y="327" type="curve" smooth="yes" name="hr03"/>
       <point x="670" y="314"/>
       <point x="665" y="300"/>
       <point x="654" y="268" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27C_2.glif b/source/Hack-Bold.ufo/glyphs/uni27C_2.glif
index 248de81fb..3f20c7693 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27C_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27C_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27C2" format="1">
+<glyph name="uni27C2" format="2">
   <advance width="1233"/>
   <unicode hex="27C2"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27C_5.glif b/source/Hack-Bold.ufo/glyphs/uni27C_5.glif
index ad6dc17d2..33828bbd4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27C_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27C_5.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27C5" format="1">
+<glyph name="uni27C5" format="2">
   <advance width="1233"/>
   <unicode hex="27C5"/>
   <outline>
     <contour>
-      <point x="866" y="-334" type="line" name="hr00" smooth="yes"/>
+      <point x="866" y="-334" type="line" smooth="yes" name="hr00"/>
       <point x="785" y="-334"/>
       <point x="745" y="-328"/>
-      <point x="709" y="-323" type="curve" name="av01" smooth="yes"/>
+      <point x="709" y="-323" type="curve" smooth="yes" name="av01"/>
       <point x="104" y="-223"/>
       <point x="202" y="135"/>
       <point x="446" y="756" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27C_6.glif b/source/Hack-Bold.ufo/glyphs/uni27C_6.glif
index fcc24687a..4e044a55e 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27C_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27C_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27C6" format="1">
+<glyph name="uni27C6" format="2">
   <advance width="1233"/>
   <unicode hex="27C6"/>
   <outline>
@@ -19,14 +19,14 @@
       <point x="500" y="791" type="curve" smooth="yes"/>
       <point x="319" y="1261"/>
       <point x="213" y="1590"/>
-      <point x="638" y="1574" type="curve" name="at01" smooth="yes"/>
+      <point x="638" y="1574" type="curve" smooth="yes" name="at01"/>
       <point x="787" y="1569"/>
       <point x="886" y="1523"/>
       <point x="971" y="1390" type="curve"/>
       <point x="756" y="1290" type="line"/>
       <point x="736" y="1333"/>
       <point x="706" y="1355"/>
-      <point x="665" y="1355" type="curve" name="sv01" smooth="yes"/>
+      <point x="665" y="1355" type="curve" smooth="yes" name="sv01"/>
       <point x="613" y="1355"/>
       <point x="591" y="1319"/>
       <point x="596" y="1275" type="curve" smooth="yes"/>
@@ -38,7 +38,7 @@
       <point x="524" y="-323" type="curve" name="av01"/>
       <point x="488" y="-330"/>
       <point x="448" y="-334"/>
-      <point x="367" y="-334" type="curve" name="av02" smooth="yes"/>
+      <point x="367" y="-334" type="curve" smooth="yes" name="av02"/>
       <point x="256" y="-334" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27D_C_.glif b/source/Hack-Bold.ufo/glyphs/uni27D_C_.glif
index 2c2166a82..a2ce191e6 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27D_C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27D_C_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27DC" format="1">
+<glyph name="uni27DC" format="2">
   <advance width="1233"/>
   <unicode hex="27DC"/>
   <outline>
     <contour>
-      <point x="310" y="359" type="curve" name="hr00" smooth="yes"/>
+      <point x="310" y="359" type="curve" smooth="yes" name="hr00"/>
       <point x="154" y="359"/>
       <point x="28" y="486"/>
-      <point x="28" y="649" type="curve" name="dh01" smooth="yes"/>
+      <point x="28" y="649" type="curve" smooth="yes" name="dh01"/>
       <point x="28" y="808"/>
       <point x="149" y="930"/>
-      <point x="315" y="930" type="curve" name="dv03" smooth="yes"/>
+      <point x="315" y="930" type="curve" smooth="yes" name="dv03"/>
       <point x="392" y="930"/>
       <point x="458" y="903"/>
       <point x="515" y="848" type="curve" smooth="yes"/>
@@ -27,16 +27,16 @@
       <point x="386" y="359"/>
     </contour>
     <contour>
-      <point x="312" y="509" type="curve" name="dv01" smooth="yes"/>
+      <point x="312" y="509" type="curve" smooth="yes" name="dv01"/>
       <point x="389" y="509"/>
       <point x="450" y="571"/>
       <point x="450" y="647" type="curve" smooth="yes"/>
       <point x="450" y="722"/>
       <point x="390" y="782"/>
-      <point x="313" y="782" type="curve" name="dv02" smooth="yes"/>
+      <point x="313" y="782" type="curve" smooth="yes" name="dv02"/>
       <point x="236" y="782"/>
       <point x="176" y="722"/>
-      <point x="176" y="646" type="curve" name="dh02" smooth="yes"/>
+      <point x="176" y="646" type="curve" smooth="yes" name="dh02"/>
       <point x="176" y="570"/>
       <point x="236" y="509"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27E_0.glif b/source/Hack-Bold.ufo/glyphs/uni27E_0.glif
index 2485cb6d3..298a6d061 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27E_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27E_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27E0" format="1">
+<glyph name="uni27E0" format="2">
   <advance width="1233"/>
   <unicode hex="27E0"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27E_6.glif b/source/Hack-Bold.ufo/glyphs/uni27E_6.glif
index dda911493..9bdf4046c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27E_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27E_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27E6" format="1">
+<glyph name="uni27E6" format="2">
   <advance width="1233"/>
   <unicode hex="27E6"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27E_7.glif b/source/Hack-Bold.ufo/glyphs/uni27E_7.glif
index 24e23e08c..d5c94c677 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27E_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27E_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27E7" format="1">
+<glyph name="uni27E7" format="2">
   <advance width="1233"/>
   <unicode hex="27E7"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27E_8.glif b/source/Hack-Bold.ufo/glyphs/uni27E_8.glif
index 758ad1bb2..ea20ec956 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27E_8.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27E_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27E8" format="1">
+<glyph name="uni27E8" format="2">
   <advance width="1233"/>
   <unicode hex="27E8"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27E_9.glif b/source/Hack-Bold.ufo/glyphs/uni27E_9.glif
index 610cf7e5a..359e7ed22 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27E_9.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27E_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27E9" format="1">
+<glyph name="uni27E9" format="2">
   <advance width="1233"/>
   <unicode hex="27E9"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27E_A_.glif b/source/Hack-Bold.ufo/glyphs/uni27E_A_.glif
index 36a08b2c6..4ef301c44 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27E_A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27E_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27EA" format="1">
+<glyph name="uni27EA" format="2">
   <advance width="1233"/>
   <unicode hex="27EA"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27E_B_.glif b/source/Hack-Bold.ufo/glyphs/uni27E_B_.glif
index 3f946c63f..45f106266 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27E_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27E_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27EB" format="1">
+<glyph name="uni27EB" format="2">
   <advance width="1233"/>
   <unicode hex="27EB"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27F_5.glif b/source/Hack-Bold.ufo/glyphs/uni27F_5.glif
index 276f0007f..93ecc9ae9 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27F_5.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27F_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27F5" format="1">
+<glyph name="uni27F5" format="2">
   <advance width="1233"/>
   <unicode hex="27F5"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27F_6.glif b/source/Hack-Bold.ufo/glyphs/uni27F_6.glif
index e71ce27a8..2bf3fd397 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27F_6.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27F_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27F6" format="1">
+<glyph name="uni27F6" format="2">
   <advance width="1233"/>
   <unicode hex="27F6"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni27F_7.glif b/source/Hack-Bold.ufo/glyphs/uni27F_7.glif
index 0d784c960..d7511f3ac 100644
--- a/source/Hack-Bold.ufo/glyphs/uni27F_7.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni27F_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27F7" format="1">
+<glyph name="uni27F7" format="2">
   <advance width="1233"/>
   <unicode hex="27F7"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2987.glif b/source/Hack-Bold.ufo/glyphs/uni2987.glif
index a51f27a43..bda2447cd 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2987.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2987.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2987" format="1">
+<glyph name="uni2987" format="2">
   <advance width="1233"/>
   <unicode hex="2987"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="978" y="-270" type="line" name="hr00"/>
       <point x="490" y="-162"/>
       <point x="255" y="239"/>
-      <point x="255" y="647" type="curve" name="dh01" smooth="yes"/>
+      <point x="255" y="647" type="curve" smooth="yes" name="dh01"/>
       <point x="255" y="1042"/>
       <point x="475" y="1442"/>
       <point x="978" y="1554" type="curve" name="dh04"/>
@@ -16,7 +16,7 @@
       <point x="858" y="1373" type="line" name="dh03"/>
       <point x="665" y="1321"/>
       <point x="510" y="976"/>
-      <point x="510" y="642" type="curve" name="dh02" smooth="yes"/>
+      <point x="510" y="642" type="curve" smooth="yes" name="dh02"/>
       <point x="510" y="308"/>
       <point x="665" y="-37"/>
       <point x="858" y="-89" type="curve" name="iv01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2988.glif b/source/Hack-Bold.ufo/glyphs/uni2988.glif
index baa83d631..0e0aac95c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2988.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2988.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2988" format="1">
+<glyph name="uni2988" format="2">
   <advance width="1233"/>
   <unicode hex="2988"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="255" y="1554" type="line" name="hr00"/>
       <point x="743" y="1446"/>
       <point x="978" y="1045"/>
-      <point x="978" y="637" type="curve" name="dh03" smooth="yes"/>
+      <point x="978" y="637" type="curve" smooth="yes" name="dh03"/>
       <point x="978" y="245"/>
       <point x="758" y="-162"/>
       <point x="255" y="-270" type="curve" name="av01"/>
@@ -16,7 +16,7 @@
       <point x="375" y="-89" type="line" name="iv01"/>
       <point x="568" y="-37"/>
       <point x="723" y="308"/>
-      <point x="723" y="642" type="curve" name="dh02" smooth="yes"/>
+      <point x="723" y="642" type="curve" smooth="yes" name="dh02"/>
       <point x="723" y="976"/>
       <point x="568" y="1321"/>
       <point x="375" y="1373" type="curve" name="dh01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2997.glif b/source/Hack-Bold.ufo/glyphs/uni2997.glif
index 4ada8e7a3..040e73d43 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2997.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2997.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2997" format="1">
+<glyph name="uni2997" format="2">
   <advance width="1233"/>
   <unicode hex="2997"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2998.glif b/source/Hack-Bold.ufo/glyphs/uni2998.glif
index db71d9fb3..432eacddb 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2998.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2998.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2998" format="1">
+<glyph name="uni2998" format="2">
   <advance width="1233"/>
   <unicode hex="2998"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni29E_B_.glif b/source/Hack-Bold.ufo/glyphs/uni29E_B_.glif
index dff97d656..419f61c0f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni29E_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni29E_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni29EB" format="1">
+<glyph name="uni29EB" format="2">
   <advance width="1233"/>
   <unicode hex="29EB"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni29F_A_.glif b/source/Hack-Bold.ufo/glyphs/uni29F_A_.glif
index f476c9f78..aacd7228a 100644
--- a/source/Hack-Bold.ufo/glyphs/uni29F_A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni29F_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni29FA" format="1">
+<glyph name="uni29FA" format="2">
   <advance width="1233"/>
   <unicode hex="29FA"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni29F_B_.glif b/source/Hack-Bold.ufo/glyphs/uni29F_B_.glif
index a6f422217..30d8b8fdd 100644
--- a/source/Hack-Bold.ufo/glyphs/uni29F_B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni29F_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni29FB" format="1">
+<glyph name="uni29FB" format="2">
   <advance width="1233"/>
   <unicode hex="29FB"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2A_00.glif b/source/Hack-Bold.ufo/glyphs/uni2A_00.glif
index e04c21ec0..a6d7bc2ee 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2A_00.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2A_00.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2A00" format="1">
+<glyph name="uni2A00" format="2">
   <advance width="1233"/>
   <unicode hex="2A00"/>
   <outline>
     <contour>
-      <point x="616" y="-465" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-465" type="curve" smooth="yes" name="hr00"/>
       <point x="259" y="-465"/>
       <point x="80" y="-130"/>
-      <point x="80" y="540" type="curve" name="dh01" smooth="yes"/>
+      <point x="80" y="540" type="curve" smooth="yes" name="dh01"/>
       <point x="80" y="1211"/>
       <point x="259" y="1547"/>
-      <point x="616" y="1547" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1547" type="curve" smooth="yes" name="dv03"/>
       <point x="974" y="1547"/>
       <point x="1153" y="1211"/>
-      <point x="1153" y="540" type="curve" name="dh06" smooth="yes"/>
+      <point x="1153" y="540" type="curve" smooth="yes" name="dh06"/>
       <point x="1153" y="-130"/>
       <point x="974" y="-465"/>
     </contour>
     <contour>
-      <point x="616" y="-275" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-275" type="curve" smooth="yes" name="dv01"/>
       <point x="847" y="-275"/>
       <point x="963" y="-4"/>
-      <point x="963" y="539" type="curve" name="dh05" smooth="yes"/>
+      <point x="963" y="539" type="curve" smooth="yes" name="dh05"/>
       <point x="963" y="1084"/>
       <point x="847" y="1357"/>
-      <point x="616" y="1357" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1357" type="curve" smooth="yes" name="dv02"/>
       <point x="385" y="1357"/>
       <point x="270" y="1084"/>
-      <point x="270" y="539" type="curve" name="dh02" smooth="yes"/>
+      <point x="270" y="539" type="curve" smooth="yes" name="dh02"/>
       <point x="270" y="-4"/>
       <point x="385" y="-275"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2A_2F_.glif b/source/Hack-Bold.ufo/glyphs/uni2A_2F_.glif
index 38c30e648..9287caa2c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2A_2F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2A_2F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2A2F" format="1">
+<glyph name="uni2A2F" format="2">
   <advance width="1233"/>
   <unicode hex="2A2F"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2A_6A_.glif b/source/Hack-Bold.ufo/glyphs/uni2A_6A_.glif
index 5535a1a6d..c697b64c7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2A_6A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2A_6A_.glif
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2A6A" format="1">
+<glyph name="uni2A6A" format="2">
   <advance width="1233"/>
   <unicode hex="2A6A"/>
   <outline>
     <contour>
-      <point x="481" y="912" type="line" name="dv05" smooth="yes"/>
+      <point x="481" y="912" type="line" smooth="yes" name="dv05"/>
       <point x="461" y="912"/>
       <point x="451" y="922"/>
-      <point x="451" y="942" type="curve" name="dh01" smooth="yes"/>
+      <point x="451" y="942" type="curve" smooth="yes" name="dh01"/>
       <point x="451" y="1247" type="line" smooth="yes"/>
       <point x="451" y="1267"/>
       <point x="461" y="1277"/>
-      <point x="481" y="1277" type="curve" name="dv06" smooth="yes"/>
+      <point x="481" y="1277" type="curve" smooth="yes" name="dv06"/>
       <point x="754" y="1277" type="line" smooth="yes"/>
       <point x="774" y="1277"/>
       <point x="784" y="1267"/>
       <point x="784" y="1247" type="curve" smooth="yes"/>
-      <point x="784" y="942" type="line" name="dh02" smooth="yes"/>
+      <point x="784" y="942" type="line" smooth="yes" name="dh02"/>
       <point x="784" y="922"/>
       <point x="774" y="912"/>
-      <point x="754" y="912" type="curve" name="hr01" smooth="yes"/>
+      <point x="754" y="912" type="curve" smooth="yes" name="hr01"/>
     </contour>
     <contour>
-      <point x="850" y="468" type="curve" name="dv01" smooth="yes"/>
+      <point x="850" y="468" type="curve" smooth="yes" name="dv01"/>
       <point x="778" y="468"/>
       <point x="726" y="484"/>
       <point x="645" y="519" type="curve" smooth="yes"/>
       <point x="612" y="533" type="line" smooth="yes"/>
       <point x="522" y="570"/>
       <point x="468" y="591"/>
-      <point x="385" y="591" type="curve" name="dv03" smooth="yes"/>
+      <point x="385" y="591" type="curve" smooth="yes" name="dv03"/>
       <point x="280" y="591"/>
       <point x="192" y="558"/>
       <point x="88" y="470" type="curve" name="iv01"/>
       <point x="88" y="699" type="line" name="hr02"/>
       <point x="192" y="779"/>
       <point x="287" y="814"/>
-      <point x="390" y="814" type="curve" name="dv04" smooth="yes"/>
+      <point x="390" y="814" type="curve" smooth="yes" name="dv04"/>
       <point x="463" y="814"/>
       <point x="533" y="796"/>
       <point x="621" y="759" type="curve"/>
@@ -44,7 +44,7 @@
       <point x="652" y="745" type="line" smooth="yes"/>
       <point x="725" y="710"/>
       <point x="797" y="691"/>
-      <point x="865" y="691" type="curve" name="dv02" smooth="yes"/>
+      <point x="865" y="691" type="curve" smooth="yes" name="dv02"/>
       <point x="958" y="691"/>
       <point x="1045" y="728"/>
       <point x="1145" y="816" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2A_6B_.glif b/source/Hack-Bold.ufo/glyphs/uni2A_6B_.glif
index a821803b5..7e732d76f 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2A_6B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2A_6B_.glif
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2A6B" format="1">
+<glyph name="uni2A6B" format="2">
   <advance width="1233"/>
   <unicode hex="2A6B"/>
   <outline>
     <contour>
-      <point x="721" y="912" type="line" name="dv01" smooth="yes"/>
+      <point x="721" y="912" type="line" smooth="yes" name="dv01"/>
       <point x="701" y="912"/>
       <point x="691" y="922"/>
-      <point x="691" y="942" type="curve" name="ah01" smooth="yes"/>
+      <point x="691" y="942" type="curve" smooth="yes" name="ah01"/>
       <point x="691" y="1247" type="line" smooth="yes"/>
       <point x="691" y="1267"/>
       <point x="701" y="1277"/>
-      <point x="721" y="1277" type="curve" name="dv02" smooth="yes"/>
+      <point x="721" y="1277" type="curve" smooth="yes" name="dv02"/>
       <point x="994" y="1277" type="line" smooth="yes"/>
       <point x="1014" y="1277"/>
       <point x="1024" y="1267"/>
       <point x="1024" y="1247" type="curve" smooth="yes"/>
-      <point x="1024" y="942" type="line" name="sh01" smooth="yes"/>
+      <point x="1024" y="942" type="line" smooth="yes" name="sh01"/>
       <point x="1024" y="922"/>
       <point x="1014" y="912"/>
       <point x="994" y="912" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="850" y="468" type="curve" name="dv03" smooth="yes"/>
+      <point x="850" y="468" type="curve" smooth="yes" name="dv03"/>
       <point x="778" y="468"/>
       <point x="726" y="484"/>
       <point x="645" y="519" type="curve" smooth="yes"/>
       <point x="612" y="533" type="line" smooth="yes"/>
       <point x="522" y="570"/>
       <point x="468" y="591"/>
-      <point x="385" y="591" type="curve" name="dv05" smooth="yes"/>
+      <point x="385" y="591" type="curve" smooth="yes" name="dv05"/>
       <point x="280" y="591"/>
       <point x="192" y="558"/>
       <point x="88" y="470" type="curve" name="iv01"/>
       <point x="88" y="699" type="line"/>
       <point x="192" y="779"/>
       <point x="287" y="814"/>
-      <point x="390" y="814" type="curve" name="dv06" smooth="yes"/>
+      <point x="390" y="814" type="curve" smooth="yes" name="dv06"/>
       <point x="463" y="814"/>
       <point x="533" y="796"/>
       <point x="621" y="759" type="curve" name="hr01"/>
@@ -44,7 +44,7 @@
       <point x="652" y="745" type="line" smooth="yes"/>
       <point x="725" y="710"/>
       <point x="797" y="691"/>
-      <point x="865" y="691" type="curve" name="dv04" smooth="yes"/>
+      <point x="865" y="691" type="curve" smooth="yes" name="dv04"/>
       <point x="958" y="691"/>
       <point x="1045" y="728"/>
       <point x="1145" y="816" type="curve"/>
@@ -53,19 +53,19 @@
       <point x="959" y="468"/>
     </contour>
     <contour>
-      <point x="240" y="0" type="line" name="hr02" smooth="yes"/>
+      <point x="240" y="0" type="line" smooth="yes" name="hr02"/>
       <point x="220" y="0"/>
       <point x="210" y="10"/>
-      <point x="210" y="30" type="curve" name="sh02" smooth="yes"/>
+      <point x="210" y="30" type="curve" smooth="yes" name="sh02"/>
       <point x="210" y="335" type="line" smooth="yes"/>
       <point x="210" y="355"/>
       <point x="220" y="365"/>
-      <point x="240" y="365" type="curve" name="sv01" smooth="yes"/>
+      <point x="240" y="365" type="curve" smooth="yes" name="sv01"/>
       <point x="513" y="365" type="line" smooth="yes"/>
       <point x="533" y="365"/>
       <point x="543" y="355"/>
       <point x="543" y="335" type="curve" smooth="yes"/>
-      <point x="543" y="30" type="line" name="sh03" smooth="yes"/>
+      <point x="543" y="30" type="line" smooth="yes" name="sh03"/>
       <point x="543" y="10"/>
       <point x="533" y="0"/>
       <point x="513" y="0" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2B_05.glif b/source/Hack-Bold.ufo/glyphs/uni2B_05.glif
index aae2dafb0..1c57ffc1d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2B_05.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2B_05.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B05" format="1">
+<glyph name="uni2B05" format="2">
   <advance width="1233"/>
   <unicode hex="2B05"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2B_06.glif b/source/Hack-Bold.ufo/glyphs/uni2B_06.glif
index 8301a2c45..e781b0ca5 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2B_06.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2B_06.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B06" format="1">
+<glyph name="uni2B06" format="2">
   <advance width="1233"/>
   <unicode hex="2B06"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2B_07.glif b/source/Hack-Bold.ufo/glyphs/uni2B_07.glif
index 9b1a7e792..94c3f0bc7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2B_07.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2B_07.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B07" format="1">
+<glyph name="uni2B07" format="2">
   <advance width="1233"/>
   <unicode hex="2B07"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2B_08.glif b/source/Hack-Bold.ufo/glyphs/uni2B_08.glif
index a1663e612..bf05515aa 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2B_08.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2B_08.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B08" format="1">
+<glyph name="uni2B08" format="2">
   <advance width="1233"/>
   <unicode hex="2B08"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2B_09.glif b/source/Hack-Bold.ufo/glyphs/uni2B_09.glif
index 53bd2854b..443a0a27b 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2B_09.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2B_09.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B09" format="1">
+<glyph name="uni2B09" format="2">
   <advance width="1233"/>
   <unicode hex="2B09"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2B_0A_.glif b/source/Hack-Bold.ufo/glyphs/uni2B_0A_.glif
index 07d99088d..8d7b58520 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2B_0A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2B_0A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B0A" format="1">
+<glyph name="uni2B0A" format="2">
   <advance width="1233"/>
   <unicode hex="2B0A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2B_0B_.glif b/source/Hack-Bold.ufo/glyphs/uni2B_0B_.glif
index 1ff77d49c..40a643378 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2B_0B_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2B_0B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B0B" format="1">
+<glyph name="uni2B0B" format="2">
   <advance width="1233"/>
   <unicode hex="2B0B"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2B_0C_.glif b/source/Hack-Bold.ufo/glyphs/uni2B_0C_.glif
index 7464efd15..e77854f14 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2B_0C_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2B_0C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B0C" format="1">
+<glyph name="uni2B0C" format="2">
   <advance width="1233"/>
   <unicode hex="2B0C"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2B_0D_.glif b/source/Hack-Bold.ufo/glyphs/uni2B_0D_.glif
index 13acb4c41..bd4b267a7 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2B_0D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2B_0D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B0D" format="1">
+<glyph name="uni2B0D" format="2">
   <advance width="1233"/>
   <unicode hex="2B0D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2B_16.glif b/source/Hack-Bold.ufo/glyphs/uni2B_16.glif
index 874df6ab1..5a1a56a23 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2B_16.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2B_16.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B16" format="1">
+<glyph name="uni2B16" format="2">
   <advance width="1233"/>
   <unicode hex="2B16"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2B_17.glif b/source/Hack-Bold.ufo/glyphs/uni2B_17.glif
index 074464fff..083909981 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2B_17.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2B_17.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B17" format="1">
+<glyph name="uni2B17" format="2">
   <advance width="1233"/>
   <unicode hex="2B17"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2B_18.glif b/source/Hack-Bold.ufo/glyphs/uni2B_18.glif
index 1834720d1..91a26a4d4 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2B_18.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2B_18.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B18" format="1">
+<glyph name="uni2B18" format="2">
   <advance width="1233"/>
   <unicode hex="2B18"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2B_19.glif b/source/Hack-Bold.ufo/glyphs/uni2B_19.glif
index d47b5b184..41eb9616d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2B_19.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2B_19.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B19" format="1">
+<glyph name="uni2B19" format="2">
   <advance width="1233"/>
   <unicode hex="2B19"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2B_1A_.glif b/source/Hack-Bold.ufo/glyphs/uni2B_1A_.glif
index d926e42c8..492f88fb0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2B_1A_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2B_1A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B1A" format="1">
+<glyph name="uni2B1A" format="2">
   <advance width="1233"/>
   <unicode hex="2B1A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2C_7D_.glif b/source/Hack-Bold.ufo/glyphs/uni2C_7D_.glif
index b3ed54105..db302b4bb 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2C_7D_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2C_7D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2C7D" format="1">
+<glyph name="uni2C7D" format="2">
   <advance width="1233"/>
   <unicode hex="2C7D"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2E_18.case.glif b/source/Hack-Bold.ufo/glyphs/uni2E_18.case.glif
index 77c1b9277..064c06a6c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2E_18.case.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2E_18.case.glif
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E18.case" format="1">
+<glyph name="uni2E18.case" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="669" y="1230" type="curve" name="dv01" smooth="yes"/>
+      <point x="669" y="1230" type="curve" smooth="yes" name="dv01"/>
       <point x="580" y="1230"/>
       <point x="508" y="1300"/>
-      <point x="508" y="1397" type="curve" name="dh03" smooth="yes"/>
+      <point x="508" y="1397" type="curve" smooth="yes" name="dh03"/>
       <point x="508" y="1446"/>
       <point x="524" y="1488"/>
       <point x="555" y="1519" type="curve" smooth="yes"/>
       <point x="587" y="1550"/>
       <point x="629" y="1564"/>
-      <point x="669" y="1564" type="curve" name="at01" smooth="yes"/>
+      <point x="669" y="1564" type="curve" smooth="yes" name="at01"/>
       <point x="680" y="1564"/>
       <point x="691" y="1563"/>
-      <point x="702" y="1561" type="curve" name="at02" smooth="yes"/>
+      <point x="702" y="1561" type="curve" smooth="yes" name="at02"/>
       <point x="707" y="1560"/>
       <point x="720" y="1557"/>
-      <point x="731" y="1552" type="curve" name="at03" smooth="yes"/>
+      <point x="731" y="1552" type="curve" smooth="yes" name="at03"/>
       <point x="756" y="1541"/>
       <point x="761" y="1539"/>
-      <point x="783" y="1517" type="curve" name="hr01" smooth="yes"/>
+      <point x="783" y="1517" type="curve" smooth="yes" name="hr01"/>
       <point x="796" y="1504"/>
       <point x="809" y="1487"/>
       <point x="818" y="1464" type="curve" smooth="yes"/>
       <point x="826" y="1444"/>
       <point x="830" y="1422"/>
-      <point x="830" y="1398" type="curve" name="sh01" smooth="yes"/>
+      <point x="830" y="1398" type="curve" smooth="yes" name="sh01"/>
       <point x="830" y="1299"/>
       <point x="758" y="1230"/>
     </contour>
     <contour>
-      <point x="603" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="603" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="340" y="-27"/>
       <point x="174" y="105"/>
-      <point x="174" y="325" type="curve" name="dh01" smooth="yes"/>
+      <point x="174" y="325" type="curve" smooth="yes" name="dh01"/>
       <point x="174" y="424"/>
       <point x="208" y="499"/>
       <point x="336" y="625" type="curve" smooth="yes"/>
@@ -59,7 +59,7 @@
       <point x="532" y="496" type="line" name="sh06"/>
       <point x="485" y="447"/>
       <point x="459" y="406"/>
-      <point x="459" y="347" type="curve" name="dh02" smooth="yes"/>
+      <point x="459" y="347" type="curve" smooth="yes" name="dh02"/>
       <point x="459" y="303"/>
       <point x="474" y="270"/>
       <point x="505" y="247" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2E_18.glif b/source/Hack-Bold.ufo/glyphs/uni2E_18.glif
index c29b6e4b8..e4f03085d 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2E_18.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2E_18.glif
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E18" format="1">
+<glyph name="uni2E18" format="2">
   <advance width="1233"/>
   <unicode hex="2E18"/>
   <outline>
     <contour>
-      <point x="664" y="1236" type="curve" name="dv01" smooth="yes"/>
+      <point x="664" y="1236" type="curve" smooth="yes" name="dv01"/>
       <point x="575" y="1236"/>
       <point x="503" y="1306"/>
-      <point x="503" y="1403" type="curve" name="dh03" smooth="yes"/>
+      <point x="503" y="1403" type="curve" smooth="yes" name="dh03"/>
       <point x="503" y="1452"/>
       <point x="519" y="1494"/>
       <point x="550" y="1525" type="curve" smooth="yes"/>
       <point x="582" y="1556"/>
       <point x="624" y="1570"/>
-      <point x="664" y="1570" type="curve" name="at01" smooth="yes"/>
+      <point x="664" y="1570" type="curve" smooth="yes" name="at01"/>
       <point x="675" y="1570"/>
       <point x="686" y="1569"/>
-      <point x="697" y="1567" type="curve" name="at02" smooth="yes"/>
+      <point x="697" y="1567" type="curve" smooth="yes" name="at02"/>
       <point x="702" y="1566"/>
       <point x="715" y="1563"/>
-      <point x="726" y="1558" type="curve" name="at03" smooth="yes"/>
+      <point x="726" y="1558" type="curve" smooth="yes" name="at03"/>
       <point x="751" y="1547"/>
       <point x="756" y="1545"/>
-      <point x="778" y="1523" type="curve" name="hr01" smooth="yes"/>
+      <point x="778" y="1523" type="curve" smooth="yes" name="hr01"/>
       <point x="791" y="1510"/>
       <point x="804" y="1493"/>
       <point x="813" y="1470" type="curve" smooth="yes"/>
       <point x="821" y="1450"/>
       <point x="825" y="1428"/>
-      <point x="825" y="1404" type="curve" name="dh04" smooth="yes"/>
+      <point x="825" y="1404" type="curve" smooth="yes" name="dh04"/>
       <point x="825" y="1305"/>
       <point x="753" y="1236"/>
     </contour>
     <contour>
-      <point x="603" y="-64" type="curve" name="av01" smooth="yes"/>
+      <point x="603" y="-64" type="curve" smooth="yes" name="av01"/>
       <point x="340" y="-64"/>
       <point x="174" y="68"/>
-      <point x="174" y="288" type="curve" name="dh01" smooth="yes"/>
+      <point x="174" y="288" type="curve" smooth="yes" name="dh01"/>
       <point x="174" y="387"/>
       <point x="208" y="462"/>
       <point x="336" y="588" type="curve" smooth="yes"/>
@@ -60,7 +60,7 @@
       <point x="532" y="459" type="line" name="sh04"/>
       <point x="485" y="410"/>
       <point x="459" y="369"/>
-      <point x="459" y="310" type="curve" name="dh02" smooth="yes"/>
+      <point x="459" y="310" type="curve" smooth="yes" name="dh02"/>
       <point x="459" y="266"/>
       <point x="474" y="233"/>
       <point x="505" y="210" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2E_1F_.glif b/source/Hack-Bold.ufo/glyphs/uni2E_1F_.glif
index 3b5a6d5fc..7dc9fce32 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2E_1F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2E_1F_.glif
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E1F" format="1">
+<glyph name="uni2E1F" format="2">
   <advance width="1233"/>
   <unicode hex="2E1F"/>
   <outline>
     <contour>
-      <point x="850" y="468" type="curve" name="dv01" smooth="yes"/>
+      <point x="850" y="468" type="curve" smooth="yes" name="dv01"/>
       <point x="778" y="468"/>
       <point x="726" y="484"/>
       <point x="645" y="519" type="curve" smooth="yes"/>
       <point x="612" y="533" type="line" smooth="yes"/>
       <point x="522" y="570"/>
       <point x="468" y="591"/>
-      <point x="385" y="591" type="curve" name="sv01" smooth="yes"/>
+      <point x="385" y="591" type="curve" smooth="yes" name="sv01"/>
       <point x="280" y="591"/>
       <point x="192" y="558"/>
       <point x="88" y="470" type="curve" name="iv01"/>
       <point x="88" y="699" type="line"/>
       <point x="192" y="779"/>
       <point x="287" y="814"/>
-      <point x="390" y="814" type="curve" name="av01" smooth="yes"/>
+      <point x="390" y="814" type="curve" smooth="yes" name="av01"/>
       <point x="463" y="814"/>
       <point x="533" y="796"/>
       <point x="621" y="759" type="curve"/>
@@ -26,7 +26,7 @@
       <point x="652" y="745" type="line" smooth="yes"/>
       <point x="725" y="710"/>
       <point x="797" y="691"/>
-      <point x="865" y="691" type="curve" name="dv02" smooth="yes"/>
+      <point x="865" y="691" type="curve" smooth="yes" name="dv02"/>
       <point x="958" y="691"/>
       <point x="1045" y="728"/>
       <point x="1145" y="816" type="curve" name="av02"/>
@@ -35,19 +35,19 @@
       <point x="959" y="468"/>
     </contour>
     <contour>
-      <point x="480" y="0" type="line" name="ab01" smooth="yes"/>
+      <point x="480" y="0" type="line" smooth="yes" name="ab01"/>
       <point x="460" y="0"/>
       <point x="450" y="10"/>
-      <point x="450" y="30" type="curve" name="dh01" smooth="yes"/>
-      <point x="450" y="335" type="line" name="hr01" smooth="yes"/>
+      <point x="450" y="30" type="curve" smooth="yes" name="dh01"/>
+      <point x="450" y="335" type="line" smooth="yes" name="hr01"/>
       <point x="450" y="355"/>
       <point x="460" y="365"/>
-      <point x="480" y="365" type="curve" name="sv02" smooth="yes"/>
+      <point x="480" y="365" type="curve" smooth="yes" name="sv02"/>
       <point x="753" y="365" type="line" smooth="yes"/>
       <point x="773" y="365"/>
       <point x="783" y="355"/>
       <point x="783" y="335" type="curve" smooth="yes"/>
-      <point x="783" y="30" type="line" name="dh02" smooth="yes"/>
+      <point x="783" y="30" type="line" smooth="yes" name="dh02"/>
       <point x="783" y="10"/>
       <point x="773" y="0"/>
       <point x="753" y="0" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2E_22.glif b/source/Hack-Bold.ufo/glyphs/uni2E_22.glif
index c00b4455a..75477bc11 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2E_22.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2E_22.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E22" format="1">
+<glyph name="uni2E22" format="2">
   <advance width="1233"/>
   <unicode hex="2E22"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2E_23.glif b/source/Hack-Bold.ufo/glyphs/uni2E_23.glif
index a4dea83ae..63fc94c51 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2E_23.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2E_23.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E23" format="1">
+<glyph name="uni2E23" format="2">
   <advance width="1233"/>
   <unicode hex="2E23"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2E_24.glif b/source/Hack-Bold.ufo/glyphs/uni2E_24.glif
index 7e6caf8ab..8a6d2b9e0 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2E_24.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2E_24.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E24" format="1">
+<glyph name="uni2E24" format="2">
   <advance width="1233"/>
   <unicode hex="2E24"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2E_25.glif b/source/Hack-Bold.ufo/glyphs/uni2E_25.glif
index 101e66be6..13b65b93c 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2E_25.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2E_25.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E25" format="1">
+<glyph name="uni2E25" format="2">
   <advance width="1233"/>
   <unicode hex="2E25"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uni2E_2E_.glif b/source/Hack-Bold.ufo/glyphs/uni2E_2E_.glif
index ebfa681d6..d7c2a62ff 100644
--- a/source/Hack-Bold.ufo/glyphs/uni2E_2E_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uni2E_2E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E2E" format="1">
+<glyph name="uni2E2E" format="2">
   <advance width="1233"/>
   <unicode hex="2E2E"/>
   <outline>
@@ -7,27 +7,27 @@
       <point x="526" y="524" type="line" name="sh02"/>
       <point x="525" y="543"/>
       <point x="524" y="559"/>
-      <point x="524" y="571" type="curve" name="sh01" smooth="yes"/>
+      <point x="524" y="571" type="curve" smooth="yes" name="sh01"/>
       <point x="524" y="648"/>
       <point x="514" y="689"/>
       <point x="418" y="782" type="curve" smooth="yes"/>
       <point x="330" y="868" type="line" smooth="yes"/>
       <point x="202" y="993"/>
       <point x="168" y="1069"/>
-      <point x="168" y="1168" type="curve" name="dh01" smooth="yes"/>
+      <point x="168" y="1168" type="curve" smooth="yes" name="dh01"/>
       <point x="168" y="1388"/>
       <point x="334" y="1520"/>
-      <point x="597" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="597" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="738" y="1520"/>
       <point x="868" y="1483"/>
       <point x="1000" y="1407" type="curve"/>
       <point x="1000" y="1139" type="line" name="iv01"/>
       <point x="863" y="1239"/>
       <point x="746" y="1280"/>
-      <point x="633" y="1280" type="curve" name="sv01" smooth="yes"/>
+      <point x="633" y="1280" type="curve" smooth="yes" name="sv01"/>
       <point x="514" y="1280"/>
       <point x="453" y="1235"/>
-      <point x="453" y="1144" type="curve" name="dh02" smooth="yes"/>
+      <point x="453" y="1144" type="curve" smooth="yes" name="dh02"/>
       <point x="453" y="1082"/>
       <point x="481" y="1041"/>
       <point x="561" y="961" type="curve" smooth="yes"/>
@@ -39,10 +39,10 @@
       <point x="526" y="401" type="line"/>
     </contour>
     <contour>
-      <point x="652" y="-50" type="curve" name="av01" smooth="yes"/>
+      <point x="652" y="-50" type="curve" smooth="yes" name="av01"/>
       <point x="563" y="-50"/>
       <point x="491" y="20"/>
-      <point x="491" y="117" type="curve" name="dh03" smooth="yes"/>
+      <point x="491" y="117" type="curve" smooth="yes" name="dh03"/>
       <point x="491" y="166"/>
       <point x="507" y="208"/>
       <point x="538" y="239" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uniE_0A_0.glif b/source/Hack-Bold.ufo/glyphs/uniE_0A_0.glif
index 4b063facc..33d485208 100644
--- a/source/Hack-Bold.ufo/glyphs/uniE_0A_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uniE_0A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0A0" format="1">
+<glyph name="uniE0A0" format="2">
   <advance width="1233"/>
   <unicode hex="E0A0"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="279" y="624" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="279" y="159" type="line" name="sh01" smooth="yes"/>
+      <point x="279" y="159" type="line" smooth="yes" name="sh01"/>
       <point x="279" y="266"/>
       <point x="302" y="352"/>
       <point x="349" y="419" type="curve" smooth="yes"/>
@@ -23,13 +23,13 @@
       <point x="747" y="765" type="curve" smooth="yes"/>
       <point x="770" y="811"/>
       <point x="781" y="873"/>
-      <point x="781" y="950" type="curve" name="dh02" smooth="yes"/>
+      <point x="781" y="950" type="curve" smooth="yes" name="dh02"/>
       <point x="781" y="1242" type="line"/>
       <point x="596" y="1242" type="line" name="ih01"/>
       <point x="856" y="1545" type="line"/>
       <point x="1113" y="1242" type="line" name="iv02"/>
       <point x="928" y="1242" type="line"/>
-      <point x="928" y="901" type="line" name="dh03" smooth="yes"/>
+      <point x="928" y="901" type="line" smooth="yes" name="dh03"/>
       <point x="928" y="793"/>
       <point x="916" y="708"/>
       <point x="881" y="640" type="curve" smooth="yes"/>
@@ -39,7 +39,7 @@
       <point x="672" y="442" type="line" smooth="yes"/>
       <point x="567" y="369"/>
       <point x="524" y="319"/>
-      <point x="524" y="159" type="curve" name="sh02" smooth="yes"/>
+      <point x="524" y="159" type="curve" smooth="yes" name="sh02"/>
       <point x="524" y="-267" type="line" name="ab01"/>
       <point x="279" y="-267" type="line"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uniE_0A_1.glif b/source/Hack-Bold.ufo/glyphs/uniE_0A_1.glif
index 946a5d679..b19d5baaa 100644
--- a/source/Hack-Bold.ufo/glyphs/uniE_0A_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uniE_0A_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0A1" format="1">
+<glyph name="uniE0A1" format="2">
   <advance width="1233"/>
   <unicode hex="E0A1"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uniE_0A_2.glif b/source/Hack-Bold.ufo/glyphs/uniE_0A_2.glif
index 64091a334..5c402e4dc 100644
--- a/source/Hack-Bold.ufo/glyphs/uniE_0A_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uniE_0A_2.glif
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0A2" format="1">
+<glyph name="uniE0A2" format="2">
   <advance width="1233"/>
   <unicode hex="E0A2"/>
   <outline>
     <contour>
-      <point x="276" y="-267" type="line" name="ab01" smooth="yes"/>
+      <point x="276" y="-267" type="line" smooth="yes" name="ab01"/>
       <point x="157" y="-267"/>
       <point x="98" y="-207"/>
       <point x="98" y="-86" type="curve" smooth="yes"/>
-      <point x="98" y="795" type="line" name="dh01" smooth="yes"/>
+      <point x="98" y="795" type="line" smooth="yes" name="dh01"/>
       <point x="98" y="924"/>
       <point x="150" y="989"/>
       <point x="253" y="989" type="curve" name="hr01"/>
@@ -18,24 +18,24 @@
       <point x="360" y="1673" type="curve" smooth="yes"/>
       <point x="428" y="1746"/>
       <point x="514" y="1783"/>
-      <point x="617" y="1783" type="curve" name="at01" smooth="yes"/>
+      <point x="617" y="1783" type="curve" smooth="yes" name="at01"/>
       <point x="720" y="1783"/>
       <point x="806" y="1746"/>
       <point x="874" y="1673" type="curve" smooth="yes"/>
       <point x="939" y="1601"/>
       <point x="981" y="1504"/>
-      <point x="981" y="1379" type="curve" name="hr02" smooth="yes"/>
+      <point x="981" y="1379" type="curve" smooth="yes" name="hr02"/>
       <point x="981" y="989" type="line" name="sh01"/>
       <point x="1084" y="989"/>
       <point x="1136" y="924"/>
-      <point x="1136" y="795" type="curve" name="dh03" smooth="yes"/>
-      <point x="1136" y="-86" type="line" name="hr03" smooth="yes"/>
+      <point x="1136" y="795" type="curve" smooth="yes" name="dh03"/>
+      <point x="1136" y="-86" type="line" smooth="yes" name="hr03"/>
       <point x="1136" y="-207"/>
       <point x="1076" y="-267"/>
       <point x="955" y="-267" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="617" y="1618" type="curve" name="sv01" smooth="yes"/>
+      <point x="617" y="1618" type="curve" smooth="yes" name="sv01"/>
       <point x="558" y="1618"/>
       <point x="513" y="1595"/>
       <point x="478" y="1552" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="428" y="1379" type="curve" smooth="yes"/>
       <point x="428" y="989" type="line" name="sh02"/>
       <point x="806" y="989" type="line" name="ih01"/>
-      <point x="806" y="1379" type="line" name="hr04" smooth="yes"/>
+      <point x="806" y="1379" type="line" smooth="yes" name="hr04"/>
       <point x="806" y="1523"/>
       <point x="729" y="1618"/>
     </contour>
@@ -52,19 +52,19 @@
       <point x="688" y="449" type="line" name="hr05"/>
       <point x="745" y="478"/>
       <point x="774" y="525"/>
-      <point x="774" y="590" type="curve" name="sh03" smooth="yes"/>
+      <point x="774" y="590" type="curve" smooth="yes" name="sh03"/>
       <point x="774" y="635"/>
       <point x="761" y="671"/>
       <point x="730" y="703" type="curve"/>
       <point x="698" y="734"/>
       <point x="662" y="750"/>
-      <point x="617" y="750" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="750" type="curve" smooth="yes" name="dv01"/>
       <point x="572" y="750"/>
       <point x="536" y="734"/>
       <point x="504" y="703" type="curve"/>
       <point x="473" y="671"/>
       <point x="457" y="635"/>
-      <point x="457" y="588" type="curve" name="dh02" smooth="yes"/>
+      <point x="457" y="588" type="curve" smooth="yes" name="dh02"/>
       <point x="457" y="524"/>
       <point x="486" y="478"/>
       <point x="544" y="449" type="curve"/>
diff --git a/source/Hack-Bold.ufo/glyphs/uniE_0B_0.glif b/source/Hack-Bold.ufo/glyphs/uniE_0B_0.glif
index 0c37c5316..b6d912aac 100644
--- a/source/Hack-Bold.ufo/glyphs/uniE_0B_0.glif
+++ b/source/Hack-Bold.ufo/glyphs/uniE_0B_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0B0" format="1">
+<glyph name="uniE0B0" format="2">
   <advance width="1233"/>
   <unicode hex="E0B0"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uniE_0B_1.glif b/source/Hack-Bold.ufo/glyphs/uniE_0B_1.glif
index 8b0f5914b..4eb33e829 100644
--- a/source/Hack-Bold.ufo/glyphs/uniE_0B_1.glif
+++ b/source/Hack-Bold.ufo/glyphs/uniE_0B_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0B1" format="1">
+<glyph name="uniE0B1" format="2">
   <advance width="1233"/>
   <unicode hex="E0B1"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uniE_0B_2.glif b/source/Hack-Bold.ufo/glyphs/uniE_0B_2.glif
index c9c536151..3b9433769 100644
--- a/source/Hack-Bold.ufo/glyphs/uniE_0B_2.glif
+++ b/source/Hack-Bold.ufo/glyphs/uniE_0B_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0B2" format="1">
+<glyph name="uniE0B2" format="2">
   <advance width="1233"/>
   <unicode hex="E0B2"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uniE_0B_3.glif b/source/Hack-Bold.ufo/glyphs/uniE_0B_3.glif
index 244bd9d3a..d644e1e16 100644
--- a/source/Hack-Bold.ufo/glyphs/uniE_0B_3.glif
+++ b/source/Hack-Bold.ufo/glyphs/uniE_0B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0B3" format="1">
+<glyph name="uniE0B3" format="2">
   <advance width="1233"/>
   <unicode hex="E0B3"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uniF_E_F_F_.glif b/source/Hack-Bold.ufo/glyphs/uniF_E_F_F_.glif
index 3ca2362e7..f5d2cecac 100644
--- a/source/Hack-Bold.ufo/glyphs/uniF_E_F_F_.glif
+++ b/source/Hack-Bold.ufo/glyphs/uniF_E_F_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniFEFF" format="1">
+<glyph name="uniFEFF" format="2">
   <advance width="1233"/>
   <unicode hex="FEFF"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/union.glif b/source/Hack-Bold.ufo/glyphs/union.glif
index c688b36a7..1b826add6 100644
--- a/source/Hack-Bold.ufo/glyphs/union.glif
+++ b/source/Hack-Bold.ufo/glyphs/union.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="union" format="1">
+<glyph name="union" format="2">
   <advance width="1233"/>
   <unicode hex="222A"/>
   <outline>
     <contour>
-      <point x="616" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="312" y="0"/>
       <point x="182" y="173"/>
-      <point x="182" y="584" type="curve" name="sh01" smooth="yes"/>
+      <point x="182" y="584" type="curve" smooth="yes" name="sh01"/>
       <point x="182" y="1186" type="line" name="av01"/>
       <point x="433" y="1186" type="line"/>
-      <point x="433" y="510" type="line" name="sh02" smooth="yes"/>
+      <point x="433" y="510" type="line" smooth="yes" name="sh02"/>
       <point x="433" y="354"/>
       <point x="500" y="267"/>
-      <point x="616" y="267" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="267" type="curve" smooth="yes" name="sv01"/>
       <point x="732" y="267"/>
       <point x="799" y="354"/>
-      <point x="799" y="510" type="curve" name="ah01" smooth="yes"/>
+      <point x="799" y="510" type="curve" smooth="yes" name="ah01"/>
       <point x="799" y="1186" type="line" name="av02"/>
       <point x="1050" y="1186" type="line"/>
-      <point x="1050" y="584" type="line" name="sh03" smooth="yes"/>
+      <point x="1050" y="584" type="line" smooth="yes" name="sh03"/>
       <point x="1050" y="173"/>
       <point x="920" y="0"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/universal.glif b/source/Hack-Bold.ufo/glyphs/universal.glif
index 2d48f6713..0a87210b5 100644
--- a/source/Hack-Bold.ufo/glyphs/universal.glif
+++ b/source/Hack-Bold.ufo/glyphs/universal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="universal" format="1">
+<glyph name="universal" format="2">
   <advance width="1233"/>
   <unicode hex="2200"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/uogonek.glif b/source/Hack-Bold.ufo/glyphs/uogonek.glif
index 22f4d65bd..b89cd4f80 100644
--- a/source/Hack-Bold.ufo/glyphs/uogonek.glif
+++ b/source/Hack-Bold.ufo/glyphs/uogonek.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uogonek" format="1">
+<glyph name="uogonek" format="2">
   <advance width="1233"/>
   <unicode hex="0173"/>
   <outline>
     <contour>
-      <point x="1080" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="1080" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="1121" y="-254"/>
       <point x="1175" y="-244"/>
       <point x="1228" y="-223" type="curve" name="sh01"/>
       <point x="1228" y="-379" type="line"/>
       <point x="1156" y="-394"/>
       <point x="1092" y="-401"/>
-      <point x="1041" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="1041" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="885" y="-401"/>
       <point x="800" y="-339"/>
-      <point x="800" y="-224" type="curve" name="hr01" smooth="yes"/>
+      <point x="800" y="-224" type="curve" smooth="yes" name="hr01"/>
       <point x="800" y="-151"/>
       <point x="835" y="-81"/>
       <point x="911" y="0" type="curve" name="ab01"/>
@@ -22,19 +22,19 @@
       <point x="768" y="166" type="line" name="iv01"/>
       <point x="727" y="43"/>
       <point x="629" y="-29"/>
-      <point x="480" y="-29" type="curve" name="sv01" smooth="yes"/>
+      <point x="480" y="-29" type="curve" smooth="yes" name="sv01"/>
       <point x="271" y="-29"/>
       <point x="160" y="112"/>
-      <point x="160" y="391" type="curve" name="dh01" smooth="yes"/>
+      <point x="160" y="391" type="curve" smooth="yes" name="dh01"/>
       <point x="160" y="1120" type="line" name="at01"/>
       <point x="453" y="1120" type="line"/>
-      <point x="453" y="436" type="line" name="dh02" smooth="yes"/>
+      <point x="453" y="436" type="line" smooth="yes" name="dh02"/>
       <point x="453" y="280"/>
       <point x="494" y="211"/>
-      <point x="593" y="211" type="curve" name="hr02" smooth="yes"/>
+      <point x="593" y="211" type="curve" smooth="yes" name="hr02"/>
       <point x="710" y="211"/>
       <point x="768" y="308"/>
-      <point x="768" y="477" type="curve" name="sh02" smooth="yes"/>
+      <point x="768" y="477" type="curve" smooth="yes" name="sh02"/>
       <point x="768" y="1120" type="line" name="hr03"/>
       <point x="1061" y="1120" type="line"/>
       <point x="1061" y="0" type="line" name="hr04"/>
@@ -44,7 +44,7 @@
       <point x="981" y="-106" type="curve" smooth="yes"/>
       <point x="968" y="-130"/>
       <point x="962" y="-147"/>
-      <point x="962" y="-166" type="curve" name="sh03" smooth="yes"/>
+      <point x="962" y="-166" type="curve" smooth="yes" name="sh03"/>
       <point x="962" y="-213"/>
       <point x="997" y="-254"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/upblock.glif b/source/Hack-Bold.ufo/glyphs/upblock.glif
index 98203446b..d75b178db 100644
--- a/source/Hack-Bold.ufo/glyphs/upblock.glif
+++ b/source/Hack-Bold.ufo/glyphs/upblock.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="upblock" format="1">
+<glyph name="upblock" format="2">
   <advance width="1233"/>
   <unicode hex="2580"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/upsilon.glif b/source/Hack-Bold.ufo/glyphs/upsilon.glif
index 5b6c12371..9a84a6e86 100644
--- a/source/Hack-Bold.ufo/glyphs/upsilon.glif
+++ b/source/Hack-Bold.ufo/glyphs/upsilon.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="upsilon" format="1">
+<glyph name="upsilon" format="2">
   <advance width="1233"/>
   <unicode hex="03C5"/>
   <outline>
     <contour>
-      <point x="610" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="610" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="288" y="0"/>
       <point x="241" y="167"/>
-      <point x="241" y="379" type="curve" name="sh01" smooth="yes"/>
+      <point x="241" y="379" type="curve" smooth="yes" name="sh01"/>
       <point x="241" y="895" type="line" name="sv01"/>
       <point x="76" y="895" type="line"/>
       <point x="76" y="1120" type="line" name="dh01"/>
@@ -15,7 +15,7 @@
       <point x="533" y="365" type="line" smooth="yes"/>
       <point x="533" y="266"/>
       <point x="590" y="225"/>
-      <point x="660" y="225" type="curve" name="sv02" smooth="yes"/>
+      <point x="660" y="225" type="curve" smooth="yes" name="sv02"/>
       <point x="785" y="225"/>
       <point x="862" y="357"/>
       <point x="865" y="640" type="curve" name="dh03"/>
@@ -25,7 +25,7 @@
       <point x="1028" y="1120" type="line" name="hr01"/>
       <point x="1100" y="1021"/>
       <point x="1157" y="835"/>
-      <point x="1157" y="615" type="curve" name="dh04" smooth="yes"/>
+      <point x="1157" y="615" type="curve" smooth="yes" name="dh04"/>
       <point x="1157" y="243"/>
       <point x="998" y="0"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/upsilondieresis.glif b/source/Hack-Bold.ufo/glyphs/upsilondieresis.glif
index 35e19b910..7764f2019 100644
--- a/source/Hack-Bold.ufo/glyphs/upsilondieresis.glif
+++ b/source/Hack-Bold.ufo/glyphs/upsilondieresis.glif
@@ -1,57 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="upsilondieresis" format="1">
+<glyph name="upsilondieresis" format="2">
   <advance width="1233"/>
   <unicode hex="03CB"/>
   <outline>
     <contour>
-      <point x="331" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="331" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="311" y="1320"/>
       <point x="301" y="1330"/>
-      <point x="301" y="1350" type="curve" name="sh01" smooth="yes"/>
+      <point x="301" y="1350" type="curve" smooth="yes" name="sh01"/>
       <point x="301" y="1536" type="line" smooth="yes"/>
       <point x="301" y="1556"/>
       <point x="311" y="1566"/>
-      <point x="331" y="1566" type="curve" name="at01" smooth="yes"/>
+      <point x="331" y="1566" type="curve" smooth="yes" name="at01"/>
       <point x="507" y="1566" type="line" smooth="yes"/>
       <point x="527" y="1566"/>
       <point x="537" y="1556"/>
-      <point x="537" y="1536" type="curve" name="sh02" smooth="yes"/>
-      <point x="537" y="1350" type="line" name="sh04" smooth="yes"/>
+      <point x="537" y="1536" type="curve" smooth="yes" name="sh02"/>
+      <point x="537" y="1350" type="line" smooth="yes" name="sh04"/>
       <point x="537" y="1330"/>
       <point x="527" y="1320"/>
       <point x="507" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1320" type="line" name="sv02" smooth="yes"/>
+      <point x="726" y="1320" type="line" smooth="yes" name="sv02"/>
       <point x="706" y="1320"/>
       <point x="696" y="1330"/>
-      <point x="696" y="1350" type="curve" name="dh03" smooth="yes"/>
-      <point x="696" y="1536" type="line" name="hr01" smooth="yes"/>
+      <point x="696" y="1350" type="curve" smooth="yes" name="dh03"/>
+      <point x="696" y="1536" type="line" smooth="yes" name="hr01"/>
       <point x="696" y="1556"/>
       <point x="706" y="1566"/>
-      <point x="726" y="1566" type="curve" name="at02" smooth="yes"/>
+      <point x="726" y="1566" type="curve" smooth="yes" name="at02"/>
       <point x="902" y="1566" type="line" smooth="yes"/>
       <point x="922" y="1566"/>
       <point x="932" y="1556"/>
       <point x="932" y="1536" type="curve" smooth="yes"/>
-      <point x="932" y="1350" type="line" name="dh04" smooth="yes"/>
+      <point x="932" y="1350" type="line" smooth="yes" name="dh04"/>
       <point x="932" y="1330"/>
       <point x="922" y="1320"/>
-      <point x="902" y="1320" type="curve" name="sv03" smooth="yes"/>
+      <point x="902" y="1320" type="curve" smooth="yes" name="sv03"/>
     </contour>
     <contour>
-      <point x="610" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="610" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="288" y="0"/>
       <point x="241" y="167"/>
-      <point x="241" y="379" type="curve" name="sh05" smooth="yes"/>
+      <point x="241" y="379" type="curve" smooth="yes" name="sh05"/>
       <point x="241" y="895" type="line" name="sv04"/>
       <point x="76" y="895" type="line"/>
       <point x="76" y="1120" type="line" name="dh01"/>
       <point x="533" y="1120" type="line" name="dh02"/>
-      <point x="533" y="365" type="line" name="sh03" smooth="yes"/>
+      <point x="533" y="365" type="line" smooth="yes" name="sh03"/>
       <point x="533" y="266"/>
       <point x="590" y="225"/>
-      <point x="660" y="225" type="curve" name="sv05" smooth="yes"/>
+      <point x="660" y="225" type="curve" smooth="yes" name="sv05"/>
       <point x="785" y="225"/>
       <point x="862" y="357"/>
       <point x="865" y="640" type="curve" name="ih01"/>
@@ -61,7 +61,7 @@
       <point x="1028" y="1120" type="line" name="hr02"/>
       <point x="1100" y="1021"/>
       <point x="1157" y="835"/>
-      <point x="1157" y="615" type="curve" name="sh06" smooth="yes"/>
+      <point x="1157" y="615" type="curve" smooth="yes" name="sh06"/>
       <point x="1157" y="243"/>
       <point x="998" y="0"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/upsilondieresistonos.glif b/source/Hack-Bold.ufo/glyphs/upsilondieresistonos.glif
index 15bf056f3..e3555f911 100644
--- a/source/Hack-Bold.ufo/glyphs/upsilondieresistonos.glif
+++ b/source/Hack-Bold.ufo/glyphs/upsilondieresistonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="upsilondieresistonos" format="1">
+<glyph name="upsilondieresistonos" format="2">
   <advance width="1233"/>
   <unicode hex="03B0"/>
   <outline>
@@ -10,46 +10,46 @@
       <point x="469" y="1515" type="line" name="ih03"/>
     </contour>
     <contour>
-      <point x="211" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="211" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="191" y="1320"/>
       <point x="181" y="1330"/>
-      <point x="181" y="1350" type="curve" name="ih04" smooth="yes"/>
+      <point x="181" y="1350" type="curve" smooth="yes" name="ih04"/>
       <point x="181" y="1536" type="line" smooth="yes"/>
       <point x="181" y="1556"/>
       <point x="191" y="1566"/>
-      <point x="211" y="1566" type="curve" name="at02" smooth="yes"/>
+      <point x="211" y="1566" type="curve" smooth="yes" name="at02"/>
       <point x="387" y="1566" type="line" smooth="yes"/>
       <point x="407" y="1566"/>
       <point x="417" y="1556"/>
       <point x="417" y="1536" type="curve" smooth="yes"/>
-      <point x="417" y="1350" type="line" name="hr01" smooth="yes"/>
+      <point x="417" y="1350" type="line" smooth="yes" name="hr01"/>
       <point x="417" y="1330"/>
       <point x="407" y="1320"/>
       <point x="387" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="816" y="1320" type="line" name="sv02" smooth="yes"/>
+      <point x="816" y="1320" type="line" smooth="yes" name="sv02"/>
       <point x="796" y="1320"/>
       <point x="786" y="1330"/>
-      <point x="786" y="1350" type="curve" name="dh03" smooth="yes"/>
+      <point x="786" y="1350" type="curve" smooth="yes" name="dh03"/>
       <point x="786" y="1536" type="line" smooth="yes"/>
       <point x="786" y="1556"/>
       <point x="796" y="1566"/>
-      <point x="816" y="1566" type="curve" name="at03" smooth="yes"/>
+      <point x="816" y="1566" type="curve" smooth="yes" name="at03"/>
       <point x="992" y="1566" type="line" smooth="yes"/>
       <point x="1012" y="1566"/>
       <point x="1022" y="1556"/>
       <point x="1022" y="1536" type="curve" smooth="yes"/>
-      <point x="1022" y="1350" type="line" name="dh04" smooth="yes"/>
+      <point x="1022" y="1350" type="line" smooth="yes" name="dh04"/>
       <point x="1022" y="1330"/>
       <point x="1012" y="1320"/>
-      <point x="992" y="1320" type="curve" name="sv03" smooth="yes"/>
+      <point x="992" y="1320" type="curve" smooth="yes" name="sv03"/>
     </contour>
     <contour>
-      <point x="610" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="610" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="288" y="0"/>
       <point x="241" y="167"/>
-      <point x="241" y="379" type="curve" name="sh02" smooth="yes"/>
+      <point x="241" y="379" type="curve" smooth="yes" name="sh02"/>
       <point x="241" y="895" type="line" name="hr02"/>
       <point x="76" y="895" type="line"/>
       <point x="76" y="1120" type="line" name="dh01"/>
@@ -57,7 +57,7 @@
       <point x="533" y="365" type="line" smooth="yes"/>
       <point x="533" y="266"/>
       <point x="590" y="225"/>
-      <point x="660" y="225" type="curve" name="sv04" smooth="yes"/>
+      <point x="660" y="225" type="curve" smooth="yes" name="sv04"/>
       <point x="785" y="225"/>
       <point x="862" y="357"/>
       <point x="865" y="640" type="curve" name="ih01"/>
@@ -67,7 +67,7 @@
       <point x="1028" y="1120" type="line"/>
       <point x="1100" y="1021"/>
       <point x="1157" y="835"/>
-      <point x="1157" y="615" type="curve" name="sh01" smooth="yes"/>
+      <point x="1157" y="615" type="curve" smooth="yes" name="sh01"/>
       <point x="1157" y="243"/>
       <point x="998" y="0"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/upsilontonos.glif b/source/Hack-Bold.ufo/glyphs/upsilontonos.glif
index 6d43b9123..b1790faac 100644
--- a/source/Hack-Bold.ufo/glyphs/upsilontonos.glif
+++ b/source/Hack-Bold.ufo/glyphs/upsilontonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="upsilontonos" format="1">
+<glyph name="upsilontonos" format="2">
   <advance width="1233"/>
   <unicode hex="03CD"/>
   <outline>
@@ -10,18 +10,18 @@
       <point x="469" y="1272" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="610" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="610" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="288" y="0"/>
       <point x="241" y="167"/>
-      <point x="241" y="379" type="curve" name="sh01" smooth="yes"/>
+      <point x="241" y="379" type="curve" smooth="yes" name="sh01"/>
       <point x="241" y="895" type="line" name="sv01"/>
       <point x="76" y="895" type="line"/>
       <point x="76" y="1120" type="line" name="dh01"/>
       <point x="533" y="1120" type="line" name="dh02"/>
-      <point x="533" y="365" type="line" name="hr01" smooth="yes"/>
+      <point x="533" y="365" type="line" smooth="yes" name="hr01"/>
       <point x="533" y="266"/>
       <point x="590" y="225"/>
-      <point x="660" y="225" type="curve" name="sv02" smooth="yes"/>
+      <point x="660" y="225" type="curve" smooth="yes" name="sv02"/>
       <point x="785" y="225"/>
       <point x="862" y="357"/>
       <point x="865" y="640" type="curve" name="dh03"/>
@@ -31,7 +31,7 @@
       <point x="1028" y="1120" type="line"/>
       <point x="1100" y="1021"/>
       <point x="1157" y="835"/>
-      <point x="1157" y="615" type="curve" name="dh04" smooth="yes"/>
+      <point x="1157" y="615" type="curve" smooth="yes" name="dh04"/>
       <point x="1157" y="243"/>
       <point x="998" y="0"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/uring.glif b/source/Hack-Bold.ufo/glyphs/uring.glif
index 283494743..2e6312088 100644
--- a/source/Hack-Bold.ufo/glyphs/uring.glif
+++ b/source/Hack-Bold.ufo/glyphs/uring.glif
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uring" format="1">
+<glyph name="uring" format="2">
   <advance width="1233"/>
   <unicode hex="016F"/>
   <outline>
     <contour>
-      <point x="617" y="1249" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="1249" type="curve" smooth="yes" name="dv02"/>
       <point x="460" y="1249"/>
       <point x="332" y="1377"/>
-      <point x="332" y="1534" type="curve" name="ih01" smooth="yes"/>
+      <point x="332" y="1534" type="curve" smooth="yes" name="ih01"/>
       <point x="332" y="1691"/>
       <point x="460" y="1819"/>
-      <point x="617" y="1819" type="curve" name="hr01" smooth="yes"/>
+      <point x="617" y="1819" type="curve" smooth="yes" name="hr01"/>
       <point x="775" y="1819"/>
       <point x="901" y="1691"/>
-      <point x="901" y="1534" type="curve" name="dh03" smooth="yes"/>
+      <point x="901" y="1534" type="curve" smooth="yes" name="dh03"/>
       <point x="901" y="1377"/>
       <point x="775" y="1249"/>
     </contour>
     <contour>
-      <point x="616" y="1403" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1403" type="curve" smooth="yes" name="dv03"/>
       <point x="688" y="1403"/>
       <point x="748" y="1462"/>
       <point x="748" y="1534" type="curve" smooth="yes"/>
       <point x="748" y="1606"/>
       <point x="688" y="1665"/>
-      <point x="616" y="1665" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1665" type="curve" smooth="yes" name="dv01"/>
       <point x="544" y="1665"/>
       <point x="485" y="1606"/>
-      <point x="485" y="1534" type="curve" name="sh01" smooth="yes"/>
+      <point x="485" y="1534" type="curve" smooth="yes" name="sh01"/>
       <point x="485" y="1461"/>
       <point x="544" y="1403"/>
     </contour>
     <contour>
-      <point x="480" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="480" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="271" y="-29"/>
       <point x="160" y="112"/>
-      <point x="160" y="391" type="curve" name="dh01" smooth="yes"/>
+      <point x="160" y="391" type="curve" smooth="yes" name="dh01"/>
       <point x="160" y="1120" type="line" name="at01"/>
       <point x="453" y="1120" type="line"/>
-      <point x="453" y="436" type="line" name="hr02" smooth="yes"/>
+      <point x="453" y="436" type="line" smooth="yes" name="hr02"/>
       <point x="453" y="280"/>
       <point x="494" y="211"/>
-      <point x="593" y="211" type="curve" name="sv01" smooth="yes"/>
+      <point x="593" y="211" type="curve" smooth="yes" name="sv01"/>
       <point x="710" y="211"/>
       <point x="768" y="308"/>
       <point x="768" y="477" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/utilde.glif b/source/Hack-Bold.ufo/glyphs/utilde.glif
index 32b4b0e64..da1f2eebb 100644
--- a/source/Hack-Bold.ufo/glyphs/utilde.glif
+++ b/source/Hack-Bold.ufo/glyphs/utilde.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="utilde" format="1">
+<glyph name="utilde" format="2">
   <advance width="1233"/>
   <unicode hex="0169"/>
   <outline>
     <contour>
-      <point x="764" y="1270" type="curve" name="sh01" smooth="yes"/>
+      <point x="764" y="1270" type="curve" smooth="yes" name="sh01"/>
       <point x="723" y="1270"/>
       <point x="685" y="1281"/>
       <point x="618" y="1327" type="curve" smooth="yes"/>
@@ -12,7 +12,7 @@
       <point x="551" y="1372" type="line" smooth="yes"/>
       <point x="522" y="1391"/>
       <point x="500" y="1401"/>
-      <point x="479" y="1401" type="curve" name="sv01" smooth="yes"/>
+      <point x="479" y="1401" type="curve" smooth="yes" name="sv01"/>
       <point x="434" y="1401"/>
       <point x="408" y="1357"/>
       <point x="408" y="1280" type="curve" smooth="yes"/>
@@ -20,36 +20,36 @@
       <point x="268" y="1272" type="line"/>
       <point x="268" y="1455"/>
       <point x="340" y="1556"/>
-      <point x="465" y="1556" type="curve" name="sh04" smooth="yes"/>
+      <point x="465" y="1556" type="curve" smooth="yes" name="sh04"/>
       <point x="516" y="1556"/>
       <point x="557" y="1539"/>
       <point x="614" y="1499" type="curve" smooth="yes"/>
       <point x="676" y="1456" type="line" smooth="yes"/>
       <point x="703" y="1437"/>
       <point x="727" y="1425"/>
-      <point x="751" y="1425" type="curve" name="dv01" smooth="yes"/>
+      <point x="751" y="1425" type="curve" smooth="yes" name="dv01"/>
       <point x="798" y="1425"/>
       <point x="825" y="1470"/>
-      <point x="825" y="1546" type="curve" name="hr02" smooth="yes"/>
+      <point x="825" y="1546" type="curve" smooth="yes" name="hr02"/>
       <point x="825" y="1554" type="line"/>
       <point x="965" y="1554" type="line" name="at03"/>
       <point x="965" y="1371"/>
       <point x="895" y="1270"/>
     </contour>
     <contour>
-      <point x="480" y="-29" type="curve" name="sv03" smooth="yes"/>
+      <point x="480" y="-29" type="curve" smooth="yes" name="sv03"/>
       <point x="271" y="-29"/>
       <point x="160" y="112"/>
-      <point x="160" y="391" type="curve" name="sh02" smooth="yes"/>
+      <point x="160" y="391" type="curve" smooth="yes" name="sh02"/>
       <point x="160" y="1120" type="line" name="at01"/>
       <point x="453" y="1120" type="line"/>
-      <point x="453" y="436" type="line" name="sh03" smooth="yes"/>
+      <point x="453" y="436" type="line" smooth="yes" name="sh03"/>
       <point x="453" y="280"/>
       <point x="494" y="211"/>
-      <point x="593" y="211" type="curve" name="hr03" smooth="yes"/>
+      <point x="593" y="211" type="curve" smooth="yes" name="hr03"/>
       <point x="710" y="211"/>
       <point x="768" y="308"/>
-      <point x="768" y="477" type="curve" name="sh05" smooth="yes"/>
+      <point x="768" y="477" type="curve" smooth="yes" name="sh05"/>
       <point x="768" y="1120" type="line" name="at02"/>
       <point x="1061" y="1120" type="line"/>
       <point x="1061" y="0" type="line" name="sh06"/>
diff --git a/source/Hack-Bold.ufo/glyphs/v.glif b/source/Hack-Bold.ufo/glyphs/v.glif
index ff3bff9d1..4c3af7056 100644
--- a/source/Hack-Bold.ufo/glyphs/v.glif
+++ b/source/Hack-Bold.ufo/glyphs/v.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="v" format="1">
+<glyph name="v" format="2">
   <advance width="1233"/>
   <unicode hex="0076"/>
   <outline>
@@ -14,9 +14,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/w.glif b/source/Hack-Bold.ufo/glyphs/w.glif
index 1b43fd31c..5972de06f 100644
--- a/source/Hack-Bold.ufo/glyphs/w.glif
+++ b/source/Hack-Bold.ufo/glyphs/w.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="w" format="1">
+<glyph name="w" format="2">
   <advance width="1233"/>
   <unicode hex="0077"/>
   <outline>
@@ -20,9 +20,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/wacute.glif b/source/Hack-Bold.ufo/glyphs/wacute.glif
index 63e4354ae..f34aae7e9 100644
--- a/source/Hack-Bold.ufo/glyphs/wacute.glif
+++ b/source/Hack-Bold.ufo/glyphs/wacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="wacute" format="1">
+<glyph name="wacute" format="2">
   <advance width="1233"/>
   <unicode hex="1E83"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/wcircumflex.glif b/source/Hack-Bold.ufo/glyphs/wcircumflex.glif
index 30caca70f..cb15c605b 100644
--- a/source/Hack-Bold.ufo/glyphs/wcircumflex.glif
+++ b/source/Hack-Bold.ufo/glyphs/wcircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="wcircumflex" format="1">
+<glyph name="wcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0175"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/wdieresis.glif b/source/Hack-Bold.ufo/glyphs/wdieresis.glif
index 7029bd8dd..9f3903c22 100644
--- a/source/Hack-Bold.ufo/glyphs/wdieresis.glif
+++ b/source/Hack-Bold.ufo/glyphs/wdieresis.glif
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="wdieresis" format="1">
+<glyph name="wdieresis" format="2">
   <advance width="1233"/>
   <unicode hex="1E85"/>
   <outline>
     <contour>
-      <point x="331" y="1320" type="line" name="hr00" smooth="yes"/>
+      <point x="331" y="1320" type="line" smooth="yes" name="hr00"/>
       <point x="311" y="1320"/>
       <point x="301" y="1330"/>
-      <point x="301" y="1350" type="curve" name="sh01" smooth="yes"/>
+      <point x="301" y="1350" type="curve" smooth="yes" name="sh01"/>
       <point x="301" y="1536" type="line" smooth="yes"/>
       <point x="301" y="1556"/>
       <point x="311" y="1566"/>
-      <point x="331" y="1566" type="curve" name="at03" smooth="yes"/>
+      <point x="331" y="1566" type="curve" smooth="yes" name="at03"/>
       <point x="507" y="1566" type="line" smooth="yes"/>
       <point x="527" y="1566"/>
       <point x="537" y="1556"/>
       <point x="537" y="1536" type="curve" smooth="yes"/>
-      <point x="537" y="1350" type="line" name="sh02" smooth="yes"/>
+      <point x="537" y="1350" type="line" smooth="yes" name="sh02"/>
       <point x="537" y="1330"/>
       <point x="527" y="1320"/>
       <point x="507" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="726" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="706" y="1320"/>
       <point x="696" y="1330"/>
-      <point x="696" y="1350" type="curve" name="ah01" smooth="yes"/>
+      <point x="696" y="1350" type="curve" smooth="yes" name="ah01"/>
       <point x="696" y="1536" type="line" smooth="yes"/>
       <point x="696" y="1556"/>
       <point x="706" y="1566"/>
-      <point x="726" y="1566" type="curve" name="at04" smooth="yes"/>
+      <point x="726" y="1566" type="curve" smooth="yes" name="at04"/>
       <point x="902" y="1566" type="line" smooth="yes"/>
       <point x="922" y="1566"/>
       <point x="932" y="1556"/>
       <point x="932" y="1536" type="curve" smooth="yes"/>
-      <point x="932" y="1350" type="line" name="sh03" smooth="yes"/>
+      <point x="932" y="1350" type="line" smooth="yes" name="sh03"/>
       <point x="932" y="1330"/>
       <point x="922" y="1320"/>
-      <point x="902" y="1320" type="curve" name="sv02" smooth="yes"/>
+      <point x="902" y="1320" type="curve" smooth="yes" name="sv02"/>
     </contour>
     <contour>
       <point x="0" y="1120" type="line" name="at01"/>
diff --git a/source/Hack-Bold.ufo/glyphs/wgrave.glif b/source/Hack-Bold.ufo/glyphs/wgrave.glif
index 82fc5c436..0b35574a8 100644
--- a/source/Hack-Bold.ufo/glyphs/wgrave.glif
+++ b/source/Hack-Bold.ufo/glyphs/wgrave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="wgrave" format="1">
+<glyph name="wgrave" format="2">
   <advance width="1233"/>
   <unicode hex="1E81"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/x.glif b/source/Hack-Bold.ufo/glyphs/x.glif
index 63fee2576..2f54c79bd 100644
--- a/source/Hack-Bold.ufo/glyphs/x.glif
+++ b/source/Hack-Bold.ufo/glyphs/x.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="x" format="1">
+<glyph name="x" format="2">
   <advance width="1233"/>
   <unicode hex="0078"/>
   <outline>
@@ -19,9 +19,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/xi.glif b/source/Hack-Bold.ufo/glyphs/xi.glif
index 3236698b2..6a82cb3a0 100644
--- a/source/Hack-Bold.ufo/glyphs/xi.glif
+++ b/source/Hack-Bold.ufo/glyphs/xi.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="xi" format="1">
+<glyph name="xi" format="2">
   <advance width="1233"/>
   <unicode hex="03BE"/>
   <outline>
@@ -7,19 +7,19 @@
       <point x="752" y="-201" type="line" name="sh01"/>
       <point x="844" y="-201"/>
       <point x="870" y="-154"/>
-      <point x="870" y="-107" type="curve" name="sh02" smooth="yes"/>
+      <point x="870" y="-107" type="curve" smooth="yes" name="sh02"/>
       <point x="870" y="-51"/>
       <point x="837" y="-5"/>
-      <point x="752" y="0" type="curve" name="dh02" smooth="yes"/>
+      <point x="752" y="0" type="curve" smooth="yes" name="dh02"/>
       <point x="663" y="5"/>
       <point x="153" y="-19"/>
-      <point x="153" y="407" type="curve" name="dh01" smooth="yes"/>
+      <point x="153" y="407" type="curve" smooth="yes" name="dh01"/>
       <point x="153" y="610"/>
       <point x="268" y="734"/>
       <point x="524" y="779" type="curve" name="ih01"/>
       <point x="316" y="804"/>
       <point x="206" y="917"/>
-      <point x="206" y="1078" type="curve" name="sh03" smooth="yes"/>
+      <point x="206" y="1078" type="curve" smooth="yes" name="sh03"/>
       <point x="206" y="1196"/>
       <point x="266" y="1270"/>
       <point x="426" y="1331" type="curve" name="hr01"/>
@@ -29,20 +29,20 @@
       <point x="1055" y="1331" type="line" name="sv01"/>
       <point x="684" y="1331"/>
       <point x="498" y="1243"/>
-      <point x="498" y="1087" type="curve" name="sh05" smooth="yes"/>
+      <point x="498" y="1087" type="curve" smooth="yes" name="sh05"/>
       <point x="498" y="957"/>
       <point x="629" y="888"/>
       <point x="954" y="880" type="curve" name="hr02"/>
       <point x="954" y="657" type="line" name="dv01"/>
       <point x="621" y="652"/>
       <point x="445" y="570"/>
-      <point x="445" y="409" type="curve" name="hr03" smooth="yes"/>
+      <point x="445" y="409" type="curve" smooth="yes" name="hr03"/>
       <point x="445" y="257"/>
       <point x="606" y="238"/>
       <point x="752" y="225" type="curve" smooth="yes"/>
       <point x="959" y="205"/>
       <point x="1069" y="102"/>
-      <point x="1069" y="-95" type="curve" name="hr04" smooth="yes"/>
+      <point x="1069" y="-95" type="curve" smooth="yes" name="hr04"/>
       <point x="1069" y="-306"/>
       <point x="941" y="-426"/>
       <point x="752" y="-426" type="curve" name="hr05"/>
diff --git a/source/Hack-Bold.ufo/glyphs/y.glif b/source/Hack-Bold.ufo/glyphs/y.glif
index f9b7617af..58572fe88 100644
--- a/source/Hack-Bold.ufo/glyphs/y.glif
+++ b/source/Hack-Bold.ufo/glyphs/y.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="y" format="1">
+<glyph name="y" format="2">
   <advance width="1233"/>
   <unicode hex="0079"/>
   <outline>
@@ -23,9 +23,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/yacute.glif b/source/Hack-Bold.ufo/glyphs/yacute.glif
index 9263e2bc8..a632ea895 100644
--- a/source/Hack-Bold.ufo/glyphs/yacute.glif
+++ b/source/Hack-Bold.ufo/glyphs/yacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="yacute" format="1">
+<glyph name="yacute" format="2">
   <advance width="1233"/>
   <unicode hex="00FD"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/ycircumflex.glif b/source/Hack-Bold.ufo/glyphs/ycircumflex.glif
index daa35d4b0..94a1b277e 100644
--- a/source/Hack-Bold.ufo/glyphs/ycircumflex.glif
+++ b/source/Hack-Bold.ufo/glyphs/ycircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ycircumflex" format="1">
+<glyph name="ycircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0177"/>
   <outline>
@@ -27,7 +27,7 @@
       <point x="721" y="-121" type="line" smooth="yes"/>
       <point x="642" y="-332"/>
       <point x="536" y="-424"/>
-      <point x="379" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="379" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="137" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/ydieresis.glif b/source/Hack-Bold.ufo/glyphs/ydieresis.glif
index 0917a68f8..1f3b0c408 100644
--- a/source/Hack-Bold.ufo/glyphs/ydieresis.glif
+++ b/source/Hack-Bold.ufo/glyphs/ydieresis.glif
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ydieresis" format="1">
+<glyph name="ydieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00FF"/>
   <outline>
     <contour>
-      <point x="341" y="1320" type="line" name="hr00" smooth="yes"/>
+      <point x="341" y="1320" type="line" smooth="yes" name="hr00"/>
       <point x="321" y="1320"/>
       <point x="311" y="1330"/>
-      <point x="311" y="1350" type="curve" name="sh01" smooth="yes"/>
+      <point x="311" y="1350" type="curve" smooth="yes" name="sh01"/>
       <point x="311" y="1536" type="line" smooth="yes"/>
       <point x="311" y="1556"/>
       <point x="321" y="1566"/>
-      <point x="341" y="1566" type="curve" name="at03" smooth="yes"/>
+      <point x="341" y="1566" type="curve" smooth="yes" name="at03"/>
       <point x="517" y="1566" type="line" smooth="yes"/>
       <point x="537" y="1566"/>
       <point x="547" y="1556"/>
       <point x="547" y="1536" type="curve" smooth="yes"/>
-      <point x="547" y="1350" type="line" name="sh02" smooth="yes"/>
+      <point x="547" y="1350" type="line" smooth="yes" name="sh02"/>
       <point x="547" y="1330"/>
       <point x="537" y="1320"/>
       <point x="517" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="736" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="736" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="716" y="1320"/>
       <point x="706" y="1330"/>
-      <point x="706" y="1350" type="curve" name="ah01" smooth="yes"/>
+      <point x="706" y="1350" type="curve" smooth="yes" name="ah01"/>
       <point x="706" y="1536" type="line" smooth="yes"/>
       <point x="706" y="1556"/>
       <point x="716" y="1566"/>
-      <point x="736" y="1566" type="curve" name="at04" smooth="yes"/>
+      <point x="736" y="1566" type="curve" smooth="yes" name="at04"/>
       <point x="912" y="1566" type="line" smooth="yes"/>
       <point x="932" y="1566"/>
       <point x="942" y="1556"/>
       <point x="942" y="1536" type="curve" smooth="yes"/>
-      <point x="942" y="1350" type="line" name="sh03" smooth="yes"/>
+      <point x="942" y="1350" type="line" smooth="yes" name="sh03"/>
       <point x="942" y="1330"/>
       <point x="932" y="1320"/>
-      <point x="912" y="1320" type="curve" name="sv02" smooth="yes"/>
+      <point x="912" y="1320" type="curve" smooth="yes" name="sv02"/>
     </contour>
     <contour>
       <point x="137" y="-201" type="line" name="sv03"/>
diff --git a/source/Hack-Bold.ufo/glyphs/yen.glif b/source/Hack-Bold.ufo/glyphs/yen.glif
index 48103b2e9..9e84e8338 100644
--- a/source/Hack-Bold.ufo/glyphs/yen.glif
+++ b/source/Hack-Bold.ufo/glyphs/yen.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="yen" format="1">
+<glyph name="yen" format="2">
   <advance width="1233"/>
   <unicode hex="00A5"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/ygrave.glif b/source/Hack-Bold.ufo/glyphs/ygrave.glif
index 83df03050..0678e4c41 100644
--- a/source/Hack-Bold.ufo/glyphs/ygrave.glif
+++ b/source/Hack-Bold.ufo/glyphs/ygrave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ygrave" format="1">
+<glyph name="ygrave" format="2">
   <advance width="1233"/>
   <unicode hex="1EF3"/>
   <outline>
@@ -24,7 +24,7 @@
       <point x="721" y="-121" type="line" smooth="yes"/>
       <point x="642" y="-332"/>
       <point x="536" y="-424"/>
-      <point x="379" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="379" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="137" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Bold.ufo/glyphs/z.glif b/source/Hack-Bold.ufo/glyphs/z.glif
index 9eb56dd10..0a04166fb 100644
--- a/source/Hack-Bold.ufo/glyphs/z.glif
+++ b/source/Hack-Bold.ufo/glyphs/z.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="z" format="1">
+<glyph name="z" format="2">
   <advance width="1233"/>
   <unicode hex="007A"/>
   <outline>
@@ -17,9 +17,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Bold.ufo/glyphs/zacute.glif b/source/Hack-Bold.ufo/glyphs/zacute.glif
index 2cd8f850c..6f53b7a90 100644
--- a/source/Hack-Bold.ufo/glyphs/zacute.glif
+++ b/source/Hack-Bold.ufo/glyphs/zacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="zacute" format="1">
+<glyph name="zacute" format="2">
   <advance width="1233"/>
   <unicode hex="017A"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/zcaron.glif b/source/Hack-Bold.ufo/glyphs/zcaron.glif
index 5f3ce8938..5eaab4543 100644
--- a/source/Hack-Bold.ufo/glyphs/zcaron.glif
+++ b/source/Hack-Bold.ufo/glyphs/zcaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="zcaron" format="1">
+<glyph name="zcaron" format="2">
   <advance width="1233"/>
   <unicode hex="017E"/>
   <outline>
diff --git a/source/Hack-Bold.ufo/glyphs/zdotaccent.glif b/source/Hack-Bold.ufo/glyphs/zdotaccent.glif
index aa60ac44d..064a00cb5 100644
--- a/source/Hack-Bold.ufo/glyphs/zdotaccent.glif
+++ b/source/Hack-Bold.ufo/glyphs/zdotaccent.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="zdotaccent" format="1">
+<glyph name="zdotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="017C"/>
   <outline>
     <contour>
-      <point x="509" y="1320" type="line" name="hr00" smooth="yes"/>
+      <point x="509" y="1320" type="line" smooth="yes" name="hr00"/>
       <point x="489" y="1320"/>
       <point x="479" y="1330"/>
-      <point x="479" y="1350" type="curve" name="dh01" smooth="yes"/>
+      <point x="479" y="1350" type="curve" smooth="yes" name="dh01"/>
       <point x="479" y="1536" type="line" smooth="yes"/>
       <point x="479" y="1556"/>
       <point x="489" y="1566"/>
-      <point x="509" y="1566" type="curve" name="at01" smooth="yes"/>
+      <point x="509" y="1566" type="curve" smooth="yes" name="at01"/>
       <point x="724" y="1566" type="line" smooth="yes"/>
       <point x="744" y="1566"/>
       <point x="754" y="1556"/>
       <point x="754" y="1536" type="curve" smooth="yes"/>
-      <point x="754" y="1350" type="line" name="dh02" smooth="yes"/>
+      <point x="754" y="1350" type="line" smooth="yes" name="dh02"/>
       <point x="754" y="1330"/>
       <point x="744" y="1320"/>
       <point x="724" y="1320" type="curve" smooth="yes"/>
diff --git a/source/Hack-Bold.ufo/glyphs/zero.glif b/source/Hack-Bold.ufo/glyphs/zero.glif
index 5a2994305..6b897c70c 100644
--- a/source/Hack-Bold.ufo/glyphs/zero.glif
+++ b/source/Hack-Bold.ufo/glyphs/zero.glif
@@ -1,51 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="zero" format="1">
+<glyph name="zero" format="2">
   <advance width="1233"/>
   <unicode hex="0030"/>
   <outline>
     <contour>
-      <point x="617" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="452" y="-29"/>
       <point x="328" y="36"/>
       <point x="246" y="165" type="curve" smooth="yes"/>
       <point x="164" y="294"/>
       <point x="123" y="487"/>
-      <point x="123" y="745" type="curve" name="sh01" smooth="yes"/>
+      <point x="123" y="745" type="curve" smooth="yes" name="sh01"/>
       <point x="123" y="1004"/>
       <point x="164" y="1198"/>
       <point x="246" y="1327" type="curve" smooth="yes"/>
       <point x="328" y="1456"/>
       <point x="451" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="781" y="1520"/>
       <point x="905" y="1456"/>
       <point x="987" y="1327" type="curve" smooth="yes"/>
       <point x="1069" y="1198"/>
       <point x="1110" y="1004"/>
-      <point x="1110" y="745" type="curve" name="sh04" smooth="yes"/>
+      <point x="1110" y="745" type="curve" smooth="yes" name="sh04"/>
       <point x="1110" y="228"/>
       <point x="946" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="221" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="221" type="curve" smooth="yes" name="dv01"/>
       <point x="685" y="221"/>
       <point x="735" y="263"/>
       <point x="766" y="346" type="curve" smooth="yes"/>
       <point x="797" y="430"/>
       <point x="813" y="563"/>
-      <point x="813" y="745" type="curve" name="sh03" smooth="yes"/>
+      <point x="813" y="745" type="curve" smooth="yes" name="sh03"/>
       <point x="813" y="928"/>
       <point x="797" y="1061"/>
       <point x="766" y="1145" type="curve" smooth="yes"/>
       <point x="735" y="1228"/>
       <point x="685" y="1270"/>
-      <point x="616" y="1270" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1270" type="curve" smooth="yes" name="sv01"/>
       <point x="548" y="1270"/>
       <point x="498" y="1228"/>
       <point x="467" y="1145" type="curve" smooth="yes"/>
       <point x="436" y="1061"/>
       <point x="420" y="928"/>
-      <point x="420" y="745" type="curve" name="sh05" smooth="yes"/>
+      <point x="420" y="745" type="curve" smooth="yes" name="sh05"/>
       <point x="420" y="563"/>
       <point x="436" y="430"/>
       <point x="467" y="346" type="curve" smooth="yes"/>
@@ -59,7 +59,7 @@
       <point x="576" y="578" type="curve" name="sh06"/>
       <point x="571" y="629"/>
       <point x="564" y="712"/>
-      <point x="564" y="749" type="curve" name="sh02" smooth="yes"/>
+      <point x="564" y="749" type="curve" smooth="yes" name="sh02"/>
       <point x="564" y="775"/>
       <point x="566" y="854"/>
       <point x="574" y="915" type="curve" name="sh07"/>
@@ -71,10 +71,10 @@
       <point x="658" y="913" type="curve" name="sh09"/>
       <point x="663" y="857"/>
       <point x="669" y="779"/>
-      <point x="669" y="743" type="curve" name="sh08" smooth="yes"/>
+      <point x="669" y="743" type="curve" smooth="yes" name="sh08"/>
       <point x="669" y="720"/>
       <point x="668" y="645"/>
-      <point x="660" y="579" type="curve" name="sh10" smooth="yes"/>
+      <point x="660" y="579" type="curve" smooth="yes" name="sh10"/>
       <point x="651" y="499"/>
       <point x="636" y="460"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/zero.subs.glif b/source/Hack-Bold.ufo/glyphs/zero.subs.glif
index 651818a01..006d96ff1 100644
--- a/source/Hack-Bold.ufo/glyphs/zero.subs.glif
+++ b/source/Hack-Bold.ufo/glyphs/zero.subs.glif
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="zero.subs" format="1">
+<glyph name="zero.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="615" y="-434" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="-434" type="curve" smooth="yes" name="dv01"/>
       <point x="390" y="-434"/>
       <point x="278" y="-289"/>
-      <point x="278" y="0" type="curve" name="dh01" smooth="yes"/>
+      <point x="278" y="0" type="curve" smooth="yes" name="dh01"/>
       <point x="278" y="289"/>
       <point x="390" y="433"/>
-      <point x="615" y="433" type="curve" name="dv04" smooth="yes"/>
+      <point x="615" y="433" type="curve" smooth="yes" name="dv04"/>
       <point x="841" y="433"/>
       <point x="954" y="289"/>
-      <point x="954" y="0" type="curve" name="dh05" smooth="yes"/>
+      <point x="954" y="0" type="curve" smooth="yes" name="dh05"/>
       <point x="954" y="-289"/>
       <point x="841" y="-434"/>
     </contour>
     <contour>
-      <point x="616" y="-294" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="-294" type="curve" smooth="yes" name="dv02"/>
       <point x="663" y="-294"/>
       <point x="697" y="-271"/>
       <point x="718" y="-224" type="curve" smooth="yes"/>
       <point x="739" y="-177"/>
       <point x="750" y="-103"/>
-      <point x="750" y="-1" type="curve" name="hr01" smooth="yes"/>
+      <point x="750" y="-1" type="curve" smooth="yes" name="hr01"/>
       <point x="750" y="100"/>
       <point x="739" y="175"/>
       <point x="718" y="223" type="curve" smooth="yes"/>
       <point x="697" y="270"/>
       <point x="663" y="293"/>
-      <point x="616" y="293" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="293" type="curve" smooth="yes" name="dv03"/>
       <point x="564" y="293"/>
       <point x="534" y="266"/>
       <point x="514" y="223" type="curve" smooth="yes"/>
       <point x="492" y="176"/>
       <point x="481" y="101"/>
-      <point x="481" y="-1" type="curve" name="dh02" smooth="yes"/>
+      <point x="481" y="-1" type="curve" smooth="yes" name="dh02"/>
       <point x="481" y="-102"/>
       <point x="492" y="-176"/>
       <point x="514" y="-224" type="curve" smooth="yes"/>
@@ -49,13 +49,13 @@
       <point x="555" y="-51" type="curve" smooth="yes"/>
       <point x="539" y="-38"/>
       <point x="531" y="-22"/>
-      <point x="531" y="-2" type="curve" name="dh03" smooth="yes"/>
+      <point x="531" y="-2" type="curve" smooth="yes" name="dh03"/>
       <point x="531" y="39"/>
       <point x="568" y="70"/>
-      <point x="615" y="70" type="curve" name="sv01" smooth="yes"/>
+      <point x="615" y="70" type="curve" smooth="yes" name="sv01"/>
       <point x="662" y="70"/>
       <point x="701" y="39"/>
-      <point x="701" y="-1" type="curve" name="dh04" smooth="yes"/>
+      <point x="701" y="-1" type="curve" smooth="yes" name="dh04"/>
       <point x="701" y="-40"/>
       <point x="664" y="-71"/>
     </contour>
diff --git a/source/Hack-Bold.ufo/glyphs/zeta.glif b/source/Hack-Bold.ufo/glyphs/zeta.glif
index 081c4117f..4cf99b622 100644
--- a/source/Hack-Bold.ufo/glyphs/zeta.glif
+++ b/source/Hack-Bold.ufo/glyphs/zeta.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="zeta" format="1">
+<glyph name="zeta" format="2">
   <advance width="1233"/>
   <unicode hex="03B6"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="762" y="-201" type="line" name="dh01"/>
       <point x="854" y="-201"/>
       <point x="880" y="-155"/>
-      <point x="880" y="-104" type="curve" name="sh01" smooth="yes"/>
+      <point x="880" y="-104" type="curve" smooth="yes" name="sh01"/>
       <point x="880" y="-53"/>
       <point x="841" y="0"/>
-      <point x="762" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="762" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="-34" y="0"/>
       <point x="-5" y="900"/>
       <point x="660" y="1331" type="curve" name="sv01"/>
@@ -23,10 +23,10 @@
       <point x="455" y="534" type="curve" smooth="yes"/>
       <point x="455" y="336"/>
       <point x="557" y="233"/>
-      <point x="762" y="225" type="curve" name="sv02" smooth="yes"/>
+      <point x="762" y="225" type="curve" smooth="yes" name="sv02"/>
       <point x="950" y="217"/>
       <point x="1079" y="107"/>
-      <point x="1079" y="-104" type="curve" name="hr01" smooth="yes"/>
+      <point x="1079" y="-104" type="curve" smooth="yes" name="hr01"/>
       <point x="1079" y="-301"/>
       <point x="951" y="-426"/>
       <point x="762" y="-426" type="curve" name="hr02"/>
diff --git a/source/Hack-Bold.ufo/layercontents.plist b/source/Hack-Bold.ufo/layercontents.plist
new file mode 100644
index 000000000..cf95d3573
--- /dev/null
+++ b/source/Hack-Bold.ufo/layercontents.plist
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<array>
+		<string>public.default</string>
+		<string>glyphs</string>
+	</array>
+</array>
+</plist>
diff --git a/source/Hack-Bold.ufo/lib.plist b/source/Hack-Bold.ufo/lib.plist
index a6ff2e656..c11891ffe 100644
--- a/source/Hack-Bold.ufo/lib.plist
+++ b/source/Hack-Bold.ufo/lib.plist
@@ -1616,6 +1616,7 @@
 		<string>uni2077</string>
 		<string>uni2078</string>
 		<string>uni2079</string>
+		<string>ruble</string>
 		<string>guillemotleft</string>
 		<string>guillemotright</string>
 		<string>uni00B5</string>
diff --git a/source/Hack-Bold.ufo/metainfo.plist b/source/Hack-Bold.ufo/metainfo.plist
index 12a792239..632695b5a 100644
--- a/source/Hack-Bold.ufo/metainfo.plist
+++ b/source/Hack-Bold.ufo/metainfo.plist
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>creator</key>
-	<string>com.schriftgestaltung.GlyphsUFOExport</string>
+	<string>org.robofab.ufoLib</string>
 	<key>formatVersion</key>
-	<integer>2</integer>
+	<integer>3</integer>
 </dict>
 </plist>
diff --git a/source/Hack-BoldItalic.ufo/fontinfo.plist b/source/Hack-BoldItalic.ufo/fontinfo.plist
index 255ac5ba5..41255bdef 100644
--- a/source/Hack-BoldItalic.ufo/fontinfo.plist
+++ b/source/Hack-BoldItalic.ufo/fontinfo.plist
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>ascender</key>
@@ -12,8 +12,10 @@
 	<integer>-492</integer>
 	<key>familyName</key>
 	<string>Hack</string>
+	<key>guidelines</key>
+	<array/>
 	<key>italicAngle</key>
-	<real>-11</real>
+	<real>-11.0</real>
 	<key>macintoshFONDFamilyID</key>
 	<integer>128</integer>
 	<key>macintoshFONDName</key>
@@ -23,8 +25,7 @@
 	<key>openTypeHeadCreated</key>
 	<string>2017/10/23 12:00:00</string>
 	<key>openTypeHeadFlags</key>
-	<array>
-	</array>
+	<array/>
 	<key>openTypeHheaAscender</key>
 	<integer>1901</integer>
 	<key>openTypeHheaDescender</key>
@@ -100,7 +101,7 @@ Except as contained in this notice, the names of Gnome, the Gnome Foundation, an
 	<key>openTypeNameUniqueID</key>
 	<string>SourceFoundry: Hack Bold Italic: 2018</string>
 	<key>openTypeNameVersion</key>
-	<string>Version 3.003</string>
+	<string>Version 4.000</string>
 	<key>openTypeOS2CodePageRanges</key>
 	<array>
 		<integer>0</integer>
@@ -144,8 +145,7 @@ Except as contained in this notice, the names of Gnome, the Gnome Foundation, an
 		<integer>4</integer>
 	</array>
 	<key>openTypeOS2Selection</key>
-	<array>
-	</array>
+	<array/>
 	<key>openTypeOS2StrikeoutPosition</key>
 	<integer>530</integer>
 	<key>openTypeOS2StrikeoutSize</key>
@@ -215,7 +215,7 @@ Except as contained in this notice, the names of Gnome, the Gnome Foundation, an
 	<key>postscriptBlueFuzz</key>
 	<integer>0</integer>
 	<key>postscriptBlueScale</key>
-	<real>0.036999999999999998</real>
+	<real>0.037</real>
 	<key>postscriptBlueShift</key>
 	<integer>14</integer>
 	<key>postscriptBlueValues</key>
@@ -227,6 +227,10 @@ Except as contained in this notice, the names of Gnome, the Gnome Foundation, an
 		<integer>1493</integer>
 		<integer>1520</integer>
 	</array>
+	<key>postscriptFamilyBlues</key>
+	<array/>
+	<key>postscriptFamilyOtherBlues</key>
+	<array/>
 	<key>postscriptFontName</key>
 	<string>Hack-BoldItalic</string>
 	<key>postscriptForceBold</key>
@@ -271,9 +275,9 @@ Except as contained in this notice, the names of Gnome, the Gnome Foundation, an
 	<key>unitsPerEm</key>
 	<integer>2048</integer>
 	<key>versionMajor</key>
-	<integer>3</integer>
+	<integer>4</integer>
 	<key>versionMinor</key>
-	<integer>003</integer>
+	<integer>0</integer>
 	<key>xHeight</key>
 	<integer>1120</integer>
 </dict>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/A_.glif b/source/Hack-BoldItalic.ufo/glyphs/A_.glif
index 4f8e0636e..7715ecdfe 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/A_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="A" format="1">
+<glyph name="A" format="2">
   <advance width="1233"/>
   <unicode hex="0041"/>
   <outline>
     <contour>
-      <point x="582" y="1493" type="line" name="hr00"/>
+      <point x="582" y="1493" type="line"/>
       <point x="942" y="1493" type="line"/>
-      <point x="1055" y="0" type="line" name="ab01"/>
+      <point x="1055" y="0" type="line"/>
       <point x="762" y="0" type="line"/>
-      <point x="748" y="369" type="line" name="dv01"/>
+      <point x="748" y="369" type="line"/>
       <point x="348" y="369" type="line"/>
-      <point x="186" y="0" type="line" name="ab02"/>
+      <point x="186" y="0" type="line"/>
       <point x="-113" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="737" y="612" type="line" name="dv02"/>
+      <point x="737" y="612" type="line"/>
       <point x="717" y="1219" type="line"/>
       <point x="453" y="612" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/A_E_.glif b/source/Hack-BoldItalic.ufo/glyphs/A_E_.glif
index f3005c796..8172fb002 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/A_E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/A_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="AE" format="1">
+<glyph name="AE" format="2">
   <advance width="1233"/>
   <unicode hex="00C6"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/A_acute.glif b/source/Hack-BoldItalic.ufo/glyphs/A_acute.glif
index 3a296ac99..11af6eb7f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/A_acute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/A_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Aacute" format="1">
+<glyph name="Aacute" format="2">
   <advance width="1233"/>
   <unicode hex="00C1"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/A_breve.glif b/source/Hack-BoldItalic.ufo/glyphs/A_breve.glif
index d05b8a3c7..d3415b3af 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/A_breve.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/A_breve.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Abreve" format="1">
+<glyph name="Abreve" format="2">
   <advance width="1233"/>
   <unicode hex="0102"/>
   <outline>
     <contour>
-      <point x="796" y="1588" type="curve" name="dv01" smooth="yes"/>
+      <point x="796" y="1588" type="curve" smooth="yes" name="dv01"/>
       <point x="607" y="1588"/>
       <point x="508" y="1680"/>
       <point x="508" y="1848" type="curve" smooth="yes"/>
@@ -12,7 +12,7 @@
       <point x="651" y="1852" type="line" name="sv01"/>
       <point x="662" y="1780"/>
       <point x="711" y="1737"/>
-      <point x="816" y="1737" type="curve" name="dv02" smooth="yes"/>
+      <point x="816" y="1737" type="curve" smooth="yes" name="dv02"/>
       <point x="920" y="1737"/>
       <point x="989" y="1777"/>
       <point x="1022" y="1852" type="curve" name="sv02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/A_circumflex.glif b/source/Hack-BoldItalic.ufo/glyphs/A_circumflex.glif
index ace707056..470411edf 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/A_circumflex.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/A_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Acircumflex" format="1">
+<glyph name="Acircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00C2"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/A_dieresis.glif b/source/Hack-BoldItalic.ufo/glyphs/A_dieresis.glif
index f06c0a5ec..e81aef89d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/A_dieresis.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/A_dieresis.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Adieresis" format="1">
+<glyph name="Adieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00C4"/>
   <outline>
     <contour>
-      <point x="487" y="1613" type="line" name="hr00" smooth="yes"/>
+      <point x="487" y="1613" type="line" smooth="yes" name="hr00"/>
       <point x="469" y="1613"/>
       <point x="460" y="1621"/>
       <point x="460" y="1637" type="curve" smooth="yes"/>
@@ -14,7 +14,7 @@
       <point x="499" y="1832" type="line" smooth="yes"/>
       <point x="503" y="1850"/>
       <point x="514" y="1859"/>
-      <point x="531" y="1859" type="curve" name="dv01" smooth="yes"/>
+      <point x="531" y="1859" type="curve" smooth="yes" name="dv01"/>
       <point x="706" y="1859" type="line" smooth="yes"/>
       <point x="724" y="1859"/>
       <point x="733" y="1851"/>
@@ -28,7 +28,7 @@
       <point x="663" y="1613" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="883" y="1613" type="line" name="sv01" smooth="yes"/>
+      <point x="883" y="1613" type="line" smooth="yes" name="sv01"/>
       <point x="865" y="1613"/>
       <point x="856" y="1621"/>
       <point x="856" y="1637" type="curve" smooth="yes"/>
@@ -38,7 +38,7 @@
       <point x="894" y="1832" type="line"/>
       <point x="897" y="1850"/>
       <point x="907" y="1859"/>
-      <point x="926" y="1859" type="curve" name="sv02" smooth="yes"/>
+      <point x="926" y="1859" type="curve" smooth="yes" name="sv02"/>
       <point x="1101" y="1859" type="line" smooth="yes"/>
       <point x="1121" y="1859"/>
       <point x="1132" y="1846"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/A_grave.glif b/source/Hack-BoldItalic.ufo/glyphs/A_grave.glif
index cdfdff1d1..6b2492236 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/A_grave.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/A_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Agrave" format="1">
+<glyph name="Agrave" format="2">
   <advance width="1233"/>
   <unicode hex="00C0"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/A_lpha.glif b/source/Hack-BoldItalic.ufo/glyphs/A_lpha.glif
index 5247a2ec6..3fffa7ce2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/A_lpha.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/A_lpha.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Alpha" format="1">
+<glyph name="Alpha" format="2">
   <advance width="1233"/>
   <unicode hex="0391"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/A_lphatonos.glif b/source/Hack-BoldItalic.ufo/glyphs/A_lphatonos.glif
index fe696c0bd..7086c863b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/A_lphatonos.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/A_lphatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Alphatonos" format="1">
+<glyph name="Alphatonos" format="2">
   <advance width="1233"/>
   <unicode hex="0386"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/A_macron.glif b/source/Hack-BoldItalic.ufo/glyphs/A_macron.glif
index 626a269f3..bd3637cd5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/A_macron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/A_macron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Amacron" format="1">
+<glyph name="Amacron" format="2">
   <advance width="1233"/>
   <unicode hex="0100"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/A_ogonek.glif b/source/Hack-BoldItalic.ufo/glyphs/A_ogonek.glif
index e9f669f08..ee5a0c625 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/A_ogonek.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/A_ogonek.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Aogonek" format="1">
+<glyph name="Aogonek" format="2">
   <advance width="1233"/>
   <unicode hex="0104"/>
   <outline>
     <contour>
-      <point x="785" y="-182" type="curve" name="hr00" smooth="yes"/>
+      <point x="785" y="-182" type="curve" smooth="yes" name="hr00"/>
       <point x="785" y="-221"/>
       <point x="816" y="-254"/>
-      <point x="885" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="885" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="921" y="-254"/>
       <point x="978" y="-246"/>
       <point x="1041" y="-223" type="curve"/>
       <point x="1010" y="-379" type="line"/>
       <point x="945" y="-394"/>
       <point x="882" y="-401"/>
-      <point x="831" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="831" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="694" y="-401"/>
       <point x="611" y="-350"/>
       <point x="611" y="-255" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/A_ring.glif b/source/Hack-BoldItalic.ufo/glyphs/A_ring.glif
index c69e1a574..830778d34 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/A_ring.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/A_ring.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Aring" format="1">
+<glyph name="Aring" format="2">
   <advance width="1233"/>
   <unicode hex="00C5"/>
   <outline>
@@ -10,19 +10,19 @@
       <point x="490" y="1510" type="curve" smooth="yes"/>
       <point x="476" y="1545"/>
       <point x="469" y="1581"/>
-      <point x="469" y="1618" type="curve" name="sh01" smooth="yes"/>
+      <point x="469" y="1618" type="curve" smooth="yes" name="sh01"/>
       <point x="469" y="1695"/>
       <point x="497" y="1761"/>
       <point x="553" y="1817" type="curve" smooth="yes"/>
       <point x="606" y="1870"/>
       <point x="669" y="1901"/>
-      <point x="753" y="1901" type="curve" name="dv02" smooth="yes"/>
+      <point x="753" y="1901" type="curve" smooth="yes" name="dv02"/>
       <point x="831" y="1901"/>
       <point x="898" y="1873"/>
       <point x="954" y="1817" type="curve" smooth="yes"/>
       <point x="1010" y="1761"/>
       <point x="1038" y="1695"/>
-      <point x="1038" y="1618" type="curve" name="sh02" smooth="yes"/>
+      <point x="1038" y="1618" type="curve" smooth="yes" name="sh02"/>
       <point x="1038" y="1575"/>
       <point x="1030" y="1535"/>
       <point x="1015" y="1503" type="curve" smooth="yes"/>
@@ -43,19 +43,19 @@
       <point x="847" y="1524" type="curve" smooth="yes"/>
       <point x="872" y="1549"/>
       <point x="885" y="1580"/>
-      <point x="885" y="1616" type="curve" name="ah01" smooth="yes"/>
+      <point x="885" y="1616" type="curve" smooth="yes" name="ah01"/>
       <point x="885" y="1652"/>
       <point x="872" y="1683"/>
       <point x="846" y="1709" type="curve" smooth="yes"/>
       <point x="819" y="1734"/>
       <point x="789" y="1747"/>
-      <point x="754" y="1747" type="curve" name="dv01" smooth="yes"/>
+      <point x="754" y="1747" type="curve" smooth="yes" name="dv01"/>
       <point x="718" y="1747"/>
       <point x="687" y="1734"/>
       <point x="662" y="1709" type="curve" smooth="yes"/>
       <point x="636" y="1683"/>
       <point x="623" y="1652"/>
-      <point x="623" y="1616" type="curve" name="sh03" smooth="yes"/>
+      <point x="623" y="1616" type="curve" smooth="yes" name="sh03"/>
       <point x="623" y="1577"/>
       <point x="638" y="1547"/>
       <point x="661" y="1524" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/A_tilde.glif b/source/Hack-BoldItalic.ufo/glyphs/A_tilde.glif
index 2c682baf6..683420ae7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/A_tilde.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/A_tilde.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Atilde" format="1">
+<glyph name="Atilde" format="2">
   <advance width="1233"/>
   <unicode hex="00C3"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="513" y="1786" type="curve" smooth="yes"/>
       <point x="556" y="1831"/>
       <point x="608" y="1855"/>
-      <point x="673" y="1855" type="curve" name="dv02" smooth="yes"/>
+      <point x="673" y="1855" type="curve" smooth="yes" name="dv02"/>
       <point x="698" y="1855"/>
       <point x="722" y="1851"/>
       <point x="744" y="1843" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="1080" y="1658" type="curve" smooth="yes"/>
       <point x="1037" y="1612"/>
       <point x="984" y="1589"/>
-      <point x="921" y="1589" type="curve" name="sv02" smooth="yes"/>
+      <point x="921" y="1589" type="curve" smooth="yes" name="sv02"/>
       <point x="867" y="1589"/>
       <point x="838" y="1598"/>
       <point x="782" y="1640" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/B_.glif b/source/Hack-BoldItalic.ufo/glyphs/B_.glif
index ed52a4823..21d8f9a5e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/B_.glif
@@ -1,68 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="B" format="1">
+<glyph name="B" format="2">
   <advance width="1233"/>
   <unicode hex="0042"/>
   <outline>
     <contour>
-      <point x="270" y="1495" type="line" name="at01"/>
+      <point x="270" y="1495" type="line"/>
       <point x="752" y="1495" type="line" smooth="yes"/>
-      <point x="892" y="1495"/>
-      <point x="998" y="1467"/>
-      <point x="1071" y="1412" type="curve" smooth="yes"/>
-      <point x="1142" y="1357"/>
-      <point x="1178" y="1274"/>
-      <point x="1178" y="1164" type="curve" name="sh01" smooth="yes"/>
-      <point x="1178" y="952"/>
-      <point x="1046" y="811"/>
-      <point x="813" y="786" type="curve" name="ih02"/>
-      <point x="901" y="779"/>
-      <point x="978" y="748"/>
-      <point x="1029" y="696" type="curve" smooth="yes"/>
-      <point x="1081" y="643"/>
-      <point x="1106" y="568"/>
-      <point x="1106" y="480" type="curve" name="dh02" smooth="yes"/>
-      <point x="1106" y="416"/>
-      <point x="1093" y="347"/>
-      <point x="1068" y="284" type="curve" smooth="yes"/>
-      <point x="1044" y="224"/>
-      <point x="1008" y="170"/>
-      <point x="961" y="127" type="curve" smooth="yes"/>
-      <point x="862" y="38"/>
-      <point x="720" y="0"/>
-      <point x="461" y="0" type="curve" name="hr01" smooth="yes"/>
+      <point x="983.225" y="1495"/>
+      <point x="1178" y="1342.89"/>
+      <point x="1178" y="1162.31" type="curve" smooth="yes"/>
+      <point x="1178" y="949.855"/>
+      <point x="1042.91" y="810.582"/>
+      <point x="813" y="786" type="curve"/>
+      <point x="1000.16" y="771.178"/>
+      <point x="1106" y="659.921"/>
+      <point x="1106" y="478.016" type="curve" smooth="yes"/>
+      <point x="1106" y="413.763"/>
+      <point x="1092.89" y="346.447"/>
+      <point x="1068.4" y="285.003" type="curve" smooth="yes"/>
+      <point x="988.09" y="83.4844"/>
+      <point x="810.168" y="0"/>
+      <point x="461" y="0" type="curve" smooth="yes"/>
       <point x="-20" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="639" y="913" type="line" name="dv02" smooth="yes"/>
-      <point x="720" y="913"/>
-      <point x="781" y="931"/>
-      <point x="822" y="968" type="curve" smooth="yes"/>
-      <point x="861" y="1003"/>
-      <point x="883" y="1054"/>
-      <point x="883" y="1123" type="curve" name="ih01" smooth="yes"/>
-      <point x="883" y="1176"/>
-      <point x="869" y="1207"/>
-      <point x="840" y="1228" type="curve" smooth="yes"/>
-      <point x="811" y="1249"/>
-      <point x="766" y="1260"/>
-      <point x="707" y="1260" type="curve" name="sv01" smooth="yes"/>
+      <point x="639" y="913" type="line" smooth="yes"/>
+      <point x="772.491" y="913"/>
+      <point x="883" y="1003.46"/>
+      <point x="883" y="1112.72" type="curve" smooth="yes"/>
+      <point x="883" y="1215.24"/>
+      <point x="829.509" y="1260"/>
+      <point x="707" y="1260" type="curve" smooth="yes"/>
       <point x="510" y="1260" type="line"/>
-      <point x="442" y="913" type="line" name="hr02"/>
+      <point x="442" y="913" type="line"/>
     </contour>
     <contour>
-      <point x="508" y="236" type="line" name="sv02" smooth="yes"/>
-      <point x="613" y="236"/>
-      <point x="689" y="258"/>
-      <point x="738" y="303" type="curve" smooth="yes"/>
-      <point x="787" y="348"/>
-      <point x="811" y="418"/>
-      <point x="811" y="501" type="curve" name="dh01" smooth="yes"/>
-      <point x="811" y="573"/>
-      <point x="793" y="610"/>
-      <point x="758" y="637" type="curve" name="hr03" smooth="yes"/>
-      <point x="723" y="664"/>
-      <point x="668" y="678"/>
-      <point x="594" y="678" type="curve" name="dv01" smooth="yes"/>
+      <point x="508" y="236" type="line" smooth="yes"/>
+      <point x="680.205" y="236"/>
+      <point x="811" y="344.184"/>
+      <point x="811" y="486.62" type="curve" smooth="yes"/>
+      <point x="811" y="621.273"/>
+      <point x="746.679" y="678"/>
+      <point x="594" y="678" type="curve" smooth="yes"/>
       <point x="397" y="678" type="line"/>
       <point x="311" y="236" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/B_eta.glif b/source/Hack-BoldItalic.ufo/glyphs/B_eta.glif
index 20f16df9f..c96f6cc9f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/B_eta.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/B_eta.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Beta" format="1">
+<glyph name="Beta" format="2">
   <advance width="1233"/>
   <unicode hex="0392"/>
   <outline>
@@ -8,40 +8,40 @@
       <point x="759" y="1495" type="line" smooth="yes"/>
       <point x="1042" y="1495"/>
       <point x="1185" y="1387"/>
-      <point x="1185" y="1163" type="curve" name="sh03" smooth="yes"/>
+      <point x="1185" y="1163" type="curve" smooth="yes" name="sh03"/>
       <point x="1185" y="951"/>
       <point x="1052" y="813"/>
       <point x="820" y="786" type="curve" name="sh04"/>
       <point x="1000" y="770"/>
       <point x="1113" y="669"/>
-      <point x="1113" y="477" type="curve" name="sh05" smooth="yes"/>
+      <point x="1113" y="477" type="curve" smooth="yes" name="sh05"/>
       <point x="1113" y="345"/>
       <point x="1060" y="211"/>
       <point x="968" y="127" type="curve" smooth="yes"/>
       <point x="872" y="39"/>
       <point x="727" y="0"/>
-      <point x="468" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="468" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="-13" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="646" y="913" type="line" name="hr01" smooth="yes"/>
+      <point x="646" y="913" type="line" smooth="yes" name="hr01"/>
       <point x="807" y="913"/>
       <point x="890" y="990"/>
-      <point x="890" y="1119" type="curve" name="sh02" smooth="yes"/>
+      <point x="890" y="1119" type="curve" smooth="yes" name="sh02"/>
       <point x="890" y="1219"/>
       <point x="841" y="1260"/>
-      <point x="714" y="1260" type="curve" name="sv01" smooth="yes"/>
+      <point x="714" y="1260" type="curve" smooth="yes" name="sv01"/>
       <point x="517" y="1260" type="line"/>
       <point x="449" y="913" type="line"/>
     </contour>
     <contour>
-      <point x="515" y="236" type="line" name="sv02" smooth="yes"/>
+      <point x="515" y="236" type="line" smooth="yes" name="sv02"/>
       <point x="716" y="236"/>
       <point x="818" y="321"/>
-      <point x="818" y="496" type="curve" name="sh01" smooth="yes"/>
+      <point x="818" y="496" type="curve" smooth="yes" name="sh01"/>
       <point x="818" y="612"/>
       <point x="772" y="678"/>
-      <point x="601" y="678" type="curve" name="hr02" smooth="yes"/>
+      <point x="601" y="678" type="curve" smooth="yes" name="hr02"/>
       <point x="404" y="678" type="line"/>
       <point x="318" y="236" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/C_.glif b/source/Hack-BoldItalic.ufo/glyphs/C_.glif
index 95b699507..c5d8ed2b9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/C_.glif
@@ -1,71 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="C" format="1">
+<glyph name="C" format="2">
   <advance width="1233"/>
   <unicode hex="0043"/>
   <outline>
     <contour>
-      <point x="598" y="-29" type="curve" name="hr00" smooth="yes"/>
-      <point x="451" y="-29"/>
-      <point x="319" y="13"/>
-      <point x="231" y="108" type="curve" smooth="yes"/>
-      <point x="142" y="204"/>
-      <point x="105" y="345"/>
-      <point x="105" y="517" type="curve" name="dh01" smooth="yes"/>
-      <point x="105" y="653"/>
-      <point x="128" y="803"/>
-      <point x="176" y="948" type="curve" smooth="yes"/>
-      <point x="223" y="1088"/>
-      <point x="286" y="1204"/>
-      <point x="367" y="1296" type="curve" smooth="yes"/>
-      <point x="431" y="1368"/>
-      <point x="505" y="1424"/>
-      <point x="594" y="1463" type="curve" smooth="yes"/>
-      <point x="681" y="1501"/>
-      <point x="775" y="1520"/>
-      <point x="877" y="1520" type="curve" name="at01" smooth="yes"/>
-      <point x="933" y="1520"/>
-      <point x="985" y="1514"/>
-      <point x="1038" y="1502" type="curve" smooth="yes"/>
-      <point x="1081" y="1491"/>
-      <point x="1138" y="1475"/>
+      <point x="592.994" y="-29" type="curve" smooth="yes"/>
+      <point x="309.784" y="-29"/>
+      <point x="105" y="207.98"/>
+      <point x="105" y="535.713" type="curve" smooth="yes"/>
+      <point x="105" y="1099.58"/>
+      <point x="432.397" y="1520"/>
+      <point x="877.358" y="1520" type="curve" smooth="yes"/>
+      <point x="985.621" y="1520"/>
+      <point x="1096.75" y="1495.11"/>
       <point x="1193" y="1448" type="curve"/>
       <point x="1129" y="1120" type="line"/>
-      <point x="1096" y="1166"/>
-      <point x="1055" y="1200"/>
-      <point x="1007" y="1223" type="curve" smooth="yes"/>
-      <point x="958" y="1246"/>
-      <point x="901" y="1257"/>
-      <point x="853" y="1257" type="curve" name="sv01" smooth="yes"/>
-      <point x="798" y="1257"/>
-      <point x="742" y="1243"/>
-      <point x="689" y="1210" type="curve" smooth="yes"/>
-      <point x="633" y="1175"/>
-      <point x="590" y="1123"/>
-      <point x="558" y="1074" type="curve" smooth="yes"/>
-      <point x="511" y="1002"/>
-      <point x="475" y="919"/>
-      <point x="447" y="819" type="curve" smooth="yes"/>
-      <point x="416" y="711"/>
-      <point x="404" y="617"/>
-      <point x="404" y="537" type="curve" name="dh02" smooth="yes"/>
-      <point x="404" y="442"/>
-      <point x="422" y="364"/>
-      <point x="467" y="308" type="curve" smooth="yes"/>
-      <point x="509" y="257"/>
-      <point x="570" y="231"/>
-      <point x="651" y="231" type="curve" name="dv01" smooth="yes"/>
-      <point x="703" y="231"/>
-      <point x="756" y="242"/>
-      <point x="810" y="265" type="curve" smooth="yes"/>
-      <point x="867" y="289"/>
-      <point x="923" y="324"/>
+      <point x="1067.26" y="1206.11"/>
+      <point x="967.621" y="1257"/>
+      <point x="870.692" y="1257" type="curve" smooth="yes"/>
+      <point x="619.96" y="1257"/>
+      <point x="404" y="916.46"/>
+      <point x="404" y="536.718" type="curve" smooth="yes"/>
+      <point x="404" y="337.536"/>
+      <point x="489.255" y="231"/>
+      <point x="648.649" y="231" type="curve" smooth="yes"/>
+      <point x="753.209" y="231"/>
+      <point x="860.515" y="275.797"/>
       <point x="984" y="371" type="curve"/>
       <point x="920" y="43" type="line"/>
-      <point x="867" y="18"/>
-      <point x="812" y="0"/>
-      <point x="763" y="-11" type="curve" smooth="yes"/>
-      <point x="709" y="-23"/>
-      <point x="654" y="-29"/>
+      <point x="818.791" y="-4.70109"/>
+      <point x="708.431" y="-29"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/C_R_.glif b/source/Hack-BoldItalic.ufo/glyphs/C_R_.glif
index 8dd4ab034..9c88b2cdc 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/C_R_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/C_R_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="CR" format="1">
+<glyph name="CR" format="2">
   <advance width="1233"/>
   <unicode hex="000D"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/C_acute.glif b/source/Hack-BoldItalic.ufo/glyphs/C_acute.glif
index 0280d747d..e11a223a3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/C_acute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/C_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Cacute" format="1">
+<glyph name="Cacute" format="2">
   <advance width="1233"/>
   <unicode hex="0106"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="732" y="1588" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="598" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="598" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="451" y="-29"/>
       <point x="319" y="13"/>
       <point x="231" y="108" type="curve" smooth="yes"/>
       <point x="142" y="204"/>
       <point x="105" y="345"/>
-      <point x="105" y="517" type="curve" name="dh01" smooth="yes"/>
+      <point x="105" y="517" type="curve" smooth="yes" name="dh01"/>
       <point x="105" y="653"/>
       <point x="128" y="803"/>
       <point x="176" y="948" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="594" y="1463" type="curve" smooth="yes"/>
       <point x="682" y="1502"/>
       <point x="778" y="1520"/>
-      <point x="879" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="879" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="935" y="1520"/>
       <point x="985" y="1514"/>
       <point x="1038" y="1502" type="curve" smooth="yes"/>
@@ -41,7 +41,7 @@
       <point x="1007" y="1223" type="curve" smooth="yes"/>
       <point x="958" y="1246"/>
       <point x="901" y="1257"/>
-      <point x="853" y="1257" type="curve" name="sv01" smooth="yes"/>
+      <point x="853" y="1257" type="curve" smooth="yes" name="sv01"/>
       <point x="798" y="1257"/>
       <point x="742" y="1243"/>
       <point x="689" y="1210" type="curve" smooth="yes"/>
@@ -53,13 +53,13 @@
       <point x="447" y="819" type="curve" smooth="yes"/>
       <point x="416" y="711"/>
       <point x="404" y="617"/>
-      <point x="404" y="537" type="curve" name="dh02" smooth="yes"/>
+      <point x="404" y="537" type="curve" smooth="yes" name="dh02"/>
       <point x="404" y="442"/>
       <point x="422" y="364"/>
       <point x="467" y="308" type="curve" smooth="yes"/>
       <point x="509" y="257"/>
       <point x="570" y="231"/>
-      <point x="651" y="231" type="curve" name="dv02" smooth="yes"/>
+      <point x="651" y="231" type="curve" smooth="yes" name="dv02"/>
       <point x="703" y="231"/>
       <point x="756" y="242"/>
       <point x="810" y="265" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/C_caron.glif b/source/Hack-BoldItalic.ufo/glyphs/C_caron.glif
index bcbd8a5ad..caf32216d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/C_caron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/C_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ccaron" format="1">
+<glyph name="Ccaron" format="2">
   <advance width="1233"/>
   <unicode hex="010C"/>
   <outline>
@@ -13,13 +13,13 @@
       <point x="644" y="1589" type="line"/>
     </contour>
     <contour>
-      <point x="598" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="598" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="451" y="-29"/>
       <point x="319" y="13"/>
       <point x="231" y="108" type="curve" smooth="yes"/>
       <point x="142" y="204"/>
       <point x="105" y="345"/>
-      <point x="105" y="517" type="curve" name="dh01" smooth="yes"/>
+      <point x="105" y="517" type="curve" smooth="yes" name="dh01"/>
       <point x="105" y="653"/>
       <point x="128" y="803"/>
       <point x="176" y="948" type="curve" smooth="yes"/>
@@ -31,7 +31,7 @@
       <point x="594" y="1463" type="curve" smooth="yes"/>
       <point x="682" y="1502"/>
       <point x="778" y="1520"/>
-      <point x="879" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="879" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="935" y="1520"/>
       <point x="985" y="1514"/>
       <point x="1038" y="1502" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="1007" y="1223" type="curve" smooth="yes"/>
       <point x="958" y="1246"/>
       <point x="901" y="1257"/>
-      <point x="853" y="1257" type="curve" name="sv01" smooth="yes"/>
+      <point x="853" y="1257" type="curve" smooth="yes" name="sv01"/>
       <point x="798" y="1257"/>
       <point x="742" y="1243"/>
       <point x="689" y="1210" type="curve" smooth="yes"/>
@@ -56,13 +56,13 @@
       <point x="447" y="819" type="curve" smooth="yes"/>
       <point x="416" y="711"/>
       <point x="404" y="617"/>
-      <point x="404" y="537" type="curve" name="dh02" smooth="yes"/>
+      <point x="404" y="537" type="curve" smooth="yes" name="dh02"/>
       <point x="404" y="442"/>
       <point x="422" y="364"/>
       <point x="467" y="308" type="curve" smooth="yes"/>
       <point x="509" y="257"/>
       <point x="570" y="231"/>
-      <point x="651" y="231" type="curve" name="dv02" smooth="yes"/>
+      <point x="651" y="231" type="curve" smooth="yes" name="dv02"/>
       <point x="703" y="231"/>
       <point x="756" y="242"/>
       <point x="810" y="265" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/C_cedilla.glif b/source/Hack-BoldItalic.ufo/glyphs/C_cedilla.glif
index cbd58ab64..74650b447 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/C_cedilla.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/C_cedilla.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ccedilla" format="1">
+<glyph name="Ccedilla" format="2">
   <advance width="1233"/>
   <unicode hex="00C7"/>
   <outline>
     <contour>
-      <point x="1038" y="1502" type="curve" name="hr00" smooth="yes"/>
+      <point x="1038" y="1502" type="curve" smooth="yes" name="hr00"/>
       <point x="1085" y="1491"/>
       <point x="1141" y="1473"/>
       <point x="1193" y="1448" type="curve"/>
@@ -14,7 +14,7 @@
       <point x="1007" y="1223" type="curve" smooth="yes"/>
       <point x="958" y="1246"/>
       <point x="901" y="1257"/>
-      <point x="853" y="1257" type="curve" name="sv01" smooth="yes"/>
+      <point x="853" y="1257" type="curve" smooth="yes" name="sv01"/>
       <point x="798" y="1257"/>
       <point x="742" y="1243"/>
       <point x="689" y="1210" type="curve" smooth="yes"/>
@@ -26,7 +26,7 @@
       <point x="447" y="819" type="curve" smooth="yes"/>
       <point x="416" y="711"/>
       <point x="404" y="617"/>
-      <point x="404" y="537" type="curve" name="dh02" smooth="yes"/>
+      <point x="404" y="537" type="curve" smooth="yes" name="dh02"/>
       <point x="404" y="442"/>
       <point x="422" y="364"/>
       <point x="467" y="308" type="curve" smooth="yes"/>
@@ -57,10 +57,10 @@
       <point x="655" y="-342" type="curve" smooth="yes"/>
       <point x="606" y="-381"/>
       <point x="535" y="-401"/>
-      <point x="443" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="443" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="408" y="-401"/>
       <point x="369" y="-398"/>
-      <point x="344" y="-395" type="curve" name="sv02" smooth="yes"/>
+      <point x="344" y="-395" type="curve" smooth="yes" name="sv02"/>
       <point x="285" y="-387"/>
       <point x="268" y="-380"/>
       <point x="245" y="-375" type="curve"/>
@@ -70,7 +70,7 @@
       <point x="357" y="-245" type="curve" smooth="yes"/>
       <point x="384" y="-251"/>
       <point x="409" y="-254"/>
-      <point x="434" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="434" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="479" y="-254"/>
       <point x="515" y="-244"/>
       <point x="538" y="-227" type="curve" smooth="yes"/>
@@ -88,7 +88,7 @@
       <point x="231" y="108" type="curve" smooth="yes"/>
       <point x="142" y="204"/>
       <point x="105" y="345"/>
-      <point x="105" y="517" type="curve" name="dh01" smooth="yes"/>
+      <point x="105" y="517" type="curve" smooth="yes" name="dh01"/>
       <point x="105" y="653"/>
       <point x="128" y="803"/>
       <point x="176" y="948" type="curve" smooth="yes"/>
@@ -100,7 +100,7 @@
       <point x="594" y="1463" type="curve" smooth="yes"/>
       <point x="682" y="1502"/>
       <point x="782" y="1520"/>
-      <point x="883" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="883" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="939" y="1520"/>
       <point x="985" y="1514"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/C_circumflex.glif b/source/Hack-BoldItalic.ufo/glyphs/C_circumflex.glif
index f329c56f4..ba0ca5c04 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/C_circumflex.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/C_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ccircumflex" format="1">
+<glyph name="Ccircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0108"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/C_dotaccent.glif b/source/Hack-BoldItalic.ufo/glyphs/C_dotaccent.glif
index a449a02fd..5939f5af6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/C_dotaccent.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/C_dotaccent.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Cdotaccent" format="1">
+<glyph name="Cdotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="010A"/>
   <outline>
     <contour>
-      <point x="763" y="1607" type="line" name="hr00" smooth="yes"/>
+      <point x="763" y="1607" type="line" smooth="yes" name="hr00"/>
       <point x="742" y="1607"/>
       <point x="732" y="1620"/>
       <point x="736" y="1640" type="curve" smooth="yes"/>
       <point x="773" y="1826" type="line"/>
       <point x="776" y="1844"/>
       <point x="786" y="1853"/>
-      <point x="805" y="1853" type="curve" name="dv03" smooth="yes"/>
+      <point x="805" y="1853" type="curve" smooth="yes" name="dv03"/>
       <point x="1020" y="1853" type="line" smooth="yes"/>
       <point x="1041" y="1853"/>
       <point x="1051" y="1840"/>
@@ -22,32 +22,32 @@
       <point x="978" y="1607" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="596" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="596" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="279" y="-29"/>
       <point x="106" y="151"/>
-      <point x="106" y="522" type="curve" name="dh01" smooth="yes"/>
+      <point x="106" y="522" type="curve" smooth="yes" name="dh01"/>
       <point x="106" y="805"/>
       <point x="208" y="1112"/>
       <point x="368" y="1296" type="curve" smooth="yes"/>
       <point x="497" y="1444"/>
       <point x="673" y="1520"/>
-      <point x="876" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="876" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="989" y="1520"/>
       <point x="1090" y="1496"/>
       <point x="1194" y="1448" type="curve"/>
       <point x="1130" y="1120" type="line"/>
       <point x="1065" y="1209"/>
       <point x="961" y="1257"/>
-      <point x="857" y="1257" type="curve" name="sv01" smooth="yes"/>
+      <point x="857" y="1257" type="curve" smooth="yes" name="sv01"/>
       <point x="732" y="1257"/>
       <point x="632" y="1188"/>
       <point x="559" y="1075" type="curve" smooth="yes"/>
       <point x="469" y="937"/>
       <point x="405" y="711"/>
-      <point x="405" y="536" type="curve" name="dh02" smooth="yes"/>
+      <point x="405" y="536" type="curve" smooth="yes" name="dh02"/>
       <point x="405" y="332"/>
       <point x="491" y="231"/>
-      <point x="652" y="231" type="curve" name="dv02" smooth="yes"/>
+      <point x="652" y="231" type="curve" smooth="yes" name="dv02"/>
       <point x="756" y="231"/>
       <point x="860" y="274"/>
       <point x="985" y="371" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/C_hi.glif b/source/Hack-BoldItalic.ufo/glyphs/C_hi.glif
index df4079036..0a1475c13 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/C_hi.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/C_hi.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Chi" format="1">
+<glyph name="Chi" format="2">
   <advance width="1233"/>
   <unicode hex="03A7"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/D_.glif b/source/Hack-BoldItalic.ufo/glyphs/D_.glif
index 8610f43ba..5c1a5e57c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/D_.glif
@@ -1,57 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="D" format="1">
+<glyph name="D" format="2">
   <advance width="1233"/>
   <unicode hex="0044"/>
   <outline>
     <contour>
-      <point x="283" y="1493" type="line" name="hr00"/>
+      <point x="283" y="1493" type="line"/>
       <point x="598" y="1493" type="line" smooth="yes"/>
-      <point x="783" y="1493"/>
-      <point x="929" y="1454"/>
-      <point x="1025" y="1370" type="curve" smooth="yes"/>
-      <point x="1118" y="1289"/>
-      <point x="1165" y="1163"/>
-      <point x="1165" y="996" type="curve" name="dh02" smooth="yes"/>
-      <point x="1165" y="948"/>
-      <point x="1161" y="877"/>
-      <point x="1152" y="814" type="curve" smooth="yes"/>
-      <point x="1144" y="759"/>
-      <point x="1127" y="668"/>
-      <point x="1111" y="603" type="curve" smooth="yes"/>
-      <point x="1084" y="495"/>
-      <point x="1050" y="407"/>
-      <point x="1021" y="347" type="curve" smooth="yes"/>
-      <point x="982" y="267"/>
-      <point x="936" y="210"/>
-      <point x="897" y="171" type="curve" smooth="yes"/>
-      <point x="837" y="112"/>
-      <point x="759" y="67"/>
-      <point x="671" y="40" type="curve" smooth="yes"/>
-      <point x="586" y="13"/>
-      <point x="470" y="0"/>
-      <point x="322" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="920.802" y="1493"/>
+      <point x="1165" y="1273.67"/>
+      <point x="1165" y="983.749" type="curve" smooth="yes"/>
+      <point x="1165" y="877.301"/>
+      <point x="1146.89" y="747.187"/>
+      <point x="1113.27" y="612.137" type="curve" smooth="yes"/>
+      <point x="999.321" y="154.321"/>
+      <point x="799.839" y="0"/>
+      <point x="322" y="0" type="curve" smooth="yes"/>
       <point x="-8" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="434" y="266" type="line" name="sv01" smooth="yes"/>
-      <point x="509" y="266"/>
-      <point x="572" y="281"/>
-      <point x="623" y="310" type="curve" smooth="yes"/>
-      <point x="679" y="341"/>
-      <point x="714" y="385"/>
-      <point x="743" y="442" type="curve" smooth="yes"/>
-      <point x="775" y="506"/>
-      <point x="807" y="599"/>
-      <point x="828" y="695" type="curve" smooth="yes"/>
-      <point x="851" y="795"/>
-      <point x="860" y="892"/>
-      <point x="860" y="960" type="curve" name="dh01" smooth="yes"/>
-      <point x="860" y="1057"/>
-      <point x="839" y="1120"/>
-      <point x="798" y="1163" type="curve" smooth="yes"/>
-      <point x="756" y="1206"/>
-      <point x="692" y="1227"/>
-      <point x="606" y="1227" type="curve" name="sv02" smooth="yes"/>
+      <point x="434" y="266" type="line" smooth="yes"/>
+      <point x="577.297" y="266"/>
+      <point x="678.846" y="316.116"/>
+      <point x="741.608" y="439.269" type="curve" smooth="yes"/>
+      <point x="802.256" y="558.274"/>
+      <point x="860" y="810.851"/>
+      <point x="860" y="950.314" type="curve" smooth="yes"/>
+      <point x="860" y="1142.1"/>
+      <point x="782.061" y="1227"/>
+      <point x="606" y="1227" type="curve" smooth="yes"/>
       <point x="524" y="1227" type="line"/>
       <point x="338" y="266" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/D_caron.glif b/source/Hack-BoldItalic.ufo/glyphs/D_caron.glif
index 5dae9d712..7802126f4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/D_caron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/D_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Dcaron" format="1">
+<glyph name="Dcaron" format="2">
   <advance width="1233"/>
   <unicode hex="010E"/>
   <outline>
@@ -17,7 +17,7 @@
       <point x="598" y="1493" type="line" smooth="yes"/>
       <point x="981" y="1493"/>
       <point x="1165" y="1330"/>
-      <point x="1165" y="994" type="curve" name="dh02" smooth="yes"/>
+      <point x="1165" y="994" type="curve" smooth="yes" name="dh02"/>
       <point x="1165" y="889"/>
       <point x="1147" y="751"/>
       <point x="1110" y="602" type="curve" smooth="yes"/>
@@ -26,20 +26,20 @@
       <point x="897" y="172" type="curve" smooth="yes"/>
       <point x="772" y="50"/>
       <point x="613" y="0"/>
-      <point x="322" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="322" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="-8" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="434" y="266" type="line" name="sv01" smooth="yes"/>
+      <point x="434" y="266" type="line" smooth="yes" name="sv01"/>
       <point x="587" y="266"/>
       <point x="682" y="323"/>
       <point x="743" y="442" type="curve" smooth="yes"/>
       <point x="807" y="564"/>
       <point x="860" y="800"/>
-      <point x="860" y="956" type="curve" name="dh01" smooth="yes"/>
+      <point x="860" y="956" type="curve" smooth="yes" name="dh01"/>
       <point x="860" y="1143"/>
       <point x="783" y="1227"/>
-      <point x="606" y="1227" type="curve" name="sv02" smooth="yes"/>
+      <point x="606" y="1227" type="curve" smooth="yes" name="sv02"/>
       <point x="524" y="1227" type="line"/>
       <point x="338" y="266" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/D_croat.glif b/source/Hack-BoldItalic.ufo/glyphs/D_croat.glif
index 5a75ebf17..ddc680965 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/D_croat.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/D_croat.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Dcroat" format="1">
+<glyph name="Dcroat" format="2">
   <advance width="1233"/>
   <unicode hex="0110"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="598" y="1493" type="line" smooth="yes"/>
       <point x="981" y="1493"/>
       <point x="1165" y="1330"/>
-      <point x="1165" y="994" type="curve" name="dh02" smooth="yes"/>
+      <point x="1165" y="994" type="curve" smooth="yes" name="dh02"/>
       <point x="1165" y="889"/>
       <point x="1147" y="751"/>
       <point x="1110" y="602" type="curve" smooth="yes"/>
@@ -21,20 +21,20 @@
       <point x="897" y="172" type="curve" smooth="yes"/>
       <point x="772" y="50"/>
       <point x="613" y="0"/>
-      <point x="322" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="322" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="-8" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="434" y="266" type="line" name="sv01" smooth="yes"/>
+      <point x="434" y="266" type="line" smooth="yes" name="sv01"/>
       <point x="587" y="266"/>
       <point x="682" y="323"/>
       <point x="743" y="442" type="curve" smooth="yes"/>
       <point x="807" y="564"/>
       <point x="860" y="800"/>
-      <point x="860" y="956" type="curve" name="dh01" smooth="yes"/>
+      <point x="860" y="956" type="curve" smooth="yes" name="dh01"/>
       <point x="860" y="1143"/>
       <point x="783" y="1227"/>
-      <point x="606" y="1227" type="curve" name="sv02" smooth="yes"/>
+      <point x="606" y="1227" type="curve" smooth="yes" name="sv02"/>
       <point x="524" y="1227" type="line"/>
       <point x="461" y="901" type="line" name="sv03"/>
       <point x="672" y="901" type="line"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/E_.glif b/source/Hack-BoldItalic.ufo/glyphs/E_.glif
index a1441bd33..fb0c615ba 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/E_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="E" format="1">
+<glyph name="E" format="2">
   <advance width="1233"/>
   <unicode hex="0045"/>
   <outline>
     <contour>
-      <point x="317" y="1493" type="line" name="hr00"/>
+      <point x="317" y="1493" type="line"/>
       <point x="1249" y="1493" type="line"/>
-      <point x="1198" y="1233" type="line" name="sv01"/>
+      <point x="1198" y="1233" type="line"/>
       <point x="563" y="1233" type="line"/>
       <point x="500" y="911" type="line"/>
-      <point x="1075" y="911" type="line" name="dv02"/>
-      <point x="1026" y="651" type="line" name="dv01"/>
+      <point x="1075" y="911" type="line"/>
+      <point x="1026" y="651" type="line"/>
       <point x="451" y="651" type="line"/>
-      <point x="375" y="260" type="line" name="sv02"/>
+      <point x="375" y="260" type="line"/>
       <point x="1010" y="260" type="line"/>
-      <point x="958" y="0" type="line" name="ab01"/>
+      <point x="958" y="0" type="line"/>
       <point x="29" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/E_acute.glif b/source/Hack-BoldItalic.ufo/glyphs/E_acute.glif
index 68a3f9067..d2cf2f3b6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/E_acute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/E_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Eacute" format="1">
+<glyph name="Eacute" format="2">
   <advance width="1233"/>
   <unicode hex="00C9"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/E_breve.glif b/source/Hack-BoldItalic.ufo/glyphs/E_breve.glif
index 8b8a57f32..e4043205a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/E_breve.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/E_breve.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ebreve" format="1">
+<glyph name="Ebreve" format="2">
   <advance width="1233"/>
   <unicode hex="0114"/>
   <outline>
@@ -18,7 +18,7 @@
       <point x="29" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="807" y="1608" type="curve" name="dv03" smooth="yes"/>
+      <point x="807" y="1608" type="curve" smooth="yes" name="dv03"/>
       <point x="711" y="1608"/>
       <point x="644" y="1631"/>
       <point x="595" y="1676" type="curve" smooth="yes"/>
@@ -32,7 +32,7 @@
       <point x="715" y="1785" type="curve" smooth="yes"/>
       <point x="742" y="1766"/>
       <point x="781" y="1757"/>
-      <point x="832" y="1757" type="curve" name="dv04" smooth="yes"/>
+      <point x="832" y="1757" type="curve" smooth="yes" name="dv04"/>
       <point x="885" y="1757"/>
       <point x="923" y="1767"/>
       <point x="959" y="1788" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/E_caron.glif b/source/Hack-BoldItalic.ufo/glyphs/E_caron.glif
index c7a0dd46d..4e80e3776 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/E_caron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/E_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ecaron" format="1">
+<glyph name="Ecaron" format="2">
   <advance width="1233"/>
   <unicode hex="011A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/E_circumflex.glif b/source/Hack-BoldItalic.ufo/glyphs/E_circumflex.glif
index 38a6960da..edd6be994 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/E_circumflex.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/E_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ecircumflex" format="1">
+<glyph name="Ecircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00CA"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/E_dieresis.glif b/source/Hack-BoldItalic.ufo/glyphs/E_dieresis.glif
index d97579cb0..568ed23b8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/E_dieresis.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/E_dieresis.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Edieresis" format="1">
+<glyph name="Edieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00CB"/>
   <outline>
     <contour>
-      <point x="514" y="1607" type="line" name="hr00" smooth="yes"/>
+      <point x="514" y="1607" type="line" smooth="yes" name="hr00"/>
       <point x="496" y="1607"/>
       <point x="487" y="1615"/>
       <point x="487" y="1631" type="curve" smooth="yes"/>
@@ -14,7 +14,7 @@
       <point x="526" y="1826" type="line" smooth="yes"/>
       <point x="530" y="1844"/>
       <point x="541" y="1853"/>
-      <point x="558" y="1853" type="curve" name="dv01" smooth="yes"/>
+      <point x="558" y="1853" type="curve" smooth="yes" name="dv01"/>
       <point x="733" y="1853" type="line" smooth="yes"/>
       <point x="751" y="1853"/>
       <point x="760" y="1845"/>
@@ -28,7 +28,7 @@
       <point x="690" y="1607" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="910" y="1607" type="line" name="sv01" smooth="yes"/>
+      <point x="910" y="1607" type="line" smooth="yes" name="sv01"/>
       <point x="892" y="1607"/>
       <point x="883" y="1615"/>
       <point x="883" y="1631" type="curve" smooth="yes"/>
@@ -38,7 +38,7 @@
       <point x="921" y="1826" type="line"/>
       <point x="924" y="1844"/>
       <point x="934" y="1853"/>
-      <point x="953" y="1853" type="curve" name="sv02" smooth="yes"/>
+      <point x="953" y="1853" type="curve" smooth="yes" name="sv02"/>
       <point x="1128" y="1853" type="line" smooth="yes"/>
       <point x="1148" y="1853"/>
       <point x="1159" y="1840"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/E_dotaccent.glif b/source/Hack-BoldItalic.ufo/glyphs/E_dotaccent.glif
index 9dc06f2b3..06f8c04bc 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/E_dotaccent.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/E_dotaccent.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Edotaccent" format="1">
+<glyph name="Edotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="0116"/>
   <outline>
     <contour>
-      <point x="709" y="1606" type="line" name="hr00" smooth="yes"/>
+      <point x="709" y="1606" type="line" smooth="yes" name="hr00"/>
       <point x="688" y="1606"/>
       <point x="678" y="1619"/>
       <point x="682" y="1639" type="curve" smooth="yes"/>
       <point x="719" y="1825" type="line"/>
       <point x="722" y="1843"/>
       <point x="732" y="1852"/>
-      <point x="751" y="1852" type="curve" name="dv01" smooth="yes"/>
+      <point x="751" y="1852" type="curve" smooth="yes" name="dv01"/>
       <point x="966" y="1852" type="line" smooth="yes"/>
       <point x="987" y="1852"/>
       <point x="997" y="1839"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/E_grave.glif b/source/Hack-BoldItalic.ufo/glyphs/E_grave.glif
index 51c390e08..b20361472 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/E_grave.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/E_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Egrave" format="1">
+<glyph name="Egrave" format="2">
   <advance width="1233"/>
   <unicode hex="00C8"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/E_macron.glif b/source/Hack-BoldItalic.ufo/glyphs/E_macron.glif
index 77f9bb451..5c33313f5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/E_macron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/E_macron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Emacron" format="1">
+<glyph name="Emacron" format="2">
   <advance width="1233"/>
   <unicode hex="0112"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/E_ng.glif b/source/Hack-BoldItalic.ufo/glyphs/E_ng.glif
index 0597bb7b0..48d886f7d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/E_ng.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/E_ng.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Eng" format="1">
+<glyph name="Eng" format="2">
   <advance width="1233"/>
   <unicode hex="014A"/>
   <outline>
@@ -12,10 +12,10 @@
       <point x="902" y="1015" type="line" smooth="yes"/>
       <point x="909" y="1050"/>
       <point x="912" y="1082"/>
-      <point x="912" y="1107" type="curve" name="dh02" smooth="yes"/>
+      <point x="912" y="1107" type="curve" smooth="yes" name="dh02"/>
       <point x="912" y="1210"/>
       <point x="861" y="1255"/>
-      <point x="758" y="1255" type="curve" name="sv02" smooth="yes"/>
+      <point x="758" y="1255" type="curve" smooth="yes" name="sv02"/>
       <point x="600" y="1255"/>
       <point x="498" y="1145"/>
       <point x="463" y="972" type="curve"/>
@@ -26,17 +26,17 @@
       <point x="518" y="1253" type="line" name="sh02"/>
       <point x="602" y="1425"/>
       <point x="741" y="1522"/>
-      <point x="916" y="1522" type="curve" name="sv03" smooth="yes"/>
+      <point x="916" y="1522" type="curve" smooth="yes" name="sv03"/>
       <point x="1107" y="1522"/>
       <point x="1207" y="1407"/>
-      <point x="1207" y="1172" type="curve" name="sh03" smooth="yes"/>
+      <point x="1207" y="1172" type="curve" smooth="yes" name="sh03"/>
       <point x="1207" y="1105"/>
       <point x="1199" y="1029"/>
       <point x="1182" y="942" type="curve" smooth="yes"/>
       <point x="1010" y="58" type="line" smooth="yes"/>
       <point x="940" y="-298"/>
       <point x="801" y="-426"/>
-      <point x="524" y="-426" type="curve" name="dh01" smooth="yes"/>
+      <point x="524" y="-426" type="curve" smooth="yes" name="dh01"/>
       <point x="403" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/E_ogonek.glif b/source/Hack-BoldItalic.ufo/glyphs/E_ogonek.glif
index bc1ff90fd..19c6fa9d4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/E_ogonek.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/E_ogonek.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Eogonek" format="1">
+<glyph name="Eogonek" format="2">
   <advance width="1233"/>
   <unicode hex="0118"/>
   <outline>
@@ -18,20 +18,20 @@
       <point x="729" y="-117" type="curve" smooth="yes"/>
       <point x="713" y="-142"/>
       <point x="705" y="-162"/>
-      <point x="705" y="-182" type="curve" name="dh02" smooth="yes"/>
+      <point x="705" y="-182" type="curve" smooth="yes" name="dh02"/>
       <point x="705" y="-221"/>
       <point x="736" y="-254"/>
-      <point x="805" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="805" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="841" y="-254"/>
       <point x="898" y="-246"/>
       <point x="961" y="-223" type="curve"/>
       <point x="930" y="-379" type="line"/>
       <point x="865" y="-394"/>
       <point x="802" y="-401"/>
-      <point x="751" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="751" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="614" y="-401"/>
       <point x="531" y="-350"/>
-      <point x="531" y="-255" type="curve" name="dh01" smooth="yes"/>
+      <point x="531" y="-255" type="curve" smooth="yes" name="dh01"/>
       <point x="531" y="-183"/>
       <point x="579" y="-95"/>
       <point x="687" y="0" type="curve" name="ih01"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/E_psilon.glif b/source/Hack-BoldItalic.ufo/glyphs/E_psilon.glif
index cfd2dd648..316ed8cc8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/E_psilon.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/E_psilon.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Epsilon" format="1">
+<glyph name="Epsilon" format="2">
   <advance width="1233"/>
   <unicode hex="0395"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/E_psilontonos.glif b/source/Hack-BoldItalic.ufo/glyphs/E_psilontonos.glif
index fa15251be..27b6b4167 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/E_psilontonos.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/E_psilontonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Epsilontonos" format="1">
+<glyph name="Epsilontonos" format="2">
   <advance width="1233"/>
   <unicode hex="0388"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/E_ta.glif b/source/Hack-BoldItalic.ufo/glyphs/E_ta.glif
index b2cd3e0fc..5ecc2bf8d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/E_ta.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/E_ta.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Eta" format="1">
+<glyph name="Eta" format="2">
   <advance width="1233"/>
   <unicode hex="0397"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/E_tatonos.glif b/source/Hack-BoldItalic.ufo/glyphs/E_tatonos.glif
index c2dcb513a..f8bf367d7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/E_tatonos.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/E_tatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Etatonos" format="1">
+<glyph name="Etatonos" format="2">
   <advance width="1233"/>
   <unicode hex="0389"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/E_th.glif b/source/Hack-BoldItalic.ufo/glyphs/E_th.glif
index 51b620f42..1ccfb21a6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/E_th.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/E_th.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Eth" format="1">
+<glyph name="Eth" format="2">
   <advance width="1233"/>
   <unicode hex="00D0"/>
   <outline>
@@ -15,7 +15,7 @@
       <point x="1055" y="1370" type="curve" smooth="yes"/>
       <point x="1148" y="1289"/>
       <point x="1195" y="1163"/>
-      <point x="1195" y="996" type="curve" name="dh02" smooth="yes"/>
+      <point x="1195" y="996" type="curve" smooth="yes" name="dh02"/>
       <point x="1195" y="948"/>
       <point x="1191" y="877"/>
       <point x="1182" y="814" type="curve" smooth="yes"/>
@@ -33,11 +33,11 @@
       <point x="701" y="40" type="curve" smooth="yes"/>
       <point x="609" y="12"/>
       <point x="497" y="0"/>
-      <point x="352" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="352" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="22" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="464" y="266" type="line" name="sv01" smooth="yes"/>
+      <point x="464" y="266" type="line" smooth="yes" name="sv01"/>
       <point x="539" y="266"/>
       <point x="602" y="281"/>
       <point x="653" y="310" type="curve" smooth="yes"/>
@@ -49,13 +49,13 @@
       <point x="858" y="695" type="curve" smooth="yes"/>
       <point x="881" y="795"/>
       <point x="890" y="892"/>
-      <point x="890" y="960" type="curve" name="dh01" smooth="yes"/>
+      <point x="890" y="960" type="curve" smooth="yes" name="dh01"/>
       <point x="890" y="1057"/>
       <point x="869" y="1120"/>
       <point x="828" y="1163" type="curve" smooth="yes"/>
       <point x="786" y="1206"/>
       <point x="722" y="1227"/>
-      <point x="636" y="1227" type="curve" name="sv02" smooth="yes"/>
+      <point x="636" y="1227" type="curve" smooth="yes" name="sv02"/>
       <point x="554" y="1227" type="line"/>
       <point x="491" y="901" type="line" name="sv03"/>
       <point x="702" y="901" type="line"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/E_uro.glif b/source/Hack-BoldItalic.ufo/glyphs/E_uro.glif
index 6ab204f1e..87c452d6a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/E_uro.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/E_uro.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Euro" format="1">
+<glyph name="Euro" format="2">
   <advance width="1233"/>
   <unicode hex="20AC"/>
   <outline>
     <contour>
-      <point x="651" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="651" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="492" y="-29"/>
       <point x="374" y="21"/>
       <point x="294" y="105" type="curve" smooth="yes"/>
@@ -29,7 +29,7 @@
       <point x="524" y="1389" type="curve" smooth="yes"/>
       <point x="639" y="1476"/>
       <point x="772" y="1520"/>
-      <point x="924" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="924" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="979" y="1520"/>
       <point x="1032" y="1514"/>
       <point x="1084" y="1502" type="curve" smooth="yes"/>
@@ -42,7 +42,7 @@
       <point x="1046" y="1234" type="curve" smooth="yes"/>
       <point x="999" y="1261"/>
       <point x="947" y="1272"/>
-      <point x="896" y="1272" type="curve" name="sv01" smooth="yes"/>
+      <point x="896" y="1272" type="curve" smooth="yes" name="sv01"/>
       <point x="828" y="1272"/>
       <point x="763" y="1250"/>
       <point x="706" y="1205" type="curve" smooth="yes"/>
@@ -64,7 +64,7 @@
       <point x="524" y="289" type="curve" smooth="yes"/>
       <point x="567" y="242"/>
       <point x="623" y="219"/>
-      <point x="694" y="219" type="curve" name="dv01" smooth="yes"/>
+      <point x="694" y="219" type="curve" smooth="yes" name="dv01"/>
       <point x="742" y="219"/>
       <point x="793" y="229"/>
       <point x="842" y="250" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/F_.glif b/source/Hack-BoldItalic.ufo/glyphs/F_.glif
index 99a0fd076..e7a886795 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/F_.glif
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="F" format="1">
+<glyph name="F" format="2">
   <advance width="1233"/>
   <unicode hex="0046"/>
   <outline>
     <contour>
-      <point x="338" y="1493" type="line" name="hr00"/>
+      <point x="338" y="1493" type="line"/>
       <point x="1268" y="1493" type="line"/>
-      <point x="1217" y="1233" type="line" name="sv01"/>
+      <point x="1217" y="1233" type="line"/>
       <point x="582" y="1233" type="line"/>
       <point x="520" y="901" type="line"/>
-      <point x="1098" y="901" type="line" name="dv02"/>
-      <point x="1047" y="641" type="line" name="dv01"/>
+      <point x="1098" y="901" type="line"/>
+      <point x="1047" y="641" type="line"/>
       <point x="469" y="641" type="line"/>
-      <point x="342" y="0" type="line" name="ab01"/>
+      <point x="342" y="0" type="line"/>
       <point x="47" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/G_.glif b/source/Hack-BoldItalic.ufo/glyphs/G_.glif
index 1ff619f05..cf1caf476 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/G_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/G_.glif
@@ -1,81 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="G" format="1">
+<glyph name="G" format="2">
   <advance width="1233"/>
   <unicode hex="0047"/>
   <outline>
     <contour>
-      <point x="611" y="-29" type="curve" name="hr00" smooth="yes"/>
-      <point x="440" y="-29"/>
-      <point x="319" y="24"/>
-      <point x="235" y="115" type="curve" smooth="yes"/>
-      <point x="142" y="216"/>
-      <point x="102" y="359"/>
-      <point x="102" y="528" type="curve" name="dh01" smooth="yes"/>
-      <point x="102" y="656"/>
-      <point x="125" y="805"/>
-      <point x="174" y="949" type="curve" smooth="yes"/>
-      <point x="217" y="1074"/>
-      <point x="282" y="1197"/>
-      <point x="367" y="1294" type="curve" smooth="yes"/>
-      <point x="427" y="1362"/>
-      <point x="502" y="1422"/>
-      <point x="595" y="1463" type="curve" smooth="yes"/>
-      <point x="682" y="1501"/>
-      <point x="775" y="1520"/>
-      <point x="876" y="1520" type="curve" name="at01" smooth="yes"/>
-      <point x="932" y="1520"/>
-      <point x="984" y="1514"/>
-      <point x="1037" y="1502" type="curve" smooth="yes"/>
-      <point x="1080" y="1491"/>
-      <point x="1137" y="1475"/>
+      <point x="608.598" y="-29" type="curve" smooth="yes"/>
+      <point x="316.08" y="-29"/>
+      <point x="102" y="214.751"/>
+      <point x="102" y="547.813" type="curve" smooth="yes"/>
+      <point x="102" y="1095.48"/>
+      <point x="438.314" y="1520"/>
+      <point x="878.092" y="1520" type="curve" smooth="yes"/>
+      <point x="984.91" y="1520"/>
+      <point x="1096.16" y="1494.95"/>
       <point x="1192" y="1448" type="curve"/>
       <point x="1126" y="1120" type="line"/>
-      <point x="1092" y="1165"/>
-      <point x="1052" y="1199"/>
-      <point x="1006" y="1222" type="curve" smooth="yes"/>
-      <point x="959" y="1245"/>
-      <point x="910" y="1257"/>
-      <point x="857" y="1257" type="curve" name="sv01" smooth="yes"/>
-      <point x="805" y="1257"/>
-      <point x="760" y="1245"/>
-      <point x="721" y="1228" type="curve" smooth="yes"/>
-      <point x="681" y="1209"/>
-      <point x="644" y="1184"/>
-      <point x="605" y="1141" type="curve" smooth="yes"/>
-      <point x="574" y="1108"/>
-      <point x="552" y="1072"/>
-      <point x="529" y="1031" type="curve" smooth="yes"/>
-      <point x="508" y="992"/>
-      <point x="488" y="948"/>
-      <point x="469" y="891" type="curve" smooth="yes"/>
-      <point x="449" y="831"/>
-      <point x="431" y="762"/>
-      <point x="420" y="702" type="curve" smooth="yes"/>
-      <point x="409" y="639"/>
-      <point x="403" y="583"/>
-      <point x="403" y="533" type="curve" name="dh02" smooth="yes"/>
-      <point x="403" y="424"/>
-      <point x="431" y="353"/>
-      <point x="467" y="309" type="curve" smooth="yes"/>
-      <point x="512" y="253"/>
-      <point x="576" y="231"/>
-      <point x="648" y="231" type="curve" name="dv01" smooth="yes"/>
-      <point x="673" y="231"/>
-      <point x="692" y="233"/>
-      <point x="715" y="240" type="curve" smooth="yes"/>
-      <point x="731" y="244"/>
-      <point x="750" y="249"/>
+      <point x="1059.09" y="1208.61"/>
+      <point x="963.62" y="1257"/>
+      <point x="860.017" y="1257" type="curve" smooth="yes"/>
+      <point x="541.835" y="1257"/>
+      <point x="403" y="800.584"/>
+      <point x="403" y="544.707" type="curve" smooth="yes"/>
+      <point x="403" y="342.4"/>
+      <point x="489.788" y="231"/>
+      <point x="634.239" y="231" type="curve" smooth="yes"/>
+      <point x="687.393" y="231"/>
+      <point x="745.76" y="246.084"/>
       <point x="770" y="264" type="curve"/>
       <point x="827" y="555" type="line"/>
-      <point x="621" y="555" type="line" name="dv02"/>
-      <point x="670" y="803" type="line" name="dv03"/>
+      <point x="621" y="555" type="line"/>
+      <point x="670" y="803" type="line"/>
       <point x="1130" y="803" type="line"/>
       <point x="991" y="94" type="line"/>
-      <point x="943" y="54"/>
-      <point x="887" y="24"/>
-      <point x="823" y="3" type="curve" smooth="yes"/>
-      <point x="757" y="-18"/>
-      <point x="686" y="-29"/>
+      <point x="895.284" y="14.2431"/>
+      <point x="760.843" y="-29"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/G_amma.glif b/source/Hack-BoldItalic.ufo/glyphs/G_amma.glif
index 1df4ff004..880ca7144 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/G_amma.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/G_amma.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Gamma" format="1">
+<glyph name="Gamma" format="2">
   <advance width="1233"/>
   <unicode hex="0393"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/G_breve.glif b/source/Hack-BoldItalic.ufo/glyphs/G_breve.glif
index 56c6f1682..b17672bc3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/G_breve.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/G_breve.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Gbreve" format="1">
+<glyph name="Gbreve" format="2">
   <advance width="1233"/>
   <unicode hex="011E"/>
   <outline>
     <contour>
-      <point x="807" y="1588" type="curve" name="dv03" smooth="yes"/>
+      <point x="807" y="1588" type="curve" smooth="yes" name="dv03"/>
       <point x="711" y="1588"/>
       <point x="644" y="1611"/>
       <point x="595" y="1656" type="curve" smooth="yes"/>
@@ -18,7 +18,7 @@
       <point x="715" y="1765" type="curve" smooth="yes"/>
       <point x="742" y="1746"/>
       <point x="781" y="1737"/>
-      <point x="832" y="1737" type="curve" name="dv04" smooth="yes"/>
+      <point x="832" y="1737" type="curve" smooth="yes" name="dv04"/>
       <point x="885" y="1737"/>
       <point x="923" y="1747"/>
       <point x="959" y="1768" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="902" y="1588"/>
     </contour>
     <contour>
-      <point x="611" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="611" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="440" y="-29"/>
       <point x="319" y="24"/>
       <point x="235" y="115" type="curve" smooth="yes"/>
       <point x="142" y="216"/>
       <point x="102" y="359"/>
-      <point x="102" y="528" type="curve" name="dh01" smooth="yes"/>
+      <point x="102" y="528" type="curve" smooth="yes" name="dh01"/>
       <point x="102" y="656"/>
       <point x="125" y="805"/>
       <point x="174" y="949" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="595" y="1463" type="curve" smooth="yes"/>
       <point x="682" y="1501"/>
       <point x="775" y="1520"/>
-      <point x="876" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="876" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="932" y="1520"/>
       <point x="984" y="1514"/>
       <point x="1037" y="1502" type="curve" smooth="yes"/>
@@ -64,7 +64,7 @@
       <point x="1006" y="1222" type="curve" smooth="yes"/>
       <point x="959" y="1245"/>
       <point x="910" y="1257"/>
-      <point x="857" y="1257" type="curve" name="sv03" smooth="yes"/>
+      <point x="857" y="1257" type="curve" smooth="yes" name="sv03"/>
       <point x="805" y="1257"/>
       <point x="760" y="1245"/>
       <point x="721" y="1228" type="curve" smooth="yes"/>
@@ -82,13 +82,13 @@
       <point x="420" y="702" type="curve" smooth="yes"/>
       <point x="409" y="639"/>
       <point x="403" y="583"/>
-      <point x="403" y="533" type="curve" name="dh02" smooth="yes"/>
+      <point x="403" y="533" type="curve" smooth="yes" name="dh02"/>
       <point x="403" y="424"/>
       <point x="431" y="353"/>
       <point x="467" y="309" type="curve" smooth="yes"/>
       <point x="512" y="253"/>
       <point x="576" y="231"/>
-      <point x="648" y="231" type="curve" name="dv02" smooth="yes"/>
+      <point x="648" y="231" type="curve" smooth="yes" name="dv02"/>
       <point x="673" y="231"/>
       <point x="692" y="233"/>
       <point x="715" y="240" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/G_caron.glif b/source/Hack-BoldItalic.ufo/glyphs/G_caron.glif
index 9013f34c3..dbc3a3bd0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/G_caron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/G_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Gcaron" format="1">
+<glyph name="Gcaron" format="2">
   <advance width="1233"/>
   <unicode hex="01E6"/>
   <outline>
@@ -13,23 +13,23 @@
       <point x="642" y="1589" type="line"/>
     </contour>
     <contour>
-      <point x="610" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="610" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="287" y="-29"/>
       <point x="102" y="168"/>
-      <point x="102" y="533" type="curve" name="dh01" smooth="yes"/>
+      <point x="102" y="533" type="curve" smooth="yes" name="dh01"/>
       <point x="102" y="805"/>
       <point x="204" y="1110"/>
       <point x="367" y="1294" type="curve" smooth="yes"/>
       <point x="499" y="1443"/>
       <point x="674" y="1520"/>
-      <point x="875" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="875" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="987" y="1520"/>
       <point x="1088" y="1496"/>
       <point x="1192" y="1448" type="curve"/>
       <point x="1126" y="1120" type="line"/>
       <point x="1058" y="1209"/>
       <point x="964" y="1257"/>
-      <point x="857" y="1257" type="curve" name="sv01" smooth="yes"/>
+      <point x="857" y="1257" type="curve" smooth="yes" name="sv01"/>
       <point x="764" y="1257"/>
       <point x="676" y="1221"/>
       <point x="604" y="1141" type="curve" smooth="yes"/>
@@ -38,10 +38,10 @@
       <point x="469" y="891" type="curve" smooth="yes"/>
       <point x="429" y="777"/>
       <point x="403" y="638"/>
-      <point x="403" y="533" type="curve" name="dh02" smooth="yes"/>
+      <point x="403" y="533" type="curve" smooth="yes" name="dh02"/>
       <point x="403" y="338"/>
       <point x="492" y="231"/>
-      <point x="645" y="231" type="curve" name="dv02" smooth="yes"/>
+      <point x="645" y="231" type="curve" smooth="yes" name="dv02"/>
       <point x="695" y="231"/>
       <point x="737" y="242"/>
       <point x="770" y="264" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/G_circumflex.glif b/source/Hack-BoldItalic.ufo/glyphs/G_circumflex.glif
index 4e672a484..5693eaa3c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/G_circumflex.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/G_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Gcircumflex" format="1">
+<glyph name="Gcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="011C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/G_dotaccent.glif b/source/Hack-BoldItalic.ufo/glyphs/G_dotaccent.glif
index eca7a184a..6c48abe81 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/G_dotaccent.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/G_dotaccent.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Gdotaccent" format="1">
+<glyph name="Gdotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="0120"/>
   <outline>
     <contour>
-      <point x="738" y="1607" type="line" name="hr00" smooth="yes"/>
+      <point x="738" y="1607" type="line" smooth="yes" name="hr00"/>
       <point x="717" y="1607"/>
       <point x="707" y="1620"/>
       <point x="711" y="1640" type="curve" smooth="yes"/>
       <point x="748" y="1826" type="line"/>
       <point x="751" y="1844"/>
       <point x="761" y="1853"/>
-      <point x="780" y="1853" type="curve" name="dv03" smooth="yes"/>
+      <point x="780" y="1853" type="curve" smooth="yes" name="dv03"/>
       <point x="995" y="1853" type="line" smooth="yes"/>
       <point x="1016" y="1853"/>
       <point x="1026" y="1840"/>
@@ -22,23 +22,23 @@
       <point x="953" y="1607" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="610" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="610" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="287" y="-29"/>
       <point x="102" y="168"/>
-      <point x="102" y="533" type="curve" name="dh01" smooth="yes"/>
+      <point x="102" y="533" type="curve" smooth="yes" name="dh01"/>
       <point x="102" y="805"/>
       <point x="204" y="1110"/>
       <point x="367" y="1294" type="curve" smooth="yes"/>
       <point x="499" y="1443"/>
       <point x="674" y="1520"/>
-      <point x="875" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="875" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="987" y="1520"/>
       <point x="1088" y="1496"/>
       <point x="1192" y="1448" type="curve"/>
       <point x="1126" y="1120" type="line"/>
       <point x="1058" y="1209"/>
       <point x="964" y="1257"/>
-      <point x="857" y="1257" type="curve" name="sv01" smooth="yes"/>
+      <point x="857" y="1257" type="curve" smooth="yes" name="sv01"/>
       <point x="764" y="1257"/>
       <point x="676" y="1221"/>
       <point x="604" y="1141" type="curve" smooth="yes"/>
@@ -47,10 +47,10 @@
       <point x="469" y="891" type="curve" smooth="yes"/>
       <point x="429" y="777"/>
       <point x="403" y="638"/>
-      <point x="403" y="533" type="curve" name="dh02" smooth="yes"/>
+      <point x="403" y="533" type="curve" smooth="yes" name="dh02"/>
       <point x="403" y="338"/>
       <point x="492" y="231"/>
-      <point x="645" y="231" type="curve" name="dv02" smooth="yes"/>
+      <point x="645" y="231" type="curve" smooth="yes" name="dv02"/>
       <point x="695" y="231"/>
       <point x="737" y="242"/>
       <point x="770" y="264" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/H_.glif b/source/Hack-BoldItalic.ufo/glyphs/H_.glif
index 3fc32129f..5fa4dd692 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/H_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/H_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="H" format="1">
+<glyph name="H" format="2">
   <advance width="1233"/>
   <unicode hex="0048"/>
   <outline>
     <contour>
-      <point x="283" y="1493" type="line" name="hr00"/>
+      <point x="283" y="1493" type="line"/>
       <point x="578" y="1493" type="line"/>
       <point x="467" y="924" type="line"/>
-      <point x="836" y="924" type="line" name="dv02"/>
-      <point x="946" y="1493" type="line" name="at01"/>
+      <point x="836" y="924" type="line"/>
+      <point x="946" y="1493" type="line"/>
       <point x="1241" y="1493" type="line"/>
-      <point x="950" y="0" type="line" name="ab01"/>
+      <point x="950" y="0" type="line"/>
       <point x="655" y="0" type="line"/>
-      <point x="784" y="664" type="line" name="dv01"/>
+      <point x="784" y="664" type="line"/>
       <point x="416" y="664" type="line"/>
-      <point x="287" y="0" type="line" name="ab02"/>
+      <point x="287" y="0" type="line"/>
       <point x="-8" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/H_bar.glif b/source/Hack-BoldItalic.ufo/glyphs/H_bar.glif
index 7ccae468c..e1e8f01b5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/H_bar.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/H_bar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Hbar" format="1">
+<glyph name="Hbar" format="2">
   <advance width="1233"/>
   <unicode hex="0126"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/H_circumflex.glif b/source/Hack-BoldItalic.ufo/glyphs/H_circumflex.glif
index 1bc63fd30..18fb0576c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/H_circumflex.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/H_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Hcircumflex" format="1">
+<glyph name="Hcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0124"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/I_.glif b/source/Hack-BoldItalic.ufo/glyphs/I_.glif
index 2a551723f..d405d6b01 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/I_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/I_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="I" format="1">
+<glyph name="I" format="2">
   <advance width="1233"/>
   <unicode hex="0049"/>
   <outline>
     <contour>
-      <point x="78" y="260" type="line" name="hr00"/>
+      <point x="78" y="260" type="line"/>
       <point x="375" y="260" type="line"/>
-      <point x="563" y="1233" type="line" name="sv01"/>
+      <point x="563" y="1233" type="line"/>
       <point x="266" y="1233" type="line"/>
-      <point x="317" y="1493" type="line" name="at01"/>
+      <point x="317" y="1493" type="line"/>
       <point x="1206" y="1493" type="line"/>
-      <point x="1155" y="1233" type="line" name="sv02"/>
-      <point x="858" y="1233" type="line" name="sv03"/>
-      <point x="670" y="260" type="line" name="sv04"/>
-      <point x="967" y="260" type="line" name="sv05"/>
-      <point x="915" y="0" type="line" name="ab01"/>
+      <point x="1155" y="1233" type="line"/>
+      <point x="858" y="1233" type="line"/>
+      <point x="670" y="260" type="line"/>
+      <point x="967" y="260" type="line"/>
+      <point x="915" y="0" type="line"/>
       <point x="27" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/I_J_.glif b/source/Hack-BoldItalic.ufo/glyphs/I_J_.glif
index 300c1adb1..5666d1b38 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/I_J_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/I_J_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="IJ" format="1">
+<glyph name="IJ" format="2">
   <advance width="1233"/>
   <unicode hex="0132"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/I_acute.glif b/source/Hack-BoldItalic.ufo/glyphs/I_acute.glif
index 05b79f37a..d3825c3c1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/I_acute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/I_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Iacute" format="1">
+<glyph name="Iacute" format="2">
   <advance width="1233"/>
   <unicode hex="00CD"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/I_breve.glif b/source/Hack-BoldItalic.ufo/glyphs/I_breve.glif
index 92fb51b52..d06db59a6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/I_breve.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/I_breve.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ibreve" format="1">
+<glyph name="Ibreve" format="2">
   <advance width="1233"/>
   <unicode hex="012C"/>
   <outline>
     <contour>
-      <point x="775" y="1608" type="curve" name="dv03" smooth="yes"/>
+      <point x="775" y="1608" type="curve" smooth="yes" name="dv03"/>
       <point x="679" y="1608"/>
       <point x="612" y="1631"/>
       <point x="563" y="1676" type="curve" smooth="yes"/>
@@ -18,7 +18,7 @@
       <point x="683" y="1785" type="curve" smooth="yes"/>
       <point x="710" y="1767"/>
       <point x="749" y="1757"/>
-      <point x="800" y="1757" type="curve" name="dv04" smooth="yes"/>
+      <point x="800" y="1757" type="curve" smooth="yes" name="dv04"/>
       <point x="853" y="1757"/>
       <point x="891" y="1767"/>
       <point x="927" y="1788" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/I_circumflex.glif b/source/Hack-BoldItalic.ufo/glyphs/I_circumflex.glif
index 50d39523a..9ba84246d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/I_circumflex.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/I_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Icircumflex" format="1">
+<glyph name="Icircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00CE"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/I_dieresis.glif b/source/Hack-BoldItalic.ufo/glyphs/I_dieresis.glif
index 70c5f36e0..7da1fd3e0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/I_dieresis.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/I_dieresis.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Idieresis" format="1">
+<glyph name="Idieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00CF"/>
   <outline>
     <contour>
-      <point x="493" y="1606" type="line" name="hr00" smooth="yes"/>
+      <point x="493" y="1606" type="line" smooth="yes" name="hr00"/>
       <point x="475" y="1606"/>
       <point x="466" y="1614"/>
       <point x="466" y="1630" type="curve" smooth="yes"/>
@@ -14,7 +14,7 @@
       <point x="505" y="1825" type="line" smooth="yes"/>
       <point x="509" y="1843"/>
       <point x="520" y="1852"/>
-      <point x="537" y="1852" type="curve" name="dv01" smooth="yes"/>
+      <point x="537" y="1852" type="curve" smooth="yes" name="dv01"/>
       <point x="712" y="1852" type="line" smooth="yes"/>
       <point x="730" y="1852"/>
       <point x="739" y="1844"/>
@@ -28,7 +28,7 @@
       <point x="669" y="1606" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="889" y="1606" type="line" name="sv01" smooth="yes"/>
+      <point x="889" y="1606" type="line" smooth="yes" name="sv01"/>
       <point x="871" y="1606"/>
       <point x="862" y="1614"/>
       <point x="862" y="1630" type="curve" smooth="yes"/>
@@ -38,7 +38,7 @@
       <point x="900" y="1825" type="line"/>
       <point x="903" y="1843"/>
       <point x="913" y="1852"/>
-      <point x="932" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="932" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="1107" y="1852" type="line" smooth="yes"/>
       <point x="1127" y="1852"/>
       <point x="1138" y="1839"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/I_dotaccent.glif b/source/Hack-BoldItalic.ufo/glyphs/I_dotaccent.glif
index 11d15e3b6..1b7338fdc 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/I_dotaccent.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/I_dotaccent.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Idotaccent" format="1">
+<glyph name="Idotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="0130"/>
   <outline>
     <contour>
-      <point x="674" y="1607" type="line" name="hr00" smooth="yes"/>
+      <point x="674" y="1607" type="line" smooth="yes" name="hr00"/>
       <point x="654" y="1607"/>
       <point x="643" y="1620"/>
       <point x="647" y="1640" type="curve" smooth="yes"/>
       <point x="683" y="1826" type="line"/>
       <point x="686" y="1844"/>
       <point x="696" y="1853"/>
-      <point x="715" y="1853" type="curve" name="dv01" smooth="yes"/>
+      <point x="715" y="1853" type="curve" smooth="yes" name="dv01"/>
       <point x="929" y="1853" type="line" smooth="yes"/>
       <point x="949" y="1853"/>
       <point x="960" y="1840"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/I_grave.glif b/source/Hack-BoldItalic.ufo/glyphs/I_grave.glif
index e23e8bd0d..ac2c46a68 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/I_grave.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/I_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Igrave" format="1">
+<glyph name="Igrave" format="2">
   <advance width="1233"/>
   <unicode hex="00CC"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/I_macron.glif b/source/Hack-BoldItalic.ufo/glyphs/I_macron.glif
index 36695cd4e..65aebeba3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/I_macron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/I_macron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Imacron" format="1">
+<glyph name="Imacron" format="2">
   <advance width="1233"/>
   <unicode hex="012A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/I_ogonek.glif b/source/Hack-BoldItalic.ufo/glyphs/I_ogonek.glif
index 438ed8cd8..0e82037ac 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/I_ogonek.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/I_ogonek.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Iogonek" format="1">
+<glyph name="Iogonek" format="2">
   <advance width="1233"/>
   <unicode hex="012E"/>
   <outline>
@@ -14,20 +14,20 @@
       <point x="519" y="-117" type="curve" smooth="yes"/>
       <point x="503" y="-142"/>
       <point x="495" y="-162"/>
-      <point x="495" y="-182" type="curve" name="dh02" smooth="yes"/>
+      <point x="495" y="-182" type="curve" smooth="yes" name="dh02"/>
       <point x="495" y="-221"/>
       <point x="526" y="-254"/>
-      <point x="595" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="595" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="631" y="-254"/>
       <point x="688" y="-246"/>
       <point x="751" y="-223" type="curve"/>
       <point x="720" y="-379" type="line"/>
       <point x="655" y="-394"/>
       <point x="592" y="-401"/>
-      <point x="541" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="541" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="404" y="-401"/>
       <point x="321" y="-350"/>
-      <point x="321" y="-255" type="curve" name="dh01" smooth="yes"/>
+      <point x="321" y="-255" type="curve" smooth="yes" name="dh01"/>
       <point x="321" y="-183"/>
       <point x="369" y="-95"/>
       <point x="477" y="0" type="curve" name="ih01"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/I_ota.glif b/source/Hack-BoldItalic.ufo/glyphs/I_ota.glif
index c486e33d1..d6b5b23fb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/I_ota.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/I_ota.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Iota" format="1">
+<glyph name="Iota" format="2">
   <advance width="1233"/>
   <unicode hex="0399"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/I_otadieresis.glif b/source/Hack-BoldItalic.ufo/glyphs/I_otadieresis.glif
index 24731b636..a19b9ab29 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/I_otadieresis.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/I_otadieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Iotadieresis" format="1">
+<glyph name="Iotadieresis" format="2">
   <advance width="1233"/>
   <unicode hex="03AA"/>
   <outline>
     <contour>
-      <point x="473" y="1608" type="line" name="hr00" smooth="yes"/>
+      <point x="473" y="1608" type="line" smooth="yes" name="hr00"/>
       <point x="452" y="1608"/>
       <point x="443" y="1621"/>
       <point x="447" y="1641" type="curve" smooth="yes"/>
       <point x="485" y="1827" type="line" smooth="yes"/>
       <point x="489" y="1845"/>
       <point x="500" y="1854"/>
-      <point x="517" y="1854" type="curve" name="dv01" smooth="yes"/>
+      <point x="517" y="1854" type="curve" smooth="yes" name="dv01"/>
       <point x="692" y="1854" type="line" smooth="yes"/>
       <point x="713" y="1854"/>
       <point x="722" y="1841"/>
@@ -22,14 +22,14 @@
       <point x="649" y="1608" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="869" y="1608" type="line" name="sv01" smooth="yes"/>
+      <point x="869" y="1608" type="line" smooth="yes" name="sv01"/>
       <point x="848" y="1608"/>
       <point x="839" y="1621"/>
       <point x="843" y="1641" type="curve" smooth="yes"/>
       <point x="880" y="1827" type="line"/>
       <point x="883" y="1845"/>
       <point x="893" y="1854"/>
-      <point x="912" y="1854" type="curve" name="sv02" smooth="yes"/>
+      <point x="912" y="1854" type="curve" smooth="yes" name="sv02"/>
       <point x="1087" y="1854" type="line" smooth="yes"/>
       <point x="1107" y="1854"/>
       <point x="1118" y="1841"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/I_otatonos.glif b/source/Hack-BoldItalic.ufo/glyphs/I_otatonos.glif
index 3a0ee70f8..96ee64b5f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/I_otatonos.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/I_otatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Iotatonos" format="1">
+<glyph name="Iotatonos" format="2">
   <advance width="1233"/>
   <unicode hex="038A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/I_tilde.glif b/source/Hack-BoldItalic.ufo/glyphs/I_tilde.glif
index 1296d372d..0f1780335 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/I_tilde.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/I_tilde.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Itilde" format="1">
+<glyph name="Itilde" format="2">
   <advance width="1233"/>
   <unicode hex="0128"/>
   <outline>
@@ -7,28 +7,28 @@
       <point x="428" y="1588" type="line" name="sv01"/>
       <point x="461" y="1761"/>
       <point x="553" y="1854"/>
-      <point x="680" y="1854" type="curve" name="dv02" smooth="yes"/>
+      <point x="680" y="1854" type="curve" smooth="yes" name="dv02"/>
       <point x="731" y="1854"/>
       <point x="770" y="1839"/>
       <point x="817" y="1803" type="curve" smooth="yes"/>
       <point x="870" y="1762" type="line"/>
       <point x="891" y="1744"/>
       <point x="915" y="1735"/>
-      <point x="940" y="1735" type="curve" name="dv04" smooth="yes"/>
+      <point x="940" y="1735" type="curve" smooth="yes" name="dv04"/>
       <point x="989" y="1735"/>
       <point x="1025" y="1777"/>
       <point x="1040" y="1854" type="curve" name="sv02"/>
       <point x="1177" y="1854" type="line"/>
       <point x="1142" y="1689"/>
       <point x="1058" y="1588"/>
-      <point x="925" y="1588" type="curve" name="dv03" smooth="yes"/>
+      <point x="925" y="1588" type="curve" smooth="yes" name="dv03"/>
       <point x="878" y="1588"/>
       <point x="839" y="1600"/>
       <point x="788" y="1639" type="curve" smooth="yes"/>
       <point x="739" y="1676" type="line" smooth="yes"/>
       <point x="706" y="1701"/>
       <point x="686" y="1708"/>
-      <point x="666" y="1708" type="curve" name="dv01" smooth="yes"/>
+      <point x="666" y="1708" type="curve" smooth="yes" name="dv01"/>
       <point x="615" y="1708"/>
       <point x="580" y="1667"/>
       <point x="565" y="1588" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/J_.glif b/source/Hack-BoldItalic.ufo/glyphs/J_.glif
index 1d3ee1e63..2ef1ed6bd 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/J_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/J_.glif
@@ -1,42 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="J" format="1">
+<glyph name="J" format="2">
   <advance width="1233"/>
   <unicode hex="004A"/>
   <outline>
     <contour>
-      <point x="411" y="-29" type="curve" name="hr00" smooth="yes"/>
-      <point x="338" y="-29"/>
-      <point x="261" y="-20"/>
-      <point x="192" y="-3" type="curve" smooth="yes"/>
-      <point x="131" y="12"/>
-      <point x="56" y="39"/>
+      <point x="404.67" y="-29" type="curve" smooth="yes"/>
+      <point x="278.002" y="-29"/>
+      <point x="102.26" y="15.28"/>
       <point x="-20" y="78" type="curve"/>
       <point x="45" y="422" type="line"/>
-      <point x="97" y="358"/>
-      <point x="153" y="310"/>
-      <point x="212" y="279" type="curve" smooth="yes"/>
-      <point x="271" y="247"/>
-      <point x="335" y="231"/>
-      <point x="406" y="231" type="curve" name="dv01" smooth="yes"/>
-      <point x="481" y="231"/>
-      <point x="537" y="249"/>
-      <point x="575" y="285" type="curve" smooth="yes"/>
-      <point x="614" y="321"/>
-      <point x="640" y="382"/>
+      <point x="149.036" y="293.911"/>
+      <point x="268.948" y="231"/>
+      <point x="411.836" y="231" type="curve" smooth="yes"/>
+      <point x="557.362" y="231"/>
+      <point x="623.13" y="296.256"/>
       <point x="659" y="479" type="curve" smooth="yes"/>
-      <point x="807" y="1233" type="line" name="sv01"/>
+      <point x="807" y="1233" type="line"/>
       <point x="446" y="1233" type="line"/>
-      <point x="498" y="1493" type="line" name="at01"/>
+      <point x="498" y="1493" type="line"/>
       <point x="1153" y="1493" type="line"/>
       <point x="954" y="479" type="line" smooth="yes"/>
-      <point x="931" y="362"/>
-      <point x="907" y="280"/>
-      <point x="880" y="223" type="curve" smooth="yes"/>
-      <point x="826" y="110"/>
-      <point x="732" y="37"/>
-      <point x="614" y="-1" type="curve" smooth="yes"/>
-      <point x="553" y="-20"/>
-      <point x="484" y="-29"/>
+      <point x="929.45" y="353.904"/>
+      <point x="909.222" y="283.465"/>
+      <point x="881.966" y="227.068" type="curve" smooth="yes"/>
+      <point x="800.813" y="59.148"/>
+      <point x="635.747" y="-29"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/J_circumflex.glif b/source/Hack-BoldItalic.ufo/glyphs/J_circumflex.glif
index 1235b1c55..f44f31a40 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/J_circumflex.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/J_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Jcircumflex" format="1">
+<glyph name="Jcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0134"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/K_.glif b/source/Hack-BoldItalic.ufo/glyphs/K_.glif
index 76721d828..a8e1a55b3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/K_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/K_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="K" format="1">
+<glyph name="K" format="2">
   <advance width="1233"/>
   <unicode hex="004B"/>
   <outline>
     <contour>
-      <point x="270" y="1493" type="line" name="hr00"/>
+      <point x="270" y="1493" type="line"/>
       <point x="565" y="1493" type="line"/>
-      <point x="457" y="936" type="line" name="iv01"/>
-      <point x="1020" y="1493" type="line" name="at01"/>
+      <point x="457" y="936" type="line"/>
+      <point x="1020" y="1493" type="line"/>
       <point x="1368" y="1493" type="line"/>
       <point x="762" y="889" type="line"/>
-      <point x="1100" y="0" type="line" name="ab01"/>
+      <point x="1100" y="0" type="line"/>
       <point x="797" y="0" type="line"/>
-      <point x="543" y="670" type="line" name="iv02"/>
+      <point x="543" y="670" type="line"/>
       <point x="371" y="500" type="line"/>
-      <point x="276" y="0" type="line" name="ab02"/>
+      <point x="276" y="0" type="line"/>
       <point x="-18" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/K_appa.glif b/source/Hack-BoldItalic.ufo/glyphs/K_appa.glif
index afbae5e25..4aac414b7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/K_appa.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/K_appa.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Kappa" format="1">
+<glyph name="Kappa" format="2">
   <advance width="1233"/>
   <unicode hex="039A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/L_.glif b/source/Hack-BoldItalic.ufo/glyphs/L_.glif
index 3dc9dd44b..d89d0afab 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/L_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/L_.glif
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="L" format="1">
+<glyph name="L" format="2">
   <advance width="1233"/>
   <unicode hex="004C"/>
   <outline>
     <contour>
-      <point x="371" y="1493" type="line" name="hr00"/>
+      <point x="371" y="1493" type="line"/>
       <point x="666" y="1493" type="line"/>
-      <point x="426" y="260" type="line" name="sv01"/>
+      <point x="426" y="260" type="line"/>
       <point x="1057" y="260" type="line"/>
-      <point x="1006" y="0" type="line" name="ab01"/>
+      <point x="1006" y="0" type="line"/>
       <point x="80" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/L_acute.glif b/source/Hack-BoldItalic.ufo/glyphs/L_acute.glif
index 3ef66c45b..33672921d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/L_acute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/L_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Lacute" format="1">
+<glyph name="Lacute" format="2">
   <advance width="1233"/>
   <unicode hex="0139"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/L_ambda.glif b/source/Hack-BoldItalic.ufo/glyphs/L_ambda.glif
index 795d65993..30bbe2437 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/L_ambda.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/L_ambda.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Lambda" format="1">
+<glyph name="Lambda" format="2">
   <advance width="1233"/>
   <unicode hex="039B"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/L_caron.glif b/source/Hack-BoldItalic.ufo/glyphs/L_caron.glif
index 5db70a144..645b03b9d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/L_caron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/L_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Lcaron" format="1">
+<glyph name="Lcaron" format="2">
   <advance width="1233"/>
   <unicode hex="013D"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/L_dot.glif b/source/Hack-BoldItalic.ufo/glyphs/L_dot.glif
index 8962a9009..f72494d67 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/L_dot.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/L_dot.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ldot" format="1">
+<glyph name="Ldot" format="2">
   <advance width="1233"/>
   <unicode hex="013F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/L_slash.glif b/source/Hack-BoldItalic.ufo/glyphs/L_slash.glif
index 5510a43fe..4f7cc3007 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/L_slash.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/L_slash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Lslash" format="1">
+<glyph name="Lslash" format="2">
   <advance width="1233"/>
   <unicode hex="0141"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/M_.glif b/source/Hack-BoldItalic.ufo/glyphs/M_.glif
index 0f08a2122..21604af5c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/M_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/M_.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="M" format="1">
+<glyph name="M" format="2">
   <advance width="1233"/>
   <unicode hex="004D"/>
   <outline>
     <contour>
-      <point x="231" y="1493" type="line" name="hr00"/>
+      <point x="231" y="1493" type="line"/>
       <point x="584" y="1493" type="line"/>
-      <point x="633" y="838" type="line" name="iv01"/>
-      <point x="930" y="1493" type="line" name="at01"/>
+      <point x="633" y="838" type="line"/>
+      <point x="930" y="1493" type="line"/>
       <point x="1290" y="1493" type="line"/>
-      <point x="1001" y="0" type="line" name="ab01"/>
+      <point x="1001" y="0" type="line"/>
       <point x="748" y="0" type="line"/>
-      <point x="985" y="1198" type="line" name="iv02"/>
+      <point x="985" y="1198" type="line"/>
       <point x="692" y="543" type="line"/>
       <point x="473" y="543" type="line"/>
-      <point x="426" y="1198" type="line" name="iv03"/>
-      <point x="195" y="0" type="line" name="ab02"/>
+      <point x="426" y="1198" type="line"/>
+      <point x="195" y="0" type="line"/>
       <point x="-57" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/M_u.glif b/source/Hack-BoldItalic.ufo/glyphs/M_u.glif
index ed42365b3..c1adcf19b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/M_u.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/M_u.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Mu" format="1">
+<glyph name="Mu" format="2">
   <advance width="1233"/>
   <unicode hex="039C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/N_.glif b/source/Hack-BoldItalic.ufo/glyphs/N_.glif
index 03a291765..1dd7621e8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/N_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/N_.glif
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="N" format="1">
+<glyph name="N" format="2">
   <advance width="1233"/>
   <unicode hex="004E"/>
   <outline>
     <contour>
-      <point x="266" y="1493" type="line" name="hr00"/>
+      <point x="266" y="1493" type="line"/>
       <point x="569" y="1493" type="line"/>
-      <point x="784" y="408" type="line" name="iv01"/>
-      <point x="995" y="1493" type="line" name="at01"/>
+      <point x="784" y="408" type="line"/>
+      <point x="995" y="1493" type="line"/>
       <point x="1255" y="1493" type="line"/>
-      <point x="967" y="0" type="line" name="ab01"/>
+      <point x="967" y="0" type="line"/>
       <point x="674" y="0" type="line"/>
-      <point x="449" y="1085" type="line" name="iv02"/>
-      <point x="238" y="0" type="line" name="ab02"/>
+      <point x="449" y="1085" type="line"/>
+      <point x="238" y="0" type="line"/>
       <point x="-25" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/N_U_L_L_.glif b/source/Hack-BoldItalic.ufo/glyphs/N_U_L_L_.glif
index fa0b87887..79a4001e6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/N_U_L_L_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/N_U_L_L_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="NULL" format="1">
-  <advance width="0"/>
+<glyph name="NULL" format="2">
   <unicode hex="0000"/>
   <outline>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/N_acute.glif b/source/Hack-BoldItalic.ufo/glyphs/N_acute.glif
index 61f038a52..e87ffa6c3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/N_acute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/N_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Nacute" format="1">
+<glyph name="Nacute" format="2">
   <advance width="1233"/>
   <unicode hex="0143"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/N_caron.glif b/source/Hack-BoldItalic.ufo/glyphs/N_caron.glif
index 88b3bb0f8..2ea9cc71b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/N_caron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/N_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ncaron" format="1">
+<glyph name="Ncaron" format="2">
   <advance width="1233"/>
   <unicode hex="0147"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/N_tilde.glif b/source/Hack-BoldItalic.ufo/glyphs/N_tilde.glif
index 2850ba89b..dbcd96c3a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/N_tilde.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/N_tilde.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ntilde" format="1">
+<glyph name="Ntilde" format="2">
   <advance width="1233"/>
   <unicode hex="00D1"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="543" y="1785" type="curve" smooth="yes"/>
       <point x="586" y="1830"/>
       <point x="638" y="1854"/>
-      <point x="703" y="1854" type="curve" name="dv02" smooth="yes"/>
+      <point x="703" y="1854" type="curve" smooth="yes" name="dv02"/>
       <point x="728" y="1854"/>
       <point x="752" y="1850"/>
       <point x="774" y="1842" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="1110" y="1657" type="curve" smooth="yes"/>
       <point x="1067" y="1611"/>
       <point x="1014" y="1588"/>
-      <point x="951" y="1588" type="curve" name="sv02" smooth="yes"/>
+      <point x="951" y="1588" type="curve" smooth="yes" name="sv02"/>
       <point x="897" y="1588"/>
       <point x="868" y="1597"/>
       <point x="812" y="1639" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/N_u.glif b/source/Hack-BoldItalic.ufo/glyphs/N_u.glif
index b973c983e..ce93917b9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/N_u.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/N_u.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Nu" format="1">
+<glyph name="Nu" format="2">
   <advance width="1233"/>
   <unicode hex="039D"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/O_.glif b/source/Hack-BoldItalic.ufo/glyphs/O_.glif
index a23925e26..be3bd6898 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/O_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/O_.glif
@@ -1,95 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="O" format="1">
+<glyph name="O" format="2">
   <advance width="1233"/>
   <unicode hex="004F"/>
   <outline>
     <contour>
-      <point x="500" y="-29" type="curve" name="hr00" smooth="yes"/>
-      <point x="364" y="-29"/>
-      <point x="250" y="11"/>
-      <point x="173" y="98" type="curve" smooth="yes"/>
-      <point x="94" y="186"/>
-      <point x="61" y="312"/>
-      <point x="61" y="476" type="curve" name="sh01" smooth="yes"/>
-      <point x="61" y="593"/>
-      <point x="78" y="733"/>
-      <point x="111" y="870" type="curve" smooth="yes"/>
-      <point x="146" y="1015"/>
-      <point x="193" y="1133"/>
-      <point x="246" y="1228" type="curve" smooth="yes"/>
-      <point x="293" y="1312"/>
-      <point x="355" y="1389"/>
-      <point x="447" y="1445" type="curve" smooth="yes"/>
-      <point x="534" y="1497"/>
-      <point x="632" y="1520"/>
-      <point x="732" y="1520" type="curve" name="at01" smooth="yes"/>
-      <point x="869" y="1520"/>
-      <point x="982" y="1479"/>
-      <point x="1058" y="1395" type="curve" smooth="yes"/>
-      <point x="1143" y="1302"/>
-      <point x="1171" y="1168"/>
-      <point x="1171" y="1015" type="curve" name="sh02" smooth="yes"/>
-      <point x="1171" y="902"/>
-      <point x="1157" y="767"/>
-      <point x="1122" y="622" type="curve" smooth="yes"/>
-      <point x="1091" y="490"/>
-      <point x="1048" y="368"/>
-      <point x="988" y="264" type="curve" smooth="yes"/>
-      <point x="932" y="165"/>
-      <point x="870" y="97"/>
-      <point x="786" y="46" type="curve" smooth="yes"/>
-      <point x="701" y="-5"/>
-      <point x="604" y="-29"/>
+      <point x="511.563" y="-29" type="curve" smooth="yes"/>
+      <point x="208.503" y="-29"/>
+      <point x="61" y="223.645"/>
+      <point x="61" y="514.061" type="curve" smooth="yes"/>
+      <point x="61" y="774.332"/>
+      <point x="179.472" y="1288.14"/>
+      <point x="458.622" y="1451.88" type="curve" smooth="yes"/>
+      <point x="538.375" y="1498.66"/>
+      <point x="636.595" y="1520"/>
+      <point x="737.05" y="1520" type="curve" smooth="yes"/>
+      <point x="1061.4" y="1520"/>
+      <point x="1171" y="1297.5"/>
+      <point x="1171" y="1009.02" type="curve" smooth="yes"/>
+      <point x="1171" y="712.88"/>
+      <point x="1055.5" y="203.602"/>
+      <point x="772.694" y="38.1555" type="curve" smooth="yes"/>
+      <point x="693.068" y="-8.42599"/>
+      <point x="598.046" y="-29"/>
     </contour>
     <contour>
-      <point x="525" y="233" type="curve" name="dv01" smooth="yes"/>
-      <point x="565" y="233"/>
-      <point x="602" y="245"/>
-      <point x="635" y="269" type="curve" smooth="yes"/>
-      <point x="667" y="292"/>
-      <point x="696" y="326"/>
-      <point x="721" y="373" type="curve" smooth="yes"/>
-      <point x="738" y="405"/>
-      <point x="752" y="440"/>
-      <point x="767" y="483" type="curve" smooth="yes"/>
-      <point x="784" y="532"/>
-      <point x="794" y="569"/>
-      <point x="809" y="630" type="curve" smooth="yes"/>
-      <point x="829" y="714"/>
-      <point x="842" y="781"/>
-      <point x="853" y="846" type="curve" smooth="yes"/>
-      <point x="863" y="912"/>
-      <point x="868" y="970"/>
-      <point x="868" y="1020" type="curve" name="ah01" smooth="yes"/>
-      <point x="868" y="1101"/>
-      <point x="855" y="1161"/>
-      <point x="828" y="1200" type="curve" smooth="yes"/>
-      <point x="801" y="1240"/>
-      <point x="761" y="1260"/>
-      <point x="708" y="1260" type="curve" name="sv01" smooth="yes"/>
-      <point x="663" y="1260"/>
-      <point x="626" y="1245"/>
-      <point x="598" y="1225" type="curve" smooth="yes"/>
-      <point x="566" y="1202"/>
-      <point x="536" y="1165"/>
-      <point x="512" y="1121" type="curve" smooth="yes"/>
-      <point x="493" y="1088"/>
-      <point x="482" y="1056"/>
-      <point x="469" y="1017" type="curve" smooth="yes"/>
-      <point x="450" y="960"/>
-      <point x="443" y="932"/>
-      <point x="424" y="860" type="curve" smooth="yes"/>
-      <point x="407" y="791"/>
-      <point x="391" y="714"/>
-      <point x="380" y="646" type="curve" smooth="yes"/>
-      <point x="370" y="579"/>
-      <point x="365" y="520"/>
-      <point x="365" y="471" type="curve" name="sh03" smooth="yes"/>
-      <point x="365" y="390"/>
-      <point x="378" y="331"/>
-      <point x="405" y="292" type="curve" smooth="yes"/>
-      <point x="433" y="251"/>
-      <point x="474" y="233"/>
+      <point x="518.635" y="233" type="curve" smooth="yes"/>
+      <point x="608.873" y="233"/>
+      <point x="680.24" y="300.046"/>
+      <point x="720.651" y="372.295" type="curve" smooth="yes"/>
+      <point x="799.3" y="512.91"/>
+      <point x="868" y="865.092"/>
+      <point x="868" y="1025.97" type="curve" smooth="yes"/>
+      <point x="868" y="1133.15"/>
+      <point x="837.507" y="1260"/>
+      <point x="705.901" y="1260" type="curve" smooth="yes"/>
+      <point x="618.745" y="1260"/>
+      <point x="560.224" y="1204.37"/>
+      <point x="524.066" y="1142.12" type="curve" smooth="yes"/>
+      <point x="438.611" y="994.998"/>
+      <point x="365" y="616.264"/>
+      <point x="365" y="458.685" type="curve" smooth="yes"/>
+      <point x="365" y="354.672"/>
+      <point x="397.071" y="233"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/O_E_.glif b/source/Hack-BoldItalic.ufo/glyphs/O_E_.glif
index 2da42439d..83896fe2d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/O_E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/O_E_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="OE" format="1">
+<glyph name="OE" format="2">
   <advance width="1233"/>
   <unicode hex="0152"/>
   <outline>
     <contour>
-      <point x="474" y="0" type="line" name="hr00" smooth="yes"/>
+      <point x="474" y="0" type="line" smooth="yes" name="hr00"/>
       <point x="297" y="0"/>
       <point x="186" y="32"/>
       <point x="117" y="91" type="curve" smooth="yes"/>
       <point x="46" y="151"/>
       <point x="11" y="246"/>
-      <point x="11" y="402" type="curve" name="dh01" smooth="yes"/>
+      <point x="11" y="402" type="curve" smooth="yes" name="dh01"/>
       <point x="11" y="569"/>
       <point x="62" y="869"/>
       <point x="138" y="1083" type="curve" smooth="yes"/>
@@ -19,7 +19,7 @@
       <point x="334" y="1395" type="curve" smooth="yes"/>
       <point x="419" y="1463"/>
       <point x="521" y="1493"/>
-      <point x="646" y="1493" type="curve" name="at01" smooth="yes"/>
+      <point x="646" y="1493" type="curve" smooth="yes" name="at01"/>
       <point x="1332" y="1493" type="line"/>
       <point x="1280" y="1233" type="line" name="sv01"/>
       <point x="949" y="1233" type="line"/>
@@ -34,7 +34,7 @@
     <contour>
       <point x="506" y="260" type="line" name="sv03"/>
       <point x="695" y="1233" type="line" name="sv04"/>
-      <point x="644" y="1233" type="line" name="sv05" smooth="yes"/>
+      <point x="644" y="1233" type="line" smooth="yes" name="sv05"/>
       <point x="580" y="1233"/>
       <point x="536" y="1214"/>
       <point x="501" y="1186" type="curve" smooth="yes"/>
@@ -46,13 +46,13 @@
       <point x="327" y="717" type="curve" smooth="yes"/>
       <point x="307" y="610"/>
       <point x="295" y="508"/>
-      <point x="295" y="440" type="curve" name="dh02" smooth="yes"/>
+      <point x="295" y="440" type="curve" smooth="yes" name="dh02"/>
       <point x="295" y="371"/>
       <point x="307" y="330"/>
       <point x="334" y="302" type="curve" smooth="yes"/>
       <point x="358" y="275"/>
       <point x="395" y="260"/>
-      <point x="455" y="260" type="curve" name="sv06" smooth="yes"/>
+      <point x="455" y="260" type="curve" smooth="yes" name="sv06"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/O_acute.glif b/source/Hack-BoldItalic.ufo/glyphs/O_acute.glif
index 066bac84a..9af5df1a9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/O_acute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/O_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Oacute" format="1">
+<glyph name="Oacute" format="2">
   <advance width="1233"/>
   <unicode hex="00D3"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="626" y="1588" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="500" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="500" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="364" y="-29"/>
       <point x="250" y="11"/>
       <point x="173" y="98" type="curve" smooth="yes"/>
       <point x="94" y="186"/>
       <point x="61" y="312"/>
-      <point x="61" y="476" type="curve" name="sh02" smooth="yes"/>
+      <point x="61" y="476" type="curve" smooth="yes" name="sh02"/>
       <point x="61" y="593"/>
       <point x="78" y="733"/>
       <point x="111" y="870" type="curve" smooth="yes"/>
@@ -28,13 +28,13 @@
       <point x="447" y="1445" type="curve" smooth="yes"/>
       <point x="534" y="1497"/>
       <point x="632" y="1520"/>
-      <point x="732" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="732" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="869" y="1520"/>
       <point x="982" y="1479"/>
       <point x="1058" y="1395" type="curve" smooth="yes"/>
       <point x="1143" y="1302"/>
       <point x="1171" y="1168"/>
-      <point x="1171" y="1015" type="curve" name="sh01" smooth="yes"/>
+      <point x="1171" y="1015" type="curve" smooth="yes" name="sh01"/>
       <point x="1171" y="902"/>
       <point x="1157" y="767"/>
       <point x="1122" y="622" type="curve" smooth="yes"/>
@@ -48,7 +48,7 @@
       <point x="604" y="-29"/>
     </contour>
     <contour>
-      <point x="525" y="233" type="curve" name="dv02" smooth="yes"/>
+      <point x="525" y="233" type="curve" smooth="yes" name="dv02"/>
       <point x="565" y="233"/>
       <point x="602" y="245"/>
       <point x="635" y="269" type="curve" smooth="yes"/>
@@ -66,13 +66,13 @@
       <point x="853" y="846" type="curve" smooth="yes"/>
       <point x="863" y="912"/>
       <point x="868" y="970"/>
-      <point x="868" y="1020" type="curve" name="ah01" smooth="yes"/>
+      <point x="868" y="1020" type="curve" smooth="yes" name="ah01"/>
       <point x="868" y="1101"/>
       <point x="855" y="1161"/>
       <point x="828" y="1200" type="curve" smooth="yes"/>
       <point x="801" y="1240"/>
       <point x="761" y="1260"/>
-      <point x="708" y="1260" type="curve" name="sv01" smooth="yes"/>
+      <point x="708" y="1260" type="curve" smooth="yes" name="sv01"/>
       <point x="663" y="1260"/>
       <point x="626" y="1245"/>
       <point x="598" y="1225" type="curve" smooth="yes"/>
@@ -90,7 +90,7 @@
       <point x="380" y="646" type="curve" smooth="yes"/>
       <point x="370" y="579"/>
       <point x="365" y="520"/>
-      <point x="365" y="471" type="curve" name="sh03" smooth="yes"/>
+      <point x="365" y="471" type="curve" smooth="yes" name="sh03"/>
       <point x="365" y="390"/>
       <point x="378" y="331"/>
       <point x="405" y="292" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/O_breve.glif b/source/Hack-BoldItalic.ufo/glyphs/O_breve.glif
index 069a2a20a..be09a36f8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/O_breve.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/O_breve.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Obreve" format="1">
+<glyph name="Obreve" format="2">
   <advance width="1233"/>
   <unicode hex="014E"/>
   <outline>
     <contour>
-      <point x="500" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="500" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="364" y="-29"/>
       <point x="250" y="11"/>
       <point x="173" y="98" type="curve" smooth="yes"/>
       <point x="94" y="186"/>
       <point x="61" y="312"/>
-      <point x="61" y="476" type="curve" name="sh01" smooth="yes"/>
+      <point x="61" y="476" type="curve" smooth="yes" name="sh01"/>
       <point x="61" y="593"/>
       <point x="78" y="733"/>
       <point x="111" y="870" type="curve" smooth="yes"/>
@@ -22,13 +22,13 @@
       <point x="447" y="1445" type="curve" smooth="yes"/>
       <point x="534" y="1497"/>
       <point x="632" y="1520"/>
-      <point x="732" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="732" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="869" y="1520"/>
       <point x="982" y="1479"/>
       <point x="1058" y="1395" type="curve" smooth="yes"/>
       <point x="1143" y="1302"/>
       <point x="1171" y="1168"/>
-      <point x="1171" y="1015" type="curve" name="sh02" smooth="yes"/>
+      <point x="1171" y="1015" type="curve" smooth="yes" name="sh02"/>
       <point x="1171" y="902"/>
       <point x="1157" y="767"/>
       <point x="1122" y="622" type="curve" smooth="yes"/>
@@ -42,7 +42,7 @@
       <point x="604" y="-29"/>
     </contour>
     <contour>
-      <point x="525" y="233" type="curve" name="dv01" smooth="yes"/>
+      <point x="525" y="233" type="curve" smooth="yes" name="dv01"/>
       <point x="565" y="233"/>
       <point x="602" y="245"/>
       <point x="635" y="269" type="curve" smooth="yes"/>
@@ -60,13 +60,13 @@
       <point x="853" y="846" type="curve" smooth="yes"/>
       <point x="863" y="912"/>
       <point x="868" y="970"/>
-      <point x="868" y="1020" type="curve" name="ah01" smooth="yes"/>
+      <point x="868" y="1020" type="curve" smooth="yes" name="ah01"/>
       <point x="868" y="1101"/>
       <point x="855" y="1161"/>
       <point x="828" y="1200" type="curve" smooth="yes"/>
       <point x="801" y="1240"/>
       <point x="761" y="1260"/>
-      <point x="708" y="1260" type="curve" name="sv01" smooth="yes"/>
+      <point x="708" y="1260" type="curve" smooth="yes" name="sv01"/>
       <point x="663" y="1260"/>
       <point x="626" y="1245"/>
       <point x="598" y="1225" type="curve" smooth="yes"/>
@@ -84,7 +84,7 @@
       <point x="380" y="646" type="curve" smooth="yes"/>
       <point x="370" y="579"/>
       <point x="365" y="520"/>
-      <point x="365" y="471" type="curve" name="sh03" smooth="yes"/>
+      <point x="365" y="471" type="curve" smooth="yes" name="sh03"/>
       <point x="365" y="390"/>
       <point x="378" y="331"/>
       <point x="405" y="292" type="curve" smooth="yes"/>
@@ -92,7 +92,7 @@
       <point x="474" y="233"/>
     </contour>
     <contour>
-      <point x="790" y="1588" type="curve" name="dv03" smooth="yes"/>
+      <point x="790" y="1588" type="curve" smooth="yes" name="dv03"/>
       <point x="694" y="1588"/>
       <point x="627" y="1611"/>
       <point x="578" y="1656" type="curve" smooth="yes"/>
@@ -106,7 +106,7 @@
       <point x="698" y="1765" type="curve" smooth="yes"/>
       <point x="725" y="1747"/>
       <point x="764" y="1737"/>
-      <point x="815" y="1737" type="curve" name="dv04" smooth="yes"/>
+      <point x="815" y="1737" type="curve" smooth="yes" name="dv04"/>
       <point x="868" y="1737"/>
       <point x="906" y="1747"/>
       <point x="942" y="1768" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/O_circumflex.glif b/source/Hack-BoldItalic.ufo/glyphs/O_circumflex.glif
index 962af0fdc..835dabc28 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/O_circumflex.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/O_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ocircumflex" format="1">
+<glyph name="Ocircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00D4"/>
   <outline>
@@ -13,13 +13,13 @@
       <point x="385" y="1588" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="500" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="500" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="364" y="-29"/>
       <point x="250" y="11"/>
       <point x="173" y="98" type="curve" smooth="yes"/>
       <point x="94" y="186"/>
       <point x="61" y="312"/>
-      <point x="61" y="476" type="curve" name="sh02" smooth="yes"/>
+      <point x="61" y="476" type="curve" smooth="yes" name="sh02"/>
       <point x="61" y="593"/>
       <point x="78" y="733"/>
       <point x="111" y="870" type="curve" smooth="yes"/>
@@ -31,13 +31,13 @@
       <point x="447" y="1445" type="curve" smooth="yes"/>
       <point x="534" y="1497"/>
       <point x="632" y="1520"/>
-      <point x="732" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="732" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="869" y="1520"/>
       <point x="982" y="1479"/>
       <point x="1058" y="1395" type="curve" smooth="yes"/>
       <point x="1143" y="1302"/>
       <point x="1171" y="1168"/>
-      <point x="1171" y="1015" type="curve" name="sh01" smooth="yes"/>
+      <point x="1171" y="1015" type="curve" smooth="yes" name="sh01"/>
       <point x="1171" y="902"/>
       <point x="1157" y="767"/>
       <point x="1122" y="622" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="604" y="-29"/>
     </contour>
     <contour>
-      <point x="525" y="233" type="curve" name="dv02" smooth="yes"/>
+      <point x="525" y="233" type="curve" smooth="yes" name="dv02"/>
       <point x="565" y="233"/>
       <point x="602" y="245"/>
       <point x="635" y="269" type="curve" smooth="yes"/>
@@ -69,13 +69,13 @@
       <point x="853" y="846" type="curve" smooth="yes"/>
       <point x="863" y="912"/>
       <point x="868" y="970"/>
-      <point x="868" y="1020" type="curve" name="ah01" smooth="yes"/>
+      <point x="868" y="1020" type="curve" smooth="yes" name="ah01"/>
       <point x="868" y="1101"/>
       <point x="855" y="1161"/>
       <point x="828" y="1200" type="curve" smooth="yes"/>
       <point x="801" y="1240"/>
       <point x="761" y="1260"/>
-      <point x="708" y="1260" type="curve" name="sv02" smooth="yes"/>
+      <point x="708" y="1260" type="curve" smooth="yes" name="sv02"/>
       <point x="663" y="1260"/>
       <point x="626" y="1245"/>
       <point x="598" y="1225" type="curve" smooth="yes"/>
@@ -93,7 +93,7 @@
       <point x="380" y="646" type="curve" smooth="yes"/>
       <point x="370" y="579"/>
       <point x="365" y="520"/>
-      <point x="365" y="471" type="curve" name="sh03" smooth="yes"/>
+      <point x="365" y="471" type="curve" smooth="yes" name="sh03"/>
       <point x="365" y="390"/>
       <point x="378" y="331"/>
       <point x="405" y="292" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/O_dieresis.glif b/source/Hack-BoldItalic.ufo/glyphs/O_dieresis.glif
index c8fe508e7..77286b81c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/O_dieresis.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/O_dieresis.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Odieresis" format="1">
+<glyph name="Odieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00D6"/>
   <outline>
     <contour>
-      <point x="487" y="1606" type="line" name="hr00" smooth="yes"/>
+      <point x="487" y="1606" type="line" smooth="yes" name="hr00"/>
       <point x="469" y="1606"/>
       <point x="460" y="1615"/>
       <point x="460" y="1632" type="curve" smooth="yes"/>
@@ -14,7 +14,7 @@
       <point x="499" y="1825" type="line" smooth="yes"/>
       <point x="503" y="1843"/>
       <point x="514" y="1852"/>
-      <point x="531" y="1852" type="curve" name="dv03" smooth="yes"/>
+      <point x="531" y="1852" type="curve" smooth="yes" name="dv03"/>
       <point x="706" y="1852" type="line" smooth="yes"/>
       <point x="724" y="1852"/>
       <point x="733" y="1843"/>
@@ -28,17 +28,17 @@
       <point x="663" y="1606" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="883" y="1606" type="line" name="sv01" smooth="yes"/>
+      <point x="883" y="1606" type="line" smooth="yes" name="sv01"/>
       <point x="865" y="1606"/>
       <point x="856" y="1615"/>
-      <point x="856" y="1632" type="curve" name="sh01" smooth="yes"/>
+      <point x="856" y="1632" type="curve" smooth="yes" name="sh01"/>
       <point x="856" y="1637"/>
       <point x="857" y="1636"/>
       <point x="857" y="1639" type="curve" name="sh02"/>
       <point x="894" y="1825" type="line"/>
       <point x="897" y="1843"/>
       <point x="907" y="1852"/>
-      <point x="926" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="926" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="1101" y="1852" type="line" smooth="yes"/>
       <point x="1121" y="1852"/>
       <point x="1132" y="1839"/>
@@ -49,13 +49,13 @@
       <point x="1060" y="1606" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="500" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="500" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="364" y="-29"/>
       <point x="250" y="11"/>
       <point x="173" y="98" type="curve" smooth="yes"/>
       <point x="94" y="186"/>
       <point x="61" y="312"/>
-      <point x="61" y="476" type="curve" name="sh03" smooth="yes"/>
+      <point x="61" y="476" type="curve" smooth="yes" name="sh03"/>
       <point x="61" y="593"/>
       <point x="78" y="733"/>
       <point x="111" y="870" type="curve" smooth="yes"/>
@@ -67,13 +67,13 @@
       <point x="447" y="1445" type="curve" smooth="yes"/>
       <point x="534" y="1497"/>
       <point x="632" y="1520"/>
-      <point x="732" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="732" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="869" y="1520"/>
       <point x="982" y="1479"/>
       <point x="1058" y="1395" type="curve" smooth="yes"/>
       <point x="1143" y="1302"/>
       <point x="1171" y="1168"/>
-      <point x="1171" y="1015" type="curve" name="sh04" smooth="yes"/>
+      <point x="1171" y="1015" type="curve" smooth="yes" name="sh04"/>
       <point x="1171" y="902"/>
       <point x="1157" y="767"/>
       <point x="1122" y="622" type="curve" smooth="yes"/>
@@ -87,7 +87,7 @@
       <point x="604" y="-29"/>
     </contour>
     <contour>
-      <point x="525" y="233" type="curve" name="dv02" smooth="yes"/>
+      <point x="525" y="233" type="curve" smooth="yes" name="dv02"/>
       <point x="565" y="233"/>
       <point x="602" y="245"/>
       <point x="635" y="269" type="curve" smooth="yes"/>
@@ -105,13 +105,13 @@
       <point x="853" y="846" type="curve" smooth="yes"/>
       <point x="863" y="912"/>
       <point x="868" y="970"/>
-      <point x="868" y="1020" type="curve" name="ah01" smooth="yes"/>
+      <point x="868" y="1020" type="curve" smooth="yes" name="ah01"/>
       <point x="868" y="1101"/>
       <point x="855" y="1161"/>
       <point x="828" y="1200" type="curve" smooth="yes"/>
       <point x="801" y="1240"/>
       <point x="761" y="1260"/>
-      <point x="708" y="1260" type="curve" name="sv03" smooth="yes"/>
+      <point x="708" y="1260" type="curve" smooth="yes" name="sv03"/>
       <point x="663" y="1260"/>
       <point x="626" y="1245"/>
       <point x="598" y="1225" type="curve" smooth="yes"/>
@@ -129,7 +129,7 @@
       <point x="380" y="646" type="curve" smooth="yes"/>
       <point x="370" y="579"/>
       <point x="365" y="520"/>
-      <point x="365" y="471" type="curve" name="sh05" smooth="yes"/>
+      <point x="365" y="471" type="curve" smooth="yes" name="sh05"/>
       <point x="365" y="390"/>
       <point x="378" y="331"/>
       <point x="405" y="292" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/O_grave.glif b/source/Hack-BoldItalic.ufo/glyphs/O_grave.glif
index 84ce4a149..728601c55 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/O_grave.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/O_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ograve" format="1">
+<glyph name="Ograve" format="2">
   <advance width="1233"/>
   <unicode hex="00D2"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="739" y="1588" type="line" name="dv03"/>
     </contour>
     <contour>
-      <point x="500" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="500" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="364" y="-29"/>
       <point x="250" y="11"/>
       <point x="173" y="98" type="curve" smooth="yes"/>
       <point x="94" y="186"/>
       <point x="61" y="312"/>
-      <point x="61" y="476" type="curve" name="sh01" smooth="yes"/>
+      <point x="61" y="476" type="curve" smooth="yes" name="sh01"/>
       <point x="61" y="593"/>
       <point x="78" y="733"/>
       <point x="111" y="870" type="curve" smooth="yes"/>
@@ -28,13 +28,13 @@
       <point x="447" y="1445" type="curve" smooth="yes"/>
       <point x="534" y="1497"/>
       <point x="632" y="1520"/>
-      <point x="732" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="732" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="869" y="1520"/>
       <point x="982" y="1479"/>
       <point x="1058" y="1395" type="curve" smooth="yes"/>
       <point x="1143" y="1302"/>
       <point x="1171" y="1168"/>
-      <point x="1171" y="1015" type="curve" name="sh02" smooth="yes"/>
+      <point x="1171" y="1015" type="curve" smooth="yes" name="sh02"/>
       <point x="1171" y="902"/>
       <point x="1157" y="767"/>
       <point x="1122" y="622" type="curve" smooth="yes"/>
@@ -48,7 +48,7 @@
       <point x="604" y="-29"/>
     </contour>
     <contour>
-      <point x="525" y="233" type="curve" name="dv02" smooth="yes"/>
+      <point x="525" y="233" type="curve" smooth="yes" name="dv02"/>
       <point x="565" y="233"/>
       <point x="602" y="245"/>
       <point x="635" y="269" type="curve" smooth="yes"/>
@@ -66,13 +66,13 @@
       <point x="853" y="846" type="curve" smooth="yes"/>
       <point x="863" y="912"/>
       <point x="868" y="970"/>
-      <point x="868" y="1020" type="curve" name="ah01" smooth="yes"/>
+      <point x="868" y="1020" type="curve" smooth="yes" name="ah01"/>
       <point x="868" y="1101"/>
       <point x="855" y="1161"/>
       <point x="828" y="1200" type="curve" smooth="yes"/>
       <point x="801" y="1240"/>
       <point x="761" y="1260"/>
-      <point x="708" y="1260" type="curve" name="sv01" smooth="yes"/>
+      <point x="708" y="1260" type="curve" smooth="yes" name="sv01"/>
       <point x="663" y="1260"/>
       <point x="626" y="1245"/>
       <point x="598" y="1225" type="curve" smooth="yes"/>
@@ -90,7 +90,7 @@
       <point x="380" y="646" type="curve" smooth="yes"/>
       <point x="370" y="579"/>
       <point x="365" y="520"/>
-      <point x="365" y="471" type="curve" name="sh03" smooth="yes"/>
+      <point x="365" y="471" type="curve" smooth="yes" name="sh03"/>
       <point x="365" y="390"/>
       <point x="378" y="331"/>
       <point x="405" y="292" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/O_horn.glif b/source/Hack-BoldItalic.ufo/glyphs/O_horn.glif
index 75576d7d2..f1b0aaa37 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/O_horn.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/O_horn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ohorn" format="1">
+<glyph name="Ohorn" format="2">
   <advance width="1233"/>
   <unicode hex="01A0"/>
   <outline>
@@ -10,35 +10,35 @@
       <point x="1373" y="1365" type="curve" smooth="yes"/>
       <point x="1342" y="1213"/>
       <point x="1264" y="1127"/>
-      <point x="1149" y="1127" type="curve" name="sv01" smooth="yes"/>
+      <point x="1149" y="1127" type="curve" smooth="yes" name="sv01"/>
       <point x="1136" y="1127"/>
       <point x="1124" y="1128"/>
       <point x="1112" y="1130" type="curve" name="sh02"/>
       <point x="1117" y="1093"/>
       <point x="1119" y="1054"/>
-      <point x="1119" y="1011" type="curve" name="sh01" smooth="yes"/>
+      <point x="1119" y="1011" type="curve" smooth="yes" name="sh01"/>
       <point x="1119" y="784"/>
       <point x="1051" y="463"/>
       <point x="937" y="264" type="curve" smooth="yes"/>
       <point x="828" y="72"/>
       <point x="666" y="-29"/>
-      <point x="445" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="445" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="162" y="-29"/>
       <point x="9" y="139"/>
-      <point x="9" y="482" type="curve" name="sh03" smooth="yes"/>
+      <point x="9" y="482" type="curve" smooth="yes" name="sh03"/>
       <point x="9" y="728"/>
       <point x="87" y="1045"/>
       <point x="194" y="1229" type="curve"/>
       <point x="303" y="1421"/>
       <point x="463" y="1520"/>
-      <point x="683" y="1520" type="curve" name="hr01" smooth="yes"/>
+      <point x="683" y="1520" type="curve" smooth="yes" name="hr01"/>
       <point x="864" y="1520"/>
       <point x="991" y="1453"/>
       <point x="1060" y="1313" type="curve"/>
       <point x="1065" y="1310" type="line" smooth="yes"/>
       <point x="1086" y="1297"/>
       <point x="1106" y="1291"/>
-      <point x="1123" y="1291" type="curve" name="hr02" smooth="yes"/>
+      <point x="1123" y="1291" type="curve" smooth="yes" name="hr02"/>
       <point x="1170" y="1291"/>
       <point x="1216" y="1323"/>
       <point x="1232" y="1399" type="curve" smooth="yes"/>
@@ -53,10 +53,10 @@
       <point x="758" y="630" type="curve" smooth="yes"/>
       <point x="790" y="763"/>
       <point x="816" y="916"/>
-      <point x="816" y="1024" type="curve" name="ah01" smooth="yes"/>
+      <point x="816" y="1024" type="curve" smooth="yes" name="ah01"/>
       <point x="816" y="1181"/>
       <point x="762" y="1260"/>
-      <point x="653" y="1260" type="curve" name="sv02" smooth="yes"/>
+      <point x="653" y="1260" type="curve" smooth="yes" name="sv02"/>
       <point x="566" y="1260"/>
       <point x="510" y="1211"/>
       <point x="462" y="1119" type="curve" smooth="yes"/>
@@ -65,10 +65,10 @@
       <point x="370" y="861" type="curve" smooth="yes"/>
       <point x="330" y="702"/>
       <point x="313" y="537"/>
-      <point x="313" y="458" type="curve" name="sh04" smooth="yes"/>
+      <point x="313" y="458" type="curve" smooth="yes" name="sh04"/>
       <point x="313" y="315"/>
       <point x="365" y="233"/>
-      <point x="476" y="233" type="curve" name="hr04" smooth="yes"/>
+      <point x="476" y="233" type="curve" smooth="yes" name="hr04"/>
       <point x="560" y="233"/>
       <point x="618" y="281"/>
       <point x="667" y="373" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/O_hungarumlaut.glif b/source/Hack-BoldItalic.ufo/glyphs/O_hungarumlaut.glif
index ea23444a7..550d47191 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/O_hungarumlaut.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/O_hungarumlaut.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ohungarumlaut" format="1">
+<glyph name="Ohungarumlaut" format="2">
   <advance width="1233"/>
   <unicode hex="0150"/>
   <outline>
@@ -16,19 +16,19 @@
       <point x="812" y="1588" type="line" name="ih03"/>
     </contour>
     <contour>
-      <point x="497" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="497" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="214" y="-29"/>
       <point x="61" y="139"/>
-      <point x="61" y="482" type="curve" name="sh02" smooth="yes"/>
+      <point x="61" y="482" type="curve" smooth="yes" name="sh02"/>
       <point x="61" y="728"/>
       <point x="139" y="1045"/>
       <point x="246" y="1229" type="curve"/>
       <point x="355" y="1421"/>
       <point x="515" y="1520"/>
-      <point x="735" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="735" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1016" y="1520"/>
       <point x="1171" y="1354"/>
-      <point x="1171" y="1011" type="curve" name="sh01" smooth="yes"/>
+      <point x="1171" y="1011" type="curve" smooth="yes" name="sh01"/>
       <point x="1171" y="784"/>
       <point x="1103" y="463"/>
       <point x="989" y="264" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="718" y="-29"/>
     </contour>
     <contour>
-      <point x="528" y="233" type="curve" name="dv02" smooth="yes"/>
+      <point x="528" y="233" type="curve" smooth="yes" name="dv02"/>
       <point x="612" y="233"/>
       <point x="670" y="281"/>
       <point x="719" y="373" type="curve" smooth="yes"/>
@@ -45,10 +45,10 @@
       <point x="810" y="630" type="curve" smooth="yes"/>
       <point x="842" y="763"/>
       <point x="868" y="916"/>
-      <point x="868" y="1024" type="curve" name="ah01" smooth="yes"/>
+      <point x="868" y="1024" type="curve" smooth="yes" name="ah01"/>
       <point x="868" y="1181"/>
       <point x="814" y="1260"/>
-      <point x="705" y="1260" type="curve" name="sv03" smooth="yes"/>
+      <point x="705" y="1260" type="curve" smooth="yes" name="sv03"/>
       <point x="618" y="1260"/>
       <point x="562" y="1211"/>
       <point x="514" y="1119" type="curve" smooth="yes"/>
@@ -57,7 +57,7 @@
       <point x="422" y="861" type="curve" smooth="yes"/>
       <point x="382" y="702"/>
       <point x="365" y="537"/>
-      <point x="365" y="458" type="curve" name="sh03" smooth="yes"/>
+      <point x="365" y="458" type="curve" smooth="yes" name="sh03"/>
       <point x="365" y="315"/>
       <point x="417" y="233"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/O_macron.glif b/source/Hack-BoldItalic.ufo/glyphs/O_macron.glif
index ec3875740..89d669e91 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/O_macron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/O_macron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Omacron" format="1">
+<glyph name="Omacron" format="2">
   <advance width="1233"/>
   <unicode hex="014C"/>
   <outline>
@@ -10,19 +10,19 @@
       <point x="473" y="1662" type="line"/>
     </contour>
     <contour>
-      <point x="497" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="497" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="214" y="-29"/>
       <point x="61" y="139"/>
-      <point x="61" y="482" type="curve" name="sh01" smooth="yes"/>
+      <point x="61" y="482" type="curve" smooth="yes" name="sh01"/>
       <point x="61" y="728"/>
       <point x="139" y="1045"/>
       <point x="246" y="1229" type="curve"/>
       <point x="355" y="1421"/>
       <point x="515" y="1520"/>
-      <point x="735" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="735" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1016" y="1520"/>
       <point x="1171" y="1354"/>
-      <point x="1171" y="1011" type="curve" name="sh02" smooth="yes"/>
+      <point x="1171" y="1011" type="curve" smooth="yes" name="sh02"/>
       <point x="1171" y="784"/>
       <point x="1103" y="463"/>
       <point x="989" y="264" type="curve" smooth="yes"/>
@@ -30,7 +30,7 @@
       <point x="718" y="-29"/>
     </contour>
     <contour>
-      <point x="528" y="233" type="curve" name="dv02" smooth="yes"/>
+      <point x="528" y="233" type="curve" smooth="yes" name="dv02"/>
       <point x="612" y="233"/>
       <point x="670" y="281"/>
       <point x="719" y="373" type="curve" smooth="yes"/>
@@ -39,10 +39,10 @@
       <point x="810" y="630" type="curve" smooth="yes"/>
       <point x="842" y="763"/>
       <point x="868" y="916"/>
-      <point x="868" y="1024" type="curve" name="ah01" smooth="yes"/>
+      <point x="868" y="1024" type="curve" smooth="yes" name="ah01"/>
       <point x="868" y="1181"/>
       <point x="814" y="1260"/>
-      <point x="705" y="1260" type="curve" name="sv01" smooth="yes"/>
+      <point x="705" y="1260" type="curve" smooth="yes" name="sv01"/>
       <point x="618" y="1260"/>
       <point x="562" y="1211"/>
       <point x="514" y="1119" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="422" y="861" type="curve" smooth="yes"/>
       <point x="382" y="702"/>
       <point x="365" y="537"/>
-      <point x="365" y="458" type="curve" name="sh03" smooth="yes"/>
+      <point x="365" y="458" type="curve" smooth="yes" name="sh03"/>
       <point x="365" y="315"/>
       <point x="417" y="233"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/O_megatonos.glif b/source/Hack-BoldItalic.ufo/glyphs/O_megatonos.glif
index c3ddbdf6d..5f2c34d85 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/O_megatonos.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/O_megatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Omegatonos" format="1">
+<glyph name="Omegatonos" format="2">
   <advance width="1233"/>
   <unicode hex="038F"/>
   <outline>
@@ -14,16 +14,16 @@
       <point x="242" y="211" type="line" name="ih02"/>
       <point x="147" y="315"/>
       <point x="104" y="430"/>
-      <point x="104" y="582" type="curve" name="sh01" smooth="yes"/>
+      <point x="104" y="582" type="curve" smooth="yes" name="sh01"/>
       <point x="104" y="642"/>
       <point x="111" y="709"/>
       <point x="125" y="782" type="curve" smooth="yes"/>
       <point x="205" y="1192"/>
       <point x="454" y="1460"/>
-      <point x="772" y="1460" type="curve" name="sv03" smooth="yes"/>
+      <point x="772" y="1460" type="curve" smooth="yes" name="sv03"/>
       <point x="1030" y="1460"/>
       <point x="1179" y="1282"/>
-      <point x="1179" y="989" type="curve" name="sh02" smooth="yes"/>
+      <point x="1179" y="989" type="curve" smooth="yes" name="sh02"/>
       <point x="1179" y="925"/>
       <point x="1172" y="856"/>
       <point x="1158" y="782" type="curve" smooth="yes"/>
@@ -39,19 +39,19 @@
       <point x="849" y="748" type="curve" smooth="yes"/>
       <point x="865" y="828"/>
       <point x="873" y="898"/>
-      <point x="873" y="957" type="curve" name="ah01" smooth="yes"/>
+      <point x="873" y="957" type="curve" smooth="yes" name="ah01"/>
       <point x="873" y="1004"/>
       <point x="868" y="1044"/>
       <point x="858" y="1078" type="curve" smooth="yes"/>
       <point x="835" y="1157"/>
       <point x="789" y="1194"/>
-      <point x="722" y="1194" type="curve" name="sv02" smooth="yes"/>
+      <point x="722" y="1194" type="curve" smooth="yes" name="sv02"/>
       <point x="582" y="1194"/>
       <point x="473" y="1024"/>
       <point x="419" y="748" type="curve" smooth="yes"/>
       <point x="405" y="676"/>
       <point x="398" y="611"/>
-      <point x="398" y="552" type="curve" name="sh03" smooth="yes"/>
+      <point x="398" y="552" type="curve" smooth="yes" name="sh03"/>
       <point x="398" y="431"/>
       <point x="428" y="337"/>
       <point x="488" y="268" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/O_micron.glif b/source/Hack-BoldItalic.ufo/glyphs/O_micron.glif
index 7e9d04107..cd46402b7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/O_micron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/O_micron.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Omicron" format="1">
+<glyph name="Omicron" format="2">
   <advance width="1233"/>
   <unicode hex="039F"/>
   <outline>
     <contour>
-      <point x="497" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="497" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="214" y="-29"/>
       <point x="61" y="139"/>
-      <point x="61" y="482" type="curve" name="sh01" smooth="yes"/>
+      <point x="61" y="482" type="curve" smooth="yes" name="sh01"/>
       <point x="61" y="728"/>
       <point x="139" y="1045"/>
       <point x="246" y="1229" type="curve"/>
       <point x="355" y="1421"/>
       <point x="515" y="1520"/>
-      <point x="735" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="735" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1016" y="1520"/>
       <point x="1171" y="1354"/>
-      <point x="1171" y="1011" type="curve" name="sh02" smooth="yes"/>
+      <point x="1171" y="1011" type="curve" smooth="yes" name="sh02"/>
       <point x="1171" y="784"/>
       <point x="1103" y="463"/>
       <point x="989" y="264" type="curve" smooth="yes"/>
@@ -24,7 +24,7 @@
       <point x="718" y="-29"/>
     </contour>
     <contour>
-      <point x="528" y="233" type="curve" name="dv01" smooth="yes"/>
+      <point x="528" y="233" type="curve" smooth="yes" name="dv01"/>
       <point x="612" y="233"/>
       <point x="670" y="281"/>
       <point x="719" y="373" type="curve" smooth="yes"/>
@@ -33,10 +33,10 @@
       <point x="810" y="630" type="curve" smooth="yes"/>
       <point x="842" y="763"/>
       <point x="868" y="916"/>
-      <point x="868" y="1024" type="curve" name="ah01" smooth="yes"/>
+      <point x="868" y="1024" type="curve" smooth="yes" name="ah01"/>
       <point x="868" y="1181"/>
       <point x="814" y="1260"/>
-      <point x="705" y="1260" type="curve" name="sv01" smooth="yes"/>
+      <point x="705" y="1260" type="curve" smooth="yes" name="sv01"/>
       <point x="618" y="1260"/>
       <point x="562" y="1211"/>
       <point x="514" y="1119" type="curve" smooth="yes"/>
@@ -45,7 +45,7 @@
       <point x="422" y="861" type="curve" smooth="yes"/>
       <point x="382" y="702"/>
       <point x="365" y="537"/>
-      <point x="365" y="458" type="curve" name="sh03" smooth="yes"/>
+      <point x="365" y="458" type="curve" smooth="yes" name="sh03"/>
       <point x="365" y="315"/>
       <point x="417" y="233"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/O_microntonos.glif b/source/Hack-BoldItalic.ufo/glyphs/O_microntonos.glif
index 1b5a838a5..7d53d9c99 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/O_microntonos.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/O_microntonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Omicrontonos" format="1">
+<glyph name="Omicrontonos" format="2">
   <advance width="1233"/>
   <unicode hex="038C"/>
   <outline>
@@ -10,19 +10,19 @@
       <point x="-218" y="1126" type="line"/>
     </contour>
     <contour>
-      <point x="489" y="-56" type="curve" name="dv01" smooth="yes"/>
+      <point x="489" y="-56" type="curve" smooth="yes" name="dv01"/>
       <point x="206" y="-56"/>
       <point x="53" y="112"/>
-      <point x="53" y="455" type="curve" name="sh01" smooth="yes"/>
+      <point x="53" y="455" type="curve" smooth="yes" name="sh01"/>
       <point x="53" y="701"/>
       <point x="131" y="1018"/>
       <point x="238" y="1202" type="curve"/>
       <point x="347" y="1394"/>
       <point x="507" y="1493"/>
-      <point x="727" y="1493" type="curve" name="at02" smooth="yes"/>
+      <point x="727" y="1493" type="curve" smooth="yes" name="at02"/>
       <point x="1008" y="1493"/>
       <point x="1163" y="1327"/>
-      <point x="1163" y="984" type="curve" name="sh02" smooth="yes"/>
+      <point x="1163" y="984" type="curve" smooth="yes" name="sh02"/>
       <point x="1163" y="757"/>
       <point x="1095" y="436"/>
       <point x="981" y="237" type="curve" smooth="yes"/>
@@ -30,7 +30,7 @@
       <point x="710" y="-56"/>
     </contour>
     <contour>
-      <point x="520" y="206" type="curve" name="dv02" smooth="yes"/>
+      <point x="520" y="206" type="curve" smooth="yes" name="dv02"/>
       <point x="604" y="206"/>
       <point x="662" y="254"/>
       <point x="711" y="346" type="curve" smooth="yes"/>
@@ -39,10 +39,10 @@
       <point x="802" y="603" type="curve" smooth="yes"/>
       <point x="834" y="736"/>
       <point x="860" y="889"/>
-      <point x="860" y="997" type="curve" name="ah01" smooth="yes"/>
+      <point x="860" y="997" type="curve" smooth="yes" name="ah01"/>
       <point x="860" y="1154"/>
       <point x="806" y="1233"/>
-      <point x="697" y="1233" type="curve" name="sv01" smooth="yes"/>
+      <point x="697" y="1233" type="curve" smooth="yes" name="sv01"/>
       <point x="610" y="1233"/>
       <point x="554" y="1184"/>
       <point x="506" y="1092" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="414" y="834" type="curve" smooth="yes"/>
       <point x="374" y="675"/>
       <point x="357" y="510"/>
-      <point x="357" y="431" type="curve" name="sh03" smooth="yes"/>
+      <point x="357" y="431" type="curve" smooth="yes" name="sh03"/>
       <point x="357" y="288"/>
       <point x="409" y="206"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/O_slash.glif b/source/Hack-BoldItalic.ufo/glyphs/O_slash.glif
index 1b9e60074..c0d58402e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/O_slash.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/O_slash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Oslash" format="1">
+<glyph name="Oslash" format="2">
   <advance width="1233"/>
   <unicode hex="00D8"/>
   <outline>
@@ -20,7 +20,7 @@
       <point x="244" y="1227" type="curve" smooth="yes"/>
       <point x="350" y="1414"/>
       <point x="522" y="1520"/>
-      <point x="732" y="1520" type="curve" name="at02" smooth="yes"/>
+      <point x="732" y="1520" type="curve" smooth="yes" name="at02"/>
       <point x="801" y="1520"/>
       <point x="864" y="1509"/>
       <point x="919" y="1487" type="curve" smooth="yes"/>
@@ -53,7 +53,7 @@
       <point x="786" y="46" type="curve" smooth="yes"/>
       <point x="702" y="-5"/>
       <point x="604" y="-29"/>
-      <point x="500" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="500" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="427" y="-29"/>
       <point x="361" y="-17"/>
       <point x="304" y="8" type="curve" smooth="yes"/>
@@ -69,7 +69,7 @@
       <point x="797" y="1233" type="curve" smooth="yes"/>
       <point x="770" y="1253"/>
       <point x="737" y="1260"/>
-      <point x="706" y="1260" type="curve" name="sv01" smooth="yes"/>
+      <point x="706" y="1260" type="curve" smooth="yes" name="sv01"/>
       <point x="619" y="1260"/>
       <point x="558" y="1205"/>
       <point x="510" y="1113" type="curve" smooth="yes"/>
@@ -78,7 +78,7 @@
       <point x="379" y="629" type="curve" name="iv01"/>
     </contour>
     <contour>
-      <point x="525" y="233" type="curve" name="dv02" smooth="yes"/>
+      <point x="525" y="233" type="curve" smooth="yes" name="dv02"/>
       <point x="610" y="233"/>
       <point x="678" y="284"/>
       <point x="729" y="386" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/O_slashacute.glif b/source/Hack-BoldItalic.ufo/glyphs/O_slashacute.glif
index aae2bee93..1338a9b71 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/O_slashacute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/O_slashacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Oslashacute" format="1">
+<glyph name="Oslashacute" format="2">
   <advance width="1233"/>
   <unicode hex="01FE"/>
   <outline>
@@ -20,7 +20,7 @@
       <point x="244" y="1227" type="curve" smooth="yes"/>
       <point x="352" y="1418"/>
       <point x="515" y="1520"/>
-      <point x="731" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="731" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="871" y="1520"/>
       <point x="982" y="1476"/>
       <point x="1063" y="1389" type="curve"/>
@@ -38,7 +38,7 @@
       <point x="987" y="265" type="curve" smooth="yes"/>
       <point x="871" y="61"/>
       <point x="711" y="-29"/>
-      <point x="504" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="504" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="353" y="-29"/>
       <point x="239" y="18"/>
       <point x="160" y="117" type="curve"/>
@@ -48,7 +48,7 @@
       <point x="852" y="1153" type="line"/>
       <point x="828" y="1222"/>
       <point x="777" y="1260"/>
-      <point x="706" y="1260" type="curve" name="sv01" smooth="yes"/>
+      <point x="706" y="1260" type="curve" smooth="yes" name="sv01"/>
       <point x="622" y="1260"/>
       <point x="558" y="1206"/>
       <point x="510" y="1114" type="curve" smooth="yes"/>
@@ -57,7 +57,7 @@
       <point x="379" y="629" type="curve" name="iv02"/>
     </contour>
     <contour>
-      <point x="526" y="233" type="curve" name="dv02" smooth="yes"/>
+      <point x="526" y="233" type="curve" smooth="yes" name="dv02"/>
       <point x="606" y="233"/>
       <point x="676" y="281"/>
       <point x="729" y="386" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/O_tilde.glif b/source/Hack-BoldItalic.ufo/glyphs/O_tilde.glif
index 3893f2244..b75cd5dbe 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/O_tilde.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/O_tilde.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Otilde" format="1">
+<glyph name="Otilde" format="2">
   <advance width="1233"/>
   <unicode hex="00D5"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="513" y="1786" type="curve" smooth="yes"/>
       <point x="556" y="1831"/>
       <point x="608" y="1855"/>
-      <point x="673" y="1855" type="curve" name="dv04" smooth="yes"/>
+      <point x="673" y="1855" type="curve" smooth="yes" name="dv04"/>
       <point x="698" y="1855"/>
       <point x="722" y="1851"/>
       <point x="744" y="1843" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="1080" y="1658" type="curve" smooth="yes"/>
       <point x="1037" y="1612"/>
       <point x="984" y="1589"/>
-      <point x="921" y="1589" type="curve" name="sv02" smooth="yes"/>
+      <point x="921" y="1589" type="curve" smooth="yes" name="sv02"/>
       <point x="867" y="1589"/>
       <point x="838" y="1598"/>
       <point x="782" y="1640" type="curve" smooth="yes"/>
@@ -55,13 +55,13 @@
       <point x="559" y="1589" type="curve" name="dv03"/>
     </contour>
     <contour>
-      <point x="500" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="500" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="364" y="-29"/>
       <point x="250" y="11"/>
       <point x="173" y="98" type="curve" smooth="yes"/>
       <point x="94" y="186"/>
       <point x="61" y="312"/>
-      <point x="61" y="476" type="curve" name="sh04" smooth="yes"/>
+      <point x="61" y="476" type="curve" smooth="yes" name="sh04"/>
       <point x="61" y="593"/>
       <point x="78" y="733"/>
       <point x="111" y="870" type="curve" smooth="yes"/>
@@ -73,13 +73,13 @@
       <point x="447" y="1445" type="curve" smooth="yes"/>
       <point x="534" y="1497"/>
       <point x="632" y="1520"/>
-      <point x="732" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="732" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="869" y="1520"/>
       <point x="982" y="1479"/>
       <point x="1058" y="1395" type="curve" smooth="yes"/>
       <point x="1143" y="1302"/>
       <point x="1171" y="1168"/>
-      <point x="1171" y="1015" type="curve" name="sh02" smooth="yes"/>
+      <point x="1171" y="1015" type="curve" smooth="yes" name="sh02"/>
       <point x="1171" y="902"/>
       <point x="1157" y="767"/>
       <point x="1122" y="622" type="curve" smooth="yes"/>
@@ -93,7 +93,7 @@
       <point x="604" y="-29"/>
     </contour>
     <contour>
-      <point x="525" y="233" type="curve" name="dv02" smooth="yes"/>
+      <point x="525" y="233" type="curve" smooth="yes" name="dv02"/>
       <point x="565" y="233"/>
       <point x="602" y="245"/>
       <point x="635" y="269" type="curve" smooth="yes"/>
@@ -111,13 +111,13 @@
       <point x="853" y="846" type="curve" smooth="yes"/>
       <point x="863" y="912"/>
       <point x="868" y="970"/>
-      <point x="868" y="1020" type="curve" name="ah01" smooth="yes"/>
+      <point x="868" y="1020" type="curve" smooth="yes" name="ah01"/>
       <point x="868" y="1101"/>
       <point x="855" y="1161"/>
       <point x="828" y="1200" type="curve" smooth="yes"/>
       <point x="801" y="1240"/>
       <point x="761" y="1260"/>
-      <point x="708" y="1260" type="curve" name="sv03" smooth="yes"/>
+      <point x="708" y="1260" type="curve" smooth="yes" name="sv03"/>
       <point x="663" y="1260"/>
       <point x="626" y="1245"/>
       <point x="598" y="1225" type="curve" smooth="yes"/>
@@ -135,7 +135,7 @@
       <point x="380" y="646" type="curve" smooth="yes"/>
       <point x="370" y="579"/>
       <point x="365" y="520"/>
-      <point x="365" y="471" type="curve" name="sh05" smooth="yes"/>
+      <point x="365" y="471" type="curve" smooth="yes" name="sh05"/>
       <point x="365" y="390"/>
       <point x="378" y="331"/>
       <point x="405" y="292" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/P_.glif b/source/Hack-BoldItalic.ufo/glyphs/P_.glif
index ef44819fb..26d22917a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/P_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/P_.glif
@@ -1,44 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="P" format="1">
+<glyph name="P" format="2">
   <advance width="1233"/>
   <unicode hex="0050"/>
   <outline>
     <contour>
-      <point x="305" y="1493" type="line" name="hr00"/>
+      <point x="305" y="1493" type="line"/>
       <point x="725" y="1493" type="line" smooth="yes"/>
-      <point x="882" y="1493"/>
-      <point x="1002" y="1463"/>
-      <point x="1085" y="1402" type="curve" smooth="yes"/>
-      <point x="1169" y="1339"/>
-      <point x="1208" y="1252"/>
-      <point x="1208" y="1129" type="curve" name="dh02" smooth="yes"/>
-      <point x="1208" y="1061"/>
-      <point x="1196" y="985"/>
-      <point x="1172" y="909" type="curve" smooth="yes"/>
-      <point x="1147" y="830"/>
-      <point x="1116" y="776"/>
-      <point x="1077" y="731" type="curve" smooth="yes"/>
-      <point x="974" y="611"/>
-      <point x="827" y="559"/>
-      <point x="582" y="559" type="curve" name="dv01" smooth="yes"/>
-      <point x="418" y="559" type="line"/>
-      <point x="309" y="0" type="line" name="ab01"/>
+      <point x="971.737" y="1493"/>
+      <point x="1208" y="1418.72"/>
+      <point x="1208" y="1124.79" type="curve" smooth="yes"/>
+      <point x="1208" y="1054.51"/>
+      <point x="1194.49" y="979.875"/>
+      <point x="1173.62" y="914.101" type="curve" smooth="yes"/>
+      <point x="1060.57" y="557.885"/>
+      <point x="762.116" y="558.957"/>
+      <point x="454.169" y="558.957" type="curve" smooth="yes"/>
+      <point x="448.149" y="558.957"/>
+      <point x="442.125" y="558.989"/>
+      <point x="436.098" y="558.989" type="curve" smooth="yes"/>
+      <point x="418" y="558.989" type="line"/>
+      <point x="309" y="0" type="line"/>
       <point x="14" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="610" y="807" type="line" name="dv02" smooth="yes"/>
-      <point x="710" y="807"/>
-      <point x="782" y="832"/>
-      <point x="829" y="875" type="curve" smooth="yes"/>
-      <point x="877" y="920"/>
-      <point x="901" y="990"/>
-      <point x="901" y="1071" type="curve" name="dh01" smooth="yes"/>
-      <point x="901" y="1136"/>
-      <point x="884" y="1182"/>
-      <point x="849" y="1207" type="curve" smooth="yes"/>
-      <point x="814" y="1232"/>
-      <point x="755" y="1245"/>
-      <point x="672" y="1245" type="curve" name="sv01" smooth="yes"/>
+      <point x="610" y="807" type="line" smooth="yes"/>
+      <point x="785.775" y="807"/>
+      <point x="901" y="883.962"/>
+      <point x="901" y="1060.96" type="curve" smooth="yes"/>
+      <point x="901" y="1223.79"/>
+      <point x="803.479" y="1245"/>
+      <point x="672" y="1245" type="curve" smooth="yes"/>
       <point x="551" y="1245" type="line"/>
       <point x="467" y="807" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/P_hi.glif b/source/Hack-BoldItalic.ufo/glyphs/P_hi.glif
index bd4ef44c2..9d63273de 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/P_hi.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/P_hi.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Phi" format="1">
+<glyph name="Phi" format="2">
   <advance width="1233"/>
   <unicode hex="03A6"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="388" y="330" type="line"/>
       <point x="214" y="354"/>
       <point x="81" y="443"/>
-      <point x="81" y="633" type="curve" name="sh01" smooth="yes"/>
+      <point x="81" y="633" type="curve" smooth="yes" name="sh01"/>
       <point x="81" y="666"/>
       <point x="84" y="710"/>
       <point x="91" y="745" type="curve" name="sh02"/>
@@ -25,10 +25,10 @@
       <point x="845" y="1161" type="line"/>
       <point x="1018" y="1132"/>
       <point x="1152" y="1054"/>
-      <point x="1152" y="853" type="curve" name="sh03" smooth="yes"/>
+      <point x="1152" y="853" type="curve" smooth="yes" name="sh03"/>
       <point x="1152" y="822"/>
       <point x="1149" y="784"/>
-      <point x="1141" y="744" type="curve" name="sh04" smooth="yes"/>
+      <point x="1141" y="744" type="curve" smooth="yes" name="sh04"/>
       <point x="1088" y="470"/>
       <point x="892" y="357"/>
       <point x="683" y="330" type="curve"/>
@@ -42,7 +42,7 @@
       <point x="472" y="938" type="line" smooth="yes"/>
       <point x="392" y="882"/>
       <point x="350" y="792"/>
-      <point x="350" y="701" type="curve" name="sh05" smooth="yes"/>
+      <point x="350" y="701" type="curve" smooth="yes" name="sh05"/>
       <point x="350" y="646"/>
       <point x="365" y="596"/>
       <point x="397" y="553" type="curve" smooth="yes"/>
@@ -57,7 +57,7 @@
       <point x="761" y="553" type="curve" smooth="yes"/>
       <point x="841" y="625"/>
       <point x="887" y="723"/>
-      <point x="887" y="808" type="curve" name="ah01" smooth="yes"/>
+      <point x="887" y="808" type="curve" smooth="yes" name="ah01"/>
       <point x="887" y="860"/>
       <point x="871" y="907"/>
       <point x="836" y="938" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/P_i.glif b/source/Hack-BoldItalic.ufo/glyphs/P_i.glif
index 89e1ba1b3..a2e29525e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/P_i.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/P_i.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Pi" format="1">
+<glyph name="Pi" format="2">
   <advance width="1233"/>
   <unicode hex="03A0"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/P_si.glif b/source/Hack-BoldItalic.ufo/glyphs/P_si.glif
index 2f65df167..035344d07 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/P_si.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/P_si.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Psi" format="1">
+<glyph name="Psi" format="2">
   <advance width="1233"/>
   <unicode hex="03A8"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="190" y="568" type="curve" smooth="yes"/>
       <point x="149" y="644"/>
       <point x="127" y="737"/>
-      <point x="127" y="865" type="curve" name="dh01" smooth="yes"/>
+      <point x="127" y="865" type="curve" smooth="yes" name="dh01"/>
       <point x="127" y="952"/>
       <point x="137" y="1038"/>
       <point x="158" y="1146" type="curve" smooth="yes"/>
@@ -21,7 +21,7 @@
       <point x="453" y="1146" type="line"/>
       <point x="434" y="1054"/>
       <point x="425" y="976"/>
-      <point x="425" y="897" type="curve" name="dh02" smooth="yes"/>
+      <point x="425" y="897" type="curve" smooth="yes" name="dh02"/>
       <point x="425" y="837"/>
       <point x="430" y="797"/>
       <point x="441" y="758" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/Q_.glif b/source/Hack-BoldItalic.ufo/glyphs/Q_.glif
index 97f76eac4..0c69bf398 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/Q_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/Q_.glif
@@ -1,96 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Q" format="1">
+<glyph name="Q" format="2">
   <advance width="1233"/>
   <unicode hex="0051"/>
   <outline>
     <contour>
-      <point x="535" y="-29" type="line" name="hr00"/>
-      <point x="508" y="-29" type="line" smooth="yes"/>
-      <point x="363" y="-29"/>
-      <point x="252" y="14"/>
-      <point x="176" y="95" type="curve" smooth="yes"/>
-      <point x="96" y="182"/>
-      <point x="61" y="305"/>
-      <point x="61" y="474" type="curve" smooth="yes" name="sh01"/>
-      <point x="61" y="710"/>
-      <point x="138" y="1041"/>
-      <point x="244" y="1226" type="curve" smooth="yes"/>
-      <point x="295" y="1314"/>
-      <point x="357" y="1390"/>
-      <point x="448" y="1445" type="curve" smooth="yes"/>
-      <point x="528" y="1493"/>
-      <point x="623" y="1520"/>
-      <point x="732" y="1520" type="curve" smooth="yes" name="at01"/>
-      <point x="873" y="1520"/>
-      <point x="982" y="1476"/>
-      <point x="1057" y="1397" type="curve" smooth="yes"/>
-      <point x="1140" y="1309"/>
-      <point x="1171" y="1192"/>
-      <point x="1171" y="1024" type="curve" smooth="yes" name="sh02"/>
-      <point x="1171" y="913"/>
-      <point x="1157" y="778"/>
-      <point x="1122" y="627" type="curve" smooth="yes"/>
-      <point x="1091" y="494"/>
-      <point x="1046" y="362"/>
-      <point x="990" y="262" type="curve" smooth="yes"/>
-      <point x="962" y="213"/>
-      <point x="933" y="174"/>
-      <point x="902" y="141" type="curve" smooth="yes"/>
-      <point x="867" y="104"/>
-      <point x="825" y="70"/>
+      <point x="535" y="-29" type="line"/>
+      <point x="203.094" y="-29"/>
+      <point x="61" y="141.306"/>
+      <point x="61" y="464.319" type="curve" smooth="yes"/>
+      <point x="61" y="693.491"/>
+      <point x="132.524" y="1036.18"/>
+      <point x="252.765" y="1241.09" type="curve" smooth="yes"/>
+      <point x="358.778" y="1421.75"/>
+      <point x="517.156" y="1520"/>
+      <point x="734.879" y="1520" type="curve" smooth="yes"/>
+      <point x="1053.39" y="1520"/>
+      <point x="1171" y="1309.72"/>
+      <point x="1171" y="1016.64" type="curve" smooth="yes"/>
+      <point x="1171" y="792.235"/>
+      <point x="1102.05" y="454.513"/>
+      <point x="985.199" y="253.701" type="curve" smooth="yes"/>
+      <point x="933.1" y="164.171"/>
+      <point x="868.938" y="97.49"/>
       <point x="776" y="39" type="curve"/>
-      <point x="1050" y="-350" type="line" name="ih01"/>
+      <point x="1050" y="-350" type="line"/>
       <point x="706" y="-350" type="line"/>
     </contour>
     <contour>
-      <point x="525" y="233" type="curve" smooth="yes" name="dv01"/>
-      <point x="565" y="233"/>
-      <point x="602" y="245"/>
-      <point x="635" y="269" type="curve" smooth="yes"/>
-      <point x="667" y="292"/>
-      <point x="696" y="326"/>
-      <point x="721" y="373" type="curve" smooth="yes"/>
-      <point x="736" y="401"/>
-      <point x="752" y="442"/>
-      <point x="767" y="483" type="curve" smooth="yes"/>
-      <point x="781" y="523"/>
-      <point x="795" y="572"/>
-      <point x="809" y="630" type="curve" smooth="yes"/>
-      <point x="830" y="717"/>
-      <point x="842" y="782"/>
-      <point x="853" y="846" type="curve" smooth="yes"/>
-      <point x="863" y="912"/>
-      <point x="868" y="970"/>
-      <point x="868" y="1020" type="curve" smooth="yes" name="ah01"/>
-      <point x="868" y="1101"/>
-      <point x="855" y="1161"/>
-      <point x="828" y="1200" type="curve" smooth="yes"/>
-      <point x="801" y="1240"/>
-      <point x="761" y="1260"/>
-      <point x="708" y="1260" type="curve" smooth="yes" name="sv01"/>
-      <point x="663" y="1260"/>
-      <point x="626" y="1245"/>
-      <point x="598" y="1225" type="curve" smooth="yes"/>
-      <point x="566" y="1202"/>
-      <point x="536" y="1165"/>
-      <point x="512" y="1121" type="curve" smooth="yes"/>
-      <point x="493" y="1088"/>
-      <point x="482" y="1056"/>
-      <point x="469" y="1017" type="curve" smooth="yes"/>
-      <point x="450" y="960"/>
-      <point x="443" y="932"/>
-      <point x="424" y="860" type="curve" smooth="yes"/>
-      <point x="403" y="775"/>
-      <point x="391" y="711"/>
-      <point x="380" y="646" type="curve" smooth="yes"/>
-      <point x="370" y="579"/>
-      <point x="365" y="520"/>
-      <point x="365" y="471" type="curve" smooth="yes" name="sh03"/>
-      <point x="365" y="390"/>
-      <point x="378" y="331"/>
-      <point x="405" y="292" type="curve" smooth="yes"/>
-      <point x="433" y="251"/>
-      <point x="474" y="233"/>
+      <point x="518.671" y="233" type="curve" smooth="yes"/>
+      <point x="608.764" y="233"/>
+      <point x="680.053" y="299.764"/>
+      <point x="720.43" y="371.886" type="curve" smooth="yes"/>
+      <point x="799.096" y="512.398"/>
+      <point x="868" y="865.391"/>
+      <point x="868" y="1026.18" type="curve" smooth="yes"/>
+      <point x="868" y="1133.3"/>
+      <point x="837.416" y="1260"/>
+      <point x="705.893" y="1260" type="curve" smooth="yes"/>
+      <point x="618.731" y="1260"/>
+      <point x="560.219" y="1204.36"/>
+      <point x="523.988" y="1141.98" type="curve" smooth="yes"/>
+      <point x="438.433" y="994.692"/>
+      <point x="365" y="616.821"/>
+      <point x="365" y="458.981" type="curve" smooth="yes"/>
+      <point x="365" y="354.865"/>
+      <point x="396.952" y="233"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/R_.glif b/source/Hack-BoldItalic.ufo/glyphs/R_.glif
index c7cefac1c..5281dc007 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/R_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/R_.glif
@@ -1,54 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="R" format="1">
+<glyph name="R" format="2">
   <advance width="1233"/>
   <unicode hex="0052"/>
   <outline>
     <contour>
-      <point x="294" y="1493" type="line" name="hr00"/>
+      <point x="294" y="1493" type="line"/>
       <point x="704" y="1493" type="line" smooth="yes"/>
-      <point x="858" y="1493"/>
-      <point x="973" y="1464"/>
-      <point x="1048" y="1406" type="curve" smooth="yes"/>
-      <point x="1120" y="1350"/>
-      <point x="1160" y="1265"/>
-      <point x="1160" y="1133" type="curve" name="dh02" smooth="yes"/>
-      <point x="1160" y="1013"/>
-      <point x="1127" y="914"/>
-      <point x="1062" y="838" type="curve" smooth="yes"/>
-      <point x="997" y="762"/>
-      <point x="904" y="718"/>
-      <point x="783" y="705" type="curve" name="iv01"/>
-      <point x="823" y="699"/>
-      <point x="855" y="684"/>
-      <point x="878" y="660" type="curve" smooth="yes"/>
-      <point x="901" y="636"/>
-      <point x="921" y="595"/>
+      <point x="955.575" y="1493"/>
+      <point x="1160" y="1422.03"/>
+      <point x="1160" y="1129.13" type="curve" smooth="yes"/>
+      <point x="1160" y="891.481"/>
+      <point x="1025.42" y="730.964"/>
+      <point x="783" y="705" type="curve"/>
+      <point x="881.27" y="690.502"/>
+      <point x="912.574" y="623.53"/>
       <point x="939" y="537" type="curve" smooth="yes"/>
-      <point x="1103" y="0" type="line" name="ih01"/>
+      <point x="1103" y="0" type="line"/>
       <point x="802" y="0" type="line"/>
-      <point x="696" y="376" type="line"/>
-      <point x="688" y="403" type="line" smooth="yes"/>
-      <point x="647" y="538"/>
-      <point x="599" y="590"/>
-      <point x="530" y="590" type="curve" name="dv01" smooth="yes"/>
+      <point x="696" y="376" type="line" smooth="yes"/>
+      <point x="673.252" y="456.691"/>
+      <point x="634.217" y="590"/>
+      <point x="530" y="590" type="curve" smooth="yes"/>
       <point x="413" y="590" type="line"/>
-      <point x="298" y="0" type="line" name="ab01"/>
+      <point x="298" y="0" type="line"/>
       <point x="3" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="585" y="838" type="line" name="dv02" smooth="yes"/>
-      <point x="678" y="838"/>
-      <point x="746" y="861"/>
-      <point x="790" y="902" type="curve" smooth="yes"/>
-      <point x="837" y="945"/>
-      <point x="859" y="1009"/>
-      <point x="859" y="1084" type="curve" name="dh01" smooth="yes"/>
-      <point x="859" y="1141"/>
-      <point x="844" y="1182"/>
-      <point x="813" y="1207" type="curve" smooth="yes"/>
-      <point x="782" y="1232"/>
-      <point x="736" y="1245"/>
-      <point x="675" y="1245" type="curve" name="sv01" smooth="yes"/>
+      <point x="585" y="838" type="line" smooth="yes"/>
+      <point x="747.825" y="838"/>
+      <point x="859" y="910.506"/>
+      <point x="859" y="1074.1" type="curve" smooth="yes"/>
+      <point x="859" y="1205.39"/>
+      <point x="787.405" y="1245"/>
+      <point x="675" y="1245" type="curve" smooth="yes"/>
       <point x="542" y="1245" type="line"/>
       <point x="462" y="838" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/R_acute.glif b/source/Hack-BoldItalic.ufo/glyphs/R_acute.glif
index 6443b19aa..c38c26686 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/R_acute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/R_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Racute" format="1">
+<glyph name="Racute" format="2">
   <advance width="1233"/>
   <unicode hex="0154"/>
   <outline>
@@ -14,7 +14,7 @@
       <point x="704" y="1493" type="line" smooth="yes"/>
       <point x="1016" y="1493"/>
       <point x="1160" y="1378"/>
-      <point x="1160" y="1131" type="curve" name="dh02" smooth="yes"/>
+      <point x="1160" y="1131" type="curve" smooth="yes" name="dh02"/>
       <point x="1160" y="891"/>
       <point x="1023" y="732"/>
       <point x="783" y="705" type="curve" name="iv02"/>
@@ -27,19 +27,19 @@
       <point x="688" y="403" type="line" smooth="yes"/>
       <point x="649" y="531"/>
       <point x="605" y="590"/>
-      <point x="530" y="590" type="curve" name="dv01" smooth="yes"/>
+      <point x="530" y="590" type="curve" smooth="yes" name="dv01"/>
       <point x="413" y="590" type="line"/>
       <point x="298" y="0" type="line" name="ab01"/>
       <point x="3" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="585" y="838" type="line" name="dv02" smooth="yes"/>
+      <point x="585" y="838" type="line" smooth="yes" name="dv02"/>
       <point x="766" y="838"/>
       <point x="859" y="929"/>
-      <point x="859" y="1080" type="curve" name="dh01" smooth="yes"/>
+      <point x="859" y="1080" type="curve" smooth="yes" name="dh01"/>
       <point x="859" y="1195"/>
       <point x="804" y="1245"/>
-      <point x="675" y="1245" type="curve" name="sv01" smooth="yes"/>
+      <point x="675" y="1245" type="curve" smooth="yes" name="sv01"/>
       <point x="542" y="1245" type="line"/>
       <point x="462" y="838" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/R_caron.glif b/source/Hack-BoldItalic.ufo/glyphs/R_caron.glif
index 3720afab4..267aa7f83 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/R_caron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/R_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Rcaron" format="1">
+<glyph name="Rcaron" format="2">
   <advance width="1233"/>
   <unicode hex="0158"/>
   <outline>
@@ -17,7 +17,7 @@
       <point x="704" y="1493" type="line" smooth="yes"/>
       <point x="1016" y="1493"/>
       <point x="1160" y="1378"/>
-      <point x="1160" y="1131" type="curve" name="dh02" smooth="yes"/>
+      <point x="1160" y="1131" type="curve" smooth="yes" name="dh02"/>
       <point x="1160" y="891"/>
       <point x="1023" y="732"/>
       <point x="783" y="705" type="curve" name="iv01"/>
@@ -30,19 +30,19 @@
       <point x="688" y="403" type="line" smooth="yes"/>
       <point x="649" y="531"/>
       <point x="605" y="590"/>
-      <point x="530" y="590" type="curve" name="dv03" smooth="yes"/>
+      <point x="530" y="590" type="curve" smooth="yes" name="dv03"/>
       <point x="413" y="590" type="line"/>
       <point x="298" y="0" type="line" name="ab01"/>
       <point x="3" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="585" y="838" type="line" name="dv04" smooth="yes"/>
+      <point x="585" y="838" type="line" smooth="yes" name="dv04"/>
       <point x="766" y="838"/>
       <point x="859" y="929"/>
-      <point x="859" y="1080" type="curve" name="dh01" smooth="yes"/>
+      <point x="859" y="1080" type="curve" smooth="yes" name="dh01"/>
       <point x="859" y="1195"/>
       <point x="804" y="1245"/>
-      <point x="675" y="1245" type="curve" name="sv01" smooth="yes"/>
+      <point x="675" y="1245" type="curve" smooth="yes" name="sv01"/>
       <point x="542" y="1245" type="line"/>
       <point x="462" y="838" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/R_ho.glif b/source/Hack-BoldItalic.ufo/glyphs/R_ho.glif
index 9e0b46673..15236c8c2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/R_ho.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/R_ho.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Rho" format="1">
+<glyph name="Rho" format="2">
   <advance width="1233"/>
   <unicode hex="03A1"/>
   <outline>
@@ -8,25 +8,25 @@
       <point x="737" y="1493" type="line" smooth="yes"/>
       <point x="1052" y="1493"/>
       <point x="1220" y="1374"/>
-      <point x="1220" y="1123" type="curve" name="dh02" smooth="yes"/>
+      <point x="1220" y="1123" type="curve" smooth="yes" name="dh02"/>
       <point x="1220" y="978"/>
       <point x="1165" y="825"/>
       <point x="1089" y="731" type="curve" smooth="yes"/>
       <point x="985" y="603"/>
       <point x="817" y="559"/>
-      <point x="594" y="559" type="curve" name="dv01" smooth="yes"/>
+      <point x="594" y="559" type="curve" smooth="yes" name="dv01"/>
       <point x="430" y="559" type="line"/>
       <point x="321" y="0" type="line" name="ab01"/>
       <point x="26" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="622" y="807" type="line" name="dv02" smooth="yes"/>
+      <point x="622" y="807" type="line" smooth="yes" name="dv02"/>
       <point x="818" y="807"/>
       <point x="913" y="900"/>
-      <point x="913" y="1069" type="curve" name="dh01" smooth="yes"/>
+      <point x="913" y="1069" type="curve" smooth="yes" name="dh01"/>
       <point x="913" y="1197"/>
       <point x="856" y="1245"/>
-      <point x="684" y="1245" type="curve" name="sv01" smooth="yes"/>
+      <point x="684" y="1245" type="curve" smooth="yes" name="sv01"/>
       <point x="563" y="1245" type="line"/>
       <point x="479" y="807" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/S_.glif b/source/Hack-BoldItalic.ufo/glyphs/S_.glif
index f384edf81..df75dbf71 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/S_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/S_.glif
@@ -1,80 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="S" format="1">
+<glyph name="S" format="2">
   <advance width="1233"/>
   <unicode hex="0053"/>
   <outline>
     <contour>
-      <point x="469" y="-29" type="curve" name="hr00" smooth="yes"/>
-      <point x="392" y="-29"/>
-      <point x="319" y="-20"/>
-      <point x="243" y="-3" type="curve" smooth="yes"/>
-      <point x="163" y="16"/>
-      <point x="88" y="41"/>
+      <point x="481.124" y="-29" type="curve" smooth="yes"/>
+      <point x="318.729" y="-29"/>
+      <point x="141.794" y="18.6007"/>
       <point x="4" y="76" type="curve"/>
       <point x="63" y="381" type="line"/>
-      <point x="128" y="326"/>
-      <point x="190" y="289"/>
-      <point x="266" y="258" type="curve" smooth="yes"/>
-      <point x="337" y="230"/>
-      <point x="403" y="215"/>
-      <point x="479" y="215" type="curve" name="sh03" smooth="yes"/>
-      <point x="567" y="215"/>
-      <point x="637" y="235"/>
-      <point x="688" y="274" type="curve" smooth="yes"/>
-      <point x="739" y="313"/>
-      <point x="764" y="364"/>
-      <point x="764" y="429" type="curve" name="ah01" smooth="yes"/>
-      <point x="764" y="476"/>
-      <point x="752" y="511"/>
-      <point x="729" y="540" type="curve" smooth="yes"/>
-      <point x="706" y="570"/>
-      <point x="671" y="595"/>
-      <point x="625" y="614" type="curve" smooth="yes"/>
-      <point x="506" y="664" type="line" smooth="yes"/>
-      <point x="375" y="719"/>
-      <point x="297" y="765"/>
-      <point x="252" y="820" type="curve" smooth="yes"/>
-      <point x="213" y="867"/>
-      <point x="190" y="926"/>
-      <point x="190" y="1021" type="curve" name="sh01" smooth="yes"/>
-      <point x="190" y="1177"/>
-      <point x="255" y="1298"/>
-      <point x="351" y="1381" type="curve" smooth="yes"/>
-      <point x="455" y="1470"/>
-      <point x="599" y="1520"/>
-      <point x="770" y="1520" type="curve" name="sh04" smooth="yes"/>
-      <point x="908" y="1520"/>
-      <point x="1037" y="1492"/>
+      <point x="177.497" y="284.061"/>
+      <point x="325.326" y="215"/>
+      <point x="475.091" y="215" type="curve" smooth="yes"/>
+      <point x="611.293" y="215"/>
+      <point x="764" y="272.12"/>
+      <point x="764" y="425.923" type="curve" smooth="yes"/>
+      <point x="764" y="560.168"/>
+      <point x="647.662" y="608.12"/>
+      <point x="519.737" y="660.848" type="curve" smooth="yes"/>
+      <point x="363.509" y="725.241"/>
+      <point x="190" y="796.758"/>
+      <point x="190" y="1041.27" type="curve" smooth="yes"/>
+      <point x="190" y="1358.34"/>
+      <point x="481.762" y="1520"/>
+      <point x="781.757" y="1520" type="curve" smooth="yes"/>
+      <point x="909.392" y="1520"/>
+      <point x="1039.84" y="1490.74"/>
       <point x="1159" y="1438" type="curve"/>
       <point x="1102" y="1153" type="line"/>
-      <point x="1056" y="1195"/>
-      <point x="1003" y="1226"/>
-      <point x="943" y="1247" type="curve" smooth="yes"/>
-      <point x="882" y="1268"/>
-      <point x="812" y="1278"/>
-      <point x="748" y="1278" type="curve" name="sv01" smooth="yes"/>
-      <point x="656" y="1278"/>
-      <point x="594" y="1257"/>
-      <point x="549" y="1222" type="curve" smooth="yes"/>
-      <point x="500" y="1183"/>
-      <point x="475" y="1131"/>
-      <point x="475" y="1087" type="curve" name="sh02" smooth="yes"/>
-      <point x="475" y="1018"/>
-      <point x="538" y="962"/>
-      <point x="659" y="910" type="curve" smooth="yes"/>
-      <point x="666" y="907" type="line"/>
-      <point x="782" y="856" type="line" smooth="yes"/>
-      <point x="882" y="812"/>
-      <point x="952" y="760"/>
-      <point x="996" y="700" type="curve" smooth="yes"/>
-      <point x="1041" y="639"/>
-      <point x="1063" y="566"/>
-      <point x="1063" y="473" type="curve" name="sh05" smooth="yes"/>
-      <point x="1063" y="330"/>
-      <point x="1012" y="201"/>
-      <point x="903" y="108" type="curve" smooth="yes"/>
-      <point x="799" y="20"/>
-      <point x="652" y="-29"/>
+      <point x="1006.91" y="1239.77"/>
+      <point x="879.106" y="1278"/>
+      <point x="752.299" y="1278" type="curve" smooth="yes"/>
+      <point x="636.248" y="1278"/>
+      <point x="475" y="1227.24"/>
+      <point x="475" y="1094.52" type="curve" smooth="yes"/>
+      <point x="475" y="990.277"/>
+      <point x="574.465" y="946.76"/>
+      <point x="691.578" y="895.521" type="curve" smooth="yes"/>
+      <point x="859.211" y="822.179"/>
+      <point x="1063" y="733.018"/>
+      <point x="1063" y="454.587" type="curve" smooth="yes"/>
+      <point x="1063" y="119.652"/>
+      <point x="768.105" y="-29"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/S_acute.glif b/source/Hack-BoldItalic.ufo/glyphs/S_acute.glif
index f3110c5d3..b630fc23a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/S_acute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/S_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Sacute" format="1">
+<glyph name="Sacute" format="2">
   <advance width="1233"/>
   <unicode hex="015A"/>
   <outline>
@@ -10,37 +10,37 @@
       <point x="641" y="1589" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="469" y="-29" type="curve" name="sh04" smooth="yes"/>
+      <point x="469" y="-29" type="curve" smooth="yes" name="sh04"/>
       <point x="318" y="-29"/>
       <point x="169" y="5"/>
       <point x="4" y="76" type="curve"/>
       <point x="63" y="381" type="line"/>
       <point x="192" y="273"/>
       <point x="335" y="215"/>
-      <point x="480" y="215" type="curve" name="sh05" smooth="yes"/>
+      <point x="480" y="215" type="curve" smooth="yes" name="sh05"/>
       <point x="655" y="215"/>
       <point x="764" y="300"/>
-      <point x="764" y="430" type="curve" name="ah01" smooth="yes"/>
+      <point x="764" y="430" type="curve" smooth="yes" name="ah01"/>
       <point x="764" y="517"/>
       <point x="717" y="575"/>
       <point x="625" y="614" type="curve" smooth="yes"/>
       <point x="506" y="664" type="line" smooth="yes"/>
       <point x="255" y="768"/>
       <point x="190" y="850"/>
-      <point x="190" y="1012" type="curve" name="sh01" smooth="yes"/>
+      <point x="190" y="1012" type="curve" smooth="yes" name="sh01"/>
       <point x="190" y="1320"/>
       <point x="427" y="1520"/>
-      <point x="775" y="1520" type="curve" name="sh06" smooth="yes"/>
+      <point x="775" y="1520" type="curve" smooth="yes" name="sh06"/>
       <point x="904" y="1520"/>
       <point x="1038" y="1494"/>
       <point x="1159" y="1438" type="curve"/>
       <point x="1102" y="1153" type="line"/>
       <point x="1011" y="1236"/>
       <point x="879" y="1278"/>
-      <point x="753" y="1278" type="curve" name="sh07" smooth="yes"/>
+      <point x="753" y="1278" type="curve" smooth="yes" name="sh07"/>
       <point x="544" y="1278"/>
       <point x="475" y="1162"/>
-      <point x="475" y="1088" type="curve" name="sh03" smooth="yes"/>
+      <point x="475" y="1088" type="curve" smooth="yes" name="sh03"/>
       <point x="475" y="1023"/>
       <point x="527" y="967"/>
       <point x="659" y="910" type="curve" smooth="yes"/>
@@ -48,7 +48,7 @@
       <point x="782" y="856" type="line" smooth="yes"/>
       <point x="977" y="771"/>
       <point x="1063" y="653"/>
-      <point x="1063" y="470" type="curve" name="sh02" smooth="yes"/>
+      <point x="1063" y="470" type="curve" smooth="yes" name="sh02"/>
       <point x="1063" y="171"/>
       <point x="832" y="-29"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/S_caron.glif b/source/Hack-BoldItalic.ufo/glyphs/S_caron.glif
index effe1fb37..78c78c61d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/S_caron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/S_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Scaron" format="1">
+<glyph name="Scaron" format="2">
   <advance width="1233"/>
   <unicode hex="0160"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="594" y="1589" type="line"/>
     </contour>
     <contour>
-      <point x="469" y="-29" type="curve" name="sh04" smooth="yes"/>
+      <point x="469" y="-29" type="curve" smooth="yes" name="sh04"/>
       <point x="392" y="-29"/>
       <point x="319" y="-20"/>
       <point x="243" y="-3" type="curve" smooth="yes"/>
@@ -26,13 +26,13 @@
       <point x="266" y="258" type="curve" smooth="yes"/>
       <point x="337" y="230"/>
       <point x="403" y="215"/>
-      <point x="479" y="215" type="curve" name="sh05" smooth="yes"/>
+      <point x="479" y="215" type="curve" smooth="yes" name="sh05"/>
       <point x="567" y="215"/>
       <point x="637" y="235"/>
       <point x="688" y="274" type="curve" smooth="yes"/>
       <point x="739" y="313"/>
       <point x="764" y="364"/>
-      <point x="764" y="429" type="curve" name="ah01" smooth="yes"/>
+      <point x="764" y="429" type="curve" smooth="yes" name="ah01"/>
       <point x="764" y="476"/>
       <point x="752" y="511"/>
       <point x="729" y="540" type="curve" smooth="yes"/>
@@ -45,13 +45,13 @@
       <point x="252" y="820" type="curve" smooth="yes"/>
       <point x="213" y="867"/>
       <point x="190" y="926"/>
-      <point x="190" y="1021" type="curve" name="sh01" smooth="yes"/>
+      <point x="190" y="1021" type="curve" smooth="yes" name="sh01"/>
       <point x="190" y="1177"/>
       <point x="255" y="1298"/>
       <point x="351" y="1381" type="curve" smooth="yes"/>
       <point x="455" y="1470"/>
       <point x="599" y="1520"/>
-      <point x="770" y="1520" type="curve" name="sh06" smooth="yes"/>
+      <point x="770" y="1520" type="curve" smooth="yes" name="sh06"/>
       <point x="908" y="1520"/>
       <point x="1037" y="1492"/>
       <point x="1159" y="1438" type="curve"/>
@@ -61,13 +61,13 @@
       <point x="943" y="1247" type="curve" smooth="yes"/>
       <point x="882" y="1268"/>
       <point x="812" y="1278"/>
-      <point x="748" y="1278" type="curve" name="sv01" smooth="yes"/>
+      <point x="748" y="1278" type="curve" smooth="yes" name="sv01"/>
       <point x="656" y="1278"/>
       <point x="594" y="1257"/>
       <point x="549" y="1222" type="curve" smooth="yes"/>
       <point x="500" y="1183"/>
       <point x="475" y="1131"/>
-      <point x="475" y="1087" type="curve" name="sh02" smooth="yes"/>
+      <point x="475" y="1087" type="curve" smooth="yes" name="sh02"/>
       <point x="475" y="1018"/>
       <point x="538" y="962"/>
       <point x="659" y="910" type="curve" smooth="yes"/>
@@ -78,7 +78,7 @@
       <point x="996" y="700" type="curve" smooth="yes"/>
       <point x="1041" y="639"/>
       <point x="1063" y="566"/>
-      <point x="1063" y="473" type="curve" name="sh07" smooth="yes"/>
+      <point x="1063" y="473" type="curve" smooth="yes" name="sh07"/>
       <point x="1063" y="330"/>
       <point x="1012" y="201"/>
       <point x="903" y="108" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/S_cedilla.glif b/source/Hack-BoldItalic.ufo/glyphs/S_cedilla.glif
index e9729a621..fe4e26db5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/S_cedilla.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/S_cedilla.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Scedilla" format="1">
+<glyph name="Scedilla" format="2">
   <advance width="1233"/>
   <unicode hex="015E"/>
   <outline>
     <contour>
-      <point x="549" y="1222" type="curve" name="hr00" smooth="yes"/>
+      <point x="549" y="1222" type="curve" smooth="yes" name="hr00"/>
       <point x="500" y="1183"/>
       <point x="475" y="1131"/>
-      <point x="475" y="1087" type="curve" name="sh02" smooth="yes"/>
+      <point x="475" y="1087" type="curve" smooth="yes" name="sh02"/>
       <point x="475" y="1018"/>
       <point x="538" y="962"/>
       <point x="659" y="910" type="curve" smooth="yes"/>
@@ -18,7 +18,7 @@
       <point x="996" y="700" type="curve" smooth="yes"/>
       <point x="1041" y="639"/>
       <point x="1063" y="566"/>
-      <point x="1063" y="473" type="curve" name="sh03" smooth="yes"/>
+      <point x="1063" y="473" type="curve" smooth="yes" name="sh03"/>
       <point x="1063" y="330"/>
       <point x="1012" y="201"/>
       <point x="903" y="108" type="curve" smooth="yes"/>
@@ -36,10 +36,10 @@
       <point x="560" y="-342" type="curve" smooth="yes"/>
       <point x="511" y="-381"/>
       <point x="440" y="-401"/>
-      <point x="348" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="348" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="313" y="-401"/>
       <point x="274" y="-398"/>
-      <point x="249" y="-395" type="curve" name="sv01" smooth="yes"/>
+      <point x="249" y="-395" type="curve" smooth="yes" name="sv01"/>
       <point x="193" y="-388"/>
       <point x="171" y="-379"/>
       <point x="150" y="-375" type="curve"/>
@@ -49,16 +49,16 @@
       <point x="262" y="-245" type="curve" smooth="yes"/>
       <point x="289" y="-251"/>
       <point x="314" y="-254"/>
-      <point x="339" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="339" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="384" y="-254"/>
       <point x="420" y="-244"/>
       <point x="443" y="-227" type="curve" smooth="yes"/>
       <point x="467" y="-209"/>
       <point x="479" y="-184"/>
-      <point x="479" y="-151" type="curve" name="sh05" smooth="yes"/>
+      <point x="479" y="-151" type="curve" smooth="yes" name="sh05"/>
       <point x="479" y="-132"/>
       <point x="475" y="-112"/>
-      <point x="466" y="-90" type="curve" name="sh06" smooth="yes"/>
+      <point x="466" y="-90" type="curve" smooth="yes" name="sh06"/>
       <point x="459" y="-75"/>
       <point x="451" y="-53"/>
       <point x="438" y="-28" type="curve"/>
@@ -74,13 +74,13 @@
       <point x="266" y="258" type="curve" smooth="yes"/>
       <point x="337" y="230"/>
       <point x="403" y="215"/>
-      <point x="479" y="215" type="curve" name="sh07" smooth="yes"/>
+      <point x="479" y="215" type="curve" smooth="yes" name="sh07"/>
       <point x="567" y="215"/>
       <point x="637" y="235"/>
       <point x="688" y="274" type="curve" smooth="yes"/>
       <point x="739" y="313"/>
       <point x="764" y="364"/>
-      <point x="764" y="429" type="curve" name="ah01" smooth="yes"/>
+      <point x="764" y="429" type="curve" smooth="yes" name="ah01"/>
       <point x="764" y="476"/>
       <point x="752" y="511"/>
       <point x="729" y="540" type="curve" smooth="yes"/>
@@ -93,13 +93,13 @@
       <point x="252" y="820" type="curve" smooth="yes"/>
       <point x="213" y="867"/>
       <point x="190" y="926"/>
-      <point x="190" y="1021" type="curve" name="sh01" smooth="yes"/>
+      <point x="190" y="1021" type="curve" smooth="yes" name="sh01"/>
       <point x="190" y="1177"/>
       <point x="255" y="1298"/>
       <point x="351" y="1381" type="curve" smooth="yes"/>
       <point x="455" y="1470"/>
       <point x="599" y="1520"/>
-      <point x="770" y="1520" type="curve" name="sh08" smooth="yes"/>
+      <point x="770" y="1520" type="curve" smooth="yes" name="sh08"/>
       <point x="908" y="1520"/>
       <point x="1037" y="1492"/>
       <point x="1159" y="1438" type="curve"/>
@@ -109,7 +109,7 @@
       <point x="943" y="1247" type="curve" smooth="yes"/>
       <point x="882" y="1268"/>
       <point x="812" y="1278"/>
-      <point x="748" y="1278" type="curve" name="sv02" smooth="yes"/>
+      <point x="748" y="1278" type="curve" smooth="yes" name="sv02"/>
       <point x="656" y="1278"/>
       <point x="594" y="1257"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/S_circumflex.glif b/source/Hack-BoldItalic.ufo/glyphs/S_circumflex.glif
index daadbf54b..359987b24 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/S_circumflex.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/S_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Scircumflex" format="1">
+<glyph name="Scircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="015C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/S_igma.glif b/source/Hack-BoldItalic.ufo/glyphs/S_igma.glif
index 122515e68..5fecd17a5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/S_igma.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/S_igma.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Sigma" format="1">
+<glyph name="Sigma" format="2">
   <advance width="1233"/>
   <unicode hex="03A3"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/T_.glif b/source/Hack-BoldItalic.ufo/glyphs/T_.glif
index 26e11e7bc..570cdbe6c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/T_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/T_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="T" format="1">
+<glyph name="T" format="2">
   <advance width="1233"/>
   <unicode hex="0054"/>
   <outline>
     <contour>
-      <point x="563" y="1235" type="line" name="hr00"/>
+      <point x="563" y="1235" type="line"/>
       <point x="180" y="1235" type="line"/>
-      <point x="229" y="1493" type="line" name="at01"/>
+      <point x="229" y="1493" type="line"/>
       <point x="1288" y="1493" type="line"/>
-      <point x="1237" y="1235" type="line" name="sv01"/>
-      <point x="858" y="1235" type="line" name="sv02"/>
-      <point x="618" y="0" type="line" name="ab01"/>
+      <point x="1237" y="1235" type="line"/>
+      <point x="858" y="1235" type="line"/>
+      <point x="618" y="0" type="line"/>
       <point x="324" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/T_au.glif b/source/Hack-BoldItalic.ufo/glyphs/T_au.glif
index c38b5c00b..ed940ea2a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/T_au.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/T_au.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Tau" format="1">
+<glyph name="Tau" format="2">
   <advance width="1233"/>
   <unicode hex="03A4"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/T_bar.glif b/source/Hack-BoldItalic.ufo/glyphs/T_bar.glif
index a058a0714..9c7e1e6db 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/T_bar.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/T_bar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Tbar" format="1">
+<glyph name="Tbar" format="2">
   <advance width="1233"/>
   <unicode hex="0166"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/T_caron.glif b/source/Hack-BoldItalic.ufo/glyphs/T_caron.glif
index 1eb1b42ca..103257af8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/T_caron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/T_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Tcaron" format="1">
+<glyph name="Tcaron" format="2">
   <advance width="1233"/>
   <unicode hex="0164"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/T_heta.glif b/source/Hack-BoldItalic.ufo/glyphs/T_heta.glif
index 940eadb30..95e6c65c8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/T_heta.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/T_heta.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Theta" format="1">
+<glyph name="Theta" format="2">
   <advance width="1233"/>
   <unicode hex="0398"/>
   <outline>
     <contour>
-      <point x="-21" y="452" type="curve" name="hr00" smooth="yes"/>
+      <point x="-21" y="452" type="curve" smooth="yes" name="hr00"/>
       <point x="-21" y="521"/>
       <point x="-13" y="597"/>
       <point x="3" y="680" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/T_horn.glif b/source/Hack-BoldItalic.ufo/glyphs/T_horn.glif
index 79ca8324d..62c4e718b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/T_horn.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/T_horn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Thorn" format="1">
+<glyph name="Thorn" format="2">
   <advance width="1233"/>
   <unicode hex="00DE"/>
   <outline>
@@ -7,13 +7,13 @@
       <point x="307" y="1493" type="line" name="at01"/>
       <point x="602" y="1493" type="line"/>
       <point x="555" y="1266" type="line"/>
-      <point x="682" y="1266" type="line" name="sv02" smooth="yes"/>
+      <point x="682" y="1266" type="line" smooth="yes" name="sv02"/>
       <point x="839" y="1266"/>
       <point x="959" y="1235"/>
       <point x="1042" y="1174" type="curve" smooth="yes"/>
       <point x="1126" y="1111"/>
       <point x="1165" y="1023"/>
-      <point x="1165" y="902" type="curve" name="dh02" smooth="yes"/>
+      <point x="1165" y="902" type="curve" smooth="yes" name="dh02"/>
       <point x="1165" y="834"/>
       <point x="1153" y="758"/>
       <point x="1129" y="683" type="curve" smooth="yes"/>
@@ -25,25 +25,25 @@
       <point x="840" y="374" type="curve" smooth="yes"/>
       <point x="761" y="346"/>
       <point x="671" y="332"/>
-      <point x="539" y="332" type="curve" name="dv01" smooth="yes"/>
+      <point x="539" y="332" type="curve" smooth="yes" name="dv01"/>
       <point x="375" y="332" type="line"/>
       <point x="311" y="0" type="line" name="ab01"/>
       <point x="16" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="569" y="580" type="line" name="dv02" smooth="yes"/>
+      <point x="569" y="580" type="line" smooth="yes" name="dv02"/>
       <point x="667" y="580"/>
       <point x="739" y="602"/>
       <point x="786" y="647" type="curve" smooth="yes"/>
       <point x="834" y="692"/>
       <point x="858" y="759"/>
-      <point x="858" y="843" type="curve" name="dh01" smooth="yes"/>
+      <point x="858" y="843" type="curve" smooth="yes" name="dh01"/>
       <point x="858" y="916"/>
       <point x="841" y="956"/>
-      <point x="806" y="980" type="curve" name="hr01" smooth="yes"/>
+      <point x="806" y="980" type="curve" smooth="yes" name="hr01"/>
       <point x="771" y="1005"/>
       <point x="716" y="1018"/>
-      <point x="631" y="1018" type="curve" name="sv01" smooth="yes"/>
+      <point x="631" y="1018" type="curve" smooth="yes" name="sv01"/>
       <point x="510" y="1018" type="line" name="hr02"/>
       <point x="424" y="580" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/U_.glif b/source/Hack-BoldItalic.ufo/glyphs/U_.glif
index 1b529f967..2ec947ced 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/U_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/U_.glif
@@ -1,54 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="U" format="1">
+<glyph name="U" format="2">
   <advance width="1233"/>
   <unicode hex="0055"/>
   <outline>
     <contour>
-      <point x="497" y="-29" type="curve" name="hr00" smooth="yes"/>
-      <point x="356" y="-29"/>
-      <point x="243" y="3"/>
-      <point x="163" y="70" type="curve" smooth="yes"/>
-      <point x="80" y="138"/>
-      <point x="45" y="233"/>
-      <point x="45" y="354" type="curve" name="dh01" smooth="yes"/>
-      <point x="45" y="382"/>
-      <point x="47" y="408"/>
-      <point x="51" y="444" type="curve" name="sh01" smooth="yes"/>
-      <point x="56" y="491"/>
-      <point x="57" y="504"/>
-      <point x="68" y="551" type="curve"/>
-      <point x="252" y="1493" type="line" name="at01"/>
+      <point x="497.661" y="-29" type="curve" smooth="yes"/>
+      <point x="284.337" y="-29"/>
+      <point x="45" y="124.441"/>
+      <point x="45" y="357.025" type="curve" smooth="yes"/>
+      <point x="45" y="422.259"/>
+      <point x="55.5282" y="487.15"/>
+      <point x="68" y="551" type="curve" smooth="yes"/>
+      <point x="252" y="1493" type="line"/>
       <point x="547" y="1493" type="line"/>
-      <point x="348" y="477" type="line" name="sh02"/>
-      <point x="348" y="475"/>
-      <point x="348" y="473"/>
-      <point x="347" y="471" type="curve" name="sh03" smooth="yes"/>
-      <point x="342" y="440"/>
-      <point x="340" y="419"/>
-      <point x="340" y="400" type="curve" name="dh02" smooth="yes"/>
-      <point x="340" y="295"/>
-      <point x="403" y="231"/>
-      <point x="518" y="231" type="curve" name="dv01" smooth="yes"/>
-      <point x="587" y="231"/>
-      <point x="646" y="251"/>
-      <point x="689" y="292" type="curve" smooth="yes"/>
-      <point x="732" y="333"/>
-      <point x="761" y="394"/>
+      <point x="348" y="477" type="line" smooth="yes"/>
+      <point x="343.141" y="452.194"/>
+      <point x="340" y="426.796"/>
+      <point x="340" y="402.73" type="curve" smooth="yes"/>
+      <point x="340" y="286.038"/>
+      <point x="413.861" y="231"/>
+      <point x="524.405" y="231" type="curve" smooth="yes"/>
+      <point x="678.042" y="231"/>
+      <point x="750.663" y="337.432"/>
       <point x="778" y="477" type="curve" smooth="yes"/>
-      <point x="977" y="1493" type="line" name="at02"/>
+      <point x="977" y="1493" type="line"/>
       <point x="1272" y="1493" type="line"/>
       <point x="1087" y="551" type="line" smooth="yes"/>
-      <point x="1064" y="438"/>
-      <point x="1044" y="354"/>
-      <point x="1012" y="279" type="curve" smooth="yes"/>
-      <point x="984" y="214"/>
-      <point x="951" y="166"/>
-      <point x="908" y="123" type="curve" smooth="yes"/>
-      <point x="858" y="74"/>
-      <point x="798" y="37"/>
-      <point x="729" y="10" type="curve" smooth="yes"/>
-      <point x="660" y="-17"/>
-      <point x="585" y="-29"/>
+      <point x="1040.72" y="315.608"/>
+      <point x="981.471" y="107.687"/>
+      <point x="737.37" y="13.2754" type="curve" smooth="yes"/>
+      <point x="661.127" y="-16.2128"/>
+      <point x="581.402" y="-29"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/U_acute.glif b/source/Hack-BoldItalic.ufo/glyphs/U_acute.glif
index e6c3852f5..486896782 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/U_acute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/U_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Uacute" format="1">
+<glyph name="Uacute" format="2">
   <advance width="1233"/>
   <unicode hex="00DA"/>
   <outline>
@@ -10,16 +10,16 @@
       <point x="622" y="1590" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="497" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="497" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="356" y="-29"/>
       <point x="243" y="3"/>
       <point x="163" y="70" type="curve" smooth="yes"/>
       <point x="80" y="138"/>
       <point x="45" y="233"/>
-      <point x="45" y="354" type="curve" name="dh01" smooth="yes"/>
+      <point x="45" y="354" type="curve" smooth="yes" name="dh01"/>
       <point x="45" y="382"/>
       <point x="47" y="408"/>
-      <point x="51" y="444" type="curve" name="sh01" smooth="yes"/>
+      <point x="51" y="444" type="curve" smooth="yes" name="sh01"/>
       <point x="56" y="495"/>
       <point x="58" y="504"/>
       <point x="68" y="551" type="curve"/>
@@ -28,13 +28,13 @@
       <point x="348" y="477" type="line" name="sh02"/>
       <point x="348" y="475"/>
       <point x="348" y="473"/>
-      <point x="347" y="471" type="curve" name="sh03" smooth="yes"/>
+      <point x="347" y="471" type="curve" smooth="yes" name="sh03"/>
       <point x="342" y="440"/>
       <point x="340" y="419"/>
-      <point x="340" y="400" type="curve" name="dh02" smooth="yes"/>
+      <point x="340" y="400" type="curve" smooth="yes" name="dh02"/>
       <point x="340" y="295"/>
       <point x="403" y="231"/>
-      <point x="518" y="231" type="curve" name="dv02" smooth="yes"/>
+      <point x="518" y="231" type="curve" smooth="yes" name="dv02"/>
       <point x="587" y="231"/>
       <point x="646" y="251"/>
       <point x="689" y="292" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/U_breve.glif b/source/Hack-BoldItalic.ufo/glyphs/U_breve.glif
index f8df9ed38..05d8f71cc 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/U_breve.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/U_breve.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ubreve" format="1">
+<glyph name="Ubreve" format="2">
   <advance width="1233"/>
   <unicode hex="016C"/>
   <outline>
     <contour>
-      <point x="494" y="1824" type="curve" name="hr00" smooth="yes"/>
+      <point x="494" y="1824" type="curve" smooth="yes" name="hr00"/>
       <point x="494" y="1839"/>
       <point x="494" y="1849"/>
       <point x="495" y="1852" type="curve"/>
@@ -59,7 +59,7 @@
       <point x="163" y="70" type="curve" smooth="yes"/>
       <point x="242" y="4"/>
       <point x="354" y="-29"/>
-      <point x="497" y="-29" type="curve" name="hr01" smooth="yes"/>
+      <point x="497" y="-29" type="curve" smooth="yes" name="hr01"/>
       <point x="584" y="-29"/>
       <point x="662" y="-16"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/U_circumflex.glif b/source/Hack-BoldItalic.ufo/glyphs/U_circumflex.glif
index 158e35caf..0c693cf7d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/U_circumflex.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/U_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ucircumflex" format="1">
+<glyph name="Ucircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00DB"/>
   <outline>
@@ -13,16 +13,16 @@
       <point x="401" y="1591" type="line"/>
     </contour>
     <contour>
-      <point x="497" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="497" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="356" y="-29"/>
       <point x="243" y="3"/>
       <point x="163" y="70" type="curve" smooth="yes"/>
       <point x="80" y="138"/>
       <point x="45" y="233"/>
-      <point x="45" y="354" type="curve" name="dh01" smooth="yes"/>
+      <point x="45" y="354" type="curve" smooth="yes" name="dh01"/>
       <point x="45" y="382"/>
       <point x="47" y="408"/>
-      <point x="51" y="444" type="curve" name="sh01" smooth="yes"/>
+      <point x="51" y="444" type="curve" smooth="yes" name="sh01"/>
       <point x="56" y="495"/>
       <point x="58" y="504"/>
       <point x="68" y="551" type="curve"/>
@@ -31,13 +31,13 @@
       <point x="348" y="477" type="line" name="sh02"/>
       <point x="348" y="475"/>
       <point x="348" y="473"/>
-      <point x="347" y="471" type="curve" name="sh03" smooth="yes"/>
+      <point x="347" y="471" type="curve" smooth="yes" name="sh03"/>
       <point x="342" y="440"/>
       <point x="340" y="419"/>
-      <point x="340" y="400" type="curve" name="dh02" smooth="yes"/>
+      <point x="340" y="400" type="curve" smooth="yes" name="dh02"/>
       <point x="340" y="295"/>
       <point x="403" y="231"/>
-      <point x="518" y="231" type="curve" name="dv02" smooth="yes"/>
+      <point x="518" y="231" type="curve" smooth="yes" name="dv02"/>
       <point x="587" y="231"/>
       <point x="646" y="251"/>
       <point x="689" y="292" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/U_dieresis.glif b/source/Hack-BoldItalic.ufo/glyphs/U_dieresis.glif
index 0206eec20..1a2dfe9be 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/U_dieresis.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/U_dieresis.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Udieresis" format="1">
+<glyph name="Udieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00DC"/>
   <outline>
     <contour>
-      <point x="493" y="1608" type="line" name="hr00" smooth="yes"/>
+      <point x="493" y="1608" type="line" smooth="yes" name="hr00"/>
       <point x="475" y="1608"/>
       <point x="466" y="1617"/>
       <point x="466" y="1634" type="curve" smooth="yes"/>
@@ -14,7 +14,7 @@
       <point x="505" y="1827" type="line" smooth="yes"/>
       <point x="509" y="1845"/>
       <point x="520" y="1854"/>
-      <point x="537" y="1854" type="curve" name="dv03" smooth="yes"/>
+      <point x="537" y="1854" type="curve" smooth="yes" name="dv03"/>
       <point x="712" y="1854" type="line" smooth="yes"/>
       <point x="730" y="1854"/>
       <point x="739" y="1845"/>
@@ -28,7 +28,7 @@
       <point x="669" y="1608" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="889" y="1608" type="line" name="sv01" smooth="yes"/>
+      <point x="889" y="1608" type="line" smooth="yes" name="sv01"/>
       <point x="871" y="1608"/>
       <point x="862" y="1617"/>
       <point x="862" y="1634" type="curve" smooth="yes"/>
@@ -38,7 +38,7 @@
       <point x="900" y="1827" type="line"/>
       <point x="903" y="1845"/>
       <point x="913" y="1854"/>
-      <point x="932" y="1854" type="curve" name="sv02" smooth="yes"/>
+      <point x="932" y="1854" type="curve" smooth="yes" name="sv02"/>
       <point x="1107" y="1854" type="line" smooth="yes"/>
       <point x="1127" y="1854"/>
       <point x="1138" y="1841"/>
@@ -49,16 +49,16 @@
       <point x="1066" y="1608" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="497" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="497" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="356" y="-29"/>
       <point x="243" y="3"/>
       <point x="163" y="70" type="curve" smooth="yes"/>
       <point x="80" y="138"/>
       <point x="45" y="233"/>
-      <point x="45" y="354" type="curve" name="dh01" smooth="yes"/>
+      <point x="45" y="354" type="curve" smooth="yes" name="dh01"/>
       <point x="45" y="382"/>
       <point x="47" y="408"/>
-      <point x="51" y="444" type="curve" name="sh01" smooth="yes"/>
+      <point x="51" y="444" type="curve" smooth="yes" name="sh01"/>
       <point x="56" y="495"/>
       <point x="58" y="504"/>
       <point x="68" y="551" type="curve"/>
@@ -67,13 +67,13 @@
       <point x="348" y="477" type="line" name="sh02"/>
       <point x="348" y="475"/>
       <point x="348" y="473"/>
-      <point x="347" y="471" type="curve" name="sh03" smooth="yes"/>
+      <point x="347" y="471" type="curve" smooth="yes" name="sh03"/>
       <point x="342" y="440"/>
       <point x="340" y="419"/>
-      <point x="340" y="400" type="curve" name="dh02" smooth="yes"/>
+      <point x="340" y="400" type="curve" smooth="yes" name="dh02"/>
       <point x="340" y="295"/>
       <point x="403" y="231"/>
-      <point x="518" y="231" type="curve" name="dv02" smooth="yes"/>
+      <point x="518" y="231" type="curve" smooth="yes" name="dv02"/>
       <point x="587" y="231"/>
       <point x="646" y="251"/>
       <point x="689" y="292" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/U_grave.glif b/source/Hack-BoldItalic.ufo/glyphs/U_grave.glif
index 1a8703122..91f26b675 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/U_grave.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/U_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ugrave" format="1">
+<glyph name="Ugrave" format="2">
   <advance width="1233"/>
   <unicode hex="00D9"/>
   <outline>
@@ -10,16 +10,16 @@
       <point x="725" y="1588" type="line" name="dv03"/>
     </contour>
     <contour>
-      <point x="497" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="497" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="356" y="-29"/>
       <point x="243" y="3"/>
       <point x="163" y="70" type="curve" smooth="yes"/>
       <point x="80" y="138"/>
       <point x="45" y="233"/>
-      <point x="45" y="354" type="curve" name="dh01" smooth="yes"/>
+      <point x="45" y="354" type="curve" smooth="yes" name="dh01"/>
       <point x="45" y="382"/>
       <point x="47" y="408"/>
-      <point x="51" y="444" type="curve" name="sh01" smooth="yes"/>
+      <point x="51" y="444" type="curve" smooth="yes" name="sh01"/>
       <point x="56" y="495"/>
       <point x="58" y="504"/>
       <point x="68" y="551" type="curve"/>
@@ -28,13 +28,13 @@
       <point x="348" y="477" type="line" name="sh02"/>
       <point x="348" y="475"/>
       <point x="348" y="473"/>
-      <point x="347" y="471" type="curve" name="sh03" smooth="yes"/>
+      <point x="347" y="471" type="curve" smooth="yes" name="sh03"/>
       <point x="342" y="440"/>
       <point x="340" y="419"/>
-      <point x="340" y="400" type="curve" name="dh02" smooth="yes"/>
+      <point x="340" y="400" type="curve" smooth="yes" name="dh02"/>
       <point x="340" y="295"/>
       <point x="403" y="231"/>
-      <point x="518" y="231" type="curve" name="dv02" smooth="yes"/>
+      <point x="518" y="231" type="curve" smooth="yes" name="dv02"/>
       <point x="587" y="231"/>
       <point x="646" y="251"/>
       <point x="689" y="292" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/U_horn.glif b/source/Hack-BoldItalic.ufo/glyphs/U_horn.glif
index 3f120873d..98f00d8f4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/U_horn.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/U_horn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Uhorn" format="1">
+<glyph name="Uhorn" format="2">
   <advance width="1233"/>
   <unicode hex="01AF"/>
   <outline>
@@ -10,20 +10,20 @@
       <point x="1422" y="1365" type="curve" smooth="yes"/>
       <point x="1391" y="1213"/>
       <point x="1313" y="1127"/>
-      <point x="1198" y="1127" type="curve" name="sv01" smooth="yes"/>
+      <point x="1198" y="1127" type="curve" smooth="yes" name="sv01"/>
       <point x="1175" y="1127"/>
       <point x="1152" y="1131"/>
       <point x="1129" y="1139" type="curve"/>
       <point x="1014" y="551" type="line" smooth="yes"/>
       <point x="969" y="322"/>
       <point x="924" y="208"/>
-      <point x="836" y="123" type="curve" name="hr01" smooth="yes"/>
+      <point x="836" y="123" type="curve" smooth="yes" name="hr01"/>
       <point x="736" y="24"/>
       <point x="599" y="-29"/>
-      <point x="419" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="419" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="136" y="-29"/>
       <point x="-28" y="107"/>
-      <point x="-28" y="359" type="curve" name="dh01" smooth="yes"/>
+      <point x="-28" y="359" type="curve" smooth="yes" name="dh01"/>
       <point x="-28" y="411"/>
       <point x="-21" y="471"/>
       <point x="-5" y="551" type="curve" smooth="yes"/>
@@ -32,13 +32,13 @@
       <point x="275" y="477" type="line" name="sh01"/>
       <point x="275" y="475"/>
       <point x="275" y="473"/>
-      <point x="274" y="471" type="curve" name="sh02" smooth="yes"/>
+      <point x="274" y="471" type="curve" smooth="yes" name="sh02"/>
       <point x="269" y="440"/>
       <point x="267" y="418"/>
-      <point x="267" y="399" type="curve" name="dh02" smooth="yes"/>
+      <point x="267" y="399" type="curve" smooth="yes" name="dh02"/>
       <point x="267" y="294"/>
       <point x="329" y="231"/>
-      <point x="449" y="231" type="curve" name="dv02" smooth="yes"/>
+      <point x="449" y="231" type="curve" smooth="yes" name="dv02"/>
       <point x="582" y="231"/>
       <point x="672" y="309"/>
       <point x="705" y="477" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/U_hungarumlaut.glif b/source/Hack-BoldItalic.ufo/glyphs/U_hungarumlaut.glif
index 4a752db55..41c4eac66 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/U_hungarumlaut.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/U_hungarumlaut.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Uhungarumlaut" format="1">
+<glyph name="Uhungarumlaut" format="2">
   <advance width="1233"/>
   <unicode hex="0170"/>
   <outline>
@@ -16,10 +16,10 @@
       <point x="812" y="1588" type="line"/>
     </contour>
     <contour>
-      <point x="492" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="492" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="209" y="-29"/>
       <point x="45" y="107"/>
-      <point x="45" y="359" type="curve" name="dh01" smooth="yes"/>
+      <point x="45" y="359" type="curve" smooth="yes" name="dh01"/>
       <point x="45" y="411"/>
       <point x="52" y="471"/>
       <point x="68" y="551" type="curve" smooth="yes"/>
@@ -28,13 +28,13 @@
       <point x="348" y="477" type="line" name="sh01"/>
       <point x="348" y="475"/>
       <point x="348" y="473"/>
-      <point x="347" y="471" type="curve" name="sh02" smooth="yes"/>
+      <point x="347" y="471" type="curve" smooth="yes" name="sh02"/>
       <point x="342" y="440"/>
       <point x="340" y="418"/>
-      <point x="340" y="399" type="curve" name="dh02" smooth="yes"/>
+      <point x="340" y="399" type="curve" smooth="yes" name="dh02"/>
       <point x="340" y="294"/>
       <point x="402" y="231"/>
-      <point x="522" y="231" type="curve" name="dv02" smooth="yes"/>
+      <point x="522" y="231" type="curve" smooth="yes" name="dv02"/>
       <point x="655" y="231"/>
       <point x="745" y="309"/>
       <point x="778" y="477" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/U_macron.glif b/source/Hack-BoldItalic.ufo/glyphs/U_macron.glif
index 9b0c820f6..8f64136d4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/U_macron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/U_macron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Umacron" format="1">
+<glyph name="Umacron" format="2">
   <advance width="1233"/>
   <unicode hex="016A"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="483" y="1662" type="line"/>
     </contour>
     <contour>
-      <point x="492" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="492" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="209" y="-29"/>
       <point x="45" y="107"/>
-      <point x="45" y="359" type="curve" name="dh01" smooth="yes"/>
+      <point x="45" y="359" type="curve" smooth="yes" name="dh01"/>
       <point x="45" y="411"/>
       <point x="52" y="471"/>
       <point x="68" y="551" type="curve" smooth="yes"/>
@@ -22,13 +22,13 @@
       <point x="348" y="477" type="line" name="sh01"/>
       <point x="348" y="475"/>
       <point x="348" y="473"/>
-      <point x="347" y="471" type="curve" name="sh02" smooth="yes"/>
+      <point x="347" y="471" type="curve" smooth="yes" name="sh02"/>
       <point x="342" y="440"/>
       <point x="340" y="418"/>
-      <point x="340" y="399" type="curve" name="dh02" smooth="yes"/>
+      <point x="340" y="399" type="curve" smooth="yes" name="dh02"/>
       <point x="340" y="294"/>
       <point x="402" y="231"/>
-      <point x="522" y="231" type="curve" name="dv02" smooth="yes"/>
+      <point x="522" y="231" type="curve" smooth="yes" name="dv02"/>
       <point x="655" y="231"/>
       <point x="745" y="309"/>
       <point x="778" y="477" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/U_ogonek.glif b/source/Hack-BoldItalic.ufo/glyphs/U_ogonek.glif
index fbf80249d..b01598be0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/U_ogonek.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/U_ogonek.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Uogonek" format="1">
+<glyph name="Uogonek" format="2">
   <advance width="1233"/>
   <unicode hex="0172"/>
   <outline>
@@ -11,33 +11,33 @@
       <point x="909" y="123" type="curve" smooth="yes"/>
       <point x="809" y="24"/>
       <point x="672" y="-29"/>
-      <point x="492" y="-29" type="curve" name="dv03" smooth="yes"/>
+      <point x="492" y="-29" type="curve" smooth="yes" name="dv03"/>
       <point x="487" y="-29" type="line"/>
       <point x="445" y="-74"/>
       <point x="416" y="-109"/>
       <point x="400" y="-133" type="curve" smooth="yes"/>
       <point x="384" y="-158"/>
       <point x="376" y="-178"/>
-      <point x="376" y="-198" type="curve" name="sh01" smooth="yes"/>
+      <point x="376" y="-198" type="curve" smooth="yes" name="sh01"/>
       <point x="376" y="-237"/>
       <point x="407" y="-270"/>
-      <point x="476" y="-270" type="curve" name="dv02" smooth="yes"/>
+      <point x="476" y="-270" type="curve" smooth="yes" name="dv02"/>
       <point x="512" y="-270"/>
       <point x="569" y="-262"/>
       <point x="632" y="-239" type="curve"/>
       <point x="601" y="-395" type="line"/>
       <point x="536" y="-410"/>
       <point x="473" y="-417"/>
-      <point x="422" y="-417" type="curve" name="dv01" smooth="yes"/>
+      <point x="422" y="-417" type="curve" smooth="yes" name="dv01"/>
       <point x="285" y="-417"/>
       <point x="202" y="-366"/>
-      <point x="202" y="-271" type="curve" name="hr01" smooth="yes"/>
+      <point x="202" y="-271" type="curve" smooth="yes" name="hr01"/>
       <point x="202" y="-199"/>
       <point x="250" y="-112"/>
       <point x="357" y="-17" type="curve" name="ih01"/>
       <point x="156" y="22"/>
       <point x="45" y="148"/>
-      <point x="45" y="359" type="curve" name="dh01" smooth="yes"/>
+      <point x="45" y="359" type="curve" smooth="yes" name="dh01"/>
       <point x="45" y="411"/>
       <point x="52" y="471"/>
       <point x="68" y="551" type="curve" smooth="yes"/>
@@ -46,13 +46,13 @@
       <point x="348" y="477" type="line" name="sh02"/>
       <point x="348" y="475"/>
       <point x="348" y="473"/>
-      <point x="347" y="471" type="curve" name="sh03" smooth="yes"/>
+      <point x="347" y="471" type="curve" smooth="yes" name="sh03"/>
       <point x="342" y="440"/>
       <point x="340" y="418"/>
-      <point x="340" y="399" type="curve" name="dh02" smooth="yes"/>
+      <point x="340" y="399" type="curve" smooth="yes" name="dh02"/>
       <point x="340" y="294"/>
       <point x="402" y="231"/>
-      <point x="522" y="231" type="curve" name="dv04" smooth="yes"/>
+      <point x="522" y="231" type="curve" smooth="yes" name="dv04"/>
       <point x="655" y="231"/>
       <point x="745" y="309"/>
       <point x="778" y="477" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/U_psilon.glif b/source/Hack-BoldItalic.ufo/glyphs/U_psilon.glif
index b1f0ce62b..68ea31b51 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/U_psilon.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/U_psilon.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Upsilon" format="1">
+<glyph name="Upsilon" format="2">
   <advance width="1233"/>
   <unicode hex="03A5"/>
   <outline>
     <contour>
-      <point x="432" y="534" type="line" name="hr00" smooth="yes"/>
+      <point x="432" y="534" type="line" smooth="yes" name="hr00"/>
       <point x="452" y="635"/>
       <point x="461" y="736"/>
-      <point x="461" y="829" type="curve" name="dh01" smooth="yes"/>
+      <point x="461" y="829" type="curve" smooth="yes" name="dh01"/>
       <point x="461" y="1020"/>
       <point x="423" y="1173"/>
       <point x="363" y="1203" type="curve" smooth="yes"/>
       <point x="315" y="1226"/>
       <point x="265" y="1238"/>
-      <point x="214" y="1238" type="curve" name="sv01" smooth="yes"/>
+      <point x="214" y="1238" type="curve" smooth="yes" name="sv01"/>
       <point x="187" y="1238"/>
       <point x="160" y="1235"/>
       <point x="132" y="1229" type="curve" name="sv02"/>
       <point x="183" y="1493" type="line" name="at01"/>
       <point x="208" y="1501"/>
       <point x="239" y="1504"/>
-      <point x="274" y="1504" type="curve" name="at02" smooth="yes"/>
+      <point x="274" y="1504" type="curve" smooth="yes" name="at02"/>
       <point x="313" y="1504"/>
       <point x="359" y="1501"/>
       <point x="410" y="1490" type="curve" name="at03"/>
@@ -29,22 +29,22 @@
       <point x="670" y="1057" type="curve" name="dh02"/>
       <point x="790" y="1308"/>
       <point x="933" y="1453"/>
-      <point x="1098" y="1490" type="curve" name="at04" smooth="yes"/>
+      <point x="1098" y="1490" type="curve" smooth="yes" name="at04"/>
       <point x="1123" y="1495"/>
       <point x="1146" y="1498"/>
-      <point x="1165" y="1498" type="curve" name="at05" smooth="yes"/>
+      <point x="1165" y="1498" type="curve" smooth="yes" name="at05"/>
       <point x="1206" y="1498"/>
       <point x="1240" y="1488"/>
       <point x="1269" y="1467" type="curve" smooth="yes"/>
       <point x="1315" y="1434"/>
       <point x="1338" y="1389"/>
-      <point x="1338" y="1332" type="curve" name="hr01" smooth="yes"/>
+      <point x="1338" y="1332" type="curve" smooth="yes" name="hr01"/>
       <point x="1338" y="1277"/>
       <point x="1315" y="1209"/>
       <point x="1270" y="1130" type="curve" smooth="yes"/>
       <point x="1243" y="1085"/>
       <point x="1199" y="1063"/>
-      <point x="1155" y="1063" type="curve" name="sv03" smooth="yes"/>
+      <point x="1155" y="1063" type="curve" smooth="yes" name="sv03"/>
       <point x="1089" y="1063"/>
       <point x="1026" y="1111"/>
       <point x="1034" y="1203" type="curve" name="hr02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/U_psilondieresis.glif b/source/Hack-BoldItalic.ufo/glyphs/U_psilondieresis.glif
index b3cd63206..7b5df0a7b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/U_psilondieresis.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/U_psilondieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Upsilondieresis" format="1">
+<glyph name="Upsilondieresis" format="2">
   <advance width="1233"/>
   <unicode hex="03AB"/>
   <outline>
     <contour>
-      <point x="483" y="1608" type="line" name="dv01" smooth="yes"/>
+      <point x="483" y="1608" type="line" smooth="yes" name="dv01"/>
       <point x="462" y="1608"/>
       <point x="453" y="1621"/>
       <point x="457" y="1641" type="curve" smooth="yes"/>
       <point x="495" y="1827" type="line" smooth="yes"/>
       <point x="499" y="1845"/>
       <point x="510" y="1854"/>
-      <point x="527" y="1854" type="curve" name="dv02" smooth="yes"/>
+      <point x="527" y="1854" type="curve" smooth="yes" name="dv02"/>
       <point x="702" y="1854" type="line" smooth="yes"/>
       <point x="723" y="1854"/>
       <point x="732" y="1841"/>
@@ -22,41 +22,41 @@
       <point x="659" y="1608" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="879" y="1608" type="line" name="sv01" smooth="yes"/>
+      <point x="879" y="1608" type="line" smooth="yes" name="sv01"/>
       <point x="858" y="1608"/>
       <point x="849" y="1621"/>
       <point x="853" y="1641" type="curve" smooth="yes"/>
       <point x="890" y="1827" type="line"/>
       <point x="893" y="1845"/>
       <point x="903" y="1854"/>
-      <point x="922" y="1854" type="curve" name="sv02" smooth="yes"/>
-      <point x="1097" y="1854" type="line" name="hr01" smooth="yes"/>
+      <point x="922" y="1854" type="curve" smooth="yes" name="sv02"/>
+      <point x="1097" y="1854" type="line" smooth="yes" name="hr01"/>
       <point x="1117" y="1854"/>
       <point x="1128" y="1841"/>
       <point x="1124" y="1821" type="curve" smooth="yes"/>
       <point x="1088" y="1635" type="line" smooth="yes"/>
       <point x="1085" y="1617"/>
       <point x="1074" y="1608"/>
-      <point x="1056" y="1608" type="curve" name="hr02" smooth="yes"/>
+      <point x="1056" y="1608" type="curve" smooth="yes" name="hr02"/>
     </contour>
     <contour>
       <point x="432" y="534" type="line" smooth="yes"/>
       <point x="452" y="635"/>
       <point x="461" y="736"/>
-      <point x="461" y="829" type="curve" name="dh01" smooth="yes"/>
+      <point x="461" y="829" type="curve" smooth="yes" name="dh01"/>
       <point x="461" y="1020"/>
       <point x="423" y="1173"/>
       <point x="363" y="1203" type="curve" smooth="yes"/>
       <point x="315" y="1226"/>
       <point x="265" y="1238"/>
-      <point x="214" y="1238" type="curve" name="sv03" smooth="yes"/>
+      <point x="214" y="1238" type="curve" smooth="yes" name="sv03"/>
       <point x="187" y="1238"/>
       <point x="160" y="1235"/>
       <point x="132" y="1229" type="curve" name="sv04"/>
       <point x="183" y="1493" type="line" name="at01"/>
       <point x="208" y="1501"/>
       <point x="239" y="1504"/>
-      <point x="274" y="1504" type="curve" name="at02" smooth="yes"/>
+      <point x="274" y="1504" type="curve" smooth="yes" name="at02"/>
       <point x="313" y="1504"/>
       <point x="359" y="1501"/>
       <point x="410" y="1490" type="curve" name="at03"/>
@@ -65,10 +65,10 @@
       <point x="670" y="1057" type="curve" name="dh02"/>
       <point x="790" y="1308"/>
       <point x="933" y="1453"/>
-      <point x="1098" y="1490" type="curve" name="at04" smooth="yes"/>
+      <point x="1098" y="1490" type="curve" smooth="yes" name="at04"/>
       <point x="1123" y="1495"/>
       <point x="1146" y="1498"/>
-      <point x="1165" y="1498" type="curve" name="at05" smooth="yes"/>
+      <point x="1165" y="1498" type="curve" smooth="yes" name="at05"/>
       <point x="1206" y="1498"/>
       <point x="1240" y="1488"/>
       <point x="1269" y="1467" type="curve" smooth="yes"/>
@@ -80,7 +80,7 @@
       <point x="1270" y="1130" type="curve" smooth="yes"/>
       <point x="1243" y="1085"/>
       <point x="1199" y="1063"/>
-      <point x="1155" y="1063" type="curve" name="sv05" smooth="yes"/>
+      <point x="1155" y="1063" type="curve" smooth="yes" name="sv05"/>
       <point x="1089" y="1063"/>
       <point x="1026" y="1111"/>
       <point x="1034" y="1203" type="curve" name="iv01"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/U_psilontonos.glif b/source/Hack-BoldItalic.ufo/glyphs/U_psilontonos.glif
index c5b3a1d11..c707ddaed 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/U_psilontonos.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/U_psilontonos.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Upsilontonos" format="1">
+<glyph name="Upsilontonos" format="2">
   <advance width="1233"/>
   <unicode hex="038E"/>
   <outline>
     <contour>
-      <point x="427" y="534" type="line" name="hr00" smooth="yes"/>
+      <point x="427" y="534" type="line" smooth="yes" name="hr00"/>
       <point x="447" y="635"/>
       <point x="456" y="736"/>
-      <point x="456" y="829" type="curve" name="dh01" smooth="yes"/>
+      <point x="456" y="829" type="curve" smooth="yes" name="dh01"/>
       <point x="456" y="1020"/>
       <point x="418" y="1173"/>
-      <point x="358" y="1203" type="curve" name="hr01" smooth="yes"/>
+      <point x="358" y="1203" type="curve" smooth="yes" name="hr01"/>
       <point x="310" y="1226"/>
       <point x="260" y="1238"/>
-      <point x="209" y="1238" type="curve" name="sv01" smooth="yes"/>
+      <point x="209" y="1238" type="curve" smooth="yes" name="sv01"/>
       <point x="182" y="1238"/>
       <point x="155" y="1235"/>
       <point x="127" y="1229" type="curve" name="sv02"/>
       <point x="178" y="1493" type="line" name="at01"/>
       <point x="203" y="1501"/>
       <point x="234" y="1504"/>
-      <point x="269" y="1504" type="curve" name="at02" smooth="yes"/>
+      <point x="269" y="1504" type="curve" smooth="yes" name="at02"/>
       <point x="308" y="1504"/>
       <point x="354" y="1501"/>
       <point x="405" y="1490" type="curve" name="at03"/>
@@ -29,28 +29,28 @@
       <point x="665" y="1057" type="curve" name="hr03"/>
       <point x="785" y="1308"/>
       <point x="928" y="1453"/>
-      <point x="1093" y="1490" type="curve" name="at04" smooth="yes"/>
+      <point x="1093" y="1490" type="curve" smooth="yes" name="at04"/>
       <point x="1118" y="1495"/>
       <point x="1141" y="1498"/>
-      <point x="1160" y="1498" type="curve" name="at05" smooth="yes"/>
+      <point x="1160" y="1498" type="curve" smooth="yes" name="at05"/>
       <point x="1201" y="1498"/>
       <point x="1235" y="1488"/>
       <point x="1264" y="1467" type="curve" smooth="yes"/>
       <point x="1310" y="1434"/>
       <point x="1333" y="1389"/>
-      <point x="1333" y="1332" type="curve" name="hr04" smooth="yes"/>
+      <point x="1333" y="1332" type="curve" smooth="yes" name="hr04"/>
       <point x="1333" y="1277"/>
       <point x="1310" y="1209"/>
-      <point x="1265" y="1130" type="curve" name="at06" smooth="yes"/>
+      <point x="1265" y="1130" type="curve" smooth="yes" name="at06"/>
       <point x="1238" y="1085"/>
       <point x="1194" y="1063"/>
-      <point x="1150" y="1063" type="curve" name="sv03" smooth="yes"/>
+      <point x="1150" y="1063" type="curve" smooth="yes" name="sv03"/>
       <point x="1084" y="1063"/>
       <point x="1021" y="1111"/>
       <point x="1029" y="1203" type="curve" name="iv01"/>
       <point x="870" y="1022"/>
       <point x="774" y="803"/>
-      <point x="722" y="534" type="curve" name="hr05" smooth="yes"/>
+      <point x="722" y="534" type="curve" smooth="yes" name="hr05"/>
       <point x="618" y="0" type="line" name="ab01"/>
       <point x="323" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/U_ring.glif b/source/Hack-BoldItalic.ufo/glyphs/U_ring.glif
index 89660f627..5d25e51e8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/U_ring.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/U_ring.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Uring" format="1">
+<glyph name="Uring" format="2">
   <advance width="1233"/>
   <unicode hex="016E"/>
   <outline>
@@ -11,10 +11,10 @@
       <point x="909" y="123" type="curve" smooth="yes"/>
       <point x="809" y="24"/>
       <point x="672" y="-29"/>
-      <point x="492" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="492" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="209" y="-29"/>
       <point x="45" y="107"/>
-      <point x="45" y="359" type="curve" name="dh01" smooth="yes"/>
+      <point x="45" y="359" type="curve" smooth="yes" name="dh01"/>
       <point x="45" y="411"/>
       <point x="52" y="471"/>
       <point x="68" y="551" type="curve" smooth="yes"/>
@@ -22,28 +22,28 @@
       <point x="503" y="1493" type="line" name="ih01"/>
       <point x="484" y="1532"/>
       <point x="475" y="1573"/>
-      <point x="475" y="1616" type="curve" name="dh03" smooth="yes"/>
+      <point x="475" y="1616" type="curve" smooth="yes" name="dh03"/>
       <point x="475" y="1773"/>
       <point x="601" y="1901"/>
-      <point x="759" y="1901" type="curve" name="dv04" smooth="yes"/>
+      <point x="759" y="1901" type="curve" smooth="yes" name="dv04"/>
       <point x="916" y="1901"/>
       <point x="1044" y="1773"/>
-      <point x="1044" y="1616" type="curve" name="dh05" smooth="yes"/>
+      <point x="1044" y="1616" type="curve" smooth="yes" name="dh05"/>
       <point x="1044" y="1573"/>
       <point x="1035" y="1532"/>
       <point x="1016" y="1493" type="curve" name="ih02"/>
     </contour>
     <contour>
-      <point x="759" y="1747" type="curve" name="dv03" smooth="yes"/>
+      <point x="759" y="1747" type="curve" smooth="yes" name="dv03"/>
       <point x="687" y="1747"/>
       <point x="628" y="1688"/>
-      <point x="628" y="1616" type="curve" name="hr01" smooth="yes"/>
+      <point x="628" y="1616" type="curve" smooth="yes" name="hr01"/>
       <point x="628" y="1543"/>
       <point x="687" y="1485"/>
-      <point x="759" y="1485" type="curve" name="at03" smooth="yes"/>
+      <point x="759" y="1485" type="curve" smooth="yes" name="at03"/>
       <point x="831" y="1485"/>
       <point x="891" y="1544"/>
-      <point x="891" y="1616" type="curve" name="dh04" smooth="yes"/>
+      <point x="891" y="1616" type="curve" smooth="yes" name="dh04"/>
       <point x="891" y="1688"/>
       <point x="831" y="1747"/>
     </contour>
@@ -51,20 +51,20 @@
       <point x="962" y="1416" type="line" name="ih03"/>
       <point x="910" y="1363"/>
       <point x="839" y="1331"/>
-      <point x="759" y="1331" type="curve" name="sv01" smooth="yes"/>
+      <point x="759" y="1331" type="curve" smooth="yes" name="sv01"/>
       <point x="667" y="1331"/>
       <point x="588" y="1372"/>
       <point x="536" y="1439" type="curve" name="iv01"/>
       <point x="348" y="477" type="line" name="sh01"/>
       <point x="348" y="475"/>
       <point x="348" y="473"/>
-      <point x="347" y="471" type="curve" name="sh02" smooth="yes"/>
+      <point x="347" y="471" type="curve" smooth="yes" name="sh02"/>
       <point x="342" y="440"/>
       <point x="340" y="418"/>
-      <point x="340" y="399" type="curve" name="dh02" smooth="yes"/>
+      <point x="340" y="399" type="curve" smooth="yes" name="dh02"/>
       <point x="340" y="294"/>
       <point x="402" y="231"/>
-      <point x="522" y="231" type="curve" name="dv02" smooth="yes"/>
+      <point x="522" y="231" type="curve" smooth="yes" name="dv02"/>
       <point x="655" y="231"/>
       <point x="745" y="309"/>
       <point x="778" y="477" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/U_tilde.glif b/source/Hack-BoldItalic.ufo/glyphs/U_tilde.glif
index a38e310eb..9c53ad965 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/U_tilde.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/U_tilde.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Utilde" format="1">
+<glyph name="Utilde" format="2">
   <advance width="1233"/>
   <unicode hex="0168"/>
   <outline>
@@ -7,37 +7,37 @@
       <point x="438" y="1589" type="line" name="sv01"/>
       <point x="471" y="1762"/>
       <point x="563" y="1855"/>
-      <point x="690" y="1855" type="curve" name="dv03" smooth="yes"/>
+      <point x="690" y="1855" type="curve" smooth="yes" name="dv03"/>
       <point x="741" y="1855"/>
       <point x="780" y="1840"/>
       <point x="827" y="1804" type="curve" smooth="yes"/>
       <point x="880" y="1763" type="line"/>
       <point x="901" y="1745"/>
       <point x="925" y="1736"/>
-      <point x="950" y="1736" type="curve" name="dv05" smooth="yes"/>
+      <point x="950" y="1736" type="curve" smooth="yes" name="dv05"/>
       <point x="999" y="1736"/>
       <point x="1035" y="1778"/>
       <point x="1050" y="1855" type="curve" name="sv02"/>
       <point x="1187" y="1855" type="line"/>
       <point x="1152" y="1690"/>
       <point x="1068" y="1589"/>
-      <point x="935" y="1589" type="curve" name="dv04" smooth="yes"/>
+      <point x="935" y="1589" type="curve" smooth="yes" name="dv04"/>
       <point x="888" y="1589"/>
       <point x="849" y="1601"/>
       <point x="798" y="1640" type="curve" smooth="yes"/>
       <point x="749" y="1677" type="line" smooth="yes"/>
       <point x="716" y="1702"/>
       <point x="696" y="1709"/>
-      <point x="676" y="1709" type="curve" name="dv02" smooth="yes"/>
+      <point x="676" y="1709" type="curve" smooth="yes" name="dv02"/>
       <point x="625" y="1709"/>
       <point x="590" y="1668"/>
       <point x="575" y="1589" type="curve"/>
     </contour>
     <contour>
-      <point x="492" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="492" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="209" y="-29"/>
       <point x="45" y="107"/>
-      <point x="45" y="359" type="curve" name="dh01" smooth="yes"/>
+      <point x="45" y="359" type="curve" smooth="yes" name="dh01"/>
       <point x="45" y="411"/>
       <point x="52" y="471"/>
       <point x="68" y="551" type="curve" smooth="yes"/>
@@ -46,13 +46,13 @@
       <point x="348" y="477" type="line" name="sh01"/>
       <point x="348" y="475"/>
       <point x="348" y="473"/>
-      <point x="347" y="471" type="curve" name="sh02" smooth="yes"/>
+      <point x="347" y="471" type="curve" smooth="yes" name="sh02"/>
       <point x="342" y="440"/>
       <point x="340" y="418"/>
-      <point x="340" y="399" type="curve" name="hr02" smooth="yes"/>
+      <point x="340" y="399" type="curve" smooth="yes" name="hr02"/>
       <point x="340" y="294"/>
       <point x="402" y="231"/>
-      <point x="522" y="231" type="curve" name="hr03" smooth="yes"/>
+      <point x="522" y="231" type="curve" smooth="yes" name="hr03"/>
       <point x="655" y="231"/>
       <point x="745" y="309"/>
       <point x="778" y="477" type="curve" smooth="yes"/>
@@ -61,7 +61,7 @@
       <point x="1087" y="551" type="line" smooth="yes"/>
       <point x="1042" y="322"/>
       <point x="997" y="208"/>
-      <point x="909" y="123" type="curve" name="hr05" smooth="yes"/>
+      <point x="909" y="123" type="curve" smooth="yes" name="hr05"/>
       <point x="809" y="24"/>
       <point x="672" y="-29"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/V_.glif b/source/Hack-BoldItalic.ufo/glyphs/V_.glif
index 6f2ab2c90..e2748555e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/V_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/V_.glif
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="V" format="1">
+<glyph name="V" format="2">
   <advance width="1233"/>
   <unicode hex="0056"/>
   <outline>
     <contour>
-      <point x="203" y="1493" type="line" name="hr00"/>
-      <point x="494" y="1493" type="line"/>
-      <point x="518" y="242" type="line" name="iv01"/>
-      <point x="1024" y="1493" type="line" name="at01"/>
+      <point x="203" y="1493" type="line"/>
+      <point x="506" y="1493" type="line"/>
+      <point x="506" y="242" type="line"/>
+      <point x="1024" y="1493" type="line"/>
       <point x="1325" y="1493" type="line"/>
-      <point x="680" y="0" type="line" name="ab01"/>
+      <point x="680" y="0" type="line"/>
       <point x="268" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/W_.glif b/source/Hack-BoldItalic.ufo/glyphs/W_.glif
index a5150992a..a2fdf9cda 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/W_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/W_.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="W" format="1">
+<glyph name="W" format="2">
   <advance width="1233"/>
   <unicode hex="0057"/>
   <outline>
     <contour>
-      <point x="143" y="1493" type="line" name="hr00"/>
+      <point x="143" y="1493" type="line"/>
       <point x="397" y="1493" type="line"/>
-      <point x="289" y="397" type="line" name="iv01"/>
+      <point x="289" y="397" type="line"/>
       <point x="561" y="1106" type="line"/>
-      <point x="799" y="1106" type="line"/>
-      <point x="811" y="397" type="line" name="iv02"/>
-      <point x="1108" y="1493" type="line" name="at01"/>
+      <point x="805" y="1106" type="line"/>
+      <point x="805" y="397" type="line"/>
+      <point x="1108" y="1493" type="line"/>
       <point x="1370" y="1493" type="line"/>
-      <point x="909" y="0" type="line" name="ab01"/>
-      <point x="639" y="0" type="line"/>
-      <point x="627" y="784" type="line" name="iv03"/>
-      <point x="309" y="0" type="line" name="ab02"/>
+      <point x="909" y="0" type="line"/>
+      <point x="633" y="0" type="line"/>
+      <point x="633" y="784" type="line"/>
+      <point x="309" y="0" type="line"/>
       <point x="41" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/W_acute.glif b/source/Hack-BoldItalic.ufo/glyphs/W_acute.glif
index 2b5bbb398..8c564b1b2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/W_acute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/W_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Wacute" format="1">
+<glyph name="Wacute" format="2">
   <advance width="1233"/>
   <unicode hex="1E82"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/W_circumflex.glif b/source/Hack-BoldItalic.ufo/glyphs/W_circumflex.glif
index b1d32db27..8d9531bf1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/W_circumflex.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/W_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Wcircumflex" format="1">
+<glyph name="Wcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0174"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/W_dieresis.glif b/source/Hack-BoldItalic.ufo/glyphs/W_dieresis.glif
index 2a8274ef4..f513c2a0b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/W_dieresis.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/W_dieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Wdieresis" format="1">
+<glyph name="Wdieresis" format="2">
   <advance width="1233"/>
   <unicode hex="1E84"/>
   <outline>
     <contour>
-      <point x="502" y="1596" type="line" name="hr00" smooth="yes"/>
+      <point x="502" y="1596" type="line" smooth="yes" name="hr00"/>
       <point x="482" y="1596"/>
       <point x="471" y="1609"/>
       <point x="475" y="1629" type="curve" smooth="yes"/>
       <point x="511" y="1815" type="line"/>
       <point x="514" y="1833"/>
       <point x="524" y="1842"/>
-      <point x="543" y="1842" type="curve" name="dv01" smooth="yes"/>
+      <point x="543" y="1842" type="curve" smooth="yes" name="dv01"/>
       <point x="720" y="1842" type="line" smooth="yes"/>
       <point x="738" y="1842"/>
       <point x="747" y="1834"/>
@@ -25,14 +25,14 @@
       <point x="677" y="1596" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="897" y="1596" type="line" name="sv01" smooth="yes"/>
+      <point x="897" y="1596" type="line" smooth="yes" name="sv01"/>
       <point x="877" y="1596"/>
       <point x="866" y="1609"/>
       <point x="870" y="1629" type="curve" smooth="yes"/>
       <point x="906" y="1815" type="line"/>
       <point x="909" y="1833"/>
       <point x="919" y="1842"/>
-      <point x="938" y="1842" type="curve" name="sv02" smooth="yes"/>
+      <point x="938" y="1842" type="curve" smooth="yes" name="sv02"/>
       <point x="1116" y="1842" type="line" smooth="yes"/>
       <point x="1134" y="1842"/>
       <point x="1143" y="1834"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/W_grave.glif b/source/Hack-BoldItalic.ufo/glyphs/W_grave.glif
index 62816f39d..e2ae5f592 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/W_grave.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/W_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Wgrave" format="1">
+<glyph name="Wgrave" format="2">
   <advance width="1233"/>
   <unicode hex="1E80"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/X_.glif b/source/Hack-BoldItalic.ufo/glyphs/X_.glif
index 1c6b7358d..c31f8bff8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/X_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/X_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="X" format="1">
+<glyph name="X" format="2">
   <advance width="1233"/>
   <unicode hex="0058"/>
   <outline>
     <contour>
-      <point x="471" y="782" type="line" name="hr00"/>
-      <point x="184" y="1493" type="line" name="at01"/>
+      <point x="471" y="782" type="line"/>
+      <point x="184" y="1493" type="line"/>
       <point x="475" y="1493" type="line"/>
-      <point x="662" y="1030" type="line" name="iv01"/>
-      <point x="1022" y="1493" type="line" name="at02"/>
+      <point x="662" y="1030" type="line"/>
+      <point x="1022" y="1493" type="line"/>
       <point x="1343" y="1493" type="line"/>
       <point x="770" y="756" type="line"/>
-      <point x="1071" y="0" type="line" name="ab01"/>
+      <point x="1071" y="0" type="line"/>
       <point x="780" y="0" type="line"/>
-      <point x="580" y="512" type="line" name="iv02"/>
-      <point x="180" y="0" type="line" name="ab02"/>
+      <point x="580" y="512" type="line"/>
+      <point x="180" y="0" type="line"/>
       <point x="-143" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/X_i.glif b/source/Hack-BoldItalic.ufo/glyphs/X_i.glif
index 67b4aa393..8278a0f38 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/X_i.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/X_i.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Xi" format="1">
+<glyph name="Xi" format="2">
   <advance width="1233"/>
   <unicode hex="039E"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/Y_.glif b/source/Hack-BoldItalic.ufo/glyphs/Y_.glif
index b1f487add..a29ef7068 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/Y_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/Y_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Y" format="1">
+<glyph name="Y" format="2">
   <advance width="1233"/>
   <unicode hex="0059"/>
   <outline>
     <contour>
-      <point x="432" y="588" type="line" name="hr00"/>
-      <point x="145" y="1493" type="line" name="at01"/>
+      <point x="432" y="588" type="line"/>
+      <point x="145" y="1493" type="line"/>
       <point x="438" y="1493" type="line"/>
-      <point x="625" y="844" type="line" name="iv01"/>
-      <point x="1036" y="1493" type="line" name="at02"/>
+      <point x="625" y="844" type="line"/>
+      <point x="1036" y="1493" type="line"/>
       <point x="1358" y="1493" type="line"/>
       <point x="725" y="588" type="line"/>
-      <point x="610" y="0" type="line" name="ab01"/>
+      <point x="610" y="0" type="line"/>
       <point x="317" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/Y_acute.glif b/source/Hack-BoldItalic.ufo/glyphs/Y_acute.glif
index cbfc0e02f..9254e3a91 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/Y_acute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/Y_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Yacute" format="1">
+<glyph name="Yacute" format="2">
   <advance width="1233"/>
   <unicode hex="00DD"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/Y_circumflex.glif b/source/Hack-BoldItalic.ufo/glyphs/Y_circumflex.glif
index 4ab01985f..bf5fcd216 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/Y_circumflex.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/Y_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ycircumflex" format="1">
+<glyph name="Ycircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0176"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/Y_dieresis.glif b/source/Hack-BoldItalic.ufo/glyphs/Y_dieresis.glif
index 7ee72a60b..8c50d7d20 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/Y_dieresis.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/Y_dieresis.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ydieresis" format="1">
+<glyph name="Ydieresis" format="2">
   <advance width="1233"/>
   <unicode hex="0178"/>
   <outline>
     <contour>
-      <point x="489" y="1607" type="line" name="hr00" smooth="yes"/>
+      <point x="489" y="1607" type="line" smooth="yes" name="hr00"/>
       <point x="471" y="1607"/>
       <point x="462" y="1615"/>
       <point x="462" y="1631" type="curve" smooth="yes"/>
@@ -14,7 +14,7 @@
       <point x="501" y="1826" type="line" smooth="yes"/>
       <point x="505" y="1844"/>
       <point x="516" y="1853"/>
-      <point x="533" y="1853" type="curve" name="dv01" smooth="yes"/>
+      <point x="533" y="1853" type="curve" smooth="yes" name="dv01"/>
       <point x="708" y="1853" type="line" smooth="yes"/>
       <point x="726" y="1853"/>
       <point x="735" y="1845"/>
@@ -28,7 +28,7 @@
       <point x="665" y="1607" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="885" y="1607" type="line" name="sv01" smooth="yes"/>
+      <point x="885" y="1607" type="line" smooth="yes" name="sv01"/>
       <point x="867" y="1607"/>
       <point x="858" y="1615"/>
       <point x="858" y="1631" type="curve" smooth="yes"/>
@@ -38,7 +38,7 @@
       <point x="896" y="1826" type="line"/>
       <point x="899" y="1844"/>
       <point x="909" y="1853"/>
-      <point x="928" y="1853" type="curve" name="sv02" smooth="yes"/>
+      <point x="928" y="1853" type="curve" smooth="yes" name="sv02"/>
       <point x="1103" y="1853" type="line" smooth="yes"/>
       <point x="1123" y="1853"/>
       <point x="1134" y="1840"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/Y_grave.glif b/source/Hack-BoldItalic.ufo/glyphs/Y_grave.glif
index dd4ad8b43..5ca893cc5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/Y_grave.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/Y_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ygrave" format="1">
+<glyph name="Ygrave" format="2">
   <advance width="1233"/>
   <unicode hex="1EF2"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/Z_.glif b/source/Hack-BoldItalic.ufo/glyphs/Z_.glif
index 1862e3ca1..adccc2a9c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/Z_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/Z_.glif
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Z" format="1">
+<glyph name="Z" format="2">
   <advance width="1233"/>
   <unicode hex="005A"/>
   <outline>
     <contour>
-      <point x="4" y="244" type="line" name="hr00"/>
-      <point x="862" y="1233" type="line" name="sv01"/>
+      <point x="4" y="244" type="line"/>
+      <point x="862" y="1233" type="line"/>
       <point x="219" y="1233" type="line"/>
-      <point x="271" y="1493" type="line" name="at01"/>
+      <point x="271" y="1493" type="line"/>
       <point x="1280" y="1493" type="line"/>
       <point x="1231" y="1249" type="line"/>
-      <point x="355" y="260" type="line" name="sv02"/>
+      <point x="355" y="260" type="line"/>
       <point x="1055" y="260" type="line"/>
-      <point x="1004" y="0" type="line" name="ab01"/>
+      <point x="1004" y="0" type="line"/>
       <point x="-43" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/Z_acute.glif b/source/Hack-BoldItalic.ufo/glyphs/Z_acute.glif
index 5bc1ec665..72104f2aa 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/Z_acute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/Z_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Zacute" format="1">
+<glyph name="Zacute" format="2">
   <advance width="1233"/>
   <unicode hex="0179"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/Z_caron.glif b/source/Hack-BoldItalic.ufo/glyphs/Z_caron.glif
index 90365ecc4..d8b2cdfa6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/Z_caron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/Z_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Zcaron" format="1">
+<glyph name="Zcaron" format="2">
   <advance width="1233"/>
   <unicode hex="017D"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/Z_dotaccent.glif b/source/Hack-BoldItalic.ufo/glyphs/Z_dotaccent.glif
index 72c8a6447..6c46dbe23 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/Z_dotaccent.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/Z_dotaccent.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Zdotaccent" format="1">
+<glyph name="Zdotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="017B"/>
   <outline>
     <contour>
-      <point x="698" y="1606" type="line" name="hr00" smooth="yes"/>
+      <point x="698" y="1606" type="line" smooth="yes" name="hr00"/>
       <point x="677" y="1606"/>
       <point x="667" y="1619"/>
       <point x="671" y="1639" type="curve" smooth="yes"/>
       <point x="708" y="1825" type="line"/>
       <point x="711" y="1843"/>
       <point x="721" y="1852"/>
-      <point x="740" y="1852" type="curve" name="dv01" smooth="yes"/>
+      <point x="740" y="1852" type="curve" smooth="yes" name="dv01"/>
       <point x="955" y="1852" type="line" smooth="yes"/>
       <point x="976" y="1852"/>
       <point x="986" y="1839"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/Z_eta.glif b/source/Hack-BoldItalic.ufo/glyphs/Z_eta.glif
index 481a8b9f6..c34c63275 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/Z_eta.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/Z_eta.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Zeta" format="1">
+<glyph name="Zeta" format="2">
   <advance width="1233"/>
   <unicode hex="0396"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/_1554.glif b/source/Hack-BoldItalic.ufo/glyphs/_1554.glif
index fab991ffa..f1261e569 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/_1554.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/_1554.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="_1554" format="1">
-  <advance width="0"/>
+<glyph name="_1554" format="2">
   <outline>
   </outline>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/_notdef.glif b/source/Hack-BoldItalic.ufo/glyphs/_notdef.glif
index 112158991..5c8a9cc25 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/_notdef.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/_notdef.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name=".notdef" format="1">
+<glyph name=".notdef" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/a.glif b/source/Hack-BoldItalic.ufo/glyphs/a.glif
index e79ffcc7f..6eb683273 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/a.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/a.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="a" format="1">
+<glyph name="a" format="2">
   <advance width="1233"/>
   <unicode hex="0061"/>
   <outline>
@@ -34,7 +34,7 @@
       <point x="1128.13" y="705.809"/>
       <point x="1114" y="639" type="curve"/>
       <point x="991" y="0" type="line"/>
-      <point x="727" y="-0" type="line"/>
+      <point x="727" y="0" type="line"/>
       <point x="727" y="125" type="line"/>
       <point x="632.187" y="20.3383"/>
       <point x="518.719" y="-29"/>
@@ -53,9 +53,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/aacute.glif b/source/Hack-BoldItalic.ufo/glyphs/aacute.glif
index 237371e3e..80a8e5da1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/aacute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/aacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="aacute" format="1">
+<glyph name="aacute" format="2">
   <advance width="1233"/>
   <unicode hex="00E1"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="600" y="1297" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="379" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="379" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="279" y="-29"/>
       <point x="195" y="-2"/>
       <point x="135" y="58" type="curve" smooth="yes"/>
       <point x="72" y="119"/>
       <point x="47" y="204"/>
-      <point x="47" y="300" type="curve" name="dh01" smooth="yes"/>
+      <point x="47" y="300" type="curve" smooth="yes" name="dh01"/>
       <point x="47" y="436"/>
       <point x="99" y="548"/>
       <point x="203" y="624" type="curve" smooth="yes"/>
@@ -31,7 +31,7 @@
       <point x="854" y="815" type="line" smooth="yes"/>
       <point x="854" y="891"/>
       <point x="784" y="932"/>
-      <point x="657" y="932" type="curve" name="sv01" smooth="yes"/>
+      <point x="657" y="932" type="curve" smooth="yes" name="sv01"/>
       <point x="600" y="932"/>
       <point x="538" y="923"/>
       <point x="470" y="904" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="509" y="1128" type="curve" smooth="yes"/>
       <point x="577" y="1141"/>
       <point x="637" y="1147"/>
-      <point x="705" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="705" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="844" y="1147"/>
       <point x="953" y="1122"/>
       <point x="1029" y="1071" type="curve" smooth="yes"/>
@@ -62,12 +62,12 @@
       <point x="725" y="125" type="line" name="iv02"/>
       <point x="678" y="72"/>
       <point x="627" y="34"/>
-      <point x="572" y="10" type="curve" name="ab02" smooth="yes"/>
+      <point x="572" y="10" type="curve" smooth="yes" name="ab02"/>
       <point x="513" y="-17"/>
       <point x="447" y="-29"/>
     </contour>
     <contour>
-      <point x="501" y="172" type="curve" name="dv02" smooth="yes"/>
+      <point x="501" y="172" type="curve" smooth="yes" name="dv02"/>
       <point x="573" y="172"/>
       <point x="641" y="202"/>
       <point x="694" y="265" type="curve" smooth="yes"/>
@@ -77,10 +77,10 @@
       <point x="690" y="530" type="line" smooth="yes"/>
       <point x="575" y="530"/>
       <point x="490" y="513"/>
-      <point x="435" y="478" type="curve" name="hr02" smooth="yes"/>
+      <point x="435" y="478" type="curve" smooth="yes" name="hr02"/>
       <point x="379" y="443"/>
       <point x="352" y="389"/>
-      <point x="352" y="321" type="curve" name="dh02" smooth="yes"/>
+      <point x="352" y="321" type="curve" smooth="yes" name="dh02"/>
       <point x="352" y="230"/>
       <point x="410" y="172"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/abreve.glif b/source/Hack-BoldItalic.ufo/glyphs/abreve.glif
index ccbc292a5..f86b707ee 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/abreve.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/abreve.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="abreve" format="1">
+<glyph name="abreve" format="2">
   <advance width="1233"/>
   <unicode hex="0103"/>
   <outline>
     <contour>
-      <point x="736" y="1297" type="curve" name="dv01" smooth="yes"/>
+      <point x="736" y="1297" type="curve" smooth="yes" name="dv01"/>
       <point x="545" y="1297"/>
       <point x="446" y="1382"/>
       <point x="446" y="1561" type="curve" smooth="yes"/>
       <point x="446" y="1594" type="line" name="dh02"/>
       <point x="590" y="1594" type="line" name="sv01"/>
-      <point x="590" y="1581" type="line" name="dh03" smooth="yes"/>
+      <point x="590" y="1581" type="line" smooth="yes" name="dh03"/>
       <point x="590" y="1500"/>
       <point x="652" y="1448"/>
-      <point x="756" y="1448" type="curve" name="dv02" smooth="yes"/>
+      <point x="756" y="1448" type="curve" smooth="yes" name="dv02"/>
       <point x="861" y="1448"/>
       <point x="944" y="1502"/>
       <point x="977" y="1594" type="curve" name="sv02"/>
@@ -22,10 +22,10 @@
       <point x="952" y="1297"/>
     </contour>
     <contour>
-      <point x="381" y="-29" type="curve" name="sv04" smooth="yes"/>
+      <point x="381" y="-29" type="curve" smooth="yes" name="sv04"/>
       <point x="174" y="-29"/>
       <point x="47" y="90"/>
-      <point x="47" y="302" type="curve" name="dh01" smooth="yes"/>
+      <point x="47" y="302" type="curve" smooth="yes" name="dh01"/>
       <point x="47" y="578"/>
       <point x="260" y="737"/>
       <point x="651" y="737" type="curve" smooth="yes"/>
@@ -33,20 +33,20 @@
       <point x="852" y="786" type="line" smooth="yes"/>
       <point x="853" y="794"/>
       <point x="854" y="800"/>
-      <point x="854" y="811" type="curve" name="dh04" smooth="yes"/>
+      <point x="854" y="811" type="curve" smooth="yes" name="dh04"/>
       <point x="854" y="891"/>
       <point x="785" y="932"/>
-      <point x="661" y="932" type="curve" name="sv05" smooth="yes"/>
+      <point x="661" y="932" type="curve" smooth="yes" name="sv05"/>
       <point x="544" y="932"/>
       <point x="411" y="896"/>
       <point x="248" y="819" type="curve" name="ih01"/>
       <point x="295" y="1069" type="line"/>
       <point x="463" y="1125"/>
       <point x="583" y="1147"/>
-      <point x="709" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="709" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="988" y="1147"/>
       <point x="1141" y="1045"/>
-      <point x="1141" y="845" type="curve" name="dh05" smooth="yes"/>
+      <point x="1141" y="845" type="curve" smooth="yes" name="dh05"/>
       <point x="1141" y="792"/>
       <point x="1130" y="722"/>
       <point x="1114" y="639" type="curve" smooth="yes"/>
@@ -57,14 +57,14 @@
       <point x="517" y="-29"/>
     </contour>
     <contour>
-      <point x="504" y="172" type="curve" name="sv03" smooth="yes"/>
+      <point x="504" y="172" type="curve" smooth="yes" name="sv03"/>
       <point x="649" y="172"/>
       <point x="766" y="303"/>
       <point x="803" y="530" type="curve" name="hr03"/>
       <point x="690" y="530" type="line" smooth="yes"/>
       <point x="466" y="530"/>
       <point x="352" y="462"/>
-      <point x="352" y="325" type="curve" name="hr04" smooth="yes"/>
+      <point x="352" y="325" type="curve" smooth="yes" name="hr04"/>
       <point x="352" y="229"/>
       <point x="408" y="172"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/acircumflex.glif b/source/Hack-BoldItalic.ufo/glyphs/acircumflex.glif
index 2c22a077d..e4c7ac4e6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/acircumflex.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/acircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="acircumflex" format="1">
+<glyph name="acircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00E2"/>
   <outline>
@@ -13,19 +13,19 @@
       <point x="367" y="1297" type="line" name="iv02"/>
     </contour>
     <contour>
-      <point x="379" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="379" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="279" y="-29"/>
       <point x="195" y="-2"/>
       <point x="135" y="58" type="curve" smooth="yes"/>
       <point x="72" y="119"/>
       <point x="47" y="204"/>
-      <point x="47" y="300" type="curve" name="dh01" smooth="yes"/>
+      <point x="47" y="300" type="curve" smooth="yes" name="dh01"/>
       <point x="47" y="436"/>
       <point x="99" y="548"/>
       <point x="203" y="624" type="curve" smooth="yes"/>
       <point x="306" y="699"/>
       <point x="456" y="737"/>
-      <point x="651" y="737" type="curve" name="hr01" smooth="yes"/>
+      <point x="651" y="737" type="curve" smooth="yes" name="hr01"/>
       <point x="844" y="737" type="line" name="dv04"/>
       <point x="852" y="786" type="line" smooth="yes"/>
       <point x="853" y="793"/>
@@ -34,7 +34,7 @@
       <point x="854" y="815" type="line" smooth="yes"/>
       <point x="854" y="891"/>
       <point x="784" y="932"/>
-      <point x="657" y="932" type="curve" name="sv01" smooth="yes"/>
+      <point x="657" y="932" type="curve" smooth="yes" name="sv01"/>
       <point x="600" y="932"/>
       <point x="538" y="923"/>
       <point x="470" y="904" type="curve" smooth="yes"/>
@@ -47,7 +47,7 @@
       <point x="509" y="1128" type="curve" smooth="yes"/>
       <point x="577" y="1141"/>
       <point x="637" y="1147"/>
-      <point x="705" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="705" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="844" y="1147"/>
       <point x="953" y="1122"/>
       <point x="1029" y="1071" type="curve" smooth="yes"/>
@@ -65,15 +65,15 @@
       <point x="725" y="125" type="line" name="iv03"/>
       <point x="678" y="72"/>
       <point x="627" y="34"/>
-      <point x="572" y="10" type="curve" name="ab02" smooth="yes"/>
+      <point x="572" y="10" type="curve" smooth="yes" name="ab02"/>
       <point x="513" y="-17"/>
       <point x="447" y="-29"/>
     </contour>
     <contour>
-      <point x="501" y="172" type="curve" name="dv02" smooth="yes"/>
+      <point x="501" y="172" type="curve" smooth="yes" name="dv02"/>
       <point x="573" y="172"/>
       <point x="641" y="202"/>
-      <point x="694" y="265" type="curve" name="hr02" smooth="yes"/>
+      <point x="694" y="265" type="curve" smooth="yes" name="hr02"/>
       <point x="745" y="324"/>
       <point x="784" y="411"/>
       <point x="803" y="530" type="curve" name="dv03"/>
@@ -83,7 +83,7 @@
       <point x="435" y="478" type="curve" smooth="yes"/>
       <point x="379" y="443"/>
       <point x="352" y="389"/>
-      <point x="352" y="321" type="curve" name="dh02" smooth="yes"/>
+      <point x="352" y="321" type="curve" smooth="yes" name="dh02"/>
       <point x="352" y="230"/>
       <point x="410" y="172"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/acute.glif b/source/Hack-BoldItalic.ufo/glyphs/acute.glif
index 397106e10..821f6ffad 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/acute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="acute" format="1">
+<glyph name="acute" format="2">
   <advance width="1233"/>
   <unicode hex="00B4"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/acutecomb.glif b/source/Hack-BoldItalic.ufo/glyphs/acutecomb.glif
index 45fbb9800..f15a5b892 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/acutecomb.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/acutecomb.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="acutecomb" format="1">
-  <advance width="0"/>
+<glyph name="acutecomb" format="2">
   <unicode hex="0301"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/adieresis.glif b/source/Hack-BoldItalic.ufo/glyphs/adieresis.glif
index c672a35e0..aae986ae9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/adieresis.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/adieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="adieresis" format="1">
+<glyph name="adieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00E4"/>
   <outline>
     <contour>
-      <point x="480" y="1347" type="line" name="dv03" smooth="yes"/>
+      <point x="480" y="1347" type="line" smooth="yes" name="dv03"/>
       <point x="460" y="1347"/>
       <point x="449" y="1360"/>
       <point x="453" y="1380" type="curve" smooth="yes"/>
       <point x="489" y="1566" type="line"/>
       <point x="492" y="1584"/>
       <point x="502" y="1593"/>
-      <point x="521" y="1593" type="curve" name="dv04" smooth="yes"/>
+      <point x="521" y="1593" type="curve" smooth="yes" name="dv04"/>
       <point x="698" y="1593" type="line" smooth="yes"/>
       <point x="716" y="1593"/>
       <point x="725" y="1585"/>
@@ -25,14 +25,14 @@
       <point x="655" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="875" y="1347" type="line" name="sv01" smooth="yes"/>
+      <point x="875" y="1347" type="line" smooth="yes" name="sv01"/>
       <point x="855" y="1347"/>
       <point x="844" y="1360"/>
       <point x="848" y="1380" type="curve" smooth="yes"/>
       <point x="884" y="1566" type="line" name="hr01"/>
       <point x="887" y="1584"/>
       <point x="897" y="1593"/>
-      <point x="916" y="1593" type="curve" name="sv02" smooth="yes"/>
+      <point x="916" y="1593" type="curve" smooth="yes" name="sv02"/>
       <point x="1094" y="1593" type="line" smooth="yes"/>
       <point x="1112" y="1593"/>
       <point x="1121" y="1585"/>
@@ -46,13 +46,13 @@
       <point x="1051" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="379" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="379" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="279" y="-29"/>
       <point x="195" y="-2"/>
       <point x="135" y="58" type="curve" smooth="yes"/>
       <point x="72" y="119"/>
       <point x="47" y="204"/>
-      <point x="47" y="300" type="curve" name="dh01" smooth="yes"/>
+      <point x="47" y="300" type="curve" smooth="yes" name="dh01"/>
       <point x="47" y="436"/>
       <point x="99" y="548"/>
       <point x="203" y="624" type="curve" smooth="yes"/>
@@ -67,7 +67,7 @@
       <point x="854" y="815" type="line" smooth="yes"/>
       <point x="854" y="891"/>
       <point x="784" y="932"/>
-      <point x="657" y="932" type="curve" name="sv03" smooth="yes"/>
+      <point x="657" y="932" type="curve" smooth="yes" name="sv03"/>
       <point x="600" y="932"/>
       <point x="538" y="923"/>
       <point x="470" y="904" type="curve" smooth="yes"/>
@@ -77,10 +77,10 @@
       <point x="295" y="1069" type="line"/>
       <point x="372" y="1096"/>
       <point x="443" y="1115"/>
-      <point x="509" y="1128" type="curve" name="hr02" smooth="yes"/>
+      <point x="509" y="1128" type="curve" smooth="yes" name="hr02"/>
       <point x="577" y="1141"/>
       <point x="637" y="1147"/>
-      <point x="705" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="705" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="844" y="1147"/>
       <point x="953" y="1122"/>
       <point x="1029" y="1071" type="curve" smooth="yes"/>
@@ -98,12 +98,12 @@
       <point x="725" y="125" type="line" name="iv01"/>
       <point x="678" y="72"/>
       <point x="627" y="34"/>
-      <point x="572" y="10" type="curve" name="ab02" smooth="yes"/>
+      <point x="572" y="10" type="curve" smooth="yes" name="ab02"/>
       <point x="513" y="-17"/>
       <point x="447" y="-29"/>
     </contour>
     <contour>
-      <point x="501" y="172" type="curve" name="dv02" smooth="yes"/>
+      <point x="501" y="172" type="curve" smooth="yes" name="dv02"/>
       <point x="573" y="172"/>
       <point x="641" y="202"/>
       <point x="694" y="265" type="curve" smooth="yes"/>
@@ -116,7 +116,7 @@
       <point x="435" y="478" type="curve" smooth="yes"/>
       <point x="379" y="443"/>
       <point x="352" y="389"/>
-      <point x="352" y="321" type="curve" name="dh02" smooth="yes"/>
+      <point x="352" y="321" type="curve" smooth="yes" name="dh02"/>
       <point x="352" y="230"/>
       <point x="410" y="172"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ae.glif b/source/Hack-BoldItalic.ufo/glyphs/ae.glif
index edf389f83..dda4d19f4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ae.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ae.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ae" format="1">
+<glyph name="ae" format="2">
   <advance width="1233"/>
   <unicode hex="00E6"/>
   <outline>
     <contour>
-      <point x="246" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="246" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="161" y="-29"/>
       <point x="94" y="-3"/>
       <point x="44" y="50" type="curve" smooth="yes"/>
       <point x="-7" y="103"/>
       <point x="-31" y="171"/>
-      <point x="-31" y="267" type="curve" name="dh01" smooth="yes"/>
+      <point x="-31" y="267" type="curve" smooth="yes" name="dh01"/>
       <point x="-31" y="390"/>
       <point x="10" y="493"/>
       <point x="91" y="573" type="curve" smooth="yes"/>
@@ -30,7 +30,7 @@
       <point x="507" y="900" type="curve" smooth="yes"/>
       <point x="484" y="921"/>
       <point x="451" y="932"/>
-      <point x="409" y="932" type="curve" name="sv01" smooth="yes"/>
+      <point x="409" y="932" type="curve" smooth="yes" name="sv01"/>
       <point x="373" y="932"/>
       <point x="332" y="924"/>
       <point x="287" y="907" type="curve" smooth="yes"/>
@@ -43,7 +43,7 @@
       <point x="330" y="1128" type="curve" smooth="yes"/>
       <point x="378" y="1141"/>
       <point x="426" y="1147"/>
-      <point x="469" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="469" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="525" y="1147"/>
       <point x="572" y="1135"/>
       <point x="611" y="1112" type="curve" smooth="yes"/>
@@ -55,7 +55,7 @@
       <point x="816" y="1113" type="curve" smooth="yes"/>
       <point x="861" y="1136"/>
       <point x="913" y="1147"/>
-      <point x="970" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="970" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1054" y="1147"/>
       <point x="1118" y="1124"/>
       <point x="1163" y="1077" type="curve" smooth="yes"/>
@@ -81,7 +81,7 @@
       <point x="754" y="227" type="curve" smooth="yes"/>
       <point x="782" y="196"/>
       <point x="820" y="180"/>
-      <point x="867" y="180" type="curve" name="sv02" smooth="yes"/>
+      <point x="867" y="180" type="curve" smooth="yes" name="sv02"/>
       <point x="903" y="180"/>
       <point x="944" y="190"/>
       <point x="991" y="209" type="curve" smooth="yes"/>
@@ -94,7 +94,7 @@
       <point x="952" y="-9" type="curve" smooth="yes"/>
       <point x="907" y="-22"/>
       <point x="855" y="-29"/>
-      <point x="806" y="-29" type="curve" name="sv03" smooth="yes"/>
+      <point x="806" y="-29" type="curve" smooth="yes" name="sv03"/>
       <point x="737" y="-29"/>
       <point x="689" y="-15"/>
       <point x="642" y="14" type="curve" smooth="yes"/>
@@ -121,7 +121,7 @@
       <point x="990" y="909" type="curve" smooth="yes"/>
       <point x="977" y="924"/>
       <point x="955" y="932"/>
-      <point x="926" y="932" type="curve" name="sv05" smooth="yes"/>
+      <point x="926" y="932" type="curve" smooth="yes" name="sv05"/>
       <point x="888" y="932"/>
       <point x="858" y="918"/>
       <point x="835" y="890" type="curve" smooth="yes"/>
@@ -131,7 +131,7 @@
       <point x="766" y="688" type="line"/>
     </contour>
     <contour>
-      <point x="296" y="180" type="curve" name="dv01" smooth="yes"/>
+      <point x="296" y="180" type="curve" smooth="yes" name="dv01"/>
       <point x="384" y="180"/>
       <point x="435" y="245"/>
       <point x="463" y="401" type="curve" smooth="yes"/>
@@ -142,7 +142,7 @@
       <point x="247" y="428" type="curve" smooth="yes"/>
       <point x="207" y="393"/>
       <point x="188" y="344"/>
-      <point x="188" y="293" type="curve" name="dh02" smooth="yes"/>
+      <point x="188" y="293" type="curve" smooth="yes" name="dh02"/>
       <point x="188" y="256"/>
       <point x="198" y="230"/>
       <point x="217" y="210" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/agrave.glif b/source/Hack-BoldItalic.ufo/glyphs/agrave.glif
index fff0e8a5e..f070bc646 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/agrave.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/agrave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="agrave" format="1">
+<glyph name="agrave" format="2">
   <advance width="1233"/>
   <unicode hex="00E0"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="697" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="379" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="379" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="279" y="-29"/>
       <point x="195" y="-2"/>
       <point x="135" y="58" type="curve" smooth="yes"/>
       <point x="72" y="119"/>
       <point x="47" y="204"/>
-      <point x="47" y="300" type="curve" name="dh01" smooth="yes"/>
+      <point x="47" y="300" type="curve" smooth="yes" name="dh01"/>
       <point x="47" y="436"/>
       <point x="99" y="548"/>
       <point x="203" y="624" type="curve" smooth="yes"/>
@@ -31,7 +31,7 @@
       <point x="854" y="815" type="line" smooth="yes"/>
       <point x="854" y="891"/>
       <point x="784" y="932"/>
-      <point x="657" y="932" type="curve" name="sv01" smooth="yes"/>
+      <point x="657" y="932" type="curve" smooth="yes" name="sv01"/>
       <point x="600" y="932"/>
       <point x="538" y="923"/>
       <point x="470" y="904" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="509" y="1128" type="curve" smooth="yes"/>
       <point x="577" y="1141"/>
       <point x="637" y="1147"/>
-      <point x="705" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="705" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="844" y="1147"/>
       <point x="953" y="1122"/>
       <point x="1029" y="1071" type="curve" smooth="yes"/>
@@ -62,12 +62,12 @@
       <point x="725" y="125" type="line" name="iv02"/>
       <point x="678" y="72"/>
       <point x="627" y="34"/>
-      <point x="572" y="10" type="curve" name="ab02" smooth="yes"/>
+      <point x="572" y="10" type="curve" smooth="yes" name="ab02"/>
       <point x="513" y="-17"/>
       <point x="447" y="-29"/>
     </contour>
     <contour>
-      <point x="501" y="172" type="curve" name="dv02" smooth="yes"/>
+      <point x="501" y="172" type="curve" smooth="yes" name="dv02"/>
       <point x="573" y="172"/>
       <point x="641" y="202"/>
       <point x="694" y="265" type="curve" smooth="yes"/>
@@ -77,10 +77,10 @@
       <point x="690" y="530" type="line" smooth="yes"/>
       <point x="575" y="530"/>
       <point x="490" y="513"/>
-      <point x="435" y="478" type="curve" name="hr02" smooth="yes"/>
+      <point x="435" y="478" type="curve" smooth="yes" name="hr02"/>
       <point x="379" y="443"/>
       <point x="352" y="389"/>
-      <point x="352" y="321" type="curve" name="dh02" smooth="yes"/>
+      <point x="352" y="321" type="curve" smooth="yes" name="dh02"/>
       <point x="352" y="230"/>
       <point x="410" y="172"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/alpha.glif b/source/Hack-BoldItalic.ufo/glyphs/alpha.glif
index ec46fd177..f57d6ce32 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/alpha.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/alpha.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="alpha" format="1">
+<glyph name="alpha" format="2">
   <advance width="1233"/>
   <unicode hex="03B1"/>
   <outline>
     <contour>
-      <point x="953" y="0" type="line" name="ab02" smooth="yes"/>
+      <point x="953" y="0" type="line" smooth="yes" name="ab02"/>
       <point x="846" y="0"/>
       <point x="772" y="28"/>
       <point x="729" y="84" type="curve" smooth="yes"/>
@@ -16,29 +16,29 @@
       <point x="602" y="18" type="curve" smooth="yes"/>
       <point x="542" y="-18"/>
       <point x="483" y="-27"/>
-      <point x="411" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="411" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="261" y="-27"/>
       <point x="143" y="14"/>
       <point x="82" y="123" type="curve" smooth="yes"/>
       <point x="49" y="183"/>
       <point x="35" y="259"/>
-      <point x="35" y="367" type="curve" name="dh01" smooth="yes"/>
+      <point x="35" y="367" type="curve" smooth="yes" name="dh01"/>
       <point x="35" y="614"/>
       <point x="110" y="842"/>
       <point x="254" y="984" type="curve" smooth="yes"/>
       <point x="375" y="1102"/>
       <point x="518" y="1146"/>
-      <point x="644" y="1146" type="curve" name="at02" smooth="yes"/>
+      <point x="644" y="1146" type="curve" smooth="yes" name="at02"/>
       <point x="773" y="1146"/>
       <point x="872" y="1100"/>
       <point x="921" y="1012" type="curve" name="iv02"/>
       <point x="978" y="1120" type="line" name="at01"/>
       <point x="1260" y="1120" type="line" name="iv03"/>
       <point x="955" y="543" type="line"/>
-      <point x="952" y="390" type="line" name="hr01" smooth="yes"/>
+      <point x="952" y="390" type="line" smooth="yes" name="hr01"/>
       <point x="950" y="280"/>
       <point x="972" y="225"/>
-      <point x="1017" y="225" type="curve" name="sv01" smooth="yes"/>
+      <point x="1017" y="225" type="curve" smooth="yes" name="sv01"/>
       <point x="1099" y="225" type="line"/>
       <point x="1055" y="0" type="line" name="hr02"/>
     </contour>
@@ -47,22 +47,22 @@
       <point x="702" y="752" type="line" smooth="yes"/>
       <point x="703" y="859"/>
       <point x="659" y="905"/>
-      <point x="594" y="905" type="curve" name="sv02" smooth="yes"/>
+      <point x="594" y="905" type="curve" smooth="yes" name="sv02"/>
       <point x="542" y="905"/>
       <point x="482" y="876"/>
       <point x="431" y="813" type="curve" smooth="yes"/>
       <point x="351" y="714"/>
       <point x="308" y="549"/>
-      <point x="308" y="421" type="curve" name="dh02" smooth="yes"/>
+      <point x="308" y="421" type="curve" smooth="yes" name="dh02"/>
       <point x="308" y="361"/>
       <point x="317" y="326"/>
       <point x="330" y="299" type="curve" smooth="yes"/>
       <point x="355" y="247"/>
       <point x="400" y="220"/>
-      <point x="443" y="220" type="curve" name="sv03" smooth="yes"/>
+      <point x="443" y="220" type="curve" smooth="yes" name="sv03"/>
       <point x="482" y="220"/>
       <point x="520" y="242"/>
-      <point x="543" y="285" type="curve" name="hr03" smooth="yes"/>
+      <point x="543" y="285" type="curve" smooth="yes" name="hr03"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/alphatonos.glif b/source/Hack-BoldItalic.ufo/glyphs/alphatonos.glif
index 6e0019f18..e3572fca7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/alphatonos.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/alphatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="alphatonos" format="1">
+<glyph name="alphatonos" format="2">
   <advance width="1233"/>
   <unicode hex="03AC"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="569" y="1297" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="953" y="0" type="line" name="ab02" smooth="yes"/>
+      <point x="953" y="0" type="line" smooth="yes" name="ab02"/>
       <point x="846" y="0"/>
       <point x="772" y="28"/>
       <point x="729" y="84" type="curve" smooth="yes"/>
@@ -22,19 +22,19 @@
       <point x="602" y="18" type="curve" smooth="yes"/>
       <point x="542" y="-18"/>
       <point x="483" y="-27"/>
-      <point x="411" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="411" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="261" y="-27"/>
       <point x="143" y="14"/>
       <point x="82" y="123" type="curve" smooth="yes"/>
       <point x="49" y="183"/>
       <point x="35" y="259"/>
-      <point x="35" y="367" type="curve" name="dh01" smooth="yes"/>
+      <point x="35" y="367" type="curve" smooth="yes" name="dh01"/>
       <point x="35" y="614"/>
       <point x="110" y="842"/>
       <point x="254" y="984" type="curve" smooth="yes"/>
       <point x="375" y="1102"/>
       <point x="518" y="1146"/>
-      <point x="644" y="1146" type="curve" name="at02" smooth="yes"/>
+      <point x="644" y="1146" type="curve" smooth="yes" name="at02"/>
       <point x="773" y="1146"/>
       <point x="872" y="1100"/>
       <point x="921" y="1012" type="curve" name="hr01"/>
@@ -44,7 +44,7 @@
       <point x="952" y="390" type="line" smooth="yes"/>
       <point x="950" y="280"/>
       <point x="972" y="225"/>
-      <point x="1017" y="225" type="curve" name="sv01" smooth="yes"/>
+      <point x="1017" y="225" type="curve" smooth="yes" name="sv01"/>
       <point x="1099" y="225" type="line"/>
       <point x="1055" y="0" type="line"/>
     </contour>
@@ -53,19 +53,19 @@
       <point x="702" y="752" type="line" smooth="yes"/>
       <point x="703" y="859"/>
       <point x="659" y="905"/>
-      <point x="594" y="905" type="curve" name="sv02" smooth="yes"/>
+      <point x="594" y="905" type="curve" smooth="yes" name="sv02"/>
       <point x="542" y="905"/>
       <point x="482" y="876"/>
-      <point x="431" y="813" type="curve" name="hr03" smooth="yes"/>
+      <point x="431" y="813" type="curve" smooth="yes" name="hr03"/>
       <point x="351" y="714"/>
       <point x="308" y="549"/>
-      <point x="308" y="421" type="curve" name="dh02" smooth="yes"/>
+      <point x="308" y="421" type="curve" smooth="yes" name="dh02"/>
       <point x="308" y="361"/>
       <point x="317" y="326"/>
       <point x="330" y="299" type="curve" smooth="yes"/>
       <point x="355" y="247"/>
       <point x="400" y="220"/>
-      <point x="443" y="220" type="curve" name="sv03" smooth="yes"/>
+      <point x="443" y="220" type="curve" smooth="yes" name="sv03"/>
       <point x="482" y="220"/>
       <point x="520" y="242"/>
       <point x="543" y="285" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/amacron.glif b/source/Hack-BoldItalic.ufo/glyphs/amacron.glif
index 0ac7cda51..08d530a98 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/amacron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/amacron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="amacron" format="1">
+<glyph name="amacron" format="2">
   <advance width="1233"/>
   <unicode hex="0101"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="422" y="1347" type="line"/>
     </contour>
     <contour>
-      <point x="381" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="381" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="174" y="-29"/>
       <point x="47" y="90"/>
-      <point x="47" y="302" type="curve" name="sh01" smooth="yes"/>
+      <point x="47" y="302" type="curve" smooth="yes" name="sh01"/>
       <point x="47" y="578"/>
       <point x="260" y="737"/>
       <point x="651" y="737" type="curve" smooth="yes"/>
@@ -21,20 +21,20 @@
       <point x="852" y="786" type="line" smooth="yes"/>
       <point x="853" y="794"/>
       <point x="854" y="800"/>
-      <point x="854" y="811" type="curve" name="ah01" smooth="yes"/>
+      <point x="854" y="811" type="curve" smooth="yes" name="ah01"/>
       <point x="854" y="891"/>
       <point x="785" y="932"/>
-      <point x="661" y="932" type="curve" name="sv03" smooth="yes"/>
+      <point x="661" y="932" type="curve" smooth="yes" name="sv03"/>
       <point x="544" y="932"/>
       <point x="411" y="896"/>
       <point x="248" y="819" type="curve" name="ih01"/>
       <point x="295" y="1069" type="line"/>
       <point x="463" y="1125"/>
       <point x="583" y="1147"/>
-      <point x="709" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="709" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="988" y="1147"/>
       <point x="1141" y="1045"/>
-      <point x="1141" y="845" type="curve" name="sh03" smooth="yes"/>
+      <point x="1141" y="845" type="curve" smooth="yes" name="sh03"/>
       <point x="1141" y="792"/>
       <point x="1130" y="722"/>
       <point x="1114" y="639" type="curve" smooth="yes"/>
@@ -45,14 +45,14 @@
       <point x="517" y="-29"/>
     </contour>
     <contour>
-      <point x="504" y="172" type="curve" name="sv01" smooth="yes"/>
+      <point x="504" y="172" type="curve" smooth="yes" name="sv01"/>
       <point x="649" y="172"/>
       <point x="766" y="303"/>
       <point x="803" y="530" type="curve" name="hr02"/>
       <point x="690" y="530" type="line" smooth="yes"/>
       <point x="466" y="530"/>
       <point x="352" y="462"/>
-      <point x="352" y="325" type="curve" name="sh02" smooth="yes"/>
+      <point x="352" y="325" type="curve" smooth="yes" name="sh02"/>
       <point x="352" y="229"/>
       <point x="408" y="172"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ampersand.glif b/source/Hack-BoldItalic.ufo/glyphs/ampersand.glif
index 9a0c678ab..be9eb6cec 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ampersand.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ampersand.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ampersand" format="1">
+<glyph name="ampersand" format="2">
   <advance width="1233"/>
   <unicode hex="0026"/>
   <outline>
     <contour>
-      <point x="387" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="387" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="264" y="-29"/>
       <point x="157" y="5"/>
       <point x="80" y="77" type="curve" smooth="yes"/>
       <point x="1" y="150"/>
       <point x="-33" y="251"/>
-      <point x="-33" y="362" type="curve" name="sh01" smooth="yes"/>
+      <point x="-33" y="362" type="curve" smooth="yes" name="sh01"/>
       <point x="-33" y="469"/>
       <point x="0" y="571"/>
       <point x="66" y="666" type="curve" smooth="yes"/>
@@ -19,19 +19,19 @@
       <point x="350" y="913" type="curve"/>
       <point x="331" y="954"/>
       <point x="321" y="985"/>
-      <point x="312" y="1021" type="curve" name="sh02" smooth="yes"/>
+      <point x="312" y="1021" type="curve" smooth="yes" name="sh02"/>
       <point x="304" y="1053"/>
       <point x="299" y="1079"/>
-      <point x="299" y="1118" type="curve" name="ah01" smooth="yes"/>
+      <point x="299" y="1118" type="curve" smooth="yes" name="ah01"/>
       <point x="299" y="1235"/>
       <point x="343" y="1338"/>
       <point x="432" y="1411" type="curve" smooth="yes"/>
       <point x="520" y="1483"/>
       <point x="645" y="1520"/>
-      <point x="794" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="794" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="843" y="1520"/>
       <point x="888" y="1516"/>
-      <point x="933" y="1509" type="curve" name="at02" smooth="yes"/>
+      <point x="933" y="1509" type="curve" smooth="yes" name="at02"/>
       <point x="977" y="1502"/>
       <point x="1018" y="1492"/>
       <point x="1065" y="1477" type="curve"/>
@@ -41,13 +41,13 @@
       <point x="898" y="1275" type="curve" smooth="yes"/>
       <point x="855" y="1288"/>
       <point x="812" y="1294"/>
-      <point x="769" y="1294" type="curve" name="sv01" smooth="yes"/>
+      <point x="769" y="1294" type="curve" smooth="yes" name="sv01"/>
       <point x="705" y="1294"/>
       <point x="662" y="1282"/>
       <point x="633" y="1259" type="curve" smooth="yes"/>
       <point x="602" y="1235"/>
       <point x="586" y="1201"/>
-      <point x="586" y="1158" type="curve" name="sh03" smooth="yes"/>
+      <point x="586" y="1158" type="curve" smooth="yes" name="sh03"/>
       <point x="586" y="1134"/>
       <point x="592" y="1103"/>
       <point x="605" y="1065" type="curve" smooth="yes"/>
@@ -73,12 +73,12 @@
       <point x="739" y="72" type="line"/>
       <point x="682" y="39"/>
       <point x="624" y="13"/>
-      <point x="564" y="-4" type="curve" name="ab02" smooth="yes"/>
+      <point x="564" y="-4" type="curve" smooth="yes" name="ab02"/>
       <point x="505" y="-21"/>
       <point x="446" y="-29"/>
     </contour>
     <contour>
-      <point x="473" y="207" type="curve" name="dv02" smooth="yes"/>
+      <point x="473" y="207" type="curve" smooth="yes" name="dv02"/>
       <point x="501" y="207"/>
       <point x="531" y="212"/>
       <point x="562" y="221" type="curve" smooth="yes"/>
@@ -88,10 +88,10 @@
       <point x="436" y="731" type="line"/>
       <point x="375" y="696"/>
       <point x="330" y="654"/>
-      <point x="299" y="605" type="curve" name="sh04" smooth="yes"/>
+      <point x="299" y="605" type="curve" smooth="yes" name="sh04"/>
       <point x="267" y="554"/>
       <point x="252" y="496"/>
-      <point x="252" y="440" type="curve" name="sh05" smooth="yes"/>
+      <point x="252" y="440" type="curve" smooth="yes" name="sh05"/>
       <point x="252" y="307"/>
       <point x="349" y="207"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/angle.glif b/source/Hack-BoldItalic.ufo/glyphs/angle.glif
index 96ea71403..917ef6c4f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/angle.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/angle.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="angle" format="1">
+<glyph name="angle" format="2">
   <advance width="1233"/>
   <unicode hex="2220"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/aogonek.glif b/source/Hack-BoldItalic.ufo/glyphs/aogonek.glif
index 50ec5f392..6ba59dde2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/aogonek.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/aogonek.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="aogonek" format="1">
+<glyph name="aogonek" format="2">
   <advance width="1233"/>
   <unicode hex="0105"/>
   <outline>
     <contour>
-      <point x="709" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="709" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="988" y="1147"/>
       <point x="1141" y="1045"/>
-      <point x="1141" y="845" type="curve" name="dh06" smooth="yes"/>
+      <point x="1141" y="845" type="curve" smooth="yes" name="dh06"/>
       <point x="1141" y="792"/>
       <point x="1130" y="722"/>
       <point x="1114" y="639" type="curve" smooth="yes"/>
@@ -18,41 +18,41 @@
       <point x="742" y="-117" type="curve" smooth="yes"/>
       <point x="726" y="-142"/>
       <point x="718" y="-162"/>
-      <point x="718" y="-182" type="curve" name="dh04" smooth="yes"/>
+      <point x="718" y="-182" type="curve" smooth="yes" name="dh04"/>
       <point x="718" y="-221"/>
       <point x="749" y="-254"/>
-      <point x="818" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="818" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="854" y="-254"/>
       <point x="911" y="-246"/>
       <point x="974" y="-223" type="curve" name="ih01"/>
       <point x="943" y="-379" type="line"/>
       <point x="878" y="-394"/>
       <point x="815" y="-401"/>
-      <point x="764" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="764" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="627" y="-401"/>
       <point x="544" y="-350"/>
-      <point x="544" y="-255" type="curve" name="dh03" smooth="yes"/>
+      <point x="544" y="-255" type="curve" smooth="yes" name="dh03"/>
       <point x="544" y="-183"/>
       <point x="592" y="-95"/>
       <point x="700" y="0" type="curve" name="ab02"/>
       <point x="725" y="125" type="line" name="sh01"/>
       <point x="636" y="21"/>
       <point x="517" y="-29"/>
-      <point x="381" y="-29" type="curve" name="dv03" smooth="yes"/>
+      <point x="381" y="-29" type="curve" smooth="yes" name="dv03"/>
       <point x="174" y="-29"/>
       <point x="47" y="90"/>
-      <point x="47" y="302" type="curve" name="dh01" smooth="yes"/>
+      <point x="47" y="302" type="curve" smooth="yes" name="dh01"/>
       <point x="47" y="578"/>
       <point x="260" y="737"/>
-      <point x="651" y="737" type="curve" name="hr01" smooth="yes"/>
+      <point x="651" y="737" type="curve" smooth="yes" name="hr01"/>
       <point x="844" y="737" type="line" name="dv06"/>
       <point x="852" y="786" type="line" smooth="yes"/>
       <point x="853" y="794"/>
       <point x="854" y="800"/>
-      <point x="854" y="811" type="curve" name="dh05" smooth="yes"/>
+      <point x="854" y="811" type="curve" smooth="yes" name="dh05"/>
       <point x="854" y="891"/>
       <point x="785" y="932"/>
-      <point x="661" y="932" type="curve" name="sv01" smooth="yes"/>
+      <point x="661" y="932" type="curve" smooth="yes" name="sv01"/>
       <point x="544" y="932"/>
       <point x="411" y="896"/>
       <point x="248" y="819" type="curve" name="ih02"/>
@@ -61,14 +61,14 @@
       <point x="583" y="1147"/>
     </contour>
     <contour>
-      <point x="504" y="172" type="curve" name="dv04" smooth="yes"/>
+      <point x="504" y="172" type="curve" smooth="yes" name="dv04"/>
       <point x="649" y="172"/>
       <point x="766" y="303"/>
       <point x="803" y="530" type="curve" name="dv05"/>
       <point x="690" y="530" type="line" smooth="yes"/>
       <point x="466" y="530"/>
       <point x="352" y="462"/>
-      <point x="352" y="325" type="curve" name="dh02" smooth="yes"/>
+      <point x="352" y="325" type="curve" smooth="yes" name="dh02"/>
       <point x="352" y="229"/>
       <point x="408" y="172"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/approxequal.glif b/source/Hack-BoldItalic.ufo/glyphs/approxequal.glif
index 161e1c4d1..96d624fcd 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/approxequal.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/approxequal.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="approxequal" format="1">
+<glyph name="approxequal" format="2">
   <advance width="1233"/>
   <unicode hex="2248"/>
   <outline>
     <contour>
-      <point x="850" y="672" type="curve" name="dv04" smooth="yes"/>
+      <point x="850" y="672" type="curve" smooth="yes" name="dv04"/>
       <point x="770" y="672"/>
       <point x="714" y="694"/>
       <point x="645" y="723" type="curve"/>
@@ -16,7 +16,7 @@
       <point x="484" y="783" type="curve" smooth="yes"/>
       <point x="449" y="791"/>
       <point x="414" y="795"/>
-      <point x="381" y="795" type="curve" name="sv01" smooth="yes"/>
+      <point x="381" y="795" type="curve" smooth="yes" name="sv01"/>
       <point x="330" y="795"/>
       <point x="281" y="785"/>
       <point x="233" y="766" type="curve" smooth="yes"/>
@@ -29,7 +29,7 @@
       <point x="239" y="991" type="curve" smooth="yes"/>
       <point x="287" y="1010"/>
       <point x="343" y="1018"/>
-      <point x="392" y="1018" type="curve" name="hr01" smooth="yes"/>
+      <point x="392" y="1018" type="curve" smooth="yes" name="hr01"/>
       <point x="461" y="1018"/>
       <point x="533" y="1000"/>
       <point x="621" y="963" type="curve"/>
@@ -37,7 +37,7 @@
       <point x="652" y="949" type="line" smooth="yes"/>
       <point x="730" y="913"/>
       <point x="801" y="895"/>
-      <point x="864" y="895" type="curve" name="dv05" smooth="yes"/>
+      <point x="864" y="895" type="curve" smooth="yes" name="dv05"/>
       <point x="959" y="895"/>
       <point x="1046" y="933"/>
       <point x="1145" y="1020" type="curve" name="av01"/>
@@ -49,7 +49,7 @@
       <point x="907" y="672"/>
     </contour>
     <contour>
-      <point x="850" y="254" type="curve" name="hr02" smooth="yes"/>
+      <point x="850" y="254" type="curve" smooth="yes" name="hr02"/>
       <point x="770" y="254"/>
       <point x="714" y="276"/>
       <point x="645" y="305" type="curve"/>
@@ -61,7 +61,7 @@
       <point x="484" y="365" type="curve" smooth="yes"/>
       <point x="449" y="373"/>
       <point x="414" y="377"/>
-      <point x="381" y="377" type="curve" name="dv02" smooth="yes"/>
+      <point x="381" y="377" type="curve" smooth="yes" name="dv02"/>
       <point x="330" y="377"/>
       <point x="281" y="367"/>
       <point x="233" y="348" type="curve" smooth="yes"/>
@@ -74,7 +74,7 @@
       <point x="239" y="573" type="curve" smooth="yes"/>
       <point x="288" y="592"/>
       <point x="342" y="600"/>
-      <point x="391" y="600" type="curve" name="dv03" smooth="yes"/>
+      <point x="391" y="600" type="curve" smooth="yes" name="dv03"/>
       <point x="462" y="600"/>
       <point x="533" y="582"/>
       <point x="621" y="545" type="curve" name="hr03"/>
@@ -82,7 +82,7 @@
       <point x="653" y="531" type="line" smooth="yes"/>
       <point x="728" y="496"/>
       <point x="796" y="477"/>
-      <point x="864" y="477" type="curve" name="dv01" smooth="yes"/>
+      <point x="864" y="477" type="curve" smooth="yes" name="dv01"/>
       <point x="915" y="477"/>
       <point x="958" y="488"/>
       <point x="1003" y="508" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/aring.glif b/source/Hack-BoldItalic.ufo/glyphs/aring.glif
index 55e81a6b7..009a92b63 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/aring.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/aring.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="aring" format="1">
+<glyph name="aring" format="2">
   <advance width="1233"/>
   <unicode hex="00E5"/>
   <outline>
     <contour>
-      <point x="778" y="1249" type="curve" name="dv07" smooth="yes"/>
+      <point x="778" y="1249" type="curve" smooth="yes" name="dv07"/>
       <point x="702" y="1249"/>
       <point x="632" y="1277"/>
       <point x="576" y="1333" type="curve" smooth="yes"/>
       <point x="521" y="1389"/>
       <point x="494" y="1458"/>
-      <point x="494" y="1534" type="curve" name="dh03" smooth="yes"/>
+      <point x="494" y="1534" type="curve" smooth="yes" name="dh03"/>
       <point x="494" y="1618"/>
       <point x="529" y="1689"/>
       <point x="577" y="1737" type="curve" smooth="yes"/>
       <point x="626" y="1786"/>
       <point x="696" y="1819"/>
-      <point x="779" y="1819" type="curve" name="dv04" smooth="yes"/>
+      <point x="779" y="1819" type="curve" smooth="yes" name="dv04"/>
       <point x="855" y="1819"/>
       <point x="925" y="1792"/>
       <point x="980" y="1737" type="curve" smooth="yes"/>
@@ -30,7 +30,7 @@
       <point x="854" y="1249"/>
     </contour>
     <contour>
-      <point x="779" y="1403" type="curve" name="dv08" smooth="yes"/>
+      <point x="779" y="1403" type="curve" smooth="yes" name="dv08"/>
       <point x="812" y="1403"/>
       <point x="846" y="1415"/>
       <point x="873" y="1442" type="curve" smooth="yes"/>
@@ -39,16 +39,16 @@
       <point x="910" y="1535" type="curve" smooth="yes"/>
       <point x="910" y="1570"/>
       <point x="897" y="1601"/>
-      <point x="871" y="1627" type="curve" name="hr01" smooth="yes"/>
+      <point x="871" y="1627" type="curve" smooth="yes" name="hr01"/>
       <point x="848" y="1650"/>
       <point x="818" y="1665"/>
-      <point x="779" y="1665" type="curve" name="dv03" smooth="yes"/>
+      <point x="779" y="1665" type="curve" smooth="yes" name="dv03"/>
       <point x="742" y="1665"/>
       <point x="711" y="1652"/>
       <point x="686" y="1627" type="curve" smooth="yes"/>
       <point x="660" y="1601"/>
       <point x="647" y="1570"/>
-      <point x="647" y="1534" type="curve" name="dh04" smooth="yes"/>
+      <point x="647" y="1534" type="curve" smooth="yes" name="dh04"/>
       <point x="647" y="1497"/>
       <point x="660" y="1466"/>
       <point x="685" y="1441" type="curve" smooth="yes"/>
@@ -56,13 +56,13 @@
       <point x="742" y="1403"/>
     </contour>
     <contour>
-      <point x="379" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="379" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="279" y="-29"/>
       <point x="195" y="-2"/>
       <point x="135" y="58" type="curve" smooth="yes"/>
       <point x="72" y="119"/>
       <point x="47" y="204"/>
-      <point x="47" y="300" type="curve" name="dh01" smooth="yes"/>
+      <point x="47" y="300" type="curve" smooth="yes" name="dh01"/>
       <point x="47" y="436"/>
       <point x="99" y="548"/>
       <point x="203" y="624" type="curve" smooth="yes"/>
@@ -77,7 +77,7 @@
       <point x="854" y="815" type="line" smooth="yes"/>
       <point x="854" y="891"/>
       <point x="784" y="932"/>
-      <point x="657" y="932" type="curve" name="sv01" smooth="yes"/>
+      <point x="657" y="932" type="curve" smooth="yes" name="sv01"/>
       <point x="600" y="932"/>
       <point x="538" y="923"/>
       <point x="470" y="904" type="curve" smooth="yes"/>
@@ -90,10 +90,10 @@
       <point x="509" y="1128" type="curve" smooth="yes"/>
       <point x="577" y="1141"/>
       <point x="637" y="1147"/>
-      <point x="705" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="705" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="844" y="1147"/>
       <point x="953" y="1122"/>
-      <point x="1029" y="1071" type="curve" name="hr02" smooth="yes"/>
+      <point x="1029" y="1071" type="curve" smooth="yes" name="hr02"/>
       <point x="1109" y="1018"/>
       <point x="1141" y="942"/>
       <point x="1141" y="845" type="curve" smooth="yes"/>
@@ -108,12 +108,12 @@
       <point x="725" y="125" type="line" name="iv01"/>
       <point x="678" y="72"/>
       <point x="627" y="34"/>
-      <point x="572" y="10" type="curve" name="ab02" smooth="yes"/>
+      <point x="572" y="10" type="curve" smooth="yes" name="ab02"/>
       <point x="513" y="-17"/>
       <point x="447" y="-29"/>
     </contour>
     <contour>
-      <point x="501" y="172" type="curve" name="dv02" smooth="yes"/>
+      <point x="501" y="172" type="curve" smooth="yes" name="dv02"/>
       <point x="573" y="172"/>
       <point x="641" y="202"/>
       <point x="694" y="265" type="curve" smooth="yes"/>
@@ -126,7 +126,7 @@
       <point x="435" y="478" type="curve" smooth="yes"/>
       <point x="379" y="443"/>
       <point x="352" y="389"/>
-      <point x="352" y="321" type="curve" name="dh02" smooth="yes"/>
+      <point x="352" y="321" type="curve" smooth="yes" name="dh02"/>
       <point x="352" y="230"/>
       <point x="410" y="172"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/arrowboth.glif b/source/Hack-BoldItalic.ufo/glyphs/arrowboth.glif
index 979672a7d..a3ea1d527 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/arrowboth.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/arrowboth.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowboth" format="1">
+<glyph name="arrowboth" format="2">
   <advance width="1233"/>
   <unicode hex="2194"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/arrowdblboth.glif b/source/Hack-BoldItalic.ufo/glyphs/arrowdblboth.glif
index ea5f8624c..38aaf49a4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/arrowdblboth.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/arrowdblboth.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowdblboth" format="1">
+<glyph name="arrowdblboth" format="2">
   <advance width="1233"/>
   <unicode hex="21D4"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/arrowdbldown.glif b/source/Hack-BoldItalic.ufo/glyphs/arrowdbldown.glif
index 9b3a9be50..38bff7a2e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/arrowdbldown.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/arrowdbldown.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowdbldown" format="1">
+<glyph name="arrowdbldown" format="2">
   <advance width="1233"/>
   <unicode hex="21D3"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/arrowdblleft.glif b/source/Hack-BoldItalic.ufo/glyphs/arrowdblleft.glif
index 46e95df75..504edd739 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/arrowdblleft.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/arrowdblleft.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowdblleft" format="1">
+<glyph name="arrowdblleft" format="2">
   <advance width="1233"/>
   <unicode hex="21D0"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/arrowdblright.glif b/source/Hack-BoldItalic.ufo/glyphs/arrowdblright.glif
index 878d61b77..9a5a67668 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/arrowdblright.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/arrowdblright.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowdblright" format="1">
+<glyph name="arrowdblright" format="2">
   <advance width="1233"/>
   <unicode hex="21D2"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/arrowdblup.glif b/source/Hack-BoldItalic.ufo/glyphs/arrowdblup.glif
index ded4a3c5b..cd38e6bf6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/arrowdblup.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/arrowdblup.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowdblup" format="1">
+<glyph name="arrowdblup" format="2">
   <advance width="1233"/>
   <unicode hex="21D1"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/arrowdown.glif b/source/Hack-BoldItalic.ufo/glyphs/arrowdown.glif
index 18e0673ba..298b24959 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/arrowdown.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/arrowdown.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowdown" format="1">
+<glyph name="arrowdown" format="2">
   <advance width="1233"/>
   <unicode hex="2193"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/arrowleft.glif b/source/Hack-BoldItalic.ufo/glyphs/arrowleft.glif
index 4a16ddd96..26ebe65e6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/arrowleft.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/arrowleft.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowleft" format="1">
+<glyph name="arrowleft" format="2">
   <advance width="1233"/>
   <unicode hex="2190"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/arrowright.glif b/source/Hack-BoldItalic.ufo/glyphs/arrowright.glif
index a210453f3..310250374 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/arrowright.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/arrowright.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowright" format="1">
+<glyph name="arrowright" format="2">
   <advance width="1233"/>
   <unicode hex="2192"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/arrowup.glif b/source/Hack-BoldItalic.ufo/glyphs/arrowup.glif
index 3c23f687e..f244b0f90 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/arrowup.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/arrowup.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowup" format="1">
+<glyph name="arrowup" format="2">
   <advance width="1233"/>
   <unicode hex="2191"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/arrowupdn.glif b/source/Hack-BoldItalic.ufo/glyphs/arrowupdn.glif
index fd3edea94..8c92bef2e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/arrowupdn.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/arrowupdn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowupdn" format="1">
+<glyph name="arrowupdn" format="2">
   <advance width="1233"/>
   <unicode hex="2195"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/arrowupdnbse.glif b/source/Hack-BoldItalic.ufo/glyphs/arrowupdnbse.glif
index 80c7235ee..7ff09332b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/arrowupdnbse.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/arrowupdnbse.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowupdnbse" format="1">
+<glyph name="arrowupdnbse" format="2">
   <advance width="1233"/>
   <unicode hex="21A8"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/asciicircum.glif b/source/Hack-BoldItalic.ufo/glyphs/asciicircum.glif
index e96383134..f2ebc4256 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/asciicircum.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/asciicircum.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="asciicircum" format="1">
+<glyph name="asciicircum" format="2">
   <advance width="1233"/>
   <unicode hex="005E"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/asciitilde.glif b/source/Hack-BoldItalic.ufo/glyphs/asciitilde.glif
index 904a8c368..75da2cdbe 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/asciitilde.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/asciitilde.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="asciitilde" format="1">
+<glyph name="asciitilde" format="2">
   <advance width="1233"/>
   <unicode hex="007E"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/asterisk.glif b/source/Hack-BoldItalic.ufo/glyphs/asterisk.glif
index 49f2e3c5a..0c621fa3b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/asterisk.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/asterisk.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="asterisk" format="1">
+<glyph name="asterisk" format="2">
   <advance width="1233"/>
   <unicode hex="002A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/asteriskmath.glif b/source/Hack-BoldItalic.ufo/glyphs/asteriskmath.glif
index 08b44db3a..e908b8173 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/asteriskmath.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/asteriskmath.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="asteriskmath" format="1">
+<glyph name="asteriskmath" format="2">
   <advance width="1233"/>
   <unicode hex="2217"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/at.glif b/source/Hack-BoldItalic.ufo/glyphs/at.glif
index 7efa5edce..02ff41098 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/at.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/at.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="at" format="1">
+<glyph name="at" format="2">
   <advance width="1233"/>
   <unicode hex="0040"/>
   <outline>
     <contour>
-      <point x="599" y="-319" type="curve" name="hr00" smooth="yes"/>
+      <point x="599" y="-319" type="curve" smooth="yes" name="hr00"/>
       <point x="416" y="-319"/>
       <point x="262" y="-253"/>
       <point x="153" y="-128" type="curve" smooth="yes"/>
       <point x="41" y="0"/>
       <point x="-14" y="174"/>
-      <point x="-14" y="387" type="curve" name="dh01" smooth="yes"/>
+      <point x="-14" y="387" type="curve" smooth="yes" name="dh01"/>
       <point x="-14" y="496"/>
       <point x="1" y="603"/>
       <point x="30" y="709" type="curve" smooth="yes"/>
@@ -22,13 +22,13 @@
       <point x="442" y="1293" type="curve" smooth="yes"/>
       <point x="550" y="1360"/>
       <point x="670" y="1395"/>
-      <point x="799" y="1395" type="curve" name="dv03" smooth="yes"/>
+      <point x="799" y="1395" type="curve" smooth="yes" name="dv03"/>
       <point x="928" y="1395"/>
       <point x="1036" y="1360"/>
       <point x="1112" y="1293" type="curve" smooth="yes"/>
       <point x="1193" y="1221"/>
       <point x="1229" y="1126"/>
-      <point x="1229" y="1023" type="curve" name="dh06" smooth="yes"/>
+      <point x="1229" y="1023" type="curve" smooth="yes" name="dh06"/>
       <point x="1229" y="1006"/>
       <point x="1229" y="979"/>
       <point x="1226" y="960" type="curve" smooth="yes"/>
@@ -43,19 +43,19 @@
       <point x="788" y="142" type="curve" smooth="yes"/>
       <point x="741" y="119"/>
       <point x="700" y="115"/>
-      <point x="664" y="115" type="curve" name="dv04" smooth="yes"/>
+      <point x="664" y="115" type="curve" smooth="yes" name="dv04"/>
       <point x="576" y="115"/>
       <point x="503" y="146"/>
       <point x="451" y="203" type="curve" smooth="yes"/>
       <point x="395" y="264"/>
       <point x="371" y="348"/>
-      <point x="371" y="448" type="curve" name="dh03" smooth="yes"/>
+      <point x="371" y="448" type="curve" smooth="yes" name="dh03"/>
       <point x="371" y="593"/>
       <point x="421" y="728"/>
       <point x="498" y="821" type="curve" smooth="yes"/>
       <point x="585" y="925"/>
       <point x="698" y="973"/>
-      <point x="810" y="973" type="curve" name="dv07" smooth="yes"/>
+      <point x="810" y="973" type="curve" smooth="yes" name="dv07"/>
       <point x="857" y="973"/>
       <point x="898" y="965"/>
       <point x="933" y="949" type="curve" smooth="yes"/>
@@ -64,10 +64,10 @@
       <point x="1014" y="877" type="curve" name="ih02"/>
       <point x="1027" y="921"/>
       <point x="1032" y="973"/>
-      <point x="1032" y="1004" type="curve" name="dh05" smooth="yes"/>
+      <point x="1032" y="1004" type="curve" smooth="yes" name="dh05"/>
       <point x="1032" y="1134"/>
       <point x="948" y="1206"/>
-      <point x="798" y="1206" type="curve" name="dv02" smooth="yes"/>
+      <point x="798" y="1206" type="curve" smooth="yes" name="dv02"/>
       <point x="640" y="1206"/>
       <point x="483" y="1117"/>
       <point x="365" y="961" type="curve" smooth="yes"/>
@@ -76,13 +76,13 @@
       <point x="226" y="690" type="curve" smooth="yes"/>
       <point x="194" y="591"/>
       <point x="178" y="490"/>
-      <point x="178" y="388" type="curve" name="dh02" smooth="yes"/>
+      <point x="178" y="388" type="curve" smooth="yes" name="dh02"/>
       <point x="178" y="237"/>
       <point x="214" y="105"/>
       <point x="295" y="9" type="curve" smooth="yes"/>
       <point x="372" y="-83"/>
       <point x="481" y="-131"/>
-      <point x="614" y="-131" type="curve" name="dv01" smooth="yes"/>
+      <point x="614" y="-131" type="curve" smooth="yes" name="dv01"/>
       <point x="719" y="-131"/>
       <point x="828" y="-99"/>
       <point x="936" y="-35" type="curve"/>
@@ -94,7 +94,7 @@
       <point x="671" y="-319"/>
     </contour>
     <contour>
-      <point x="724" y="301" type="curve" name="dv05" smooth="yes"/>
+      <point x="724" y="301" type="curve" smooth="yes" name="dv05"/>
       <point x="792" y="301"/>
       <point x="854" y="335"/>
       <point x="898" y="392" type="curve" smooth="yes"/>
@@ -106,13 +106,13 @@
       <point x="929" y="742" type="curve" smooth="yes"/>
       <point x="902" y="771"/>
       <point x="864" y="786"/>
-      <point x="817" y="786" type="curve" name="dv06" smooth="yes"/>
+      <point x="817" y="786" type="curve" smooth="yes" name="dv06"/>
       <point x="749" y="786"/>
       <point x="689" y="756"/>
       <point x="642" y="697" type="curve" smooth="yes"/>
       <point x="595" y="637"/>
       <point x="571" y="558"/>
-      <point x="571" y="481" type="curve" name="dh04" smooth="yes"/>
+      <point x="571" y="481" type="curve" smooth="yes" name="dh04"/>
       <point x="571" y="430"/>
       <point x="580" y="382"/>
       <point x="611" y="347" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/atilde.glif b/source/Hack-BoldItalic.ufo/glyphs/atilde.glif
index c27267b22..045d53010 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/atilde.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/atilde.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="atilde" format="1">
+<glyph name="atilde" format="2">
   <advance width="1233"/>
   <unicode hex="00E3"/>
   <outline>
     <contour>
-      <point x="911" y="1297" type="curve" name="sv02" smooth="yes"/>
+      <point x="911" y="1297" type="curve" smooth="yes" name="sv02"/>
       <point x="863" y="1297"/>
       <point x="823" y="1311"/>
       <point x="770" y="1354" type="curve"/>
@@ -24,7 +24,7 @@
       <point x="495" y="1506" type="curve" smooth="yes"/>
       <point x="540" y="1557"/>
       <point x="596" y="1583"/>
-      <point x="656" y="1583" type="curve" name="av01" smooth="yes"/>
+      <point x="656" y="1583" type="curve" smooth="yes" name="av01"/>
       <point x="709" y="1583"/>
       <point x="734" y="1570"/>
       <point x="799" y="1522" type="curve" smooth="yes"/>
@@ -43,13 +43,13 @@
       <point x="1044" y="1297"/>
     </contour>
     <contour>
-      <point x="379" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="379" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="279" y="-29"/>
       <point x="195" y="-2"/>
       <point x="135" y="58" type="curve" smooth="yes"/>
       <point x="72" y="119"/>
       <point x="47" y="204"/>
-      <point x="47" y="300" type="curve" name="dh01" smooth="yes"/>
+      <point x="47" y="300" type="curve" smooth="yes" name="dh01"/>
       <point x="47" y="436"/>
       <point x="99" y="548"/>
       <point x="203" y="624" type="curve" smooth="yes"/>
@@ -64,7 +64,7 @@
       <point x="854" y="815" type="line" smooth="yes"/>
       <point x="854" y="891"/>
       <point x="784" y="932"/>
-      <point x="657" y="932" type="curve" name="sv03" smooth="yes"/>
+      <point x="657" y="932" type="curve" smooth="yes" name="sv03"/>
       <point x="600" y="932"/>
       <point x="538" y="923"/>
       <point x="470" y="904" type="curve" smooth="yes"/>
@@ -77,7 +77,7 @@
       <point x="509" y="1128" type="curve" smooth="yes"/>
       <point x="577" y="1141"/>
       <point x="637" y="1147"/>
-      <point x="705" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="705" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="850" y="1147"/>
       <point x="956" y="1120"/>
       <point x="1029" y="1071" type="curve" smooth="yes"/>
@@ -95,15 +95,15 @@
       <point x="725" y="125" type="line" name="iv01"/>
       <point x="678" y="72"/>
       <point x="627" y="34"/>
-      <point x="572" y="10" type="curve" name="hr03" smooth="yes"/>
+      <point x="572" y="10" type="curve" smooth="yes" name="hr03"/>
       <point x="513" y="-17"/>
       <point x="447" y="-29"/>
     </contour>
     <contour>
-      <point x="501" y="172" type="curve" name="dv02" smooth="yes"/>
+      <point x="501" y="172" type="curve" smooth="yes" name="dv02"/>
       <point x="573" y="172"/>
       <point x="641" y="202"/>
-      <point x="694" y="265" type="curve" name="hr04" smooth="yes"/>
+      <point x="694" y="265" type="curve" smooth="yes" name="hr04"/>
       <point x="745" y="324"/>
       <point x="784" y="411"/>
       <point x="803" y="530" type="curve" name="dv03"/>
@@ -113,7 +113,7 @@
       <point x="435" y="478" type="curve" smooth="yes"/>
       <point x="379" y="443"/>
       <point x="352" y="389"/>
-      <point x="352" y="321" type="curve" name="dh02" smooth="yes"/>
+      <point x="352" y="321" type="curve" smooth="yes" name="dh02"/>
       <point x="352" y="230"/>
       <point x="410" y="172"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/b.glif b/source/Hack-BoldItalic.ufo/glyphs/b.glif
index aca7f9072..b0ebfa535 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/b.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/b.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="b" format="1">
+<glyph name="b" format="2">
   <advance width="1233"/>
   <unicode hex="0062"/>
   <outline>
@@ -38,9 +38,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/backslash.glif b/source/Hack-BoldItalic.ufo/glyphs/backslash.glif
index 75ccaef01..c3df54482 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/backslash.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/backslash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="backslash" format="1">
+<glyph name="backslash" format="2">
   <advance width="1233"/>
   <unicode hex="005C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/bar.glif b/source/Hack-BoldItalic.ufo/glyphs/bar.glif
index 143fcd9e2..e6c134147 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/bar.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/bar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="bar" format="1">
+<glyph name="bar" format="2">
   <advance width="1233"/>
   <unicode hex="007C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/beta.glif b/source/Hack-BoldItalic.ufo/glyphs/beta.glif
index 198a643d3..a8cb17c8e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/beta.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/beta.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="beta" format="1">
+<glyph name="beta" format="2">
   <advance width="1233"/>
   <unicode hex="03B2"/>
   <outline>
     <contour>
-      <point x="258" y="1113" type="line" name="hr00" smooth="yes"/>
+      <point x="258" y="1113" type="line" smooth="yes" name="hr00"/>
       <point x="318" y="1418"/>
       <point x="493" y="1569"/>
-      <point x="774" y="1569" type="curve" name="at01" smooth="yes"/>
+      <point x="774" y="1569" type="curve" smooth="yes" name="at01"/>
       <point x="1070" y="1569"/>
       <point x="1177" y="1399"/>
-      <point x="1177" y="1216" type="curve" name="sh01" smooth="yes"/>
+      <point x="1177" y="1216" type="curve" smooth="yes" name="sh01"/>
       <point x="1177" y="1057"/>
       <point x="1095" y="890"/>
       <point x="978" y="810" type="curve" name="ih01"/>
       <point x="1099" y="767"/>
       <point x="1145" y="674"/>
-      <point x="1145" y="566" type="curve" name="dh01" smooth="yes"/>
+      <point x="1145" y="566" type="curve" smooth="yes" name="dh01"/>
       <point x="1145" y="531"/>
       <point x="1141" y="489"/>
       <point x="1134" y="453" type="curve" smooth="yes"/>
@@ -25,7 +25,7 @@
       <point x="643" y="-21" type="curve" name="hr01"/>
       <point x="632" y="-21"/>
       <point x="632" y="-22"/>
-      <point x="613" y="-22" type="curve" name="ab02" smooth="yes"/>
+      <point x="613" y="-22" type="curve" smooth="yes" name="ab02"/>
       <point x="518" y="-22"/>
       <point x="417" y="4"/>
       <point x="346" y="69" type="curve" name="iv01"/>
@@ -36,26 +36,26 @@
       <point x="410" y="402" type="line"/>
       <point x="458" y="296"/>
       <point x="554" y="234"/>
-      <point x="636" y="234" type="curve" name="sv01" smooth="yes"/>
+      <point x="636" y="234" type="curve" smooth="yes" name="sv01"/>
       <point x="722" y="234"/>
       <point x="802" y="299"/>
-      <point x="832" y="449" type="curve" name="hr02" smooth="yes"/>
+      <point x="832" y="449" type="curve" smooth="yes" name="hr02"/>
       <point x="836" y="470"/>
       <point x="838" y="489"/>
-      <point x="838" y="507" type="curve" name="hr03" smooth="yes"/>
+      <point x="838" y="507" type="curve" smooth="yes" name="hr03"/>
       <point x="838" y="608"/>
       <point x="767" y="658"/>
-      <point x="624" y="658" type="curve" name="dv01" smooth="yes"/>
+      <point x="624" y="658" type="curve" smooth="yes" name="dv01"/>
       <point x="613" y="658"/>
       <point x="603" y="658"/>
       <point x="592" y="657" type="curve"/>
       <point x="635" y="880" type="line" name="dv02"/>
       <point x="782" y="875"/>
       <point x="876" y="1035"/>
-      <point x="876" y="1165" type="curve" name="hr04" smooth="yes"/>
+      <point x="876" y="1165" type="curve" smooth="yes" name="hr04"/>
       <point x="876" y="1255"/>
       <point x="831" y="1332"/>
-      <point x="734" y="1332" type="curve" name="sv02" smooth="yes"/>
+      <point x="734" y="1332" type="curve" smooth="yes" name="sv02"/>
       <point x="639" y="1332"/>
       <point x="578" y="1260"/>
       <point x="547" y="1107" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/block.glif b/source/Hack-BoldItalic.ufo/glyphs/block.glif
index bf10efca1..89dc04bf7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/block.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/block.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="block" format="1">
+<glyph name="block" format="2">
   <advance width="1233"/>
   <unicode hex="2588"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/braceleft.glif b/source/Hack-BoldItalic.ufo/glyphs/braceleft.glif
index 0b897cf4c..14263513a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/braceleft.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/braceleft.glif
@@ -1,97 +1,71 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="braceleft" format="1">
+<glyph name="braceleft" format="2">
   <advance width="1233"/>
   <unicode hex="007B"/>
   <outline>
     <contour>
-      <point x="644" y="-334" type="line" name="dv01"/>
-      <point x="373" y="-327"/>
-      <point x="289" y="-278"/>
-      <point x="280" y="-101" type="curve" name="dh01"/>
-      <point x="280" y="-84"/>
-      <point x="281" y="-72"/>
-      <point x="284" y="-49" type="curve" name="sh01"/>
-      <point x="284" y="-41"/>
-      <point x="290" y="1"/>
-      <point x="298" y="35" type="curve"/>
-      <point x="341" y="250" type="line" smooth="yes"/>
-      <point x="343" y="260"/>
-      <point x="351" y="304"/>
-      <point x="354" y="328" type="curve" smooth="yes"/>
-      <point x="357" y="351"/>
-      <point x="358" y="365"/>
-      <point x="358" y="377" type="curve" name="ih01" smooth="yes"/>
-      <point x="358" y="433"/>
-      <point x="338" y="465"/>
-      <point x="295" y="486" type="curve" smooth="yes"/>
-      <point x="259" y="505"/>
-      <point x="197" y="516"/>
-      <point x="113" y="516" type="curve" name="hr01" smooth="yes"/>
-      <point x="51" y="516" type="line"/>
-      <point x="88" y="707" type="line" name="dv02"/>
-      <point x="179" y="707" type="line" smooth="yes"/>
-      <point x="274" y="707"/>
-      <point x="343" y="725"/>
-      <point x="386" y="762" type="curve" smooth="yes"/>
-      <point x="429" y="799"/>
-      <point x="460" y="869"/>
-      <point x="480" y="973" type="curve" smooth="yes"/>
-      <point x="521" y="1188" type="line" smooth="yes"/>
-      <point x="550" y="1341"/>
-      <point x="597" y="1437"/>
-      <point x="658" y="1484" type="curve" smooth="yes"/>
-      <point x="720" y="1532"/>
-      <point x="838" y="1556"/>
-      <point x="1011" y="1556" type="curve" name="at01" smooth="yes"/>
-      <point x="1160" y="1556" type="line"/>
-      <point x="1124" y="1366" type="line" name="sv01"/>
-      <point x="1001" y="1366" type="line" smooth="yes"/>
-      <point x="926" y="1366"/>
-      <point x="881" y="1351"/>
-      <point x="852" y="1323" type="curve" smooth="yes"/>
-      <point x="821" y="1294"/>
-      <point x="800" y="1239"/>
-      <point x="781" y="1139" type="curve" smooth="yes"/>
-      <point x="743" y="930" type="line" smooth="yes"/>
-      <point x="724" y="826"/>
-      <point x="692" y="744"/>
-      <point x="648" y="696" type="curve" smooth="yes"/>
-      <point x="607" y="651"/>
-      <point x="543" y="623"/>
-      <point x="456" y="612" type="curve" name="ih02"/>
-      <point x="520" y="598"/>
-      <point x="566" y="577"/>
-      <point x="593" y="548" type="curve" smooth="yes"/>
-      <point x="620" y="521"/>
-      <point x="634" y="485"/>
-      <point x="634" y="428" type="curve" name="sh02" smooth="yes"/>
-      <point x="634" y="413"/>
-      <point x="633" y="387"/>
-      <point x="630" y="364" type="curve" smooth="yes"/>
-      <point x="627" y="347"/>
-      <point x="625" y="326"/>
-      <point x="618" y="291" type="curve" smooth="yes"/>
-      <point x="577" y="86" type="line"/>
-      <point x="569" y="51"/>
-      <point x="569" y="49"/>
-      <point x="564" y="12" type="curve" smooth="yes"/>
-      <point x="561" y="-11"/>
-      <point x="560" y="-19"/>
-      <point x="560" y="-32" type="curve" name="dh02" smooth="yes"/>
-      <point x="560" y="-75"/>
-      <point x="571" y="-101"/>
-      <point x="594" y="-118" type="curve" smooth="yes"/>
-      <point x="617" y="-135"/>
-      <point x="655" y="-143"/>
-      <point x="708" y="-143" type="curve" name="hr02" smooth="yes"/>
-      <point x="829" y="-143" type="line"/>
-      <point x="792" y="-334" type="line" name="sv02"/>
+      <point x="644" y="-190" type="line" smooth="yes" name="dv01"/>
+      <point x="389.228" y="-190"/>
+      <point x="280" y="-118.033"/>
+      <point x="280" y="49.8286" type="curve" smooth="yes" name="dh01"/>
+      <point x="280" y="124.401"/>
+      <point x="301.59" y="210.882"/>
+      <point x="322.052" y="292.848" type="curve" smooth="yes"/>
+      <point x="349.39" y="402.354"/>
+      <point x="358" y="450.354"/>
+      <point x="358" y="493.248" type="curve" smooth="yes" name="ih01"/>
+      <point x="358" y="617.419"/>
+      <point x="285.262" y="660.042"/>
+      <point x="73.3579" y="660.042" type="curve" smooth="yes"/>
+      <point x="65.9052" y="660.042"/>
+      <point x="58.4527" y="660"/>
+      <point x="51" y="660" type="curve"/>
+      <point x="88" y="851" type="line" name="dv02"/>
+      <point x="377.946" y="851"/>
+      <point x="436.766" y="890.914"/>
+      <point x="480" y="1117" type="curve" smooth="yes"/>
+      <point x="521" y="1332" type="line" smooth="yes"/>
+      <point x="577.561" y="1628.11"/>
+      <point x="673.286" y="1700"/>
+      <point x="1011" y="1700" type="curve" smooth="yes" name="at01"/>
+      <point x="1160" y="1700" type="line"/>
+      <point x="1124" y="1510" type="line" name="sv01"/>
+      <point x="1112.49" y="1510"/>
+      <point x="1100.97" y="1510.07"/>
+      <point x="1089.46" y="1510.13" type="curve" smooth="yes"/>
+      <point x="1077.95" y="1510.2"/>
+      <point x="1066.43" y="1510.26"/>
+      <point x="1054.92" y="1510.26" type="curve" smooth="yes"/>
+      <point x="868.998" y="1510.26"/>
+      <point x="819.113" y="1491.53"/>
+      <point x="781" y="1283" type="curve" smooth="yes"/>
+      <point x="743" y="1074" type="line" smooth="yes"/>
+      <point x="704.298" y="861.628"/>
+      <point x="628.627" y="777.783"/>
+      <point x="456" y="756" type="curve" name="ih02"/>
+      <point x="583.978" y="728.062"/>
+      <point x="634" y="672.151"/>
+      <point x="634" y="557.042" type="curve" smooth="yes" name="sh02"/>
+      <point x="634" y="485.562"/>
+      <point x="614.725" y="400.195"/>
+      <point x="595.913" y="316.875" type="curve" smooth="yes"/>
+      <point x="594.192" y="309.253"/>
+      <point x="592.288" y="301.027"/>
+      <point x="590.281" y="292.355" type="curve" smooth="yes"/>
+      <point x="577.298" y="236.258"/>
+      <point x="560" y="161.516"/>
+      <point x="560" y="111.153" type="curve" smooth="yes" name="dh02"/>
+      <point x="560" y="32.898"/>
+      <point x="601.765" y="1"/>
+      <point x="708" y="1" type="curve" smooth="yes" name="hr02"/>
+      <point x="829" y="1" type="line"/>
+      <point x="792" y="-190" type="line" name="sv02"/>
     </contour>
   </outline>
   <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
-    </dict>
+  <dict>
+    <key>com.schriftgestaltung.Glyphs.lastChange</key>
+    <string>2017-07-11 17:15:08 +0000</string>
+  </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/braceright.glif b/source/Hack-BoldItalic.ufo/glyphs/braceright.glif
index 582325c64..5f3866117 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/braceright.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/braceright.glif
@@ -1,101 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="braceright" format="1">
+<glyph name="braceright" format="2">
   <advance width="1233"/>
   <unicode hex="007D"/>
   <outline>
     <contour>
-      <point x="56" y="-143" type="line" name="hr00"/>
-      <point x="179" y="-143" type="line" name="dv02" smooth="yes"/>
-      <point x="243" y="-143"/>
-      <point x="297" y="-128"/>
-      <point x="326" y="-100" type="curve" smooth="yes"/>
-      <point x="356" y="-71"/>
-      <point x="380" y="-9"/>
-      <point x="398" y="86" type="curve" smooth="yes"/>
-      <point x="437" y="291" type="line" smooth="yes"/>
-      <point x="457" y="396"/>
-      <point x="488" y="476"/>
-      <point x="532" y="524" type="curve" smooth="yes"/>
-      <point x="573" y="569"/>
-      <point x="637" y="599"/>
-      <point x="724" y="612" type="curve" name="ih01"/>
-      <point x="661" y="623"/>
-      <point x="615" y="642"/>
-      <point x="588" y="670" type="curve" smooth="yes"/>
-      <point x="560" y="698"/>
-      <point x="546" y="739"/>
-      <point x="546" y="792" type="curve" name="dh01" smooth="yes"/>
-      <point x="546" y="807"/>
-      <point x="547" y="828"/>
-      <point x="550" y="852" type="curve" name="sh01"/>
-      <point x="553" y="867"/>
-      <point x="557" y="903"/>
-      <point x="562" y="930" type="curve" smooth="yes"/>
-      <point x="603" y="1139" type="line"/>
-      <point x="610" y="1163"/>
-      <point x="612" y="1183"/>
-      <point x="616" y="1214" type="curve" smooth="yes"/>
-      <point x="619" y="1234"/>
-      <point x="620" y="1242"/>
-      <point x="620" y="1247" type="curve" smooth="yes"/>
-      <point x="620" y="1252"/>
-      <point x="619" y="1252"/>
-      <point x="619" y="1257" type="curve" smooth="yes"/>
-      <point x="619" y="1294"/>
-      <point x="609" y="1325"/>
-      <point x="586" y="1342" type="curve" smooth="yes"/>
-      <point x="564" y="1358"/>
-      <point x="526" y="1366"/>
-      <point x="472" y="1366" type="curve" name="sv01" smooth="yes"/>
-      <point x="351" y="1366" type="line"/>
-      <point x="388" y="1556" type="line" name="at01"/>
-      <point x="535" y="1556" type="line" smooth="yes"/>
-      <point x="671" y="1556"/>
-      <point x="767" y="1540"/>
-      <point x="822" y="1508" type="curve" smooth="yes"/>
-      <point x="878" y="1476"/>
-      <point x="904" y="1419"/>
-      <point x="904" y="1351" type="curve" smooth="yes"/>
-      <point x="904" y="1318"/>
-      <point x="897" y="1269"/>
-      <point x="884" y="1202" type="curve" smooth="yes"/>
-      <point x="881" y="1187" type="line"/>
-      <point x="840" y="972" type="line" smooth="yes"/>
-      <point x="836" y="951"/>
-      <point x="833" y="927"/>
-      <point x="830" y="911" type="curve" smooth="yes"/>
-      <point x="827" y="890"/>
-      <point x="826" y="877"/>
-      <point x="826" y="864" type="curve" name="dh02" smooth="yes"/>
-      <point x="826" y="793"/>
-      <point x="854" y="762"/>
-      <point x="889" y="742" type="curve" smooth="yes"/>
-      <point x="930" y="719"/>
-      <point x="990" y="707"/>
-      <point x="1067" y="707" type="curve" name="dv04" smooth="yes"/>
-      <point x="1129" y="707" type="line"/>
-      <point x="1092" y="516" type="line" name="dv03"/>
-      <point x="1000" y="516" type="line" smooth="yes"/>
-      <point x="906" y="516"/>
-      <point x="837" y="497"/>
-      <point x="794" y="458" type="curve" smooth="yes"/>
-      <point x="749" y="419"/>
-      <point x="718" y="349"/>
-      <point x="699" y="250" type="curve" smooth="yes"/>
-      <point x="658" y="35" type="line" smooth="yes"/>
-      <point x="630" y="-113"/>
-      <point x="583" y="-211"/>
-      <point x="516" y="-260" type="curve" smooth="yes"/>
-      <point x="449" y="-309"/>
-      <point x="334" y="-334"/>
-      <point x="169" y="-334" type="curve" name="dv01" smooth="yes"/>
-      <point x="19" y="-334" type="line"/>
+      <point x="56" y="1" type="line" name="hr00"/>
+      <point x="64.8825" y="1"/>
+      <point x="74.3983" y="0.808198"/>
+      <point x="95.328" y="0.208" type="curve" smooth="yes"/>
+      <point x="111.606" y="-0.258802"/>
+      <point x="129.042" y="-0.759"/>
+      <point x="147.909" y="-0.759" type="curve" smooth="yes"/>
+      <point x="317.616" y="-0.759"/>
+      <point x="361.729" y="39.717"/>
+      <point x="398" y="230" type="curve" smooth="yes"/>
+      <point x="437" y="435" type="line" smooth="yes"/>
+      <point x="477.445" y="647.222"/>
+      <point x="551.714" y="730.29"/>
+      <point x="724" y="756" type="curve" name="ih01"/>
+      <point x="584.586" y="780.278"/>
+      <point x="544.283" y="860.862"/>
+      <point x="544.283" y="961.649" type="curve" smooth="yes"/>
+      <point x="544.283" y="1033"/>
+      <point x="564.481" y="1114.47"/>
+      <point x="584.011" y="1193.25" type="curve" smooth="yes"/>
+      <point x="602.298" y="1267.02"/>
+      <point x="620" y="1338.43"/>
+      <point x="620" y="1396.97" type="curve" smooth="yes"/>
+      <point x="620" y="1481.19"/>
+      <point x="581.753" y="1510"/>
+      <point x="472" y="1510" type="curve" smooth="yes" name="sv01"/>
+      <point x="351" y="1510" type="line"/>
+      <point x="388" y="1700" type="line" name="at01"/>
+      <point x="535" y="1700" type="line" smooth="yes"/>
+      <point x="789.779" y="1700"/>
+      <point x="904" y="1636.94"/>
+      <point x="904" y="1496.27" type="curve" smooth="yes"/>
+      <point x="904" y="1399.81"/>
+      <point x="880.966" y="1297.9"/>
+      <point x="858.469" y="1198.36" type="curve" smooth="yes"/>
+      <point x="849.589" y="1159.07"/>
+      <point x="840.792" y="1120.15"/>
+      <point x="833.529" y="1082.08" type="curve" smooth="yes"/>
+      <point x="833.068" y="1079.67"/>
+      <point x="826" y="1042.65"/>
+      <point x="826" y="1009.63" type="curve" smooth="yes" name="dh02"/>
+      <point x="826" y="899.334"/>
+      <point x="906.516" y="850.919"/>
+      <point x="1091.86" y="850.919" type="curve" smooth="yes"/>
+      <point x="1110.3" y="850.919" type="line" smooth="yes"/>
+      <point x="1113.53" y="850.919"/>
+      <point x="1116.73" y="850.98"/>
+      <point x="1119.88" y="850.98" type="curve" smooth="yes"/>
+      <point x="1129" y="850.98" type="line"/>
+      <point x="1092" y="660" type="line" name="dv03"/>
+      <point x="788.035" y="660"/>
+      <point x="742.54" y="621.757"/>
+      <point x="684.342" y="317.324" type="curve" smooth="yes"/>
+      <point x="680.86" y="299.107"/>
+      <point x="677.379" y="280.219"/>
+      <point x="670.687" y="243.236" type="curve" smooth="yes"/>
+      <point x="605.885" y="-114.907"/>
+      <point x="518.927" y="-190"/>
+      <point x="169" y="-190" type="curve" smooth="yes" name="dv01"/>
+      <point x="19" y="-190" type="line"/>
     </contour>
   </outline>
   <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
-    </dict>
+  <dict>
+    <key>com.schriftgestaltung.Glyphs.lastChange</key>
+    <string>2017-07-11 17:15:08 +0000</string>
+  </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/bracketleft.glif b/source/Hack-BoldItalic.ufo/glyphs/bracketleft.glif
index 383c2a1d9..9342dadb2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/bracketleft.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/bracketleft.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="bracketleft" format="1">
+<glyph name="bracketleft" format="2">
   <advance width="1233"/>
   <unicode hex="005B"/>
   <outline>
     <contour>
-      <point x="549" y="1651" type="line" name="hr00"/>
-      <point x="1204" y="1651" type="line" name="dv04"/>
-      <point x="1176" y="1478" type="line" name="dv03"/>
-      <point x="756" y="1478" type="line"/>
-      <point x="505" y="-112" type="line"/>
-      <point x="925" y="-112" type="line" name="dv02"/>
-      <point x="897" y="-285" type="line" name="dv01"/>
-      <point x="242" y="-285" type="line"/>
+      <point x="549" y="1700" type="line" name="hr00"/>
+      <point x="1204" y="1700" type="line" name="dv04"/>
+      <point x="1176" y="1527" type="line" name="dv03"/>
+      <point x="756" y="1527" type="line"/>
+      <point x="505" y="-63" type="line"/>
+      <point x="925" y="-63" type="line" name="dv02"/>
+      <point x="897" y="-236" type="line" name="dv01"/>
+      <point x="242" y="-236" type="line"/>
     </contour>
   </outline>
   <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
-    </dict>
+  <dict>
+    <key>com.schriftgestaltung.Glyphs.lastChange</key>
+    <string>2017-07-11 17:15:08 +0000</string>
+  </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/bracketright.glif b/source/Hack-BoldItalic.ufo/glyphs/bracketright.glif
index 9d4ed970b..3b96e0c0b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/bracketright.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/bracketright.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="bracketright" format="1">
+<glyph name="bracketright" format="2">
   <advance width="1233"/>
   <unicode hex="005D"/>
   <outline>
     <contour>
-      <point x="273" y="-112" type="line" name="hr00"/>
-      <point x="693" y="-112" type="line" name="dv02"/>
-      <point x="944" y="1477" type="line"/>
-      <point x="524" y="1477" type="line" name="dv03"/>
-      <point x="552" y="1650" type="line" name="dv04"/>
-      <point x="1207" y="1650" type="line"/>
-      <point x="900" y="-285" type="line" name="dv01"/>
-      <point x="245" y="-285" type="line"/>
+      <point x="273" y="-62" type="line" name="hr00"/>
+      <point x="693" y="-62" type="line" name="dv02"/>
+      <point x="944" y="1527" type="line"/>
+      <point x="524" y="1527" type="line" name="dv03"/>
+      <point x="552" y="1700" type="line" name="dv04"/>
+      <point x="1207" y="1700" type="line"/>
+      <point x="900" y="-235" type="line" name="dv01"/>
+      <point x="245" y="-235" type="line"/>
     </contour>
   </outline>
   <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
-    </dict>
+  <dict>
+    <key>com.schriftgestaltung.Glyphs.lastChange</key>
+    <string>2017-07-11 17:15:08 +0000</string>
+  </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/breve.glif b/source/Hack-BoldItalic.ufo/glyphs/breve.glif
index d3839fc06..6c4f821e9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/breve.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/breve.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="breve" format="1">
+<glyph name="breve" format="2">
   <advance width="1233"/>
   <unicode hex="02D8"/>
   <outline>
     <contour>
-      <point x="739" y="1309" type="curve" name="dv01" smooth="yes"/>
+      <point x="739" y="1309" type="curve" smooth="yes" name="dv01"/>
       <point x="642" y="1309"/>
       <point x="569" y="1331"/>
       <point x="520" y="1375" type="curve" smooth="yes"/>
@@ -13,16 +13,16 @@
       <point x="446" y="1573" type="curve" smooth="yes"/>
       <point x="446" y="1606" type="line"/>
       <point x="590" y="1606" type="line" name="sv01"/>
-      <point x="590" y="1593" type="line" name="hr01" smooth="yes"/>
+      <point x="590" y="1593" type="line" smooth="yes" name="hr01"/>
       <point x="590" y="1552"/>
       <point x="605" y="1520"/>
       <point x="634" y="1496" type="curve" smooth="yes"/>
       <point x="663" y="1472"/>
       <point x="703" y="1460"/>
-      <point x="754" y="1460" type="curve" name="dv02" smooth="yes"/>
+      <point x="754" y="1460" type="curve" smooth="yes" name="dv02"/>
       <point x="808" y="1460"/>
       <point x="855" y="1473"/>
-      <point x="894" y="1499" type="curve" name="hr02" smooth="yes"/>
+      <point x="894" y="1499" type="curve" smooth="yes" name="hr02"/>
       <point x="933" y="1524"/>
       <point x="958" y="1557"/>
       <point x="977" y="1606" type="curve" name="sv02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/brokenbar.glif b/source/Hack-BoldItalic.ufo/glyphs/brokenbar.glif
index 7efe44fa8..25f64cf80 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/brokenbar.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/brokenbar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="brokenbar" format="1">
+<glyph name="brokenbar" format="2">
   <advance width="1233"/>
   <unicode hex="00A6"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/bullet.glif b/source/Hack-BoldItalic.ufo/glyphs/bullet.glif
index 50013dc34..229788dc8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/bullet.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/bullet.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="bullet" format="1">
+<glyph name="bullet" format="2">
   <advance width="1233"/>
   <unicode hex="2022"/>
   <outline>
     <contour>
-      <point x="614" y="399" type="curve" name="hr00" smooth="yes"/>
+      <point x="614" y="399" type="curve" smooth="yes" name="hr00"/>
       <point x="566" y="399"/>
       <point x="520" y="408"/>
       <point x="476" y="427" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="480" y="1094" type="curve" smooth="yes"/>
       <point x="519" y="1110"/>
       <point x="566" y="1120"/>
-      <point x="617" y="1120" type="curve" name="at01" smooth="yes"/>
+      <point x="617" y="1120" type="curve" smooth="yes" name="at01"/>
       <point x="665" y="1120"/>
       <point x="711" y="1111"/>
       <point x="755" y="1093" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/c.glif b/source/Hack-BoldItalic.ufo/glyphs/c.glif
index 841b91558..3353f5b8a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/c.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/c.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c" format="1">
+<glyph name="c" format="2">
   <advance width="1233"/>
   <unicode hex="0063"/>
   <outline>
@@ -33,9 +33,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/c6459.glif b/source/Hack-BoldItalic.ufo/glyphs/c6459.glif
index 65a88250b..150e78341 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/c6459.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/c6459.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6459" format="1">
+<glyph name="c6459" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="436" y="1280" type="line" name="hr00" smooth="yes"/>
+      <point x="436" y="1280" type="line" smooth="yes" name="hr00"/>
       <point x="418" y="1280"/>
       <point x="409" y="1288"/>
       <point x="409" y="1304" type="curve" smooth="yes"/>
@@ -13,7 +13,7 @@
       <point x="448" y="1499" type="line" smooth="yes"/>
       <point x="452" y="1517"/>
       <point x="463" y="1526"/>
-      <point x="480" y="1526" type="curve" name="dv01" smooth="yes"/>
+      <point x="480" y="1526" type="curve" smooth="yes" name="dv01"/>
       <point x="655" y="1526" type="line" smooth="yes"/>
       <point x="673" y="1526"/>
       <point x="682" y="1518"/>
@@ -27,7 +27,7 @@
       <point x="612" y="1280" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="832" y="1280" type="line" name="sv01" smooth="yes"/>
+      <point x="832" y="1280" type="line" smooth="yes" name="sv01"/>
       <point x="814" y="1280"/>
       <point x="805" y="1288"/>
       <point x="805" y="1304" type="curve" smooth="yes"/>
@@ -37,7 +37,7 @@
       <point x="843" y="1499" type="line"/>
       <point x="846" y="1517"/>
       <point x="856" y="1526"/>
-      <point x="875" y="1526" type="curve" name="sv02" smooth="yes"/>
+      <point x="875" y="1526" type="curve" smooth="yes" name="sv02"/>
       <point x="1050" y="1526" type="line" smooth="yes"/>
       <point x="1070" y="1526"/>
       <point x="1081" y="1513"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/c6460.glif b/source/Hack-BoldItalic.ufo/glyphs/c6460.glif
index 7e89a5470..3cb839f28 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/c6460.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/c6460.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6460" format="1">
+<glyph name="c6460" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/c6461.glif b/source/Hack-BoldItalic.ufo/glyphs/c6461.glif
index e5eaf15b4..6d8367c00 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/c6461.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/c6461.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6461" format="1">
+<glyph name="c6461" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
@@ -9,7 +9,7 @@
       <point x="462" y="1459" type="curve" smooth="yes"/>
       <point x="505" y="1504"/>
       <point x="557" y="1528"/>
-      <point x="622" y="1528" type="curve" name="dv02" smooth="yes"/>
+      <point x="622" y="1528" type="curve" smooth="yes" name="dv02"/>
       <point x="647" y="1528"/>
       <point x="671" y="1524"/>
       <point x="693" y="1516" type="curve" smooth="yes"/>
@@ -35,7 +35,7 @@
       <point x="1029" y="1331" type="curve" smooth="yes"/>
       <point x="986" y="1285"/>
       <point x="933" y="1262"/>
-      <point x="870" y="1262" type="curve" name="sv02" smooth="yes"/>
+      <point x="870" y="1262" type="curve" smooth="yes" name="sv02"/>
       <point x="843" y="1262"/>
       <point x="822" y="1266"/>
       <point x="801" y="1273" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/c6462.glif b/source/Hack-BoldItalic.ufo/glyphs/c6462.glif
index f1d8cca4c..503ffaf97 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/c6462.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/c6462.glif
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6462" format="1">
+<glyph name="c6462" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="543" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="543" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="391" y="-29"/>
       <point x="280" y="20"/>
       <point x="208" y="91" type="curve" smooth="yes"/>
       <point x="123" y="175"/>
       <point x="88" y="293"/>
-      <point x="88" y="442" type="curve" name="sh01" smooth="yes"/>
+      <point x="88" y="442" type="curve" smooth="yes" name="sh01"/>
       <point x="88" y="631"/>
       <point x="143" y="814"/>
       <point x="254" y="949" type="curve" smooth="yes"/>
       <point x="361" y="1078"/>
       <point x="509" y="1149"/>
-      <point x="689" y="1149" type="curve" name="dv03" smooth="yes"/>
+      <point x="689" y="1149" type="curve" smooth="yes" name="dv03"/>
       <point x="822" y="1149"/>
       <point x="942" y="1110"/>
       <point x="1025" y="1030" type="curve" smooth="yes"/>
       <point x="1109" y="947"/>
       <point x="1145" y="828"/>
-      <point x="1145" y="676" type="curve" name="sh02" smooth="yes"/>
+      <point x="1145" y="676" type="curve" smooth="yes" name="sh02"/>
       <point x="1145" y="484"/>
       <point x="1088" y="304"/>
       <point x="980" y="171" type="curve"/>
@@ -29,25 +29,25 @@
       <point x="715" y="-29"/>
     </contour>
     <contour>
-      <point x="563" y="207" type="curve" name="dv01" smooth="yes"/>
+      <point x="563" y="207" type="curve" smooth="yes" name="dv01"/>
       <point x="640" y="207"/>
       <point x="711" y="251"/>
       <point x="767" y="343" type="curve" smooth="yes"/>
       <point x="818" y="427"/>
       <point x="850" y="544"/>
-      <point x="850" y="672" type="curve" name="ah01" smooth="yes"/>
+      <point x="850" y="672" type="curve" smooth="yes" name="ah01"/>
       <point x="850" y="764"/>
       <point x="833" y="817"/>
       <point x="804" y="853" type="curve" smooth="yes"/>
       <point x="771" y="893"/>
       <point x="724" y="911"/>
-      <point x="673" y="911" type="curve" name="dv02" smooth="yes"/>
+      <point x="673" y="911" type="curve" smooth="yes" name="dv02"/>
       <point x="590" y="911"/>
       <point x="521" y="866"/>
       <point x="466" y="776" type="curve" smooth="yes"/>
       <point x="411" y="684"/>
       <point x="383" y="561"/>
-      <point x="383" y="449" type="curve" name="sh03" smooth="yes"/>
+      <point x="383" y="449" type="curve" smooth="yes" name="sh03"/>
       <point x="383" y="377"/>
       <point x="394" y="312"/>
       <point x="431" y="267" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/c6469.glif b/source/Hack-BoldItalic.ufo/glyphs/c6469.glif
index 6504fda75..0bc20ca53 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/c6469.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/c6469.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6469" format="1">
+<glyph name="c6469" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/c6471.glif b/source/Hack-BoldItalic.ufo/glyphs/c6471.glif
index 8bb326d93..e03296f93 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/c6471.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/c6471.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6471" format="1">
+<glyph name="c6471" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/c6473.glif b/source/Hack-BoldItalic.ufo/glyphs/c6473.glif
index 23f2d8913..ee4b67e81 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/c6473.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/c6473.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6473" format="1">
+<glyph name="c6473" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/c6476.glif b/source/Hack-BoldItalic.ufo/glyphs/c6476.glif
index 47632eb20..ebf95ea2b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/c6476.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/c6476.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6476" format="1">
+<glyph name="c6476" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="720" y="1262" type="curve" name="dv01" smooth="yes"/>
+      <point x="720" y="1262" type="curve" smooth="yes" name="dv01"/>
       <point x="624" y="1262"/>
       <point x="557" y="1285"/>
       <point x="508" y="1330" type="curve" smooth="yes"/>
@@ -14,13 +14,13 @@
       <point x="577" y="1526" type="line" name="sv01"/>
       <point x="584" y="1486"/>
       <point x="601" y="1457"/>
-      <point x="628" y="1439" type="curve" name="hr01" smooth="yes"/>
+      <point x="628" y="1439" type="curve" smooth="yes" name="hr01"/>
       <point x="655" y="1420"/>
       <point x="694" y="1411"/>
-      <point x="745" y="1411" type="curve" name="dv02" smooth="yes"/>
+      <point x="745" y="1411" type="curve" smooth="yes" name="dv02"/>
       <point x="798" y="1411"/>
       <point x="836" y="1421"/>
-      <point x="872" y="1442" type="curve" name="hr02" smooth="yes"/>
+      <point x="872" y="1442" type="curve" smooth="yes" name="hr02"/>
       <point x="908" y="1463"/>
       <point x="933" y="1491"/>
       <point x="948" y="1526" type="curve" name="sv02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/c6477.glif b/source/Hack-BoldItalic.ufo/glyphs/c6477.glif
index f81dfa769..fecd03255 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/c6477.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/c6477.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6477" format="1">
+<glyph name="c6477" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="617" y="1280" type="line" name="hr00" smooth="yes"/>
+      <point x="617" y="1280" type="line" smooth="yes" name="hr00"/>
       <point x="597" y="1280"/>
       <point x="586" y="1293"/>
       <point x="590" y="1313" type="curve" smooth="yes"/>
       <point x="626" y="1499" type="line"/>
       <point x="629" y="1517"/>
       <point x="639" y="1526"/>
-      <point x="658" y="1526" type="curve" name="dv01" smooth="yes"/>
+      <point x="658" y="1526" type="curve" smooth="yes" name="dv01"/>
       <point x="872" y="1526" type="line" smooth="yes"/>
       <point x="892" y="1526"/>
       <point x="903" y="1513"/>
@@ -18,7 +18,7 @@
       <point x="863" y="1307" type="line" smooth="yes"/>
       <point x="860" y="1289"/>
       <point x="849" y="1280"/>
-      <point x="831" y="1280" type="curve" name="sv01" smooth="yes"/>
+      <point x="831" y="1280" type="curve" smooth="yes" name="sv01"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/c6478.glif b/source/Hack-BoldItalic.ufo/glyphs/c6478.glif
index e575b2f12..d311ccd29 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/c6478.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/c6478.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6478" format="1">
+<glyph name="c6478" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/c6479.glif b/source/Hack-BoldItalic.ufo/glyphs/c6479.glif
index a05e1ae94..62ccce1a0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/c6479.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/c6479.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6479" format="1">
+<glyph name="c6479" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/cacute.glif b/source/Hack-BoldItalic.ufo/glyphs/cacute.glif
index 9718bd8e2..fd93765a2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/cacute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/cacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="cacute" format="1">
+<glyph name="cacute" format="2">
   <advance width="1233"/>
   <unicode hex="0107"/>
   <outline>
@@ -10,19 +10,19 @@
       <point x="630" y="1297" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="611" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="611" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="471" y="-29"/>
       <point x="345" y="6"/>
       <point x="253" y="94" type="curve" smooth="yes"/>
       <point x="161" y="182"/>
       <point x="125" y="305"/>
-      <point x="125" y="448" type="curve" name="dh01" smooth="yes"/>
+      <point x="125" y="448" type="curve" smooth="yes" name="dh01"/>
       <point x="125" y="636"/>
       <point x="189" y="823"/>
       <point x="308" y="950" type="curve" smooth="yes"/>
       <point x="428" y="1079"/>
       <point x="595" y="1147"/>
-      <point x="787" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="787" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="854" y="1147"/>
       <point x="920" y="1139"/>
       <point x="971" y="1127" type="curve" smooth="yes"/>
@@ -35,16 +35,16 @@
       <point x="950" y="881" type="curve" smooth="yes"/>
       <point x="906" y="900"/>
       <point x="857" y="909"/>
-      <point x="804" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="804" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="685" y="909"/>
       <point x="593" y="862"/>
       <point x="528" y="786" type="curve" smooth="yes"/>
       <point x="456" y="702"/>
       <point x="421" y="590"/>
-      <point x="421" y="466" type="curve" name="dh02" smooth="yes"/>
+      <point x="421" y="466" type="curve" smooth="yes" name="dh02"/>
       <point x="421" y="289"/>
       <point x="503" y="209"/>
-      <point x="665" y="209" type="curve" name="dv02" smooth="yes"/>
+      <point x="665" y="209" type="curve" smooth="yes" name="dv02"/>
       <point x="716" y="209"/>
       <point x="764" y="218"/>
       <point x="817" y="235" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/caron.glif b/source/Hack-BoldItalic.ufo/glyphs/caron.glif
index 07e564f83..6b9ef1054 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/caron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="caron" format="1">
+<glyph name="caron" format="2">
   <advance width="1233"/>
   <unicode hex="02C7"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/carriagereturn.glif b/source/Hack-BoldItalic.ufo/glyphs/carriagereturn.glif
index b7ec56f83..bfd3dabf9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/carriagereturn.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/carriagereturn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="carriagereturn" format="1">
+<glyph name="carriagereturn" format="2">
   <advance width="1233"/>
   <unicode hex="21B5"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ccaron.glif b/source/Hack-BoldItalic.ufo/glyphs/ccaron.glif
index 370f78954..544d7bfd9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ccaron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ccaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ccaron" format="1">
+<glyph name="ccaron" format="2">
   <advance width="1233"/>
   <unicode hex="010D"/>
   <outline>
@@ -13,19 +13,19 @@
       <point x="657" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="611" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="611" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="471" y="-29"/>
       <point x="345" y="6"/>
       <point x="253" y="94" type="curve" smooth="yes"/>
       <point x="161" y="182"/>
       <point x="125" y="305"/>
-      <point x="125" y="448" type="curve" name="dh01" smooth="yes"/>
+      <point x="125" y="448" type="curve" smooth="yes" name="dh01"/>
       <point x="125" y="636"/>
       <point x="189" y="823"/>
       <point x="308" y="950" type="curve" smooth="yes"/>
       <point x="428" y="1079"/>
       <point x="595" y="1147"/>
-      <point x="787" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="787" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="854" y="1147"/>
       <point x="920" y="1139"/>
       <point x="971" y="1127" type="curve" smooth="yes"/>
@@ -38,16 +38,16 @@
       <point x="950" y="881" type="curve" smooth="yes"/>
       <point x="906" y="900"/>
       <point x="857" y="909"/>
-      <point x="804" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="804" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="685" y="909"/>
       <point x="593" y="862"/>
       <point x="528" y="786" type="curve" smooth="yes"/>
       <point x="456" y="702"/>
       <point x="421" y="590"/>
-      <point x="421" y="466" type="curve" name="dh02" smooth="yes"/>
+      <point x="421" y="466" type="curve" smooth="yes" name="dh02"/>
       <point x="421" y="289"/>
       <point x="503" y="209"/>
-      <point x="665" y="209" type="curve" name="dv02" smooth="yes"/>
+      <point x="665" y="209" type="curve" smooth="yes" name="dv02"/>
       <point x="716" y="209"/>
       <point x="764" y="218"/>
       <point x="817" y="235" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ccedilla.glif b/source/Hack-BoldItalic.ufo/glyphs/ccedilla.glif
index fe35e7326..61a96def0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ccedilla.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ccedilla.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ccedilla" format="1">
+<glyph name="ccedilla" format="2">
   <advance width="1233"/>
   <unicode hex="00E7"/>
   <outline>
     <contour>
-      <point x="809" y="909" type="curve" name="hr00" smooth="yes"/>
+      <point x="809" y="909" type="curve" smooth="yes" name="hr00"/>
       <point x="690" y="909"/>
       <point x="598" y="862"/>
       <point x="533" y="786" type="curve" smooth="yes"/>
       <point x="461" y="702"/>
       <point x="426" y="590"/>
-      <point x="426" y="466" type="curve" name="dh02" smooth="yes"/>
+      <point x="426" y="466" type="curve" smooth="yes" name="dh02"/>
       <point x="426" y="289"/>
       <point x="508" y="209"/>
-      <point x="670" y="209" type="curve" name="sv01" smooth="yes"/>
+      <point x="670" y="209" type="curve" smooth="yes" name="sv01"/>
       <point x="721" y="209"/>
       <point x="769" y="218"/>
       <point x="822" y="235" type="curve" smooth="yes"/>
@@ -23,7 +23,7 @@
       <point x="936" y="37" type="line"/>
       <point x="884" y="14"/>
       <point x="831" y="-2"/>
-      <point x="778" y="-13" type="curve" name="ab01" smooth="yes"/>
+      <point x="778" y="-13" type="curve" smooth="yes" name="ab01"/>
       <point x="754" y="-18"/>
       <point x="729" y="-21"/>
       <point x="705" y="-24" type="curve" name="ab02"/>
@@ -38,10 +38,10 @@
       <point x="685" y="-342" type="curve" smooth="yes"/>
       <point x="636" y="-381"/>
       <point x="565" y="-401"/>
-      <point x="473" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="473" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="438" y="-401"/>
       <point x="399" y="-398"/>
-      <point x="374" y="-395" type="curve" name="sv02" smooth="yes"/>
+      <point x="374" y="-395" type="curve" smooth="yes" name="sv02"/>
       <point x="315" y="-387"/>
       <point x="298" y="-380"/>
       <point x="275" y="-375" type="curve"/>
@@ -51,7 +51,7 @@
       <point x="387" y="-245" type="curve" smooth="yes"/>
       <point x="414" y="-251"/>
       <point x="439" y="-254"/>
-      <point x="464" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="464" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="509" y="-254"/>
       <point x="545" y="-244"/>
       <point x="568" y="-227" type="curve" smooth="yes"/>
@@ -69,13 +69,13 @@
       <point x="258" y="94" type="curve" smooth="yes"/>
       <point x="166" y="182"/>
       <point x="130" y="305"/>
-      <point x="130" y="448" type="curve" name="dh01" smooth="yes"/>
+      <point x="130" y="448" type="curve" smooth="yes" name="dh01"/>
       <point x="130" y="636"/>
       <point x="194" y="823"/>
       <point x="313" y="950" type="curve" smooth="yes"/>
       <point x="433" y="1079"/>
       <point x="600" y="1147"/>
-      <point x="792" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="792" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="859" y="1147"/>
       <point x="925" y="1139"/>
       <point x="976" y="1127" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ccircumflex.glif b/source/Hack-BoldItalic.ufo/glyphs/ccircumflex.glif
index 9c2b59877..ecf6eecb6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ccircumflex.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ccircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ccircumflex" format="1">
+<glyph name="ccircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0109"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/cdotaccent.glif b/source/Hack-BoldItalic.ufo/glyphs/cdotaccent.glif
index 9b03bd7fc..adc47fa94 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/cdotaccent.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/cdotaccent.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="cdotaccent" format="1">
+<glyph name="cdotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="010B"/>
   <outline>
     <contour>
-      <point x="677" y="1347" type="line" name="hr00" smooth="yes"/>
+      <point x="677" y="1347" type="line" smooth="yes" name="hr00"/>
       <point x="656" y="1347"/>
       <point x="647" y="1360"/>
       <point x="651" y="1380" type="curve" smooth="yes"/>
       <point x="688" y="1566" type="line"/>
       <point x="691" y="1584"/>
       <point x="701" y="1593"/>
-      <point x="720" y="1593" type="curve" name="dv03" smooth="yes"/>
+      <point x="720" y="1593" type="curve" smooth="yes" name="dv03"/>
       <point x="932" y="1593" type="line" smooth="yes"/>
       <point x="952" y="1593"/>
       <point x="963" y="1580"/>
@@ -22,26 +22,26 @@
       <point x="891" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="608" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="608" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="307" y="-29"/>
       <point x="125" y="134"/>
-      <point x="125" y="457" type="curve" name="dh01" smooth="yes"/>
+      <point x="125" y="457" type="curve" smooth="yes" name="dh01"/>
       <point x="125" y="848"/>
       <point x="392" y="1147"/>
-      <point x="795" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="795" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="916" y="1147"/>
       <point x="1031" y="1120"/>
       <point x="1132" y="1063" type="curve"/>
       <point x="1079" y="795" type="line"/>
       <point x="999" y="871"/>
       <point x="908" y="909"/>
-      <point x="805" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="805" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="577" y="909"/>
       <point x="421" y="723"/>
-      <point x="421" y="472" type="curve" name="dh02" smooth="yes"/>
+      <point x="421" y="472" type="curve" smooth="yes" name="dh02"/>
       <point x="421" y="291"/>
       <point x="500" y="209"/>
-      <point x="661" y="209" type="curve" name="dv02" smooth="yes"/>
+      <point x="661" y="209" type="curve" smooth="yes" name="dv02"/>
       <point x="760" y="209"/>
       <point x="858" y="240"/>
       <point x="987" y="313" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/cedilla.glif b/source/Hack-BoldItalic.ufo/glyphs/cedilla.glif
index 273741fb1..12ee20534 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/cedilla.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/cedilla.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="cedilla" format="1">
+<glyph name="cedilla" format="2">
   <advance width="1233"/>
   <unicode hex="00B8"/>
   <outline>
     <contour>
-      <point x="349" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="349" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="314" y="-401"/>
       <point x="272" y="-398"/>
       <point x="249" y="-395" type="curve" smooth="yes"/>
@@ -17,7 +17,7 @@
       <point x="262" y="-245" type="curve" smooth="yes"/>
       <point x="289" y="-251"/>
       <point x="314" y="-254"/>
-      <point x="339" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="339" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="384" y="-254"/>
       <point x="420" y="-244"/>
       <point x="443" y="-227" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/cent.glif b/source/Hack-BoldItalic.ufo/glyphs/cent.glif
index 9654bfc39..565ea5af9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/cent.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/cent.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="cent" format="1">
+<glyph name="cent" format="2">
   <advance width="1233"/>
   <unicode hex="00A2"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="208" y="116" type="curve" smooth="yes"/>
       <point x="139" y="196"/>
       <point x="104" y="298"/>
-      <point x="104" y="438" type="curve" name="dh01" smooth="yes"/>
+      <point x="104" y="438" type="curve" smooth="yes" name="dh01"/>
       <point x="104" y="541"/>
       <point x="123" y="635"/>
       <point x="159" y="727" type="curve" smooth="yes"/>
@@ -63,7 +63,7 @@
       <point x="459" y="762" type="curve" smooth="yes"/>
       <point x="398" y="677"/>
       <point x="365" y="576"/>
-      <point x="365" y="463" type="curve" name="dh02" smooth="yes"/>
+      <point x="365" y="463" type="curve" smooth="yes" name="dh02"/>
       <point x="365" y="383"/>
       <point x="382" y="329"/>
       <point x="417" y="285" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/chi.glif b/source/Hack-BoldItalic.ufo/glyphs/chi.glif
index dcb4aaf3c..965731fcb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/chi.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/chi.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="chi" format="1">
+<glyph name="chi" format="2">
   <advance width="1233"/>
   <unicode hex="03C7"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/circle.glif b/source/Hack-BoldItalic.ufo/glyphs/circle.glif
index 4bc4878d5..a34dafb61 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/circle.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/circle.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="circle" format="1">
+<glyph name="circle" format="2">
   <advance width="1233"/>
   <unicode hex="25CB"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv03"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -30,13 +30,13 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="616" y="79" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="79" type="curve" smooth="yes" name="dv01"/>
       <point x="691" y="79"/>
       <point x="766" y="100"/>
       <point x="841" y="143" type="curve" smooth="yes"/>
       <point x="990" y="228"/>
       <point x="1066" y="357"/>
-      <point x="1066" y="532" type="curve" name="ah01" smooth="yes"/>
+      <point x="1066" y="532" type="curve" smooth="yes" name="ah01"/>
       <point x="1066" y="619"/>
       <point x="1047" y="695"/>
       <point x="1010" y="760" type="curve" smooth="yes"/>
@@ -45,13 +45,13 @@
       <point x="841" y="921" type="curve" smooth="yes"/>
       <point x="766" y="964"/>
       <point x="691" y="985"/>
-      <point x="616" y="985" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="985" type="curve" smooth="yes" name="dv02"/>
       <point x="541" y="985"/>
       <point x="467" y="964"/>
       <point x="392" y="921" type="curve" smooth="yes"/>
       <point x="243" y="836"/>
       <point x="167" y="707"/>
-      <point x="167" y="532" type="curve" name="sh03" smooth="yes"/>
+      <point x="167" y="532" type="curve" smooth="yes" name="sh03"/>
       <point x="167" y="445"/>
       <point x="186" y="369"/>
       <point x="224" y="304" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/circlemultiply.glif b/source/Hack-BoldItalic.ufo/glyphs/circlemultiply.glif
index d5e0c6a8d..abd230793 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/circlemultiply.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/circlemultiply.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="circlemultiply" format="1">
+<glyph name="circlemultiply" format="2">
   <advance width="1233"/>
   <unicode hex="2297"/>
   <outline>
     <contour>
-      <point x="617" y="52" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="52" type="curve" smooth="yes" name="hr00"/>
       <point x="448" y="52"/>
       <point x="302" y="121"/>
       <point x="198" y="225" type="curve" smooth="yes"/>
       <point x="82" y="341"/>
       <point x="26" y="488"/>
-      <point x="26" y="643" type="curve" name="sh01" smooth="yes"/>
+      <point x="26" y="643" type="curve" smooth="yes" name="sh01"/>
       <point x="26" y="810"/>
       <point x="90" y="954"/>
       <point x="198" y="1061" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="391" y="1191" type="curve" smooth="yes"/>
       <point x="461" y="1220"/>
       <point x="536" y="1235"/>
-      <point x="615" y="1235" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1235" type="curve" smooth="yes" name="dv03"/>
       <point x="772" y="1235"/>
       <point x="922" y="1175"/>
       <point x="1035" y="1062" type="curve" smooth="yes"/>
       <point x="1140" y="957"/>
       <point x="1207" y="810"/>
-      <point x="1207" y="643" type="curve" name="sh02" smooth="yes"/>
+      <point x="1207" y="643" type="curve" smooth="yes" name="sh02"/>
       <point x="1207" y="487"/>
       <point x="1150" y="340"/>
       <point x="1035" y="225" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="786" y="52"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="533"/>
-      <point x="1012" y="646" type="curve" name="ah01" smooth="yes"/>
+      <point x="1012" y="646" type="curve" smooth="yes" name="ah01"/>
       <point x="1012" y="747"/>
       <point x="977" y="844"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="412" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/circleplus.glif b/source/Hack-BoldItalic.ufo/glyphs/circleplus.glif
index bbdd63fec..7a3e98dc5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/circleplus.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/circleplus.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="circleplus" format="1">
+<glyph name="circleplus" format="2">
   <advance width="1233"/>
   <unicode hex="2295"/>
   <outline>
     <contour>
-      <point x="617" y="52" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="52" type="curve" smooth="yes" name="hr00"/>
       <point x="448" y="52"/>
       <point x="302" y="121"/>
       <point x="198" y="225" type="curve" smooth="yes"/>
       <point x="82" y="341"/>
       <point x="26" y="488"/>
-      <point x="26" y="643" type="curve" name="dh01" smooth="yes"/>
+      <point x="26" y="643" type="curve" smooth="yes" name="dh01"/>
       <point x="26" y="810"/>
       <point x="90" y="954"/>
       <point x="198" y="1061" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="391" y="1191" type="curve" smooth="yes"/>
       <point x="461" y="1220"/>
       <point x="536" y="1235"/>
-      <point x="615" y="1235" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1235" type="curve" smooth="yes" name="dv03"/>
       <point x="772" y="1235"/>
       <point x="922" y="1175"/>
       <point x="1035" y="1062" type="curve" smooth="yes"/>
       <point x="1140" y="957"/>
       <point x="1207" y="810"/>
-      <point x="1207" y="643" type="curve" name="dh06" smooth="yes"/>
+      <point x="1207" y="643" type="curve" smooth="yes" name="dh06"/>
       <point x="1207" y="487"/>
       <point x="1150" y="340"/>
       <point x="1035" y="225" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="786" y="52"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="533"/>
-      <point x="1012" y="646" type="curve" name="dh05" smooth="yes"/>
+      <point x="1012" y="646" type="curve" smooth="yes" name="dh05"/>
       <point x="1012" y="747"/>
       <point x="977" y="844"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="412" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="dh02" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="dh02"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/circumflex.glif b/source/Hack-BoldItalic.ufo/glyphs/circumflex.glif
index 515fad42b..666550a1e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/circumflex.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="circumflex" format="1">
+<glyph name="circumflex" format="2">
   <advance width="1233"/>
   <unicode hex="02C6"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/colon.glif b/source/Hack-BoldItalic.ufo/glyphs/colon.glif
index 8adfd15dc..0657723d7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/colon.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/colon.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="colon" format="1">
+<glyph name="colon" format="2">
   <advance width="1233"/>
   <unicode hex="003A"/>
   <outline>
     <contour>
-      <point x="734" y="747" type="curve" name="dv01" smooth="yes"/>
+      <point x="734" y="747" type="curve" smooth="yes" name="dv01"/>
       <point x="681" y="747"/>
       <point x="644" y="766"/>
       <point x="620" y="793" type="curve" smooth="yes"/>
       <point x="597" y="820"/>
       <point x="581" y="857"/>
-      <point x="581" y="904" type="curve" name="ih01" smooth="yes"/>
+      <point x="581" y="904" type="curve" smooth="yes" name="ih01"/>
       <point x="581" y="988"/>
       <point x="631" y="1070"/>
       <point x="716" y="1102" type="curve" smooth="yes"/>
       <point x="739" y="1110"/>
       <point x="761" y="1115"/>
-      <point x="788" y="1115" type="curve" name="dv02" smooth="yes"/>
+      <point x="788" y="1115" type="curve" smooth="yes" name="dv02"/>
       <point x="837" y="1115"/>
       <point x="876" y="1098"/>
       <point x="903" y="1069" type="curve" smooth="yes"/>
       <point x="931" y="1038"/>
       <point x="941" y="993"/>
-      <point x="941" y="954" type="curve" name="sh01" smooth="yes"/>
+      <point x="941" y="954" type="curve" smooth="yes" name="sh01"/>
       <point x="941" y="923"/>
       <point x="935" y="902"/>
       <point x="927" y="882" type="curve" smooth="yes"/>
@@ -33,31 +33,31 @@
       <point x="759" y="747"/>
     </contour>
     <contour>
-      <point x="620" y="35" type="curve" name="ab01" smooth="yes"/>
+      <point x="620" y="35" type="curve" smooth="yes" name="ab01"/>
       <point x="567" y="35"/>
       <point x="530" y="54"/>
       <point x="506" y="81" type="curve" smooth="yes"/>
       <point x="483" y="108"/>
       <point x="467" y="145"/>
-      <point x="467" y="192" type="curve" name="dh01" smooth="yes"/>
+      <point x="467" y="192" type="curve" smooth="yes" name="dh01"/>
       <point x="467" y="276"/>
       <point x="517" y="358"/>
       <point x="602" y="390" type="curve" smooth="yes"/>
       <point x="625" y="398"/>
       <point x="647" y="403"/>
-      <point x="674" y="403" type="curve" name="hr01" smooth="yes"/>
+      <point x="674" y="403" type="curve" smooth="yes" name="hr01"/>
       <point x="723" y="403"/>
       <point x="762" y="386"/>
       <point x="789" y="357" type="curve" smooth="yes"/>
       <point x="817" y="326"/>
       <point x="827" y="281"/>
-      <point x="827" y="242" type="curve" name="dh02" smooth="yes"/>
+      <point x="827" y="242" type="curve" smooth="yes" name="dh02"/>
       <point x="827" y="211"/>
       <point x="821" y="190"/>
       <point x="813" y="170" type="curve" smooth="yes"/>
       <point x="790" y="113"/>
       <point x="748" y="72"/>
-      <point x="692" y="49" type="curve" name="ab02" smooth="yes"/>
+      <point x="692" y="49" type="curve" smooth="yes" name="ab02"/>
       <point x="669" y="40"/>
       <point x="645" y="35"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/colonmonetary.glif b/source/Hack-BoldItalic.ufo/glyphs/colonmonetary.glif
index fae6ec1b2..46119052b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/colonmonetary.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/colonmonetary.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="colonmonetary" format="1">
+<glyph name="colonmonetary" format="2">
   <advance width="1233"/>
   <unicode hex="20A1"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="210" y="146" type="line" name="hr00"/>
       <point x="111" y="259"/>
       <point x="67" y="396"/>
-      <point x="67" y="581" type="curve" name="dh01" smooth="yes"/>
+      <point x="67" y="581" type="curve" smooth="yes" name="dh01"/>
       <point x="67" y="805"/>
       <point x="131" y="1024"/>
       <point x="258" y="1200" type="curve" smooth="yes"/>
@@ -40,7 +40,7 @@
       <point x="1054" y="70" type="line"/>
       <point x="897" y="5"/>
       <point x="755" y="-29"/>
-      <point x="626" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="626" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="615" y="-29"/>
       <point x="607" y="-29"/>
       <point x="596" y="-28" type="curve" name="sv01"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/comma.glif b/source/Hack-BoldItalic.ufo/glyphs/comma.glif
index 5115659be..caa40a1b8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/comma.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/comma.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="comma" format="1">
+<glyph name="comma" format="2">
   <advance width="1233"/>
   <unicode hex="002C"/>
   <outline>
@@ -17,7 +17,7 @@
       <point x="492" y="75" type="curve" smooth="yes"/>
       <point x="461" y="102"/>
       <point x="443" y="139"/>
-      <point x="443" y="196" type="curve" name="dh01" smooth="yes"/>
+      <point x="443" y="196" type="curve" smooth="yes" name="dh01"/>
       <point x="443" y="215"/>
       <point x="445" y="229"/>
       <point x="449" y="244" type="curve" smooth="yes"/>
@@ -26,13 +26,13 @@
       <point x="494" y="319" type="curve" smooth="yes"/>
       <point x="513" y="335"/>
       <point x="528" y="345"/>
-      <point x="551" y="353" type="curve" name="av02" smooth="yes"/>
+      <point x="551" y="353" type="curve" smooth="yes" name="av02"/>
       <point x="571" y="360"/>
       <point x="591" y="364"/>
-      <point x="618" y="364" type="curve" name="av03" smooth="yes"/>
+      <point x="618" y="364" type="curve" smooth="yes" name="av03"/>
       <point x="641" y="364"/>
       <point x="657" y="361"/>
-      <point x="676" y="356" type="curve" name="av04" smooth="yes"/>
+      <point x="676" y="356" type="curve" smooth="yes" name="av04"/>
       <point x="694" y="351"/>
       <point x="711" y="342"/>
       <point x="726" y="331" type="curve" smooth="yes"/>
@@ -41,13 +41,13 @@
       <point x="764" y="289" type="curve"/>
       <point x="797" y="242"/>
       <point x="813" y="174"/>
-      <point x="813" y="93" type="curve" name="dh02" smooth="yes"/>
+      <point x="813" y="93" type="curve" smooth="yes" name="dh02"/>
       <point x="813" y="34"/>
       <point x="805" y="-20"/>
       <point x="789" y="-71" type="curve" smooth="yes"/>
       <point x="773" y="-122"/>
       <point x="747" y="-172"/>
-      <point x="718" y="-211" type="curve" name="hr01" smooth="yes"/>
+      <point x="718" y="-211" type="curve" smooth="yes" name="hr01"/>
       <point x="653" y="-300"/>
       <point x="564" y="-358"/>
       <point x="451" y="-401" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/congruent.glif b/source/Hack-BoldItalic.ufo/glyphs/congruent.glif
index 41b4b83b5..2db77df53 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/congruent.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/congruent.glif
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="congruent" format="1">
+<glyph name="congruent" format="2">
   <advance width="1233"/>
   <unicode hex="2245"/>
   <outline>
     <contour>
-      <point x="850" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="850" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="778" y="909"/>
       <point x="726" y="925"/>
       <point x="645" y="960" type="curve" smooth="yes"/>
       <point x="612" y="974" type="line" smooth="yes"/>
       <point x="522" y="1011"/>
       <point x="468" y="1032"/>
-      <point x="385" y="1032" type="curve" name="sv02" smooth="yes"/>
+      <point x="385" y="1032" type="curve" smooth="yes" name="sv02"/>
       <point x="280" y="1032"/>
       <point x="192" y="999"/>
       <point x="88" y="911" type="curve" name="iv01"/>
       <point x="88" y="1140" type="line" name="at01"/>
       <point x="192" y="1220"/>
       <point x="287" y="1255"/>
-      <point x="390" y="1255" type="curve" name="av01" smooth="yes"/>
+      <point x="390" y="1255" type="curve" smooth="yes" name="av01"/>
       <point x="463" y="1255"/>
       <point x="533" y="1237"/>
       <point x="621" y="1200" type="curve"/>
@@ -26,7 +26,7 @@
       <point x="652" y="1186" type="line" smooth="yes"/>
       <point x="725" y="1151"/>
       <point x="797" y="1132"/>
-      <point x="865" y="1132" type="curve" name="at02" smooth="yes"/>
+      <point x="865" y="1132" type="curve" smooth="yes" name="at02"/>
       <point x="958" y="1132"/>
       <point x="1045" y="1169"/>
       <point x="1145" y="1257" type="curve" name="av02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/contents.plist b/source/Hack-BoldItalic.ufo/glyphs/contents.plist
index 9c650fdb0..895292c42 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/contents.plist
+++ b/source/Hack-BoldItalic.ufo/glyphs/contents.plist
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>.notdef</key>
@@ -60,6 +60,8 @@
 	<string>E_.glif</string>
 	<key>Eacute</key>
 	<string>E_acute.glif</string>
+	<key>Ebreve</key>
+	<string>E_breve.glif</string>
 	<key>Ecaron</key>
 	<string>E_caron.glif</string>
 	<key>Ecircumflex</key>
@@ -114,6 +116,8 @@
 	<string>I_J_.glif</string>
 	<key>Iacute</key>
 	<string>I_acute.glif</string>
+	<key>Ibreve</key>
+	<string>I_breve.glif</string>
 	<key>Icircumflex</key>
 	<string>I_circumflex.glif</string>
 	<key>Idieresis</key>
@@ -176,6 +180,8 @@
 	<string>O_E_.glif</string>
 	<key>Oacute</key>
 	<string>O_acute.glif</string>
+	<key>Obreve</key>
+	<string>O_breve.glif</string>
 	<key>Ocircumflex</key>
 	<string>O_circumflex.glif</string>
 	<key>Odieresis</key>
@@ -508,6 +514,8 @@
 	<string>e.glif</string>
 	<key>eacute</key>
 	<string>eacute.glif</string>
+	<key>ebreve</key>
+	<string>ebreve.glif</string>
 	<key>ecaron</key>
 	<string>ecaron.glif</string>
 	<key>ecircumflex</key>
@@ -524,18 +532,10 @@
 	<string>eight.subs.glif</string>
 	<key>element</key>
 	<string>element.glif</string>
-	<key>onedotenleader</key>
-	<string>onedotenleader.glif</string>
-	<key>twodotenleader</key>
-	<string>twodotenleader.glif</string>
 	<key>ellipsis</key>
 	<string>ellipsis.glif</string>
 	<key>emacron</key>
 	<string>emacron.glif</string>
-	<key>Ebreve</key>
-	<string>E_breve.glif</string>
-	<key>ebreve</key>
-	<string>ebreve.glif</string>
 	<key>emdash</key>
 	<string>emdash.glif</string>
 	<key>emptyset</key>
@@ -636,10 +636,14 @@
 	<string>hungarumlaut.glif</string>
 	<key>hyphen</key>
 	<string>hyphen.glif</string>
+	<key>hyphenationpoint</key>
+	<string>hyphenationpoint.glif</string>
 	<key>i</key>
 	<string>i.glif</string>
 	<key>iacute</key>
 	<string>iacute.glif</string>
+	<key>ibreve</key>
+	<string>ibreve.glif</string>
 	<key>icircumflex</key>
 	<string>icircumflex.glif</string>
 	<key>idieresis</key>
@@ -650,10 +654,6 @@
 	<string>ij.glif</string>
 	<key>imacron</key>
 	<string>imacron.glif</string>
-	<key>Ibreve</key>
-	<string>I_breve.glif</string>
-	<key>ibreve</key>
-	<string>ibreve.glif</string>
 	<key>infinity</key>
 	<string>infinity.glif</string>
 	<key>integral</key>
@@ -726,8 +726,12 @@
 	<string>m.glif</string>
 	<key>macron</key>
 	<string>macron.glif</string>
+	<key>millisecond</key>
+	<string>millisecond.glif</string>
 	<key>minus</key>
 	<string>minus.glif</string>
+	<key>minute</key>
+	<string>minute.glif</string>
 	<key>multiply</key>
 	<string>multiply.glif</string>
 	<key>musicalnote</key>
@@ -760,6 +764,8 @@
 	<string>o.glif</string>
 	<key>oacute</key>
 	<string>oacute.glif</string>
+	<key>obreve</key>
+	<string>obreve.glif</string>
 	<key>ocircumflex</key>
 	<string>ocircumflex.glif</string>
 	<key>odieresis</key>
@@ -776,10 +782,6 @@
 	<string>ohungarumlaut.glif</string>
 	<key>omacron</key>
 	<string>omacron.glif</string>
-	<key>Obreve</key>
-	<string>O_breve.glif</string>
-	<key>obreve</key>
-	<string>obreve.glif</string>
 	<key>omega</key>
 	<string>omega.glif</string>
 	<key>omegatonos</key>
@@ -792,6 +794,8 @@
 	<string>one.glif</string>
 	<key>one.subs</key>
 	<string>one.subs.glif</string>
+	<key>onedotenleader</key>
+	<string>onedotenleader.glif</string>
 	<key>oneeighth</key>
 	<string>oneeighth.glif</string>
 	<key>onehalf</key>
@@ -898,6 +902,8 @@
 	<string>ring.glif</string>
 	<key>rtblock</key>
 	<string>rtblock.glif</string>
+	<key>ruble</key>
+	<string>ruble.glif</string>
 	<key>s</key>
 	<string>s.glif</string>
 	<key>sacute</key>
@@ -908,6 +914,8 @@
 	<string>scedilla.glif</string>
 	<key>scircumflex</key>
 	<string>scircumflex.glif</string>
+	<key>second</key>
+	<string>second.glif</string>
 	<key>section</key>
 	<string>section.glif</string>
 	<key>semicolon</key>
@@ -980,6 +988,8 @@
 	<string>two.glif</string>
 	<key>two.subs</key>
 	<string>two.subs.glif</string>
+	<key>twodotenleader</key>
+	<string>twodotenleader.glif</string>
 	<key>u</key>
 	<string>u.glif</string>
 	<key>uacute</key>
@@ -1902,18 +1912,10 @@
 	<string>uni201F_.glif</string>
 	<key>uni2023</key>
 	<string>uni2023.glif</string>
-	<key>hyphenationpoint</key>
-	<string>hyphenationpoint.glif</string>
 	<key>uni202F</key>
 	<string>uni202F_.glif</string>
 	<key>uni2031</key>
 	<string>uni2031.glif</string>
-	<key>minute</key>
-	<string>minute.glif</string>
-	<key>second</key>
-	<string>second.glif</string>
-	<key>millisecond</key>
-	<string>millisecond.glif</string>
 	<key>uni2035</key>
 	<string>uni2035.glif</string>
 	<key>uni2036</key>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/copyright.glif b/source/Hack-BoldItalic.ufo/glyphs/copyright.glif
index e8c94a94e..20ab02617 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/copyright.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/copyright.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="copyright" format="1">
+<glyph name="copyright" format="2">
   <advance width="1233"/>
   <unicode hex="00A9"/>
   <outline>
     <contour>
-      <point x="616" y="125" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="125" type="curve" smooth="yes" name="hr00"/>
       <point x="528" y="125"/>
       <point x="454" y="140"/>
       <point x="382" y="171" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="45" y="508" type="curve" smooth="yes"/>
       <point x="15" y="579"/>
       <point x="0" y="656"/>
-      <point x="0" y="741" type="curve" name="dh01" smooth="yes"/>
+      <point x="0" y="741" type="curve" smooth="yes" name="dh01"/>
       <point x="0" y="825"/>
       <point x="15" y="904"/>
       <point x="46" y="977" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="381" y="1313" type="curve" smooth="yes"/>
       <point x="454" y="1343"/>
       <point x="532" y="1358"/>
-      <point x="616" y="1358" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1358" type="curve" smooth="yes" name="dv03"/>
       <point x="700" y="1358"/>
       <point x="779" y="1343"/>
       <point x="852" y="1313" type="curve" smooth="yes"/>
@@ -40,7 +40,7 @@
       <point x="1187" y="977" type="curve" smooth="yes"/>
       <point x="1218" y="905"/>
       <point x="1233" y="827"/>
-      <point x="1233" y="742" type="curve" name="dh06" smooth="yes"/>
+      <point x="1233" y="742" type="curve" smooth="yes" name="dh06"/>
       <point x="1233" y="657"/>
       <point x="1218" y="579"/>
       <point x="1188" y="508" type="curve" smooth="yes"/>
@@ -54,7 +54,7 @@
       <point x="701" y="125"/>
     </contour>
     <contour>
-      <point x="616" y="256" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="256" type="curve" smooth="yes" name="dv01"/>
       <point x="684" y="256"/>
       <point x="741" y="266"/>
       <point x="802" y="293" type="curve" smooth="yes"/>
@@ -66,7 +66,7 @@
       <point x="1066" y="558" type="curve" smooth="yes"/>
       <point x="1090" y="615"/>
       <point x="1102" y="676"/>
-      <point x="1102" y="743" type="curve" name="dh05" smooth="yes"/>
+      <point x="1102" y="743" type="curve" smooth="yes" name="dh05"/>
       <point x="1102" y="815"/>
       <point x="1089" y="871"/>
       <point x="1066" y="927" type="curve" smooth="yes"/>
@@ -75,7 +75,7 @@
       <point x="802" y="1193" type="curve" smooth="yes"/>
       <point x="738" y="1220"/>
       <point x="680" y="1229"/>
-      <point x="619" y="1229" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1229" type="curve" smooth="yes" name="dv02"/>
       <point x="544" y="1229"/>
       <point x="486" y="1216"/>
       <point x="431" y="1193" type="curve" smooth="yes"/>
@@ -84,7 +84,7 @@
       <point x="167" y="927" type="curve" smooth="yes"/>
       <point x="143" y="871"/>
       <point x="131" y="809"/>
-      <point x="131" y="742" type="curve" name="dh02" smooth="yes"/>
+      <point x="131" y="742" type="curve" smooth="yes" name="dh02"/>
       <point x="131" y="676"/>
       <point x="143" y="615"/>
       <point x="167" y="558" type="curve" smooth="yes"/>
@@ -98,16 +98,16 @@
       <point x="549" y="256"/>
     </contour>
     <contour>
-      <point x="637" y="399" type="curve" name="dv04" smooth="yes"/>
+      <point x="637" y="399" type="curve" smooth="yes" name="dv04"/>
       <point x="415" y="399"/>
       <point x="266" y="537"/>
-      <point x="266" y="741" type="curve" name="dh03" smooth="yes"/>
+      <point x="266" y="741" type="curve" smooth="yes" name="dh03"/>
       <point x="266" y="850"/>
       <point x="306" y="935"/>
       <point x="367" y="991" type="curve" smooth="yes"/>
       <point x="430" y="1048"/>
       <point x="521" y="1083"/>
-      <point x="636" y="1083" type="curve" name="dv07" smooth="yes"/>
+      <point x="636" y="1083" type="curve" smooth="yes" name="dv07"/>
       <point x="671" y="1083"/>
       <point x="713" y="1080"/>
       <point x="745" y="1075" type="curve" smooth="yes"/>
@@ -120,19 +120,19 @@
       <point x="751" y="926" type="curve" smooth="yes"/>
       <point x="720" y="935"/>
       <point x="690" y="940"/>
-      <point x="655" y="940" type="curve" name="dv06" smooth="yes"/>
+      <point x="655" y="940" type="curve" smooth="yes" name="dv06"/>
       <point x="590" y="940"/>
       <point x="542" y="923"/>
       <point x="507" y="888" type="curve" smooth="yes"/>
       <point x="471" y="853"/>
       <point x="453" y="804"/>
-      <point x="453" y="741" type="curve" name="dh04" smooth="yes"/>
+      <point x="453" y="741" type="curve" smooth="yes" name="dh04"/>
       <point x="453" y="678"/>
       <point x="471" y="629"/>
       <point x="506" y="595" type="curve" smooth="yes"/>
       <point x="541" y="560"/>
       <point x="591" y="543"/>
-      <point x="658" y="543" type="curve" name="dv05" smooth="yes"/>
+      <point x="658" y="543" type="curve" smooth="yes" name="dv05"/>
       <point x="733" y="543"/>
       <point x="786" y="559"/>
       <point x="848" y="602" type="curve" name="ih02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/currency.glif b/source/Hack-BoldItalic.ufo/glyphs/currency.glif
index 22d66b8f0..6f3d9f77c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/currency.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/currency.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="currency" format="1">
+<glyph name="currency" format="2">
   <advance width="1233"/>
   <unicode hex="00A4"/>
   <outline>
@@ -8,13 +8,13 @@
       <point x="356" y="475" type="line"/>
       <point x="337" y="511"/>
       <point x="332" y="527"/>
-      <point x="323" y="559" type="curve" name="sh02" smooth="yes"/>
+      <point x="323" y="559" type="curve" smooth="yes" name="sh02"/>
       <point x="316" y="586"/>
       <point x="311" y="607"/>
-      <point x="311" y="642" type="curve" name="sh01" smooth="yes"/>
+      <point x="311" y="642" type="curve" smooth="yes" name="sh01"/>
       <point x="311" y="677"/>
       <point x="316" y="704"/>
-      <point x="323" y="729" type="curve" name="sh03" smooth="yes"/>
+      <point x="323" y="729" type="curve" smooth="yes" name="sh03"/>
       <point x="330" y="752"/>
       <point x="338" y="776"/>
       <point x="358" y="807" type="curve"/>
@@ -26,7 +26,7 @@
       <point x="566" y="972" type="curve" smooth="yes"/>
       <point x="594" y="979"/>
       <point x="623" y="983"/>
-      <point x="652" y="983" type="curve" name="dv04" smooth="yes"/>
+      <point x="652" y="983" type="curve" smooth="yes" name="dv04"/>
       <point x="708" y="983"/>
       <point x="756" y="968"/>
       <point x="819" y="938" type="curve" name="sh07"/>
@@ -35,13 +35,13 @@
       <point x="948" y="809" type="line"/>
       <point x="963" y="782"/>
       <point x="975" y="754"/>
-      <point x="982" y="727" type="curve" name="sh10" smooth="yes"/>
+      <point x="982" y="727" type="curve" smooth="yes" name="sh10"/>
       <point x="989" y="698"/>
       <point x="993" y="669"/>
-      <point x="993" y="641" type="curve" name="sh08" smooth="yes"/>
+      <point x="993" y="641" type="curve" smooth="yes" name="sh08"/>
       <point x="993" y="613"/>
       <point x="989" y="579"/>
-      <point x="982" y="554" type="curve" name="sh11" smooth="yes"/>
+      <point x="982" y="554" type="curve" smooth="yes" name="sh11"/>
       <point x="975" y="533"/>
       <point x="963" y="502"/>
       <point x="946" y="477" type="curve"/>
@@ -53,32 +53,32 @@
       <point x="741" y="313" type="curve" smooth="yes"/>
       <point x="716" y="306"/>
       <point x="689" y="301"/>
-      <point x="656" y="301" type="curve" name="dv01" smooth="yes"/>
+      <point x="656" y="301" type="curve" smooth="yes" name="dv01"/>
       <point x="598" y="301"/>
       <point x="546" y="315"/>
       <point x="485" y="344" type="curve" name="sh14"/>
       <point x="315" y="176" type="line" name="sh15"/>
     </contour>
     <contour>
-      <point x="654" y="467" type="curve" name="dv02" smooth="yes"/>
+      <point x="654" y="467" type="curve" smooth="yes" name="dv02"/>
       <point x="703" y="467"/>
       <point x="744" y="484"/>
       <point x="777" y="518" type="curve" smooth="yes"/>
       <point x="810" y="553"/>
       <point x="827" y="594"/>
-      <point x="827" y="642" type="curve" name="ah01" smooth="yes"/>
+      <point x="827" y="642" type="curve" smooth="yes" name="ah01"/>
       <point x="827" y="690"/>
       <point x="809" y="735"/>
       <point x="778" y="766" type="curve" smooth="yes"/>
       <point x="746" y="798"/>
       <point x="700" y="815"/>
-      <point x="653" y="815" type="curve" name="dv03" smooth="yes"/>
+      <point x="653" y="815" type="curve" smooth="yes" name="dv03"/>
       <point x="606" y="815"/>
       <point x="563" y="799"/>
       <point x="530" y="767" type="curve" smooth="yes"/>
       <point x="499" y="738"/>
       <point x="479" y="694"/>
-      <point x="479" y="643" type="curve" name="sh05" smooth="yes"/>
+      <point x="479" y="643" type="curve" smooth="yes" name="sh05"/>
       <point x="479" y="596"/>
       <point x="496" y="553"/>
       <point x="529" y="518" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/d.glif b/source/Hack-BoldItalic.ufo/glyphs/d.glif
index 63683e8d7..7f9ceddb2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/d.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/d.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="d" format="1">
+<glyph name="d" format="2">
   <advance width="1233"/>
   <unicode hex="0064"/>
   <outline>
@@ -17,7 +17,7 @@
       <point x="979" y="1556" type="line"/>
       <point x="1272" y="1556" type="line"/>
       <point x="969" y="0" type="line"/>
-      <point x="708" y="-0" type="line"/>
+      <point x="708" y="0" type="line"/>
       <point x="708" y="166" type="line"/>
       <point x="621.221" y="38.3219"/>
       <point x="508.328" y="-29"/>
@@ -41,9 +41,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/dagger.glif b/source/Hack-BoldItalic.ufo/glyphs/dagger.glif
index c7cac2dfb..489e7f6d5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/dagger.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/dagger.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dagger" format="1">
+<glyph name="dagger" format="2">
   <advance width="1233"/>
   <unicode hex="2020"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/daggerdbl.glif b/source/Hack-BoldItalic.ufo/glyphs/daggerdbl.glif
index 0fe2bad22..1329f67c5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/daggerdbl.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/daggerdbl.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="daggerdbl" format="1">
+<glyph name="daggerdbl" format="2">
   <advance width="1233"/>
   <unicode hex="2021"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/dcaron.glif b/source/Hack-BoldItalic.ufo/glyphs/dcaron.glif
index ff1bc52d1..271174ded 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/dcaron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/dcaron.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dcaron" format="1">
+<glyph name="dcaron" format="2">
   <advance width="1233"/>
   <unicode hex="010F"/>
   <outline>
     <contour>
-      <point x="382" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="382" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="187" y="-29"/>
       <point x="66" y="122"/>
-      <point x="66" y="393" type="curve" name="dh01" smooth="yes"/>
+      <point x="66" y="393" type="curve" smooth="yes" name="dh01"/>
       <point x="66" y="564"/>
       <point x="115" y="744"/>
       <point x="185" y="873" type="curve" smooth="yes"/>
       <point x="282" y="1054"/>
       <point x="423" y="1149"/>
-      <point x="579" y="1149" type="curve" name="dv02" smooth="yes"/>
+      <point x="579" y="1149" type="curve" smooth="yes" name="dv02"/>
       <point x="733" y="1149"/>
       <point x="835" y="1054"/>
       <point x="854" y="911" type="curve" name="iv01"/>
@@ -32,16 +32,16 @@
       <point x="1200" y="1180" type="line"/>
     </contour>
     <contour>
-      <point x="513" y="211" type="curve" name="sv01" smooth="yes"/>
+      <point x="513" y="211" type="curve" smooth="yes" name="sv01"/>
       <point x="681" y="211"/>
       <point x="799" y="445"/>
-      <point x="799" y="667" type="curve" name="sh02" smooth="yes"/>
+      <point x="799" y="667" type="curve" smooth="yes" name="sh02"/>
       <point x="799" y="831"/>
       <point x="734" y="909"/>
-      <point x="639" y="909" type="curve" name="dv01" smooth="yes"/>
+      <point x="639" y="909" type="curve" smooth="yes" name="dv01"/>
       <point x="471" y="909"/>
       <point x="362" y="663"/>
-      <point x="362" y="443" type="curve" name="dh02" smooth="yes"/>
+      <point x="362" y="443" type="curve" smooth="yes" name="dh02"/>
       <point x="362" y="282"/>
       <point x="421" y="211"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/dcroat.glif b/source/Hack-BoldItalic.ufo/glyphs/dcroat.glif
index a0a244dc8..b3fc54da2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/dcroat.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/dcroat.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dcroat" format="1">
+<glyph name="dcroat" format="2">
   <advance width="1233"/>
   <unicode hex="0111"/>
   <outline>
     <contour>
-      <point x="382" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="382" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="286" y="-29"/>
       <point x="209" y="8"/>
       <point x="152" y="81" type="curve" smooth="yes"/>
       <point x="95" y="154"/>
       <point x="66" y="251"/>
-      <point x="66" y="386" type="curve" name="dh01" smooth="yes"/>
+      <point x="66" y="386" type="curve" smooth="yes" name="dh01"/>
       <point x="66" y="543"/>
       <point x="114" y="742"/>
       <point x="184" y="874" type="curve" smooth="yes"/>
@@ -19,7 +19,7 @@
       <point x="358" y="1076" type="curve" smooth="yes"/>
       <point x="427" y="1125"/>
       <point x="502" y="1149"/>
-      <point x="581" y="1149" type="curve" name="dv04" smooth="yes"/>
+      <point x="581" y="1149" type="curve" smooth="yes" name="dv04"/>
       <point x="655" y="1149"/>
       <point x="717" y="1128"/>
       <point x="766" y="1086" type="curve" smooth="yes"/>
@@ -55,13 +55,13 @@
       <point x="754" y="850" type="curve" smooth="yes"/>
       <point x="724" y="889"/>
       <point x="684" y="909"/>
-      <point x="634" y="909" type="curve" name="dv03" smooth="yes"/>
+      <point x="634" y="909" type="curve" smooth="yes" name="dv03"/>
       <point x="559" y="909"/>
       <point x="495" y="862"/>
       <point x="442" y="768" type="curve" smooth="yes"/>
       <point x="389" y="672"/>
       <point x="362" y="553"/>
-      <point x="362" y="436" type="curve" name="dh02" smooth="yes"/>
+      <point x="362" y="436" type="curve" smooth="yes" name="dh02"/>
       <point x="362" y="351"/>
       <point x="376" y="304"/>
       <point x="404" y="267" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/degree.glif b/source/Hack-BoldItalic.ufo/glyphs/degree.glif
index 821d51768..f0eb13f69 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/degree.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/degree.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="degree" format="1">
+<glyph name="degree" format="2">
   <advance width="1233"/>
   <unicode hex="00B0"/>
   <outline>
     <contour>
-      <point x="613" y="854" type="curve" name="hr00" smooth="yes"/>
+      <point x="613" y="854" type="curve" smooth="yes" name="hr00"/>
       <point x="518" y="854"/>
       <point x="437" y="889"/>
       <point x="378" y="948" type="curve" smooth="yes"/>
       <point x="315" y="1011"/>
       <point x="283" y="1093"/>
-      <point x="283" y="1185" type="curve" name="sh01" smooth="yes"/>
+      <point x="283" y="1185" type="curve" smooth="yes" name="sh01"/>
       <point x="283" y="1373"/>
       <point x="428" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="661" y="1520"/>
       <point x="704" y="1512"/>
       <point x="744" y="1495" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="924" y="1313" type="curve" smooth="yes"/>
       <point x="940" y="1274"/>
       <point x="948" y="1232"/>
-      <point x="948" y="1188" type="curve" name="sh02" smooth="yes"/>
+      <point x="948" y="1188" type="curve" smooth="yes" name="sh02"/>
       <point x="948" y="1142"/>
       <point x="940" y="1099"/>
       <point x="923" y="1059" type="curve" smooth="yes"/>
@@ -36,19 +36,19 @@
       <point x="660" y="854"/>
     </contour>
     <contour>
-      <point x="614" y="1016" type="curve" name="dv01" smooth="yes"/>
+      <point x="614" y="1016" type="curve" smooth="yes" name="dv01"/>
       <point x="710" y="1016"/>
       <point x="786" y="1092"/>
-      <point x="786" y="1187" type="curve" name="ah01" smooth="yes"/>
+      <point x="786" y="1187" type="curve" smooth="yes" name="ah01"/>
       <point x="786" y="1235"/>
       <point x="770" y="1275"/>
       <point x="737" y="1308" type="curve" smooth="yes"/>
       <point x="704" y="1341"/>
       <point x="663" y="1358"/>
-      <point x="616" y="1358" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1358" type="curve" smooth="yes" name="sv01"/>
       <point x="520" y="1358"/>
       <point x="444" y="1282"/>
-      <point x="444" y="1185" type="curve" name="sh03" smooth="yes"/>
+      <point x="444" y="1185" type="curve" smooth="yes" name="sh03"/>
       <point x="444" y="1090"/>
       <point x="518" y="1016"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/delta.glif b/source/Hack-BoldItalic.ufo/glyphs/delta.glif
index defa7afcc..00788669f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/delta.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/delta.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="delta" format="1">
+<glyph name="delta" format="2">
   <advance width="1233"/>
   <unicode hex="03B4"/>
   <outline>
     <contour>
-      <point x="491" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="491" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="225" y="-29"/>
       <point x="70" y="133"/>
-      <point x="70" y="397" type="curve" name="dh01" smooth="yes"/>
+      <point x="70" y="397" type="curve" smooth="yes" name="dh01"/>
       <point x="70" y="449"/>
       <point x="76" y="502"/>
       <point x="87" y="559" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="414" y="1065" type="curve" name="ih02"/>
       <point x="339" y="1100"/>
       <point x="306" y="1162"/>
-      <point x="306" y="1233" type="curve" name="ih01" smooth="yes"/>
+      <point x="306" y="1233" type="curve" smooth="yes" name="ih01"/>
       <point x="306" y="1323"/>
       <point x="362" y="1427"/>
       <point x="478" y="1492" type="curve" smooth="yes"/>
       <point x="566" y="1541"/>
       <point x="690" y="1569"/>
-      <point x="847" y="1569" type="curve" name="at01" smooth="yes"/>
+      <point x="847" y="1569" type="curve" smooth="yes" name="at01"/>
       <point x="907" y="1569"/>
       <point x="967" y="1565"/>
       <point x="1023" y="1557" type="curve" name="at02"/>
@@ -41,20 +41,20 @@
       <point x="1112" y="1314" type="curve"/>
       <point x="992" y="1351"/>
       <point x="944" y="1367"/>
-      <point x="833" y="1367" type="curve" name="sv02" smooth="yes"/>
+      <point x="833" y="1367" type="curve" smooth="yes" name="sv02"/>
       <point x="752" y="1367"/>
       <point x="700" y="1360"/>
       <point x="649" y="1333" type="curve"/>
       <point x="625" y="1318" type="line" smooth="yes"/>
       <point x="591" y="1297"/>
       <point x="574" y="1267"/>
-      <point x="574" y="1230" type="curve" name="sh01" smooth="yes"/>
+      <point x="574" y="1230" type="curve" smooth="yes" name="sh01"/>
       <point x="574" y="1154"/>
       <point x="653" y="1150"/>
-      <point x="719" y="1147" type="curve" name="at04" smooth="yes"/>
+      <point x="719" y="1147" type="curve" smooth="yes" name="at04"/>
       <point x="1010" y="1134"/>
       <point x="1141" y="979"/>
-      <point x="1141" y="724" type="curve" name="dh04" smooth="yes"/>
+      <point x="1141" y="724" type="curve" smooth="yes" name="dh04"/>
       <point x="1141" y="668"/>
       <point x="1135" y="617"/>
       <point x="1124" y="558" type="curve"/>
@@ -62,22 +62,22 @@
       <point x="805" y="-29"/>
     </contour>
     <contour>
-      <point x="538" y="209" type="curve" name="dv02" smooth="yes"/>
+      <point x="538" y="209" type="curve" smooth="yes" name="dv02"/>
       <point x="678" y="209"/>
       <point x="788" y="338"/>
       <point x="831" y="559" type="curve" smooth="yes"/>
       <point x="840" y="606"/>
       <point x="845" y="648"/>
-      <point x="845" y="688" type="curve" name="dh03" smooth="yes"/>
+      <point x="845" y="688" type="curve" smooth="yes" name="dh03"/>
       <point x="845" y="829"/>
       <point x="785" y="909"/>
-      <point x="673" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="673" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="533" y="909"/>
       <point x="423" y="778"/>
       <point x="380" y="559" type="curve" smooth="yes"/>
       <point x="371" y="512"/>
       <point x="366" y="470"/>
-      <point x="366" y="430" type="curve" name="dh02" smooth="yes"/>
+      <point x="366" y="430" type="curve" smooth="yes" name="dh02"/>
       <point x="366" y="289"/>
       <point x="426" y="209"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/dieresis.glif b/source/Hack-BoldItalic.ufo/glyphs/dieresis.glif
index a85b4ddc7..6cb2c8d8a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/dieresis.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/dieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dieresis" format="1">
+<glyph name="dieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00A8"/>
   <outline>
     <contour>
-      <point x="449" y="1339" type="line" name="hr00" smooth="yes"/>
+      <point x="449" y="1339" type="line" smooth="yes" name="hr00"/>
       <point x="429" y="1339"/>
       <point x="418" y="1352"/>
       <point x="422" y="1372" type="curve" smooth="yes"/>
       <point x="458" y="1558" type="line"/>
       <point x="461" y="1576"/>
       <point x="471" y="1585"/>
-      <point x="490" y="1585" type="curve" name="dv01" smooth="yes"/>
+      <point x="490" y="1585" type="curve" smooth="yes" name="dv01"/>
       <point x="667" y="1585" type="line" smooth="yes"/>
       <point x="685" y="1585"/>
       <point x="694" y="1577"/>
@@ -25,14 +25,14 @@
       <point x="624" y="1339" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="844" y="1339" type="line" name="sv01" smooth="yes"/>
+      <point x="844" y="1339" type="line" smooth="yes" name="sv01"/>
       <point x="824" y="1339"/>
       <point x="813" y="1352"/>
       <point x="817" y="1372" type="curve" smooth="yes"/>
       <point x="853" y="1558" type="line"/>
       <point x="856" y="1576"/>
       <point x="866" y="1585"/>
-      <point x="885" y="1585" type="curve" name="sv02" smooth="yes"/>
+      <point x="885" y="1585" type="curve" smooth="yes" name="sv02"/>
       <point x="1063" y="1585" type="line" smooth="yes"/>
       <point x="1081" y="1585"/>
       <point x="1090" y="1577"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/dieresistonos.glif b/source/Hack-BoldItalic.ufo/glyphs/dieresistonos.glif
index b36e08ae5..b256daba9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/dieresistonos.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/dieresistonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dieresistonos" format="1">
+<glyph name="dieresistonos" format="2">
   <advance width="1233"/>
   <unicode hex="0385"/>
   <outline>
@@ -10,14 +10,14 @@
       <point x="641" y="1570" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="379" y="1339" type="line" name="dv01" smooth="yes"/>
+      <point x="379" y="1339" type="line" smooth="yes" name="dv01"/>
       <point x="359" y="1339"/>
       <point x="348" y="1352"/>
       <point x="352" y="1372" type="curve" smooth="yes"/>
       <point x="388" y="1558" type="line"/>
       <point x="391" y="1576"/>
       <point x="401" y="1585"/>
-      <point x="420" y="1585" type="curve" name="dv02" smooth="yes"/>
+      <point x="420" y="1585" type="curve" smooth="yes" name="dv02"/>
       <point x="597" y="1585" type="line" smooth="yes"/>
       <point x="618" y="1585"/>
       <point x="627" y="1572"/>
@@ -28,14 +28,14 @@
       <point x="554" y="1339" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="874" y="1339" type="line" name="sv01" smooth="yes"/>
+      <point x="874" y="1339" type="line" smooth="yes" name="sv01"/>
       <point x="854" y="1339"/>
       <point x="843" y="1352"/>
       <point x="847" y="1372" type="curve" smooth="yes"/>
       <point x="883" y="1558" type="line"/>
       <point x="886" y="1576"/>
       <point x="896" y="1585"/>
-      <point x="915" y="1585" type="curve" name="sv02" smooth="yes"/>
+      <point x="915" y="1585" type="curve" smooth="yes" name="sv02"/>
       <point x="1093" y="1585" type="line" smooth="yes"/>
       <point x="1114" y="1585"/>
       <point x="1123" y="1572"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/divide.glif b/source/Hack-BoldItalic.ufo/glyphs/divide.glif
index eee9b9157..5a5696476 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/divide.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/divide.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="divide" format="1">
+<glyph name="divide" format="2">
   <advance width="1233"/>
   <unicode hex="00F7"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/dkshade.glif b/source/Hack-BoldItalic.ufo/glyphs/dkshade.glif
index 4107a505a..8a2848824 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/dkshade.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/dkshade.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dkshade" format="1">
+<glyph name="dkshade" format="2">
   <advance width="1233"/>
   <unicode hex="2593"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/dnblock.glif b/source/Hack-BoldItalic.ufo/glyphs/dnblock.glif
index d5c91abc5..ae024e4f7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/dnblock.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/dnblock.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dnblock" format="1">
+<glyph name="dnblock" format="2">
   <advance width="1233"/>
   <unicode hex="2584"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/dollar.glif b/source/Hack-BoldItalic.ufo/glyphs/dollar.glif
index c6358c2b0..c0de02fa7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/dollar.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/dollar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dollar" format="1">
+<glyph name="dollar" format="2">
   <advance width="1233"/>
   <unicode hex="0024"/>
   <outline>
@@ -24,7 +24,7 @@
       <point x="277" y="691" type="curve" smooth="yes"/>
       <point x="225" y="747"/>
       <point x="199" y="812"/>
-      <point x="199" y="900" type="curve" name="sh01" smooth="yes"/>
+      <point x="199" y="900" type="curve" smooth="yes" name="sh01"/>
       <point x="199" y="1013"/>
       <point x="242" y="1113"/>
       <point x="327" y="1193" type="curve" smooth="yes"/>
@@ -53,7 +53,7 @@
       <point x="947" y="652" type="curve" smooth="yes"/>
       <point x="1002" y="596"/>
       <point x="1028" y="527"/>
-      <point x="1028" y="435" type="curve" name="sh02" smooth="yes"/>
+      <point x="1028" y="435" type="curve" smooth="yes" name="sh02"/>
       <point x="1028" y="316"/>
       <point x="985" y="215"/>
       <point x="897" y="135" type="curve" smooth="yes"/>
@@ -70,7 +70,7 @@
       <point x="501" y="1045" type="curve" smooth="yes"/>
       <point x="472" y="1013"/>
       <point x="459" y="975"/>
-      <point x="459" y="935" type="curve" name="sh05" smooth="yes"/>
+      <point x="459" y="935" type="curve" smooth="yes" name="sh05"/>
       <point x="459" y="902"/>
       <point x="468" y="881"/>
       <point x="485" y="862" type="curve" smooth="yes"/>
@@ -85,7 +85,7 @@
       <point x="719" y="286" type="curve" smooth="yes"/>
       <point x="750" y="317"/>
       <point x="768" y="352"/>
-      <point x="768" y="401" type="curve" name="ah01" smooth="yes"/>
+      <point x="768" y="401" type="curve" smooth="yes" name="ah01"/>
       <point x="768" y="436"/>
       <point x="759" y="463"/>
       <point x="740" y="484" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/dong.glif b/source/Hack-BoldItalic.ufo/glyphs/dong.glif
index c57379dc4..7da6c7e3a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/dong.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/dong.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dong" format="1">
+<glyph name="dong" format="2">
   <advance width="1233"/>
   <unicode hex="20AB"/>
   <outline>
     <contour>
-      <point x="685" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="685" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="490" y="-29"/>
       <point x="369" y="122"/>
-      <point x="369" y="393" type="curve" name="dh01" smooth="yes"/>
+      <point x="369" y="393" type="curve" smooth="yes" name="dh01"/>
       <point x="369" y="564"/>
       <point x="418" y="744"/>
       <point x="488" y="873" type="curve" smooth="yes"/>
       <point x="585" y="1054"/>
       <point x="726" y="1149"/>
-      <point x="882" y="1149" type="curve" name="dv04" smooth="yes"/>
+      <point x="882" y="1149" type="curve" smooth="yes" name="dv04"/>
       <point x="1036" y="1149"/>
       <point x="1138" y="1054"/>
       <point x="1157" y="911" type="curve"/>
@@ -34,16 +34,16 @@
       <point x="814" y="-29"/>
     </contour>
     <contour>
-      <point x="816" y="211" type="curve" name="sv01" smooth="yes"/>
+      <point x="816" y="211" type="curve" smooth="yes" name="sv01"/>
       <point x="984" y="211"/>
       <point x="1102" y="445"/>
-      <point x="1102" y="667" type="curve" name="hr03" smooth="yes"/>
+      <point x="1102" y="667" type="curve" smooth="yes" name="hr03"/>
       <point x="1102" y="831"/>
       <point x="1037" y="909"/>
-      <point x="942" y="909" type="curve" name="dv03" smooth="yes"/>
+      <point x="942" y="909" type="curve" smooth="yes" name="dv03"/>
       <point x="774" y="909"/>
       <point x="665" y="663"/>
-      <point x="665" y="443" type="curve" name="dh02" smooth="yes"/>
+      <point x="665" y="443" type="curve" smooth="yes" name="dh02"/>
       <point x="665" y="282"/>
       <point x="724" y="211"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/dotaccent.glif b/source/Hack-BoldItalic.ufo/glyphs/dotaccent.glif
index ce9e462db..e41907226 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/dotaccent.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/dotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dotaccent" format="1">
+<glyph name="dotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="02D9"/>
   <outline>
     <contour>
-      <point x="627" y="1339" type="line" name="hr00" smooth="yes"/>
+      <point x="627" y="1339" type="line" smooth="yes" name="hr00"/>
       <point x="609" y="1339"/>
       <point x="600" y="1347"/>
       <point x="600" y="1363" type="curve" smooth="yes"/>
@@ -14,7 +14,7 @@
       <point x="638" y="1558" type="line"/>
       <point x="641" y="1576"/>
       <point x="651" y="1585"/>
-      <point x="670" y="1585" type="curve" name="dv01" smooth="yes"/>
+      <point x="670" y="1585" type="curve" smooth="yes" name="dv01"/>
       <point x="882" y="1585" type="line" smooth="yes"/>
       <point x="902" y="1585"/>
       <point x="913" y="1572"/>
@@ -22,7 +22,7 @@
       <point x="873" y="1366" type="line" smooth="yes"/>
       <point x="870" y="1348"/>
       <point x="859" y="1339"/>
-      <point x="841" y="1339" type="curve" name="sv01" smooth="yes"/>
+      <point x="841" y="1339" type="curve" smooth="yes" name="sv01"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/dotbelowcomb.glif b/source/Hack-BoldItalic.ufo/glyphs/dotbelowcomb.glif
index 65eb27308..1df618641 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/dotbelowcomb.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/dotbelowcomb.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dotbelowcomb" format="1">
-  <advance width="0"/>
+<glyph name="dotbelowcomb" format="2">
   <unicode hex="0323"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/dotlessi.glif b/source/Hack-BoldItalic.ufo/glyphs/dotlessi.glif
index 9956d5c6a..06d6541f7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/dotlessi.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/dotlessi.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dotlessi" format="1">
+<glyph name="dotlessi" format="2">
   <advance width="1233"/>
   <unicode hex="0131"/>
   <outline>
     <contour>
-      <point x="732" y="-8" type="line" name="hr00" smooth="yes"/>
+      <point x="732" y="-8" type="line" smooth="yes" name="hr00"/>
       <point x="589" y="-8"/>
       <point x="499" y="10"/>
       <point x="442" y="49" type="curve" smooth="yes"/>
@@ -33,7 +33,7 @@
       <point x="687" y="236" type="curve" smooth="yes"/>
       <point x="708" y="223"/>
       <point x="744" y="217"/>
-      <point x="796" y="217" type="curve" name="sv02" smooth="yes"/>
+      <point x="796" y="217" type="curve" smooth="yes" name="sv02"/>
       <point x="1074" y="217" type="line" name="sv03"/>
       <point x="1029" y="-8" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/dotmath.glif b/source/Hack-BoldItalic.ufo/glyphs/dotmath.glif
index c97d119dd..e7395b48c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/dotmath.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/dotmath.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dotmath" format="1">
+<glyph name="dotmath" format="2">
   <advance width="1233"/>
   <unicode hex="22C5"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/e.glif b/source/Hack-BoldItalic.ufo/glyphs/e.glif
index b9101b17d..ee54dae87 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/e.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/e.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="e" format="1">
+<glyph name="e" format="2">
   <advance width="1233"/>
   <unicode hex="0065"/>
   <outline>
@@ -49,9 +49,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/eacute.glif b/source/Hack-BoldItalic.ufo/glyphs/eacute.glif
index 2d8a8b18f..b37923ca9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/eacute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/eacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eacute" format="1">
+<glyph name="eacute" format="2">
   <advance width="1233"/>
   <unicode hex="00E9"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="549" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="583" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="583" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="416" y="-29"/>
       <point x="290" y="10"/>
       <point x="205" y="89" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="444" y="1095" type="curve" smooth="yes"/>
       <point x="516" y="1130"/>
       <point x="599" y="1149"/>
-      <point x="694" y="1149" type="curve" name="dv06" smooth="yes"/>
+      <point x="694" y="1149" type="curve" smooth="yes" name="dv06"/>
       <point x="830" y="1149"/>
       <point x="947" y="1109"/>
       <point x="1030" y="1029" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="429" y="254" type="curve" smooth="yes"/>
       <point x="474" y="220"/>
       <point x="540" y="203"/>
-      <point x="629" y="203" type="curve" name="dv02" smooth="yes"/>
+      <point x="629" y="203" type="curve" smooth="yes" name="dv02"/>
       <point x="698" y="203"/>
       <point x="771" y="213"/>
       <point x="843" y="234" type="curve" smooth="yes"/>
@@ -78,7 +78,7 @@
       <point x="832" y="871" type="curve" smooth="yes"/>
       <point x="799" y="904"/>
       <point x="752" y="920"/>
-      <point x="692" y="920" type="curve" name="dv05" smooth="yes"/>
+      <point x="692" y="920" type="curve" smooth="yes" name="dv05"/>
       <point x="559" y="920"/>
       <point x="463" y="841"/>
       <point x="410" y="684" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ebreve.glif b/source/Hack-BoldItalic.ufo/glyphs/ebreve.glif
index 9cb64c3ad..d4a78167e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ebreve.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ebreve.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ebreve" format="1">
+<glyph name="ebreve" format="2">
   <advance width="1233"/>
   <unicode hex="0115"/>
   <outline>
     <contour>
-      <point x="583" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="583" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="416" y="-29"/>
       <point x="290" y="10"/>
       <point x="205" y="89" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="444" y="1095" type="curve" smooth="yes"/>
       <point x="521" y="1131"/>
       <point x="604" y="1149"/>
-      <point x="694" y="1149" type="curve" name="dv03" smooth="yes"/>
+      <point x="694" y="1149" type="curve" smooth="yes" name="dv03"/>
       <point x="830" y="1149"/>
       <point x="947" y="1109"/>
       <point x="1030" y="1029" type="curve" smooth="yes"/>
@@ -45,7 +45,7 @@
       <point x="429" y="254" type="curve" smooth="yes"/>
       <point x="474" y="220"/>
       <point x="540" y="203"/>
-      <point x="629" y="203" type="curve" name="dv01" smooth="yes"/>
+      <point x="629" y="203" type="curve" smooth="yes" name="dv01"/>
       <point x="698" y="203"/>
       <point x="771" y="213"/>
       <point x="843" y="234" type="curve" smooth="yes"/>
@@ -72,13 +72,13 @@
       <point x="832" y="871" type="curve" smooth="yes"/>
       <point x="799" y="904"/>
       <point x="752" y="920"/>
-      <point x="692" y="920" type="curve" name="dv02" smooth="yes"/>
+      <point x="692" y="920" type="curve" smooth="yes" name="dv02"/>
       <point x="559" y="920"/>
       <point x="463" y="841"/>
       <point x="410" y="684" type="curve"/>
     </contour>
     <contour>
-      <point x="749" y="1301" type="curve" name="dv01" smooth="yes"/>
+      <point x="749" y="1301" type="curve" smooth="yes" name="dv01"/>
       <point x="652" y="1301"/>
       <point x="579" y="1323"/>
       <point x="530" y="1367" type="curve" smooth="yes"/>
@@ -93,7 +93,7 @@
       <point x="644" y="1488" type="curve" smooth="yes"/>
       <point x="673" y="1464"/>
       <point x="713" y="1452"/>
-      <point x="764" y="1452" type="curve" name="dv02" smooth="yes"/>
+      <point x="764" y="1452" type="curve" smooth="yes" name="dv02"/>
       <point x="818" y="1452"/>
       <point x="865" y="1465"/>
       <point x="904" y="1491" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ecaron.glif b/source/Hack-BoldItalic.ufo/glyphs/ecaron.glif
index 13b9b17bc..3113250be 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ecaron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ecaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ecaron" format="1">
+<glyph name="ecaron" format="2">
   <advance width="1233"/>
   <unicode hex="011B"/>
   <outline>
@@ -13,19 +13,19 @@
       <point x="592" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="586" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="586" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="249" y="-29"/>
       <point x="76" y="127"/>
-      <point x="76" y="440" type="curve" name="sh01" smooth="yes"/>
+      <point x="76" y="440" type="curve" smooth="yes" name="sh01"/>
       <point x="76" y="621"/>
       <point x="135" y="805"/>
       <point x="244" y="938" type="curve" smooth="yes"/>
       <point x="357" y="1075"/>
       <point x="513" y="1149"/>
-      <point x="696" y="1149" type="curve" name="dv05" smooth="yes"/>
+      <point x="696" y="1149" type="curve" smooth="yes" name="dv05"/>
       <point x="972" y="1149"/>
       <point x="1155" y="975"/>
-      <point x="1155" y="708" type="curve" name="sh02" smooth="yes"/>
+      <point x="1155" y="708" type="curve" smooth="yes" name="sh02"/>
       <point x="1155" y="652"/>
       <point x="1147" y="577"/>
       <point x="1128" y="465" type="curve" name="dv03"/>
@@ -35,7 +35,7 @@
       <point x="362" y="403" type="curve" name="sh04"/>
       <point x="362" y="270"/>
       <point x="451" y="203"/>
-      <point x="630" y="203" type="curve" name="dv02" smooth="yes"/>
+      <point x="630" y="203" type="curve" smooth="yes" name="dv02"/>
       <point x="771" y="203"/>
       <point x="919" y="244"/>
       <point x="1044" y="324" type="curve" name="ih01"/>
@@ -47,10 +47,10 @@
       <point x="876" y="684" type="line" name="sh06"/>
       <point x="881" y="702"/>
       <point x="883" y="720"/>
-      <point x="883" y="739" type="curve" name="ah01" smooth="yes"/>
+      <point x="883" y="739" type="curve" smooth="yes" name="ah01"/>
       <point x="883" y="851"/>
       <point x="812" y="920"/>
-      <point x="689" y="920" type="curve" name="dv04" smooth="yes"/>
+      <point x="689" y="920" type="curve" smooth="yes" name="dv04"/>
       <point x="560" y="920"/>
       <point x="463" y="841"/>
       <point x="410" y="684" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ecircumflex.glif b/source/Hack-BoldItalic.ufo/glyphs/ecircumflex.glif
index 53c0cff1f..2ff4427bd 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ecircumflex.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ecircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ecircumflex" format="1">
+<glyph name="ecircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00EA"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="336" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="583" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="583" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="416" y="-29"/>
       <point x="290" y="10"/>
       <point x="205" y="89" type="curve" smooth="yes"/>
@@ -31,7 +31,7 @@
       <point x="444" y="1095" type="curve" smooth="yes"/>
       <point x="516" y="1130"/>
       <point x="599" y="1149"/>
-      <point x="694" y="1149" type="curve" name="dv06" smooth="yes"/>
+      <point x="694" y="1149" type="curve" smooth="yes" name="dv06"/>
       <point x="830" y="1149"/>
       <point x="947" y="1109"/>
       <point x="1030" y="1029" type="curve" smooth="yes"/>
@@ -54,7 +54,7 @@
       <point x="429" y="254" type="curve" smooth="yes"/>
       <point x="474" y="220"/>
       <point x="540" y="203"/>
-      <point x="629" y="203" type="curve" name="dv02" smooth="yes"/>
+      <point x="629" y="203" type="curve" smooth="yes" name="dv02"/>
       <point x="698" y="203"/>
       <point x="771" y="213"/>
       <point x="843" y="234" type="curve" smooth="yes"/>
@@ -81,7 +81,7 @@
       <point x="832" y="871" type="curve" smooth="yes"/>
       <point x="799" y="904"/>
       <point x="752" y="920"/>
-      <point x="692" y="920" type="curve" name="dv05" smooth="yes"/>
+      <point x="692" y="920" type="curve" smooth="yes" name="dv05"/>
       <point x="559" y="920"/>
       <point x="463" y="841"/>
       <point x="410" y="684" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/edieresis.glif b/source/Hack-BoldItalic.ufo/glyphs/edieresis.glif
index 554a42a8a..3d7dcc60d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/edieresis.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/edieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="edieresis" format="1">
+<glyph name="edieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00EB"/>
   <outline>
     <contour>
-      <point x="439" y="1347" type="line" name="hr00" smooth="yes"/>
+      <point x="439" y="1347" type="line" smooth="yes" name="hr00"/>
       <point x="419" y="1347"/>
       <point x="408" y="1360"/>
       <point x="412" y="1380" type="curve" smooth="yes"/>
       <point x="448" y="1566" type="line"/>
       <point x="451" y="1584"/>
       <point x="461" y="1593"/>
-      <point x="480" y="1593" type="curve" name="dv03" smooth="yes"/>
+      <point x="480" y="1593" type="curve" smooth="yes" name="dv03"/>
       <point x="657" y="1593" type="line" smooth="yes"/>
       <point x="675" y="1593"/>
       <point x="684" y="1584"/>
@@ -25,14 +25,14 @@
       <point x="614" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="834" y="1347" type="line" name="sv01" smooth="yes"/>
+      <point x="834" y="1347" type="line" smooth="yes" name="sv01"/>
       <point x="814" y="1347"/>
       <point x="803" y="1360"/>
       <point x="807" y="1380" type="curve" smooth="yes"/>
       <point x="843" y="1566" type="line"/>
       <point x="846" y="1584"/>
       <point x="856" y="1593"/>
-      <point x="875" y="1593" type="curve" name="sv02" smooth="yes"/>
+      <point x="875" y="1593" type="curve" smooth="yes" name="sv02"/>
       <point x="1053" y="1593" type="line" smooth="yes"/>
       <point x="1071" y="1593"/>
       <point x="1080" y="1584"/>
@@ -46,7 +46,7 @@
       <point x="1010" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="583" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="583" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="416" y="-29"/>
       <point x="290" y="10"/>
       <point x="205" y="89" type="curve" smooth="yes"/>
@@ -64,7 +64,7 @@
       <point x="444" y="1095" type="curve" smooth="yes"/>
       <point x="516" y="1130"/>
       <point x="599" y="1149"/>
-      <point x="694" y="1149" type="curve" name="dv07" smooth="yes"/>
+      <point x="694" y="1149" type="curve" smooth="yes" name="dv07"/>
       <point x="830" y="1149"/>
       <point x="947" y="1109"/>
       <point x="1030" y="1029" type="curve" smooth="yes"/>
@@ -87,7 +87,7 @@
       <point x="429" y="254" type="curve" smooth="yes"/>
       <point x="474" y="220"/>
       <point x="540" y="203"/>
-      <point x="629" y="203" type="curve" name="dv02" smooth="yes"/>
+      <point x="629" y="203" type="curve" smooth="yes" name="dv02"/>
       <point x="698" y="203"/>
       <point x="771" y="213"/>
       <point x="843" y="234" type="curve" smooth="yes"/>
@@ -114,7 +114,7 @@
       <point x="832" y="871" type="curve" smooth="yes"/>
       <point x="799" y="904"/>
       <point x="752" y="920"/>
-      <point x="692" y="920" type="curve" name="dv06" smooth="yes"/>
+      <point x="692" y="920" type="curve" smooth="yes" name="dv06"/>
       <point x="559" y="920"/>
       <point x="463" y="841"/>
       <point x="410" y="684" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/edotaccent.glif b/source/Hack-BoldItalic.ufo/glyphs/edotaccent.glif
index 78fb5b005..59b67fd76 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/edotaccent.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/edotaccent.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="edotaccent" format="1">
+<glyph name="edotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="0117"/>
   <outline>
     <contour>
-      <point x="636" y="1349" type="line" name="hr00" smooth="yes"/>
+      <point x="636" y="1349" type="line" smooth="yes" name="hr00"/>
       <point x="615" y="1349"/>
       <point x="606" y="1362"/>
       <point x="610" y="1382" type="curve" smooth="yes"/>
       <point x="647" y="1568" type="line"/>
       <point x="650" y="1586"/>
       <point x="660" y="1595"/>
-      <point x="679" y="1595" type="curve" name="dv03" smooth="yes"/>
-      <point x="891" y="1595" type="line" name="sh01" smooth="yes"/>
+      <point x="679" y="1595" type="curve" smooth="yes" name="dv03"/>
+      <point x="891" y="1595" type="line" smooth="yes" name="sh01"/>
       <point x="911" y="1595"/>
       <point x="922" y="1582"/>
       <point x="918" y="1562" type="curve" smooth="yes"/>
-      <point x="882" y="1376" type="line" name="sh02" smooth="yes"/>
+      <point x="882" y="1376" type="line" smooth="yes" name="sh02"/>
       <point x="879" y="1358"/>
       <point x="868" y="1349"/>
       <point x="850" y="1349" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="586" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="586" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="249" y="-29"/>
       <point x="76" y="127"/>
-      <point x="76" y="440" type="curve" name="sh03" smooth="yes"/>
+      <point x="76" y="440" type="curve" smooth="yes" name="sh03"/>
       <point x="76" y="621"/>
       <point x="135" y="805"/>
       <point x="244" y="938" type="curve" smooth="yes"/>
       <point x="357" y="1075"/>
       <point x="513" y="1149"/>
-      <point x="696" y="1149" type="curve" name="dv06" smooth="yes"/>
+      <point x="696" y="1149" type="curve" smooth="yes" name="dv06"/>
       <point x="972" y="1149"/>
       <point x="1155" y="975"/>
-      <point x="1155" y="708" type="curve" name="sh04" smooth="yes"/>
+      <point x="1155" y="708" type="curve" smooth="yes" name="sh04"/>
       <point x="1155" y="652"/>
       <point x="1147" y="577"/>
       <point x="1128" y="465" type="curve" name="dv04"/>
@@ -44,7 +44,7 @@
       <point x="362" y="403" type="curve" name="sh05"/>
       <point x="362" y="270"/>
       <point x="451" y="203"/>
-      <point x="630" y="203" type="curve" name="dv02" smooth="yes"/>
+      <point x="630" y="203" type="curve" smooth="yes" name="dv02"/>
       <point x="771" y="203"/>
       <point x="919" y="244"/>
       <point x="1044" y="324" type="curve" name="ih01"/>
@@ -56,10 +56,10 @@
       <point x="876" y="684" type="line" name="sh07"/>
       <point x="881" y="702"/>
       <point x="883" y="720"/>
-      <point x="883" y="739" type="curve" name="ah01" smooth="yes"/>
+      <point x="883" y="739" type="curve" smooth="yes" name="ah01"/>
       <point x="883" y="851"/>
       <point x="812" y="920"/>
-      <point x="689" y="920" type="curve" name="dv05" smooth="yes"/>
+      <point x="689" y="920" type="curve" smooth="yes" name="dv05"/>
       <point x="560" y="920"/>
       <point x="463" y="841"/>
       <point x="410" y="684" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/egrave.glif b/source/Hack-BoldItalic.ufo/glyphs/egrave.glif
index 179efcfec..c12fe0359 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/egrave.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/egrave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="egrave" format="1">
+<glyph name="egrave" format="2">
   <advance width="1233"/>
   <unicode hex="00E8"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="686" y="1298" type="line"/>
     </contour>
     <contour>
-      <point x="583" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="583" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="416" y="-29"/>
       <point x="290" y="10"/>
       <point x="205" y="89" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="444" y="1095" type="curve" smooth="yes"/>
       <point x="516" y="1130"/>
       <point x="599" y="1149"/>
-      <point x="694" y="1149" type="curve" name="dv06" smooth="yes"/>
+      <point x="694" y="1149" type="curve" smooth="yes" name="dv06"/>
       <point x="830" y="1149"/>
       <point x="947" y="1109"/>
       <point x="1030" y="1029" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="429" y="254" type="curve" smooth="yes"/>
       <point x="474" y="220"/>
       <point x="540" y="203"/>
-      <point x="629" y="203" type="curve" name="dv02" smooth="yes"/>
+      <point x="629" y="203" type="curve" smooth="yes" name="dv02"/>
       <point x="698" y="203"/>
       <point x="771" y="213"/>
       <point x="843" y="234" type="curve" smooth="yes"/>
@@ -78,7 +78,7 @@
       <point x="832" y="871" type="curve" smooth="yes"/>
       <point x="799" y="904"/>
       <point x="752" y="920"/>
-      <point x="692" y="920" type="curve" name="dv05" smooth="yes"/>
+      <point x="692" y="920" type="curve" smooth="yes" name="dv05"/>
       <point x="559" y="920"/>
       <point x="463" y="841"/>
       <point x="410" y="684" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/eight.glif b/source/Hack-BoldItalic.ufo/glyphs/eight.glif
index ce0e18d3c..36a002e14 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/eight.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/eight.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eight" format="1">
+<glyph name="eight" format="2">
   <advance width="1233"/>
   <unicode hex="0038"/>
   <outline>
     <contour>
-      <point x="502" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="502" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="361" y="-29"/>
       <point x="253" y="7"/>
       <point x="178" y="71" type="curve" smooth="yes"/>
       <point x="101" y="138"/>
       <point x="63" y="231"/>
-      <point x="63" y="352" type="curve" name="dh01" smooth="yes"/>
+      <point x="63" y="352" type="curve" smooth="yes" name="dh01"/>
       <point x="63" y="575"/>
       <point x="202" y="746"/>
       <point x="434" y="799" type="curve" name="ih02"/>
@@ -19,22 +19,22 @@
       <point x="277" y="897" type="curve" smooth="yes"/>
       <point x="242" y="942"/>
       <point x="223" y="999"/>
-      <point x="223" y="1075" type="curve" name="ih01" smooth="yes"/>
+      <point x="223" y="1075" type="curve" smooth="yes" name="ih01"/>
       <point x="223" y="1192"/>
       <point x="270" y="1303"/>
       <point x="370" y="1391" type="curve" smooth="yes"/>
       <point x="462" y="1471"/>
       <point x="585" y="1520"/>
-      <point x="730" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="730" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="850" y="1520"/>
       <point x="949" y="1487"/>
       <point x="1025" y="1422" type="curve" smooth="yes"/>
       <point x="1097" y="1359"/>
       <point x="1137" y="1273"/>
-      <point x="1137" y="1161" type="curve" name="sh02" smooth="yes"/>
+      <point x="1137" y="1161" type="curve" smooth="yes" name="sh02"/>
       <point x="1137" y="1064"/>
       <point x="1107" y="982"/>
-      <point x="1048" y="913" type="curve" name="hr01" smooth="yes"/>
+      <point x="1048" y="913" type="curve" smooth="yes" name="hr01"/>
       <point x="989" y="846"/>
       <point x="910" y="803"/>
       <point x="809" y="786" type="curve" name="ih04"/>
@@ -43,7 +43,7 @@
       <point x="979" y="673" type="curve" smooth="yes"/>
       <point x="1019" y="617"/>
       <point x="1040" y="552"/>
-      <point x="1040" y="461" type="curve" name="dh04" smooth="yes"/>
+      <point x="1040" y="461" type="curve" smooth="yes" name="dh04"/>
       <point x="1040" y="322"/>
       <point x="992" y="199"/>
       <point x="892" y="107" type="curve" smooth="yes"/>
@@ -51,25 +51,25 @@
       <point x="670" y="-29"/>
     </contour>
     <contour>
-      <point x="653" y="903" type="curve" name="dv03" smooth="yes"/>
+      <point x="653" y="903" type="curve" smooth="yes" name="dv03"/>
       <point x="712" y="903"/>
       <point x="770" y="923"/>
       <point x="813" y="963" type="curve" smooth="yes"/>
       <point x="856" y="1003"/>
       <point x="877" y="1054"/>
-      <point x="877" y="1116" type="curve" name="ih03" smooth="yes"/>
+      <point x="877" y="1116" type="curve" smooth="yes" name="ih03"/>
       <point x="877" y="1169"/>
       <point x="862" y="1210"/>
       <point x="831" y="1240" type="curve" smooth="yes"/>
       <point x="800" y="1269"/>
       <point x="758" y="1284"/>
-      <point x="705" y="1284" type="curve" name="hr02" smooth="yes"/>
+      <point x="705" y="1284" type="curve" smooth="yes" name="hr02"/>
       <point x="642" y="1284"/>
       <point x="590" y="1264"/>
       <point x="548" y="1223" type="curve" smooth="yes"/>
       <point x="509" y="1186"/>
       <point x="485" y="1133"/>
-      <point x="485" y="1070" type="curve" name="sh01" smooth="yes"/>
+      <point x="485" y="1070" type="curve" smooth="yes" name="sh01"/>
       <point x="485" y="1023"/>
       <point x="499" y="981"/>
       <point x="530" y="950" type="curve" smooth="yes"/>
@@ -77,25 +77,25 @@
       <point x="604" y="903"/>
     </contour>
     <contour>
-      <point x="528" y="209" type="curve" name="hr03" smooth="yes"/>
+      <point x="528" y="209" type="curve" smooth="yes" name="hr03"/>
       <point x="600" y="209"/>
       <point x="662" y="234"/>
       <point x="709" y="285" type="curve" smooth="yes"/>
       <point x="754" y="334"/>
       <point x="778" y="402"/>
-      <point x="778" y="474" type="curve" name="dh03" smooth="yes"/>
+      <point x="778" y="474" type="curve" smooth="yes" name="dh03"/>
       <point x="778" y="539"/>
       <point x="758" y="585"/>
       <point x="725" y="617" type="curve" smooth="yes"/>
       <point x="693" y="648"/>
       <point x="646" y="668"/>
-      <point x="579" y="668" type="curve" name="dv02" smooth="yes"/>
+      <point x="579" y="668" type="curve" smooth="yes" name="dv02"/>
       <point x="504" y="668"/>
       <point x="444" y="643"/>
       <point x="397" y="593" type="curve" smooth="yes"/>
       <point x="350" y="544"/>
       <point x="326" y="476"/>
-      <point x="326" y="405" type="curve" name="dh02" smooth="yes"/>
+      <point x="326" y="405" type="curve" smooth="yes" name="dh02"/>
       <point x="326" y="346"/>
       <point x="343" y="296"/>
       <point x="382" y="260" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/eight.subs.glif b/source/Hack-BoldItalic.ufo/glyphs/eight.subs.glif
index 03e4a062d..5b29615ba 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/eight.subs.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/eight.subs.glif
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eight.subs" format="1">
+<glyph name="eight.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="596" y="-435" type="curve" name="dv01" smooth="yes"/>
+      <point x="596" y="-435" type="curve" smooth="yes" name="dv01"/>
       <point x="403" y="-435"/>
       <point x="288" y="-358"/>
-      <point x="288" y="-223" type="curve" name="dh01" smooth="yes"/>
+      <point x="288" y="-223" type="curve" smooth="yes" name="dh01"/>
       <point x="288" y="-95"/>
       <point x="391" y="-3"/>
       <point x="551" y="29" type="curve" name="ih02"/>
       <point x="447" y="50"/>
       <point x="401" y="107"/>
-      <point x="401" y="183" type="curve" name="ih01" smooth="yes"/>
+      <point x="401" y="183" type="curve" smooth="yes" name="ih01"/>
       <point x="401" y="322"/>
       <point x="561" y="432"/>
-      <point x="762" y="432" type="curve" name="dv04" smooth="yes"/>
+      <point x="762" y="432" type="curve" smooth="yes" name="dv04"/>
       <point x="933" y="432"/>
       <point x="1050" y="352"/>
-      <point x="1050" y="231" type="curve" name="sh03" smooth="yes"/>
+      <point x="1050" y="231" type="curve" smooth="yes" name="sh03"/>
       <point x="1050" y="128"/>
       <point x="963" y="41"/>
       <point x="817" y="22" type="curve" name="hr01"/>
       <point x="924" y="-2"/>
       <point x="981" y="-63"/>
-      <point x="981" y="-163" type="curve" name="dh03" smooth="yes"/>
+      <point x="981" y="-163" type="curve" smooth="yes" name="dh03"/>
       <point x="981" y="-326"/>
       <point x="825" y="-435"/>
     </contour>
     <contour>
-      <point x="707" y="87" type="curve" name="dv06" smooth="yes"/>
+      <point x="707" y="87" type="curve" smooth="yes" name="dv06"/>
       <point x="793" y="87"/>
       <point x="865" y="137"/>
-      <point x="865" y="208" type="curve" name="sh02" smooth="yes"/>
+      <point x="865" y="208" type="curve" smooth="yes" name="sh02"/>
       <point x="865" y="265"/>
       <point x="819" y="300"/>
-      <point x="744" y="300" type="curve" name="dv03" smooth="yes"/>
+      <point x="744" y="300" type="curve" smooth="yes" name="dv03"/>
       <point x="652" y="300"/>
       <point x="587" y="249"/>
-      <point x="587" y="181" type="curve" name="sh01" smooth="yes"/>
+      <point x="587" y="181" type="curve" smooth="yes" name="sh01"/>
       <point x="587" y="125"/>
       <point x="631" y="87"/>
     </contour>
     <contour>
-      <point x="616" y="-302" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="-302" type="curve" smooth="yes" name="dv02"/>
       <point x="721" y="-302"/>
       <point x="795" y="-240"/>
-      <point x="795" y="-156" type="curve" name="hr02" smooth="yes"/>
+      <point x="795" y="-156" type="curve" smooth="yes" name="hr02"/>
       <point x="795" y="-84"/>
       <point x="740" y="-45"/>
-      <point x="656" y="-45" type="curve" name="dv05" smooth="yes"/>
+      <point x="656" y="-45" type="curve" smooth="yes" name="dv05"/>
       <point x="547" y="-45"/>
       <point x="474" y="-110"/>
-      <point x="474" y="-191" type="curve" name="dh02" smooth="yes"/>
+      <point x="474" y="-191" type="curve" smooth="yes" name="dh02"/>
       <point x="474" y="-267"/>
       <point x="538" y="-302"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/element.glif b/source/Hack-BoldItalic.ufo/glyphs/element.glif
index 2c832dab4..c698a1d01 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/element.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/element.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="element" format="1">
+<glyph name="element" format="2">
   <advance width="1233"/>
   <unicode hex="2208"/>
   <outline>
     <contour>
-      <point x="636" y="0" type="line" name="hr00" smooth="yes"/>
+      <point x="636" y="0" type="line" smooth="yes" name="hr00"/>
       <point x="442" y="0"/>
       <point x="268" y="146"/>
       <point x="172" y="380" type="curve" smooth="yes"/>
@@ -34,7 +34,7 @@
       <point x="483" y="301" type="curve" smooth="yes"/>
       <point x="530" y="254"/>
       <point x="581" y="230"/>
-      <point x="636" y="230" type="curve" name="sv01" smooth="yes"/>
+      <point x="636" y="230" type="curve" smooth="yes" name="sv01"/>
       <point x="1133" y="230" type="line" name="sv02"/>
       <point x="1133" y="0" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ellipsis.glif b/source/Hack-BoldItalic.ufo/glyphs/ellipsis.glif
index 5f6c272d4..c5c0f5f2d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ellipsis.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ellipsis.glif
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ellipsis" format="1">
+<glyph name="ellipsis" format="2">
   <advance width="1233"/>
   <unicode hex="2026"/>
   <outline>
     <contour>
-      <point x="-53" y="0" type="line" name="hr00" smooth="yes"/>
+      <point x="-53" y="0" type="line" smooth="yes" name="hr00"/>
       <point x="-73" y="0"/>
       <point x="-84" y="13"/>
       <point x="-80" y="33" type="curve" smooth="yes"/>
       <point x="-21" y="340" type="line"/>
       <point x="-18" y="358"/>
       <point x="-8" y="367"/>
-      <point x="11" y="367" type="curve" name="sv01" smooth="yes"/>
-      <point x="266" y="367" type="line" name="sv02" smooth="yes"/>
+      <point x="11" y="367" type="curve" smooth="yes" name="sv01"/>
+      <point x="266" y="367" type="line" smooth="yes" name="sv02"/>
       <point x="285" y="367"/>
       <point x="294" y="359"/>
       <point x="294" y="342" type="curve" smooth="yes"/>
@@ -25,7 +25,7 @@
       <point x="200" y="0" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="357" y="0" type="line" name="ab01" smooth="yes"/>
+      <point x="357" y="0" type="line" smooth="yes" name="ab01"/>
       <point x="338" y="0"/>
       <point x="329" y="8"/>
       <point x="329" y="25" type="curve" smooth="yes"/>
@@ -35,8 +35,8 @@
       <point x="390" y="340" type="line"/>
       <point x="393" y="358"/>
       <point x="403" y="367"/>
-      <point x="422" y="367" type="curve" name="sv03" smooth="yes"/>
-      <point x="657" y="367" type="line" name="sv04" smooth="yes"/>
+      <point x="422" y="367" type="curve" smooth="yes" name="sv03"/>
+      <point x="657" y="367" type="line" smooth="yes" name="sv04"/>
       <point x="676" y="367"/>
       <point x="685" y="359"/>
       <point x="685" y="342" type="curve" smooth="yes"/>
@@ -49,7 +49,7 @@
       <point x="594" y="0" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="748" y="0" type="line" name="ab02" smooth="yes"/>
+      <point x="748" y="0" type="line" smooth="yes" name="ab02"/>
       <point x="729" y="0"/>
       <point x="720" y="8"/>
       <point x="720" y="25" type="curve" smooth="yes"/>
@@ -59,8 +59,8 @@
       <point x="781" y="340" type="line"/>
       <point x="784" y="358"/>
       <point x="794" y="367"/>
-      <point x="813" y="367" type="curve" name="sv05" smooth="yes"/>
-      <point x="1067" y="367" type="line" name="sv06" smooth="yes"/>
+      <point x="813" y="367" type="curve" smooth="yes" name="sv05"/>
+      <point x="1067" y="367" type="line" smooth="yes" name="sv06"/>
       <point x="1087" y="367"/>
       <point x="1098" y="354"/>
       <point x="1094" y="334" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/emacron.glif b/source/Hack-BoldItalic.ufo/glyphs/emacron.glif
index e3f5b6f3a..a0bc80f51 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/emacron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/emacron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="emacron" format="1">
+<glyph name="emacron" format="2">
   <advance width="1233"/>
   <unicode hex="0113"/>
   <outline>
@@ -10,19 +10,19 @@
       <point x="431" y="1349" type="line"/>
     </contour>
     <contour>
-      <point x="586" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="586" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="249" y="-29"/>
       <point x="76" y="127"/>
-      <point x="76" y="440" type="curve" name="sh01" smooth="yes"/>
+      <point x="76" y="440" type="curve" smooth="yes" name="sh01"/>
       <point x="76" y="621"/>
       <point x="135" y="805"/>
       <point x="244" y="938" type="curve" smooth="yes"/>
       <point x="357" y="1075"/>
       <point x="513" y="1149"/>
-      <point x="696" y="1149" type="curve" name="dv07" smooth="yes"/>
+      <point x="696" y="1149" type="curve" smooth="yes" name="dv07"/>
       <point x="972" y="1149"/>
       <point x="1155" y="975"/>
-      <point x="1155" y="708" type="curve" name="sh02" smooth="yes"/>
+      <point x="1155" y="708" type="curve" smooth="yes" name="sh02"/>
       <point x="1155" y="652"/>
       <point x="1147" y="577"/>
       <point x="1128" y="465" type="curve" name="dv05"/>
@@ -32,7 +32,7 @@
       <point x="362" y="403" type="curve" name="sh03"/>
       <point x="362" y="270"/>
       <point x="451" y="203"/>
-      <point x="630" y="203" type="curve" name="dv02" smooth="yes"/>
+      <point x="630" y="203" type="curve" smooth="yes" name="dv02"/>
       <point x="771" y="203"/>
       <point x="919" y="244"/>
       <point x="1044" y="324" type="curve" name="ih01"/>
@@ -44,10 +44,10 @@
       <point x="876" y="684" type="line" name="sh05"/>
       <point x="881" y="702"/>
       <point x="883" y="720"/>
-      <point x="883" y="739" type="curve" name="ah01" smooth="yes"/>
+      <point x="883" y="739" type="curve" smooth="yes" name="ah01"/>
       <point x="883" y="851"/>
       <point x="812" y="920"/>
-      <point x="689" y="920" type="curve" name="dv06" smooth="yes"/>
+      <point x="689" y="920" type="curve" smooth="yes" name="dv06"/>
       <point x="560" y="920"/>
       <point x="463" y="841"/>
       <point x="410" y="684" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/emdash.glif b/source/Hack-BoldItalic.ufo/glyphs/emdash.glif
index 26b071458..14bfc4b40 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/emdash.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/emdash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="emdash" format="1">
+<glyph name="emdash" format="2">
   <advance width="1233"/>
   <unicode hex="2014"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/emptyset.glif b/source/Hack-BoldItalic.ufo/glyphs/emptyset.glif
index daf5bda0c..470d4d56b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/emptyset.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/emptyset.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="emptyset" format="1">
+<glyph name="emptyset" format="2">
   <advance width="1233"/>
   <unicode hex="2205"/>
   <outline>
@@ -8,13 +8,13 @@
       <point x="183" y="327" type="line"/>
       <point x="130" y="396"/>
       <point x="80" y="497"/>
-      <point x="80" y="642" type="curve" name="sh01" smooth="yes"/>
+      <point x="80" y="642" type="curve" smooth="yes" name="sh01"/>
       <point x="80" y="791"/>
       <point x="132" y="918"/>
       <point x="237" y="1023" type="curve" smooth="yes"/>
       <point x="343" y="1129"/>
       <point x="470" y="1182"/>
-      <point x="618" y="1182" type="curve" name="av01" smooth="yes"/>
+      <point x="618" y="1182" type="curve" smooth="yes" name="av01"/>
       <point x="764" y="1182"/>
       <point x="864" y="1130"/>
       <point x="933" y="1077" type="curve"/>
@@ -23,13 +23,13 @@
       <point x="1052" y="958" type="line"/>
       <point x="1102" y="889"/>
       <point x="1153" y="790"/>
-      <point x="1153" y="644" type="curve" name="sh02" smooth="yes"/>
+      <point x="1153" y="644" type="curve" smooth="yes" name="sh02"/>
       <point x="1153" y="495"/>
       <point x="1101" y="369"/>
       <point x="996" y="264" type="curve" smooth="yes"/>
       <point x="896" y="164"/>
       <point x="770" y="106"/>
-      <point x="615" y="106" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="106" type="curve" smooth="yes" name="dv01"/>
       <point x="470" y="106"/>
       <point x="369" y="157"/>
       <point x="302" y="208" type="curve"/>
@@ -39,16 +39,16 @@
       <point x="810" y="953" type="line"/>
       <point x="793" y="964"/>
       <point x="775" y="974"/>
-      <point x="756" y="982" type="curve" name="hr01" smooth="yes"/>
+      <point x="756" y="982" type="curve" smooth="yes" name="hr01"/>
       <point x="713" y="1000"/>
       <point x="667" y="1009"/>
-      <point x="618" y="1009" type="curve" name="sv01" smooth="yes"/>
+      <point x="618" y="1009" type="curve" smooth="yes" name="sv01"/>
       <point x="513" y="1009"/>
       <point x="421" y="965"/>
-      <point x="358" y="902" type="curve" name="hr02" smooth="yes"/>
+      <point x="358" y="902" type="curve" smooth="yes" name="hr02"/>
       <point x="286" y="830"/>
       <point x="252" y="737"/>
-      <point x="252" y="641" type="curve" name="sh03" smooth="yes"/>
+      <point x="252" y="641" type="curve" smooth="yes" name="sh03"/>
       <point x="252" y="592"/>
       <point x="261" y="547"/>
       <point x="279" y="504" type="curve"/>
@@ -57,16 +57,16 @@
       <point x="307" y="451" type="curve"/>
     </contour>
     <contour>
-      <point x="617" y="278" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="278" type="curve" smooth="yes" name="dv02"/>
       <point x="716" y="278"/>
       <point x="802" y="314"/>
       <point x="874" y="386" type="curve" smooth="yes"/>
       <point x="945" y="457"/>
       <point x="981" y="543"/>
-      <point x="981" y="643" type="curve" name="ah01" smooth="yes"/>
+      <point x="981" y="643" type="curve" smooth="yes" name="ah01"/>
       <point x="981" y="693"/>
       <point x="972" y="740"/>
-      <point x="954" y="783" type="curve" name="hr03" smooth="yes"/>
+      <point x="954" y="783" type="curve" smooth="yes" name="hr03"/>
       <point x="947" y="800"/>
       <point x="939" y="817"/>
       <point x="928" y="834" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/endash.glif b/source/Hack-BoldItalic.ufo/glyphs/endash.glif
index ca547c833..917fdc688 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/endash.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/endash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="endash" format="1">
+<glyph name="endash" format="2">
   <advance width="1233"/>
   <unicode hex="2013"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/eng.glif b/source/Hack-BoldItalic.ufo/glyphs/eng.glif
index f70fd168b..78cc09599 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/eng.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/eng.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eng" format="1">
+<glyph name="eng" format="2">
   <advance width="1233"/>
   <unicode hex="014B"/>
   <outline>
@@ -12,10 +12,10 @@
       <point x="811" y="682" type="line" smooth="yes"/>
       <point x="819" y="723"/>
       <point x="823" y="758"/>
-      <point x="823" y="787" type="curve" name="dh01" smooth="yes"/>
+      <point x="823" y="787" type="curve" smooth="yes" name="dh01"/>
       <point x="823" y="838"/>
       <point x="812" y="909"/>
-      <point x="715" y="909" type="curve" name="sv02" smooth="yes"/>
+      <point x="715" y="909" type="curve" smooth="yes" name="sv02"/>
       <point x="598" y="909"/>
       <point x="518" y="806"/>
       <point x="486" y="641" type="curve" smooth="yes"/>
@@ -26,17 +26,17 @@
       <point x="547" y="952" type="line" name="iv01"/>
       <point x="615" y="1081"/>
       <point x="732" y="1147"/>
-      <point x="877" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="877" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1084" y="1147"/>
       <point x="1127" y="1010"/>
-      <point x="1127" y="878" type="curve" name="dh02" smooth="yes"/>
+      <point x="1127" y="878" type="curve" smooth="yes" name="dh02"/>
       <point x="1127" y="833"/>
       <point x="1122" y="783"/>
       <point x="1111" y="727" type="curve" smooth="yes"/>
       <point x="978" y="43" type="line"/>
       <point x="914" y="-293"/>
       <point x="776" y="-424"/>
-      <point x="496" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="496" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="375" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/eogonek.glif b/source/Hack-BoldItalic.ufo/glyphs/eogonek.glif
index ae9bd98d9..1ebbc0614 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/eogonek.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/eogonek.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eogonek" format="1">
+<glyph name="eogonek" format="2">
   <advance width="1233"/>
   <unicode hex="0119"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="362" y="403" type="curve" name="dh02"/>
       <point x="362" y="270"/>
       <point x="451" y="203"/>
-      <point x="630" y="203" type="curve" name="dv06" smooth="yes"/>
+      <point x="630" y="203" type="curve" smooth="yes" name="dv06"/>
       <point x="771" y="203"/>
       <point x="919" y="244"/>
       <point x="1044" y="324" type="curve" name="ih01"/>
@@ -23,51 +23,51 @@
       <point x="730" y="-117" type="curve" smooth="yes"/>
       <point x="714" y="-142"/>
       <point x="706" y="-162"/>
-      <point x="706" y="-182" type="curve" name="dh04" smooth="yes"/>
+      <point x="706" y="-182" type="curve" smooth="yes" name="dh04"/>
       <point x="706" y="-221"/>
       <point x="737" y="-254"/>
-      <point x="806" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="806" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="842" y="-254"/>
       <point x="899" y="-246"/>
       <point x="962" y="-223" type="curve" name="ih02"/>
       <point x="931" y="-379" type="line"/>
       <point x="866" y="-394"/>
       <point x="803" y="-401"/>
-      <point x="752" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="752" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="615" y="-401"/>
       <point x="532" y="-350"/>
-      <point x="532" y="-255" type="curve" name="dh03" smooth="yes"/>
+      <point x="532" y="-255" type="curve" smooth="yes" name="dh03"/>
       <point x="532" y="-190"/>
       <point x="571" y="-111"/>
       <point x="659" y="-26" type="curve" name="ih03"/>
       <point x="635" y="-28"/>
       <point x="611" y="-29"/>
-      <point x="586" y="-29" type="curve" name="dv05" smooth="yes"/>
+      <point x="586" y="-29" type="curve" smooth="yes" name="dv05"/>
       <point x="249" y="-29"/>
       <point x="76" y="127"/>
-      <point x="76" y="440" type="curve" name="dh01" smooth="yes"/>
+      <point x="76" y="440" type="curve" smooth="yes" name="dh01"/>
       <point x="76" y="621"/>
       <point x="135" y="805"/>
       <point x="244" y="938" type="curve" smooth="yes"/>
       <point x="357" y="1075"/>
       <point x="513" y="1149"/>
-      <point x="696" y="1149" type="curve" name="dv04" smooth="yes"/>
+      <point x="696" y="1149" type="curve" smooth="yes" name="dv04"/>
       <point x="972" y="1149"/>
       <point x="1155" y="975"/>
-      <point x="1155" y="708" type="curve" name="dh06" smooth="yes"/>
+      <point x="1155" y="708" type="curve" smooth="yes" name="dh06"/>
       <point x="1155" y="652"/>
       <point x="1147" y="577"/>
       <point x="1128" y="465" type="curve"/>
     </contour>
     <contour>
-      <point x="689" y="920" type="curve" name="dv03" smooth="yes"/>
+      <point x="689" y="920" type="curve" smooth="yes" name="dv03"/>
       <point x="560" y="920"/>
       <point x="463" y="841"/>
       <point x="410" y="684" type="curve" name="ih04"/>
       <point x="876" y="684" type="line"/>
       <point x="881" y="702"/>
       <point x="883" y="720"/>
-      <point x="883" y="739" type="curve" name="dh05" smooth="yes"/>
+      <point x="883" y="739" type="curve" smooth="yes" name="dh05"/>
       <point x="883" y="851"/>
       <point x="812" y="920"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/epsilon.glif b/source/Hack-BoldItalic.ufo/glyphs/epsilon.glif
index 686b0ed40..463def40a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/epsilon.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/epsilon.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="epsilon" format="1">
+<glyph name="epsilon" format="2">
   <advance width="1233"/>
   <unicode hex="03B5"/>
   <outline>
     <contour>
-      <point x="568" y="-22" type="curve" name="hr00" smooth="yes"/>
+      <point x="568" y="-22" type="curve" smooth="yes" name="hr00"/>
       <point x="243" y="-22"/>
       <point x="94" y="71"/>
       <point x="94" y="246" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="239" y="850" type="curve" smooth="yes"/>
       <point x="274" y="1026"/>
       <point x="463" y="1140"/>
-      <point x="771" y="1140" type="curve" name="at01" smooth="yes"/>
+      <point x="771" y="1140" type="curve" smooth="yes" name="at01"/>
       <point x="828" y="1140"/>
       <point x="888" y="1136"/>
       <point x="951" y="1128" type="curve" name="at02"/>
@@ -36,7 +36,7 @@
       <point x="1040" y="885" type="line" smooth="yes"/>
       <point x="919" y="925"/>
       <point x="858" y="938"/>
-      <point x="756" y="938" type="curve" name="sv01" smooth="yes"/>
+      <point x="756" y="938" type="curve" smooth="yes" name="sv01"/>
       <point x="681" y="938"/>
       <point x="629" y="931"/>
       <point x="577" y="904" type="curve"/>
@@ -71,7 +71,7 @@
       <point x="419" y="223" type="curve" smooth="yes"/>
       <point x="466" y="190"/>
       <point x="525" y="181"/>
-      <point x="605" y="181" type="curve" name="sv02" smooth="yes"/>
+      <point x="605" y="181" type="curve" smooth="yes" name="sv02"/>
       <point x="677" y="181"/>
       <point x="743" y="188"/>
       <point x="812" y="200" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/epsilontonos.glif b/source/Hack-BoldItalic.ufo/glyphs/epsilontonos.glif
index 3e11fae73..2bc051e38 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/epsilontonos.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/epsilontonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="epsilontonos" format="1">
+<glyph name="epsilontonos" format="2">
   <advance width="1233"/>
   <unicode hex="03AD"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="569" y="1290" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="568" y="-22" type="curve" name="ab01" smooth="yes"/>
+      <point x="568" y="-22" type="curve" smooth="yes" name="ab01"/>
       <point x="243" y="-22"/>
       <point x="94" y="71"/>
       <point x="94" y="246" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="239" y="850" type="curve" smooth="yes"/>
       <point x="274" y="1026"/>
       <point x="463" y="1140"/>
-      <point x="771" y="1140" type="curve" name="at01" smooth="yes"/>
+      <point x="771" y="1140" type="curve" smooth="yes" name="at01"/>
       <point x="828" y="1140"/>
       <point x="888" y="1136"/>
       <point x="951" y="1128" type="curve" name="at02"/>
@@ -42,7 +42,7 @@
       <point x="1040" y="885" type="line" smooth="yes"/>
       <point x="919" y="925"/>
       <point x="858" y="938"/>
-      <point x="756" y="938" type="curve" name="sv01" smooth="yes"/>
+      <point x="756" y="938" type="curve" smooth="yes" name="sv01"/>
       <point x="681" y="938"/>
       <point x="629" y="931"/>
       <point x="577" y="904" type="curve"/>
@@ -77,7 +77,7 @@
       <point x="419" y="223" type="curve" smooth="yes"/>
       <point x="466" y="190"/>
       <point x="525" y="181"/>
-      <point x="605" y="181" type="curve" name="sv02" smooth="yes"/>
+      <point x="605" y="181" type="curve" smooth="yes" name="sv02"/>
       <point x="677" y="181"/>
       <point x="743" y="188"/>
       <point x="812" y="200" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/equal.glif b/source/Hack-BoldItalic.ufo/glyphs/equal.glif
index 7358e6688..17a3441ac 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/equal.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/equal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="equal" format="1">
+<glyph name="equal" format="2">
   <advance width="1233"/>
   <unicode hex="003D"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/equivalence.glif b/source/Hack-BoldItalic.ufo/glyphs/equivalence.glif
index 0524ffd24..a89aebdca 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/equivalence.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/equivalence.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="equivalence" format="1">
+<glyph name="equivalence" format="2">
   <advance width="1233"/>
   <unicode hex="2261"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/eta.glif b/source/Hack-BoldItalic.ufo/glyphs/eta.glif
index b52a72c07..69a311f5b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/eta.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/eta.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eta" format="1">
+<glyph name="eta" format="2">
   <advance width="1233"/>
   <unicode hex="03B7"/>
   <outline>
     <contour>
-      <point x="809" y="682" type="line" name="hr00" smooth="yes"/>
+      <point x="809" y="682" type="line" smooth="yes" name="hr00"/>
       <point x="817" y="723"/>
       <point x="821" y="757"/>
-      <point x="821" y="786" type="curve" name="dh02" smooth="yes"/>
+      <point x="821" y="786" type="curve" smooth="yes" name="dh02"/>
       <point x="821" y="870"/>
       <point x="785" y="909"/>
-      <point x="713" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="713" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="596" y="909"/>
       <point x="517" y="808"/>
       <point x="485" y="641" type="curve" smooth="yes"/>
@@ -21,10 +21,10 @@
       <point x="545" y="952" type="line" name="iv01"/>
       <point x="612" y="1077"/>
       <point x="728" y="1147"/>
-      <point x="873" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="873" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1038" y="1147"/>
       <point x="1126" y="1059"/>
-      <point x="1126" y="880" type="curve" name="sh01" smooth="yes"/>
+      <point x="1126" y="880" type="curve" smooth="yes" name="sh01"/>
       <point x="1126" y="833"/>
       <point x="1120" y="783"/>
       <point x="1109" y="727" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/etatonos.glif b/source/Hack-BoldItalic.ufo/glyphs/etatonos.glif
index 2a9aaf2a9..a530a01fa 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/etatonos.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/etatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="etatonos" format="1">
+<glyph name="etatonos" format="2">
   <advance width="1233"/>
   <unicode hex="03AE"/>
   <outline>
@@ -13,10 +13,10 @@
       <point x="812" y="682" type="line" smooth="yes"/>
       <point x="820" y="723"/>
       <point x="824" y="757"/>
-      <point x="824" y="786" type="curve" name="dh02" smooth="yes"/>
+      <point x="824" y="786" type="curve" smooth="yes" name="dh02"/>
       <point x="824" y="870"/>
       <point x="788" y="909"/>
-      <point x="716" y="909" type="curve" name="hr01" smooth="yes"/>
+      <point x="716" y="909" type="curve" smooth="yes" name="hr01"/>
       <point x="599" y="909"/>
       <point x="520" y="808"/>
       <point x="488" y="641" type="curve" smooth="yes"/>
@@ -27,10 +27,10 @@
       <point x="548" y="952" type="line" name="iv01"/>
       <point x="615" y="1077"/>
       <point x="731" y="1147"/>
-      <point x="876" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="876" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1041" y="1147"/>
       <point x="1129" y="1059"/>
-      <point x="1129" y="880" type="curve" name="sh01" smooth="yes"/>
+      <point x="1129" y="880" type="curve" smooth="yes" name="sh01"/>
       <point x="1129" y="833"/>
       <point x="1123" y="783"/>
       <point x="1112" y="727" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/eth.glif b/source/Hack-BoldItalic.ufo/glyphs/eth.glif
index 51c281e23..90faf8001 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/eth.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/eth.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eth" format="1">
+<glyph name="eth" format="2">
   <advance width="1233"/>
   <unicode hex="00F0"/>
   <outline>
     <contour>
-      <point x="538" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="538" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="389" y="-29"/>
       <point x="278" y="14"/>
       <point x="202" y="86" type="curve" smooth="yes"/>
       <point x="118" y="166"/>
       <point x="82" y="277"/>
-      <point x="82" y="420" type="curve" name="sh01" smooth="yes"/>
+      <point x="82" y="420" type="curve" smooth="yes" name="sh01"/>
       <point x="82" y="592"/>
       <point x="134" y="752"/>
       <point x="241" y="873" type="curve" smooth="yes"/>
       <point x="340" y="985"/>
       <point x="476" y="1053"/>
-      <point x="651" y="1053" type="curve" name="dv03" smooth="yes"/>
+      <point x="651" y="1053" type="curve" smooth="yes" name="dv03"/>
       <point x="679" y="1053"/>
       <point x="704" y="1051"/>
       <point x="726" y="1047" type="curve" smooth="yes"/>
@@ -43,7 +43,7 @@
       <point x="1082" y="980" type="curve" smooth="yes"/>
       <point x="1121" y="872"/>
       <point x="1141" y="765"/>
-      <point x="1141" y="646" type="curve" name="sh02" smooth="yes"/>
+      <point x="1141" y="646" type="curve" smooth="yes" name="sh02"/>
       <point x="1141" y="454"/>
       <point x="1086" y="283"/>
       <point x="977" y="158" type="curve" smooth="yes"/>
@@ -51,16 +51,16 @@
       <point x="726" y="-29"/>
     </contour>
     <contour>
-      <point x="560" y="207" type="curve" name="dv01" smooth="yes"/>
+      <point x="560" y="207" type="curve" smooth="yes" name="dv01"/>
       <point x="640" y="207"/>
       <point x="712" y="248"/>
       <point x="767" y="332" type="curve" smooth="yes"/>
       <point x="819" y="412"/>
       <point x="848" y="528"/>
-      <point x="848" y="652" type="curve" name="ah01" smooth="yes"/>
+      <point x="848" y="652" type="curve" smooth="yes" name="ah01"/>
       <point x="848" y="675"/>
       <point x="847" y="703"/>
-      <point x="846" y="718" type="curve" name="sh04" smooth="yes"/>
+      <point x="846" y="718" type="curve" smooth="yes" name="sh04"/>
       <point x="845" y="729"/>
       <point x="841" y="759"/>
       <point x="838" y="778" type="curve" name="sh05"/>
@@ -69,13 +69,13 @@
       <point x="759" y="809" type="curve" smooth="yes"/>
       <point x="732" y="816"/>
       <point x="700" y="819"/>
-      <point x="676" y="819" type="curve" name="dv02" smooth="yes"/>
+      <point x="676" y="819" type="curve" smooth="yes" name="dv02"/>
       <point x="585" y="819"/>
       <point x="512" y="778"/>
       <point x="460" y="710" type="curve" smooth="yes"/>
       <point x="403" y="634"/>
       <point x="375" y="534"/>
-      <point x="375" y="437" type="curve" name="sh06" smooth="yes"/>
+      <point x="375" y="437" type="curve" smooth="yes" name="sh06"/>
       <point x="375" y="357"/>
       <point x="393" y="303"/>
       <point x="424" y="267" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/exclam.glif b/source/Hack-BoldItalic.ufo/glyphs/exclam.glif
index 6fc8f1f16..74e6867ed 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/exclam.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/exclam.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="exclam" format="1">
+<glyph name="exclam" format="2">
   <advance width="1233"/>
   <unicode hex="0021"/>
   <outline>
@@ -12,25 +12,25 @@
       <point x="624" y="476" type="line"/>
     </contour>
     <contour>
-      <point x="612" y="-65" type="curve" name="dv01" smooth="yes"/>
+      <point x="612" y="-65" type="curve" smooth="yes" name="dv01"/>
       <point x="561" y="-65"/>
       <point x="526" y="-46"/>
       <point x="503" y="-22" type="curve" smooth="yes"/>
       <point x="474" y="11"/>
       <point x="465" y="55"/>
-      <point x="465" y="90" type="curve" name="dh01" smooth="yes"/>
+      <point x="465" y="90" type="curve" smooth="yes" name="dh01"/>
       <point x="465" y="174"/>
       <point x="519" y="251"/>
       <point x="597" y="281" type="curve" smooth="yes"/>
       <point x="619" y="289"/>
       <point x="643" y="293"/>
-      <point x="670" y="293" type="curve" name="dv02" smooth="yes"/>
+      <point x="670" y="293" type="curve" smooth="yes" name="dv02"/>
       <point x="727" y="293"/>
       <point x="759" y="270"/>
       <point x="780" y="247" type="curve" smooth="yes"/>
       <point x="807" y="216"/>
       <point x="817" y="180"/>
-      <point x="817" y="140" type="curve" name="dh02" smooth="yes"/>
+      <point x="817" y="140" type="curve" smooth="yes" name="dh02"/>
       <point x="817" y="112"/>
       <point x="811" y="85"/>
       <point x="803" y="66" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/exclamdbl.glif b/source/Hack-BoldItalic.ufo/glyphs/exclamdbl.glif
index 80151a589..f867a08b4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/exclamdbl.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/exclamdbl.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="exclamdbl" format="1">
+<glyph name="exclamdbl" format="2">
   <advance width="1233"/>
   <unicode hex="203C"/>
   <outline>
@@ -20,28 +20,28 @@
       <point x="854" y="476" type="line"/>
     </contour>
     <contour>
-      <point x="292" y="-65" type="curve" name="dv01" smooth="yes"/>
+      <point x="292" y="-65" type="curve" smooth="yes" name="dv01"/>
       <point x="241" y="-65"/>
       <point x="206" y="-46"/>
       <point x="183" y="-22" type="curve" smooth="yes"/>
       <point x="154" y="11"/>
       <point x="145" y="55"/>
-      <point x="145" y="90" type="curve" name="sh01" smooth="yes"/>
+      <point x="145" y="90" type="curve" smooth="yes" name="sh01"/>
       <point x="145" y="174"/>
       <point x="199" y="251"/>
       <point x="277" y="281" type="curve" smooth="yes"/>
       <point x="299" y="289"/>
       <point x="323" y="293"/>
-      <point x="350" y="293" type="curve" name="dv02" smooth="yes"/>
+      <point x="350" y="293" type="curve" smooth="yes" name="dv02"/>
       <point x="407" y="293"/>
       <point x="439" y="270"/>
       <point x="460" y="247" type="curve" smooth="yes"/>
       <point x="487" y="216"/>
       <point x="497" y="180"/>
-      <point x="497" y="140" type="curve" name="sh02" smooth="yes"/>
+      <point x="497" y="140" type="curve" smooth="yes" name="sh02"/>
       <point x="497" y="112"/>
       <point x="491" y="85"/>
-      <point x="483" y="66" type="curve" name="sh03" smooth="yes"/>
+      <point x="483" y="66" type="curve" smooth="yes" name="sh03"/>
       <point x="462" y="14"/>
       <point x="422" y="-29"/>
       <point x="366" y="-52" type="curve" smooth="yes"/>
@@ -49,28 +49,28 @@
       <point x="319" y="-65"/>
     </contour>
     <contour>
-      <point x="842" y="-65" type="curve" name="sv01" smooth="yes"/>
+      <point x="842" y="-65" type="curve" smooth="yes" name="sv01"/>
       <point x="791" y="-65"/>
       <point x="756" y="-46"/>
       <point x="733" y="-22" type="curve" smooth="yes"/>
       <point x="704" y="11"/>
       <point x="695" y="55"/>
-      <point x="695" y="90" type="curve" name="ah01" smooth="yes"/>
+      <point x="695" y="90" type="curve" smooth="yes" name="ah01"/>
       <point x="695" y="174"/>
       <point x="749" y="251"/>
       <point x="827" y="281" type="curve" smooth="yes"/>
       <point x="849" y="289"/>
       <point x="873" y="293"/>
-      <point x="900" y="293" type="curve" name="sv02" smooth="yes"/>
+      <point x="900" y="293" type="curve" smooth="yes" name="sv02"/>
       <point x="957" y="293"/>
       <point x="989" y="270"/>
       <point x="1010" y="247" type="curve" smooth="yes"/>
       <point x="1037" y="216"/>
       <point x="1047" y="180"/>
-      <point x="1047" y="140" type="curve" name="sh04" smooth="yes"/>
+      <point x="1047" y="140" type="curve" smooth="yes" name="sh04"/>
       <point x="1047" y="112"/>
       <point x="1041" y="85"/>
-      <point x="1033" y="66" type="curve" name="sh05" smooth="yes"/>
+      <point x="1033" y="66" type="curve" smooth="yes" name="sh05"/>
       <point x="1012" y="14"/>
       <point x="972" y="-29"/>
       <point x="916" y="-52" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/exclamdown.case.glif b/source/Hack-BoldItalic.ufo/glyphs/exclamdown.case.glif
index 9ee5d6890..3a7586766 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/exclamdown.case.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/exclamdown.case.glif
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="exclamdown.case" format="1">
+<glyph name="exclamdown.case" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="696" y="1198" type="curve" name="hr00" smooth="yes"/>
+      <point x="696" y="1198" type="curve" smooth="yes" name="hr00"/>
       <point x="645" y="1198"/>
       <point x="610" y="1217"/>
       <point x="587" y="1241" type="curve" smooth="yes"/>
       <point x="558" y="1274"/>
       <point x="549" y="1318"/>
-      <point x="549" y="1353" type="curve" name="dh01" smooth="yes"/>
+      <point x="549" y="1353" type="curve" smooth="yes" name="dh01"/>
       <point x="549" y="1437"/>
       <point x="603" y="1514"/>
-      <point x="681" y="1544" type="curve" name="at01" smooth="yes"/>
+      <point x="681" y="1544" type="curve" smooth="yes" name="at01"/>
       <point x="703" y="1552"/>
       <point x="727" y="1556"/>
-      <point x="754" y="1556" type="curve" name="at02" smooth="yes"/>
+      <point x="754" y="1556" type="curve" smooth="yes" name="at02"/>
       <point x="811" y="1556"/>
       <point x="843" y="1533"/>
       <point x="864" y="1510" type="curve" smooth="yes"/>
       <point x="891" y="1479"/>
       <point x="901" y="1443"/>
-      <point x="901" y="1403" type="curve" name="dh02" smooth="yes"/>
+      <point x="901" y="1403" type="curve" smooth="yes" name="dh02"/>
       <point x="901" y="1375"/>
       <point x="895" y="1348"/>
       <point x="887" y="1329" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/exclamdown.glif b/source/Hack-BoldItalic.ufo/glyphs/exclamdown.glif
index e9552f0da..38235be7f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/exclamdown.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/exclamdown.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="exclamdown" format="1">
+<glyph name="exclamdown" format="2">
   <advance width="1233"/>
   <unicode hex="00A1"/>
   <outline>
     <contour>
-      <point x="696" y="1198" type="curve" name="hr00" smooth="yes"/>
+      <point x="696" y="1198" type="curve" smooth="yes" name="hr00"/>
       <point x="645" y="1198"/>
       <point x="610" y="1217"/>
       <point x="587" y="1241" type="curve" smooth="yes"/>
       <point x="558" y="1274"/>
       <point x="549" y="1318"/>
-      <point x="549" y="1353" type="curve" name="dh01" smooth="yes"/>
+      <point x="549" y="1353" type="curve" smooth="yes" name="dh01"/>
       <point x="549" y="1437"/>
       <point x="603" y="1514"/>
-      <point x="681" y="1544" type="curve" name="at01" smooth="yes"/>
+      <point x="681" y="1544" type="curve" smooth="yes" name="at01"/>
       <point x="703" y="1552"/>
       <point x="727" y="1556"/>
-      <point x="754" y="1556" type="curve" name="at02" smooth="yes"/>
+      <point x="754" y="1556" type="curve" smooth="yes" name="at02"/>
       <point x="811" y="1556"/>
       <point x="843" y="1533"/>
       <point x="864" y="1510" type="curve" smooth="yes"/>
       <point x="891" y="1479"/>
       <point x="901" y="1443"/>
-      <point x="901" y="1403" type="curve" name="dh02" smooth="yes"/>
+      <point x="901" y="1403" type="curve" smooth="yes" name="dh02"/>
       <point x="901" y="1375"/>
       <point x="895" y="1348"/>
       <point x="887" y="1329" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/existential.glif b/source/Hack-BoldItalic.ufo/glyphs/existential.glif
index 3c20b3963..3f47619b5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/existential.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/existential.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="existential" format="1">
+<glyph name="existential" format="2">
   <advance width="1233"/>
   <unicode hex="2203"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/f.glif b/source/Hack-BoldItalic.ufo/glyphs/f.glif
index b018a604c..950e96de9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/f.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/f.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="f" format="1">
+<glyph name="f" format="2">
   <advance width="1233"/>
   <unicode hex="0066"/>
   <outline>
@@ -27,9 +27,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/figuredash.glif b/source/Hack-BoldItalic.ufo/glyphs/figuredash.glif
index 6ff9d4832..48a97cf4e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/figuredash.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/figuredash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="figuredash" format="1">
+<glyph name="figuredash" format="2">
   <advance width="1233"/>
   <unicode hex="2012"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/filledbox.glif b/source/Hack-BoldItalic.ufo/glyphs/filledbox.glif
index ce4481119..a7028df70 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/filledbox.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/filledbox.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="filledbox" format="1">
+<glyph name="filledbox" format="2">
   <advance width="1233"/>
   <unicode hex="25A0"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/filledrect.glif b/source/Hack-BoldItalic.ufo/glyphs/filledrect.glif
index 2dfc9ac67..eca6c2868 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/filledrect.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/filledrect.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="filledrect" format="1">
+<glyph name="filledrect" format="2">
   <advance width="1233"/>
   <unicode hex="25AC"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/five.glif b/source/Hack-BoldItalic.ufo/glyphs/five.glif
index c04f82745..19e4169f1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/five.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/five.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="five" format="1">
+<glyph name="five" format="2">
   <advance width="1233"/>
   <unicode hex="0035"/>
   <outline>
     <contour>
-      <point x="387" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="387" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="324" y="-29"/>
       <point x="261" y="-24"/>
       <point x="197" y="-13" type="curve" smooth="yes"/>
@@ -17,16 +17,16 @@
       <point x="213" y="240" type="curve" smooth="yes"/>
       <point x="270" y="225"/>
       <point x="331" y="219"/>
-      <point x="391" y="219" type="curve" name="dv01" smooth="yes"/>
+      <point x="391" y="219" type="curve" smooth="yes" name="dv01"/>
       <point x="511" y="219"/>
       <point x="600" y="246"/>
       <point x="665" y="298" type="curve" smooth="yes"/>
       <point x="732" y="351"/>
       <point x="764" y="424"/>
-      <point x="764" y="509" type="curve" name="dh01" smooth="yes"/>
+      <point x="764" y="509" type="curve" smooth="yes" name="dh01"/>
       <point x="764" y="653"/>
       <point x="663" y="737"/>
-      <point x="498" y="737" type="curve" name="dv02" smooth="yes"/>
+      <point x="498" y="737" type="curve" smooth="yes" name="dv02"/>
       <point x="449" y="737"/>
       <point x="397" y="730"/>
       <point x="340" y="717" type="curve" smooth="yes"/>
@@ -43,13 +43,13 @@
       <point x="544" y="975" type="curve" smooth="yes"/>
       <point x="568" y="979"/>
       <point x="594" y="981"/>
-      <point x="622" y="981" type="curve" name="dv03" smooth="yes"/>
+      <point x="622" y="981" type="curve" smooth="yes" name="dv03"/>
       <point x="754" y="981"/>
       <point x="863" y="938"/>
       <point x="936" y="865" type="curve" smooth="yes"/>
       <point x="1011" y="790"/>
       <point x="1051" y="684"/>
-      <point x="1051" y="545" type="curve" name="dh02" smooth="yes"/>
+      <point x="1051" y="545" type="curve" smooth="yes" name="dh02"/>
       <point x="1051" y="376"/>
       <point x="992" y="231"/>
       <point x="873" y="127" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/five.subs.glif b/source/Hack-BoldItalic.ufo/glyphs/five.subs.glif
index 0ef7d5a6f..d2347329c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/five.subs.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/five.subs.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="five.subs" format="1">
+<glyph name="five.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="507" y="-425" type="curve" name="hr00" smooth="yes"/>
+      <point x="507" y="-425" type="curve" smooth="yes" name="hr00"/>
       <point x="416" y="-425"/>
       <point x="317" y="-413"/>
       <point x="237" y="-390" type="curve"/>
       <point x="273" y="-241" type="line"/>
       <point x="341" y="-270"/>
       <point x="423" y="-287"/>
-      <point x="508" y="-287" type="curve" name="sv01" smooth="yes"/>
+      <point x="508" y="-287" type="curve" smooth="yes" name="sv01"/>
       <point x="672" y="-287"/>
       <point x="775" y="-224"/>
-      <point x="775" y="-125" type="curve" name="dh01" smooth="yes"/>
+      <point x="775" y="-125" type="curve" smooth="yes" name="dh01"/>
       <point x="775" y="-44"/>
       <point x="707" y="3"/>
-      <point x="584" y="3" type="curve" name="dv03" smooth="yes"/>
+      <point x="584" y="3" type="curve" smooth="yes" name="dv03"/>
       <point x="515" y="3"/>
       <point x="435" y="-12"/>
       <point x="359" y="-40" type="curve"/>
@@ -27,10 +27,10 @@
       <point x="570" y="126" type="line" name="iv01"/>
       <point x="601" y="135"/>
       <point x="634" y="140"/>
-      <point x="677" y="140" type="curve" name="dv04" smooth="yes"/>
+      <point x="677" y="140" type="curve" smooth="yes" name="dv04"/>
       <point x="859" y="140"/>
       <point x="979" y="48"/>
-      <point x="979" y="-107" type="curve" name="dh02" smooth="yes"/>
+      <point x="979" y="-107" type="curve" smooth="yes" name="dh02"/>
       <point x="979" y="-296"/>
       <point x="799" y="-425"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/fiveeighths.glif b/source/Hack-BoldItalic.ufo/glyphs/fiveeighths.glif
index 3e908b6b6..9090f0ce7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/fiveeighths.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/fiveeighths.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="fiveeighths" format="1">
+<glyph name="fiveeighths" format="2">
   <advance width="1233"/>
   <unicode hex="215D"/>
   <outline>
     <contour>
-      <point x="279" y="809" type="curve" name="dv11" smooth="yes"/>
+      <point x="279" y="809" type="curve" smooth="yes" name="dv11"/>
       <point x="188" y="809"/>
       <point x="89" y="821"/>
       <point x="9" y="844" type="curve"/>
       <point x="45" y="993" type="line"/>
       <point x="113" y="964"/>
       <point x="195" y="947"/>
-      <point x="280" y="947" type="curve" name="dv12" smooth="yes"/>
+      <point x="280" y="947" type="curve" smooth="yes" name="dv12"/>
       <point x="444" y="947"/>
       <point x="547" y="1010"/>
-      <point x="547" y="1109" type="curve" name="ih01" smooth="yes"/>
+      <point x="547" y="1109" type="curve" smooth="yes" name="ih01"/>
       <point x="547" y="1190"/>
       <point x="479" y="1237"/>
-      <point x="356" y="1237" type="curve" name="dv07" smooth="yes"/>
+      <point x="356" y="1237" type="curve" smooth="yes" name="dv07"/>
       <point x="287" y="1237"/>
       <point x="207" y="1222"/>
       <point x="131" y="1194" type="curve" name="hr01"/>
@@ -28,10 +28,10 @@
       <point x="342" y="1360" type="line" name="iv01"/>
       <point x="373" y="1369"/>
       <point x="406" y="1374"/>
-      <point x="449" y="1374" type="curve" name="dv08" smooth="yes"/>
+      <point x="449" y="1374" type="curve" smooth="yes" name="dv08"/>
       <point x="631" y="1374"/>
       <point x="751" y="1282"/>
-      <point x="751" y="1127" type="curve" name="hr02" smooth="yes"/>
+      <point x="751" y="1127" type="curve" smooth="yes" name="hr02"/>
       <point x="751" y="938"/>
       <point x="571" y="809"/>
     </contour>
@@ -42,56 +42,56 @@
       <point x="84" y="500" type="line" name="hr03"/>
     </contour>
     <contour>
-      <point x="733" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="733" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="540" y="-285"/>
       <point x="425" y="-208"/>
-      <point x="425" y="-73" type="curve" name="dh01" smooth="yes"/>
+      <point x="425" y="-73" type="curve" smooth="yes" name="dh01"/>
       <point x="425" y="55"/>
       <point x="528" y="147"/>
       <point x="688" y="179" type="curve" name="ih02"/>
       <point x="584" y="200"/>
       <point x="538" y="257"/>
-      <point x="538" y="333" type="curve" name="sh02" smooth="yes"/>
+      <point x="538" y="333" type="curve" smooth="yes" name="sh02"/>
       <point x="538" y="472"/>
       <point x="698" y="582"/>
-      <point x="899" y="582" type="curve" name="dv10" smooth="yes"/>
+      <point x="899" y="582" type="curve" smooth="yes" name="dv10"/>
       <point x="1070" y="582"/>
       <point x="1187" y="502"/>
-      <point x="1187" y="381" type="curve" name="sh04" smooth="yes"/>
+      <point x="1187" y="381" type="curve" smooth="yes" name="sh04"/>
       <point x="1187" y="278"/>
       <point x="1100" y="191"/>
       <point x="954" y="172" type="curve" name="hr04"/>
       <point x="1061" y="148"/>
       <point x="1118" y="87"/>
-      <point x="1118" y="-13" type="curve" name="dh04" smooth="yes"/>
+      <point x="1118" y="-13" type="curve" smooth="yes" name="dh04"/>
       <point x="1118" y="-176"/>
       <point x="962" y="-285"/>
     </contour>
     <contour>
-      <point x="844" y="237" type="curve" name="dv06" smooth="yes"/>
+      <point x="844" y="237" type="curve" smooth="yes" name="dv06"/>
       <point x="930" y="237"/>
       <point x="1002" y="287"/>
-      <point x="1002" y="358" type="curve" name="sh03" smooth="yes"/>
+      <point x="1002" y="358" type="curve" smooth="yes" name="sh03"/>
       <point x="1002" y="415"/>
       <point x="956" y="450"/>
-      <point x="881" y="450" type="curve" name="dv09" smooth="yes"/>
+      <point x="881" y="450" type="curve" smooth="yes" name="dv09"/>
       <point x="789" y="450"/>
       <point x="724" y="399"/>
-      <point x="724" y="331" type="curve" name="sh01" smooth="yes"/>
+      <point x="724" y="331" type="curve" smooth="yes" name="sh01"/>
       <point x="724" y="275"/>
       <point x="768" y="237"/>
     </contour>
     <contour>
-      <point x="753" y="-152" type="curve" name="dv02" smooth="yes"/>
+      <point x="753" y="-152" type="curve" smooth="yes" name="dv02"/>
       <point x="858" y="-152"/>
       <point x="932" y="-90"/>
-      <point x="932" y="-6" type="curve" name="dh03" smooth="yes"/>
+      <point x="932" y="-6" type="curve" smooth="yes" name="dh03"/>
       <point x="932" y="66"/>
       <point x="877" y="105"/>
-      <point x="793" y="105" type="curve" name="dv05" smooth="yes"/>
+      <point x="793" y="105" type="curve" smooth="yes" name="dv05"/>
       <point x="684" y="105"/>
       <point x="611" y="40"/>
-      <point x="611" y="-41" type="curve" name="dh02" smooth="yes"/>
+      <point x="611" y="-41" type="curve" smooth="yes" name="dh02"/>
       <point x="611" y="-117"/>
       <point x="675" y="-152"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/florin.glif b/source/Hack-BoldItalic.ufo/glyphs/florin.glif
index 6feb24fd2..563cbb34e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/florin.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/florin.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="florin" format="1">
+<glyph name="florin" format="2">
   <advance width="1233"/>
   <unicode hex="0192"/>
   <outline>
     <contour>
-      <point x="270" y="-426" type="curve" name="hr00" smooth="yes"/>
+      <point x="270" y="-426" type="curve" smooth="yes" name="hr00"/>
       <point x="191" y="-426"/>
       <point x="119" y="-411"/>
       <point x="42" y="-375" type="curve"/>
@@ -14,7 +14,7 @@
       <point x="125" y="-182" type="curve" smooth="yes"/>
       <point x="151" y="-191"/>
       <point x="178" y="-195"/>
-      <point x="205" y="-195" type="curve" name="sv01" smooth="yes"/>
+      <point x="205" y="-195" type="curve" smooth="yes" name="sv01"/>
       <point x="268" y="-195"/>
       <point x="317" y="-175"/>
       <point x="352" y="-135" type="curve" smooth="yes"/>
@@ -31,10 +31,10 @@
       <point x="695" y="1458" type="curve" smooth="yes"/>
       <point x="763" y="1523"/>
       <point x="852" y="1556"/>
-      <point x="956" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="956" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="993" y="1556"/>
       <point x="1037" y="1552"/>
-      <point x="1072" y="1544" type="curve" name="at02" smooth="yes"/>
+      <point x="1072" y="1544" type="curve" smooth="yes" name="at02"/>
       <point x="1103" y="1537"/>
       <point x="1148" y="1521"/>
       <point x="1183" y="1505" type="curve"/>
@@ -44,7 +44,7 @@
       <point x="1101" y="1312" type="curve" smooth="yes"/>
       <point x="1075" y="1321"/>
       <point x="1049" y="1325"/>
-      <point x="1022" y="1325" type="curve" name="sv02" smooth="yes"/>
+      <point x="1022" y="1325" type="curve" smooth="yes" name="sv02"/>
       <point x="960" y="1325"/>
       <point x="912" y="1305"/>
       <point x="878" y="1265" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/four.glif b/source/Hack-BoldItalic.ufo/glyphs/four.glif
index 4be60f6b6..c355dd109 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/four.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/four.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="four" format="1">
+<glyph name="four" format="2">
   <advance width="1233"/>
   <unicode hex="0034"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/four.subs.glif b/source/Hack-BoldItalic.ufo/glyphs/four.subs.glif
index d1a98eba5..5e98f8911 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/four.subs.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/four.subs.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="four.subs" format="1">
+<glyph name="four.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/franc.glif b/source/Hack-BoldItalic.ufo/glyphs/franc.glif
index 99fb31732..51099a19f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/franc.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/franc.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="franc" format="1">
+<glyph name="franc" format="2">
   <advance width="1233"/>
   <unicode hex="20A3"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/g.glif b/source/Hack-BoldItalic.ufo/glyphs/g.glif
index 5309d5d65..87fe27a7e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/g.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/g.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="g" format="1">
+<glyph name="g" format="2">
   <advance width="1233"/>
   <unicode hex="0067"/>
   <outline>
@@ -50,9 +50,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/gamma.glif b/source/Hack-BoldItalic.ufo/glyphs/gamma.glif
index ca1e24193..7b5c13c40 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/gamma.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/gamma.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gamma" format="1">
+<glyph name="gamma" format="2">
   <advance width="1233"/>
   <unicode hex="03B3"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/gbreve.glif b/source/Hack-BoldItalic.ufo/glyphs/gbreve.glif
index 5c6984a16..ad5910d89 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/gbreve.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/gbreve.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gbreve" format="1">
+<glyph name="gbreve" format="2">
   <advance width="1233"/>
   <unicode hex="011F"/>
   <outline>
     <contour>
-      <point x="749" y="1301" type="curve" name="dv01" smooth="yes"/>
+      <point x="749" y="1301" type="curve" smooth="yes" name="dv01"/>
       <point x="652" y="1301"/>
       <point x="579" y="1323"/>
       <point x="530" y="1367" type="curve" smooth="yes"/>
@@ -19,7 +19,7 @@
       <point x="644" y="1488" type="curve" smooth="yes"/>
       <point x="673" y="1464"/>
       <point x="713" y="1452"/>
-      <point x="764" y="1452" type="curve" name="dv02" smooth="yes"/>
+      <point x="764" y="1452" type="curve" smooth="yes" name="dv02"/>
       <point x="818" y="1452"/>
       <point x="865" y="1465"/>
       <point x="904" y="1491" type="curve" smooth="yes"/>
@@ -34,7 +34,7 @@
       <point x="852" y="1301"/>
     </contour>
     <contour>
-      <point x="386" y="-424" type="curve" name="hr01" smooth="yes"/>
+      <point x="386" y="-424" type="curve" smooth="yes" name="hr01"/>
       <point x="320" y="-424"/>
       <point x="257" y="-419"/>
       <point x="196" y="-409" type="curve" smooth="yes"/>
@@ -44,10 +44,10 @@
       <point x="72" y="-100" type="line" name="ih01"/>
       <point x="123" y="-131"/>
       <point x="175" y="-153"/>
-      <point x="230" y="-168" type="curve" name="hr02" smooth="yes"/>
+      <point x="230" y="-168" type="curve" smooth="yes" name="hr02"/>
       <point x="286" y="-183"/>
       <point x="341" y="-190"/>
-      <point x="396" y="-190" type="curve" name="sv03" smooth="yes"/>
+      <point x="396" y="-190" type="curve" smooth="yes" name="sv03"/>
       <point x="484" y="-190"/>
       <point x="548" y="-171"/>
       <point x="595" y="-132" type="curve" smooth="yes"/>
@@ -60,13 +60,13 @@
       <point x="584" y="59" type="curve" smooth="yes"/>
       <point x="533" y="30"/>
       <point x="474" y="16"/>
-      <point x="409" y="16" type="curve" name="dv03" smooth="yes"/>
+      <point x="409" y="16" type="curve" smooth="yes" name="dv03"/>
       <point x="308" y="16"/>
       <point x="226" y="48"/>
       <point x="161" y="121" type="curve" smooth="yes"/>
       <point x="97" y="193"/>
       <point x="68" y="282"/>
-      <point x="68" y="407" type="curve" name="dh01" smooth="yes"/>
+      <point x="68" y="407" type="curve" smooth="yes" name="dh01"/>
       <point x="68" y="494"/>
       <point x="82" y="588"/>
       <point x="110" y="683" type="curve" smooth="yes"/>
@@ -75,7 +75,7 @@
       <point x="225" y="932" type="curve" smooth="yes"/>
       <point x="320" y="1069"/>
       <point x="461" y="1151"/>
-      <point x="602" y="1151" type="curve" name="dv06" smooth="yes"/>
+      <point x="602" y="1151" type="curve" smooth="yes" name="dv06"/>
       <point x="742" y="1151"/>
       <point x="834" y="1075"/>
       <point x="862" y="938" type="curve" name="iv01"/>
@@ -89,25 +89,25 @@
       <point x="568" y="-424"/>
     </contour>
     <contour>
-      <point x="521" y="246" type="curve" name="dv04" smooth="yes"/>
+      <point x="521" y="246" type="curve" smooth="yes" name="dv04"/>
       <point x="594" y="246"/>
       <point x="664" y="291"/>
       <point x="720" y="379" type="curve"/>
       <point x="776" y="470"/>
       <point x="803" y="584"/>
-      <point x="803" y="689" type="curve" name="sh01" smooth="yes"/>
+      <point x="803" y="689" type="curve" smooth="yes" name="sh01"/>
       <point x="803" y="757"/>
       <point x="793" y="815"/>
-      <point x="762" y="855" type="curve" name="hr03" smooth="yes"/>
+      <point x="762" y="855" type="curve" smooth="yes" name="hr03"/>
       <point x="735" y="891"/>
       <point x="696" y="909"/>
-      <point x="649" y="909" type="curve" name="dv05" smooth="yes"/>
+      <point x="649" y="909" type="curve" smooth="yes" name="dv05"/>
       <point x="573" y="909"/>
       <point x="502" y="861"/>
       <point x="450" y="777" type="curve" smooth="yes"/>
       <point x="394" y="689"/>
       <point x="367" y="573"/>
-      <point x="367" y="465" type="curve" name="hr04" smooth="yes"/>
+      <point x="367" y="465" type="curve" smooth="yes" name="hr04"/>
       <point x="367" y="397"/>
       <point x="378" y="340"/>
       <point x="407" y="301" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/gcaron.glif b/source/Hack-BoldItalic.ufo/glyphs/gcaron.glif
index dcb143ce4..49f6efea9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/gcaron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/gcaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gcaron" format="1">
+<glyph name="gcaron" format="2">
   <advance width="1233"/>
   <unicode hex="01E7"/>
   <outline>
@@ -13,30 +13,30 @@
       <point x="596" y="1301" type="line"/>
     </contour>
     <contour>
-      <point x="389" y="-424" type="curve" name="hr01" smooth="yes"/>
+      <point x="389" y="-424" type="curve" smooth="yes" name="hr01"/>
       <point x="252" y="-424"/>
       <point x="135" y="-404"/>
       <point x="18" y="-365" type="curve"/>
       <point x="72" y="-100" type="line" name="ih02"/>
       <point x="172" y="-160"/>
       <point x="284" y="-190"/>
-      <point x="395" y="-190" type="curve" name="hr02" smooth="yes"/>
+      <point x="395" y="-190" type="curve" smooth="yes" name="hr02"/>
       <point x="571" y="-190"/>
       <point x="656" y="-113"/>
       <point x="688" y="51" type="curve"/>
       <point x="715" y="184" type="line" name="ih03"/>
       <point x="640" y="69"/>
       <point x="536" y="16"/>
-      <point x="409" y="16" type="curve" name="dv01" smooth="yes"/>
+      <point x="409" y="16" type="curve" smooth="yes" name="dv01"/>
       <point x="201" y="16"/>
       <point x="68" y="161"/>
-      <point x="68" y="412" type="curve" name="dh01" smooth="yes"/>
+      <point x="68" y="412" type="curve" smooth="yes" name="dh01"/>
       <point x="68" y="584"/>
       <point x="132" y="796"/>
       <point x="225" y="932" type="curve" smooth="yes"/>
       <point x="321" y="1071"/>
       <point x="459" y="1151"/>
-      <point x="603" y="1151" type="curve" name="dv04" smooth="yes"/>
+      <point x="603" y="1151" type="curve" smooth="yes" name="dv04"/>
       <point x="742" y="1151"/>
       <point x="834" y="1075"/>
       <point x="862" y="938" type="curve" name="iv01"/>
@@ -47,16 +47,16 @@
       <point x="749" y="-424"/>
     </contour>
     <contour>
-      <point x="516" y="246" type="curve" name="dv02" smooth="yes"/>
+      <point x="516" y="246" type="curve" smooth="yes" name="dv02"/>
       <point x="675" y="246"/>
       <point x="803" y="457"/>
-      <point x="803" y="684" type="curve" name="sh01" smooth="yes"/>
+      <point x="803" y="684" type="curve" smooth="yes" name="sh01"/>
       <point x="803" y="837"/>
       <point x="745" y="909"/>
-      <point x="653" y="909" type="curve" name="dv03" smooth="yes"/>
+      <point x="653" y="909" type="curve" smooth="yes" name="dv03"/>
       <point x="496" y="909"/>
       <point x="367" y="702"/>
-      <point x="367" y="471" type="curve" name="dh02" smooth="yes"/>
+      <point x="367" y="471" type="curve" smooth="yes" name="dh02"/>
       <point x="367" y="318"/>
       <point x="423" y="246"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/gcircumflex.glif b/source/Hack-BoldItalic.ufo/glyphs/gcircumflex.glif
index 29b7e26cb..6b11d7168 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/gcircumflex.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/gcircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gcircumflex" format="1">
+<glyph name="gcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="011D"/>
   <outline>
@@ -27,7 +27,7 @@
       <point x="711" y="172" type="line"/>
       <point x="631" y="65"/>
       <point x="529" y="14"/>
-      <point x="394" y="14" type="curve" name="hr01" smooth="yes"/>
+      <point x="394" y="14" type="curve" smooth="yes" name="hr01"/>
       <point x="185" y="14"/>
       <point x="65" y="154"/>
       <point x="65" y="395" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="84" y="573" type="curve"/>
       <point x="106" y="689"/>
       <point x="142" y="790"/>
-      <point x="193" y="876" type="curve" name="hr02" smooth="yes"/>
+      <point x="193" y="876" type="curve" smooth="yes" name="hr02"/>
       <point x="294" y="1049"/>
       <point x="446" y="1149"/>
       <point x="609" y="1149" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/gdotaccent.glif b/source/Hack-BoldItalic.ufo/glyphs/gdotaccent.glif
index d8633e8b0..bf9c7d248 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/gdotaccent.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/gdotaccent.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gdotaccent" format="1">
+<glyph name="gdotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="0121"/>
   <outline>
     <contour>
-      <point x="647" y="1351" type="line" name="dv01" smooth="yes"/>
+      <point x="647" y="1351" type="line" smooth="yes" name="dv01"/>
       <point x="626" y="1351"/>
       <point x="617" y="1364"/>
       <point x="621" y="1384" type="curve" smooth="yes"/>
       <point x="658" y="1570" type="line"/>
       <point x="661" y="1588"/>
       <point x="671" y="1597"/>
-      <point x="690" y="1597" type="curve" name="dv02" smooth="yes"/>
+      <point x="690" y="1597" type="curve" smooth="yes" name="dv02"/>
       <point x="902" y="1597" type="line" smooth="yes"/>
       <point x="922" y="1597"/>
       <point x="933" y="1584"/>
@@ -19,33 +19,33 @@
       <point x="893" y="1378" type="line" smooth="yes"/>
       <point x="890" y="1360"/>
       <point x="879" y="1351"/>
-      <point x="861" y="1351" type="curve" name="hr01" smooth="yes"/>
+      <point x="861" y="1351" type="curve" smooth="yes" name="hr01"/>
     </contour>
     <contour>
-      <point x="389" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="389" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="252" y="-424"/>
       <point x="135" y="-404"/>
       <point x="18" y="-365" type="curve"/>
       <point x="72" y="-100" type="line" name="hr02"/>
       <point x="172" y="-160"/>
       <point x="284" y="-190"/>
-      <point x="395" y="-190" type="curve" name="sv01" smooth="yes"/>
+      <point x="395" y="-190" type="curve" smooth="yes" name="sv01"/>
       <point x="571" y="-190"/>
       <point x="656" y="-113"/>
       <point x="688" y="51" type="curve"/>
       <point x="715" y="184" type="line" name="ih01"/>
       <point x="640" y="69"/>
       <point x="536" y="16"/>
-      <point x="409" y="16" type="curve" name="dv03" smooth="yes"/>
+      <point x="409" y="16" type="curve" smooth="yes" name="dv03"/>
       <point x="201" y="16"/>
       <point x="68" y="161"/>
-      <point x="68" y="412" type="curve" name="dh01" smooth="yes"/>
+      <point x="68" y="412" type="curve" smooth="yes" name="dh01"/>
       <point x="68" y="584"/>
       <point x="132" y="796"/>
       <point x="225" y="932" type="curve" smooth="yes"/>
       <point x="321" y="1071"/>
       <point x="459" y="1151"/>
-      <point x="603" y="1151" type="curve" name="dv06" smooth="yes"/>
+      <point x="603" y="1151" type="curve" smooth="yes" name="dv06"/>
       <point x="742" y="1151"/>
       <point x="834" y="1075"/>
       <point x="862" y="938" type="curve" name="iv01"/>
@@ -56,16 +56,16 @@
       <point x="749" y="-424"/>
     </contour>
     <contour>
-      <point x="516" y="246" type="curve" name="dv04" smooth="yes"/>
+      <point x="516" y="246" type="curve" smooth="yes" name="dv04"/>
       <point x="675" y="246"/>
       <point x="803" y="457"/>
-      <point x="803" y="684" type="curve" name="sh01" smooth="yes"/>
+      <point x="803" y="684" type="curve" smooth="yes" name="sh01"/>
       <point x="803" y="837"/>
       <point x="745" y="909"/>
-      <point x="653" y="909" type="curve" name="dv05" smooth="yes"/>
+      <point x="653" y="909" type="curve" smooth="yes" name="dv05"/>
       <point x="496" y="909"/>
       <point x="367" y="702"/>
-      <point x="367" y="471" type="curve" name="dh02" smooth="yes"/>
+      <point x="367" y="471" type="curve" smooth="yes" name="dh02"/>
       <point x="367" y="318"/>
       <point x="423" y="246"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/germandbls.glif b/source/Hack-BoldItalic.ufo/glyphs/germandbls.glif
index 7c5a2101a..7e9179c49 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/germandbls.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/germandbls.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="germandbls" format="1">
+<glyph name="germandbls" format="2">
   <advance width="1233"/>
   <unicode hex="00DF"/>
   <outline>
     <contour>
-      <point x="666" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="666" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="613" y="-29"/>
       <point x="576" y="-24"/>
       <point x="535" y="-16" type="curve" smooth="yes"/>
@@ -17,10 +17,10 @@
       <point x="567" y="223" type="curve" smooth="yes"/>
       <point x="601" y="212"/>
       <point x="635" y="207"/>
-      <point x="669" y="207" type="curve" name="dv02" smooth="yes"/>
+      <point x="669" y="207" type="curve" smooth="yes" name="dv02"/>
       <point x="784" y="207"/>
       <point x="860" y="269"/>
-      <point x="860" y="347" type="curve" name="ah01" smooth="yes"/>
+      <point x="860" y="347" type="curve" smooth="yes" name="ah01"/>
       <point x="860" y="402"/>
       <point x="824" y="456"/>
       <point x="749" y="531" type="curve" smooth="yes"/>
@@ -31,20 +31,20 @@
       <point x="609" y="705" type="curve" smooth="yes"/>
       <point x="595" y="739"/>
       <point x="588" y="776"/>
-      <point x="588" y="817" type="curve" name="sh01" smooth="yes"/>
+      <point x="588" y="817" type="curve" smooth="yes" name="sh01"/>
       <point x="588" y="905"/>
       <point x="619" y="981"/>
       <point x="680" y="1044" type="curve" smooth="yes"/>
       <point x="741" y="1106"/>
       <point x="827" y="1149"/>
       <point x="940" y="1174" type="curve"/>
-      <point x="940" y="1190" type="line" name="hr01" smooth="yes"/>
+      <point x="940" y="1190" type="line" smooth="yes" name="hr01"/>
       <point x="940" y="1229"/>
       <point x="927" y="1265"/>
       <point x="895" y="1290" type="curve" smooth="yes"/>
       <point x="864" y="1313"/>
       <point x="823" y="1325"/>
-      <point x="770" y="1325" type="curve" name="sv01" smooth="yes"/>
+      <point x="770" y="1325" type="curve" smooth="yes" name="sv01"/>
       <point x="643" y="1325"/>
       <point x="568" y="1257"/>
       <point x="541" y="1122" type="curve" smooth="yes"/>
@@ -56,27 +56,27 @@
       <point x="421" y="1449" type="curve" smooth="yes"/>
       <point x="508" y="1522"/>
       <point x="624" y="1559"/>
-      <point x="767" y="1559" type="curve" name="at01" smooth="yes"/>
+      <point x="767" y="1559" type="curve" smooth="yes" name="at01"/>
       <point x="1028" y="1559"/>
       <point x="1157" y="1439"/>
-      <point x="1157" y="1215" type="curve" name="sh03" smooth="yes"/>
+      <point x="1157" y="1215" type="curve" smooth="yes" name="sh03"/>
       <point x="1157" y="1176"/>
       <point x="1153" y="1133"/>
-      <point x="1146" y="1065" type="curve" name="sh04" smooth="yes"/>
+      <point x="1146" y="1065" type="curve" smooth="yes" name="sh04"/>
       <point x="1145" y="1059" type="line"/>
       <point x="955" y="1049"/>
       <point x="848" y="976"/>
-      <point x="848" y="875" type="curve" name="sh05" smooth="yes"/>
+      <point x="848" y="875" type="curve" smooth="yes" name="sh05"/>
       <point x="848" y="831"/>
       <point x="873" y="786"/>
-      <point x="944" y="715" type="curve" name="hr02" smooth="yes"/>
+      <point x="944" y="715" type="curve" smooth="yes" name="hr02"/>
       <point x="1026" y="633" type="line" smooth="yes"/>
       <point x="1065" y="593"/>
       <point x="1095" y="553"/>
       <point x="1114" y="512" type="curve" smooth="yes"/>
       <point x="1133" y="473"/>
       <point x="1143" y="431"/>
-      <point x="1143" y="374" type="curve" name="sh02" smooth="yes"/>
+      <point x="1143" y="374" type="curve" smooth="yes" name="sh02"/>
       <point x="1143" y="259"/>
       <point x="1100" y="157"/>
       <point x="1015" y="82" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/gradient.glif b/source/Hack-BoldItalic.ufo/glyphs/gradient.glif
index 8482d600a..b9eb751df 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/gradient.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/gradient.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gradient" format="1">
+<glyph name="gradient" format="2">
   <advance width="1233"/>
   <unicode hex="2207"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/grave.glif b/source/Hack-BoldItalic.ufo/glyphs/grave.glif
index 9d2f7e128..6ebd6140c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/grave.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="grave" format="1">
+<glyph name="grave" format="2">
   <advance width="1233"/>
   <unicode hex="0060"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/gravecomb.glif b/source/Hack-BoldItalic.ufo/glyphs/gravecomb.glif
index 48db4b3cc..9eb54cafc 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/gravecomb.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/gravecomb.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gravecomb" format="1">
-  <advance width="0"/>
+<glyph name="gravecomb" format="2">
   <unicode hex="0300"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/greater.glif b/source/Hack-BoldItalic.ufo/glyphs/greater.glif
index 4a52d67a0..3673982d2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/greater.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/greater.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="greater" format="1">
+<glyph name="greater" format="2">
   <advance width="1233"/>
   <unicode hex="003E"/>
   <outline>
     <contour>
-      <point x="88" y="358" type="line" name="hr00"/>
-      <point x="883" y="641" type="line" name="iv01"/>
-      <point x="88" y="926" type="line"/>
-      <point x="88" y="1176" type="line" name="av01"/>
+      <point x="88" y="268" type="line" name="hr00"/>
+      <point x="873" y="641" type="line" name="iv01"/>
+      <point x="88" y="1016" type="line"/>
+      <point x="88" y="1276" type="line" name="av01"/>
       <point x="1145" y="760" type="line"/>
       <point x="1145" y="524" type="line"/>
-      <point x="88" y="109" type="line" name="av02"/>
+      <point x="88" y="9" type="line" name="av02"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/greaterequal.glif b/source/Hack-BoldItalic.ufo/glyphs/greaterequal.glif
index 81ad922fb..48a419ba1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/greaterequal.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/greaterequal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="greaterequal" format="1">
+<glyph name="greaterequal" format="2">
   <advance width="1233"/>
   <unicode hex="2265"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/guillemotleft.glif b/source/Hack-BoldItalic.ufo/glyphs/guillemotleft.glif
index 7525c54d0..6772d386a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/guillemotleft.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/guillemotleft.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="guillemotleft" format="1">
+<glyph name="guillemotleft" format="2">
   <advance width="1233"/>
   <unicode hex="00AB"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/guillemotright.glif b/source/Hack-BoldItalic.ufo/glyphs/guillemotright.glif
index 90d4ec494..3d3331499 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/guillemotright.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/guillemotright.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="guillemotright" format="1">
+<glyph name="guillemotright" format="2">
   <advance width="1233"/>
   <unicode hex="00BB"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/guilsinglleft.glif b/source/Hack-BoldItalic.ufo/glyphs/guilsinglleft.glif
index 2bf646a76..bc503f52e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/guilsinglleft.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/guilsinglleft.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="guilsinglleft" format="1">
+<glyph name="guilsinglleft" format="2">
   <advance width="1233"/>
   <unicode hex="2039"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/guilsinglright.glif b/source/Hack-BoldItalic.ufo/glyphs/guilsinglright.glif
index e8d40d77b..1f215aaf5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/guilsinglright.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/guilsinglright.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="guilsinglright" format="1">
+<glyph name="guilsinglright" format="2">
   <advance width="1233"/>
   <unicode hex="203A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/h.glif b/source/Hack-BoldItalic.ufo/glyphs/h.glif
index 2833a264e..501525e2b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/h.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/h.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="h" format="1">
+<glyph name="h" format="2">
   <advance width="1233"/>
   <unicode hex="0068"/>
   <outline>
@@ -39,9 +39,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/hbar.glif b/source/Hack-BoldItalic.ufo/glyphs/hbar.glif
index 609f793d7..254ae18e6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/hbar.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/hbar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="hbar" format="1">
+<glyph name="hbar" format="2">
   <advance width="1233"/>
   <unicode hex="0127"/>
   <outline>
@@ -17,22 +17,22 @@
       <point x="497" y="952" type="line" name="iv01"/>
       <point x="565" y="1080"/>
       <point x="679" y="1147"/>
-      <point x="819" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="819" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="986" y="1147"/>
       <point x="1080" y="1051"/>
-      <point x="1080" y="878" type="curve" name="dh02" smooth="yes"/>
+      <point x="1080" y="878" type="curve" smooth="yes" name="dh02"/>
       <point x="1080" y="843"/>
       <point x="1076" y="803"/>
       <point x="1061" y="727" type="curve" smooth="yes"/>
       <point x="920" y="0" type="line" name="ab01"/>
       <point x="629" y="0" type="line"/>
-      <point x="761" y="682" type="line" name="hr01" smooth="yes"/>
+      <point x="761" y="682" type="line" smooth="yes" name="hr01"/>
       <point x="773" y="743"/>
       <point x="774" y="768"/>
-      <point x="774" y="784" type="curve" name="dh01" smooth="yes"/>
+      <point x="774" y="784" type="curve" smooth="yes" name="dh01"/>
       <point x="774" y="877"/>
       <point x="741" y="919"/>
-      <point x="665" y="919" type="curve" name="hr02" smooth="yes"/>
+      <point x="665" y="919" type="curve" smooth="yes" name="hr02"/>
       <point x="548" y="919"/>
       <point x="471" y="822"/>
       <point x="436" y="641" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/hcircumflex.glif b/source/Hack-BoldItalic.ufo/glyphs/hcircumflex.glif
index b5a661b7e..edfc40bf7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/hcircumflex.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/hcircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="hcircumflex" format="1">
+<glyph name="hcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0125"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/hookabovecomb.glif b/source/Hack-BoldItalic.ufo/glyphs/hookabovecomb.glif
index a137982b1..206446161 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/hookabovecomb.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/hookabovecomb.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="hookabovecomb" format="1">
-  <advance width="0"/>
+<glyph name="hookabovecomb" format="2">
   <unicode hex="0309"/>
   <outline>
     <contour>
@@ -10,7 +9,7 @@
       <point x="-589" y="1438" type="curve"/>
       <point x="-569" y="1453"/>
       <point x="-551" y="1490"/>
-      <point x="-551" y="1523" type="curve" name="dh01" smooth="yes"/>
+      <point x="-551" y="1523" type="curve" smooth="yes" name="dh01"/>
       <point x="-551" y="1550"/>
       <point x="-563" y="1574"/>
       <point x="-595" y="1583" type="curve" smooth="yes"/>
@@ -24,7 +23,7 @@
       <point x="-801" y="1712" type="line"/>
       <point x="-726" y="1729"/>
       <point x="-657" y="1738"/>
-      <point x="-594" y="1738" type="curve" name="dv01" smooth="yes"/>
+      <point x="-594" y="1738" type="curve" smooth="yes" name="dv01"/>
       <point x="-445" y="1738"/>
       <point x="-372" y="1690"/>
       <point x="-375" y="1593" type="curve" name="dh02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/hungarumlaut.glif b/source/Hack-BoldItalic.ufo/glyphs/hungarumlaut.glif
index 524bf9e8c..1ae385bd5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/hungarumlaut.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/hungarumlaut.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="hungarumlaut" format="1">
+<glyph name="hungarumlaut" format="2">
   <advance width="1233"/>
   <unicode hex="02DD"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/hyphen.glif b/source/Hack-BoldItalic.ufo/glyphs/hyphen.glif
index 1b6b9a884..2f75fae2a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/hyphen.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/hyphen.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="hyphen" format="1">
+<glyph name="hyphen" format="2">
   <advance width="1233"/>
   <unicode hex="002D"/>
   <outline>
     <contour>
-      <point x="259" y="746" type="line" name="hr00"/>
-      <point x="1048" y="746" type="line" name="dv02"/>
-      <point x="992" y="455" type="line" name="dv01"/>
-      <point x="204" y="455" type="line"/>
+      <point x="259" y="776" type="line" name="hr00"/>
+      <point x="1048" y="776" type="line" name="dv02"/>
+      <point x="992" y="485" type="line" name="dv01"/>
+      <point x="204" y="485" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
+      <string>2018-06-08 00:00:07 +0000</string>
     </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/hyphenationpoint.glif b/source/Hack-BoldItalic.ufo/glyphs/hyphenationpoint.glif
index a1a0d1fdd..68be9461f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/hyphenationpoint.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/hyphenationpoint.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="hyphenationpoint" format="1">
+<glyph name="hyphenationpoint" format="2">
   <advance width="1233"/>
   <unicode hex="2027"/>
   <outline>
     <contour>
-      <point x="616" y="576" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="576" type="curve" smooth="yes" name="hr00"/>
       <point x="525" y="576"/>
       <point x="454" y="645"/>
       <point x="454" y="745" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/i.glif b/source/Hack-BoldItalic.ufo/glyphs/i.glif
index fbe83b25f..ffb16ca9c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/i.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/i.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="i" format="1">
+<glyph name="i" format="2">
   <advance width="1233"/>
   <unicode hex="0069"/>
   <outline>
@@ -45,9 +45,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/iacute.glif b/source/Hack-BoldItalic.ufo/glyphs/iacute.glif
index 2338be10e..3a5784c44 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/iacute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/iacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="iacute" format="1">
+<glyph name="iacute" format="2">
   <advance width="1233"/>
   <unicode hex="00ED"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="544" y="1272" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="697" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="697" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="554" y="-8"/>
       <point x="464" y="10"/>
       <point x="407" y="49" type="curve" smooth="yes"/>
@@ -39,7 +39,7 @@
       <point x="652" y="236" type="curve" smooth="yes"/>
       <point x="673" y="223"/>
       <point x="709" y="217"/>
-      <point x="761" y="217" type="curve" name="sv02" smooth="yes"/>
+      <point x="761" y="217" type="curve" smooth="yes" name="sv02"/>
       <point x="1039" y="217" type="line"/>
       <point x="994" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ibreve.glif b/source/Hack-BoldItalic.ufo/glyphs/ibreve.glif
index d7af78133..c9e77f3be 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ibreve.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ibreve.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ibreve" format="1">
+<glyph name="ibreve" format="2">
   <advance width="1233"/>
   <unicode hex="012D"/>
   <outline>
     <contour>
-      <point x="719" y="1297" type="curve" name="dv01" smooth="yes"/>
+      <point x="719" y="1297" type="curve" smooth="yes" name="dv01"/>
       <point x="528" y="1297"/>
       <point x="429" y="1382"/>
       <point x="429" y="1561" type="curve" smooth="yes"/>
       <point x="429" y="1594" type="line" name="dh02"/>
       <point x="573" y="1594" type="line" name="sv01"/>
-      <point x="573" y="1581" type="line" name="dh03" smooth="yes"/>
+      <point x="573" y="1581" type="line" smooth="yes" name="dh03"/>
       <point x="573" y="1500"/>
       <point x="635" y="1448"/>
-      <point x="739" y="1448" type="curve" name="dv02" smooth="yes"/>
+      <point x="739" y="1448" type="curve" smooth="yes" name="dv02"/>
       <point x="844" y="1448"/>
       <point x="927" y="1502"/>
       <point x="960" y="1594" type="curve" name="sv02"/>
@@ -22,7 +22,7 @@
       <point x="935" y="1297"/>
     </contour>
     <contour>
-      <point x="732" y="-8" type="line" name="hr00" smooth="yes"/>
+      <point x="732" y="-8" type="line" smooth="yes" name="hr00"/>
       <point x="589" y="-8"/>
       <point x="499" y="10"/>
       <point x="442" y="49" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="687" y="236" type="curve" smooth="yes"/>
       <point x="708" y="223"/>
       <point x="744" y="217"/>
-      <point x="796" y="217" type="curve" name="sv02" smooth="yes"/>
+      <point x="796" y="217" type="curve" smooth="yes" name="sv02"/>
       <point x="1074" y="217" type="line" name="sv03"/>
       <point x="1029" y="-8" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/icircumflex.glif b/source/Hack-BoldItalic.ufo/glyphs/icircumflex.glif
index 6227ed5fa..8a8f4459a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/icircumflex.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/icircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="icircumflex" format="1">
+<glyph name="icircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00EE"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="264" y="1297" type="line" name="iv02"/>
     </contour>
     <contour>
-      <point x="700" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="700" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="557" y="-8"/>
       <point x="467" y="10"/>
       <point x="410" y="49" type="curve" smooth="yes"/>
@@ -42,7 +42,7 @@
       <point x="655" y="236" type="curve" smooth="yes"/>
       <point x="676" y="223"/>
       <point x="712" y="217"/>
-      <point x="764" y="217" type="curve" name="sv02" smooth="yes"/>
+      <point x="764" y="217" type="curve" smooth="yes" name="sv02"/>
       <point x="1042" y="217" type="line"/>
       <point x="997" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/idieresis.glif b/source/Hack-BoldItalic.ufo/glyphs/idieresis.glif
index edd1c68ef..498e34d23 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/idieresis.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/idieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="idieresis" format="1">
+<glyph name="idieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00EF"/>
   <outline>
     <contour>
-      <point x="395" y="1347" type="line" name="hr00" smooth="yes"/>
+      <point x="395" y="1347" type="line" smooth="yes" name="hr00"/>
       <point x="375" y="1347"/>
       <point x="364" y="1360"/>
       <point x="368" y="1380" type="curve" smooth="yes"/>
       <point x="404" y="1566" type="line"/>
       <point x="407" y="1584"/>
       <point x="417" y="1593"/>
-      <point x="436" y="1593" type="curve" name="at01" smooth="yes"/>
+      <point x="436" y="1593" type="curve" smooth="yes" name="at01"/>
       <point x="613" y="1593" type="line" smooth="yes"/>
       <point x="632" y="1593"/>
       <point x="634" y="1584"/>
@@ -25,14 +25,14 @@
       <point x="570" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="790" y="1347" type="line" name="sv01" smooth="yes"/>
+      <point x="790" y="1347" type="line" smooth="yes" name="sv01"/>
       <point x="770" y="1347"/>
       <point x="759" y="1360"/>
       <point x="763" y="1380" type="curve" smooth="yes"/>
       <point x="799" y="1566" type="line"/>
       <point x="802" y="1584"/>
       <point x="812" y="1593"/>
-      <point x="831" y="1593" type="curve" name="at02" smooth="yes"/>
+      <point x="831" y="1593" type="curve" smooth="yes" name="at02"/>
       <point x="1009" y="1593" type="line" smooth="yes"/>
       <point x="1028" y="1593"/>
       <point x="1030" y="1584"/>
@@ -43,10 +43,10 @@
       <point x="998" y="1374" type="line" smooth="yes"/>
       <point x="995" y="1356"/>
       <point x="984" y="1347"/>
-      <point x="966" y="1347" type="curve" name="sv02" smooth="yes"/>
+      <point x="966" y="1347" type="curve" smooth="yes" name="sv02"/>
     </contour>
     <contour>
-      <point x="718" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="718" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="575" y="-8"/>
       <point x="485" y="10"/>
       <point x="428" y="49" type="curve" smooth="yes"/>
@@ -75,7 +75,7 @@
       <point x="673" y="236" type="curve" smooth="yes"/>
       <point x="694" y="223"/>
       <point x="730" y="217"/>
-      <point x="782" y="217" type="curve" name="sv04" smooth="yes"/>
+      <point x="782" y="217" type="curve" smooth="yes" name="sv04"/>
       <point x="1060" y="217" type="line"/>
       <point x="1015" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/igrave.glif b/source/Hack-BoldItalic.ufo/glyphs/igrave.glif
index b207c8f9b..a737b56a9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/igrave.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/igrave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="igrave" format="1">
+<glyph name="igrave" format="2">
   <advance width="1233"/>
   <unicode hex="00EC"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="601" y="1272" type="line"/>
     </contour>
     <contour>
-      <point x="737" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="737" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="594" y="-8"/>
       <point x="504" y="10"/>
       <point x="447" y="49" type="curve" smooth="yes"/>
@@ -39,7 +39,7 @@
       <point x="692" y="236" type="curve" smooth="yes"/>
       <point x="713" y="223"/>
       <point x="749" y="217"/>
-      <point x="801" y="217" type="curve" name="sv02" smooth="yes"/>
+      <point x="801" y="217" type="curve" smooth="yes" name="sv02"/>
       <point x="1079" y="217" type="line"/>
       <point x="1034" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ij.glif b/source/Hack-BoldItalic.ufo/glyphs/ij.glif
index 3a41c29b9..f55a35a31 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ij.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ij.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ij" format="1">
+<glyph name="ij" format="2">
   <advance width="1233"/>
   <unicode hex="0133"/>
   <outline>
     <contour>
-      <point x="265" y="1274" type="curve" name="hr00" smooth="yes"/>
+      <point x="265" y="1274" type="curve" smooth="yes" name="hr00"/>
       <point x="265" y="1279"/>
       <point x="265" y="1282"/>
       <point x="266" y="1283" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/imacron.glif b/source/Hack-BoldItalic.ufo/glyphs/imacron.glif
index b4e3378e8..3c1ed1b10 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/imacron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/imacron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="imacron" format="1">
+<glyph name="imacron" format="2">
   <advance width="1233"/>
   <unicode hex="012B"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="330" y="1320" type="line"/>
     </contour>
     <contour>
-      <point x="717" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="717" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="574" y="-8"/>
       <point x="484" y="10"/>
       <point x="427" y="49" type="curve" smooth="yes"/>
@@ -39,7 +39,7 @@
       <point x="672" y="236" type="curve" smooth="yes"/>
       <point x="693" y="223"/>
       <point x="729" y="217"/>
-      <point x="781" y="217" type="curve" name="sv03" smooth="yes"/>
+      <point x="781" y="217" type="curve" smooth="yes" name="sv03"/>
       <point x="1059" y="217" type="line"/>
       <point x="1014" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/infinity.glif b/source/Hack-BoldItalic.ufo/glyphs/infinity.glif
index eb65a8231..e3f8cbeb0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/infinity.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/infinity.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="infinity" format="1">
+<glyph name="infinity" format="2">
   <advance width="1233"/>
   <unicode hex="221E"/>
   <outline>
     <contour>
-      <point x="331" y="223" type="curve" name="hr00" smooth="yes"/>
+      <point x="331" y="223" type="curve" smooth="yes" name="hr00"/>
       <point x="240" y="223"/>
       <point x="164" y="262"/>
       <point x="103" y="339" type="curve" smooth="yes"/>
       <point x="42" y="416"/>
       <point x="12" y="510"/>
-      <point x="12" y="634" type="curve" name="sh01" smooth="yes"/>
+      <point x="12" y="634" type="curve" smooth="yes" name="sh01"/>
       <point x="12" y="755"/>
       <point x="40" y="854"/>
       <point x="99" y="929" type="curve" smooth="yes"/>
       <point x="159" y="1006"/>
       <point x="236" y="1040"/>
-      <point x="328" y="1040" type="curve" name="dv03" smooth="yes"/>
+      <point x="328" y="1040" type="curve" smooth="yes" name="dv03"/>
       <point x="391" y="1040"/>
       <point x="447" y="1023"/>
       <point x="494" y="988" type="curve" smooth="yes"/>
@@ -28,19 +28,19 @@
       <point x="731" y="989" type="curve" smooth="yes"/>
       <point x="778" y="1023"/>
       <point x="834" y="1040"/>
-      <point x="901" y="1040" type="curve" name="sv01" smooth="yes"/>
+      <point x="901" y="1040" type="curve" smooth="yes" name="sv01"/>
       <point x="998" y="1040"/>
       <point x="1076" y="1003"/>
       <point x="1134" y="928" type="curve" smooth="yes"/>
       <point x="1192" y="853"/>
       <point x="1221" y="754"/>
-      <point x="1221" y="633" type="curve" name="sh02" smooth="yes"/>
+      <point x="1221" y="633" type="curve" smooth="yes" name="sh02"/>
       <point x="1221" y="510"/>
       <point x="1191" y="415"/>
       <point x="1131" y="338" type="curve" smooth="yes"/>
       <point x="1071" y="261"/>
       <point x="995" y="223"/>
-      <point x="904" y="223" type="curve" name="sv02" smooth="yes"/>
+      <point x="904" y="223" type="curve" smooth="yes" name="sv02"/>
       <point x="785" y="223"/>
       <point x="703" y="285"/>
       <point x="616" y="428" type="curve" name="ih02"/>
@@ -48,7 +48,7 @@
       <point x="448" y="223"/>
     </contour>
     <contour>
-      <point x="319" y="422" type="curve" name="dv01" smooth="yes"/>
+      <point x="319" y="422" type="curve" smooth="yes" name="dv01"/>
       <point x="355" y="422"/>
       <point x="388" y="439"/>
       <point x="419" y="474" type="curve" smooth="yes"/>
@@ -60,13 +60,13 @@
       <point x="415" y="801" type="curve" smooth="yes"/>
       <point x="388" y="830"/>
       <point x="360" y="842"/>
-      <point x="329" y="842" type="curve" name="dv02" smooth="yes"/>
+      <point x="329" y="842" type="curve" smooth="yes" name="dv02"/>
       <point x="289" y="842"/>
       <point x="256" y="820"/>
       <point x="233" y="785" type="curve" smooth="yes"/>
       <point x="209" y="748"/>
       <point x="195" y="693"/>
-      <point x="195" y="628" type="curve" name="sh03" smooth="yes"/>
+      <point x="195" y="628" type="curve" smooth="yes" name="sh03"/>
       <point x="195" y="571"/>
       <point x="206" y="517"/>
       <point x="229" y="478" type="curve" smooth="yes"/>
@@ -74,19 +74,19 @@
       <point x="281" y="422"/>
     </contour>
     <contour>
-      <point x="903" y="422" type="curve" name="sv03" smooth="yes"/>
+      <point x="903" y="422" type="curve" smooth="yes" name="sv03"/>
       <point x="942" y="422"/>
       <point x="975" y="443"/>
       <point x="999" y="480" type="curve" smooth="yes"/>
       <point x="1024" y="519"/>
       <point x="1036" y="572"/>
-      <point x="1036" y="635" type="curve" name="ah01" smooth="yes"/>
+      <point x="1036" y="635" type="curve" smooth="yes" name="ah01"/>
       <point x="1036" y="695"/>
       <point x="1026" y="746"/>
       <point x="1003" y="785" type="curve" smooth="yes"/>
       <point x="982" y="821"/>
       <point x="951" y="842"/>
-      <point x="912" y="842" type="curve" name="sv04" smooth="yes"/>
+      <point x="912" y="842" type="curve" smooth="yes" name="sv04"/>
       <point x="875" y="842"/>
       <point x="841" y="824"/>
       <point x="808" y="787" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/integral.glif b/source/Hack-BoldItalic.ufo/glyphs/integral.glif
index 3a8c8534b..3e335d594 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/integral.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/integral.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="integral" format="1">
+<glyph name="integral" format="2">
   <advance width="1233"/>
   <unicode hex="222B"/>
   <outline>
     <contour>
-      <point x="291" y="-373" type="curve" name="dv01" smooth="yes"/>
+      <point x="291" y="-373" type="curve" smooth="yes" name="dv01"/>
       <point x="222" y="-373"/>
       <point x="167" y="-355"/>
       <point x="131" y="-324" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="111" y="-98" type="curve" smooth="yes"/>
       <point x="136" y="-73"/>
       <point x="169" y="-61"/>
-      <point x="210" y="-61" type="curve" name="sv01" smooth="yes"/>
+      <point x="210" y="-61" type="curve" smooth="yes" name="sv01"/>
       <point x="247" y="-61"/>
       <point x="277" y="-71"/>
       <point x="301" y="-92" type="curve" smooth="yes"/>
@@ -28,19 +28,19 @@
       <point x="342" y="-237" type="curve" smooth="yes"/>
       <point x="345" y="-244"/>
       <point x="351" y="-252"/>
-      <point x="366" y="-252" type="curve" name="dv02" smooth="yes"/>
+      <point x="366" y="-252" type="curve" smooth="yes" name="dv02"/>
       <point x="443" y="-252"/>
       <point x="466" y="-40"/>
       <point x="485" y="387" type="curve"/>
       <point x="485" y="414"/>
       <point x="489" y="528"/>
-      <point x="492" y="599" type="curve" name="hr01" smooth="yes"/>
+      <point x="492" y="599" type="curve" smooth="yes" name="hr01"/>
       <point x="505" y="939"/>
       <point x="540" y="1175"/>
       <point x="615" y="1330" type="curve" smooth="yes"/>
       <point x="683" y="1471"/>
       <point x="788" y="1554"/>
-      <point x="941" y="1554" type="curve" name="at01" smooth="yes"/>
+      <point x="941" y="1554" type="curve" smooth="yes" name="at01"/>
       <point x="1008" y="1554"/>
       <point x="1061" y="1538"/>
       <point x="1100" y="1505" type="curve" smooth="yes"/>
@@ -52,7 +52,7 @@
       <point x="1121" y="1279" type="curve" smooth="yes"/>
       <point x="1096" y="1255"/>
       <point x="1060" y="1243"/>
-      <point x="1021" y="1243" type="curve" name="sv02" smooth="yes"/>
+      <point x="1021" y="1243" type="curve" smooth="yes" name="sv02"/>
       <point x="991" y="1243"/>
       <point x="966" y="1251"/>
       <point x="945" y="1267" type="curve" smooth="yes"/>
@@ -64,7 +64,7 @@
       <point x="896" y="1390" type="curve" smooth="yes"/>
       <point x="893" y="1410"/>
       <point x="890" y="1436"/>
-      <point x="867" y="1436" type="curve" name="sv03" smooth="yes"/>
+      <point x="867" y="1436" type="curve" smooth="yes" name="sv03"/>
       <point x="799" y="1436"/>
       <point x="762" y="1223"/>
       <point x="747" y="802" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/integralbt.glif b/source/Hack-BoldItalic.ufo/glyphs/integralbt.glif
index d53cd7c5a..9d55316f7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/integralbt.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/integralbt.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="integralbt" format="1">
+<glyph name="integralbt" format="2">
   <advance width="1233"/>
   <unicode hex="2321"/>
   <outline>
     <contour>
-      <point x="288" y="-490" type="curve" name="hr00" smooth="yes"/>
+      <point x="288" y="-490" type="curve" smooth="yes" name="hr00"/>
       <point x="153" y="-490"/>
       <point x="67" y="-419"/>
       <point x="67" y="-315" type="curve" smooth="yes"/>
@@ -19,19 +19,19 @@
       <point x="330" y="-326" type="curve" smooth="yes"/>
       <point x="333" y="-353"/>
       <point x="340" y="-372"/>
-      <point x="359" y="-372" type="curve" name="sv01" smooth="yes"/>
+      <point x="359" y="-372" type="curve" smooth="yes" name="sv01"/>
       <point x="422" y="-372"/>
       <point x="460" y="-166"/>
-      <point x="479" y="262" type="curve" name="sh01" smooth="yes"/>
+      <point x="479" y="262" type="curve" smooth="yes" name="sh01"/>
       <point x="483" y="357"/>
       <point x="485" y="416"/>
-      <point x="485" y="440" type="curve" name="dh01" smooth="yes"/>
+      <point x="485" y="440" type="curve" smooth="yes" name="dh01"/>
       <point x="485" y="1926" type="line" name="av01"/>
       <point x="741" y="1926" type="line"/>
-      <point x="741" y="677" type="line" name="dh02" smooth="yes"/>
+      <point x="741" y="677" type="line" smooth="yes" name="dh02"/>
       <point x="741" y="672"/>
       <point x="739" y="605"/>
-      <point x="734" y="465" type="curve" name="sh02" smooth="yes"/>
+      <point x="734" y="465" type="curve" smooth="yes" name="sh02"/>
       <point x="721" y="128"/>
       <point x="685" y="-113"/>
       <point x="612" y="-266" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/integraltp.glif b/source/Hack-BoldItalic.ufo/glyphs/integraltp.glif
index 6f8f3d3e1..ededd23c4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/integraltp.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/integraltp.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="integraltp" format="1">
+<glyph name="integraltp" format="2">
   <advance width="1233"/>
   <unicode hex="2320"/>
   <outline>
     <contour>
-      <point x="485" y="727" type="line" name="dh01" smooth="yes"/>
+      <point x="485" y="727" type="line" smooth="yes" name="dh01"/>
       <point x="485" y="732"/>
       <point x="487" y="799"/>
-      <point x="492" y="939" type="curve" name="sh01" smooth="yes"/>
+      <point x="492" y="939" type="curve" smooth="yes" name="sh01"/>
       <point x="505" y="1276"/>
       <point x="541" y="1517"/>
       <point x="614" y="1670" type="curve" smooth="yes"/>
       <point x="683" y="1815"/>
       <point x="794" y="1894"/>
-      <point x="938" y="1894" type="curve" name="dv02" smooth="yes"/>
+      <point x="938" y="1894" type="curve" smooth="yes" name="dv02"/>
       <point x="1073" y="1894"/>
       <point x="1159" y="1823"/>
       <point x="1159" y="1719" type="curve" smooth="yes"/>
       <point x="1159" y="1635"/>
       <point x="1104" y="1583"/>
-      <point x="1024" y="1583" type="curve" name="sv01" smooth="yes"/>
+      <point x="1024" y="1583" type="curve" smooth="yes" name="sv01"/>
       <point x="955" y="1583"/>
       <point x="916" y="1621"/>
       <point x="903" y="1676" type="curve" smooth="yes"/>
       <point x="900" y="1689"/>
       <point x="897" y="1711"/>
-      <point x="896" y="1730" type="curve" name="hr01" smooth="yes"/>
+      <point x="896" y="1730" type="curve" smooth="yes" name="hr01"/>
       <point x="893" y="1757"/>
       <point x="886" y="1776"/>
-      <point x="867" y="1776" type="curve" name="dv01" smooth="yes"/>
+      <point x="867" y="1776" type="curve" smooth="yes" name="dv01"/>
       <point x="804" y="1776"/>
       <point x="766" y="1570"/>
-      <point x="747" y="1142" type="curve" name="sh02" smooth="yes"/>
+      <point x="747" y="1142" type="curve" smooth="yes" name="sh02"/>
       <point x="743" y="1047"/>
       <point x="741" y="987"/>
-      <point x="741" y="964" type="curve" name="dh02" smooth="yes"/>
+      <point x="741" y="964" type="curve" smooth="yes" name="dh02"/>
       <point x="741" y="-512" type="line" name="av01"/>
       <point x="485" y="-512" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/intersection.glif b/source/Hack-BoldItalic.ufo/glyphs/intersection.glif
index 92bea0238..8bc6952f4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/intersection.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/intersection.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="intersection" format="1">
+<glyph name="intersection" format="2">
   <advance width="1233"/>
   <unicode hex="2229"/>
   <outline>
     <contour>
-      <point x="182" y="602" type="line" name="hr00" smooth="yes"/>
+      <point x="182" y="602" type="line" smooth="yes" name="hr00"/>
       <point x="182" y="1013"/>
       <point x="312" y="1186"/>
-      <point x="616" y="1186" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1186" type="curve" smooth="yes" name="dv02"/>
       <point x="920" y="1186"/>
       <point x="1050" y="1013"/>
       <point x="1050" y="602" type="curve" smooth="yes"/>
@@ -16,10 +16,10 @@
       <point x="799" y="676" type="line" smooth="yes"/>
       <point x="799" y="832"/>
       <point x="732" y="919"/>
-      <point x="616" y="919" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="919" type="curve" smooth="yes" name="dv01"/>
       <point x="500" y="919"/>
       <point x="433" y="832"/>
-      <point x="433" y="676" type="curve" name="sh02" smooth="yes"/>
+      <point x="433" y="676" type="curve" smooth="yes" name="sh02"/>
       <point x="433" y="0" type="line" name="ab01"/>
       <point x="182" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/invbullet.glif b/source/Hack-BoldItalic.ufo/glyphs/invbullet.glif
index e07eaa736..bf40bf663 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/invbullet.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/invbullet.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="invbullet" format="1">
+<glyph name="invbullet" format="2">
   <advance width="1233"/>
   <unicode hex="25D8"/>
   <outline>
@@ -10,25 +10,25 @@
       <point x="-20" y="-20" type="line" name="sh02"/>
     </contour>
     <contour>
-      <point x="615" y="399" type="curve" name="sv01" smooth="yes"/>
+      <point x="615" y="399" type="curve" smooth="yes" name="sv01"/>
       <point x="710" y="399"/>
       <point x="798" y="434"/>
       <point x="870" y="506" type="curve" smooth="yes"/>
       <point x="939" y="575"/>
       <point x="977" y="664"/>
-      <point x="977" y="763" type="curve" name="ah01" smooth="yes"/>
+      <point x="977" y="763" type="curve" smooth="yes" name="ah01"/>
       <point x="977" y="859"/>
       <point x="942" y="947"/>
       <point x="870" y="1016" type="curve" smooth="yes"/>
       <point x="802" y="1083"/>
       <point x="715" y="1120"/>
-      <point x="618" y="1120" type="curve" name="dv01" smooth="yes"/>
+      <point x="618" y="1120" type="curve" smooth="yes" name="dv01"/>
       <point x="518" y="1120"/>
       <point x="429" y="1081"/>
       <point x="362" y="1016" type="curve" smooth="yes"/>
       <point x="294" y="948"/>
       <point x="256" y="861"/>
-      <point x="256" y="761" type="curve" name="sh03" smooth="yes"/>
+      <point x="256" y="761" type="curve" smooth="yes" name="sh03"/>
       <point x="256" y="664"/>
       <point x="292" y="574"/>
       <point x="360" y="506" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/invcircle.glif b/source/Hack-BoldItalic.ufo/glyphs/invcircle.glif
index 6f676c198..73f1d490e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/invcircle.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/invcircle.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="invcircle" format="1">
+<glyph name="invcircle" format="2">
   <advance width="1233"/>
   <unicode hex="25D9"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="-20" y="-512" type="line"/>
     </contour>
     <contour>
-      <point x="617" y="-84" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="-84"/>
       <point x="818" y="-56"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="818" y="1120"/>
       <point x="710" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv03"/>
       <point x="524" y="1148"/>
       <point x="413" y="1119"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/iogonek.glif b/source/Hack-BoldItalic.ufo/glyphs/iogonek.glif
index 52fef58ff..b8c266e0d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/iogonek.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/iogonek.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="iogonek" format="1">
+<glyph name="iogonek" format="2">
   <advance width="1233"/>
   <unicode hex="012F"/>
   <outline>
     <contour>
-      <point x="544" y="1323" type="line" name="hr00" smooth="yes"/>
+      <point x="544" y="1323" type="line" smooth="yes" name="hr00"/>
       <point x="523" y="1323"/>
       <point x="513" y="1336"/>
       <point x="517" y="1356" type="curve" smooth="yes"/>
       <point x="573" y="1638" type="line"/>
       <point x="576" y="1656"/>
       <point x="586" y="1665"/>
-      <point x="605" y="1665" type="curve" name="dv03" smooth="yes"/>
+      <point x="605" y="1665" type="curve" smooth="yes" name="dv03"/>
       <point x="838" y="1665" type="line" smooth="yes"/>
       <point x="859" y="1665"/>
       <point x="869" y="1652"/>
@@ -28,20 +28,20 @@
       <point x="733" y="-115" type="curve" smooth="yes"/>
       <point x="717" y="-140"/>
       <point x="709" y="-160"/>
-      <point x="709" y="-180" type="curve" name="dh02" smooth="yes"/>
+      <point x="709" y="-180" type="curve" smooth="yes" name="dh02"/>
       <point x="709" y="-219"/>
       <point x="740" y="-252"/>
-      <point x="809" y="-252" type="curve" name="dv02" smooth="yes"/>
+      <point x="809" y="-252" type="curve" smooth="yes" name="dv02"/>
       <point x="845" y="-252"/>
       <point x="902" y="-244"/>
       <point x="965" y="-221" type="curve"/>
       <point x="934" y="-377" type="line"/>
       <point x="869" y="-392"/>
       <point x="806" y="-399"/>
-      <point x="755" y="-399" type="curve" name="dv01" smooth="yes"/>
+      <point x="755" y="-399" type="curve" smooth="yes" name="dv01"/>
       <point x="618" y="-399"/>
       <point x="535" y="-348"/>
-      <point x="535" y="-253" type="curve" name="dh01" smooth="yes"/>
+      <point x="535" y="-253" type="curve" smooth="yes" name="dh01"/>
       <point x="535" y="-182"/>
       <point x="580" y="-99"/>
       <point x="680" y="-8" type="curve" name="ih01"/>
@@ -73,7 +73,7 @@
       <point x="672" y="236" type="curve" smooth="yes"/>
       <point x="693" y="223"/>
       <point x="729" y="217"/>
-      <point x="781" y="217" type="curve" name="sv02" smooth="yes"/>
+      <point x="781" y="217" type="curve" smooth="yes" name="sv02"/>
       <point x="1059" y="217" type="line"/>
       <point x="1014" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/iota.glif b/source/Hack-BoldItalic.ufo/glyphs/iota.glif
index eb42124e5..e73e46ad3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/iota.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/iota.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="iota" format="1">
+<glyph name="iota" format="2">
   <advance width="1233"/>
   <unicode hex="03B9"/>
   <outline>
     <contour>
-      <point x="772" y="-8" type="line" name="hr00" smooth="yes"/>
+      <point x="772" y="-8" type="line" smooth="yes" name="hr00"/>
       <point x="504" y="-8"/>
       <point x="399" y="46"/>
-      <point x="399" y="222" type="curve" name="dh01" smooth="yes"/>
+      <point x="399" y="222" type="curve" smooth="yes" name="dh01"/>
       <point x="399" y="265"/>
       <point x="405" y="312"/>
       <point x="416" y="371" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="705" y="357" type="line" smooth="yes"/>
       <point x="702" y="341"/>
       <point x="700" y="328"/>
-      <point x="700" y="313" type="curve" name="dh02" smooth="yes"/>
+      <point x="700" y="313" type="curve" smooth="yes" name="dh02"/>
       <point x="700" y="245"/>
       <point x="743" y="217"/>
-      <point x="836" y="217" type="curve" name="sv02" smooth="yes"/>
+      <point x="836" y="217" type="curve" smooth="yes" name="sv02"/>
       <point x="894" y="217" type="line"/>
       <point x="850" y="-8" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/iotadieresis.glif b/source/Hack-BoldItalic.ufo/glyphs/iotadieresis.glif
index 83d1e555d..41fa0e3cf 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/iotadieresis.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/iotadieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="iotadieresis" format="1">
+<glyph name="iotadieresis" format="2">
   <advance width="1233"/>
   <unicode hex="03CA"/>
   <outline>
     <contour>
-      <point x="412" y="1320" type="line" name="hr00" smooth="yes"/>
+      <point x="412" y="1320" type="line" smooth="yes" name="hr00"/>
       <point x="392" y="1320"/>
       <point x="381" y="1333"/>
       <point x="385" y="1353" type="curve" smooth="yes"/>
       <point x="421" y="1539" type="line"/>
       <point x="424" y="1557"/>
       <point x="434" y="1566"/>
-      <point x="453" y="1566" type="curve" name="at01" smooth="yes"/>
+      <point x="453" y="1566" type="curve" smooth="yes" name="at01"/>
       <point x="630" y="1566" type="line" smooth="yes"/>
       <point x="651" y="1566"/>
       <point x="660" y="1553"/>
@@ -22,14 +22,14 @@
       <point x="587" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="807" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="807" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="787" y="1320"/>
       <point x="776" y="1333"/>
       <point x="780" y="1353" type="curve" smooth="yes"/>
       <point x="816" y="1539" type="line"/>
       <point x="819" y="1557"/>
       <point x="829" y="1566"/>
-      <point x="848" y="1566" type="curve" name="at02" smooth="yes"/>
+      <point x="848" y="1566" type="curve" smooth="yes" name="at02"/>
       <point x="1026" y="1566" type="line" smooth="yes"/>
       <point x="1047" y="1566"/>
       <point x="1056" y="1553"/>
@@ -37,13 +37,13 @@
       <point x="1015" y="1347" type="line" smooth="yes"/>
       <point x="1012" y="1329"/>
       <point x="1001" y="1320"/>
-      <point x="983" y="1320" type="curve" name="sv02" smooth="yes"/>
+      <point x="983" y="1320" type="curve" smooth="yes" name="sv02"/>
     </contour>
     <contour>
-      <point x="765" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="765" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="497" y="-8"/>
       <point x="392" y="46"/>
-      <point x="392" y="222" type="curve" name="dh01" smooth="yes"/>
+      <point x="392" y="222" type="curve" smooth="yes" name="dh01"/>
       <point x="392" y="265"/>
       <point x="398" y="312"/>
       <point x="409" y="371" type="curve" smooth="yes"/>
@@ -54,10 +54,10 @@
       <point x="698" y="357" type="line" smooth="yes"/>
       <point x="695" y="341"/>
       <point x="693" y="328"/>
-      <point x="693" y="313" type="curve" name="dh02" smooth="yes"/>
+      <point x="693" y="313" type="curve" smooth="yes" name="dh02"/>
       <point x="693" y="245"/>
       <point x="736" y="217"/>
-      <point x="829" y="217" type="curve" name="sv04" smooth="yes"/>
+      <point x="829" y="217" type="curve" smooth="yes" name="sv04"/>
       <point x="887" y="217" type="line"/>
       <point x="843" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/iotadieresistonos.glif b/source/Hack-BoldItalic.ufo/glyphs/iotadieresistonos.glif
index 131de32b1..afe4849ed 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/iotadieresistonos.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/iotadieresistonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="iotadieresistonos" format="1">
+<glyph name="iotadieresistonos" format="2">
   <advance width="1233"/>
   <unicode hex="0390"/>
   <outline>
@@ -10,14 +10,14 @@
       <point x="633" y="1560" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="382" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="382" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="362" y="1320"/>
       <point x="351" y="1333"/>
       <point x="355" y="1353" type="curve" smooth="yes"/>
       <point x="391" y="1539" type="line"/>
       <point x="394" y="1557"/>
       <point x="404" y="1566"/>
-      <point x="423" y="1566" type="curve" name="at02" smooth="yes"/>
+      <point x="423" y="1566" type="curve" smooth="yes" name="at02"/>
       <point x="600" y="1566" type="line" smooth="yes"/>
       <point x="621" y="1566"/>
       <point x="630" y="1553"/>
@@ -28,14 +28,14 @@
       <point x="557" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="857" y="1320" type="line" name="sv02" smooth="yes"/>
+      <point x="857" y="1320" type="line" smooth="yes" name="sv02"/>
       <point x="837" y="1320"/>
       <point x="826" y="1333"/>
       <point x="830" y="1353" type="curve" smooth="yes"/>
       <point x="866" y="1539" type="line"/>
       <point x="869" y="1557"/>
       <point x="879" y="1566"/>
-      <point x="898" y="1566" type="curve" name="at03" smooth="yes"/>
+      <point x="898" y="1566" type="curve" smooth="yes" name="at03"/>
       <point x="1076" y="1566" type="line" smooth="yes"/>
       <point x="1097" y="1566"/>
       <point x="1106" y="1553"/>
@@ -43,13 +43,13 @@
       <point x="1065" y="1347" type="line" smooth="yes"/>
       <point x="1062" y="1329"/>
       <point x="1051" y="1320"/>
-      <point x="1033" y="1320" type="curve" name="sv03" smooth="yes"/>
+      <point x="1033" y="1320" type="curve" smooth="yes" name="sv03"/>
     </contour>
     <contour>
-      <point x="765" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="765" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="497" y="-8"/>
       <point x="392" y="46"/>
-      <point x="392" y="222" type="curve" name="dh01" smooth="yes"/>
+      <point x="392" y="222" type="curve" smooth="yes" name="dh01"/>
       <point x="392" y="265"/>
       <point x="398" y="312"/>
       <point x="409" y="371" type="curve" smooth="yes"/>
@@ -60,10 +60,10 @@
       <point x="698" y="357" type="line" smooth="yes"/>
       <point x="695" y="341"/>
       <point x="693" y="328"/>
-      <point x="693" y="313" type="curve" name="dh02" smooth="yes"/>
+      <point x="693" y="313" type="curve" smooth="yes" name="dh02"/>
       <point x="693" y="245"/>
       <point x="736" y="217"/>
-      <point x="829" y="217" type="curve" name="sv05" smooth="yes"/>
+      <point x="829" y="217" type="curve" smooth="yes" name="sv05"/>
       <point x="887" y="217" type="line"/>
       <point x="843" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/iotatonos.glif b/source/Hack-BoldItalic.ufo/glyphs/iotatonos.glif
index dc120ecd2..1067313ef 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/iotatonos.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/iotatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="iotatonos" format="1">
+<glyph name="iotatonos" format="2">
   <advance width="1233"/>
   <unicode hex="03AF"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="539" y="1272" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="762" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="762" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="494" y="-8"/>
       <point x="389" y="46"/>
-      <point x="389" y="222" type="curve" name="dh01" smooth="yes"/>
+      <point x="389" y="222" type="curve" smooth="yes" name="dh01"/>
       <point x="389" y="265"/>
       <point x="395" y="312"/>
       <point x="406" y="371" type="curve" smooth="yes"/>
@@ -24,10 +24,10 @@
       <point x="695" y="357" type="line" smooth="yes"/>
       <point x="692" y="341"/>
       <point x="690" y="328"/>
-      <point x="690" y="313" type="curve" name="dh02" smooth="yes"/>
+      <point x="690" y="313" type="curve" smooth="yes" name="dh02"/>
       <point x="690" y="245"/>
       <point x="733" y="217"/>
-      <point x="826" y="217" type="curve" name="sv02" smooth="yes"/>
+      <point x="826" y="217" type="curve" smooth="yes" name="sv02"/>
       <point x="884" y="217" type="line"/>
       <point x="840" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/itilde.glif b/source/Hack-BoldItalic.ufo/glyphs/itilde.glif
index 5a84889e9..9de732d76 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/itilde.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/itilde.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="itilde" format="1">
+<glyph name="itilde" format="2">
   <advance width="1233"/>
   <unicode hex="0129"/>
   <outline>
     <contour>
-      <point x="804" y="1270" type="curve" name="dv01" smooth="yes"/>
+      <point x="804" y="1270" type="curve" smooth="yes" name="dv01"/>
       <point x="757" y="1270"/>
       <point x="717" y="1286"/>
       <point x="664" y="1327" type="curve" smooth="yes"/>
@@ -14,21 +14,21 @@
       <point x="610" y="1368" type="curve" smooth="yes"/>
       <point x="582" y="1390"/>
       <point x="558" y="1401"/>
-      <point x="537" y="1401" type="curve" name="sv01" smooth="yes"/>
+      <point x="537" y="1401" type="curve" smooth="yes" name="sv01"/>
       <point x="492" y="1401"/>
       <point x="454" y="1352"/>
       <point x="441" y="1272" type="curve" name="sv02"/>
       <point x="302" y="1272" type="line"/>
       <point x="326" y="1445"/>
       <point x="425" y="1556"/>
-      <point x="552" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="552" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="597" y="1556"/>
       <point x="632" y="1543"/>
       <point x="693" y="1495" type="curve" smooth="yes"/>
       <point x="744" y="1456" type="line" smooth="yes"/>
       <point x="770" y="1435"/>
       <point x="793" y="1425"/>
-      <point x="814" y="1425" type="curve" name="dv02" smooth="yes"/>
+      <point x="814" y="1425" type="curve" smooth="yes" name="dv02"/>
       <point x="865" y="1425"/>
       <point x="901" y="1470"/>
       <point x="914" y="1554" type="curve" name="at02"/>
@@ -37,7 +37,7 @@
       <point x="939" y="1270"/>
     </contour>
     <contour>
-      <point x="727" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="727" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="584" y="-8"/>
       <point x="494" y="10"/>
       <point x="437" y="49" type="curve" smooth="yes"/>
@@ -66,7 +66,7 @@
       <point x="682" y="236" type="curve" smooth="yes"/>
       <point x="703" y="223"/>
       <point x="739" y="217"/>
-      <point x="791" y="217" type="curve" name="sv04" smooth="yes"/>
+      <point x="791" y="217" type="curve" smooth="yes" name="sv04"/>
       <point x="1069" y="217" type="line"/>
       <point x="1024" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/j.glif b/source/Hack-BoldItalic.ufo/glyphs/j.glif
index 616d3bdba..1c757e634 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/j.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/j.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="j" format="1">
+<glyph name="j" format="2">
   <advance width="1233"/>
   <unicode hex="006A"/>
   <outline>
@@ -45,9 +45,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/jcircumflex.glif b/source/Hack-BoldItalic.ufo/glyphs/jcircumflex.glif
index ce52abd6f..b2d05fa8b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/jcircumflex.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/jcircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="jcircumflex" format="1">
+<glyph name="jcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0135"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/k.glif b/source/Hack-BoldItalic.ufo/glyphs/k.glif
index e7f603825..7b7962e8a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/k.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/k.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="k" format="1">
+<glyph name="k" format="2">
   <advance width="1233"/>
   <unicode hex="006B"/>
   <outline>
@@ -19,9 +19,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/kappa.glif b/source/Hack-BoldItalic.ufo/glyphs/kappa.glif
index 4012f10eb..325159e3a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/kappa.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/kappa.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="kappa" format="1">
+<glyph name="kappa" format="2">
   <advance width="1233"/>
   <unicode hex="03BA"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/kgreenlandic.glif b/source/Hack-BoldItalic.ufo/glyphs/kgreenlandic.glif
index cb27a527c..4fb3e0b0e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/kgreenlandic.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/kgreenlandic.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="kgreenlandic" format="1">
+<glyph name="kgreenlandic" format="2">
   <advance width="1233"/>
   <unicode hex="0138"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/l.glif b/source/Hack-BoldItalic.ufo/glyphs/l.glif
index aee1894e4..e2cc84caf 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/l.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/l.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="l" format="1">
+<glyph name="l" format="2">
   <advance width="1233"/>
   <unicode hex="006C"/>
   <outline>
@@ -27,9 +27,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/lacute.glif b/source/Hack-BoldItalic.ufo/glyphs/lacute.glif
index ccff51374..fc6a2c664 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/lacute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/lacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lacute" format="1">
+<glyph name="lacute" format="2">
   <advance width="1233"/>
   <unicode hex="013A"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="609" y="1637" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="690" y="-10" type="line" name="ab01" smooth="yes"/>
+      <point x="690" y="-10" type="line" smooth="yes" name="ab01"/>
       <point x="423" y="-10"/>
       <point x="315" y="59"/>
-      <point x="315" y="223" type="curve" name="dh01" smooth="yes"/>
+      <point x="315" y="223" type="curve" smooth="yes" name="dh01"/>
       <point x="315" y="262"/>
       <point x="321" y="306"/>
       <point x="334" y="369" type="curve" smooth="yes"/>
@@ -24,10 +24,10 @@
       <point x="623" y="355" type="line" smooth="yes"/>
       <point x="617" y="325"/>
       <point x="614" y="303"/>
-      <point x="614" y="289" type="curve" name="dh02" smooth="yes"/>
+      <point x="614" y="289" type="curve" smooth="yes" name="dh02"/>
       <point x="614" y="233"/>
       <point x="663" y="215"/>
-      <point x="754" y="215" type="curve" name="sv02" smooth="yes"/>
+      <point x="754" y="215" type="curve" smooth="yes" name="sv02"/>
       <point x="1032" y="215" type="line"/>
       <point x="987" y="-10" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/lambda.glif b/source/Hack-BoldItalic.ufo/glyphs/lambda.glif
index 4214c8cde..434de37ca 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/lambda.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/lambda.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lambda" format="1">
+<glyph name="lambda" format="2">
   <advance width="1233"/>
   <unicode hex="03BB"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="591" y="1188" type="line"/>
       <point x="575" y="1287"/>
       <point x="546" y="1321"/>
-      <point x="420" y="1321" type="curve" name="sv01" smooth="yes"/>
+      <point x="420" y="1321" type="curve" smooth="yes" name="sv01"/>
       <point x="308" y="1321" type="line"/>
       <point x="353" y="1556" type="line" name="at01"/>
       <point x="503" y="1556" type="line" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/layerinfo.plist b/source/Hack-BoldItalic.ufo/glyphs/layerinfo.plist
new file mode 100644
index 000000000..0c67376eb
--- /dev/null
+++ b/source/Hack-BoldItalic.ufo/glyphs/layerinfo.plist
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/lcaron.glif b/source/Hack-BoldItalic.ufo/glyphs/lcaron.glif
index 15d07feb3..bb580411e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/lcaron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/lcaron.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lcaron" format="1">
+<glyph name="lcaron" format="2">
   <advance width="1233"/>
   <unicode hex="013E"/>
   <outline>
     <contour>
-      <point x="690" y="-10" type="line" name="ab01" smooth="yes"/>
+      <point x="690" y="-10" type="line" smooth="yes" name="ab01"/>
       <point x="423" y="-10"/>
       <point x="315" y="59"/>
-      <point x="315" y="223" type="curve" name="dh01" smooth="yes"/>
+      <point x="315" y="223" type="curve" smooth="yes" name="dh01"/>
       <point x="315" y="262"/>
       <point x="321" y="306"/>
       <point x="334" y="369" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="623" y="355" type="line" smooth="yes"/>
       <point x="617" y="325"/>
       <point x="614" y="303"/>
-      <point x="614" y="289" type="curve" name="dh02" smooth="yes"/>
+      <point x="614" y="289" type="curve" smooth="yes" name="dh02"/>
       <point x="614" y="233"/>
       <point x="663" y="215"/>
-      <point x="754" y="215" type="curve" name="sv02" smooth="yes"/>
+      <point x="754" y="215" type="curve" smooth="yes" name="sv02"/>
       <point x="1032" y="215" type="line"/>
       <point x="987" y="-10" type="line" name="hr01"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ldot.glif b/source/Hack-BoldItalic.ufo/glyphs/ldot.glif
index c79d0dc42..fa64a68e1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ldot.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ldot.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ldot" format="1">
+<glyph name="ldot" format="2">
   <advance width="1233"/>
   <unicode hex="0140"/>
   <outline>
     <contour>
-      <point x="297" y="275" type="curve" name="hr00" smooth="yes"/>
+      <point x="297" y="275" type="curve" smooth="yes" name="hr00"/>
       <point x="297" y="329"/>
       <point x="304" y="390"/>
       <point x="317" y="459" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/less.glif b/source/Hack-BoldItalic.ufo/glyphs/less.glif
index 10001beae..9472f0316 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/less.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/less.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="less" format="1">
+<glyph name="less" format="2">
   <advance width="1233"/>
   <unicode hex="003C"/>
   <outline>
     <contour>
       <point x="88" y="524" type="line" name="hr00"/>
       <point x="88" y="760" type="line"/>
-      <point x="1145" y="1176" type="line" name="av01"/>
-      <point x="1145" y="926" type="line"/>
-      <point x="350" y="641" type="line" name="iv01"/>
-      <point x="1145" y="358" type="line"/>
-      <point x="1145" y="109" type="line" name="av02"/>
+      <point x="1145" y="1276" type="line" name="av01"/>
+      <point x="1145" y="1016" type="line"/>
+      <point x="360" y="641" type="line" name="iv01"/>
+      <point x="1145" y="268" type="line"/>
+      <point x="1145" y="9" type="line" name="av02"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/lessequal.glif b/source/Hack-BoldItalic.ufo/glyphs/lessequal.glif
index ee0dc9d62..d229eae59 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/lessequal.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/lessequal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lessequal" format="1">
+<glyph name="lessequal" format="2">
   <advance width="1233"/>
   <unicode hex="2264"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/lfblock.glif b/source/Hack-BoldItalic.ufo/glyphs/lfblock.glif
index 8a76fb3d0..379f2131b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/lfblock.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/lfblock.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lfblock" format="1">
+<glyph name="lfblock" format="2">
   <advance width="1233"/>
   <unicode hex="258C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/lira.glif b/source/Hack-BoldItalic.ufo/glyphs/lira.glif
index a82e53cc8..5bfef2129 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/lira.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/lira.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lira" format="1">
+<glyph name="lira" format="2">
   <advance width="1233"/>
   <unicode hex="20A4"/>
   <outline>
@@ -16,14 +16,14 @@
       <point x="354" y="1015" type="line" name="dv04"/>
       <point x="418" y="1360"/>
       <point x="587" y="1520"/>
-      <point x="919" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="919" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1030" y="1520"/>
       <point x="1136" y="1502"/>
       <point x="1237" y="1466" type="curve"/>
       <point x="1187" y="1180" type="line" name="iv01"/>
       <point x="1115" y="1229"/>
       <point x="1030" y="1257"/>
-      <point x="942" y="1257" type="curve" name="sv01" smooth="yes"/>
+      <point x="942" y="1257" type="curve" smooth="yes" name="sv01"/>
       <point x="794" y="1257"/>
       <point x="716" y="1178"/>
       <point x="684" y="1015" type="curve" name="sv02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/logicaland.glif b/source/Hack-BoldItalic.ufo/glyphs/logicaland.glif
index 80cdfc4eb..6a2490e3c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/logicaland.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/logicaland.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="logicaland" format="1">
+<glyph name="logicaland" format="2">
   <advance width="1233"/>
   <unicode hex="2227"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/logicalnot.glif b/source/Hack-BoldItalic.ufo/glyphs/logicalnot.glif
index 1ad37b83f..aff079849 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/logicalnot.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/logicalnot.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="logicalnot" format="1">
+<glyph name="logicalnot" format="2">
   <advance width="1233"/>
   <unicode hex="00AC"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/logicalor.glif b/source/Hack-BoldItalic.ufo/glyphs/logicalor.glif
index d0711d982..69c653f25 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/logicalor.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/logicalor.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="logicalor" format="1">
+<glyph name="logicalor" format="2">
   <advance width="1233"/>
   <unicode hex="2228"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/longs.glif b/source/Hack-BoldItalic.ufo/glyphs/longs.glif
index a7073d75b..610783683 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/longs.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/longs.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="longs" format="1">
+<glyph name="longs" format="2">
   <advance width="1233"/>
   <unicode hex="017F"/>
   <outline>
@@ -14,7 +14,7 @@
       <point x="689" y="1483" type="curve" smooth="yes"/>
       <point x="750" y="1531"/>
       <point x="855" y="1556"/>
-      <point x="1020" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="1020" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="1260" y="1556" type="line"/>
       <point x="1217" y="1331" type="line" name="sv01"/>
       <point x="987" y="1331" type="line" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/lozenge.glif b/source/Hack-BoldItalic.ufo/glyphs/lozenge.glif
index 88d12a8f8..4252cd2f9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/lozenge.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/lozenge.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lozenge" format="1">
+<glyph name="lozenge" format="2">
   <advance width="1233"/>
   <unicode hex="25CA"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/lslash.glif b/source/Hack-BoldItalic.ufo/glyphs/lslash.glif
index 75a764fc7..61427aed0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/lslash.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/lslash.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lslash" format="1">
+<glyph name="lslash" format="2">
   <advance width="1233"/>
   <unicode hex="0142"/>
   <outline>
     <contour>
-      <point x="719" y="-10" type="line" name="hr00" smooth="yes"/>
+      <point x="719" y="-10" type="line" smooth="yes" name="hr00"/>
       <point x="582" y="-10"/>
       <point x="486" y="9"/>
       <point x="429" y="46" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ltshade.glif b/source/Hack-BoldItalic.ufo/glyphs/ltshade.glif
index 80c634926..d044e38f7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ltshade.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ltshade.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ltshade" format="1">
+<glyph name="ltshade" format="2">
   <advance width="1233"/>
   <unicode hex="2591"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/m.glif b/source/Hack-BoldItalic.ufo/glyphs/m.glif
index 086b9fd1d..cc5fceab7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/m.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/m.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="m" format="1">
+<glyph name="m" format="2">
   <advance width="1233"/>
   <unicode hex="006D"/>
   <outline>
@@ -60,9 +60,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/macron.glif b/source/Hack-BoldItalic.ufo/glyphs/macron.glif
index e71c4d4f0..24027c1cb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/macron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/macron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="macron" format="1">
+<glyph name="macron" format="2">
   <advance width="1233"/>
   <unicode hex="00AF"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/millisecond.glif b/source/Hack-BoldItalic.ufo/glyphs/millisecond.glif
index d1d7c50e9..c67ed291c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/millisecond.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/millisecond.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="millisecond" format="1">
+<glyph name="millisecond" format="2">
   <advance width="1233"/>
   <unicode hex="2034"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/minus.glif b/source/Hack-BoldItalic.ufo/glyphs/minus.glif
index 6eae802f2..e956e8d6a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/minus.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/minus.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="minus" format="1">
+<glyph name="minus" format="2">
   <advance width="1233"/>
   <unicode hex="2212"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/minute.glif b/source/Hack-BoldItalic.ufo/glyphs/minute.glif
index f97d1e935..34beac35c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/minute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/minute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="minute" format="1">
+<glyph name="minute" format="2">
   <advance width="1233"/>
   <unicode hex="2032"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/multiply.glif b/source/Hack-BoldItalic.ufo/glyphs/multiply.glif
index 740a6094a..40865e298 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/multiply.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/multiply.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="multiply" format="1">
+<glyph name="multiply" format="2">
   <advance width="1233"/>
   <unicode hex="00D7"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/musicalnote.glif b/source/Hack-BoldItalic.ufo/glyphs/musicalnote.glif
index 7a955db13..67b9e221d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/musicalnote.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/musicalnote.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="musicalnote" format="1">
+<glyph name="musicalnote" format="2">
   <advance width="1233"/>
   <unicode hex="266A"/>
   <outline>
     <contour>
-      <point x="527" y="265" type="line" name="hr00" smooth="yes"/>
+      <point x="527" y="265" type="line" smooth="yes" name="hr00"/>
       <point x="526" y="262"/>
       <point x="522" y="243"/>
       <point x="514" y="210" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/n.glif b/source/Hack-BoldItalic.ufo/glyphs/n.glif
index a238230c2..a87ed9dfe 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/n.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/n.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="n" format="1">
+<glyph name="n" format="2">
   <advance width="1233"/>
   <unicode hex="006E"/>
   <outline>
@@ -33,9 +33,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/nacute.glif b/source/Hack-BoldItalic.ufo/glyphs/nacute.glif
index 67a49ae39..6362420dc 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/nacute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/nacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="nacute" format="1">
+<glyph name="nacute" format="2">
   <advance width="1233"/>
   <unicode hex="0144"/>
   <outline>
@@ -15,22 +15,22 @@
       <point x="537" y="952" type="line" name="dh01"/>
       <point x="601" y="1073"/>
       <point x="713" y="1147"/>
-      <point x="858" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="858" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1023" y="1147"/>
       <point x="1120" y="1051"/>
-      <point x="1120" y="882" type="curve" name="sh01" smooth="yes"/>
+      <point x="1120" y="882" type="curve" smooth="yes" name="sh01"/>
       <point x="1120" y="839"/>
       <point x="1114" y="792"/>
       <point x="1102" y="728" type="curve" smooth="yes"/>
       <point x="961" y="0" type="line" name="ab01"/>
       <point x="668" y="0" type="line"/>
-      <point x="801" y="682" type="line" name="hr01" smooth="yes"/>
+      <point x="801" y="682" type="line" smooth="yes" name="hr01"/>
       <point x="808" y="717"/>
       <point x="811" y="756"/>
-      <point x="811" y="780" type="curve" name="dh02" smooth="yes"/>
+      <point x="811" y="780" type="curve" smooth="yes" name="dh02"/>
       <point x="811" y="868"/>
       <point x="772" y="907"/>
-      <point x="700" y="907" type="curve" name="sv01" smooth="yes"/>
+      <point x="700" y="907" type="curve" smooth="yes" name="sv01"/>
       <point x="587" y="907"/>
       <point x="508" y="809"/>
       <point x="473" y="629" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/napostrophe.glif b/source/Hack-BoldItalic.ufo/glyphs/napostrophe.glif
index caa4f49fa..73f300e4c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/napostrophe.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/napostrophe.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="napostrophe" format="1">
+<glyph name="napostrophe" format="2">
   <advance width="1233"/>
   <unicode hex="0149"/>
   <outline>
@@ -26,7 +26,7 @@
       <point x="1265" y="727" type="curve" smooth="yes"/>
       <point x="1123" y="0" type="line"/>
       <point x="832" y="0" type="line"/>
-      <point x="965" y="682" type="line" name="hr01" smooth="yes"/>
+      <point x="965" y="682" type="line" smooth="yes" name="hr01"/>
       <point x="973" y="723"/>
       <point x="977" y="758"/>
       <point x="977" y="787" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ncaron.glif b/source/Hack-BoldItalic.ufo/glyphs/ncaron.glif
index e9895861c..218e17ce1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ncaron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ncaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ncaron" format="1">
+<glyph name="ncaron" format="2">
   <advance width="1233"/>
   <unicode hex="0148"/>
   <outline>
@@ -18,22 +18,22 @@
       <point x="537" y="952" type="line" name="dh01"/>
       <point x="601" y="1073"/>
       <point x="713" y="1147"/>
-      <point x="858" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="858" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1023" y="1147"/>
       <point x="1120" y="1051"/>
-      <point x="1120" y="882" type="curve" name="sh01" smooth="yes"/>
+      <point x="1120" y="882" type="curve" smooth="yes" name="sh01"/>
       <point x="1120" y="839"/>
       <point x="1114" y="792"/>
-      <point x="1102" y="728" type="curve" name="hr01" smooth="yes"/>
+      <point x="1102" y="728" type="curve" smooth="yes" name="hr01"/>
       <point x="961" y="0" type="line" name="ab01"/>
       <point x="668" y="0" type="line"/>
       <point x="801" y="682" type="line" smooth="yes"/>
       <point x="808" y="717"/>
       <point x="811" y="756"/>
-      <point x="811" y="780" type="curve" name="dh02" smooth="yes"/>
+      <point x="811" y="780" type="curve" smooth="yes" name="dh02"/>
       <point x="811" y="868"/>
       <point x="772" y="907"/>
-      <point x="700" y="907" type="curve" name="sv01" smooth="yes"/>
+      <point x="700" y="907" type="curve" smooth="yes" name="sv01"/>
       <point x="587" y="907"/>
       <point x="508" y="809"/>
       <point x="473" y="629" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/nine.glif b/source/Hack-BoldItalic.ufo/glyphs/nine.glif
index 48ef2acbf..764d7351d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/nine.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/nine.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="nine" format="1">
+<glyph name="nine" format="2">
   <advance width="1233"/>
   <unicode hex="0039"/>
   <outline>
     <contour>
-      <point x="345" y="-31" type="curve" name="hr00" smooth="yes"/>
+      <point x="345" y="-31" type="curve" smooth="yes" name="hr00"/>
       <point x="289" y="-31"/>
       <point x="248" y="-27"/>
       <point x="201" y="-16" type="curve" smooth="yes"/>
@@ -17,7 +17,7 @@
       <point x="237" y="230" type="curve" smooth="yes"/>
       <point x="284" y="215"/>
       <point x="330" y="207"/>
-      <point x="379" y="207" type="curve" name="dv01" smooth="yes"/>
+      <point x="379" y="207" type="curve" smooth="yes" name="dv01"/>
       <point x="483" y="207"/>
       <point x="570" y="243"/>
       <point x="641" y="316" type="curve" smooth="yes"/>
@@ -29,25 +29,25 @@
       <point x="658" y="535" type="curve" smooth="yes"/>
       <point x="607" y="512"/>
       <point x="554" y="502"/>
-      <point x="494" y="502" type="curve" name="dv02" smooth="yes"/>
+      <point x="494" y="502" type="curve" smooth="yes" name="dv02"/>
       <point x="371" y="502"/>
       <point x="288" y="548"/>
       <point x="232" y="612" type="curve" smooth="yes"/>
       <point x="163" y="692"/>
       <point x="135" y="799"/>
-      <point x="135" y="919" type="curve" name="sh01" smooth="yes"/>
+      <point x="135" y="919" type="curve" smooth="yes" name="sh01"/>
       <point x="135" y="1092"/>
       <point x="194" y="1246"/>
       <point x="286" y="1350" type="curve" smooth="yes"/>
       <point x="386" y="1463"/>
       <point x="525" y="1520"/>
-      <point x="685" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="685" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="830" y="1520"/>
       <point x="943" y="1474"/>
       <point x="1015" y="1394" type="curve" smooth="yes"/>
       <point x="1090" y="1312"/>
       <point x="1128" y="1183"/>
-      <point x="1128" y="1008" type="curve" name="sh02" smooth="yes"/>
+      <point x="1128" y="1008" type="curve" smooth="yes" name="sh02"/>
       <point x="1128" y="741"/>
       <point x="1041" y="435"/>
       <point x="899" y="238" type="curve" smooth="yes"/>
@@ -58,25 +58,25 @@
       <point x="460" y="-31"/>
     </contour>
     <contour>
-      <point x="589" y="739" type="curve" name="dv03" smooth="yes"/>
+      <point x="589" y="739" type="curve" smooth="yes" name="dv03"/>
       <point x="660" y="739"/>
       <point x="719" y="772"/>
       <point x="768" y="839" type="curve" smooth="yes"/>
       <point x="816" y="906"/>
       <point x="842" y="989"/>
-      <point x="842" y="1078" type="curve" name="ah01" smooth="yes"/>
+      <point x="842" y="1078" type="curve" smooth="yes" name="ah01"/>
       <point x="842" y="1142"/>
       <point x="829" y="1190"/>
       <point x="797" y="1227" type="curve" smooth="yes"/>
       <point x="766" y="1262"/>
       <point x="726" y="1280"/>
-      <point x="675" y="1280" type="curve" name="sv01" smooth="yes"/>
+      <point x="675" y="1280" type="curve" smooth="yes" name="sv01"/>
       <point x="604" y="1280"/>
       <point x="544" y="1246"/>
       <point x="496" y="1179" type="curve" smooth="yes"/>
       <point x="448" y="1111"/>
       <point x="424" y="1024"/>
-      <point x="424" y="935" type="curve" name="sh03" smooth="yes"/>
+      <point x="424" y="935" type="curve" smooth="yes" name="sh03"/>
       <point x="424" y="863"/>
       <point x="438" y="825"/>
       <point x="469" y="790" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/nine.subs.glif b/source/Hack-BoldItalic.ufo/glyphs/nine.subs.glif
index 6d6f83283..31ae1ceb6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/nine.subs.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/nine.subs.glif
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="nine.subs" format="1">
+<glyph name="nine.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="496" y="-435" type="curve" name="hr00" smooth="yes"/>
+      <point x="496" y="-435" type="curve" smooth="yes" name="hr00"/>
       <point x="432" y="-435"/>
       <point x="372" y="-429"/>
       <point x="289" y="-402" type="curve"/>
       <point x="325" y="-252" type="line"/>
       <point x="382" y="-285"/>
       <point x="451" y="-302"/>
-      <point x="519" y="-302" type="curve" name="dv01" smooth="yes"/>
+      <point x="519" y="-302" type="curve" smooth="yes" name="dv01"/>
       <point x="668" y="-302"/>
       <point x="769" y="-221"/>
       <point x="814" y="-64" type="curve" name="ih01"/>
       <point x="756" y="-113"/>
       <point x="685" y="-137"/>
-      <point x="600" y="-137" type="curve" name="dv04" smooth="yes"/>
+      <point x="600" y="-137" type="curve" smooth="yes" name="dv04"/>
       <point x="443" y="-137"/>
       <point x="346" y="-50"/>
-      <point x="346" y="98" type="curve" name="sh01" smooth="yes"/>
+      <point x="346" y="98" type="curve" smooth="yes" name="sh01"/>
       <point x="346" y="282"/>
       <point x="495" y="432"/>
-      <point x="744" y="432" type="curve" name="dv03" smooth="yes"/>
+      <point x="744" y="432" type="curve" smooth="yes" name="dv03"/>
       <point x="943" y="432"/>
       <point x="1050" y="339"/>
-      <point x="1050" y="144" type="curve" name="sh02" smooth="yes"/>
+      <point x="1050" y="144" type="curve" smooth="yes" name="sh02"/>
       <point x="1050" y="3"/>
       <point x="992" y="-173"/>
       <point x="888" y="-285" type="curve" smooth="yes"/>
@@ -33,16 +33,16 @@
       <point x="663" y="-435"/>
     </contour>
     <contour>
-      <point x="665" y="-5" type="curve" name="dv05" smooth="yes"/>
+      <point x="665" y="-5" type="curve" smooth="yes" name="dv05"/>
       <point x="772" y="-5"/>
       <point x="847" y="89"/>
-      <point x="847" y="183" type="curve" name="ah01" smooth="yes"/>
+      <point x="847" y="183" type="curve" smooth="yes" name="ah01"/>
       <point x="847" y="260"/>
       <point x="798" y="298"/>
-      <point x="730" y="298" type="curve" name="dv02" smooth="yes"/>
+      <point x="730" y="298" type="curve" smooth="yes" name="dv02"/>
       <point x="627" y="298"/>
       <point x="551" y="209"/>
-      <point x="551" y="110" type="curve" name="sh03" smooth="yes"/>
+      <point x="551" y="110" type="curve" smooth="yes" name="sh03"/>
       <point x="551" y="33"/>
       <point x="596" y="-5"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/notelement.glif b/source/Hack-BoldItalic.ufo/glyphs/notelement.glif
index 1e31d5b66..6fcba9863 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/notelement.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/notelement.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="notelement" format="1">
+<glyph name="notelement" format="2">
   <advance width="1233"/>
   <unicode hex="2209"/>
   <outline>
@@ -14,7 +14,7 @@
       <point x="367" y="1422" type="curve" smooth="yes"/>
       <point x="449" y="1490"/>
       <point x="539" y="1524"/>
-      <point x="636" y="1524" type="curve" name="sv01" smooth="yes"/>
+      <point x="636" y="1524" type="curve" smooth="yes" name="sv01"/>
       <point x="854" y="1524" type="line"/>
       <point x="928" y="1721" type="line" name="av02"/>
       <point x="1143" y="1641" type="line"/>
@@ -29,13 +29,13 @@
       <point x="614" y="231" type="line"/>
       <point x="621" y="230"/>
       <point x="629" y="230"/>
-      <point x="636" y="230" type="curve" name="sv02" smooth="yes"/>
+      <point x="636" y="230" type="curve" smooth="yes" name="sv02"/>
       <point x="1133" y="230" type="line" name="sv03"/>
       <point x="1133" y="0" type="line" name="ab01"/>
       <point x="636" y="0" type="line" smooth="yes"/>
       <point x="592" y="0"/>
       <point x="567" y="6"/>
-      <point x="532" y="14" type="curve" name="ab02" smooth="yes"/>
+      <point x="532" y="14" type="curve" smooth="yes" name="ab02"/>
       <point x="527" y="15"/>
       <point x="521" y="16"/>
       <point x="516" y="16" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/notequal.glif b/source/Hack-BoldItalic.ufo/glyphs/notequal.glif
index 9f476a259..fd6d6d956 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/notequal.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/notequal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="notequal" format="1">
+<glyph name="notequal" format="2">
   <advance width="1233"/>
   <unicode hex="2260"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/notsubset.glif b/source/Hack-BoldItalic.ufo/glyphs/notsubset.glif
index b64fd7994..fd5d22b05 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/notsubset.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/notsubset.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="notsubset" format="1">
+<glyph name="notsubset" format="2">
   <advance width="1233"/>
   <unicode hex="2284"/>
   <outline>
@@ -11,10 +11,10 @@
       <point x="230" y="280" type="curve" smooth="yes"/>
       <point x="134" y="381"/>
       <point x="88" y="505"/>
-      <point x="88" y="641" type="curve" name="dh01" smooth="yes"/>
+      <point x="88" y="641" type="curve" smooth="yes" name="dh01"/>
       <point x="88" y="930"/>
       <point x="303" y="1144"/>
-      <point x="575" y="1144" type="curve" name="at01" smooth="yes"/>
+      <point x="575" y="1144" type="curve" smooth="yes" name="at01"/>
       <point x="709" y="1144" type="line"/>
       <point x="808" y="1401" type="line" name="av01"/>
       <point x="987" y="1332" type="line"/>
@@ -33,10 +33,10 @@
     </contour>
     <contour>
       <point x="621" y="919" type="line" name="sv03"/>
-      <point x="575" y="919" type="line" name="sv04" smooth="yes"/>
+      <point x="575" y="919" type="line" smooth="yes" name="sv04"/>
       <point x="428" y="919"/>
       <point x="313" y="808"/>
-      <point x="313" y="637" type="curve" name="dh02" smooth="yes"/>
+      <point x="313" y="637" type="curve" smooth="yes" name="dh02"/>
       <point x="313" y="558"/>
       <point x="337" y="492"/>
       <point x="389" y="440" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ntilde.glif b/source/Hack-BoldItalic.ufo/glyphs/ntilde.glif
index 5a46cdc04..d0cdf8311 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ntilde.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ntilde.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ntilde" format="1">
+<glyph name="ntilde" format="2">
   <advance width="1233"/>
   <unicode hex="00F1"/>
   <outline>
     <contour>
-      <point x="880" y="1297" type="curve" name="sv02" smooth="yes"/>
+      <point x="880" y="1297" type="curve" smooth="yes" name="sv02"/>
       <point x="832" y="1297"/>
       <point x="792" y="1311"/>
       <point x="739" y="1354" type="curve"/>
@@ -24,7 +24,7 @@
       <point x="464" y="1506" type="curve" smooth="yes"/>
       <point x="509" y="1557"/>
       <point x="565" y="1583"/>
-      <point x="625" y="1583" type="curve" name="av01" smooth="yes"/>
+      <point x="625" y="1583" type="curve" smooth="yes" name="av01"/>
       <point x="678" y="1583"/>
       <point x="703" y="1570"/>
       <point x="768" y="1522" type="curve" smooth="yes"/>
@@ -51,13 +51,13 @@
       <point x="669" y="1096" type="curve" smooth="yes"/>
       <point x="724" y="1130"/>
       <point x="786" y="1147"/>
-      <point x="857" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="857" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="938" y="1147"/>
       <point x="1004" y="1125"/>
       <point x="1051" y="1078" type="curve" smooth="yes"/>
       <point x="1095" y="1034"/>
       <point x="1120" y="969"/>
-      <point x="1120" y="880" type="curve" name="dh02" smooth="yes"/>
+      <point x="1120" y="880" type="curve" smooth="yes" name="dh02"/>
       <point x="1120" y="861"/>
       <point x="1119" y="838"/>
       <point x="1116" y="813" type="curve" name="sh01"/>
@@ -66,19 +66,19 @@
       <point x="1102" y="728" type="curve"/>
       <point x="961" y="0" type="line" name="ab01"/>
       <point x="668" y="0" type="line" name="hr02"/>
-      <point x="801" y="682" type="line" name="sh02" smooth="yes"/>
+      <point x="801" y="682" type="line" smooth="yes" name="sh02"/>
       <point x="804" y="692"/>
       <point x="809" y="732"/>
       <point x="809" y="735" type="curve" name="hr03"/>
       <point x="810" y="752"/>
       <point x="811" y="771"/>
-      <point x="811" y="784" type="curve" name="dh01" smooth="yes"/>
+      <point x="811" y="784" type="curve" smooth="yes" name="dh01"/>
       <point x="811" y="823"/>
       <point x="803" y="854"/>
       <point x="782" y="877" type="curve" smooth="yes"/>
       <point x="763" y="897"/>
       <point x="735" y="907"/>
-      <point x="699" y="907" type="curve" name="sv03" smooth="yes"/>
+      <point x="699" y="907" type="curve" smooth="yes" name="sv03"/>
       <point x="644" y="907"/>
       <point x="597" y="883"/>
       <point x="558" y="835" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/nu.glif b/source/Hack-BoldItalic.ufo/glyphs/nu.glif
index 4e1359747..7c63c9c5f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/nu.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/nu.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="nu" format="1">
+<glyph name="nu" format="2">
   <advance width="1233"/>
   <unicode hex="03BD"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/numbersign.glif b/source/Hack-BoldItalic.ufo/glyphs/numbersign.glif
index f79788111..b1e9fe453 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/numbersign.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/numbersign.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="numbersign" format="1">
+<glyph name="numbersign" format="2">
   <advance width="1233"/>
   <unicode hex="0023"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/o.glif b/source/Hack-BoldItalic.ufo/glyphs/o.glif
index 7568378a7..18fc66b4f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/o.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/o.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="o" format="1">
+<glyph name="o" format="2">
   <advance width="1233"/>
   <unicode hex="006F"/>
   <outline>
@@ -33,9 +33,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/oacute.glif b/source/Hack-BoldItalic.ufo/glyphs/oacute.glif
index cc321b742..9585cf42a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/oacute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/oacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="oacute" format="1">
+<glyph name="oacute" format="2">
   <advance width="1233"/>
   <unicode hex="00F3"/>
   <outline>
@@ -10,25 +10,25 @@
       <point x="569" y="1297" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="543" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="543" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="391" y="-29"/>
       <point x="280" y="20"/>
       <point x="208" y="91" type="curve" smooth="yes"/>
       <point x="123" y="175"/>
       <point x="88" y="293"/>
-      <point x="88" y="442" type="curve" name="sh01" smooth="yes"/>
+      <point x="88" y="442" type="curve" smooth="yes" name="sh01"/>
       <point x="88" y="631"/>
       <point x="143" y="814"/>
       <point x="254" y="949" type="curve" smooth="yes"/>
       <point x="361" y="1078"/>
       <point x="509" y="1149"/>
-      <point x="689" y="1149" type="curve" name="dv04" smooth="yes"/>
+      <point x="689" y="1149" type="curve" smooth="yes" name="dv04"/>
       <point x="822" y="1149"/>
       <point x="942" y="1110"/>
       <point x="1025" y="1030" type="curve" smooth="yes"/>
       <point x="1109" y="947"/>
       <point x="1145" y="828"/>
-      <point x="1145" y="676" type="curve" name="sh02" smooth="yes"/>
+      <point x="1145" y="676" type="curve" smooth="yes" name="sh02"/>
       <point x="1145" y="483"/>
       <point x="1088" y="302"/>
       <point x="980" y="171" type="curve" smooth="yes"/>
@@ -36,25 +36,25 @@
       <point x="715" y="-29"/>
     </contour>
     <contour>
-      <point x="563" y="207" type="curve" name="dv02" smooth="yes"/>
+      <point x="563" y="207" type="curve" smooth="yes" name="dv02"/>
       <point x="640" y="207"/>
       <point x="711" y="251"/>
       <point x="767" y="343" type="curve" smooth="yes"/>
       <point x="818" y="427"/>
       <point x="850" y="544"/>
-      <point x="850" y="672" type="curve" name="ah01" smooth="yes"/>
+      <point x="850" y="672" type="curve" smooth="yes" name="ah01"/>
       <point x="850" y="764"/>
       <point x="833" y="817"/>
       <point x="804" y="853" type="curve" smooth="yes"/>
       <point x="769" y="896"/>
       <point x="720" y="911"/>
-      <point x="672" y="911" type="curve" name="dv03" smooth="yes"/>
+      <point x="672" y="911" type="curve" smooth="yes" name="dv03"/>
       <point x="589" y="911"/>
       <point x="521" y="866"/>
       <point x="466" y="776" type="curve"/>
       <point x="410" y="679"/>
       <point x="383" y="556"/>
-      <point x="383" y="448" type="curve" name="sh03" smooth="yes"/>
+      <point x="383" y="448" type="curve" smooth="yes" name="sh03"/>
       <point x="383" y="377"/>
       <point x="394" y="312"/>
       <point x="431" y="267" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/obreve.glif b/source/Hack-BoldItalic.ufo/glyphs/obreve.glif
index b6d19010e..a27a9066b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/obreve.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/obreve.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="obreve" format="1">
+<glyph name="obreve" format="2">
   <advance width="1233"/>
   <unicode hex="014F"/>
   <outline>
     <contour>
-      <point x="543" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="543" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="391" y="-29"/>
       <point x="280" y="20"/>
       <point x="208" y="91" type="curve" smooth="yes"/>
       <point x="123" y="175"/>
       <point x="88" y="293"/>
-      <point x="88" y="442" type="curve" name="sh01" smooth="yes"/>
+      <point x="88" y="442" type="curve" smooth="yes" name="sh01"/>
       <point x="88" y="631"/>
       <point x="143" y="814"/>
       <point x="254" y="949" type="curve" smooth="yes"/>
       <point x="361" y="1078"/>
       <point x="509" y="1149"/>
-      <point x="689" y="1149" type="curve" name="dv03" smooth="yes"/>
+      <point x="689" y="1149" type="curve" smooth="yes" name="dv03"/>
       <point x="822" y="1149"/>
       <point x="942" y="1110"/>
       <point x="1025" y="1030" type="curve" smooth="yes"/>
       <point x="1109" y="947"/>
       <point x="1145" y="828"/>
-      <point x="1145" y="676" type="curve" name="sh02" smooth="yes"/>
+      <point x="1145" y="676" type="curve" smooth="yes" name="sh02"/>
       <point x="1145" y="483"/>
       <point x="1088" y="302"/>
       <point x="980" y="171" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="715" y="-29"/>
     </contour>
     <contour>
-      <point x="563" y="207" type="curve" name="dv01" smooth="yes"/>
+      <point x="563" y="207" type="curve" smooth="yes" name="dv01"/>
       <point x="640" y="207"/>
       <point x="711" y="251"/>
       <point x="767" y="343" type="curve" smooth="yes"/>
       <point x="818" y="427"/>
       <point x="850" y="544"/>
-      <point x="850" y="672" type="curve" name="ah01" smooth="yes"/>
+      <point x="850" y="672" type="curve" smooth="yes" name="ah01"/>
       <point x="850" y="764"/>
       <point x="833" y="817"/>
       <point x="804" y="853" type="curve" smooth="yes"/>
       <point x="769" y="896"/>
       <point x="720" y="911"/>
-      <point x="672" y="911" type="curve" name="dv02" smooth="yes"/>
+      <point x="672" y="911" type="curve" smooth="yes" name="dv02"/>
       <point x="589" y="911"/>
       <point x="521" y="866"/>
       <point x="466" y="776" type="curve"/>
       <point x="410" y="679"/>
       <point x="383" y="556"/>
-      <point x="383" y="448" type="curve" name="sh03" smooth="yes"/>
+      <point x="383" y="448" type="curve" smooth="yes" name="sh03"/>
       <point x="383" y="377"/>
       <point x="394" y="312"/>
       <point x="431" y="267" type="curve" smooth="yes"/>
@@ -56,7 +56,7 @@
       <point x="503" y="207"/>
     </contour>
     <contour>
-      <point x="749" y="1301" type="curve" name="dv01" smooth="yes"/>
+      <point x="749" y="1301" type="curve" smooth="yes" name="dv01"/>
       <point x="652" y="1301"/>
       <point x="579" y="1323"/>
       <point x="530" y="1367" type="curve" smooth="yes"/>
@@ -71,7 +71,7 @@
       <point x="644" y="1488" type="curve" smooth="yes"/>
       <point x="673" y="1464"/>
       <point x="713" y="1452"/>
-      <point x="764" y="1452" type="curve" name="dv02" smooth="yes"/>
+      <point x="764" y="1452" type="curve" smooth="yes" name="dv02"/>
       <point x="818" y="1452"/>
       <point x="865" y="1465"/>
       <point x="904" y="1491" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ocircumflex.glif b/source/Hack-BoldItalic.ufo/glyphs/ocircumflex.glif
index 69a6476dc..fbdf8854c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ocircumflex.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ocircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ocircumflex" format="1">
+<glyph name="ocircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00F4"/>
   <outline>
@@ -13,25 +13,25 @@
       <point x="336" y="1299" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="543" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="543" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="391" y="-29"/>
       <point x="280" y="20"/>
       <point x="208" y="91" type="curve" smooth="yes"/>
       <point x="123" y="175"/>
       <point x="88" y="293"/>
-      <point x="88" y="442" type="curve" name="sh02" smooth="yes"/>
+      <point x="88" y="442" type="curve" smooth="yes" name="sh02"/>
       <point x="88" y="631"/>
       <point x="143" y="814"/>
       <point x="254" y="949" type="curve" smooth="yes"/>
       <point x="361" y="1078"/>
       <point x="509" y="1149"/>
-      <point x="689" y="1149" type="curve" name="dv04" smooth="yes"/>
+      <point x="689" y="1149" type="curve" smooth="yes" name="dv04"/>
       <point x="822" y="1149"/>
       <point x="942" y="1110"/>
       <point x="1025" y="1030" type="curve" smooth="yes"/>
       <point x="1109" y="947"/>
       <point x="1145" y="828"/>
-      <point x="1145" y="676" type="curve" name="sh01" smooth="yes"/>
+      <point x="1145" y="676" type="curve" smooth="yes" name="sh01"/>
       <point x="1145" y="483"/>
       <point x="1088" y="302"/>
       <point x="980" y="171" type="curve" smooth="yes"/>
@@ -39,25 +39,25 @@
       <point x="715" y="-29"/>
     </contour>
     <contour>
-      <point x="563" y="207" type="curve" name="dv02" smooth="yes"/>
+      <point x="563" y="207" type="curve" smooth="yes" name="dv02"/>
       <point x="640" y="207"/>
       <point x="711" y="251"/>
       <point x="767" y="343" type="curve" smooth="yes"/>
       <point x="818" y="427"/>
       <point x="850" y="544"/>
-      <point x="850" y="672" type="curve" name="ah01" smooth="yes"/>
+      <point x="850" y="672" type="curve" smooth="yes" name="ah01"/>
       <point x="850" y="764"/>
       <point x="833" y="817"/>
       <point x="804" y="853" type="curve" smooth="yes"/>
       <point x="769" y="896"/>
       <point x="720" y="911"/>
-      <point x="672" y="911" type="curve" name="dv03" smooth="yes"/>
+      <point x="672" y="911" type="curve" smooth="yes" name="dv03"/>
       <point x="589" y="911"/>
       <point x="521" y="866"/>
       <point x="466" y="776" type="curve"/>
       <point x="410" y="679"/>
       <point x="383" y="556"/>
-      <point x="383" y="448" type="curve" name="sh03" smooth="yes"/>
+      <point x="383" y="448" type="curve" smooth="yes" name="sh03"/>
       <point x="383" y="377"/>
       <point x="394" y="312"/>
       <point x="431" y="267" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/odieresis.glif b/source/Hack-BoldItalic.ufo/glyphs/odieresis.glif
index 3196fde09..db581dd40 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/odieresis.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/odieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="odieresis" format="1">
+<glyph name="odieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00F6"/>
   <outline>
     <contour>
-      <point x="449" y="1347" type="line" name="hr00" smooth="yes"/>
+      <point x="449" y="1347" type="line" smooth="yes" name="hr00"/>
       <point x="429" y="1347"/>
       <point x="418" y="1360"/>
       <point x="422" y="1380" type="curve" smooth="yes"/>
       <point x="458" y="1566" type="line"/>
       <point x="461" y="1584"/>
       <point x="471" y="1593"/>
-      <point x="490" y="1593" type="curve" name="dv03" smooth="yes"/>
+      <point x="490" y="1593" type="curve" smooth="yes" name="dv03"/>
       <point x="667" y="1593" type="line" smooth="yes"/>
       <point x="685" y="1593"/>
       <point x="694" y="1584"/>
@@ -25,14 +25,14 @@
       <point x="624" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="844" y="1347" type="line" name="sh01" smooth="yes"/>
+      <point x="844" y="1347" type="line" smooth="yes" name="sh01"/>
       <point x="824" y="1347"/>
       <point x="813" y="1360"/>
       <point x="817" y="1380" type="curve" smooth="yes"/>
       <point x="853" y="1566" type="line" name="sh02"/>
       <point x="856" y="1584"/>
       <point x="866" y="1593"/>
-      <point x="885" y="1593" type="curve" name="sv01" smooth="yes"/>
+      <point x="885" y="1593" type="curve" smooth="yes" name="sv01"/>
       <point x="1063" y="1593" type="line" smooth="yes"/>
       <point x="1081" y="1593"/>
       <point x="1090" y="1584"/>
@@ -46,25 +46,25 @@
       <point x="1020" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="543" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="543" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="391" y="-29"/>
       <point x="280" y="20"/>
       <point x="208" y="91" type="curve" smooth="yes"/>
       <point x="123" y="175"/>
       <point x="88" y="293"/>
-      <point x="88" y="442" type="curve" name="sh03" smooth="yes"/>
+      <point x="88" y="442" type="curve" smooth="yes" name="sh03"/>
       <point x="88" y="631"/>
       <point x="143" y="814"/>
       <point x="254" y="949" type="curve" smooth="yes"/>
       <point x="361" y="1078"/>
       <point x="509" y="1149"/>
-      <point x="689" y="1149" type="curve" name="dv05" smooth="yes"/>
+      <point x="689" y="1149" type="curve" smooth="yes" name="dv05"/>
       <point x="822" y="1149"/>
       <point x="942" y="1110"/>
       <point x="1025" y="1030" type="curve" smooth="yes"/>
       <point x="1109" y="947"/>
       <point x="1145" y="828"/>
-      <point x="1145" y="676" type="curve" name="sh04" smooth="yes"/>
+      <point x="1145" y="676" type="curve" smooth="yes" name="sh04"/>
       <point x="1145" y="483"/>
       <point x="1088" y="302"/>
       <point x="980" y="171" type="curve" smooth="yes"/>
@@ -72,25 +72,25 @@
       <point x="715" y="-29"/>
     </contour>
     <contour>
-      <point x="563" y="207" type="curve" name="dv02" smooth="yes"/>
+      <point x="563" y="207" type="curve" smooth="yes" name="dv02"/>
       <point x="640" y="207"/>
       <point x="711" y="251"/>
       <point x="767" y="343" type="curve" smooth="yes"/>
       <point x="818" y="427"/>
       <point x="850" y="544"/>
-      <point x="850" y="672" type="curve" name="ah01" smooth="yes"/>
+      <point x="850" y="672" type="curve" smooth="yes" name="ah01"/>
       <point x="850" y="764"/>
       <point x="833" y="817"/>
       <point x="804" y="853" type="curve" smooth="yes"/>
       <point x="769" y="896"/>
       <point x="720" y="911"/>
-      <point x="672" y="911" type="curve" name="dv04" smooth="yes"/>
+      <point x="672" y="911" type="curve" smooth="yes" name="dv04"/>
       <point x="589" y="911"/>
       <point x="521" y="866"/>
       <point x="466" y="776" type="curve"/>
       <point x="410" y="679"/>
       <point x="383" y="556"/>
-      <point x="383" y="448" type="curve" name="sh05" smooth="yes"/>
+      <point x="383" y="448" type="curve" smooth="yes" name="sh05"/>
       <point x="383" y="377"/>
       <point x="394" y="312"/>
       <point x="431" y="267" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/oe.glif b/source/Hack-BoldItalic.ufo/glyphs/oe.glif
index 4c755187d..be3889274 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/oe.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/oe.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="oe" format="1">
+<glyph name="oe" format="2">
   <advance width="1233"/>
   <unicode hex="0153"/>
   <outline>
     <contour>
-      <point x="296" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="296" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="200" y="-29"/>
       <point x="118" y="-2"/>
       <point x="62" y="54" type="curve" smooth="yes"/>
       <point x="9" y="107"/>
       <point x="-20" y="186"/>
-      <point x="-20" y="309" type="curve" name="sh01" smooth="yes"/>
+      <point x="-20" y="309" type="curve" smooth="yes" name="sh01"/>
       <point x="-20" y="385"/>
       <point x="-9" y="490"/>
       <point x="12" y="595" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="254" y="1080" type="curve" smooth="yes"/>
       <point x="321" y="1124"/>
       <point x="401" y="1147"/>
-      <point x="485" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="485" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="593" y="1147"/>
       <point x="677" y="1105"/>
       <point x="725" y="1026" type="curve" name="ih01"/>
@@ -31,16 +31,16 @@
       <point x="842" y="1116" type="curve" smooth="yes"/>
       <point x="887" y="1137"/>
       <point x="938" y="1147"/>
-      <point x="993" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="993" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1082" y="1147"/>
       <point x="1149" y="1122"/>
       <point x="1193" y="1078" type="curve" smooth="yes"/>
       <point x="1240" y="1031"/>
       <point x="1262" y="962"/>
-      <point x="1262" y="878" type="curve" name="sh02" smooth="yes"/>
+      <point x="1262" y="878" type="curve" smooth="yes" name="sh02"/>
       <point x="1262" y="843"/>
       <point x="1258" y="794"/>
-      <point x="1254" y="761" type="curve" name="sh03" smooth="yes"/>
+      <point x="1254" y="761" type="curve" smooth="yes" name="sh03"/>
       <point x="1249" y="722"/>
       <point x="1240" y="662"/>
       <point x="1229" y="606" type="curve" smooth="yes"/>
@@ -57,7 +57,7 @@
       <point x="784" y="230" type="curve" smooth="yes"/>
       <point x="811" y="201"/>
       <point x="852" y="184"/>
-      <point x="901" y="184" type="curve" name="sv02" smooth="yes"/>
+      <point x="901" y="184" type="curve" smooth="yes" name="sv02"/>
       <point x="938" y="184"/>
       <point x="979" y="193"/>
       <point x="1024" y="212" type="curve" smooth="yes"/>
@@ -70,7 +70,7 @@
       <point x="982" y="-9" type="curve" smooth="yes"/>
       <point x="935" y="-22"/>
       <point x="886" y="-29"/>
-      <point x="835" y="-29" type="curve" name="sv03" smooth="yes"/>
+      <point x="835" y="-29" type="curve" smooth="yes" name="sv03"/>
       <point x="766" y="-29"/>
       <point x="715" y="-15"/>
       <point x="671" y="12" type="curve" smooth="yes"/>
@@ -84,7 +84,7 @@
       <point x="363" y="-29"/>
     </contour>
     <contour>
-      <point x="319" y="184" type="curve" name="dv01" smooth="yes"/>
+      <point x="319" y="184" type="curve" smooth="yes" name="dv01"/>
       <point x="355" y="184"/>
       <point x="382" y="195"/>
       <point x="405" y="216" type="curve" smooth="yes"/>
@@ -108,7 +108,7 @@
       <point x="531" y="902" type="curve" smooth="yes"/>
       <point x="514" y="923"/>
       <point x="487" y="934"/>
-      <point x="452" y="934" type="curve" name="sv01" smooth="yes"/>
+      <point x="452" y="934" type="curve" smooth="yes" name="sv01"/>
       <point x="415" y="934"/>
       <point x="385" y="923"/>
       <point x="362" y="902" type="curve" smooth="yes"/>
@@ -123,7 +123,7 @@
       <point x="220" y="417" type="curve" name="sh05"/>
       <point x="213" y="373"/>
       <point x="211" y="350"/>
-      <point x="211" y="322" type="curve" name="sh04" smooth="yes"/>
+      <point x="211" y="322" type="curve" smooth="yes" name="sh04"/>
       <point x="211" y="273"/>
       <point x="220" y="238"/>
       <point x="237" y="217" type="curve" smooth="yes"/>
@@ -135,16 +135,16 @@
       <point x="1032" y="756" type="line" name="sh06"/>
       <point x="1035" y="769"/>
       <point x="1037" y="782"/>
-      <point x="1038" y="796" type="curve" name="sh07" smooth="yes"/>
+      <point x="1038" y="796" type="curve" smooth="yes" name="sh07"/>
       <point x="1039" y="809"/>
       <point x="1040" y="821"/>
-      <point x="1040" y="834" type="curve" name="ah01" smooth="yes"/>
+      <point x="1040" y="834" type="curve" smooth="yes" name="ah01"/>
       <point x="1040" y="868"/>
       <point x="1033" y="893"/>
       <point x="1020" y="910" type="curve" smooth="yes"/>
       <point x="1007" y="926"/>
       <point x="986" y="934"/>
-      <point x="957" y="934" type="curve" name="sv04" smooth="yes"/>
+      <point x="957" y="934" type="curve" smooth="yes" name="sv04"/>
       <point x="919" y="934"/>
       <point x="889" y="920"/>
       <point x="866" y="892" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ogonek.glif b/source/Hack-BoldItalic.ufo/glyphs/ogonek.glif
index 50bf45cf3..56ecaae79 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ogonek.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ogonek.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ogonek" format="1">
+<glyph name="ogonek" format="2">
   <advance width="1233"/>
   <unicode hex="02DB"/>
   <outline>
     <contour>
-      <point x="471" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="471" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="408" y="-401"/>
       <point x="354" y="-390"/>
       <point x="314" y="-363" type="curve" smooth="yes"/>
@@ -29,7 +29,7 @@
       <point x="456" y="-234" type="curve" smooth="yes"/>
       <point x="472" y="-247"/>
       <point x="494" y="-254"/>
-      <point x="529" y="-254" type="curve" name="hr01" smooth="yes"/>
+      <point x="529" y="-254" type="curve" smooth="yes" name="hr01"/>
       <point x="548" y="-254"/>
       <point x="574" y="-252"/>
       <point x="601" y="-247" type="curve" smooth="yes"/>
@@ -39,7 +39,7 @@
       <point x="655" y="-379" type="line"/>
       <point x="632" y="-384"/>
       <point x="579" y="-393"/>
-      <point x="560" y="-396" type="curve" name="sv01" smooth="yes"/>
+      <point x="560" y="-396" type="curve" smooth="yes" name="sv01"/>
       <point x="533" y="-399"/>
       <point x="496" y="-401"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ograve.glif b/source/Hack-BoldItalic.ufo/glyphs/ograve.glif
index b31c85c04..24ae2cc20 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ograve.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ograve.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ograve" format="1">
+<glyph name="ograve" format="2">
   <advance width="1233"/>
   <unicode hex="00F2"/>
   <outline>
@@ -10,25 +10,25 @@
       <point x="666" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="543" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="543" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="391" y="-29"/>
       <point x="280" y="20"/>
       <point x="208" y="91" type="curve" smooth="yes"/>
       <point x="123" y="175"/>
       <point x="88" y="293"/>
-      <point x="88" y="442" type="curve" name="sh01" smooth="yes"/>
+      <point x="88" y="442" type="curve" smooth="yes" name="sh01"/>
       <point x="88" y="631"/>
       <point x="143" y="814"/>
       <point x="254" y="949" type="curve" smooth="yes"/>
       <point x="361" y="1078"/>
       <point x="509" y="1149"/>
-      <point x="689" y="1149" type="curve" name="dv04" smooth="yes"/>
+      <point x="689" y="1149" type="curve" smooth="yes" name="dv04"/>
       <point x="822" y="1149"/>
       <point x="942" y="1110"/>
       <point x="1025" y="1030" type="curve" smooth="yes"/>
       <point x="1109" y="947"/>
       <point x="1145" y="828"/>
-      <point x="1145" y="676" type="curve" name="sh04" smooth="yes"/>
+      <point x="1145" y="676" type="curve" smooth="yes" name="sh04"/>
       <point x="1145" y="483"/>
       <point x="1088" y="302"/>
       <point x="980" y="171" type="curve" smooth="yes"/>
@@ -36,25 +36,25 @@
       <point x="715" y="-29"/>
     </contour>
     <contour>
-      <point x="563" y="207" type="curve" name="dv02" smooth="yes"/>
+      <point x="563" y="207" type="curve" smooth="yes" name="dv02"/>
       <point x="640" y="207"/>
       <point x="711" y="251"/>
       <point x="767" y="343" type="curve" smooth="yes"/>
       <point x="818" y="427"/>
       <point x="850" y="544"/>
-      <point x="850" y="672" type="curve" name="ah01" smooth="yes"/>
+      <point x="850" y="672" type="curve" smooth="yes" name="ah01"/>
       <point x="850" y="764"/>
       <point x="833" y="817"/>
       <point x="804" y="853" type="curve" smooth="yes"/>
       <point x="769" y="896"/>
       <point x="720" y="911"/>
-      <point x="672" y="911" type="curve" name="dv03" smooth="yes"/>
+      <point x="672" y="911" type="curve" smooth="yes" name="dv03"/>
       <point x="589" y="911"/>
       <point x="521" y="866"/>
       <point x="466" y="776" type="curve"/>
       <point x="410" y="679"/>
       <point x="383" y="556"/>
-      <point x="383" y="448" type="curve" name="sh02" smooth="yes"/>
+      <point x="383" y="448" type="curve" smooth="yes" name="sh02"/>
       <point x="383" y="377"/>
       <point x="394" y="312"/>
       <point x="431" y="267" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ohorn.glif b/source/Hack-BoldItalic.ufo/glyphs/ohorn.glif
index 9e596bf19..151063904 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ohorn.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ohorn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ohorn" format="1">
+<glyph name="ohorn" format="2">
   <advance width="1233"/>
   <unicode hex="01A1"/>
   <outline>
@@ -13,16 +13,16 @@
       <point x="1102" y="744" type="curve" name="sh02"/>
       <point x="1105" y="719"/>
       <point x="1106" y="693"/>
-      <point x="1106" y="665" type="curve" name="sh01" smooth="yes"/>
+      <point x="1106" y="665" type="curve" smooth="yes" name="sh01"/>
       <point x="1106" y="300"/>
       <point x="886" y="-29"/>
-      <point x="494" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="494" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="219" y="-29"/>
       <point x="49" y="134"/>
-      <point x="49" y="454" type="curve" name="hr01" smooth="yes"/>
+      <point x="49" y="454" type="curve" smooth="yes" name="hr01"/>
       <point x="49" y="818"/>
       <point x="269" y="1149"/>
-      <point x="661" y="1149" type="curve" name="dv04" smooth="yes"/>
+      <point x="661" y="1149" type="curve" smooth="yes" name="dv04"/>
       <point x="856" y="1149"/>
       <point x="995" y="1070"/>
       <point x="1063" y="909" type="curve"/>
@@ -31,22 +31,22 @@
       <point x="1138" y="1011" type="curve" smooth="yes"/>
       <point x="1143" y="1035"/>
       <point x="1146" y="1066"/>
-      <point x="1146" y="1090" type="curve" name="hr02" smooth="yes"/>
+      <point x="1146" y="1090" type="curve" smooth="yes" name="hr02"/>
       <point x="1146" y="1113"/>
       <point x="1143" y="1138"/>
       <point x="1138" y="1167" type="curve"/>
     </contour>
     <contour>
-      <point x="518" y="207" type="curve" name="dv02" smooth="yes"/>
+      <point x="518" y="207" type="curve" smooth="yes" name="dv02"/>
       <point x="698" y="207"/>
       <point x="811" y="440"/>
-      <point x="811" y="664" type="curve" name="ah01" smooth="yes"/>
+      <point x="811" y="664" type="curve" smooth="yes" name="ah01"/>
       <point x="811" y="835"/>
       <point x="745" y="911"/>
-      <point x="640" y="911" type="curve" name="dv03" smooth="yes"/>
+      <point x="640" y="911" type="curve" smooth="yes" name="dv03"/>
       <point x="450" y="911"/>
       <point x="344" y="669"/>
-      <point x="344" y="456" type="curve" name="sh03" smooth="yes"/>
+      <point x="344" y="456" type="curve" smooth="yes" name="sh03"/>
       <point x="344" y="285"/>
       <point x="413" y="207"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ohungarumlaut.glif b/source/Hack-BoldItalic.ufo/glyphs/ohungarumlaut.glif
index 3ac34e264..fa0174408 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ohungarumlaut.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ohungarumlaut.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ohungarumlaut" format="1">
+<glyph name="ohungarumlaut" format="2">
   <advance width="1233"/>
   <unicode hex="0151"/>
   <outline>
@@ -16,30 +16,30 @@
       <point x="750" y="1297" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="533" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="533" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="258" y="-29"/>
       <point x="88" y="134"/>
-      <point x="88" y="454" type="curve" name="sh02" smooth="yes"/>
+      <point x="88" y="454" type="curve" smooth="yes" name="sh02"/>
       <point x="88" y="818"/>
       <point x="308" y="1149"/>
-      <point x="700" y="1149" type="curve" name="dv05" smooth="yes"/>
+      <point x="700" y="1149" type="curve" smooth="yes" name="dv05"/>
       <point x="975" y="1149"/>
       <point x="1145" y="987"/>
-      <point x="1145" y="665" type="curve" name="sh05" smooth="yes"/>
+      <point x="1145" y="665" type="curve" smooth="yes" name="sh05"/>
       <point x="1145" y="300"/>
       <point x="925" y="-29"/>
     </contour>
     <contour>
-      <point x="557" y="207" type="curve" name="dv02" smooth="yes"/>
+      <point x="557" y="207" type="curve" smooth="yes" name="dv02"/>
       <point x="737" y="207"/>
       <point x="850" y="440"/>
-      <point x="850" y="664" type="curve" name="ah01" smooth="yes"/>
+      <point x="850" y="664" type="curve" smooth="yes" name="ah01"/>
       <point x="850" y="835"/>
       <point x="784" y="911"/>
-      <point x="679" y="911" type="curve" name="dv04" smooth="yes"/>
+      <point x="679" y="911" type="curve" smooth="yes" name="dv04"/>
       <point x="489" y="911"/>
       <point x="383" y="669"/>
-      <point x="383" y="456" type="curve" name="sh03" smooth="yes"/>
+      <point x="383" y="456" type="curve" smooth="yes" name="sh03"/>
       <point x="383" y="285"/>
       <point x="452" y="207"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/omacron.glif b/source/Hack-BoldItalic.ufo/glyphs/omacron.glif
index 18ba9588a..4e8d7a1da 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/omacron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/omacron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="omacron" format="1">
+<glyph name="omacron" format="2">
   <advance width="1233"/>
   <unicode hex="014D"/>
   <outline>
@@ -10,30 +10,30 @@
       <point x="422" y="1349" type="line"/>
     </contour>
     <contour>
-      <point x="533" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="533" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="258" y="-29"/>
       <point x="88" y="134"/>
-      <point x="88" y="454" type="curve" name="sh01" smooth="yes"/>
+      <point x="88" y="454" type="curve" smooth="yes" name="sh01"/>
       <point x="88" y="818"/>
       <point x="308" y="1149"/>
-      <point x="700" y="1149" type="curve" name="dv06" smooth="yes"/>
+      <point x="700" y="1149" type="curve" smooth="yes" name="dv06"/>
       <point x="975" y="1149"/>
       <point x="1145" y="987"/>
-      <point x="1145" y="665" type="curve" name="sh02" smooth="yes"/>
+      <point x="1145" y="665" type="curve" smooth="yes" name="sh02"/>
       <point x="1145" y="300"/>
       <point x="925" y="-29"/>
     </contour>
     <contour>
-      <point x="557" y="207" type="curve" name="dv02" smooth="yes"/>
+      <point x="557" y="207" type="curve" smooth="yes" name="dv02"/>
       <point x="737" y="207"/>
       <point x="850" y="440"/>
-      <point x="850" y="664" type="curve" name="ah01" smooth="yes"/>
+      <point x="850" y="664" type="curve" smooth="yes" name="ah01"/>
       <point x="850" y="835"/>
       <point x="784" y="911"/>
-      <point x="679" y="911" type="curve" name="dv05" smooth="yes"/>
+      <point x="679" y="911" type="curve" smooth="yes" name="dv05"/>
       <point x="489" y="911"/>
       <point x="383" y="669"/>
-      <point x="383" y="456" type="curve" name="sh03" smooth="yes"/>
+      <point x="383" y="456" type="curve" smooth="yes" name="sh03"/>
       <point x="383" y="285"/>
       <point x="452" y="207"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/omega.glif b/source/Hack-BoldItalic.ufo/glyphs/omega.glif
index ee6c10f8a..597aa0935 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/omega.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/omega.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="omega" format="1">
+<glyph name="omega" format="2">
   <advance width="1233"/>
   <unicode hex="03C9"/>
   <outline>
     <contour>
-      <point x="287" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="287" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="199" y="-29"/>
       <point x="129" y="3"/>
       <point x="90" y="54" type="curve" smooth="yes"/>
       <point x="56" y="99"/>
       <point x="39" y="171"/>
-      <point x="39" y="271" type="curve" name="sh01" smooth="yes"/>
+      <point x="39" y="271" type="curve" smooth="yes" name="sh01"/>
       <point x="39" y="518"/>
       <point x="137" y="881"/>
       <point x="289" y="1120" type="curve" name="at01"/>
@@ -20,10 +20,10 @@
       <point x="355" y="557" type="curve"/>
       <point x="331" y="446"/>
       <point x="315" y="326"/>
-      <point x="315" y="271" type="curve" name="sh03" smooth="yes"/>
+      <point x="315" y="271" type="curve" smooth="yes" name="sh03"/>
       <point x="315" y="256"/>
       <point x="316" y="245"/>
-      <point x="318" y="237" type="curve" name="sh04" smooth="yes"/>
+      <point x="318" y="237" type="curve" smooth="yes" name="sh04"/>
       <point x="322" y="220"/>
       <point x="335" y="210"/>
       <point x="357" y="209" type="curve" name="dv01"/>
@@ -42,20 +42,20 @@
       <point x="808" y="237" type="curve" smooth="yes"/>
       <point x="848" y="299"/>
       <point x="928" y="602"/>
-      <point x="928" y="933" type="curve" name="ah01" smooth="yes"/>
+      <point x="928" y="933" type="curve" smooth="yes" name="ah01"/>
       <point x="928" y="996"/>
       <point x="925" y="1058"/>
       <point x="919" y="1120" type="curve" name="sh05"/>
       <point x="1181" y="1120" type="line"/>
       <point x="1198" y="1045"/>
       <point x="1207" y="959"/>
-      <point x="1207" y="864" type="curve" name="sh02" smooth="yes"/>
+      <point x="1207" y="864" type="curve" smooth="yes" name="sh02"/>
       <point x="1207" y="547"/>
       <point x="1110" y="183"/>
       <point x="964" y="54" type="curve"/>
       <point x="905" y="3"/>
       <point x="820" y="-29"/>
-      <point x="735" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="735" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="618" y="-29"/>
       <point x="555" y="31"/>
       <point x="546" y="150" type="curve" name="ih02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/omegatonos.glif b/source/Hack-BoldItalic.ufo/glyphs/omegatonos.glif
index ca30be8dc..6da9087f4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/omegatonos.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/omegatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="omegatonos" format="1">
+<glyph name="omegatonos" format="2">
   <advance width="1233"/>
   <unicode hex="03CE"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="564" y="1272" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="282" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="282" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="194" y="-29"/>
       <point x="124" y="3"/>
       <point x="85" y="54" type="curve" smooth="yes"/>
       <point x="51" y="99"/>
       <point x="34" y="171"/>
-      <point x="34" y="271" type="curve" name="sh03" smooth="yes"/>
+      <point x="34" y="271" type="curve" smooth="yes" name="sh03"/>
       <point x="34" y="518"/>
       <point x="132" y="881"/>
       <point x="284" y="1120" type="curve" name="at01"/>
@@ -26,10 +26,10 @@
       <point x="350" y="557" type="curve"/>
       <point x="326" y="446"/>
       <point x="310" y="326"/>
-      <point x="310" y="271" type="curve" name="sh04" smooth="yes"/>
+      <point x="310" y="271" type="curve" smooth="yes" name="sh04"/>
       <point x="310" y="256"/>
       <point x="311" y="245"/>
-      <point x="313" y="237" type="curve" name="sh05" smooth="yes"/>
+      <point x="313" y="237" type="curve" smooth="yes" name="sh05"/>
       <point x="317" y="220"/>
       <point x="330" y="210"/>
       <point x="352" y="209" type="curve" name="dv02"/>
@@ -48,20 +48,20 @@
       <point x="803" y="237" type="curve" smooth="yes"/>
       <point x="843" y="299"/>
       <point x="923" y="602"/>
-      <point x="923" y="933" type="curve" name="ah01" smooth="yes"/>
+      <point x="923" y="933" type="curve" smooth="yes" name="ah01"/>
       <point x="923" y="996"/>
       <point x="920" y="1058"/>
       <point x="914" y="1120" type="curve" name="sh06"/>
       <point x="1176" y="1120" type="line"/>
       <point x="1193" y="1045"/>
       <point x="1202" y="959"/>
-      <point x="1202" y="864" type="curve" name="sh01" smooth="yes"/>
+      <point x="1202" y="864" type="curve" smooth="yes" name="sh01"/>
       <point x="1202" y="547"/>
       <point x="1105" y="183"/>
       <point x="959" y="54" type="curve"/>
       <point x="900" y="3"/>
       <point x="815" y="-29"/>
-      <point x="730" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="730" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="613" y="-29"/>
       <point x="550" y="31"/>
       <point x="541" y="150" type="curve" name="ih03"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/omicron.glif b/source/Hack-BoldItalic.ufo/glyphs/omicron.glif
index 6f4925287..57c6a3aad 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/omicron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/omicron.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="omicron" format="1">
+<glyph name="omicron" format="2">
   <advance width="1233"/>
   <unicode hex="03BF"/>
   <outline>
     <contour>
-      <point x="533" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="533" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="258" y="-29"/>
       <point x="88" y="134"/>
-      <point x="88" y="454" type="curve" name="sh01" smooth="yes"/>
+      <point x="88" y="454" type="curve" smooth="yes" name="sh01"/>
       <point x="88" y="818"/>
       <point x="308" y="1149"/>
-      <point x="700" y="1149" type="curve" name="dv03" smooth="yes"/>
+      <point x="700" y="1149" type="curve" smooth="yes" name="dv03"/>
       <point x="975" y="1149"/>
       <point x="1145" y="987"/>
-      <point x="1145" y="665" type="curve" name="sh02" smooth="yes"/>
+      <point x="1145" y="665" type="curve" smooth="yes" name="sh02"/>
       <point x="1145" y="300"/>
       <point x="925" y="-29"/>
     </contour>
     <contour>
-      <point x="557" y="207" type="curve" name="dv01" smooth="yes"/>
+      <point x="557" y="207" type="curve" smooth="yes" name="dv01"/>
       <point x="737" y="207"/>
       <point x="850" y="440"/>
-      <point x="850" y="664" type="curve" name="ah01" smooth="yes"/>
+      <point x="850" y="664" type="curve" smooth="yes" name="ah01"/>
       <point x="850" y="835"/>
       <point x="784" y="911"/>
-      <point x="679" y="911" type="curve" name="dv02" smooth="yes"/>
+      <point x="679" y="911" type="curve" smooth="yes" name="dv02"/>
       <point x="489" y="911"/>
       <point x="383" y="669"/>
-      <point x="383" y="456" type="curve" name="sh03" smooth="yes"/>
+      <point x="383" y="456" type="curve" smooth="yes" name="sh03"/>
       <point x="383" y="285"/>
       <point x="452" y="207"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/omicrontonos.glif b/source/Hack-BoldItalic.ufo/glyphs/omicrontonos.glif
index 840880053..4f50b992a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/omicrontonos.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/omicrontonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="omicrontonos" format="1">
+<glyph name="omicrontonos" format="2">
   <advance width="1233"/>
   <unicode hex="03CC"/>
   <outline>
@@ -10,30 +10,30 @@
       <point x="569" y="1299" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="533" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="533" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="258" y="-29"/>
       <point x="88" y="134"/>
-      <point x="88" y="454" type="curve" name="sh01" smooth="yes"/>
+      <point x="88" y="454" type="curve" smooth="yes" name="sh01"/>
       <point x="88" y="818"/>
       <point x="308" y="1149"/>
-      <point x="700" y="1149" type="curve" name="dv04" smooth="yes"/>
+      <point x="700" y="1149" type="curve" smooth="yes" name="dv04"/>
       <point x="975" y="1149"/>
       <point x="1145" y="987"/>
-      <point x="1145" y="665" type="curve" name="sh02" smooth="yes"/>
+      <point x="1145" y="665" type="curve" smooth="yes" name="sh02"/>
       <point x="1145" y="300"/>
       <point x="925" y="-29"/>
     </contour>
     <contour>
-      <point x="557" y="207" type="curve" name="dv02" smooth="yes"/>
+      <point x="557" y="207" type="curve" smooth="yes" name="dv02"/>
       <point x="737" y="207"/>
       <point x="850" y="440"/>
-      <point x="850" y="664" type="curve" name="ah01" smooth="yes"/>
+      <point x="850" y="664" type="curve" smooth="yes" name="ah01"/>
       <point x="850" y="835"/>
       <point x="784" y="911"/>
-      <point x="679" y="911" type="curve" name="dv03" smooth="yes"/>
+      <point x="679" y="911" type="curve" smooth="yes" name="dv03"/>
       <point x="489" y="911"/>
       <point x="383" y="669"/>
-      <point x="383" y="456" type="curve" name="sh03" smooth="yes"/>
+      <point x="383" y="456" type="curve" smooth="yes" name="sh03"/>
       <point x="383" y="285"/>
       <point x="452" y="207"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/one.glif b/source/Hack-BoldItalic.ufo/glyphs/one.glif
index 1aaa8365d..f5f51c173 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/one.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/one.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="one" format="1">
+<glyph name="one" format="2">
   <advance width="1233"/>
   <unicode hex="0031"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/one.subs.glif b/source/Hack-BoldItalic.ufo/glyphs/one.subs.glif
index c907e41c6..349412479 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/one.subs.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/one.subs.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="one.subs" format="1">
+<glyph name="one.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/onedotenleader.glif b/source/Hack-BoldItalic.ufo/glyphs/onedotenleader.glif
index cdc9c28c4..c9e017d60 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/onedotenleader.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/onedotenleader.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="onedotenleader" format="1">
+<glyph name="onedotenleader" format="2">
   <advance width="1233"/>
   <unicode hex="2024"/>
   <outline>
     <contour>
-      <point x="357" y="0" type="line" name="ab01" smooth="yes"/>
+      <point x="357" y="0" type="line" smooth="yes" name="ab01"/>
       <point x="338" y="0"/>
       <point x="329" y="8"/>
       <point x="329" y="25" type="curve" smooth="yes"/>
@@ -14,8 +14,8 @@
       <point x="390" y="340" type="line"/>
       <point x="393" y="358"/>
       <point x="403" y="367"/>
-      <point x="422" y="367" type="curve" name="sv03" smooth="yes"/>
-      <point x="657" y="367" type="line" name="sv04" smooth="yes"/>
+      <point x="422" y="367" type="curve" smooth="yes" name="sv03"/>
+      <point x="657" y="367" type="line" smooth="yes" name="sv04"/>
       <point x="676" y="367"/>
       <point x="685" y="359"/>
       <point x="685" y="342" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/oneeighth.glif b/source/Hack-BoldItalic.ufo/glyphs/oneeighth.glif
index fdc0b4d0e..fd3bf83eb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/oneeighth.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/oneeighth.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="oneeighth" format="1">
+<glyph name="oneeighth" format="2">
   <advance width="1233"/>
   <unicode hex="215B"/>
   <outline>
@@ -23,56 +23,56 @@
       <point x="84" y="500" type="line"/>
     </contour>
     <contour>
-      <point x="733" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="733" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="540" y="-285"/>
       <point x="425" y="-208"/>
-      <point x="425" y="-73" type="curve" name="dh01" smooth="yes"/>
+      <point x="425" y="-73" type="curve" smooth="yes" name="dh01"/>
       <point x="425" y="55"/>
       <point x="528" y="147"/>
       <point x="688" y="179" type="curve" name="hr03"/>
       <point x="584" y="200"/>
       <point x="538" y="257"/>
-      <point x="538" y="333" type="curve" name="ih01" smooth="yes"/>
+      <point x="538" y="333" type="curve" smooth="yes" name="ih01"/>
       <point x="538" y="472"/>
       <point x="698" y="582"/>
-      <point x="899" y="582" type="curve" name="dv06" smooth="yes"/>
+      <point x="899" y="582" type="curve" smooth="yes" name="dv06"/>
       <point x="1070" y="582"/>
       <point x="1187" y="502"/>
-      <point x="1187" y="381" type="curve" name="sh04" smooth="yes"/>
+      <point x="1187" y="381" type="curve" smooth="yes" name="sh04"/>
       <point x="1187" y="278"/>
       <point x="1100" y="191"/>
       <point x="954" y="172" type="curve" name="ih02"/>
       <point x="1061" y="148"/>
       <point x="1118" y="87"/>
-      <point x="1118" y="-13" type="curve" name="dh04" smooth="yes"/>
+      <point x="1118" y="-13" type="curve" smooth="yes" name="dh04"/>
       <point x="1118" y="-176"/>
       <point x="962" y="-285"/>
     </contour>
     <contour>
-      <point x="844" y="237" type="curve" name="dv04" smooth="yes"/>
+      <point x="844" y="237" type="curve" smooth="yes" name="dv04"/>
       <point x="930" y="237"/>
       <point x="1002" y="287"/>
-      <point x="1002" y="358" type="curve" name="sh03" smooth="yes"/>
+      <point x="1002" y="358" type="curve" smooth="yes" name="sh03"/>
       <point x="1002" y="415"/>
       <point x="956" y="450"/>
-      <point x="881" y="450" type="curve" name="dv05" smooth="yes"/>
+      <point x="881" y="450" type="curve" smooth="yes" name="dv05"/>
       <point x="789" y="450"/>
       <point x="724" y="399"/>
-      <point x="724" y="331" type="curve" name="sh01" smooth="yes"/>
+      <point x="724" y="331" type="curve" smooth="yes" name="sh01"/>
       <point x="724" y="275"/>
       <point x="768" y="237"/>
     </contour>
     <contour>
-      <point x="753" y="-152" type="curve" name="dv02" smooth="yes"/>
+      <point x="753" y="-152" type="curve" smooth="yes" name="dv02"/>
       <point x="858" y="-152"/>
       <point x="932" y="-90"/>
-      <point x="932" y="-6" type="curve" name="dh03" smooth="yes"/>
+      <point x="932" y="-6" type="curve" smooth="yes" name="dh03"/>
       <point x="932" y="66"/>
       <point x="877" y="105"/>
-      <point x="793" y="105" type="curve" name="dv03" smooth="yes"/>
+      <point x="793" y="105" type="curve" smooth="yes" name="dv03"/>
       <point x="684" y="105"/>
       <point x="611" y="40"/>
-      <point x="611" y="-41" type="curve" name="dh02" smooth="yes"/>
+      <point x="611" y="-41" type="curve" smooth="yes" name="dh02"/>
       <point x="611" y="-117"/>
       <point x="675" y="-152"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/onehalf.glif b/source/Hack-BoldItalic.ufo/glyphs/onehalf.glif
index 009c7faa5..777797898 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/onehalf.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/onehalf.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="onehalf" format="1">
+<glyph name="onehalf" format="2">
   <advance width="1233"/>
   <unicode hex="00BD"/>
   <outline>
@@ -29,13 +29,13 @@
       <point x="585" y="-27" type="curve" smooth="yes"/>
       <point x="870" y="178"/>
       <point x="985" y="289"/>
-      <point x="985" y="356" type="curve" name="dh01" smooth="yes"/>
+      <point x="985" y="356" type="curve" smooth="yes" name="dh01"/>
       <point x="985" y="377"/>
       <point x="973" y="403"/>
       <point x="949" y="420" type="curve" smooth="yes"/>
       <point x="926" y="436"/>
       <point x="891" y="444"/>
-      <point x="845" y="444" type="curve" name="dv03" smooth="yes"/>
+      <point x="845" y="444" type="curve" smooth="yes" name="dv03"/>
       <point x="805" y="444"/>
       <point x="758" y="438"/>
       <point x="709" y="426" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="737" y="570" type="curve" smooth="yes"/>
       <point x="786" y="578"/>
       <point x="834" y="582"/>
-      <point x="881" y="582" type="curve" name="dv04" smooth="yes"/>
+      <point x="881" y="582" type="curve" smooth="yes" name="dv04"/>
       <point x="976" y="582"/>
       <point x="1053" y="565"/>
       <point x="1105" y="528" type="curve" smooth="yes"/>
       <point x="1158" y="489"/>
       <point x="1182" y="434"/>
-      <point x="1182" y="387" type="curve" name="dh02" smooth="yes"/>
+      <point x="1182" y="387" type="curve" smooth="yes" name="dh02"/>
       <point x="1182" y="280"/>
       <point x="1053" y="143"/>
       <point x="772" y="-52" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/onequarter.glif b/source/Hack-BoldItalic.ufo/glyphs/onequarter.glif
index 88d8fa6a9..2fad5bd12 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/onequarter.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/onequarter.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="onequarter" format="1">
+<glyph name="onequarter" format="2">
   <advance width="1233"/>
   <unicode hex="00BC"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/openbullet.glif b/source/Hack-BoldItalic.ufo/glyphs/openbullet.glif
index 91e2561c8..e815b31fa 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/openbullet.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/openbullet.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="openbullet" format="1">
+<glyph name="openbullet" format="2">
   <advance width="1233"/>
   <unicode hex="25E6"/>
   <outline>
     <contour>
-      <point x="614" y="399" type="curve" name="hr00" smooth="yes"/>
+      <point x="614" y="399" type="curve" smooth="yes" name="hr00"/>
       <point x="517" y="399"/>
       <point x="427" y="438"/>
       <point x="360" y="506" type="curve" smooth="yes"/>
       <point x="292" y="574"/>
       <point x="256" y="664"/>
-      <point x="256" y="761" type="curve" name="sh01" smooth="yes"/>
+      <point x="256" y="761" type="curve" smooth="yes" name="sh01"/>
       <point x="256" y="861"/>
       <point x="294" y="948"/>
       <point x="362" y="1016" type="curve" smooth="yes"/>
       <point x="429" y="1081"/>
       <point x="520" y="1120"/>
-      <point x="617" y="1120" type="curve" name="at01" smooth="yes"/>
+      <point x="617" y="1120" type="curve" smooth="yes" name="at01"/>
       <point x="713" y="1120"/>
       <point x="802" y="1082"/>
       <point x="870" y="1017" type="curve" smooth="yes"/>
       <point x="942" y="946"/>
       <point x="977" y="856"/>
-      <point x="977" y="763" type="curve" name="sh02" smooth="yes"/>
+      <point x="977" y="763" type="curve" smooth="yes" name="sh02"/>
       <point x="977" y="667"/>
       <point x="938" y="573"/>
       <point x="870" y="505" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="711" y="399"/>
     </contour>
     <contour>
-      <point x="616" y="471" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="471" type="curve" smooth="yes" name="dv01"/>
       <point x="696" y="471"/>
       <point x="764" y="502"/>
       <point x="819" y="557" type="curve" smooth="yes"/>
       <point x="876" y="614"/>
       <point x="905" y="682"/>
-      <point x="905" y="761" type="curve" name="ah01" smooth="yes"/>
+      <point x="905" y="761" type="curve" smooth="yes" name="ah01"/>
       <point x="905" y="840"/>
       <point x="876" y="909"/>
       <point x="819" y="965" type="curve" smooth="yes"/>
       <point x="763" y="1020"/>
       <point x="693" y="1048"/>
-      <point x="616" y="1048" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1048" type="curve" smooth="yes" name="sv01"/>
       <point x="539" y="1048"/>
       <point x="469" y="1020"/>
       <point x="413" y="965" type="curve" smooth="yes"/>
       <point x="358" y="912"/>
       <point x="328" y="842"/>
-      <point x="328" y="762" type="curve" name="sh03" smooth="yes"/>
+      <point x="328" y="762" type="curve" smooth="yes" name="sh03"/>
       <point x="328" y="678"/>
       <point x="362" y="608"/>
       <point x="411" y="557" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ordfeminine.glif b/source/Hack-BoldItalic.ufo/glyphs/ordfeminine.glif
index 6767ab23b..87eb084ee 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ordfeminine.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ordfeminine.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ordfeminine" format="1">
+<glyph name="ordfeminine" format="2">
   <advance width="1233"/>
   <unicode hex="00AA"/>
   <outline>
     <contour>
-      <point x="511" y="698" type="curve" name="hr00" smooth="yes"/>
+      <point x="511" y="698" type="curve" smooth="yes" name="hr00"/>
       <point x="437" y="698"/>
       <point x="379" y="718"/>
       <point x="338" y="759" type="curve" smooth="yes"/>
       <point x="295" y="800"/>
       <point x="274" y="855"/>
-      <point x="274" y="926" type="curve" name="dh01" smooth="yes"/>
+      <point x="274" y="926" type="curve" smooth="yes" name="dh01"/>
       <point x="274" y="1021"/>
       <point x="309" y="1097"/>
       <point x="386" y="1153" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="812" y="1347" type="curve" smooth="yes"/>
       <point x="787" y="1362"/>
       <point x="751" y="1368"/>
-      <point x="708" y="1368" type="curve" name="sv01" smooth="yes"/>
+      <point x="708" y="1368" type="curve" smooth="yes" name="sv01"/>
       <point x="665" y="1368"/>
       <point x="624" y="1361"/>
       <point x="575" y="1348" type="curve" smooth="yes"/>
@@ -38,10 +38,10 @@
       <point x="451" y="1464" type="line"/>
       <point x="504" y="1483"/>
       <point x="554" y="1497"/>
-      <point x="603" y="1506" type="curve" name="at01" smooth="yes"/>
+      <point x="603" y="1506" type="curve" smooth="yes" name="at01"/>
       <point x="650" y="1515"/>
       <point x="695" y="1520"/>
-      <point x="743" y="1520" type="curve" name="at02" smooth="yes"/>
+      <point x="743" y="1520" type="curve" smooth="yes" name="at02"/>
       <point x="832" y="1520"/>
       <point x="913" y="1504"/>
       <point x="969" y="1469" type="curve" smooth="yes"/>
@@ -64,7 +64,7 @@
       <point x="561" y="698"/>
     </contour>
     <contour>
-      <point x="598" y="838" type="curve" name="dv04" smooth="yes"/>
+      <point x="598" y="838" type="curve" smooth="yes" name="dv04"/>
       <point x="649" y="838"/>
       <point x="698" y="860"/>
       <point x="735" y="903" type="curve" smooth="yes"/>
@@ -77,7 +77,7 @@
       <point x="551" y="1051" type="curve" smooth="yes"/>
       <point x="512" y="1027"/>
       <point x="492" y="990"/>
-      <point x="492" y="943" type="curve" name="dh02" smooth="yes"/>
+      <point x="492" y="943" type="curve" smooth="yes" name="dh02"/>
       <point x="492" y="912"/>
       <point x="502" y="886"/>
       <point x="521" y="867" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ordmasculine.glif b/source/Hack-BoldItalic.ufo/glyphs/ordmasculine.glif
index e5f40466d..47544013b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ordmasculine.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ordmasculine.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ordmasculine" format="1">
+<glyph name="ordmasculine" format="2">
   <advance width="1233"/>
   <unicode hex="00BA"/>
   <outline>
     <contour>
-      <point x="634" y="698" type="curve" name="hr00" smooth="yes"/>
+      <point x="634" y="698" type="curve" smooth="yes" name="hr00"/>
       <point x="530" y="698"/>
       <point x="453" y="726"/>
       <point x="394" y="782" type="curve" smooth="yes"/>
       <point x="334" y="838"/>
       <point x="307" y="914"/>
-      <point x="307" y="1027" type="curve" name="sh01" smooth="yes"/>
+      <point x="307" y="1027" type="curve" smooth="yes" name="sh01"/>
       <point x="307" y="1164"/>
       <point x="347" y="1287"/>
       <point x="427" y="1380" type="curve" smooth="yes"/>
       <point x="506" y="1473"/>
       <point x="611" y="1520"/>
-      <point x="740" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="740" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="843" y="1520"/>
       <point x="923" y="1492"/>
       <point x="981" y="1436" type="curve" smooth="yes"/>
       <point x="1038" y="1380"/>
       <point x="1067" y="1307"/>
-      <point x="1067" y="1191" type="curve" name="sh02" smooth="yes"/>
+      <point x="1067" y="1191" type="curve" smooth="yes" name="sh02"/>
       <point x="1067" y="1058"/>
       <point x="1028" y="934"/>
       <point x="948" y="838" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="761" y="698"/>
     </contour>
     <contour>
-      <point x="649" y="862" type="curve" name="dv03" smooth="yes"/>
+      <point x="649" y="862" type="curve" smooth="yes" name="dv03"/>
       <point x="709" y="862"/>
       <point x="760" y="898"/>
       <point x="796" y="957" type="curve" smooth="yes"/>
       <point x="836" y="1022"/>
       <point x="856" y="1108"/>
-      <point x="856" y="1188" type="curve" name="ah01" smooth="yes"/>
+      <point x="856" y="1188" type="curve" smooth="yes" name="ah01"/>
       <point x="856" y="1239"/>
       <point x="849" y="1284"/>
       <point x="822" y="1315" type="curve" smooth="yes"/>
       <point x="799" y="1342"/>
       <point x="765" y="1356"/>
-      <point x="728" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="728" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="667" y="1356"/>
       <point x="616" y="1320"/>
       <point x="580" y="1261" type="curve" smooth="yes"/>
       <point x="537" y="1193"/>
       <point x="520" y="1105"/>
-      <point x="520" y="1032" type="curve" name="sh03" smooth="yes"/>
+      <point x="520" y="1032" type="curve" smooth="yes" name="sh03"/>
       <point x="520" y="969"/>
       <point x="533" y="932"/>
       <point x="554" y="905" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/orthogonal.glif b/source/Hack-BoldItalic.ufo/glyphs/orthogonal.glif
index 328f3b42d..f309b3078 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/orthogonal.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/orthogonal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="orthogonal" format="1">
+<glyph name="orthogonal" format="2">
   <advance width="1233"/>
   <unicode hex="221F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/oslash.glif b/source/Hack-BoldItalic.ufo/glyphs/oslash.glif
index 9c7a8c87a..30f792e9e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/oslash.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/oslash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="oslash" format="1">
+<glyph name="oslash" format="2">
   <advance width="1233"/>
   <unicode hex="00F8"/>
   <outline>
@@ -17,7 +17,7 @@
       <point x="253" y="950" type="curve" smooth="yes"/>
       <point x="364" y="1083"/>
       <point x="516" y="1149"/>
-      <point x="688" y="1149" type="curve" name="dv04" smooth="yes"/>
+      <point x="688" y="1149" type="curve" smooth="yes" name="dv04"/>
       <point x="748" y="1149"/>
       <point x="806" y="1141"/>
       <point x="858" y="1124" type="curve" smooth="yes"/>
@@ -32,13 +32,13 @@
       <point x="1135" y="810" type="curve" smooth="yes"/>
       <point x="1142" y="773"/>
       <point x="1145" y="743"/>
-      <point x="1145" y="696" type="curve" name="dh02" smooth="yes"/>
+      <point x="1145" y="696" type="curve" smooth="yes" name="dh02"/>
       <point x="1145" y="489"/>
       <point x="1089" y="303"/>
       <point x="980" y="170" type="curve" smooth="yes"/>
       <point x="875" y="42"/>
       <point x="726" y="-29"/>
-      <point x="541" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="541" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="478" y="-29"/>
       <point x="421" y="-21"/>
       <point x="370" y="-4" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="801" y="856" type="line"/>
       <point x="766" y="895"/>
       <point x="729" y="911"/>
-      <point x="674" y="911" type="curve" name="dv03" smooth="yes"/>
+      <point x="674" y="911" type="curve" smooth="yes" name="dv03"/>
       <point x="590" y="911"/>
       <point x="529" y="872"/>
       <point x="478" y="793" type="curve" smooth="yes"/>
@@ -60,7 +60,7 @@
       <point x="383" y="453" type="curve" name="iv01"/>
     </contour>
     <contour>
-      <point x="562" y="207" type="curve" name="dv02" smooth="yes"/>
+      <point x="562" y="207" type="curve" smooth="yes" name="dv02"/>
       <point x="642" y="207"/>
       <point x="707" y="247"/>
       <point x="758" y="328" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/oslashacute.glif b/source/Hack-BoldItalic.ufo/glyphs/oslashacute.glif
index 7e0b6077b..a183664a2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/oslashacute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/oslashacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="oslashacute" format="1">
+<glyph name="oslashacute" format="2">
   <advance width="1233"/>
   <unicode hex="01FF"/>
   <outline>
@@ -17,7 +17,7 @@
       <point x="88" y="433" type="curve" smooth="yes"/>
       <point x="88" y="853"/>
       <point x="330" y="1149"/>
-      <point x="690" y="1149" type="curve" name="dv04" smooth="yes"/>
+      <point x="690" y="1149" type="curve" smooth="yes" name="dv04"/>
       <point x="810" y="1149"/>
       <point x="914" y="1116"/>
       <point x="1001" y="1049" type="curve"/>
@@ -26,10 +26,10 @@
       <point x="1104" y="913" type="line"/>
       <point x="1133" y="842"/>
       <point x="1145" y="777"/>
-      <point x="1145" y="684" type="curve" name="dh02" smooth="yes"/>
+      <point x="1145" y="684" type="curve" smooth="yes" name="dh02"/>
       <point x="1145" y="264"/>
       <point x="903" y="-29"/>
-      <point x="538" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="538" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="414" y="-29"/>
       <point x="312" y="5"/>
       <point x="233" y="72" type="curve"/>
@@ -39,13 +39,13 @@
       <point x="801" y="856" type="line"/>
       <point x="768" y="893"/>
       <point x="726" y="911"/>
-      <point x="673" y="911" type="curve" name="dv03" smooth="yes"/>
+      <point x="673" y="911" type="curve" smooth="yes" name="dv03"/>
       <point x="513" y="911"/>
       <point x="408" y="752"/>
       <point x="383" y="453" type="curve" name="iv02"/>
     </contour>
     <contour>
-      <point x="562" y="207" type="curve" name="dv02" smooth="yes"/>
+      <point x="562" y="207" type="curve" smooth="yes" name="dv02"/>
       <point x="722" y="207"/>
       <point x="829" y="375"/>
       <point x="850" y="670" type="curve" name="dh01"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/otilde.glif b/source/Hack-BoldItalic.ufo/glyphs/otilde.glif
index 4354fb8dc..bbf024449 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/otilde.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/otilde.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="otilde" format="1">
+<glyph name="otilde" format="2">
   <advance width="1233"/>
   <unicode hex="00F5"/>
   <outline>
     <contour>
-      <point x="880" y="1299" type="curve" name="sv02" smooth="yes"/>
+      <point x="880" y="1299" type="curve" smooth="yes" name="sv02"/>
       <point x="832" y="1299"/>
       <point x="792" y="1313"/>
       <point x="739" y="1356" type="curve"/>
@@ -24,7 +24,7 @@
       <point x="464" y="1508" type="curve" smooth="yes"/>
       <point x="509" y="1559"/>
       <point x="565" y="1585"/>
-      <point x="625" y="1585" type="curve" name="av01" smooth="yes"/>
+      <point x="625" y="1585" type="curve" smooth="yes" name="av01"/>
       <point x="678" y="1585"/>
       <point x="703" y="1572"/>
       <point x="768" y="1524" type="curve" smooth="yes"/>
@@ -43,25 +43,25 @@
       <point x="1013" y="1299"/>
     </contour>
     <contour>
-      <point x="543" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="543" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="391" y="-29"/>
       <point x="280" y="20"/>
       <point x="208" y="91" type="curve" smooth="yes"/>
       <point x="123" y="175"/>
       <point x="88" y="293"/>
-      <point x="88" y="442" type="curve" name="sh01" smooth="yes"/>
+      <point x="88" y="442" type="curve" smooth="yes" name="sh01"/>
       <point x="88" y="631"/>
       <point x="143" y="814"/>
       <point x="254" y="949" type="curve" smooth="yes"/>
       <point x="361" y="1078"/>
       <point x="509" y="1149"/>
-      <point x="689" y="1149" type="curve" name="dv03" smooth="yes"/>
+      <point x="689" y="1149" type="curve" smooth="yes" name="dv03"/>
       <point x="822" y="1149"/>
       <point x="942" y="1110"/>
       <point x="1025" y="1030" type="curve" smooth="yes"/>
       <point x="1109" y="947"/>
       <point x="1145" y="828"/>
-      <point x="1145" y="676" type="curve" name="sh05" smooth="yes"/>
+      <point x="1145" y="676" type="curve" smooth="yes" name="sh05"/>
       <point x="1145" y="483"/>
       <point x="1088" y="302"/>
       <point x="980" y="171" type="curve" smooth="yes"/>
@@ -69,25 +69,25 @@
       <point x="715" y="-29"/>
     </contour>
     <contour>
-      <point x="563" y="207" type="curve" name="hr01" smooth="yes"/>
+      <point x="563" y="207" type="curve" smooth="yes" name="hr01"/>
       <point x="640" y="207"/>
       <point x="711" y="251"/>
       <point x="767" y="343" type="curve" smooth="yes"/>
       <point x="818" y="427"/>
       <point x="850" y="544"/>
-      <point x="850" y="672" type="curve" name="hr02" smooth="yes"/>
+      <point x="850" y="672" type="curve" smooth="yes" name="hr02"/>
       <point x="850" y="764"/>
       <point x="833" y="817"/>
       <point x="804" y="853" type="curve" smooth="yes"/>
       <point x="769" y="896"/>
       <point x="720" y="911"/>
-      <point x="672" y="911" type="curve" name="dv02" smooth="yes"/>
+      <point x="672" y="911" type="curve" smooth="yes" name="dv02"/>
       <point x="589" y="911"/>
       <point x="521" y="866"/>
       <point x="466" y="776" type="curve"/>
       <point x="410" y="679"/>
       <point x="383" y="556"/>
-      <point x="383" y="448" type="curve" name="sh02" smooth="yes"/>
+      <point x="383" y="448" type="curve" smooth="yes" name="sh02"/>
       <point x="383" y="377"/>
       <point x="394" y="312"/>
       <point x="431" y="267" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/p.glif b/source/Hack-BoldItalic.ufo/glyphs/p.glif
index a31160dbc..3240c249b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/p.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/p.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="p" format="1">
+<glyph name="p" format="2">
   <advance width="1233"/>
   <unicode hex="0070"/>
   <outline>
@@ -38,9 +38,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/paragraph.glif b/source/Hack-BoldItalic.ufo/glyphs/paragraph.glif
index 5c4931327..b6a5fdb4d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/paragraph.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/paragraph.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="paragraph" format="1">
+<glyph name="paragraph" format="2">
   <advance width="1233"/>
   <unicode hex="00B6"/>
   <outline>
@@ -16,7 +16,7 @@
       <point x="265" y="1346" type="curve" smooth="yes"/>
       <point x="373" y="1444"/>
       <point x="509" y="1493"/>
-      <point x="672" y="1493" type="curve" name="at01" smooth="yes"/>
+      <point x="672" y="1493" type="curve" smooth="yes" name="at01"/>
       <point x="1190" y="1493" type="line"/>
       <point x="862" y="-197" type="line" name="av01"/>
       <point x="672" y="-197" type="line"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/parenleft.glif b/source/Hack-BoldItalic.ufo/glyphs/parenleft.glif
index f0afa24cc..e96be94d2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/parenleft.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/parenleft.glif
@@ -1,38 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="parenleft" format="1">
+<glyph name="parenleft" format="2">
   <advance width="1233"/>
   <unicode hex="0028"/>
   <outline>
     <contour>
-      <point x="440" y="-270" type="line" name="hr00"/>
-      <point x="388" y="-161"/>
-      <point x="346" y="-49"/>
-      <point x="318" y="67" type="curve" smooth="yes"/>
-      <point x="291" y="176"/>
-      <point x="278" y="284"/>
-      <point x="278" y="393" type="curve" name="dh01" smooth="yes"/>
-      <point x="278" y="784"/>
-      <point x="448" y="1164"/>
-      <point x="794" y="1554" type="curve" name="at01"/>
-      <point x="1019" y="1554" type="line"/>
-      <point x="863" y="1345"/>
-      <point x="746" y="1140"/>
-      <point x="669" y="941" type="curve" smooth="yes"/>
-      <point x="591" y="740"/>
-      <point x="552" y="541"/>
-      <point x="552" y="346" type="curve" name="dh02" smooth="yes"/>
-      <point x="552" y="251"/>
-      <point x="561" y="153"/>
-      <point x="580" y="50" type="curve" smooth="yes"/>
-      <point x="600" y="-58"/>
-      <point x="629" y="-165"/>
-      <point x="665" y="-270" type="curve" name="av01"/>
+      <point x="822" y="-236" type="line" name="hr00"/>
+      <point x="493" y="-168"/>
+      <point x="286" y="154"/>
+      <point x="286" y="594" type="curve" smooth="yes"/>
+      <point x="286" y="651"/>
+      <point x="290" y="696"/>
+      <point x="298" y="752" type="curve" smooth="yes" name="dh01"/>
+      <point x="371" y="1265"/>
+      <point x="690" y="1624"/>
+      <point x="1131" y="1700" type="curve" name="at01"/>
+      <point x="1101" y="1527" type="line"/>
+      <point x="807" y="1439"/>
+      <point x="628" y="1181"/>
+      <point x="561" y="736" type="curve" smooth="yes" name="dh02"/>
+      <point x="548" y="650"/>
+      <point x="541" y="574"/>
+      <point x="541" y="503" type="curve" smooth="yes"/>
+      <point x="541" y="208"/>
+      <point x="652" y="3"/>
+      <point x="850" y="-63" type="curve" name="av01"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
+      <string>2018-06-05 00:50:28 +0000</string>
     </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/parenright.glif b/source/Hack-BoldItalic.ufo/glyphs/parenright.glif
index f8c2e0854..55f67cea0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/parenright.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/parenright.glif
@@ -1,38 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="parenright" format="1">
+<glyph name="parenright" format="2">
   <advance width="1233"/>
   <unicode hex="0029"/>
   <outline>
     <contour>
-      <point x="243" y="-270" type="line" name="hr00"/>
-      <point x="554" y="147"/>
-      <point x="710" y="547"/>
-      <point x="710" y="939" type="curve" name="dh01" smooth="yes"/>
-      <point x="710" y="1034"/>
-      <point x="701" y="1131"/>
-      <point x="682" y="1235" type="curve" smooth="yes"/>
-      <point x="663" y="1338"/>
-      <point x="634" y="1445"/>
-      <point x="597" y="1554" type="curve" name="at01"/>
-      <point x="822" y="1554" type="line"/>
-      <point x="877" y="1439"/>
-      <point x="917" y="1327"/>
-      <point x="944" y="1218" type="curve" smooth="yes"/>
-      <point x="971" y="1107"/>
-      <point x="984" y="999"/>
-      <point x="984" y="892" type="curve" name="dh02" smooth="yes"/>
-      <point x="984" y="697"/>
-      <point x="942" y="505"/>
-      <point x="855" y="310" type="curve" smooth="yes"/>
-      <point x="770" y="118"/>
-      <point x="640" y="-75"/>
-      <point x="468" y="-270" type="curve" name="av01"/>
+      <point x="478" y="1700" type="line" name="hr00"/>
+      <point x="792" y="1608"/>
+      <point x="1010" y="1311"/>
+      <point x="1010" y="873" type="curve" smooth="yes"/>
+      <point x="1010" y="815"/>
+      <point x="1007" y="768"/>
+      <point x="998" y="708" type="curve" smooth="yes" name="dh01"/>
+      <point x="920" y="189"/>
+      <point x="623" y="-149"/>
+      <point x="171" y="-235" type="curve" name="at01"/>
+      <point x="199" y="-62" type="line"/>
+      <point x="511" y="20"/>
+      <point x="755" y="465"/>
+      <point x="755" y="930" type="curve" smooth="yes"/>
+      <point x="755" y="1236"/>
+      <point x="650" y="1436"/>
+      <point x="451" y="1527" type="curve" name="av01"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
+      <string>2018-06-05 00:50:46 +0000</string>
     </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/partialdiff.glif b/source/Hack-BoldItalic.ufo/glyphs/partialdiff.glif
index 9ca8b46fd..202327703 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/partialdiff.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/partialdiff.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="partialdiff" format="1">
+<glyph name="partialdiff" format="2">
   <advance width="1233"/>
   <unicode hex="2202"/>
   <outline>
     <contour>
-      <point x="538" y="-25" type="curve" name="ab01" smooth="yes"/>
+      <point x="538" y="-25" type="curve" smooth="yes" name="ab01"/>
       <point x="418" y="-25"/>
       <point x="328" y="15"/>
       <point x="256" y="90" type="curve" smooth="yes"/>
       <point x="181" y="166"/>
       <point x="145" y="260"/>
-      <point x="145" y="384" type="curve" name="dh01" smooth="yes"/>
+      <point x="145" y="384" type="curve" smooth="yes" name="dh01"/>
       <point x="145" y="512"/>
       <point x="183" y="623"/>
       <point x="262" y="711" type="curve" smooth="yes"/>
       <point x="339" y="798"/>
       <point x="435" y="842"/>
-      <point x="550" y="842" type="curve" name="dv04" smooth="yes"/>
+      <point x="550" y="842" type="curve" smooth="yes" name="dv04"/>
       <point x="617" y="842"/>
       <point x="674" y="828"/>
       <point x="719" y="799" type="curve" smooth="yes"/>
@@ -25,22 +25,22 @@
       <point x="831" y="662" type="curve" name="ih01"/>
       <point x="839" y="721"/>
       <point x="849" y="750"/>
-      <point x="860" y="851" type="curve" name="sh02" smooth="yes"/>
+      <point x="860" y="851" type="curve" smooth="yes" name="sh02"/>
       <point x="867" y="907"/>
       <point x="870" y="952"/>
-      <point x="870" y="1003" type="curve" name="sh01" smooth="yes"/>
+      <point x="870" y="1003" type="curve" smooth="yes" name="sh01"/>
       <point x="870" y="1075"/>
       <point x="862" y="1125"/>
       <point x="845" y="1164" type="curve" smooth="yes"/>
       <point x="826" y="1204"/>
       <point x="802" y="1221"/>
-      <point x="775" y="1221" type="curve" name="dv01" smooth="yes"/>
+      <point x="775" y="1221" type="curve" smooth="yes" name="dv01"/>
       <point x="735" y="1221"/>
       <point x="682" y="1185"/>
       <point x="629" y="1148" type="curve" smooth="yes"/>
       <point x="564" y="1103"/>
       <point x="516" y="1075"/>
-      <point x="469" y="1075" type="curve" name="sv01" smooth="yes"/>
+      <point x="469" y="1075" type="curve" smooth="yes" name="sv01"/>
       <point x="440" y="1075"/>
       <point x="417" y="1085"/>
       <point x="398" y="1105" type="curve" smooth="yes"/>
@@ -52,39 +52,39 @@
       <point x="455" y="1296" type="curve" smooth="yes"/>
       <point x="512" y="1331"/>
       <point x="581" y="1350"/>
-      <point x="661" y="1350" type="curve" name="dv02" smooth="yes"/>
+      <point x="661" y="1350" type="curve" smooth="yes" name="dv02"/>
       <point x="798" y="1350"/>
       <point x="899" y="1294"/>
       <point x="975" y="1189" type="curve" smooth="yes"/>
       <point x="1054" y="1081"/>
       <point x="1092" y="941"/>
-      <point x="1092" y="750" type="curve" name="dh04" smooth="yes"/>
+      <point x="1092" y="750" type="curve" smooth="yes" name="dh04"/>
       <point x="1092" y="537"/>
       <point x="1043" y="349"/>
-      <point x="935" y="196" type="curve" name="hr01" smooth="yes"/>
+      <point x="935" y="196" type="curve" smooth="yes" name="hr01"/>
       <point x="831" y="51"/>
       <point x="701" y="-25"/>
     </contour>
     <contour>
-      <point x="535" y="45" type="curve" name="sv02" smooth="yes"/>
+      <point x="535" y="45" type="curve" smooth="yes" name="sv02"/>
       <point x="599" y="45"/>
       <point x="659" y="86"/>
       <point x="704" y="178" type="curve" smooth="yes"/>
       <point x="748" y="269"/>
       <point x="770" y="387"/>
-      <point x="770" y="507" type="curve" name="dh03" smooth="yes"/>
+      <point x="770" y="507" type="curve" smooth="yes" name="dh03"/>
       <point x="770" y="588"/>
       <point x="760" y="652"/>
       <point x="732" y="696" type="curve" smooth="yes"/>
       <point x="705" y="739"/>
       <point x="666" y="758"/>
-      <point x="623" y="758" type="curve" name="dv03" smooth="yes"/>
+      <point x="623" y="758" type="curve" smooth="yes" name="dv03"/>
       <point x="551" y="758"/>
       <point x="495" y="709"/>
       <point x="454" y="625" type="curve" smooth="yes"/>
       <point x="411" y="537"/>
       <point x="387" y="420"/>
-      <point x="387" y="295" type="curve" name="dh02" smooth="yes"/>
+      <point x="387" y="295" type="curve" smooth="yes" name="dh02"/>
       <point x="387" y="203"/>
       <point x="400" y="144"/>
       <point x="425" y="105" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/percent.glif b/source/Hack-BoldItalic.ufo/glyphs/percent.glif
index fdb62e8dd..8ce888c6b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/percent.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/percent.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="percent" format="1">
+<glyph name="percent" format="2">
   <advance width="1233"/>
   <unicode hex="0025"/>
   <outline>
     <contour>
-      <point x="353" y="778" type="curve" name="dv05" smooth="yes"/>
+      <point x="353" y="778" type="curve" smooth="yes" name="dv05"/>
       <point x="264" y="778"/>
       <point x="176" y="807"/>
       <point x="109" y="871" type="curve" smooth="yes"/>
       <point x="52" y="927"/>
       <point x="13" y="1009"/>
-      <point x="13" y="1105" type="curve" name="dh01" smooth="yes"/>
+      <point x="13" y="1105" type="curve" smooth="yes" name="dh01"/>
       <point x="13" y="1198"/>
       <point x="49" y="1280"/>
       <point x="109" y="1339" type="curve" smooth="yes"/>
       <point x="172" y="1400"/>
       <point x="257" y="1432"/>
-      <point x="360" y="1432" type="curve" name="dv02" smooth="yes"/>
+      <point x="360" y="1432" type="curve" smooth="yes" name="dv02"/>
       <point x="363" y="1432"/>
       <point x="374" y="1432"/>
       <point x="385" y="1431" type="curve" smooth="yes"/>
@@ -34,7 +34,7 @@
       <point x="673" y="1231" type="curve" smooth="yes"/>
       <point x="691" y="1191"/>
       <point x="700" y="1148"/>
-      <point x="700" y="1103" type="curve" name="dh04" smooth="yes"/>
+      <point x="700" y="1103" type="curve" smooth="yes" name="dh04"/>
       <point x="700" y="1012"/>
       <point x="667" y="937"/>
       <point x="599" y="873" type="curve" smooth="yes"/>
@@ -45,7 +45,7 @@
       <point x="400" y="778"/>
     </contour>
     <contour>
-      <point x="351" y="943" type="curve" name="dv06" smooth="yes"/>
+      <point x="351" y="943" type="curve" smooth="yes" name="dv06"/>
       <point x="375" y="943"/>
       <point x="398" y="947"/>
       <point x="419" y="955" type="curve" smooth="yes"/>
@@ -57,16 +57,16 @@
       <point x="515" y="1042" type="curve" smooth="yes"/>
       <point x="524" y="1060"/>
       <point x="528" y="1080"/>
-      <point x="528" y="1103" type="curve" name="dh03" smooth="yes"/>
+      <point x="528" y="1103" type="curve" smooth="yes" name="dh03"/>
       <point x="528" y="1149"/>
       <point x="511" y="1188"/>
       <point x="477" y="1219" type="curve" smooth="yes"/>
       <point x="442" y="1250"/>
       <point x="398" y="1266"/>
-      <point x="351" y="1266" type="curve" name="dv01" smooth="yes"/>
+      <point x="351" y="1266" type="curve" smooth="yes" name="dv01"/>
       <point x="251" y="1266"/>
       <point x="178" y="1195"/>
-      <point x="178" y="1104" type="curve" name="dh02" smooth="yes"/>
+      <point x="178" y="1104" type="curve" smooth="yes" name="dh02"/>
       <point x="178" y="1060"/>
       <point x="194" y="1020"/>
       <point x="225" y="989" type="curve" smooth="yes"/>
@@ -80,7 +80,7 @@
       <point x="22" y="431" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="898" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="898" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="851" y="0"/>
       <point x="806" y="8"/>
       <point x="764" y="24" type="curve" smooth="yes"/>
@@ -95,13 +95,13 @@
       <point x="564" y="239" type="curve" smooth="yes"/>
       <point x="557" y="267"/>
       <point x="553" y="296"/>
-      <point x="553" y="327" type="curve" name="ih02" smooth="yes"/>
+      <point x="553" y="327" type="curve" smooth="yes" name="ih02"/>
       <point x="553" y="423"/>
       <point x="591" y="502"/>
       <point x="654" y="561" type="curve" smooth="yes"/>
       <point x="718" y="621"/>
       <point x="803" y="654"/>
-      <point x="900" y="654" type="curve" name="dv04" smooth="yes"/>
+      <point x="900" y="654" type="curve" smooth="yes" name="dv04"/>
       <point x="948" y="654"/>
       <point x="992" y="646"/>
       <point x="1031" y="629" type="curve" smooth="yes"/>
@@ -126,7 +126,7 @@
       <point x="1234" y="390" type="curve" smooth="yes"/>
       <point x="1238" y="371"/>
       <point x="1240" y="346"/>
-      <point x="1240" y="325" type="curve" name="dh06" smooth="yes"/>
+      <point x="1240" y="325" type="curve" smooth="yes" name="dh06"/>
       <point x="1240" y="240"/>
       <point x="1207" y="156"/>
       <point x="1144" y="95" type="curve" smooth="yes"/>
@@ -134,25 +134,25 @@
       <point x="1002" y="0"/>
     </contour>
     <contour>
-      <point x="900" y="165" type="curve" name="sv01" smooth="yes"/>
+      <point x="900" y="165" type="curve" smooth="yes" name="sv01"/>
       <point x="949" y="165"/>
       <point x="991" y="181"/>
       <point x="1024" y="212" type="curve" smooth="yes"/>
       <point x="1057" y="243"/>
       <point x="1073" y="282"/>
-      <point x="1073" y="325" type="curve" name="dh05" smooth="yes"/>
+      <point x="1073" y="325" type="curve" smooth="yes" name="dh05"/>
       <point x="1073" y="369"/>
       <point x="1056" y="411"/>
       <point x="1024" y="442" type="curve" smooth="yes"/>
       <point x="997" y="469"/>
       <point x="955" y="489"/>
-      <point x="899" y="489" type="curve" name="dv03" smooth="yes"/>
+      <point x="899" y="489" type="curve" smooth="yes" name="dv03"/>
       <point x="852" y="489"/>
       <point x="808" y="474"/>
       <point x="775" y="443" type="curve" smooth="yes"/>
       <point x="742" y="412"/>
       <point x="725" y="373"/>
-      <point x="725" y="326" type="curve" name="sh03" smooth="yes"/>
+      <point x="725" y="326" type="curve" smooth="yes" name="sh03"/>
       <point x="725" y="297"/>
       <point x="733" y="269"/>
       <point x="747" y="245" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/period.glif b/source/Hack-BoldItalic.ufo/glyphs/period.glif
index 6ef06cbda..5b38784fc 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/period.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/period.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="period" format="1">
+<glyph name="period" format="2">
   <advance width="1233"/>
   <unicode hex="002E"/>
   <outline>
     <contour>
-      <point x="614" y="-42" type="curve" name="hr00" smooth="yes"/>
+      <point x="614" y="-42" type="curve" smooth="yes" name="hr00"/>
       <point x="563" y="-42"/>
       <point x="521" y="-25"/>
       <point x="487" y="9" type="curve" smooth="yes"/>
       <point x="455" y="41"/>
       <point x="436" y="86"/>
-      <point x="436" y="143" type="curve" name="dh01" smooth="yes"/>
+      <point x="436" y="143" type="curve" smooth="yes" name="dh01"/>
       <point x="436" y="196"/>
       <point x="453" y="240"/>
       <point x="487" y="275" type="curve" smooth="yes"/>
       <point x="521" y="309"/>
       <point x="563" y="326"/>
-      <point x="612" y="326" type="curve" name="dv01" smooth="yes"/>
+      <point x="612" y="326" type="curve" smooth="yes" name="dv01"/>
       <point x="713" y="326"/>
       <point x="790" y="252"/>
-      <point x="790" y="141" type="curve" name="dh02" smooth="yes"/>
+      <point x="790" y="141" type="curve" smooth="yes" name="dh02"/>
       <point x="790" y="88"/>
       <point x="773" y="44"/>
       <point x="739" y="9" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/periodcentered.glif b/source/Hack-BoldItalic.ufo/glyphs/periodcentered.glif
index 3f59cf121..121be074e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/periodcentered.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/periodcentered.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="periodcentered" format="1">
+<glyph name="periodcentered" format="2">
   <advance width="1233"/>
   <unicode hex="00B7"/>
   <outline>
     <contour>
-      <point x="616" y="576" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="576" type="curve" smooth="yes" name="hr00"/>
       <point x="525" y="576"/>
       <point x="454" y="645"/>
       <point x="454" y="745" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/perthousand.glif b/source/Hack-BoldItalic.ufo/glyphs/perthousand.glif
index d2c6ca93f..522986292 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/perthousand.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/perthousand.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="perthousand" format="1">
+<glyph name="perthousand" format="2">
   <advance width="1233"/>
   <unicode hex="2030"/>
   <outline>
     <contour>
-      <point x="286" y="856" type="curve" name="dv05" smooth="yes"/>
+      <point x="286" y="856" type="curve" smooth="yes" name="dv05"/>
       <point x="206" y="856"/>
       <point x="135" y="888"/>
       <point x="84" y="939" type="curve" smooth="yes"/>
       <point x="28" y="995"/>
       <point x="0" y="1065"/>
-      <point x="0" y="1144" type="curve" name="dh01" smooth="yes"/>
+      <point x="0" y="1144" type="curve" smooth="yes" name="dh01"/>
       <point x="0" y="1228"/>
       <point x="33" y="1300"/>
       <point x="82" y="1349" type="curve" smooth="yes"/>
       <point x="135" y="1402"/>
       <point x="208" y="1432"/>
-      <point x="287" y="1432" type="curve" name="dv02" smooth="yes"/>
+      <point x="287" y="1432" type="curve" smooth="yes" name="dv02"/>
       <point x="368" y="1432"/>
       <point x="438" y="1400"/>
       <point x="489" y="1348" type="curve" smooth="yes"/>
       <point x="540" y="1297"/>
       <point x="571" y="1226"/>
-      <point x="571" y="1146" type="curve" name="dh04" smooth="yes"/>
+      <point x="571" y="1146" type="curve" smooth="yes" name="dh04"/>
       <point x="571" y="1066"/>
       <point x="540" y="991"/>
       <point x="489" y="940" type="curve" smooth="yes"/>
@@ -30,22 +30,22 @@
       <point x="359" y="856"/>
     </contour>
     <contour>
-      <point x="285" y="1018" type="curve" name="dv06" smooth="yes"/>
+      <point x="285" y="1018" type="curve" smooth="yes" name="dv06"/>
       <point x="318" y="1018"/>
       <point x="348" y="1031"/>
       <point x="373" y="1057" type="curve" smooth="yes"/>
       <point x="400" y="1085"/>
       <point x="410" y="1114"/>
-      <point x="410" y="1146" type="curve" name="dh03" smooth="yes"/>
+      <point x="410" y="1146" type="curve" smooth="yes" name="dh03"/>
       <point x="410" y="1213"/>
       <point x="353" y="1270"/>
-      <point x="284" y="1270" type="curve" name="dv01" smooth="yes"/>
+      <point x="284" y="1270" type="curve" smooth="yes" name="dv01"/>
       <point x="250" y="1270"/>
       <point x="221" y="1258"/>
       <point x="198" y="1235" type="curve" smooth="yes"/>
       <point x="174" y="1211"/>
       <point x="162" y="1182"/>
-      <point x="162" y="1147" type="curve" name="dh02" smooth="yes"/>
+      <point x="162" y="1147" type="curve" smooth="yes" name="dh02"/>
       <point x="162" y="1111"/>
       <point x="174" y="1081"/>
       <point x="198" y="1056" type="curve" smooth="yes"/>
@@ -59,25 +59,25 @@
       <point x="72" y="565" type="line"/>
     </contour>
     <contour>
-      <point x="330" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="330" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="250" y="0"/>
       <point x="183" y="28"/>
       <point x="128" y="84" type="curve" smooth="yes"/>
       <point x="73" y="141"/>
       <point x="45" y="209"/>
-      <point x="45" y="290" type="curve" name="ih01" smooth="yes"/>
+      <point x="45" y="290" type="curve" smooth="yes" name="ih01"/>
       <point x="45" y="374"/>
       <point x="73" y="437"/>
       <point x="128" y="492" type="curve" smooth="yes"/>
       <point x="183" y="547"/>
       <point x="250" y="575"/>
-      <point x="329" y="575" type="curve" name="dv04" smooth="yes"/>
+      <point x="329" y="575" type="curve" smooth="yes" name="dv04"/>
       <point x="410" y="575"/>
       <point x="478" y="547"/>
       <point x="533" y="492" type="curve" smooth="yes"/>
       <point x="586" y="439"/>
       <point x="616" y="371"/>
-      <point x="616" y="288" type="curve" name="sh01" smooth="yes"/>
+      <point x="616" y="288" type="curve" smooth="yes" name="sh01"/>
       <point x="616" y="211"/>
       <point x="591" y="145"/>
       <point x="532" y="85" type="curve" smooth="yes"/>
@@ -85,26 +85,26 @@
       <point x="409" y="0"/>
     </contour>
     <contour>
-      <point x="946" y="0" type="curve" name="ab02" smooth="yes"/>
+      <point x="946" y="0" type="curve" smooth="yes" name="ab02"/>
       <point x="870" y="0"/>
       <point x="802" y="27"/>
       <point x="746" y="82" type="curve" smooth="yes"/>
       <point x="690" y="138"/>
       <point x="662" y="208"/>
       <point x="662" y="285" type="curve" smooth="yes"/>
-      <point x="662" y="289" type="line" name="dh05" smooth="yes"/>
+      <point x="662" y="289" type="line" smooth="yes" name="dh05"/>
       <point x="662" y="366"/>
       <point x="689" y="436"/>
       <point x="744" y="492" type="curve" smooth="yes"/>
       <point x="799" y="547"/>
       <point x="869" y="575"/>
-      <point x="946" y="575" type="curve" name="sv01" smooth="yes"/>
+      <point x="946" y="575" type="curve" smooth="yes" name="sv01"/>
       <point x="1026" y="575"/>
       <point x="1099" y="543"/>
       <point x="1150" y="492" type="curve" smooth="yes"/>
       <point x="1206" y="436"/>
       <point x="1233" y="364"/>
-      <point x="1233" y="288" type="curve" name="dh08" smooth="yes"/>
+      <point x="1233" y="288" type="curve" smooth="yes" name="dh08"/>
       <point x="1233" y="212"/>
       <point x="1206" y="141"/>
       <point x="1150" y="85" type="curve" smooth="yes"/>
@@ -112,19 +112,19 @@
       <point x="1027" y="0"/>
     </contour>
     <contour>
-      <point x="330" y="162" type="curve" name="sv02" smooth="yes"/>
+      <point x="330" y="162" type="curve" smooth="yes" name="sv02"/>
       <point x="363" y="162"/>
       <point x="393" y="175"/>
       <point x="418" y="201" type="curve" smooth="yes"/>
       <point x="445" y="229"/>
       <point x="455" y="258"/>
-      <point x="455" y="290" type="curve" name="ih02" smooth="yes"/>
+      <point x="455" y="290" type="curve" smooth="yes" name="ih02"/>
       <point x="455" y="357"/>
       <point x="398" y="414"/>
-      <point x="330" y="414" type="curve" name="dv03" smooth="yes"/>
+      <point x="330" y="414" type="curve" smooth="yes" name="dv03"/>
       <point x="262" y="414"/>
       <point x="207" y="359"/>
-      <point x="207" y="291" type="curve" name="hr01" smooth="yes"/>
+      <point x="207" y="291" type="curve" smooth="yes" name="hr01"/>
       <point x="207" y="255"/>
       <point x="219" y="225"/>
       <point x="243" y="200" type="curve" smooth="yes"/>
@@ -132,13 +132,13 @@
       <point x="296" y="162"/>
     </contour>
     <contour>
-      <point x="946" y="162" type="curve" name="sv03" smooth="yes"/>
+      <point x="946" y="162" type="curve" smooth="yes" name="sv03"/>
       <point x="978" y="162"/>
       <point x="1011" y="176"/>
       <point x="1035" y="200" type="curve" smooth="yes"/>
       <point x="1055" y="220"/>
       <point x="1071" y="252"/>
-      <point x="1071" y="291" type="curve" name="dh07" smooth="yes"/>
+      <point x="1071" y="291" type="curve" smooth="yes" name="dh07"/>
       <point x="1071" y="323"/>
       <point x="1059" y="351"/>
       <point x="1034" y="376" type="curve" smooth="yes"/>
@@ -150,7 +150,7 @@
       <point x="860" y="378" type="curve" smooth="yes"/>
       <point x="839" y="357"/>
       <point x="823" y="324"/>
-      <point x="823" y="288" type="curve" name="dh06" smooth="yes"/>
+      <point x="823" y="288" type="curve" smooth="yes" name="dh06"/>
       <point x="823" y="256"/>
       <point x="836" y="223"/>
       <point x="859" y="199" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/peseta.glif b/source/Hack-BoldItalic.ufo/glyphs/peseta.glif
index 090dc2813..da6220c0a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/peseta.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/peseta.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="peseta" format="1">
+<glyph name="peseta" format="2">
   <advance width="1233"/>
   <unicode hex="20A7"/>
   <outline>
     <contour>
-      <point x="1049" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="1049" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="1015" y="-29"/>
       <point x="980" y="-23"/>
       <point x="943" y="-11" type="curve" name="ab01"/>
@@ -26,7 +26,7 @@
       <point x="482" y="557" type="curve" smooth="yes"/>
       <point x="444" y="531"/>
       <point x="397" y="518"/>
-      <point x="340" y="518" type="curve" name="dv03" smooth="yes"/>
+      <point x="340" y="518" type="curve" smooth="yes" name="dv03"/>
       <point x="223" y="518" type="line"/>
       <point x="177" y="0" type="line" name="ab03"/>
       <point x="0" y="0" type="line"/>
@@ -43,50 +43,50 @@
       <point x="1015" y="1110" type="line" name="ih01"/>
       <point x="1050" y="1135"/>
       <point x="1092" y="1147"/>
-      <point x="1143" y="1147" type="curve" name="at03" smooth="yes"/>
+      <point x="1143" y="1147" type="curve" smooth="yes" name="at03"/>
       <point x="1211" y="1147"/>
       <point x="1279" y="1126"/>
       <point x="1348" y="1085" type="curve"/>
       <point x="1324" y="807" type="line" name="sh03"/>
       <point x="1259" y="875"/>
       <point x="1197" y="909"/>
-      <point x="1136" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="1136" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="1073" y="909"/>
       <point x="1036" y="872"/>
-      <point x="1036" y="804" type="curve" name="dh03" smooth="yes"/>
+      <point x="1036" y="804" type="curve" smooth="yes" name="dh03"/>
       <point x="1036" y="761"/>
       <point x="1052" y="744"/>
       <point x="1108" y="717" type="curve"/>
       <point x="1138" y="705" type="line"/>
       <point x="1277" y="641"/>
       <point x="1318" y="552"/>
-      <point x="1318" y="383" type="curve" name="dh05" smooth="yes"/>
+      <point x="1318" y="383" type="curve" smooth="yes" name="dh05"/>
       <point x="1318" y="126"/>
       <point x="1220" y="-29"/>
     </contour>
     <contour>
-      <point x="347" y="797" type="line" name="dv04" smooth="yes"/>
+      <point x="347" y="797" type="line" smooth="yes" name="dv04"/>
       <point x="430" y="797"/>
       <point x="475" y="889"/>
-      <point x="475" y="1037" type="curve" name="hr01" smooth="yes"/>
+      <point x="475" y="1037" type="curve" smooth="yes" name="hr01"/>
       <point x="475" y="1155"/>
       <point x="444" y="1214"/>
-      <point x="383" y="1214" type="curve" name="sv02" smooth="yes"/>
+      <point x="383" y="1214" type="curve" smooth="yes" name="sv02"/>
       <point x="286" y="1214" type="line"/>
       <point x="249" y="797" type="line"/>
     </contour>
     <contour>
-      <point x="1054" y="209" type="curve" name="dv02" smooth="yes"/>
+      <point x="1054" y="209" type="curve" smooth="yes" name="dv02"/>
       <point x="1124" y="209"/>
       <point x="1159" y="245"/>
-      <point x="1159" y="316" type="curve" name="dh04" smooth="yes"/>
+      <point x="1159" y="316" type="curve" smooth="yes" name="dh04"/>
       <point x="1159" y="364"/>
       <point x="1143" y="385"/>
       <point x="1084" y="412" type="curve"/>
       <point x="1054" y="424" type="line"/>
       <point x="935" y="477"/>
       <point x="890" y="573"/>
-      <point x="890" y="758" type="curve" name="dh02" smooth="yes"/>
+      <point x="890" y="758" type="curve" smooth="yes" name="dh02"/>
       <point x="890" y="795"/>
       <point x="892" y="831"/>
       <point x="896" y="864" type="curve" name="sh04"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/phi.glif b/source/Hack-BoldItalic.ufo/glyphs/phi.glif
index 1fd646f26..106f0d366 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/phi.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/phi.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="phi" format="1">
+<glyph name="phi" format="2">
   <advance width="1233"/>
   <unicode hex="03C6"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="369" y="0" type="line" name="hr00"/>
       <point x="133" y="37"/>
       <point x="53" y="212"/>
-      <point x="53" y="411" type="curve" name="sh01" smooth="yes"/>
+      <point x="53" y="411" type="curve" smooth="yes" name="sh01"/>
       <point x="53" y="647"/>
       <point x="165" y="894"/>
       <point x="272" y="996" type="curve" smooth="yes"/>
@@ -20,20 +20,20 @@
       <point x="429" y="806" type="curve" smooth="yes"/>
       <point x="378" y="728"/>
       <point x="331" y="601"/>
-      <point x="331" y="478" type="curve" name="sh02" smooth="yes"/>
+      <point x="331" y="478" type="curve" smooth="yes" name="sh02"/>
       <point x="331" y="390"/>
       <point x="355" y="311"/>
       <point x="419" y="256" type="curve" name="ih01"/>
       <point x="495" y="648" type="line" smooth="yes"/>
       <point x="559" y="976"/>
       <point x="710" y="1130"/>
-      <point x="917" y="1130" type="curve" name="at02" smooth="yes"/>
+      <point x="917" y="1130" type="curve" smooth="yes" name="at02"/>
       <point x="1022" y="1130"/>
       <point x="1103" y="1091"/>
       <point x="1148" y="1007" type="curve" smooth="yes"/>
       <point x="1183" y="943"/>
       <point x="1198" y="853"/>
-      <point x="1198" y="750" type="curve" name="sh03" smooth="yes"/>
+      <point x="1198" y="750" type="curve" smooth="yes" name="sh03"/>
       <point x="1198" y="455"/>
       <point x="1063" y="48"/>
       <point x="661" y="0" type="curve"/>
@@ -47,13 +47,13 @@
       <point x="916" y="595" type="curve" smooth="yes"/>
       <point x="928" y="651"/>
       <point x="936" y="709"/>
-      <point x="936" y="756" type="curve" name="ah01" smooth="yes"/>
+      <point x="936" y="756" type="curve" smooth="yes" name="ah01"/>
       <point x="936" y="772"/>
       <point x="935" y="790"/>
-      <point x="932" y="806" type="curve" name="sh04" smooth="yes"/>
+      <point x="932" y="806" type="curve" smooth="yes" name="sh04"/>
       <point x="925" y="845"/>
       <point x="910" y="864"/>
-      <point x="889" y="864" type="curve" name="sv01" smooth="yes"/>
+      <point x="889" y="864" type="curve" smooth="yes" name="sv01"/>
       <point x="849" y="864"/>
       <point x="815" y="792"/>
       <point x="787" y="648" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/pi.glif b/source/Hack-BoldItalic.ufo/glyphs/pi.glif
index 03a5741fb..f9ab6a8a2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/pi.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/pi.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="pi" format="1">
+<glyph name="pi" format="2">
   <advance width="1233"/>
   <unicode hex="03C0"/>
   <outline>
     <contour>
-      <point x="1016" y="-39" type="curve" name="av01" smooth="yes"/>
+      <point x="1016" y="-39" type="curve" smooth="yes" name="av01"/>
       <point x="959" y="-39"/>
       <point x="917" y="-33"/>
       <point x="878" y="-22" type="curve"/>
@@ -13,7 +13,7 @@
       <point x="747" y="102" type="curve" smooth="yes"/>
       <point x="738" y="132"/>
       <point x="733" y="176"/>
-      <point x="733" y="233" type="curve" name="dh02" smooth="yes"/>
+      <point x="733" y="233" type="curve" smooth="yes" name="dh02"/>
       <point x="733" y="891" type="line" name="sv01"/>
       <point x="459" y="891" type="line"/>
       <point x="459" y="0" type="line" name="hr01"/>
@@ -24,7 +24,7 @@
       <point x="1180" y="1100" type="line" name="dv02"/>
       <point x="1180" y="891" type="line" name="dv01"/>
       <point x="1018" y="891" type="line"/>
-      <point x="1018" y="362" type="line" name="dh03" smooth="yes"/>
+      <point x="1018" y="362" type="line" smooth="yes" name="dh03"/>
       <point x="1018" y="265"/>
       <point x="1027" y="220"/>
       <point x="1043" y="202" type="curve"/>
@@ -38,7 +38,7 @@
       <point x="1212" y="-14" type="line" name="ab01"/>
       <point x="1185" y="-23"/>
       <point x="1154" y="-29"/>
-      <point x="1119" y="-33" type="curve" name="av02" smooth="yes"/>
+      <point x="1119" y="-33" type="curve" smooth="yes" name="av02"/>
       <point x="1086" y="-37"/>
       <point x="1049" y="-39"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/plus.glif b/source/Hack-BoldItalic.ufo/glyphs/plus.glif
index df4d2a0c5..28eb2f5a8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/plus.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/plus.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="plus" format="1">
+<glyph name="plus" format="2">
   <advance width="1233"/>
   <unicode hex="002B"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/plusminus.glif b/source/Hack-BoldItalic.ufo/glyphs/plusminus.glif
index f39cbb9e5..1da6b560d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/plusminus.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/plusminus.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="plusminus" format="1">
+<glyph name="plusminus" format="2">
   <advance width="1233"/>
   <unicode hex="00B1"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/product.glif b/source/Hack-BoldItalic.ufo/glyphs/product.glif
index 878e50b16..d4a4c8ad4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/product.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/product.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="product" format="1">
+<glyph name="product" format="2">
   <advance width="1233"/>
   <unicode hex="220F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/propersubset.glif b/source/Hack-BoldItalic.ufo/glyphs/propersubset.glif
index bd48f8f25..928ddaff8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/propersubset.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/propersubset.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="propersubset" format="1">
+<glyph name="propersubset" format="2">
   <advance width="1233"/>
   <unicode hex="2282"/>
   <outline>
     <contour>
-      <point x="576" y="138" type="line" name="hr00" smooth="yes"/>
+      <point x="576" y="138" type="line" smooth="yes" name="hr00"/>
       <point x="289" y="138"/>
       <point x="88" y="364"/>
-      <point x="88" y="642" type="curve" name="dh01" smooth="yes"/>
+      <point x="88" y="642" type="curve" smooth="yes" name="dh01"/>
       <point x="88" y="929"/>
       <point x="303" y="1144"/>
-      <point x="575" y="1144" type="curve" name="at01" smooth="yes"/>
+      <point x="575" y="1144" type="curve" smooth="yes" name="at01"/>
       <point x="1145" y="1144" type="line"/>
       <point x="1145" y="919" type="line" name="sv01"/>
       <point x="575" y="919" type="line" smooth="yes"/>
       <point x="428" y="919"/>
       <point x="313" y="805"/>
-      <point x="313" y="640" type="curve" name="dh02" smooth="yes"/>
+      <point x="313" y="640" type="curve" smooth="yes" name="dh02"/>
       <point x="313" y="473"/>
       <point x="430" y="363"/>
-      <point x="575" y="363" type="curve" name="dv01" smooth="yes"/>
+      <point x="575" y="363" type="curve" smooth="yes" name="dv01"/>
       <point x="1145" y="363" type="line"/>
       <point x="1145" y="138" type="line" name="sv02"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/propersuperset.glif b/source/Hack-BoldItalic.ufo/glyphs/propersuperset.glif
index 0fa233258..a2c8f1182 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/propersuperset.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/propersuperset.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="propersuperset" format="1">
+<glyph name="propersuperset" format="2">
   <advance width="1233"/>
   <unicode hex="2283"/>
   <outline>
     <contour>
       <point x="88" y="363" type="line" name="hr00"/>
-      <point x="658" y="363" type="line" name="dv02" smooth="yes"/>
+      <point x="658" y="363" type="line" smooth="yes" name="dv02"/>
       <point x="803" y="363"/>
       <point x="920" y="473"/>
-      <point x="920" y="640" type="curve" name="dh01" smooth="yes"/>
+      <point x="920" y="640" type="curve" smooth="yes" name="dh01"/>
       <point x="920" y="805"/>
       <point x="805" y="919"/>
-      <point x="658" y="919" type="curve" name="sv01" smooth="yes"/>
+      <point x="658" y="919" type="curve" smooth="yes" name="sv01"/>
       <point x="88" y="919" type="line"/>
       <point x="88" y="1144" type="line" name="at01"/>
       <point x="658" y="1144" type="line" smooth="yes"/>
       <point x="930" y="1144"/>
       <point x="1145" y="929"/>
-      <point x="1145" y="642" type="curve" name="dh02" smooth="yes"/>
+      <point x="1145" y="642" type="curve" smooth="yes" name="dh02"/>
       <point x="1145" y="364"/>
       <point x="944" y="138"/>
-      <point x="657" y="138" type="curve" name="dv01" smooth="yes"/>
+      <point x="657" y="138" type="curve" smooth="yes" name="dv01"/>
       <point x="88" y="138" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/proportional.glif b/source/Hack-BoldItalic.ufo/glyphs/proportional.glif
index b9fffab9f..d2617c15f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/proportional.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/proportional.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="proportional" format="1">
+<glyph name="proportional" format="2">
   <advance width="1233"/>
   <unicode hex="221D"/>
   <outline>
     <contour>
-      <point x="497" y="223" type="curve" name="hr00" smooth="yes"/>
+      <point x="497" y="223" type="curve" smooth="yes" name="hr00"/>
       <point x="313" y="223"/>
       <point x="177" y="391"/>
-      <point x="177" y="639" type="curve" name="dh01" smooth="yes"/>
+      <point x="177" y="639" type="curve" smooth="yes" name="dh01"/>
       <point x="177" y="875"/>
       <point x="302" y="1040"/>
-      <point x="494" y="1040" type="curve" name="sv01" smooth="yes"/>
+      <point x="494" y="1040" type="curve" smooth="yes" name="sv01"/>
       <point x="615" y="1040"/>
       <point x="712" y="976"/>
       <point x="781" y="831" type="curve"/>
@@ -38,16 +38,16 @@
       <point x="614" y="223"/>
     </contour>
     <contour>
-      <point x="485" y="422" type="curve" name="dv01" smooth="yes"/>
+      <point x="485" y="422" type="curve" smooth="yes" name="dv01"/>
       <point x="556" y="422"/>
       <point x="616" y="490"/>
       <point x="671" y="635" type="curve"/>
       <point x="599" y="802"/>
       <point x="559" y="842"/>
-      <point x="494" y="842" type="curve" name="sv04" smooth="yes"/>
+      <point x="494" y="842" type="curve" smooth="yes" name="sv04"/>
       <point x="415" y="842"/>
       <point x="360" y="757"/>
-      <point x="360" y="626" type="curve" name="dh02" smooth="yes"/>
+      <point x="360" y="626" type="curve" smooth="yes" name="dh02"/>
       <point x="360" y="503"/>
       <point x="409" y="422"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/psi.glif b/source/Hack-BoldItalic.ufo/glyphs/psi.glif
index 66a475613..156adbe0f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/psi.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/psi.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="psi" format="1">
+<glyph name="psi" format="2">
   <advance width="1233"/>
   <unicode hex="03C8"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="359" y="0" type="line" name="hr00"/>
       <point x="153" y="34"/>
       <point x="50" y="164"/>
-      <point x="50" y="391" type="curve" name="dh01" smooth="yes"/>
+      <point x="50" y="391" type="curve" smooth="yes" name="dh01"/>
       <point x="50" y="450"/>
       <point x="57" y="516"/>
       <point x="71" y="588" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="364" y="595" type="line" smooth="yes"/>
       <point x="350" y="522"/>
       <point x="343" y="459"/>
-      <point x="343" y="407" type="curve" name="dh02" smooth="yes"/>
+      <point x="343" y="407" type="curve" smooth="yes" name="dh02"/>
       <point x="343" y="319"/>
       <point x="363" y="258"/>
       <point x="402" y="225" type="curve" name="iv01"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/q.glif b/source/Hack-BoldItalic.ufo/glyphs/q.glif
index aaedbd2b7..4a07385a9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/q.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/q.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="q" format="1">
+<glyph name="q" format="2">
   <advance width="1233"/>
   <unicode hex="0071"/>
   <outline>
@@ -38,9 +38,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/question.glif b/source/Hack-BoldItalic.ufo/glyphs/question.glif
index f1d94defd..4ebbe3ed7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/question.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/question.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="question" format="1">
+<glyph name="question" format="2">
   <advance width="1233"/>
   <unicode hex="003F"/>
   <outline>
     <contour>
-      <point x="531" y="585" type="line" name="hr00" smooth="yes"/>
+      <point x="531" y="585" type="line" smooth="yes" name="hr00"/>
       <point x="539" y="640"/>
       <point x="557" y="691"/>
       <point x="586" y="737" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="864" y="1336" type="curve" smooth="yes"/>
       <point x="837" y="1345"/>
       <point x="806" y="1349"/>
-      <point x="775" y="1349" type="curve" name="dv03" smooth="yes"/>
+      <point x="775" y="1349" type="curve" smooth="yes" name="dv03"/>
       <point x="718" y="1349"/>
       <point x="661" y="1335"/>
       <point x="606" y="1315" type="curve" smooth="yes"/>
@@ -57,7 +57,7 @@
       <point x="627" y="1514" type="curve" smooth="yes"/>
       <point x="691" y="1531"/>
       <point x="753" y="1543"/>
-      <point x="833" y="1543" type="curve" name="dv04" smooth="yes"/>
+      <point x="833" y="1543" type="curve" smooth="yes" name="dv04"/>
       <point x="973" y="1543"/>
       <point x="1062" y="1507"/>
       <point x="1127" y="1443" type="curve" smooth="yes"/>
@@ -97,7 +97,7 @@
       <point x="512" y="457" type="line"/>
     </contour>
     <contour>
-      <point x="556" y="-55" type="curve" name="dv01" smooth="yes"/>
+      <point x="556" y="-55" type="curve" smooth="yes" name="dv01"/>
       <point x="509" y="-55"/>
       <point x="479" y="-38"/>
       <point x="456" y="-13" type="curve" smooth="yes"/>
@@ -110,7 +110,7 @@
       <point x="435" y="164" type="curve" smooth="yes"/>
       <point x="458" y="210"/>
       <point x="514" y="279"/>
-      <point x="607" y="279" type="curve" name="dv02" smooth="yes"/>
+      <point x="607" y="279" type="curve" smooth="yes" name="dv02"/>
       <point x="670" y="279"/>
       <point x="717" y="252"/>
       <point x="738" y="192" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/questiondown.case.glif b/source/Hack-BoldItalic.ufo/glyphs/questiondown.case.glif
index 09417f10f..f88ca3717 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/questiondown.case.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/questiondown.case.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="questiondown.case" format="1">
+<glyph name="questiondown.case" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="739" y="1222" type="curve" name="hr00" smooth="yes"/>
+      <point x="739" y="1222" type="curve" smooth="yes" name="hr00"/>
       <point x="692" y="1222"/>
       <point x="662" y="1239"/>
       <point x="639" y="1264" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="618" y="1441" type="curve" smooth="yes"/>
       <point x="641" y="1487"/>
       <point x="697" y="1556"/>
-      <point x="790" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="790" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="853" y="1556"/>
       <point x="900" y="1529"/>
       <point x="921" y="1469" type="curve" smooth="yes"/>
@@ -30,10 +30,10 @@
       <point x="790" y="1222"/>
     </contour>
     <contour>
-      <point x="458" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="458" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="230" y="-27"/>
       <point x="90" y="93"/>
-      <point x="90" y="275" type="curve" name="dh01" smooth="yes"/>
+      <point x="90" y="275" type="curve" smooth="yes" name="dh01"/>
       <point x="90" y="393"/>
       <point x="149" y="504"/>
       <point x="305" y="631" type="curve" smooth="yes"/>
@@ -52,10 +52,10 @@
       <point x="511" y="515" type="line" smooth="yes"/>
       <point x="412" y="428"/>
       <point x="371" y="373"/>
-      <point x="371" y="317" type="curve" name="dh02" smooth="yes"/>
+      <point x="371" y="317" type="curve" smooth="yes" name="dh02"/>
       <point x="371" y="253"/>
       <point x="422" y="209"/>
-      <point x="522" y="209" type="curve" name="sv01" smooth="yes"/>
+      <point x="522" y="209" type="curve" smooth="yes" name="sv01"/>
       <point x="629" y="209"/>
       <point x="771" y="258"/>
       <point x="924" y="354" type="curve" name="iv01"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/questiondown.glif b/source/Hack-BoldItalic.ufo/glyphs/questiondown.glif
index 4aec38d9c..00992e2a4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/questiondown.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/questiondown.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="questiondown" format="1">
+<glyph name="questiondown" format="2">
   <advance width="1233"/>
   <unicode hex="00BF"/>
   <outline>
     <contour>
-      <point x="732" y="1222" type="curve" name="hr00" smooth="yes"/>
+      <point x="732" y="1222" type="curve" smooth="yes" name="hr00"/>
       <point x="685" y="1222"/>
       <point x="655" y="1239"/>
       <point x="632" y="1264" type="curve" smooth="yes"/>
@@ -17,7 +17,7 @@
       <point x="611" y="1441" type="curve" smooth="yes"/>
       <point x="634" y="1487"/>
       <point x="690" y="1556"/>
-      <point x="783" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="783" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="846" y="1556"/>
       <point x="893" y="1529"/>
       <point x="914" y="1469" type="curve" smooth="yes"/>
@@ -31,13 +31,13 @@
       <point x="783" y="1222"/>
     </contour>
     <contour>
-      <point x="454" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="454" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="341" y="-27"/>
       <point x="256" y="0"/>
       <point x="189" y="56" type="curve" smooth="yes"/>
       <point x="123" y="111"/>
       <point x="90" y="183"/>
-      <point x="90" y="272" type="curve" name="dh01" smooth="yes"/>
+      <point x="90" y="272" type="curve" smooth="yes" name="dh01"/>
       <point x="90" y="336"/>
       <point x="106" y="395"/>
       <point x="139" y="450" type="curve" smooth="yes"/>
@@ -62,10 +62,10 @@
       <point x="511" y="515" type="line" smooth="yes"/>
       <point x="420" y="436"/>
       <point x="371" y="377"/>
-      <point x="371" y="321" type="curve" name="dh02" smooth="yes"/>
+      <point x="371" y="321" type="curve" smooth="yes" name="dh02"/>
       <point x="371" y="258"/>
       <point x="420" y="209"/>
-      <point x="517" y="209" type="curve" name="sv01" smooth="yes"/>
+      <point x="517" y="209" type="curve" smooth="yes" name="sv01"/>
       <point x="637" y="209"/>
       <point x="767" y="254"/>
       <point x="924" y="354" type="curve" name="iv01"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/quotedbl.glif b/source/Hack-BoldItalic.ufo/glyphs/quotedbl.glif
index 396ff1c5c..d0d00ca20 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/quotedbl.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/quotedbl.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotedbl" format="1">
+<glyph name="quotedbl" format="2">
   <advance width="1233"/>
   <unicode hex="0022"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/quotedblbase.glif b/source/Hack-BoldItalic.ufo/glyphs/quotedblbase.glif
index fa88f8d0b..db01b3603 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/quotedblbase.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/quotedblbase.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotedblbase" format="1">
+<glyph name="quotedblbase" format="2">
   <advance width="1233"/>
   <unicode hex="201E"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/quotedblleft.glif b/source/Hack-BoldItalic.ufo/glyphs/quotedblleft.glif
index e9e68619d..95b8bd13f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/quotedblleft.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/quotedblleft.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotedblleft" format="1">
+<glyph name="quotedblleft" format="2">
   <advance width="1233"/>
   <unicode hex="201C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/quotedblright.glif b/source/Hack-BoldItalic.ufo/glyphs/quotedblright.glif
index 9a0909ba6..74a9cd57d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/quotedblright.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/quotedblright.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotedblright" format="1">
+<glyph name="quotedblright" format="2">
   <advance width="1233"/>
   <unicode hex="201D"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/quoteleft.glif b/source/Hack-BoldItalic.ufo/glyphs/quoteleft.glif
index a793cb480..565a02c22 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/quoteleft.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/quoteleft.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quoteleft" format="1">
+<glyph name="quoteleft" format="2">
   <advance width="1233"/>
   <unicode hex="2018"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/quotereversed.glif b/source/Hack-BoldItalic.ufo/glyphs/quotereversed.glif
index 3ea2ba6be..d1ef5be4a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/quotereversed.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/quotereversed.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotereversed" format="1">
+<glyph name="quotereversed" format="2">
   <advance width="1233"/>
   <unicode hex="201B"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/quoteright.glif b/source/Hack-BoldItalic.ufo/glyphs/quoteright.glif
index 2029a1505..25e08d8ba 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/quoteright.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/quoteright.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quoteright" format="1">
+<glyph name="quoteright" format="2">
   <advance width="1233"/>
   <unicode hex="2019"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/quotesinglbase.glif b/source/Hack-BoldItalic.ufo/glyphs/quotesinglbase.glif
index 9dd34aea7..918de7502 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/quotesinglbase.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/quotesinglbase.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotesinglbase" format="1">
+<glyph name="quotesinglbase" format="2">
   <advance width="1233"/>
   <unicode hex="201A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/quotesingle.glif b/source/Hack-BoldItalic.ufo/glyphs/quotesingle.glif
index c29dd1fbd..c95307de6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/quotesingle.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/quotesingle.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotesingle" format="1">
+<glyph name="quotesingle" format="2">
   <advance width="1233"/>
   <unicode hex="0027"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/r.glif b/source/Hack-BoldItalic.ufo/glyphs/r.glif
index 6184d54e7..c1d32930f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/r.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/r.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="r" format="1">
+<glyph name="r" format="2">
   <advance width="1233"/>
   <unicode hex="0072"/>
   <outline>
@@ -25,9 +25,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/racute.glif b/source/Hack-BoldItalic.ufo/glyphs/racute.glif
index 467f8f0fa..40894110e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/racute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/racute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="racute" format="1">
+<glyph name="racute" format="2">
   <advance width="1233"/>
   <unicode hex="0155"/>
   <outline>
@@ -15,14 +15,14 @@
       <point x="601" y="946" type="line" name="iv02"/>
       <point x="686" y="1078"/>
       <point x="824" y="1147"/>
-      <point x="979" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="979" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1063" y="1147"/>
       <point x="1137" y="1126"/>
       <point x="1197" y="1090" type="curve" name="hr01"/>
       <point x="1144" y="815" type="line" name="iv03"/>
       <point x="1077" y="874"/>
       <point x="1003" y="899"/>
-      <point x="899" y="899" type="curve" name="sv01" smooth="yes"/>
+      <point x="899" y="899" type="curve" smooth="yes" name="sv01"/>
       <point x="683" y="899"/>
       <point x="572" y="790"/>
       <point x="519" y="516" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/radical.glif b/source/Hack-BoldItalic.ufo/glyphs/radical.glif
index a7a2487ea..aeeb3b70b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/radical.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/radical.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="radical" format="1">
+<glyph name="radical" format="2">
   <advance width="1233"/>
   <unicode hex="221A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/rcaron.glif b/source/Hack-BoldItalic.ufo/glyphs/rcaron.glif
index b1ca70958..8a2f6f8f1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/rcaron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/rcaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="rcaron" format="1">
+<glyph name="rcaron" format="2">
   <advance width="1233"/>
   <unicode hex="0159"/>
   <outline>
@@ -18,14 +18,14 @@
       <point x="606" y="946" type="line" name="iv01"/>
       <point x="691" y="1078"/>
       <point x="829" y="1147"/>
-      <point x="984" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="984" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1068" y="1147"/>
       <point x="1142" y="1126"/>
       <point x="1202" y="1090" type="curve"/>
       <point x="1149" y="815" type="line" name="iv02"/>
       <point x="1082" y="874"/>
       <point x="1008" y="899"/>
-      <point x="904" y="899" type="curve" name="sv01" smooth="yes"/>
+      <point x="904" y="899" type="curve" smooth="yes" name="sv01"/>
       <point x="688" y="899"/>
       <point x="577" y="790"/>
       <point x="524" y="516" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/reflexsubset.glif b/source/Hack-BoldItalic.ufo/glyphs/reflexsubset.glif
index 30fdc3855..426b32f6a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/reflexsubset.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/reflexsubset.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="reflexsubset" format="1">
+<glyph name="reflexsubset" format="2">
   <advance width="1233"/>
   <unicode hex="2286"/>
   <outline>
     <contour>
-      <point x="576" y="315" type="line" name="hr00" smooth="yes"/>
+      <point x="576" y="315" type="line" smooth="yes" name="hr00"/>
       <point x="289" y="315"/>
       <point x="88" y="541"/>
-      <point x="88" y="819" type="curve" name="dh01" smooth="yes"/>
+      <point x="88" y="819" type="curve" smooth="yes" name="dh01"/>
       <point x="88" y="1106"/>
       <point x="303" y="1321"/>
       <point x="575" y="1321" type="curve" smooth="yes"/>
@@ -16,10 +16,10 @@
       <point x="575" y="1096" type="line" smooth="yes"/>
       <point x="428" y="1096"/>
       <point x="313" y="982"/>
-      <point x="313" y="817" type="curve" name="dh02" smooth="yes"/>
+      <point x="313" y="817" type="curve" smooth="yes" name="dh02"/>
       <point x="313" y="650"/>
       <point x="430" y="540"/>
-      <point x="575" y="540" type="curve" name="dv05" smooth="yes"/>
+      <point x="575" y="540" type="curve" smooth="yes" name="dv05"/>
       <point x="1145" y="540" type="line"/>
       <point x="1145" y="315" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/reflexsuperset.glif b/source/Hack-BoldItalic.ufo/glyphs/reflexsuperset.glif
index b5163d43e..4312a39ac 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/reflexsuperset.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/reflexsuperset.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="reflexsuperset" format="1">
+<glyph name="reflexsuperset" format="2">
   <advance width="1233"/>
   <unicode hex="2287"/>
   <outline>
     <contour>
       <point x="88" y="540" type="line" name="hr00"/>
-      <point x="658" y="540" type="line" name="dv05" smooth="yes"/>
+      <point x="658" y="540" type="line" smooth="yes" name="dv05"/>
       <point x="803" y="540"/>
       <point x="920" y="650"/>
-      <point x="920" y="817" type="curve" name="dh01" smooth="yes"/>
+      <point x="920" y="817" type="curve" smooth="yes" name="dh01"/>
       <point x="920" y="982"/>
       <point x="805" y="1096"/>
-      <point x="658" y="1096" type="curve" name="dv02" smooth="yes"/>
+      <point x="658" y="1096" type="curve" smooth="yes" name="dv02"/>
       <point x="88" y="1096" type="line"/>
       <point x="88" y="1321" type="line"/>
-      <point x="658" y="1321" type="line" name="dv03" smooth="yes"/>
+      <point x="658" y="1321" type="line" smooth="yes" name="dv03"/>
       <point x="930" y="1321"/>
       <point x="1145" y="1106"/>
-      <point x="1145" y="819" type="curve" name="dh02" smooth="yes"/>
+      <point x="1145" y="819" type="curve" smooth="yes" name="dh02"/>
       <point x="1145" y="541"/>
       <point x="944" y="315"/>
-      <point x="657" y="315" type="curve" name="dv04" smooth="yes"/>
+      <point x="657" y="315" type="curve" smooth="yes" name="dv04"/>
       <point x="88" y="315" type="line"/>
     </contour>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/registered.glif b/source/Hack-BoldItalic.ufo/glyphs/registered.glif
index 6d7222316..cbb775c89 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/registered.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/registered.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="registered" format="1">
+<glyph name="registered" format="2">
   <advance width="1233"/>
   <unicode hex="00AE"/>
   <outline>
     <contour>
-      <point x="616" y="125" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="125" type="curve" smooth="yes" name="hr00"/>
       <point x="448" y="125"/>
       <point x="302" y="186"/>
       <point x="181" y="307" type="curve" smooth="yes"/>
@@ -13,7 +13,7 @@
       <point x="46" y="507" type="curve" smooth="yes"/>
       <point x="15" y="579"/>
       <point x="0" y="653"/>
-      <point x="0" y="741" type="curve" name="dh01" smooth="yes"/>
+      <point x="0" y="741" type="curve" smooth="yes" name="dh01"/>
       <point x="0" y="826"/>
       <point x="15" y="905"/>
       <point x="46" y="977" type="curve" smooth="yes"/>
@@ -25,7 +25,7 @@
       <point x="381" y="1313" type="curve" smooth="yes"/>
       <point x="454" y="1343"/>
       <point x="532" y="1358"/>
-      <point x="616" y="1358" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1358" type="curve" smooth="yes" name="dv03"/>
       <point x="700" y="1358"/>
       <point x="779" y="1343"/>
       <point x="852" y="1313" type="curve" smooth="yes"/>
@@ -37,7 +37,7 @@
       <point x="1187" y="977" type="curve" smooth="yes"/>
       <point x="1218" y="905"/>
       <point x="1233" y="827"/>
-      <point x="1233" y="742" type="curve" name="dh08" smooth="yes"/>
+      <point x="1233" y="742" type="curve" smooth="yes" name="dh08"/>
       <point x="1233" y="657"/>
       <point x="1218" y="579"/>
       <point x="1188" y="508" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="701" y="125"/>
     </contour>
     <contour>
-      <point x="616" y="256" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="256" type="curve" smooth="yes" name="dv01"/>
       <point x="748" y="256"/>
       <point x="863" y="304"/>
       <point x="958" y="399" type="curve" smooth="yes"/>
@@ -60,7 +60,7 @@
       <point x="1066" y="558" type="curve" smooth="yes"/>
       <point x="1090" y="615"/>
       <point x="1102" y="674"/>
-      <point x="1102" y="742" type="curve" name="dh07" smooth="yes"/>
+      <point x="1102" y="742" type="curve" smooth="yes" name="dh07"/>
       <point x="1102" y="872"/>
       <point x="1050" y="992"/>
       <point x="959" y="1086" type="curve" smooth="yes"/>
@@ -69,7 +69,7 @@
       <point x="802" y="1193" type="curve" smooth="yes"/>
       <point x="738" y="1220"/>
       <point x="681" y="1229"/>
-      <point x="617" y="1229" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="1229" type="curve" smooth="yes" name="dv02"/>
       <point x="538" y="1229"/>
       <point x="484" y="1216"/>
       <point x="432" y="1193" type="curve" smooth="yes"/>
@@ -81,7 +81,7 @@
       <point x="167" y="927" type="curve" smooth="yes"/>
       <point x="140" y="863"/>
       <point x="131" y="802"/>
-      <point x="131" y="742" type="curve" name="dh02" smooth="yes"/>
+      <point x="131" y="742" type="curve" smooth="yes" name="dh02"/>
       <point x="131" y="674"/>
       <point x="143" y="615"/>
       <point x="167" y="558" type="curve" smooth="yes"/>
@@ -102,7 +102,7 @@
       <point x="804" y="1011" type="curve" smooth="yes"/>
       <point x="847" y="982"/>
       <point x="868" y="937"/>
-      <point x="868" y="878" type="curve" name="dh06" smooth="yes"/>
+      <point x="868" y="878" type="curve" smooth="yes" name="dh06"/>
       <point x="868" y="834"/>
       <point x="855" y="798"/>
       <point x="829" y="770" type="curve" smooth="yes"/>
@@ -135,7 +135,7 @@
       <point x="674" y="800" type="curve" smooth="yes"/>
       <point x="693" y="813"/>
       <point x="702" y="833"/>
-      <point x="702" y="861" type="curve" name="dh05" smooth="yes"/>
+      <point x="702" y="861" type="curve" smooth="yes" name="dh05"/>
       <point x="702" y="889"/>
       <point x="693" y="910"/>
       <point x="674" y="924" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/revlogicalnot.glif b/source/Hack-BoldItalic.ufo/glyphs/revlogicalnot.glif
index 0f58a543f..3b409abe0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/revlogicalnot.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/revlogicalnot.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="revlogicalnot" format="1">
+<glyph name="revlogicalnot" format="2">
   <advance width="1233"/>
   <unicode hex="2310"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/rho.glif b/source/Hack-BoldItalic.ufo/glyphs/rho.glif
index 8c09d372b..ef850599d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/rho.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/rho.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="rho" format="1">
+<glyph name="rho" format="2">
   <advance width="1233"/>
   <unicode hex="03C1"/>
   <outline>
@@ -7,16 +7,16 @@
       <point x="139" y="552" type="line" name="hr00"/>
       <point x="213" y="943"/>
       <point x="414" y="1147"/>
-      <point x="762" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="762" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1046" y="1147"/>
       <point x="1158" y="1012"/>
-      <point x="1158" y="779" type="curve" name="sh01" smooth="yes"/>
+      <point x="1158" y="779" type="curve" smooth="yes" name="sh01"/>
       <point x="1158" y="714"/>
       <point x="1150" y="641"/>
       <point x="1134" y="558" type="curve" smooth="yes"/>
       <point x="1060" y="175"/>
       <point x="860" y="-29"/>
-      <point x="614" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="614" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="479" y="-29"/>
       <point x="404" y="31"/>
       <point x="355" y="158" type="curve" name="iv01"/>
@@ -24,25 +24,25 @@
       <point x="-51" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="573" y="215" type="curve" name="dv02" smooth="yes"/>
+      <point x="573" y="215" type="curve" smooth="yes" name="dv02"/>
       <point x="637" y="215"/>
       <point x="690" y="247"/>
       <point x="737" y="307" type="curve" smooth="yes"/>
       <point x="809" y="400"/>
       <point x="854" y="560"/>
-      <point x="854" y="696" type="curve" name="dh02" smooth="yes"/>
+      <point x="854" y="696" type="curve" smooth="yes" name="dh02"/>
       <point x="854" y="747"/>
       <point x="848" y="784"/>
       <point x="836" y="815" type="curve" smooth="yes"/>
       <point x="812" y="876"/>
       <point x="767" y="907"/>
-      <point x="707" y="907" type="curve" name="sv01" smooth="yes"/>
+      <point x="707" y="907" type="curve" smooth="yes" name="sv01"/>
       <point x="582" y="907"/>
       <point x="469" y="772"/>
-      <point x="432" y="561" type="curve" name="hr01" smooth="yes"/>
+      <point x="432" y="561" type="curve" smooth="yes" name="hr01"/>
       <point x="423" y="510"/>
       <point x="419" y="459"/>
-      <point x="419" y="424" type="curve" name="dh01" smooth="yes"/>
+      <point x="419" y="424" type="curve" smooth="yes" name="dh01"/>
       <point x="419" y="295"/>
       <point x="473" y="215"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ring.glif b/source/Hack-BoldItalic.ufo/glyphs/ring.glif
index eb334bada..b23ea7902 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ring.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ring.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ring" format="1">
+<glyph name="ring" format="2">
   <advance width="1233"/>
   <unicode hex="02DA"/>
   <outline>
     <contour>
-      <point x="747" y="1249" type="curve" name="hr00" smooth="yes"/>
+      <point x="747" y="1249" type="curve" smooth="yes" name="hr00"/>
       <point x="671" y="1249"/>
       <point x="601" y="1277"/>
       <point x="545" y="1333" type="curve" smooth="yes"/>
       <point x="490" y="1389"/>
       <point x="463" y="1457"/>
-      <point x="463" y="1533" type="curve" name="sh01" smooth="yes"/>
+      <point x="463" y="1533" type="curve" smooth="yes" name="sh01"/>
       <point x="463" y="1618"/>
       <point x="498" y="1689"/>
       <point x="546" y="1737" type="curve" smooth="yes"/>
       <point x="595" y="1786"/>
       <point x="665" y="1819"/>
-      <point x="748" y="1819" type="curve" name="dv03" smooth="yes"/>
+      <point x="748" y="1819" type="curve" smooth="yes" name="dv03"/>
       <point x="824" y="1819"/>
       <point x="894" y="1792"/>
       <point x="949" y="1737" type="curve" smooth="yes"/>
       <point x="996" y="1690"/>
       <point x="1032" y="1620"/>
-      <point x="1032" y="1535" type="curve" name="sh02" smooth="yes"/>
+      <point x="1032" y="1535" type="curve" smooth="yes" name="sh02"/>
       <point x="1032" y="1451"/>
       <point x="997" y="1379"/>
       <point x="950" y="1332" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="823" y="1249"/>
     </contour>
     <contour>
-      <point x="749" y="1403" type="curve" name="dv01" smooth="yes"/>
+      <point x="749" y="1403" type="curve" smooth="yes" name="dv01"/>
       <point x="784" y="1403"/>
       <point x="815" y="1416"/>
       <point x="841" y="1442" type="curve" smooth="yes"/>
       <point x="866" y="1467"/>
       <point x="879" y="1498"/>
-      <point x="879" y="1534" type="curve" name="ah01" smooth="yes"/>
+      <point x="879" y="1534" type="curve" smooth="yes" name="ah01"/>
       <point x="879" y="1570"/>
       <point x="866" y="1601"/>
       <point x="840" y="1627" type="curve" smooth="yes"/>
       <point x="813" y="1652"/>
       <point x="783" y="1665"/>
-      <point x="748" y="1665" type="curve" name="dv02" smooth="yes"/>
+      <point x="748" y="1665" type="curve" smooth="yes" name="dv02"/>
       <point x="711" y="1665"/>
       <point x="680" y="1652"/>
       <point x="655" y="1627" type="curve" smooth="yes"/>
       <point x="629" y="1601"/>
       <point x="616" y="1570"/>
-      <point x="616" y="1534" type="curve" name="sh03" smooth="yes"/>
+      <point x="616" y="1534" type="curve" smooth="yes" name="sh03"/>
       <point x="616" y="1497"/>
       <point x="629" y="1466"/>
       <point x="654" y="1441" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/rtblock.glif b/source/Hack-BoldItalic.ufo/glyphs/rtblock.glif
index 847a9fd1a..d12eaad05 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/rtblock.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/rtblock.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="rtblock" format="1">
+<glyph name="rtblock" format="2">
   <advance width="1233"/>
   <unicode hex="2590"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ruble.glif b/source/Hack-BoldItalic.ufo/glyphs/ruble.glif
new file mode 100644
index 000000000..a2354eeff
--- /dev/null
+++ b/source/Hack-BoldItalic.ufo/glyphs/ruble.glif
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="ruble" format="2">
+  <advance width="1233"/>
+  <unicode hex="20BD"/>
+  <outline>
+    <contour>
+      <point x="322" y="1493" type="line" name="hr00"/>
+      <point x="189" y="807" type="line"/>
+      <point x="105" y="807" type="line"/>
+      <point x="57" y="559" type="line"/>
+      <point x="141" y="559" type="line"/>
+      <point x="120" y="455" type="line"/>
+      <point x="36" y="455" type="line"/>
+      <point x="-13" y="207" type="line"/>
+      <point x="71" y="207" type="line"/>
+      <point x="31" y="0" type="line"/>
+      <point x="326" y="0" type="line" name="ab01"/>
+      <point x="366" y="207" type="line"/>
+      <point x="795" y="207" type="line"/>
+      <point x="844" y="455" type="line"/>
+      <point x="415" y="455" type="line"/>
+      <point x="435" y="559" type="line"/>
+      <point x="599" y="559" type="line" smooth="yes" name="dv01"/>
+      <point x="822" y="559"/>
+      <point x="990" y="603"/>
+      <point x="1094" y="731" type="curve" smooth="yes"/>
+      <point x="1170" y="825"/>
+      <point x="1225" y="978"/>
+      <point x="1225" y="1123" type="curve" smooth="yes" name="dh02"/>
+      <point x="1225" y="1374"/>
+      <point x="1057" y="1493"/>
+      <point x="742" y="1493" type="curve" smooth="yes"/>
+    </contour>
+    <contour>
+      <point x="484" y="807" type="line"/>
+      <point x="568" y="1245" type="line"/>
+      <point x="689" y="1245" type="line" smooth="yes" name="sv01"/>
+      <point x="861" y="1245"/>
+      <point x="918" y="1197"/>
+      <point x="918" y="1069" type="curve" smooth="yes" name="dh01"/>
+      <point x="918" y="900"/>
+      <point x="823" y="807"/>
+      <point x="627" y="807" type="curve" smooth="yes" name="dv02"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2018-05-15 18:14:42 +0000</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/s.glif b/source/Hack-BoldItalic.ufo/glyphs/s.glif
index 24702cbbb..341298370 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/s.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/s.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="s" format="1">
+<glyph name="s" format="2">
   <advance width="1233"/>
   <unicode hex="0073"/>
   <outline>
@@ -53,9 +53,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/sacute.glif b/source/Hack-BoldItalic.ufo/glyphs/sacute.glif
index 7e66b0c2d..9d9b701b3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/sacute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/sacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="sacute" format="1">
+<glyph name="sacute" format="2">
   <advance width="1233"/>
   <unicode hex="015B"/>
   <outline>
@@ -10,17 +10,17 @@
       <point x="563" y="1297" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="495" y="-29" type="curve" name="sh04" smooth="yes"/>
+      <point x="495" y="-29" type="curve" smooth="yes" name="sh04"/>
       <point x="362" y="-29"/>
       <point x="223" y="-6"/>
       <point x="90" y="41" type="curve"/>
       <point x="141" y="297" type="line"/>
       <point x="257" y="221"/>
       <point x="383" y="182"/>
-      <point x="512" y="182" type="curve" name="sh05" smooth="yes"/>
+      <point x="512" y="182" type="curve" smooth="yes" name="sh05"/>
       <point x="657" y="182"/>
       <point x="743" y="231"/>
-      <point x="743" y="330" type="curve" name="ah01" smooth="yes"/>
+      <point x="743" y="330" type="curve" smooth="yes" name="ah01"/>
       <point x="743" y="354"/>
       <point x="738" y="374"/>
       <point x="711" y="395" type="curve" smooth="yes"/>
@@ -30,20 +30,20 @@
       <point x="461" y="485" type="line" smooth="yes"/>
       <point x="304" y="528"/>
       <point x="225" y="623"/>
-      <point x="225" y="769" type="curve" name="sh01" smooth="yes"/>
+      <point x="225" y="769" type="curve" smooth="yes" name="sh01"/>
       <point x="225" y="997"/>
       <point x="417" y="1147"/>
-      <point x="729" y="1147" type="curve" name="sh06" smooth="yes"/>
+      <point x="729" y="1147" type="curve" smooth="yes" name="sh06"/>
       <point x="846" y="1147"/>
       <point x="970" y="1126"/>
       <point x="1094" y="1085" type="curve"/>
       <point x="1044" y="831" type="line"/>
       <point x="941" y="904"/>
       <point x="819" y="938"/>
-      <point x="708" y="938" type="curve" name="sv01" smooth="yes"/>
+      <point x="708" y="938" type="curve" smooth="yes" name="sv01"/>
       <point x="573" y="938"/>
       <point x="498" y="889"/>
-      <point x="498" y="810" type="curve" name="sh03" smooth="yes"/>
+      <point x="498" y="810" type="curve" smooth="yes" name="sh03"/>
       <point x="498" y="779"/>
       <point x="510" y="755"/>
       <point x="535" y="737" type="curve" smooth="yes"/>
@@ -53,7 +53,7 @@
       <point x="774" y="651" type="line" smooth="yes"/>
       <point x="939" y="604"/>
       <point x="1020" y="516"/>
-      <point x="1020" y="359" type="curve" name="sh02" smooth="yes"/>
+      <point x="1020" y="359" type="curve" smooth="yes" name="sh02"/>
       <point x="1020" y="116"/>
       <point x="829" y="-29"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/scaron.glif b/source/Hack-BoldItalic.ufo/glyphs/scaron.glif
index c1ae032f0..61fec9ff7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/scaron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/scaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="scaron" format="1">
+<glyph name="scaron" format="2">
   <advance width="1233"/>
   <unicode hex="0161"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="606" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="501" y="-29" type="curve" name="sh04" smooth="yes"/>
+      <point x="501" y="-29" type="curve" smooth="yes" name="sh04"/>
       <point x="430" y="-29"/>
       <point x="353" y="-23"/>
       <point x="293" y="-12" type="curve" smooth="yes"/>
@@ -26,13 +26,13 @@
       <point x="322" y="212" type="curve" smooth="yes"/>
       <point x="383" y="193"/>
       <point x="442" y="182"/>
-      <point x="510" y="182" type="curve" name="sh05" smooth="yes"/>
+      <point x="510" y="182" type="curve" smooth="yes" name="sh05"/>
       <point x="583" y="182"/>
       <point x="641" y="195"/>
       <point x="682" y="220" type="curve" smooth="yes"/>
       <point x="723" y="245"/>
       <point x="743" y="280"/>
-      <point x="743" y="326" type="curve" name="ah01" smooth="yes"/>
+      <point x="743" y="326" type="curve" smooth="yes" name="ah01"/>
       <point x="743" y="362"/>
       <point x="731" y="380"/>
       <point x="712" y="395" type="curve" smooth="yes"/>
@@ -45,10 +45,10 @@
       <point x="282" y="592" type="curve" smooth="yes"/>
       <point x="246" y="636"/>
       <point x="225" y="691"/>
-      <point x="225" y="767" type="curve" name="sh01" smooth="yes"/>
+      <point x="225" y="767" type="curve" smooth="yes" name="sh01"/>
       <point x="225" y="1002"/>
       <point x="418" y="1147"/>
-      <point x="725" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="725" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="854" y="1147"/>
       <point x="965" y="1130"/>
       <point x="1094" y="1085" type="curve"/>
@@ -58,13 +58,13 @@
       <point x="882" y="911" type="curve" smooth="yes"/>
       <point x="823" y="930"/>
       <point x="764" y="938"/>
-      <point x="705" y="938" type="curve" name="sv01" smooth="yes"/>
+      <point x="705" y="938" type="curve" smooth="yes" name="sv01"/>
       <point x="637" y="938"/>
       <point x="590" y="926"/>
       <point x="553" y="903" type="curve" smooth="yes"/>
       <point x="516" y="880"/>
       <point x="498" y="849"/>
-      <point x="498" y="810" type="curve" name="sh02" smooth="yes"/>
+      <point x="498" y="810" type="curve" smooth="yes" name="sh02"/>
       <point x="498" y="779"/>
       <point x="510" y="755"/>
       <point x="535" y="737" type="curve" smooth="yes"/>
@@ -77,7 +77,7 @@
       <point x="961" y="544" type="curve" smooth="yes"/>
       <point x="1000" y="499"/>
       <point x="1020" y="439"/>
-      <point x="1020" y="359" type="curve" name="sh06" smooth="yes"/>
+      <point x="1020" y="359" type="curve" smooth="yes" name="sh06"/>
       <point x="1020" y="238"/>
       <point x="972" y="142"/>
       <point x="884" y="75" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/scedilla.glif b/source/Hack-BoldItalic.ufo/glyphs/scedilla.glif
index 5bc10f9a2..8c1704d09 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/scedilla.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/scedilla.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="scedilla" format="1">
+<glyph name="scedilla" format="2">
   <advance width="1233"/>
   <unicode hex="015F"/>
   <outline>
     <contour>
-      <point x="553" y="903" type="curve" name="hr00" smooth="yes"/>
+      <point x="553" y="903" type="curve" smooth="yes" name="hr00"/>
       <point x="516" y="880"/>
       <point x="498" y="849"/>
-      <point x="498" y="810" type="curve" name="sh02" smooth="yes"/>
+      <point x="498" y="810" type="curve" smooth="yes" name="sh02"/>
       <point x="498" y="779"/>
       <point x="510" y="755"/>
       <point x="535" y="737" type="curve" smooth="yes"/>
@@ -20,7 +20,7 @@
       <point x="961" y="544" type="curve" smooth="yes"/>
       <point x="1000" y="499"/>
       <point x="1020" y="439"/>
-      <point x="1020" y="359" type="curve" name="sh03" smooth="yes"/>
+      <point x="1020" y="359" type="curve" smooth="yes" name="sh03"/>
       <point x="1020" y="238"/>
       <point x="972" y="142"/>
       <point x="884" y="75" type="curve" smooth="yes"/>
@@ -38,10 +38,10 @@
       <point x="560" y="-342" type="curve" smooth="yes"/>
       <point x="511" y="-381"/>
       <point x="440" y="-401"/>
-      <point x="348" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="348" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="313" y="-401"/>
       <point x="274" y="-398"/>
-      <point x="249" y="-395" type="curve" name="sv01" smooth="yes"/>
+      <point x="249" y="-395" type="curve" smooth="yes" name="sv01"/>
       <point x="193" y="-388"/>
       <point x="171" y="-379"/>
       <point x="150" y="-375" type="curve"/>
@@ -51,7 +51,7 @@
       <point x="262" y="-245" type="curve" smooth="yes"/>
       <point x="289" y="-251"/>
       <point x="314" y="-254"/>
-      <point x="339" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="339" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="384" y="-254"/>
       <point x="420" y="-244"/>
       <point x="443" y="-227" type="curve" smooth="yes"/>
@@ -76,13 +76,13 @@
       <point x="322" y="212" type="curve" smooth="yes"/>
       <point x="383" y="193"/>
       <point x="442" y="182"/>
-      <point x="510" y="182" type="curve" name="sh04" smooth="yes"/>
+      <point x="510" y="182" type="curve" smooth="yes" name="sh04"/>
       <point x="583" y="182"/>
       <point x="641" y="195"/>
       <point x="682" y="220" type="curve" smooth="yes"/>
       <point x="723" y="245"/>
       <point x="743" y="280"/>
-      <point x="743" y="326" type="curve" name="ah01" smooth="yes"/>
+      <point x="743" y="326" type="curve" smooth="yes" name="ah01"/>
       <point x="743" y="362"/>
       <point x="731" y="380"/>
       <point x="712" y="395" type="curve" smooth="yes"/>
@@ -95,10 +95,10 @@
       <point x="282" y="592" type="curve" smooth="yes"/>
       <point x="246" y="636"/>
       <point x="225" y="691"/>
-      <point x="225" y="767" type="curve" name="sh01" smooth="yes"/>
+      <point x="225" y="767" type="curve" smooth="yes" name="sh01"/>
       <point x="225" y="1002"/>
       <point x="418" y="1147"/>
-      <point x="725" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="725" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="854" y="1147"/>
       <point x="965" y="1130"/>
       <point x="1094" y="1085" type="curve"/>
@@ -108,7 +108,7 @@
       <point x="882" y="911" type="curve" smooth="yes"/>
       <point x="823" y="930"/>
       <point x="764" y="938"/>
-      <point x="705" y="938" type="curve" name="sv02" smooth="yes"/>
+      <point x="705" y="938" type="curve" smooth="yes" name="sv02"/>
       <point x="637" y="938"/>
       <point x="590" y="926"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/scircumflex.glif b/source/Hack-BoldItalic.ufo/glyphs/scircumflex.glif
index c356c943e..902449147 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/scircumflex.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/scircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="scircumflex" format="1">
+<glyph name="scircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="015D"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/second.glif b/source/Hack-BoldItalic.ufo/glyphs/second.glif
index c9fba6236..8727309ce 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/second.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/second.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="second" format="1">
+<glyph name="second" format="2">
   <advance width="1233"/>
   <unicode hex="2033"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/section.glif b/source/Hack-BoldItalic.ufo/glyphs/section.glif
index 53331f140..34f9dc378 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/section.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/section.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="section" format="1">
+<glyph name="section" format="2">
   <advance width="1233"/>
   <unicode hex="00A7"/>
   <outline>
     <contour>
-      <point x="458" y="-195" type="curve" name="hr00" smooth="yes"/>
+      <point x="458" y="-195" type="curve" smooth="yes" name="hr00"/>
       <point x="405" y="-195"/>
       <point x="350" y="-190"/>
       <point x="291" y="-180" type="curve" smooth="yes"/>
@@ -14,16 +14,16 @@
       <point x="150" y="94" type="line"/>
       <point x="197" y="73"/>
       <point x="246" y="56"/>
-      <point x="303" y="44" type="curve" name="sh02" smooth="yes"/>
+      <point x="303" y="44" type="curve" smooth="yes" name="sh02"/>
       <point x="358" y="33"/>
       <point x="408" y="27"/>
-      <point x="453" y="27" type="curve" name="dv01" smooth="yes"/>
+      <point x="453" y="27" type="curve" smooth="yes" name="dv01"/>
       <point x="514" y="27"/>
       <point x="559" y="38"/>
       <point x="590" y="61" type="curve" smooth="yes"/>
       <point x="621" y="84"/>
       <point x="637" y="119"/>
-      <point x="637" y="151" type="curve" name="ah01" smooth="yes"/>
+      <point x="637" y="151" type="curve" smooth="yes" name="ah01"/>
       <point x="637" y="203"/>
       <point x="596" y="253"/>
       <point x="485" y="328" type="curve" smooth="yes"/>
@@ -46,32 +46,32 @@
       <point x="339" y="1057" type="curve" smooth="yes"/>
       <point x="323" y="1090"/>
       <point x="315" y="1125"/>
-      <point x="315" y="1172" type="curve" name="sh01" smooth="yes"/>
+      <point x="315" y="1172" type="curve" smooth="yes" name="sh01"/>
       <point x="315" y="1275"/>
       <point x="354" y="1358"/>
       <point x="433" y="1423" type="curve" smooth="yes"/>
       <point x="508" y="1484"/>
       <point x="606" y="1520"/>
-      <point x="739" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="739" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="788" y="1520"/>
       <point x="839" y="1515"/>
-      <point x="892" y="1505" type="curve" name="sh05" smooth="yes"/>
+      <point x="892" y="1505" type="curve" smooth="yes" name="sh05"/>
       <point x="946" y="1495"/>
       <point x="1002" y="1480"/>
       <point x="1059" y="1460" type="curve"/>
       <point x="1014" y="1231" type="line"/>
       <point x="969" y="1254"/>
       <point x="921" y="1271"/>
-      <point x="881" y="1282" type="curve" name="sh06" smooth="yes"/>
+      <point x="881" y="1282" type="curve" smooth="yes" name="sh06"/>
       <point x="837" y="1293"/>
       <point x="793" y="1298"/>
-      <point x="753" y="1298" type="curve" name="sv01" smooth="yes"/>
+      <point x="753" y="1298" type="curve" smooth="yes" name="sv01"/>
       <point x="695" y="1298"/>
       <point x="651" y="1287"/>
       <point x="620" y="1264" type="curve" smooth="yes"/>
       <point x="589" y="1241"/>
       <point x="573" y="1209"/>
-      <point x="573" y="1169" type="curve" name="sh03" smooth="yes"/>
+      <point x="573" y="1169" type="curve" smooth="yes" name="sh03"/>
       <point x="573" y="1140"/>
       <point x="583" y="1113"/>
       <point x="604" y="1090" type="curve" smooth="yes"/>
@@ -96,7 +96,7 @@
       <point x="874" y="260" type="curve" smooth="yes"/>
       <point x="888" y="227"/>
       <point x="895" y="190"/>
-      <point x="895" y="149" type="curve" name="sh04" smooth="yes"/>
+      <point x="895" y="149" type="curve" smooth="yes" name="sh04"/>
       <point x="895" y="46"/>
       <point x="853" y="-40"/>
       <point x="776" y="-101" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/semicolon.glif b/source/Hack-BoldItalic.ufo/glyphs/semicolon.glif
index faa8ddd13..2b1fa29e6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/semicolon.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/semicolon.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="semicolon" format="1">
+<glyph name="semicolon" format="2">
   <advance width="1233"/>
   <unicode hex="003B"/>
   <outline>
     <contour>
-      <point x="724" y="698" type="curve" name="dv01" smooth="yes"/>
+      <point x="724" y="698" type="curve" smooth="yes" name="dv01"/>
       <point x="673" y="698"/>
       <point x="629" y="716"/>
       <point x="598" y="751" type="curve"/>
@@ -23,7 +23,7 @@
       <point x="641" y="1031" type="curve" smooth="yes"/>
       <point x="680" y="1063"/>
       <point x="724" y="1084"/>
-      <point x="780" y="1084" type="curve" name="dv02" smooth="yes"/>
+      <point x="780" y="1084" type="curve" smooth="yes" name="dv02"/>
       <point x="831" y="1084"/>
       <point x="874" y="1066"/>
       <point x="905" y="1031" type="curve"/>
@@ -54,7 +54,7 @@
       <point x="639" y="-19" type="curve" name="ab01"/>
       <point x="632" y="-20"/>
       <point x="626" y="-20"/>
-      <point x="619" y="-20" type="curve" name="ab02" smooth="yes"/>
+      <point x="619" y="-20" type="curve" smooth="yes" name="ab02"/>
       <point x="566" y="-20"/>
       <point x="526" y="-5"/>
       <point x="497" y="26" type="curve" smooth="yes"/>
@@ -76,10 +76,10 @@
       <point x="624" y="323" type="curve" smooth="yes"/>
       <point x="639" y="326"/>
       <point x="654" y="328"/>
-      <point x="673" y="328" type="curve" name="sv01" smooth="yes"/>
+      <point x="673" y="328" type="curve" smooth="yes" name="sv01"/>
       <point x="737" y="328"/>
       <point x="785" y="304"/>
-      <point x="816" y="248" type="curve" name="hr01" smooth="yes"/>
+      <point x="816" y="248" type="curve" smooth="yes" name="hr01"/>
       <point x="835" y="213"/>
       <point x="843" y="171"/>
       <point x="843" y="132" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/seven.glif b/source/Hack-BoldItalic.ufo/glyphs/seven.glif
index 188534b68..4940ee822 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/seven.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/seven.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="seven" format="1">
+<glyph name="seven" format="2">
   <advance width="1233"/>
   <unicode hex="0037"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/seven.subs.glif b/source/Hack-BoldItalic.ufo/glyphs/seven.subs.glif
index 47be98e62..e106ea2b0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/seven.subs.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/seven.subs.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="seven.subs" format="1">
+<glyph name="seven.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/seveneighths.glif b/source/Hack-BoldItalic.ufo/glyphs/seveneighths.glif
index 8cc4d230b..da97f1970 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/seveneighths.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/seveneighths.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="seveneighths" format="1">
+<glyph name="seveneighths" format="2">
   <advance width="1233"/>
   <unicode hex="215E"/>
   <outline>
@@ -19,56 +19,56 @@
       <point x="84" y="500" type="line"/>
     </contour>
     <contour>
-      <point x="733" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="733" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="540" y="-285"/>
       <point x="425" y="-208"/>
-      <point x="425" y="-73" type="curve" name="dh01" smooth="yes"/>
+      <point x="425" y="-73" type="curve" smooth="yes" name="dh01"/>
       <point x="425" y="55"/>
       <point x="528" y="147"/>
       <point x="688" y="179" type="curve" name="hr02"/>
       <point x="584" y="200"/>
       <point x="538" y="257"/>
-      <point x="538" y="333" type="curve" name="ih02" smooth="yes"/>
+      <point x="538" y="333" type="curve" smooth="yes" name="ih02"/>
       <point x="538" y="472"/>
       <point x="698" y="582"/>
-      <point x="899" y="582" type="curve" name="dv07" smooth="yes"/>
+      <point x="899" y="582" type="curve" smooth="yes" name="dv07"/>
       <point x="1070" y="582"/>
       <point x="1187" y="502"/>
-      <point x="1187" y="381" type="curve" name="sh03" smooth="yes"/>
+      <point x="1187" y="381" type="curve" smooth="yes" name="sh03"/>
       <point x="1187" y="278"/>
       <point x="1100" y="191"/>
       <point x="954" y="172" type="curve" name="hr03"/>
       <point x="1061" y="148"/>
       <point x="1118" y="87"/>
-      <point x="1118" y="-13" type="curve" name="dh04" smooth="yes"/>
+      <point x="1118" y="-13" type="curve" smooth="yes" name="dh04"/>
       <point x="1118" y="-176"/>
       <point x="962" y="-285"/>
     </contour>
     <contour>
-      <point x="844" y="237" type="curve" name="dv05" smooth="yes"/>
+      <point x="844" y="237" type="curve" smooth="yes" name="dv05"/>
       <point x="930" y="237"/>
       <point x="1002" y="287"/>
-      <point x="1002" y="358" type="curve" name="sh02" smooth="yes"/>
+      <point x="1002" y="358" type="curve" smooth="yes" name="sh02"/>
       <point x="1002" y="415"/>
       <point x="956" y="450"/>
-      <point x="881" y="450" type="curve" name="dv06" smooth="yes"/>
+      <point x="881" y="450" type="curve" smooth="yes" name="dv06"/>
       <point x="789" y="450"/>
       <point x="724" y="399"/>
-      <point x="724" y="331" type="curve" name="sh01" smooth="yes"/>
+      <point x="724" y="331" type="curve" smooth="yes" name="sh01"/>
       <point x="724" y="275"/>
       <point x="768" y="237"/>
     </contour>
     <contour>
-      <point x="753" y="-152" type="curve" name="dv02" smooth="yes"/>
+      <point x="753" y="-152" type="curve" smooth="yes" name="dv02"/>
       <point x="858" y="-152"/>
       <point x="932" y="-90"/>
-      <point x="932" y="-6" type="curve" name="dh03" smooth="yes"/>
+      <point x="932" y="-6" type="curve" smooth="yes" name="dh03"/>
       <point x="932" y="66"/>
       <point x="877" y="105"/>
-      <point x="793" y="105" type="curve" name="dv04" smooth="yes"/>
+      <point x="793" y="105" type="curve" smooth="yes" name="dv04"/>
       <point x="684" y="105"/>
       <point x="611" y="40"/>
-      <point x="611" y="-41" type="curve" name="dh02" smooth="yes"/>
+      <point x="611" y="-41" type="curve" smooth="yes" name="dh02"/>
       <point x="611" y="-117"/>
       <point x="675" y="-152"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/shade.glif b/source/Hack-BoldItalic.ufo/glyphs/shade.glif
index edf408aa9..9b35592e0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/shade.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/shade.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="shade" format="1">
+<glyph name="shade" format="2">
   <advance width="1233"/>
   <unicode hex="2592"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/sigma.glif b/source/Hack-BoldItalic.ufo/glyphs/sigma.glif
index ae6a2ac3f..e25365ede 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/sigma.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/sigma.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="sigma" format="1">
+<glyph name="sigma" format="2">
   <advance width="1233"/>
   <unicode hex="03C3"/>
   <outline>
     <contour>
-      <point x="469" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="469" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="200" y="-29"/>
       <point x="45" y="133"/>
-      <point x="45" y="397" type="curve" name="sh01" smooth="yes"/>
+      <point x="45" y="397" type="curve" smooth="yes" name="sh01"/>
       <point x="45" y="449"/>
       <point x="51" y="502"/>
       <point x="62" y="559" type="curve" smooth="yes"/>
       <point x="129" y="904"/>
       <point x="354" y="1120"/>
-      <point x="689" y="1120" type="curve" name="at01" smooth="yes"/>
+      <point x="689" y="1120" type="curve" smooth="yes" name="at01"/>
       <point x="1241" y="1120" type="line"/>
       <point x="1197" y="895" type="line" name="sv01"/>
       <point x="986" y="895" type="line" name="ih01"/>
       <point x="1066" y="827"/>
       <point x="1101" y="730"/>
-      <point x="1101" y="621" type="curve" name="sh02" smooth="yes"/>
+      <point x="1101" y="621" type="curve" smooth="yes" name="sh02"/>
       <point x="1101" y="453"/>
       <point x="1014" y="258"/>
       <point x="875" y="130" type="curve" smooth="yes"/>
@@ -27,13 +27,13 @@
       <point x="626" y="-29"/>
     </contour>
     <contour>
-      <point x="510" y="209" type="curve" name="dv01" smooth="yes"/>
+      <point x="510" y="209" type="curve" smooth="yes" name="dv01"/>
       <point x="677" y="209"/>
       <point x="788" y="409"/>
       <point x="807" y="559" type="curve" name="sh03"/>
       <point x="810" y="575"/>
       <point x="811" y="601"/>
-      <point x="811" y="616" type="curve" name="ah01" smooth="yes"/>
+      <point x="811" y="616" type="curve" smooth="yes" name="ah01"/>
       <point x="811" y="692"/>
       <point x="764" y="764"/>
       <point x="677" y="828" type="curve" smooth="yes"/>
@@ -45,7 +45,7 @@
       <point x="464" y="812" type="curve" smooth="yes"/>
       <point x="389" y="724"/>
       <point x="342" y="564"/>
-      <point x="342" y="433" type="curve" name="sh04" smooth="yes"/>
+      <point x="342" y="433" type="curve" smooth="yes" name="sh04"/>
       <point x="342" y="382"/>
       <point x="349" y="337"/>
       <point x="365" y="302" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/similar.glif b/source/Hack-BoldItalic.ufo/glyphs/similar.glif
index 480de3fb2..588c95803 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/similar.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/similar.glif
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="similar" format="1">
+<glyph name="similar" format="2">
   <advance width="1233"/>
   <unicode hex="223C"/>
   <outline>
     <contour>
-      <point x="850" y="468" type="curve" name="dv01" smooth="yes"/>
+      <point x="850" y="468" type="curve" smooth="yes" name="dv01"/>
       <point x="778" y="468"/>
       <point x="726" y="484"/>
       <point x="645" y="519" type="curve" smooth="yes"/>
       <point x="612" y="533" type="line" smooth="yes"/>
       <point x="522" y="570"/>
       <point x="468" y="591"/>
-      <point x="385" y="591" type="curve" name="sv01" smooth="yes"/>
+      <point x="385" y="591" type="curve" smooth="yes" name="sv01"/>
       <point x="280" y="591"/>
       <point x="192" y="558"/>
       <point x="88" y="470" type="curve" name="iv01"/>
       <point x="88" y="699" type="line"/>
       <point x="192" y="779"/>
       <point x="287" y="814"/>
-      <point x="390" y="814" type="curve" name="av01" smooth="yes"/>
+      <point x="390" y="814" type="curve" smooth="yes" name="av01"/>
       <point x="463" y="814"/>
       <point x="533" y="796"/>
       <point x="621" y="759" type="curve" name="hr01"/>
@@ -26,7 +26,7 @@
       <point x="652" y="745" type="line" smooth="yes"/>
       <point x="725" y="710"/>
       <point x="797" y="691"/>
-      <point x="865" y="691" type="curve" name="dv02" smooth="yes"/>
+      <point x="865" y="691" type="curve" smooth="yes" name="dv02"/>
       <point x="958" y="691"/>
       <point x="1045" y="728"/>
       <point x="1145" y="816" type="curve" name="av02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/six.glif b/source/Hack-BoldItalic.ufo/glyphs/six.glif
index 4193566fd..ba1f26f2f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/six.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/six.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="six" format="1">
+<glyph name="six" format="2">
   <advance width="1233"/>
   <unicode hex="0036"/>
   <outline>
     <contour>
-      <point x="544" y="-33" type="curve" name="hr00" smooth="yes"/>
+      <point x="544" y="-33" type="curve" smooth="yes" name="hr00"/>
       <point x="401" y="-33"/>
       <point x="287" y="9"/>
       <point x="210" y="93" type="curve" smooth="yes"/>
       <point x="134" y="177"/>
       <point x="96" y="296"/>
-      <point x="96" y="480" type="curve" name="sh01" smooth="yes"/>
+      <point x="96" y="480" type="curve" smooth="yes" name="sh01"/>
       <point x="96" y="613"/>
       <point x="116" y="751"/>
       <point x="157" y="891" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="563" y="1451" type="curve" smooth="yes"/>
       <point x="658" y="1496"/>
       <point x="765" y="1518"/>
-      <point x="881" y="1518" type="curve" name="at01" smooth="yes"/>
+      <point x="881" y="1518" type="curve" smooth="yes" name="at01"/>
       <point x="937" y="1518"/>
       <point x="977" y="1514"/>
       <point x="1024" y="1503" type="curve" smooth="yes"/>
@@ -35,7 +35,7 @@
       <point x="988" y="1257" type="curve" smooth="yes"/>
       <point x="941" y="1272"/>
       <point x="895" y="1280"/>
-      <point x="846" y="1280" type="curve" name="sv01" smooth="yes"/>
+      <point x="846" y="1280" type="curve" smooth="yes" name="sv01"/>
       <point x="741" y="1280"/>
       <point x="654" y="1244"/>
       <point x="583" y="1172" type="curve" smooth="yes"/>
@@ -47,13 +47,13 @@
       <point x="566" y="952" type="curve" smooth="yes"/>
       <point x="617" y="974"/>
       <point x="672" y="985"/>
-      <point x="732" y="985" type="curve" name="dv03" smooth="yes"/>
+      <point x="732" y="985" type="curve" smooth="yes" name="dv03"/>
       <point x="842" y="985"/>
       <point x="930" y="948"/>
       <point x="995" y="874" type="curve" smooth="yes"/>
       <point x="1059" y="802"/>
       <point x="1092" y="704"/>
-      <point x="1092" y="565" type="curve" name="sh02" smooth="yes"/>
+      <point x="1092" y="565" type="curve" smooth="yes" name="sh02"/>
       <point x="1092" y="390"/>
       <point x="1038" y="252"/>
       <point x="938" y="139" type="curve" smooth="yes"/>
@@ -61,22 +61,22 @@
       <point x="713" y="-33"/>
     </contour>
     <contour>
-      <point x="551" y="207" type="curve" name="dv01" smooth="yes"/>
+      <point x="551" y="207" type="curve" smooth="yes" name="dv01"/>
       <point x="691" y="207"/>
       <point x="803" y="360"/>
-      <point x="803" y="550" type="curve" name="ah01" smooth="yes"/>
+      <point x="803" y="550" type="curve" smooth="yes" name="ah01"/>
       <point x="803" y="614"/>
       <point x="790" y="661"/>
       <point x="758" y="697" type="curve" smooth="yes"/>
       <point x="727" y="731"/>
       <point x="686" y="748"/>
-      <point x="636" y="748" type="curve" name="dv02" smooth="yes"/>
+      <point x="636" y="748" type="curve" smooth="yes" name="dv02"/>
       <point x="561" y="748"/>
       <point x="499" y="708"/>
       <point x="456" y="648" type="curve" smooth="yes"/>
       <point x="408" y="580"/>
       <point x="383" y="492"/>
-      <point x="383" y="408" type="curve" name="sh03" smooth="yes"/>
+      <point x="383" y="408" type="curve" smooth="yes" name="sh03"/>
       <point x="383" y="341"/>
       <point x="397" y="295"/>
       <point x="428" y="260" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/six.subs.glif b/source/Hack-BoldItalic.ufo/glyphs/six.subs.glif
index 19570e4ae..f37be0b81 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/six.subs.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/six.subs.glif
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="six.subs" format="1">
+<glyph name="six.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="596" y="-427" type="curve" name="hr00" smooth="yes"/>
+      <point x="596" y="-427" type="curve" smooth="yes" name="hr00"/>
       <point x="397" y="-427"/>
       <point x="289" y="-334"/>
-      <point x="289" y="-139" type="curve" name="sh01" smooth="yes"/>
+      <point x="289" y="-139" type="curve" smooth="yes" name="sh01"/>
       <point x="289" y="5"/>
       <point x="349" y="177"/>
       <point x="452" y="288" type="curve" smooth="yes"/>
       <point x="546" y="389"/>
       <point x="676" y="440"/>
-      <point x="843" y="440" type="curve" name="dv02" smooth="yes"/>
+      <point x="843" y="440" type="curve" smooth="yes" name="dv02"/>
       <point x="916" y="440"/>
       <point x="974" y="430"/>
       <point x="1050" y="406" type="curve"/>
       <point x="1014" y="257" type="line"/>
       <point x="958" y="289"/>
       <point x="889" y="307"/>
-      <point x="821" y="307" type="curve" name="dv01" smooth="yes"/>
+      <point x="821" y="307" type="curve" smooth="yes" name="dv01"/>
       <point x="676" y="307"/>
       <point x="570" y="226"/>
       <point x="526" y="69" type="curve" name="ih01"/>
       <point x="582" y="114"/>
       <point x="654" y="142"/>
-      <point x="742" y="142" type="curve" name="dv04" smooth="yes"/>
+      <point x="742" y="142" type="curve" smooth="yes" name="dv04"/>
       <point x="897" y="142"/>
       <point x="996" y="54"/>
-      <point x="996" y="-96" type="curve" name="sh02" smooth="yes"/>
+      <point x="996" y="-96" type="curve" smooth="yes" name="sh02"/>
       <point x="996" y="-286"/>
       <point x="839" y="-427"/>
     </contour>
     <contour>
-      <point x="609" y="-293" type="curve" name="sv01" smooth="yes"/>
+      <point x="609" y="-293" type="curve" smooth="yes" name="sv01"/>
       <point x="716" y="-293"/>
       <point x="791" y="-201"/>
-      <point x="791" y="-105" type="curve" name="ah01" smooth="yes"/>
+      <point x="791" y="-105" type="curve" smooth="yes" name="ah01"/>
       <point x="791" y="-29"/>
       <point x="744" y="9"/>
-      <point x="675" y="9" type="curve" name="dv03" smooth="yes"/>
+      <point x="675" y="9" type="curve" smooth="yes" name="dv03"/>
       <point x="568" y="9"/>
       <point x="493" y="-82"/>
-      <point x="493" y="-178" type="curve" name="sh03" smooth="yes"/>
+      <point x="493" y="-178" type="curve" smooth="yes" name="sh03"/>
       <point x="493" y="-254"/>
       <point x="538" y="-293"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/slash.glif b/source/Hack-BoldItalic.ufo/glyphs/slash.glif
index 13931fb39..101bc1170 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/slash.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/slash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="slash" format="1">
+<glyph name="slash" format="2">
   <advance width="1233"/>
   <unicode hex="002F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/space.glif b/source/Hack-BoldItalic.ufo/glyphs/space.glif
index 6b1fa9261..13665e890 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/space.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/space.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="space" format="1">
+<glyph name="space" format="2">
   <advance width="1233"/>
   <unicode hex="0020"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/sterling.glif b/source/Hack-BoldItalic.ufo/glyphs/sterling.glif
index 569da5c18..92f720b9a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/sterling.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/sterling.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="sterling" format="1">
+<glyph name="sterling" format="2">
   <advance width="1233"/>
   <unicode hex="00A3"/>
   <outline>
@@ -16,7 +16,7 @@
       <point x="589" y="1402" type="curve" smooth="yes"/>
       <point x="674" y="1482"/>
       <point x="799" y="1520"/>
-      <point x="952" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="952" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1005" y="1520"/>
       <point x="1055" y="1515"/>
       <point x="1102" y="1504" type="curve" smooth="yes"/>
@@ -26,7 +26,7 @@
       <point x="1192" y="1190" type="line" name="iv01"/>
       <point x="1109" y="1247"/>
       <point x="1039" y="1272"/>
-      <point x="952" y="1272" type="curve" name="sv01" smooth="yes"/>
+      <point x="952" y="1272" type="curve" smooth="yes" name="sv01"/>
       <point x="882" y="1272"/>
       <point x="826" y="1250"/>
       <point x="784" y="1205" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/suchthat.glif b/source/Hack-BoldItalic.ufo/glyphs/suchthat.glif
index 068b7392c..c599cf459 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/suchthat.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/suchthat.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="suchthat" format="1">
+<glyph name="suchthat" format="2">
   <advance width="1233"/>
   <unicode hex="220B"/>
   <outline>
@@ -20,10 +20,10 @@
       <point x="751" y="1223" type="curve" smooth="yes"/>
       <point x="704" y="1270"/>
       <point x="652" y="1294"/>
-      <point x="597" y="1294" type="curve" name="dv01" smooth="yes"/>
+      <point x="597" y="1294" type="curve" smooth="yes" name="dv01"/>
       <point x="100" y="1294" type="line"/>
       <point x="100" y="1524" type="line"/>
-      <point x="597" y="1524" type="line" name="dv02" smooth="yes"/>
+      <point x="597" y="1524" type="line" smooth="yes" name="dv02"/>
       <point x="791" y="1524"/>
       <point x="965" y="1379"/>
       <point x="1061" y="1145" type="curve" smooth="yes"/>
@@ -35,7 +35,7 @@
       <point x="866" y="102" type="curve" smooth="yes"/>
       <point x="784" y="34"/>
       <point x="694" y="0"/>
-      <point x="597" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="597" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="100" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/summation.glif b/source/Hack-BoldItalic.ufo/glyphs/summation.glif
index 9590e5b3c..103e1710c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/summation.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/summation.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="summation" format="1">
+<glyph name="summation" format="2">
   <advance width="1233"/>
   <unicode hex="2211"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/t.glif b/source/Hack-BoldItalic.ufo/glyphs/t.glif
index 689ed8b6b..abbce7323 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/t.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/t.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="t" format="1">
+<glyph name="t" format="2">
   <advance width="1233"/>
   <unicode hex="0074"/>
   <outline>
@@ -33,9 +33,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/tau.glif b/source/Hack-BoldItalic.ufo/glyphs/tau.glif
index c16b40168..cdd56d7f7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/tau.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/tau.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="tau" format="1">
+<glyph name="tau" format="2">
   <advance width="1233"/>
   <unicode hex="03C4"/>
   <outline>
     <contour>
-      <point x="767" y="0" type="line" name="hr00" smooth="yes"/>
+      <point x="767" y="0" type="line" smooth="yes" name="hr00"/>
       <point x="499" y="0"/>
       <point x="394" y="54"/>
-      <point x="394" y="230" type="curve" name="dh01" smooth="yes"/>
+      <point x="394" y="230" type="curve" smooth="yes" name="dh01"/>
       <point x="394" y="273"/>
       <point x="400" y="320"/>
       <point x="411" y="379" type="curve"/>
@@ -20,10 +20,10 @@
       <point x="700" y="365" type="line" smooth="yes"/>
       <point x="697" y="349"/>
       <point x="695" y="335"/>
-      <point x="695" y="320" type="curve" name="dh02" smooth="yes"/>
+      <point x="695" y="320" type="curve" smooth="yes" name="dh02"/>
       <point x="695" y="252"/>
       <point x="738" y="225"/>
-      <point x="831" y="225" type="curve" name="sv04" smooth="yes"/>
+      <point x="831" y="225" type="curve" smooth="yes" name="sv04"/>
       <point x="889" y="225" type="line"/>
       <point x="845" y="0" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/tbar.glif b/source/Hack-BoldItalic.ufo/glyphs/tbar.glif
index ce70bf018..2b3a75f88 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/tbar.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/tbar.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="tbar" format="1">
+<glyph name="tbar" format="2">
   <advance width="1233"/>
   <unicode hex="0167"/>
   <outline>
     <contour>
-      <point x="706" y="-5" type="line" name="hr00" smooth="yes"/>
+      <point x="706" y="-5" type="line" smooth="yes" name="hr00"/>
       <point x="539" y="-5"/>
       <point x="430" y="22"/>
       <point x="381" y="75" type="curve" smooth="yes"/>
@@ -41,7 +41,7 @@
       <point x="655" y="253" type="curve" smooth="yes"/>
       <point x="676" y="231"/>
       <point x="714" y="220"/>
-      <point x="771" y="220" type="curve" name="sv06" smooth="yes"/>
+      <point x="771" y="220" type="curve" smooth="yes" name="sv06"/>
       <point x="996" y="220" type="line" name="sv07"/>
       <point x="952" y="-5" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/tcaron.glif b/source/Hack-BoldItalic.ufo/glyphs/tcaron.glif
index 4e52a86ba..a2d8d2e2d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/tcaron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/tcaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="tcaron" format="1">
+<glyph name="tcaron" format="2">
   <advance width="1233"/>
   <unicode hex="0165"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="940" y="1285" type="line"/>
     </contour>
     <contour>
-      <point x="707" y="-5" type="line" name="ab01" smooth="yes"/>
+      <point x="707" y="-5" type="line" smooth="yes" name="ab01"/>
       <point x="566" y="-5"/>
       <point x="475" y="13"/>
       <point x="418" y="52" type="curve" smooth="yes"/>
@@ -45,7 +45,7 @@
       <point x="661" y="239" type="curve" smooth="yes"/>
       <point x="680" y="226"/>
       <point x="717" y="220"/>
-      <point x="770" y="220" type="curve" name="sv04" smooth="yes"/>
+      <point x="770" y="220" type="curve" smooth="yes" name="sv04"/>
       <point x="995" y="220" type="line"/>
       <point x="952" y="-5" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/therefore.glif b/source/Hack-BoldItalic.ufo/glyphs/therefore.glif
index d77a1caf7..9019a11e9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/therefore.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/therefore.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="therefore" format="1">
+<glyph name="therefore" format="2">
   <advance width="1233"/>
   <unicode hex="2234"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/theta.glif b/source/Hack-BoldItalic.ufo/glyphs/theta.glif
index ca2435e31..c62d357c8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/theta.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/theta.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="theta" format="1">
+<glyph name="theta" format="2">
   <advance width="1233"/>
   <unicode hex="03B8"/>
   <outline>
     <contour>
-      <point x="502" y="-24" type="curve" name="hr00" smooth="yes"/>
+      <point x="502" y="-24" type="curve" smooth="yes" name="hr00"/>
       <point x="249" y="-24"/>
       <point x="108" y="174"/>
-      <point x="108" y="490" type="curve" name="sh01" smooth="yes"/>
+      <point x="108" y="490" type="curve" smooth="yes" name="sh01"/>
       <point x="108" y="570"/>
       <point x="117" y="673"/>
       <point x="136" y="776" type="curve" smooth="yes"/>
       <point x="224" y="1251"/>
       <point x="492" y="1575"/>
-      <point x="813" y="1575" type="curve" name="dv02" smooth="yes"/>
+      <point x="813" y="1575" type="curve" smooth="yes" name="dv02"/>
       <point x="1062" y="1575"/>
       <point x="1204" y="1378"/>
-      <point x="1204" y="1059" type="curve" name="sh02" smooth="yes"/>
+      <point x="1204" y="1059" type="curve" smooth="yes" name="sh02"/>
       <point x="1204" y="974"/>
       <point x="1195" y="875"/>
       <point x="1176" y="776" type="curve" smooth="yes"/>
       <point x="1136" y="557"/>
       <point x="1044" y="338"/>
-      <point x="921" y="191" type="curve" name="sh03" smooth="yes"/>
+      <point x="921" y="191" type="curve" smooth="yes" name="sh03"/>
       <point x="798" y="44"/>
       <point x="653" y="-24"/>
     </contour>
@@ -30,23 +30,23 @@
       <point x="901" y="887" type="line" name="sh04"/>
       <point x="909" y="951"/>
       <point x="914" y="1011"/>
-      <point x="914" y="1067" type="curve" name="ah01" smooth="yes"/>
+      <point x="914" y="1067" type="curve" smooth="yes" name="ah01"/>
       <point x="914" y="1231"/>
       <point x="873" y="1343"/>
-      <point x="766" y="1343" type="curve" name="dv01" smooth="yes"/>
+      <point x="766" y="1343" type="curve" smooth="yes" name="dv01"/>
       <point x="626" y="1343"/>
       <point x="522" y="1146"/>
       <point x="455" y="887" type="curve"/>
     </contour>
     <contour>
-      <point x="546" y="209" type="curve" name="sv01" smooth="yes"/>
+      <point x="546" y="209" type="curve" smooth="yes" name="sv01"/>
       <point x="691" y="209"/>
       <point x="793" y="415"/>
       <point x="857" y="662" type="curve" name="dv03"/>
       <point x="411" y="662" type="line" name="sh06"/>
       <point x="403" y="598"/>
       <point x="398" y="539"/>
-      <point x="398" y="483" type="curve" name="sh05" smooth="yes"/>
+      <point x="398" y="483" type="curve" smooth="yes" name="sh05"/>
       <point x="398" y="323"/>
       <point x="438" y="209"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/thorn.glif b/source/Hack-BoldItalic.ufo/glyphs/thorn.glif
index aabd9f825..8d6730e8e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/thorn.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/thorn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="thorn" format="1">
+<glyph name="thorn" format="2">
   <advance width="1233"/>
   <unicode hex="00FE"/>
   <outline>
@@ -12,19 +12,19 @@
       <point x="677" y="1099" type="curve" smooth="yes"/>
       <point x="729" y="1130"/>
       <point x="789" y="1147"/>
-      <point x="854" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="854" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="951" y="1147"/>
       <point x="1027" y="1111"/>
       <point x="1084" y="1038" type="curve" smooth="yes"/>
       <point x="1141" y="965"/>
       <point x="1169" y="867"/>
-      <point x="1169" y="734" type="curve" name="sh01" smooth="yes"/>
+      <point x="1169" y="734" type="curve" smooth="yes" name="sh01"/>
       <point x="1169" y="575"/>
       <point x="1121" y="379"/>
       <point x="1051" y="244" type="curve"/>
       <point x="959" y="72"/>
       <point x="811" y="-29"/>
-      <point x="654" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="654" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="507" y="-29"/>
       <point x="404" y="58"/>
       <point x="379" y="207" type="curve" name="iv01"/>
@@ -32,25 +32,25 @@
       <point x="-37" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="601" y="209" type="curve" name="dv02" smooth="yes"/>
+      <point x="601" y="209" type="curve" smooth="yes" name="dv02"/>
       <point x="681" y="209"/>
       <point x="747" y="266"/>
       <point x="794" y="350" type="curve" smooth="yes"/>
       <point x="845" y="442"/>
       <point x="874" y="564"/>
-      <point x="874" y="683" type="curve" name="hr01" smooth="yes"/>
+      <point x="874" y="683" type="curve" smooth="yes" name="hr01"/>
       <point x="874" y="763"/>
       <point x="861" y="814"/>
       <point x="833" y="851" type="curve" smooth="yes"/>
       <point x="805" y="888"/>
       <point x="767" y="907"/>
-      <point x="718" y="907" type="curve" name="sv01" smooth="yes"/>
+      <point x="718" y="907" type="curve" smooth="yes" name="sv01"/>
       <point x="643" y="907"/>
       <point x="574" y="861"/>
       <point x="519" y="769" type="curve" smooth="yes"/>
       <point x="466" y="678"/>
       <point x="436" y="560"/>
-      <point x="436" y="444" type="curve" name="dh01" smooth="yes"/>
+      <point x="436" y="444" type="curve" smooth="yes" name="dh01"/>
       <point x="436" y="371"/>
       <point x="448" y="312"/>
       <point x="480" y="269" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/three.glif b/source/Hack-BoldItalic.ufo/glyphs/three.glif
index 5405e0df8..468902aa7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/three.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/three.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="three" format="1">
+<glyph name="three" format="2">
   <advance width="1233"/>
   <unicode hex="0033"/>
   <outline>
     <contour>
-      <point x="421" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="421" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="353" y="-29"/>
       <point x="285" y="-23"/>
       <point x="206" y="-10" type="curve" smooth="yes"/>
@@ -26,22 +26,22 @@
       <point x="686" y="620" type="curve" smooth="yes"/>
       <point x="643" y="652"/>
       <point x="582" y="668"/>
-      <point x="514" y="668" type="curve" name="dv03" smooth="yes"/>
+      <point x="514" y="668" type="curve" smooth="yes" name="dv03"/>
       <point x="356" y="668" type="line"/>
       <point x="408" y="928" type="line"/>
-      <point x="565" y="928" type="line" name="dv04" smooth="yes"/>
+      <point x="565" y="928" type="line" smooth="yes" name="dv04"/>
       <point x="647" y="928"/>
       <point x="714" y="947"/>
       <point x="767" y="984" type="curve" smooth="yes"/>
       <point x="820" y="1023"/>
       <point x="844" y="1069"/>
-      <point x="844" y="1124" type="curve" name="ih01" smooth="yes"/>
+      <point x="844" y="1124" type="curve" smooth="yes" name="ih01"/>
       <point x="844" y="1171"/>
       <point x="825" y="1207"/>
       <point x="787" y="1232" type="curve" smooth="yes"/>
       <point x="752" y="1255"/>
       <point x="699" y="1270"/>
-      <point x="622" y="1270" type="curve" name="sv01" smooth="yes"/>
+      <point x="622" y="1270" type="curve" smooth="yes" name="sv01"/>
       <point x="567" y="1270"/>
       <point x="507" y="1263"/>
       <point x="441" y="1249" type="curve" smooth="yes"/>
@@ -51,10 +51,10 @@
       <point x="285" y="1456" type="line"/>
       <point x="424" y="1500"/>
       <point x="556" y="1520"/>
-      <point x="667" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="667" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="808" y="1520"/>
       <point x="921" y="1485"/>
-      <point x="998" y="1424" type="curve" name="hr02" smooth="yes"/>
+      <point x="998" y="1424" type="curve" smooth="yes" name="hr02"/>
       <point x="1081" y="1359"/>
       <point x="1120" y="1267"/>
       <point x="1120" y="1164" type="curve" name="sh01"/>
@@ -66,7 +66,7 @@
       <point x="964" y="687" type="curve" smooth="yes"/>
       <point x="1008" y="631"/>
       <point x="1030" y="563"/>
-      <point x="1030" y="470" type="curve" name="dh02" smooth="yes"/>
+      <point x="1030" y="470" type="curve" smooth="yes" name="dh02"/>
       <point x="1030" y="169"/>
       <point x="796" y="-29"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/three.subs.glif b/source/Hack-BoldItalic.ufo/glyphs/three.subs.glif
index 33bff247e..b67af7c24 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/three.subs.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/three.subs.glif
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="three.subs" format="1">
+<glyph name="three.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="566" y="-425" type="curve" name="ab01" smooth="yes"/>
+      <point x="566" y="-425" type="curve" smooth="yes" name="ab01"/>
       <point x="466" y="-425"/>
       <point x="369" y="-411"/>
       <point x="276" y="-384" type="curve"/>
       <point x="307" y="-230" type="line"/>
       <point x="386" y="-265"/>
       <point x="497" y="-285"/>
-      <point x="580" y="-285" type="curve" name="hr01" smooth="yes"/>
+      <point x="580" y="-285" type="curve" smooth="yes" name="hr01"/>
       <point x="723" y="-285"/>
       <point x="801" y="-227"/>
-      <point x="801" y="-143" type="curve" name="dh01" smooth="yes"/>
+      <point x="801" y="-143" type="curve" smooth="yes" name="dh01"/>
       <point x="801" y="-68"/>
       <point x="739" y="-36"/>
-      <point x="639" y="-36" type="curve" name="dv02" smooth="yes"/>
+      <point x="639" y="-36" type="curve" smooth="yes" name="dv02"/>
       <point x="528" y="-36" type="line"/>
       <point x="557" y="110" type="line"/>
-      <point x="666" y="110" type="line" name="dv03" smooth="yes"/>
+      <point x="666" y="110" type="line" smooth="yes" name="dv03"/>
       <point x="783" y="110"/>
       <point x="848" y="149"/>
-      <point x="848" y="212" type="curve" name="sh01" smooth="yes"/>
+      <point x="848" y="212" type="curve" smooth="yes" name="sh01"/>
       <point x="848" y="272"/>
       <point x="791" y="302"/>
-      <point x="699" y="302" type="curve" name="dv01" smooth="yes"/>
+      <point x="699" y="302" type="curve" smooth="yes" name="dv01"/>
       <point x="634" y="302"/>
       <point x="540" y="286"/>
       <point x="432" y="255" type="curve"/>
       <point x="461" y="407" type="line"/>
       <point x="558" y="430"/>
       <point x="655" y="442"/>
-      <point x="736" y="442" type="curve" name="hr02" smooth="yes"/>
+      <point x="736" y="442" type="curve" smooth="yes" name="hr02"/>
       <point x="931" y="442"/>
       <point x="1040" y="375"/>
-      <point x="1040" y="246" type="curve" name="sh02" smooth="yes"/>
+      <point x="1040" y="246" type="curve" smooth="yes" name="sh02"/>
       <point x="1040" y="134"/>
       <point x="955" y="54"/>
       <point x="807" y="38" type="curve" name="ih01"/>
       <point x="915" y="25"/>
       <point x="989" y="-36"/>
-      <point x="989" y="-153" type="curve" name="dh02" smooth="yes"/>
+      <point x="989" y="-153" type="curve" smooth="yes" name="dh02"/>
       <point x="989" y="-319"/>
       <point x="838" y="-425"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/threeeighths.glif b/source/Hack-BoldItalic.ufo/glyphs/threeeighths.glif
index b9b148e8d..5221bb12e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/threeeighths.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/threeeighths.glif
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="threeeighths" format="1">
+<glyph name="threeeighths" format="2">
   <advance width="1233"/>
   <unicode hex="215C"/>
   <outline>
     <contour>
-      <point x="338" y="809" type="curve" name="dv10" smooth="yes"/>
+      <point x="338" y="809" type="curve" smooth="yes" name="dv10"/>
       <point x="238" y="809"/>
       <point x="141" y="823"/>
       <point x="48" y="850" type="curve"/>
       <point x="79" y="1004" type="line"/>
       <point x="158" y="969"/>
       <point x="269" y="949"/>
-      <point x="352" y="949" type="curve" name="dv11" smooth="yes"/>
+      <point x="352" y="949" type="curve" smooth="yes" name="dv11"/>
       <point x="495" y="949"/>
       <point x="573" y="1007"/>
-      <point x="573" y="1091" type="curve" name="ih01" smooth="yes"/>
+      <point x="573" y="1091" type="curve" smooth="yes" name="ih01"/>
       <point x="573" y="1166"/>
       <point x="511" y="1198"/>
-      <point x="411" y="1198" type="curve" name="dv06" smooth="yes"/>
+      <point x="411" y="1198" type="curve" smooth="yes" name="dv06"/>
       <point x="300" y="1198" type="line" name="hr01"/>
       <point x="329" y="1344" type="line"/>
-      <point x="438" y="1344" type="line" name="dv07" smooth="yes"/>
+      <point x="438" y="1344" type="line" smooth="yes" name="dv07"/>
       <point x="555" y="1344"/>
       <point x="620" y="1383"/>
-      <point x="620" y="1446" type="curve" name="sh01" smooth="yes"/>
+      <point x="620" y="1446" type="curve" smooth="yes" name="sh01"/>
       <point x="620" y="1506"/>
       <point x="563" y="1536"/>
-      <point x="471" y="1536" type="curve" name="dv03" smooth="yes"/>
+      <point x="471" y="1536" type="curve" smooth="yes" name="dv03"/>
       <point x="406" y="1536"/>
       <point x="312" y="1520"/>
       <point x="204" y="1489" type="curve"/>
       <point x="233" y="1641" type="line"/>
       <point x="330" y="1664"/>
       <point x="427" y="1676"/>
-      <point x="508" y="1676" type="curve" name="hr02" smooth="yes"/>
+      <point x="508" y="1676" type="curve" smooth="yes" name="hr02"/>
       <point x="703" y="1676"/>
       <point x="812" y="1609"/>
-      <point x="812" y="1480" type="curve" name="sh02" smooth="yes"/>
+      <point x="812" y="1480" type="curve" smooth="yes" name="sh02"/>
       <point x="812" y="1368"/>
       <point x="727" y="1288"/>
       <point x="579" y="1272" type="curve" name="ih02"/>
       <point x="687" y="1259"/>
       <point x="761" y="1198"/>
-      <point x="761" y="1081" type="curve" name="sh03" smooth="yes"/>
+      <point x="761" y="1081" type="curve" smooth="yes" name="sh03"/>
       <point x="761" y="915"/>
       <point x="610" y="809"/>
     </contour>
@@ -53,56 +53,56 @@
       <point x="84" y="500" type="line"/>
     </contour>
     <contour>
-      <point x="733" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="733" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="540" y="-285"/>
       <point x="425" y="-208"/>
-      <point x="425" y="-73" type="curve" name="dh01" smooth="yes"/>
+      <point x="425" y="-73" type="curve" smooth="yes" name="dh01"/>
       <point x="425" y="55"/>
       <point x="528" y="147"/>
       <point x="688" y="179" type="curve" name="ih03"/>
       <point x="584" y="200"/>
       <point x="538" y="257"/>
-      <point x="538" y="333" type="curve" name="hr04" smooth="yes"/>
+      <point x="538" y="333" type="curve" smooth="yes" name="hr04"/>
       <point x="538" y="472"/>
       <point x="698" y="582"/>
-      <point x="899" y="582" type="curve" name="dv09" smooth="yes"/>
+      <point x="899" y="582" type="curve" smooth="yes" name="dv09"/>
       <point x="1070" y="582"/>
       <point x="1187" y="502"/>
-      <point x="1187" y="381" type="curve" name="hr05" smooth="yes"/>
+      <point x="1187" y="381" type="curve" smooth="yes" name="hr05"/>
       <point x="1187" y="278"/>
       <point x="1100" y="191"/>
       <point x="954" y="172" type="curve" name="ih04"/>
       <point x="1061" y="148"/>
       <point x="1118" y="87"/>
-      <point x="1118" y="-13" type="curve" name="dh03" smooth="yes"/>
+      <point x="1118" y="-13" type="curve" smooth="yes" name="dh03"/>
       <point x="1118" y="-176"/>
       <point x="962" y="-285"/>
     </contour>
     <contour>
-      <point x="844" y="237" type="curve" name="dv05" smooth="yes"/>
+      <point x="844" y="237" type="curve" smooth="yes" name="dv05"/>
       <point x="930" y="237"/>
       <point x="1002" y="287"/>
-      <point x="1002" y="358" type="curve" name="sh05" smooth="yes"/>
+      <point x="1002" y="358" type="curve" smooth="yes" name="sh05"/>
       <point x="1002" y="415"/>
       <point x="956" y="450"/>
-      <point x="881" y="450" type="curve" name="dv08" smooth="yes"/>
+      <point x="881" y="450" type="curve" smooth="yes" name="dv08"/>
       <point x="789" y="450"/>
       <point x="724" y="399"/>
-      <point x="724" y="331" type="curve" name="sh04" smooth="yes"/>
+      <point x="724" y="331" type="curve" smooth="yes" name="sh04"/>
       <point x="724" y="275"/>
       <point x="768" y="237"/>
     </contour>
     <contour>
-      <point x="753" y="-152" type="curve" name="dv02" smooth="yes"/>
+      <point x="753" y="-152" type="curve" smooth="yes" name="dv02"/>
       <point x="858" y="-152"/>
       <point x="932" y="-90"/>
-      <point x="932" y="-6" type="curve" name="dh02" smooth="yes"/>
+      <point x="932" y="-6" type="curve" smooth="yes" name="dh02"/>
       <point x="932" y="66"/>
       <point x="877" y="105"/>
-      <point x="793" y="105" type="curve" name="dv04" smooth="yes"/>
+      <point x="793" y="105" type="curve" smooth="yes" name="dv04"/>
       <point x="684" y="105"/>
       <point x="611" y="40"/>
-      <point x="611" y="-41" type="curve" name="hr06" smooth="yes"/>
+      <point x="611" y="-41" type="curve" smooth="yes" name="hr06"/>
       <point x="611" y="-117"/>
       <point x="675" y="-152"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/threequarters.glif b/source/Hack-BoldItalic.ufo/glyphs/threequarters.glif
index 4b2c5e92e..153e8655f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/threequarters.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/threequarters.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="threequarters" format="1">
+<glyph name="threequarters" format="2">
   <advance width="1233"/>
   <unicode hex="00BE"/>
   <outline>
     <contour>
-      <point x="342" y="809" type="curve" name="dv06" smooth="yes"/>
+      <point x="342" y="809" type="curve" smooth="yes" name="dv06"/>
       <point x="289" y="809"/>
       <point x="241" y="813"/>
-      <point x="192" y="820" type="curve" name="sv01" smooth="yes"/>
+      <point x="192" y="820" type="curve" smooth="yes" name="sv01"/>
       <point x="144" y="827"/>
       <point x="100" y="835"/>
       <point x="49" y="850" type="curve"/>
@@ -17,34 +17,34 @@
       <point x="215" y="963" type="curve" smooth="yes"/>
       <point x="264" y="954"/>
       <point x="317" y="949"/>
-      <point x="361" y="949" type="curve" name="hr01" smooth="yes"/>
+      <point x="361" y="949" type="curve" smooth="yes" name="hr01"/>
       <point x="434" y="949"/>
       <point x="482" y="963"/>
       <point x="519" y="990" type="curve" smooth="yes"/>
       <point x="558" y="1019"/>
       <point x="574" y="1056"/>
-      <point x="574" y="1095" type="curve" name="dh01" smooth="yes"/>
+      <point x="574" y="1095" type="curve" smooth="yes" name="dh01"/>
       <point x="574" y="1130"/>
       <point x="560" y="1155"/>
       <point x="531" y="1172" type="curve" smooth="yes"/>
       <point x="502" y="1189"/>
       <point x="462" y="1198"/>
-      <point x="412" y="1198" type="curve" name="dv05" smooth="yes"/>
+      <point x="412" y="1198" type="curve" smooth="yes" name="dv05"/>
       <point x="301" y="1198" type="line"/>
       <point x="330" y="1344" type="line"/>
-      <point x="439" y="1344" type="line" name="hr02" smooth="yes"/>
+      <point x="439" y="1344" type="line" smooth="yes" name="hr02"/>
       <point x="498" y="1344"/>
       <point x="543" y="1353"/>
       <point x="574" y="1372" type="curve" smooth="yes"/>
       <point x="605" y="1391"/>
       <point x="621" y="1416"/>
-      <point x="621" y="1449" type="curve" name="ih01" smooth="yes"/>
+      <point x="621" y="1449" type="curve" smooth="yes" name="ih01"/>
       <point x="621" y="1477"/>
       <point x="608" y="1498"/>
       <point x="581" y="1513" type="curve" smooth="yes"/>
       <point x="554" y="1528"/>
       <point x="517" y="1536"/>
-      <point x="472" y="1536" type="curve" name="dv03" smooth="yes"/>
+      <point x="472" y="1536" type="curve" smooth="yes" name="dv03"/>
       <point x="439" y="1536"/>
       <point x="400" y="1532"/>
       <point x="354" y="1524" type="curve" smooth="yes"/>
@@ -54,19 +54,19 @@
       <point x="234" y="1641" type="line"/>
       <point x="283" y="1652"/>
       <point x="331" y="1660"/>
-      <point x="378" y="1667" type="curve" name="sv02" smooth="yes"/>
+      <point x="378" y="1667" type="curve" smooth="yes" name="sv02"/>
       <point x="425" y="1673"/>
       <point x="469" y="1676"/>
-      <point x="512" y="1676" type="curve" name="dv04" smooth="yes"/>
+      <point x="512" y="1676" type="curve" smooth="yes" name="dv04"/>
       <point x="609" y="1676"/>
       <point x="681" y="1660"/>
       <point x="734" y="1625" type="curve" smooth="yes"/>
       <point x="787" y="1591"/>
       <point x="813" y="1543"/>
-      <point x="813" y="1482" type="curve" name="sh01" smooth="yes"/>
+      <point x="813" y="1482" type="curve" smooth="yes" name="sh01"/>
       <point x="813" y="1426"/>
       <point x="793" y="1377"/>
-      <point x="753" y="1340" type="curve" name="hr03" smooth="yes"/>
+      <point x="753" y="1340" type="curve" smooth="yes" name="hr03"/>
       <point x="714" y="1304"/>
       <point x="656" y="1280"/>
       <point x="580" y="1272" type="curve" name="ih02"/>
@@ -75,7 +75,7 @@
       <point x="713" y="1214" type="curve" smooth="yes"/>
       <point x="746" y="1181"/>
       <point x="762" y="1142"/>
-      <point x="762" y="1086" type="curve" name="dh02" smooth="yes"/>
+      <point x="762" y="1086" type="curve" smooth="yes" name="dh02"/>
       <point x="762" y="915"/>
       <point x="610" y="809"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/tilde.glif b/source/Hack-BoldItalic.ufo/glyphs/tilde.glif
index 829221c5e..f665ff10d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/tilde.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/tilde.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="tilde" format="1">
+<glyph name="tilde" format="2">
   <advance width="1233"/>
   <unicode hex="02DC"/>
   <outline>
     <contour>
-      <point x="880" y="1307" type="curve" name="av01" smooth="yes"/>
+      <point x="880" y="1307" type="curve" smooth="yes" name="av01"/>
       <point x="832" y="1307"/>
       <point x="792" y="1321"/>
       <point x="739" y="1364" type="curve" name="hr01"/>
@@ -24,10 +24,10 @@
       <point x="464" y="1516" type="curve" smooth="yes"/>
       <point x="509" y="1567"/>
       <point x="565" y="1593"/>
-      <point x="625" y="1593" type="curve" name="hr02" smooth="yes"/>
+      <point x="625" y="1593" type="curve" smooth="yes" name="hr02"/>
       <point x="678" y="1593"/>
       <point x="703" y="1580"/>
-      <point x="768" y="1532" type="curve" name="hr03" smooth="yes"/>
+      <point x="768" y="1532" type="curve" smooth="yes" name="hr03"/>
       <point x="819" y="1493" type="line" smooth="yes"/>
       <point x="845" y="1472"/>
       <point x="868" y="1462"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/tildecomb.glif b/source/Hack-BoldItalic.ufo/glyphs/tildecomb.glif
index aa4e7ccbc..e66b23253 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/tildecomb.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/tildecomb.glif
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="tildecomb" format="1">
-  <advance width="0"/>
+<glyph name="tildecomb" format="2">
   <unicode hex="0303"/>
   <outline>
     <contour>
-      <point x="-354" y="1307" type="curve" name="dv01" smooth="yes"/>
+      <point x="-354" y="1307" type="curve" smooth="yes" name="dv01"/>
       <point x="-401" y="1307"/>
       <point x="-441" y="1323"/>
       <point x="-494" y="1364" type="curve" smooth="yes"/>
@@ -14,21 +13,21 @@
       <point x="-548" y="1405" type="curve" smooth="yes"/>
       <point x="-576" y="1427"/>
       <point x="-600" y="1438"/>
-      <point x="-621" y="1438" type="curve" name="dv03" smooth="yes"/>
+      <point x="-621" y="1438" type="curve" smooth="yes" name="dv03"/>
       <point x="-666" y="1438"/>
       <point x="-704" y="1389"/>
       <point x="-717" y="1309" type="curve" name="sv01"/>
       <point x="-856" y="1309" type="line" name="hr01"/>
       <point x="-832" y="1482"/>
       <point x="-733" y="1593"/>
-      <point x="-606" y="1593" type="curve" name="dv04" smooth="yes"/>
+      <point x="-606" y="1593" type="curve" smooth="yes" name="dv04"/>
       <point x="-561" y="1593"/>
       <point x="-526" y="1580"/>
       <point x="-465" y="1532" type="curve" smooth="yes"/>
       <point x="-414" y="1493" type="line" smooth="yes"/>
       <point x="-388" y="1472"/>
       <point x="-365" y="1462"/>
-      <point x="-344" y="1462" type="curve" name="dv02" smooth="yes"/>
+      <point x="-344" y="1462" type="curve" smooth="yes" name="dv02"/>
       <point x="-293" y="1462"/>
       <point x="-257" y="1507"/>
       <point x="-244" y="1591" type="curve" name="sv02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/tonos.glif b/source/Hack-BoldItalic.ufo/glyphs/tonos.glif
index 176b8c626..a7f5bee48 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/tonos.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/tonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="tonos" format="1">
+<glyph name="tonos" format="2">
   <advance width="1233"/>
   <unicode hex="0384"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/trademark.glif b/source/Hack-BoldItalic.ufo/glyphs/trademark.glif
index 5a6a66cce..997be8f17 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/trademark.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/trademark.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="trademark" format="1">
+<glyph name="trademark" format="2">
   <advance width="1233"/>
   <unicode hex="2122"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/triagdn.glif b/source/Hack-BoldItalic.ufo/glyphs/triagdn.glif
index ae62ad357..4964145af 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/triagdn.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/triagdn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="triagdn" format="1">
+<glyph name="triagdn" format="2">
   <advance width="1233"/>
   <unicode hex="25BC"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/triaglf.glif b/source/Hack-BoldItalic.ufo/glyphs/triaglf.glif
index 5b464644c..a9eecf67b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/triaglf.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/triaglf.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="triaglf" format="1">
+<glyph name="triaglf" format="2">
   <advance width="1233"/>
   <unicode hex="25C4"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/triagrt.glif b/source/Hack-BoldItalic.ufo/glyphs/triagrt.glif
index 4fa9ebf0a..76cd2a61c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/triagrt.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/triagrt.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="triagrt" format="1">
+<glyph name="triagrt" format="2">
   <advance width="1233"/>
   <unicode hex="25BA"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/triagup.glif b/source/Hack-BoldItalic.ufo/glyphs/triagup.glif
index 8b827d704..6a5b3fba1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/triagup.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/triagup.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="triagup" format="1">
+<glyph name="triagup" format="2">
   <advance width="1233"/>
   <unicode hex="25B2"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/two.glif b/source/Hack-BoldItalic.ufo/glyphs/two.glif
index e351673f8..1569ec4cf 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/two.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/two.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="two" format="1">
+<glyph name="two" format="2">
   <advance width="1233"/>
   <unicode hex="0032"/>
   <outline>
     <contour>
-      <point x="13" y="218" type="line" name="hr00" smooth="yes"/>
+      <point x="13" y="218" type="line" smooth="yes" name="hr00"/>
       <point x="18" y="243"/>
       <point x="27" y="258"/>
       <point x="46" y="275" type="curve" smooth="yes"/>
@@ -14,10 +14,10 @@
       <point x="442" y="628" type="curve" smooth="yes"/>
       <point x="731" y="887"/>
       <point x="844" y="1033"/>
-      <point x="844" y="1138" type="curve" name="dh01" smooth="yes"/>
+      <point x="844" y="1138" type="curve" smooth="yes" name="dh01"/>
       <point x="844" y="1229"/>
       <point x="764" y="1288"/>
-      <point x="635" y="1288" type="curve" name="sv01" smooth="yes"/>
+      <point x="635" y="1288" type="curve" smooth="yes" name="sv01"/>
       <point x="579" y="1288"/>
       <point x="515" y="1278"/>
       <point x="447" y="1259" type="curve" smooth="yes"/>
@@ -30,13 +30,13 @@
       <point x="492" y="1499" type="curve" smooth="yes"/>
       <point x="564" y="1514"/>
       <point x="637" y="1520"/>
-      <point x="697" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="697" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="824" y="1520"/>
       <point x="934" y="1490"/>
       <point x="1014" y="1426" type="curve" smooth="yes"/>
       <point x="1089" y="1367"/>
       <point x="1135" y="1283"/>
-      <point x="1135" y="1186" type="curve" name="dh02" smooth="yes"/>
+      <point x="1135" y="1186" type="curve" smooth="yes" name="dh02"/>
       <point x="1135" y="1011"/>
       <point x="984" y="799"/>
       <point x="681" y="542" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/two.subs.glif b/source/Hack-BoldItalic.ufo/glyphs/two.subs.glif
index 12ecca68e..839f17e2b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/two.subs.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/two.subs.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="two.subs" format="1">
+<glyph name="two.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
@@ -9,20 +9,20 @@
       <point x="431" y="-157" type="curve" smooth="yes"/>
       <point x="700" y="36"/>
       <point x="831" y="154"/>
-      <point x="831" y="230" type="curve" name="dh01" smooth="yes"/>
+      <point x="831" y="230" type="curve" smooth="yes" name="dh01"/>
       <point x="831" y="277"/>
       <point x="782" y="314"/>
-      <point x="687" y="314" type="curve" name="dv03" smooth="yes"/>
+      <point x="687" y="314" type="curve" smooth="yes" name="dv03"/>
       <point x="611" y="314"/>
       <point x="506" y="290"/>
       <point x="403" y="243" type="curve"/>
       <point x="434" y="405" type="line"/>
       <point x="535" y="436"/>
       <point x="634" y="452"/>
-      <point x="722" y="452" type="curve" name="dv04" smooth="yes"/>
+      <point x="722" y="452" type="curve" smooth="yes" name="dv04"/>
       <point x="919" y="452"/>
       <point x="1028" y="370"/>
-      <point x="1028" y="264" type="curve" name="dh02" smooth="yes"/>
+      <point x="1028" y="264" type="curve" smooth="yes" name="dh02"/>
       <point x="1028" y="149"/>
       <point x="900" y="12"/>
       <point x="618" y="-182" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/twodotenleader.glif b/source/Hack-BoldItalic.ufo/glyphs/twodotenleader.glif
index bc63e1c42..d7e0a051b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/twodotenleader.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/twodotenleader.glif
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="twodotenleader" format="1">
+<glyph name="twodotenleader" format="2">
   <advance width="1233"/>
   <unicode hex="2025"/>
   <outline>
     <contour>
-      <point x="124" y="0" type="line" name="hr00" smooth="yes"/>
+      <point x="124" y="0" type="line" smooth="yes" name="hr00"/>
       <point x="104" y="0"/>
       <point x="93" y="13"/>
       <point x="97" y="33" type="curve" smooth="yes"/>
       <point x="156" y="340" type="line"/>
       <point x="159" y="358"/>
       <point x="169" y="367"/>
-      <point x="188" y="367" type="curve" name="sv01" smooth="yes"/>
-      <point x="443" y="367" type="line" name="sv02" smooth="yes"/>
+      <point x="188" y="367" type="curve" smooth="yes" name="sv01"/>
+      <point x="443" y="367" type="line" smooth="yes" name="sv02"/>
       <point x="462" y="367"/>
       <point x="471" y="359"/>
       <point x="471" y="342" type="curve" smooth="yes"/>
@@ -25,7 +25,7 @@
       <point x="377" y="0" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="594" y="0" type="line" name="ab01" smooth="yes"/>
+      <point x="594" y="0" type="line" smooth="yes" name="ab01"/>
       <point x="575" y="0"/>
       <point x="566" y="8"/>
       <point x="566" y="25" type="curve" smooth="yes"/>
@@ -35,8 +35,8 @@
       <point x="627" y="340" type="line"/>
       <point x="630" y="358"/>
       <point x="640" y="367"/>
-      <point x="659" y="367" type="curve" name="sv03" smooth="yes"/>
-      <point x="894" y="367" type="line" name="sv04" smooth="yes"/>
+      <point x="659" y="367" type="curve" smooth="yes" name="sv03"/>
+      <point x="894" y="367" type="line" smooth="yes" name="sv04"/>
       <point x="913" y="367"/>
       <point x="922" y="359"/>
       <point x="922" y="342" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/u.glif b/source/Hack-BoldItalic.ufo/glyphs/u.glif
index f9139a997..68302f91f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/u.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/u.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="u" format="1">
+<glyph name="u" format="2">
   <advance width="1233"/>
   <unicode hex="0075"/>
   <outline>
@@ -26,16 +26,16 @@
       <point x="874" y="1120" type="line"/>
       <point x="1165" y="1120" type="line"/>
       <point x="948" y="0" type="line"/>
-      <point x="686" y="-0" type="line"/>
+      <point x="686" y="0" type="line"/>
       <point x="686" y="166" type="line"/>
       <point x="630.99" y="46.6073"/>
       <point x="508.468" y="-29"/>
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uacute.glif b/source/Hack-BoldItalic.ufo/glyphs/uacute.glif
index c7027d4a6..dca6f47b0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uacute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uacute" format="1">
+<glyph name="uacute" format="2">
   <advance width="1233"/>
   <unicode hex="00FA"/>
   <outline>
@@ -10,16 +10,16 @@
       <point x="579" y="1272" type="line" name="hr01"/>
     </contour>
     <contour>
-      <point x="370" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="370" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="289" y="-29"/>
       <point x="222" y="-5"/>
       <point x="175" y="42" type="curve" smooth="yes"/>
       <point x="129" y="89"/>
       <point x="106" y="156"/>
-      <point x="106" y="244" type="curve" name="dh01" smooth="yes"/>
+      <point x="106" y="244" type="curve" smooth="yes" name="dh01"/>
       <point x="106" y="263"/>
       <point x="107" y="284"/>
-      <point x="110" y="308" type="curve" name="sh01" smooth="yes"/>
+      <point x="110" y="308" type="curve" smooth="yes" name="sh01"/>
       <point x="113" y="324"/>
       <point x="116" y="360"/>
       <point x="123" y="391" type="curve"/>
@@ -28,13 +28,13 @@
       <point x="426" y="436" type="line" smooth="yes"/>
       <point x="421" y="408"/>
       <point x="416" y="357"/>
-      <point x="416" y="336" type="curve" name="dh02" smooth="yes"/>
+      <point x="416" y="336" type="curve" smooth="yes" name="dh02"/>
       <point x="416" y="289"/>
       <point x="426" y="264"/>
       <point x="445" y="243" type="curve" smooth="yes"/>
       <point x="462" y="224"/>
       <point x="486" y="211"/>
-      <point x="529" y="211" type="curve" name="dv02" smooth="yes"/>
+      <point x="529" y="211" type="curve" smooth="yes" name="dv02"/>
       <point x="588" y="211"/>
       <point x="632" y="235"/>
       <point x="668" y="282" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ubreve.glif b/source/Hack-BoldItalic.ufo/glyphs/ubreve.glif
index 33a75af60..b04411d94 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ubreve.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ubreve.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ubreve" format="1">
+<glyph name="ubreve" format="2">
   <advance width="1233"/>
   <unicode hex="016D"/>
   <outline>
     <contour>
-      <point x="1002" y="1379" type="curve" name="hr00" smooth="yes"/>
+      <point x="1002" y="1379" type="curve" smooth="yes" name="hr00"/>
       <point x="1070" y="1432"/>
       <point x="1111" y="1503"/>
       <point x="1130" y="1598" type="curve"/>
@@ -14,7 +14,7 @@
       <point x="904" y="1491" type="curve" smooth="yes"/>
       <point x="865" y="1465"/>
       <point x="819" y="1452"/>
-      <point x="764" y="1452" type="curve" name="hr01" smooth="yes"/>
+      <point x="764" y="1452" type="curve" smooth="yes" name="hr01"/>
       <point x="661" y="1452"/>
       <point x="600" y="1504"/>
       <point x="600" y="1585" type="curve" smooth="yes"/>
@@ -45,7 +45,7 @@
       <point x="529" y="211" type="curve" smooth="yes"/>
       <point x="492" y="211"/>
       <point x="464" y="222"/>
-      <point x="445" y="243" type="curve" name="hr03" smooth="yes"/>
+      <point x="445" y="243" type="curve" smooth="yes" name="hr03"/>
       <point x="425" y="267"/>
       <point x="416" y="293"/>
       <point x="416" y="336" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ucircumflex.glif b/source/Hack-BoldItalic.ufo/glyphs/ucircumflex.glif
index 047727dcb..c8fa7b3d2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ucircumflex.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ucircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ucircumflex" format="1">
+<glyph name="ucircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00FB"/>
   <outline>
@@ -13,16 +13,16 @@
       <point x="346" y="1272" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="370" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="370" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="289" y="-29"/>
       <point x="222" y="-5"/>
       <point x="175" y="42" type="curve" smooth="yes"/>
       <point x="129" y="89"/>
       <point x="106" y="156"/>
-      <point x="106" y="244" type="curve" name="hr02" smooth="yes"/>
+      <point x="106" y="244" type="curve" smooth="yes" name="hr02"/>
       <point x="106" y="263"/>
       <point x="107" y="284"/>
-      <point x="110" y="308" type="curve" name="sh01" smooth="yes"/>
+      <point x="110" y="308" type="curve" smooth="yes" name="sh01"/>
       <point x="113" y="324"/>
       <point x="116" y="360"/>
       <point x="123" y="391" type="curve"/>
@@ -31,13 +31,13 @@
       <point x="426" y="436" type="line" smooth="yes"/>
       <point x="421" y="408"/>
       <point x="416" y="357"/>
-      <point x="416" y="336" type="curve" name="dh01" smooth="yes"/>
+      <point x="416" y="336" type="curve" smooth="yes" name="dh01"/>
       <point x="416" y="289"/>
       <point x="426" y="264"/>
       <point x="445" y="243" type="curve" smooth="yes"/>
       <point x="462" y="224"/>
       <point x="486" y="211"/>
-      <point x="529" y="211" type="curve" name="dv02" smooth="yes"/>
+      <point x="529" y="211" type="curve" smooth="yes" name="dv02"/>
       <point x="588" y="211"/>
       <point x="632" y="235"/>
       <point x="668" y="282" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/udieresis.glif b/source/Hack-BoldItalic.ufo/glyphs/udieresis.glif
index 8b2eedbf5..0f6291f2e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/udieresis.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/udieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="udieresis" format="1">
+<glyph name="udieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00FC"/>
   <outline>
     <contour>
-      <point x="459" y="1347" type="line" name="sv01" smooth="yes"/>
+      <point x="459" y="1347" type="line" smooth="yes" name="sv01"/>
       <point x="439" y="1347"/>
       <point x="428" y="1360"/>
       <point x="432" y="1380" type="curve" smooth="yes"/>
       <point x="468" y="1566" type="line"/>
       <point x="471" y="1584"/>
       <point x="481" y="1593"/>
-      <point x="500" y="1593" type="curve" name="hr01" smooth="yes"/>
+      <point x="500" y="1593" type="curve" smooth="yes" name="hr01"/>
       <point x="677" y="1593" type="line" smooth="yes"/>
       <point x="695" y="1593"/>
       <point x="704" y="1585"/>
@@ -25,14 +25,14 @@
       <point x="634" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="854" y="1347" type="line" name="hr02" smooth="yes"/>
+      <point x="854" y="1347" type="line" smooth="yes" name="hr02"/>
       <point x="834" y="1347"/>
       <point x="823" y="1360"/>
       <point x="827" y="1380" type="curve" smooth="yes"/>
       <point x="863" y="1566" type="line"/>
       <point x="866" y="1584"/>
       <point x="876" y="1593"/>
-      <point x="895" y="1593" type="curve" name="at03" smooth="yes"/>
+      <point x="895" y="1593" type="curve" smooth="yes" name="at03"/>
       <point x="1073" y="1593" type="line" smooth="yes"/>
       <point x="1091" y="1593"/>
       <point x="1100" y="1585"/>
@@ -43,19 +43,19 @@
       <point x="1062" y="1374" type="line" smooth="yes"/>
       <point x="1059" y="1356"/>
       <point x="1048" y="1347"/>
-      <point x="1030" y="1347" type="curve" name="sv02" smooth="yes"/>
+      <point x="1030" y="1347" type="curve" smooth="yes" name="sv02"/>
     </contour>
     <contour>
-      <point x="370" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="370" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="289" y="-29"/>
       <point x="222" y="-5"/>
       <point x="175" y="42" type="curve" smooth="yes"/>
       <point x="129" y="89"/>
       <point x="106" y="156"/>
-      <point x="106" y="244" type="curve" name="dh01" smooth="yes"/>
+      <point x="106" y="244" type="curve" smooth="yes" name="dh01"/>
       <point x="106" y="263"/>
       <point x="107" y="284"/>
-      <point x="110" y="308" type="curve" name="sh01" smooth="yes"/>
+      <point x="110" y="308" type="curve" smooth="yes" name="sh01"/>
       <point x="113" y="324"/>
       <point x="116" y="360"/>
       <point x="123" y="391" type="curve"/>
@@ -64,13 +64,13 @@
       <point x="426" y="436" type="line" smooth="yes"/>
       <point x="421" y="408"/>
       <point x="416" y="357"/>
-      <point x="416" y="336" type="curve" name="dh02" smooth="yes"/>
+      <point x="416" y="336" type="curve" smooth="yes" name="dh02"/>
       <point x="416" y="289"/>
       <point x="426" y="264"/>
       <point x="445" y="243" type="curve" smooth="yes"/>
       <point x="462" y="224"/>
       <point x="486" y="211"/>
-      <point x="529" y="211" type="curve" name="dv02" smooth="yes"/>
+      <point x="529" y="211" type="curve" smooth="yes" name="dv02"/>
       <point x="588" y="211"/>
       <point x="632" y="235"/>
       <point x="668" y="282" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ugrave.glif b/source/Hack-BoldItalic.ufo/glyphs/ugrave.glif
index 8efd53d43..14064d4a9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ugrave.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ugrave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ugrave" format="1">
+<glyph name="ugrave" format="2">
   <advance width="1233"/>
   <unicode hex="00F9"/>
   <outline>
@@ -10,16 +10,16 @@
       <point x="676" y="1272" type="line" name="hr01"/>
     </contour>
     <contour>
-      <point x="370" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="370" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="289" y="-29"/>
       <point x="222" y="-5"/>
       <point x="175" y="42" type="curve" smooth="yes"/>
       <point x="129" y="89"/>
       <point x="106" y="156"/>
-      <point x="106" y="244" type="curve" name="dh01" smooth="yes"/>
+      <point x="106" y="244" type="curve" smooth="yes" name="dh01"/>
       <point x="106" y="263"/>
       <point x="107" y="284"/>
-      <point x="110" y="308" type="curve" name="sh01" smooth="yes"/>
+      <point x="110" y="308" type="curve" smooth="yes" name="sh01"/>
       <point x="113" y="324"/>
       <point x="116" y="360"/>
       <point x="123" y="391" type="curve"/>
@@ -28,13 +28,13 @@
       <point x="426" y="436" type="line" smooth="yes"/>
       <point x="421" y="408"/>
       <point x="416" y="357"/>
-      <point x="416" y="336" type="curve" name="dh02" smooth="yes"/>
+      <point x="416" y="336" type="curve" smooth="yes" name="dh02"/>
       <point x="416" y="289"/>
       <point x="426" y="264"/>
       <point x="445" y="243" type="curve" smooth="yes"/>
       <point x="462" y="224"/>
       <point x="486" y="211"/>
-      <point x="529" y="211" type="curve" name="dv02" smooth="yes"/>
+      <point x="529" y="211" type="curve" smooth="yes" name="dv02"/>
       <point x="588" y="211"/>
       <point x="632" y="235"/>
       <point x="668" y="282" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uhorn.glif b/source/Hack-BoldItalic.ufo/glyphs/uhorn.glif
index 7e3972920..95ea8d360 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uhorn.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uhorn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uhorn" format="1">
+<glyph name="uhorn" format="2">
   <advance width="1233"/>
   <unicode hex="01B0"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="1321" y="977" type="curve" smooth="yes"/>
       <point x="1290" y="825"/>
       <point x="1212" y="739"/>
-      <point x="1097" y="739" type="curve" name="sv01" smooth="yes"/>
+      <point x="1097" y="739" type="curve" smooth="yes" name="sv01"/>
       <point x="1074" y="739"/>
       <point x="1052" y="742"/>
       <point x="1032" y="749" type="curve"/>
@@ -19,10 +19,10 @@
       <point x="627" y="166" type="line" name="sh01"/>
       <point x="567" y="45"/>
       <point x="452" y="-29"/>
-      <point x="307" y="-29" type="curve" name="sv03" smooth="yes"/>
+      <point x="307" y="-29" type="curve" smooth="yes" name="sv03"/>
       <point x="143" y="-29"/>
       <point x="45" y="67"/>
-      <point x="45" y="244" type="curve" name="dh01" smooth="yes"/>
+      <point x="45" y="244" type="curve" smooth="yes" name="dh01"/>
       <point x="45" y="283"/>
       <point x="50" y="327"/>
       <point x="62" y="391" type="curve" smooth="yes"/>
@@ -31,10 +31,10 @@
       <point x="365" y="436" type="line" smooth="yes"/>
       <point x="358" y="400"/>
       <point x="355" y="362"/>
-      <point x="355" y="338" type="curve" name="dh02" smooth="yes"/>
+      <point x="355" y="338" type="curve" smooth="yes" name="dh02"/>
       <point x="355" y="251"/>
       <point x="395" y="211"/>
-      <point x="467" y="211" type="curve" name="sv02" smooth="yes"/>
+      <point x="467" y="211" type="curve" smooth="yes" name="sv02"/>
       <point x="574" y="211"/>
       <point x="654" y="298"/>
       <point x="691" y="489" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uhungarumlaut.glif b/source/Hack-BoldItalic.ufo/glyphs/uhungarumlaut.glif
index 0ee984f0a..e67b8ad1e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uhungarumlaut.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uhungarumlaut.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uhungarumlaut" format="1">
+<glyph name="uhungarumlaut" format="2">
   <advance width="1233"/>
   <unicode hex="0171"/>
   <outline>
@@ -16,10 +16,10 @@
       <point x="770" y="1272" type="line"/>
     </contour>
     <contour>
-      <point x="368" y="-29" type="curve" name="sv04" smooth="yes"/>
+      <point x="368" y="-29" type="curve" smooth="yes" name="sv04"/>
       <point x="204" y="-29"/>
       <point x="106" y="67"/>
-      <point x="106" y="244" type="curve" name="dh01" smooth="yes"/>
+      <point x="106" y="244" type="curve" smooth="yes" name="dh01"/>
       <point x="106" y="283"/>
       <point x="111" y="327"/>
       <point x="123" y="391" type="curve" smooth="yes"/>
@@ -28,10 +28,10 @@
       <point x="426" y="436" type="line" smooth="yes"/>
       <point x="419" y="400"/>
       <point x="416" y="362"/>
-      <point x="416" y="338" type="curve" name="hr02" smooth="yes"/>
+      <point x="416" y="338" type="curve" smooth="yes" name="hr02"/>
       <point x="416" y="251"/>
       <point x="456" y="211"/>
-      <point x="528" y="211" type="curve" name="sv03" smooth="yes"/>
+      <point x="528" y="211" type="curve" smooth="yes" name="sv03"/>
       <point x="635" y="211"/>
       <point x="715" y="298"/>
       <point x="752" y="489" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/umacron.glif b/source/Hack-BoldItalic.ufo/glyphs/umacron.glif
index f9fc20374..753ed3b05 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/umacron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/umacron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="umacron" format="1">
+<glyph name="umacron" format="2">
   <advance width="1233"/>
   <unicode hex="016B"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="432" y="1320" type="line"/>
     </contour>
     <contour>
-      <point x="368" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="368" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="204" y="-29"/>
       <point x="106" y="67"/>
-      <point x="106" y="244" type="curve" name="dh01" smooth="yes"/>
+      <point x="106" y="244" type="curve" smooth="yes" name="dh01"/>
       <point x="106" y="283"/>
       <point x="111" y="327"/>
       <point x="123" y="391" type="curve" smooth="yes"/>
@@ -22,10 +22,10 @@
       <point x="426" y="436" type="line" smooth="yes"/>
       <point x="419" y="400"/>
       <point x="416" y="362"/>
-      <point x="416" y="338" type="curve" name="dh02" smooth="yes"/>
+      <point x="416" y="338" type="curve" smooth="yes" name="dh02"/>
       <point x="416" y="251"/>
       <point x="456" y="211"/>
-      <point x="528" y="211" type="curve" name="sv01" smooth="yes"/>
+      <point x="528" y="211" type="curve" smooth="yes" name="sv01"/>
       <point x="635" y="211"/>
       <point x="715" y="298"/>
       <point x="752" y="489" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/underscore.glif b/source/Hack-BoldItalic.ufo/glyphs/underscore.glif
index 80080a654..bb4427197 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/underscore.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/underscore.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="underscore" format="1">
+<glyph name="underscore" format="2">
   <advance width="1233"/>
   <unicode hex="005F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/underscoredbl.glif b/source/Hack-BoldItalic.ufo/glyphs/underscoredbl.glif
index 2bac7f055..a4b0d7423 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/underscoredbl.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/underscoredbl.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="underscoredbl" format="1">
+<glyph name="underscoredbl" format="2">
   <advance width="1233"/>
   <unicode hex="2017"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni00A_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni00A_0.glif
index c0979d094..a4b993919 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni00A_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni00A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni00A0" format="1">
+<glyph name="uni00A0" format="2">
   <advance width="1233"/>
   <unicode hex="00A0"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni00A_D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni00A_D_.glif
index c7792aaaf..1ace75b10 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni00A_D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni00A_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni00AD" format="1">
+<glyph name="uni00AD" format="2">
   <advance width="1233"/>
   <unicode hex="00AD"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni00B_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni00B_2.glif
index 057875d43..60095366f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni00B_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni00B_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni00B2" format="1">
+<glyph name="uni00B2" format="2">
   <advance width="1233"/>
   <unicode hex="00B2"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="431" y="1363" type="curve" smooth="yes"/>
       <point x="722" y="1571"/>
       <point x="831" y="1681"/>
-      <point x="831" y="1746" type="curve" name="dh01" smooth="yes"/>
+      <point x="831" y="1746" type="curve" smooth="yes" name="dh01"/>
       <point x="831" y="1767"/>
       <point x="819" y="1793"/>
       <point x="795" y="1810" type="curve" smooth="yes"/>
       <point x="772" y="1826"/>
       <point x="737" y="1834"/>
-      <point x="691" y="1834" type="curve" name="dv03" smooth="yes"/>
+      <point x="691" y="1834" type="curve" smooth="yes" name="dv03"/>
       <point x="651" y="1834"/>
       <point x="604" y="1828"/>
       <point x="555" y="1816" type="curve" smooth="yes"/>
@@ -29,13 +29,13 @@
       <point x="583" y="1960" type="curve" smooth="yes"/>
       <point x="632" y="1968"/>
       <point x="680" y="1972"/>
-      <point x="728" y="1972" type="curve" name="dv04" smooth="yes"/>
+      <point x="728" y="1972" type="curve" smooth="yes" name="dv04"/>
       <point x="820" y="1972"/>
       <point x="894" y="1957"/>
       <point x="950" y="1918" type="curve" smooth="yes"/>
       <point x="1005" y="1879"/>
       <point x="1028" y="1825"/>
-      <point x="1028" y="1777" type="curve" name="dh02" smooth="yes"/>
+      <point x="1028" y="1777" type="curve" smooth="yes" name="dh02"/>
       <point x="1028" y="1668"/>
       <point x="906" y="1541"/>
       <point x="618" y="1338" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni00B_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni00B_3.glif
index 9e06599bf..61242afcb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni00B_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni00B_3.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni00B3" format="1">
+<glyph name="uni00B3" format="2">
   <advance width="1233"/>
   <unicode hex="00B3"/>
   <outline>
     <contour>
-      <point x="569" y="1103" type="curve" name="dv01" smooth="yes"/>
+      <point x="569" y="1103" type="curve" smooth="yes" name="dv01"/>
       <point x="516" y="1103"/>
       <point x="468" y="1107"/>
-      <point x="419" y="1114" type="curve" name="sv01" smooth="yes"/>
+      <point x="419" y="1114" type="curve" smooth="yes" name="sv01"/>
       <point x="371" y="1121"/>
       <point x="327" y="1129"/>
       <point x="276" y="1144" type="curve"/>
@@ -17,34 +17,34 @@
       <point x="442" y="1257" type="curve" smooth="yes"/>
       <point x="491" y="1248"/>
       <point x="544" y="1243"/>
-      <point x="588" y="1243" type="curve" name="dv02" smooth="yes"/>
+      <point x="588" y="1243" type="curve" smooth="yes" name="dv02"/>
       <point x="661" y="1243"/>
       <point x="709" y="1257"/>
-      <point x="746" y="1284" type="curve" name="hr01" smooth="yes"/>
+      <point x="746" y="1284" type="curve" smooth="yes" name="hr01"/>
       <point x="785" y="1313"/>
       <point x="801" y="1350"/>
-      <point x="801" y="1389" type="curve" name="dh01" smooth="yes"/>
+      <point x="801" y="1389" type="curve" smooth="yes" name="dh01"/>
       <point x="801" y="1424"/>
       <point x="787" y="1449"/>
       <point x="758" y="1466" type="curve" smooth="yes"/>
       <point x="729" y="1483"/>
       <point x="689" y="1492"/>
-      <point x="639" y="1492" type="curve" name="dv04" smooth="yes"/>
+      <point x="639" y="1492" type="curve" smooth="yes" name="dv04"/>
       <point x="528" y="1492" type="line"/>
       <point x="557" y="1638" type="line"/>
-      <point x="666" y="1638" type="line" name="dv05" smooth="yes"/>
+      <point x="666" y="1638" type="line" smooth="yes" name="dv05"/>
       <point x="725" y="1638"/>
       <point x="770" y="1647"/>
       <point x="801" y="1666" type="curve" smooth="yes"/>
       <point x="832" y="1685"/>
       <point x="848" y="1710"/>
-      <point x="848" y="1743" type="curve" name="ih01" smooth="yes"/>
+      <point x="848" y="1743" type="curve" smooth="yes" name="ih01"/>
       <point x="848" y="1771"/>
       <point x="835" y="1792"/>
       <point x="808" y="1807" type="curve" smooth="yes"/>
       <point x="781" y="1822"/>
       <point x="744" y="1830"/>
-      <point x="699" y="1830" type="curve" name="hr02" smooth="yes"/>
+      <point x="699" y="1830" type="curve" smooth="yes" name="hr02"/>
       <point x="666" y="1830"/>
       <point x="627" y="1826"/>
       <point x="581" y="1818" type="curve" smooth="yes"/>
@@ -54,16 +54,16 @@
       <point x="461" y="1935" type="line"/>
       <point x="510" y="1946"/>
       <point x="558" y="1954"/>
-      <point x="605" y="1961" type="curve" name="sv02" smooth="yes"/>
+      <point x="605" y="1961" type="curve" smooth="yes" name="sv02"/>
       <point x="652" y="1967"/>
       <point x="696" y="1970"/>
-      <point x="739" y="1970" type="curve" name="dv03" smooth="yes"/>
+      <point x="739" y="1970" type="curve" smooth="yes" name="dv03"/>
       <point x="836" y="1970"/>
       <point x="908" y="1954"/>
       <point x="961" y="1919" type="curve" smooth="yes"/>
       <point x="1014" y="1885"/>
       <point x="1040" y="1837"/>
-      <point x="1040" y="1776" type="curve" name="sh01" smooth="yes"/>
+      <point x="1040" y="1776" type="curve" smooth="yes" name="sh01"/>
       <point x="1040" y="1720"/>
       <point x="1020" y="1671"/>
       <point x="980" y="1634" type="curve" smooth="yes"/>
@@ -75,7 +75,7 @@
       <point x="940" y="1508" type="curve" smooth="yes"/>
       <point x="973" y="1475"/>
       <point x="989" y="1436"/>
-      <point x="989" y="1380" type="curve" name="dh02" smooth="yes"/>
+      <point x="989" y="1380" type="curve" smooth="yes" name="dh02"/>
       <point x="989" y="1209"/>
       <point x="837" y="1103"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni00B_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni00B_5.glif
index 5bb01b446..318be000a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni00B_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni00B_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni00B5" format="1">
+<glyph name="uni00B5" format="2">
   <advance width="1233"/>
   <unicode hex="00B5"/>
   <outline>
@@ -18,7 +18,7 @@
       <point x="425" y="248" type="curve" smooth="yes"/>
       <point x="448" y="225"/>
       <point x="478" y="213"/>
-      <point x="521" y="213" type="curve" name="sv01" smooth="yes"/>
+      <point x="521" y="213" type="curve" smooth="yes" name="sv01"/>
       <point x="575" y="213"/>
       <point x="619" y="232"/>
       <point x="653" y="269" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="987" y="264" type="curve" smooth="yes"/>
       <point x="987" y="233"/>
       <point x="1003" y="213"/>
-      <point x="1028" y="213" type="curve" name="dv02" smooth="yes"/>
+      <point x="1028" y="213" type="curve" smooth="yes" name="dv02"/>
       <point x="1036" y="213"/>
       <point x="1045" y="215"/>
       <point x="1055" y="219" type="curve" smooth="yes"/>
@@ -46,7 +46,7 @@
       <point x="1047" y="16" type="line"/>
       <point x="980" y="-17"/>
       <point x="938" y="-29"/>
-      <point x="883" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="883" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="832" y="-29"/>
       <point x="799" y="-15"/>
       <point x="775" y="9" type="curve" smooth="yes"/>
@@ -58,7 +58,7 @@
       <point x="611" y="11" type="curve" smooth="yes"/>
       <point x="572" y="-14"/>
       <point x="531" y="-29"/>
-      <point x="479" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="479" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="440" y="-29"/>
       <point x="408" y="-21"/>
       <point x="383" y="-5" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni00B_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni00B_9.glif
index 8bc84094d..91e82402d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni00B_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni00B_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni00B9" format="1">
+<glyph name="uni00B9" format="2">
   <advance width="1233"/>
   <unicode hex="00B9"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0122.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0122.glif
index 4eac3fdc5..b8a55d240 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0122.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0122.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0122" format="1">
+<glyph name="uni0122" format="2">
   <advance width="1233"/>
   <unicode hex="0122"/>
   <outline>
     <contour>
-      <point x="610" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="610" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="287" y="-29"/>
       <point x="102" y="168"/>
-      <point x="102" y="533" type="curve" name="dh01" smooth="yes"/>
+      <point x="102" y="533" type="curve" smooth="yes" name="dh01"/>
       <point x="102" y="805"/>
       <point x="204" y="1110"/>
       <point x="367" y="1294" type="curve" smooth="yes"/>
       <point x="499" y="1443"/>
       <point x="674" y="1520"/>
-      <point x="875" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="875" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="987" y="1520"/>
       <point x="1088" y="1496"/>
       <point x="1192" y="1448" type="curve"/>
       <point x="1126" y="1120" type="line" name="iv01"/>
       <point x="1058" y="1209"/>
       <point x="964" y="1257"/>
-      <point x="857" y="1257" type="curve" name="sv01" smooth="yes"/>
+      <point x="857" y="1257" type="curve" smooth="yes" name="sv01"/>
       <point x="764" y="1257"/>
       <point x="676" y="1221"/>
       <point x="604" y="1141" type="curve" smooth="yes"/>
@@ -29,10 +29,10 @@
       <point x="469" y="891" type="curve" smooth="yes"/>
       <point x="429" y="777"/>
       <point x="403" y="638"/>
-      <point x="403" y="533" type="curve" name="dh02" smooth="yes"/>
+      <point x="403" y="533" type="curve" smooth="yes" name="dh02"/>
       <point x="403" y="338"/>
       <point x="492" y="231"/>
-      <point x="645" y="231" type="curve" name="dv01" smooth="yes"/>
+      <point x="645" y="231" type="curve" smooth="yes" name="dv01"/>
       <point x="695" y="231"/>
       <point x="737" y="242"/>
       <point x="770" y="264" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0123.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0123.glif
index 8bfbf3fc4..b1ec31025 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0123.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0123.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0123" format="1">
+<glyph name="uni0123" format="2">
   <advance width="1233"/>
   <unicode hex="0123"/>
   <outline>
@@ -10,30 +10,30 @@
       <point x="525" y="1273" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="389" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="389" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="252" y="-424"/>
       <point x="135" y="-404"/>
       <point x="18" y="-365" type="curve"/>
       <point x="72" y="-100" type="line" name="ih02"/>
       <point x="172" y="-160"/>
       <point x="284" y="-190"/>
-      <point x="395" y="-190" type="curve" name="hr01" smooth="yes"/>
+      <point x="395" y="-190" type="curve" smooth="yes" name="hr01"/>
       <point x="571" y="-190"/>
       <point x="656" y="-113"/>
       <point x="688" y="51" type="curve"/>
       <point x="715" y="184" type="line" name="ih03"/>
       <point x="640" y="69"/>
       <point x="536" y="16"/>
-      <point x="409" y="16" type="curve" name="hr02" smooth="yes"/>
+      <point x="409" y="16" type="curve" smooth="yes" name="hr02"/>
       <point x="201" y="16"/>
       <point x="68" y="161"/>
-      <point x="68" y="412" type="curve" name="dh01" smooth="yes"/>
+      <point x="68" y="412" type="curve" smooth="yes" name="dh01"/>
       <point x="68" y="584"/>
       <point x="132" y="796"/>
       <point x="225" y="932" type="curve" smooth="yes"/>
       <point x="321" y="1071"/>
       <point x="459" y="1151"/>
-      <point x="603" y="1151" type="curve" name="dv05" smooth="yes"/>
+      <point x="603" y="1151" type="curve" smooth="yes" name="dv05"/>
       <point x="742" y="1151"/>
       <point x="834" y="1075"/>
       <point x="862" y="938" type="curve" name="iv01"/>
@@ -44,16 +44,16 @@
       <point x="749" y="-424"/>
     </contour>
     <contour>
-      <point x="516" y="246" type="curve" name="dv03" smooth="yes"/>
+      <point x="516" y="246" type="curve" smooth="yes" name="dv03"/>
       <point x="675" y="246"/>
       <point x="803" y="457"/>
-      <point x="803" y="684" type="curve" name="sh01" smooth="yes"/>
+      <point x="803" y="684" type="curve" smooth="yes" name="sh01"/>
       <point x="803" y="837"/>
       <point x="745" y="909"/>
-      <point x="653" y="909" type="curve" name="dv04" smooth="yes"/>
+      <point x="653" y="909" type="curve" smooth="yes" name="dv04"/>
       <point x="496" y="909"/>
       <point x="367" y="702"/>
-      <point x="367" y="471" type="curve" name="dh02" smooth="yes"/>
+      <point x="367" y="471" type="curve" smooth="yes" name="dh02"/>
       <point x="367" y="318"/>
       <point x="423" y="246"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0136.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0136.glif
index fb4d4bfe0..18499716c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0136.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0136.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0136" format="1">
+<glyph name="uni0136" format="2">
   <advance width="1233"/>
   <unicode hex="0136"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0137.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0137.glif
index c812891c0..f81f05047 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0137.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0137.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0137" format="1">
+<glyph name="uni0137" format="2">
   <advance width="1233"/>
   <unicode hex="0137"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni013B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni013B_.glif
index dbaf29cc8..fb831ce3a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni013B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni013B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni013B" format="1">
+<glyph name="uni013B" format="2">
   <advance width="1233"/>
   <unicode hex="013B"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni013C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni013C_.glif
index fc7f6ec9d..93654ef5d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni013C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni013C_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni013C" format="1">
+<glyph name="uni013C" format="2">
   <advance width="1233"/>
   <unicode hex="013C"/>
   <outline>
     <contour>
-      <point x="690" y="-10" type="line" name="hr00" smooth="yes"/>
+      <point x="690" y="-10" type="line" smooth="yes" name="hr00"/>
       <point x="423" y="-10"/>
       <point x="315" y="59"/>
-      <point x="315" y="223" type="curve" name="dh01" smooth="yes"/>
+      <point x="315" y="223" type="curve" smooth="yes" name="dh01"/>
       <point x="315" y="262"/>
       <point x="321" y="306"/>
       <point x="334" y="369" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="623" y="355" type="line" smooth="yes"/>
       <point x="617" y="325"/>
       <point x="614" y="303"/>
-      <point x="614" y="289" type="curve" name="dh02" smooth="yes"/>
+      <point x="614" y="289" type="curve" smooth="yes" name="dh02"/>
       <point x="614" y="233"/>
       <point x="663" y="215"/>
-      <point x="754" y="215" type="curve" name="sv02" smooth="yes"/>
+      <point x="754" y="215" type="curve" smooth="yes" name="sv02"/>
       <point x="1032" y="215" type="line"/>
       <point x="987" y="-10" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0145.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0145.glif
index 75108c5b7..c276dfeb3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0145.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0145.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0145" format="1">
+<glyph name="uni0145" format="2">
   <advance width="1233"/>
   <unicode hex="0145"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0146.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0146.glif
index ff90a9594..4b3c76229 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0146.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0146.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0146" format="1">
+<glyph name="uni0146" format="2">
   <advance width="1233"/>
   <unicode hex="0146"/>
   <outline>
@@ -9,10 +9,10 @@
       <point x="537" y="952" type="line" name="dh01"/>
       <point x="601" y="1073"/>
       <point x="713" y="1147"/>
-      <point x="858" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="858" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1023" y="1147"/>
       <point x="1120" y="1051"/>
-      <point x="1120" y="882" type="curve" name="sh01" smooth="yes"/>
+      <point x="1120" y="882" type="curve" smooth="yes" name="sh01"/>
       <point x="1120" y="839"/>
       <point x="1114" y="792"/>
       <point x="1102" y="728" type="curve" smooth="yes"/>
@@ -21,10 +21,10 @@
       <point x="801" y="682" type="line" smooth="yes"/>
       <point x="808" y="717"/>
       <point x="811" y="756"/>
-      <point x="811" y="780" type="curve" name="dh02" smooth="yes"/>
+      <point x="811" y="780" type="curve" smooth="yes" name="dh02"/>
       <point x="811" y="868"/>
       <point x="772" y="907"/>
-      <point x="700" y="907" type="curve" name="sv01" smooth="yes"/>
+      <point x="700" y="907" type="curve" smooth="yes" name="sv01"/>
       <point x="587" y="907"/>
       <point x="508" y="809"/>
       <point x="473" y="629" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0156.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0156.glif
index 052b82373..22ccad461 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0156.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0156.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0156" format="1">
+<glyph name="uni0156" format="2">
   <advance width="1233"/>
   <unicode hex="0156"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="704" y="1493" type="line" smooth="yes"/>
       <point x="1016" y="1493"/>
       <point x="1160" y="1378"/>
-      <point x="1160" y="1131" type="curve" name="dh02" smooth="yes"/>
+      <point x="1160" y="1131" type="curve" smooth="yes" name="dh02"/>
       <point x="1160" y="891"/>
       <point x="1023" y="732"/>
       <point x="783" y="705" type="curve" name="iv01"/>
@@ -21,19 +21,19 @@
       <point x="688" y="403" type="line" smooth="yes"/>
       <point x="649" y="531"/>
       <point x="605" y="590"/>
-      <point x="530" y="590" type="curve" name="dv03" smooth="yes"/>
+      <point x="530" y="590" type="curve" smooth="yes" name="dv03"/>
       <point x="413" y="590" type="line"/>
       <point x="298" y="0" type="line" name="ab01"/>
       <point x="3" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="585" y="838" type="line" name="dv04" smooth="yes"/>
+      <point x="585" y="838" type="line" smooth="yes" name="dv04"/>
       <point x="766" y="838"/>
       <point x="859" y="929"/>
-      <point x="859" y="1080" type="curve" name="dh01" smooth="yes"/>
+      <point x="859" y="1080" type="curve" smooth="yes" name="dh01"/>
       <point x="859" y="1195"/>
       <point x="804" y="1245"/>
-      <point x="675" y="1245" type="curve" name="sv01" smooth="yes"/>
+      <point x="675" y="1245" type="curve" smooth="yes" name="sv01"/>
       <point x="542" y="1245" type="line"/>
       <point x="462" y="838" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0157.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0157.glif
index a2b0a4330..77f6fbaaf 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0157.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0157.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0157" format="1">
+<glyph name="uni0157" format="2">
   <advance width="1233"/>
   <unicode hex="0157"/>
   <outline>
@@ -9,14 +9,14 @@
       <point x="631" y="946" type="line" name="iv01"/>
       <point x="716" y="1078"/>
       <point x="854" y="1147"/>
-      <point x="1009" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="1009" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1093" y="1147"/>
       <point x="1167" y="1126"/>
       <point x="1227" y="1090" type="curve"/>
       <point x="1174" y="815" type="line" name="iv02"/>
       <point x="1107" y="874"/>
       <point x="1033" y="899"/>
-      <point x="929" y="899" type="curve" name="sv01" smooth="yes"/>
+      <point x="929" y="899" type="curve" smooth="yes" name="sv01"/>
       <point x="713" y="899"/>
       <point x="602" y="790"/>
       <point x="549" y="516" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0162.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0162.glif
index e6bebd5c0..0da1dc621 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0162.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0162.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0162" format="1">
+<glyph name="uni0162" format="2">
   <advance width="1233"/>
   <unicode hex="0162"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0163.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0163.glif
index ad65d1c20..17229d938 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0163.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0163.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0163" format="1">
+<glyph name="uni0163" format="2">
   <advance width="1233"/>
   <unicode hex="0163"/>
   <outline>
@@ -40,7 +40,7 @@
       <point x="332" y="242"/>
       <point x="334" y="262"/>
       <point x="337" y="290" type="curve" smooth="yes"/>
-      <point x="342" y="326" type="line" name="hr01" smooth="yes"/>
+      <point x="342" y="326" type="line" smooth="yes" name="hr01"/>
       <point x="343" y="333"/>
       <point x="345" y="349"/>
       <point x="350" y="374" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni01A_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni01A_4.glif
index 264e17ef7..5a1d72b4f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni01A_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni01A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni01A4" format="1">
+<glyph name="uni01A4" format="2">
   <advance width="1233"/>
   <unicode hex="01A4"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0218.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0218.glif
index 9d0db3bf3..ae93be66a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0218.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0218.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0218" format="1">
+<glyph name="uni0218" format="2">
   <advance width="1233"/>
   <unicode hex="0218"/>
   <outline>
     <contour>
-      <point x="469" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="469" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="318" y="-29"/>
       <point x="169" y="5"/>
       <point x="4" y="76" type="curve"/>
       <point x="63" y="381" type="line" name="iv01"/>
       <point x="192" y="273"/>
       <point x="335" y="215"/>
-      <point x="480" y="215" type="curve" name="sh03" smooth="yes"/>
+      <point x="480" y="215" type="curve" smooth="yes" name="sh03"/>
       <point x="655" y="215"/>
       <point x="764" y="300"/>
-      <point x="764" y="430" type="curve" name="ah01" smooth="yes"/>
+      <point x="764" y="430" type="curve" smooth="yes" name="ah01"/>
       <point x="764" y="517"/>
       <point x="717" y="575"/>
       <point x="625" y="614" type="curve" smooth="yes"/>
       <point x="506" y="664" type="line" smooth="yes"/>
       <point x="255" y="768"/>
       <point x="190" y="850"/>
-      <point x="190" y="1012" type="curve" name="sh01" smooth="yes"/>
+      <point x="190" y="1012" type="curve" smooth="yes" name="sh01"/>
       <point x="190" y="1320"/>
       <point x="427" y="1520"/>
-      <point x="775" y="1520" type="curve" name="sh04" smooth="yes"/>
+      <point x="775" y="1520" type="curve" smooth="yes" name="sh04"/>
       <point x="904" y="1520"/>
       <point x="1038" y="1494"/>
       <point x="1159" y="1438" type="curve"/>
       <point x="1102" y="1153" type="line" name="iv02"/>
       <point x="1011" y="1236"/>
       <point x="879" y="1278"/>
-      <point x="753" y="1278" type="curve" name="sh05" smooth="yes"/>
+      <point x="753" y="1278" type="curve" smooth="yes" name="sh05"/>
       <point x="544" y="1278"/>
       <point x="475" y="1162"/>
-      <point x="475" y="1088" type="curve" name="sh02" smooth="yes"/>
+      <point x="475" y="1088" type="curve" smooth="yes" name="sh02"/>
       <point x="475" y="1023"/>
       <point x="527" y="967"/>
       <point x="659" y="910" type="curve" smooth="yes"/>
@@ -42,7 +42,7 @@
       <point x="782" y="856" type="line" smooth="yes"/>
       <point x="977" y="771"/>
       <point x="1063" y="653"/>
-      <point x="1063" y="470" type="curve" name="sh06" smooth="yes"/>
+      <point x="1063" y="470" type="curve" smooth="yes" name="sh06"/>
       <point x="1063" y="171"/>
       <point x="832" y="-29"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0219.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0219.glif
index 350f96baa..fa723c72c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0219.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0219.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0219" format="1">
+<glyph name="uni0219" format="2">
   <advance width="1233"/>
   <unicode hex="0219"/>
   <outline>
     <contour>
-      <point x="495" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="495" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="362" y="-29"/>
       <point x="223" y="-6"/>
       <point x="90" y="41" type="curve"/>
       <point x="141" y="297" type="line" name="iv01"/>
       <point x="257" y="221"/>
       <point x="383" y="182"/>
-      <point x="512" y="182" type="curve" name="sh03" smooth="yes"/>
+      <point x="512" y="182" type="curve" smooth="yes" name="sh03"/>
       <point x="657" y="182"/>
       <point x="743" y="231"/>
-      <point x="743" y="330" type="curve" name="ah01" smooth="yes"/>
+      <point x="743" y="330" type="curve" smooth="yes" name="ah01"/>
       <point x="743" y="354"/>
       <point x="738" y="374"/>
       <point x="711" y="395" type="curve" smooth="yes"/>
@@ -24,20 +24,20 @@
       <point x="461" y="485" type="line" smooth="yes"/>
       <point x="304" y="528"/>
       <point x="225" y="623"/>
-      <point x="225" y="769" type="curve" name="sh01" smooth="yes"/>
+      <point x="225" y="769" type="curve" smooth="yes" name="sh01"/>
       <point x="225" y="997"/>
       <point x="417" y="1147"/>
-      <point x="729" y="1147" type="curve" name="sh04" smooth="yes"/>
+      <point x="729" y="1147" type="curve" smooth="yes" name="sh04"/>
       <point x="846" y="1147"/>
       <point x="970" y="1126"/>
       <point x="1094" y="1085" type="curve"/>
       <point x="1044" y="831" type="line" name="iv02"/>
       <point x="941" y="904"/>
       <point x="819" y="938"/>
-      <point x="708" y="938" type="curve" name="sv01" smooth="yes"/>
+      <point x="708" y="938" type="curve" smooth="yes" name="sv01"/>
       <point x="573" y="938"/>
       <point x="498" y="889"/>
-      <point x="498" y="810" type="curve" name="sh02" smooth="yes"/>
+      <point x="498" y="810" type="curve" smooth="yes" name="sh02"/>
       <point x="498" y="779"/>
       <point x="510" y="755"/>
       <point x="535" y="737" type="curve" smooth="yes"/>
@@ -47,7 +47,7 @@
       <point x="774" y="651" type="line" smooth="yes"/>
       <point x="939" y="604"/>
       <point x="1020" y="516"/>
-      <point x="1020" y="359" type="curve" name="sh05" smooth="yes"/>
+      <point x="1020" y="359" type="curve" smooth="yes" name="sh05"/>
       <point x="1020" y="116"/>
       <point x="829" y="-29"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni021A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni021A_.glif
index f78b2c222..d88e9feba 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni021A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni021A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni021A" format="1">
+<glyph name="uni021A" format="2">
   <advance width="1233"/>
   <unicode hex="021A"/>
   <outline>
@@ -11,20 +11,20 @@
       <point x="564" y="0" type="line" name="ih01"/>
       <point x="612" y="-64"/>
       <point x="636" y="-123"/>
-      <point x="636" y="-186" type="curve" name="dh02" smooth="yes"/>
+      <point x="636" y="-186" type="curve" smooth="yes" name="dh02"/>
       <point x="636" y="-316"/>
       <point x="528" y="-401"/>
-      <point x="346" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="346" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="286" y="-401"/>
       <point x="215" y="-392"/>
       <point x="151" y="-375" type="curve"/>
       <point x="179" y="-219" type="line"/>
       <point x="237" y="-242"/>
       <point x="291" y="-254"/>
-      <point x="341" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="341" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="429" y="-254"/>
       <point x="480" y="-218"/>
-      <point x="480" y="-151" type="curve" name="dh01" smooth="yes"/>
+      <point x="480" y="-151" type="curve" smooth="yes" name="dh01"/>
       <point x="480" y="-115"/>
       <point x="464" y="-73"/>
       <point x="423" y="0" type="curve" name="ab02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni021B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni021B_.glif
index 31013108d..841ebcbf9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni021B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni021B_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni021B" format="1">
+<glyph name="uni021B" format="2">
   <advance width="1233"/>
   <unicode hex="021B"/>
   <outline>
     <contour>
-      <point x="639" y="360" type="line" name="hr00" smooth="yes"/>
+      <point x="639" y="360" type="line" smooth="yes" name="hr00"/>
       <point x="638" y="353"/>
       <point x="636" y="344"/>
       <point x="633" y="325" type="curve" smooth="yes"/>
@@ -16,26 +16,26 @@
       <point x="661" y="239" type="curve" smooth="yes"/>
       <point x="680" y="226"/>
       <point x="717" y="220"/>
-      <point x="770" y="220" type="curve" name="sv01" smooth="yes"/>
+      <point x="770" y="220" type="curve" smooth="yes" name="sv01"/>
       <point x="995" y="220" type="line" name="sv02"/>
       <point x="952" y="-5" type="line" name="ab01"/>
       <point x="752" y="-5" type="line" name="ih01"/>
       <point x="795" y="-66"/>
       <point x="817" y="-122"/>
-      <point x="817" y="-182" type="curve" name="dh02" smooth="yes"/>
+      <point x="817" y="-182" type="curve" smooth="yes" name="dh02"/>
       <point x="817" y="-312"/>
       <point x="709" y="-397"/>
-      <point x="527" y="-397" type="curve" name="dv01" smooth="yes"/>
+      <point x="527" y="-397" type="curve" smooth="yes" name="dv01"/>
       <point x="467" y="-397"/>
       <point x="396" y="-388"/>
       <point x="332" y="-371" type="curve"/>
       <point x="360" y="-215" type="line"/>
       <point x="418" y="-238"/>
       <point x="472" y="-250"/>
-      <point x="522" y="-250" type="curve" name="dv02" smooth="yes"/>
+      <point x="522" y="-250" type="curve" smooth="yes" name="dv02"/>
       <point x="610" y="-250"/>
       <point x="661" y="-214"/>
-      <point x="661" y="-147" type="curve" name="dh01" smooth="yes"/>
+      <point x="661" y="-147" type="curve" smooth="yes" name="dh01"/>
       <point x="661" y="-112"/>
       <point x="646" y="-72"/>
       <point x="607" y="-1" type="curve" name="ab02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni02B_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni02B_9.glif
index 5ac362c93..efd61478f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni02B_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni02B_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02B9" format="1">
+<glyph name="uni02B9" format="2">
   <advance width="1233"/>
   <unicode hex="02B9"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni02B_B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni02B_B_.glif
index d2cfafbee..792e4b68a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni02B_B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni02B_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02BB" format="1">
+<glyph name="uni02BB" format="2">
   <advance width="1233"/>
   <unicode hex="02BB"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni02B_C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni02B_C_.glif
index 48212d00c..d86940f41 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni02B_C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni02B_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02BC" format="1">
+<glyph name="uni02BC" format="2">
   <advance width="1233"/>
   <unicode hex="02BC"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni02B_D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni02B_D_.glif
index a2a95a4fd..bbcbb83ad 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni02B_D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni02B_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02BD" format="1">
+<glyph name="uni02BD" format="2">
   <advance width="1233"/>
   <unicode hex="02BD"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="704" y="1218" type="line" name="hr00"/>
       <point x="550" y="1219"/>
       <point x="473" y="1281"/>
-      <point x="473" y="1406" type="curve" name="dh01" smooth="yes"/>
+      <point x="473" y="1406" type="curve" smooth="yes" name="dh01"/>
       <point x="473" y="1430"/>
       <point x="476" y="1455"/>
       <point x="481" y="1483" type="curve" smooth="yes"/>
@@ -17,7 +17,7 @@
       <point x="634" y="1483" type="line"/>
       <point x="631" y="1470"/>
       <point x="630" y="1458"/>
-      <point x="630" y="1447" type="curve" name="dh02" smooth="yes"/>
+      <point x="630" y="1447" type="curve" smooth="yes" name="dh02"/>
       <point x="630" y="1390"/>
       <point x="664" y="1361"/>
       <point x="732" y="1361" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni02B_E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni02B_E_.glif
index 0435023b5..1a5cc45f5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni02B_E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni02B_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02BE" format="1">
+<glyph name="uni02BE" format="2">
   <advance width="1233"/>
   <unicode hex="02BE"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="632" y="1140" type="line" name="hr00"/>
       <point x="712" y="1140"/>
       <point x="790" y="1212"/>
-      <point x="790" y="1295" type="curve" name="dh01" smooth="yes"/>
+      <point x="790" y="1295" type="curve" smooth="yes" name="dh01"/>
       <point x="790" y="1355"/>
       <point x="746" y="1402"/>
       <point x="682" y="1402" type="curve"/>
       <point x="712" y="1556" type="line" name="at01"/>
       <point x="850" y="1556"/>
       <point x="947" y="1457"/>
-      <point x="947" y="1326" type="curve" name="dh02" smooth="yes"/>
+      <point x="947" y="1326" type="curve" smooth="yes" name="dh02"/>
       <point x="947" y="1307"/>
       <point x="946" y="1290"/>
       <point x="942" y="1271" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni02B_F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni02B_F_.glif
index 4f43ad0a1..2ee451600 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni02B_F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni02B_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02BF" format="1">
+<glyph name="uni02BF" format="2">
   <advance width="1233"/>
   <unicode hex="02BF"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="585" y="1069" type="curve"/>
       <point x="552" y="1112"/>
       <point x="537" y="1162"/>
-      <point x="537" y="1215" type="curve" name="dh01" smooth="yes"/>
+      <point x="537" y="1215" type="curve" smooth="yes" name="dh01"/>
       <point x="537" y="1307"/>
       <point x="580" y="1402"/>
       <point x="664" y="1473" type="curve" smooth="yes"/>
@@ -20,7 +20,7 @@
       <point x="852" y="1402" type="line"/>
       <point x="772" y="1402"/>
       <point x="693" y="1328"/>
-      <point x="693" y="1246" type="curve" name="dh02" smooth="yes"/>
+      <point x="693" y="1246" type="curve" smooth="yes" name="dh02"/>
       <point x="693" y="1186"/>
       <point x="737" y="1140"/>
       <point x="801" y="1140" type="curve" name="at02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni02C_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni02C_0.glif
index 02007009e..feec027b6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni02C_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni02C_0.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02C0" format="1">
+<glyph name="uni02C0" format="2">
   <advance width="1233"/>
   <unicode hex="02C0"/>
   <outline>
     <contour>
       <point x="437" y="1080" type="line" name="hr00"/>
-      <point x="491" y="1080" type="line" name="dv02" smooth="yes"/>
+      <point x="491" y="1080" type="line" smooth="yes" name="dv02"/>
       <point x="575" y="1080"/>
       <point x="637" y="1101"/>
       <point x="678" y="1144" type="curve" smooth="yes"/>
       <point x="713" y="1180"/>
       <point x="730" y="1220"/>
-      <point x="730" y="1257" type="curve" name="dh01" smooth="yes"/>
+      <point x="730" y="1257" type="curve" smooth="yes" name="dh01"/>
       <point x="730" y="1279"/>
       <point x="724" y="1299"/>
       <point x="712" y="1317" type="curve" smooth="yes"/>
       <point x="682" y="1360"/>
       <point x="633" y="1381"/>
-      <point x="564" y="1381" type="curve" name="dv03" smooth="yes"/>
+      <point x="564" y="1381" type="curve" smooth="yes" name="dv03"/>
       <point x="501" y="1381"/>
       <point x="438" y="1365"/>
       <point x="373" y="1333" type="curve"/>
       <point x="405" y="1500" type="line"/>
       <point x="470" y="1524"/>
       <point x="514" y="1539"/>
-      <point x="655" y="1539" type="curve" name="dv04" smooth="yes"/>
+      <point x="655" y="1539" type="curve" smooth="yes" name="dv04"/>
       <point x="820" y="1539"/>
       <point x="934" y="1416"/>
-      <point x="934" y="1276" type="curve" name="dh02" smooth="yes"/>
+      <point x="934" y="1276" type="curve" smooth="yes" name="dh02"/>
       <point x="934" y="1261"/>
       <point x="932" y="1245"/>
       <point x="929" y="1226" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni02C_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni02C_1.glif
index 8f6eba87e..7208cf32a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni02C_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni02C_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02C1" format="1">
+<glyph name="uni02C1" format="2">
   <advance width="1233"/>
   <unicode hex="02C1"/>
   <outline>
@@ -7,32 +7,32 @@
       <point x="554" y="946" type="line" name="hr00"/>
       <point x="433" y="965"/>
       <point x="345" y="1033"/>
-      <point x="345" y="1161" type="curve" name="dh01" smooth="yes"/>
+      <point x="345" y="1161" type="curve" smooth="yes" name="dh01"/>
       <point x="345" y="1181"/>
       <point x="348" y="1203"/>
       <point x="352" y="1226" type="curve" smooth="yes"/>
       <point x="384" y="1386"/>
       <point x="564" y="1539"/>
-      <point x="748" y="1539" type="curve" name="dv04" smooth="yes"/>
+      <point x="748" y="1539" type="curve" smooth="yes" name="dv04"/>
       <point x="888" y="1539"/>
       <point x="928" y="1524"/>
       <point x="982" y="1500" type="curve"/>
       <point x="950" y="1333" type="line"/>
       <point x="895" y="1365"/>
       <point x="837" y="1381"/>
-      <point x="777" y="1381" type="curve" name="dv03" smooth="yes"/>
+      <point x="777" y="1381" type="curve" smooth="yes" name="dv03"/>
       <point x="708" y="1381"/>
       <point x="651" y="1360"/>
       <point x="604" y="1317" type="curve" smooth="yes"/>
       <point x="569" y="1286"/>
       <point x="553" y="1249"/>
-      <point x="553" y="1210" type="curve" name="dh02" smooth="yes"/>
+      <point x="553" y="1210" type="curve" smooth="yes" name="dh02"/>
       <point x="553" y="1187"/>
       <point x="559" y="1165"/>
       <point x="571" y="1144" type="curve" smooth="yes"/>
       <point x="595" y="1101"/>
       <point x="649" y="1080"/>
-      <point x="732" y="1080" type="curve" name="dv02" smooth="yes"/>
+      <point x="732" y="1080" type="curve" smooth="yes" name="dv02"/>
       <point x="786" y="1080" type="line"/>
       <point x="706" y="668" type="line" name="dv01"/>
       <point x="500" y="668" type="line"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni02C_8.glif b/source/Hack-BoldItalic.ufo/glyphs/uni02C_8.glif
index 9fdc502f5..3c48d1c03 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni02C_8.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni02C_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02C8" format="1">
+<glyph name="uni02C8" format="2">
   <advance width="1233"/>
   <unicode hex="02C8"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni02C_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni02C_9.glif
index e848c27c8..754b317f7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni02C_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni02C_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02C9" format="1">
+<glyph name="uni02C9" format="2">
   <advance width="1233"/>
   <unicode hex="02C9"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni02C_C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni02C_C_.glif
index 8da14a169..c7b769b12 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni02C_C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni02C_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02CC" format="1">
+<glyph name="uni02CC" format="2">
   <advance width="1233"/>
   <unicode hex="02CC"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni02C_D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni02C_D_.glif
index 5de59d636..3fa1cf223 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni02C_D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni02C_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02CD" format="1">
+<glyph name="uni02CD" format="2">
   <advance width="1233"/>
   <unicode hex="02CD"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni02C_E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni02C_E_.glif
index ae4138b0e..ff131b3c3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni02C_E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni02C_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02CE" format="1">
+<glyph name="uni02CE" format="2">
   <advance width="1233"/>
   <unicode hex="02CE"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni02C_F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni02C_F_.glif
index 4d813fb37..9061d81cd 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni02C_F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni02C_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02CF" format="1">
+<glyph name="uni02CF" format="2">
   <advance width="1233"/>
   <unicode hex="02CF"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni02D_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni02D_0.glif
index 19cec70c3..6910a6d0f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni02D_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni02D_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02D0" format="1">
+<glyph name="uni02D0" format="2">
   <advance width="1233"/>
   <unicode hex="02D0"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni02D_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni02D_1.glif
index 3fc3f9244..353523b9c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni02D_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni02D_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02D1" format="1">
+<glyph name="uni02D1" format="2">
   <advance width="1233"/>
   <unicode hex="02D1"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0302.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0302.glif
index a4623eab1..de5a6ca71 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0302.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0302.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0302" format="1">
-  <advance width="0"/>
+<glyph name="uni0302" format="2">
   <unicode hex="0302"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0304.case.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0304.case.glif
index 285efda0d..d9188e457 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0304.case.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0304.case.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0304.case" format="1">
-  <advance width="0"/>
+<glyph name="uni0304.case" format="2">
   <outline>
     <contour>
       <point x="-714" y="1870" type="line" name="hr00"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0304.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0304.glif
index b8e9fc77d..0a0e52584 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0304.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0304.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0304" format="1">
-  <advance width="0"/>
+<glyph name="uni0304" format="2">
   <unicode hex="0304"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0305.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0305.glif
index bf50bdfa6..8b2955304 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0305.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0305.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0305" format="1">
-  <advance width="0"/>
+<glyph name="uni0305" format="2">
   <unicode hex="0305"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0306.case.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0306.case.glif
index 2ad447961..39b852309 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0306.case.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0306.case.glif
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0306.case" format="1">
-  <advance width="0"/>
+<glyph name="uni0306.case" format="2">
   <outline>
     <contour>
-      <point x="-442" y="1635" type="curve" name="dv01" smooth="yes"/>
+      <point x="-442" y="1635" type="curve" smooth="yes" name="dv01"/>
       <point x="-625" y="1635"/>
       <point x="-725" y="1727"/>
       <point x="-725" y="1895" type="curve" smooth="yes"/>
@@ -11,7 +10,7 @@
       <point x="-582" y="1899" type="line" name="hr01"/>
       <point x="-569" y="1819"/>
       <point x="-516" y="1784"/>
-      <point x="-411" y="1784" type="curve" name="hr02" smooth="yes"/>
+      <point x="-411" y="1784" type="curve" smooth="yes" name="hr02"/>
       <point x="-315" y="1784"/>
       <point x="-242" y="1827"/>
       <point x="-211" y="1899" type="curve" name="sv01"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0306.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0306.glif
index 0caaaae1d..bba559723 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0306.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0306.glif
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0306" format="1">
-  <advance width="0"/>
+<glyph name="uni0306" format="2">
   <unicode hex="0306"/>
   <outline>
     <contour>
-      <point x="-492" y="1309" type="curve" name="dv01" smooth="yes"/>
+      <point x="-492" y="1309" type="curve" smooth="yes" name="dv01"/>
       <point x="-689" y="1309"/>
       <point x="-787" y="1397"/>
       <point x="-787" y="1573" type="curve" smooth="yes"/>
       <point x="-787" y="1606" type="line" name="dh01"/>
       <point x="-643" y="1606" type="line" name="hr01"/>
-      <point x="-643" y="1593" type="line" name="dh02" smooth="yes"/>
+      <point x="-643" y="1593" type="line" smooth="yes" name="dh02"/>
       <point x="-643" y="1512"/>
       <point x="-580" y="1460"/>
-      <point x="-479" y="1460" type="curve" name="hr02" smooth="yes"/>
+      <point x="-479" y="1460" type="curve" smooth="yes" name="hr02"/>
       <point x="-371" y="1460"/>
       <point x="-289" y="1514"/>
       <point x="-256" y="1606" type="curve" name="sv01"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0307.case.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0307.case.glif
index 9cfa4319b..011aef34a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0307.case.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0307.case.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0307.case" format="1">
-  <advance width="0"/>
+<glyph name="uni0307.case" format="2">
   <outline>
     <contour>
       <point x="-530" y="1899" type="line" name="hr00"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0307.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0307.glif
index 7e25b3225..ed6fb93fb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0307.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0307.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0307" format="1">
-  <advance width="0"/>
+<glyph name="uni0307" format="2">
   <unicode hex="0307"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0308.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0308.glif
index c2d335242..aeb482f24 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0308.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0308.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0308" format="1">
-  <advance width="0"/>
+<glyph name="uni0308" format="2">
   <unicode hex="0308"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni030A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni030A_.glif
index 1bb22f6c4..f4f52d01a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni030A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni030A_.glif
@@ -1,33 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni030A" format="1">
-  <advance width="0"/>
+<glyph name="uni030A" format="2">
   <unicode hex="030A"/>
   <outline>
     <contour>
-      <point x="-485" y="1249" type="curve" name="hr00" smooth="yes"/>
+      <point x="-485" y="1249" type="curve" smooth="yes" name="hr00"/>
       <point x="-645" y="1249"/>
       <point x="-770" y="1377"/>
-      <point x="-770" y="1534" type="curve" name="sh01" smooth="yes"/>
+      <point x="-770" y="1534" type="curve" smooth="yes" name="sh01"/>
       <point x="-770" y="1691"/>
       <point x="-645" y="1819"/>
-      <point x="-485" y="1819" type="curve" name="dv03" smooth="yes"/>
+      <point x="-485" y="1819" type="curve" smooth="yes" name="dv03"/>
       <point x="-329" y="1819"/>
       <point x="-201" y="1691"/>
-      <point x="-201" y="1534" type="curve" name="sh02" smooth="yes"/>
+      <point x="-201" y="1534" type="curve" smooth="yes" name="sh02"/>
       <point x="-201" y="1377"/>
       <point x="-329" y="1249"/>
     </contour>
     <contour>
-      <point x="-485" y="1403" type="curve" name="dv01" smooth="yes"/>
+      <point x="-485" y="1403" type="curve" smooth="yes" name="dv01"/>
       <point x="-413" y="1403"/>
       <point x="-354" y="1462"/>
-      <point x="-354" y="1534" type="curve" name="ah01" smooth="yes"/>
+      <point x="-354" y="1534" type="curve" smooth="yes" name="ah01"/>
       <point x="-354" y="1606"/>
       <point x="-414" y="1665"/>
-      <point x="-485" y="1665" type="curve" name="dv02" smooth="yes"/>
+      <point x="-485" y="1665" type="curve" smooth="yes" name="dv02"/>
       <point x="-557" y="1665"/>
       <point x="-617" y="1606"/>
-      <point x="-617" y="1534" type="curve" name="sh03" smooth="yes"/>
+      <point x="-617" y="1534" type="curve" smooth="yes" name="sh03"/>
       <point x="-617" y="1461"/>
       <point x="-557" y="1403"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni030B_.case.glif b/source/Hack-BoldItalic.ufo/glyphs/uni030B_.case.glif
index 2e805becd..e4c21d189 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni030B_.case.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni030B_.case.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni030B.case" format="1">
-  <advance width="0"/>
+<glyph name="uni030B.case" format="2">
   <outline>
     <contour>
       <point x="-546" y="1899" type="line" name="hr00"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni030B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni030B_.glif
index c526cd6a1..291e79dcf 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni030B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni030B_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni030B" format="1">
-  <advance width="0"/>
+<glyph name="uni030B" format="2">
   <unicode hex="030B"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni030C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni030C_.glif
index 7d556e7a2..7f6f53787 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni030C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni030C_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni030C" format="1">
-  <advance width="0"/>
+<glyph name="uni030C" format="2">
   <unicode hex="030C"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni030D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni030D_.glif
index 548b072c7..bcd32ca46 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni030D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni030D_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni030D" format="1">
-  <advance width="0"/>
+<glyph name="uni030D" format="2">
   <unicode hex="030D"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni030E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni030E_.glif
index 353fae1eb..acb1961d9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni030E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni030E_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni030E" format="1">
-  <advance width="0"/>
+<glyph name="uni030E" format="2">
   <unicode hex="030E"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni030F_.case.glif b/source/Hack-BoldItalic.ufo/glyphs/uni030F_.case.glif
index deed560ca..05a8c277c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni030F_.case.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni030F_.case.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni030F.case" format="1">
-  <advance width="0"/>
+<glyph name="uni030F.case" format="2">
   <outline>
     <contour>
       <point x="-898" y="1899" type="line" name="hr00"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni030F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni030F_.glif
index 284af5f5c..afa299019 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni030F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni030F_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni030F" format="1">
-  <advance width="0"/>
+<glyph name="uni030F" format="2">
   <unicode hex="030F"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0310.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0310.glif
index 775ccb2ad..3a3582bfb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0310.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0310.glif
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0310" format="1">
-  <advance width="0"/>
+<glyph name="uni0310" format="2">
   <unicode hex="0310"/>
   <outline>
     <contour>
       <point x="-77" y="1822" type="line" name="hr00"/>
       <point x="-116" y="1631"/>
       <point x="-252" y="1525"/>
-      <point x="-456" y="1525" type="curve" name="dv01" smooth="yes"/>
+      <point x="-456" y="1525" type="curve" smooth="yes" name="dv01"/>
       <point x="-653" y="1525"/>
       <point x="-751" y="1613"/>
       <point x="-751" y="1789" type="curve" smooth="yes"/>
       <point x="-751" y="1822" type="line" name="av01"/>
       <point x="-607" y="1822" type="line"/>
-      <point x="-607" y="1809" type="line" name="av02" smooth="yes"/>
+      <point x="-607" y="1809" type="line" smooth="yes" name="av02"/>
       <point x="-607" y="1772"/>
       <point x="-595" y="1742"/>
       <point x="-570" y="1719" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0311.case.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0311.case.glif
index 05513f298..23ec79636 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0311.case.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0311.case.glif
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0311.case" format="1">
-  <advance width="0"/>
+<glyph name="uni0311.case" format="2">
   <outline>
     <contour>
       <point x="-779" y="1635" type="line" name="sv01"/>
       <point x="-726" y="1808"/>
       <point x="-590" y="1899"/>
-      <point x="-393" y="1899" type="curve" name="hr01" smooth="yes"/>
+      <point x="-393" y="1899" type="curve" smooth="yes" name="hr01"/>
       <point x="-196" y="1899"/>
       <point x="-107" y="1810"/>
-      <point x="-107" y="1665" type="curve" name="hr02" smooth="yes"/>
+      <point x="-107" y="1665" type="curve" smooth="yes" name="hr02"/>
       <point x="-107" y="1656"/>
       <point x="-107" y="1646"/>
       <point x="-108" y="1635" type="curve"/>
       <point x="-251" y="1635" type="line" name="dv01"/>
       <point x="-262" y="1716"/>
       <point x="-318" y="1756"/>
-      <point x="-421" y="1756" type="curve" name="sv02" smooth="yes"/>
+      <point x="-421" y="1756" type="curve" smooth="yes" name="sv02"/>
       <point x="-523" y="1756"/>
       <point x="-595" y="1716"/>
       <point x="-638" y="1635" type="curve" name="sv03"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0311.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0311.glif
index c8a4cff98..51799e2bb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0311.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0311.glif
@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0311" format="1">
-  <advance width="0"/>
+<glyph name="uni0311" format="2">
   <unicode hex="0311"/>
   <outline>
     <contour>
       <point x="-843" y="1309" type="line" name="sv01"/>
       <point x="-798" y="1502"/>
       <point x="-659" y="1606"/>
-      <point x="-450" y="1606" type="curve" name="hr01" smooth="yes"/>
+      <point x="-450" y="1606" type="curve" smooth="yes" name="hr01"/>
       <point x="-241" y="1606"/>
       <point x="-166" y="1504"/>
-      <point x="-166" y="1373" type="curve" name="dh02" smooth="yes"/>
+      <point x="-166" y="1373" type="curve" smooth="yes" name="dh02"/>
       <point x="-166" y="1353"/>
       <point x="-168" y="1332"/>
       <point x="-172" y="1309" type="curve" name="hr02"/>
       <point x="-315" y="1309" type="line" name="dv01"/>
       <point x="-314" y="1311"/>
       <point x="-314" y="1314"/>
-      <point x="-314" y="1317" type="curve" name="dh01" smooth="yes"/>
+      <point x="-314" y="1317" type="curve" smooth="yes" name="dh01"/>
       <point x="-314" y="1402"/>
       <point x="-368" y="1453"/>
-      <point x="-480" y="1453" type="curve" name="sv02" smooth="yes"/>
+      <point x="-480" y="1453" type="curve" smooth="yes" name="sv02"/>
       <point x="-592" y="1453"/>
       <point x="-669" y="1401"/>
       <point x="-702" y="1309" type="curve" name="sv03"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0312.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0312.glif
index 566aa2629..4228e5ca0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0312.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0312.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0312" format="1">
-  <advance width="0"/>
+<glyph name="uni0312" format="2">
   <unicode hex="0312"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0313.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0313.glif
index 3d6e3ac6e..0e935f0ed 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0313.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0313.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0313" format="1">
-  <advance width="0"/>
+<glyph name="uni0313" format="2">
   <unicode hex="0313"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0314.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0314.glif
index aead6391f..f1fb6e858 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0314.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0314.glif
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0314" format="1">
-  <advance width="0"/>
+<glyph name="uni0314" format="2">
   <unicode hex="0314"/>
   <outline>
     <contour>
       <point x="-529" y="1218" type="line" name="hr00"/>
       <point x="-683" y="1219"/>
       <point x="-760" y="1281"/>
-      <point x="-760" y="1406" type="curve" name="dh01" smooth="yes"/>
+      <point x="-760" y="1406" type="curve" smooth="yes" name="dh01"/>
       <point x="-760" y="1430"/>
       <point x="-757" y="1455"/>
       <point x="-752" y="1483" type="curve" smooth="yes"/>
@@ -17,7 +16,7 @@
       <point x="-599" y="1483" type="line"/>
       <point x="-602" y="1470"/>
       <point x="-603" y="1458"/>
-      <point x="-603" y="1447" type="curve" name="dh02" smooth="yes"/>
+      <point x="-603" y="1447" type="curve" smooth="yes" name="dh02"/>
       <point x="-603" y="1390"/>
       <point x="-569" y="1361"/>
       <point x="-501" y="1361" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0315.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0315.glif
index 87c58caf2..f0496a0bf 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0315.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0315.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0315" format="1">
-  <advance width="0"/>
+<glyph name="uni0315" format="2">
   <unicode hex="0315"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0316.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0316.glif
index 368c916c2..2c7ccd311 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0316.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0316.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0316" format="1">
-  <advance width="0"/>
+<glyph name="uni0316" format="2">
   <unicode hex="0316"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0317.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0317.glif
index cf4f7c6de..c6113f73e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0317.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0317.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0317" format="1">
-  <advance width="0"/>
+<glyph name="uni0317" format="2">
   <unicode hex="0317"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0318.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0318.glif
index 2e05a2cae..667c689d4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0318.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0318.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0318" format="1">
-  <advance width="0"/>
+<glyph name="uni0318" format="2">
   <unicode hex="0318"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0319.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0319.glif
index 19107dc3c..cfc45745b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0319.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0319.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0319" format="1">
-  <advance width="0"/>
+<glyph name="uni0319" format="2">
   <unicode hex="0319"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni031A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni031A_.glif
index 79f46144f..dbaa1d1dd 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni031A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni031A_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni031A" format="1">
-  <advance width="0"/>
+<glyph name="uni031A" format="2">
   <unicode hex="031A"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni031B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni031B_.glif
index b115892cf..1e960c0c1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni031B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni031B_.glif
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni031B" format="1">
-  <advance width="0"/>
+<glyph name="uni031B" format="2">
   <unicode hex="031B"/>
   <outline>
     <contour>
-      <point x="-636" y="739" type="curve" name="dv01" smooth="yes"/>
+      <point x="-636" y="739" type="curve" smooth="yes" name="dv01"/>
       <point x="-708" y="739"/>
       <point x="-769" y="774"/>
       <point x="-837" y="850" type="curve"/>
       <point x="-810" y="991" type="line" name="iv01"/>
       <point x="-730" y="924"/>
       <point x="-697" y="903"/>
-      <point x="-661" y="903" type="curve" name="dv02" smooth="yes"/>
+      <point x="-661" y="903" type="curve" smooth="yes" name="dv02"/>
       <point x="-609" y="903"/>
       <point x="-564" y="946"/>
       <point x="-552" y="1011" type="curve" smooth="yes"/>
       <point x="-547" y="1038"/>
       <point x="-544" y="1062"/>
-      <point x="-544" y="1089" type="curve" name="hr01" smooth="yes"/>
+      <point x="-544" y="1089" type="curve" smooth="yes" name="hr01"/>
       <point x="-544" y="1112"/>
       <point x="-547" y="1138"/>
       <point x="-552" y="1167" type="curve" name="sv01"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni031C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni031C_.glif
index e54b868fa..36312af87 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni031C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni031C_.glif
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni031C" format="1">
-  <advance width="0"/>
+<glyph name="uni031C" format="2">
   <unicode hex="031C"/>
   <outline>
     <contour>
       <point x="-750" y="-502" type="line" name="hr00"/>
       <point x="-874" y="-502"/>
       <point x="-931" y="-412"/>
-      <point x="-931" y="-328" type="curve" name="dh01" smooth="yes"/>
+      <point x="-931" y="-328" type="curve" smooth="yes" name="dh01"/>
       <point x="-931" y="-169"/>
       <point x="-788" y="-63"/>
       <point x="-664" y="-63" type="curve" name="sv01"/>
       <point x="-690" y="-195" type="line"/>
       <point x="-738" y="-195"/>
       <point x="-797" y="-241"/>
-      <point x="-797" y="-290" type="curve" name="dh02" smooth="yes"/>
+      <point x="-797" y="-290" type="curve" smooth="yes" name="dh02"/>
       <point x="-797" y="-343"/>
       <point x="-773" y="-370"/>
       <point x="-724" y="-370" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni031D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni031D_.glif
index 17d4cdf5f..14fae86a6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni031D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni031D_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni031D" format="1">
-  <advance width="0"/>
+<glyph name="uni031D" format="2">
   <unicode hex="031D"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni031E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni031E_.glif
index f5ddc029c..2322dce8d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni031E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni031E_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni031E" format="1">
-  <advance width="0"/>
+<glyph name="uni031E" format="2">
   <unicode hex="031E"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni031F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni031F_.glif
index 453e13dab..679537710 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni031F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni031F_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni031F" format="1">
-  <advance width="0"/>
+<glyph name="uni031F" format="2">
   <unicode hex="031F"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0320.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0320.glif
index 5054b5e86..441d903c8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0320.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0320.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0320" format="1">
-  <advance width="0"/>
+<glyph name="uni0320" format="2">
   <unicode hex="0320"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0321.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0321.glif
index cea5d359a..8d59ba433 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0321.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0321.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0321" format="1">
-  <advance width="0"/>
+<glyph name="uni0321" format="2">
   <unicode hex="0321"/>
   <outline>
     <contour>
@@ -14,7 +13,7 @@
       <point x="-129" y="43" type="line"/>
       <point x="-193" y="-290"/>
       <point x="-331" y="-424"/>
-      <point x="-611" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="-611" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="-732" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0322.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0322.glif
index 4511d0064..8938d4ed5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0322.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0322.glif
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0322" format="1">
-  <advance width="0"/>
+<glyph name="uni0322" format="2">
   <unicode hex="0322"/>
   <outline>
     <contour>
-      <point x="-733" y="-426" type="line" name="hr00" smooth="yes"/>
+      <point x="-733" y="-426" type="line" smooth="yes" name="hr00"/>
       <point x="-954" y="-426"/>
       <point x="-1053" y="-342"/>
-      <point x="-1053" y="-142" type="curve" name="dh01" smooth="yes"/>
+      <point x="-1053" y="-142" type="curve" smooth="yes" name="dh01"/>
       <point x="-1053" y="-90"/>
       <point x="-1046" y="-30"/>
       <point x="-1033" y="41" type="curve" smooth="yes"/>
@@ -16,10 +15,10 @@
       <point x="-742" y="41" type="line" smooth="yes"/>
       <point x="-750" y="0"/>
       <point x="-754" y="-36"/>
-      <point x="-754" y="-65" type="curve" name="dh02" smooth="yes"/>
+      <point x="-754" y="-65" type="curve" smooth="yes" name="dh02"/>
       <point x="-754" y="-165"/>
       <point x="-708" y="-201"/>
-      <point x="-607" y="-201" type="curve" name="sv01" smooth="yes"/>
+      <point x="-607" y="-201" type="curve" smooth="yes" name="sv01"/>
       <point x="-568" y="-201" type="line"/>
       <point x="-612" y="-426" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0324.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0324.glif
index b2636aa4f..8384bd9f8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0324.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0324.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0324" format="1">
-  <advance width="0"/>
+<glyph name="uni0324" format="2">
   <unicode hex="0324"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0325.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0325.glif
index 642a4375a..d64e2af0c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0325.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0325.glif
@@ -1,33 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0325" format="1">
-  <advance width="0"/>
+<glyph name="uni0325" format="2">
   <unicode hex="0325"/>
   <outline>
     <contour>
-      <point x="-859" y="-502" type="curve" name="hr00" smooth="yes"/>
+      <point x="-859" y="-502" type="curve" smooth="yes" name="hr00"/>
       <point x="-983" y="-502"/>
       <point x="-1040" y="-412"/>
-      <point x="-1040" y="-328" type="curve" name="sh01" smooth="yes"/>
+      <point x="-1040" y="-328" type="curve" smooth="yes" name="sh01"/>
       <point x="-1040" y="-169"/>
       <point x="-897" y="-63"/>
-      <point x="-774" y="-63" type="curve" name="dv02" smooth="yes"/>
+      <point x="-774" y="-63" type="curve" smooth="yes" name="dv02"/>
       <point x="-650" y="-63"/>
       <point x="-592" y="-153"/>
-      <point x="-592" y="-236" type="curve" name="sh02" smooth="yes"/>
+      <point x="-592" y="-236" type="curve" smooth="yes" name="sh02"/>
       <point x="-592" y="-396"/>
       <point x="-736" y="-502"/>
     </contour>
     <contour>
-      <point x="-834" y="-370" type="curve" name="sv01" smooth="yes"/>
+      <point x="-834" y="-370" type="curve" smooth="yes" name="sv01"/>
       <point x="-786" y="-370"/>
       <point x="-727" y="-323"/>
-      <point x="-727" y="-276" type="curve" name="ah01" smooth="yes"/>
+      <point x="-727" y="-276" type="curve" smooth="yes" name="ah01"/>
       <point x="-727" y="-222"/>
       <point x="-751" y="-195"/>
-      <point x="-800" y="-195" type="curve" name="dv01" smooth="yes"/>
+      <point x="-800" y="-195" type="curve" smooth="yes" name="dv01"/>
       <point x="-849" y="-195"/>
       <point x="-906" y="-241"/>
-      <point x="-906" y="-290" type="curve" name="sh03" smooth="yes"/>
+      <point x="-906" y="-290" type="curve" smooth="yes" name="sh03"/>
       <point x="-906" y="-343"/>
       <point x="-882" y="-370"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0326.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0326.glif
index 6f5e0b1b8..ac94d318a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0326.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0326.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0326" format="1">
-  <advance width="0"/>
+<glyph name="uni0326" format="2">
   <unicode hex="0326"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0327.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0327.glif
index 7973e2294..5130cbe9f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0327.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0327.glif
@@ -1,27 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0327" format="1">
-  <advance width="0"/>
+<glyph name="uni0327" format="2">
   <unicode hex="0327"/>
   <outline>
     <contour>
-      <point x="-880" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="-880" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="-949" y="-401"/>
       <point x="-1017" y="-392"/>
       <point x="-1082" y="-375" type="curve"/>
       <point x="-1054" y="-219" type="line"/>
       <point x="-996" y="-242"/>
       <point x="-943" y="-254"/>
-      <point x="-894" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="-894" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="-802" y="-254"/>
       <point x="-753" y="-218"/>
-      <point x="-753" y="-150" type="curve" name="dh01" smooth="yes"/>
+      <point x="-753" y="-150" type="curve" smooth="yes" name="dh01"/>
       <point x="-753" y="-115"/>
       <point x="-769" y="-73"/>
       <point x="-810" y="0" type="curve" name="hr01"/>
       <point x="-669" y="0" type="line"/>
       <point x="-621" y="-64"/>
       <point x="-597" y="-125"/>
-      <point x="-597" y="-184" type="curve" name="dh02" smooth="yes"/>
+      <point x="-597" y="-184" type="curve" smooth="yes" name="dh02"/>
       <point x="-597" y="-316"/>
       <point x="-707" y="-401"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0328.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0328.glif
index de34ff239..9e99c0564 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0328.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0328.glif
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0328" format="1">
-  <advance width="0"/>
+<glyph name="uni0328" format="2">
   <unicode hex="0328"/>
   <outline>
     <contour>
-      <point x="-806" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="-806" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="-938" y="-401"/>
       <point x="-1021" y="-346"/>
-      <point x="-1021" y="-258" type="curve" name="dh01" smooth="yes"/>
+      <point x="-1021" y="-258" type="curve" smooth="yes" name="dh01"/>
       <point x="-1021" y="-178"/>
       <point x="-969" y="-92"/>
       <point x="-865" y="0" type="curve" name="sv01"/>
@@ -17,10 +16,10 @@
       <point x="-823" y="-117" type="curve" smooth="yes"/>
       <point x="-839" y="-142"/>
       <point x="-847" y="-163"/>
-      <point x="-847" y="-180" type="curve" name="dh02" smooth="yes"/>
+      <point x="-847" y="-180" type="curve" smooth="yes" name="dh02"/>
       <point x="-847" y="-224"/>
       <point x="-809" y="-254"/>
-      <point x="-753" y="-254" type="curve" name="hr01" smooth="yes"/>
+      <point x="-753" y="-254" type="curve" smooth="yes" name="hr01"/>
       <point x="-704" y="-254"/>
       <point x="-650" y="-244"/>
       <point x="-591" y="-223" type="curve" name="iv01"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0329.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0329.glif
index feef4aca1..814904137 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0329.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0329.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0329" format="1">
-  <advance width="0"/>
+<glyph name="uni0329" format="2">
   <unicode hex="0329"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni032A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni032A_.glif
index 1e9dccdb8..b5ae1fb45 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni032A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni032A_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni032A" format="1">
-  <advance width="0"/>
+<glyph name="uni032A" format="2">
   <unicode hex="032A"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni032B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni032B_.glif
index 4e1e8491b..1547a7d16 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni032B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni032B_.glif
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni032B" format="1">
-  <advance width="0"/>
+<glyph name="uni032B" format="2">
   <unicode hex="032B"/>
   <outline>
     <contour>
-      <point x="-813" y="-489" type="curve" name="dv01" smooth="yes"/>
+      <point x="-813" y="-489" type="curve" smooth="yes" name="dv01"/>
       <point x="-940" y="-489"/>
       <point x="-1003" y="-420"/>
-      <point x="-1003" y="-283" type="curve" name="dh01" smooth="yes"/>
+      <point x="-1003" y="-283" type="curve" smooth="yes" name="dh01"/>
       <point x="-1003" y="-255"/>
       <point x="-1002" y="-225"/>
       <point x="-995" y="-192" type="curve" name="sh01"/>
       <point x="-852" y="-192" type="line" name="sh02"/>
       <point x="-852" y="-200"/>
       <point x="-853" y="-208"/>
-      <point x="-853" y="-216" type="curve" name="dh02" smooth="yes"/>
+      <point x="-853" y="-216" type="curve" smooth="yes" name="dh02"/>
       <point x="-853" y="-291"/>
       <point x="-830" y="-331"/>
       <point x="-784" y="-336" type="curve" name="dv02"/>
@@ -27,7 +26,7 @@
       <point x="-516" y="-192" type="line" name="sh03"/>
       <point x="-516" y="-200"/>
       <point x="-517" y="-208"/>
-      <point x="-517" y="-216" type="curve" name="hr02" smooth="yes"/>
+      <point x="-517" y="-216" type="curve" smooth="yes" name="hr02"/>
       <point x="-517" y="-291"/>
       <point x="-494" y="-331"/>
       <point x="-448" y="-336" type="curve" name="sv01"/>
@@ -40,10 +39,10 @@
       <point x="-180" y="-192" type="line"/>
       <point x="-211" y="-330"/>
       <point x="-271" y="-421"/>
-      <point x="-360" y="-464" type="curve" name="hr04" smooth="yes"/>
+      <point x="-360" y="-464" type="curve" smooth="yes" name="hr04"/>
       <point x="-394" y="-481"/>
       <point x="-433" y="-489"/>
-      <point x="-477" y="-489" type="curve" name="sv02" smooth="yes"/>
+      <point x="-477" y="-489" type="curve" smooth="yes" name="sv02"/>
       <point x="-548" y="-489"/>
       <point x="-600" y="-466"/>
       <point x="-632" y="-419" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni032C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni032C_.glif
index 2f645c86d..613f121ca 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni032C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni032C_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni032C" format="1">
-  <advance width="0"/>
+<glyph name="uni032C" format="2">
   <unicode hex="032C"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni032D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni032D_.glif
index cee7f5977..bc29e11bc 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni032D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni032D_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni032D" format="1">
-  <advance width="0"/>
+<glyph name="uni032D" format="2">
   <unicode hex="032D"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni032E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni032E_.glif
index b3b0e7378..641b04e4b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni032E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni032E_.glif
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni032E" format="1">
-  <advance width="0"/>
+<glyph name="uni032E" format="2">
   <unicode hex="032E"/>
   <outline>
     <contour>
-      <point x="-840" y="-491" type="curve" name="ab01" smooth="yes"/>
+      <point x="-840" y="-491" type="curve" smooth="yes" name="ab01"/>
       <point x="-1037" y="-491"/>
       <point x="-1135" y="-403"/>
       <point x="-1135" y="-227" type="curve" smooth="yes"/>
       <point x="-1135" y="-194" type="line" name="dh01"/>
       <point x="-991" y="-194" type="line" name="hr01"/>
-      <point x="-991" y="-207" type="line" name="dh02" smooth="yes"/>
+      <point x="-991" y="-207" type="line" smooth="yes" name="dh02"/>
       <point x="-991" y="-288"/>
       <point x="-928" y="-340"/>
-      <point x="-827" y="-340" type="curve" name="hr02" smooth="yes"/>
+      <point x="-827" y="-340" type="curve" smooth="yes" name="hr02"/>
       <point x="-719" y="-340"/>
       <point x="-637" y="-286"/>
       <point x="-604" y="-194" type="curve" name="sv01"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni032F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni032F_.glif
index 5fcfe28a6..281a57c95 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni032F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni032F_.glif
@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni032F" format="1">
-  <advance width="0"/>
+<glyph name="uni032F" format="2">
   <unicode hex="032F"/>
   <outline>
     <contour>
       <point x="-1192" y="-489" type="line" name="sv01"/>
       <point x="-1147" y="-296"/>
       <point x="-1009" y="-192"/>
-      <point x="-798" y="-192" type="curve" name="hr01" smooth="yes"/>
+      <point x="-798" y="-192" type="curve" smooth="yes" name="hr01"/>
       <point x="-590" y="-192"/>
       <point x="-516" y="-294"/>
-      <point x="-516" y="-425" type="curve" name="dh02" smooth="yes"/>
+      <point x="-516" y="-425" type="curve" smooth="yes" name="dh02"/>
       <point x="-516" y="-445"/>
       <point x="-518" y="-466"/>
       <point x="-521" y="-489" type="curve" name="hr02"/>
       <point x="-662" y="-489" type="line" name="dv01"/>
-      <point x="-662" y="-482" type="line" name="dh01" smooth="yes"/>
+      <point x="-662" y="-482" type="line" smooth="yes" name="dh01"/>
       <point x="-662" y="-397"/>
       <point x="-716" y="-345"/>
-      <point x="-828" y="-345" type="curve" name="sv02" smooth="yes"/>
+      <point x="-828" y="-345" type="curve" smooth="yes" name="sv02"/>
       <point x="-940" y="-345"/>
       <point x="-1016" y="-396"/>
       <point x="-1049" y="-489" type="curve" name="sv03"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0330.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0330.glif
index 8868727ce..f31e395bf 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0330.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0330.glif
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0330" format="1">
-  <advance width="0"/>
+<glyph name="uni0330" format="2">
   <unicode hex="0330"/>
   <outline>
     <contour>
-      <point x="-702" y="-487" type="curve" name="av01" smooth="yes"/>
+      <point x="-702" y="-487" type="curve" smooth="yes" name="av01"/>
       <point x="-749" y="-487"/>
       <point x="-789" y="-471"/>
       <point x="-842" y="-430" type="curve" smooth="yes"/>
@@ -14,21 +13,21 @@
       <point x="-896" y="-389" type="curve" smooth="yes"/>
       <point x="-924" y="-367"/>
       <point x="-948" y="-356"/>
-      <point x="-969" y="-356" type="curve" name="dv01" smooth="yes"/>
+      <point x="-969" y="-356" type="curve" smooth="yes" name="dv01"/>
       <point x="-1014" y="-356"/>
       <point x="-1052" y="-405"/>
       <point x="-1065" y="-485" type="curve" name="av02"/>
       <point x="-1204" y="-485" type="line" name="hr01"/>
       <point x="-1180" y="-312"/>
       <point x="-1081" y="-201"/>
-      <point x="-954" y="-201" type="curve" name="dv02" smooth="yes"/>
+      <point x="-954" y="-201" type="curve" smooth="yes" name="dv02"/>
       <point x="-909" y="-201"/>
       <point x="-874" y="-214"/>
       <point x="-813" y="-262" type="curve" smooth="yes"/>
       <point x="-762" y="-301" type="line" smooth="yes"/>
       <point x="-736" y="-322"/>
       <point x="-713" y="-332"/>
-      <point x="-692" y="-332" type="curve" name="sv01" smooth="yes"/>
+      <point x="-692" y="-332" type="curve" smooth="yes" name="sv01"/>
       <point x="-641" y="-332"/>
       <point x="-605" y="-287"/>
       <point x="-592" y="-203" type="curve" name="sv02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0331.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0331.glif
index 736ef3930..f494db064 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0331.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0331.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0331" format="1">
-  <advance width="0"/>
+<glyph name="uni0331" format="2">
   <unicode hex="0331"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0332.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0332.glif
index 0d65945c4..2da59158c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0332.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0332.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0332" format="1">
-  <advance width="0"/>
+<glyph name="uni0332" format="2">
   <unicode hex="0332"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0333.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0333.glif
index a09cb3581..2b496525b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0333.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0333.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0333" format="1">
-  <advance width="0"/>
+<glyph name="uni0333" format="2">
   <unicode hex="0333"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0334.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0334.glif
index d856f146a..dd842ad7c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0334.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0334.glif
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0334" format="1">
-  <advance width="0"/>
+<glyph name="uni0334" format="2">
   <unicode hex="0334"/>
   <outline>
     <contour>
-      <point x="-419" y="463" type="curve" name="dv01" smooth="yes"/>
+      <point x="-419" y="463" type="curve" smooth="yes" name="dv01"/>
       <point x="-479" y="463"/>
       <point x="-543" y="480"/>
       <point x="-612" y="514" type="curve" smooth="yes"/>
@@ -13,14 +12,14 @@
       <point x="-642" y="528" type="curve" smooth="yes"/>
       <point x="-737" y="573"/>
       <point x="-794" y="586"/>
-      <point x="-862" y="586" type="curve" name="sv01" smooth="yes"/>
+      <point x="-862" y="586" type="curve" smooth="yes" name="sv01"/>
       <point x="-966" y="586"/>
       <point x="-1062" y="549"/>
       <point x="-1178" y="465" type="curve" name="iv01"/>
       <point x="-1134" y="694" type="line"/>
       <point x="-1014" y="775"/>
       <point x="-916" y="809"/>
-      <point x="-805" y="809" type="curve" name="hr01" smooth="yes"/>
+      <point x="-805" y="809" type="curve" smooth="yes" name="hr01"/>
       <point x="-734" y="809"/>
       <point x="-680" y="797"/>
       <point x="-588" y="756" type="curve" smooth="yes"/>
@@ -29,7 +28,7 @@
       <point x="-558" y="741" type="curve" smooth="yes"/>
       <point x="-487" y="704"/>
       <point x="-421" y="686"/>
-      <point x="-359" y="686" type="curve" name="dv02" smooth="yes"/>
+      <point x="-359" y="686" type="curve" smooth="yes" name="dv02"/>
       <point x="-266" y="686"/>
       <point x="-170" y="726"/>
       <point x="-54" y="811" type="curve" name="av01"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0335.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0335.glif
index 8ad854b2a..d1240e95d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0335.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0335.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0335" format="1">
-  <advance width="0"/>
+<glyph name="uni0335" format="2">
   <unicode hex="0335"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0336.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0336.glif
index 34b77913b..5d1fe2401 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0336.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0336.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0336" format="1">
-  <advance width="0"/>
+<glyph name="uni0336" format="2">
   <unicode hex="0336"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0337.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0337.glif
index 2c40d9039..47965794b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0337.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0337.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0337" format="1">
-  <advance width="0"/>
+<glyph name="uni0337" format="2">
   <unicode hex="0337"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0338.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0338.glif
index 11aef496a..9bb0367c7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0338.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0338.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0338" format="1">
-  <advance width="0"/>
+<glyph name="uni0338" format="2">
   <unicode hex="0338"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0339.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0339.glif
index 02ff9ec41..e6eb9cbb6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0339.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0339.glif
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0339" format="1">
-  <advance width="0"/>
+<glyph name="uni0339" format="2">
   <unicode hex="0339"/>
   <outline>
     <contour>
       <point x="-944" y="-370" type="line" name="hr00"/>
       <point x="-896" y="-370"/>
       <point x="-837" y="-323"/>
-      <point x="-837" y="-276" type="curve" name="dh01" smooth="yes"/>
+      <point x="-837" y="-276" type="curve" smooth="yes" name="dh01"/>
       <point x="-837" y="-222"/>
       <point x="-861" y="-195"/>
       <point x="-910" y="-195" type="curve"/>
       <point x="-884" y="-63" type="line" name="sv01"/>
       <point x="-760" y="-63"/>
       <point x="-702" y="-153"/>
-      <point x="-702" y="-236" type="curve" name="dh02" smooth="yes"/>
+      <point x="-702" y="-236" type="curve" smooth="yes" name="dh02"/>
       <point x="-702" y="-396"/>
       <point x="-846" y="-502"/>
       <point x="-970" y="-502" type="curve" name="ab01"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni033A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni033A_.glif
index 0e8d9f740..a74bfea53 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni033A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni033A_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni033A" format="1">
-  <advance width="0"/>
+<glyph name="uni033A" format="2">
   <unicode hex="033A"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni033B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni033B_.glif
index f31bc6dba..666c8be66 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni033B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni033B_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni033B" format="1">
-  <advance width="0"/>
+<glyph name="uni033B" format="2">
   <unicode hex="033B"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni033C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni033C_.glif
index b21dde71f..cc4d22364 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni033C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni033C_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni033C" format="1">
-  <advance width="0"/>
+<glyph name="uni033C" format="2">
   <unicode hex="033C"/>
   <outline>
     <contour>
@@ -10,23 +9,23 @@
       <point x="-873" y="-217" type="curve" smooth="yes"/>
       <point x="-839" y="-200"/>
       <point x="-800" y="-192"/>
-      <point x="-756" y="-192" type="curve" name="hr01" smooth="yes"/>
+      <point x="-756" y="-192" type="curve" smooth="yes" name="hr01"/>
       <point x="-685" y="-192"/>
       <point x="-633" y="-215"/>
       <point x="-601" y="-262" type="curve"/>
       <point x="-552" y="-215"/>
       <point x="-491" y="-192"/>
-      <point x="-420" y="-192" type="curve" name="hr02" smooth="yes"/>
+      <point x="-420" y="-192" type="curve" smooth="yes" name="hr02"/>
       <point x="-293" y="-192"/>
       <point x="-230" y="-261"/>
-      <point x="-230" y="-398" type="curve" name="dh02" smooth="yes"/>
+      <point x="-230" y="-398" type="curve" smooth="yes" name="dh02"/>
       <point x="-230" y="-426"/>
       <point x="-231" y="-456"/>
       <point x="-238" y="-489" type="curve" name="sh01"/>
       <point x="-381" y="-489" type="line" name="hr03"/>
       <point x="-381" y="-481"/>
       <point x="-380" y="-473"/>
-      <point x="-380" y="-465" type="curve" name="sh02" smooth="yes"/>
+      <point x="-380" y="-465" type="curve" smooth="yes" name="sh02"/>
       <point x="-380" y="-390"/>
       <point x="-403" y="-350"/>
       <point x="-449" y="-345" type="curve" name="hr04"/>
@@ -39,7 +38,7 @@
       <point x="-717" y="-489" type="line" name="sh03"/>
       <point x="-717" y="-481"/>
       <point x="-716" y="-473"/>
-      <point x="-716" y="-465" type="curve" name="dh01" smooth="yes"/>
+      <point x="-716" y="-465" type="curve" smooth="yes" name="dh01"/>
       <point x="-716" y="-390"/>
       <point x="-739" y="-350"/>
       <point x="-785" y="-345" type="curve" name="sv02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni033D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni033D_.glif
index 6a5f4474b..551089cdb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni033D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni033D_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni033D" format="1">
-  <advance width="0"/>
+<glyph name="uni033D" format="2">
   <unicode hex="033D"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni033E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni033E_.glif
index cc010873e..c8c420905 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni033E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni033E_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni033E" format="1">
-  <advance width="0"/>
+<glyph name="uni033E" format="2">
   <unicode hex="033E"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni033F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni033F_.glif
index a69c9172b..5c99e7a5c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni033F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni033F_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni033F" format="1">
-  <advance width="0"/>
+<glyph name="uni033F" format="2">
   <unicode hex="033F"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0358.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0358.glif
index 1689e6d85..b2de04c31 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0358.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0358.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0358" format="1">
-  <advance width="0"/>
+<glyph name="uni0358" format="2">
   <unicode hex="0358"/>
   <outline>
     <contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0361.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0361.glif
index 3f4b60521..c54cf0fdd 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0361.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0361.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0361" format="1">
-  <advance width="0"/>
+<glyph name="uni0361" format="2">
   <unicode hex="0361"/>
   <outline>
     <contour>
@@ -8,7 +7,7 @@
       <point x="-1490" y="1737"/>
       <point x="-1007" y="1795"/>
       <point x="-587" y="1803" type="curve" name="dv02"/>
-      <point x="-542" y="1803" type="line" name="hr01" smooth="yes"/>
+      <point x="-542" y="1803" type="line" smooth="yes" name="hr01"/>
       <point x="-219" y="1803"/>
       <point x="221" y="1735"/>
       <point x="221" y="1549" type="curve" smooth="yes"/>
@@ -21,7 +20,7 @@
       <point x="-120" y="1613" type="curve" smooth="yes"/>
       <point x="-249" y="1638"/>
       <point x="-415" y="1650"/>
-      <point x="-616" y="1650" type="curve" name="sv02" smooth="yes"/>
+      <point x="-616" y="1650" type="curve" smooth="yes" name="sv02"/>
       <point x="-818" y="1650"/>
       <point x="-989" y="1638"/>
       <point x="-1128" y="1613" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0394.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0394.glif
index 5234dcf5e..2ae30cca0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0394.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0394.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0394" format="1">
+<glyph name="uni0394" format="2">
   <advance width="1233"/>
   <unicode hex="0394"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni03A_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni03A_9.glif
index 8336d7b42..35b951b36 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni03A_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni03A_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni03A9" format="1">
+<glyph name="uni03A9" format="2">
   <advance width="1233"/>
   <unicode hex="03A9"/>
   <outline>
@@ -11,19 +11,19 @@
       <point x="154" y="456" type="curve" smooth="yes"/>
       <point x="118" y="546"/>
       <point x="100" y="654"/>
-      <point x="100" y="781" type="curve" name="dh01" smooth="yes"/>
+      <point x="100" y="781" type="curve" smooth="yes" name="dh01"/>
       <point x="100" y="990"/>
       <point x="150" y="1161"/>
-      <point x="239" y="1278" type="curve" name="hr01" smooth="yes"/>
+      <point x="239" y="1278" type="curve" smooth="yes" name="hr01"/>
       <point x="326" y="1391"/>
       <point x="452" y="1460"/>
-      <point x="615" y="1460" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="1460" type="curve" smooth="yes" name="dv02"/>
       <point x="776" y="1460"/>
       <point x="904" y="1394"/>
       <point x="993" y="1277" type="curve" smooth="yes"/>
       <point x="1084" y="1160"/>
       <point x="1133" y="993"/>
-      <point x="1133" y="782" type="curve" name="dh04" smooth="yes"/>
+      <point x="1133" y="782" type="curve" smooth="yes" name="dh04"/>
       <point x="1133" y="655"/>
       <point x="1115" y="546"/>
       <point x="1079" y="456" type="curve" smooth="yes"/>
@@ -39,19 +39,19 @@
       <point x="792" y="464" type="curve" smooth="yes"/>
       <point x="818" y="542"/>
       <point x="831" y="638"/>
-      <point x="831" y="751" type="curve" name="sh02" smooth="yes"/>
+      <point x="831" y="751" type="curve" smooth="yes" name="sh02"/>
       <point x="831" y="891"/>
       <point x="812" y="1000"/>
       <point x="775" y="1078" type="curve" smooth="yes"/>
       <point x="738" y="1155"/>
       <point x="685" y="1194"/>
-      <point x="616" y="1194" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1194" type="curve" smooth="yes" name="dv01"/>
       <point x="549" y="1194"/>
       <point x="496" y="1155"/>
       <point x="458" y="1078" type="curve" smooth="yes"/>
       <point x="420" y="1000"/>
       <point x="401" y="891"/>
-      <point x="401" y="751" type="curve" name="dh02" smooth="yes"/>
+      <point x="401" y="751" type="curve" smooth="yes" name="dh02"/>
       <point x="401" y="638"/>
       <point x="414" y="542"/>
       <point x="441" y="464" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni03B_C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni03B_C_.glif
index 2906df9e6..8dfb17397 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni03B_C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni03B_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni03BC" format="1">
+<glyph name="uni03BC" format="2">
   <advance width="1233"/>
   <unicode hex="03BC"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="391" y="346" type="curve" smooth="yes"/>
       <point x="391" y="262"/>
       <point x="439" y="213"/>
-      <point x="520" y="213" type="curve" name="sv01" smooth="yes"/>
+      <point x="520" y="213" type="curve" smooth="yes" name="sv01"/>
       <point x="627" y="213"/>
       <point x="696" y="289"/>
       <point x="727" y="440" type="curve"/>
@@ -27,20 +27,20 @@
       <point x="987" y="268" type="curve" smooth="yes"/>
       <point x="987" y="231"/>
       <point x="1001" y="213"/>
-      <point x="1028" y="213" type="curve" name="dv02" smooth="yes"/>
+      <point x="1028" y="213" type="curve" smooth="yes" name="dv02"/>
       <point x="1044" y="213"/>
       <point x="1062" y="221"/>
       <point x="1090" y="238" type="curve" name="iv01"/>
       <point x="1047" y="16" type="line"/>
       <point x="986" y="-15"/>
       <point x="933" y="-29"/>
-      <point x="885" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="885" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="789" y="-29"/>
       <point x="741" y="17"/>
       <point x="725" y="129" type="curve" name="iv02"/>
       <point x="654" y="24"/>
       <point x="572" y="-29"/>
-      <point x="479" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="479" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="402" y="-29"/>
       <point x="350" y="2"/>
       <point x="330" y="66" type="curve" name="iv03"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni03C_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni03C_2.glif
index a5725e9ea..c5a20bd56 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni03C_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni03C_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni03C2" format="1">
+<glyph name="uni03C2" format="2">
   <advance width="1233"/>
   <unicode hex="03C2"/>
   <outline>
@@ -7,41 +7,41 @@
       <point x="600" y="-201" type="line" name="hr00"/>
       <point x="688" y="-201"/>
       <point x="726" y="-159"/>
-      <point x="737" y="-104" type="curve" name="sh01" smooth="yes"/>
+      <point x="737" y="-104" type="curve" smooth="yes" name="sh01"/>
       <point x="738" y="-97"/>
       <point x="739" y="-90"/>
-      <point x="739" y="-82" type="curve" name="ah01" smooth="yes"/>
+      <point x="739" y="-82" type="curve" smooth="yes" name="ah01"/>
       <point x="739" y="-35"/>
       <point x="711" y="-5"/>
       <point x="639" y="0" type="curve" smooth="yes"/>
       <point x="535" y="8"/>
       <point x="147" y="-19"/>
-      <point x="147" y="380" type="curve" name="sh02" smooth="yes"/>
+      <point x="147" y="380" type="curve" smooth="yes" name="sh02"/>
       <point x="147" y="437"/>
       <point x="155" y="503"/>
       <point x="166" y="559" type="curve" smooth="yes"/>
       <point x="238" y="927"/>
       <point x="489" y="1149"/>
-      <point x="834" y="1149" type="curve" name="dv02" smooth="yes"/>
+      <point x="834" y="1149" type="curve" smooth="yes" name="dv02"/>
       <point x="955" y="1149"/>
       <point x="1057" y="1123"/>
       <point x="1157" y="1063" type="curve"/>
       <point x="1105" y="795" type="line"/>
       <point x="1033" y="868"/>
       <point x="937" y="909"/>
-      <point x="828" y="909" type="curve" name="dv01" smooth="yes"/>
+      <point x="828" y="909" type="curve" smooth="yes" name="dv01"/>
       <point x="635" y="909"/>
       <point x="506" y="780"/>
-      <point x="463" y="559" type="curve" name="sh04" smooth="yes"/>
+      <point x="463" y="559" type="curve" smooth="yes" name="sh04"/>
       <point x="455" y="517"/>
       <point x="451" y="480"/>
-      <point x="451" y="447" type="curve" name="sh03" smooth="yes"/>
+      <point x="451" y="447" type="curve" smooth="yes" name="sh03"/>
       <point x="451" y="250"/>
       <point x="590" y="233"/>
       <point x="682" y="225" type="curve" smooth="yes"/>
       <point x="765" y="217"/>
       <point x="944" y="197"/>
-      <point x="944" y="-23" type="curve" name="sh05" smooth="yes"/>
+      <point x="944" y="-23" type="curve" smooth="yes" name="sh05"/>
       <point x="944" y="-46"/>
       <point x="943" y="-73"/>
       <point x="936" y="-104" type="curve" name="sh06"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni03F_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni03F_4.glif
index 73ad3c434..f03241791 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni03F_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni03F_4.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni03F4" format="1">
+<glyph name="uni03F4" format="2">
   <advance width="1233"/>
   <unicode hex="03F4"/>
   <outline>
     <contour>
-      <point x="465" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="465" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="194" y="-29"/>
       <point x="59" y="130"/>
-      <point x="59" y="445" type="curve" name="sh01" smooth="yes"/>
+      <point x="59" y="445" type="curve" smooth="yes" name="sh01"/>
       <point x="59" y="533"/>
       <point x="70" y="633"/>
       <point x="92" y="745" type="curve" smooth="yes"/>
       <point x="191" y="1256"/>
       <point x="422" y="1520"/>
-      <point x="767" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="767" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1039" y="1520"/>
       <point x="1174" y="1362"/>
-      <point x="1174" y="1047" type="curve" name="sh02" smooth="yes"/>
+      <point x="1174" y="1047" type="curve" smooth="yes" name="sh02"/>
       <point x="1174" y="958"/>
       <point x="1163" y="858"/>
       <point x="1141" y="745" type="curve" smooth="yes"/>
@@ -27,23 +27,23 @@
       <point x="860" y="911" type="line" name="sh03"/>
       <point x="864" y="955"/>
       <point x="867" y="995"/>
-      <point x="867" y="1034" type="curve" name="ah01" smooth="yes"/>
+      <point x="867" y="1034" type="curve" smooth="yes" name="ah01"/>
       <point x="867" y="1166"/>
       <point x="833" y="1255"/>
-      <point x="715" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="715" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="564" y="1255"/>
       <point x="496" y="1112"/>
       <point x="437" y="911" type="curve"/>
     </contour>
     <contour>
-      <point x="517" y="236" type="curve" name="dv01" smooth="yes"/>
+      <point x="517" y="236" type="curve" smooth="yes" name="dv01"/>
       <point x="668" y="236"/>
       <point x="750" y="382"/>
       <point x="814" y="651" type="curve" name="dv02"/>
       <point x="383" y="651" type="line"/>
       <point x="372" y="576"/>
       <point x="366" y="513"/>
-      <point x="366" y="457" type="curve" name="sh04" smooth="yes"/>
+      <point x="366" y="457" type="curve" smooth="yes" name="sh04"/>
       <point x="366" y="312"/>
       <point x="408" y="236"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0400.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0400.glif
index 90575b1d6..fe25029b7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0400.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0400.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0400" format="1">
+<glyph name="uni0400" format="2">
   <advance width="1233"/>
   <unicode hex="0400"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0401.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0401.glif
index adee7e913..e043115d7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0401.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0401.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0401" format="1">
+<glyph name="uni0401" format="2">
   <advance width="1233"/>
   <unicode hex="0401"/>
   <outline>
     <contour>
-      <point x="504" y="1608" type="line" name="hr00" smooth="yes"/>
+      <point x="504" y="1608" type="line" smooth="yes" name="hr00"/>
       <point x="483" y="1608"/>
       <point x="474" y="1621"/>
       <point x="478" y="1641" type="curve" smooth="yes"/>
       <point x="516" y="1827" type="line" smooth="yes"/>
       <point x="520" y="1845"/>
       <point x="531" y="1854"/>
-      <point x="548" y="1854" type="curve" name="dv01" smooth="yes"/>
+      <point x="548" y="1854" type="curve" smooth="yes" name="dv01"/>
       <point x="723" y="1854" type="line" smooth="yes"/>
       <point x="744" y="1854"/>
       <point x="753" y="1841"/>
@@ -22,14 +22,14 @@
       <point x="680" y="1608" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="900" y="1608" type="line" name="sv01" smooth="yes"/>
+      <point x="900" y="1608" type="line" smooth="yes" name="sv01"/>
       <point x="879" y="1608"/>
       <point x="870" y="1621"/>
       <point x="874" y="1641" type="curve" smooth="yes"/>
       <point x="911" y="1827" type="line"/>
       <point x="914" y="1845"/>
       <point x="924" y="1854"/>
-      <point x="943" y="1854" type="curve" name="sv02" smooth="yes"/>
+      <point x="943" y="1854" type="curve" smooth="yes" name="sv02"/>
       <point x="1118" y="1854" type="line" smooth="yes"/>
       <point x="1138" y="1854"/>
       <point x="1149" y="1841"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0402.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0402.glif
index b862f10e2..c1d78ad2b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0402.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0402.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0402" format="1">
+<glyph name="uni0402" format="2">
   <advance width="1233"/>
   <unicode hex="0402"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="822" y="504" type="line" smooth="yes"/>
       <point x="830" y="544"/>
       <point x="834" y="578"/>
-      <point x="834" y="607" type="curve" name="dh01" smooth="yes"/>
+      <point x="834" y="607" type="curve" smooth="yes" name="dh01"/>
       <point x="834" y="637"/>
       <point x="830" y="660"/>
       <point x="821" y="677" type="curve"/>
@@ -57,14 +57,14 @@
       <point x="1106" y="886" type="curve" smooth="yes"/>
       <point x="1130" y="844"/>
       <point x="1142" y="790"/>
-      <point x="1142" y="724" type="curve" name="dh02" smooth="yes"/>
+      <point x="1142" y="724" type="curve" smooth="yes" name="dh02"/>
       <point x="1142" y="680"/>
       <point x="1137" y="628"/>
       <point x="1126" y="572" type="curve" smooth="yes"/>
       <point x="1023" y="43" type="line"/>
       <point x="959" y="-293"/>
       <point x="820" y="-424"/>
-      <point x="544" y="-424" type="curve" name="ab02" smooth="yes"/>
+      <point x="544" y="-424" type="curve" smooth="yes" name="ab02"/>
       <point x="326" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0403.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0403.glif
index 0bd7c3269..f34638d4d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0403.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0403.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0403" format="1">
+<glyph name="uni0403" format="2">
   <advance width="1233"/>
   <unicode hex="0403"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0404.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0404.glif
index ae38d455a..95def6ef5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0404.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0404.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0404" format="1">
+<glyph name="uni0404" format="2">
   <advance width="1233"/>
   <unicode hex="0404"/>
   <outline>
     <contour>
-      <point x="591" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="591" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="193" y="-29"/>
       <point x="99" y="236"/>
-      <point x="99" y="478" type="curve" name="dh01" smooth="yes"/>
+      <point x="99" y="478" type="curve" smooth="yes" name="dh01"/>
       <point x="99" y="554"/>
       <point x="107" y="650"/>
       <point x="126" y="746" type="curve"/>
       <point x="217" y="1237"/>
       <point x="497" y="1520"/>
-      <point x="897" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="897" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1013" y="1520"/>
       <point x="1112" y="1496"/>
       <point x="1193" y="1448" type="curve"/>
       <point x="1129" y="1120" type="line"/>
       <point x="1048" y="1210"/>
       <point x="957" y="1255"/>
-      <point x="857" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="857" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="654" y="1255"/>
       <point x="528" y="1076"/>
       <point x="466" y="875" type="curve"/>
@@ -29,10 +29,10 @@
       <point x="416" y="615" type="line" name="sh01"/>
       <point x="414" y="595"/>
       <point x="413" y="575"/>
-      <point x="413" y="555" type="curve" name="dh02" smooth="yes"/>
+      <point x="413" y="555" type="curve" smooth="yes" name="dh02"/>
       <point x="413" y="403"/>
       <point x="465" y="236"/>
-      <point x="661" y="236" type="curve" name="dv01" smooth="yes"/>
+      <point x="661" y="236" type="curve" smooth="yes" name="dv01"/>
       <point x="760" y="236"/>
       <point x="868" y="281"/>
       <point x="983" y="371" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0405.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0405.glif
index 406f395c4..4e44cdd34 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0405.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0405.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0405" format="1">
+<glyph name="uni0405" format="2">
   <advance width="1233"/>
   <unicode hex="0405"/>
   <outline>
     <contour>
-      <point x="469" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="469" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="318" y="-29"/>
       <point x="169" y="5"/>
       <point x="4" y="76" type="curve"/>
       <point x="63" y="381" type="line"/>
       <point x="192" y="273"/>
       <point x="335" y="215"/>
-      <point x="480" y="215" type="curve" name="sh03" smooth="yes"/>
+      <point x="480" y="215" type="curve" smooth="yes" name="sh03"/>
       <point x="655" y="215"/>
       <point x="764" y="300"/>
-      <point x="764" y="430" type="curve" name="ah01" smooth="yes"/>
+      <point x="764" y="430" type="curve" smooth="yes" name="ah01"/>
       <point x="764" y="517"/>
       <point x="717" y="575"/>
       <point x="625" y="614" type="curve" smooth="yes"/>
       <point x="506" y="664" type="line" smooth="yes"/>
       <point x="255" y="768"/>
       <point x="190" y="850"/>
-      <point x="190" y="1012" type="curve" name="sh01" smooth="yes"/>
+      <point x="190" y="1012" type="curve" smooth="yes" name="sh01"/>
       <point x="190" y="1320"/>
       <point x="427" y="1520"/>
-      <point x="775" y="1520" type="curve" name="sh04" smooth="yes"/>
+      <point x="775" y="1520" type="curve" smooth="yes" name="sh04"/>
       <point x="904" y="1520"/>
       <point x="1038" y="1494"/>
       <point x="1159" y="1438" type="curve"/>
       <point x="1102" y="1153" type="line"/>
       <point x="1011" y="1236"/>
       <point x="879" y="1278"/>
-      <point x="753" y="1278" type="curve" name="sh05" smooth="yes"/>
+      <point x="753" y="1278" type="curve" smooth="yes" name="sh05"/>
       <point x="544" y="1278"/>
       <point x="475" y="1162"/>
-      <point x="475" y="1088" type="curve" name="sh02" smooth="yes"/>
+      <point x="475" y="1088" type="curve" smooth="yes" name="sh02"/>
       <point x="475" y="1023"/>
       <point x="527" y="967"/>
       <point x="659" y="910" type="curve" smooth="yes"/>
@@ -42,7 +42,7 @@
       <point x="782" y="856" type="line" smooth="yes"/>
       <point x="977" y="771"/>
       <point x="1063" y="653"/>
-      <point x="1063" y="470" type="curve" name="sh06" smooth="yes"/>
+      <point x="1063" y="470" type="curve" smooth="yes" name="sh06"/>
       <point x="1063" y="171"/>
       <point x="832" y="-29"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0406.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0406.glif
index ca5a2f3f5..9d8979b6f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0406.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0406.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0406" format="1">
+<glyph name="uni0406" format="2">
   <advance width="1233"/>
   <unicode hex="0406"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0407.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0407.glif
index c219e0d95..f6d44a522 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0407.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0407.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0407" format="1">
+<glyph name="uni0407" format="2">
   <advance width="1233"/>
   <unicode hex="0407"/>
   <outline>
     <contour>
-      <point x="484" y="1608" type="line" name="hr00" smooth="yes"/>
+      <point x="484" y="1608" type="line" smooth="yes" name="hr00"/>
       <point x="463" y="1608"/>
       <point x="454" y="1621"/>
       <point x="458" y="1641" type="curve" smooth="yes"/>
       <point x="496" y="1827" type="line" smooth="yes"/>
       <point x="500" y="1845"/>
       <point x="511" y="1854"/>
-      <point x="528" y="1854" type="curve" name="dv01" smooth="yes"/>
+      <point x="528" y="1854" type="curve" smooth="yes" name="dv01"/>
       <point x="703" y="1854" type="line" smooth="yes"/>
       <point x="724" y="1854"/>
       <point x="733" y="1841"/>
@@ -22,14 +22,14 @@
       <point x="660" y="1608" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="880" y="1608" type="line" name="sv01" smooth="yes"/>
+      <point x="880" y="1608" type="line" smooth="yes" name="sv01"/>
       <point x="859" y="1608"/>
       <point x="850" y="1621"/>
       <point x="854" y="1641" type="curve" smooth="yes"/>
       <point x="891" y="1827" type="line"/>
       <point x="894" y="1845"/>
       <point x="904" y="1854"/>
-      <point x="923" y="1854" type="curve" name="sv02" smooth="yes"/>
+      <point x="923" y="1854" type="curve" smooth="yes" name="sv02"/>
       <point x="1098" y="1854" type="line" smooth="yes"/>
       <point x="1118" y="1854"/>
       <point x="1129" y="1841"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0408.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0408.glif
index f7dcb1b0f..1514f0fb7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0408.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0408.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0408" format="1">
+<glyph name="uni0408" format="2">
   <advance width="1233"/>
   <unicode hex="0408"/>
   <outline>
     <contour>
-      <point x="427" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="427" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="280" y="-29"/>
       <point x="137" y="7"/>
       <point x="-2" y="78" type="curve"/>
       <point x="63" y="422" type="line"/>
       <point x="172" y="289"/>
       <point x="284" y="231"/>
-      <point x="428" y="231" type="curve" name="dv01" smooth="yes"/>
+      <point x="428" y="231" type="curve" smooth="yes" name="dv01"/>
       <point x="570" y="231"/>
       <point x="640" y="288"/>
       <point x="677" y="479" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0409.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0409.glif
index 6c2fcc2d3..cef68cf29 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0409.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0409.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0409" format="1">
+<glyph name="uni0409" format="2">
   <advance width="1233"/>
   <unicode hex="0409"/>
   <outline>
@@ -18,13 +18,13 @@
       <point x="886" y="913" type="line" smooth="yes"/>
       <point x="1033" y="913"/>
       <point x="1190" y="774"/>
-      <point x="1190" y="526" type="curve" name="dh02" smooth="yes"/>
+      <point x="1190" y="526" type="curve" smooth="yes" name="dh02"/>
       <point x="1190" y="498"/>
       <point x="1187" y="271"/>
       <point x="974" y="110" type="curve"/>
       <point x="886" y="46"/>
       <point x="780" y="0"/>
-      <point x="709" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="709" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="447" y="0" type="line"/>
       <point x="687" y="1233" type="line" name="sv01"/>
       <point x="551" y="1233" type="line"/>
@@ -34,17 +34,17 @@
       <point x="210" y="113" type="curve" smooth="yes"/>
       <point x="131" y="38"/>
       <point x="24" y="0"/>
-      <point x="-112" y="0" type="curve" name="ab02" smooth="yes"/>
+      <point x="-112" y="0" type="curve" smooth="yes" name="ab02"/>
       <point x="-149" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="741" y="236" type="line" name="sv02" smooth="yes"/>
+      <point x="741" y="236" type="line" smooth="yes" name="sv02"/>
       <point x="787" y="236"/>
       <point x="899" y="295"/>
       <point x="929" y="416" type="curve" smooth="yes"/>
       <point x="937" y="451"/>
       <point x="945" y="515"/>
-      <point x="945" y="542" type="curve" name="dh01" smooth="yes"/>
+      <point x="945" y="542" type="curve" smooth="yes" name="dh01"/>
       <point x="945" y="619"/>
       <point x="874" y="678"/>
       <point x="827" y="678" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni040A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni040A_.glif
index 85ebba326..0d1fc8140 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni040A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni040A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni040A" format="1">
+<glyph name="uni040A" format="2">
   <advance width="1233"/>
   <unicode hex="040A"/>
   <outline>
@@ -14,13 +14,13 @@
       <point x="922" y="913" type="line" smooth="yes"/>
       <point x="1069" y="913"/>
       <point x="1226" y="775"/>
-      <point x="1226" y="578" type="curve" name="dh02" smooth="yes"/>
+      <point x="1226" y="578" type="curve" smooth="yes" name="dh02"/>
       <point x="1226" y="546"/>
       <point x="1222" y="501"/>
       <point x="1213" y="456" type="curve" smooth="yes"/>
       <point x="1149" y="138"/>
       <point x="889" y="0"/>
-      <point x="745" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="745" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="483" y="0" type="line"/>
       <point x="612" y="664" type="line" name="dv01"/>
       <point x="290" y="664" type="line"/>
@@ -34,10 +34,10 @@
       <point x="973" y="457" type="curve" smooth="yes"/>
       <point x="978" y="484"/>
       <point x="981" y="520"/>
-      <point x="981" y="539" type="curve" name="dh01" smooth="yes"/>
+      <point x="981" y="539" type="curve" smooth="yes" name="dh01"/>
       <point x="981" y="631"/>
       <point x="901" y="678"/>
-      <point x="863" y="678" type="curve" name="sv02" smooth="yes"/>
+      <point x="863" y="678" type="curve" smooth="yes" name="sv02"/>
       <point x="855" y="678" type="line"/>
       <point x="769" y="236" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni040B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni040B_.glif
index 1f9962c2f..0215590b1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni040B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni040B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni040B" format="1">
+<glyph name="uni040B" format="2">
   <advance width="1233"/>
   <unicode hex="040B"/>
   <outline>
@@ -29,7 +29,7 @@
       <point x="1133" y="886" type="curve" smooth="yes"/>
       <point x="1157" y="844"/>
       <point x="1169" y="790"/>
-      <point x="1169" y="724" type="curve" name="dh02" smooth="yes"/>
+      <point x="1169" y="724" type="curve" smooth="yes" name="dh02"/>
       <point x="1169" y="680"/>
       <point x="1164" y="628"/>
       <point x="1153" y="572" type="curve" smooth="yes"/>
@@ -38,7 +38,7 @@
       <point x="849" y="504" type="line" smooth="yes"/>
       <point x="857" y="544"/>
       <point x="861" y="578"/>
-      <point x="861" y="607" type="curve" name="dh01" smooth="yes"/>
+      <point x="861" y="607" type="curve" smooth="yes" name="dh01"/>
       <point x="861" y="637"/>
       <point x="857" y="660"/>
       <point x="848" y="677" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni040C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni040C_.glif
index c658f4f87..621b47aab 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni040C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni040C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni040C" format="1">
+<glyph name="uni040C" format="2">
   <advance width="1233"/>
   <unicode hex="040C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni040D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni040D_.glif
index 16ceb1c3c..2ddc12c49 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni040D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni040D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni040D" format="1">
+<glyph name="uni040D" format="2">
   <advance width="1233"/>
   <unicode hex="040D"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni040E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni040E_.glif
index b070aeb2e..d4d993183 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni040E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni040E_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni040E" format="1">
+<glyph name="uni040E" format="2">
   <advance width="1233"/>
   <unicode hex="040E"/>
   <outline>
     <contour>
-      <point x="779" y="1590" type="curve" name="dv01" smooth="yes"/>
+      <point x="779" y="1590" type="curve" smooth="yes" name="dv01"/>
       <point x="590" y="1590"/>
       <point x="491" y="1682"/>
       <point x="491" y="1850" type="curve" smooth="yes"/>
@@ -12,7 +12,7 @@
       <point x="634" y="1854" type="line" name="sv01"/>
       <point x="645" y="1782"/>
       <point x="694" y="1739"/>
-      <point x="799" y="1739" type="curve" name="dv02" smooth="yes"/>
+      <point x="799" y="1739" type="curve" smooth="yes" name="dv02"/>
       <point x="903" y="1739"/>
       <point x="972" y="1779"/>
       <point x="1005" y="1854" type="curve" name="sv02"/>
@@ -38,7 +38,7 @@
       <point x="664" y="303" type="line" name="hr02"/>
       <point x="541" y="99"/>
       <point x="419" y="0"/>
-      <point x="263" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="263" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="63" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni040F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni040F_.glif
index ec7391e61..6d190465f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni040F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni040F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni040F" format="1">
+<glyph name="uni040F" format="2">
   <advance width="1233"/>
   <unicode hex="040F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0410.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0410.glif
index 669ea81ce..4894af907 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0410.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0410.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0410" format="1">
+<glyph name="uni0410" format="2">
   <advance width="1233"/>
   <unicode hex="0410"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0411.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0411.glif
index 89c57b063..6322d6835 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0411.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0411.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0411" format="1">
+<glyph name="uni0411" format="2">
   <advance width="1233"/>
   <unicode hex="0411"/>
   <outline>
@@ -9,29 +9,29 @@
       <point x="1178" y="1233" type="line" name="sv01"/>
       <point x="543" y="1233" type="line"/>
       <point x="485" y="934" type="line"/>
-      <point x="595" y="934" type="line" name="dv02" smooth="yes"/>
+      <point x="595" y="934" type="line" smooth="yes" name="dv02"/>
       <point x="939" y="934"/>
       <point x="1099" y="835"/>
-      <point x="1099" y="612" type="curve" name="dh02" smooth="yes"/>
+      <point x="1099" y="612" type="curve" smooth="yes" name="dh02"/>
       <point x="1099" y="572"/>
       <point x="1094" y="518"/>
       <point x="1085" y="467" type="curve" smooth="yes"/>
       <point x="1027" y="140"/>
       <point x="815" y="0"/>
-      <point x="413" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="413" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="8" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="472" y="248" type="line" name="sv02" smooth="yes"/>
+      <point x="472" y="248" type="line" smooth="yes" name="sv02"/>
       <point x="663" y="248"/>
       <point x="745" y="305"/>
       <point x="777" y="467" type="curve" smooth="yes"/>
       <point x="782" y="494"/>
       <point x="785" y="515"/>
-      <point x="785" y="538" type="curve" name="dh01" smooth="yes"/>
+      <point x="785" y="538" type="curve" smooth="yes" name="dh01"/>
       <point x="785" y="646"/>
       <point x="716" y="686"/>
-      <point x="557" y="686" type="curve" name="dv01" smooth="yes"/>
+      <point x="557" y="686" type="curve" smooth="yes" name="dv01"/>
       <point x="436" y="686" type="line"/>
       <point x="351" y="248" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0412.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0412.glif
index f391441fc..122b04895 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0412.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0412.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0412" format="1">
+<glyph name="uni0412" format="2">
   <advance width="1233"/>
   <unicode hex="0412"/>
   <outline>
@@ -8,40 +8,40 @@
       <point x="762" y="1495" type="line" smooth="yes"/>
       <point x="1045" y="1495"/>
       <point x="1188" y="1387"/>
-      <point x="1188" y="1163" type="curve" name="sh03" smooth="yes"/>
+      <point x="1188" y="1163" type="curve" smooth="yes" name="sh03"/>
       <point x="1188" y="951"/>
       <point x="1055" y="813"/>
       <point x="823" y="786" type="curve" name="sh04"/>
       <point x="1003" y="770"/>
       <point x="1116" y="669"/>
-      <point x="1116" y="477" type="curve" name="sh05" smooth="yes"/>
+      <point x="1116" y="477" type="curve" smooth="yes" name="sh05"/>
       <point x="1116" y="345"/>
       <point x="1063" y="211"/>
       <point x="971" y="127" type="curve" smooth="yes"/>
       <point x="875" y="39"/>
       <point x="730" y="0"/>
-      <point x="471" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="471" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="-10" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="649" y="913" type="line" name="hr01" smooth="yes"/>
+      <point x="649" y="913" type="line" smooth="yes" name="hr01"/>
       <point x="810" y="913"/>
       <point x="893" y="990"/>
-      <point x="893" y="1119" type="curve" name="sh02" smooth="yes"/>
+      <point x="893" y="1119" type="curve" smooth="yes" name="sh02"/>
       <point x="893" y="1219"/>
       <point x="844" y="1260"/>
-      <point x="717" y="1260" type="curve" name="sv01" smooth="yes"/>
+      <point x="717" y="1260" type="curve" smooth="yes" name="sv01"/>
       <point x="520" y="1260" type="line"/>
       <point x="452" y="913" type="line"/>
     </contour>
     <contour>
-      <point x="518" y="236" type="line" name="sv02" smooth="yes"/>
+      <point x="518" y="236" type="line" smooth="yes" name="sv02"/>
       <point x="719" y="236"/>
       <point x="821" y="321"/>
-      <point x="821" y="496" type="curve" name="sh01" smooth="yes"/>
+      <point x="821" y="496" type="curve" smooth="yes" name="sh01"/>
       <point x="821" y="612"/>
       <point x="775" y="678"/>
-      <point x="604" y="678" type="curve" name="hr02" smooth="yes"/>
+      <point x="604" y="678" type="curve" smooth="yes" name="hr02"/>
       <point x="407" y="678" type="line"/>
       <point x="321" y="236" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0413.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0413.glif
index 21323dfb4..15819c820 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0413.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0413.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0413" format="1">
+<glyph name="uni0413" format="2">
   <advance width="1233"/>
   <unicode hex="0413"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0414.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0414.glif
index 6f0f2ab6f..7174f605b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0414.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0414.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0414" format="1">
+<glyph name="uni0414" format="2">
   <advance width="1233"/>
   <unicode hex="0414"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0415.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0415.glif
index 4e7d7b573..db7a3fcb2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0415.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0415.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0415" format="1">
+<glyph name="uni0415" format="2">
   <advance width="1233"/>
   <unicode hex="0415"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0416.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0416.glif
index 8d06eaad3..c7da5d8f0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0416.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0416.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0416" format="1">
+<glyph name="uni0416" format="2">
   <advance width="1233"/>
   <unicode hex="0416"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0417.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0417.glif
index c1f846022..eafe3af4c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0417.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0417.glif
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0417" format="1">
+<glyph name="uni0417" format="2">
   <advance width="1233"/>
   <unicode hex="0417"/>
   <outline>
     <contour>
-      <point x="442" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="442" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="305" y="-29"/>
       <point x="153" y="-3"/>
       <point x="-11" y="45" type="curve"/>
       <point x="43" y="315" type="line"/>
       <point x="168" y="255"/>
       <point x="315" y="221"/>
-      <point x="443" y="221" type="curve" name="hr01" smooth="yes"/>
+      <point x="443" y="221" type="curve" smooth="yes" name="hr01"/>
       <point x="659" y="221"/>
       <point x="770" y="321"/>
-      <point x="770" y="469" type="curve" name="dh01" smooth="yes"/>
+      <point x="770" y="469" type="curve" smooth="yes" name="dh01"/>
       <point x="770" y="605"/>
       <point x="678" y="668"/>
-      <point x="534" y="668" type="curve" name="dv02" smooth="yes"/>
+      <point x="534" y="668" type="curve" smooth="yes" name="dv02"/>
       <point x="376" y="668" type="line"/>
       <point x="428" y="928" type="line"/>
-      <point x="585" y="928" type="line" name="dv03" smooth="yes"/>
+      <point x="585" y="928" type="line" smooth="yes" name="dv03"/>
       <point x="750" y="928"/>
       <point x="864" y="1011"/>
-      <point x="864" y="1124" type="curve" name="ih01" smooth="yes"/>
+      <point x="864" y="1124" type="curve" smooth="yes" name="ih01"/>
       <point x="864" y="1217"/>
       <point x="785" y="1270"/>
-      <point x="640" y="1270" type="curve" name="sv01" smooth="yes"/>
+      <point x="640" y="1270" type="curve" smooth="yes" name="sv01"/>
       <point x="532" y="1270"/>
       <point x="399" y="1241"/>
       <point x="251" y="1188" type="curve"/>
       <point x="305" y="1456" type="line"/>
       <point x="445" y="1499"/>
       <point x="576" y="1520"/>
-      <point x="684" y="1520" type="curve" name="hr02" smooth="yes"/>
+      <point x="684" y="1520" type="curve" smooth="yes" name="hr02"/>
       <point x="965" y="1520"/>
       <point x="1140" y="1378"/>
-      <point x="1140" y="1166" type="curve" name="sh01" smooth="yes"/>
+      <point x="1140" y="1166" type="curve" smooth="yes" name="sh01"/>
       <point x="1140" y="979"/>
       <point x="1007" y="845"/>
       <point x="784" y="805" type="curve" name="ih02"/>
       <point x="972" y="754"/>
       <point x="1050" y="642"/>
-      <point x="1050" y="469" type="curve" name="dh02" smooth="yes"/>
+      <point x="1050" y="469" type="curve" smooth="yes" name="dh02"/>
       <point x="1050" y="168"/>
       <point x="817" y="-29"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0418.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0418.glif
index 281a6a28a..afa3ae291 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0418.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0418.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0418" format="1">
+<glyph name="uni0418" format="2">
   <advance width="1233"/>
   <unicode hex="0418"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0419.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0419.glif
index 4ca787349..fa0b97e1e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0419.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0419.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0419" format="1">
+<glyph name="uni0419" format="2">
   <advance width="1233"/>
   <unicode hex="0419"/>
   <outline>
     <contour>
-      <point x="754" y="1590" type="curve" name="dv01" smooth="yes"/>
+      <point x="754" y="1590" type="curve" smooth="yes" name="dv01"/>
       <point x="571" y="1590"/>
       <point x="471" y="1682"/>
       <point x="471" y="1850" type="curve" smooth="yes"/>
@@ -12,7 +12,7 @@
       <point x="614" y="1854" type="line" name="sv01"/>
       <point x="627" y="1774"/>
       <point x="680" y="1739"/>
-      <point x="785" y="1739" type="curve" name="dv02" smooth="yes"/>
+      <point x="785" y="1739" type="curve" smooth="yes" name="dv02"/>
       <point x="881" y="1739"/>
       <point x="954" y="1782"/>
       <point x="985" y="1854" type="curve" name="sv02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni041A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni041A_.glif
index 987db2b69..82347dae5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni041A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni041A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni041A" format="1">
+<glyph name="uni041A" format="2">
   <advance width="1233"/>
   <unicode hex="041A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni041B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni041B_.glif
index 86f3186f0..0ecbce323 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni041B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni041B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni041B" format="1">
+<glyph name="uni041B" format="2">
   <advance width="1233"/>
   <unicode hex="041B"/>
   <outline>
@@ -24,7 +24,7 @@
       <point x="290" y="113" type="curve" smooth="yes"/>
       <point x="211" y="38"/>
       <point x="104" y="0"/>
-      <point x="-32" y="0" type="curve" name="ab02" smooth="yes"/>
+      <point x="-32" y="0" type="curve" smooth="yes" name="ab02"/>
       <point x="-124" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni041C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni041C_.glif
index 47f79f50a..5563e5385 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni041C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni041C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni041C" format="1">
+<glyph name="uni041C" format="2">
   <advance width="1233"/>
   <unicode hex="041C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni041D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni041D_.glif
index 30e02e9f0..690a50035 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni041D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni041D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni041D" format="1">
+<glyph name="uni041D" format="2">
   <advance width="1233"/>
   <unicode hex="041D"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni041E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni041E_.glif
index 5aa8ab784..848846e46 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni041E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni041E_.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni041E" format="1">
+<glyph name="uni041E" format="2">
   <advance width="1233"/>
   <unicode hex="041E"/>
   <outline>
     <contour>
-      <point x="497" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="497" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="214" y="-29"/>
       <point x="61" y="139"/>
-      <point x="61" y="482" type="curve" name="sh01" smooth="yes"/>
+      <point x="61" y="482" type="curve" smooth="yes" name="sh01"/>
       <point x="61" y="728"/>
       <point x="139" y="1045"/>
       <point x="246" y="1229" type="curve"/>
       <point x="355" y="1421"/>
       <point x="515" y="1520"/>
-      <point x="735" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="735" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1016" y="1520"/>
       <point x="1171" y="1354"/>
-      <point x="1171" y="1011" type="curve" name="sh02" smooth="yes"/>
+      <point x="1171" y="1011" type="curve" smooth="yes" name="sh02"/>
       <point x="1171" y="784"/>
       <point x="1103" y="463"/>
       <point x="989" y="264" type="curve" smooth="yes"/>
@@ -24,7 +24,7 @@
       <point x="718" y="-29"/>
     </contour>
     <contour>
-      <point x="528" y="233" type="curve" name="dv01" smooth="yes"/>
+      <point x="528" y="233" type="curve" smooth="yes" name="dv01"/>
       <point x="612" y="233"/>
       <point x="670" y="281"/>
       <point x="719" y="373" type="curve" smooth="yes"/>
@@ -33,10 +33,10 @@
       <point x="810" y="630" type="curve" smooth="yes"/>
       <point x="842" y="763"/>
       <point x="868" y="916"/>
-      <point x="868" y="1024" type="curve" name="ah01" smooth="yes"/>
+      <point x="868" y="1024" type="curve" smooth="yes" name="ah01"/>
       <point x="868" y="1181"/>
       <point x="814" y="1260"/>
-      <point x="705" y="1260" type="curve" name="sv01" smooth="yes"/>
+      <point x="705" y="1260" type="curve" smooth="yes" name="sv01"/>
       <point x="618" y="1260"/>
       <point x="562" y="1211"/>
       <point x="514" y="1119" type="curve" smooth="yes"/>
@@ -45,7 +45,7 @@
       <point x="422" y="861" type="curve" smooth="yes"/>
       <point x="382" y="702"/>
       <point x="365" y="537"/>
-      <point x="365" y="458" type="curve" name="sh03" smooth="yes"/>
+      <point x="365" y="458" type="curve" smooth="yes" name="sh03"/>
       <point x="365" y="315"/>
       <point x="417" y="233"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni041F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni041F_.glif
index a4712a8a5..20817074c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni041F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni041F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni041F" format="1">
+<glyph name="uni041F" format="2">
   <advance width="1233"/>
   <unicode hex="041F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0420.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0420.glif
index 68efde5dd..5cff2b8b6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0420.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0420.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0420" format="1">
+<glyph name="uni0420" format="2">
   <advance width="1233"/>
   <unicode hex="0420"/>
   <outline>
@@ -8,25 +8,25 @@
       <point x="742" y="1493" type="line" smooth="yes"/>
       <point x="1057" y="1493"/>
       <point x="1225" y="1374"/>
-      <point x="1225" y="1123" type="curve" name="dh02" smooth="yes"/>
+      <point x="1225" y="1123" type="curve" smooth="yes" name="dh02"/>
       <point x="1225" y="978"/>
       <point x="1170" y="825"/>
       <point x="1094" y="731" type="curve" smooth="yes"/>
       <point x="990" y="603"/>
       <point x="822" y="559"/>
-      <point x="599" y="559" type="curve" name="dv01" smooth="yes"/>
+      <point x="599" y="559" type="curve" smooth="yes" name="dv01"/>
       <point x="435" y="559" type="line"/>
       <point x="326" y="0" type="line" name="ab01"/>
       <point x="31" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="627" y="807" type="line" name="dv02" smooth="yes"/>
+      <point x="627" y="807" type="line" smooth="yes" name="dv02"/>
       <point x="823" y="807"/>
       <point x="918" y="900"/>
-      <point x="918" y="1069" type="curve" name="dh01" smooth="yes"/>
+      <point x="918" y="1069" type="curve" smooth="yes" name="dh01"/>
       <point x="918" y="1197"/>
       <point x="861" y="1245"/>
-      <point x="689" y="1245" type="curve" name="sv01" smooth="yes"/>
+      <point x="689" y="1245" type="curve" smooth="yes" name="sv01"/>
       <point x="568" y="1245" type="line"/>
       <point x="484" y="807" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0421.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0421.glif
index 2d73c0d22..26aef67d7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0421.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0421.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0421" format="1">
+<glyph name="uni0421" format="2">
   <advance width="1233"/>
   <unicode hex="0421"/>
   <outline>
     <contour>
-      <point x="598" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="598" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="451" y="-29"/>
       <point x="319" y="13"/>
       <point x="231" y="108" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0422.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0422.glif
index 7a1c9fa7c..83b924bcb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0422.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0422.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0422" format="1">
+<glyph name="uni0422" format="2">
   <advance width="1233"/>
   <unicode hex="0422"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0423.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0423.glif
index 76b69b31c..c0c912105 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0423.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0423.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0423" format="1">
+<glyph name="uni0423" format="2">
   <advance width="1233"/>
   <unicode hex="0423"/>
   <outline>
@@ -21,7 +21,7 @@
       <point x="664" y="303" type="line"/>
       <point x="541" y="99"/>
       <point x="419" y="0"/>
-      <point x="263" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="263" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="63" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0424.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0424.glif
index ee3aaed45..734b346c7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0424.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0424.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0424" format="1">
+<glyph name="uni0424" format="2">
   <advance width="1233"/>
   <unicode hex="0424"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="375" y="132" type="line" name="hr00"/>
       <point x="102" y="156"/>
       <point x="22" y="409"/>
-      <point x="22" y="603" type="curve" name="sh01" smooth="yes"/>
+      <point x="22" y="603" type="curve" smooth="yes" name="sh01"/>
       <point x="22" y="652"/>
       <point x="27" y="705"/>
       <point x="38" y="760" type="curve" smooth="yes"/>
@@ -19,7 +19,7 @@
       <point x="874" y="1391" type="line"/>
       <point x="1146" y="1367"/>
       <point x="1227" y="1114"/>
-      <point x="1227" y="918" type="curve" name="sh02" smooth="yes"/>
+      <point x="1227" y="918" type="curve" smooth="yes" name="sh02"/>
       <point x="1227" y="869"/>
       <point x="1222" y="816"/>
       <point x="1211" y="760" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="292" y="760" type="curve" smooth="yes"/>
       <point x="281" y="705"/>
       <point x="280" y="671"/>
-      <point x="277" y="632" type="curve" name="sh03" smooth="yes"/>
+      <point x="277" y="632" type="curve" smooth="yes" name="sh03"/>
       <point x="272" y="536"/>
       <point x="289" y="411"/>
       <point x="424" y="387" type="curve"/>
@@ -48,7 +48,7 @@
       <point x="950" y="726" type="curve"/>
       <point x="961" y="783"/>
       <point x="971" y="855"/>
-      <point x="971" y="893" type="curve" name="ah01" smooth="yes"/>
+      <point x="971" y="893" type="curve" smooth="yes" name="ah01"/>
       <point x="971" y="992"/>
       <point x="970" y="1104"/>
       <point x="825" y="1136" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0425.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0425.glif
index 62f068302..bc44d1cd5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0425.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0425.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0425" format="1">
+<glyph name="uni0425" format="2">
   <advance width="1233"/>
   <unicode hex="0425"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0426.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0426.glif
index c9ab486e5..a65538e49 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0426.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0426.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0426" format="1">
+<glyph name="uni0426" format="2">
   <advance width="1233"/>
   <unicode hex="0426"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0427.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0427.glif
index 74f03f779..62cf2284e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0427.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0427.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0427" format="1">
+<glyph name="uni0427" format="2">
   <advance width="1233"/>
   <unicode hex="0427"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="824" y="766" type="line" name="hr00"/>
       <point x="763" y="663"/>
       <point x="647" y="607"/>
-      <point x="450" y="607" type="curve" name="dv01" smooth="yes"/>
+      <point x="450" y="607" type="curve" smooth="yes" name="dv01"/>
       <point x="222" y="607"/>
       <point x="123" y="683"/>
-      <point x="123" y="878" type="curve" name="dh01" smooth="yes"/>
+      <point x="123" y="878" type="curve" smooth="yes" name="dh01"/>
       <point x="123" y="922"/>
       <point x="128" y="972"/>
       <point x="139" y="1027" type="curve" smooth="yes"/>
@@ -19,10 +19,10 @@
       <point x="444" y="1095" type="line" smooth="yes"/>
       <point x="439" y="1067"/>
       <point x="436" y="1044"/>
-      <point x="436" y="1020" type="curve" name="dh02" smooth="yes"/>
+      <point x="436" y="1020" type="curve" smooth="yes" name="dh02"/>
       <point x="436" y="896"/>
       <point x="515" y="870"/>
-      <point x="611" y="870" type="curve" name="dv02" smooth="yes"/>
+      <point x="611" y="870" type="curve" smooth="yes" name="dv02"/>
       <point x="790" y="870"/>
       <point x="861" y="959"/>
       <point x="896" y="1136" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0428.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0428.glif
index f04b702b6..85da08dc4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0428.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0428.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0428" format="1">
+<glyph name="uni0428" format="2">
   <advance width="1233"/>
   <unicode hex="0428"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0429.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0429.glif
index 739b2de17..4fd81d848 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0429.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0429.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0429" format="1">
+<glyph name="uni0429" format="2">
   <advance width="1233"/>
   <unicode hex="0429"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni042A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni042A_.glif
index bea3a41b4..ecbbca668 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni042A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni042A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni042A" format="1">
+<glyph name="uni042A" format="2">
   <advance width="1233"/>
   <unicode hex="042A"/>
   <outline>
@@ -12,29 +12,29 @@
       <point x="635" y="913" type="line" smooth="yes"/>
       <point x="1045" y="913"/>
       <point x="1140" y="772"/>
-      <point x="1140" y="583" type="curve" name="dh02" smooth="yes"/>
+      <point x="1140" y="583" type="curve" smooth="yes" name="dh02"/>
       <point x="1140" y="539"/>
       <point x="1135" y="498"/>
       <point x="1126" y="451" type="curve" smooth="yes"/>
       <point x="1065" y="142"/>
       <point x="871" y="0"/>
-      <point x="458" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="458" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="133" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="515" y="236" type="line" name="sv01" smooth="yes"/>
+      <point x="515" y="236" type="line" smooth="yes" name="sv01"/>
       <point x="711" y="236"/>
       <point x="797" y="290"/>
       <point x="827" y="451" type="curve"/>
       <point x="834" y="483"/>
       <point x="836" y="512"/>
-      <point x="836" y="535" type="curve" name="dh01" smooth="yes"/>
+      <point x="836" y="535" type="curve" smooth="yes" name="dh01"/>
       <point x="836" y="578"/>
       <point x="824" y="614"/>
       <point x="796" y="638" type="curve" smooth="yes"/>
       <point x="765" y="665"/>
       <point x="710" y="678"/>
-      <point x="601" y="678" type="curve" name="dv01" smooth="yes"/>
+      <point x="601" y="678" type="curve" smooth="yes" name="dv01"/>
       <point x="560" y="678" type="line"/>
       <point x="474" y="236" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni042B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni042B_.glif
index ae133c360..516b4ead8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni042B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni042B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni042B" format="1">
+<glyph name="uni042B" format="2">
   <advance width="1233"/>
   <unicode hex="042B"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="347" y="913" type="line" smooth="yes"/>
       <point x="699" y="913"/>
       <point x="808" y="773"/>
-      <point x="808" y="580" type="curve" name="dh02" smooth="yes"/>
+      <point x="808" y="580" type="curve" smooth="yes" name="dh02"/>
       <point x="808" y="539"/>
       <point x="803" y="498"/>
       <point x="794" y="451" type="curve" smooth="yes"/>
       <point x="734" y="146"/>
       <point x="526" y="0"/>
-      <point x="170" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="170" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="-95" y="0" type="line"/>
     </contour>
     <contour>
@@ -26,19 +26,19 @@
       <point x="803" y="0" type="line" name="sh01"/>
     </contour>
     <contour>
-      <point x="227" y="236" type="line" name="sv01" smooth="yes"/>
+      <point x="227" y="236" type="line" smooth="yes" name="sv01"/>
       <point x="423" y="236"/>
       <point x="509" y="290"/>
       <point x="539" y="451" type="curve"/>
       <point x="546" y="483"/>
       <point x="548" y="512"/>
-      <point x="548" y="535" type="curve" name="dh01" smooth="yes"/>
+      <point x="548" y="535" type="curve" smooth="yes" name="dh01"/>
       <point x="548" y="578"/>
       <point x="536" y="614"/>
       <point x="508" y="638" type="curve" smooth="yes"/>
       <point x="477" y="665"/>
       <point x="422" y="678"/>
-      <point x="313" y="678" type="curve" name="dv01" smooth="yes"/>
+      <point x="313" y="678" type="curve" smooth="yes" name="dv01"/>
       <point x="292" y="678" type="line"/>
       <point x="206" y="236" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni042C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni042C_.glif
index 00c913a66..0fb93b1a7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni042C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni042C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni042C" format="1">
+<glyph name="uni042C" format="2">
   <advance width="1233"/>
   <unicode hex="042C"/>
   <outline>
@@ -7,32 +7,32 @@
       <point x="311" y="1493" type="line" name="hr00"/>
       <point x="606" y="1493" type="line"/>
       <point x="493" y="913" type="line"/>
-      <point x="603" y="913" type="line" name="dv02" smooth="yes"/>
+      <point x="603" y="913" type="line" smooth="yes" name="dv02"/>
       <point x="1013" y="913"/>
       <point x="1108" y="772"/>
-      <point x="1108" y="583" type="curve" name="dh02" smooth="yes"/>
+      <point x="1108" y="583" type="curve" smooth="yes" name="dh02"/>
       <point x="1108" y="539"/>
       <point x="1103" y="498"/>
       <point x="1094" y="451" type="curve" smooth="yes"/>
       <point x="1033" y="142"/>
       <point x="839" y="0"/>
-      <point x="426" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="426" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="21" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="483" y="236" type="line" name="sv01" smooth="yes"/>
+      <point x="483" y="236" type="line" smooth="yes" name="sv01"/>
       <point x="679" y="236"/>
       <point x="765" y="290"/>
       <point x="795" y="451" type="curve"/>
       <point x="802" y="483"/>
       <point x="804" y="512"/>
-      <point x="804" y="535" type="curve" name="dh01" smooth="yes"/>
+      <point x="804" y="535" type="curve" smooth="yes" name="dh01"/>
       <point x="804" y="578"/>
       <point x="792" y="614"/>
       <point x="764" y="638" type="curve" smooth="yes"/>
       <point x="733" y="665"/>
       <point x="678" y="678"/>
-      <point x="569" y="678" type="curve" name="dv01" smooth="yes"/>
+      <point x="569" y="678" type="curve" smooth="yes" name="dv01"/>
       <point x="448" y="678" type="line"/>
       <point x="362" y="236" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni042D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni042D_.glif
index 7fa3c4160..0a15258cd 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni042D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni042D_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni042D" format="1">
+<glyph name="uni042D" format="2">
   <advance width="1233"/>
   <unicode hex="042D"/>
   <outline>
     <contour>
-      <point x="348" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="348" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="231" y="-29"/>
       <point x="135" y="-5"/>
       <point x="50" y="43" type="curve"/>
       <point x="114" y="371" type="line"/>
       <point x="194" y="281"/>
       <point x="287" y="236"/>
-      <point x="392" y="236" type="curve" name="dv01" smooth="yes"/>
+      <point x="392" y="236" type="curve" smooth="yes" name="dv01"/>
       <point x="573" y="236"/>
       <point x="701" y="362"/>
       <point x="777" y="615" type="curve" name="dv02"/>
@@ -20,20 +20,20 @@
       <point x="827" y="875" type="line" name="sh01"/>
       <point x="830" y="903"/>
       <point x="831" y="929"/>
-      <point x="831" y="952" type="curve" name="dh01" smooth="yes"/>
+      <point x="831" y="952" type="curve" smooth="yes" name="dh01"/>
       <point x="831" y="1157"/>
       <point x="749" y="1255"/>
-      <point x="589" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="589" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="481" y="1255"/>
       <point x="376" y="1211"/>
       <point x="260" y="1120" type="curve"/>
       <point x="324" y="1448" type="line"/>
       <point x="423" y="1496"/>
       <point x="532" y="1520"/>
-      <point x="651" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="651" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1050" y="1520"/>
       <point x="1144" y="1256"/>
-      <point x="1144" y="1012" type="curve" name="dh02" smooth="yes"/>
+      <point x="1144" y="1012" type="curve" smooth="yes" name="dh02"/>
       <point x="1144" y="936"/>
       <point x="1136" y="842"/>
       <point x="1117" y="746" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni042E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni042E_.glif
index 51e15e293..4c504fc6a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni042E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni042E_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni042E" format="1">
+<glyph name="uni042E" format="2">
   <advance width="1233"/>
   <unicode hex="042E"/>
   <outline>
     <contour>
-      <point x="674" y="-29" type="curve" name="av01" smooth="yes"/>
+      <point x="674" y="-29" type="curve" smooth="yes" name="av01"/>
       <point x="473" y="-29"/>
       <point x="381" y="173"/>
-      <point x="381" y="449" type="curve" name="sh01" smooth="yes"/>
+      <point x="381" y="449" type="curve" smooth="yes" name="sh01"/>
       <point x="381" y="514"/>
       <point x="386" y="581"/>
       <point x="396" y="651" type="curve"/>
@@ -20,10 +20,10 @@
       <point x="450" y="911" type="line"/>
       <point x="531" y="1194"/>
       <point x="715" y="1520"/>
-      <point x="990" y="1520" type="curve" name="sh02" smooth="yes"/>
+      <point x="990" y="1520" type="curve" smooth="yes" name="sh02"/>
       <point x="1173" y="1520"/>
       <point x="1269" y="1381"/>
-      <point x="1269" y="1122" type="curve" name="sh03" smooth="yes"/>
+      <point x="1269" y="1122" type="curve" smooth="yes" name="sh03"/>
       <point x="1269" y="1017"/>
       <point x="1253" y="881"/>
       <point x="1226" y="745" type="curve"/>
@@ -37,13 +37,13 @@
       <point x="841" y="366" type="curve" smooth="yes"/>
       <point x="922" y="536"/>
       <point x="993" y="865"/>
-      <point x="993" y="1052" type="curve" name="ah01" smooth="yes"/>
+      <point x="993" y="1052" type="curve" smooth="yes" name="ah01"/>
       <point x="993" y="1084"/>
       <point x="992" y="1108"/>
-      <point x="989" y="1125" type="curve" name="hr01" smooth="yes"/>
+      <point x="989" y="1125" type="curve" smooth="yes" name="hr01"/>
       <point x="978" y="1212"/>
       <point x="954" y="1255"/>
-      <point x="922" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="922" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="889" y="1255"/>
       <point x="849" y="1207"/>
       <point x="803" y="1111" type="curve" smooth="yes"/>
@@ -52,10 +52,10 @@
       <point x="690" y="745" type="curve" smooth="yes"/>
       <point x="664" y="614"/>
       <point x="651" y="509"/>
-      <point x="651" y="432" type="curve" name="sh04" smooth="yes"/>
+      <point x="651" y="432" type="curve" smooth="yes" name="sh04"/>
       <point x="651" y="401"/>
       <point x="653" y="379"/>
-      <point x="656" y="358" type="curve" name="sh05" smooth="yes"/>
+      <point x="656" y="358" type="curve" smooth="yes" name="sh05"/>
       <point x="667" y="279"/>
       <point x="691" y="236"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni042F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni042F_.glif
index e6a22652d..d058566d2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni042F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni042F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni042F" format="1">
+<glyph name="uni042F" format="2">
   <advance width="1233"/>
   <unicode hex="042F"/>
   <outline>
@@ -7,13 +7,13 @@
       <point x="339" y="644" type="line" name="hr00"/>
       <point x="244" y="694"/>
       <point x="145" y="816"/>
-      <point x="145" y="958" type="curve" name="dh01" smooth="yes"/>
+      <point x="145" y="958" type="curve" smooth="yes" name="dh01"/>
       <point x="145" y="987"/>
       <point x="149" y="1020"/>
       <point x="156" y="1059" type="curve" smooth="yes"/>
       <point x="214" y="1370"/>
       <point x="419" y="1493"/>
-      <point x="779" y="1493" type="curve" name="at01" smooth="yes"/>
+      <point x="779" y="1493" type="curve" smooth="yes" name="at01"/>
       <point x="1255" y="1493" type="line"/>
       <point x="965" y="0" type="line" name="ab01"/>
       <point x="670" y="0" type="line"/>
@@ -31,7 +31,7 @@
       <point x="457" y="1042" type="curve" smooth="yes"/>
       <point x="453" y="1020"/>
       <point x="451" y="1000"/>
-      <point x="451" y="983" type="curve" name="dh02" smooth="yes"/>
+      <point x="451" y="983" type="curve" smooth="yes" name="dh02"/>
       <point x="451" y="886"/>
       <point x="515" y="838"/>
       <point x="644" y="838" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0430.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0430.glif
index 2e5350fd7..b80d2230e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0430.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0430.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0430" format="1">
+<glyph name="uni0430" format="2">
   <advance width="1233"/>
   <unicode hex="0430"/>
   <outline>
     <contour>
-      <point x="381" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="381" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="174" y="-29"/>
       <point x="47" y="90"/>
-      <point x="47" y="302" type="curve" name="sh01" smooth="yes"/>
+      <point x="47" y="302" type="curve" smooth="yes" name="sh01"/>
       <point x="47" y="578"/>
       <point x="260" y="737"/>
       <point x="651" y="737" type="curve" smooth="yes"/>
@@ -15,20 +15,20 @@
       <point x="852" y="786" type="line" smooth="yes"/>
       <point x="853" y="794"/>
       <point x="854" y="800"/>
-      <point x="854" y="811" type="curve" name="ah01" smooth="yes"/>
+      <point x="854" y="811" type="curve" smooth="yes" name="ah01"/>
       <point x="854" y="891"/>
       <point x="785" y="932"/>
-      <point x="661" y="932" type="curve" name="sv03" smooth="yes"/>
+      <point x="661" y="932" type="curve" smooth="yes" name="sv03"/>
       <point x="544" y="932"/>
       <point x="411" y="896"/>
       <point x="248" y="819" type="curve" name="hr01"/>
       <point x="295" y="1069" type="line"/>
       <point x="463" y="1125"/>
       <point x="583" y="1147"/>
-      <point x="709" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="709" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="988" y="1147"/>
       <point x="1141" y="1045"/>
-      <point x="1141" y="845" type="curve" name="sh04" smooth="yes"/>
+      <point x="1141" y="845" type="curve" smooth="yes" name="sh04"/>
       <point x="1141" y="792"/>
       <point x="1130" y="722"/>
       <point x="1114" y="639" type="curve" smooth="yes"/>
@@ -39,14 +39,14 @@
       <point x="517" y="-29"/>
     </contour>
     <contour>
-      <point x="504" y="172" type="curve" name="sv01" smooth="yes"/>
+      <point x="504" y="172" type="curve" smooth="yes" name="sv01"/>
       <point x="649" y="172"/>
       <point x="766" y="303"/>
       <point x="803" y="530" type="curve" name="dv01"/>
       <point x="690" y="530" type="line" smooth="yes"/>
       <point x="466" y="530"/>
       <point x="352" y="462"/>
-      <point x="352" y="325" type="curve" name="sh03" smooth="yes"/>
+      <point x="352" y="325" type="curve" smooth="yes" name="sh03"/>
       <point x="352" y="229"/>
       <point x="408" y="172"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0431.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0431.glif
index db765ecf4..ee36eb2d8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0431.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0431.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0431" format="1">
+<glyph name="uni0431" format="2">
   <advance width="1233"/>
   <unicode hex="0431"/>
   <outline>
     <contour>
-      <point x="498" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="498" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="187" y="-29"/>
       <point x="81" y="183"/>
-      <point x="81" y="399" type="curve" name="sh01" smooth="yes"/>
+      <point x="81" y="399" type="curve" smooth="yes" name="sh01"/>
       <point x="81" y="446"/>
       <point x="86" y="492"/>
-      <point x="95" y="541" type="curve" name="sh02" smooth="yes"/>
+      <point x="95" y="541" type="curve" smooth="yes" name="sh02"/>
       <point x="100" y="572"/>
       <point x="106" y="602"/>
       <point x="109" y="621" type="curve"/>
@@ -37,10 +37,10 @@
       <point x="392" y="1045" type="curve" name="ih01"/>
       <point x="491" y="1113"/>
       <point x="603" y="1147"/>
-      <point x="730" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="730" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1046" y="1147"/>
       <point x="1152" y="935"/>
-      <point x="1152" y="724" type="curve" name="sh03" smooth="yes"/>
+      <point x="1152" y="724" type="curve" smooth="yes" name="sh03"/>
       <point x="1152" y="669"/>
       <point x="1146" y="611"/>
       <point x="1135" y="559" type="curve" smooth="yes"/>
@@ -48,22 +48,22 @@
       <point x="821" y="-29"/>
     </contour>
     <contour>
-      <point x="548" y="209" type="curve" name="dv01" smooth="yes"/>
+      <point x="548" y="209" type="curve" smooth="yes" name="dv01"/>
       <point x="693" y="209"/>
       <point x="802" y="347"/>
-      <point x="842" y="559" type="curve" name="sh04" smooth="yes"/>
+      <point x="842" y="559" type="curve" smooth="yes" name="sh04"/>
       <point x="851" y="606"/>
       <point x="856" y="655"/>
-      <point x="856" y="692" type="curve" name="ah01" smooth="yes"/>
+      <point x="856" y="692" type="curve" smooth="yes" name="ah01"/>
       <point x="856" y="784"/>
       <point x="825" y="909"/>
-      <point x="688" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="688" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="544" y="909"/>
       <point x="437" y="774"/>
       <point x="400" y="606" type="curve"/>
       <point x="387" y="551"/>
       <point x="377" y="465"/>
-      <point x="377" y="417" type="curve" name="sh05" smooth="yes"/>
+      <point x="377" y="417" type="curve" smooth="yes" name="sh05"/>
       <point x="377" y="336"/>
       <point x="408" y="209"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0432.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0432.glif
index 94155637c..92e4e9cec 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0432.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0432.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0432" format="1">
+<glyph name="uni0432" format="2">
   <advance width="1233"/>
   <unicode hex="0432"/>
   <outline>
@@ -11,46 +11,46 @@
       <point x="1060" y="1058" type="curve" smooth="yes"/>
       <point x="1116" y="1021"/>
       <point x="1147" y="965"/>
-      <point x="1147" y="880" type="curve" name="sh01" smooth="yes"/>
+      <point x="1147" y="880" type="curve" smooth="yes" name="sh01"/>
       <point x="1147" y="752"/>
       <point x="1080" y="646"/>
       <point x="937" y="599" type="curve" name="ih01"/>
       <point x="1063" y="562"/>
       <point x="1100" y="475"/>
-      <point x="1100" y="391" type="curve" name="dh02" smooth="yes"/>
+      <point x="1100" y="391" type="curve" smooth="yes" name="dh02"/>
       <point x="1100" y="372"/>
       <point x="1098" y="348"/>
       <point x="1093" y="321" type="curve" smooth="yes"/>
       <point x="1053" y="106"/>
       <point x="869" y="0"/>
-      <point x="552" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="552" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="35" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="619" y="698" type="line" name="dv02" smooth="yes"/>
+      <point x="619" y="698" type="line" smooth="yes" name="dv02"/>
       <point x="796" y="698"/>
       <point x="856" y="732"/>
-      <point x="856" y="807" type="curve" name="hr01" smooth="yes"/>
+      <point x="856" y="807" type="curve" smooth="yes" name="hr01"/>
       <point x="856" y="842"/>
       <point x="843" y="864"/>
       <point x="826" y="876" type="curve" smooth="yes"/>
       <point x="807" y="890"/>
       <point x="775" y="901"/>
-      <point x="658" y="901" type="curve" name="sv01" smooth="yes"/>
+      <point x="658" y="901" type="curve" smooth="yes" name="sv01"/>
       <point x="502" y="901" type="line"/>
       <point x="463" y="698" type="line"/>
     </contour>
     <contour>
-      <point x="537" y="219" type="line" name="hr02" smooth="yes"/>
+      <point x="537" y="219" type="line" smooth="yes" name="hr02"/>
       <point x="696" y="219"/>
       <point x="808" y="258"/>
-      <point x="808" y="370" type="curve" name="dh01" smooth="yes"/>
+      <point x="808" y="370" type="curve" smooth="yes" name="dh01"/>
       <point x="808" y="413"/>
       <point x="791" y="437"/>
-      <point x="760" y="453" type="curve" name="hr03" smooth="yes"/>
+      <point x="760" y="453" type="curve" smooth="yes" name="hr03"/>
       <point x="726" y="470"/>
       <point x="668" y="479"/>
-      <point x="587" y="479" type="curve" name="dv01" smooth="yes"/>
+      <point x="587" y="479" type="curve" smooth="yes" name="dv01"/>
       <point x="420" y="479" type="line"/>
       <point x="370" y="219" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0433.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0433.glif
index dbf173cc3..ed0c05c99 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0433.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0433.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0433" format="1">
+<glyph name="uni0433" format="2">
   <advance width="1233"/>
   <unicode hex="0433"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0434.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0434.glif
index b3abaa064..51d33a0bb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0434.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0434.glif
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0434" format="1">
+<glyph name="uni0434" format="2">
   <advance width="1233"/>
   <unicode hex="0434"/>
   <outline>
     <contour>
       <point x="0" y="219" type="line" name="sv01"/>
-      <point x="76" y="219" type="line" name="sv03" smooth="yes"/>
+      <point x="76" y="219" type="line" smooth="yes" name="sv03"/>
       <point x="91" y="219"/>
       <point x="114" y="239"/>
       <point x="130" y="262" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0435.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0435.glif
index de017e6d6..c3ccb0f2c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0435.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0435.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0435" format="1">
+<glyph name="uni0435" format="2">
   <advance width="1233"/>
   <unicode hex="0435"/>
   <outline>
     <contour>
-      <point x="586" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="586" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="249" y="-29"/>
       <point x="76" y="127"/>
-      <point x="76" y="440" type="curve" name="sh01" smooth="yes"/>
+      <point x="76" y="440" type="curve" smooth="yes" name="sh01"/>
       <point x="76" y="621"/>
       <point x="135" y="805"/>
       <point x="244" y="938" type="curve" smooth="yes"/>
       <point x="357" y="1075"/>
       <point x="513" y="1149"/>
-      <point x="696" y="1149" type="curve" name="dv03" smooth="yes"/>
+      <point x="696" y="1149" type="curve" smooth="yes" name="dv03"/>
       <point x="972" y="1149"/>
       <point x="1155" y="975"/>
-      <point x="1155" y="708" type="curve" name="sh02" smooth="yes"/>
+      <point x="1155" y="708" type="curve" smooth="yes" name="sh02"/>
       <point x="1155" y="652"/>
       <point x="1147" y="577"/>
       <point x="1128" y="465" type="curve" name="dv04"/>
@@ -26,7 +26,7 @@
       <point x="362" y="403" type="curve" name="sh03"/>
       <point x="362" y="270"/>
       <point x="451" y="203"/>
-      <point x="630" y="203" type="curve" name="dv01" smooth="yes"/>
+      <point x="630" y="203" type="curve" smooth="yes" name="dv01"/>
       <point x="771" y="203"/>
       <point x="919" y="244"/>
       <point x="1044" y="324" type="curve" name="ih01"/>
@@ -38,10 +38,10 @@
       <point x="876" y="684" type="line" name="sh05"/>
       <point x="881" y="702"/>
       <point x="883" y="720"/>
-      <point x="883" y="739" type="curve" name="ah01" smooth="yes"/>
+      <point x="883" y="739" type="curve" smooth="yes" name="ah01"/>
       <point x="883" y="851"/>
       <point x="812" y="920"/>
-      <point x="689" y="920" type="curve" name="dv02" smooth="yes"/>
+      <point x="689" y="920" type="curve" smooth="yes" name="dv02"/>
       <point x="560" y="920"/>
       <point x="463" y="841"/>
       <point x="410" y="684" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0436.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0436.glif
index d7c321455..d6501c991 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0436.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0436.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0436" format="1">
+<glyph name="uni0436" format="2">
   <advance width="1233"/>
   <unicode hex="0436"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0437.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0437.glif
index 02601474e..91efe667f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0437.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0437.glif
@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0437" format="1">
+<glyph name="uni0437" format="2">
   <advance width="1233"/>
   <unicode hex="0437"/>
   <outline>
     <contour>
-      <point x="390" y="-22" type="curve" name="ab01" smooth="yes"/>
+      <point x="390" y="-22" type="curve" smooth="yes" name="ab01"/>
       <point x="283" y="-22"/>
       <point x="186" y="-12"/>
       <point x="52" y="44" type="curve"/>
       <point x="98" y="280" type="line" name="iv01"/>
       <point x="219" y="215"/>
       <point x="299" y="201"/>
-      <point x="467" y="201" type="curve" name="sv01" smooth="yes"/>
+      <point x="467" y="201" type="curve" smooth="yes" name="sv01"/>
       <point x="614" y="201"/>
       <point x="718" y="212"/>
-      <point x="740" y="325" type="curve" name="hr01" smooth="yes"/>
+      <point x="740" y="325" type="curve" smooth="yes" name="hr01"/>
       <point x="742" y="335"/>
       <point x="743" y="344"/>
-      <point x="743" y="352" type="curve" name="dh01" smooth="yes"/>
+      <point x="743" y="352" type="curve" smooth="yes" name="dh01"/>
       <point x="743" y="435"/>
       <point x="628" y="462"/>
-      <point x="536" y="462" type="curve" name="dv01" smooth="yes"/>
+      <point x="536" y="462" type="curve" smooth="yes" name="dv01"/>
       <point x="373" y="462" type="line"/>
       <point x="416" y="681" type="line"/>
-      <point x="553" y="681" type="line" name="dv02" smooth="yes"/>
+      <point x="553" y="681" type="line" smooth="yes" name="dv02"/>
       <point x="665" y="681"/>
       <point x="808" y="715"/>
-      <point x="808" y="819" type="curve" name="sh01" smooth="yes"/>
+      <point x="808" y="819" type="curve" smooth="yes" name="sh01"/>
       <point x="808" y="894"/>
       <point x="734" y="928"/>
-      <point x="577" y="928" type="curve" name="sv02" smooth="yes"/>
+      <point x="577" y="928" type="curve" smooth="yes" name="sv02"/>
       <point x="468" y="928"/>
       <point x="359" y="911"/>
       <point x="251" y="876" type="curve" name="iv02"/>
       <point x="294" y="1099" type="line"/>
       <point x="401" y="1128"/>
       <point x="532" y="1147"/>
-      <point x="660" y="1147" type="curve" name="hr02" smooth="yes"/>
+      <point x="660" y="1147" type="curve" smooth="yes" name="hr02"/>
       <point x="960" y="1147"/>
       <point x="1101" y="1042"/>
-      <point x="1101" y="894" type="curve" name="sh02" smooth="yes"/>
+      <point x="1101" y="894" type="curve" smooth="yes" name="sh02"/>
       <point x="1101" y="875"/>
       <point x="1099" y="855"/>
       <point x="1095" y="836" type="curve" smooth="yes"/>
@@ -48,7 +48,7 @@
       <point x="859" y="573" type="curve" name="ih01"/>
       <point x="958" y="541"/>
       <point x="1031" y="460"/>
-      <point x="1031" y="335" type="curve" name="dh02" smooth="yes"/>
+      <point x="1031" y="335" type="curve" smooth="yes" name="dh02"/>
       <point x="1031" y="87"/>
       <point x="739" y="-22"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0438.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0438.glif
index 5dd29f482..95097df25 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0438.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0438.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0438" format="1">
+<glyph name="uni0438" format="2">
   <advance width="1233"/>
   <unicode hex="0438"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0439.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0439.glif
index 63e1fde74..efadf14fa 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0439.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0439.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0439" format="1">
+<glyph name="uni0439" format="2">
   <advance width="1233"/>
   <unicode hex="0439"/>
   <outline>
     <contour>
-      <point x="736" y="1270" type="curve" name="sv01" smooth="yes"/>
+      <point x="736" y="1270" type="curve" smooth="yes" name="sv01"/>
       <point x="545" y="1270"/>
       <point x="446" y="1355"/>
       <point x="446" y="1534" type="curve" smooth="yes"/>
       <point x="446" y="1567" type="line" name="dh01"/>
       <point x="590" y="1567" type="line"/>
-      <point x="590" y="1554" type="line" name="dh02" smooth="yes"/>
+      <point x="590" y="1554" type="line" smooth="yes" name="dh02"/>
       <point x="590" y="1473"/>
       <point x="652" y="1421"/>
-      <point x="756" y="1421" type="curve" name="sv02" smooth="yes"/>
+      <point x="756" y="1421" type="curve" smooth="yes" name="sv02"/>
       <point x="861" y="1421"/>
       <point x="944" y="1475"/>
       <point x="977" y="1567" type="curve" name="at03"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni043A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni043A_.glif
index 0e0c9006a..54253a1cc 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni043A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni043A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni043A" format="1">
+<glyph name="uni043A" format="2">
   <advance width="1233"/>
   <unicode hex="043A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni043B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni043B_.glif
index 24136ff12..faec0c925 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni043B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni043B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni043B" format="1">
+<glyph name="uni043B" format="2">
   <advance width="1233"/>
   <unicode hex="043B"/>
   <outline>
@@ -24,7 +24,7 @@
       <point x="342" y="114" type="curve" smooth="yes"/>
       <point x="269" y="35"/>
       <point x="164" y="0"/>
-      <point x="20" y="0" type="curve" name="ab02" smooth="yes"/>
+      <point x="20" y="0" type="curve" smooth="yes" name="ab02"/>
       <point x="-75" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni043C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni043C_.glif
index acb6776ba..642d5867b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni043C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni043C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni043C" format="1">
+<glyph name="uni043C" format="2">
   <advance width="1233"/>
   <unicode hex="043C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni043D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni043D_.glif
index af87185ad..310a491a2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni043D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni043D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni043D" format="1">
+<glyph name="uni043D" format="2">
   <advance width="1233"/>
   <unicode hex="043D"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni043E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni043E_.glif
index a271d68b6..94f5db129 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni043E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni043E_.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni043E" format="1">
+<glyph name="uni043E" format="2">
   <advance width="1233"/>
   <unicode hex="043E"/>
   <outline>
     <contour>
-      <point x="533" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="533" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="258" y="-29"/>
       <point x="88" y="134"/>
-      <point x="88" y="454" type="curve" name="sh01" smooth="yes"/>
+      <point x="88" y="454" type="curve" smooth="yes" name="sh01"/>
       <point x="88" y="818"/>
       <point x="308" y="1149"/>
-      <point x="700" y="1149" type="curve" name="dv03" smooth="yes"/>
+      <point x="700" y="1149" type="curve" smooth="yes" name="dv03"/>
       <point x="975" y="1149"/>
       <point x="1145" y="987"/>
-      <point x="1145" y="665" type="curve" name="sh02" smooth="yes"/>
+      <point x="1145" y="665" type="curve" smooth="yes" name="sh02"/>
       <point x="1145" y="300"/>
       <point x="925" y="-29"/>
     </contour>
     <contour>
-      <point x="557" y="207" type="curve" name="dv01" smooth="yes"/>
+      <point x="557" y="207" type="curve" smooth="yes" name="dv01"/>
       <point x="737" y="207"/>
       <point x="850" y="440"/>
-      <point x="850" y="664" type="curve" name="ah01" smooth="yes"/>
+      <point x="850" y="664" type="curve" smooth="yes" name="ah01"/>
       <point x="850" y="835"/>
       <point x="784" y="911"/>
-      <point x="679" y="911" type="curve" name="dv02" smooth="yes"/>
+      <point x="679" y="911" type="curve" smooth="yes" name="dv02"/>
       <point x="489" y="911"/>
       <point x="383" y="669"/>
-      <point x="383" y="456" type="curve" name="sh03" smooth="yes"/>
+      <point x="383" y="456" type="curve" smooth="yes" name="sh03"/>
       <point x="383" y="285"/>
       <point x="452" y="207"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni043F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni043F_.glif
index 4ef035548..f504b9e5d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni043F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni043F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni043F" format="1">
+<glyph name="uni043F" format="2">
   <advance width="1233"/>
   <unicode hex="043F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0440.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0440.glif
index bf58ea79e..d90d0a3e8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0440.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0440.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0440" format="1">
+<glyph name="uni0440" format="2">
   <advance width="1233"/>
   <unicode hex="0440"/>
   <outline>
@@ -9,16 +9,16 @@
       <point x="521" y="952" type="line" name="ih01"/>
       <point x="617" y="1085"/>
       <point x="725" y="1147"/>
-      <point x="850" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="850" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1045" y="1147"/>
       <point x="1166" y="994"/>
-      <point x="1166" y="731" type="curve" name="sh02" smooth="yes"/>
+      <point x="1166" y="731" type="curve" smooth="yes" name="sh02"/>
       <point x="1166" y="574"/>
       <point x="1123" y="383"/>
       <point x="1048" y="244" type="curve" smooth="yes"/>
       <point x="952" y="67"/>
       <point x="807" y="-29"/>
-      <point x="651" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="651" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="499" y="-29"/>
       <point x="403" y="62"/>
       <point x="376" y="207" type="curve" name="iv01"/>
@@ -26,16 +26,16 @@
       <point x="-40" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="593" y="209" type="curve" name="hr01" smooth="yes"/>
+      <point x="593" y="209" type="curve" smooth="yes" name="hr01"/>
       <point x="760" y="209"/>
       <point x="871" y="453"/>
-      <point x="871" y="675" type="curve" name="dh01" smooth="yes"/>
+      <point x="871" y="675" type="curve" smooth="yes" name="dh01"/>
       <point x="871" y="835"/>
       <point x="813" y="907"/>
-      <point x="720" y="907" type="curve" name="sv01" smooth="yes"/>
+      <point x="720" y="907" type="curve" smooth="yes" name="sv01"/>
       <point x="551" y="907"/>
       <point x="433" y="672"/>
-      <point x="433" y="451" type="curve" name="hr02" smooth="yes"/>
+      <point x="433" y="451" type="curve" smooth="yes" name="hr02"/>
       <point x="433" y="287"/>
       <point x="498" y="209"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0441.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0441.glif
index d5759d07e..caad4a4a4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0441.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0441.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0441" format="1">
+<glyph name="uni0441" format="2">
   <advance width="1233"/>
   <unicode hex="0441"/>
   <outline>
     <contour>
-      <point x="621" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="621" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="481" y="-29"/>
       <point x="355" y="6"/>
       <point x="263" y="94" type="curve" smooth="yes"/>
@@ -38,7 +38,7 @@
       <point x="431" y="466" type="curve" smooth="yes"/>
       <point x="431" y="289"/>
       <point x="513" y="209"/>
-      <point x="675" y="209" type="curve" name="hr01" smooth="yes"/>
+      <point x="675" y="209" type="curve" smooth="yes" name="hr01"/>
       <point x="726" y="209"/>
       <point x="774" y="218"/>
       <point x="827" y="235" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0442.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0442.glif
index 811a5a652..adf97b9e0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0442.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0442.glif
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0442" format="1">
+<glyph name="uni0442" format="2">
   <advance width="1233"/>
   <unicode hex="0442"/>
   <outline>
     <contour>
       <point x="532" y="901" type="line" name="hr00"/>
-      <point x="224" y="901" type="line"/>
-      <point x="267" y="1120" type="line" name="at01"/>
-      <point x="1174" y="1120" type="line"/>
-      <point x="1131" y="901" type="line" name="sv01"/>
+      <point x="194" y="901" type="line"/>
+      <point x="237" y="1120" type="line" name="at01"/>
+      <point x="1204" y="1120" type="line"/>
+      <point x="1161" y="901" type="line" name="sv01"/>
       <point x="823" y="901" type="line" name="sv02"/>
       <point x="648" y="0" type="line" name="ab01"/>
       <point x="357" y="0" type="line"/>
@@ -17,7 +17,7 @@
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
+      <string>2018-06-01 07:12:39 +0000</string>
     </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0443.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0443.glif
index 612bd212a..b0d6c7a2a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0443.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0443.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0443" format="1">
+<glyph name="uni0443" format="2">
   <advance width="1233"/>
   <unicode hex="0443"/>
   <outline>
@@ -18,7 +18,7 @@
       <point x="576" y="-121" type="line" smooth="yes"/>
       <point x="426" y="-386"/>
       <point x="343" y="-424"/>
-      <point x="175" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="175" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="-65" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0444.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0444.glif
index 639d4619a..511b44683 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0444.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0444.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0444" format="1">
+<glyph name="uni0444" format="2">
   <advance width="1233"/>
   <unicode hex="0444"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="381" y="-29" type="line" name="hr00"/>
       <point x="186" y="-10"/>
       <point x="61" y="187"/>
-      <point x="61" y="394" type="curve" name="sh01" smooth="yes"/>
+      <point x="61" y="394" type="curve" smooth="yes" name="sh01"/>
       <point x="61" y="439"/>
       <point x="67" y="500"/>
       <point x="78" y="559" type="curve" smooth="yes"/>
@@ -19,7 +19,7 @@
       <point x="850" y="1147" type="line"/>
       <point x="1042" y="1126"/>
       <point x="1170" y="939"/>
-      <point x="1170" y="724" type="curve" name="sh03" smooth="yes"/>
+      <point x="1170" y="724" type="curve" smooth="yes" name="sh03"/>
       <point x="1170" y="677"/>
       <point x="1164" y="620"/>
       <point x="1152" y="559" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="318" y="559" type="curve" smooth="yes"/>
       <point x="307" y="506"/>
       <point x="303" y="456"/>
-      <point x="303" y="420" type="curve" name="sh04" smooth="yes"/>
+      <point x="303" y="420" type="curve" smooth="yes" name="sh04"/>
       <point x="303" y="320"/>
       <point x="343" y="230"/>
       <point x="427" y="209" type="curve"/>
@@ -48,7 +48,7 @@
       <point x="912" y="559" type="curve" smooth="yes"/>
       <point x="923" y="612"/>
       <point x="928" y="658"/>
-      <point x="928" y="697" type="curve" name="ah01" smooth="yes"/>
+      <point x="928" y="697" type="curve" smooth="yes" name="ah01"/>
       <point x="928" y="798"/>
       <point x="891" y="885"/>
       <point x="803" y="909" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0445.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0445.glif
index 9a03712e9..48c838cb4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0445.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0445.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0445" format="1">
+<glyph name="uni0445" format="2">
   <advance width="1233"/>
   <unicode hex="0445"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0446.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0446.glif
index 67318c37d..dc032facb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0446.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0446.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0446" format="1">
+<glyph name="uni0446" format="2">
   <advance width="1233"/>
   <unicode hex="0446"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0447.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0447.glif
index fa02ab2f9..94aa17cc4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0447.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0447.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0447" format="1">
+<glyph name="uni0447" format="2">
   <advance width="1233"/>
   <unicode hex="0447"/>
   <outline>
@@ -24,7 +24,7 @@
       <point x="441" y="750" type="curve" smooth="yes"/>
       <point x="441" y="725"/>
       <point x="448" y="704"/>
-      <point x="461" y="689" type="curve" name="hr01" smooth="yes"/>
+      <point x="461" y="689" type="curve" smooth="yes" name="hr01"/>
       <point x="465" y="684"/>
       <point x="471" y="679"/>
       <point x="479" y="672" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0448.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0448.glif
index 8cb2b5f14..ff851c9ff 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0448.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0448.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0448" format="1">
+<glyph name="uni0448" format="2">
   <advance width="1233"/>
   <unicode hex="0448"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0449.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0449.glif
index 735ae8848..b1506ac20 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0449.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0449.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0449" format="1">
+<glyph name="uni0449" format="2">
   <advance width="1233"/>
   <unicode hex="0449"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni044A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni044A_.glif
index 788a7a085..6d92f5cb0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni044A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni044A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni044A" format="1">
+<glyph name="uni044A" format="2">
   <advance width="1233"/>
   <unicode hex="044A"/>
   <outline>
@@ -12,26 +12,26 @@
       <point x="743" y="698" type="line" smooth="yes"/>
       <point x="1026" y="698"/>
       <point x="1138" y="585"/>
-      <point x="1138" y="429" type="curve" name="dh02" smooth="yes"/>
+      <point x="1138" y="429" type="curve" smooth="yes" name="dh02"/>
       <point x="1138" y="404"/>
       <point x="1135" y="379"/>
       <point x="1130" y="350" type="curve" smooth="yes"/>
       <point x="1090" y="129"/>
       <point x="906" y="0"/>
-      <point x="607" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="607" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="189" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="596" y="219" type="line" name="sv01" smooth="yes"/>
+      <point x="596" y="219" type="line" smooth="yes" name="sv01"/>
       <point x="735" y="219"/>
       <point x="840" y="256"/>
-      <point x="840" y="373" type="curve" name="dh01" smooth="yes"/>
+      <point x="840" y="373" type="curve" smooth="yes" name="dh01"/>
       <point x="840" y="410"/>
       <point x="829" y="434"/>
       <point x="798" y="453" type="curve" smooth="yes"/>
       <point x="768" y="470"/>
       <point x="717" y="479"/>
-      <point x="646" y="479" type="curve" name="dv01" smooth="yes"/>
+      <point x="646" y="479" type="curve" smooth="yes" name="dv01"/>
       <point x="573" y="479" type="line"/>
       <point x="523" y="219" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni044B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni044B_.glif
index 1156b049d..c087fa00b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni044B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni044B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni044B" format="1">
+<glyph name="uni044B" format="2">
   <advance width="1233"/>
   <unicode hex="044B"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="363" y="698" type="line" smooth="yes"/>
       <point x="646" y="698"/>
       <point x="758" y="585"/>
-      <point x="758" y="429" type="curve" name="dh02" smooth="yes"/>
+      <point x="758" y="429" type="curve" smooth="yes" name="dh02"/>
       <point x="758" y="404"/>
       <point x="755" y="379"/>
       <point x="750" y="350" type="curve" smooth="yes"/>
       <point x="710" y="129"/>
       <point x="526" y="0"/>
-      <point x="227" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="227" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="-85" y="0" type="line"/>
     </contour>
     <contour>
@@ -26,10 +26,10 @@
       <point x="792" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="276" y="219" type="line" name="sv01" smooth="yes"/>
+      <point x="276" y="219" type="line" smooth="yes" name="sv01"/>
       <point x="356" y="219"/>
       <point x="460" y="272"/>
-      <point x="460" y="370" type="curve" name="dh01" smooth="yes"/>
+      <point x="460" y="370" type="curve" smooth="yes" name="dh01"/>
       <point x="460" y="451"/>
       <point x="389" y="479"/>
       <point x="326" y="479" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni044C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni044C_.glif
index 8a8b4e5e5..5d4073157 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni044C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni044C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni044C" format="1">
+<glyph name="uni044C" format="2">
   <advance width="1233"/>
   <unicode hex="044C"/>
   <outline>
@@ -10,20 +10,20 @@
       <point x="684" y="698" type="line" smooth="yes"/>
       <point x="967" y="698"/>
       <point x="1079" y="585"/>
-      <point x="1079" y="429" type="curve" name="dh02" smooth="yes"/>
+      <point x="1079" y="429" type="curve" smooth="yes" name="dh02"/>
       <point x="1079" y="404"/>
       <point x="1076" y="379"/>
       <point x="1071" y="350" type="curve" smooth="yes"/>
       <point x="1031" y="129"/>
       <point x="847" y="0"/>
-      <point x="548" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="548" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="80" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="537" y="219" type="line" name="sv01" smooth="yes"/>
+      <point x="537" y="219" type="line" smooth="yes" name="sv01"/>
       <point x="676" y="219"/>
       <point x="781" y="256"/>
-      <point x="781" y="373" type="curve" name="dh01" smooth="yes"/>
+      <point x="781" y="373" type="curve" smooth="yes" name="dh01"/>
       <point x="781" y="410"/>
       <point x="770" y="434"/>
       <point x="739" y="453" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni044D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni044D_.glif
index 02030a002..3d9bece05 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni044D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni044D_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni044D" format="1">
+<glyph name="uni044D" format="2">
   <advance width="1233"/>
   <unicode hex="044D"/>
   <outline>
     <contour>
-      <point x="418" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="418" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="289" y="-29"/>
       <point x="182" y="0"/>
       <point x="95" y="57" type="curve"/>
       <point x="148" y="326" type="line"/>
       <point x="223" y="247"/>
       <point x="304" y="209"/>
-      <point x="416" y="209" type="curve" name="dv01" smooth="yes"/>
+      <point x="416" y="209" type="curve" smooth="yes" name="dv01"/>
       <point x="583" y="209"/>
       <point x="702" y="294"/>
       <point x="763" y="458" type="curve" name="dv02"/>
@@ -20,17 +20,17 @@
       <point x="801" y="677" type="line" name="dh01"/>
       <point x="796" y="832"/>
       <point x="716" y="909"/>
-      <point x="559" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="559" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="448" y="909"/>
       <point x="342" y="871"/>
       <point x="239" y="795" type="curve"/>
       <point x="291" y="1063" type="line"/>
       <point x="407" y="1119"/>
       <point x="522" y="1147"/>
-      <point x="649" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="649" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="993" y="1147"/>
       <point x="1103" y="939"/>
-      <point x="1103" y="724" type="curve" name="dh02" smooth="yes"/>
+      <point x="1103" y="724" type="curve" smooth="yes" name="dh02"/>
       <point x="1103" y="669"/>
       <point x="1097" y="612"/>
       <point x="1086" y="560" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni044E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni044E_.glif
index d5ac6fdce..e4522db69 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni044E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni044E_.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni044E" format="1">
+<glyph name="uni044E" format="2">
   <advance width="1233"/>
   <unicode hex="044E"/>
   <outline>
     <contour>
-      <point x="1212" y="988" type="curve" name="hr00" smooth="yes"/>
+      <point x="1212" y="988" type="curve" smooth="yes" name="hr00"/>
       <point x="1251" y="927"/>
       <point x="1279" y="844"/>
-      <point x="1279" y="720" type="curve" name="dh02" smooth="yes"/>
+      <point x="1279" y="720" type="curve" smooth="yes" name="dh02"/>
       <point x="1279" y="512"/>
       <point x="1196" y="242"/>
       <point x="1046" y="92" type="curve" smooth="yes"/>
       <point x="949" y="-5"/>
       <point x="858" y="-18"/>
-      <point x="756" y="-28" type="curve" name="av01" smooth="yes"/>
+      <point x="756" y="-28" type="curve" smooth="yes" name="av01"/>
       <point x="748" y="-29"/>
       <point x="743" y="-29"/>
-      <point x="740" y="-29" type="curve" name="av02" smooth="yes"/>
+      <point x="740" y="-29" type="curve" smooth="yes" name="av02"/>
       <point x="614" y="-29"/>
       <point x="519" y="53"/>
       <point x="466" y="130" type="curve" smooth="yes"/>
@@ -35,10 +35,10 @@
       <point x="451" y="689" type="line"/>
       <point x="531" y="942"/>
       <point x="725" y="1098"/>
-      <point x="892" y="1138" type="curve" name="at01" smooth="yes"/>
+      <point x="892" y="1138" type="curve" smooth="yes" name="at01"/>
       <point x="917" y="1144"/>
       <point x="939" y="1147"/>
-      <point x="960" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="960" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1055" y="1147"/>
       <point x="1150" y="1084"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni044F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni044F_.glif
index be8928c2d..1eaff2c5e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni044F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni044F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni044F" format="1">
+<glyph name="uni044F" format="2">
   <advance width="1233"/>
   <unicode hex="044F"/>
   <outline>
@@ -7,13 +7,13 @@
       <point x="342" y="488" type="line" name="hr00"/>
       <point x="281" y="522"/>
       <point x="174" y="599"/>
-      <point x="174" y="725" type="curve" name="dh01" smooth="yes"/>
+      <point x="174" y="725" type="curve" smooth="yes" name="dh01"/>
       <point x="174" y="746"/>
       <point x="176" y="777"/>
       <point x="183" y="808" type="curve"/>
       <point x="223" y="1020"/>
       <point x="391" y="1120"/>
-      <point x="756" y="1120" type="curve" name="at01" smooth="yes"/>
+      <point x="756" y="1120" type="curve" smooth="yes" name="at01"/>
       <point x="1180" y="1120" type="line"/>
       <point x="962" y="0" type="line" name="ab01"/>
       <point x="671" y="0" type="line"/>
@@ -28,7 +28,7 @@
       <point x="675" y="909" type="line" smooth="yes"/>
       <point x="560" y="909"/>
       <point x="457" y="861"/>
-      <point x="457" y="760" type="curve" name="dh02" smooth="yes"/>
+      <point x="457" y="760" type="curve" smooth="yes" name="dh02"/>
       <point x="457" y="680"/>
       <point x="517" y="648"/>
       <point x="624" y="648" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0450.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0450.glif
index 1feb78072..acb8c1252 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0450.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0450.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0450" format="1">
+<glyph name="uni0450" format="2">
   <advance width="1233"/>
   <unicode hex="0450"/>
   <outline>
@@ -10,19 +10,19 @@
       <point x="705" y="1299" type="line"/>
     </contour>
     <contour>
-      <point x="586" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="586" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="249" y="-29"/>
       <point x="76" y="127"/>
-      <point x="76" y="440" type="curve" name="sh01" smooth="yes"/>
+      <point x="76" y="440" type="curve" smooth="yes" name="sh01"/>
       <point x="76" y="621"/>
       <point x="135" y="805"/>
       <point x="244" y="938" type="curve" smooth="yes"/>
       <point x="357" y="1075"/>
       <point x="513" y="1149"/>
-      <point x="696" y="1149" type="curve" name="dv05" smooth="yes"/>
+      <point x="696" y="1149" type="curve" smooth="yes" name="dv05"/>
       <point x="972" y="1149"/>
       <point x="1155" y="975"/>
-      <point x="1155" y="708" type="curve" name="sh02" smooth="yes"/>
+      <point x="1155" y="708" type="curve" smooth="yes" name="sh02"/>
       <point x="1155" y="652"/>
       <point x="1147" y="577"/>
       <point x="1128" y="465" type="curve" name="dv03"/>
@@ -32,7 +32,7 @@
       <point x="362" y="403" type="curve" name="sh03"/>
       <point x="362" y="270"/>
       <point x="451" y="203"/>
-      <point x="630" y="203" type="curve" name="dv02" smooth="yes"/>
+      <point x="630" y="203" type="curve" smooth="yes" name="dv02"/>
       <point x="771" y="203"/>
       <point x="919" y="244"/>
       <point x="1044" y="324" type="curve" name="ih02"/>
@@ -44,10 +44,10 @@
       <point x="876" y="684" type="line" name="sh05"/>
       <point x="881" y="702"/>
       <point x="883" y="720"/>
-      <point x="883" y="739" type="curve" name="ah01" smooth="yes"/>
+      <point x="883" y="739" type="curve" smooth="yes" name="ah01"/>
       <point x="883" y="851"/>
       <point x="812" y="920"/>
-      <point x="689" y="920" type="curve" name="dv04" smooth="yes"/>
+      <point x="689" y="920" type="curve" smooth="yes" name="dv04"/>
       <point x="560" y="920"/>
       <point x="463" y="841"/>
       <point x="410" y="684" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0451.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0451.glif
index 7ef0866b1..c39de0481 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0451.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0451.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0451" format="1">
+<glyph name="uni0451" format="2">
   <advance width="1233"/>
   <unicode hex="0451"/>
   <outline>
     <contour>
-      <point x="478" y="1349" type="line" name="hr00" smooth="yes"/>
+      <point x="478" y="1349" type="line" smooth="yes" name="hr00"/>
       <point x="458" y="1349"/>
       <point x="447" y="1362"/>
       <point x="451" y="1382" type="curve" smooth="yes"/>
       <point x="487" y="1568" type="line"/>
       <point x="490" y="1586"/>
       <point x="500" y="1595"/>
-      <point x="519" y="1595" type="curve" name="dv03" smooth="yes"/>
+      <point x="519" y="1595" type="curve" smooth="yes" name="dv03"/>
       <point x="696" y="1595" type="line" smooth="yes"/>
       <point x="717" y="1595"/>
       <point x="726" y="1582"/>
@@ -22,14 +22,14 @@
       <point x="653" y="1349" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="873" y="1349" type="line" name="sh01" smooth="yes"/>
+      <point x="873" y="1349" type="line" smooth="yes" name="sh01"/>
       <point x="853" y="1349"/>
       <point x="842" y="1362"/>
       <point x="846" y="1382" type="curve" smooth="yes"/>
       <point x="882" y="1568" type="line" name="sh02"/>
       <point x="885" y="1586"/>
       <point x="895" y="1595"/>
-      <point x="914" y="1595" type="curve" name="sv01" smooth="yes"/>
+      <point x="914" y="1595" type="curve" smooth="yes" name="sv01"/>
       <point x="1092" y="1595" type="line" smooth="yes"/>
       <point x="1113" y="1595"/>
       <point x="1122" y="1582"/>
@@ -40,19 +40,19 @@
       <point x="1049" y="1349" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="586" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="586" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="249" y="-29"/>
       <point x="76" y="127"/>
-      <point x="76" y="440" type="curve" name="sh03" smooth="yes"/>
+      <point x="76" y="440" type="curve" smooth="yes" name="sh03"/>
       <point x="76" y="621"/>
       <point x="135" y="805"/>
       <point x="244" y="938" type="curve" smooth="yes"/>
       <point x="357" y="1075"/>
       <point x="513" y="1149"/>
-      <point x="696" y="1149" type="curve" name="dv06" smooth="yes"/>
+      <point x="696" y="1149" type="curve" smooth="yes" name="dv06"/>
       <point x="972" y="1149"/>
       <point x="1155" y="975"/>
-      <point x="1155" y="708" type="curve" name="sh04" smooth="yes"/>
+      <point x="1155" y="708" type="curve" smooth="yes" name="sh04"/>
       <point x="1155" y="652"/>
       <point x="1147" y="577"/>
       <point x="1128" y="465" type="curve" name="dv04"/>
@@ -62,7 +62,7 @@
       <point x="362" y="403" type="curve" name="sh05"/>
       <point x="362" y="270"/>
       <point x="451" y="203"/>
-      <point x="630" y="203" type="curve" name="dv02" smooth="yes"/>
+      <point x="630" y="203" type="curve" smooth="yes" name="dv02"/>
       <point x="771" y="203"/>
       <point x="919" y="244"/>
       <point x="1044" y="324" type="curve" name="ih01"/>
@@ -74,10 +74,10 @@
       <point x="876" y="684" type="line" name="sh07"/>
       <point x="881" y="702"/>
       <point x="883" y="720"/>
-      <point x="883" y="739" type="curve" name="ah01" smooth="yes"/>
+      <point x="883" y="739" type="curve" smooth="yes" name="ah01"/>
       <point x="883" y="851"/>
       <point x="812" y="920"/>
-      <point x="689" y="920" type="curve" name="dv05" smooth="yes"/>
+      <point x="689" y="920" type="curve" smooth="yes" name="dv05"/>
       <point x="560" y="920"/>
       <point x="463" y="841"/>
       <point x="410" y="684" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0452.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0452.glif
index b2aeb8e0b..b49ebf031 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0452.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0452.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0452" format="1">
+<glyph name="uni0452" format="2">
   <advance width="1233"/>
   <unicode hex="0452"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="796" y="280" type="curve" smooth="yes"/>
       <point x="808" y="339"/>
       <point x="814" y="388"/>
-      <point x="814" y="427" type="curve" name="dh01" smooth="yes"/>
+      <point x="814" y="427" type="curve" smooth="yes" name="dh01"/>
       <point x="814" y="494"/>
       <point x="797" y="555"/>
-      <point x="681" y="555" type="curve" name="dv01" smooth="yes"/>
+      <point x="681" y="555" type="curve" smooth="yes" name="dv01"/>
       <point x="534" y="555"/>
       <point x="461" y="460"/>
       <point x="428" y="289" type="curve" smooth="yes"/>
@@ -32,10 +32,10 @@
       <point x="489" y="600" type="line" name="iv01"/>
       <point x="558" y="733"/>
       <point x="686" y="795"/>
-      <point x="831" y="795" type="curve" name="dv02" smooth="yes"/>
+      <point x="831" y="795" type="curve" smooth="yes" name="dv02"/>
       <point x="1034" y="795"/>
       <point x="1113" y="676"/>
-      <point x="1113" y="506" type="curve" name="dh02" smooth="yes"/>
+      <point x="1113" y="506" type="curve" smooth="yes" name="dh02"/>
       <point x="1113" y="449"/>
       <point x="1105" y="371"/>
       <point x="1090" y="295" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0453.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0453.glif
index 660f39e06..2a951e0ba 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0453.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0453.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0453" format="1">
+<glyph name="uni0453" format="2">
   <advance width="1233"/>
   <unicode hex="0453"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0454.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0454.glif
index 7dc83c51b..1598ed8d7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0454.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0454.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0454" format="1">
+<glyph name="uni0454" format="2">
   <advance width="1233"/>
   <unicode hex="0454"/>
   <outline>
     <contour>
-      <point x="569" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="569" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="276" y="-29"/>
       <point x="113" y="128"/>
-      <point x="113" y="397" type="curve" name="dh01" smooth="yes"/>
+      <point x="113" y="397" type="curve" smooth="yes" name="dh01"/>
       <point x="113" y="449"/>
       <point x="119" y="502"/>
       <point x="130" y="559" type="curve" smooth="yes"/>
       <point x="202" y="927"/>
       <point x="451" y="1149"/>
-      <point x="797" y="1149" type="curve" name="dv03" smooth="yes"/>
+      <point x="797" y="1149" type="curve" smooth="yes" name="dv03"/>
       <point x="918" y="1149"/>
       <point x="1021" y="1123"/>
       <point x="1121" y="1063" type="curve"/>
       <point x="1069" y="795" type="line"/>
       <point x="997" y="868"/>
       <point x="903" y="909"/>
-      <point x="791" y="909" type="curve" name="dv02" smooth="yes"/>
+      <point x="791" y="909" type="curve" smooth="yes" name="dv02"/>
       <point x="599" y="909"/>
       <point x="506" y="786"/>
       <point x="461" y="677" type="curve"/>
@@ -29,7 +29,7 @@
       <point x="415" y="468" type="line" name="dh02"/>
       <point x="410" y="331"/>
       <point x="464" y="211"/>
-      <point x="659" y="211" type="curve" name="dv01" smooth="yes"/>
+      <point x="659" y="211" type="curve" smooth="yes" name="dv01"/>
       <point x="768" y="211"/>
       <point x="874" y="249"/>
       <point x="977" y="326" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0455.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0455.glif
index d99acfd0e..36cc8eaf1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0455.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0455.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0455" format="1">
+<glyph name="uni0455" format="2">
   <advance width="1233"/>
   <unicode hex="0455"/>
   <outline>
     <contour>
-      <point x="495" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="495" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="362" y="-29"/>
       <point x="223" y="-6"/>
       <point x="90" y="41" type="curve"/>
       <point x="141" y="297" type="line"/>
       <point x="257" y="221"/>
       <point x="383" y="182"/>
-      <point x="512" y="182" type="curve" name="sh03" smooth="yes"/>
+      <point x="512" y="182" type="curve" smooth="yes" name="sh03"/>
       <point x="657" y="182"/>
       <point x="743" y="231"/>
-      <point x="743" y="330" type="curve" name="ah01" smooth="yes"/>
+      <point x="743" y="330" type="curve" smooth="yes" name="ah01"/>
       <point x="743" y="354"/>
       <point x="738" y="374"/>
       <point x="711" y="395" type="curve" smooth="yes"/>
@@ -24,20 +24,20 @@
       <point x="461" y="485" type="line" smooth="yes"/>
       <point x="304" y="528"/>
       <point x="225" y="623"/>
-      <point x="225" y="769" type="curve" name="sh01" smooth="yes"/>
+      <point x="225" y="769" type="curve" smooth="yes" name="sh01"/>
       <point x="225" y="997"/>
       <point x="417" y="1147"/>
-      <point x="729" y="1147" type="curve" name="sh04" smooth="yes"/>
+      <point x="729" y="1147" type="curve" smooth="yes" name="sh04"/>
       <point x="846" y="1147"/>
       <point x="970" y="1126"/>
       <point x="1094" y="1085" type="curve"/>
       <point x="1044" y="831" type="line"/>
       <point x="941" y="904"/>
       <point x="819" y="938"/>
-      <point x="708" y="938" type="curve" name="sv01" smooth="yes"/>
+      <point x="708" y="938" type="curve" smooth="yes" name="sv01"/>
       <point x="573" y="938"/>
       <point x="498" y="889"/>
-      <point x="498" y="810" type="curve" name="sh02" smooth="yes"/>
+      <point x="498" y="810" type="curve" smooth="yes" name="sh02"/>
       <point x="498" y="779"/>
       <point x="510" y="755"/>
       <point x="535" y="737" type="curve" smooth="yes"/>
@@ -47,7 +47,7 @@
       <point x="774" y="651" type="line" smooth="yes"/>
       <point x="939" y="604"/>
       <point x="1020" y="516"/>
-      <point x="1020" y="359" type="curve" name="sh05" smooth="yes"/>
+      <point x="1020" y="359" type="curve" smooth="yes" name="sh05"/>
       <point x="1020" y="116"/>
       <point x="829" y="-29"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0456.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0456.glif
index f577743cd..e12d4fdfa 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0456.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0456.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0456" format="1">
+<glyph name="uni0456" format="2">
   <advance width="1233"/>
   <unicode hex="0456"/>
   <outline>
     <contour>
-      <point x="588" y="1323" type="line" name="hr00" smooth="yes"/>
+      <point x="588" y="1323" type="line" smooth="yes" name="hr00"/>
       <point x="567" y="1323"/>
       <point x="557" y="1336"/>
       <point x="561" y="1356" type="curve" smooth="yes"/>
       <point x="617" y="1638" type="line"/>
       <point x="620" y="1656"/>
       <point x="630" y="1665"/>
-      <point x="649" y="1665" type="curve" name="dv01" smooth="yes"/>
+      <point x="649" y="1665" type="curve" smooth="yes" name="dv01"/>
       <point x="882" y="1665" type="line" smooth="yes"/>
       <point x="903" y="1665"/>
       <point x="913" y="1652"/>
@@ -22,7 +22,7 @@
       <point x="821" y="1323" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="732" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="732" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="589" y="-8"/>
       <point x="499" y="10"/>
       <point x="442" y="49" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="687" y="236" type="curve" smooth="yes"/>
       <point x="708" y="223"/>
       <point x="744" y="217"/>
-      <point x="796" y="217" type="curve" name="sv02" smooth="yes"/>
+      <point x="796" y="217" type="curve" smooth="yes" name="sv02"/>
       <point x="1074" y="217" type="line"/>
       <point x="1029" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0457.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0457.glif
index e5b8d1f75..60501b887 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0457.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0457.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0457" format="1">
+<glyph name="uni0457" format="2">
   <advance width="1233"/>
   <unicode hex="0457"/>
   <outline>
     <contour>
-      <point x="369" y="1320" type="line" name="hr00" smooth="yes"/>
+      <point x="369" y="1320" type="line" smooth="yes" name="hr00"/>
       <point x="349" y="1320"/>
       <point x="338" y="1333"/>
       <point x="342" y="1353" type="curve" smooth="yes"/>
       <point x="378" y="1539" type="line"/>
       <point x="381" y="1557"/>
       <point x="391" y="1566"/>
-      <point x="410" y="1566" type="curve" name="at01" smooth="yes"/>
+      <point x="410" y="1566" type="curve" smooth="yes" name="at01"/>
       <point x="587" y="1566" type="line" smooth="yes"/>
       <point x="608" y="1566"/>
       <point x="617" y="1553"/>
@@ -22,14 +22,14 @@
       <point x="544" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="764" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="764" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="744" y="1320"/>
       <point x="733" y="1333"/>
       <point x="737" y="1353" type="curve" smooth="yes"/>
       <point x="773" y="1539" type="line"/>
       <point x="776" y="1557"/>
       <point x="786" y="1566"/>
-      <point x="805" y="1566" type="curve" name="at02" smooth="yes"/>
+      <point x="805" y="1566" type="curve" smooth="yes" name="at02"/>
       <point x="983" y="1566" type="line" smooth="yes"/>
       <point x="1004" y="1566"/>
       <point x="1013" y="1553"/>
@@ -37,10 +37,10 @@
       <point x="972" y="1347" type="line" smooth="yes"/>
       <point x="969" y="1329"/>
       <point x="958" y="1320"/>
-      <point x="940" y="1320" type="curve" name="sv02" smooth="yes"/>
+      <point x="940" y="1320" type="curve" smooth="yes" name="sv02"/>
     </contour>
     <contour>
-      <point x="703" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="703" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="560" y="-8"/>
       <point x="470" y="10"/>
       <point x="413" y="49" type="curve" smooth="yes"/>
@@ -69,7 +69,7 @@
       <point x="658" y="236" type="curve" smooth="yes"/>
       <point x="679" y="223"/>
       <point x="715" y="217"/>
-      <point x="767" y="217" type="curve" name="sv04" smooth="yes"/>
+      <point x="767" y="217" type="curve" smooth="yes" name="sv04"/>
       <point x="1045" y="217" type="line"/>
       <point x="1000" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0458.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0458.glif
index 17b85c8f8..8085faf5a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0458.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0458.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0458" format="1">
+<glyph name="uni0458" format="2">
   <advance width="1233"/>
   <unicode hex="0458"/>
   <outline>
     <contour>
-      <point x="743" y="1323" type="line" name="hr00" smooth="yes"/>
+      <point x="743" y="1323" type="line" smooth="yes" name="hr00"/>
       <point x="723" y="1323"/>
       <point x="712" y="1336"/>
       <point x="716" y="1356" type="curve" smooth="yes"/>
       <point x="771" y="1638" type="line"/>
       <point x="774" y="1656"/>
       <point x="784" y="1665"/>
-      <point x="803" y="1665" type="curve" name="dv01" smooth="yes"/>
+      <point x="803" y="1665" type="curve" smooth="yes" name="dv01"/>
       <point x="1036" y="1665" type="line" smooth="yes"/>
       <point x="1056" y="1665"/>
       <point x="1067" y="1652"/>
@@ -40,7 +40,7 @@
       <point x="492" y="-398" type="curve" smooth="yes"/>
       <point x="437" y="-415"/>
       <point x="367" y="-424"/>
-      <point x="284" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="284" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="-23" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0459.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0459.glif
index e4a40bc8e..9f519d307 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0459.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0459.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0459" format="1">
+<glyph name="uni0459" format="2">
   <advance width="1233"/>
   <unicode hex="0459"/>
   <outline>
@@ -18,13 +18,13 @@
       <point x="852" y="698" type="line" smooth="yes"/>
       <point x="1065" y="698"/>
       <point x="1194" y="585"/>
-      <point x="1194" y="429" type="curve" name="dh02" smooth="yes"/>
+      <point x="1194" y="429" type="curve" smooth="yes" name="dh02"/>
       <point x="1194" y="405"/>
       <point x="1191" y="379"/>
       <point x="1186" y="350" type="curve" smooth="yes"/>
       <point x="1143" y="114"/>
       <point x="925" y="0"/>
-      <point x="716" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="716" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="465" y="0" type="line"/>
       <point x="640" y="901" type="line"/>
       <point x="522" y="901" type="line"/>
@@ -34,14 +34,14 @@
       <point x="262" y="114" type="curve" smooth="yes"/>
       <point x="189" y="35"/>
       <point x="84" y="0"/>
-      <point x="-60" y="0" type="curve" name="ab02" smooth="yes"/>
+      <point x="-60" y="0" type="curve" smooth="yes" name="ab02"/>
       <point x="-104" y="0" type="line"/>
     </contour>
     <contour>
       <point x="765" y="219" type="line" smooth="yes"/>
       <point x="845" y="219"/>
       <point x="949" y="272"/>
-      <point x="949" y="370" type="curve" name="dh01" smooth="yes"/>
+      <point x="949" y="370" type="curve" smooth="yes" name="dh01"/>
       <point x="949" y="451"/>
       <point x="878" y="479"/>
       <point x="815" y="479" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni045A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni045A_.glif
index 8c49fa17c..a6a0d2412 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni045A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni045A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni045A" format="1">
+<glyph name="uni045A" format="2">
   <advance width="1233"/>
   <unicode hex="045A"/>
   <outline>
@@ -14,13 +14,13 @@
       <point x="872" y="698" type="line" smooth="yes"/>
       <point x="1085" y="698"/>
       <point x="1214" y="585"/>
-      <point x="1214" y="429" type="curve" name="dh02" smooth="yes"/>
+      <point x="1214" y="429" type="curve" smooth="yes" name="dh02"/>
       <point x="1214" y="405"/>
       <point x="1211" y="379"/>
       <point x="1206" y="350" type="curve" smooth="yes"/>
       <point x="1163" y="114"/>
       <point x="945" y="0"/>
-      <point x="736" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="736" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="485" y="0" type="line"/>
       <point x="586" y="520" type="line" name="dv01"/>
       <point x="287" y="520" type="line"/>
@@ -28,10 +28,10 @@
       <point x="-54" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="785" y="219" type="line" name="sv01" smooth="yes"/>
+      <point x="785" y="219" type="line" smooth="yes" name="sv01"/>
       <point x="865" y="219"/>
       <point x="969" y="272"/>
-      <point x="969" y="370" type="curve" name="dh01" smooth="yes"/>
+      <point x="969" y="370" type="curve" smooth="yes" name="dh01"/>
       <point x="969" y="451"/>
       <point x="898" y="479"/>
       <point x="835" y="479" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni045B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni045B_.glif
index 40224f3fa..039c022fb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni045B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni045B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni045B" format="1">
+<glyph name="uni045B" format="2">
   <advance width="1233"/>
   <unicode hex="045B"/>
   <outline>
@@ -17,10 +17,10 @@
       <point x="482" y="600" type="line" name="iv01"/>
       <point x="546" y="721"/>
       <point x="659" y="795"/>
-      <point x="811" y="795" type="curve" name="dv02" smooth="yes"/>
+      <point x="811" y="795" type="curve" smooth="yes" name="dv02"/>
       <point x="978" y="795"/>
       <point x="1063" y="706"/>
-      <point x="1063" y="525" type="curve" name="dh02" smooth="yes"/>
+      <point x="1063" y="525" type="curve" smooth="yes" name="dh02"/>
       <point x="1063" y="482"/>
       <point x="1058" y="431"/>
       <point x="1047" y="375" type="curve" smooth="yes"/>
@@ -29,10 +29,10 @@
       <point x="747" y="330" type="line" smooth="yes"/>
       <point x="754" y="362"/>
       <point x="758" y="403"/>
-      <point x="758" y="432" type="curve" name="dh01" smooth="yes"/>
+      <point x="758" y="432" type="curve" smooth="yes" name="dh01"/>
       <point x="758" y="515"/>
       <point x="719" y="555"/>
-      <point x="647" y="555" type="curve" name="dv01" smooth="yes"/>
+      <point x="647" y="555" type="curve" smooth="yes" name="dv01"/>
       <point x="534" y="555"/>
       <point x="454" y="456"/>
       <point x="422" y="289" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni045C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni045C_.glif
index 66ded44be..f96b7c5c4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni045C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni045C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni045C" format="1">
+<glyph name="uni045C" format="2">
   <advance width="1233"/>
   <unicode hex="045C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni045D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni045D_.glif
index 942024a6b..0bd08fc76 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni045D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni045D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni045D" format="1">
+<glyph name="uni045D" format="2">
   <advance width="1233"/>
   <unicode hex="045D"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni045E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni045E_.glif
index ea955b9cc..6aeca9351 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni045E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni045E_.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni045E" format="1">
+<glyph name="uni045E" format="2">
   <advance width="1233"/>
   <unicode hex="045E"/>
   <outline>
     <contour>
-      <point x="741" y="1270" type="curve" name="sv01" smooth="yes"/>
+      <point x="741" y="1270" type="curve" smooth="yes" name="sv01"/>
       <point x="550" y="1270"/>
       <point x="451" y="1355"/>
       <point x="451" y="1534" type="curve" smooth="yes"/>
       <point x="451" y="1567" type="line" name="dh01"/>
       <point x="595" y="1567" type="line"/>
-      <point x="595" y="1554" type="line" name="dh02" smooth="yes"/>
+      <point x="595" y="1554" type="line" smooth="yes" name="dh02"/>
       <point x="595" y="1473"/>
       <point x="657" y="1421"/>
-      <point x="761" y="1421" type="curve" name="sv02" smooth="yes"/>
+      <point x="761" y="1421" type="curve" smooth="yes" name="sv02"/>
       <point x="866" y="1421"/>
       <point x="949" y="1475"/>
       <point x="982" y="1567" type="curve" name="at02"/>
@@ -33,10 +33,10 @@
       <point x="590" y="420" type="line" name="sh02"/>
       <point x="973" y="1120" type="line" name="hr01"/>
       <point x="1282" y="1120" type="line" name="iv01"/>
-      <point x="576" y="-121" type="line" name="hr02" smooth="yes"/>
+      <point x="576" y="-121" type="line" smooth="yes" name="hr02"/>
       <point x="426" y="-386"/>
       <point x="343" y="-424"/>
-      <point x="175" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="175" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="-65" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni045F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni045F_.glif
index a0c668a81..7e5d5927d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni045F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni045F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni045F" format="1">
+<glyph name="uni045F" format="2">
   <advance width="1233"/>
   <unicode hex="045F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0462.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0462.glif
index 237ca2227..57216c227 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0462.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0462.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0462" format="1">
+<glyph name="uni0462" format="2">
   <advance width="1233"/>
   <unicode hex="0462"/>
   <outline>
@@ -18,26 +18,26 @@
       <point x="627" y="913" type="line" smooth="yes"/>
       <point x="975" y="913"/>
       <point x="1132" y="813"/>
-      <point x="1132" y="584" type="curve" name="dh01" smooth="yes"/>
+      <point x="1132" y="584" type="curve" smooth="yes" name="dh01"/>
       <point x="1132" y="543"/>
       <point x="1127" y="499"/>
       <point x="1118" y="451" type="curve" smooth="yes"/>
       <point x="1057" y="142"/>
       <point x="860" y="0"/>
-      <point x="450" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="450" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="125" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="507" y="236" type="line" name="hr01" smooth="yes"/>
+      <point x="507" y="236" type="line" smooth="yes" name="hr01"/>
       <point x="713" y="236"/>
       <point x="787" y="294"/>
       <point x="819" y="451" type="curve" smooth="yes"/>
       <point x="825" y="482"/>
       <point x="828" y="509"/>
-      <point x="828" y="532" type="curve" name="hr02" smooth="yes"/>
+      <point x="828" y="532" type="curve" smooth="yes" name="hr02"/>
       <point x="828" y="641"/>
       <point x="762" y="678"/>
-      <point x="593" y="678" type="curve" name="dv01" smooth="yes"/>
+      <point x="593" y="678" type="curve" smooth="yes" name="dv01"/>
       <point x="552" y="678" type="line"/>
       <point x="466" y="236" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0463.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0463.glif
index e2c15fd30..10341af5c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0463.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0463.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0463" format="1">
+<glyph name="uni0463" format="2">
   <advance width="1233"/>
   <unicode hex="0463"/>
   <outline>
@@ -18,26 +18,26 @@
       <point x="726" y="698" type="line" smooth="yes"/>
       <point x="977" y="698"/>
       <point x="1121" y="608"/>
-      <point x="1121" y="428" type="curve" name="dh02" smooth="yes"/>
+      <point x="1121" y="428" type="curve" smooth="yes" name="dh02"/>
       <point x="1121" y="401"/>
       <point x="1118" y="378"/>
       <point x="1113" y="350" type="curve" smooth="yes"/>
       <point x="1070" y="121"/>
       <point x="877" y="0"/>
-      <point x="590" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="590" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="172" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="579" y="219" type="line" name="sv03" smooth="yes"/>
+      <point x="579" y="219" type="line" smooth="yes" name="sv03"/>
       <point x="728" y="219"/>
       <point x="803" y="258"/>
       <point x="820" y="350" type="curve" smooth="yes"/>
       <point x="822" y="361"/>
       <point x="823" y="371"/>
-      <point x="823" y="380" type="curve" name="dh01" smooth="yes"/>
+      <point x="823" y="380" type="curve" smooth="yes" name="dh01"/>
       <point x="823" y="452"/>
       <point x="760" y="479"/>
-      <point x="629" y="479" type="curve" name="dv01" smooth="yes"/>
+      <point x="629" y="479" type="curve" smooth="yes" name="dv01"/>
       <point x="556" y="479" type="line"/>
       <point x="506" y="219" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0472.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0472.glif
index 25cf1031d..b774083de 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0472.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0472.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0472" format="1">
+<glyph name="uni0472" format="2">
   <advance width="1233"/>
   <unicode hex="0472"/>
   <outline>
     <contour>
-      <point x="465" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="465" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="137" y="-29"/>
       <point x="54" y="187"/>
-      <point x="54" y="414" type="curve" name="sh01" smooth="yes"/>
+      <point x="54" y="414" type="curve" smooth="yes" name="sh01"/>
       <point x="54" y="520"/>
       <point x="72" y="644"/>
       <point x="91" y="745" type="curve" smooth="yes"/>
@@ -16,10 +16,10 @@
       <point x="586" y="1493" type="curve" smooth="yes"/>
       <point x="642" y="1511"/>
       <point x="702" y="1520"/>
-      <point x="766" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="766" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1039" y="1520"/>
       <point x="1174" y="1358"/>
-      <point x="1174" y="1054" type="curve" name="sh02" smooth="yes"/>
+      <point x="1174" y="1054" type="curve" smooth="yes" name="sh02"/>
       <point x="1174" y="967"/>
       <point x="1163" y="859"/>
       <point x="1142" y="744" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="860" y="911" type="line" name="sh03"/>
       <point x="864" y="953"/>
       <point x="866" y="991"/>
-      <point x="866" y="1026" type="curve" name="ah01" smooth="yes"/>
+      <point x="866" y="1026" type="curve" smooth="yes" name="ah01"/>
       <point x="866" y="1098"/>
       <point x="857" y="1151"/>
       <point x="838" y="1186" type="curve" smooth="yes"/>
       <point x="811" y="1235"/>
       <point x="770" y="1255"/>
-      <point x="715" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="715" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="611" y="1255"/>
       <point x="541" y="1184"/>
       <point x="481" y="1041" type="curve"/>
@@ -48,14 +48,14 @@
       <point x="437" y="911" type="curve"/>
     </contour>
     <contour>
-      <point x="518" y="236" type="curve" name="dv01" smooth="yes"/>
+      <point x="518" y="236" type="curve" smooth="yes" name="dv01"/>
       <point x="668" y="236"/>
       <point x="750" y="381"/>
       <point x="814" y="651" type="curve" name="dv02"/>
       <point x="383" y="651" type="line"/>
       <point x="372" y="576"/>
       <point x="366" y="513"/>
-      <point x="366" y="457" type="curve" name="sh04" smooth="yes"/>
+      <point x="366" y="457" type="curve" smooth="yes" name="sh04"/>
       <point x="366" y="312"/>
       <point x="407" y="236"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0473.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0473.glif
index e2d09afaa..173572e93 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0473.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0473.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0473" format="1">
+<glyph name="uni0473" format="2">
   <advance width="1233"/>
   <unicode hex="0473"/>
   <outline>
     <contour>
-      <point x="502" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="502" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="341" y="-29"/>
       <point x="226" y="26"/>
       <point x="155" y="130" type="curve" smooth="yes"/>
       <point x="106" y="201"/>
       <point x="82" y="292"/>
-      <point x="82" y="402" type="curve" name="sh01" smooth="yes"/>
+      <point x="82" y="402" type="curve" smooth="yes" name="sh01"/>
       <point x="82" y="606"/>
       <point x="165" y="840"/>
       <point x="321" y="988" type="curve" smooth="yes"/>
       <point x="430" y="1092"/>
       <point x="570" y="1147"/>
-      <point x="731" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="731" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="888" y="1147"/>
       <point x="1005" y="1095"/>
       <point x="1077" y="988" type="curve" smooth="yes"/>
       <point x="1128" y="912"/>
       <point x="1150" y="820"/>
-      <point x="1150" y="715" type="curve" name="sh02" smooth="yes"/>
+      <point x="1150" y="715" type="curve" smooth="yes" name="sh02"/>
       <point x="1150" y="507"/>
       <point x="1063" y="274"/>
       <point x="911" y="130" type="curve" smooth="yes"/>
@@ -33,16 +33,16 @@
       <point x="853" y="632" type="line" name="sh03"/>
       <point x="855" y="651"/>
       <point x="856" y="669"/>
-      <point x="856" y="687" type="curve" name="ah01" smooth="yes"/>
+      <point x="856" y="687" type="curve" smooth="yes" name="ah01"/>
       <point x="856" y="812"/>
       <point x="808" y="909"/>
-      <point x="684" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="684" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="544" y="909"/>
       <point x="450" y="783"/>
       <point x="408" y="632" type="curve"/>
     </contour>
     <contour>
-      <point x="548" y="209" type="curve" name="dv01" smooth="yes"/>
+      <point x="548" y="209" type="curve" smooth="yes" name="dv01"/>
       <point x="688" y="209"/>
       <point x="769" y="330"/>
       <point x="809" y="438" type="curve" name="dv02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0490.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0490.glif
index ef011f1ed..e1bc7cc11 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0490.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0490.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0490" format="1">
+<glyph name="uni0490" format="2">
   <advance width="1233"/>
   <unicode hex="0490"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0491.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0491.glif
index c263ea5bd..38055ac74 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0491.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0491.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0491" format="1">
+<glyph name="uni0491" format="2">
   <advance width="1233"/>
   <unicode hex="0491"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0492.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0492.glif
index 0fe1bda68..0ccad8381 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0492.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0492.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0492" format="1">
+<glyph name="uni0492" format="2">
   <advance width="1233"/>
   <unicode hex="0492"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0493.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0493.glif
index bf53c886d..9f63aa8bf 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0493.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0493.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0493" format="1">
+<glyph name="uni0493" format="2">
   <advance width="1233"/>
   <unicode hex="0493"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0494.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0494.glif
index c4266293a..a640ff8b5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0494.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0494.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0494" format="1">
+<glyph name="uni0494" format="2">
   <advance width="1233"/>
   <unicode hex="0494"/>
   <outline>
@@ -12,10 +12,10 @@
       <point x="769" y="464" type="line" smooth="yes"/>
       <point x="777" y="507"/>
       <point x="782" y="539"/>
-      <point x="782" y="570" type="curve" name="dh01" smooth="yes"/>
+      <point x="782" y="570" type="curve" smooth="yes" name="dh01"/>
       <point x="782" y="654"/>
       <point x="744" y="686"/>
-      <point x="659" y="686" type="curve" name="dv01" smooth="yes"/>
+      <point x="659" y="686" type="curve" smooth="yes" name="dv01"/>
       <point x="425" y="686" type="line"/>
       <point x="292" y="0" type="line" name="ab01"/>
       <point x="-3" y="0" type="line"/>
@@ -24,7 +24,7 @@
       <point x="1167" y="1233" type="line" name="sv01"/>
       <point x="532" y="1233" type="line"/>
       <point x="477" y="952" type="line"/>
-      <point x="786" y="952" type="line" name="dv02" smooth="yes"/>
+      <point x="786" y="952" type="line" smooth="yes" name="dv02"/>
       <point x="874" y="952"/>
       <point x="949" y="931"/>
       <point x="1002" y="899" type="curve" smooth="yes"/>
@@ -33,14 +33,14 @@
       <point x="1057" y="846" type="curve"/>
       <point x="1081" y="804"/>
       <point x="1093" y="750"/>
-      <point x="1093" y="684" type="curve" name="dh02" smooth="yes"/>
+      <point x="1093" y="684" type="curve" smooth="yes" name="dh02"/>
       <point x="1093" y="640"/>
       <point x="1088" y="588"/>
       <point x="1077" y="532" type="curve" smooth="yes"/>
       <point x="982" y="43" type="line"/>
       <point x="918" y="-293"/>
       <point x="781" y="-424"/>
-      <point x="499" y="-424" type="curve" name="ab02" smooth="yes"/>
+      <point x="499" y="-424" type="curve" smooth="yes" name="ab02"/>
       <point x="281" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0495.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0495.glif
index f4a36032d..5b44f2873 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0495.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0495.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0495" format="1">
+<glyph name="uni0495" format="2">
   <advance width="1233"/>
   <unicode hex="0495"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="698" y="180" type="line" smooth="yes"/>
       <point x="706" y="220"/>
       <point x="709" y="253"/>
-      <point x="709" y="280" type="curve" name="dh01" smooth="yes"/>
+      <point x="709" y="280" type="curve" smooth="yes" name="dh01"/>
       <point x="709" y="371"/>
       <point x="672" y="405"/>
       <point x="595" y="405" type="curve" smooth="yes"/>
@@ -27,14 +27,14 @@
       <point x="758" y="645" type="line" smooth="yes"/>
       <point x="929" y="645"/>
       <point x="1015" y="556"/>
-      <point x="1015" y="377" type="curve" name="dh02" smooth="yes"/>
+      <point x="1015" y="377" type="curve" smooth="yes" name="dh02"/>
       <point x="1015" y="330"/>
       <point x="1009" y="281"/>
       <point x="998" y="225" type="curve" smooth="yes"/>
       <point x="962" y="43" type="line" smooth="yes"/>
       <point x="895" y="-291"/>
       <point x="767" y="-424"/>
-      <point x="484" y="-424" type="curve" name="ab02" smooth="yes"/>
+      <point x="484" y="-424" type="curve" smooth="yes" name="ab02"/>
       <point x="289" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0496.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0496.glif
index bf1e88b06..9a41a85a9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0496.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0496.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0496" format="1">
+<glyph name="uni0496" format="2">
   <advance width="1233"/>
   <unicode hex="0496"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0497.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0497.glif
index 66f987724..169b23135 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0497.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0497.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0497" format="1">
+<glyph name="uni0497" format="2">
   <advance width="1233"/>
   <unicode hex="0497"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0498.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0498.glif
index f6956ea26..34e7e8b23 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0498.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0498.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0498" format="1">
+<glyph name="uni0498" format="2">
   <advance width="1233"/>
   <unicode hex="0498"/>
   <outline>
@@ -7,26 +7,26 @@
       <point x="764" y="805" type="curve" name="ih01"/>
       <point x="952" y="754"/>
       <point x="1030" y="642"/>
-      <point x="1030" y="469" type="curve" name="dh04" smooth="yes"/>
+      <point x="1030" y="469" type="curve" smooth="yes" name="dh04"/>
       <point x="1030" y="196"/>
       <point x="840" y="11"/>
       <point x="527" y="-24" type="curve" name="ih02"/>
       <point x="564" y="-79"/>
       <point x="582" y="-133"/>
-      <point x="582" y="-186" type="curve" name="dh02" smooth="yes"/>
+      <point x="582" y="-186" type="curve" smooth="yes" name="dh02"/>
       <point x="582" y="-316"/>
       <point x="474" y="-401"/>
-      <point x="292" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="292" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="232" y="-401"/>
       <point x="161" y="-392"/>
       <point x="97" y="-375" type="curve"/>
       <point x="125" y="-219" type="line"/>
       <point x="183" y="-242"/>
       <point x="237" y="-254"/>
-      <point x="287" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="287" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="375" y="-254"/>
       <point x="426" y="-218"/>
-      <point x="426" y="-151" type="curve" name="dh01" smooth="yes"/>
+      <point x="426" y="-151" type="curve" smooth="yes" name="dh01"/>
       <point x="426" y="-120"/>
       <point x="415" y="-84"/>
       <point x="384" y="-28" type="curve" name="dv03"/>
@@ -36,32 +36,32 @@
       <point x="23" y="315" type="line" name="hr01"/>
       <point x="148" y="255"/>
       <point x="295" y="221"/>
-      <point x="423" y="221" type="curve" name="dv04" smooth="yes"/>
+      <point x="423" y="221" type="curve" smooth="yes" name="dv04"/>
       <point x="639" y="221"/>
       <point x="750" y="321"/>
-      <point x="750" y="469" type="curve" name="dh03" smooth="yes"/>
+      <point x="750" y="469" type="curve" smooth="yes" name="dh03"/>
       <point x="750" y="605"/>
       <point x="658" y="668"/>
-      <point x="514" y="668" type="curve" name="dv05" smooth="yes"/>
+      <point x="514" y="668" type="curve" smooth="yes" name="dv05"/>
       <point x="356" y="668" type="line"/>
       <point x="408" y="928" type="line"/>
-      <point x="565" y="928" type="line" name="dv06" smooth="yes"/>
+      <point x="565" y="928" type="line" smooth="yes" name="dv06"/>
       <point x="730" y="928"/>
       <point x="844" y="1011"/>
-      <point x="844" y="1124" type="curve" name="ih03" smooth="yes"/>
+      <point x="844" y="1124" type="curve" smooth="yes" name="ih03"/>
       <point x="844" y="1217"/>
       <point x="765" y="1270"/>
-      <point x="620" y="1270" type="curve" name="sv01" smooth="yes"/>
+      <point x="620" y="1270" type="curve" smooth="yes" name="sv01"/>
       <point x="512" y="1270"/>
       <point x="379" y="1241"/>
       <point x="231" y="1188" type="curve"/>
       <point x="285" y="1456" type="line"/>
       <point x="425" y="1499"/>
       <point x="556" y="1520"/>
-      <point x="664" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="664" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="945" y="1520"/>
       <point x="1120" y="1378"/>
-      <point x="1120" y="1166" type="curve" name="sh01" smooth="yes"/>
+      <point x="1120" y="1166" type="curve" smooth="yes" name="sh01"/>
       <point x="1120" y="979"/>
       <point x="987" y="845"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0499.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0499.glif
index 00863ea9a..a443dfebe 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0499.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0499.glif
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0499" format="1">
+<glyph name="uni0499" format="2">
   <advance width="1233"/>
   <unicode hex="0499"/>
   <outline>
     <contour>
-      <point x="1095" y="836" type="curve" name="hr00" smooth="yes"/>
+      <point x="1095" y="836" type="curve" smooth="yes" name="hr00"/>
       <point x="1063" y="672"/>
       <point x="966" y="608"/>
       <point x="859" y="573" type="curve" name="ih01"/>
       <point x="958" y="541"/>
       <point x="1031" y="460"/>
-      <point x="1031" y="335" type="curve" name="dh04" smooth="yes"/>
+      <point x="1031" y="335" type="curve" smooth="yes" name="dh04"/>
       <point x="1031" y="114"/>
       <point x="802" y="3"/>
       <point x="507" y="-18" type="curve" name="ih02"/>
       <point x="546" y="-75"/>
       <point x="566" y="-131"/>
-      <point x="566" y="-186" type="curve" name="dh02" smooth="yes"/>
+      <point x="566" y="-186" type="curve" smooth="yes" name="dh02"/>
       <point x="566" y="-316"/>
       <point x="458" y="-401"/>
-      <point x="276" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="276" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="216" y="-401"/>
       <point x="145" y="-392"/>
       <point x="81" y="-375" type="curve"/>
       <point x="109" y="-219" type="line"/>
       <point x="167" y="-242"/>
       <point x="221" y="-254"/>
-      <point x="271" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="271" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="359" y="-254"/>
       <point x="410" y="-218"/>
-      <point x="410" y="-151" type="curve" name="dh01" smooth="yes"/>
+      <point x="410" y="-151" type="curve" smooth="yes" name="dh01"/>
       <point x="410" y="-119"/>
       <point x="397" y="-82"/>
       <point x="365" y="-22" type="curve" name="ab01"/>
@@ -39,35 +39,35 @@
       <point x="98" y="280" type="line" name="iv01"/>
       <point x="219" y="215"/>
       <point x="299" y="201"/>
-      <point x="467" y="201" type="curve" name="sv01" smooth="yes"/>
+      <point x="467" y="201" type="curve" smooth="yes" name="sv01"/>
       <point x="614" y="201"/>
       <point x="718" y="212"/>
       <point x="740" y="325" type="curve" smooth="yes"/>
       <point x="742" y="335"/>
       <point x="743" y="344"/>
-      <point x="743" y="352" type="curve" name="dh03" smooth="yes"/>
+      <point x="743" y="352" type="curve" smooth="yes" name="dh03"/>
       <point x="743" y="435"/>
       <point x="628" y="462"/>
-      <point x="536" y="462" type="curve" name="dv03" smooth="yes"/>
+      <point x="536" y="462" type="curve" smooth="yes" name="dv03"/>
       <point x="373" y="462" type="line"/>
       <point x="416" y="681" type="line" name="sh01"/>
-      <point x="553" y="681" type="line" name="dv04" smooth="yes"/>
+      <point x="553" y="681" type="line" smooth="yes" name="dv04"/>
       <point x="665" y="681"/>
       <point x="808" y="715"/>
-      <point x="808" y="819" type="curve" name="sh02" smooth="yes"/>
+      <point x="808" y="819" type="curve" smooth="yes" name="sh02"/>
       <point x="808" y="894"/>
       <point x="734" y="928"/>
-      <point x="577" y="928" type="curve" name="sv02" smooth="yes"/>
+      <point x="577" y="928" type="curve" smooth="yes" name="sv02"/>
       <point x="468" y="928"/>
       <point x="359" y="911"/>
       <point x="251" y="876" type="curve" name="iv02"/>
       <point x="294" y="1099" type="line"/>
       <point x="401" y="1128"/>
       <point x="532" y="1147"/>
-      <point x="660" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="660" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="960" y="1147"/>
       <point x="1101" y="1042"/>
-      <point x="1101" y="894" type="curve" name="sh03" smooth="yes"/>
+      <point x="1101" y="894" type="curve" smooth="yes" name="sh03"/>
       <point x="1101" y="875"/>
       <point x="1099" y="855"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni049A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni049A_.glif
index 242f5ef47..35616039d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni049A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni049A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni049A" format="1">
+<glyph name="uni049A" format="2">
   <advance width="1233"/>
   <unicode hex="049A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni049B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni049B_.glif
index 0265fc628..5a8152da4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni049B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni049B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni049B" format="1">
+<glyph name="uni049B" format="2">
   <advance width="1233"/>
   <unicode hex="049B"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04A_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04A_2.glif
index ea815e514..8d4870a0c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04A_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04A_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04A2" format="1">
+<glyph name="uni04A2" format="2">
   <advance width="1233"/>
   <unicode hex="04A2"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04A_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04A_3.glif
index 16e1c513c..388801854 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04A_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04A_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04A3" format="1">
+<glyph name="uni04A3" format="2">
   <advance width="1233"/>
   <unicode hex="04A3"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04A_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04A_4.glif
index 40d0ee9f5..13c8e4c00 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04A_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04A4" format="1">
+<glyph name="uni04A4" format="2">
   <advance width="1233"/>
   <unicode hex="04A4"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04A_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04A_5.glif
index 005631193..0b4e72487 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04A_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04A_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04A5" format="1">
+<glyph name="uni04A5" format="2">
   <advance width="1233"/>
   <unicode hex="04A5"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04A_A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04A_A_.glif
index 348eba10f..372b266fb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04A_A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04A_A_.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04AA" format="1">
+<glyph name="uni04AA" format="2">
   <advance width="1233"/>
   <unicode hex="04AA"/>
   <outline>
     <contour>
-      <point x="871" y="1520" type="curve" name="hr00" smooth="yes"/>
+      <point x="871" y="1520" type="curve" smooth="yes" name="hr00"/>
       <point x="984" y="1520"/>
       <point x="1085" y="1496"/>
       <point x="1189" y="1448" type="curve"/>
       <point x="1125" y="1120" type="line"/>
       <point x="1060" y="1209"/>
       <point x="956" y="1257"/>
-      <point x="852" y="1257" type="curve" name="sv01" smooth="yes"/>
+      <point x="852" y="1257" type="curve" smooth="yes" name="sv01"/>
       <point x="727" y="1257"/>
       <point x="627" y="1188"/>
       <point x="554" y="1075" type="curve" smooth="yes"/>
       <point x="464" y="937"/>
       <point x="400" y="711"/>
-      <point x="400" y="536" type="curve" name="dh02" smooth="yes"/>
+      <point x="400" y="536" type="curve" smooth="yes" name="dh02"/>
       <point x="400" y="332"/>
       <point x="486" y="231"/>
       <point x="647" y="231" type="curve" smooth="yes"/>
@@ -30,26 +30,26 @@
       <point x="669" y="-25" type="curve" name="ih01"/>
       <point x="705" y="-81"/>
       <point x="723" y="-131"/>
-      <point x="723" y="-186" type="curve" name="dh04" smooth="yes"/>
+      <point x="723" y="-186" type="curve" smooth="yes" name="dh04"/>
       <point x="723" y="-316"/>
       <point x="615" y="-401"/>
-      <point x="433" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="433" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="373" y="-401"/>
       <point x="302" y="-392"/>
       <point x="238" y="-375" type="curve"/>
       <point x="266" y="-219" type="line"/>
       <point x="324" y="-242"/>
       <point x="378" y="-254"/>
-      <point x="428" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="428" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="516" y="-254"/>
       <point x="567" y="-218"/>
-      <point x="567" y="-151" type="curve" name="dh03" smooth="yes"/>
+      <point x="567" y="-151" type="curve" smooth="yes" name="dh03"/>
       <point x="567" y="-120"/>
       <point x="555" y="-83"/>
       <point x="524" y="-26" type="curve"/>
       <point x="249" y="-2"/>
       <point x="101" y="179"/>
-      <point x="101" y="522" type="curve" name="dh01" smooth="yes"/>
+      <point x="101" y="522" type="curve" smooth="yes" name="dh01"/>
       <point x="101" y="805"/>
       <point x="203" y="1112"/>
       <point x="363" y="1296" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04A_B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04A_B_.glif
index 613d1065c..b80dfe599 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04A_B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04A_B_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04AB" format="1">
+<glyph name="uni04AB" format="2">
   <advance width="1233"/>
   <unicode hex="04AB"/>
   <outline>
     <contour>
-      <point x="805" y="909" type="curve" name="hr00" smooth="yes"/>
+      <point x="805" y="909" type="curve" smooth="yes" name="hr00"/>
       <point x="577" y="909"/>
       <point x="421" y="723"/>
-      <point x="421" y="472" type="curve" name="dh02" smooth="yes"/>
+      <point x="421" y="472" type="curve" smooth="yes" name="dh02"/>
       <point x="421" y="291"/>
       <point x="500" y="209"/>
-      <point x="661" y="209" type="curve" name="dv03" smooth="yes"/>
+      <point x="661" y="209" type="curve" smooth="yes" name="dv03"/>
       <point x="760" y="209"/>
       <point x="858" y="240"/>
       <point x="987" y="313" type="curve"/>
@@ -20,29 +20,29 @@
       <point x="631" y="-29" type="curve" name="ih01"/>
       <point x="666" y="-82"/>
       <point x="683" y="-134"/>
-      <point x="683" y="-186" type="curve" name="dh04" smooth="yes"/>
+      <point x="683" y="-186" type="curve" smooth="yes" name="dh04"/>
       <point x="683" y="-316"/>
       <point x="575" y="-401"/>
-      <point x="393" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="393" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="333" y="-401"/>
       <point x="262" y="-392"/>
       <point x="198" y="-375" type="curve"/>
       <point x="226" y="-219" type="line"/>
       <point x="284" y="-242"/>
       <point x="338" y="-254"/>
-      <point x="388" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="388" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="476" y="-254"/>
       <point x="527" y="-218"/>
-      <point x="527" y="-151" type="curve" name="dh03" smooth="yes"/>
+      <point x="527" y="-151" type="curve" smooth="yes" name="dh03"/>
       <point x="527" y="-118"/>
       <point x="515" y="-81"/>
       <point x="480" y="-18" type="curve" name="sv01"/>
       <point x="256" y="23"/>
       <point x="125" y="184"/>
-      <point x="125" y="457" type="curve" name="dh01" smooth="yes"/>
+      <point x="125" y="457" type="curve" smooth="yes" name="dh01"/>
       <point x="125" y="848"/>
       <point x="392" y="1147"/>
-      <point x="795" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="795" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="916" y="1147"/>
       <point x="1031" y="1120"/>
       <point x="1132" y="1063" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04A_C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04A_C_.glif
index 084f93867..04a4041aa 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04A_C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04A_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04AC" format="1">
+<glyph name="uni04AC" format="2">
   <advance width="1233"/>
   <unicode hex="04AC"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04A_D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04A_D_.glif
index 843b615af..924aa27eb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04A_D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04A_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04AD" format="1">
+<glyph name="uni04AD" format="2">
   <advance width="1233"/>
   <unicode hex="04AD"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04A_E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04A_E_.glif
index 35c610acf..e0c3a8e7d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04A_E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04A_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04AE" format="1">
+<glyph name="uni04AE" format="2">
   <advance width="1233"/>
   <unicode hex="04AE"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04A_F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04A_F_.glif
index c2daf1be2..a53d5ffbf 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04A_F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04A_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04AF" format="1">
+<glyph name="uni04AF" format="2">
   <advance width="1233"/>
   <unicode hex="04AF"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04B_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04B_0.glif
index 5cdb568c7..63c421a78 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04B_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04B_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04B0" format="1">
+<glyph name="uni04B0" format="2">
   <advance width="1233"/>
   <unicode hex="04B0"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04B_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04B_1.glif
index 77067edc9..75c27a154 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04B_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04B_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04B1" format="1">
+<glyph name="uni04B1" format="2">
   <advance width="1233"/>
   <unicode hex="04B1"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04B_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04B_2.glif
index eabf56f05..dcad6fcea 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04B_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04B_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04B2" format="1">
+<glyph name="uni04B2" format="2">
   <advance width="1233"/>
   <unicode hex="04B2"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04B_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04B_3.glif
index 0dfaf1212..facb13197 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04B_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04B3" format="1">
+<glyph name="uni04B3" format="2">
   <advance width="1233"/>
   <unicode hex="04B3"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04B_A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04B_A_.glif
index 11aa4f080..769ecc97d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04B_A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04B_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04BA" format="1">
+<glyph name="uni04BA" format="2">
   <advance width="1233"/>
   <unicode hex="04BA"/>
   <outline>
@@ -23,7 +23,7 @@
       <point x="1099" y="943" type="curve" smooth="yes"/>
       <point x="1123" y="904"/>
       <point x="1135" y="849"/>
-      <point x="1135" y="780" type="curve" name="dh02" smooth="yes"/>
+      <point x="1135" y="780" type="curve" smooth="yes" name="dh02"/>
       <point x="1135" y="737"/>
       <point x="1130" y="685"/>
       <point x="1119" y="629" type="curve" smooth="yes"/>
@@ -32,7 +32,7 @@
       <point x="815" y="561" type="line" smooth="yes"/>
       <point x="823" y="601"/>
       <point x="827" y="635"/>
-      <point x="827" y="664" type="curve" name="dh01" smooth="yes"/>
+      <point x="827" y="664" type="curve" smooth="yes" name="dh01"/>
       <point x="827" y="694"/>
       <point x="823" y="717"/>
       <point x="814" y="734" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04B_B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04B_B_.glif
index f4d0c25de..0352eaeb8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04B_B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04B_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04BB" format="1">
+<glyph name="uni04BB" format="2">
   <advance width="1233"/>
   <unicode hex="04BB"/>
   <outline>
@@ -9,10 +9,10 @@
       <point x="537" y="952" type="line" name="iv01"/>
       <point x="601" y="1073"/>
       <point x="713" y="1147"/>
-      <point x="858" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="858" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1023" y="1147"/>
       <point x="1120" y="1051"/>
-      <point x="1120" y="882" type="curve" name="dh02" smooth="yes"/>
+      <point x="1120" y="882" type="curve" smooth="yes" name="dh02"/>
       <point x="1120" y="839"/>
       <point x="1114" y="792"/>
       <point x="1102" y="728" type="curve" smooth="yes"/>
@@ -21,10 +21,10 @@
       <point x="801" y="682" type="line" smooth="yes"/>
       <point x="808" y="717"/>
       <point x="811" y="756"/>
-      <point x="811" y="780" type="curve" name="dh01" smooth="yes"/>
+      <point x="811" y="780" type="curve" smooth="yes" name="dh01"/>
       <point x="811" y="868"/>
       <point x="771" y="907"/>
-      <point x="699" y="907" type="curve" name="sv01" smooth="yes"/>
+      <point x="699" y="907" type="curve" smooth="yes" name="sv01"/>
       <point x="586" y="907"/>
       <point x="508" y="810"/>
       <point x="473" y="629" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04C_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04C_0.glif
index 22955fffc..668db3d69 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04C_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04C_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C0" format="1">
+<glyph name="uni04C0" format="2">
   <advance width="1233"/>
   <unicode hex="04C0"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04C_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04C_1.glif
index 9c5068280..2924e0bd4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04C_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04C_1.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C1" format="1">
+<glyph name="uni04C1" format="2">
   <advance width="1233"/>
   <unicode hex="04C1"/>
   <outline>
     <contour>
-      <point x="761" y="1590" type="curve" name="dv01" smooth="yes"/>
+      <point x="761" y="1590" type="curve" smooth="yes" name="dv01"/>
       <point x="578" y="1590"/>
       <point x="478" y="1682"/>
       <point x="478" y="1850" type="curve" smooth="yes"/>
@@ -12,7 +12,7 @@
       <point x="621" y="1854" type="line" name="sv01"/>
       <point x="634" y="1774"/>
       <point x="687" y="1739"/>
-      <point x="792" y="1739" type="curve" name="dv02" smooth="yes"/>
+      <point x="792" y="1739" type="curve" smooth="yes" name="dv02"/>
       <point x="888" y="1739"/>
       <point x="961" y="1782"/>
       <point x="992" y="1854" type="curve" name="sv02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04C_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04C_2.glif
index 71b20097b..9c4c2dc99 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04C_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04C_2.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C2" format="1">
+<glyph name="uni04C2" format="2">
   <advance width="1233"/>
   <unicode hex="04C2"/>
   <outline>
     <contour>
-      <point x="751" y="1270" type="curve" name="sv01" smooth="yes"/>
+      <point x="751" y="1270" type="curve" smooth="yes" name="sv01"/>
       <point x="554" y="1270"/>
       <point x="456" y="1358"/>
       <point x="456" y="1534" type="curve" smooth="yes"/>
       <point x="456" y="1567" type="line" name="dh01"/>
       <point x="600" y="1567" type="line"/>
-      <point x="600" y="1554" type="line" name="dh02" smooth="yes"/>
+      <point x="600" y="1554" type="line" smooth="yes" name="dh02"/>
       <point x="600" y="1473"/>
       <point x="663" y="1421"/>
-      <point x="764" y="1421" type="curve" name="sv02" smooth="yes"/>
+      <point x="764" y="1421" type="curve" smooth="yes" name="sv02"/>
       <point x="872" y="1421"/>
       <point x="954" y="1475"/>
       <point x="987" y="1567" type="curve" name="at03"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04C_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04C_3.glif
index e65912d2a..19e90157f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04C_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04C_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C3" format="1">
+<glyph name="uni04C3" format="2">
   <advance width="1233"/>
   <unicode hex="04C3"/>
   <outline>
@@ -15,7 +15,7 @@
       <point x="754" y="464" type="line" smooth="yes"/>
       <point x="762" y="505"/>
       <point x="766" y="539"/>
-      <point x="766" y="568" type="curve" name="dh01" smooth="yes"/>
+      <point x="766" y="568" type="curve" smooth="yes" name="dh01"/>
       <point x="766" y="599"/>
       <point x="762" y="622"/>
       <point x="753" y="637" type="curve"/>
@@ -40,14 +40,14 @@
       <point x="1042" y="846" type="curve" smooth="yes"/>
       <point x="1065" y="809"/>
       <point x="1078" y="750"/>
-      <point x="1078" y="678" type="curve" name="dh02" smooth="yes"/>
+      <point x="1078" y="678" type="curve" smooth="yes" name="dh02"/>
       <point x="1078" y="635"/>
       <point x="1073" y="587"/>
       <point x="1062" y="532" type="curve" smooth="yes"/>
       <point x="967" y="43" type="line" smooth="yes"/>
       <point x="903" y="-288"/>
       <point x="768" y="-424"/>
-      <point x="484" y="-424" type="curve" name="ab02" smooth="yes"/>
+      <point x="484" y="-424" type="curve" smooth="yes" name="ab02"/>
       <point x="266" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04C_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04C_4.glif
index e089b326e..e077ceecc 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04C_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04C_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C4" format="1">
+<glyph name="uni04C4" format="2">
   <advance width="1233"/>
   <unicode hex="04C4"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="664" y="180" type="line" smooth="yes"/>
       <point x="672" y="220"/>
       <point x="675" y="253"/>
-      <point x="675" y="280" type="curve" name="dh01" smooth="yes"/>
+      <point x="675" y="280" type="curve" smooth="yes" name="dh01"/>
       <point x="675" y="371"/>
       <point x="638" y="405"/>
       <point x="561" y="405" type="curve" smooth="yes"/>
@@ -28,14 +28,14 @@
       <point x="724" y="645" type="line" smooth="yes"/>
       <point x="895" y="645"/>
       <point x="981" y="556"/>
-      <point x="981" y="377" type="curve" name="dh02" smooth="yes"/>
+      <point x="981" y="377" type="curve" smooth="yes" name="dh02"/>
       <point x="981" y="330"/>
       <point x="975" y="281"/>
       <point x="964" y="225" type="curve" smooth="yes"/>
       <point x="928" y="43" type="line" smooth="yes"/>
       <point x="861" y="-291"/>
       <point x="733" y="-424"/>
-      <point x="450" y="-424" type="curve" name="ab02" smooth="yes"/>
+      <point x="450" y="-424" type="curve" smooth="yes" name="ab02"/>
       <point x="255" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04C_7.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04C_7.glif
index f8289a81c..aefea6c8f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04C_7.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04C_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C7" format="1">
+<glyph name="uni04C7" format="2">
   <advance width="1233"/>
   <unicode hex="04C7"/>
   <outline>
@@ -22,7 +22,7 @@
       <point x="959" y="43" type="line"/>
       <point x="895" y="-293"/>
       <point x="751" y="-424"/>
-      <point x="476" y="-424" type="curve" name="ab02" smooth="yes"/>
+      <point x="476" y="-424" type="curve" smooth="yes" name="ab02"/>
       <point x="258" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04C_8.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04C_8.glif
index d9c2fff29..c97c42b68 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04C_8.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04C_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C8" format="1">
+<glyph name="uni04C8" format="2">
   <advance width="1233"/>
   <unicode hex="04C8"/>
   <outline>
@@ -22,7 +22,7 @@
       <point x="974" y="43" type="line" smooth="yes"/>
       <point x="907" y="-298"/>
       <point x="771" y="-424"/>
-      <point x="495" y="-424" type="curve" name="ab02" smooth="yes"/>
+      <point x="495" y="-424" type="curve" smooth="yes" name="ab02"/>
       <point x="300" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04C_B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04C_B_.glif
index 62f1a11b3..e9245cb33 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04C_B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04C_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04CB" format="1">
+<glyph name="uni04CB" format="2">
   <advance width="1233"/>
   <unicode hex="04CB"/>
   <outline>
@@ -23,7 +23,7 @@
       <point x="154" y="713" type="curve" smooth="yes"/>
       <point x="130" y="752"/>
       <point x="118" y="807"/>
-      <point x="118" y="876" type="curve" name="dh01" smooth="yes"/>
+      <point x="118" y="876" type="curve" smooth="yes" name="dh01"/>
       <point x="118" y="919"/>
       <point x="123" y="971"/>
       <point x="134" y="1027" type="curve" smooth="yes"/>
@@ -32,16 +32,16 @@
       <point x="438" y="1095" type="line" smooth="yes"/>
       <point x="430" y="1055"/>
       <point x="426" y="1021"/>
-      <point x="426" y="992" type="curve" name="dh02" smooth="yes"/>
+      <point x="426" y="992" type="curve" smooth="yes" name="dh02"/>
       <point x="426" y="962"/>
       <point x="430" y="939"/>
       <point x="439" y="922" type="curve"/>
       <point x="450" y="897"/>
       <point x="486" y="881"/>
-      <point x="548" y="873" type="curve" name="sv01" smooth="yes"/>
+      <point x="548" y="873" type="curve" smooth="yes" name="sv01"/>
       <point x="563" y="871"/>
       <point x="577" y="870"/>
-      <point x="590" y="870" type="curve" name="dv02" smooth="yes"/>
+      <point x="590" y="870" type="curve" smooth="yes" name="dv02"/>
       <point x="636" y="870"/>
       <point x="685" y="880"/>
       <point x="737" y="899" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04C_C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04C_C_.glif
index 70562750f..1fed83cf3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04C_C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04C_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04CC" format="1">
+<glyph name="uni04CC" format="2">
   <advance width="1233"/>
   <unicode hex="04CC"/>
   <outline>
@@ -26,7 +26,7 @@
       <point x="468" y="750" type="curve" smooth="yes"/>
       <point x="468" y="725"/>
       <point x="475" y="704"/>
-      <point x="488" y="689" type="curve" name="hr01" smooth="yes"/>
+      <point x="488" y="689" type="curve" smooth="yes" name="hr01"/>
       <point x="492" y="684"/>
       <point x="498" y="679"/>
       <point x="506" y="672" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04C_F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04C_F_.glif
index 64afda857..51dc5513f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04C_F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04C_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04CF" format="1">
+<glyph name="uni04CF" format="2">
   <advance width="1233"/>
   <unicode hex="04CF"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04D_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04D_0.glif
index cc97c8f14..f67efed75 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04D_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04D_0.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D0" format="1">
+<glyph name="uni04D0" format="2">
   <advance width="1233"/>
   <unicode hex="04D0"/>
   <outline>
     <contour>
-      <point x="776" y="1590" type="curve" name="dv01" smooth="yes"/>
+      <point x="776" y="1590" type="curve" smooth="yes" name="dv01"/>
       <point x="587" y="1590"/>
       <point x="488" y="1682"/>
       <point x="488" y="1850" type="curve" smooth="yes"/>
@@ -12,7 +12,7 @@
       <point x="631" y="1854" type="line" name="sv01"/>
       <point x="642" y="1782"/>
       <point x="691" y="1739"/>
-      <point x="796" y="1739" type="curve" name="dv02" smooth="yes"/>
+      <point x="796" y="1739" type="curve" smooth="yes" name="dv02"/>
       <point x="900" y="1739"/>
       <point x="969" y="1779"/>
       <point x="1002" y="1854" type="curve" name="sv02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04D_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04D_1.glif
index eb085a66e..eda8613ae 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04D_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04D_1.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D1" format="1">
+<glyph name="uni04D1" format="2">
   <advance width="1233"/>
   <unicode hex="04D1"/>
   <outline>
     <contour>
-      <point x="736" y="1297" type="curve" name="dv01" smooth="yes"/>
+      <point x="736" y="1297" type="curve" smooth="yes" name="dv01"/>
       <point x="545" y="1297"/>
       <point x="446" y="1382"/>
       <point x="446" y="1561" type="curve" smooth="yes"/>
       <point x="446" y="1594" type="line" name="dh02"/>
       <point x="590" y="1594" type="line" name="sv01"/>
-      <point x="590" y="1581" type="line" name="dh03" smooth="yes"/>
+      <point x="590" y="1581" type="line" smooth="yes" name="dh03"/>
       <point x="590" y="1500"/>
       <point x="652" y="1448"/>
-      <point x="756" y="1448" type="curve" name="dv02" smooth="yes"/>
+      <point x="756" y="1448" type="curve" smooth="yes" name="dv02"/>
       <point x="861" y="1448"/>
       <point x="944" y="1502"/>
       <point x="977" y="1594" type="curve" name="sv02"/>
@@ -22,10 +22,10 @@
       <point x="952" y="1297"/>
     </contour>
     <contour>
-      <point x="381" y="-29" type="curve" name="sv04" smooth="yes"/>
+      <point x="381" y="-29" type="curve" smooth="yes" name="sv04"/>
       <point x="174" y="-29"/>
       <point x="47" y="90"/>
-      <point x="47" y="302" type="curve" name="dh01" smooth="yes"/>
+      <point x="47" y="302" type="curve" smooth="yes" name="dh01"/>
       <point x="47" y="578"/>
       <point x="260" y="737"/>
       <point x="651" y="737" type="curve" smooth="yes"/>
@@ -33,20 +33,20 @@
       <point x="852" y="786" type="line" smooth="yes"/>
       <point x="853" y="794"/>
       <point x="854" y="800"/>
-      <point x="854" y="811" type="curve" name="dh04" smooth="yes"/>
+      <point x="854" y="811" type="curve" smooth="yes" name="dh04"/>
       <point x="854" y="891"/>
       <point x="785" y="932"/>
-      <point x="661" y="932" type="curve" name="sv05" smooth="yes"/>
+      <point x="661" y="932" type="curve" smooth="yes" name="sv05"/>
       <point x="544" y="932"/>
       <point x="411" y="896"/>
       <point x="248" y="819" type="curve" name="ih01"/>
       <point x="295" y="1069" type="line"/>
       <point x="463" y="1125"/>
       <point x="583" y="1147"/>
-      <point x="709" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="709" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="988" y="1147"/>
       <point x="1141" y="1045"/>
-      <point x="1141" y="845" type="curve" name="dh05" smooth="yes"/>
+      <point x="1141" y="845" type="curve" smooth="yes" name="dh05"/>
       <point x="1141" y="792"/>
       <point x="1130" y="722"/>
       <point x="1114" y="639" type="curve" smooth="yes"/>
@@ -57,14 +57,14 @@
       <point x="517" y="-29"/>
     </contour>
     <contour>
-      <point x="504" y="172" type="curve" name="sv03" smooth="yes"/>
+      <point x="504" y="172" type="curve" smooth="yes" name="sv03"/>
       <point x="649" y="172"/>
       <point x="766" y="303"/>
       <point x="803" y="530" type="curve" name="hr03"/>
       <point x="690" y="530" type="line" smooth="yes"/>
       <point x="466" y="530"/>
       <point x="352" y="462"/>
-      <point x="352" y="325" type="curve" name="hr04" smooth="yes"/>
+      <point x="352" y="325" type="curve" smooth="yes" name="hr04"/>
       <point x="352" y="229"/>
       <point x="408" y="172"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04D_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04D_2.glif
index 2fca1cf22..4e687e37a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04D_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04D_2.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D2" format="1">
+<glyph name="uni04D2" format="2">
   <advance width="1233"/>
   <unicode hex="04D2"/>
   <outline>
     <contour>
-      <point x="487" y="1608" type="line" name="hr00" smooth="yes"/>
+      <point x="487" y="1608" type="line" smooth="yes" name="hr00"/>
       <point x="466" y="1608"/>
       <point x="457" y="1621"/>
       <point x="461" y="1641" type="curve" smooth="yes"/>
       <point x="499" y="1827" type="line" smooth="yes"/>
       <point x="503" y="1845"/>
       <point x="514" y="1854"/>
-      <point x="531" y="1854" type="curve" name="dv01" smooth="yes"/>
+      <point x="531" y="1854" type="curve" smooth="yes" name="dv01"/>
       <point x="706" y="1854" type="line" smooth="yes"/>
       <point x="727" y="1854"/>
       <point x="736" y="1841"/>
@@ -22,14 +22,14 @@
       <point x="663" y="1608" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="883" y="1608" type="line" name="sv01" smooth="yes"/>
+      <point x="883" y="1608" type="line" smooth="yes" name="sv01"/>
       <point x="862" y="1608"/>
       <point x="853" y="1621"/>
       <point x="857" y="1641" type="curve" smooth="yes"/>
       <point x="894" y="1827" type="line"/>
       <point x="897" y="1845"/>
       <point x="907" y="1854"/>
-      <point x="926" y="1854" type="curve" name="sv02" smooth="yes"/>
+      <point x="926" y="1854" type="curve" smooth="yes" name="sv02"/>
       <point x="1101" y="1854" type="line" smooth="yes"/>
       <point x="1121" y="1854"/>
       <point x="1132" y="1841"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04D_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04D_3.glif
index 026dcd16c..ad1252f0d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04D_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04D_3.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D3" format="1">
+<glyph name="uni04D3" format="2">
   <advance width="1233"/>
   <unicode hex="04D3"/>
   <outline>
     <contour>
-      <point x="480" y="1347" type="line" name="dv01" smooth="yes"/>
+      <point x="480" y="1347" type="line" smooth="yes" name="dv01"/>
       <point x="460" y="1347"/>
       <point x="449" y="1360"/>
       <point x="453" y="1380" type="curve" smooth="yes"/>
       <point x="489" y="1566" type="line"/>
       <point x="492" y="1584"/>
       <point x="502" y="1593"/>
-      <point x="521" y="1593" type="curve" name="dv02" smooth="yes"/>
+      <point x="521" y="1593" type="curve" smooth="yes" name="dv02"/>
       <point x="698" y="1593" type="line" smooth="yes"/>
       <point x="719" y="1593"/>
       <point x="728" y="1580"/>
@@ -19,17 +19,17 @@
       <point x="687" y="1374" type="line" smooth="yes"/>
       <point x="684" y="1356"/>
       <point x="673" y="1347"/>
-      <point x="655" y="1347" type="curve" name="hr01" smooth="yes"/>
+      <point x="655" y="1347" type="curve" smooth="yes" name="hr01"/>
     </contour>
     <contour>
-      <point x="875" y="1347" type="line" name="sv01" smooth="yes"/>
+      <point x="875" y="1347" type="line" smooth="yes" name="sv01"/>
       <point x="855" y="1347"/>
       <point x="844" y="1360"/>
-      <point x="848" y="1380" type="curve" name="sh01" smooth="yes"/>
+      <point x="848" y="1380" type="curve" smooth="yes" name="sh01"/>
       <point x="884" y="1566" type="line"/>
       <point x="887" y="1584"/>
       <point x="897" y="1593"/>
-      <point x="916" y="1593" type="curve" name="sv02" smooth="yes"/>
+      <point x="916" y="1593" type="curve" smooth="yes" name="sv02"/>
       <point x="1094" y="1593" type="line" smooth="yes"/>
       <point x="1115" y="1593"/>
       <point x="1124" y="1580"/>
@@ -40,31 +40,31 @@
       <point x="1051" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="381" y="-29" type="curve" name="sv04" smooth="yes"/>
+      <point x="381" y="-29" type="curve" smooth="yes" name="sv04"/>
       <point x="174" y="-29"/>
       <point x="47" y="90"/>
-      <point x="47" y="302" type="curve" name="sh02" smooth="yes"/>
+      <point x="47" y="302" type="curve" smooth="yes" name="sh02"/>
       <point x="47" y="578"/>
       <point x="260" y="737"/>
       <point x="651" y="737" type="curve" smooth="yes"/>
       <point x="844" y="737" type="line" name="sh03"/>
-      <point x="852" y="786" type="line" name="hr02" smooth="yes"/>
+      <point x="852" y="786" type="line" smooth="yes" name="hr02"/>
       <point x="853" y="794"/>
       <point x="854" y="800"/>
-      <point x="854" y="811" type="curve" name="ah01" smooth="yes"/>
+      <point x="854" y="811" type="curve" smooth="yes" name="ah01"/>
       <point x="854" y="891"/>
       <point x="785" y="932"/>
-      <point x="661" y="932" type="curve" name="sv05" smooth="yes"/>
+      <point x="661" y="932" type="curve" smooth="yes" name="sv05"/>
       <point x="544" y="932"/>
       <point x="411" y="896"/>
       <point x="248" y="819" type="curve" name="ih01"/>
       <point x="295" y="1069" type="line"/>
       <point x="463" y="1125"/>
       <point x="583" y="1147"/>
-      <point x="709" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="709" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="988" y="1147"/>
       <point x="1141" y="1045"/>
-      <point x="1141" y="845" type="curve" name="sh05" smooth="yes"/>
+      <point x="1141" y="845" type="curve" smooth="yes" name="sh05"/>
       <point x="1141" y="792"/>
       <point x="1130" y="722"/>
       <point x="1114" y="639" type="curve" smooth="yes"/>
@@ -75,14 +75,14 @@
       <point x="517" y="-29"/>
     </contour>
     <contour>
-      <point x="504" y="172" type="curve" name="sv03" smooth="yes"/>
+      <point x="504" y="172" type="curve" smooth="yes" name="sv03"/>
       <point x="649" y="172"/>
       <point x="766" y="303"/>
       <point x="803" y="530" type="curve" name="dv03"/>
       <point x="690" y="530" type="line" smooth="yes"/>
       <point x="466" y="530"/>
       <point x="352" y="462"/>
-      <point x="352" y="325" type="curve" name="sh04" smooth="yes"/>
+      <point x="352" y="325" type="curve" smooth="yes" name="sh04"/>
       <point x="352" y="229"/>
       <point x="408" y="172"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04D_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04D_4.glif
index 9cafc1586..ff95f51ef 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04D_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04D_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D4" format="1">
+<glyph name="uni04D4" format="2">
   <advance width="1233"/>
   <unicode hex="04D4"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04D_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04D_5.glif
index 2bc65052f..ba99a1085 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04D_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04D_5.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D5" format="1">
+<glyph name="uni04D5" format="2">
   <advance width="1233"/>
   <unicode hex="04D5"/>
   <outline>
     <contour>
-      <point x="246" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="246" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="77" y="-29"/>
       <point x="-31" y="80"/>
-      <point x="-31" y="271" type="curve" name="sh01" smooth="yes"/>
+      <point x="-31" y="271" type="curve" smooth="yes" name="sh01"/>
       <point x="-31" y="514"/>
       <point x="144" y="690"/>
       <point x="416" y="690" type="curve" smooth="yes"/>
@@ -18,23 +18,23 @@
       <point x="541" y="806" type="curve" smooth="yes"/>
       <point x="541" y="889"/>
       <point x="495" y="932"/>
-      <point x="411" y="932" type="curve" name="sv01" smooth="yes"/>
+      <point x="411" y="932" type="curve" smooth="yes" name="sv01"/>
       <point x="340" y="932"/>
       <point x="246" y="898"/>
       <point x="131" y="831" type="curve" name="ih01"/>
       <point x="178" y="1069" type="line" name="sh03"/>
       <point x="283" y="1121"/>
       <point x="381" y="1147"/>
-      <point x="466" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="466" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="589" y="1147"/>
       <point x="662" y="1094"/>
       <point x="694" y="1014" type="curve" name="ih02"/>
       <point x="763" y="1102"/>
       <point x="855" y="1147"/>
-      <point x="971" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="971" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1138" y="1147"/>
       <point x="1231" y="1051"/>
-      <point x="1231" y="875" type="curve" name="sh04" smooth="yes"/>
+      <point x="1231" y="875" type="curve" smooth="yes" name="sh04"/>
       <point x="1231" y="818"/>
       <point x="1222" y="729"/>
       <point x="1199" y="606" type="curve" smooth="yes"/>
@@ -45,14 +45,14 @@
       <point x="711" y="357" type="curve" smooth="yes"/>
       <point x="711" y="249"/>
       <point x="771" y="180"/>
-      <point x="867" y="180" type="curve" name="sv02" smooth="yes"/>
+      <point x="867" y="180" type="curve" smooth="yes" name="sv02"/>
       <point x="940" y="180"/>
       <point x="1036" y="220"/>
       <point x="1124" y="289" type="curve" name="ih03"/>
       <point x="1077" y="51" type="line"/>
       <point x="997" y="-5"/>
       <point x="899" y="-29"/>
-      <point x="811" y="-29" type="curve" name="sv03" smooth="yes"/>
+      <point x="811" y="-29" type="curve" smooth="yes" name="sv03"/>
       <point x="678" y="-29"/>
       <point x="589" y="26"/>
       <point x="543" y="135" type="curve" name="ih04"/>
@@ -64,17 +64,17 @@
       <point x="1003" y="755" type="line" name="sh05"/>
       <point x="1008" y="776"/>
       <point x="1010" y="800"/>
-      <point x="1010" y="826" type="curve" name="ah01" smooth="yes"/>
+      <point x="1010" y="826" type="curve" smooth="yes" name="ah01"/>
       <point x="1010" y="884"/>
       <point x="999" y="932"/>
-      <point x="928" y="932" type="curve" name="sv05" smooth="yes"/>
+      <point x="928" y="932" type="curve" smooth="yes" name="sv05"/>
       <point x="852" y="932"/>
       <point x="803" y="875"/>
       <point x="780" y="760" type="curve" smooth="yes"/>
       <point x="766" y="688" type="line"/>
     </contour>
     <contour>
-      <point x="297" y="180" type="curve" name="dv01" smooth="yes"/>
+      <point x="297" y="180" type="curve" smooth="yes" name="dv01"/>
       <point x="382" y="180"/>
       <point x="435" y="245"/>
       <point x="463" y="401" type="curve" smooth="yes"/>
@@ -82,7 +82,7 @@
       <point x="403" y="479" type="line" smooth="yes"/>
       <point x="271" y="479"/>
       <point x="188" y="403"/>
-      <point x="188" y="295" type="curve" name="sh02" smooth="yes"/>
+      <point x="188" y="295" type="curve" smooth="yes" name="sh02"/>
       <point x="188" y="219"/>
       <point x="229" y="180"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04D_6.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04D_6.glif
index 857b8a4d7..c52ad68dc 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04D_6.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04D_6.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D6" format="1">
+<glyph name="uni04D6" format="2">
   <advance width="1233"/>
   <unicode hex="04D6"/>
   <outline>
     <contour>
-      <point x="794" y="1580" type="curve" name="dv01" smooth="yes"/>
+      <point x="794" y="1580" type="curve" smooth="yes" name="dv01"/>
       <point x="605" y="1580"/>
       <point x="506" y="1672"/>
       <point x="506" y="1840" type="curve" smooth="yes"/>
@@ -12,7 +12,7 @@
       <point x="649" y="1844" type="line" name="sv01"/>
       <point x="660" y="1772"/>
       <point x="709" y="1729"/>
-      <point x="814" y="1729" type="curve" name="dv02" smooth="yes"/>
+      <point x="814" y="1729" type="curve" smooth="yes" name="dv02"/>
       <point x="918" y="1729"/>
       <point x="987" y="1769"/>
       <point x="1020" y="1844" type="curve" name="sv02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04D_7.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04D_7.glif
index 66817400c..64229fd34 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04D_7.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04D_7.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D7" format="1">
+<glyph name="uni04D7" format="2">
   <advance width="1233"/>
   <unicode hex="04D7"/>
   <outline>
     <contour>
-      <point x="730" y="1299" type="curve" name="dv03" smooth="yes"/>
+      <point x="730" y="1299" type="curve" smooth="yes" name="dv03"/>
       <point x="539" y="1299"/>
       <point x="440" y="1384"/>
       <point x="440" y="1563" type="curve" smooth="yes"/>
       <point x="440" y="1596" type="line" name="dh03"/>
       <point x="584" y="1596" type="line" name="sv01"/>
-      <point x="584" y="1583" type="line" name="dh04" smooth="yes"/>
+      <point x="584" y="1583" type="line" smooth="yes" name="dh04"/>
       <point x="584" y="1502"/>
       <point x="646" y="1450"/>
-      <point x="750" y="1450" type="curve" name="dv04" smooth="yes"/>
+      <point x="750" y="1450" type="curve" smooth="yes" name="dv04"/>
       <point x="855" y="1450"/>
       <point x="938" y="1504"/>
       <point x="971" y="1596" type="curve" name="sv02"/>
@@ -22,19 +22,19 @@
       <point x="946" y="1299"/>
     </contour>
     <contour>
-      <point x="586" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="586" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="249" y="-29"/>
       <point x="76" y="127"/>
-      <point x="76" y="440" type="curve" name="dh01" smooth="yes"/>
+      <point x="76" y="440" type="curve" smooth="yes" name="dh01"/>
       <point x="76" y="621"/>
       <point x="135" y="805"/>
       <point x="244" y="938" type="curve" smooth="yes"/>
       <point x="357" y="1075"/>
       <point x="513" y="1149"/>
-      <point x="696" y="1149" type="curve" name="dv06" smooth="yes"/>
+      <point x="696" y="1149" type="curve" smooth="yes" name="dv06"/>
       <point x="972" y="1149"/>
       <point x="1155" y="975"/>
-      <point x="1155" y="708" type="curve" name="dh06" smooth="yes"/>
+      <point x="1155" y="708" type="curve" smooth="yes" name="dh06"/>
       <point x="1155" y="652"/>
       <point x="1147" y="577"/>
       <point x="1128" y="465" type="curve" name="dv05"/>
@@ -44,7 +44,7 @@
       <point x="362" y="403" type="curve" name="dh02"/>
       <point x="362" y="270"/>
       <point x="451" y="203"/>
-      <point x="630" y="203" type="curve" name="dv02" smooth="yes"/>
+      <point x="630" y="203" type="curve" smooth="yes" name="dv02"/>
       <point x="771" y="203"/>
       <point x="919" y="244"/>
       <point x="1044" y="324" type="curve" name="ih01"/>
@@ -56,10 +56,10 @@
       <point x="876" y="684" type="line" name="hr01"/>
       <point x="881" y="702"/>
       <point x="883" y="720"/>
-      <point x="883" y="739" type="curve" name="dh05" smooth="yes"/>
+      <point x="883" y="739" type="curve" smooth="yes" name="dh05"/>
       <point x="883" y="851"/>
       <point x="812" y="920"/>
-      <point x="689" y="920" type="curve" name="hr02" smooth="yes"/>
+      <point x="689" y="920" type="curve" smooth="yes" name="hr02"/>
       <point x="560" y="920"/>
       <point x="463" y="841"/>
       <point x="410" y="684" type="curve" name="ih02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04D_8.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04D_8.glif
index 91463f4c9..718b8e7af 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04D_8.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04D_8.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D8" format="1">
+<glyph name="uni04D8" format="2">
   <advance width="1233"/>
   <unicode hex="04D8"/>
   <outline>
     <contour>
-      <point x="465" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="465" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="194" y="-29"/>
       <point x="59" y="130"/>
-      <point x="59" y="447" type="curve" name="sh01" smooth="yes"/>
+      <point x="59" y="447" type="curve" smooth="yes" name="sh01"/>
       <point x="59" y="540"/>
       <point x="71" y="634"/>
       <point x="92" y="745" type="curve" smooth="yes"/>
@@ -15,20 +15,20 @@
       <point x="851" y="840" type="line" name="dv03"/>
       <point x="862" y="913"/>
       <point x="869" y="976"/>
-      <point x="869" y="1033" type="curve" name="ah01" smooth="yes"/>
+      <point x="869" y="1033" type="curve" smooth="yes" name="ah01"/>
       <point x="869" y="1178"/>
       <point x="824" y="1255"/>
-      <point x="697" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="697" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="601" y="1255"/>
       <point x="497" y="1212"/>
       <point x="380" y="1120" type="curve" name="ih01"/>
       <point x="444" y="1448" type="line"/>
       <point x="548" y="1496"/>
       <point x="655" y="1520"/>
-      <point x="763" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="763" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1040" y="1520"/>
       <point x="1174" y="1363"/>
-      <point x="1174" y="1047" type="curve" name="sh02" smooth="yes"/>
+      <point x="1174" y="1047" type="curve" smooth="yes" name="sh02"/>
       <point x="1174" y="958"/>
       <point x="1163" y="858"/>
       <point x="1141" y="745" type="curve" smooth="yes"/>
@@ -36,14 +36,14 @@
       <point x="818" y="-29"/>
     </contour>
     <contour>
-      <point x="517" y="236" type="curve" name="dv01" smooth="yes"/>
+      <point x="517" y="236" type="curve" smooth="yes" name="dv01"/>
       <point x="670" y="236"/>
       <point x="742" y="387"/>
       <point x="796" y="580" type="curve" name="dv02"/>
       <point x="373" y="580" type="line" name="sh04"/>
       <point x="368" y="537"/>
       <point x="365" y="496"/>
-      <point x="365" y="457" type="curve" name="sh03" smooth="yes"/>
+      <point x="365" y="457" type="curve" smooth="yes" name="sh03"/>
       <point x="365" y="326"/>
       <point x="401" y="236"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04D_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04D_9.glif
index 7a0fe39d4..5cf298013 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04D_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04D_9.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D9" format="1">
+<glyph name="uni04D9" format="2">
   <advance width="1233"/>
   <unicode hex="04D9"/>
   <outline>
     <contour>
-      <point x="492" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="492" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="220" y="-29"/>
       <point x="67" y="116"/>
-      <point x="67" y="377" type="curve" name="sh01" smooth="yes"/>
+      <point x="67" y="377" type="curve" smooth="yes" name="sh01"/>
       <point x="67" y="424"/>
       <point x="72" y="477"/>
       <point x="83" y="534" type="curve" smooth="yes"/>
@@ -15,20 +15,20 @@
       <point x="865" y="653" type="line" name="sh02"/>
       <point x="870" y="677"/>
       <point x="872" y="700"/>
-      <point x="872" y="720" type="curve" name="ah01" smooth="yes"/>
+      <point x="872" y="720" type="curve" smooth="yes" name="ah01"/>
       <point x="872" y="850"/>
       <point x="784" y="915"/>
-      <point x="608" y="915" type="curve" name="sv01" smooth="yes"/>
+      <point x="608" y="915" type="curve" smooth="yes" name="sv01"/>
       <point x="472" y="915"/>
       <point x="341" y="878"/>
       <point x="181" y="794" type="curve" name="ih01"/>
       <point x="233" y="1063" type="line"/>
       <point x="382" y="1120"/>
       <point x="532" y="1147"/>
-      <point x="673" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="673" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1001" y="1147"/>
       <point x="1163" y="1000"/>
-      <point x="1163" y="729" type="curve" name="sh04" smooth="yes"/>
+      <point x="1163" y="729" type="curve" smooth="yes" name="sh04"/>
       <point x="1163" y="673"/>
       <point x="1157" y="615"/>
       <point x="1146" y="563" type="curve" smooth="yes"/>
@@ -36,14 +36,14 @@
       <point x="832" y="-29"/>
     </contour>
     <contour>
-      <point x="537" y="198" type="curve" name="dv01" smooth="yes"/>
+      <point x="537" y="198" type="curve" smooth="yes" name="dv01"/>
       <point x="682" y="198"/>
       <point x="775" y="282"/>
       <point x="820" y="434" type="curve"/>
       <point x="359" y="433" type="line" name="sh05"/>
       <point x="355" y="409"/>
       <point x="352" y="387"/>
-      <point x="352" y="364" type="curve" name="sh03" smooth="yes"/>
+      <point x="352" y="364" type="curve" smooth="yes" name="sh03"/>
       <point x="352" y="255"/>
       <point x="418" y="198"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04D_A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04D_A_.glif
index ff7be23bd..b608b1dfa 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04D_A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04D_A_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04DA" format="1">
+<glyph name="uni04DA" format="2">
   <advance width="1233"/>
   <unicode hex="04DA"/>
   <outline>
     <contour>
-      <point x="487" y="1608" type="line" name="hr00" smooth="yes"/>
+      <point x="487" y="1608" type="line" smooth="yes" name="hr00"/>
       <point x="466" y="1608"/>
       <point x="457" y="1621"/>
       <point x="461" y="1641" type="curve" smooth="yes"/>
       <point x="499" y="1827" type="line" smooth="yes"/>
       <point x="503" y="1845"/>
       <point x="514" y="1854"/>
-      <point x="531" y="1854" type="curve" name="dv03" smooth="yes"/>
+      <point x="531" y="1854" type="curve" smooth="yes" name="dv03"/>
       <point x="706" y="1854" type="line" smooth="yes"/>
       <point x="727" y="1854"/>
       <point x="736" y="1841"/>
@@ -22,14 +22,14 @@
       <point x="663" y="1608" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="883" y="1608" type="line" name="sh01" smooth="yes"/>
+      <point x="883" y="1608" type="line" smooth="yes" name="sh01"/>
       <point x="862" y="1608"/>
       <point x="853" y="1621"/>
-      <point x="857" y="1641" type="curve" name="sh02" smooth="yes"/>
+      <point x="857" y="1641" type="curve" smooth="yes" name="sh02"/>
       <point x="894" y="1827" type="line"/>
       <point x="897" y="1845"/>
       <point x="907" y="1854"/>
-      <point x="926" y="1854" type="curve" name="sv01" smooth="yes"/>
+      <point x="926" y="1854" type="curve" smooth="yes" name="sv01"/>
       <point x="1101" y="1854" type="line" smooth="yes"/>
       <point x="1121" y="1854"/>
       <point x="1132" y="1841"/>
@@ -40,10 +40,10 @@
       <point x="1060" y="1608" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="465" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="465" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="194" y="-29"/>
       <point x="59" y="130"/>
-      <point x="59" y="447" type="curve" name="sh03" smooth="yes"/>
+      <point x="59" y="447" type="curve" smooth="yes" name="sh03"/>
       <point x="59" y="540"/>
       <point x="71" y="634"/>
       <point x="92" y="745" type="curve" smooth="yes"/>
@@ -51,20 +51,20 @@
       <point x="851" y="840" type="line" name="dv05"/>
       <point x="862" y="913"/>
       <point x="869" y="976"/>
-      <point x="869" y="1033" type="curve" name="ah01" smooth="yes"/>
+      <point x="869" y="1033" type="curve" smooth="yes" name="ah01"/>
       <point x="869" y="1178"/>
       <point x="824" y="1255"/>
-      <point x="697" y="1255" type="curve" name="sv02" smooth="yes"/>
+      <point x="697" y="1255" type="curve" smooth="yes" name="sv02"/>
       <point x="601" y="1255"/>
       <point x="497" y="1212"/>
       <point x="380" y="1120" type="curve" name="ih01"/>
       <point x="444" y="1448" type="line"/>
       <point x="548" y="1496"/>
       <point x="655" y="1520"/>
-      <point x="763" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="763" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1040" y="1520"/>
       <point x="1174" y="1363"/>
-      <point x="1174" y="1047" type="curve" name="sh04" smooth="yes"/>
+      <point x="1174" y="1047" type="curve" smooth="yes" name="sh04"/>
       <point x="1174" y="958"/>
       <point x="1163" y="858"/>
       <point x="1141" y="745" type="curve" smooth="yes"/>
@@ -72,14 +72,14 @@
       <point x="818" y="-29"/>
     </contour>
     <contour>
-      <point x="517" y="236" type="curve" name="dv02" smooth="yes"/>
+      <point x="517" y="236" type="curve" smooth="yes" name="dv02"/>
       <point x="670" y="236"/>
       <point x="742" y="387"/>
       <point x="796" y="580" type="curve" name="dv04"/>
       <point x="373" y="580" type="line" name="sh06"/>
       <point x="368" y="537"/>
       <point x="365" y="496"/>
-      <point x="365" y="457" type="curve" name="sh05" smooth="yes"/>
+      <point x="365" y="457" type="curve" smooth="yes" name="sh05"/>
       <point x="365" y="326"/>
       <point x="401" y="236"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04D_B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04D_B_.glif
index ec32c2c81..86d26bb58 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04D_B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04D_B_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04DB" format="1">
+<glyph name="uni04DB" format="2">
   <advance width="1233"/>
   <unicode hex="04DB"/>
   <outline>
     <contour>
-      <point x="449" y="1347" type="line" name="hr00" smooth="yes"/>
+      <point x="449" y="1347" type="line" smooth="yes" name="hr00"/>
       <point x="429" y="1347"/>
       <point x="418" y="1360"/>
       <point x="422" y="1380" type="curve" smooth="yes"/>
       <point x="458" y="1566" type="line"/>
       <point x="461" y="1584"/>
       <point x="471" y="1593"/>
-      <point x="490" y="1593" type="curve" name="dv03" smooth="yes"/>
+      <point x="490" y="1593" type="curve" smooth="yes" name="dv03"/>
       <point x="667" y="1593" type="line" smooth="yes"/>
       <point x="688" y="1593"/>
       <point x="697" y="1580"/>
@@ -22,14 +22,14 @@
       <point x="624" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="844" y="1347" type="line" name="sv01" smooth="yes"/>
+      <point x="844" y="1347" type="line" smooth="yes" name="sv01"/>
       <point x="824" y="1347"/>
       <point x="813" y="1360"/>
       <point x="817" y="1380" type="curve" smooth="yes"/>
       <point x="853" y="1566" type="line"/>
       <point x="856" y="1584"/>
       <point x="866" y="1593"/>
-      <point x="885" y="1593" type="curve" name="sh01" smooth="yes"/>
+      <point x="885" y="1593" type="curve" smooth="yes" name="sh01"/>
       <point x="1063" y="1593" type="line" smooth="yes"/>
       <point x="1084" y="1593"/>
       <point x="1093" y="1580"/>
@@ -40,10 +40,10 @@
       <point x="1020" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="492" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="492" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="220" y="-29"/>
       <point x="67" y="116"/>
-      <point x="67" y="377" type="curve" name="sh02" smooth="yes"/>
+      <point x="67" y="377" type="curve" smooth="yes" name="sh02"/>
       <point x="67" y="424"/>
       <point x="72" y="477"/>
       <point x="83" y="534" type="curve" smooth="yes"/>
@@ -51,20 +51,20 @@
       <point x="865" y="653" type="line" name="sh03"/>
       <point x="870" y="677"/>
       <point x="872" y="700"/>
-      <point x="872" y="720" type="curve" name="ah01" smooth="yes"/>
+      <point x="872" y="720" type="curve" smooth="yes" name="ah01"/>
       <point x="872" y="850"/>
       <point x="784" y="915"/>
-      <point x="608" y="915" type="curve" name="sv02" smooth="yes"/>
+      <point x="608" y="915" type="curve" smooth="yes" name="sv02"/>
       <point x="472" y="915"/>
       <point x="341" y="878"/>
       <point x="181" y="794" type="curve" name="ih01"/>
       <point x="233" y="1063" type="line"/>
       <point x="382" y="1120"/>
       <point x="532" y="1147"/>
-      <point x="673" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="673" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1001" y="1147"/>
       <point x="1163" y="1000"/>
-      <point x="1163" y="729" type="curve" name="sh05" smooth="yes"/>
+      <point x="1163" y="729" type="curve" smooth="yes" name="sh05"/>
       <point x="1163" y="673"/>
       <point x="1157" y="615"/>
       <point x="1146" y="563" type="curve" smooth="yes"/>
@@ -72,14 +72,14 @@
       <point x="832" y="-29"/>
     </contour>
     <contour>
-      <point x="537" y="198" type="curve" name="dv02" smooth="yes"/>
+      <point x="537" y="198" type="curve" smooth="yes" name="dv02"/>
       <point x="682" y="198"/>
       <point x="775" y="282"/>
       <point x="820" y="434" type="curve"/>
       <point x="359" y="433" type="line" name="sh06"/>
       <point x="355" y="409"/>
       <point x="352" y="387"/>
-      <point x="352" y="364" type="curve" name="sh04" smooth="yes"/>
+      <point x="352" y="364" type="curve" smooth="yes" name="sh04"/>
       <point x="352" y="255"/>
       <point x="418" y="198"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04D_C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04D_C_.glif
index f36230fe3..4415183a9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04D_C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04D_C_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04DC" format="1">
+<glyph name="uni04DC" format="2">
   <advance width="1233"/>
   <unicode hex="04DC"/>
   <outline>
     <contour>
-      <point x="494" y="1608" type="line" name="hr00" smooth="yes"/>
+      <point x="494" y="1608" type="line" smooth="yes" name="hr00"/>
       <point x="473" y="1608"/>
       <point x="464" y="1621"/>
       <point x="468" y="1641" type="curve" smooth="yes"/>
       <point x="506" y="1827" type="line" smooth="yes"/>
       <point x="510" y="1845"/>
       <point x="521" y="1854"/>
-      <point x="538" y="1854" type="curve" name="dv01" smooth="yes"/>
+      <point x="538" y="1854" type="curve" smooth="yes" name="dv01"/>
       <point x="713" y="1854" type="line" smooth="yes"/>
       <point x="734" y="1854"/>
       <point x="743" y="1841"/>
@@ -22,14 +22,14 @@
       <point x="670" y="1608" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="890" y="1608" type="line" name="sv01" smooth="yes"/>
+      <point x="890" y="1608" type="line" smooth="yes" name="sv01"/>
       <point x="869" y="1608"/>
       <point x="860" y="1621"/>
       <point x="864" y="1641" type="curve" smooth="yes"/>
       <point x="901" y="1827" type="line"/>
       <point x="904" y="1845"/>
       <point x="914" y="1854"/>
-      <point x="933" y="1854" type="curve" name="sv02" smooth="yes"/>
+      <point x="933" y="1854" type="curve" smooth="yes" name="sv02"/>
       <point x="1108" y="1854" type="line" smooth="yes"/>
       <point x="1128" y="1854"/>
       <point x="1139" y="1841"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04D_D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04D_D_.glif
index 18fccc483..c68c85f80 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04D_D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04D_D_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04DD" format="1">
+<glyph name="uni04DD" format="2">
   <advance width="1233"/>
   <unicode hex="04DD"/>
   <outline>
     <contour>
-      <point x="457" y="1320" type="line" name="hr00" smooth="yes"/>
+      <point x="457" y="1320" type="line" smooth="yes" name="hr00"/>
       <point x="437" y="1320"/>
       <point x="426" y="1333"/>
       <point x="430" y="1353" type="curve" smooth="yes"/>
       <point x="466" y="1539" type="line"/>
       <point x="469" y="1557"/>
       <point x="479" y="1566"/>
-      <point x="498" y="1566" type="curve" name="at04" smooth="yes"/>
+      <point x="498" y="1566" type="curve" smooth="yes" name="at04"/>
       <point x="675" y="1566" type="line" smooth="yes"/>
       <point x="696" y="1566"/>
       <point x="705" y="1553"/>
@@ -22,14 +22,14 @@
       <point x="632" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="852" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="852" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="832" y="1320"/>
       <point x="821" y="1333"/>
       <point x="825" y="1353" type="curve" smooth="yes"/>
       <point x="861" y="1539" type="line"/>
       <point x="864" y="1557"/>
       <point x="874" y="1566"/>
-      <point x="893" y="1566" type="curve" name="at05" smooth="yes"/>
+      <point x="893" y="1566" type="curve" smooth="yes" name="at05"/>
       <point x="1071" y="1566" type="line" smooth="yes"/>
       <point x="1092" y="1566"/>
       <point x="1101" y="1553"/>
@@ -37,7 +37,7 @@
       <point x="1060" y="1347" type="line" smooth="yes"/>
       <point x="1057" y="1329"/>
       <point x="1046" y="1320"/>
-      <point x="1028" y="1320" type="curve" name="sv02" smooth="yes"/>
+      <point x="1028" y="1320" type="curve" smooth="yes" name="sv02"/>
     </contour>
     <contour>
       <point x="294" y="694" type="line"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04D_E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04D_E_.glif
index f8e943fa0..bed92cec7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04D_E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04D_E_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04DE" format="1">
+<glyph name="uni04DE" format="2">
   <advance width="1233"/>
   <unicode hex="04DE"/>
   <outline>
     <contour>
-      <point x="457" y="1608" type="line" name="dv03" smooth="yes"/>
+      <point x="457" y="1608" type="line" smooth="yes" name="dv03"/>
       <point x="436" y="1608"/>
       <point x="427" y="1621"/>
       <point x="431" y="1641" type="curve" smooth="yes"/>
       <point x="469" y="1827" type="line" smooth="yes"/>
       <point x="473" y="1845"/>
       <point x="484" y="1854"/>
-      <point x="501" y="1854" type="curve" name="hr01" smooth="yes"/>
+      <point x="501" y="1854" type="curve" smooth="yes" name="hr01"/>
       <point x="676" y="1854" type="line" smooth="yes"/>
       <point x="697" y="1854"/>
       <point x="706" y="1841"/>
@@ -22,63 +22,63 @@
       <point x="633" y="1608" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="853" y="1608" type="line" name="sv01" smooth="yes"/>
+      <point x="853" y="1608" type="line" smooth="yes" name="sv01"/>
       <point x="832" y="1608"/>
       <point x="823" y="1621"/>
       <point x="827" y="1641" type="curve" smooth="yes"/>
       <point x="864" y="1827" type="line"/>
       <point x="867" y="1845"/>
       <point x="877" y="1854"/>
-      <point x="896" y="1854" type="curve" name="sv02" smooth="yes"/>
+      <point x="896" y="1854" type="curve" smooth="yes" name="sv02"/>
       <point x="1071" y="1854" type="line" smooth="yes"/>
       <point x="1091" y="1854"/>
       <point x="1102" y="1841"/>
-      <point x="1098" y="1821" type="curve" name="hr02" smooth="yes"/>
+      <point x="1098" y="1821" type="curve" smooth="yes" name="hr02"/>
       <point x="1062" y="1635" type="line" smooth="yes"/>
       <point x="1059" y="1617"/>
       <point x="1048" y="1608"/>
       <point x="1030" y="1608" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="444" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="444" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="307" y="-29"/>
       <point x="155" y="-3"/>
       <point x="-9" y="45" type="curve"/>
       <point x="45" y="315" type="line"/>
       <point x="170" y="255"/>
       <point x="317" y="221"/>
-      <point x="445" y="221" type="curve" name="dv02" smooth="yes"/>
+      <point x="445" y="221" type="curve" smooth="yes" name="dv02"/>
       <point x="661" y="221"/>
       <point x="772" y="321"/>
-      <point x="772" y="469" type="curve" name="dh01" smooth="yes"/>
+      <point x="772" y="469" type="curve" smooth="yes" name="dh01"/>
       <point x="772" y="605"/>
       <point x="680" y="668"/>
-      <point x="536" y="668" type="curve" name="dv04" smooth="yes"/>
+      <point x="536" y="668" type="curve" smooth="yes" name="dv04"/>
       <point x="378" y="668" type="line"/>
       <point x="430" y="928" type="line"/>
-      <point x="587" y="928" type="line" name="dv05" smooth="yes"/>
+      <point x="587" y="928" type="line" smooth="yes" name="dv05"/>
       <point x="752" y="928"/>
       <point x="866" y="1011"/>
-      <point x="866" y="1124" type="curve" name="ih01" smooth="yes"/>
+      <point x="866" y="1124" type="curve" smooth="yes" name="ih01"/>
       <point x="866" y="1217"/>
       <point x="787" y="1270"/>
-      <point x="642" y="1270" type="curve" name="sv03" smooth="yes"/>
+      <point x="642" y="1270" type="curve" smooth="yes" name="sv03"/>
       <point x="534" y="1270"/>
       <point x="401" y="1241"/>
       <point x="253" y="1188" type="curve"/>
       <point x="307" y="1456" type="line"/>
       <point x="447" y="1499"/>
       <point x="578" y="1520"/>
-      <point x="686" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="686" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="967" y="1520"/>
       <point x="1142" y="1378"/>
-      <point x="1142" y="1166" type="curve" name="sh01" smooth="yes"/>
+      <point x="1142" y="1166" type="curve" smooth="yes" name="sh01"/>
       <point x="1142" y="979"/>
       <point x="1009" y="845"/>
       <point x="786" y="805" type="curve" name="ih02"/>
       <point x="974" y="754"/>
       <point x="1052" y="642"/>
-      <point x="1052" y="469" type="curve" name="dh02" smooth="yes"/>
+      <point x="1052" y="469" type="curve" smooth="yes" name="dh02"/>
       <point x="1052" y="168"/>
       <point x="819" y="-29"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04D_F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04D_F_.glif
index 758f2db54..e6a3bfc72 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04D_F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04D_F_.glif
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04DF" format="1">
+<glyph name="uni04DF" format="2">
   <advance width="1233"/>
   <unicode hex="04DF"/>
   <outline>
     <contour>
-      <point x="431" y="1347" type="line" name="dv01" smooth="yes"/>
+      <point x="431" y="1347" type="line" smooth="yes" name="dv01"/>
       <point x="411" y="1347"/>
       <point x="400" y="1360"/>
       <point x="404" y="1380" type="curve" smooth="yes"/>
       <point x="440" y="1566" type="line"/>
       <point x="443" y="1584"/>
       <point x="453" y="1593"/>
-      <point x="472" y="1593" type="curve" name="dv02" smooth="yes"/>
-      <point x="649" y="1593" type="line" name="hr01" smooth="yes"/>
+      <point x="472" y="1593" type="curve" smooth="yes" name="dv02"/>
+      <point x="649" y="1593" type="line" smooth="yes" name="hr01"/>
       <point x="670" y="1593"/>
       <point x="679" y="1580"/>
       <point x="675" y="1560" type="curve" smooth="yes"/>
@@ -22,60 +22,60 @@
       <point x="606" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="826" y="1347" type="line" name="sv01" smooth="yes"/>
+      <point x="826" y="1347" type="line" smooth="yes" name="sv01"/>
       <point x="806" y="1347"/>
       <point x="795" y="1360"/>
       <point x="799" y="1380" type="curve" smooth="yes"/>
       <point x="835" y="1566" type="line"/>
       <point x="838" y="1584"/>
       <point x="848" y="1593"/>
-      <point x="867" y="1593" type="curve" name="sv02" smooth="yes"/>
+      <point x="867" y="1593" type="curve" smooth="yes" name="sv02"/>
       <point x="1045" y="1593" type="line" smooth="yes"/>
       <point x="1066" y="1593"/>
       <point x="1075" y="1580"/>
       <point x="1071" y="1560" type="curve" smooth="yes"/>
-      <point x="1034" y="1374" type="line" name="hr02" smooth="yes"/>
+      <point x="1034" y="1374" type="line" smooth="yes" name="hr02"/>
       <point x="1031" y="1356"/>
       <point x="1020" y="1347"/>
       <point x="1002" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="387" y="-22" type="curve" name="ab01" smooth="yes"/>
+      <point x="387" y="-22" type="curve" smooth="yes" name="ab01"/>
       <point x="280" y="-22"/>
       <point x="183" y="-12"/>
       <point x="49" y="44" type="curve"/>
       <point x="95" y="280" type="line" name="iv01"/>
       <point x="216" y="215"/>
       <point x="296" y="201"/>
-      <point x="464" y="201" type="curve" name="sv03" smooth="yes"/>
+      <point x="464" y="201" type="curve" smooth="yes" name="sv03"/>
       <point x="611" y="201"/>
       <point x="715" y="212"/>
       <point x="737" y="325" type="curve" smooth="yes"/>
       <point x="739" y="335"/>
       <point x="740" y="344"/>
-      <point x="740" y="352" type="curve" name="dh01" smooth="yes"/>
+      <point x="740" y="352" type="curve" smooth="yes" name="dh01"/>
       <point x="740" y="435"/>
       <point x="625" y="462"/>
-      <point x="533" y="462" type="curve" name="dv03" smooth="yes"/>
+      <point x="533" y="462" type="curve" smooth="yes" name="dv03"/>
       <point x="370" y="462" type="line"/>
       <point x="413" y="681" type="line"/>
-      <point x="550" y="681" type="line" name="dv04" smooth="yes"/>
+      <point x="550" y="681" type="line" smooth="yes" name="dv04"/>
       <point x="662" y="681"/>
       <point x="805" y="715"/>
-      <point x="805" y="819" type="curve" name="sh01" smooth="yes"/>
+      <point x="805" y="819" type="curve" smooth="yes" name="sh01"/>
       <point x="805" y="894"/>
       <point x="731" y="928"/>
-      <point x="574" y="928" type="curve" name="sv04" smooth="yes"/>
+      <point x="574" y="928" type="curve" smooth="yes" name="sv04"/>
       <point x="465" y="928"/>
       <point x="356" y="911"/>
       <point x="248" y="876" type="curve" name="iv02"/>
       <point x="291" y="1099" type="line"/>
       <point x="398" y="1128"/>
       <point x="529" y="1147"/>
-      <point x="657" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="657" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="957" y="1147"/>
       <point x="1098" y="1042"/>
-      <point x="1098" y="894" type="curve" name="sh02" smooth="yes"/>
+      <point x="1098" y="894" type="curve" smooth="yes" name="sh02"/>
       <point x="1098" y="875"/>
       <point x="1096" y="855"/>
       <point x="1092" y="836" type="curve" smooth="yes"/>
@@ -84,7 +84,7 @@
       <point x="856" y="573" type="curve" name="ih01"/>
       <point x="955" y="541"/>
       <point x="1028" y="460"/>
-      <point x="1028" y="335" type="curve" name="dh02" smooth="yes"/>
+      <point x="1028" y="335" type="curve" smooth="yes" name="dh02"/>
       <point x="1028" y="87"/>
       <point x="736" y="-22"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04E_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04E_0.glif
index 4af548aab..d4560adb9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04E_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04E_0.glif
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E0" format="1">
+<glyph name="uni04E0" format="2">
   <advance width="1233"/>
   <unicode hex="04E0"/>
   <outline>
     <contour>
-      <point x="467" y="-28" type="curve" name="dv01" smooth="yes"/>
+      <point x="467" y="-28" type="curve" smooth="yes" name="dv01"/>
       <point x="91" y="-28"/>
       <point x="-59" y="99"/>
-      <point x="-59" y="315" type="curve" name="sh01" smooth="yes"/>
+      <point x="-59" y="315" type="curve" smooth="yes" name="sh01"/>
       <point x="-59" y="355"/>
       <point x="-54" y="396"/>
       <point x="-46" y="439" type="curve" name="sh02"/>
       <point x="272" y="439" type="line" name="sh04"/>
       <point x="269" y="426"/>
       <point x="268" y="414"/>
-      <point x="268" y="401" type="curve" name="sh03" smooth="yes"/>
+      <point x="268" y="401" type="curve" smooth="yes" name="sh03"/>
       <point x="268" y="284"/>
       <point x="370" y="234"/>
-      <point x="509" y="234" type="curve" name="dv02" smooth="yes"/>
+      <point x="509" y="234" type="curve" smooth="yes" name="dv02"/>
       <point x="641" y="234"/>
       <point x="753" y="280"/>
       <point x="801" y="380" type="curve" smooth="yes"/>
       <point x="812" y="401"/>
       <point x="816" y="419"/>
-      <point x="820" y="439" type="curve" name="sh05" smooth="yes"/>
+      <point x="820" y="439" type="curve" smooth="yes" name="sh05"/>
       <point x="823" y="455"/>
       <point x="825" y="470"/>
-      <point x="825" y="486" type="curve" name="ah01" smooth="yes"/>
+      <point x="825" y="486" type="curve" smooth="yes" name="ah01"/>
       <point x="825" y="578"/>
       <point x="763" y="626"/>
       <point x="635" y="642" type="curve" smooth="yes"/>
@@ -43,13 +43,13 @@
       <point x="762" y="848" type="line" name="ih02"/>
       <point x="935" y="837"/>
       <point x="1065" y="819"/>
-      <point x="1135" y="685" type="curve" name="hr02" smooth="yes"/>
+      <point x="1135" y="685" type="curve" smooth="yes" name="hr02"/>
       <point x="1160" y="636"/>
       <point x="1173" y="577"/>
-      <point x="1173" y="518" type="curve" name="sh06" smooth="yes"/>
+      <point x="1173" y="518" type="curve" smooth="yes" name="sh06"/>
       <point x="1173" y="489"/>
       <point x="1170" y="458"/>
-      <point x="1164" y="425" type="curve" name="sh08" smooth="yes"/>
+      <point x="1164" y="425" type="curve" smooth="yes" name="sh08"/>
       <point x="1096" y="54"/>
       <point x="771" y="-28"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04E_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04E_1.glif
index 27449a9d9..99047744c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04E_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04E_1.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E1" format="1">
+<glyph name="uni04E1" format="2">
   <advance width="1233"/>
   <unicode hex="04E1"/>
   <outline>
     <contour>
-      <point x="345" y="-440" type="curve" name="hr00" smooth="yes"/>
+      <point x="345" y="-440" type="curve" smooth="yes" name="hr00"/>
       <point x="193" y="-440"/>
       <point x="68" y="-415"/>
       <point x="-61" y="-366" type="curve"/>
       <point x="-4" y="-69" type="line"/>
       <point x="112" y="-141"/>
       <point x="228" y="-178"/>
-      <point x="360" y="-178" type="curve" name="dv01" smooth="yes"/>
+      <point x="360" y="-178" type="curve" smooth="yes" name="dv01"/>
       <point x="540" y="-178"/>
       <point x="654" y="-108"/>
       <point x="681" y="27" type="curve" smooth="yes"/>
       <point x="684" y="43"/>
       <point x="686" y="57"/>
-      <point x="686" y="73" type="curve" name="dh01" smooth="yes"/>
+      <point x="686" y="73" type="curve" smooth="yes" name="dh01"/>
       <point x="686" y="178"/>
       <point x="597" y="234"/>
-      <point x="424" y="234" type="curve" name="dv02" smooth="yes"/>
+      <point x="424" y="234" type="curve" smooth="yes" name="dv02"/>
       <point x="256" y="234" type="line"/>
       <point x="299" y="452" type="line"/>
       <point x="776" y="901" type="line" name="ih01"/>
@@ -34,7 +34,7 @@
       <point x="1003" y="259" type="curve" smooth="yes"/>
       <point x="1022" y="216"/>
       <point x="1034" y="164"/>
-      <point x="1034" y="99" type="curve" name="dh02" smooth="yes"/>
+      <point x="1034" y="99" type="curve" smooth="yes" name="dh02"/>
       <point x="1034" y="-43"/>
       <point x="971" y="-214"/>
       <point x="807" y="-323" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04E_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04E_2.glif
index 0e26465a3..9d35184b5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04E_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04E_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E2" format="1">
+<glyph name="uni04E2" format="2">
   <advance width="1233"/>
   <unicode hex="04E2"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04E_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04E_3.glif
index 71d5a6806..f7012782c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04E_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04E_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E3" format="1">
+<glyph name="uni04E3" format="2">
   <advance width="1233"/>
   <unicode hex="04E3"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04E_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04E_4.glif
index 989e2d071..f21fe05b6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04E_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04E_4.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E4" format="1">
+<glyph name="uni04E4" format="2">
   <advance width="1233"/>
   <unicode hex="04E4"/>
   <outline>
     <contour>
-      <point x="496" y="1608" type="line" name="hr00" smooth="yes"/>
+      <point x="496" y="1608" type="line" smooth="yes" name="hr00"/>
       <point x="475" y="1608"/>
       <point x="466" y="1621"/>
       <point x="470" y="1641" type="curve" smooth="yes"/>
       <point x="508" y="1827" type="line" smooth="yes"/>
       <point x="512" y="1845"/>
       <point x="523" y="1854"/>
-      <point x="540" y="1854" type="curve" name="dv01" smooth="yes"/>
+      <point x="540" y="1854" type="curve" smooth="yes" name="dv01"/>
       <point x="715" y="1854" type="line" smooth="yes"/>
       <point x="736" y="1854"/>
       <point x="745" y="1841"/>
@@ -22,14 +22,14 @@
       <point x="672" y="1608" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="892" y="1608" type="line" name="sv01" smooth="yes"/>
+      <point x="892" y="1608" type="line" smooth="yes" name="sv01"/>
       <point x="871" y="1608"/>
       <point x="862" y="1621"/>
       <point x="866" y="1641" type="curve" smooth="yes"/>
       <point x="903" y="1827" type="line"/>
       <point x="906" y="1845"/>
       <point x="916" y="1854"/>
-      <point x="935" y="1854" type="curve" name="sv02" smooth="yes"/>
+      <point x="935" y="1854" type="curve" smooth="yes" name="sv02"/>
       <point x="1110" y="1854" type="line" smooth="yes"/>
       <point x="1130" y="1854"/>
       <point x="1141" y="1841"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04E_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04E_5.glif
index 3507f5f73..ada173409 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04E_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04E_5.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E5" format="1">
+<glyph name="uni04E5" format="2">
   <advance width="1233"/>
   <unicode hex="04E5"/>
   <outline>
     <contour>
-      <point x="469" y="1320" type="line" name="hr00" smooth="yes"/>
+      <point x="469" y="1320" type="line" smooth="yes" name="hr00"/>
       <point x="449" y="1320"/>
       <point x="438" y="1333"/>
       <point x="442" y="1353" type="curve" smooth="yes"/>
       <point x="478" y="1539" type="line"/>
       <point x="481" y="1557"/>
       <point x="491" y="1566"/>
-      <point x="510" y="1566" type="curve" name="at03" smooth="yes"/>
+      <point x="510" y="1566" type="curve" smooth="yes" name="at03"/>
       <point x="687" y="1566" type="line" smooth="yes"/>
       <point x="708" y="1566"/>
       <point x="717" y="1553"/>
@@ -22,14 +22,14 @@
       <point x="644" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="864" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="864" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="844" y="1320"/>
       <point x="833" y="1333"/>
       <point x="837" y="1353" type="curve" smooth="yes"/>
       <point x="873" y="1539" type="line"/>
       <point x="876" y="1557"/>
       <point x="886" y="1566"/>
-      <point x="905" y="1566" type="curve" name="at04" smooth="yes"/>
+      <point x="905" y="1566" type="curve" smooth="yes" name="at04"/>
       <point x="1083" y="1566" type="line" smooth="yes"/>
       <point x="1104" y="1566"/>
       <point x="1113" y="1553"/>
@@ -37,7 +37,7 @@
       <point x="1072" y="1347" type="line" smooth="yes"/>
       <point x="1069" y="1329"/>
       <point x="1058" y="1320"/>
-      <point x="1040" y="1320" type="curve" name="sv02" smooth="yes"/>
+      <point x="1040" y="1320" type="curve" smooth="yes" name="sv02"/>
     </contour>
     <contour>
       <point x="261" y="1120" type="line" name="at01"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04E_6.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04E_6.glif
index 28a7d2029..eb7b00938 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04E_6.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04E_6.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E6" format="1">
+<glyph name="uni04E6" format="2">
   <advance width="1233"/>
   <unicode hex="04E6"/>
   <outline>
     <contour>
-      <point x="467" y="1608" type="line" name="hr00" smooth="yes"/>
+      <point x="467" y="1608" type="line" smooth="yes" name="hr00"/>
       <point x="446" y="1608"/>
       <point x="437" y="1621"/>
       <point x="441" y="1641" type="curve" smooth="yes"/>
       <point x="479" y="1827" type="line" smooth="yes"/>
       <point x="483" y="1845"/>
       <point x="494" y="1854"/>
-      <point x="511" y="1854" type="curve" name="dv03" smooth="yes"/>
+      <point x="511" y="1854" type="curve" smooth="yes" name="dv03"/>
       <point x="686" y="1854" type="line" smooth="yes"/>
       <point x="707" y="1854"/>
       <point x="716" y="1841"/>
@@ -22,14 +22,14 @@
       <point x="643" y="1608" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="863" y="1608" type="line" name="sh01" smooth="yes"/>
+      <point x="863" y="1608" type="line" smooth="yes" name="sh01"/>
       <point x="842" y="1608"/>
       <point x="833" y="1621"/>
       <point x="837" y="1641" type="curve" smooth="yes"/>
       <point x="874" y="1827" type="line" name="sh02"/>
       <point x="877" y="1845"/>
       <point x="887" y="1854"/>
-      <point x="906" y="1854" type="curve" name="sv01" smooth="yes"/>
+      <point x="906" y="1854" type="curve" smooth="yes" name="sv01"/>
       <point x="1081" y="1854" type="line" smooth="yes"/>
       <point x="1101" y="1854"/>
       <point x="1112" y="1841"/>
@@ -40,19 +40,19 @@
       <point x="1040" y="1608" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="497" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="497" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="214" y="-29"/>
       <point x="61" y="139"/>
-      <point x="61" y="482" type="curve" name="sh03" smooth="yes"/>
+      <point x="61" y="482" type="curve" smooth="yes" name="sh03"/>
       <point x="61" y="728"/>
       <point x="139" y="1045"/>
       <point x="246" y="1229" type="curve"/>
       <point x="355" y="1421"/>
       <point x="515" y="1520"/>
-      <point x="735" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="735" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1016" y="1520"/>
       <point x="1171" y="1354"/>
-      <point x="1171" y="1011" type="curve" name="sh04" smooth="yes"/>
+      <point x="1171" y="1011" type="curve" smooth="yes" name="sh04"/>
       <point x="1171" y="784"/>
       <point x="1103" y="463"/>
       <point x="989" y="264" type="curve" smooth="yes"/>
@@ -60,7 +60,7 @@
       <point x="718" y="-29"/>
     </contour>
     <contour>
-      <point x="528" y="233" type="curve" name="dv02" smooth="yes"/>
+      <point x="528" y="233" type="curve" smooth="yes" name="dv02"/>
       <point x="612" y="233"/>
       <point x="670" y="281"/>
       <point x="719" y="373" type="curve" smooth="yes"/>
@@ -69,10 +69,10 @@
       <point x="810" y="630" type="curve" smooth="yes"/>
       <point x="842" y="763"/>
       <point x="868" y="916"/>
-      <point x="868" y="1024" type="curve" name="ah01" smooth="yes"/>
+      <point x="868" y="1024" type="curve" smooth="yes" name="ah01"/>
       <point x="868" y="1181"/>
       <point x="814" y="1260"/>
-      <point x="705" y="1260" type="curve" name="sv02" smooth="yes"/>
+      <point x="705" y="1260" type="curve" smooth="yes" name="sv02"/>
       <point x="618" y="1260"/>
       <point x="562" y="1211"/>
       <point x="514" y="1119" type="curve" smooth="yes"/>
@@ -81,7 +81,7 @@
       <point x="422" y="861" type="curve" smooth="yes"/>
       <point x="382" y="702"/>
       <point x="365" y="537"/>
-      <point x="365" y="458" type="curve" name="sh05" smooth="yes"/>
+      <point x="365" y="458" type="curve" smooth="yes" name="sh05"/>
       <point x="365" y="315"/>
       <point x="417" y="233"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04E_7.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04E_7.glif
index d8660eccf..ab7108dc0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04E_7.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04E_7.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E7" format="1">
+<glyph name="uni04E7" format="2">
   <advance width="1233"/>
   <unicode hex="04E7"/>
   <outline>
     <contour>
-      <point x="449" y="1349" type="line" name="hr00" smooth="yes"/>
+      <point x="449" y="1349" type="line" smooth="yes" name="hr00"/>
       <point x="429" y="1349"/>
       <point x="418" y="1362"/>
       <point x="422" y="1382" type="curve" smooth="yes"/>
       <point x="458" y="1568" type="line"/>
       <point x="461" y="1586"/>
       <point x="471" y="1595"/>
-      <point x="490" y="1595" type="curve" name="dv03" smooth="yes"/>
+      <point x="490" y="1595" type="curve" smooth="yes" name="dv03"/>
       <point x="667" y="1595" type="line" smooth="yes"/>
       <point x="688" y="1595"/>
       <point x="697" y="1582"/>
@@ -22,14 +22,14 @@
       <point x="624" y="1349" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="844" y="1349" type="line" name="sh01" smooth="yes"/>
+      <point x="844" y="1349" type="line" smooth="yes" name="sh01"/>
       <point x="824" y="1349"/>
       <point x="813" y="1362"/>
       <point x="817" y="1382" type="curve" smooth="yes"/>
       <point x="853" y="1568" type="line" name="sh02"/>
       <point x="856" y="1586"/>
       <point x="866" y="1595"/>
-      <point x="885" y="1595" type="curve" name="sv01" smooth="yes"/>
+      <point x="885" y="1595" type="curve" smooth="yes" name="sv01"/>
       <point x="1063" y="1595" type="line" smooth="yes"/>
       <point x="1084" y="1595"/>
       <point x="1093" y="1582"/>
@@ -40,30 +40,30 @@
       <point x="1020" y="1349" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="533" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="533" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="258" y="-29"/>
       <point x="88" y="134"/>
-      <point x="88" y="454" type="curve" name="sh03" smooth="yes"/>
+      <point x="88" y="454" type="curve" smooth="yes" name="sh03"/>
       <point x="88" y="818"/>
       <point x="308" y="1149"/>
-      <point x="700" y="1149" type="curve" name="dv05" smooth="yes"/>
+      <point x="700" y="1149" type="curve" smooth="yes" name="dv05"/>
       <point x="975" y="1149"/>
       <point x="1145" y="987"/>
-      <point x="1145" y="665" type="curve" name="sh04" smooth="yes"/>
+      <point x="1145" y="665" type="curve" smooth="yes" name="sh04"/>
       <point x="1145" y="300"/>
       <point x="925" y="-29"/>
     </contour>
     <contour>
-      <point x="557" y="207" type="curve" name="dv02" smooth="yes"/>
+      <point x="557" y="207" type="curve" smooth="yes" name="dv02"/>
       <point x="737" y="207"/>
       <point x="850" y="440"/>
-      <point x="850" y="664" type="curve" name="ah01" smooth="yes"/>
+      <point x="850" y="664" type="curve" smooth="yes" name="ah01"/>
       <point x="850" y="835"/>
       <point x="784" y="911"/>
-      <point x="679" y="911" type="curve" name="dv04" smooth="yes"/>
+      <point x="679" y="911" type="curve" smooth="yes" name="dv04"/>
       <point x="489" y="911"/>
       <point x="383" y="669"/>
-      <point x="383" y="456" type="curve" name="sh05" smooth="yes"/>
+      <point x="383" y="456" type="curve" smooth="yes" name="sh05"/>
       <point x="383" y="285"/>
       <point x="452" y="207"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04E_8.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04E_8.glif
index b27f657cd..f2786d8b6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04E_8.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04E_8.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E8" format="1">
+<glyph name="uni04E8" format="2">
   <advance width="1233"/>
   <unicode hex="04E8"/>
   <outline>
     <contour>
-      <point x="464" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="464" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="195" y="-29"/>
       <point x="59" y="136"/>
-      <point x="59" y="437" type="curve" name="sh01" smooth="yes"/>
+      <point x="59" y="437" type="curve" smooth="yes" name="sh01"/>
       <point x="59" y="522"/>
       <point x="70" y="633"/>
       <point x="91" y="746" type="curve" smooth="yes"/>
       <point x="184" y="1245"/>
       <point x="422" y="1520"/>
-      <point x="770" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="770" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1039" y="1520"/>
       <point x="1174" y="1357"/>
-      <point x="1174" y="1054" type="curve" name="sh02" smooth="yes"/>
+      <point x="1174" y="1054" type="curve" smooth="yes" name="sh02"/>
       <point x="1174" y="969"/>
       <point x="1163" y="859"/>
       <point x="1142" y="744" type="curve" smooth="yes"/>
@@ -27,23 +27,23 @@
       <point x="860" y="911" type="line" name="sh03"/>
       <point x="864" y="955"/>
       <point x="867" y="996"/>
-      <point x="867" y="1035" type="curve" name="ah01" smooth="yes"/>
+      <point x="867" y="1035" type="curve" smooth="yes" name="ah01"/>
       <point x="867" y="1166"/>
       <point x="833" y="1255"/>
-      <point x="715" y="1255" type="curve" name="sv01" smooth="yes"/>
+      <point x="715" y="1255" type="curve" smooth="yes" name="sv01"/>
       <point x="564" y="1255"/>
       <point x="496" y="1112"/>
       <point x="437" y="911" type="curve"/>
     </contour>
     <contour>
-      <point x="518" y="236" type="curve" name="dv01" smooth="yes"/>
+      <point x="518" y="236" type="curve" smooth="yes" name="dv01"/>
       <point x="668" y="236"/>
       <point x="750" y="381"/>
       <point x="814" y="651" type="curve" name="dv02"/>
       <point x="383" y="651" type="line"/>
       <point x="372" y="576"/>
       <point x="366" y="513"/>
-      <point x="366" y="457" type="curve" name="sh04" smooth="yes"/>
+      <point x="366" y="457" type="curve" smooth="yes" name="sh04"/>
       <point x="366" y="312"/>
       <point x="407" y="236"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04E_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04E_9.glif
index eff7aa8b8..5eb1e71e0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04E_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04E_9.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E9" format="1">
+<glyph name="uni04E9" format="2">
   <advance width="1233"/>
   <unicode hex="04E9"/>
   <outline>
     <contour>
-      <point x="502" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="502" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="341" y="-29"/>
       <point x="226" y="26"/>
       <point x="155" y="130" type="curve" smooth="yes"/>
       <point x="106" y="201"/>
       <point x="82" y="292"/>
-      <point x="82" y="402" type="curve" name="sh01" smooth="yes"/>
+      <point x="82" y="402" type="curve" smooth="yes" name="sh01"/>
       <point x="82" y="606"/>
       <point x="165" y="840"/>
       <point x="321" y="988" type="curve" smooth="yes"/>
       <point x="430" y="1092"/>
       <point x="570" y="1147"/>
-      <point x="731" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="731" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="888" y="1147"/>
       <point x="1005" y="1095"/>
       <point x="1077" y="988" type="curve" smooth="yes"/>
       <point x="1128" y="912"/>
       <point x="1150" y="820"/>
-      <point x="1150" y="715" type="curve" name="sh02" smooth="yes"/>
+      <point x="1150" y="715" type="curve" smooth="yes" name="sh02"/>
       <point x="1150" y="507"/>
       <point x="1063" y="274"/>
       <point x="911" y="130" type="curve" smooth="yes"/>
@@ -33,16 +33,16 @@
       <point x="853" y="632" type="line" name="sh03"/>
       <point x="855" y="651"/>
       <point x="856" y="669"/>
-      <point x="856" y="687" type="curve" name="ah01" smooth="yes"/>
+      <point x="856" y="687" type="curve" smooth="yes" name="ah01"/>
       <point x="856" y="812"/>
       <point x="808" y="909"/>
-      <point x="684" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="684" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="544" y="909"/>
       <point x="450" y="783"/>
       <point x="408" y="632" type="curve"/>
     </contour>
     <contour>
-      <point x="548" y="209" type="curve" name="dv01" smooth="yes"/>
+      <point x="548" y="209" type="curve" smooth="yes" name="dv01"/>
       <point x="688" y="209"/>
       <point x="769" y="330"/>
       <point x="809" y="438" type="curve" name="dv02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04E_A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04E_A_.glif
index 9517949b9..69f8cb5a3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04E_A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04E_A_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04EA" format="1">
+<glyph name="uni04EA" format="2">
   <advance width="1233"/>
   <unicode hex="04EA"/>
   <outline>
     <contour>
-      <point x="487" y="1608" type="line" name="hr00" smooth="yes"/>
+      <point x="487" y="1608" type="line" smooth="yes" name="hr00"/>
       <point x="466" y="1608"/>
       <point x="457" y="1621"/>
       <point x="461" y="1641" type="curve" smooth="yes"/>
       <point x="499" y="1827" type="line" smooth="yes"/>
       <point x="503" y="1845"/>
       <point x="514" y="1854"/>
-      <point x="531" y="1854" type="curve" name="dv03" smooth="yes"/>
+      <point x="531" y="1854" type="curve" smooth="yes" name="dv03"/>
       <point x="706" y="1854" type="line" smooth="yes"/>
       <point x="727" y="1854"/>
       <point x="736" y="1841"/>
@@ -22,14 +22,14 @@
       <point x="663" y="1608" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="883" y="1608" type="line" name="sv01" smooth="yes"/>
+      <point x="883" y="1608" type="line" smooth="yes" name="sv01"/>
       <point x="862" y="1608"/>
       <point x="853" y="1621"/>
-      <point x="857" y="1641" type="curve" name="sh01" smooth="yes"/>
+      <point x="857" y="1641" type="curve" smooth="yes" name="sh01"/>
       <point x="894" y="1827" type="line"/>
       <point x="897" y="1845"/>
       <point x="907" y="1854"/>
-      <point x="926" y="1854" type="curve" name="sv02" smooth="yes"/>
+      <point x="926" y="1854" type="curve" smooth="yes" name="sv02"/>
       <point x="1101" y="1854" type="line" smooth="yes"/>
       <point x="1121" y="1854"/>
       <point x="1132" y="1841"/>
@@ -40,19 +40,19 @@
       <point x="1060" y="1608" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="464" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="464" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="195" y="-29"/>
       <point x="59" y="136"/>
-      <point x="59" y="437" type="curve" name="sh02" smooth="yes"/>
+      <point x="59" y="437" type="curve" smooth="yes" name="sh02"/>
       <point x="59" y="522"/>
       <point x="70" y="633"/>
       <point x="91" y="746" type="curve" smooth="yes"/>
       <point x="184" y="1245"/>
       <point x="422" y="1520"/>
-      <point x="770" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="770" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1039" y="1520"/>
       <point x="1174" y="1357"/>
-      <point x="1174" y="1054" type="curve" name="sh03" smooth="yes"/>
+      <point x="1174" y="1054" type="curve" smooth="yes" name="sh03"/>
       <point x="1174" y="969"/>
       <point x="1163" y="859"/>
       <point x="1142" y="744" type="curve" smooth="yes"/>
@@ -63,23 +63,23 @@
       <point x="860" y="911" type="line" name="sh04"/>
       <point x="864" y="955"/>
       <point x="867" y="996"/>
-      <point x="867" y="1035" type="curve" name="ah01" smooth="yes"/>
+      <point x="867" y="1035" type="curve" smooth="yes" name="ah01"/>
       <point x="867" y="1166"/>
       <point x="833" y="1255"/>
-      <point x="715" y="1255" type="curve" name="sv03" smooth="yes"/>
+      <point x="715" y="1255" type="curve" smooth="yes" name="sv03"/>
       <point x="564" y="1255"/>
       <point x="496" y="1112"/>
       <point x="437" y="911" type="curve"/>
     </contour>
     <contour>
-      <point x="518" y="236" type="curve" name="dv02" smooth="yes"/>
+      <point x="518" y="236" type="curve" smooth="yes" name="dv02"/>
       <point x="668" y="236"/>
       <point x="750" y="381"/>
       <point x="814" y="651" type="curve" name="dv04"/>
       <point x="383" y="651" type="line"/>
       <point x="372" y="576"/>
       <point x="366" y="513"/>
-      <point x="366" y="457" type="curve" name="sh05" smooth="yes"/>
+      <point x="366" y="457" type="curve" smooth="yes" name="sh05"/>
       <point x="366" y="312"/>
       <point x="407" y="236"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04E_B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04E_B_.glif
index b1e73b49a..924e4276d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04E_B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04E_B_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04EB" format="1">
+<glyph name="uni04EB" format="2">
   <advance width="1233"/>
   <unicode hex="04EB"/>
   <outline>
     <contour>
-      <point x="449" y="1347" type="line" name="hr00" smooth="yes"/>
+      <point x="449" y="1347" type="line" smooth="yes" name="hr00"/>
       <point x="429" y="1347"/>
       <point x="418" y="1360"/>
       <point x="422" y="1380" type="curve" smooth="yes"/>
       <point x="458" y="1566" type="line"/>
       <point x="461" y="1584"/>
       <point x="471" y="1593"/>
-      <point x="490" y="1593" type="curve" name="dv03" smooth="yes"/>
+      <point x="490" y="1593" type="curve" smooth="yes" name="dv03"/>
       <point x="667" y="1593" type="line" smooth="yes"/>
       <point x="688" y="1593"/>
       <point x="697" y="1580"/>
@@ -22,14 +22,14 @@
       <point x="624" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="844" y="1347" type="line" name="sh01" smooth="yes"/>
+      <point x="844" y="1347" type="line" smooth="yes" name="sh01"/>
       <point x="824" y="1347"/>
       <point x="813" y="1360"/>
       <point x="817" y="1380" type="curve" smooth="yes"/>
       <point x="853" y="1566" type="line" name="sh02"/>
       <point x="856" y="1584"/>
       <point x="866" y="1593"/>
-      <point x="885" y="1593" type="curve" name="sv01" smooth="yes"/>
+      <point x="885" y="1593" type="curve" smooth="yes" name="sv01"/>
       <point x="1063" y="1593" type="line" smooth="yes"/>
       <point x="1084" y="1593"/>
       <point x="1093" y="1580"/>
@@ -40,25 +40,25 @@
       <point x="1020" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="502" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="502" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="341" y="-29"/>
       <point x="226" y="26"/>
       <point x="155" y="130" type="curve" smooth="yes"/>
       <point x="106" y="201"/>
       <point x="82" y="292"/>
-      <point x="82" y="402" type="curve" name="sh03" smooth="yes"/>
+      <point x="82" y="402" type="curve" smooth="yes" name="sh03"/>
       <point x="82" y="606"/>
       <point x="165" y="840"/>
       <point x="321" y="988" type="curve" smooth="yes"/>
       <point x="430" y="1092"/>
       <point x="570" y="1147"/>
-      <point x="731" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="731" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="888" y="1147"/>
       <point x="1005" y="1095"/>
       <point x="1077" y="988" type="curve" smooth="yes"/>
       <point x="1128" y="912"/>
       <point x="1150" y="820"/>
-      <point x="1150" y="715" type="curve" name="sh04" smooth="yes"/>
+      <point x="1150" y="715" type="curve" smooth="yes" name="sh04"/>
       <point x="1150" y="507"/>
       <point x="1063" y="274"/>
       <point x="911" y="130" type="curve" smooth="yes"/>
@@ -69,16 +69,16 @@
       <point x="853" y="632" type="line" name="sh05"/>
       <point x="855" y="651"/>
       <point x="856" y="669"/>
-      <point x="856" y="687" type="curve" name="ah01" smooth="yes"/>
+      <point x="856" y="687" type="curve" smooth="yes" name="ah01"/>
       <point x="856" y="812"/>
       <point x="808" y="909"/>
-      <point x="684" y="909" type="curve" name="sv02" smooth="yes"/>
+      <point x="684" y="909" type="curve" smooth="yes" name="sv02"/>
       <point x="544" y="909"/>
       <point x="450" y="783"/>
       <point x="408" y="632" type="curve"/>
     </contour>
     <contour>
-      <point x="548" y="209" type="curve" name="dv02" smooth="yes"/>
+      <point x="548" y="209" type="curve" smooth="yes" name="dv02"/>
       <point x="688" y="209"/>
       <point x="769" y="330"/>
       <point x="809" y="438" type="curve" name="dv04"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04E_C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04E_C_.glif
index 01ba4d33f..a7b75101f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04E_C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04E_C_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04EC" format="1">
+<glyph name="uni04EC" format="2">
   <advance width="1233"/>
   <unicode hex="04EC"/>
   <outline>
     <contour>
-      <point x="434" y="1608" type="line" name="hr00" smooth="yes"/>
+      <point x="434" y="1608" type="line" smooth="yes" name="hr00"/>
       <point x="413" y="1608"/>
       <point x="404" y="1621"/>
       <point x="408" y="1641" type="curve" smooth="yes"/>
       <point x="446" y="1827" type="line" smooth="yes"/>
       <point x="450" y="1845"/>
       <point x="461" y="1854"/>
-      <point x="478" y="1854" type="curve" name="dv03" smooth="yes"/>
+      <point x="478" y="1854" type="curve" smooth="yes" name="dv03"/>
       <point x="653" y="1854" type="line" smooth="yes"/>
       <point x="674" y="1854"/>
       <point x="683" y="1841"/>
@@ -22,14 +22,14 @@
       <point x="610" y="1608" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="830" y="1608" type="line" name="sv01" smooth="yes"/>
+      <point x="830" y="1608" type="line" smooth="yes" name="sv01"/>
       <point x="809" y="1608"/>
       <point x="800" y="1621"/>
       <point x="804" y="1641" type="curve" smooth="yes"/>
       <point x="841" y="1827" type="line"/>
       <point x="844" y="1845"/>
       <point x="854" y="1854"/>
-      <point x="873" y="1854" type="curve" name="sv02" smooth="yes"/>
+      <point x="873" y="1854" type="curve" smooth="yes" name="sv02"/>
       <point x="1048" y="1854" type="line" smooth="yes"/>
       <point x="1068" y="1854"/>
       <point x="1079" y="1841"/>
@@ -40,14 +40,14 @@
       <point x="1007" y="1608" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="343" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="343" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="226" y="-29"/>
       <point x="130" y="-5"/>
       <point x="45" y="43" type="curve"/>
       <point x="109" y="371" type="line"/>
       <point x="189" y="281"/>
       <point x="282" y="236"/>
-      <point x="387" y="236" type="curve" name="dv02" smooth="yes"/>
+      <point x="387" y="236" type="curve" smooth="yes" name="dv02"/>
       <point x="568" y="236"/>
       <point x="696" y="362"/>
       <point x="772" y="615" type="curve" name="dv04"/>
@@ -56,20 +56,20 @@
       <point x="822" y="875" type="line" name="sh01"/>
       <point x="825" y="903"/>
       <point x="826" y="929"/>
-      <point x="826" y="952" type="curve" name="dh01" smooth="yes"/>
+      <point x="826" y="952" type="curve" smooth="yes" name="dh01"/>
       <point x="826" y="1157"/>
       <point x="744" y="1255"/>
-      <point x="584" y="1255" type="curve" name="sv03" smooth="yes"/>
+      <point x="584" y="1255" type="curve" smooth="yes" name="sv03"/>
       <point x="476" y="1255"/>
       <point x="371" y="1211"/>
       <point x="255" y="1120" type="curve"/>
       <point x="319" y="1448" type="line"/>
       <point x="418" y="1496"/>
       <point x="527" y="1520"/>
-      <point x="646" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="646" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1045" y="1520"/>
       <point x="1139" y="1256"/>
-      <point x="1139" y="1012" type="curve" name="dh02" smooth="yes"/>
+      <point x="1139" y="1012" type="curve" smooth="yes" name="dh02"/>
       <point x="1139" y="936"/>
       <point x="1131" y="842"/>
       <point x="1112" y="746" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04E_D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04E_D_.glif
index df589ba24..96008780c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04E_D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04E_D_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04ED" format="1">
+<glyph name="uni04ED" format="2">
   <advance width="1233"/>
   <unicode hex="04ED"/>
   <outline>
     <contour>
-      <point x="434" y="1347" type="line" name="hr00" smooth="yes"/>
+      <point x="434" y="1347" type="line" smooth="yes" name="hr00"/>
       <point x="414" y="1347"/>
       <point x="403" y="1360"/>
       <point x="407" y="1380" type="curve" smooth="yes"/>
       <point x="443" y="1566" type="line"/>
       <point x="446" y="1584"/>
       <point x="456" y="1593"/>
-      <point x="475" y="1593" type="curve" name="dv03" smooth="yes"/>
+      <point x="475" y="1593" type="curve" smooth="yes" name="dv03"/>
       <point x="652" y="1593" type="line" smooth="yes"/>
       <point x="673" y="1593"/>
       <point x="682" y="1580"/>
@@ -22,14 +22,14 @@
       <point x="609" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="829" y="1347" type="line" name="sv01" smooth="yes"/>
+      <point x="829" y="1347" type="line" smooth="yes" name="sv01"/>
       <point x="809" y="1347"/>
       <point x="798" y="1360"/>
       <point x="802" y="1380" type="curve" smooth="yes"/>
       <point x="838" y="1566" type="line"/>
       <point x="841" y="1584"/>
       <point x="851" y="1593"/>
-      <point x="870" y="1593" type="curve" name="sv02" smooth="yes"/>
+      <point x="870" y="1593" type="curve" smooth="yes" name="sv02"/>
       <point x="1048" y="1593" type="line" smooth="yes"/>
       <point x="1069" y="1593"/>
       <point x="1078" y="1580"/>
@@ -40,14 +40,14 @@
       <point x="1005" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="411" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="411" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="282" y="-29"/>
       <point x="175" y="0"/>
       <point x="88" y="57" type="curve"/>
       <point x="141" y="326" type="line"/>
       <point x="216" y="247"/>
       <point x="297" y="209"/>
-      <point x="409" y="209" type="curve" name="dv02" smooth="yes"/>
+      <point x="409" y="209" type="curve" smooth="yes" name="dv02"/>
       <point x="576" y="209"/>
       <point x="695" y="294"/>
       <point x="756" y="458" type="curve" name="dv04"/>
@@ -56,17 +56,17 @@
       <point x="794" y="677" type="line" name="dh01"/>
       <point x="789" y="832"/>
       <point x="709" y="909"/>
-      <point x="552" y="909" type="curve" name="sv03" smooth="yes"/>
+      <point x="552" y="909" type="curve" smooth="yes" name="sv03"/>
       <point x="441" y="909"/>
       <point x="335" y="871"/>
       <point x="232" y="795" type="curve"/>
       <point x="284" y="1063" type="line"/>
       <point x="400" y="1119"/>
       <point x="515" y="1147"/>
-      <point x="642" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="642" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="986" y="1147"/>
       <point x="1096" y="939"/>
-      <point x="1096" y="724" type="curve" name="dh02" smooth="yes"/>
+      <point x="1096" y="724" type="curve" smooth="yes" name="dh02"/>
       <point x="1096" y="669"/>
       <point x="1090" y="612"/>
       <point x="1079" y="560" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04E_E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04E_E_.glif
index 6a2c8a1de..0264ba5a2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04E_E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04E_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04EE" format="1">
+<glyph name="uni04EE" format="2">
   <advance width="1233"/>
   <unicode hex="04EE"/>
   <outline>
@@ -27,7 +27,7 @@
       <point x="651" y="303" type="line"/>
       <point x="528" y="99"/>
       <point x="406" y="0"/>
-      <point x="250" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="250" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="50" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04E_F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04E_F_.glif
index d1da5c7a6..29e78a6d6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04E_F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04E_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04EF" format="1">
+<glyph name="uni04EF" format="2">
   <advance width="1233"/>
   <unicode hex="04EF"/>
   <outline>
@@ -24,7 +24,7 @@
       <point x="576" y="-121" type="line" smooth="yes"/>
       <point x="426" y="-386"/>
       <point x="343" y="-424"/>
-      <point x="175" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="175" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="-65" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04F_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04F_0.glif
index af2d715ce..d96d413c4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04F_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04F_0.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F0" format="1">
+<glyph name="uni04F0" format="2">
   <advance width="1233"/>
   <unicode hex="04F0"/>
   <outline>
     <contour>
-      <point x="503" y="1608" type="line" name="hr00" smooth="yes"/>
+      <point x="503" y="1608" type="line" smooth="yes" name="hr00"/>
       <point x="482" y="1608"/>
       <point x="473" y="1621"/>
       <point x="477" y="1641" type="curve" smooth="yes"/>
       <point x="515" y="1827" type="line" smooth="yes"/>
       <point x="519" y="1845"/>
       <point x="530" y="1854"/>
-      <point x="547" y="1854" type="curve" name="dv01" smooth="yes"/>
+      <point x="547" y="1854" type="curve" smooth="yes" name="dv01"/>
       <point x="722" y="1854" type="line" smooth="yes"/>
       <point x="743" y="1854"/>
       <point x="752" y="1841"/>
@@ -22,14 +22,14 @@
       <point x="679" y="1608" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="899" y="1608" type="line" name="sv01" smooth="yes"/>
+      <point x="899" y="1608" type="line" smooth="yes" name="sv01"/>
       <point x="878" y="1608"/>
       <point x="869" y="1621"/>
       <point x="873" y="1641" type="curve" smooth="yes"/>
       <point x="910" y="1827" type="line"/>
       <point x="913" y="1845"/>
       <point x="923" y="1854"/>
-      <point x="942" y="1854" type="curve" name="sv02" smooth="yes"/>
+      <point x="942" y="1854" type="curve" smooth="yes" name="sv02"/>
       <point x="1117" y="1854" type="line" smooth="yes"/>
       <point x="1137" y="1854"/>
       <point x="1148" y="1841"/>
@@ -57,7 +57,7 @@
       <point x="651" y="303" type="line"/>
       <point x="528" y="99"/>
       <point x="406" y="0"/>
-      <point x="250" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="250" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="50" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04F_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04F_1.glif
index 49561ec15..c61d64c8b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04F_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04F_1.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F1" format="1">
+<glyph name="uni04F1" format="2">
   <advance width="1233"/>
   <unicode hex="04F1"/>
   <outline>
     <contour>
-      <point x="464" y="1320" type="line" name="hr00" smooth="yes"/>
+      <point x="464" y="1320" type="line" smooth="yes" name="hr00"/>
       <point x="444" y="1320"/>
       <point x="433" y="1333"/>
       <point x="437" y="1353" type="curve" smooth="yes"/>
       <point x="473" y="1539" type="line"/>
       <point x="476" y="1557"/>
       <point x="486" y="1566"/>
-      <point x="505" y="1566" type="curve" name="at03" smooth="yes"/>
+      <point x="505" y="1566" type="curve" smooth="yes" name="at03"/>
       <point x="682" y="1566" type="line" smooth="yes"/>
       <point x="703" y="1566"/>
       <point x="712" y="1553"/>
@@ -22,14 +22,14 @@
       <point x="639" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="859" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="859" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="839" y="1320"/>
       <point x="828" y="1333"/>
       <point x="832" y="1353" type="curve" smooth="yes"/>
       <point x="868" y="1539" type="line"/>
       <point x="871" y="1557"/>
       <point x="881" y="1566"/>
-      <point x="900" y="1566" type="curve" name="at04" smooth="yes"/>
+      <point x="900" y="1566" type="curve" smooth="yes" name="at04"/>
       <point x="1078" y="1566" type="line" smooth="yes"/>
       <point x="1099" y="1566"/>
       <point x="1108" y="1553"/>
@@ -37,7 +37,7 @@
       <point x="1067" y="1347" type="line" smooth="yes"/>
       <point x="1064" y="1329"/>
       <point x="1053" y="1320"/>
-      <point x="1035" y="1320" type="curve" name="sv02" smooth="yes"/>
+      <point x="1035" y="1320" type="curve" smooth="yes" name="sv02"/>
     </contour>
     <contour>
       <point x="-20" y="-201" type="line" name="sv03"/>
@@ -54,7 +54,7 @@
       <point x="576" y="-121" type="line" smooth="yes"/>
       <point x="426" y="-386"/>
       <point x="343" y="-424"/>
-      <point x="175" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="175" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="-65" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04F_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04F_2.glif
index 5373ceae1..06cc0098c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04F_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04F_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F2" format="1">
+<glyph name="uni04F2" format="2">
   <advance width="1233"/>
   <unicode hex="04F2"/>
   <outline>
@@ -33,7 +33,7 @@
       <point x="651" y="303" type="line"/>
       <point x="528" y="99"/>
       <point x="406" y="0"/>
-      <point x="250" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="250" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="50" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04F_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04F_3.glif
index e4406d79a..8c1ff8b19 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04F_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04F_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F3" format="1">
+<glyph name="uni04F3" format="2">
   <advance width="1233"/>
   <unicode hex="04F3"/>
   <outline>
@@ -30,7 +30,7 @@
       <point x="576" y="-121" type="line" smooth="yes"/>
       <point x="426" y="-386"/>
       <point x="343" y="-424"/>
-      <point x="175" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="175" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="-65" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04F_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04F_4.glif
index 546cb701a..787954d68 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04F_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04F_4.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F4" format="1">
+<glyph name="uni04F4" format="2">
   <advance width="1233"/>
   <unicode hex="04F4"/>
   <outline>
     <contour>
-      <point x="502" y="1628" type="line" name="hr00" smooth="yes"/>
+      <point x="502" y="1628" type="line" smooth="yes" name="hr00"/>
       <point x="481" y="1628"/>
       <point x="472" y="1641"/>
       <point x="476" y="1661" type="curve" smooth="yes"/>
       <point x="514" y="1847" type="line" smooth="yes"/>
       <point x="518" y="1865"/>
       <point x="529" y="1874"/>
-      <point x="546" y="1874" type="curve" name="dv01" smooth="yes"/>
+      <point x="546" y="1874" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="1874" type="line" smooth="yes"/>
       <point x="742" y="1874"/>
       <point x="751" y="1861"/>
@@ -22,14 +22,14 @@
       <point x="678" y="1628" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="898" y="1628" type="line" name="sv01" smooth="yes"/>
+      <point x="898" y="1628" type="line" smooth="yes" name="sv01"/>
       <point x="877" y="1628"/>
       <point x="868" y="1641"/>
       <point x="872" y="1661" type="curve" smooth="yes"/>
       <point x="909" y="1847" type="line"/>
       <point x="912" y="1865"/>
       <point x="922" y="1874"/>
-      <point x="941" y="1874" type="curve" name="sv02" smooth="yes"/>
+      <point x="941" y="1874" type="curve" smooth="yes" name="sv02"/>
       <point x="1116" y="1874" type="line" smooth="yes"/>
       <point x="1136" y="1874"/>
       <point x="1147" y="1861"/>
@@ -43,10 +43,10 @@
       <point x="833" y="766" type="line" name="iv01"/>
       <point x="772" y="663"/>
       <point x="656" y="607"/>
-      <point x="459" y="607" type="curve" name="dv02" smooth="yes"/>
+      <point x="459" y="607" type="curve" smooth="yes" name="dv02"/>
       <point x="231" y="607"/>
       <point x="132" y="683"/>
-      <point x="132" y="878" type="curve" name="dh01" smooth="yes"/>
+      <point x="132" y="878" type="curve" smooth="yes" name="dh01"/>
       <point x="132" y="922"/>
       <point x="137" y="972"/>
       <point x="148" y="1027" type="curve" smooth="yes"/>
@@ -55,10 +55,10 @@
       <point x="453" y="1095" type="line" smooth="yes"/>
       <point x="448" y="1067"/>
       <point x="445" y="1044"/>
-      <point x="445" y="1020" type="curve" name="dh02" smooth="yes"/>
+      <point x="445" y="1020" type="curve" smooth="yes" name="dh02"/>
       <point x="445" y="896"/>
       <point x="524" y="870"/>
-      <point x="620" y="870" type="curve" name="dv03" smooth="yes"/>
+      <point x="620" y="870" type="curve" smooth="yes" name="dv03"/>
       <point x="799" y="870"/>
       <point x="870" y="959"/>
       <point x="905" y="1136" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04F_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04F_5.glif
index c31014dfe..e377993ff 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04F_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04F_5.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F5" format="1">
+<glyph name="uni04F5" format="2">
   <advance width="1233"/>
   <unicode hex="04F5"/>
   <outline>
     <contour>
-      <point x="442" y="1321" type="line" name="sv01" smooth="yes"/>
+      <point x="442" y="1321" type="line" smooth="yes" name="sv01"/>
       <point x="422" y="1321"/>
       <point x="411" y="1334"/>
       <point x="415" y="1354" type="curve" smooth="yes"/>
       <point x="451" y="1540" type="line"/>
       <point x="454" y="1558"/>
       <point x="464" y="1567"/>
-      <point x="483" y="1567" type="curve" name="at03" smooth="yes"/>
+      <point x="483" y="1567" type="curve" smooth="yes" name="at03"/>
       <point x="660" y="1567" type="line" smooth="yes"/>
       <point x="681" y="1567"/>
       <point x="690" y="1554"/>
@@ -22,14 +22,14 @@
       <point x="617" y="1321" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="837" y="1321" type="line" name="sv02" smooth="yes"/>
+      <point x="837" y="1321" type="line" smooth="yes" name="sv02"/>
       <point x="817" y="1321"/>
       <point x="806" y="1334"/>
       <point x="810" y="1354" type="curve" smooth="yes"/>
       <point x="846" y="1540" type="line" name="hr01"/>
       <point x="849" y="1558"/>
       <point x="859" y="1567"/>
-      <point x="878" y="1567" type="curve" name="at04" smooth="yes"/>
+      <point x="878" y="1567" type="curve" smooth="yes" name="at04"/>
       <point x="1056" y="1567" type="line" smooth="yes"/>
       <point x="1077" y="1567"/>
       <point x="1086" y="1554"/>
@@ -37,7 +37,7 @@
       <point x="1045" y="1348" type="line" smooth="yes"/>
       <point x="1042" y="1330"/>
       <point x="1031" y="1321"/>
-      <point x="1013" y="1321" type="curve" name="sv03" smooth="yes"/>
+      <point x="1013" y="1321" type="curve" smooth="yes" name="sv03"/>
     </contour>
     <contour>
       <point x="716" y="416" type="line" name="dv01"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04F_6.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04F_6.glif
index 969ff3a13..f0be237b0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04F_6.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04F_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F6" format="1">
+<glyph name="uni04F6" format="2">
   <advance width="1233"/>
   <unicode hex="04F6"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04F_7.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04F_7.glif
index 0e34117b7..b5731f5da 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04F_7.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04F_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F7" format="1">
+<glyph name="uni04F7" format="2">
   <advance width="1233"/>
   <unicode hex="04F7"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04F_8.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04F_8.glif
index c65bb0919..1e2be4aec 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04F_8.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04F_8.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F8" format="1">
+<glyph name="uni04F8" format="2">
   <advance width="1233"/>
   <unicode hex="04F8"/>
   <outline>
     <contour>
-      <point x="496" y="1608" type="line" name="hr00" smooth="yes"/>
+      <point x="496" y="1608" type="line" smooth="yes" name="hr00"/>
       <point x="475" y="1608"/>
       <point x="466" y="1621"/>
       <point x="470" y="1641" type="curve" smooth="yes"/>
       <point x="508" y="1827" type="line" smooth="yes"/>
       <point x="512" y="1845"/>
       <point x="523" y="1854"/>
-      <point x="540" y="1854" type="curve" name="dv01" smooth="yes"/>
+      <point x="540" y="1854" type="curve" smooth="yes" name="dv01"/>
       <point x="715" y="1854" type="line" smooth="yes"/>
       <point x="736" y="1854"/>
       <point x="745" y="1841"/>
@@ -22,14 +22,14 @@
       <point x="672" y="1608" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="892" y="1608" type="line" name="sv01" smooth="yes"/>
+      <point x="892" y="1608" type="line" smooth="yes" name="sv01"/>
       <point x="871" y="1608"/>
       <point x="862" y="1621"/>
       <point x="866" y="1641" type="curve" smooth="yes"/>
       <point x="903" y="1827" type="line"/>
       <point x="906" y="1845"/>
       <point x="916" y="1854"/>
-      <point x="935" y="1854" type="curve" name="sv02" smooth="yes"/>
+      <point x="935" y="1854" type="curve" smooth="yes" name="sv02"/>
       <point x="1110" y="1854" type="line" smooth="yes"/>
       <point x="1130" y="1854"/>
       <point x="1141" y="1841"/>
@@ -46,13 +46,13 @@
       <point x="340" y="913" type="line" smooth="yes"/>
       <point x="692" y="913"/>
       <point x="801" y="773"/>
-      <point x="801" y="580" type="curve" name="dh02" smooth="yes"/>
+      <point x="801" y="580" type="curve" smooth="yes" name="dh02"/>
       <point x="801" y="539"/>
       <point x="796" y="498"/>
       <point x="787" y="451" type="curve" smooth="yes"/>
       <point x="727" y="146"/>
       <point x="519" y="0"/>
-      <point x="163" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="163" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="-102" y="0" type="line"/>
     </contour>
     <contour>
@@ -62,19 +62,19 @@
       <point x="796" y="0" type="line" name="sh01"/>
     </contour>
     <contour>
-      <point x="220" y="236" type="line" name="sv03" smooth="yes"/>
+      <point x="220" y="236" type="line" smooth="yes" name="sv03"/>
       <point x="416" y="236"/>
       <point x="502" y="290"/>
       <point x="532" y="451" type="curve"/>
       <point x="539" y="483"/>
       <point x="541" y="512"/>
-      <point x="541" y="535" type="curve" name="dh01" smooth="yes"/>
+      <point x="541" y="535" type="curve" smooth="yes" name="dh01"/>
       <point x="541" y="578"/>
       <point x="529" y="614"/>
       <point x="501" y="638" type="curve" smooth="yes"/>
       <point x="470" y="665"/>
       <point x="415" y="678"/>
-      <point x="306" y="678" type="curve" name="dv02" smooth="yes"/>
+      <point x="306" y="678" type="curve" smooth="yes" name="dv02"/>
       <point x="285" y="678" type="line"/>
       <point x="199" y="236" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni04F_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni04F_9.glif
index 61cc14500..6ffbc77e9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni04F_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni04F_9.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F9" format="1">
+<glyph name="uni04F9" format="2">
   <advance width="1233"/>
   <unicode hex="04F9"/>
   <outline>
     <contour>
-      <point x="467" y="1320" type="line" name="hr00" smooth="yes"/>
+      <point x="467" y="1320" type="line" smooth="yes" name="hr00"/>
       <point x="447" y="1320"/>
       <point x="436" y="1333"/>
       <point x="440" y="1353" type="curve" smooth="yes"/>
       <point x="476" y="1539" type="line"/>
       <point x="479" y="1557"/>
       <point x="489" y="1566"/>
-      <point x="508" y="1566" type="curve" name="at03" smooth="yes"/>
+      <point x="508" y="1566" type="curve" smooth="yes" name="at03"/>
       <point x="685" y="1566" type="line" smooth="yes"/>
       <point x="706" y="1566"/>
       <point x="715" y="1553"/>
@@ -22,14 +22,14 @@
       <point x="642" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="862" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="862" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="842" y="1320"/>
       <point x="831" y="1333"/>
       <point x="835" y="1353" type="curve" smooth="yes"/>
       <point x="871" y="1539" type="line"/>
       <point x="874" y="1557"/>
       <point x="884" y="1566"/>
-      <point x="903" y="1566" type="curve" name="at04" smooth="yes"/>
+      <point x="903" y="1566" type="curve" smooth="yes" name="at04"/>
       <point x="1081" y="1566" type="line" smooth="yes"/>
       <point x="1102" y="1566"/>
       <point x="1111" y="1553"/>
@@ -37,7 +37,7 @@
       <point x="1070" y="1347" type="line" smooth="yes"/>
       <point x="1067" y="1329"/>
       <point x="1056" y="1320"/>
-      <point x="1038" y="1320" type="curve" name="sv02" smooth="yes"/>
+      <point x="1038" y="1320" type="curve" smooth="yes" name="sv02"/>
     </contour>
     <contour>
       <point x="140" y="1120" type="line" name="at01"/>
@@ -46,13 +46,13 @@
       <point x="370" y="698" type="line" smooth="yes"/>
       <point x="653" y="698"/>
       <point x="765" y="585"/>
-      <point x="765" y="429" type="curve" name="dh02" smooth="yes"/>
+      <point x="765" y="429" type="curve" smooth="yes" name="dh02"/>
       <point x="765" y="404"/>
       <point x="762" y="379"/>
       <point x="757" y="350" type="curve" smooth="yes"/>
       <point x="717" y="129"/>
       <point x="533" y="0"/>
-      <point x="234" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="234" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="-78" y="0" type="line"/>
     </contour>
     <contour>
@@ -62,10 +62,10 @@
       <point x="799" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="283" y="219" type="line" name="sv03" smooth="yes"/>
+      <point x="283" y="219" type="line" smooth="yes" name="sv03"/>
       <point x="363" y="219"/>
       <point x="467" y="272"/>
-      <point x="467" y="370" type="curve" name="dh01" smooth="yes"/>
+      <point x="467" y="370" type="curve" smooth="yes" name="dh01"/>
       <point x="467" y="451"/>
       <point x="396" y="479"/>
       <point x="333" y="479" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0510.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0510.glif
index e5b0c1dca..344d6994c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0510.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0510.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0510" format="1">
+<glyph name="uni0510" format="2">
   <advance width="1233"/>
   <unicode hex="0510"/>
   <outline>
     <contour>
-      <point x="520" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="520" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="209" y="-29"/>
       <point x="50" y="87"/>
-      <point x="50" y="310" type="curve" name="dh01" smooth="yes"/>
+      <point x="50" y="310" type="curve" smooth="yes" name="dh01"/>
       <point x="50" y="345"/>
       <point x="54" y="377"/>
       <point x="61" y="416" type="curve"/>
@@ -16,26 +16,26 @@
       <point x="465" y="805" type="curve" name="ih02"/>
       <point x="301" y="837"/>
       <point x="227" y="933"/>
-      <point x="227" y="1058" type="curve" name="ih01" smooth="yes"/>
+      <point x="227" y="1058" type="curve" smooth="yes" name="ih01"/>
       <point x="227" y="1083"/>
       <point x="230" y="1106"/>
       <point x="235" y="1133" type="curve" smooth="yes"/>
       <point x="281" y="1366"/>
       <point x="487" y="1520"/>
-      <point x="810" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="810" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="935" y="1520"/>
       <point x="1064" y="1497"/>
       <point x="1193" y="1456" type="curve"/>
       <point x="1141" y="1188" type="line"/>
       <point x="1013" y="1241"/>
       <point x="888" y="1270"/>
-      <point x="784" y="1270" type="curve" name="sv01" smooth="yes"/>
+      <point x="784" y="1270" type="curve" smooth="yes" name="sv01"/>
       <point x="623" y="1270"/>
       <point x="534" y="1202"/>
-      <point x="513" y="1094" type="curve" name="hr01" smooth="yes"/>
+      <point x="513" y="1094" type="curve" smooth="yes" name="hr01"/>
       <point x="510" y="1079"/>
       <point x="509" y="1066"/>
-      <point x="509" y="1057" type="curve" name="sh01" smooth="yes"/>
+      <point x="509" y="1057" type="curve" smooth="yes" name="sh01"/>
       <point x="509" y="977"/>
       <point x="580" y="928"/>
       <point x="711" y="928" type="curve" smooth="yes"/>
@@ -47,10 +47,10 @@
       <point x="346" y="428" type="curve" smooth="yes"/>
       <point x="343" y="413"/>
       <point x="342" y="398"/>
-      <point x="342" y="386" type="curve" name="dh02" smooth="yes"/>
+      <point x="342" y="386" type="curve" smooth="yes" name="dh02"/>
       <point x="342" y="285"/>
       <point x="414" y="223"/>
-      <point x="586" y="223" type="curve" name="dv02" smooth="yes"/>
+      <point x="586" y="223" type="curve" smooth="yes" name="dv02"/>
       <point x="709" y="223"/>
       <point x="881" y="255"/>
       <point x="1017" y="319" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0511.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0511.glif
index b38f7d562..6d1b857c7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0511.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0511.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0511" format="1">
+<glyph name="uni0511" format="2">
   <advance width="1233"/>
   <unicode hex="0511"/>
   <outline>
     <contour>
-      <point x="568" y="-22" type="curve" name="hr00" smooth="yes"/>
+      <point x="568" y="-22" type="curve" smooth="yes" name="hr00"/>
       <point x="243" y="-22"/>
       <point x="94" y="71"/>
       <point x="94" y="246" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="239" y="850" type="curve" smooth="yes"/>
       <point x="274" y="1026"/>
       <point x="463" y="1140"/>
-      <point x="771" y="1140" type="curve" name="at01" smooth="yes"/>
+      <point x="771" y="1140" type="curve" smooth="yes" name="at01"/>
       <point x="828" y="1140"/>
       <point x="888" y="1136"/>
       <point x="951" y="1128" type="curve" name="at02"/>
@@ -36,7 +36,7 @@
       <point x="1040" y="885" type="line" smooth="yes"/>
       <point x="919" y="925"/>
       <point x="858" y="938"/>
-      <point x="756" y="938" type="curve" name="sv01" smooth="yes"/>
+      <point x="756" y="938" type="curve" smooth="yes" name="sv01"/>
       <point x="681" y="938"/>
       <point x="629" y="931"/>
       <point x="577" y="904" type="curve"/>
@@ -71,7 +71,7 @@
       <point x="419" y="223" type="curve" smooth="yes"/>
       <point x="466" y="190"/>
       <point x="525" y="181"/>
-      <point x="605" y="181" type="curve" name="sv02" smooth="yes"/>
+      <point x="605" y="181" type="curve" smooth="yes" name="sv02"/>
       <point x="677" y="181"/>
       <point x="743" y="188"/>
       <point x="812" y="200" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni051A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni051A_.glif
index d11988072..96cb5c0f5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni051A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni051A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni051A" format="1">
+<glyph name="uni051A" format="2">
   <advance width="1233"/>
   <unicode hex="051A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni051B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni051B_.glif
index 96e87014c..d75c7eb5b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni051B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni051B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni051B" format="1">
+<glyph name="uni051B" format="2">
   <advance width="1233"/>
   <unicode hex="051B"/>
   <outline>
@@ -7,16 +7,16 @@
       <point x="709" y="166" type="line" name="ih01"/>
       <point x="621" y="34"/>
       <point x="509" y="-29"/>
-      <point x="384" y="-29" type="curve" name="dv03" smooth="yes"/>
+      <point x="384" y="-29" type="curve" smooth="yes" name="dv03"/>
       <point x="189" y="-29"/>
       <point x="68" y="125"/>
-      <point x="68" y="389" type="curve" name="dh01" smooth="yes"/>
+      <point x="68" y="389" type="curve" smooth="yes" name="dh01"/>
       <point x="68" y="556"/>
       <point x="116" y="743"/>
       <point x="186" y="874" type="curve" smooth="yes"/>
       <point x="279" y="1047"/>
       <point x="423" y="1149"/>
-      <point x="582" y="1149" type="curve" name="dv02" smooth="yes"/>
+      <point x="582" y="1149" type="curve" smooth="yes" name="dv02"/>
       <point x="727" y="1149"/>
       <point x="830" y="1063"/>
       <point x="854" y="911" type="curve" name="iv01"/>
@@ -26,16 +26,16 @@
       <point x="594" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="515" y="211" type="curve" name="hr02" smooth="yes"/>
+      <point x="515" y="211" type="curve" smooth="yes" name="hr02"/>
       <point x="682" y="211"/>
       <point x="799" y="446"/>
-      <point x="799" y="666" type="curve" name="sh01" smooth="yes"/>
+      <point x="799" y="666" type="curve" smooth="yes" name="sh01"/>
       <point x="799" y="831"/>
       <point x="734" y="909"/>
-      <point x="639" y="909" type="curve" name="dv01" smooth="yes"/>
+      <point x="639" y="909" type="curve" smooth="yes" name="dv01"/>
       <point x="471" y="909"/>
       <point x="362" y="663"/>
-      <point x="362" y="445" type="curve" name="dh02" smooth="yes"/>
+      <point x="362" y="445" type="curve" smooth="yes" name="dh02"/>
       <point x="362" y="284"/>
       <point x="420" y="211"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni051C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni051C_.glif
index 844063132..3855fb6a2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni051C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni051C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni051C" format="1">
+<glyph name="uni051C" format="2">
   <advance width="1233"/>
   <unicode hex="051C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni051D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni051D_.glif
index f5e39f947..4c47f27b9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni051D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni051D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni051D" format="1">
+<glyph name="uni051D" format="2">
   <advance width="1233"/>
   <unicode hex="051D"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0531.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0531.glif
index d464e5956..89620c015 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0531.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0531.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0531" format="1">
+<glyph name="uni0531" format="2">
   <advance width="1233"/>
   <unicode hex="0531"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="737" y="21" type="curve"/>
       <point x="657" y="-12"/>
       <point x="567" y="-29"/>
-      <point x="455" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="455" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="268" y="-29"/>
       <point x="158" y="18"/>
       <point x="95" y="109" type="curve" smooth="yes"/>
       <point x="56" y="165"/>
       <point x="36" y="238"/>
-      <point x="36" y="339" type="curve" name="dh01" smooth="yes"/>
+      <point x="36" y="339" type="curve" smooth="yes" name="dh01"/>
       <point x="36" y="403"/>
       <point x="44" y="471"/>
       <point x="59" y="551" type="curve"/>
@@ -25,10 +25,10 @@
       <point x="339" y="477" type="line"/>
       <point x="334" y="453"/>
       <point x="332" y="428"/>
-      <point x="332" y="408" type="curve" name="dh02" smooth="yes"/>
+      <point x="332" y="408" type="curve" smooth="yes" name="dh02"/>
       <point x="332" y="299"/>
       <point x="393" y="238"/>
-      <point x="508" y="238" type="curve" name="dv02" smooth="yes"/>
+      <point x="508" y="238" type="curve" smooth="yes" name="dv02"/>
       <point x="523" y="238"/>
       <point x="538" y="239"/>
       <point x="552" y="241" type="curve" name="sv01"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0532.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0532.glif
index 678575bd0..3ad4da228 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0532.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0532.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0532" format="1">
+<glyph name="uni0532" format="2">
   <advance width="1233"/>
   <unicode hex="0532"/>
   <outline>
     <contour>
-      <point x="133" y="942" type="line" name="hr00" smooth="yes"/>
+      <point x="133" y="942" type="line" smooth="yes" name="hr00"/>
       <point x="172" y="1139"/>
       <point x="236" y="1288"/>
       <point x="340" y="1385" type="curve" smooth="yes"/>
       <point x="440" y="1480"/>
       <point x="575" y="1522"/>
-      <point x="755" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="755" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="935" y="1522"/>
       <point x="1053" y="1480"/>
       <point x="1118" y="1385" type="curve" smooth="yes"/>
       <point x="1157" y="1328"/>
       <point x="1176" y="1254"/>
-      <point x="1176" y="1151" type="curve" name="dh02" smooth="yes"/>
+      <point x="1176" y="1151" type="curve" smooth="yes" name="dh02"/>
       <point x="1176" y="1088"/>
       <point x="1169" y="1025"/>
       <point x="1153" y="942" type="curve" smooth="yes"/>
@@ -25,10 +25,10 @@
       <point x="872" y="1016" type="line"/>
       <point x="877" y="1040"/>
       <point x="879" y="1065"/>
-      <point x="879" y="1085" type="curve" name="dh01" smooth="yes"/>
+      <point x="879" y="1085" type="curve" smooth="yes" name="dh01"/>
       <point x="879" y="1193"/>
       <point x="818" y="1255"/>
-      <point x="705" y="1255" type="curve" name="dv01" smooth="yes"/>
+      <point x="705" y="1255" type="curve" smooth="yes" name="dv01"/>
       <point x="572" y="1255"/>
       <point x="473" y="1171"/>
       <point x="442" y="1016" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0533.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0533.glif
index 97be53f00..fb14e3136 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0533.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0533.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0533" format="1">
+<glyph name="uni0533" format="2">
   <advance width="1233"/>
   <unicode hex="0533"/>
   <outline>
@@ -11,7 +11,7 @@
       <point x="115" y="556" type="curve" smooth="yes"/>
       <point x="76" y="615"/>
       <point x="58" y="690"/>
-      <point x="58" y="775" type="curve" name="sh01" smooth="yes"/>
+      <point x="58" y="775" type="curve" smooth="yes" name="sh01"/>
       <point x="58" y="827"/>
       <point x="65" y="901"/>
       <point x="78" y="972" type="curve" smooth="yes"/>
@@ -20,13 +20,13 @@
       <point x="280" y="1384" type="curve" smooth="yes"/>
       <point x="376" y="1473"/>
       <point x="508" y="1522"/>
-      <point x="696" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="696" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="876" y="1522"/>
       <point x="994" y="1478"/>
       <point x="1058" y="1385" type="curve" smooth="yes"/>
       <point x="1097" y="1328"/>
       <point x="1116" y="1250"/>
-      <point x="1116" y="1151" type="curve" name="sh02" smooth="yes"/>
+      <point x="1116" y="1151" type="curve" smooth="yes" name="sh02"/>
       <point x="1116" y="1086"/>
       <point x="1108" y="1018"/>
       <point x="1093" y="942" type="curve" smooth="yes"/>
@@ -42,17 +42,17 @@
       <point x="812" y="1016" type="line" name="sh03"/>
       <point x="817" y="1040"/>
       <point x="819" y="1065"/>
-      <point x="819" y="1085" type="curve" name="ah01" smooth="yes"/>
+      <point x="819" y="1085" type="curve" smooth="yes" name="ah01"/>
       <point x="819" y="1193"/>
       <point x="759" y="1255"/>
-      <point x="644" y="1255" type="curve" name="dv01" smooth="yes"/>
+      <point x="644" y="1255" type="curve" smooth="yes" name="dv01"/>
       <point x="509" y="1255"/>
       <point x="413" y="1169"/>
       <point x="382" y="1016" type="curve" smooth="yes"/>
-      <point x="363" y="920" type="line" name="sh05" smooth="yes"/>
+      <point x="363" y="920" type="line" smooth="yes" name="sh05"/>
       <point x="358" y="896"/>
       <point x="356" y="872"/>
-      <point x="356" y="853" type="curve" name="sh04" smooth="yes"/>
+      <point x="356" y="853" type="curve" smooth="yes" name="sh04"/>
       <point x="356" y="817"/>
       <point x="363" y="775"/>
       <point x="386" y="740" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0534.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0534.glif
index 2c66ba925..9e40a533a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0534.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0534.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0534" format="1">
+<glyph name="uni0534" format="2">
   <advance width="1233"/>
   <unicode hex="0534"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="807" y="1016" type="line" name="hr00"/>
       <point x="812" y="1040"/>
       <point x="814" y="1065"/>
-      <point x="814" y="1085" type="curve" name="dh01" smooth="yes"/>
+      <point x="814" y="1085" type="curve" smooth="yes" name="dh01"/>
       <point x="814" y="1194"/>
       <point x="753" y="1255"/>
-      <point x="640" y="1255" type="curve" name="dv01" smooth="yes"/>
+      <point x="640" y="1255" type="curve" smooth="yes" name="dv01"/>
       <point x="503" y="1255"/>
       <point x="406" y="1167"/>
       <point x="377" y="1016" type="curve" smooth="yes"/>
@@ -22,13 +22,13 @@
       <point x="275" y="1385" type="curve" smooth="yes"/>
       <point x="375" y="1480"/>
       <point x="510" y="1522"/>
-      <point x="690" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="690" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="861" y="1522"/>
       <point x="985" y="1484"/>
       <point x="1053" y="1385" type="curve" smooth="yes"/>
       <point x="1092" y="1328"/>
       <point x="1111" y="1250"/>
-      <point x="1111" y="1151" type="curve" name="dh02" smooth="yes"/>
+      <point x="1111" y="1151" type="curve" smooth="yes" name="dh02"/>
       <point x="1111" y="1086"/>
       <point x="1103" y="1018"/>
       <point x="1088" y="942" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0535.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0535.glif
index 5bad06972..5e37f036f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0535.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0535.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0535" format="1">
+<glyph name="uni0535" format="2">
   <advance width="1233"/>
   <unicode hex="0535"/>
   <outline>
     <contour>
-      <point x="460" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="460" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="273" y="-29"/>
       <point x="162" y="17"/>
       <point x="98" y="109" type="curve" smooth="yes"/>
       <point x="59" y="165"/>
       <point x="39" y="238"/>
-      <point x="39" y="339" type="curve" name="dh01" smooth="yes"/>
+      <point x="39" y="339" type="curve" smooth="yes" name="dh01"/>
       <point x="39" y="403"/>
       <point x="47" y="471"/>
       <point x="62" y="551" type="curve"/>
@@ -23,10 +23,10 @@
       <point x="343" y="477" type="line"/>
       <point x="338" y="453"/>
       <point x="336" y="428"/>
-      <point x="336" y="408" type="curve" name="dh02" smooth="yes"/>
+      <point x="336" y="408" type="curve" smooth="yes" name="dh02"/>
       <point x="336" y="299"/>
       <point x="397" y="238"/>
-      <point x="510" y="238" type="curve" name="dv01" smooth="yes"/>
+      <point x="510" y="238" type="curve" smooth="yes" name="dv01"/>
       <point x="647" y="238"/>
       <point x="744" y="326"/>
       <point x="773" y="477" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0536.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0536.glif
index 6770e1c4e..eddbe3849 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0536.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0536.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0536" format="1">
+<glyph name="uni0536" format="2">
   <advance width="1233"/>
   <unicode hex="0536"/>
   <outline>
@@ -15,10 +15,10 @@
       <point x="878" y="894" type="curve" smooth="yes"/>
       <point x="889" y="951"/>
       <point x="895" y="1002"/>
-      <point x="895" y="1047" type="curve" name="dh01" smooth="yes"/>
+      <point x="895" y="1047" type="curve" smooth="yes" name="dh01"/>
       <point x="895" y="1186"/>
       <point x="837" y="1255"/>
-      <point x="710" y="1255" type="curve" name="dv01" smooth="yes"/>
+      <point x="710" y="1255" type="curve" smooth="yes" name="dv01"/>
       <point x="563" y="1255"/>
       <point x="446" y="1158"/>
       <point x="405" y="935" type="curve" smooth="yes"/>
@@ -27,13 +27,13 @@
       <point x="103" y="897" type="line" smooth="yes"/>
       <point x="175" y="1286"/>
       <point x="390" y="1522"/>
-      <point x="759" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="759" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="938" y="1522"/>
       <point x="1063" y="1467"/>
       <point x="1135" y="1354" type="curve" smooth="yes"/>
       <point x="1176" y="1287"/>
       <point x="1200" y="1202"/>
-      <point x="1200" y="1082" type="curve" name="dh02" smooth="yes"/>
+      <point x="1200" y="1082" type="curve" smooth="yes" name="dh02"/>
       <point x="1200" y="1027"/>
       <point x="1195" y="968"/>
       <point x="1178" y="888" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0537.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0537.glif
index d46b4ef74..bdea581f9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0537.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0537.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0537" format="1">
+<glyph name="uni0537" format="2">
   <advance width="1233"/>
   <unicode hex="0537"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0538.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0538.glif
index 40eed2b56..cd9aa8cb4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0538.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0538.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0538" format="1">
+<glyph name="uni0538" format="2">
   <advance width="1233"/>
   <unicode hex="0538"/>
   <outline>
     <contour>
-      <point x="133" y="942" type="line" name="hr00" smooth="yes"/>
+      <point x="133" y="942" type="line" smooth="yes" name="hr00"/>
       <point x="172" y="1139"/>
       <point x="236" y="1288"/>
       <point x="340" y="1385" type="curve" smooth="yes"/>
       <point x="440" y="1480"/>
       <point x="575" y="1522"/>
-      <point x="755" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="755" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="935" y="1522"/>
       <point x="1053" y="1480"/>
       <point x="1118" y="1385" type="curve" smooth="yes"/>
       <point x="1157" y="1328"/>
       <point x="1176" y="1254"/>
-      <point x="1176" y="1151" type="curve" name="dh02" smooth="yes"/>
+      <point x="1176" y="1151" type="curve" smooth="yes" name="dh02"/>
       <point x="1176" y="1088"/>
       <point x="1169" y="1025"/>
       <point x="1153" y="942" type="curve" smooth="yes"/>
@@ -25,10 +25,10 @@
       <point x="872" y="1016" type="line"/>
       <point x="877" y="1040"/>
       <point x="879" y="1065"/>
-      <point x="879" y="1085" type="curve" name="dh01" smooth="yes"/>
+      <point x="879" y="1085" type="curve" smooth="yes" name="dh01"/>
       <point x="879" y="1193"/>
       <point x="818" y="1255"/>
-      <point x="705" y="1255" type="curve" name="dv01" smooth="yes"/>
+      <point x="705" y="1255" type="curve" smooth="yes" name="dv01"/>
       <point x="570" y="1255"/>
       <point x="473" y="1169"/>
       <point x="442" y="1016" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0539.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0539.glif
index 99f57236f..6ecdc42a0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0539.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0539.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0539" format="1">
+<glyph name="uni0539" format="2">
   <advance width="1233"/>
   <unicode hex="0539"/>
   <outline>
     <contour>
-      <point x="609" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="609" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="505" y="-29"/>
       <point x="421" y="3"/>
       <point x="374" y="75" type="curve" smooth="yes"/>
       <point x="344" y="120"/>
       <point x="329" y="180"/>
-      <point x="329" y="255" type="curve" name="sh01" smooth="yes"/>
+      <point x="329" y="255" type="curve" smooth="yes" name="sh01"/>
       <point x="329" y="300"/>
       <point x="334" y="357"/>
       <point x="345" y="413" type="curve" smooth="yes"/>
@@ -19,18 +19,18 @@
       <point x="509" y="761" type="curve" smooth="yes"/>
       <point x="583" y="837"/>
       <point x="676" y="875"/>
-      <point x="787" y="875" type="curve" name="sv01" smooth="yes"/>
+      <point x="787" y="875" type="curve" smooth="yes" name="sv01"/>
       <point x="894" y="875" type="line"/>
-      <point x="922" y="1016" type="line" name="sh02" smooth="yes"/>
+      <point x="922" y="1016" type="line" smooth="yes" name="sh02"/>
       <point x="929" y="1047"/>
       <point x="932" y="1082"/>
-      <point x="932" y="1110" type="curve" name="ah01" smooth="yes"/>
+      <point x="932" y="1110" type="curve" smooth="yes" name="ah01"/>
       <point x="932" y="1153"/>
       <point x="923" y="1192"/>
       <point x="900" y="1223" type="curve" smooth="yes"/>
       <point x="865" y="1270"/>
       <point x="800" y="1295"/>
-      <point x="699" y="1295" type="curve" name="dv03" smooth="yes"/>
+      <point x="699" y="1295" type="curve" smooth="yes" name="dv03"/>
       <point x="496" y="1295"/>
       <point x="404" y="1196"/>
       <point x="369" y="1016" type="curve" smooth="yes"/>
@@ -39,16 +39,16 @@
       <point x="101" y="942" type="line" smooth="yes"/>
       <point x="140" y="1143"/>
       <point x="210" y="1289"/>
-      <point x="318" y="1385" type="curve" name="sh03" smooth="yes"/>
+      <point x="318" y="1385" type="curve" smooth="yes" name="sh03"/>
       <point x="425" y="1480"/>
       <point x="563" y="1522"/>
-      <point x="743" y="1522" type="curve" name="dv04" smooth="yes"/>
+      <point x="743" y="1522" type="curve" smooth="yes" name="dv04"/>
       <point x="923" y="1522"/>
       <point x="1045" y="1480"/>
       <point x="1116" y="1385" type="curve" smooth="yes"/>
       <point x="1161" y="1326"/>
       <point x="1183" y="1245"/>
-      <point x="1183" y="1142" type="curve" name="sh04" smooth="yes"/>
+      <point x="1183" y="1142" type="curve" smooth="yes" name="sh04"/>
       <point x="1183" y="1081"/>
       <point x="1176" y="1010"/>
       <point x="1161" y="942" type="curve" smooth="yes"/>
@@ -64,7 +64,7 @@
       <point x="722" y="-29"/>
     </contour>
     <contour>
-      <point x="661" y="218" type="curve" name="dv02" smooth="yes"/>
+      <point x="661" y="218" type="curve" smooth="yes" name="dv02"/>
       <point x="698" y="218"/>
       <point x="729" y="231"/>
       <point x="752" y="263" type="curve" smooth="yes"/>
@@ -75,10 +75,10 @@
       <point x="737" y="615" type="line" smooth="yes"/>
       <point x="662" y="615"/>
       <point x="597" y="554"/>
-      <point x="573" y="413" type="curve" name="sh07" smooth="yes"/>
+      <point x="573" y="413" type="curve" smooth="yes" name="sh07"/>
       <point x="568" y="382"/>
       <point x="564" y="344"/>
-      <point x="564" y="321" type="curve" name="sh06" smooth="yes"/>
+      <point x="564" y="321" type="curve" smooth="yes" name="sh06"/>
       <point x="564" y="254"/>
       <point x="598" y="218"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni053A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni053A_.glif
index d1cd967fc..3ba8a4de8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni053A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni053A_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni053A" format="1">
+<glyph name="uni053A" format="2">
   <advance width="1233"/>
   <unicode hex="053A"/>
   <outline>
     <contour>
-      <point x="398" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="398" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="215" y="-29"/>
       <point x="99" y="17"/>
       <point x="34" y="109" type="curve" smooth="yes"/>
       <point x="-7" y="166"/>
       <point x="-27" y="242"/>
-      <point x="-27" y="336" type="curve" name="dh01" smooth="yes"/>
+      <point x="-27" y="336" type="curve" smooth="yes" name="dh01"/>
       <point x="-27" y="389"/>
       <point x="-20" y="451"/>
       <point x="-7" y="522" type="curve" smooth="yes"/>
@@ -19,7 +19,7 @@
       <point x="192" y="938" type="curve" smooth="yes"/>
       <point x="291" y="1033"/>
       <point x="419" y="1079"/>
-      <point x="595" y="1079" type="curve" name="sv01" smooth="yes"/>
+      <point x="595" y="1079" type="curve" smooth="yes" name="sv01"/>
       <point x="826" y="1079" type="line"/>
       <point x="906" y="1493" type="line" name="at01"/>
       <point x="1201" y="1493" type="line"/>
@@ -35,7 +35,7 @@
       <point x="577" y="-29"/>
     </contour>
     <contour>
-      <point x="446" y="238" type="curve" name="dv01" smooth="yes"/>
+      <point x="446" y="238" type="curve" smooth="yes" name="dv01"/>
       <point x="583" y="238"/>
       <point x="680" y="328"/>
       <point x="709" y="477" type="curve" smooth="yes"/>
@@ -50,7 +50,7 @@
       <point x="279" y="477" type="line" smooth="yes"/>
       <point x="274" y="453"/>
       <point x="272" y="429"/>
-      <point x="272" y="409" type="curve" name="dh02" smooth="yes"/>
+      <point x="272" y="409" type="curve" smooth="yes" name="dh02"/>
       <point x="272" y="300"/>
       <point x="333" y="238"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni053B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni053B_.glif
index c36b2cd72..6f7ccc460 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni053B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni053B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni053B" format="1">
+<glyph name="uni053B" format="2">
   <advance width="1233"/>
   <unicode hex="053B"/>
   <outline>
@@ -9,13 +9,13 @@
       <point x="503" y="1093" type="line" name="iv01"/>
       <point x="572" y="1125"/>
       <point x="635" y="1141"/>
-      <point x="738" y="1141" type="curve" name="at01" smooth="yes"/>
+      <point x="738" y="1141" type="curve" smooth="yes" name="at01"/>
       <point x="902" y="1141"/>
       <point x="1025" y="1099"/>
       <point x="1090" y="1004" type="curve" smooth="yes"/>
       <point x="1129" y="947"/>
       <point x="1148" y="871"/>
-      <point x="1148" y="774" type="curve" name="dh02" smooth="yes"/>
+      <point x="1148" y="774" type="curve" smooth="yes" name="dh02"/>
       <point x="1148" y="706"/>
       <point x="1139" y="638"/>
       <point x="1124" y="561" type="curve" smooth="yes"/>
@@ -24,10 +24,10 @@
       <point x="844" y="635" type="line" smooth="yes"/>
       <point x="849" y="659"/>
       <point x="851" y="683"/>
-      <point x="851" y="703" type="curve" name="dh01" smooth="yes"/>
+      <point x="851" y="703" type="curve" smooth="yes" name="dh01"/>
       <point x="851" y="814"/>
       <point x="790" y="874"/>
-      <point x="675" y="874" type="curve" name="sv01" smooth="yes"/>
+      <point x="675" y="874" type="curve" smooth="yes" name="sv01"/>
       <point x="539" y="874"/>
       <point x="446" y="789"/>
       <point x="418" y="646" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni053C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni053C_.glif
index f59d26b5c..f2e6bdaad 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni053C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni053C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni053C" format="1">
+<glyph name="uni053C" format="2">
   <advance width="1233"/>
   <unicode hex="053C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni053D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni053D_.glif
index 1fdb372af..3d31f4318 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni053D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni053D_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni053D" format="1">
+<glyph name="uni053D" format="2">
   <advance width="1233"/>
   <unicode hex="053D"/>
   <outline>
     <contour>
-      <point x="664" y="-27" type="curve" name="ab02" smooth="yes"/>
+      <point x="664" y="-27" type="curve" smooth="yes" name="ab02"/>
       <point x="521" y="-27"/>
       <point x="444" y="9"/>
       <point x="405" y="86" type="curve" smooth="yes"/>
@@ -31,7 +31,7 @@
       <point x="646" y="251" type="curve" smooth="yes"/>
       <point x="657" y="220"/>
       <point x="678" y="208"/>
-      <point x="710" y="208" type="curve" name="hr01" smooth="yes"/>
+      <point x="710" y="208" type="curve" smooth="yes" name="hr01"/>
       <point x="773" y="208"/>
       <point x="808" y="256"/>
       <point x="837" y="405" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni053E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni053E_.glif
index 76feac0f2..a3e1a3f01 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni053E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni053E_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni053E" format="1">
+<glyph name="uni053E" format="2">
   <advance width="1233"/>
   <unicode hex="053E"/>
   <outline>
     <contour>
-      <point x="480" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="480" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="275" y="-29"/>
       <point x="151" y="40"/>
       <point x="90" y="147" type="curve" smooth="yes"/>
       <point x="51" y="214"/>
       <point x="35" y="293"/>
-      <point x="35" y="388" type="curve" name="sh01" smooth="yes"/>
+      <point x="35" y="388" type="curve" smooth="yes" name="sh01"/>
       <point x="35" y="451"/>
       <point x="43" y="520"/>
       <point x="58" y="597" type="curve" smooth="yes"/>
@@ -24,14 +24,14 @@
       <point x="415" y="1248" type="line"/>
       <point x="591" y="1416"/>
       <point x="811" y="1520"/>
-      <point x="1022" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="1022" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1139" y="1520"/>
       <point x="1282" y="1484"/>
       <point x="1324" y="1448" type="curve"/>
       <point x="1262" y="1131" type="line" name="iv01"/>
       <point x="1211" y="1212"/>
       <point x="1083" y="1272"/>
-      <point x="963" y="1272" type="curve" name="hr01" smooth="yes"/>
+      <point x="963" y="1272" type="curve" smooth="yes" name="hr01"/>
       <point x="900" y="1272"/>
       <point x="841" y="1257"/>
       <point x="781" y="1230" type="curve" name="ih02"/>
@@ -40,7 +40,7 @@
       <point x="1118" y="1030" type="curve" smooth="yes"/>
       <point x="1163" y="959"/>
       <point x="1186" y="871"/>
-      <point x="1186" y="776" type="curve" name="sh03" smooth="yes"/>
+      <point x="1186" y="776" type="curve" smooth="yes" name="sh03"/>
       <point x="1186" y="728"/>
       <point x="1180" y="662"/>
       <point x="1169" y="601" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="697" y="-29"/>
     </contour>
     <contour>
-      <point x="533" y="228" type="curve" name="dv02" smooth="yes"/>
+      <point x="533" y="228" type="curve" smooth="yes" name="dv02"/>
       <point x="649" y="228"/>
       <point x="717" y="260"/>
       <point x="764" y="323" type="curve" smooth="yes"/>
@@ -60,7 +60,7 @@
       <point x="858" y="601" type="curve" smooth="yes"/>
       <point x="869" y="660"/>
       <point x="875" y="700"/>
-      <point x="875" y="745" type="curve" name="hr02" smooth="yes"/>
+      <point x="875" y="745" type="curve" smooth="yes" name="hr02"/>
       <point x="875" y="804"/>
       <point x="865" y="851"/>
       <point x="841" y="888" type="curve" smooth="yes"/>
@@ -72,10 +72,10 @@
       <point x="364" y="597" type="curve" smooth="yes"/>
       <point x="348" y="521"/>
       <point x="336" y="444"/>
-      <point x="336" y="389" type="curve" name="sh02" smooth="yes"/>
+      <point x="336" y="389" type="curve" smooth="yes" name="sh02"/>
       <point x="336" y="361"/>
       <point x="339" y="337"/>
-      <point x="346" y="318" type="curve" name="sh04" smooth="yes"/>
+      <point x="346" y="318" type="curve" smooth="yes" name="sh04"/>
       <point x="367" y="257"/>
       <point x="422" y="228"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni053F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni053F_.glif
index 96fa95674..931881e53 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni053F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni053F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni053F" format="1">
+<glyph name="uni053F" format="2">
   <advance width="1233"/>
   <unicode hex="053F"/>
   <outline>
@@ -7,13 +7,13 @@
       <point x="763" y="400" type="line" name="hr00"/>
       <point x="694" y="371"/>
       <point x="633" y="352"/>
-      <point x="527" y="352" type="curve" name="dv01" smooth="yes"/>
+      <point x="527" y="352" type="curve" smooth="yes" name="dv01"/>
       <point x="354" y="352"/>
       <point x="241" y="399"/>
       <point x="177" y="490" type="curve" smooth="yes"/>
       <point x="138" y="546"/>
       <point x="118" y="622"/>
-      <point x="118" y="719" type="curve" name="dh01" smooth="yes"/>
+      <point x="118" y="719" type="curve" smooth="yes" name="dh01"/>
       <point x="118" y="781"/>
       <point x="126" y="852"/>
       <point x="142" y="932" type="curve" smooth="yes"/>
@@ -22,10 +22,10 @@
       <point x="422" y="858" type="line"/>
       <point x="417" y="834"/>
       <point x="415" y="809"/>
-      <point x="415" y="789" type="curve" name="dh02" smooth="yes"/>
+      <point x="415" y="789" type="curve" smooth="yes" name="dh02"/>
       <point x="415" y="680"/>
       <point x="476" y="619"/>
-      <point x="591" y="619" type="curve" name="dv02" smooth="yes"/>
+      <point x="591" y="619" type="curve" smooth="yes" name="dv02"/>
       <point x="726" y="619"/>
       <point x="819" y="702"/>
       <point x="848" y="847" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0540.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0540.glif
index 0e9791ac1..9a3b17a01 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0540.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0540.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0540" format="1">
+<glyph name="uni0540" format="2">
   <advance width="1233"/>
   <unicode hex="0540"/>
   <outline>
     <contour>
-      <point x="239" y="251" type="line" name="hr00" smooth="yes"/>
+      <point x="239" y="251" type="line" smooth="yes" name="hr00"/>
       <point x="174" y="279"/>
       <point x="114" y="313"/>
       <point x="74" y="356" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0541.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0541.glif
index 961735635..07e635c18 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0541.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0541.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0541" format="1">
+<glyph name="uni0541" format="2">
   <advance width="1233"/>
   <unicode hex="0541"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="686" y="114" type="curve"/>
       <point x="557" y="14"/>
       <point x="426" y="-27"/>
-      <point x="294" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="294" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="184" y="-27"/>
       <point x="103" y="1"/>
       <point x="52" y="56" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="1" y="298" type="curve" smooth="yes"/>
       <point x="41" y="510"/>
       <point x="209" y="633"/>
-      <point x="418" y="633" type="curve" name="dv04" smooth="yes"/>
+      <point x="418" y="633" type="curve" smooth="yes" name="dv04"/>
       <point x="538" y="633"/>
       <point x="640" y="593"/>
       <point x="732" y="521" type="curve"/>
@@ -31,13 +31,13 @@
       <point x="875" y="878" type="curve" smooth="yes"/>
       <point x="888" y="941"/>
       <point x="894" y="996"/>
-      <point x="894" y="1043" type="curve" name="dh01" smooth="yes"/>
+      <point x="894" y="1043" type="curve" smooth="yes" name="dh01"/>
       <point x="894" y="1099"/>
       <point x="885" y="1142"/>
       <point x="869" y="1174" type="curve" smooth="yes"/>
       <point x="840" y="1233"/>
       <point x="789" y="1255"/>
-      <point x="710" y="1255" type="curve" name="dv01" smooth="yes"/>
+      <point x="710" y="1255" type="curve" smooth="yes" name="dv01"/>
       <point x="573" y="1255"/>
       <point x="452" y="1181"/>
       <point x="399" y="901" type="curve" smooth="yes"/>
@@ -49,13 +49,13 @@
       <point x="358" y="1386" type="curve" smooth="yes"/>
       <point x="477" y="1485"/>
       <point x="618" y="1522"/>
-      <point x="763" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="763" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="915" y="1522"/>
       <point x="1039" y="1480"/>
       <point x="1118" y="1380" type="curve" smooth="yes"/>
       <point x="1171" y="1312"/>
       <point x="1201" y="1216"/>
-      <point x="1201" y="1091" type="curve" name="dh02" smooth="yes"/>
+      <point x="1201" y="1091" type="curve" smooth="yes" name="dh02"/>
       <point x="1201" y="1027"/>
       <point x="1194" y="956"/>
       <point x="1179" y="885" type="curve" smooth="yes"/>
@@ -70,13 +70,13 @@
       <point x="1037" y="86" type="curve"/>
     </contour>
     <contour>
-      <point x="350" y="226" type="curve" name="sv01" smooth="yes"/>
+      <point x="350" y="226" type="curve" smooth="yes" name="sv01"/>
       <point x="406" y="226"/>
       <point x="471" y="246"/>
       <point x="540" y="305" type="curve"/>
       <point x="488" y="352"/>
       <point x="427" y="380"/>
-      <point x="374" y="380" type="curve" name="dv03" smooth="yes"/>
+      <point x="374" y="380" type="curve" smooth="yes" name="dv03"/>
       <point x="321" y="380"/>
       <point x="292" y="351"/>
       <point x="281" y="303" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0542.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0542.glif
index 3baeb6fbf..3b209087b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0542.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0542.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0542" format="1">
+<glyph name="uni0542" format="2">
   <advance width="1233"/>
   <unicode hex="0542"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="807" y="1016" type="line" name="hr00"/>
       <point x="812" y="1040"/>
       <point x="814" y="1065"/>
-      <point x="814" y="1085" type="curve" name="dh01" smooth="yes"/>
+      <point x="814" y="1085" type="curve" smooth="yes" name="dh01"/>
       <point x="814" y="1194"/>
       <point x="753" y="1255"/>
-      <point x="640" y="1255" type="curve" name="dv01" smooth="yes"/>
+      <point x="640" y="1255" type="curve" smooth="yes" name="dv01"/>
       <point x="503" y="1255"/>
       <point x="406" y="1167"/>
       <point x="377" y="1016" type="curve" smooth="yes"/>
@@ -22,13 +22,13 @@
       <point x="275" y="1385" type="curve" smooth="yes"/>
       <point x="375" y="1480"/>
       <point x="510" y="1522"/>
-      <point x="690" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="690" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="861" y="1522"/>
       <point x="985" y="1484"/>
       <point x="1053" y="1385" type="curve" smooth="yes"/>
       <point x="1092" y="1328"/>
       <point x="1111" y="1250"/>
-      <point x="1111" y="1151" type="curve" name="dh02" smooth="yes"/>
+      <point x="1111" y="1151" type="curve" smooth="yes" name="dh02"/>
       <point x="1111" y="1086"/>
       <point x="1103" y="1018"/>
       <point x="1088" y="942" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0543.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0543.glif
index b24fb38ee..5911e601d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0543.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0543.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0543" format="1">
+<glyph name="uni0543" format="2">
   <advance width="1233"/>
   <unicode hex="0543"/>
   <outline>
     <contour>
-      <point x="232" y="0" type="line" name="hr00" smooth="yes"/>
+      <point x="232" y="0" type="line" smooth="yes" name="hr00"/>
       <point x="144" y="0"/>
       <point x="69" y="20"/>
       <point x="22" y="63" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0544.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0544.glif
index d1b1204ac..e2bc09806 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0544.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0544.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0544" format="1">
+<glyph name="uni0544" format="2">
   <advance width="1233"/>
   <unicode hex="0544"/>
   <outline>
     <contour>
-      <point x="408" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="408" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="228" y="-29"/>
       <point x="110" y="14"/>
       <point x="46" y="109" type="curve" smooth="yes"/>
       <point x="7" y="166"/>
       <point x="-12" y="241"/>
-      <point x="-12" y="342" type="curve" name="dh01" smooth="yes"/>
+      <point x="-12" y="342" type="curve" smooth="yes" name="dh01"/>
       <point x="-12" y="407"/>
       <point x="-4" y="475"/>
       <point x="11" y="551" type="curve" smooth="yes"/>
@@ -19,10 +19,10 @@
       <point x="291" y="477" type="line"/>
       <point x="286" y="453"/>
       <point x="284" y="428"/>
-      <point x="284" y="408" type="curve" name="dh02" smooth="yes"/>
+      <point x="284" y="408" type="curve" smooth="yes" name="dh02"/>
       <point x="284" y="300"/>
       <point x="345" y="238"/>
-      <point x="458" y="238" type="curve" name="dv01" smooth="yes"/>
+      <point x="458" y="238" type="curve" smooth="yes" name="dv01"/>
       <point x="593" y="238"/>
       <point x="690" y="324"/>
       <point x="721" y="477" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0545.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0545.glif
index f7d0c0e14..e27963a76 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0545.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0545.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0545" format="1">
+<glyph name="uni0545" format="2">
   <advance width="1233"/>
   <unicode hex="0545"/>
   <outline>
     <contour>
-      <point x="509" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="509" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="323" y="-29"/>
       <point x="207" y="30"/>
       <point x="139" y="111" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="365" y="436" type="line" smooth="yes"/>
       <point x="362" y="421"/>
       <point x="361" y="407"/>
-      <point x="361" y="395" type="curve" name="hr01" smooth="yes"/>
+      <point x="361" y="395" type="curve" smooth="yes" name="hr01"/>
       <point x="361" y="354"/>
       <point x="372" y="319"/>
       <point x="395" y="290" type="curve" smooth="yes"/>
       <point x="426" y="251"/>
       <point x="476" y="226"/>
-      <point x="556" y="226" type="curve" name="dv02" smooth="yes"/>
+      <point x="556" y="226" type="curve" smooth="yes" name="dv02"/>
       <point x="636" y="226"/>
       <point x="700" y="252"/>
       <point x="744" y="293" type="curve" smooth="yes"/>
@@ -34,13 +34,13 @@
       <point x="827" y="454" type="curve" smooth="yes"/>
       <point x="830" y="471"/>
       <point x="832" y="487"/>
-      <point x="832" y="504" type="curve" name="sh01" smooth="yes"/>
+      <point x="832" y="504" type="curve" smooth="yes" name="sh01"/>
       <point x="832" y="601"/>
       <point x="765" y="662"/>
-      <point x="636" y="662" type="curve" name="hr02" smooth="yes"/>
+      <point x="636" y="662" type="curve" smooth="yes" name="hr02"/>
       <point x="33" y="662" type="line"/>
       <point x="84" y="922" type="line"/>
-      <point x="687" y="922" type="line" name="dv03" smooth="yes"/>
+      <point x="687" y="922" type="line" smooth="yes" name="dv03"/>
       <point x="751" y="922"/>
       <point x="798" y="944"/>
       <point x="833" y="977" type="curve" smooth="yes"/>
@@ -49,10 +49,10 @@
       <point x="898" y="1100" type="curve" smooth="yes"/>
       <point x="901" y="1116"/>
       <point x="903" y="1129"/>
-      <point x="903" y="1145" type="curve" name="dh01" smooth="yes"/>
+      <point x="903" y="1145" type="curve" smooth="yes" name="dh01"/>
       <point x="903" y="1225"/>
       <point x="851" y="1263"/>
-      <point x="755" y="1263" type="curve" name="sv02" smooth="yes"/>
+      <point x="755" y="1263" type="curve" smooth="yes" name="sv02"/>
       <point x="640" y="1263"/>
       <point x="570" y="1207"/>
       <point x="547" y="1094" type="curve" name="hr03"/>
@@ -62,13 +62,13 @@
       <point x="440" y="1406" type="curve" smooth="yes"/>
       <point x="540" y="1481"/>
       <point x="667" y="1518"/>
-      <point x="803" y="1518" type="curve" name="at01" smooth="yes"/>
+      <point x="803" y="1518" type="curve" smooth="yes" name="at01"/>
       <point x="944" y="1518"/>
       <point x="1052" y="1477"/>
       <point x="1123" y="1404" type="curve" smooth="yes"/>
       <point x="1176" y="1348"/>
       <point x="1205" y="1276"/>
-      <point x="1205" y="1188" type="curve" name="dh02" smooth="yes"/>
+      <point x="1205" y="1188" type="curve" smooth="yes" name="dh02"/>
       <point x="1205" y="1159"/>
       <point x="1202" y="1130"/>
       <point x="1196" y="1100" type="curve" smooth="yes"/>
@@ -80,7 +80,7 @@
       <point x="1116" y="669" type="curve" smooth="yes"/>
       <point x="1129" y="634"/>
       <point x="1135" y="594"/>
-      <point x="1135" y="551" type="curve" name="ih01" smooth="yes"/>
+      <point x="1135" y="551" type="curve" smooth="yes" name="ih01"/>
       <point x="1135" y="515"/>
       <point x="1132" y="485"/>
       <point x="1125" y="454" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0546.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0546.glif
index 8ece075b9..41516b9b2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0546.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0546.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0546" format="1">
+<glyph name="uni0546" format="2">
   <advance width="1233"/>
   <unicode hex="0546"/>
   <outline>
     <contour>
-      <point x="541" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="541" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="354" y="-29"/>
       <point x="243" y="17"/>
       <point x="179" y="109" type="curve" smooth="yes"/>
       <point x="139" y="168"/>
       <point x="120" y="242"/>
-      <point x="120" y="343" type="curve" name="dh01" smooth="yes"/>
+      <point x="120" y="343" type="curve" smooth="yes" name="dh01"/>
       <point x="120" y="408"/>
       <point x="128" y="475"/>
       <point x="143" y="551" type="curve" smooth="yes"/>
@@ -21,10 +21,10 @@
       <point x="424" y="477" type="line"/>
       <point x="419" y="453"/>
       <point x="417" y="428"/>
-      <point x="417" y="408" type="curve" name="dh02" smooth="yes"/>
+      <point x="417" y="408" type="curve" smooth="yes" name="dh02"/>
       <point x="417" y="299"/>
       <point x="478" y="238"/>
-      <point x="591" y="238" type="curve" name="dv01" smooth="yes"/>
+      <point x="591" y="238" type="curve" smooth="yes" name="dv01"/>
       <point x="728" y="238"/>
       <point x="825" y="326"/>
       <point x="854" y="477" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0547.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0547.glif
index 3d45928ed..5694a57b3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0547.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0547.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0547" format="1">
+<glyph name="uni0547" format="2">
   <advance width="1233"/>
   <unicode hex="0547"/>
   <outline>
     <contour>
-      <point x="469" y="-27" type="curve" name="hr00" smooth="yes"/>
+      <point x="469" y="-27" type="curve" smooth="yes" name="hr00"/>
       <point x="314" y="-27"/>
       <point x="188" y="18"/>
       <point x="111" y="119" type="curve" smooth="yes"/>
       <point x="59" y="187"/>
       <point x="29" y="283"/>
-      <point x="29" y="404" type="curve" name="dh01" smooth="yes"/>
+      <point x="29" y="404" type="curve" smooth="yes" name="dh01"/>
       <point x="29" y="464"/>
       <point x="35" y="535"/>
       <point x="50" y="606" type="curve" smooth="yes"/>
@@ -31,7 +31,7 @@
       <point x="441" y="1493" type="line" smooth="yes"/>
       <point x="470" y="1493"/>
       <point x="520" y="1489"/>
-      <point x="565" y="1481" type="curve" name="at02" smooth="yes"/>
+      <point x="565" y="1481" type="curve" smooth="yes" name="at02"/>
       <point x="608" y="1473"/>
       <point x="669" y="1455"/>
       <point x="701" y="1442" type="curve"/>
@@ -49,13 +49,13 @@
       <point x="358" y="606" type="curve" smooth="yes"/>
       <point x="346" y="545"/>
       <point x="340" y="492"/>
-      <point x="340" y="448" type="curve" name="dh02" smooth="yes"/>
+      <point x="340" y="448" type="curve" smooth="yes" name="dh02"/>
       <point x="340" y="393"/>
       <point x="349" y="352"/>
       <point x="365" y="320" type="curve" smooth="yes"/>
       <point x="394" y="263"/>
       <point x="449" y="240"/>
-      <point x="522" y="240" type="curve" name="sv01" smooth="yes"/>
+      <point x="522" y="240" type="curve" smooth="yes" name="sv01"/>
       <point x="594" y="240"/>
       <point x="661" y="262"/>
       <point x="714" y="317" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0548.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0548.glif
index fc6f8ab36..8ffe55c49 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0548.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0548.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0548" format="1">
+<glyph name="uni0548" format="2">
   <advance width="1233"/>
   <unicode hex="0548"/>
   <outline>
     <contour>
-      <point x="141" y="942" type="line" name="hr00" smooth="yes"/>
+      <point x="141" y="942" type="line" smooth="yes" name="hr00"/>
       <point x="180" y="1139"/>
       <point x="244" y="1288"/>
       <point x="348" y="1385" type="curve" smooth="yes"/>
       <point x="448" y="1480"/>
       <point x="583" y="1522"/>
-      <point x="763" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="763" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="934" y="1522"/>
       <point x="1058" y="1484"/>
       <point x="1126" y="1385" type="curve" smooth="yes"/>
       <point x="1165" y="1328"/>
       <point x="1184" y="1250"/>
-      <point x="1184" y="1151" type="curve" name="dh02" smooth="yes"/>
+      <point x="1184" y="1151" type="curve" smooth="yes" name="dh02"/>
       <point x="1184" y="1086"/>
       <point x="1176" y="1018"/>
       <point x="1161" y="942" type="curve" smooth="yes"/>
@@ -25,10 +25,10 @@
       <point x="880" y="1016" type="line"/>
       <point x="885" y="1040"/>
       <point x="887" y="1065"/>
-      <point x="887" y="1085" type="curve" name="dh01" smooth="yes"/>
+      <point x="887" y="1085" type="curve" smooth="yes" name="dh01"/>
       <point x="887" y="1193"/>
       <point x="826" y="1255"/>
-      <point x="713" y="1255" type="curve" name="dv01" smooth="yes"/>
+      <point x="713" y="1255" type="curve" smooth="yes" name="dv01"/>
       <point x="578" y="1255"/>
       <point x="481" y="1169"/>
       <point x="450" y="1016" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0549.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0549.glif
index a675aa039..51d64b66a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0549.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0549.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0549" format="1">
+<glyph name="uni0549" format="2">
   <advance width="1233"/>
   <unicode hex="0549"/>
   <outline>
@@ -18,10 +18,10 @@
       <point x="893" y="935" type="curve" name="sh01"/>
       <point x="899" y="976"/>
       <point x="902" y="1013"/>
-      <point x="902" y="1046" type="curve" name="dh01" smooth="yes"/>
+      <point x="902" y="1046" type="curve" smooth="yes" name="dh01"/>
       <point x="902" y="1187"/>
       <point x="847" y="1255"/>
-      <point x="719" y="1255" type="curve" name="dv01" smooth="yes"/>
+      <point x="719" y="1255" type="curve" smooth="yes" name="dv01"/>
       <point x="643" y="1255"/>
       <point x="577" y="1231"/>
       <point x="525" y="1179" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="111" y="897" type="line" smooth="yes"/>
       <point x="197" y="1282"/>
       <point x="375" y="1522"/>
-      <point x="764" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="764" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="953" y="1522"/>
       <point x="1071" y="1465"/>
       <point x="1142" y="1360" type="curve" smooth="yes"/>
       <point x="1188" y="1291"/>
       <point x="1211" y="1202"/>
-      <point x="1211" y="1094" type="curve" name="dh02" smooth="yes"/>
+      <point x="1211" y="1094" type="curve" smooth="yes" name="dh02"/>
       <point x="1211" y="1038"/>
       <point x="1205" y="979"/>
       <point x="1192" y="912" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni054A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni054A_.glif
index b503929d1..84b6f5a12 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni054A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni054A_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni054A" format="1">
+<glyph name="uni054A" format="2">
   <advance width="1233"/>
   <unicode hex="054A"/>
   <outline>
     <contour>
-      <point x="961" y="935" type="line" name="hr00" smooth="yes"/>
+      <point x="961" y="935" type="line" smooth="yes" name="hr00"/>
       <point x="972" y="991"/>
       <point x="977" y="1039"/>
-      <point x="977" y="1079" type="curve" name="dh01" smooth="yes"/>
+      <point x="977" y="1079" type="curve" smooth="yes" name="dh01"/>
       <point x="977" y="1191"/>
       <point x="939" y="1260"/>
       <point x="843" y="1276" type="curve"/>
@@ -25,13 +25,13 @@
       <point x="299" y="1352" type="curve" smooth="yes"/>
       <point x="415" y="1460"/>
       <point x="569" y="1518"/>
-      <point x="769" y="1518" type="curve" name="at01" smooth="yes"/>
+      <point x="769" y="1518" type="curve" smooth="yes" name="at01"/>
       <point x="976" y="1518"/>
       <point x="1106" y="1456"/>
       <point x="1174" y="1351" type="curve" smooth="yes"/>
       <point x="1215" y="1287"/>
       <point x="1232" y="1206"/>
-      <point x="1232" y="1113" type="curve" name="dh02" smooth="yes"/>
+      <point x="1232" y="1113" type="curve" smooth="yes" name="dh02"/>
       <point x="1232" y="1054"/>
       <point x="1225" y="990"/>
       <point x="1212" y="919" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni054B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni054B_.glif
index f65f6618f..7ae1eeb90 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni054B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni054B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni054B" format="1">
+<glyph name="uni054B" format="2">
   <advance width="1233"/>
   <unicode hex="054B"/>
   <outline>
@@ -36,7 +36,7 @@
       <point x="422" y="1427" type="curve" smooth="yes"/>
       <point x="510" y="1480"/>
       <point x="617" y="1518"/>
-      <point x="769" y="1518" type="curve" name="at01" smooth="yes"/>
+      <point x="769" y="1518" type="curve" smooth="yes" name="at01"/>
       <point x="899" y="1518"/>
       <point x="1000" y="1489"/>
       <point x="1073" y="1431" type="curve" smooth="yes"/>
@@ -45,7 +45,7 @@
       <point x="1198" y="1205" type="curve"/>
       <point x="1205" y="1170"/>
       <point x="1206" y="1134"/>
-      <point x="1206" y="1098" type="curve" name="dh02" smooth="yes"/>
+      <point x="1206" y="1098" type="curve" smooth="yes" name="dh02"/>
       <point x="1206" y="1018"/>
       <point x="1196" y="948"/>
       <point x="1184" y="891" type="curve" smooth="yes"/>
@@ -69,13 +69,13 @@
       <point x="882" y="885" type="curve" smooth="yes"/>
       <point x="893" y="940"/>
       <point x="900" y="994"/>
-      <point x="900" y="1043" type="curve" name="dh01" smooth="yes"/>
+      <point x="900" y="1043" type="curve" smooth="yes" name="dh01"/>
       <point x="900" y="1079"/>
       <point x="896" y="1112"/>
       <point x="888" y="1141" type="curve" smooth="yes"/>
       <point x="869" y="1206"/>
       <point x="820" y="1255"/>
-      <point x="716" y="1255" type="curve" name="sv05" smooth="yes"/>
+      <point x="716" y="1255" type="curve" smooth="yes" name="sv05"/>
       <point x="620" y="1255"/>
       <point x="548" y="1215"/>
       <point x="497" y="1159" type="curve" smooth="yes"/>
@@ -99,7 +99,7 @@
       <point x="759" y="643" type="curve" smooth="yes"/>
       <point x="759" y="630"/>
       <point x="758" y="613"/>
-      <point x="754" y="594" type="curve" name="hr01" smooth="yes"/>
+      <point x="754" y="594" type="curve" smooth="yes" name="hr01"/>
       <point x="752" y="580"/>
       <point x="749" y="568"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni054C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni054C_.glif
index ddeefd1ef..0a8c0eb03 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni054C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni054C_.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni054C" format="1">
+<glyph name="uni054C" format="2">
   <advance width="1233"/>
   <unicode hex="054C"/>
   <outline>
     <contour>
-      <point x="118" y="942" type="line" name="hr00" smooth="yes"/>
+      <point x="118" y="942" type="line" smooth="yes" name="hr00"/>
       <point x="157" y="1139"/>
       <point x="221" y="1288"/>
       <point x="325" y="1385" type="curve" smooth="yes"/>
       <point x="425" y="1480"/>
       <point x="560" y="1522"/>
-      <point x="740" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="740" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="911" y="1522"/>
       <point x="1035" y="1484"/>
       <point x="1103" y="1385" type="curve" smooth="yes"/>
       <point x="1142" y="1328"/>
       <point x="1161" y="1250"/>
-      <point x="1161" y="1151" type="curve" name="dh02" smooth="yes"/>
+      <point x="1161" y="1151" type="curve" smooth="yes" name="dh02"/>
       <point x="1161" y="1086"/>
       <point x="1153" y="1018"/>
       <point x="1138" y="942" type="curve" smooth="yes"/>
@@ -29,10 +29,10 @@
       <point x="857" y="1016" type="line"/>
       <point x="862" y="1040"/>
       <point x="864" y="1065"/>
-      <point x="864" y="1085" type="curve" name="dh01" smooth="yes"/>
+      <point x="864" y="1085" type="curve" smooth="yes" name="dh01"/>
       <point x="864" y="1193"/>
       <point x="803" y="1255"/>
-      <point x="690" y="1255" type="curve" name="dv01" smooth="yes"/>
+      <point x="690" y="1255" type="curve" smooth="yes" name="dv01"/>
       <point x="555" y="1255"/>
       <point x="458" y="1169"/>
       <point x="427" y="1016" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni054D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni054D_.glif
index 415deba6a..f646b2e7b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni054D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni054D_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni054D" format="1">
+<glyph name="uni054D" format="2">
   <advance width="1233"/>
   <unicode hex="054D"/>
   <outline>
     <contour>
-      <point x="467" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="467" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="282" y="-29"/>
       <point x="169" y="18"/>
       <point x="106" y="109" type="curve" smooth="yes"/>
       <point x="67" y="165"/>
       <point x="47" y="238"/>
-      <point x="47" y="339" type="curve" name="dh01" smooth="yes"/>
+      <point x="47" y="339" type="curve" smooth="yes" name="dh01"/>
       <point x="47" y="403"/>
       <point x="55" y="471"/>
       <point x="70" y="551" type="curve"/>
@@ -19,10 +19,10 @@
       <point x="351" y="477" type="line"/>
       <point x="346" y="453"/>
       <point x="344" y="428"/>
-      <point x="344" y="408" type="curve" name="dh02" smooth="yes"/>
+      <point x="344" y="408" type="curve" smooth="yes" name="dh02"/>
       <point x="344" y="300"/>
       <point x="405" y="238"/>
-      <point x="518" y="238" type="curve" name="dv01" smooth="yes"/>
+      <point x="518" y="238" type="curve" smooth="yes" name="dv01"/>
       <point x="653" y="238"/>
       <point x="750" y="324"/>
       <point x="781" y="477" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni054E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni054E_.glif
index da66021aa..9797fe985 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni054E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni054E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni054E" format="1">
+<glyph name="uni054E" format="2">
   <advance width="1233"/>
   <unicode hex="054E"/>
   <outline>
@@ -7,13 +7,13 @@
       <point x="690" y="400" type="line" name="hr00"/>
       <point x="620" y="368"/>
       <point x="557" y="352"/>
-      <point x="455" y="352" type="curve" name="dv01" smooth="yes"/>
+      <point x="455" y="352" type="curve" smooth="yes" name="dv01"/>
       <point x="288" y="352"/>
       <point x="168" y="397"/>
       <point x="104" y="490" type="curve" smooth="yes"/>
       <point x="65" y="547"/>
       <point x="46" y="620"/>
-      <point x="46" y="723" type="curve" name="dh01" smooth="yes"/>
+      <point x="46" y="723" type="curve" smooth="yes" name="dh01"/>
       <point x="46" y="786"/>
       <point x="53" y="849"/>
       <point x="69" y="932" type="curve" smooth="yes"/>
@@ -22,10 +22,10 @@
       <point x="349" y="858" type="line" smooth="yes"/>
       <point x="344" y="834"/>
       <point x="342" y="810"/>
-      <point x="342" y="790" type="curve" name="dh02" smooth="yes"/>
+      <point x="342" y="790" type="curve" smooth="yes" name="dh02"/>
       <point x="342" y="681"/>
       <point x="403" y="619"/>
-      <point x="518" y="619" type="curve" name="dv02" smooth="yes"/>
+      <point x="518" y="619" type="curve" smooth="yes" name="dv02"/>
       <point x="646" y="619"/>
       <point x="744" y="695"/>
       <point x="775" y="847" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni054F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni054F_.glif
index e08c2d787..45c7e24fb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni054F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni054F_.glif
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni054F" format="1">
+<glyph name="uni054F" format="2">
   <advance width="1233"/>
   <unicode hex="054F"/>
   <outline>
     <contour>
-      <point x="482" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="482" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="315" y="-29"/>
       <point x="196" y="19"/>
       <point x="120" y="103" type="curve" smooth="yes"/>
       <point x="64" y="165"/>
       <point x="36" y="245"/>
-      <point x="36" y="343" type="curve" name="dh01" smooth="yes"/>
+      <point x="36" y="343" type="curve" smooth="yes" name="dh01"/>
       <point x="36" y="375"/>
       <point x="39" y="410"/>
       <point x="46" y="447" type="curve" name="sh01"/>
       <point x="353" y="447" type="line" name="sv01"/>
       <point x="347" y="417"/>
       <point x="344" y="390"/>
-      <point x="344" y="367" type="curve" name="dh02" smooth="yes"/>
+      <point x="344" y="367" type="curve" smooth="yes" name="dh02"/>
       <point x="344" y="312"/>
       <point x="359" y="279"/>
       <point x="384" y="256" type="curve" smooth="yes"/>
       <point x="421" y="221"/>
       <point x="475" y="215"/>
-      <point x="522" y="215" type="curve" name="dv02" smooth="yes"/>
+      <point x="522" y="215" type="curve" smooth="yes" name="dv02"/>
       <point x="605" y="215"/>
       <point x="659" y="237"/>
       <point x="700" y="281" type="curve" smooth="yes"/>
@@ -35,7 +35,7 @@
       <point x="675" y="581" type="curve" smooth="yes"/>
       <point x="646" y="598"/>
       <point x="615" y="612"/>
-      <point x="576" y="628" type="curve" name="hr01" smooth="yes"/>
+      <point x="576" y="628" type="curve" smooth="yes" name="hr01"/>
       <point x="485" y="665"/>
       <point x="419" y="693"/>
       <point x="354" y="737" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="215" y="938" type="curve" smooth="yes"/>
       <point x="210" y="961"/>
       <point x="208" y="985"/>
-      <point x="208" y="1008" type="curve" name="hr02" smooth="yes"/>
+      <point x="208" y="1008" type="curve" smooth="yes" name="hr02"/>
       <point x="208" y="1077"/>
       <point x="226" y="1142"/>
       <point x="245" y="1190" type="curve" smooth="yes"/>
@@ -56,35 +56,35 @@
       <point x="597" y="1501" type="curve" smooth="yes"/>
       <point x="645" y="1513"/>
       <point x="694" y="1520"/>
-      <point x="762" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="762" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="935" y="1520"/>
       <point x="1050" y="1474"/>
       <point x="1117" y="1401" type="curve" smooth="yes"/>
       <point x="1166" y="1346"/>
       <point x="1188" y="1279"/>
-      <point x="1188" y="1203" type="curve" name="sh02" smooth="yes"/>
+      <point x="1188" y="1203" type="curve" smooth="yes" name="sh02"/>
       <point x="1188" y="1176"/>
       <point x="1185" y="1148"/>
       <point x="1180" y="1120" type="curve" name="sh03"/>
       <point x="880" y="1120" type="line"/>
       <point x="883" y="1133"/>
       <point x="884" y="1145"/>
-      <point x="884" y="1158" type="curve" name="ih01" smooth="yes"/>
+      <point x="884" y="1158" type="curve" smooth="yes" name="ih01"/>
       <point x="884" y="1205"/>
       <point x="866" y="1232"/>
       <point x="839" y="1249" type="curve" smooth="yes"/>
       <point x="804" y="1272"/>
       <point x="754" y="1275"/>
-      <point x="719" y="1275" type="curve" name="sv02" smooth="yes"/>
+      <point x="719" y="1275" type="curve" smooth="yes" name="sv02"/>
       <point x="625" y="1275"/>
       <point x="534" y="1239"/>
-      <point x="510" y="1120" type="curve" name="hr03" smooth="yes"/>
+      <point x="510" y="1120" type="curve" smooth="yes" name="hr03"/>
       <point x="508" y="1110"/>
       <point x="507" y="1101"/>
-      <point x="507" y="1092" type="curve" name="sh04" smooth="yes"/>
+      <point x="507" y="1092" type="curve" smooth="yes" name="sh04"/>
       <point x="507" y="1047"/>
       <point x="528" y="1008"/>
-      <point x="588" y="969" type="curve" name="hr04" smooth="yes"/>
+      <point x="588" y="969" type="curve" smooth="yes" name="hr04"/>
       <point x="621" y="948"/>
       <point x="662" y="929"/>
       <point x="689" y="918" type="curve" smooth="yes"/>
@@ -93,10 +93,10 @@
       <point x="920" y="806" type="curve" smooth="yes"/>
       <point x="991" y="759"/>
       <point x="1049" y="690"/>
-      <point x="1068" y="595" type="curve" name="hr05" smooth="yes"/>
+      <point x="1068" y="595" type="curve" smooth="yes" name="hr05"/>
       <point x="1072" y="574"/>
       <point x="1074" y="551"/>
-      <point x="1074" y="527" type="curve" name="dh04" smooth="yes"/>
+      <point x="1074" y="527" type="curve" smooth="yes" name="dh04"/>
       <point x="1074" y="438"/>
       <point x="1047" y="330"/>
       <point x="996" y="243" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0550.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0550.glif
index 8299a3851..8cf07f29e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0550.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0550.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0550" format="1">
+<glyph name="uni0550" format="2">
   <advance width="1233"/>
   <unicode hex="0550"/>
   <outline>
     <contour>
-      <point x="171" y="942" type="line" name="hr00" smooth="yes"/>
+      <point x="171" y="942" type="line" smooth="yes" name="hr00"/>
       <point x="210" y="1139"/>
       <point x="274" y="1288"/>
       <point x="378" y="1385" type="curve" smooth="yes"/>
       <point x="478" y="1480"/>
       <point x="613" y="1522"/>
-      <point x="793" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="793" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="973" y="1522"/>
       <point x="1091" y="1480"/>
       <point x="1156" y="1385" type="curve" smooth="yes"/>
       <point x="1195" y="1328"/>
       <point x="1214" y="1254"/>
-      <point x="1214" y="1151" type="curve" name="dh02" smooth="yes"/>
+      <point x="1214" y="1151" type="curve" smooth="yes" name="dh02"/>
       <point x="1214" y="1088"/>
       <point x="1207" y="1025"/>
       <point x="1191" y="942" type="curve" smooth="yes"/>
@@ -25,10 +25,10 @@
       <point x="910" y="1016" type="line"/>
       <point x="915" y="1040"/>
       <point x="917" y="1065"/>
-      <point x="917" y="1085" type="curve" name="dh01" smooth="yes"/>
+      <point x="917" y="1085" type="curve" smooth="yes" name="dh01"/>
       <point x="917" y="1193"/>
       <point x="856" y="1255"/>
-      <point x="743" y="1255" type="curve" name="dv01" smooth="yes"/>
+      <point x="743" y="1255" type="curve" smooth="yes" name="dv01"/>
       <point x="608" y="1255"/>
       <point x="511" y="1169"/>
       <point x="480" y="1016" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0551.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0551.glif
index 4aa0edbe7..c4a1abe82 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0551.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0551.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0551" format="1">
+<glyph name="uni0551" format="2">
   <advance width="1233"/>
   <unicode hex="0551"/>
   <outline>
     <contour>
-      <point x="509" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="509" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="334" y="-27"/>
       <point x="215" y="24"/>
       <point x="139" y="113" type="curve" smooth="yes"/>
@@ -25,7 +25,7 @@
       <point x="395" y="292" type="curve" smooth="yes"/>
       <point x="426" y="253"/>
       <point x="476" y="228"/>
-      <point x="557" y="228" type="curve" name="sv02" smooth="yes"/>
+      <point x="557" y="228" type="curve" smooth="yes" name="sv02"/>
       <point x="632" y="228"/>
       <point x="694" y="249"/>
       <point x="745" y="296" type="curve" smooth="yes"/>
@@ -40,7 +40,7 @@
       <point x="796" y="601" type="curve" smooth="yes"/>
       <point x="764" y="638"/>
       <point x="713" y="662"/>
-      <point x="637" y="662" type="curve" name="dv01" smooth="yes"/>
+      <point x="637" y="662" type="curve" smooth="yes" name="dv01"/>
       <point x="33" y="662" type="line"/>
       <point x="84" y="922" type="line" name="sv03"/>
       <point x="266" y="922" type="line" name="iv01"/>
@@ -55,7 +55,7 @@
       <point x="434" y="1400" type="curve" smooth="yes"/>
       <point x="530" y="1476"/>
       <point x="651" y="1518"/>
-      <point x="804" y="1518" type="curve" name="at01" smooth="yes"/>
+      <point x="804" y="1518" type="curve" smooth="yes" name="at01"/>
       <point x="955" y="1518"/>
       <point x="1061" y="1477"/>
       <point x="1129" y="1401" type="curve" smooth="yes"/>
@@ -81,7 +81,7 @@
       <point x="863" y="-27"/>
     </contour>
     <contour>
-      <point x="687" y="922" type="curve" name="dv02" smooth="yes"/>
+      <point x="687" y="922" type="curve" smooth="yes" name="dv02"/>
       <point x="754" y="922"/>
       <point x="799" y="942"/>
       <point x="834" y="974" type="curve" smooth="yes"/>
@@ -96,7 +96,7 @@
       <point x="884" y="1213" type="curve" smooth="yes"/>
       <point x="865" y="1241"/>
       <point x="827" y="1263"/>
-      <point x="754" y="1263" type="curve" name="sv04" smooth="yes"/>
+      <point x="754" y="1263" type="curve" smooth="yes" name="sv04"/>
       <point x="619" y="1263"/>
       <point x="562" y="1183"/>
       <point x="547" y="1094" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0552.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0552.glif
index edf0e3e03..fb1798244 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0552.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0552.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0552" format="1">
+<glyph name="uni0552" format="2">
   <advance width="1233"/>
   <unicode hex="0552"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0553.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0553.glif
index 680589b4d..f89e2ce0a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0553.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0553.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0553" format="1">
+<glyph name="uni0553" format="2">
   <advance width="1233"/>
   <unicode hex="0553"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="40" y="319" type="curve" smooth="yes"/>
       <point x="16" y="374"/>
       <point x="6" y="440"/>
-      <point x="6" y="509" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="509" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="578"/>
       <point x="16" y="673"/>
       <point x="33" y="765" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="1195" y="1202" type="curve" smooth="yes"/>
       <point x="1222" y="1146"/>
       <point x="1232" y="1081"/>
-      <point x="1232" y="1013" type="curve" name="sh02" smooth="yes"/>
+      <point x="1232" y="1013" type="curve" smooth="yes" name="sh02"/>
       <point x="1232" y="945"/>
       <point x="1222" y="856"/>
       <point x="1205" y="765" type="curve" smooth="yes"/>
@@ -51,10 +51,10 @@
       <point x="285" y="765" type="curve" smooth="yes"/>
       <point x="266" y="668"/>
       <point x="252" y="595"/>
-      <point x="252" y="530" type="curve" name="sh03" smooth="yes"/>
+      <point x="252" y="530" type="curve" smooth="yes" name="sh03"/>
       <point x="252" y="507"/>
       <point x="254" y="486"/>
-      <point x="258" y="468" type="curve" name="hr02" smooth="yes"/>
+      <point x="258" y="468" type="curve" smooth="yes" name="hr02"/>
       <point x="273" y="403"/>
       <point x="317" y="370"/>
       <point x="413" y="366" type="curve" name="sv01"/>
@@ -69,10 +69,10 @@
       <point x="950" y="765" type="curve" smooth="yes"/>
       <point x="969" y="864"/>
       <point x="983" y="941"/>
-      <point x="983" y="998" type="curve" name="ah01" smooth="yes"/>
+      <point x="983" y="998" type="curve" smooth="yes" name="ah01"/>
       <point x="983" y="1018"/>
       <point x="981" y="1036"/>
-      <point x="977" y="1052" type="curve" name="sh04" smooth="yes"/>
+      <point x="977" y="1052" type="curve" smooth="yes" name="sh04"/>
       <point x="961" y="1113"/>
       <point x="915" y="1139"/>
       <point x="819" y="1143" type="curve" name="sv07"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0554.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0554.glif
index 380b8d035..268bdc68c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0554.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0554.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0554" format="1">
+<glyph name="uni0554" format="2">
   <advance width="1233"/>
   <unicode hex="0554"/>
   <outline>
@@ -14,13 +14,13 @@
       <point x="435" y="1388" type="curve" smooth="yes"/>
       <point x="531" y="1471"/>
       <point x="661" y="1518"/>
-      <point x="832" y="1518" type="curve" name="at01" smooth="yes"/>
+      <point x="832" y="1518" type="curve" smooth="yes" name="at01"/>
       <point x="1005" y="1518"/>
       <point x="1118" y="1468"/>
       <point x="1183" y="1385" type="curve" smooth="yes"/>
       <point x="1230" y="1325"/>
       <point x="1250" y="1251"/>
-      <point x="1250" y="1168" type="curve" name="dh02" smooth="yes"/>
+      <point x="1250" y="1168" type="curve" smooth="yes" name="dh02"/>
       <point x="1250" y="1131"/>
       <point x="1246" y="1094"/>
       <point x="1239" y="1055" type="curve" smooth="yes"/>
@@ -29,7 +29,7 @@
       <point x="1054" y="724" type="curve" smooth="yes"/>
       <point x="950" y="636"/>
       <point x="815" y="591"/>
-      <point x="666" y="591" type="curve" name="dv03" smooth="yes"/>
+      <point x="666" y="591" type="curve" smooth="yes" name="dv03"/>
       <point x="602" y="591"/>
       <point x="540" y="599"/>
       <point x="468" y="640" type="curve" name="iv01"/>
@@ -41,13 +41,13 @@
       <point x="49" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="708" y="846" type="curve" name="dv04" smooth="yes"/>
+      <point x="708" y="846" type="curve" smooth="yes" name="dv04"/>
       <point x="856" y="846"/>
       <point x="914" y="926"/>
       <point x="938" y="1055" type="curve" smooth="yes"/>
       <point x="943" y="1082"/>
       <point x="946" y="1104"/>
-      <point x="946" y="1127" type="curve" name="dh01" smooth="yes"/>
+      <point x="946" y="1127" type="curve" smooth="yes" name="dh01"/>
       <point x="946" y="1159"/>
       <point x="940" y="1185"/>
       <point x="927" y="1206" type="curve" smooth="yes"/>
@@ -56,7 +56,7 @@
       <point x="876" y="1248" type="curve" smooth="yes"/>
       <point x="853" y="1258"/>
       <point x="822" y="1263"/>
-      <point x="783" y="1263" type="curve" name="sv04" smooth="yes"/>
+      <point x="783" y="1263" type="curve" smooth="yes" name="sv04"/>
       <point x="629" y="1263"/>
       <point x="574" y="1180"/>
       <point x="550" y="1057" type="curve" smooth="yes"/>
@@ -65,7 +65,7 @@
       <point x="542" y="987" type="curve" smooth="yes"/>
       <point x="542" y="954"/>
       <point x="549" y="927"/>
-      <point x="563" y="905" type="curve" name="hr02" smooth="yes"/>
+      <point x="563" y="905" type="curve" smooth="yes" name="hr02"/>
       <point x="586" y="868"/>
       <point x="631" y="846"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0555.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0555.glif
index 7743211b1..30631c6b2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0555.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0555.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0555" format="1">
+<glyph name="uni0555" format="2">
   <advance width="1233"/>
   <unicode hex="0555"/>
   <outline>
     <contour>
-      <point x="497" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="497" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="214" y="-29"/>
       <point x="61" y="139"/>
-      <point x="61" y="482" type="curve" name="sh01" smooth="yes"/>
+      <point x="61" y="482" type="curve" smooth="yes" name="sh01"/>
       <point x="61" y="728"/>
       <point x="139" y="1045"/>
       <point x="246" y="1229" type="curve"/>
       <point x="355" y="1421"/>
       <point x="515" y="1520"/>
-      <point x="735" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="735" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1016" y="1520"/>
       <point x="1171" y="1354"/>
-      <point x="1171" y="1011" type="curve" name="sh02" smooth="yes"/>
+      <point x="1171" y="1011" type="curve" smooth="yes" name="sh02"/>
       <point x="1171" y="784"/>
       <point x="1103" y="463"/>
       <point x="989" y="264" type="curve" smooth="yes"/>
@@ -24,7 +24,7 @@
       <point x="718" y="-29"/>
     </contour>
     <contour>
-      <point x="528" y="233" type="curve" name="dv01" smooth="yes"/>
+      <point x="528" y="233" type="curve" smooth="yes" name="dv01"/>
       <point x="612" y="233"/>
       <point x="670" y="281"/>
       <point x="719" y="373" type="curve" smooth="yes"/>
@@ -33,10 +33,10 @@
       <point x="810" y="630" type="curve" smooth="yes"/>
       <point x="842" y="763"/>
       <point x="868" y="916"/>
-      <point x="868" y="1024" type="curve" name="ah01" smooth="yes"/>
+      <point x="868" y="1024" type="curve" smooth="yes" name="ah01"/>
       <point x="868" y="1181"/>
       <point x="814" y="1260"/>
-      <point x="705" y="1260" type="curve" name="sv01" smooth="yes"/>
+      <point x="705" y="1260" type="curve" smooth="yes" name="sv01"/>
       <point x="618" y="1260"/>
       <point x="562" y="1211"/>
       <point x="514" y="1119" type="curve" smooth="yes"/>
@@ -45,7 +45,7 @@
       <point x="422" y="861" type="curve" smooth="yes"/>
       <point x="382" y="702"/>
       <point x="365" y="537"/>
-      <point x="365" y="458" type="curve" name="sh03" smooth="yes"/>
+      <point x="365" y="458" type="curve" smooth="yes" name="sh03"/>
       <point x="365" y="315"/>
       <point x="417" y="233"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0556.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0556.glif
index 36dd9d153..d76304ad5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0556.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0556.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0556" format="1">
+<glyph name="uni0556" format="2">
   <advance width="1233"/>
   <unicode hex="0556"/>
   <outline>
     <contour>
-      <point x="466" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="466" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="122" y="-29"/>
       <point x="0" y="79"/>
-      <point x="-24" y="255" type="curve" name="sh02" smooth="yes"/>
+      <point x="-24" y="255" type="curve" smooth="yes" name="sh02"/>
       <point x="-27" y="278"/>
       <point x="-29" y="302"/>
-      <point x="-29" y="331" type="curve" name="sh01" smooth="yes"/>
+      <point x="-29" y="331" type="curve" smooth="yes" name="sh01"/>
       <point x="-29" y="399"/>
       <point x="-18" y="477"/>
       <point x="-1" y="562" type="curve"/>
       <point x="249" y="562" type="line"/>
       <point x="233" y="482"/>
       <point x="222" y="416"/>
-      <point x="222" y="367" type="curve" name="hr01" smooth="yes"/>
+      <point x="222" y="367" type="curve" smooth="yes" name="hr01"/>
       <point x="222" y="340"/>
       <point x="225" y="322"/>
-      <point x="230" y="303" type="curve" name="sh03" smooth="yes"/>
+      <point x="230" y="303" type="curve" smooth="yes" name="sh03"/>
       <point x="247" y="243"/>
       <point x="295" y="217"/>
       <point x="387" y="213" type="curve" name="dv02"/>
@@ -30,13 +30,13 @@
       <point x="258" y="972" type="curve" smooth="yes"/>
       <point x="218" y="1009"/>
       <point x="198" y="1059"/>
-      <point x="198" y="1124" type="curve" name="at02" smooth="yes"/>
+      <point x="198" y="1124" type="curve" smooth="yes" name="at02"/>
       <point x="198" y="1149"/>
       <point x="201" y="1169"/>
       <point x="205" y="1190" type="curve" smooth="yes"/>
       <point x="245" y="1399"/>
       <point x="363" y="1493"/>
-      <point x="656" y="1493" type="curve" name="at01" smooth="yes"/>
+      <point x="656" y="1493" type="curve" smooth="yes" name="at01"/>
       <point x="890" y="1493" type="line"/>
       <point x="818" y="1118" type="line" name="at03"/>
       <point x="1001" y="1111"/>
@@ -44,7 +44,7 @@
       <point x="1152" y="966" type="curve" smooth="yes"/>
       <point x="1180" y="915"/>
       <point x="1192" y="849"/>
-      <point x="1192" y="785" type="curve" name="hr02" smooth="yes"/>
+      <point x="1192" y="785" type="curve" smooth="yes" name="hr02"/>
       <point x="1192" y="732"/>
       <point x="1184" y="645"/>
       <point x="1169" y="562" type="curve" smooth="yes"/>
@@ -82,10 +82,10 @@
       <point x="914" y="562" type="curve" smooth="yes"/>
       <point x="930" y="643"/>
       <point x="941" y="706"/>
-      <point x="941" y="755" type="curve" name="ah01" smooth="yes"/>
+      <point x="941" y="755" type="curve" smooth="yes" name="ah01"/>
       <point x="941" y="778"/>
       <point x="939" y="796"/>
-      <point x="934" y="811" type="curve" name="sh04" smooth="yes"/>
+      <point x="934" y="811" type="curve" smooth="yes" name="sh04"/>
       <point x="918" y="862"/>
       <point x="873" y="886"/>
       <point x="773" y="890" type="curve" name="sv03"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0559.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0559.glif
index bceb9363c..522d6fa7a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0559.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0559.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0559" format="1">
+<glyph name="uni0559" format="2">
   <advance width="1233"/>
   <unicode hex="0559"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="585" y="1069" type="curve" smooth="yes"/>
       <point x="552" y="1112"/>
       <point x="537" y="1162"/>
-      <point x="537" y="1215" type="curve" name="dh01" smooth="yes"/>
+      <point x="537" y="1215" type="curve" smooth="yes" name="dh01"/>
       <point x="537" y="1307"/>
       <point x="580" y="1402"/>
       <point x="664" y="1473" type="curve" smooth="yes"/>
@@ -20,7 +20,7 @@
       <point x="852" y="1402" type="line"/>
       <point x="772" y="1402"/>
       <point x="693" y="1328"/>
-      <point x="693" y="1246" type="curve" name="dh02" smooth="yes"/>
+      <point x="693" y="1246" type="curve" smooth="yes" name="dh02"/>
       <point x="693" y="1186"/>
       <point x="737" y="1140"/>
       <point x="801" y="1140" type="curve" name="at02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni055A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni055A_.glif
index 7c35ffff6..5201ddbaa 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni055A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni055A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni055A" format="1">
+<glyph name="uni055A" format="2">
   <advance width="1233"/>
   <unicode hex="055A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni055B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni055B_.glif
index 693ed3f47..a1870f32d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni055B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni055B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni055B" format="1">
+<glyph name="uni055B" format="2">
   <advance width="1233"/>
   <unicode hex="055B"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni055C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni055C_.glif
index b9c3802c1..6010af8d4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni055C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni055C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni055C" format="1">
+<glyph name="uni055C" format="2">
   <advance width="1233"/>
   <unicode hex="055C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni055D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni055D_.glif
index c0b74aa42..67eaea69a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni055D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni055D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni055D" format="1">
+<glyph name="uni055D" format="2">
   <advance width="1233"/>
   <unicode hex="055D"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni055E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni055E_.glif
index 596f10a5c..353718bc9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni055E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni055E_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni055E" format="1">
+<glyph name="uni055E" format="2">
   <advance width="1233"/>
   <unicode hex="055E"/>
   <outline>
     <contour>
-      <point x="777" y="1209" type="curve" name="dv01" smooth="yes"/>
+      <point x="777" y="1209" type="curve" smooth="yes" name="dv01"/>
       <point x="704" y="1209"/>
       <point x="642" y="1226"/>
       <point x="597" y="1262" type="curve" smooth="yes"/>
@@ -17,7 +17,7 @@
       <point x="691" y="1454" type="line" name="sv01"/>
       <point x="691" y="1411"/>
       <point x="727" y="1393"/>
-      <point x="772" y="1393" type="curve" name="dv02" smooth="yes"/>
+      <point x="772" y="1393" type="curve" smooth="yes" name="dv02"/>
       <point x="812" y="1393"/>
       <point x="834" y="1406"/>
       <point x="853" y="1425" type="curve" smooth="yes"/>
@@ -32,7 +32,7 @@
       <point x="844" y="1593" type="curve" smooth="yes"/>
       <point x="809" y="1614"/>
       <point x="760" y="1624"/>
-      <point x="704" y="1624" type="curve" name="dv03" smooth="yes"/>
+      <point x="704" y="1624" type="curve" smooth="yes" name="dv03"/>
       <point x="488" y="1624"/>
       <point x="269" y="1469"/>
       <point x="209" y="1265" type="curve"/>
@@ -45,10 +45,10 @@
       <point x="460" y="1782" type="curve" smooth="yes"/>
       <point x="565" y="1830"/>
       <point x="673" y="1856"/>
-      <point x="785" y="1856" type="curve" name="dv04" smooth="yes"/>
+      <point x="785" y="1856" type="curve" smooth="yes" name="dv04"/>
       <point x="921" y="1856"/>
       <point x="1025" y="1817"/>
-      <point x="1089" y="1753" type="curve" name="hr01" smooth="yes"/>
+      <point x="1089" y="1753" type="curve" smooth="yes" name="hr01"/>
       <point x="1140" y="1702"/>
       <point x="1165" y="1640"/>
       <point x="1165" y="1565" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni055F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni055F_.glif
index 885cc11c7..8fc9df951 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni055F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni055F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni055F" format="1">
+<glyph name="uni055F" format="2">
   <advance width="1233"/>
   <unicode hex="055F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0561.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0561.glif
index 08a4541a9..087541b2d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0561.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0561.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0561" format="1">
+<glyph name="uni0561" format="2">
   <advance width="1233"/>
   <unicode hex="0561"/>
   <outline>
     <contour>
-      <point x="201" y="-27" type="curve" name="ab03" smooth="yes"/>
+      <point x="201" y="-27" type="curve" smooth="yes" name="ab03"/>
       <point x="108" y="-27"/>
       <point x="46" y="6"/>
       <point x="23" y="73" type="curve" smooth="yes"/>
@@ -25,10 +25,10 @@
       <point x="258" y="233" type="curve" smooth="yes"/>
       <point x="267" y="201"/>
       <point x="285" y="192"/>
-      <point x="318" y="192" type="curve" name="sv01" smooth="yes"/>
+      <point x="318" y="192" type="curve" smooth="yes" name="sv01"/>
       <point x="386" y="192"/>
       <point x="417" y="237"/>
-      <point x="449" y="401" type="curve" name="hr02" smooth="yes"/>
+      <point x="449" y="401" type="curve" smooth="yes" name="hr02"/>
       <point x="589" y="1120" type="line" name="at02"/>
       <point x="826" y="1120" type="line"/>
       <point x="686" y="401" type="line" smooth="yes"/>
@@ -40,7 +40,7 @@
       <point x="674" y="235" type="curve" smooth="yes"/>
       <point x="682" y="206"/>
       <point x="698" y="192"/>
-      <point x="737" y="192" type="curve" name="sv02" smooth="yes"/>
+      <point x="737" y="192" type="curve" smooth="yes" name="sv02"/>
       <point x="802" y="192"/>
       <point x="832" y="232"/>
       <point x="864" y="401" type="curve" smooth="yes"/>
@@ -51,10 +51,10 @@
       <point x="836" y="116" type="line" name="iv01"/>
       <point x="789" y="32"/>
       <point x="698" y="-27"/>
-      <point x="608" y="-27" type="curve" name="ab04" smooth="yes"/>
+      <point x="608" y="-27" type="curve" smooth="yes" name="ab04"/>
       <point x="560" y="-27"/>
       <point x="521" y="-11"/>
-      <point x="490" y="14" type="curve" name="ab02" smooth="yes"/>
+      <point x="490" y="14" type="curve" smooth="yes" name="ab02"/>
       <point x="462" y="37"/>
       <point x="440" y="69"/>
       <point x="440" y="112" type="curve" name="iv02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0562.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0562.glif
index 2118085d4..086f42c21 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0562.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0562.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0562" format="1">
+<glyph name="uni0562" format="2">
   <advance width="1233"/>
   <unicode hex="0562"/>
   <outline>
@@ -9,10 +9,10 @@
       <point x="524" y="952" type="line" name="iv01"/>
       <point x="592" y="1079"/>
       <point x="707" y="1147"/>
-      <point x="852" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="852" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1019" y="1147"/>
       <point x="1106" y="1059"/>
-      <point x="1106" y="880" type="curve" name="dh02" smooth="yes"/>
+      <point x="1106" y="880" type="curve" smooth="yes" name="dh02"/>
       <point x="1106" y="833"/>
       <point x="1100" y="784"/>
       <point x="1089" y="727" type="curve" smooth="yes"/>
@@ -21,10 +21,10 @@
       <point x="789" y="682" type="line" smooth="yes"/>
       <point x="797" y="723"/>
       <point x="801" y="757"/>
-      <point x="801" y="785" type="curve" name="dh01" smooth="yes"/>
+      <point x="801" y="785" type="curve" smooth="yes" name="dh01"/>
       <point x="801" y="870"/>
       <point x="764" y="909"/>
-      <point x="692" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="692" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="577" y="909"/>
       <point x="497" y="812"/>
       <point x="464" y="641" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0563.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0563.glif
index 3521efd65..e9903a03f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0563.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0563.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0563" format="1">
+<glyph name="uni0563" format="2">
   <advance width="1233"/>
   <unicode hex="0563"/>
   <outline>
@@ -7,13 +7,13 @@
       <point x="676" y="158" type="line" name="iv01"/>
       <point x="576" y="30"/>
       <point x="476" y="-29"/>
-      <point x="345" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="345" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="218" y="-29"/>
       <point x="127" y="24"/>
       <point x="76" y="124" type="curve" smooth="yes"/>
       <point x="45" y="183"/>
       <point x="30" y="254"/>
-      <point x="30" y="346" type="curve" name="dh01" smooth="yes"/>
+      <point x="30" y="346" type="curve" smooth="yes" name="dh01"/>
       <point x="30" y="409"/>
       <point x="38" y="480"/>
       <point x="53" y="559" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="245" y="993" type="curve" smooth="yes"/>
       <point x="337" y="1097"/>
       <point x="444" y="1147"/>
-      <point x="568" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="568" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="709" y="1147"/>
       <point x="791" y="1081"/>
       <point x="830" y="952" type="curve" name="iv02"/>
@@ -36,7 +36,7 @@
       <point x="563" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="482" y="215" type="curve" name="sv02" smooth="yes"/>
+      <point x="482" y="215" type="curve" smooth="yes" name="sv02"/>
       <point x="549" y="215"/>
       <point x="603" y="249"/>
       <point x="650" y="308" type="curve" smooth="yes"/>
@@ -48,10 +48,10 @@
       <point x="768" y="693" type="curve" smooth="yes"/>
       <point x="768" y="740"/>
       <point x="761" y="781"/>
-      <point x="748" y="815" type="curve" name="hr02" smooth="yes"/>
+      <point x="748" y="815" type="curve" smooth="yes" name="hr02"/>
       <point x="723" y="876"/>
       <point x="679" y="907"/>
-      <point x="616" y="907" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="907" type="curve" smooth="yes" name="sv01"/>
       <point x="553" y="907"/>
       <point x="498" y="876"/>
       <point x="450" y="815" type="curve" smooth="yes"/>
@@ -60,7 +60,7 @@
       <point x="346" y="561" type="curve" smooth="yes"/>
       <point x="338" y="518"/>
       <point x="332" y="468"/>
-      <point x="332" y="425" type="curve" name="dh02" smooth="yes"/>
+      <point x="332" y="425" type="curve" smooth="yes" name="dh02"/>
       <point x="332" y="378"/>
       <point x="339" y="339"/>
       <point x="351" y="307" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0564.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0564.glif
index c981ddc3d..d155aa7b7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0564.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0564.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0564" format="1">
+<glyph name="uni0564" format="2">
   <advance width="1233"/>
   <unicode hex="0564"/>
   <outline>
     <contour>
-      <point x="763" y="682" type="line" name="hr00" smooth="yes"/>
+      <point x="763" y="682" type="line" smooth="yes" name="hr00"/>
       <point x="771" y="723"/>
       <point x="775" y="757"/>
-      <point x="775" y="785" type="curve" name="dh02" smooth="yes"/>
+      <point x="775" y="785" type="curve" smooth="yes" name="dh02"/>
       <point x="775" y="870"/>
       <point x="738" y="909"/>
-      <point x="666" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="666" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="551" y="909"/>
       <point x="471" y="812"/>
       <point x="438" y="641" type="curve" smooth="yes"/>
@@ -21,10 +21,10 @@
       <point x="498" y="952" type="line" name="iv01"/>
       <point x="566" y="1079"/>
       <point x="681" y="1147"/>
-      <point x="826" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="826" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="993" y="1147"/>
       <point x="1080" y="1059"/>
-      <point x="1080" y="880" type="curve" name="hr01" smooth="yes"/>
+      <point x="1080" y="880" type="curve" smooth="yes" name="hr01"/>
       <point x="1080" y="833"/>
       <point x="1074" y="784"/>
       <point x="1063" y="727" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0565.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0565.glif
index 6786b4fb3..ae7aa9829 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0565.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0565.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0565" format="1">
+<glyph name="uni0565" format="2">
   <advance width="1233"/>
   <unicode hex="0565"/>
   <outline>
     <contour>
-      <point x="348" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="348" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="181" y="-29"/>
       <point x="93" y="59"/>
-      <point x="93" y="238" type="curve" name="dh01" smooth="yes"/>
+      <point x="93" y="238" type="curve" smooth="yes" name="dh01"/>
       <point x="93" y="285"/>
       <point x="99" y="335"/>
-      <point x="110" y="391" type="curve" name="hr01" smooth="yes"/>
+      <point x="110" y="391" type="curve" smooth="yes" name="hr01"/>
       <point x="337" y="1556" type="line" name="at01"/>
       <point x="630" y="1556" type="line"/>
       <point x="545" y="1120" type="line" name="at02"/>
@@ -20,10 +20,10 @@
       <point x="412" y="436" type="line" smooth="yes"/>
       <point x="404" y="396"/>
       <point x="400" y="362"/>
-      <point x="400" y="333" type="curve" name="dh02" smooth="yes"/>
+      <point x="400" y="333" type="curve" smooth="yes" name="dh02"/>
       <point x="400" y="252"/>
       <point x="436" y="211"/>
-      <point x="508" y="211" type="curve" name="sv01" smooth="yes"/>
+      <point x="508" y="211" type="curve" smooth="yes" name="sv01"/>
       <point x="620" y="211"/>
       <point x="700" y="301"/>
       <point x="735" y="477" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0566.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0566.glif
index 63a1da5ec..884ea5301 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0566.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0566.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0566" format="1">
+<glyph name="uni0566" format="2">
   <advance width="1233"/>
   <unicode hex="0566"/>
   <outline>
@@ -7,13 +7,13 @@
       <point x="686" y="158" type="line" name="iv01"/>
       <point x="586" y="30"/>
       <point x="486" y="-29"/>
-      <point x="355" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="355" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="228" y="-29"/>
       <point x="137" y="24"/>
       <point x="86" y="124" type="curve" smooth="yes"/>
       <point x="55" y="183"/>
       <point x="40" y="254"/>
-      <point x="40" y="346" type="curve" name="dh01" smooth="yes"/>
+      <point x="40" y="346" type="curve" smooth="yes" name="dh01"/>
       <point x="40" y="409"/>
       <point x="48" y="480"/>
       <point x="63" y="559" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="255" y="993" type="curve" smooth="yes"/>
       <point x="347" y="1097"/>
       <point x="454" y="1147"/>
-      <point x="578" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="578" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="719" y="1147"/>
       <point x="801" y="1081"/>
       <point x="840" y="952" type="curve" name="iv02"/>
@@ -34,10 +34,10 @@
       <point x="573" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="492" y="215" type="curve" name="dv02" smooth="yes"/>
+      <point x="492" y="215" type="curve" smooth="yes" name="dv02"/>
       <point x="559" y="215"/>
       <point x="613" y="249"/>
-      <point x="660" y="308" type="curve" name="hr01" smooth="yes"/>
+      <point x="660" y="308" type="curve" smooth="yes" name="hr01"/>
       <point x="705" y="365"/>
       <point x="741" y="444"/>
       <point x="764" y="561" type="curve" smooth="yes"/>
@@ -46,10 +46,10 @@
       <point x="778" y="693" type="curve" smooth="yes"/>
       <point x="778" y="740"/>
       <point x="771" y="781"/>
-      <point x="758" y="815" type="curve" name="hr02" smooth="yes"/>
+      <point x="758" y="815" type="curve" smooth="yes" name="hr02"/>
       <point x="733" y="876"/>
       <point x="689" y="907"/>
-      <point x="626" y="907" type="curve" name="sv01" smooth="yes"/>
+      <point x="626" y="907" type="curve" smooth="yes" name="sv01"/>
       <point x="563" y="907"/>
       <point x="508" y="876"/>
       <point x="460" y="815" type="curve" smooth="yes"/>
@@ -58,7 +58,7 @@
       <point x="356" y="561" type="curve" smooth="yes"/>
       <point x="348" y="518"/>
       <point x="342" y="468"/>
-      <point x="342" y="425" type="curve" name="dh02" smooth="yes"/>
+      <point x="342" y="425" type="curve" smooth="yes" name="dh02"/>
       <point x="342" y="378"/>
       <point x="349" y="339"/>
       <point x="361" y="307" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0567.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0567.glif
index 5ec8ad760..f1249495e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0567.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0567.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0567" format="1">
+<glyph name="uni0567" format="2">
   <advance width="1233"/>
   <unicode hex="0567"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0568.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0568.glif
index 6bf03d964..661d3ab76 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0568.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0568.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0568" format="1">
+<glyph name="uni0568" format="2">
   <advance width="1233"/>
   <unicode hex="0568"/>
   <outline>
@@ -9,10 +9,10 @@
       <point x="524" y="952" type="line" name="iv01"/>
       <point x="592" y="1079"/>
       <point x="707" y="1147"/>
-      <point x="852" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="852" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1019" y="1147"/>
       <point x="1106" y="1059"/>
-      <point x="1106" y="880" type="curve" name="sh01" smooth="yes"/>
+      <point x="1106" y="880" type="curve" smooth="yes" name="sh01"/>
       <point x="1106" y="833"/>
       <point x="1100" y="784"/>
       <point x="1089" y="727" type="curve" smooth="yes"/>
@@ -21,10 +21,10 @@
       <point x="789" y="682" type="line" smooth="yes"/>
       <point x="797" y="723"/>
       <point x="801" y="757"/>
-      <point x="801" y="785" type="curve" name="dh02" smooth="yes"/>
+      <point x="801" y="785" type="curve" smooth="yes" name="dh02"/>
       <point x="801" y="870"/>
       <point x="764" y="909"/>
-      <point x="692" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="692" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="577" y="909"/>
       <point x="497" y="812"/>
       <point x="464" y="641" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0569.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0569.glif
index 03e5c72ae..d3db6e65f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0569.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0569.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0569" format="1">
+<glyph name="uni0569" format="2">
   <advance width="1233"/>
   <unicode hex="0569"/>
   <outline>
@@ -12,13 +12,13 @@
       <point x="621" y="1096" type="curve" smooth="yes"/>
       <point x="689" y="1129"/>
       <point x="767" y="1147"/>
-      <point x="839" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="839" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="978" y="1147"/>
       <point x="1108" y="1085"/>
       <point x="1153" y="911" type="curve" smooth="yes"/>
       <point x="1164" y="867"/>
       <point x="1169" y="814"/>
-      <point x="1169" y="761" type="curve" name="dh02" smooth="yes"/>
+      <point x="1169" y="761" type="curve" smooth="yes" name="dh02"/>
       <point x="1169" y="700"/>
       <point x="1162" y="632"/>
       <point x="1147" y="559" type="curve"/>
@@ -27,7 +27,7 @@
       <point x="1111" y="416" type="line"/>
       <point x="1005" y="67"/>
       <point x="798" y="-29"/>
-      <point x="627" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="627" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="528" y="-29"/>
       <point x="460" y="0"/>
       <point x="417" y="47" type="curve" smooth="yes"/>
@@ -39,17 +39,17 @@
       <point x="372" y="254" type="curve" smooth="yes"/>
       <point x="409" y="464"/>
       <point x="587" y="559"/>
-      <point x="744" y="559" type="curve" name="sv02" smooth="yes"/>
+      <point x="744" y="559" type="curve" smooth="yes" name="sv02"/>
       <point x="846" y="559" type="line"/>
       <point x="857" y="610"/>
       <point x="864" y="662"/>
-      <point x="864" y="713" type="curve" name="dh01" smooth="yes"/>
+      <point x="864" y="713" type="curve" smooth="yes" name="dh01"/>
       <point x="864" y="744"/>
       <point x="861" y="771"/>
       <point x="854" y="794" type="curve" smooth="yes"/>
       <point x="834" y="863"/>
       <point x="776" y="909"/>
-      <point x="687" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="687" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="614" y="909"/>
       <point x="554" y="878"/>
       <point x="510" y="839" type="curve" smooth="yes"/>
@@ -60,7 +60,7 @@
       <point x="-98" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="653" y="107" type="curve" name="dv02" smooth="yes"/>
+      <point x="653" y="107" type="curve" smooth="yes" name="dv02"/>
       <point x="698" y="107"/>
       <point x="730" y="121"/>
       <point x="754" y="168" type="curve" smooth="yes"/>
@@ -80,7 +80,7 @@
       <point x="540" y="215" type="curve" smooth="yes"/>
       <point x="540" y="190"/>
       <point x="545" y="168"/>
-      <point x="556" y="151" type="curve" name="hr01" smooth="yes"/>
+      <point x="556" y="151" type="curve" smooth="yes" name="hr01"/>
       <point x="573" y="124"/>
       <point x="604" y="107"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni056A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni056A_.glif
index 1ea96839e..0023b64b6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni056A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni056A_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni056A" format="1">
+<glyph name="uni056A" format="2">
   <advance width="1233"/>
   <unicode hex="056A"/>
   <outline>
     <contour>
-      <point x="406" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="406" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="169" y="-29"/>
       <point x="52" y="95"/>
       <point x="18" y="269" type="curve"/>
       <point x="11" y="308"/>
       <point x="7" y="347"/>
-      <point x="7" y="390" type="curve" name="dh01" smooth="yes"/>
+      <point x="7" y="390" type="curve" smooth="yes" name="dh01"/>
       <point x="7" y="443"/>
       <point x="13" y="498"/>
       <point x="24" y="557" type="curve" smooth="yes"/>
@@ -19,7 +19,7 @@
       <point x="217" y="953" type="curve" smooth="yes"/>
       <point x="321" y="1061"/>
       <point x="455" y="1120"/>
-      <point x="630" y="1120" type="curve" name="at02" smooth="yes"/>
+      <point x="630" y="1120" type="curve" smooth="yes" name="at02"/>
       <point x="835" y="1120" type="line"/>
       <point x="920" y="1556" type="line" name="at01"/>
       <point x="1212" y="1556" type="line"/>
@@ -38,7 +38,7 @@
       <point x="526" y="-29"/>
     </contour>
     <contour>
-      <point x="452" y="211" type="curve" name="dv01" smooth="yes"/>
+      <point x="452" y="211" type="curve" smooth="yes" name="dv01"/>
       <point x="528" y="211"/>
       <point x="587" y="245"/>
       <point x="632" y="309" type="curve" smooth="yes"/>
@@ -46,13 +46,13 @@
       <point x="705" y="454"/>
       <point x="725" y="557" type="curve" smooth="yes"/>
       <point x="791" y="895" type="line" name="sv02"/>
-      <point x="586" y="895" type="line" name="sv03" smooth="yes"/>
+      <point x="586" y="895" type="line" smooth="yes" name="sv03"/>
       <point x="435" y="895"/>
       <point x="357" y="768"/>
       <point x="317" y="558" type="curve" smooth="yes"/>
       <point x="306" y="499"/>
       <point x="300" y="447"/>
-      <point x="300" y="402" type="curve" name="dh02" smooth="yes"/>
+      <point x="300" y="402" type="curve" smooth="yes" name="dh02"/>
       <point x="300" y="366"/>
       <point x="304" y="333"/>
       <point x="313" y="306" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni056B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni056B_.glif
index 45d4ea879..48b5c7a51 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni056B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni056B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni056B" format="1">
+<glyph name="uni056B" format="2">
   <advance width="1233"/>
   <unicode hex="056B"/>
   <outline>
@@ -9,10 +9,10 @@
       <point x="533" y="952" type="line" name="iv01"/>
       <point x="597" y="1075"/>
       <point x="710" y="1147"/>
-      <point x="861" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="861" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1028" y="1147"/>
       <point x="1114" y="1060"/>
-      <point x="1114" y="881" type="curve" name="dh02" smooth="yes"/>
+      <point x="1114" y="881" type="curve" smooth="yes" name="dh02"/>
       <point x="1114" y="834"/>
       <point x="1108" y="784"/>
       <point x="1097" y="727" type="curve" smooth="yes"/>
@@ -21,10 +21,10 @@
       <point x="797" y="682" type="line" smooth="yes"/>
       <point x="805" y="723"/>
       <point x="809" y="757"/>
-      <point x="809" y="785" type="curve" name="dh01" smooth="yes"/>
+      <point x="809" y="785" type="curve" smooth="yes" name="dh01"/>
       <point x="809" y="870"/>
       <point x="772" y="909"/>
-      <point x="700" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="700" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="588" y="909"/>
       <point x="507" y="816"/>
       <point x="472" y="641" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni056C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni056C_.glif
index 8819d2505..796d828fc 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni056C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni056C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni056C" format="1">
+<glyph name="uni056C" format="2">
   <advance width="1233"/>
   <unicode hex="056C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni056D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni056D_.glif
index 3ca68e159..5158d1d1c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni056D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni056D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni056D" format="1">
+<glyph name="uni056D" format="2">
   <advance width="1233"/>
   <unicode hex="056D"/>
   <outline>
@@ -9,10 +9,10 @@
       <point x="400" y="1044" type="line" name="iv01"/>
       <point x="456" y="1120"/>
       <point x="525" y="1147"/>
-      <point x="601" y="1147" type="curve" name="at03" smooth="yes"/>
+      <point x="601" y="1147" type="curve" smooth="yes" name="at03"/>
       <point x="626" y="1147"/>
       <point x="663" y="1144"/>
-      <point x="695" y="1125" type="curve" name="at02" smooth="yes"/>
+      <point x="695" y="1125" type="curve" smooth="yes" name="at02"/>
       <point x="723" y="1108"/>
       <point x="753" y="1074"/>
       <point x="766" y="1009" type="curve" smooth="yes"/>
@@ -31,7 +31,7 @@
       <point x="680" y="235" type="curve" smooth="yes"/>
       <point x="689" y="203"/>
       <point x="707" y="192"/>
-      <point x="743" y="192" type="curve" name="sv02" smooth="yes"/>
+      <point x="743" y="192" type="curve" smooth="yes" name="sv02"/>
       <point x="808" y="192"/>
       <point x="839" y="231"/>
       <point x="871" y="401" type="curve"/>
@@ -42,10 +42,10 @@
       <point x="842" y="116" type="line" name="iv02"/>
       <point x="787" y="24"/>
       <point x="705" y="-27"/>
-      <point x="605" y="-27" type="curve" name="ab03" smooth="yes"/>
+      <point x="605" y="-27" type="curve" smooth="yes" name="ab03"/>
       <point x="574" y="-27"/>
       <point x="543" y="-22"/>
-      <point x="514" y="-5" type="curve" name="hr02" smooth="yes"/>
+      <point x="514" y="-5" type="curve" smooth="yes" name="hr02"/>
       <point x="482" y="14"/>
       <point x="456" y="45"/>
       <point x="443" y="112" type="curve" smooth="yes"/>
@@ -64,7 +64,7 @@
       <point x="529" y="886" type="curve" smooth="yes"/>
       <point x="521" y="914"/>
       <point x="506" y="928"/>
-      <point x="467" y="928" type="curve" name="sv01" smooth="yes"/>
+      <point x="467" y="928" type="curve" smooth="yes" name="sv01"/>
       <point x="401" y="928"/>
       <point x="370" y="889"/>
       <point x="338" y="719" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni056E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni056E_.glif
index b18a486f8..8eac955ed 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni056E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni056E_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni056E" format="1">
+<glyph name="uni056E" format="2">
   <advance width="1233"/>
   <unicode hex="056E"/>
   <outline>
     <contour>
-      <point x="465" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="465" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="298" y="-29"/>
       <point x="178" y="27"/>
       <point x="109" y="135" type="curve" smooth="yes"/>
       <point x="62" y="208"/>
       <point x="42" y="300"/>
-      <point x="42" y="397" type="curve" name="sh01" smooth="yes"/>
+      <point x="42" y="397" type="curve" smooth="yes" name="sh01"/>
       <point x="42" y="446"/>
       <point x="47" y="500"/>
       <point x="58" y="559" type="curve" smooth="yes"/>
@@ -30,10 +30,10 @@
       <point x="1058" y="895" type="line" name="ih02"/>
       <point x="1087" y="827"/>
       <point x="1105" y="754"/>
-      <point x="1105" y="666" type="curve" name="sh02" smooth="yes"/>
+      <point x="1105" y="666" type="curve" smooth="yes" name="sh02"/>
       <point x="1105" y="625"/>
       <point x="1102" y="594"/>
-      <point x="1095" y="559" type="curve" name="sh03" smooth="yes"/>
+      <point x="1095" y="559" type="curve" smooth="yes" name="sh03"/>
       <point x="1064" y="390"/>
       <point x="990" y="244"/>
       <point x="877" y="136" type="curve" smooth="yes"/>
@@ -41,16 +41,16 @@
       <point x="625" y="-29"/>
     </contour>
     <contour>
-      <point x="507" y="211" type="curve" name="dv01" smooth="yes"/>
+      <point x="507" y="211" type="curve" smooth="yes" name="dv01"/>
       <point x="591" y="211"/>
       <point x="652" y="252"/>
       <point x="699" y="312" type="curve" smooth="yes"/>
       <point x="748" y="376"/>
       <point x="783" y="464"/>
-      <point x="802" y="559" type="curve" name="sh04" smooth="yes"/>
+      <point x="802" y="559" type="curve" smooth="yes" name="sh04"/>
       <point x="809" y="596"/>
       <point x="813" y="628"/>
-      <point x="813" y="659" type="curve" name="ah01" smooth="yes"/>
+      <point x="813" y="659" type="curve" smooth="yes" name="ah01"/>
       <point x="813" y="695"/>
       <point x="807" y="727"/>
       <point x="798" y="755" type="curve" smooth="yes"/>
@@ -58,13 +58,13 @@
       <point x="748" y="844"/>
       <point x="703" y="879" type="curve" smooth="yes"/>
       <point x="682" y="895" type="line" name="sv02"/>
-      <point x="640" y="895" type="line" name="sv03" smooth="yes"/>
+      <point x="640" y="895" type="line" smooth="yes" name="sv03"/>
       <point x="492" y="895"/>
       <point x="388" y="766"/>
-      <point x="351" y="559" type="curve" name="sh06" smooth="yes"/>
+      <point x="351" y="559" type="curve" smooth="yes" name="sh06"/>
       <point x="343" y="516"/>
       <point x="337" y="464"/>
-      <point x="337" y="421" type="curve" name="sh05" smooth="yes"/>
+      <point x="337" y="421" type="curve" smooth="yes" name="sh05"/>
       <point x="337" y="378"/>
       <point x="343" y="338"/>
       <point x="356" y="306" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni056F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni056F_.glif
index 38531546e..85270d061 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni056F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni056F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni056F" format="1">
+<glyph name="uni056F" format="2">
   <advance width="1233"/>
   <unicode hex="056F"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="696" y="166" type="line" name="hr00"/>
       <point x="629" y="39"/>
       <point x="515" y="-29"/>
-      <point x="370" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="370" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="203" y="-29"/>
       <point x="115" y="59"/>
-      <point x="115" y="238" type="curve" name="dh01" smooth="yes"/>
+      <point x="115" y="238" type="curve" smooth="yes" name="dh01"/>
       <point x="115" y="285"/>
       <point x="121" y="335"/>
       <point x="132" y="391" type="curve" smooth="yes"/>
@@ -19,10 +19,10 @@
       <point x="433" y="436" type="line" smooth="yes"/>
       <point x="425" y="396"/>
       <point x="421" y="362"/>
-      <point x="421" y="334" type="curve" name="dh02" smooth="yes"/>
+      <point x="421" y="334" type="curve" smooth="yes" name="dh02"/>
       <point x="421" y="250"/>
       <point x="458" y="211"/>
-      <point x="531" y="211" type="curve" name="dv02" smooth="yes"/>
+      <point x="531" y="211" type="curve" smooth="yes" name="dv02"/>
       <point x="648" y="211"/>
       <point x="724" y="310"/>
       <point x="756" y="477" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0570.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0570.glif
index 031de3d02..6a503284b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0570.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0570.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0570" format="1">
+<glyph name="uni0570" format="2">
   <advance width="1233"/>
   <unicode hex="0570"/>
   <outline>
@@ -9,10 +9,10 @@
       <point x="533" y="952" type="line" name="iv01"/>
       <point x="597" y="1073"/>
       <point x="709" y="1147"/>
-      <point x="854" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="854" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1019" y="1147"/>
       <point x="1116" y="1051"/>
-      <point x="1116" y="882" type="curve" name="dh02" smooth="yes"/>
+      <point x="1116" y="882" type="curve" smooth="yes" name="dh02"/>
       <point x="1116" y="839"/>
       <point x="1110" y="792"/>
       <point x="1098" y="728" type="curve" smooth="yes"/>
@@ -21,10 +21,10 @@
       <point x="797" y="682" type="line" smooth="yes"/>
       <point x="804" y="717"/>
       <point x="807" y="756"/>
-      <point x="807" y="780" type="curve" name="dh01" smooth="yes"/>
+      <point x="807" y="780" type="curve" smooth="yes" name="dh01"/>
       <point x="807" y="868"/>
       <point x="767" y="907"/>
-      <point x="695" y="907" type="curve" name="sv01" smooth="yes"/>
+      <point x="695" y="907" type="curve" smooth="yes" name="sv01"/>
       <point x="582" y="907"/>
       <point x="504" y="810"/>
       <point x="469" y="629" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0571.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0571.glif
index a9db04a23..da6fea77b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0571.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0571.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0571" format="1">
+<glyph name="uni0571" format="2">
   <advance width="1233"/>
   <unicode hex="0571"/>
   <outline>
     <contour>
-      <point x="342" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="342" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="212" y="-29"/>
       <point x="137" y="24"/>
       <point x="100" y="99" type="curve" smooth="yes"/>
@@ -40,7 +40,7 @@
       <point x="679" y="1374" type="curve" smooth="yes"/>
       <point x="678" y="1366"/>
       <point x="677" y="1358"/>
-      <point x="677" y="1350" type="curve" name="hr01" smooth="yes"/>
+      <point x="677" y="1350" type="curve" smooth="yes" name="hr01"/>
       <point x="677" y="1305"/>
       <point x="709" y="1274"/>
       <point x="753" y="1274" type="curve" smooth="yes"/>
@@ -57,7 +57,7 @@
       <point x="1028" y="834" type="curve" smooth="yes"/>
       <point x="1044" y="787"/>
       <point x="1050" y="736"/>
-      <point x="1050" y="688" type="curve" name="dh02" smooth="yes"/>
+      <point x="1050" y="688" type="curve" smooth="yes" name="dh02"/>
       <point x="1050" y="637"/>
       <point x="1043" y="581"/>
       <point x="1031" y="520" type="curve" smooth="yes"/>
@@ -71,7 +71,7 @@
       <point x="419" y="-29"/>
     </contour>
     <contour>
-      <point x="507" y="211" type="curve" name="sv01" smooth="yes"/>
+      <point x="507" y="211" type="curve" smooth="yes" name="sv01"/>
       <point x="571" y="211"/>
       <point x="620" y="246"/>
       <point x="657" y="297" type="curve" smooth="yes"/>
@@ -81,7 +81,7 @@
       <point x="746" y="558" type="line" smooth="yes"/>
       <point x="755" y="603"/>
       <point x="761" y="652"/>
-      <point x="761" y="696" type="curve" name="dh01" smooth="yes"/>
+      <point x="761" y="696" type="curve" smooth="yes" name="dh01"/>
       <point x="761" y="721"/>
       <point x="759" y="745"/>
       <point x="755" y="767" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0572.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0572.glif
index dff27be9c..4ee077d77 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0572.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0572.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0572" format="1">
+<glyph name="uni0572" format="2">
   <advance width="1233"/>
   <unicode hex="0572"/>
   <outline>
     <contour>
-      <point x="773" y="682" type="line" name="hr00" smooth="yes"/>
+      <point x="773" y="682" type="line" smooth="yes" name="hr00"/>
       <point x="781" y="723"/>
       <point x="785" y="757"/>
-      <point x="785" y="785" type="curve" name="dh02" smooth="yes"/>
+      <point x="785" y="785" type="curve" smooth="yes" name="dh02"/>
       <point x="785" y="870"/>
       <point x="748" y="909"/>
-      <point x="676" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="676" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="561" y="909"/>
       <point x="481" y="812"/>
       <point x="448" y="641" type="curve" smooth="yes"/>
@@ -21,10 +21,10 @@
       <point x="508" y="952" type="line" name="hr01"/>
       <point x="576" y="1079"/>
       <point x="691" y="1147"/>
-      <point x="836" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="836" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1003" y="1147"/>
       <point x="1090" y="1059"/>
-      <point x="1090" y="880" type="curve" name="sh01" smooth="yes"/>
+      <point x="1090" y="880" type="curve" smooth="yes" name="sh01"/>
       <point x="1090" y="833"/>
       <point x="1084" y="784"/>
       <point x="1073" y="727" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0573.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0573.glif
index ed328f09b..de969968a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0573.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0573.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0573" format="1">
+<glyph name="uni0573" format="2">
   <advance width="1233"/>
   <unicode hex="0573"/>
   <outline>
     <contour>
-      <point x="365" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="365" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="244" y="-29"/>
       <point x="168" y="20"/>
       <point x="125" y="112" type="curve" smooth="yes"/>
       <point x="102" y="161"/>
       <point x="92" y="221"/>
-      <point x="92" y="285" type="curve" name="dh01" smooth="yes"/>
+      <point x="92" y="285" type="curve" smooth="yes" name="dh01"/>
       <point x="92" y="336"/>
       <point x="97" y="386"/>
       <point x="108" y="439" type="curve" smooth="yes"/>
@@ -25,20 +25,20 @@
       <point x="720" y="1407" type="curve" smooth="yes"/>
       <point x="831" y="1476"/>
       <point x="948" y="1517"/>
-      <point x="1069" y="1517" type="curve" name="at03" smooth="yes"/>
+      <point x="1069" y="1517" type="curve" smooth="yes" name="at03"/>
       <point x="1088" y="1517"/>
       <point x="1110" y="1516"/>
-      <point x="1134" y="1512" type="curve" name="at04" smooth="yes"/>
+      <point x="1134" y="1512" type="curve" smooth="yes" name="at04"/>
       <point x="1146" y="1509"/>
       <point x="1178" y="1504"/>
       <point x="1193" y="1491" type="curve"/>
       <point x="1144" y="1243" type="line" name="iv01"/>
       <point x="1117" y="1263"/>
       <point x="1091" y="1274"/>
-      <point x="1067" y="1281" type="curve" name="hr01" smooth="yes"/>
+      <point x="1067" y="1281" type="curve" smooth="yes" name="hr01"/>
       <point x="1046" y="1286"/>
       <point x="1033" y="1287"/>
-      <point x="1018" y="1287" type="curve" name="sv03" smooth="yes"/>
+      <point x="1018" y="1287" type="curve" smooth="yes" name="sv03"/>
       <point x="955" y="1287"/>
       <point x="902" y="1269"/>
       <point x="851" y="1237" type="curve" smooth="yes"/>
@@ -61,7 +61,7 @@
       <point x="506" y="-29"/>
     </contour>
     <contour>
-      <point x="520" y="211" type="curve" name="sv01" smooth="yes"/>
+      <point x="520" y="211" type="curve" smooth="yes" name="sv01"/>
       <point x="641" y="211"/>
       <point x="717" y="312"/>
       <point x="749" y="477" type="curve" smooth="yes"/>
@@ -80,7 +80,7 @@
       <point x="414" y="491" type="curve"/>
       <point x="405" y="443"/>
       <point x="401" y="397"/>
-      <point x="401" y="365" type="curve" name="dh02" smooth="yes"/>
+      <point x="401" y="365" type="curve" smooth="yes" name="dh02"/>
       <point x="401" y="339"/>
       <point x="404" y="316"/>
       <point x="409" y="296" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0574.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0574.glif
index ea1653fd0..f0cfbc0ff 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0574.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0574.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0574" format="1">
+<glyph name="uni0574" format="2">
   <advance width="1233"/>
   <unicode hex="0574"/>
   <outline>
     <contour>
-      <point x="318" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="318" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="151" y="-29"/>
       <point x="63" y="59"/>
-      <point x="63" y="238" type="curve" name="dh01" smooth="yes"/>
+      <point x="63" y="238" type="curve" smooth="yes" name="dh01"/>
       <point x="63" y="285"/>
       <point x="69" y="335"/>
-      <point x="80" y="391" type="curve" name="hr01" smooth="yes"/>
+      <point x="80" y="391" type="curve" smooth="yes" name="hr01"/>
       <point x="222" y="1120" type="line" name="at01"/>
       <point x="515" y="1120" type="line"/>
       <point x="382" y="436" type="line" smooth="yes"/>
       <point x="374" y="396"/>
       <point x="370" y="362"/>
-      <point x="370" y="333" type="curve" name="dh02" smooth="yes"/>
+      <point x="370" y="333" type="curve" smooth="yes" name="dh02"/>
       <point x="370" y="252"/>
       <point x="406" y="211"/>
-      <point x="479" y="211" type="curve" name="sv01" smooth="yes"/>
+      <point x="479" y="211" type="curve" smooth="yes" name="sv01"/>
       <point x="591" y="211"/>
       <point x="670" y="302"/>
       <point x="705" y="477" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0575.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0575.glif
index 01b53bbe4..ffd49f163 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0575.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0575.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0575" format="1">
+<glyph name="uni0575" format="2">
   <advance width="1233"/>
   <unicode hex="0575"/>
   <outline>
@@ -20,7 +20,7 @@
       <point x="559" y="-317" type="curve"/>
       <point x="482" y="-393"/>
       <point x="379" y="-424"/>
-      <point x="238" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="238" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="-78" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0576.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0576.glif
index 2cafad41f..15ac191ad 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0576.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0576.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0576" format="1">
+<glyph name="uni0576" format="2">
   <advance width="1233"/>
   <unicode hex="0576"/>
   <outline>
     <contour>
-      <point x="395" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="395" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="228" y="-27"/>
       <point x="141" y="61"/>
-      <point x="141" y="240" type="curve" name="dh01" smooth="yes"/>
+      <point x="141" y="240" type="curve" smooth="yes" name="dh01"/>
       <point x="141" y="287"/>
       <point x="147" y="336"/>
-      <point x="158" y="393" type="curve" name="hr01" smooth="yes"/>
+      <point x="158" y="393" type="curve" smooth="yes" name="hr01"/>
       <point x="341" y="1331" type="line" name="sv01"/>
       <point x="213" y="1331" type="line"/>
       <point x="256" y="1556" type="line" name="at02"/>
@@ -18,10 +18,10 @@
       <point x="458" y="438" type="line" smooth="yes"/>
       <point x="450" y="397"/>
       <point x="446" y="362"/>
-      <point x="446" y="335" type="curve" name="dh02" smooth="yes"/>
+      <point x="446" y="335" type="curve" smooth="yes" name="dh02"/>
       <point x="446" y="250"/>
       <point x="483" y="211"/>
-      <point x="555" y="211" type="curve" name="sv02" smooth="yes"/>
+      <point x="555" y="211" type="curve" smooth="yes" name="sv02"/>
       <point x="670" y="211"/>
       <point x="750" y="308"/>
       <point x="783" y="479" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0577.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0577.glif
index a5ff36c2d..4a57793bd 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0577.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0577.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0577" format="1">
+<glyph name="uni0577" format="2">
   <advance width="1233"/>
   <unicode hex="0577"/>
   <outline>
     <contour>
-      <point x="173" y="-426" type="line" name="hr00" smooth="yes"/>
+      <point x="173" y="-426" type="line" smooth="yes" name="hr00"/>
       <point x="113" y="-426"/>
       <point x="63" y="-406"/>
       <point x="28" y="-363" type="curve" smooth="yes"/>
@@ -34,7 +34,7 @@
       <point x="766" y="861" type="curve" smooth="yes"/>
       <point x="741" y="894"/>
       <point x="697" y="917"/>
-      <point x="638" y="917" type="curve" name="sv01" smooth="yes"/>
+      <point x="638" y="917" type="curve" smooth="yes" name="sv01"/>
       <point x="589" y="917"/>
       <point x="537" y="901"/>
       <point x="492" y="870" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="204" y="906" type="line"/>
       <point x="316" y="1058"/>
       <point x="512" y="1145"/>
-      <point x="696" y="1145" type="curve" name="at01" smooth="yes"/>
+      <point x="696" y="1145" type="curve" smooth="yes" name="at01"/>
       <point x="831" y="1145"/>
       <point x="945" y="1103"/>
       <point x="1014" y="1030" type="curve" smooth="yes"/>
@@ -68,7 +68,7 @@
       <point x="298" y="-178" type="curve" smooth="yes"/>
       <point x="298" y="-194"/>
       <point x="312" y="-201"/>
-      <point x="331" y="-201" type="curve" name="sv02" smooth="yes"/>
+      <point x="331" y="-201" type="curve" smooth="yes" name="sv02"/>
       <point x="861" y="-201" type="line" name="sv03"/>
       <point x="817" y="-426" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0578.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0578.glif
index 728bf0816..90b7307e4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0578.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0578.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0578" format="1">
+<glyph name="uni0578" format="2">
   <advance width="1233"/>
   <unicode hex="0578"/>
   <outline>
@@ -9,10 +9,10 @@
       <point x="523" y="952" type="line" name="dh01"/>
       <point x="587" y="1073"/>
       <point x="699" y="1147"/>
-      <point x="844" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="844" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1009" y="1147"/>
       <point x="1106" y="1051"/>
-      <point x="1106" y="882" type="curve" name="sh01" smooth="yes"/>
+      <point x="1106" y="882" type="curve" smooth="yes" name="sh01"/>
       <point x="1106" y="839"/>
       <point x="1100" y="792"/>
       <point x="1088" y="728" type="curve" smooth="yes"/>
@@ -21,10 +21,10 @@
       <point x="787" y="682" type="line" smooth="yes"/>
       <point x="794" y="717"/>
       <point x="797" y="756"/>
-      <point x="797" y="780" type="curve" name="dh02" smooth="yes"/>
+      <point x="797" y="780" type="curve" smooth="yes" name="dh02"/>
       <point x="797" y="868"/>
       <point x="758" y="907"/>
-      <point x="686" y="907" type="curve" name="sv01" smooth="yes"/>
+      <point x="686" y="907" type="curve" smooth="yes" name="sv01"/>
       <point x="573" y="907"/>
       <point x="494" y="809"/>
       <point x="459" y="629" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0579.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0579.glif
index 619989a1b..cf9510365 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0579.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0579.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0579" format="1">
+<glyph name="uni0579" format="2">
   <advance width="1233"/>
   <unicode hex="0579"/>
   <outline>
     <contour>
-      <point x="244" y="-426" type="line" name="hr00" smooth="yes"/>
+      <point x="244" y="-426" type="line" smooth="yes" name="hr00"/>
       <point x="189" y="-426"/>
       <point x="143" y="-405"/>
       <point x="112" y="-366" type="curve"/>
@@ -65,7 +65,7 @@
       <point x="374" y="-158" type="curve" smooth="yes"/>
       <point x="374" y="-189"/>
       <point x="387" y="-201"/>
-      <point x="414" y="-201" type="curve" name="sv01" smooth="yes"/>
+      <point x="414" y="-201" type="curve" smooth="yes" name="sv01"/>
       <point x="864" y="-201" type="line" name="sv02"/>
       <point x="820" y="-426" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni057A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni057A_.glif
index 99def2ae0..d2da510ad 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni057A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni057A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni057A" format="1">
+<glyph name="uni057A" format="2">
   <advance width="1233"/>
   <unicode hex="057A"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="782" y="85" type="line" name="hr00"/>
       <point x="731" y="13"/>
       <point x="657" y="-27"/>
-      <point x="585" y="-27" type="curve" name="ab02" smooth="yes"/>
+      <point x="585" y="-27" type="curve" smooth="yes" name="ab02"/>
       <point x="540" y="-27"/>
       <point x="500" y="-11"/>
       <point x="469" y="14" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="419" y="112" type="curve" name="iv01"/>
       <point x="351" y="9"/>
       <point x="279" y="-27"/>
-      <point x="180" y="-27" type="curve" name="ab03" smooth="yes"/>
+      <point x="180" y="-27" type="curve" smooth="yes" name="ab03"/>
       <point x="93" y="-27"/>
       <point x="27" y="1"/>
       <point x="2" y="73" type="curve" smooth="yes"/>
@@ -37,7 +37,7 @@
       <point x="237" y="233" type="curve"/>
       <point x="244" y="198"/>
       <point x="268" y="192"/>
-      <point x="295" y="192" type="curve" name="sv01" smooth="yes"/>
+      <point x="295" y="192" type="curve" smooth="yes" name="sv01"/>
       <point x="334" y="192"/>
       <point x="357" y="206"/>
       <point x="376" y="235" type="curve" smooth="yes"/>
@@ -55,7 +55,7 @@
       <point x="653" y="235" type="curve" smooth="yes"/>
       <point x="662" y="203"/>
       <point x="679" y="192"/>
-      <point x="715" y="192" type="curve" name="sv02" smooth="yes"/>
+      <point x="715" y="192" type="curve" smooth="yes" name="sv02"/>
       <point x="780" y="192"/>
       <point x="811" y="231"/>
       <point x="843" y="401" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni057B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni057B_.glif
index 64cd9d0a1..12d802b11 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni057B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni057B_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni057B" format="1">
+<glyph name="uni057B" format="2">
   <advance width="1233"/>
   <unicode hex="057B"/>
   <outline>
     <contour>
-      <point x="213" y="-426" type="line" name="hr00" smooth="yes"/>
+      <point x="213" y="-426" type="line" smooth="yes" name="hr00"/>
       <point x="148" y="-426"/>
       <point x="98" y="-402"/>
       <point x="67" y="-363" type="curve" smooth="yes"/>
@@ -34,10 +34,10 @@
       <point x="257" y="462" type="curve"/>
       <point x="214" y="511"/>
       <point x="184" y="554"/>
-      <point x="169" y="623" type="curve" name="sh02" smooth="yes"/>
+      <point x="169" y="623" type="curve" smooth="yes" name="sh02"/>
       <point x="166" y="638"/>
       <point x="164" y="654"/>
-      <point x="164" y="674" type="curve" name="sh01" smooth="yes"/>
+      <point x="164" y="674" type="curve" smooth="yes" name="sh01"/>
       <point x="164" y="737"/>
       <point x="183" y="799"/>
       <point x="211" y="852" type="curve" smooth="yes"/>
@@ -46,19 +46,19 @@
       <point x="370" y="1029" type="curve" smooth="yes"/>
       <point x="439" y="1078"/>
       <point x="521" y="1112"/>
-      <point x="602" y="1131" type="curve" name="at01" smooth="yes"/>
+      <point x="602" y="1131" type="curve" smooth="yes" name="at01"/>
       <point x="645" y="1140"/>
       <point x="684" y="1145"/>
-      <point x="733" y="1145" type="curve" name="at02" smooth="yes"/>
+      <point x="733" y="1145" type="curve" smooth="yes" name="at02"/>
       <point x="866" y="1145"/>
       <point x="980" y="1109"/>
       <point x="1052" y="1037" type="curve" smooth="yes"/>
       <point x="1107" y="982"/>
       <point x="1136" y="911"/>
-      <point x="1136" y="819" type="curve" name="sh03" smooth="yes"/>
+      <point x="1136" y="819" type="curve" smooth="yes" name="sh03"/>
       <point x="1136" y="790"/>
       <point x="1133" y="761"/>
-      <point x="1127" y="730" type="curve" name="sh04" smooth="yes"/>
+      <point x="1127" y="730" type="curve" smooth="yes" name="sh04"/>
       <point x="1104" y="609"/>
       <point x="1046" y="504"/>
       <point x="951" y="400" type="curve" smooth="yes"/>
@@ -73,7 +73,7 @@
       <point x="337" y="-181" type="curve" smooth="yes"/>
       <point x="337" y="-194"/>
       <point x="348" y="-201"/>
-      <point x="371" y="-201" type="curve" name="sv01" smooth="yes"/>
+      <point x="371" y="-201" type="curve" smooth="yes" name="sv01"/>
       <point x="901" y="-201" type="line"/>
       <point x="857" y="-426" type="line"/>
     </contour>
@@ -87,10 +87,10 @@
       <point x="794" y="611" type="curve" smooth="yes"/>
       <point x="817" y="654"/>
       <point x="824" y="681"/>
-      <point x="831" y="720" type="curve" name="sh05" smooth="yes"/>
+      <point x="831" y="720" type="curve" smooth="yes" name="sh05"/>
       <point x="834" y="736"/>
       <point x="835" y="746"/>
-      <point x="835" y="761" type="curve" name="ah01" smooth="yes"/>
+      <point x="835" y="761" type="curve" smooth="yes" name="ah01"/>
       <point x="835" y="805"/>
       <point x="825" y="832"/>
       <point x="810" y="855" type="curve" smooth="yes"/>
@@ -102,7 +102,7 @@
       <point x="445" y="745" type="curve" name="sh07"/>
       <point x="442" y="732"/>
       <point x="441" y="719"/>
-      <point x="441" y="706" type="curve" name="sh06" smooth="yes"/>
+      <point x="441" y="706" type="curve" smooth="yes" name="sh06"/>
       <point x="441" y="663"/>
       <point x="451" y="640"/>
       <point x="464" y="615" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni057C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni057C_.glif
index 94435eae2..13f4b5a1d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni057C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni057C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni057C" format="1">
+<glyph name="uni057C" format="2">
   <advance width="1233"/>
   <unicode hex="057C"/>
   <outline>
@@ -12,13 +12,13 @@
       <point x="640" y="1092" type="curve" smooth="yes"/>
       <point x="696" y="1127"/>
       <point x="762" y="1147"/>
-      <point x="838" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="838" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="959" y="1147"/>
       <point x="1038" y="1098"/>
       <point x="1081" y="1019" type="curve" smooth="yes"/>
       <point x="1108" y="971"/>
       <point x="1121" y="912"/>
-      <point x="1121" y="841" type="curve" name="dh02" smooth="yes"/>
+      <point x="1121" y="841" type="curve" smooth="yes" name="dh02"/>
       <point x="1121" y="802"/>
       <point x="1117" y="766"/>
       <point x="1110" y="727" type="curve" smooth="yes"/>
@@ -40,13 +40,13 @@
       <point x="800" y="625" type="curve" smooth="yes"/>
       <point x="807" y="662"/>
       <point x="812" y="697"/>
-      <point x="812" y="738" type="curve" name="dh01" smooth="yes"/>
+      <point x="812" y="738" type="curve" smooth="yes" name="dh01"/>
       <point x="812" y="770"/>
       <point x="809" y="799"/>
       <point x="800" y="824" type="curve" smooth="yes"/>
       <point x="781" y="879"/>
       <point x="740" y="909"/>
-      <point x="676" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="676" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="612" y="909"/>
       <point x="565" y="878"/>
       <point x="528" y="830" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni057D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni057D_.glif
index 8014dc4be..cdc9815c9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni057D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni057D_.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni057D" format="1">
+<glyph name="uni057D" format="2">
   <advance width="1233"/>
   <unicode hex="057D"/>
   <outline>
     <contour>
-      <point x="374" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="374" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="210" y="-29"/>
       <point x="112" y="67"/>
-      <point x="112" y="244" type="curve" name="dh01" smooth="yes"/>
+      <point x="112" y="244" type="curve" smooth="yes" name="dh01"/>
       <point x="112" y="283"/>
       <point x="117" y="327"/>
-      <point x="129" y="391" type="curve" name="hr01" smooth="yes"/>
+      <point x="129" y="391" type="curve" smooth="yes" name="hr01"/>
       <point x="272" y="1120" type="line" name="at01"/>
       <point x="563" y="1120" type="line"/>
       <point x="432" y="436" type="line" smooth="yes"/>
       <point x="425" y="400"/>
       <point x="422" y="362"/>
-      <point x="422" y="338" type="curve" name="dh02" smooth="yes"/>
+      <point x="422" y="338" type="curve" smooth="yes" name="dh02"/>
       <point x="422" y="251"/>
       <point x="462" y="211"/>
-      <point x="534" y="211" type="curve" name="sv01" smooth="yes"/>
+      <point x="534" y="211" type="curve" smooth="yes" name="sv01"/>
       <point x="641" y="211"/>
       <point x="721" y="298"/>
       <point x="758" y="489" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni057E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni057E_.glif
index c4b32ac3d..640d75eeb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni057E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni057E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni057E" format="1">
+<glyph name="uni057E" format="2">
   <advance width="1233"/>
   <unicode hex="057E"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="667" y="166" type="line" name="hr00"/>
       <point x="600" y="39"/>
       <point x="486" y="-29"/>
-      <point x="341" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="341" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="174" y="-29"/>
       <point x="86" y="59"/>
-      <point x="86" y="238" type="curve" name="dh01" smooth="yes"/>
+      <point x="86" y="238" type="curve" smooth="yes" name="dh01"/>
       <point x="86" y="285"/>
       <point x="92" y="335"/>
       <point x="103" y="391" type="curve" smooth="yes"/>
@@ -19,10 +19,10 @@
       <point x="404" y="436" type="line" smooth="yes"/>
       <point x="396" y="396"/>
       <point x="392" y="362"/>
-      <point x="392" y="334" type="curve" name="dh02" smooth="yes"/>
+      <point x="392" y="334" type="curve" smooth="yes" name="dh02"/>
       <point x="392" y="250"/>
       <point x="429" y="211"/>
-      <point x="502" y="211" type="curve" name="dv02" smooth="yes"/>
+      <point x="502" y="211" type="curve" smooth="yes" name="dv02"/>
       <point x="619" y="211"/>
       <point x="695" y="310"/>
       <point x="727" y="477" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni057F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni057F_.glif
index 304c4bc64..01d465d81 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni057F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni057F_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni057F" format="1">
+<glyph name="uni057F" format="2">
   <advance width="1233"/>
   <unicode hex="057F"/>
   <outline>
     <contour>
-      <point x="200" y="-27" type="curve" name="ab03" smooth="yes"/>
+      <point x="200" y="-27" type="curve" smooth="yes" name="ab03"/>
       <point x="80" y="-27"/>
       <point x="26" y="48"/>
       <point x="26" y="197" type="curve" smooth="yes"/>
       <point x="26" y="254"/>
       <point x="34" y="318"/>
-      <point x="50" y="401" type="curve" name="hr01" smooth="yes"/>
+      <point x="50" y="401" type="curve" smooth="yes" name="hr01"/>
       <point x="189" y="1120" type="line" name="at01"/>
       <point x="426" y="1120" type="line"/>
       <point x="287" y="401" type="line" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="274" y="235" type="curve" smooth="yes"/>
       <point x="283" y="202"/>
       <point x="303" y="192"/>
-      <point x="336" y="192" type="curve" name="sv01" smooth="yes"/>
+      <point x="336" y="192" type="curve" smooth="yes" name="sv01"/>
       <point x="367" y="192"/>
       <point x="390" y="201"/>
       <point x="410" y="229" type="curve" smooth="yes"/>
@@ -34,13 +34,13 @@
       <point x="795" y="1004" type="line" name="iv01"/>
       <point x="846" y="1089"/>
       <point x="927" y="1147"/>
-      <point x="1031" y="1147" type="curve" name="at03" smooth="yes"/>
+      <point x="1031" y="1147" type="curve" smooth="yes" name="at03"/>
       <point x="1150" y="1147"/>
       <point x="1205" y="1074"/>
       <point x="1205" y="926" type="curve" smooth="yes"/>
       <point x="1205" y="870"/>
       <point x="1197" y="800"/>
-      <point x="1181" y="719" type="curve" name="hr02" smooth="yes"/>
+      <point x="1181" y="719" type="curve" smooth="yes" name="hr02"/>
       <point x="1042" y="0" type="line" name="ab01"/>
       <point x="805" y="0" type="line"/>
       <point x="944" y="719" type="line" smooth="yes"/>
@@ -52,7 +52,7 @@
       <point x="957" y="886" type="curve" smooth="yes"/>
       <point x="949" y="914"/>
       <point x="933" y="928"/>
-      <point x="894" y="928" type="curve" name="sv02" smooth="yes"/>
+      <point x="894" y="928" type="curve" smooth="yes" name="sv02"/>
       <point x="863" y="928"/>
       <point x="840" y="919"/>
       <point x="821" y="892" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0580.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0580.glif
index c1f5664b8..deb997dbd 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0580.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0580.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0580" format="1">
+<glyph name="uni0580" format="2">
   <advance width="1233"/>
   <unicode hex="0580"/>
   <outline>
@@ -9,10 +9,10 @@
       <point x="547" y="952" type="line" name="iv01"/>
       <point x="615" y="1079"/>
       <point x="730" y="1147"/>
-      <point x="875" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="875" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1042" y="1147"/>
       <point x="1129" y="1059"/>
-      <point x="1129" y="880" type="curve" name="sh01" smooth="yes"/>
+      <point x="1129" y="880" type="curve" smooth="yes" name="sh01"/>
       <point x="1129" y="833"/>
       <point x="1123" y="784"/>
       <point x="1112" y="727" type="curve" smooth="yes"/>
@@ -21,10 +21,10 @@
       <point x="812" y="682" type="line" smooth="yes"/>
       <point x="820" y="723"/>
       <point x="824" y="757"/>
-      <point x="824" y="785" type="curve" name="dh02" smooth="yes"/>
+      <point x="824" y="785" type="curve" smooth="yes" name="dh02"/>
       <point x="824" y="870"/>
       <point x="787" y="909"/>
-      <point x="715" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="715" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="603" y="909"/>
       <point x="522" y="816"/>
       <point x="487" y="641" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0581.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0581.glif
index 159ff9196..724b40a87 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0581.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0581.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0581" format="1">
+<glyph name="uni0581" format="2">
   <advance width="1233"/>
   <unicode hex="0581"/>
   <outline>
     <contour>
-      <point x="408" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="408" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="271" y="-424"/>
       <point x="154" y="-404"/>
       <point x="37" y="-365" type="curve"/>
       <point x="91" y="-100" type="line" name="ih01"/>
       <point x="191" y="-160"/>
       <point x="303" y="-190"/>
-      <point x="414" y="-190" type="curve" name="sv01" smooth="yes"/>
+      <point x="414" y="-190" type="curve" smooth="yes" name="sv01"/>
       <point x="590" y="-190"/>
       <point x="675" y="-113"/>
       <point x="707" y="51" type="curve"/>
       <point x="734" y="184" type="line" name="ih02"/>
       <point x="659" y="69"/>
       <point x="555" y="16"/>
-      <point x="428" y="16" type="curve" name="dv03" smooth="yes"/>
+      <point x="428" y="16" type="curve" smooth="yes" name="dv03"/>
       <point x="220" y="16"/>
       <point x="87" y="161"/>
-      <point x="87" y="412" type="curve" name="hr01" smooth="yes"/>
+      <point x="87" y="412" type="curve" smooth="yes" name="hr01"/>
       <point x="87" y="584"/>
       <point x="151" y="796"/>
       <point x="244" y="932" type="curve" smooth="yes"/>
       <point x="340" y="1071"/>
       <point x="478" y="1151"/>
-      <point x="622" y="1151" type="curve" name="dv02" smooth="yes"/>
+      <point x="622" y="1151" type="curve" smooth="yes" name="dv02"/>
       <point x="761" y="1151"/>
       <point x="853" y="1075"/>
       <point x="881" y="938" type="curve" name="hr02"/>
@@ -38,16 +38,16 @@
       <point x="768" y="-424"/>
     </contour>
     <contour>
-      <point x="535" y="246" type="curve" name="dv04" smooth="yes"/>
+      <point x="535" y="246" type="curve" smooth="yes" name="dv04"/>
       <point x="694" y="246"/>
       <point x="822" y="457"/>
-      <point x="822" y="684" type="curve" name="sh01" smooth="yes"/>
+      <point x="822" y="684" type="curve" smooth="yes" name="sh01"/>
       <point x="822" y="837"/>
       <point x="764" y="909"/>
-      <point x="672" y="909" type="curve" name="dv01" smooth="yes"/>
+      <point x="672" y="909" type="curve" smooth="yes" name="dv01"/>
       <point x="515" y="909"/>
       <point x="386" y="702"/>
-      <point x="386" y="471" type="curve" name="dh01" smooth="yes"/>
+      <point x="386" y="471" type="curve" smooth="yes" name="dh01"/>
       <point x="386" y="318"/>
       <point x="442" y="246"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0582.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0582.glif
index f509a4067..a96314e75 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0582.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0582.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0582" format="1">
+<glyph name="uni0582" format="2">
   <advance width="1233"/>
   <unicode hex="0582"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0583.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0583.glif
index eecbe68a1..55177483b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0583.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0583.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0583" format="1">
+<glyph name="uni0583" format="2">
   <advance width="1233"/>
   <unicode hex="0583"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="406" y="104" type="line" name="iv01"/>
       <point x="350" y="8"/>
       <point x="278" y="-27"/>
-      <point x="197" y="-27" type="curve" name="ab02" smooth="yes"/>
+      <point x="197" y="-27" type="curve" smooth="yes" name="ab02"/>
       <point x="80" y="-27"/>
       <point x="25" y="48"/>
       <point x="25" y="197" type="curve" smooth="yes"/>
@@ -34,7 +34,7 @@
       <point x="823" y="1015" type="line" name="iv02"/>
       <point x="874" y="1102"/>
       <point x="945" y="1147"/>
-      <point x="1034" y="1147" type="curve" name="at03" smooth="yes"/>
+      <point x="1034" y="1147" type="curve" smooth="yes" name="at03"/>
       <point x="1149" y="1147"/>
       <point x="1204" y="1072"/>
       <point x="1204" y="925" type="curve" smooth="yes"/>
@@ -49,10 +49,10 @@
       <point x="960" y="850" type="curve" smooth="yes"/>
       <point x="960" y="863"/>
       <point x="959" y="875"/>
-      <point x="956" y="886" type="curve" name="hr01" smooth="yes"/>
+      <point x="956" y="886" type="curve" smooth="yes" name="hr01"/>
       <point x="949" y="907"/>
       <point x="937" y="928"/>
-      <point x="898" y="928" type="curve" name="sv01" smooth="yes"/>
+      <point x="898" y="928" type="curve" smooth="yes" name="sv01"/>
       <point x="869" y="928"/>
       <point x="848" y="918"/>
       <point x="825" y="887" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0584.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0584.glif
index 99b4db585..98f872c5d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0584.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0584.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0584" format="1">
+<glyph name="uni0584" format="2">
   <advance width="1233"/>
   <unicode hex="0584"/>
   <outline>
@@ -13,13 +13,13 @@
       <point x="541" y="952" type="line" name="ih01"/>
       <point x="629" y="1082"/>
       <point x="741" y="1147"/>
-      <point x="878" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="878" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="999" y="1147"/>
       <point x="1092" y="1099"/>
       <point x="1144" y="992" type="curve" smooth="yes"/>
       <point x="1173" y="932"/>
       <point x="1188" y="857"/>
-      <point x="1188" y="773" type="curve" name="sh01" smooth="yes"/>
+      <point x="1188" y="773" type="curve" smooth="yes" name="sh01"/>
       <point x="1188" y="714"/>
       <point x="1182" y="635"/>
       <point x="1167" y="559" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="974" y="125" type="curve" smooth="yes"/>
       <point x="882" y="22"/>
       <point x="772" y="-29"/>
-      <point x="647" y="-29" type="curve" name="dv03" smooth="yes"/>
+      <point x="647" y="-29" type="curve" smooth="yes" name="dv03"/>
       <point x="516" y="-29"/>
       <point x="438" y="29"/>
       <point x="387" y="158" type="curve" name="hr01"/>
@@ -40,19 +40,19 @@
       <point x="-18" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="603" y="215" type="curve" name="dv04" smooth="yes"/>
+      <point x="603" y="215" type="curve" smooth="yes" name="dv04"/>
       <point x="666" y="215"/>
       <point x="722" y="246"/>
       <point x="770" y="307" type="curve"/>
       <point x="838" y="390"/>
       <point x="888" y="567"/>
-      <point x="888" y="697" type="curve" name="dh02" smooth="yes"/>
+      <point x="888" y="697" type="curve" smooth="yes" name="dh02"/>
       <point x="888" y="785"/>
       <point x="866" y="852"/>
       <point x="819" y="884" type="curve" smooth="yes"/>
       <point x="796" y="899"/>
       <point x="769" y="907"/>
-      <point x="738" y="907" type="curve" name="hr02" smooth="yes"/>
+      <point x="738" y="907" type="curve" smooth="yes" name="hr02"/>
       <point x="674" y="907"/>
       <point x="617" y="875"/>
       <point x="570" y="815" type="curve" smooth="yes"/>
@@ -61,10 +61,10 @@
       <point x="465" y="561" type="curve" smooth="yes"/>
       <point x="457" y="518"/>
       <point x="451" y="470"/>
-      <point x="451" y="427" type="curve" name="dh01" smooth="yes"/>
+      <point x="451" y="427" type="curve" smooth="yes" name="dh01"/>
       <point x="451" y="380"/>
       <point x="458" y="341"/>
-      <point x="471" y="308" type="curve" name="hr03" smooth="yes"/>
+      <point x="471" y="308" type="curve" smooth="yes" name="hr03"/>
       <point x="495" y="248"/>
       <point x="539" y="215"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0585.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0585.glif
index 572f322dc..40c74f081 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0585.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0585.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0585" format="1">
+<glyph name="uni0585" format="2">
   <advance width="1233"/>
   <unicode hex="0585"/>
   <outline>
     <contour>
-      <point x="533" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="533" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="258" y="-29"/>
       <point x="88" y="134"/>
-      <point x="88" y="454" type="curve" name="sh01" smooth="yes"/>
+      <point x="88" y="454" type="curve" smooth="yes" name="sh01"/>
       <point x="88" y="818"/>
       <point x="308" y="1149"/>
-      <point x="700" y="1149" type="curve" name="dv03" smooth="yes"/>
+      <point x="700" y="1149" type="curve" smooth="yes" name="dv03"/>
       <point x="975" y="1149"/>
       <point x="1145" y="987"/>
-      <point x="1145" y="665" type="curve" name="sh02" smooth="yes"/>
+      <point x="1145" y="665" type="curve" smooth="yes" name="sh02"/>
       <point x="1145" y="300"/>
       <point x="925" y="-29"/>
     </contour>
     <contour>
-      <point x="557" y="207" type="curve" name="dv01" smooth="yes"/>
+      <point x="557" y="207" type="curve" smooth="yes" name="dv01"/>
       <point x="737" y="207"/>
       <point x="850" y="440"/>
-      <point x="850" y="664" type="curve" name="ah01" smooth="yes"/>
+      <point x="850" y="664" type="curve" smooth="yes" name="ah01"/>
       <point x="850" y="835"/>
       <point x="784" y="911"/>
-      <point x="679" y="911" type="curve" name="dv02" smooth="yes"/>
+      <point x="679" y="911" type="curve" smooth="yes" name="dv02"/>
       <point x="489" y="911"/>
       <point x="383" y="669"/>
-      <point x="383" y="456" type="curve" name="sh03" smooth="yes"/>
+      <point x="383" y="456" type="curve" smooth="yes" name="sh03"/>
       <point x="383" y="285"/>
       <point x="452" y="207"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0586.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0586.glif
index 5bd671c69..3cb38fbd6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0586.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0586.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0586" format="1">
+<glyph name="uni0586" format="2">
   <advance width="1233"/>
   <unicode hex="0586"/>
   <outline>
@@ -21,16 +21,16 @@
       <point x="254" y="964" type="curve" smooth="yes"/>
       <point x="214" y="1008"/>
       <point x="193" y="1068"/>
-      <point x="193" y="1136" type="curve" name="sh01" smooth="yes"/>
+      <point x="193" y="1136" type="curve" smooth="yes" name="sh01"/>
       <point x="193" y="1163"/>
       <point x="196" y="1186"/>
-      <point x="201" y="1213" type="curve" name="sh02" smooth="yes"/>
+      <point x="201" y="1213" type="curve" smooth="yes" name="sh02"/>
       <point x="222" y="1318"/>
       <point x="273" y="1400"/>
       <point x="354" y="1461" type="curve" smooth="yes"/>
       <point x="435" y="1521"/>
       <point x="545" y="1556"/>
-      <point x="686" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="686" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="895" y="1556" type="line"/>
       <point x="809" y="1114" type="line" name="dv02"/>
       <point x="977" y="1105"/>
@@ -38,7 +38,7 @@
       <point x="1129" y="961" type="curve" smooth="yes"/>
       <point x="1160" y="908"/>
       <point x="1173" y="843"/>
-      <point x="1173" y="767" type="curve" name="sh03" smooth="yes"/>
+      <point x="1173" y="767" type="curve" smooth="yes" name="sh03"/>
       <point x="1173" y="707"/>
       <point x="1164" y="640"/>
       <point x="1152" y="577" type="curve" smooth="yes"/>
@@ -55,10 +55,10 @@
       <point x="610" y="1325" type="line" name="sv01"/>
       <point x="509" y="1325"/>
       <point x="458" y="1299"/>
-      <point x="443" y="1219" type="curve" name="sh05" smooth="yes"/>
+      <point x="443" y="1219" type="curve" smooth="yes" name="sh05"/>
       <point x="441" y="1208"/>
       <point x="440" y="1198"/>
-      <point x="440" y="1190" type="curve" name="sh04" smooth="yes"/>
+      <point x="440" y="1190" type="curve" smooth="yes" name="sh04"/>
       <point x="440" y="1134"/>
       <point x="483" y="1118"/>
       <point x="570" y="1118" type="curve" name="sv02"/>
@@ -70,7 +70,7 @@
       <point x="906" y="574" type="curve" name="sh06"/>
       <point x="914" y="616"/>
       <point x="918" y="654"/>
-      <point x="918" y="689" type="curve" name="ah01" smooth="yes"/>
+      <point x="918" y="689" type="curve" smooth="yes" name="ah01"/>
       <point x="918" y="722"/>
       <point x="914" y="752"/>
       <point x="903" y="777" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0587.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0587.glif
index e955c02bf..36766ece4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0587.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0587.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0587" format="1">
+<glyph name="uni0587" format="2">
   <advance width="1233"/>
   <unicode hex="0587"/>
   <outline>
     <contour>
-      <point x="305" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="305" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="138" y="-29"/>
       <point x="51" y="58"/>
-      <point x="51" y="237" type="curve" name="dh01" smooth="yes"/>
+      <point x="51" y="237" type="curve" smooth="yes" name="dh01"/>
       <point x="51" y="284"/>
       <point x="57" y="334"/>
-      <point x="68" y="391" type="curve" name="hr01" smooth="yes"/>
+      <point x="68" y="391" type="curve" smooth="yes" name="hr01"/>
       <point x="294" y="1556" type="line" name="at01"/>
       <point x="587" y="1556" type="line"/>
       <point x="369" y="436" type="line" smooth="yes"/>
       <point x="361" y="396"/>
       <point x="357" y="362"/>
-      <point x="357" y="333" type="curve" name="dh02" smooth="yes"/>
+      <point x="357" y="333" type="curve" smooth="yes" name="dh02"/>
       <point x="357" y="252"/>
       <point x="393" y="211"/>
-      <point x="466" y="211" type="curve" name="sv01" smooth="yes"/>
+      <point x="466" y="211" type="curve" smooth="yes" name="sv01"/>
       <point x="578" y="211"/>
       <point x="657" y="302"/>
       <point x="692" y="477" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0589.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0589.glif
index 21aa5fec3..1b2b258f8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0589.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0589.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0589" format="1">
+<glyph name="uni0589" format="2">
   <advance width="1233"/>
   <unicode hex="0589"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni058A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni058A_.glif
index 129ba9e5a..e14388334 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni058A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni058A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni058A" format="1">
+<glyph name="uni058A" format="2">
   <advance width="1233"/>
   <unicode hex="058A"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="336" y="735" type="line" name="hr00"/>
       <point x="429" y="688"/>
       <point x="527" y="664"/>
-      <point x="632" y="664" type="curve" name="dv02" smooth="yes"/>
+      <point x="632" y="664" type="curve" smooth="yes" name="dv02"/>
       <point x="737" y="664"/>
       <point x="848" y="688"/>
       <point x="967" y="735" type="curve" name="av01"/>
       <point x="911" y="444" type="line"/>
       <point x="797" y="405"/>
       <point x="688" y="385"/>
-      <point x="583" y="385" type="curve" name="dv01" smooth="yes"/>
+      <point x="583" y="385" type="curve" smooth="yes" name="dv01"/>
       <point x="479" y="385"/>
       <point x="378" y="405"/>
       <point x="280" y="444" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni0E_3F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni0E_3F_.glif
index 4ef09edd4..e2bd512d4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni0E_3F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni0E_3F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0E3F" format="1">
+<glyph name="uni0E3F" format="2">
   <advance width="1233"/>
   <unicode hex="0E3F"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="811" y="1305" type="line"/>
       <point x="1030" y="1292"/>
       <point x="1165" y="1216"/>
-      <point x="1165" y="1052" type="curve" name="sh01" smooth="yes"/>
+      <point x="1165" y="1052" type="curve" smooth="yes" name="sh01"/>
       <point x="1165" y="1027"/>
       <point x="1162" y="1005"/>
       <point x="1157" y="978" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="823" y="699" type="curve" name="hr01"/>
       <point x="1006" y="682"/>
       <point x="1097" y="598"/>
-      <point x="1097" y="447" type="curve" name="dh02" smooth="yes"/>
+      <point x="1097" y="447" type="curve" smooth="yes" name="dh02"/>
       <point x="1097" y="420"/>
       <point x="1094" y="390"/>
       <point x="1088" y="358" type="curve" smooth="yes"/>
@@ -42,10 +42,10 @@
       <point x="713" y="803" type="line" name="iv01"/>
       <point x="777" y="811"/>
       <point x="849" y="837"/>
-      <point x="870" y="949" type="curve" name="hr02" smooth="yes"/>
+      <point x="870" y="949" type="curve" smooth="yes" name="hr02"/>
       <point x="873" y="965"/>
       <point x="874" y="980"/>
-      <point x="874" y="991" type="curve" name="ih01" smooth="yes"/>
+      <point x="874" y="991" type="curve" smooth="yes" name="ih01"/>
       <point x="874" y="1066"/>
       <point x="827" y="1089"/>
       <point x="770" y="1097" type="curve"/>
@@ -63,7 +63,7 @@
       <point x="807" y="394" type="curve" smooth="yes"/>
       <point x="811" y="416"/>
       <point x="813" y="436"/>
-      <point x="813" y="453" type="curve" name="dh01" smooth="yes"/>
+      <point x="813" y="453" type="curve" smooth="yes" name="dh01"/>
       <point x="813" y="546"/>
       <point x="754" y="578"/>
       <point x="672" y="589" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10D_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10D_0.glif
index 0b4e3efe6..5267725ec 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10D_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10D_0.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D0" format="1">
+<glyph name="uni10D0" format="2">
   <advance width="1233"/>
   <unicode hex="10D0"/>
   <outline>
     <contour>
-      <point x="468" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="468" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="137" y="0"/>
       <point x="42" y="153"/>
-      <point x="42" y="349" type="curve" name="dh01" smooth="yes"/>
+      <point x="42" y="349" type="curve" smooth="yes" name="dh01"/>
       <point x="42" y="421"/>
       <point x="55" y="497"/>
       <point x="99" y="568" type="curve" smooth="yes"/>
@@ -20,40 +20,40 @@
       <point x="354" y="490" type="curve"/>
       <point x="348" y="457"/>
       <point x="345" y="426"/>
-      <point x="345" y="399" type="curve" name="dh02" smooth="yes"/>
+      <point x="345" y="399" type="curve" smooth="yes" name="dh02"/>
       <point x="345" y="303"/>
       <point x="386" y="214"/>
-      <point x="526" y="214" type="curve" name="sv01" smooth="yes"/>
+      <point x="526" y="214" type="curve" smooth="yes" name="sv01"/>
       <point x="667" y="214"/>
       <point x="772" y="303"/>
       <point x="804" y="486" type="curve" smooth="yes"/>
       <point x="808" y="508"/>
       <point x="810" y="529"/>
-      <point x="810" y="548" type="curve" name="dh05" smooth="yes"/>
+      <point x="810" y="548" type="curve" smooth="yes" name="dh05"/>
       <point x="810" y="617"/>
       <point x="778" y="690"/>
       <point x="686" y="727" type="curve"/>
       <point x="687" y="727" type="line"/>
       <point x="482" y="802"/>
       <point x="447" y="930"/>
-      <point x="447" y="1047" type="curve" name="dh03" smooth="yes"/>
+      <point x="447" y="1047" type="curve" smooth="yes" name="dh03"/>
       <point x="447" y="1087"/>
       <point x="451" y="1123"/>
       <point x="458" y="1162" type="curve" name="sh01"/>
       <point x="720" y="1162" type="line"/>
       <point x="715" y="1138"/>
       <point x="713" y="1116"/>
-      <point x="713" y="1097" type="curve" name="dh04" smooth="yes"/>
+      <point x="713" y="1097" type="curve" smooth="yes" name="dh04"/>
       <point x="713" y="1038"/>
       <point x="734" y="979"/>
       <point x="789" y="958" type="curve"/>
       <point x="788" y="959" type="line"/>
       <point x="1007" y="879"/>
       <point x="1111" y="752"/>
-      <point x="1111" y="595" type="curve" name="dh06" smooth="yes"/>
+      <point x="1111" y="595" type="curve" smooth="yes" name="dh06"/>
       <point x="1111" y="564"/>
       <point x="1107" y="532"/>
-      <point x="1103" y="505" type="curve" name="sh02" smooth="yes"/>
+      <point x="1103" y="505" type="curve" smooth="yes" name="sh02"/>
       <point x="1052" y="178"/>
       <point x="825" y="0"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10D_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10D_1.glif
index fbf4e7e7b..c44f87ba3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10D_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10D_1.glif
@@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D1" format="1">
+<glyph name="uni10D1" format="2">
   <advance width="1233"/>
   <unicode hex="10D1"/>
   <outline>
     <contour>
-      <point x="480" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="480" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="199" y="0"/>
       <point x="56" y="123"/>
-      <point x="56" y="370" type="curve" name="dh01" smooth="yes"/>
+      <point x="56" y="370" type="curve" smooth="yes" name="dh01"/>
       <point x="56" y="425"/>
       <point x="62" y="484"/>
       <point x="73" y="535" type="curve" smooth="yes"/>
       <point x="129" y="818"/>
       <point x="305" y="998"/>
       <point x="573" y="1063" type="curve"/>
-      <point x="593" y="1168" type="line" name="sh01" smooth="yes"/>
+      <point x="593" y="1168" type="line" smooth="yes" name="sh01"/>
       <point x="594" y="1175"/>
       <point x="595" y="1181"/>
-      <point x="595" y="1188" type="curve" name="dh03" smooth="yes"/>
+      <point x="595" y="1188" type="curve" smooth="yes" name="dh03"/>
       <point x="595" y="1246"/>
       <point x="530" y="1263"/>
       <point x="491" y="1271" type="curve"/>
       <point x="436" y="1284"/>
       <point x="347" y="1309"/>
-      <point x="347" y="1458" type="curve" name="sh02" smooth="yes"/>
+      <point x="347" y="1458" type="curve" smooth="yes" name="sh02"/>
       <point x="347" y="1487"/>
       <point x="350" y="1519"/>
       <point x="357" y="1552" type="curve" name="sh03"/>
       <point x="657" y="1552" type="line"/>
       <point x="654" y="1541"/>
       <point x="653" y="1530"/>
-      <point x="653" y="1519" type="curve" name="sh04" smooth="yes"/>
+      <point x="653" y="1519" type="curve" smooth="yes" name="sh04"/>
       <point x="653" y="1475"/>
       <point x="675" y="1449"/>
       <point x="719" y="1440" type="curve"/>
       <point x="846" y="1392"/>
       <point x="867" y="1316"/>
-      <point x="867" y="1243" type="curve" name="dh04" smooth="yes"/>
+      <point x="867" y="1243" type="curve" smooth="yes" name="dh04"/>
       <point x="867" y="1220"/>
       <point x="865" y="1197"/>
       <point x="860" y="1174" type="curve" smooth="yes"/>
       <point x="838" y="1059" type="line"/>
       <point x="1065" y="971"/>
       <point x="1121" y="813"/>
-      <point x="1121" y="676" type="curve" name="hr01" smooth="yes"/>
+      <point x="1121" y="676" type="curve" smooth="yes" name="hr01"/>
       <point x="1121" y="636"/>
       <point x="1116" y="582"/>
       <point x="1108" y="534" type="curve" smooth="yes"/>
@@ -51,13 +51,13 @@
       <point x="836" y="0"/>
     </contour>
     <contour>
-      <point x="524" y="214" type="curve" name="hr02" smooth="yes"/>
+      <point x="524" y="214" type="curve" smooth="yes" name="hr02"/>
       <point x="665" y="214"/>
       <point x="760" y="326"/>
       <point x="799" y="535" type="curve" smooth="yes"/>
       <point x="810" y="591"/>
       <point x="815" y="646"/>
-      <point x="815" y="687" type="curve" name="ih01" smooth="yes"/>
+      <point x="815" y="687" type="curve" smooth="yes" name="ih01"/>
       <point x="815" y="767"/>
       <point x="792" y="831"/>
       <point x="745" y="863" type="curve" smooth="yes"/>
@@ -66,13 +66,13 @@
       <point x="659" y="887" type="curve" smooth="yes"/>
       <point x="624" y="887"/>
       <point x="590" y="879"/>
-      <point x="558" y="862" type="curve" name="hr03" smooth="yes"/>
+      <point x="558" y="862" type="curve" smooth="yes" name="hr03"/>
       <point x="501" y="833"/>
       <point x="449" y="779"/>
       <point x="409" y="683" type="curve"/>
       <point x="372" y="599"/>
       <point x="351" y="491"/>
-      <point x="351" y="417" type="curve" name="dh02" smooth="yes"/>
+      <point x="351" y="417" type="curve" smooth="yes" name="dh02"/>
       <point x="351" y="389"/>
       <point x="354" y="338"/>
       <point x="377" y="294" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10D_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10D_2.glif
index e96c287ec..12d24ef5b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10D_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10D_2.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D2" format="1">
+<glyph name="uni10D2" format="2">
   <advance width="1233"/>
   <unicode hex="10D2"/>
   <outline>
     <contour>
-      <point x="441" y="-402" type="curve" name="dv01" smooth="yes"/>
+      <point x="441" y="-402" type="curve" smooth="yes" name="dv01"/>
       <point x="142" y="-402"/>
       <point x="-12" y="-286"/>
-      <point x="-12" y="-53" type="curve" name="dh01" smooth="yes"/>
+      <point x="-12" y="-53" type="curve" smooth="yes" name="dh01"/>
       <point x="-12" y="-10"/>
       <point x="-7" y="32"/>
       <point x="2" y="79" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="737" y="830" type="curve" smooth="yes"/>
       <point x="706" y="845"/>
       <point x="666" y="853"/>
-      <point x="617" y="853" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="853" type="curve" smooth="yes" name="dv03"/>
       <point x="572" y="853"/>
       <point x="534" y="846"/>
       <point x="503" y="831" type="curve" smooth="yes"/>
@@ -48,10 +48,10 @@
       <point x="220" y="776" type="curve" smooth="yes"/>
       <point x="256" y="973"/>
       <point x="410" y="1066"/>
-      <point x="673" y="1066" type="curve" name="dv04" smooth="yes"/>
+      <point x="673" y="1066" type="curve" smooth="yes" name="dv04"/>
       <point x="914" y="1066"/>
       <point x="1043" y="987"/>
-      <point x="1043" y="826" type="curve" name="dh04" smooth="yes"/>
+      <point x="1043" y="826" type="curve" smooth="yes" name="dh04"/>
       <point x="1043" y="802"/>
       <point x="1040" y="777"/>
       <point x="1035" y="750" type="curve" smooth="yes"/>
@@ -60,7 +60,7 @@
       <point x="888" y="512" type="curve" name="ih01"/>
       <point x="1016" y="448"/>
       <point x="1085" y="340"/>
-      <point x="1085" y="201" type="curve" name="sh01" smooth="yes"/>
+      <point x="1085" y="201" type="curve" smooth="yes" name="sh01"/>
       <point x="1085" y="168"/>
       <point x="1081" y="120"/>
       <point x="1074" y="79" type="curve" smooth="yes"/>
@@ -74,19 +74,19 @@
       <point x="790" y="79" type="curve"/>
       <point x="797" y="110"/>
       <point x="799" y="139"/>
-      <point x="799" y="160" type="curve" name="dh03" smooth="yes"/>
+      <point x="799" y="160" type="curve" smooth="yes" name="dh03"/>
       <point x="799" y="281"/>
       <point x="698" y="346"/>
-      <point x="586" y="346" type="curve" name="dv05" smooth="yes"/>
+      <point x="586" y="346" type="curve" smooth="yes" name="dv05"/>
       <point x="463" y="346"/>
       <point x="326" y="268"/>
       <point x="286" y="79" type="curve" smooth="yes"/>
       <point x="280" y="49"/>
       <point x="277" y="22"/>
-      <point x="277" y="-3" type="curve" name="dh02" smooth="yes"/>
+      <point x="277" y="-3" type="curve" smooth="yes" name="dh02"/>
       <point x="277" y="-98"/>
       <point x="318" y="-185"/>
-      <point x="482" y="-185" type="curve" name="dv02" smooth="yes"/>
+      <point x="482" y="-185" type="curve" smooth="yes" name="dv02"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10D_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10D_3.glif
index 3dfc9b00f..7c867beb8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10D_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10D_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D3" format="1">
+<glyph name="uni10D3" format="2">
   <advance width="1233"/>
   <unicode hex="10D3"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="525" y="-403" type="line" name="hr00"/>
       <point x="526" y="-400"/>
       <point x="526" y="-396"/>
-      <point x="526" y="-390" type="curve" name="av01" smooth="yes"/>
+      <point x="526" y="-390" type="curve" smooth="yes" name="av01"/>
       <point x="526" y="-365"/>
       <point x="511" y="-340"/>
       <point x="480" y="-315" type="curve" smooth="yes"/>
@@ -39,13 +39,13 @@
       <point x="46" y="580" type="curve" smooth="yes"/>
       <point x="111" y="891"/>
       <point x="262" y="1056"/>
-      <point x="507" y="1056" type="curve" name="dv02" smooth="yes"/>
+      <point x="507" y="1056" type="curve" smooth="yes" name="dv02"/>
       <point x="589" y="1056"/>
       <point x="629" y="1037"/>
       <point x="676" y="987" type="curve"/>
       <point x="736" y="1034"/>
       <point x="814" y="1056"/>
-      <point x="922" y="1056" type="curve" name="sv01" smooth="yes"/>
+      <point x="922" y="1056" type="curve" smooth="yes" name="sv01"/>
       <point x="1051" y="1056"/>
       <point x="1144" y="1023"/>
       <point x="1197" y="950" type="curve" smooth="yes"/>
@@ -61,7 +61,7 @@
       <point x="1037" y="108" type="curve" smooth="yes"/>
       <point x="957" y="32"/>
       <point x="849" y="-1"/>
-      <point x="736" y="-1" type="curve" name="ab01" smooth="yes"/>
+      <point x="736" y="-1" type="curve" smooth="yes" name="ab01"/>
       <point x="645" y="-1"/>
       <point x="587" y="20"/>
       <point x="536" y="69" type="curve" smooth="yes"/>
@@ -70,14 +70,14 @@
       <point x="453" y="228" type="curve" smooth="yes"/>
       <point x="447" y="257"/>
       <point x="444" y="286"/>
-      <point x="444" y="317" type="curve" name="dh02" smooth="yes"/>
+      <point x="444" y="317" type="curve" smooth="yes" name="dh02"/>
       <point x="444" y="346"/>
       <point x="447" y="375"/>
       <point x="452" y="404" type="curve" smooth="yes"/>
       <point x="533" y="814" type="line"/>
       <point x="534" y="830"/>
       <point x="527" y="843"/>
-      <point x="504" y="843" type="curve" name="dv01" smooth="yes"/>
+      <point x="504" y="843" type="curve" smooth="yes" name="dv01"/>
       <point x="437" y="843" type="line" smooth="yes"/>
       <point x="418" y="843"/>
       <point x="395" y="829"/>
@@ -88,7 +88,7 @@
       <point x="267" y="356" type="line"/>
       <point x="260" y="317"/>
       <point x="256" y="284"/>
-      <point x="256" y="251" type="curve" name="dh01" smooth="yes"/>
+      <point x="256" y="251" type="curve" smooth="yes" name="dh01"/>
       <point x="256" y="199"/>
       <point x="266" y="127"/>
       <point x="319" y="55" type="curve" smooth="yes"/>
@@ -109,7 +109,7 @@
       <point x="825" y="-403" type="curve"/>
     </contour>
     <contour>
-      <point x="752" y="213" type="curve" name="sv02" smooth="yes"/>
+      <point x="752" y="213" type="curve" smooth="yes" name="sv02"/>
       <point x="843" y="213"/>
       <point x="907" y="309"/>
       <point x="934" y="444" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10D_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10D_4.glif
index 7d28a7e74..19fd50e64 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10D_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10D_4.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D4" format="1">
+<glyph name="uni10D4" format="2">
   <advance width="1233"/>
   <unicode hex="10D4"/>
   <outline>
     <contour>
-      <point x="432" y="-402" type="curve" name="hr00" smooth="yes"/>
+      <point x="432" y="-402" type="curve" smooth="yes" name="hr00"/>
       <point x="125" y="-402"/>
       <point x="-25" y="-298"/>
-      <point x="-25" y="-73" type="curve" name="sh01" smooth="yes"/>
+      <point x="-25" y="-73" type="curve" smooth="yes" name="sh01"/>
       <point x="-25" y="-24"/>
       <point x="-17" y="67"/>
       <point x="55" y="156" type="curve" smooth="yes"/>
@@ -23,20 +23,20 @@
       <point x="280" y="15" type="curve" name="sh03"/>
       <point x="277" y="-4"/>
       <point x="275" y="-22"/>
-      <point x="275" y="-39" type="curve" name="sh02" smooth="yes"/>
+      <point x="275" y="-39" type="curve" smooth="yes" name="sh02"/>
       <point x="275" y="-127"/>
       <point x="331" y="-191"/>
-      <point x="478" y="-191" type="curve" name="dv01" smooth="yes"/>
+      <point x="478" y="-191" type="curve" smooth="yes" name="dv01"/>
       <point x="622" y="-191"/>
       <point x="702" y="-131"/>
       <point x="727" y="0" type="curve" smooth="yes"/>
-      <point x="852" y="639" type="line" name="sh04" smooth="yes"/>
+      <point x="852" y="639" type="line" smooth="yes" name="sh04"/>
       <point x="857" y="664"/>
       <point x="859" y="687"/>
-      <point x="859" y="706" type="curve" name="ah01" smooth="yes"/>
+      <point x="859" y="706" type="curve" smooth="yes" name="ah01"/>
       <point x="859" y="789"/>
       <point x="825" y="854"/>
-      <point x="686" y="854" type="curve" name="dv02" smooth="yes"/>
+      <point x="686" y="854" type="curve" smooth="yes" name="dv02"/>
       <point x="567" y="854"/>
       <point x="501" y="807"/>
       <point x="470" y="686" type="curve" smooth="yes"/>
@@ -61,14 +61,14 @@
       <point x="188" y="678" type="curve" smooth="yes"/>
       <point x="233" y="931"/>
       <point x="420" y="1066"/>
-      <point x="729" y="1066" type="curve" name="dv03" smooth="yes"/>
+      <point x="729" y="1066" type="curve" smooth="yes" name="dv03"/>
       <point x="732" y="1066" type="line" smooth="yes"/>
       <point x="1015" y="1066"/>
       <point x="1157" y="961"/>
-      <point x="1157" y="750" type="curve" name="sh05" smooth="yes"/>
+      <point x="1157" y="750" type="curve" smooth="yes" name="sh05"/>
       <point x="1157" y="715"/>
       <point x="1153" y="678"/>
-      <point x="1145" y="637" type="curve" name="sh06" smooth="yes"/>
+      <point x="1145" y="637" type="curve" smooth="yes" name="sh06"/>
       <point x="1022" y="8" type="line" smooth="yes"/>
       <point x="967" y="-273"/>
       <point x="771" y="-402"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10D_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10D_5.glif
index 7a5075c9c..bbaa5551f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10D_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10D_5.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D5" format="1">
+<glyph name="uni10D5" format="2">
   <advance width="1233"/>
   <unicode hex="10D5"/>
   <outline>
     <contour>
-      <point x="435" y="-402" type="curve" name="hr00" smooth="yes"/>
+      <point x="435" y="-402" type="curve" smooth="yes" name="hr00"/>
       <point x="90" y="-402"/>
       <point x="-13" y="-265"/>
-      <point x="-13" y="-89" type="curve" name="sh01" smooth="yes"/>
+      <point x="-13" y="-89" type="curve" smooth="yes" name="sh01"/>
       <point x="-13" y="-54"/>
       <point x="-9" y="-14"/>
-      <point x="-2" y="22" type="curve" name="sh02" smooth="yes"/>
+      <point x="-2" y="22" type="curve" smooth="yes" name="sh02"/>
       <point x="6" y="63"/>
       <point x="18" y="93"/>
       <point x="43" y="140" type="curve" smooth="yes"/>
@@ -20,23 +20,23 @@
       <point x="355" y="178" type="line" name="ih01"/>
       <point x="318" y="130"/>
       <point x="301" y="74"/>
-      <point x="292" y="25" type="curve" name="sh05" smooth="yes"/>
+      <point x="292" y="25" type="curve" smooth="yes" name="sh05"/>
       <point x="288" y="4"/>
       <point x="286" y="-16"/>
-      <point x="286" y="-35" type="curve" name="sh04" smooth="yes"/>
+      <point x="286" y="-35" type="curve" smooth="yes" name="sh04"/>
       <point x="286" y="-120"/>
       <point x="332" y="-191"/>
-      <point x="481" y="-191" type="curve" name="dv01" smooth="yes"/>
+      <point x="481" y="-191" type="curve" smooth="yes" name="dv01"/>
       <point x="615" y="-191"/>
       <point x="710" y="-135"/>
       <point x="734" y="-18" type="curve" smooth="yes"/>
-      <point x="752" y="74" type="line" name="sh06" smooth="yes"/>
+      <point x="752" y="74" type="line" smooth="yes" name="sh06"/>
       <point x="755" y="93"/>
       <point x="757" y="109"/>
-      <point x="757" y="122" type="curve" name="ah01" smooth="yes"/>
+      <point x="757" y="122" type="curve" smooth="yes" name="ah01"/>
       <point x="757" y="190"/>
       <point x="715" y="247"/>
-      <point x="598" y="247" type="curve" name="dv03" smooth="yes"/>
+      <point x="598" y="247" type="curve" smooth="yes" name="dv03"/>
       <point x="535" y="247" type="line"/>
       <point x="576" y="456" type="line" name="dv04"/>
       <point x="639" y="456" type="line" smooth="yes"/>
@@ -54,7 +54,7 @@
       <point x="836" y="801" type="curve" smooth="yes"/>
       <point x="807" y="836"/>
       <point x="763" y="854"/>
-      <point x="691" y="854" type="curve" name="dv02" smooth="yes"/>
+      <point x="691" y="854" type="curve" smooth="yes" name="dv02"/>
       <point x="570" y="854"/>
       <point x="480" y="804"/>
       <point x="459" y="701" type="curve" smooth="yes"/>
@@ -76,7 +76,7 @@
       <point x="172" y="701" type="curve"/>
       <point x="196" y="928"/>
       <point x="416" y="1066"/>
-      <point x="743" y="1066" type="curve" name="sh07" smooth="yes"/>
+      <point x="743" y="1066" type="curve" smooth="yes" name="sh07"/>
       <point x="1028" y="1066"/>
       <point x="1162" y="961"/>
       <point x="1162" y="750" type="curve" smooth="yes"/>
@@ -88,10 +88,10 @@
       <point x="904" y="355" type="curve" name="ih02"/>
       <point x="1029" y="307"/>
       <point x="1053" y="227"/>
-      <point x="1053" y="151" type="curve" name="sh03" smooth="yes"/>
+      <point x="1053" y="151" type="curve" smooth="yes" name="sh03"/>
       <point x="1053" y="124"/>
       <point x="1050" y="99"/>
-      <point x="1045" y="71" type="curve" name="sh08" smooth="yes"/>
+      <point x="1045" y="71" type="curve" smooth="yes" name="sh08"/>
       <point x="1031" y="-4" type="line" smooth="yes"/>
       <point x="982" y="-268"/>
       <point x="780" y="-402"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10D_6.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10D_6.glif
index 944b950c8..5f6d4ee54 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10D_6.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10D_6.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D6" format="1">
+<glyph name="uni10D6" format="2">
   <advance width="1233"/>
   <unicode hex="10D6"/>
   <outline>
     <contour>
-      <point x="512" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="512" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="172" y="0"/>
       <point x="88" y="177"/>
-      <point x="88" y="362" type="curve" name="dh01" smooth="yes"/>
+      <point x="88" y="362" type="curve" smooth="yes" name="dh01"/>
       <point x="88" y="457"/>
       <point x="109" y="633"/>
       <point x="195" y="764" type="curve" smooth="yes"/>
@@ -16,16 +16,16 @@
       <point x="359" y="910" type="curve" name="ih01"/>
       <point x="266" y="963"/>
       <point x="230" y="1046"/>
-      <point x="230" y="1120" type="curve" name="ih02" smooth="yes"/>
+      <point x="230" y="1120" type="curve" smooth="yes" name="ih02"/>
       <point x="230" y="1137"/>
       <point x="232" y="1166"/>
-      <point x="236" y="1194" type="curve" name="sh01" smooth="yes"/>
+      <point x="236" y="1194" type="curve" smooth="yes" name="sh01"/>
       <point x="265" y="1405"/>
       <point x="425" y="1550"/>
-      <point x="713" y="1550" type="curve" name="dv01" smooth="yes"/>
+      <point x="713" y="1550" type="curve" smooth="yes" name="dv01"/>
       <point x="933" y="1550"/>
       <point x="1050" y="1467"/>
-      <point x="1050" y="1296" type="curve" name="dh04" smooth="yes"/>
+      <point x="1050" y="1296" type="curve" smooth="yes" name="dh04"/>
       <point x="1050" y="1240"/>
       <point x="1038" y="1161"/>
       <point x="999" y="1088" type="curve" smooth="yes"/>
@@ -34,7 +34,7 @@
       <point x="922" y="988" type="curve" name="ih03"/>
       <point x="1114" y="932"/>
       <point x="1157" y="794"/>
-      <point x="1157" y="671" type="curve" name="sh02" smooth="yes"/>
+      <point x="1157" y="671" type="curve" smooth="yes" name="sh02"/>
       <point x="1157" y="624"/>
       <point x="1151" y="569"/>
       <point x="1142" y="520" type="curve" smooth="yes"/>
@@ -42,40 +42,40 @@
       <point x="853" y="0"/>
     </contour>
     <contour>
-      <point x="610" y="1010" type="curve" name="dv02" smooth="yes"/>
+      <point x="610" y="1010" type="curve" smooth="yes" name="dv02"/>
       <point x="693" y="1010"/>
       <point x="750" y="1072"/>
       <point x="771" y="1188" type="curve"/>
       <point x="776" y="1209"/>
       <point x="778" y="1228"/>
-      <point x="778" y="1246" type="curve" name="dh03" smooth="yes"/>
+      <point x="778" y="1246" type="curve" smooth="yes" name="dh03"/>
       <point x="778" y="1292"/>
       <point x="763" y="1343"/>
-      <point x="675" y="1343" type="curve" name="hr01" smooth="yes"/>
+      <point x="675" y="1343" type="curve" smooth="yes" name="hr01"/>
       <point x="669" y="1343" type="line" smooth="yes"/>
       <point x="585" y="1343"/>
       <point x="542" y="1287"/>
       <point x="522" y="1179" type="curve" smooth="yes"/>
       <point x="517" y="1154"/>
       <point x="515" y="1128"/>
-      <point x="515" y="1112" type="curve" name="sh03" smooth="yes"/>
+      <point x="515" y="1112" type="curve" smooth="yes" name="sh03"/>
       <point x="515" y="1067"/>
       <point x="530" y="1010"/>
     </contour>
     <contour>
-      <point x="569" y="214" type="curve" name="sv01" smooth="yes"/>
+      <point x="569" y="214" type="curve" smooth="yes" name="sv01"/>
       <point x="713" y="214"/>
       <point x="811" y="324"/>
-      <point x="848" y="523" type="curve" name="hr02" smooth="yes"/>
+      <point x="848" y="523" type="curve" smooth="yes" name="hr02"/>
       <point x="857" y="570"/>
       <point x="860" y="613"/>
-      <point x="860" y="645" type="curve" name="ih04" smooth="yes"/>
+      <point x="860" y="645" type="curve" smooth="yes" name="ih04"/>
       <point x="860" y="672"/>
       <point x="858" y="721"/>
       <point x="835" y="766" type="curve" smooth="yes"/>
       <point x="806" y="823"/>
       <point x="755" y="852"/>
-      <point x="684" y="852" type="curve" name="hr03" smooth="yes"/>
+      <point x="684" y="852" type="curve" smooth="yes" name="hr03"/>
       <point x="612" y="852"/>
       <point x="553" y="821"/>
       <point x="504" y="764" type="curve" smooth="yes"/>
@@ -84,7 +84,7 @@
       <point x="397" y="523" type="curve" smooth="yes"/>
       <point x="390" y="484"/>
       <point x="386" y="447"/>
-      <point x="386" y="412" type="curve" name="dh02" smooth="yes"/>
+      <point x="386" y="412" type="curve" smooth="yes" name="dh02"/>
       <point x="386" y="394"/>
       <point x="386" y="341"/>
       <point x="416" y="293" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10D_7.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10D_7.glif
index 5787671d4..60d568e78 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10D_7.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10D_7.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D7" format="1">
+<glyph name="uni10D7" format="2">
   <advance width="1233"/>
   <unicode hex="10D7"/>
   <outline>
     <contour>
-      <point x="322" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="322" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="62" y="0"/>
       <point x="7" y="178"/>
-      <point x="7" y="334" type="curve" name="dh01" smooth="yes"/>
+      <point x="7" y="334" type="curve" smooth="yes" name="dh01"/>
       <point x="7" y="398"/>
       <point x="16" y="474"/>
       <point x="27" y="529" type="curve" smooth="yes"/>
       <point x="33" y="558" type="line" smooth="yes"/>
       <point x="102" y="895"/>
       <point x="272" y="1056"/>
-      <point x="539" y="1056" type="curve" name="sv01" smooth="yes"/>
+      <point x="539" y="1056" type="curve" smooth="yes" name="sv01"/>
       <point x="636" y="1056"/>
       <point x="699" y="1035"/>
       <point x="746" y="987" type="curve"/>
       <point x="807" y="1035"/>
       <point x="867" y="1056"/>
-      <point x="954" y="1056" type="curve" name="dv02" smooth="yes"/>
+      <point x="954" y="1056" type="curve" smooth="yes" name="dv02"/>
       <point x="1141" y="1056"/>
       <point x="1240" y="961"/>
       <point x="1240" y="768" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="974" y="805" type="curve" smooth="yes"/>
       <point x="974" y="834"/>
       <point x="953" y="843"/>
-      <point x="921" y="843" type="curve" name="dv01" smooth="yes"/>
+      <point x="921" y="843" type="curve" smooth="yes" name="dv01"/>
       <point x="826" y="843" type="line" smooth="yes"/>
       <point x="811" y="843"/>
       <point x="799" y="822"/>
@@ -57,7 +57,7 @@
       <point x="446" y="0"/>
     </contour>
     <contour>
-      <point x="369" y="214" type="curve" name="sv02" smooth="yes"/>
+      <point x="369" y="214" type="curve" smooth="yes" name="sv02"/>
       <point x="438" y="214"/>
       <point x="482" y="264"/>
       <point x="501" y="356" type="curve"/>
@@ -70,7 +70,7 @@
       <point x="575" y="829" type="curve" smooth="yes"/>
       <point x="567" y="838"/>
       <point x="556" y="843"/>
-      <point x="548" y="843" type="curve" name="sv03" smooth="yes"/>
+      <point x="548" y="843" type="curve" smooth="yes" name="sv03"/>
       <point x="480" y="843" type="line" smooth="yes"/>
       <point x="405" y="843"/>
       <point x="358" y="763"/>
@@ -78,7 +78,7 @@
       <point x="279" y="358" type="line" smooth="yes"/>
       <point x="276" y="342"/>
       <point x="274" y="328"/>
-      <point x="274" y="313" type="curve" name="dh02" smooth="yes"/>
+      <point x="274" y="313" type="curve" smooth="yes" name="dh02"/>
       <point x="274" y="262"/>
       <point x="302" y="214"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10D_8.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10D_8.glif
index 6aa08ac68..b5607db7b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10D_8.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10D_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D8" format="1">
+<glyph name="uni10D8" format="2">
   <advance width="1233"/>
   <unicode hex="10D8"/>
   <outline>
@@ -19,7 +19,7 @@
       <point x="100" y="541" type="curve" smooth="yes"/>
       <point x="172" y="886"/>
       <point x="380" y="1066"/>
-      <point x="723" y="1066" type="curve" name="dv02" smooth="yes"/>
+      <point x="723" y="1066" type="curve" smooth="yes" name="dv02"/>
       <point x="906" y="1066"/>
       <point x="1021" y="1016"/>
       <point x="1086" y="932" type="curve" smooth="yes"/>
@@ -47,7 +47,7 @@
       <point x="831" y="771" type="curve" smooth="yes"/>
       <point x="803" y="827"/>
       <point x="753" y="854"/>
-      <point x="688" y="854" type="curve" name="dv01" smooth="yes"/>
+      <point x="688" y="854" type="curve" smooth="yes" name="dv01"/>
       <point x="616" y="854"/>
       <point x="547" y="820"/>
       <point x="500" y="772" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10D_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10D_9.glif
index 3b66fffe1..c5320259e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10D_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10D_9.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D9" format="1">
+<glyph name="uni10D9" format="2">
   <advance width="1233"/>
   <unicode hex="10D9"/>
   <outline>
     <contour>
-      <point x="427" y="-402" type="curve" name="hr00" smooth="yes"/>
+      <point x="427" y="-402" type="curve" smooth="yes" name="hr00"/>
       <point x="72" y="-402"/>
       <point x="-30" y="-263"/>
       <point x="-30" y="-74" type="curve" name="sh01"/>
@@ -20,29 +20,29 @@
       <point x="301" y="123" type="curve" smooth="yes"/>
       <point x="292" y="102"/>
       <point x="285" y="81"/>
-      <point x="277" y="40" type="curve" name="sh03" smooth="yes"/>
+      <point x="277" y="40" type="curve" smooth="yes" name="sh03"/>
       <point x="272" y="17"/>
       <point x="270" y="-4"/>
-      <point x="270" y="-22" type="curve" name="sh02" smooth="yes"/>
+      <point x="270" y="-22" type="curve" smooth="yes" name="sh02"/>
       <point x="270" y="-118"/>
       <point x="322" y="-192"/>
-      <point x="470" y="-192" type="curve" name="dv01" smooth="yes"/>
+      <point x="470" y="-192" type="curve" smooth="yes" name="dv01"/>
       <point x="537" y="-192"/>
       <point x="592" y="-177"/>
       <point x="635" y="-146" type="curve" smooth="yes"/>
       <point x="678" y="-114"/>
       <point x="706" y="-65"/>
       <point x="719" y="0" type="curve" smooth="yes"/>
-      <point x="728" y="47" type="line" name="sh04" smooth="yes"/>
+      <point x="728" y="47" type="line" smooth="yes" name="sh04"/>
       <point x="735" y="78"/>
       <point x="738" y="102"/>
-      <point x="738" y="141" type="curve" name="ah01" smooth="yes"/>
+      <point x="738" y="141" type="curve" smooth="yes" name="ah01"/>
       <point x="738" y="200"/>
       <point x="728" y="276"/>
-      <point x="612" y="276" type="curve" name="dv04" smooth="yes"/>
+      <point x="612" y="276" type="curve" smooth="yes" name="dv04"/>
       <point x="479" y="276" type="line"/>
       <point x="522" y="496" type="line"/>
-      <point x="655" y="496" type="line" name="dv05" smooth="yes"/>
+      <point x="655" y="496" type="line" smooth="yes" name="dv05"/>
       <point x="768" y="496"/>
       <point x="824" y="539"/>
       <point x="843" y="639" type="curve" smooth="yes"/>
@@ -67,10 +67,10 @@
       <point x="865" y="392" type="curve" name="ih01"/>
       <point x="996" y="339"/>
       <point x="1033" y="243"/>
-      <point x="1033" y="145" type="curve" name="sh05" smooth="yes"/>
+      <point x="1033" y="145" type="curve" smooth="yes" name="sh05"/>
       <point x="1033" y="118"/>
       <point x="1030" y="89"/>
-      <point x="1024" y="58" type="curve" name="sh06" smooth="yes"/>
+      <point x="1024" y="58" type="curve" smooth="yes" name="sh06"/>
       <point x="1012" y="0" type="line" smooth="yes"/>
       <point x="955" y="-276"/>
       <point x="764" y="-402"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10D_A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10D_A_.glif
index 0e3804f54..03d0154d0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10D_A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10D_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10DA" format="1">
+<glyph name="uni10DA" format="2">
   <advance width="1233"/>
   <unicode hex="10DA"/>
   <outline>
@@ -20,13 +20,13 @@
       <point x="226" y="-6" type="curve" name="ih01"/>
       <point x="154" y="112"/>
       <point x="104" y="195"/>
-      <point x="104" y="386" type="curve" name="sh01" smooth="yes"/>
+      <point x="104" y="386" type="curve" smooth="yes" name="sh01"/>
       <point x="104" y="457"/>
       <point x="111" y="525"/>
       <point x="124" y="592" type="curve" smooth="yes"/>
       <point x="188" y="913"/>
       <point x="385" y="1066"/>
-      <point x="730" y="1066" type="curve" name="dv02" smooth="yes"/>
+      <point x="730" y="1066" type="curve" smooth="yes" name="dv02"/>
       <point x="1078" y="1066"/>
       <point x="1174" y="914"/>
       <point x="1174" y="709" type="curve" smooth="yes"/>
@@ -66,22 +66,22 @@
       <point x="875" y="668" type="curve" smooth="yes"/>
       <point x="875" y="696"/>
       <point x="871" y="747"/>
-      <point x="839" y="789" type="curve" name="sh05" smooth="yes"/>
+      <point x="839" y="789" type="curve" smooth="yes" name="sh05"/>
       <point x="806" y="832"/>
       <point x="750" y="853"/>
-      <point x="681" y="853" type="curve" name="dv01" smooth="yes"/>
+      <point x="681" y="853" type="curve" smooth="yes" name="dv01"/>
       <point x="540" y="853"/>
       <point x="452" y="768"/>
       <point x="416" y="585" type="curve" smooth="yes"/>
       <point x="405" y="529"/>
       <point x="399" y="465"/>
-      <point x="399" y="409" type="curve" name="sh02" smooth="yes"/>
+      <point x="399" y="409" type="curve" smooth="yes" name="sh02"/>
       <point x="399" y="223"/>
       <point x="466" y="107"/>
       <point x="586" y="0" type="curve" smooth="yes"/>
       <point x="704" y="-105"/>
       <point x="843" y="-230"/>
-      <point x="843" y="-368" type="curve" name="sh04" smooth="yes"/>
+      <point x="843" y="-368" type="curve" smooth="yes" name="sh04"/>
       <point x="843" y="-381"/>
       <point x="842" y="-392"/>
       <point x="839" y="-402" type="curve" name="sh06"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10D_B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10D_B_.glif
index a37a83a76..dfcc0a93b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10D_B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10D_B_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10DB" format="1">
+<glyph name="uni10DB" format="2">
   <advance width="1233"/>
   <unicode hex="10DB"/>
   <outline>
     <contour>
-      <point x="493" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="493" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="202" y="0"/>
       <point x="51" y="123"/>
-      <point x="51" y="371" type="curve" name="sh01" smooth="yes"/>
+      <point x="51" y="371" type="curve" smooth="yes" name="sh01"/>
       <point x="51" y="468"/>
       <point x="73" y="628"/>
       <point x="145" y="761" type="curve" smooth="yes"/>
@@ -16,17 +16,17 @@
       <point x="450" y="1000" type="curve" smooth="yes"/>
       <point x="518" y="1019"/>
       <point x="599" y="1027"/>
-      <point x="671" y="1027" type="curve" name="dv04" smooth="yes"/>
+      <point x="671" y="1027" type="curve" smooth="yes" name="dv04"/>
       <point x="767" y="1027"/>
       <point x="839" y="1010"/>
       <point x="884" y="931" type="curve" name="iv01"/>
-      <point x="928" y="1154" type="line" name="sh02" smooth="yes"/>
+      <point x="928" y="1154" type="line" smooth="yes" name="sh02"/>
       <point x="931" y="1169"/>
       <point x="932" y="1184"/>
-      <point x="932" y="1197" type="curve" name="ah01" smooth="yes"/>
+      <point x="932" y="1197" type="curve" smooth="yes" name="ah01"/>
       <point x="932" y="1279"/>
       <point x="881" y="1341"/>
-      <point x="733" y="1341" type="curve" name="dv01" smooth="yes"/>
+      <point x="733" y="1341" type="curve" smooth="yes" name="dv01"/>
       <point x="616" y="1341"/>
       <point x="543" y="1302"/>
       <point x="530" y="1234" type="curve" smooth="yes"/>
@@ -35,19 +35,19 @@
       <point x="224" y="1234" type="line" smooth="yes"/>
       <point x="265" y="1446"/>
       <point x="451" y="1551"/>
-      <point x="772" y="1551" type="curve" name="dv02" smooth="yes"/>
+      <point x="772" y="1551" type="curve" smooth="yes" name="dv02"/>
       <point x="1122" y="1551"/>
       <point x="1235" y="1424"/>
-      <point x="1235" y="1248" type="curve" name="sh03" smooth="yes"/>
+      <point x="1235" y="1248" type="curve" smooth="yes" name="sh03"/>
       <point x="1235" y="1221"/>
       <point x="1232" y="1191"/>
-      <point x="1225" y="1158" type="curve" name="sh04" smooth="yes"/>
+      <point x="1225" y="1158" type="curve" smooth="yes" name="sh04"/>
       <point x="1092" y="471" type="line" smooth="yes"/>
       <point x="1037" y="183"/>
       <point x="835" y="0"/>
     </contour>
     <contour>
-      <point x="529" y="214" type="curve" name="sv02" smooth="yes"/>
+      <point x="529" y="214" type="curve" smooth="yes" name="sv02"/>
       <point x="665" y="214"/>
       <point x="766" y="307"/>
       <point x="806" y="512" type="curve" name="hr01"/>
@@ -59,16 +59,16 @@
       <point x="792" y="750" type="curve" smooth="yes"/>
       <point x="765" y="793"/>
       <point x="714" y="814"/>
-      <point x="639" y="814" type="curve" name="dv03" smooth="yes"/>
+      <point x="639" y="814" type="curve" smooth="yes" name="dv03"/>
       <point x="567" y="814"/>
       <point x="510" y="797"/>
       <point x="462" y="750" type="curve"/>
       <point x="407" y="699"/>
       <point x="378" y="626"/>
-      <point x="358" y="526" type="curve" name="sh06" smooth="yes"/>
+      <point x="358" y="526" type="curve" smooth="yes" name="sh06"/>
       <point x="350" y="486"/>
       <point x="345" y="450"/>
-      <point x="345" y="415" type="curve" name="sh05" smooth="yes"/>
+      <point x="345" y="415" type="curve" smooth="yes" name="sh05"/>
       <point x="345" y="308"/>
       <point x="391" y="214"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10D_C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10D_C_.glif
index d97083dc1..e0f1d5ea2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10D_C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10D_C_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10DC" format="1">
+<glyph name="uni10DC" format="2">
   <advance width="1233"/>
   <unicode hex="10DC"/>
   <outline>
     <contour>
-      <point x="499" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="499" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="163" y="0"/>
       <point x="72" y="166"/>
-      <point x="72" y="355" type="curve" name="sh01" smooth="yes"/>
+      <point x="72" y="355" type="curve" smooth="yes" name="sh01"/>
       <point x="72" y="399"/>
       <point x="77" y="448"/>
       <point x="87" y="501" type="curve" smooth="yes"/>
@@ -24,10 +24,10 @@
       <point x="472" y="961" type="line" name="ih01"/>
       <point x="568" y="1043"/>
       <point x="623" y="1067"/>
-      <point x="733" y="1067" type="curve" name="dv03" smooth="yes"/>
+      <point x="733" y="1067" type="curve" smooth="yes" name="dv03"/>
       <point x="992" y="1067"/>
       <point x="1149" y="938"/>
-      <point x="1149" y="704" type="curve" name="sh02" smooth="yes"/>
+      <point x="1149" y="704" type="curve" smooth="yes" name="sh02"/>
       <point x="1149" y="657"/>
       <point x="1144" y="597"/>
       <point x="1133" y="538" type="curve" smooth="yes"/>
@@ -36,22 +36,22 @@
     </contour>
     <contour>
       <point x="547" y="213" type="line"/>
-      <point x="550" y="213" type="line" name="sv01" smooth="yes"/>
+      <point x="550" y="213" type="line" smooth="yes" name="sv01"/>
       <point x="697" y="213"/>
       <point x="796" y="317"/>
-      <point x="837" y="530" type="curve" name="sh04" smooth="yes"/>
+      <point x="837" y="530" type="curve" smooth="yes" name="sh04"/>
       <point x="846" y="577"/>
       <point x="850" y="617"/>
-      <point x="850" y="652" type="curve" name="ah01" smooth="yes"/>
+      <point x="850" y="652" type="curve" smooth="yes" name="ah01"/>
       <point x="850" y="748"/>
       <point x="820" y="853"/>
-      <point x="677" y="853" type="curve" name="dv02" smooth="yes"/>
+      <point x="677" y="853" type="curve" smooth="yes" name="dv02"/>
       <point x="532" y="853"/>
       <point x="430" y="750"/>
-      <point x="389" y="538" type="curve" name="sh06" smooth="yes"/>
+      <point x="389" y="538" type="curve" smooth="yes" name="sh06"/>
       <point x="380" y="491"/>
       <point x="376" y="451"/>
-      <point x="376" y="415" type="curve" name="sh05" smooth="yes"/>
+      <point x="376" y="415" type="curve" smooth="yes" name="sh05"/>
       <point x="376" y="318"/>
       <point x="405" y="213"/>
       <point x="545" y="213" type="curve" name="sv02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10D_D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10D_D_.glif
index a3db2239a..60fde9253 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10D_D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10D_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10DD" format="1">
+<glyph name="uni10DD" format="2">
   <advance width="1233"/>
   <unicode hex="10DD"/>
   <outline>
@@ -7,29 +7,29 @@
       <point x="99" y="0" type="line" name="hr00"/>
       <point x="43" y="88"/>
       <point x="19" y="162"/>
-      <point x="8" y="230" type="curve" name="sh02" smooth="yes"/>
+      <point x="8" y="230" type="curve" smooth="yes" name="sh02"/>
       <point x="3" y="261"/>
       <point x="0" y="296"/>
-      <point x="0" y="319" type="curve" name="sh03" smooth="yes"/>
+      <point x="0" y="319" type="curve" smooth="yes" name="sh03"/>
       <point x="0" y="332"/>
       <point x="1" y="350"/>
-      <point x="2" y="375" type="curve" name="sh01" smooth="yes"/>
+      <point x="2" y="375" type="curve" smooth="yes" name="sh01"/>
       <point x="3" y="399"/>
       <point x="8" y="429"/>
       <point x="15" y="468" type="curve" name="sh04"/>
       <point x="31" y="549" type="line" smooth="yes"/>
       <point x="95" y="874"/>
       <point x="259" y="1056"/>
-      <point x="522" y="1056" type="curve" name="sv01" smooth="yes"/>
+      <point x="522" y="1056" type="curve" smooth="yes" name="sv01"/>
       <point x="619" y="1056"/>
       <point x="667" y="1031"/>
       <point x="708" y="985" type="curve"/>
       <point x="777" y="1042"/>
       <point x="833" y="1056"/>
-      <point x="908" y="1056" type="curve" name="dv02" smooth="yes"/>
+      <point x="908" y="1056" type="curve" smooth="yes" name="dv02"/>
       <point x="1175" y="1056"/>
       <point x="1230" y="880"/>
-      <point x="1230" y="727" type="curve" name="sh05" smooth="yes"/>
+      <point x="1230" y="727" type="curve" smooth="yes" name="sh05"/>
       <point x="1230" y="676"/>
       <point x="1224" y="620"/>
       <point x="1212" y="559" type="curve" smooth="yes"/>
@@ -44,13 +44,13 @@
       <point x="829" y="154"/>
       <point x="878" y="291"/>
       <point x="901" y="416" type="curve" smooth="yes"/>
-      <point x="949" y="663" type="line" name="sh06" smooth="yes"/>
+      <point x="949" y="663" type="line" smooth="yes" name="sh06"/>
       <point x="955" y="693"/>
       <point x="958" y="719"/>
-      <point x="958" y="742" type="curve" name="ah01" smooth="yes"/>
+      <point x="958" y="742" type="curve" smooth="yes" name="ah01"/>
       <point x="958" y="786"/>
       <point x="948" y="843"/>
-      <point x="888" y="843" type="curve" name="dv01" smooth="yes"/>
+      <point x="888" y="843" type="curve" smooth="yes" name="dv01"/>
       <point x="825" y="843" type="line" smooth="yes"/>
       <point x="805" y="843"/>
       <point x="785" y="831"/>
@@ -68,10 +68,10 @@
       <point x="410" y="844"/>
       <point x="362" y="782"/>
       <point x="339" y="663" type="curve" smooth="yes"/>
-      <point x="292" y="422" type="line" name="sh08" smooth="yes"/>
+      <point x="292" y="422" type="line" smooth="yes" name="sh08"/>
       <point x="281" y="365"/>
       <point x="278" y="319"/>
-      <point x="278" y="292" type="curve" name="sh07" smooth="yes"/>
+      <point x="278" y="292" type="curve" smooth="yes" name="sh07"/>
       <point x="278" y="243"/>
       <point x="288" y="178"/>
       <point x="319" y="113" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10D_E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10D_E_.glif
index 9f9566a9a..7d413cb4b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10D_E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10D_E_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10DE" format="1">
+<glyph name="uni10DE" format="2">
   <advance width="1233"/>
   <unicode hex="10DE"/>
   <outline>
     <contour>
-      <point x="466" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="466" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="183" y="0"/>
       <point x="23" y="111"/>
-      <point x="23" y="332" type="curve" name="sh01" smooth="yes"/>
+      <point x="23" y="332" type="curve" smooth="yes" name="sh01"/>
       <point x="23" y="368"/>
       <point x="27" y="407"/>
-      <point x="35" y="449" type="curve" name="sh02" smooth="yes"/>
+      <point x="35" y="449" type="curve" smooth="yes" name="sh02"/>
       <point x="42" y="486"/>
       <point x="50" y="517"/>
       <point x="67" y="552" type="curve" smooth="yes"/>
@@ -23,25 +23,25 @@
       <point x="359" y="556" type="curve"/>
       <point x="354" y="546"/>
       <point x="336" y="489"/>
-      <point x="328" y="446" type="curve" name="sh05" smooth="yes"/>
+      <point x="328" y="446" type="curve" smooth="yes" name="sh05"/>
       <point x="323" y="418"/>
       <point x="321" y="384"/>
-      <point x="321" y="369" type="curve" name="sh04" smooth="yes"/>
+      <point x="321" y="369" type="curve" smooth="yes" name="sh04"/>
       <point x="321" y="293"/>
       <point x="375" y="214"/>
-      <point x="509" y="214" type="curve" name="sv01" smooth="yes"/>
+      <point x="509" y="214" type="curve" smooth="yes" name="sv01"/>
       <point x="661" y="214"/>
       <point x="756" y="314"/>
-      <point x="787" y="486" type="curve" name="sh06" smooth="yes"/>
+      <point x="787" y="486" type="curve" smooth="yes" name="sh06"/>
       <point x="792" y="515"/>
       <point x="796" y="550"/>
-      <point x="796" y="577" type="curve" name="ah01" smooth="yes"/>
+      <point x="796" y="577" type="curve" smooth="yes" name="ah01"/>
       <point x="796" y="669"/>
       <point x="751" y="761"/>
-      <point x="607" y="761" type="curve" name="dv01" smooth="yes"/>
+      <point x="607" y="761" type="curve" smooth="yes" name="dv01"/>
       <point x="484" y="761" type="line"/>
       <point x="523" y="965" type="line"/>
-      <point x="667" y="965" type="line" name="dv02" smooth="yes"/>
+      <point x="667" y="965" type="line" smooth="yes" name="dv02"/>
       <point x="775" y="965"/>
       <point x="853" y="1019"/>
       <point x="873" y="1118" type="curve" smooth="yes"/>
@@ -63,7 +63,7 @@
       <point x="657" y="1545" type="line"/>
       <point x="656" y="1542"/>
       <point x="656" y="1539"/>
-      <point x="656" y="1534" type="curve" name="av02" smooth="yes"/>
+      <point x="656" y="1534" type="curve" smooth="yes" name="av02"/>
       <point x="656" y="1489"/>
       <point x="712" y="1458"/>
       <point x="824" y="1439" type="curve"/>
@@ -79,10 +79,10 @@
       <point x="938" y="851" type="curve" name="ih02"/>
       <point x="1061" y="774"/>
       <point x="1090" y="672"/>
-      <point x="1090" y="584" type="curve" name="sh03" smooth="yes"/>
+      <point x="1090" y="584" type="curve" smooth="yes" name="sh03"/>
       <point x="1090" y="552"/>
       <point x="1086" y="517"/>
-      <point x="1081" y="486" type="curve" name="sh07" smooth="yes"/>
+      <point x="1081" y="486" type="curve" smooth="yes" name="sh07"/>
       <point x="1028" y="157"/>
       <point x="801" y="0"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10D_F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10D_F_.glif
index a32897e31..621269581 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10D_F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10D_F_.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10DF" format="1">
+<glyph name="uni10DF" format="2">
   <advance width="1233"/>
   <unicode hex="10DF"/>
   <outline>
     <contour>
-      <point x="429" y="-402" type="curve" name="dv01" smooth="yes"/>
+      <point x="429" y="-402" type="curve" smooth="yes" name="dv01"/>
       <point x="88" y="-402"/>
       <point x="-13" y="-267"/>
-      <point x="-13" y="-88" type="curve" name="dh01" smooth="yes"/>
+      <point x="-13" y="-88" type="curve" smooth="yes" name="dh01"/>
       <point x="-13" y="-53"/>
       <point x="-9" y="-17"/>
       <point x="-2" y="22" type="curve" name="sh01"/>
       <point x="292" y="22" type="line" name="sv01"/>
       <point x="287" y="-1"/>
       <point x="285" y="-21"/>
-      <point x="285" y="-40" type="curve" name="dh02" smooth="yes"/>
+      <point x="285" y="-40" type="curve" smooth="yes" name="dh02"/>
       <point x="285" y="-123"/>
       <point x="327" y="-191"/>
-      <point x="470" y="-191" type="curve" name="dv02" smooth="yes"/>
+      <point x="470" y="-191" type="curve" smooth="yes" name="dv02"/>
       <point x="542" y="-191"/>
       <point x="611" y="-174"/>
       <point x="663" y="-138" type="curve" smooth="yes"/>
@@ -68,7 +68,7 @@
       <point x="449" y="493" type="curve" smooth="yes"/>
       <point x="452" y="502"/>
       <point x="454" y="512"/>
-      <point x="454" y="531" type="curve" name="hr01" smooth="yes"/>
+      <point x="454" y="531" type="curve" smooth="yes" name="hr01"/>
       <point x="454" y="656"/>
       <point x="365" y="736"/>
       <point x="146" y="781" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10E_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10E_0.glif
index 94495db96..559393cd9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10E_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10E_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E0" format="1">
+<glyph name="uni10E0" format="2">
   <advance width="1233"/>
   <unicode hex="10E0"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="83" y="0" type="line" name="hr00"/>
       <point x="23" y="76"/>
       <point x="-5" y="165"/>
-      <point x="-16" y="249" type="curve" name="sh01" smooth="yes"/>
+      <point x="-16" y="249" type="curve" smooth="yes" name="sh01"/>
       <point x="-20" y="284"/>
       <point x="-22" y="323"/>
-      <point x="-22" y="348" type="curve" name="dh01" smooth="yes"/>
+      <point x="-22" y="348" type="curve" smooth="yes" name="dh01"/>
       <point x="-22" y="379"/>
       <point x="-19" y="444"/>
       <point x="-6" y="512" type="curve" smooth="yes"/>
@@ -27,7 +27,7 @@
       <point x="684" y="998" type="curve"/>
       <point x="744" y="1045"/>
       <point x="820" y="1066"/>
-      <point x="912" y="1066" type="curve" name="dv02" smooth="yes"/>
+      <point x="912" y="1066" type="curve" smooth="yes" name="dv02"/>
       <point x="1156" y="1066"/>
       <point x="1208" y="917"/>
       <point x="1208" y="767" type="curve" smooth="yes"/>
@@ -57,7 +57,7 @@
       <point x="924" y="796" type="curve" smooth="yes"/>
       <point x="915" y="828"/>
       <point x="899" y="853"/>
-      <point x="876" y="853" type="curve" name="dv01" smooth="yes"/>
+      <point x="876" y="853" type="curve" smooth="yes" name="dv01"/>
       <point x="812" y="853" type="line" smooth="yes"/>
       <point x="785" y="853"/>
       <point x="769" y="843"/>
@@ -73,7 +73,7 @@
       <point x="530" y="843" type="curve" smooth="yes"/>
       <point x="524" y="850"/>
       <point x="512" y="853"/>
-      <point x="495" y="853" type="curve" name="sv02" smooth="yes"/>
+      <point x="495" y="853" type="curve" smooth="yes" name="sv02"/>
       <point x="426" y="853" type="line" smooth="yes"/>
       <point x="403" y="853"/>
       <point x="381" y="831"/>
@@ -84,7 +84,7 @@
       <point x="266" y="446" type="line" smooth="yes"/>
       <point x="250" y="360"/>
       <point x="243" y="324"/>
-      <point x="243" y="273" type="curve" name="dh02" smooth="yes"/>
+      <point x="243" y="273" type="curve" smooth="yes" name="dh02"/>
       <point x="243" y="255"/>
       <point x="243" y="185"/>
       <point x="278" y="113" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10E_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10E_1.glif
index cb422ba49..ed7c3dbd9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10E_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10E_1.glif
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E1" format="1">
+<glyph name="uni10E1" format="2">
   <advance width="1233"/>
   <unicode hex="10E1"/>
   <outline>
     <contour>
-      <point x="527" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="527" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="248" y="0"/>
       <point x="95" y="123"/>
-      <point x="95" y="368" type="curve" name="sh01" smooth="yes"/>
+      <point x="95" y="368" type="curve" smooth="yes" name="sh01"/>
       <point x="95" y="417"/>
       <point x="101" y="468"/>
       <point x="112" y="525" type="curve" smooth="yes"/>
       <point x="304" y="1517" type="line" name="at01"/>
       <point x="599" y="1517" type="line"/>
-      <point x="407" y="525" type="line" name="sh03" smooth="yes"/>
+      <point x="407" y="525" type="line" smooth="yes" name="sh03"/>
       <point x="399" y="485"/>
       <point x="394" y="452"/>
-      <point x="394" y="415" type="curve" name="sh02" smooth="yes"/>
+      <point x="394" y="415" type="curve" smooth="yes" name="sh02"/>
       <point x="394" y="313"/>
       <point x="432" y="214"/>
-      <point x="573" y="214" type="curve" name="sv01" smooth="yes"/>
+      <point x="573" y="214" type="curve" smooth="yes" name="sv01"/>
       <point x="718" y="214"/>
       <point x="815" y="315"/>
       <point x="858" y="530" type="curve" name="sh04"/>
       <point x="861" y="550"/>
       <point x="863" y="569"/>
-      <point x="863" y="586" type="curve" name="ah01" smooth="yes"/>
+      <point x="863" y="586" type="curve" smooth="yes" name="ah01"/>
       <point x="863" y="675"/>
       <point x="806" y="716"/>
       <point x="777" y="734" type="curve" smooth="yes"/>
@@ -53,10 +53,10 @@
       <point x="1034" y="854" type="curve" smooth="yes"/>
       <point x="1133" y="798"/>
       <point x="1161" y="704"/>
-      <point x="1161" y="621" type="curve" name="sh05" smooth="yes"/>
+      <point x="1161" y="621" type="curve" smooth="yes" name="sh05"/>
       <point x="1161" y="594"/>
       <point x="1158" y="560"/>
-      <point x="1153" y="525" type="curve" name="sh06" smooth="yes"/>
+      <point x="1153" y="525" type="curve" smooth="yes" name="sh06"/>
       <point x="1105" y="197"/>
       <point x="879" y="0"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10E_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10E_2.glif
index aad4254e6..5deb11ee1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10E_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10E_2.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E2" format="1">
+<glyph name="uni10E2" format="2">
   <advance width="1233"/>
   <unicode hex="10E2"/>
   <outline>
     <contour>
-      <point x="447" y="-403" type="curve" name="hr00" smooth="yes"/>
+      <point x="447" y="-403" type="curve" smooth="yes" name="hr00"/>
       <point x="50" y="-403"/>
       <point x="-36" y="-161"/>
-      <point x="-36" y="75" type="curve" name="sh01" smooth="yes"/>
+      <point x="-36" y="75" type="curve" smooth="yes" name="sh01"/>
       <point x="-36" y="156"/>
       <point x="-26" y="247"/>
       <point x="-9" y="332" type="curve" smooth="yes"/>
@@ -25,7 +25,7 @@
       <point x="1149" y="809" type="curve" smooth="yes"/>
       <point x="1205" y="707"/>
       <point x="1209" y="596"/>
-      <point x="1209" y="583" type="curve" name="sh02" smooth="yes"/>
+      <point x="1209" y="583" type="curve" smooth="yes" name="sh02"/>
       <point x="1209" y="468"/>
       <point x="1203" y="405"/>
       <point x="1187" y="326" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="840" y="-403"/>
     </contour>
     <contour>
-      <point x="485" y="-191" type="curve" name="dv01" smooth="yes"/>
+      <point x="485" y="-191" type="curve" smooth="yes" name="dv01"/>
       <point x="688" y="-191"/>
       <point x="843" y="-4"/>
       <point x="902" y="332" type="curve" smooth="yes"/>
       <point x="915" y="408"/>
       <point x="922" y="486"/>
-      <point x="922" y="546" type="curve" name="ah01" smooth="yes"/>
+      <point x="922" y="546" type="curve" smooth="yes" name="ah01"/>
       <point x="922" y="725"/>
       <point x="857" y="784"/>
       <point x="781" y="825" type="curve" name="ih01"/>
@@ -51,7 +51,7 @@
       <point x="283" y="332" type="curve"/>
       <point x="267" y="244"/>
       <point x="259" y="158"/>
-      <point x="259" y="97" type="curve" name="sh03" smooth="yes"/>
+      <point x="259" y="97" type="curve" smooth="yes" name="sh03"/>
       <point x="259" y="-90"/>
       <point x="334" y="-191"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10E_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10E_3.glif
index bc4762c03..6e36bf95c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10E_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10E_3.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E3" format="1">
+<glyph name="uni10E3" format="2">
   <advance width="1233"/>
   <unicode hex="10E3"/>
   <outline>
     <contour>
-      <point x="475" y="-403" type="curve" name="hr00" smooth="yes"/>
+      <point x="475" y="-403" type="curve" smooth="yes" name="hr00"/>
       <point x="196" y="-403"/>
       <point x="47" y="-295"/>
-      <point x="47" y="-74" type="curve" name="dh01" smooth="yes"/>
+      <point x="47" y="-74" type="curve" smooth="yes" name="dh01"/>
       <point x="47" y="-9"/>
       <point x="60" y="61"/>
       <point x="88" y="121" type="curve" smooth="yes"/>
@@ -23,10 +23,10 @@
       <point x="330" y="36" type="curve"/>
       <point x="326" y="13"/>
       <point x="324" y="-8"/>
-      <point x="324" y="-25" type="curve" name="dh02" smooth="yes"/>
+      <point x="324" y="-25" type="curve" smooth="yes" name="dh02"/>
       <point x="324" y="-117"/>
       <point x="385" y="-191"/>
-      <point x="518" y="-191" type="curve" name="dv01" smooth="yes"/>
+      <point x="518" y="-191" type="curve" smooth="yes" name="dv01"/>
       <point x="657" y="-191"/>
       <point x="728" y="-113"/>
       <point x="759" y="44" type="curve" smooth="yes"/>
@@ -39,7 +39,7 @@
       <point x="894" y="830" type="curve" smooth="yes"/>
       <point x="883" y="841"/>
       <point x="862" y="843"/>
-      <point x="839" y="843" type="curve" name="dv02" smooth="yes"/>
+      <point x="839" y="843" type="curve" smooth="yes" name="dv02"/>
       <point x="732" y="843"/>
       <point x="718" y="764"/>
       <point x="689" y="617" type="curve"/>
@@ -54,7 +54,7 @@
       <point x="512" y="828" type="curve" smooth="yes"/>
       <point x="502" y="838"/>
       <point x="486" y="843"/>
-      <point x="464" y="843" type="curve" name="sv01" smooth="yes"/>
+      <point x="464" y="843" type="curve" smooth="yes" name="sv01"/>
       <point x="415" y="843"/>
       <point x="385" y="814"/>
       <point x="356" y="785" type="curve" smooth="yes"/>
@@ -82,13 +82,13 @@
       <point x="459" y="1040" type="curve" smooth="yes"/>
       <point x="482" y="1052"/>
       <point x="502" y="1056"/>
-      <point x="523" y="1056" type="curve" name="sv02" smooth="yes"/>
+      <point x="523" y="1056" type="curve" smooth="yes" name="sv02"/>
       <point x="595" y="1056"/>
       <point x="629" y="1006"/>
       <point x="661" y="934" type="curve" name="iv01"/>
       <point x="741" y="1021"/>
       <point x="816" y="1056"/>
-      <point x="920" y="1056" type="curve" name="dv03" smooth="yes"/>
+      <point x="920" y="1056" type="curve" smooth="yes" name="dv03"/>
       <point x="1120" y="1056"/>
       <point x="1182" y="921"/>
       <point x="1182" y="775" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10E_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10E_4.glif
index e1dfabbdd..af308d308 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10E_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10E_4.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E4" format="1">
+<glyph name="uni10E4" format="2">
   <advance width="1233"/>
   <unicode hex="10E4"/>
   <outline>
     <contour>
-      <point x="493" y="-402" type="line" name="hr00" smooth="yes"/>
+      <point x="493" y="-402" type="line" smooth="yes" name="hr00"/>
       <point x="361" y="-402"/>
       <point x="242" y="-377"/>
       <point x="165" y="-306" type="curve" smooth="yes"/>
@@ -54,13 +54,13 @@
       <point x="40" y="629" type="line" smooth="yes"/>
       <point x="100" y="922"/>
       <point x="269" y="1066"/>
-      <point x="528" y="1066" type="curve" name="sv01" smooth="yes"/>
+      <point x="528" y="1066" type="curve" smooth="yes" name="sv01"/>
       <point x="623" y="1066"/>
       <point x="691" y="1048"/>
       <point x="739" y="997" type="curve"/>
       <point x="804" y="1043"/>
       <point x="881" y="1066"/>
-      <point x="971" y="1066" type="curve" name="dv04" smooth="yes"/>
+      <point x="971" y="1066" type="curve" smooth="yes" name="dv04"/>
       <point x="1193" y="1066"/>
       <point x="1236" y="924"/>
       <point x="1236" y="784" type="curve" smooth="yes"/>
@@ -88,7 +88,7 @@
       <point x="908" y="-317" type="curve" smooth="yes"/>
       <point x="812" y="-377"/>
       <point x="684" y="-402"/>
-      <point x="527" y="-402" type="curve" name="dv01" smooth="yes"/>
+      <point x="527" y="-402" type="curve" smooth="yes" name="dv01"/>
     </contour>
     <contour>
       <point x="380" y="280" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10E_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10E_5.glif
index 35aa8ffff..04ffd1c3a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10E_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10E_5.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E5" format="1">
+<glyph name="uni10E5" format="2">
   <advance width="1233"/>
   <unicode hex="10E5"/>
   <outline>
     <contour>
-      <point x="419" y="-402" type="curve" name="hr00" smooth="yes"/>
+      <point x="419" y="-402" type="curve" smooth="yes" name="hr00"/>
       <point x="131" y="-402"/>
       <point x="-35" y="-292"/>
       <point x="-35" y="-72" type="curve" name="dh01"/>
@@ -20,10 +20,10 @@
       <point x="276" y="36" type="curve" smooth="yes"/>
       <point x="271" y="13"/>
       <point x="269" y="-8"/>
-      <point x="269" y="-25" type="curve" name="dh02" smooth="yes"/>
+      <point x="269" y="-25" type="curve" smooth="yes" name="dh02"/>
       <point x="269" y="-119"/>
       <point x="323" y="-191"/>
-      <point x="465" y="-191" type="curve" name="dv01" smooth="yes"/>
+      <point x="465" y="-191" type="curve" smooth="yes" name="dv01"/>
       <point x="537" y="-191"/>
       <point x="598" y="-173"/>
       <point x="650" y="-121" type="curve" smooth="yes"/>
@@ -42,7 +42,7 @@
       <point x="763" y="824" type="curve" smooth="yes"/>
       <point x="735" y="844"/>
       <point x="697" y="854"/>
-      <point x="649" y="854" type="curve" name="dv02" smooth="yes"/>
+      <point x="649" y="854" type="curve" smooth="yes" name="dv02"/>
       <point x="558" y="854"/>
       <point x="500" y="822"/>
       <point x="481" y="739" type="curve" smooth="yes"/>
@@ -61,7 +61,7 @@
       <point x="200" y="739" type="curve" smooth="yes"/>
       <point x="251" y="960"/>
       <point x="413" y="1067"/>
-      <point x="658" y="1067" type="curve" name="dv03" smooth="yes"/>
+      <point x="658" y="1067" type="curve" smooth="yes" name="dv03"/>
       <point x="744" y="1067"/>
       <point x="781" y="1053"/>
       <point x="828" y="1032" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10E_6.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10E_6.glif
index 65d813fbf..09ac5b87b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10E_6.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10E_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E6" format="1">
+<glyph name="uni10E6" format="2">
   <advance width="1233"/>
   <unicode hex="10E6"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="569" y="-402" type="line" name="hr00"/>
       <point x="570" y="-400"/>
       <point x="570" y="-397"/>
-      <point x="570" y="-394" type="curve" name="av01" smooth="yes"/>
+      <point x="570" y="-394" type="curve" smooth="yes" name="av01"/>
       <point x="570" y="-351"/>
       <point x="558" y="-312"/>
       <point x="535" y="-280" type="curve" smooth="yes"/>
@@ -26,20 +26,20 @@
       <point x="208" y="-51" type="curve" name="ih01"/>
       <point x="86" y="85"/>
       <point x="25" y="226"/>
-      <point x="25" y="372" type="curve" name="dh01" smooth="yes"/>
+      <point x="25" y="372" type="curve" smooth="yes" name="dh01"/>
       <point x="25" y="405"/>
       <point x="28" y="441"/>
       <point x="35" y="476" type="curve" smooth="yes"/>
       <point x="50" y="552" type="line" smooth="yes"/>
       <point x="118" y="895"/>
       <point x="281" y="1066"/>
-      <point x="536" y="1066" type="curve" name="sv01" smooth="yes"/>
+      <point x="536" y="1066" type="curve" smooth="yes" name="sv01"/>
       <point x="617" y="1066"/>
       <point x="680" y="1048"/>
       <point x="727" y="995" type="curve"/>
       <point x="788" y="1042"/>
       <point x="865" y="1066"/>
-      <point x="958" y="1066" type="curve" name="dv02" smooth="yes"/>
+      <point x="958" y="1066" type="curve" smooth="yes" name="dv02"/>
       <point x="1202" y="1066"/>
       <point x="1251" y="903"/>
       <point x="1251" y="749" type="curve" smooth="yes"/>
@@ -69,7 +69,7 @@
       <point x="960" y="849" type="curve" smooth="yes"/>
       <point x="952" y="852"/>
       <point x="942" y="853"/>
-      <point x="930" y="853" type="curve" name="dv01" smooth="yes"/>
+      <point x="930" y="853" type="curve" smooth="yes" name="dv01"/>
       <point x="843" y="853" type="line" smooth="yes"/>
       <point x="824" y="853"/>
       <point x="810" y="846"/>
@@ -82,7 +82,7 @@
       <point x="578" y="819" type="curve" smooth="yes"/>
       <point x="578" y="844"/>
       <point x="571" y="853"/>
-      <point x="555" y="853" type="curve" name="sv02" smooth="yes"/>
+      <point x="555" y="853" type="curve" smooth="yes" name="sv02"/>
       <point x="489" y="853" type="line" smooth="yes"/>
       <point x="432" y="853"/>
       <point x="385" y="837"/>
@@ -90,7 +90,7 @@
       <point x="320" y="506" type="line" smooth="yes"/>
       <point x="312" y="465"/>
       <point x="308" y="425"/>
-      <point x="308" y="388" type="curve" name="dh02" smooth="yes"/>
+      <point x="308" y="388" type="curve" smooth="yes" name="dh02"/>
       <point x="308" y="168"/>
       <point x="446" y="80"/>
       <point x="525" y="32" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10E_7.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10E_7.glif
index 410038fa0..487ca0d45 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10E_7.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10E_7.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E7" format="1">
+<glyph name="uni10E7" format="2">
   <advance width="1233"/>
   <unicode hex="10E7"/>
   <outline>
     <contour>
-      <point x="456" y="-402" type="curve" name="dv01" smooth="yes"/>
+      <point x="456" y="-402" type="curve" smooth="yes" name="dv01"/>
       <point x="149" y="-402"/>
       <point x="-4" y="-290"/>
-      <point x="-4" y="-66" type="curve" name="dh01" smooth="yes"/>
+      <point x="-4" y="-66" type="curve" smooth="yes" name="dh01"/>
       <point x="-4" y="-27"/>
       <point x="0" y="13"/>
       <point x="9" y="54" type="curve" name="sh01"/>
       <point x="320" y="54" type="line" name="sv01"/>
       <point x="314" y="25"/>
       <point x="311" y="-2"/>
-      <point x="311" y="-25" type="curve" name="dh02" smooth="yes"/>
+      <point x="311" y="-25" type="curve" smooth="yes" name="dh02"/>
       <point x="311" y="-136"/>
       <point x="373" y="-192"/>
-      <point x="497" y="-192" type="curve" name="dv02" smooth="yes"/>
+      <point x="497" y="-192" type="curve" smooth="yes" name="dv02"/>
       <point x="626" y="-192"/>
       <point x="716" y="-132"/>
       <point x="741" y="-3" type="curve" smooth="yes"/>
@@ -27,7 +27,7 @@
       <point x="659" y="171" type="curve"/>
       <point x="610" y="148"/>
       <point x="577" y="146"/>
-      <point x="526" y="146" type="curve" name="dv03" smooth="yes"/>
+      <point x="526" y="146" type="curve" smooth="yes" name="dv03"/>
       <point x="374" y="146"/>
       <point x="251" y="174"/>
       <point x="175" y="247" type="curve"/>
@@ -61,7 +61,7 @@
       <point x="439" y="409" type="curve" smooth="yes"/>
       <point x="466" y="376"/>
       <point x="511" y="364"/>
-      <point x="580" y="364" type="curve" name="dv04" smooth="yes"/>
+      <point x="580" y="364" type="curve" smooth="yes" name="dv04"/>
       <point x="735" y="364"/>
       <point x="824" y="422"/>
       <point x="848" y="547" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10E_8.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10E_8.glif
index edb8638df..100f70b67 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10E_8.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10E_8.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E8" format="1">
+<glyph name="uni10E8" format="2">
   <advance width="1233"/>
   <unicode hex="10E8"/>
   <outline>
     <contour>
-      <point x="497" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="497" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="139" y="0"/>
       <point x="43" y="182"/>
-      <point x="43" y="377" type="curve" name="sh01" smooth="yes"/>
+      <point x="43" y="377" type="curve" smooth="yes" name="sh01"/>
       <point x="43" y="477"/>
       <point x="68" y="636"/>
       <point x="135" y="759" type="curve" smooth="yes"/>
@@ -16,17 +16,17 @@
       <point x="437" y="991" type="curve" smooth="yes"/>
       <point x="505" y="1007"/>
       <point x="589" y="1017"/>
-      <point x="650" y="1017" type="curve" name="dv03" smooth="yes"/>
+      <point x="650" y="1017" type="curve" smooth="yes" name="dv03"/>
       <point x="750" y="1017"/>
       <point x="810" y="991"/>
       <point x="868" y="917" type="curve" name="iv01"/>
-      <point x="919" y="1179" type="line" name="sh02" smooth="yes"/>
+      <point x="919" y="1179" type="line" smooth="yes" name="sh02"/>
       <point x="924" y="1204"/>
       <point x="926" y="1228"/>
-      <point x="926" y="1249" type="curve" name="ah01" smooth="yes"/>
+      <point x="926" y="1249" type="curve" smooth="yes" name="ah01"/>
       <point x="926" y="1322"/>
       <point x="899" y="1342"/>
-      <point x="836" y="1342" type="curve" name="sv01" smooth="yes"/>
+      <point x="836" y="1342" type="curve" smooth="yes" name="sv01"/>
       <point x="801" y="1342"/>
       <point x="770" y="1336"/>
       <point x="753" y="1325" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="530" y="1339" type="curve" smooth="yes"/>
       <point x="519" y="1342"/>
       <point x="499" y="1343"/>
-      <point x="487" y="1343" type="curve" name="dv01" smooth="yes"/>
+      <point x="487" y="1343" type="curve" smooth="yes" name="dv01"/>
       <point x="448" y="1343"/>
       <point x="418" y="1333"/>
       <point x="395" y="1290" type="curve" smooth="yes"/>
@@ -54,25 +54,25 @@
       <point x="72" y="1128" type="line"/>
       <point x="127" y="1409"/>
       <point x="248" y="1550"/>
-      <point x="434" y="1550" type="curve" name="hr01" smooth="yes"/>
+      <point x="434" y="1550" type="curve" smooth="yes" name="hr01"/>
       <point x="555" y="1550"/>
       <point x="630" y="1491"/>
       <point x="659" y="1386" type="curve" name="ih01"/>
       <point x="736" y="1505"/>
       <point x="821" y="1550"/>
-      <point x="951" y="1550" type="curve" name="sv02" smooth="yes"/>
+      <point x="951" y="1550" type="curve" smooth="yes" name="sv02"/>
       <point x="1126" y="1550"/>
       <point x="1237" y="1469"/>
-      <point x="1237" y="1308" type="curve" name="sh05" smooth="yes"/>
+      <point x="1237" y="1308" type="curve" smooth="yes" name="sh05"/>
       <point x="1237" y="1277"/>
       <point x="1233" y="1244"/>
-      <point x="1226" y="1208" type="curve" name="hr02" smooth="yes"/>
+      <point x="1226" y="1208" type="curve" smooth="yes" name="hr02"/>
       <point x="1087" y="490" type="line" smooth="yes"/>
       <point x="1022" y="154"/>
       <point x="826" y="0"/>
     </contour>
     <contour>
-      <point x="545" y="214" type="curve" name="sv04" smooth="yes"/>
+      <point x="545" y="214" type="curve" smooth="yes" name="sv04"/>
       <point x="678" y="214"/>
       <point x="761" y="322"/>
       <point x="800" y="526" type="curve" smooth="yes"/>
@@ -84,16 +84,16 @@
       <point x="781" y="748" type="curve"/>
       <point x="749" y="791"/>
       <point x="694" y="803"/>
-      <point x="626" y="803" type="curve" name="dv02" smooth="yes"/>
+      <point x="626" y="803" type="curve" smooth="yes" name="dv02"/>
       <point x="553" y="803"/>
       <point x="496" y="788"/>
       <point x="451" y="747" type="curve" smooth="yes"/>
       <point x="407" y="707"/>
       <point x="371" y="642"/>
-      <point x="350" y="530" type="curve" name="sh06" smooth="yes"/>
+      <point x="350" y="530" type="curve" smooth="yes" name="sh06"/>
       <point x="343" y="493"/>
       <point x="340" y="463"/>
-      <point x="340" y="424" type="curve" name="sh03" smooth="yes"/>
+      <point x="340" y="424" type="curve" smooth="yes" name="sh03"/>
       <point x="340" y="401"/>
       <point x="340" y="342"/>
       <point x="377" y="292" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10E_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10E_9.glif
index 8f2b3ab23..ccc46e767 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10E_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10E_9.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E9" format="1">
+<glyph name="uni10E9" format="2">
   <advance width="1233"/>
   <unicode hex="10E9"/>
   <outline>
     <contour>
-      <point x="247" y="1183" type="line" name="hr00" smooth="yes"/>
+      <point x="247" y="1183" type="line" smooth="yes" name="hr00"/>
       <point x="296" y="1435"/>
       <point x="466" y="1550"/>
-      <point x="761" y="1550" type="curve" name="dv02" smooth="yes"/>
+      <point x="761" y="1550" type="curve" smooth="yes" name="dv02"/>
       <point x="1044" y="1550"/>
       <point x="1134" y="1444"/>
-      <point x="1134" y="1288" type="curve" name="dh02" smooth="yes"/>
+      <point x="1134" y="1288" type="curve" smooth="yes" name="dh02"/>
       <point x="1134" y="1248"/>
       <point x="1128" y="1186"/>
       <point x="1081" y="1114" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="1139" y="824" type="curve" smooth="yes"/>
       <point x="1170" y="749"/>
       <point x="1172" y="682"/>
-      <point x="1172" y="651" type="curve" name="sh01" smooth="yes"/>
+      <point x="1172" y="651" type="curve" smooth="yes" name="sh01"/>
       <point x="1172" y="616"/>
       <point x="1168" y="581"/>
       <point x="1161" y="545" type="curve" smooth="yes"/>
@@ -35,13 +35,13 @@
       <point x="869" y="552" type="curve" smooth="yes"/>
       <point x="876" y="591"/>
       <point x="880" y="628"/>
-      <point x="880" y="664" type="curve" name="dh01" smooth="yes"/>
+      <point x="880" y="664" type="curve" smooth="yes" name="dh01"/>
       <point x="880" y="682"/>
       <point x="879" y="736"/>
       <point x="847" y="781" type="curve" smooth="yes"/>
       <point x="811" y="832"/>
       <point x="752" y="853"/>
-      <point x="685" y="853" type="curve" name="dv03" smooth="yes"/>
+      <point x="685" y="853" type="curve" smooth="yes" name="dv03"/>
       <point x="544" y="853"/>
       <point x="459" y="759"/>
       <point x="427" y="595" type="curve" smooth="yes"/>
@@ -55,7 +55,7 @@
       <point x="613" y="1033" type="curve" smooth="yes"/>
       <point x="649" y="1045"/>
       <point x="698" y="1051"/>
-      <point x="759" y="1050" type="curve" name="dv04" smooth="yes"/>
+      <point x="759" y="1050" type="curve" smooth="yes" name="dv04"/>
       <point x="815" y="1049" type="line"/>
       <point x="857" y="1191" type="line"/>
       <point x="860" y="1210"/>
@@ -63,10 +63,10 @@
       <point x="862" y="1247" type="curve" smooth="yes"/>
       <point x="862" y="1262"/>
       <point x="861" y="1292"/>
-      <point x="834" y="1315" type="curve" name="hr01" smooth="yes"/>
+      <point x="834" y="1315" type="curve" smooth="yes" name="hr01"/>
       <point x="807" y="1336"/>
       <point x="757" y="1343"/>
-      <point x="722" y="1343" type="curve" name="dv01" smooth="yes"/>
+      <point x="722" y="1343" type="curve" smooth="yes" name="dv01"/>
       <point x="622" y="1343"/>
       <point x="563" y="1295"/>
       <point x="540" y="1175" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10E_A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10E_A_.glif
index 27f56cf9e..19984f4a4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10E_A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10E_A_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10EA" format="1">
+<glyph name="uni10EA" format="2">
   <advance width="1233"/>
   <unicode hex="10EA"/>
   <outline>
     <contour>
-      <point x="486" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="486" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="81" y="-401"/>
       <point x="3" y="-191"/>
-      <point x="3" y="52" type="curve" name="dh01" smooth="yes"/>
+      <point x="3" y="52" type="curve" smooth="yes" name="dh01"/>
       <point x="3" y="136"/>
       <point x="11" y="215"/>
       <point x="30" y="307" type="curve" smooth="yes"/>
@@ -28,37 +28,37 @@
       <point x="323" y="307" type="line" smooth="yes"/>
       <point x="306" y="220"/>
       <point x="298" y="147"/>
-      <point x="298" y="80" type="curve" name="dh02" smooth="yes"/>
+      <point x="298" y="80" type="curve" smooth="yes" name="dh02"/>
       <point x="298" y="-120"/>
       <point x="371" y="-191"/>
-      <point x="525" y="-191" type="curve" name="dv02" smooth="yes"/>
+      <point x="525" y="-191" type="curve" smooth="yes" name="dv02"/>
       <point x="605" y="-191"/>
       <point x="673" y="-173"/>
       <point x="728" y="-113" type="curve" smooth="yes"/>
       <point x="773" y="-64"/>
       <point x="814" y="21"/>
-      <point x="831" y="136" type="curve" name="hr02" smooth="yes"/>
+      <point x="831" y="136" type="curve" smooth="yes" name="hr02"/>
       <point x="835" y="161"/>
       <point x="838" y="193"/>
-      <point x="838" y="212" type="curve" name="ih01" smooth="yes"/>
+      <point x="838" y="212" type="curve" smooth="yes" name="ih01"/>
       <point x="838" y="268"/>
       <point x="809" y="304"/>
-      <point x="749" y="304" type="curve" name="dv03" smooth="yes"/>
+      <point x="749" y="304" type="curve" smooth="yes" name="dv03"/>
       <point x="517" y="304" type="line"/>
       <point x="557" y="510" type="line"/>
-      <point x="782" y="510" type="line" name="dv04" smooth="yes"/>
+      <point x="782" y="510" type="line" smooth="yes" name="dv04"/>
       <point x="845" y="510"/>
       <point x="887" y="552"/>
-      <point x="904" y="644" type="curve" name="hr03" smooth="yes"/>
+      <point x="904" y="644" type="curve" smooth="yes" name="hr03"/>
       <point x="906" y="654"/>
       <point x="907" y="663"/>
-      <point x="907" y="672" type="curve" name="sh01" smooth="yes"/>
+      <point x="907" y="672" type="curve" smooth="yes" name="sh01"/>
       <point x="907" y="734"/>
       <point x="846" y="753"/>
       <point x="817" y="766" type="curve"/>
       <point x="729" y="801"/>
       <point x="686" y="855"/>
-      <point x="686" y="961" type="curve" name="dh03" smooth="yes"/>
+      <point x="686" y="961" type="curve" smooth="yes" name="dh03"/>
       <point x="686" y="989"/>
       <point x="689" y="1017"/>
       <point x="694" y="1048" type="curve" name="sh02"/>
@@ -71,7 +71,7 @@
       <point x="1036" y="884" type="curve" smooth="yes"/>
       <point x="1091" y="860"/>
       <point x="1191" y="814"/>
-      <point x="1191" y="693" type="curve" name="dh04" smooth="yes"/>
+      <point x="1191" y="693" type="curve" smooth="yes" name="dh04"/>
       <point x="1191" y="681"/>
       <point x="1190" y="665"/>
       <point x="1187" y="649" type="curve" smooth="yes"/>
@@ -80,10 +80,10 @@
       <point x="988" y="409" type="curve" name="ih02"/>
       <point x="1092" y="324"/>
       <point x="1115" y="233"/>
-      <point x="1115" y="172" type="curve" name="sh03" smooth="yes"/>
+      <point x="1115" y="172" type="curve" smooth="yes" name="sh03"/>
       <point x="1115" y="153"/>
       <point x="1113" y="129"/>
-      <point x="1110" y="105" type="curve" name="sh04" smooth="yes"/>
+      <point x="1110" y="105" type="curve" smooth="yes" name="sh04"/>
       <point x="1089" y="-53"/>
       <point x="1010" y="-187"/>
       <point x="910" y="-271" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10E_B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10E_B_.glif
index 66e42dd0d..eb81c3dee 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10E_B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10E_B_.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10EB" format="1">
+<glyph name="uni10EB" format="2">
   <advance width="1233"/>
   <unicode hex="10EB"/>
   <outline>
     <contour>
-      <point x="474" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="474" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="179" y="0"/>
       <point x="35" y="115"/>
-      <point x="35" y="355" type="curve" name="dh01" smooth="yes"/>
+      <point x="35" y="355" type="curve" smooth="yes" name="dh01"/>
       <point x="35" y="399"/>
       <point x="39" y="462"/>
       <point x="50" y="519" type="curve"/>
       <point x="111" y="876"/>
       <point x="343" y="1067"/>
-      <point x="658" y="1067" type="curve" name="dv02" smooth="yes"/>
+      <point x="658" y="1067" type="curve" smooth="yes" name="dv02"/>
       <point x="718" y="1067"/>
       <point x="765" y="1060"/>
       <point x="806" y="1040" type="curve" smooth="yes"/>
@@ -27,7 +27,7 @@
       <point x="815" y="0"/>
     </contour>
     <contour>
-      <point x="511" y="214" type="curve" name="sv01" smooth="yes"/>
+      <point x="511" y="214" type="curve" smooth="yes" name="sv01"/>
       <point x="647" y="214"/>
       <point x="753" y="300"/>
       <point x="794" y="510" type="curve"/>
@@ -39,13 +39,13 @@
       <point x="783" y="775" type="curve" smooth="yes"/>
       <point x="752" y="832"/>
       <point x="696" y="854"/>
-      <point x="636" y="854" type="curve" name="dv01" smooth="yes"/>
+      <point x="636" y="854" type="curve" smooth="yes" name="dv01"/>
       <point x="492" y="854"/>
       <point x="396" y="729"/>
       <point x="360" y="520" type="curve" smooth="yes"/>
       <point x="352" y="473"/>
       <point x="347" y="424"/>
-      <point x="347" y="389" type="curve" name="dh02" smooth="yes"/>
+      <point x="347" y="389" type="curve" smooth="yes" name="dh02"/>
       <point x="347" y="272"/>
       <point x="402" y="214"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10E_C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10E_C_.glif
index e874e3502..7d15ae623 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10E_C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10E_C_.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10EC" format="1">
+<glyph name="uni10EC" format="2">
   <advance width="1233"/>
   <unicode hex="10EC"/>
   <outline>
     <contour>
-      <point x="449" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="449" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="255" y="0"/>
       <point x="150" y="57"/>
       <point x="92" y="147" type="curve" smooth="yes"/>
       <point x="36" y="235"/>
       <point x="32" y="337"/>
-      <point x="32" y="377" type="curve" name="sh01" smooth="yes"/>
+      <point x="32" y="377" type="curve" smooth="yes" name="sh01"/>
       <point x="32" y="428"/>
       <point x="37" y="483"/>
       <point x="48" y="540" type="curve" smooth="yes"/>
       <point x="186" y="1248" type="line" smooth="yes"/>
       <point x="207" y="1357"/>
       <point x="263" y="1428"/>
-      <point x="324" y="1473" type="curve" name="sh03" smooth="yes"/>
+      <point x="324" y="1473" type="curve" smooth="yes" name="sh03"/>
       <point x="396" y="1525"/>
       <point x="483" y="1550"/>
-      <point x="570" y="1550" type="curve" name="dv02" smooth="yes"/>
+      <point x="570" y="1550" type="curve" smooth="yes" name="dv02"/>
       <point x="633" y="1550"/>
       <point x="685" y="1536"/>
       <point x="726" y="1509" type="curve" smooth="yes"/>
@@ -29,7 +29,7 @@
       <point x="815" y="1386" type="curve" name="ih01"/>
       <point x="888" y="1495"/>
       <point x="984" y="1550"/>
-      <point x="1103" y="1550" type="curve" name="sh05" smooth="yes"/>
+      <point x="1103" y="1550" type="curve" smooth="yes" name="sh05"/>
       <point x="1248" y="1550"/>
       <point x="1320" y="1466"/>
       <point x="1320" y="1298" type="curve" smooth="yes"/>
@@ -48,7 +48,7 @@
       <point x="1020" y="1330" type="curve" smooth="yes"/>
       <point x="1009" y="1339"/>
       <point x="996" y="1343"/>
-      <point x="969" y="1343" type="curve" name="sv02" smooth="yes"/>
+      <point x="969" y="1343" type="curve" smooth="yes" name="sv02"/>
       <point x="936" y="1343"/>
       <point x="911" y="1337"/>
       <point x="896" y="1326" type="curve" smooth="yes"/>
@@ -66,7 +66,7 @@
       <point x="697" y="1325" type="curve" smooth="yes"/>
       <point x="683" y="1336"/>
       <point x="658" y="1342"/>
-      <point x="613" y="1342" type="curve" name="dv01" smooth="yes"/>
+      <point x="613" y="1342" type="curve" smooth="yes" name="dv01"/>
       <point x="574" y="1342"/>
       <point x="545" y="1338"/>
       <point x="522" y="1322" type="curve" smooth="yes"/>
@@ -76,42 +76,42 @@
       <point x="414" y="917" type="line" name="ih02"/>
       <point x="500" y="985"/>
       <point x="569" y="1017"/>
-      <point x="694" y="1017" type="curve" name="dv04" smooth="yes"/>
+      <point x="694" y="1017" type="curve" smooth="yes" name="dv04"/>
       <point x="831" y="1017"/>
       <point x="953" y="980"/>
       <point x="1025" y="897" type="curve"/>
       <point x="1094" y="820"/>
       <point x="1096" y="725"/>
-      <point x="1096" y="691" type="curve" name="sh04" smooth="yes"/>
+      <point x="1096" y="691" type="curve" smooth="yes" name="sh04"/>
       <point x="1096" y="636"/>
       <point x="1091" y="575"/>
-      <point x="1080" y="515" type="curve" name="hr02" smooth="yes"/>
+      <point x="1080" y="515" type="curve" smooth="yes" name="hr02"/>
       <point x="1019" y="184"/>
       <point x="802" y="0"/>
     </contour>
     <contour>
-      <point x="492" y="213" type="curve" name="sv04" smooth="yes"/>
+      <point x="492" y="213" type="curve" smooth="yes" name="sv04"/>
       <point x="643" y="213"/>
       <point x="743" y="295"/>
-      <point x="786" y="510" type="curve" name="sh06" smooth="yes"/>
+      <point x="786" y="510" type="curve" smooth="yes" name="sh06"/>
       <point x="795" y="557"/>
       <point x="799" y="592"/>
-      <point x="799" y="631" type="curve" name="ah01" smooth="yes"/>
+      <point x="799" y="631" type="curve" smooth="yes" name="ah01"/>
       <point x="799" y="658"/>
       <point x="797" y="698"/>
       <point x="773" y="737" type="curve" smooth="yes"/>
       <point x="744" y="784"/>
       <point x="697" y="803"/>
-      <point x="618" y="803" type="curve" name="dv03" smooth="yes"/>
+      <point x="618" y="803" type="curve" smooth="yes" name="dv03"/>
       <point x="558" y="803"/>
       <point x="496" y="792"/>
       <point x="445" y="748" type="curve" smooth="yes"/>
       <point x="393" y="703"/>
       <point x="361" y="633"/>
-      <point x="340" y="526" type="curve" name="sh07" smooth="yes"/>
+      <point x="340" y="526" type="curve" smooth="yes" name="sh07"/>
       <point x="332" y="486"/>
       <point x="328" y="453"/>
-      <point x="328" y="414" type="curve" name="sh02" smooth="yes"/>
+      <point x="328" y="414" type="curve" smooth="yes" name="sh02"/>
       <point x="328" y="395"/>
       <point x="329" y="342"/>
       <point x="353" y="292" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10E_D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10E_D_.glif
index c6ff6bac8..f69542b4c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10E_D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10E_D_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10ED" format="1">
+<glyph name="uni10ED" format="2">
   <advance width="1233"/>
   <unicode hex="10ED"/>
   <outline>
     <contour>
-      <point x="426" y="-402" type="curve" name="hr00" smooth="yes"/>
+      <point x="426" y="-402" type="curve" smooth="yes" name="hr00"/>
       <point x="130" y="-402"/>
       <point x="-18" y="-299"/>
-      <point x="-18" y="-92" type="curve" name="sh01" smooth="yes"/>
+      <point x="-18" y="-92" type="curve" smooth="yes" name="sh01"/>
       <point x="-18" y="-55"/>
       <point x="-13" y="-10"/>
-      <point x="-6" y="19" type="curve" name="sh02" smooth="yes"/>
+      <point x="-6" y="19" type="curve" smooth="yes" name="sh02"/>
       <point x="10" y="92"/>
       <point x="54" y="161"/>
       <point x="173" y="272" type="curve"/>
@@ -20,19 +20,19 @@
       <point x="309" y="69" type="curve" smooth="yes"/>
       <point x="294" y="42"/>
       <point x="289" y="23"/>
-      <point x="284" y="0" type="curve" name="sh04" smooth="yes"/>
+      <point x="284" y="0" type="curve" smooth="yes" name="sh04"/>
       <point x="280" y="-19"/>
       <point x="278" y="-37"/>
-      <point x="278" y="-52" type="curve" name="sh03" smooth="yes"/>
+      <point x="278" y="-52" type="curve" smooth="yes" name="sh03"/>
       <point x="278" y="-132"/>
       <point x="331" y="-193"/>
-      <point x="467" y="-193" type="curve" name="dv01" smooth="yes"/>
+      <point x="467" y="-193" type="curve" smooth="yes" name="dv01"/>
       <point x="611" y="-193"/>
       <point x="713" y="-123"/>
       <point x="737" y="18" type="curve" name="sh05"/>
       <point x="740" y="30"/>
       <point x="741" y="41"/>
-      <point x="741" y="52" type="curve" name="ah01" smooth="yes"/>
+      <point x="741" y="52" type="curve" smooth="yes" name="ah01"/>
       <point x="741" y="116"/>
       <point x="700" y="182"/>
       <point x="604" y="238" type="curve"/>
@@ -74,10 +74,10 @@
       <point x="920" y="336" type="curve"/>
       <point x="1018" y="259"/>
       <point x="1037" y="172"/>
-      <point x="1037" y="101" type="curve" name="sh06" smooth="yes"/>
+      <point x="1037" y="101" type="curve" smooth="yes" name="sh06"/>
       <point x="1037" y="73"/>
       <point x="1034" y="47"/>
-      <point x="1029" y="18" type="curve" name="sh07" smooth="yes"/>
+      <point x="1029" y="18" type="curve" smooth="yes" name="sh07"/>
       <point x="981" y="-255"/>
       <point x="777" y="-402"/>
     </contour>
@@ -85,16 +85,16 @@
       <point x="537" y="578" type="curve" smooth="yes"/>
       <point x="605" y="578"/>
       <point x="711" y="661"/>
-      <point x="730" y="760" type="curve" name="sh08" smooth="yes"/>
+      <point x="730" y="760" type="curve" smooth="yes" name="sh08"/>
       <point x="733" y="771"/>
       <point x="734" y="782"/>
-      <point x="734" y="795" type="curve" name="sh09" smooth="yes"/>
+      <point x="734" y="795" type="curve" smooth="yes" name="sh09"/>
       <point x="734" y="819"/>
       <point x="729" y="853"/>
       <point x="706" y="885" type="curve"/>
       <point x="679" y="918"/>
       <point x="647" y="935"/>
-      <point x="614" y="935" type="curve" name="dv02" smooth="yes"/>
+      <point x="614" y="935" type="curve" smooth="yes" name="dv02"/>
       <point x="579" y="935"/>
       <point x="536" y="917"/>
       <point x="497" y="885" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10E_E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10E_E_.glif
index e84143391..be3bcfd21 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10E_E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10E_E_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10EE" format="1">
+<glyph name="uni10EE" format="2">
   <advance width="1233"/>
   <unicode hex="10EE"/>
   <outline>
     <contour>
-      <point x="526" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="526" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="347" y="0"/>
       <point x="230" y="49"/>
       <point x="159" y="148" type="curve"/>
       <point x="92" y="239"/>
       <point x="92" y="346"/>
-      <point x="92" y="375" type="curve" name="sh01" smooth="yes"/>
+      <point x="92" y="375" type="curve" smooth="yes" name="sh01"/>
       <point x="92" y="447"/>
       <point x="98" y="500"/>
       <point x="110" y="563" type="curve" smooth="yes"/>
@@ -19,10 +19,10 @@
       <point x="477" y="954" type="line" name="ih01"/>
       <point x="567" y="1044"/>
       <point x="636" y="1067"/>
-      <point x="747" y="1067" type="curve" name="dv02" smooth="yes"/>
+      <point x="747" y="1067" type="curve" smooth="yes" name="dv02"/>
       <point x="1006" y="1067"/>
       <point x="1159" y="941"/>
-      <point x="1159" y="696" type="curve" name="sh02" smooth="yes"/>
+      <point x="1159" y="696" type="curve" smooth="yes" name="sh02"/>
       <point x="1159" y="648"/>
       <point x="1153" y="597"/>
       <point x="1142" y="537" type="curve"/>
@@ -30,22 +30,22 @@
       <point x="869" y="0"/>
     </contour>
     <contour>
-      <point x="558" y="214" type="curve" name="sv01" smooth="yes"/>
+      <point x="558" y="214" type="curve" smooth="yes" name="sv01"/>
       <point x="700" y="214"/>
       <point x="812" y="325"/>
-      <point x="849" y="530" type="curve" name="sh03" smooth="yes"/>
+      <point x="849" y="530" type="curve" smooth="yes" name="sh03"/>
       <point x="857" y="575"/>
       <point x="861" y="626"/>
-      <point x="861" y="657" type="curve" name="ah01" smooth="yes"/>
+      <point x="861" y="657" type="curve" smooth="yes" name="ah01"/>
       <point x="861" y="746"/>
       <point x="825" y="853"/>
-      <point x="686" y="853" type="curve" name="dv01" smooth="yes"/>
+      <point x="686" y="853" type="curve" smooth="yes" name="dv01"/>
       <point x="550" y="853"/>
       <point x="437" y="751"/>
-      <point x="397" y="530" type="curve" name="sh05" smooth="yes"/>
+      <point x="397" y="530" type="curve" smooth="yes" name="sh05"/>
       <point x="389" y="486"/>
       <point x="385" y="435"/>
-      <point x="385" y="406" type="curve" name="sh04" smooth="yes"/>
+      <point x="385" y="406" type="curve" smooth="yes" name="sh04"/>
       <point x="385" y="319"/>
       <point x="419" y="214"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10E_F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10E_F_.glif
index bbbc34901..088477d9c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10E_F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10E_F_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10EF" format="1">
+<glyph name="uni10EF" format="2">
   <advance width="1233"/>
   <unicode hex="10EF"/>
   <outline>
     <contour>
-      <point x="425" y="-402" type="curve" name="hr00" smooth="yes"/>
+      <point x="425" y="-402" type="curve" smooth="yes" name="hr00"/>
       <point x="130" y="-402"/>
       <point x="-10" y="-294"/>
-      <point x="-10" y="-75" type="curve" name="dh01" smooth="yes"/>
+      <point x="-10" y="-75" type="curve" smooth="yes" name="dh01"/>
       <point x="-10" y="-2"/>
       <point x="6" y="98"/>
       <point x="66" y="202" type="curve" smooth="yes"/>
@@ -20,23 +20,23 @@
       <point x="297" y="40" type="curve" smooth="yes"/>
       <point x="293" y="17"/>
       <point x="290" y="-3"/>
-      <point x="290" y="-27" type="curve" name="dh02" smooth="yes"/>
+      <point x="290" y="-27" type="curve" smooth="yes" name="dh02"/>
       <point x="290" y="-116"/>
       <point x="332" y="-191"/>
-      <point x="464" y="-191" type="curve" name="dv01" smooth="yes"/>
+      <point x="464" y="-191" type="curve" smooth="yes" name="dv01"/>
       <point x="468" y="-191" type="line" smooth="yes"/>
       <point x="613" y="-191"/>
       <point x="716" y="-123"/>
       <point x="745" y="25" type="curve" name="dh04"/>
       <point x="748" y="44"/>
       <point x="750" y="62"/>
-      <point x="750" y="79" type="curve" name="sh01" smooth="yes"/>
+      <point x="750" y="79" type="curve" smooth="yes" name="sh01"/>
       <point x="750" y="150"/>
       <point x="714" y="227"/>
       <point x="621" y="279" type="curve"/>
       <point x="508" y="367"/>
       <point x="473" y="447"/>
-      <point x="473" y="517" type="curve" name="dh03" smooth="yes"/>
+      <point x="473" y="517" type="curve" smooth="yes" name="dh03"/>
       <point x="473" y="528"/>
       <point x="474" y="541"/>
       <point x="476" y="554" type="curve"/>
@@ -59,7 +59,7 @@
       <point x="914" y="397" type="curve"/>
       <point x="1017" y="307"/>
       <point x="1047" y="205"/>
-      <point x="1047" y="122" type="curve" name="sh04" smooth="yes"/>
+      <point x="1047" y="122" type="curve" smooth="yes" name="sh04"/>
       <point x="1047" y="95"/>
       <point x="1045" y="53"/>
       <point x="1038" y="18" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10F_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10F_0.glif
index 17fde0f4c..0c1cb9db2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10F_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10F_0.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F0" format="1">
+<glyph name="uni10F0" format="2">
   <advance width="1233"/>
   <unicode hex="10F0"/>
   <outline>
     <contour>
-      <point x="475" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="475" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="172" y="0"/>
       <point x="20" y="106"/>
-      <point x="20" y="317" type="curve" name="sh01" smooth="yes"/>
+      <point x="20" y="317" type="curve" smooth="yes" name="sh01"/>
       <point x="20" y="352"/>
       <point x="24" y="395"/>
-      <point x="31" y="432" type="curve" name="sh02" smooth="yes"/>
+      <point x="31" y="432" type="curve" smooth="yes" name="sh02"/>
       <point x="57" y="566" type="line"/>
       <point x="350" y="566" type="line"/>
-      <point x="324" y="432" type="line" name="sh04" smooth="yes"/>
+      <point x="324" y="432" type="line" smooth="yes" name="sh04"/>
       <point x="320" y="409"/>
       <point x="318" y="388"/>
-      <point x="318" y="369" type="curve" name="sh03" smooth="yes"/>
+      <point x="318" y="369" type="curve" smooth="yes" name="sh03"/>
       <point x="318" y="275"/>
       <point x="360" y="214"/>
-      <point x="513" y="214" type="curve" name="sv01" smooth="yes"/>
+      <point x="513" y="214" type="curve" smooth="yes" name="sv01"/>
       <point x="660" y="214"/>
       <point x="734" y="270"/>
-      <point x="761" y="370" type="curve" name="sh05" smooth="yes"/>
+      <point x="761" y="370" type="curve" smooth="yes" name="sh05"/>
       <point x="766" y="389"/>
       <point x="770" y="412"/>
-      <point x="770" y="436" type="curve" name="ah01" smooth="yes"/>
+      <point x="770" y="436" type="curve" smooth="yes" name="ah01"/>
       <point x="770" y="471"/>
       <point x="762" y="488"/>
       <point x="747" y="495" type="curve" smooth="yes"/>
       <point x="741" y="498"/>
       <point x="733" y="499"/>
-      <point x="724" y="499" type="curve" name="dv01" smooth="yes"/>
+      <point x="724" y="499" type="curve" smooth="yes" name="dv01"/>
       <point x="445" y="499" type="line"/>
       <point x="488" y="718" type="line"/>
-      <point x="768" y="718" type="line" name="sh06" smooth="yes"/>
+      <point x="768" y="718" type="line" smooth="yes" name="sh06"/>
       <point x="794" y="718"/>
       <point x="831" y="724"/>
       <point x="844" y="795" type="curve" smooth="yes"/>
@@ -46,10 +46,10 @@
       <point x="836" y="855" type="curve" smooth="yes"/>
       <point x="825" y="864"/>
       <point x="809" y="865"/>
-      <point x="796" y="865" type="curve" name="dv02" smooth="yes"/>
+      <point x="796" y="865" type="curve" smooth="yes" name="dv02"/>
       <point x="516" y="865" type="line"/>
       <point x="559" y="1086" type="line"/>
-      <point x="837" y="1086" type="line" name="dv03" smooth="yes"/>
+      <point x="837" y="1086" type="line" smooth="yes" name="dv03"/>
       <point x="848" y="1086"/>
       <point x="862" y="1088"/>
       <point x="875" y="1097" type="curve" smooth="yes"/>
@@ -74,10 +74,10 @@
       <point x="700" y="1550" type="line"/>
       <point x="699" y="1548"/>
       <point x="699" y="1545"/>
-      <point x="699" y="1541" type="curve" name="av02" smooth="yes"/>
+      <point x="699" y="1541" type="curve" smooth="yes" name="av02"/>
       <point x="699" y="1513"/>
       <point x="729" y="1490"/>
-      <point x="772" y="1471" type="curve" name="sh07" smooth="yes"/>
+      <point x="772" y="1471" type="curve" smooth="yes" name="sh07"/>
       <point x="837" y="1443"/>
       <point x="908" y="1437"/>
       <point x="955" y="1430" type="curve" smooth="yes"/>
@@ -101,10 +101,10 @@
       <point x="959" y="604" type="curve" name="ih02"/>
       <point x="1028" y="549"/>
       <point x="1063" y="487"/>
-      <point x="1063" y="420" type="curve" name="sh08" smooth="yes"/>
+      <point x="1063" y="420" type="curve" smooth="yes" name="sh08"/>
       <point x="1063" y="408"/>
       <point x="1062" y="394"/>
-      <point x="1059" y="381" type="curve" name="sh09" smooth="yes"/>
+      <point x="1059" y="381" type="curve" smooth="yes" name="sh09"/>
       <point x="1012" y="132"/>
       <point x="818" y="0"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10F_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10F_1.glif
index 78010857b..095724a0e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10F_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10F_1.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F1" format="1">
+<glyph name="uni10F1" format="2">
   <advance width="1233"/>
   <unicode hex="10F1"/>
   <outline>
     <contour>
-      <point x="452" y="-402" type="curve" name="dv01" smooth="yes"/>
+      <point x="452" y="-402" type="curve" smooth="yes" name="dv01"/>
       <point x="127" y="-402"/>
       <point x="-31" y="-282"/>
-      <point x="-31" y="-54" type="curve" name="dh01" smooth="yes"/>
+      <point x="-31" y="-54" type="curve" smooth="yes" name="dh01"/>
       <point x="-31" y="-14"/>
       <point x="-26" y="36"/>
       <point x="-18" y="84" type="curve" smooth="yes"/>
@@ -16,17 +16,17 @@
       <point x="144" y="629" type="curve" smooth="yes"/>
       <point x="179" y="722"/>
       <point x="198" y="803"/>
-      <point x="201" y="870" type="curve" name="sh01" smooth="yes"/>
+      <point x="201" y="870" type="curve" smooth="yes" name="sh01"/>
       <point x="202" y="899"/>
       <point x="203" y="918"/>
-      <point x="203" y="942" type="curve" name="ih01" smooth="yes"/>
+      <point x="203" y="942" type="curve" smooth="yes" name="ih01"/>
       <point x="203" y="989"/>
       <point x="199" y="1064"/>
       <point x="186" y="1177" type="curve"/>
       <point x="460" y="1177" type="line" name="sh03"/>
       <point x="473" y="1077"/>
       <point x="474" y="1018"/>
-      <point x="474" y="987" type="curve" name="sh02" smooth="yes"/>
+      <point x="474" y="987" type="curve" smooth="yes" name="sh02"/>
       <point x="474" y="926"/>
       <point x="470" y="854"/>
       <point x="451" y="763" type="curve" smooth="yes"/>
@@ -38,10 +38,10 @@
       <point x="265" y="76" type="curve" smooth="yes"/>
       <point x="260" y="47"/>
       <point x="257" y="21"/>
-      <point x="257" y="-4" type="curve" name="dh02" smooth="yes"/>
+      <point x="257" y="-4" type="curve" smooth="yes" name="dh02"/>
       <point x="257" y="-111"/>
       <point x="312" y="-193"/>
-      <point x="495" y="-193" type="curve" name="dv02" smooth="yes"/>
+      <point x="495" y="-193" type="curve" smooth="yes" name="dv02"/>
       <point x="627" y="-193"/>
       <point x="673" y="-150"/>
       <point x="691" y="-79" type="curve" smooth="yes"/>
@@ -50,10 +50,10 @@
       <point x="700" y="-5" type="curve" smooth="yes"/>
       <point x="700" y="46"/>
       <point x="684" y="71"/>
-      <point x="651" y="71" type="curve" name="dv03" smooth="yes"/>
+      <point x="651" y="71" type="curve" smooth="yes" name="dv03"/>
       <point x="464" y="71" type="line" name="sh04"/>
       <point x="505" y="282" type="line"/>
-      <point x="692" y="282" type="line" name="dv04" smooth="yes"/>
+      <point x="692" y="282" type="line" smooth="yes" name="dv04"/>
       <point x="745" y="282"/>
       <point x="768" y="312"/>
       <point x="780" y="372" type="curve" smooth="yes"/>
@@ -65,10 +65,10 @@
       <point x="763" y="485" type="curve" smooth="yes"/>
       <point x="755" y="488"/>
       <point x="745" y="489"/>
-      <point x="733" y="489" type="curve" name="dv07" smooth="yes"/>
+      <point x="733" y="489" type="curve" smooth="yes" name="dv07"/>
       <point x="545" y="489" type="line"/>
       <point x="586" y="696" type="line"/>
-      <point x="774" y="696" type="line" name="dv08" smooth="yes"/>
+      <point x="774" y="696" type="line" smooth="yes" name="dv08"/>
       <point x="822" y="696"/>
       <point x="848" y="725"/>
       <point x="864" y="805" type="curve" smooth="yes"/>
@@ -80,10 +80,10 @@
       <point x="860" y="878" type="curve" smooth="yes"/>
       <point x="851" y="890"/>
       <point x="834" y="891"/>
-      <point x="811" y="891" type="curve" name="dv05" smooth="yes"/>
+      <point x="811" y="891" type="curve" smooth="yes" name="dv05"/>
       <point x="624" y="891" type="line"/>
       <point x="665" y="1105" type="line"/>
-      <point x="852" y="1105" type="line" name="dv06" smooth="yes"/>
+      <point x="852" y="1105" type="line" smooth="yes" name="dv06"/>
       <point x="898" y="1105"/>
       <point x="928" y="1137"/>
       <point x="941" y="1201" type="curve"/>
@@ -93,7 +93,7 @@
       <point x="822" y="1271" type="curve"/>
       <point x="729" y="1295"/>
       <point x="683" y="1359"/>
-      <point x="683" y="1463" type="curve" name="dh03" smooth="yes"/>
+      <point x="683" y="1463" type="curve" smooth="yes" name="dh03"/>
       <point x="683" y="1490"/>
       <point x="686" y="1519"/>
       <point x="692" y="1550" type="curve" name="sh05"/>
@@ -112,7 +112,7 @@
       <point x="1062" y="1003" type="curve" name="iv01"/>
       <point x="1142" y="963"/>
       <point x="1156" y="903"/>
-      <point x="1156" y="856" type="curve" name="hr01" smooth="yes"/>
+      <point x="1156" y="856" type="curve" smooth="yes" name="hr01"/>
       <point x="1156" y="837"/>
       <point x="1154" y="822"/>
       <point x="1151" y="805" type="curve" smooth="yes"/>
@@ -130,10 +130,10 @@
       <point x="887" y="175" type="curve" name="ih03"/>
       <point x="956" y="132"/>
       <point x="986" y="71"/>
-      <point x="986" y="-9" type="curve" name="dh04" smooth="yes"/>
+      <point x="986" y="-9" type="curve" smooth="yes" name="dh04"/>
       <point x="986" y="-30"/>
       <point x="984" y="-55"/>
-      <point x="979" y="-79" type="curve" name="hr02" smooth="yes"/>
+      <point x="979" y="-79" type="curve" smooth="yes" name="hr02"/>
       <point x="936" y="-290"/>
       <point x="763" y="-402"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10F_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10F_2.glif
index 78471e87f..4836d7f83 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10F_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10F_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F2" format="1">
+<glyph name="uni10F2" format="2">
   <advance width="1233"/>
   <unicode hex="10F2"/>
   <outline>
@@ -10,16 +10,16 @@
       <point x="241" y="64" type="curve" name="ih01"/>
       <point x="97" y="181"/>
       <point x="72" y="316"/>
-      <point x="72" y="407" type="curve" name="sh01" smooth="yes"/>
+      <point x="72" y="407" type="curve" smooth="yes" name="sh01"/>
       <point x="72" y="448"/>
       <point x="76" y="494"/>
-      <point x="83" y="531" type="curve" name="sh03" smooth="yes"/>
+      <point x="83" y="531" type="curve" smooth="yes" name="sh03"/>
       <point x="139" y="872"/>
       <point x="364" y="1066"/>
-      <point x="711" y="1066" type="curve" name="dv02" smooth="yes"/>
+      <point x="711" y="1066" type="curve" smooth="yes" name="dv02"/>
       <point x="994" y="1066"/>
       <point x="1139" y="940"/>
-      <point x="1139" y="695" type="curve" name="sh04" smooth="yes"/>
+      <point x="1139" y="695" type="curve" smooth="yes" name="sh04"/>
       <point x="1139" y="642"/>
       <point x="1133" y="580"/>
       <point x="1122" y="531" type="curve" smooth="yes"/>
@@ -42,19 +42,19 @@
       <point x="531" y="195" type="curve"/>
       <point x="686" y="244"/>
       <point x="792" y="347"/>
-      <point x="829" y="530" type="curve" name="sh05" smooth="yes"/>
+      <point x="829" y="530" type="curve" smooth="yes" name="sh05"/>
       <point x="838" y="575"/>
       <point x="842" y="616"/>
-      <point x="842" y="648" type="curve" name="ah01" smooth="yes"/>
+      <point x="842" y="648" type="curve" smooth="yes" name="ah01"/>
       <point x="842" y="750"/>
       <point x="800" y="853"/>
-      <point x="667" y="853" type="curve" name="dv01" smooth="yes"/>
+      <point x="667" y="853" type="curve" smooth="yes" name="dv01"/>
       <point x="521" y="853"/>
       <point x="409" y="729"/>
       <point x="377" y="530" type="curve" name="sh06"/>
       <point x="370" y="493"/>
       <point x="368" y="454"/>
-      <point x="368" y="427" type="curve" name="sh02" smooth="yes"/>
+      <point x="368" y="427" type="curve" smooth="yes" name="sh02"/>
       <point x="368" y="328"/>
       <point x="411" y="238"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10F_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10F_3.glif
index 7ec3f2fc8..76207caed 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10F_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10F_3.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F3" format="1">
+<glyph name="uni10F3" format="2">
   <advance width="1233"/>
   <unicode hex="10F3"/>
   <outline>
     <contour>
-      <point x="449" y="-191" type="curve" name="dv02" smooth="yes"/>
+      <point x="449" y="-191" type="curve" smooth="yes" name="dv02"/>
       <point x="594" y="-191"/>
       <point x="690" y="-116"/>
-      <point x="723" y="31" type="curve" name="sh01" smooth="yes"/>
+      <point x="723" y="31" type="curve" smooth="yes" name="sh01"/>
       <point x="730" y="62" type="line" smooth="yes"/>
       <point x="734" y="84"/>
       <point x="736" y="104"/>
-      <point x="736" y="122" type="curve" name="ah01" smooth="yes"/>
+      <point x="736" y="122" type="curve" smooth="yes" name="ah01"/>
       <point x="736" y="223"/>
       <point x="670" y="294"/>
-      <point x="502" y="294" type="curve" name="dv03" smooth="yes"/>
+      <point x="502" y="294" type="curve" smooth="yes" name="dv03"/>
       <point x="324" y="294" type="line"/>
       <point x="362" y="489" type="line"/>
-      <point x="536" y="489" type="line" name="dv04" smooth="yes"/>
+      <point x="536" y="489" type="line" smooth="yes" name="dv04"/>
       <point x="688" y="489"/>
       <point x="786" y="619"/>
       <point x="829" y="847" type="curve"/>
@@ -31,17 +31,17 @@
       <point x="844" y="418" type="curve" name="hr02"/>
       <point x="996" y="338"/>
       <point x="1029" y="227"/>
-      <point x="1029" y="134" type="curve" name="sh02" smooth="yes"/>
+      <point x="1029" y="134" type="curve" smooth="yes" name="sh02"/>
       <point x="1029" y="105"/>
       <point x="1026" y="76"/>
-      <point x="1021" y="47" type="curve" name="sh03" smooth="yes"/>
+      <point x="1021" y="47" type="curve" smooth="yes" name="sh03"/>
       <point x="1015" y="16" type="line" smooth="yes"/>
       <point x="959" y="-272"/>
       <point x="677" y="-402"/>
-      <point x="420" y="-402" type="curve" name="dv01" smooth="yes"/>
+      <point x="420" y="-402" type="curve" smooth="yes" name="dv01"/>
       <point x="184" y="-402"/>
       <point x="-35" y="-291"/>
-      <point x="-35" y="-84" type="curve" name="sh04" smooth="yes"/>
+      <point x="-35" y="-84" type="curve" smooth="yes" name="sh04"/>
       <point x="-35" y="-56"/>
       <point x="-31" y="-18"/>
       <point x="-23" y="21" type="curve" name="sh05"/>
@@ -50,7 +50,7 @@
       <point x="269" y="15" type="line" name="sh07"/>
       <point x="266" y="-5"/>
       <point x="264" y="-24"/>
-      <point x="264" y="-41" type="curve" name="sh06" smooth="yes"/>
+      <point x="264" y="-41" type="curve" smooth="yes" name="sh06"/>
       <point x="264" y="-126"/>
       <point x="315" y="-191"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10F_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10F_4.glif
index 336201040..f01638166 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10F_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10F_4.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F4" format="1">
+<glyph name="uni10F4" format="2">
   <advance width="1233"/>
   <unicode hex="10F4"/>
   <outline>
     <contour>
-      <point x="415" y="-402" type="curve" name="dv01" smooth="yes"/>
+      <point x="415" y="-402" type="curve" smooth="yes" name="dv01"/>
       <point x="115" y="-402"/>
       <point x="-32" y="-295"/>
-      <point x="-32" y="-68" type="curve" name="dh01" smooth="yes"/>
+      <point x="-32" y="-68" type="curve" smooth="yes" name="dh01"/>
       <point x="-32" y="-29"/>
       <point x="-28" y="12"/>
       <point x="-19" y="57" type="curve" name="sh01"/>
       <point x="276" y="58" type="line"/>
       <point x="270" y="30"/>
       <point x="267" y="4"/>
-      <point x="267" y="-20" type="curve" name="dh02" smooth="yes"/>
+      <point x="267" y="-20" type="curve" smooth="yes" name="dh02"/>
       <point x="267" y="-111"/>
       <point x="310" y="-192"/>
-      <point x="451" y="-192" type="curve" name="dv02" smooth="yes"/>
+      <point x="451" y="-192" type="curve" smooth="yes" name="dv02"/>
       <point x="516" y="-192"/>
       <point x="579" y="-176"/>
       <point x="626" y="-141" type="curve" smooth="yes"/>
@@ -33,7 +33,7 @@
       <point x="692" y="210" type="curve" smooth="yes"/>
       <point x="657" y="241"/>
       <point x="603" y="257"/>
-      <point x="530" y="257" type="curve" name="dv05" smooth="yes"/>
+      <point x="530" y="257" type="curve" smooth="yes" name="dv05"/>
       <point x="314" y="257" type="line"/>
       <point x="358" y="482" type="line"/>
       <point x="571" y="482" type="line" name="dv06"/>
@@ -46,23 +46,23 @@
       <point x="818" y="793" type="line" smooth="yes"/>
       <point x="783" y="786"/>
       <point x="747" y="781"/>
-      <point x="695" y="776" type="curve" name="sv01" smooth="yes"/>
+      <point x="695" y="776" type="curve" smooth="yes" name="sv01"/>
       <point x="674" y="773"/>
       <point x="655" y="772"/>
-      <point x="638" y="772" type="curve" name="dv07" smooth="yes"/>
+      <point x="638" y="772" type="curve" smooth="yes" name="dv07"/>
       <point x="629" y="772" type="line" smooth="yes"/>
       <point x="454" y="772"/>
       <point x="342" y="809"/>
       <point x="271" y="873" type="curve" smooth="yes"/>
       <point x="199" y="940"/>
       <point x="188" y="1019"/>
-      <point x="188" y="1073" type="curve" name="ih01" smooth="yes"/>
+      <point x="188" y="1073" type="curve" smooth="yes" name="ih01"/>
       <point x="188" y="1100"/>
       <point x="191" y="1130"/>
       <point x="197" y="1161" type="curve" smooth="yes"/>
       <point x="249" y="1430"/>
       <point x="465" y="1551"/>
-      <point x="845" y="1551" type="curve" name="dv04" smooth="yes"/>
+      <point x="845" y="1551" type="curve" smooth="yes" name="dv04"/>
       <point x="851" y="1551" type="line"/>
       <point x="809" y="1343" type="line" name="dv03"/>
       <point x="602" y="1343"/>
@@ -70,10 +70,10 @@
       <point x="461" y="1145" type="curve" smooth="yes"/>
       <point x="458" y="1134"/>
       <point x="457" y="1123"/>
-      <point x="457" y="1112" type="curve" name="sh02" smooth="yes"/>
+      <point x="457" y="1112" type="curve" smooth="yes" name="sh02"/>
       <point x="457" y="1027"/>
       <point x="536" y="985"/>
-      <point x="665" y="985" type="curve" name="dv08" smooth="yes"/>
+      <point x="665" y="985" type="curve" smooth="yes" name="dv08"/>
       <point x="825" y="985"/>
       <point x="999" y="1050"/>
       <point x="1243" y="1203" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10F_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10F_5.glif
index 7e3c35a2e..017eb6707 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10F_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10F_5.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F5" format="1">
+<glyph name="uni10F5" format="2">
   <advance width="1233"/>
   <unicode hex="10F5"/>
   <outline>
     <contour>
-      <point x="444" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="444" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="163" y="0"/>
       <point x="19" y="89"/>
-      <point x="19" y="272" type="curve" name="dh01" smooth="yes"/>
+      <point x="19" y="272" type="curve" smooth="yes" name="dh01"/>
       <point x="19" y="297"/>
       <point x="22" y="324"/>
       <point x="27" y="355" type="curve" smooth="yes"/>
@@ -19,16 +19,16 @@
       <point x="600" y="810" type="line" smooth="yes"/>
       <point x="320" y="810"/>
       <point x="180" y="906"/>
-      <point x="180" y="1098" type="curve" name="ih01" smooth="yes"/>
+      <point x="180" y="1098" type="curve" smooth="yes" name="ih01"/>
       <point x="180" y="1126"/>
       <point x="183" y="1158"/>
-      <point x="190" y="1193" type="curve" name="hr01" smooth="yes"/>
+      <point x="190" y="1193" type="curve" smooth="yes" name="hr01"/>
       <point x="238" y="1432"/>
       <point x="420" y="1551"/>
-      <point x="747" y="1551" type="curve" name="dv02" smooth="yes"/>
+      <point x="747" y="1551" type="curve" smooth="yes" name="dv02"/>
       <point x="1027" y="1551"/>
       <point x="1161" y="1463"/>
-      <point x="1161" y="1279" type="curve" name="dh04" smooth="yes"/>
+      <point x="1161" y="1279" type="curve" smooth="yes" name="dh04"/>
       <point x="1161" y="1252"/>
       <point x="1158" y="1224"/>
       <point x="1152" y="1193" type="curve" smooth="yes"/>
@@ -49,22 +49,22 @@
       <point x="876" y="1193" type="line" smooth="yes"/>
       <point x="879" y="1204"/>
       <point x="880" y="1216"/>
-      <point x="880" y="1227" type="curve" name="dh03" smooth="yes"/>
+      <point x="880" y="1227" type="curve" smooth="yes" name="dh03"/>
       <point x="880" y="1302"/>
       <point x="824" y="1340"/>
-      <point x="711" y="1340" type="curve" name="dv01" smooth="yes"/>
+      <point x="711" y="1340" type="curve" smooth="yes" name="dv01"/>
       <point x="576" y="1340"/>
       <point x="505" y="1290"/>
       <point x="485" y="1191" type="curve" smooth="yes"/>
       <point x="482" y="1175"/>
       <point x="480" y="1161"/>
-      <point x="480" y="1146" type="curve" name="sh02" smooth="yes"/>
+      <point x="480" y="1146" type="curve" smooth="yes" name="sh02"/>
       <point x="480" y="1067"/>
       <point x="534" y="1027"/>
       <point x="642" y="1027" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="489" y="209" type="curve" name="sv04" smooth="yes"/>
+      <point x="489" y="209" type="curve" smooth="yes" name="sv04"/>
       <point x="622" y="209"/>
       <point x="695" y="263"/>
       <point x="716" y="371" type="curve" smooth="yes"/>
@@ -75,7 +75,7 @@
       <point x="323" y="361" type="curve" smooth="yes"/>
       <point x="321" y="348"/>
       <point x="320" y="335"/>
-      <point x="320" y="324" type="curve" name="dh02" smooth="yes"/>
+      <point x="320" y="324" type="curve" smooth="yes" name="dh02"/>
       <point x="320" y="247"/>
       <point x="376" y="209"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10F_6.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10F_6.glif
index 5e6827d94..26f00be42 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10F_6.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10F_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F6" format="1">
+<glyph name="uni10F6" format="2">
   <advance width="1233"/>
   <unicode hex="10F6"/>
   <outline>
@@ -28,27 +28,27 @@
       <point x="270" y="413" type="line" smooth="yes"/>
       <point x="265" y="390"/>
       <point x="263" y="370"/>
-      <point x="263" y="353" type="curve" name="dh02" smooth="yes"/>
+      <point x="263" y="353" type="curve" smooth="yes" name="dh02"/>
       <point x="263" y="282"/>
       <point x="295" y="246"/>
       <point x="359" y="246" type="curve"/>
       <point x="317" y="29" type="line"/>
       <point x="82" y="32"/>
       <point x="-35" y="127"/>
-      <point x="-35" y="314" type="curve" name="dh01" smooth="yes"/>
+      <point x="-35" y="314" type="curve" smooth="yes" name="dh01"/>
       <point x="-35" y="347"/>
       <point x="-31" y="385"/>
       <point x="-23" y="426" type="curve" smooth="yes"/>
       <point x="21" y="654" type="line" smooth="yes"/>
       <point x="73" y="925"/>
       <point x="213" y="1066"/>
-      <point x="450" y="1066" type="curve" name="dv02" smooth="yes"/>
+      <point x="450" y="1066" type="curve" smooth="yes" name="dv02"/>
       <point x="556" y="1066"/>
       <point x="630" y="1037"/>
       <point x="673" y="978" type="curve"/>
       <point x="738" y="1039"/>
       <point x="826" y="1066"/>
-      <point x="930" y="1066" type="curve" name="sv01" smooth="yes"/>
+      <point x="930" y="1066" type="curve" smooth="yes" name="sv01"/>
       <point x="1120" y="1066"/>
       <point x="1215" y="975"/>
       <point x="1215" y="793" type="curve" smooth="yes"/>
@@ -58,17 +58,17 @@
       <point x="1155" y="422" type="line" smooth="yes"/>
       <point x="1100" y="142"/>
       <point x="958" y="0"/>
-      <point x="729" y="0" type="curve" name="ab02" smooth="yes"/>
+      <point x="729" y="0" type="curve" smooth="yes" name="ab02"/>
       <point x="682" y="0"/>
       <point x="652" y="6"/>
       <point x="628" y="18" type="curve" name="iv01"/>
-      <point x="625" y="2" type="line" name="ab03" smooth="yes"/>
+      <point x="625" y="2" type="line" smooth="yes" name="ab03"/>
       <point x="577" y="-251"/>
       <point x="397" y="-401"/>
       <point x="105" y="-401" type="curve" name="av01"/>
     </contour>
     <contour>
-      <point x="737" y="214" type="curve" name="sv02" smooth="yes"/>
+      <point x="737" y="214" type="curve" smooth="yes" name="sv02"/>
       <point x="810" y="214"/>
       <point x="828" y="258"/>
       <point x="844" y="334" type="curve"/>
@@ -78,7 +78,7 @@
       <point x="927" y="786" type="curve" smooth="yes"/>
       <point x="927" y="814"/>
       <point x="922" y="853"/>
-      <point x="875" y="853" type="curve" name="sv03" smooth="yes"/>
+      <point x="875" y="853" type="curve" smooth="yes" name="sv03"/>
       <point x="795" y="853" type="line" smooth="yes"/>
       <point x="772" y="853"/>
       <point x="757" y="836"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10F_7.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10F_7.glif
index eda44679f..317a6a4b0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10F_7.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10F_7.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F7" format="1">
+<glyph name="uni10F7" format="2">
   <advance width="1233"/>
   <unicode hex="10F7"/>
   <outline>
     <contour>
-      <point x="414" y="-403" type="curve" name="dv01" smooth="yes"/>
+      <point x="414" y="-403" type="curve" smooth="yes" name="dv01"/>
       <point x="67" y="-403"/>
       <point x="-36" y="-255"/>
-      <point x="-36" y="-74" type="curve" name="dh01" smooth="yes"/>
+      <point x="-36" y="-74" type="curve" smooth="yes" name="dh01"/>
       <point x="-36" y="-38"/>
       <point x="-32" y="-2"/>
       <point x="-25" y="38" type="curve"/>
@@ -19,10 +19,10 @@
       <point x="722" y="715" type="curve" smooth="yes"/>
       <point x="727" y="732"/>
       <point x="729" y="750"/>
-      <point x="729" y="771" type="curve" name="dh03" smooth="yes"/>
+      <point x="729" y="771" type="curve" smooth="yes" name="dh03"/>
       <point x="729" y="827"/>
       <point x="713" y="854"/>
-      <point x="657" y="854" type="curve" name="dv03" smooth="yes"/>
+      <point x="657" y="854" type="curve" smooth="yes" name="dv03"/>
       <point x="628" y="854"/>
       <point x="582" y="847"/>
       <point x="547" y="828" type="curve" smooth="yes"/>
@@ -34,10 +34,10 @@
       <point x="248" y="726" type="line"/>
       <point x="291" y="954"/>
       <point x="448" y="1066"/>
-      <point x="704" y="1066" type="curve" name="hr01" smooth="yes"/>
+      <point x="704" y="1066" type="curve" smooth="yes" name="hr01"/>
       <point x="964" y="1066"/>
       <point x="1025" y="948"/>
-      <point x="1025" y="815" type="curve" name="dh04" smooth="yes"/>
+      <point x="1025" y="815" type="curve" smooth="yes" name="dh04"/>
       <point x="1025" y="776"/>
       <point x="1021" y="731"/>
       <point x="1014" y="702" type="curve" smooth="yes"/>
@@ -49,26 +49,26 @@
       <point x="272" y="46" type="curve" smooth="yes"/>
       <point x="267" y="19"/>
       <point x="264" y="-3"/>
-      <point x="264" y="-27" type="curve" name="dh02" smooth="yes"/>
+      <point x="264" y="-27" type="curve" smooth="yes" name="dh02"/>
       <point x="264" y="-137"/>
       <point x="331" y="-192"/>
-      <point x="464" y="-192" type="curve" name="dv02" smooth="yes"/>
+      <point x="464" y="-192" type="curve" smooth="yes" name="dv02"/>
       <point x="639" y="-192"/>
       <point x="726" y="-102"/>
       <point x="761" y="50" type="curve" smooth="yes"/>
       <point x="768" y="78"/>
       <point x="771" y="102"/>
-      <point x="771" y="125" type="curve" name="ih01" smooth="yes"/>
+      <point x="771" y="125" type="curve" smooth="yes" name="ih01"/>
       <point x="771" y="158"/>
       <point x="763" y="186"/>
       <point x="734" y="214" type="curve" name="ih02"/>
       <point x="979" y="363" type="line"/>
       <point x="1036" y="283"/>
       <point x="1061" y="198"/>
-      <point x="1061" y="122" type="curve" name="sh01" smooth="yes"/>
+      <point x="1061" y="122" type="curve" smooth="yes" name="sh01"/>
       <point x="1061" y="101"/>
       <point x="1059" y="69"/>
-      <point x="1055" y="38" type="curve" name="sh02" smooth="yes"/>
+      <point x="1055" y="38" type="curve" smooth="yes" name="sh02"/>
       <point x="1018" y="-235"/>
       <point x="786" y="-403"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10F_8.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10F_8.glif
index 1542ea13a..a956c9cbf 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10F_8.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10F_8.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F8" format="1">
+<glyph name="uni10F8" format="2">
   <advance width="1233"/>
   <unicode hex="10F8"/>
   <outline>
     <contour>
-      <point x="412" y="-403" type="curve" name="dv01" smooth="yes"/>
+      <point x="412" y="-403" type="curve" smooth="yes" name="dv01"/>
       <point x="71" y="-403"/>
       <point x="-36" y="-263"/>
-      <point x="-36" y="-88" type="curve" name="dh01" smooth="yes"/>
+      <point x="-36" y="-88" type="curve" smooth="yes" name="dh01"/>
       <point x="-36" y="-59"/>
       <point x="-33" y="-24"/>
       <point x="-26" y="12" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="400" y="362" type="curve" smooth="yes"/>
       <point x="439" y="337"/>
       <point x="493" y="330"/>
-      <point x="540" y="330" type="curve" name="dv04" smooth="yes"/>
+      <point x="540" y="330" type="curve" smooth="yes" name="dv04"/>
       <point x="679" y="330"/>
       <point x="797" y="392"/>
       <point x="829" y="577" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="1122" y="580" type="curve" smooth="yes"/>
       <point x="1065" y="267"/>
       <point x="858" y="108"/>
-      <point x="521" y="108" type="curve" name="dv03" smooth="yes"/>
+      <point x="521" y="108" type="curve" smooth="yes" name="dv03"/>
       <point x="517" y="108" type="line" smooth="yes"/>
       <point x="423" y="108"/>
       <point x="349" y="121"/>
@@ -59,10 +59,10 @@
       <point x="269" y="16" type="line" smooth="yes"/>
       <point x="265" y="-5"/>
       <point x="263" y="-25"/>
-      <point x="263" y="-42" type="curve" name="dh02" smooth="yes"/>
+      <point x="263" y="-42" type="curve" smooth="yes" name="dh02"/>
       <point x="263" y="-141"/>
       <point x="327" y="-191"/>
-      <point x="456" y="-191" type="curve" name="dv02" smooth="yes"/>
+      <point x="456" y="-191" type="curve" smooth="yes" name="dv02"/>
       <point x="461" y="-191" type="line" smooth="yes"/>
       <point x="594" y="-191"/>
       <point x="694" y="-110"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10F_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10F_9.glif
index 30b54deee..47b0e8589 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10F_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10F_9.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F9" format="1">
+<glyph name="uni10F9" format="2">
   <advance width="1233"/>
   <unicode hex="10F9"/>
   <outline>
     <contour>
-      <point x="429" y="-402" type="curve" name="dv01" smooth="yes"/>
+      <point x="429" y="-402" type="curve" smooth="yes" name="dv01"/>
       <point x="201" y="-402"/>
       <point x="94" y="-325"/>
-      <point x="94" y="-158" type="curve" name="sh01" smooth="yes"/>
+      <point x="94" y="-158" type="curve" smooth="yes" name="sh01"/>
       <point x="94" y="-129"/>
       <point x="97" y="-99"/>
       <point x="104" y="-68" type="curve" smooth="yes"/>
@@ -16,16 +16,16 @@
       <point x="324" y="220" type="curve" name="ih01"/>
       <point x="109" y="292"/>
       <point x="66" y="408"/>
-      <point x="66" y="526" type="curve" name="dh01" smooth="yes"/>
+      <point x="66" y="526" type="curve" smooth="yes" name="dh01"/>
       <point x="66" y="557"/>
       <point x="69" y="591"/>
       <point x="76" y="626" type="curve" smooth="yes"/>
       <point x="138" y="942"/>
       <point x="423" y="1080"/>
-      <point x="692" y="1080" type="curve" name="dv03" smooth="yes"/>
+      <point x="692" y="1080" type="curve" smooth="yes" name="dv03"/>
       <point x="936" y="1080"/>
       <point x="1161" y="964"/>
-      <point x="1161" y="734" type="curve" name="dh04" smooth="yes"/>
+      <point x="1161" y="734" type="curve" smooth="yes" name="dh04"/>
       <point x="1161" y="699"/>
       <point x="1156" y="661"/>
       <point x="1148" y="625" type="curve" smooth="yes"/>
@@ -40,7 +40,7 @@
       <point x="389" y="-109" type="curve" smooth="yes"/>
       <point x="389" y="-168"/>
       <point x="413" y="-192"/>
-      <point x="472" y="-192" type="curve" name="hr01" smooth="yes"/>
+      <point x="472" y="-192" type="curve" smooth="yes" name="hr01"/>
       <point x="537" y="-192"/>
       <point x="593" y="-162"/>
       <point x="606" y="-97" type="curve" smooth="yes"/>
@@ -57,16 +57,16 @@
       <point x="857" y="625" type="curve" smooth="yes"/>
       <point x="862" y="652"/>
       <point x="864" y="676"/>
-      <point x="864" y="696" type="curve" name="dh03" smooth="yes"/>
+      <point x="864" y="696" type="curve" smooth="yes" name="dh03"/>
       <point x="864" y="813"/>
       <point x="796" y="868"/>
-      <point x="667" y="868" type="curve" name="dv02" smooth="yes"/>
+      <point x="667" y="868" type="curve" smooth="yes" name="dv02"/>
       <point x="500" y="868"/>
       <point x="394" y="776"/>
-      <point x="371" y="625" type="curve" name="sh02" smooth="yes"/>
+      <point x="371" y="625" type="curve" smooth="yes" name="sh02"/>
       <point x="368" y="606"/>
       <point x="366" y="577"/>
-      <point x="366" y="561" type="curve" name="dh02" smooth="yes"/>
+      <point x="366" y="561" type="curve" smooth="yes" name="dh02"/>
       <point x="366" y="475"/>
       <point x="428" y="405"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10F_A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10F_A_.glif
index 4104b3710..cafd4b992 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10F_A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10F_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10FA" format="1">
+<glyph name="uni10FA" format="2">
   <advance width="1233"/>
   <unicode hex="10FA"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="533" y="-52" type="curve" smooth="yes"/>
       <point x="513" y="-24"/>
       <point x="478" y="-8"/>
-      <point x="441" y="-8" type="curve" name="ab01" smooth="yes"/>
+      <point x="441" y="-8" type="curve" smooth="yes" name="ab01"/>
       <point x="385" y="-8"/>
       <point x="327" y="-46"/>
       <point x="251" y="-142" type="curve"/>
@@ -26,22 +26,22 @@
       <point x="149" y="342" type="curve" smooth="yes"/>
       <point x="138" y="378"/>
       <point x="132" y="416"/>
-      <point x="131" y="443" type="curve" name="sh03" smooth="yes"/>
+      <point x="131" y="443" type="curve" smooth="yes" name="sh03"/>
       <point x="130" y="464"/>
       <point x="129" y="486"/>
-      <point x="129" y="501" type="curve" name="sh01" smooth="yes"/>
+      <point x="129" y="501" type="curve" smooth="yes" name="sh01"/>
       <point x="129" y="532"/>
       <point x="133" y="569"/>
-      <point x="142" y="614" type="curve" name="sh04" smooth="yes"/>
+      <point x="142" y="614" type="curve" smooth="yes" name="sh04"/>
       <point x="201" y="909"/>
       <point x="391" y="1064"/>
       <point x="750" y="1067" type="curve" name="dv02"/>
       <point x="1009" y="1044"/>
       <point x="1146" y="950"/>
-      <point x="1146" y="774" type="curve" name="sh05" smooth="yes"/>
+      <point x="1146" y="774" type="curve" smooth="yes" name="sh05"/>
       <point x="1146" y="743"/>
       <point x="1142" y="714"/>
-      <point x="1138" y="693" type="curve" name="sh06" smooth="yes"/>
+      <point x="1138" y="693" type="curve" smooth="yes" name="sh06"/>
       <point x="1115" y="576"/>
       <point x="1033" y="413"/>
       <point x="881" y="197" type="curve"/>
@@ -51,10 +51,10 @@
       <point x="849" y="676" type="curve" name="sh07"/>
       <point x="852" y="695"/>
       <point x="854" y="712"/>
-      <point x="854" y="728" type="curve" name="ah01" smooth="yes"/>
+      <point x="854" y="728" type="curve" smooth="yes" name="ah01"/>
       <point x="854" y="811"/>
       <point x="801" y="854"/>
-      <point x="697" y="854" type="curve" name="dv01" smooth="yes"/>
+      <point x="697" y="854" type="curve" smooth="yes" name="dv01"/>
       <point x="558" y="854"/>
       <point x="468" y="777"/>
       <point x="437" y="616" type="curve" name="sh08"/>
@@ -63,7 +63,7 @@
       <point x="424" y="509" type="curve" name="sh09"/>
       <point x="423" y="488"/>
       <point x="423" y="476"/>
-      <point x="423" y="473" type="curve" name="sh02" smooth="yes"/>
+      <point x="423" y="473" type="curve" smooth="yes" name="sh02"/>
       <point x="423" y="401"/>
       <point x="436" y="349"/>
       <point x="471" y="293" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10F_B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10F_B_.glif
index 871aeedef..44215266a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10F_B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10F_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10FB" format="1">
+<glyph name="uni10FB" format="2">
   <advance width="1233"/>
   <unicode hex="10FB"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni10F_C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni10F_C_.glif
index 984d18178..ea844aa02 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni10F_C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni10F_C_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10FC" format="1">
+<glyph name="uni10FC" format="2">
   <advance width="1233"/>
   <unicode hex="10FC"/>
   <outline>
     <contour>
-      <point x="349" y="930" type="curve" name="hr00" smooth="yes"/>
+      <point x="349" y="930" type="curve" smooth="yes" name="hr00"/>
       <point x="349" y="957"/>
       <point x="353" y="994"/>
-      <point x="361" y="1034" type="curve" name="sh01" smooth="yes"/>
+      <point x="361" y="1034" type="curve" smooth="yes" name="sh01"/>
       <point x="423" y="1357" type="line" smooth="yes"/>
       <point x="448" y="1488"/>
       <point x="530" y="1553"/>
@@ -22,33 +22,33 @@
       <point x="643" y="1319" type="line" name="dv06"/>
       <point x="774" y="1319"/>
       <point x="839" y="1256"/>
-      <point x="839" y="1131" type="curve" name="sh02" smooth="yes"/>
+      <point x="839" y="1131" type="curve" smooth="yes" name="sh02"/>
       <point x="839" y="1104"/>
       <point x="836" y="1070"/>
-      <point x="829" y="1034" type="curve" name="sh03" smooth="yes"/>
+      <point x="829" y="1034" type="curve" smooth="yes" name="sh03"/>
       <point x="789" y="827"/>
       <point x="658" y="736"/>
-      <point x="541" y="736" type="curve" name="dv01" smooth="yes"/>
+      <point x="541" y="736" type="curve" smooth="yes" name="dv01"/>
       <point x="439" y="736"/>
       <point x="349" y="805"/>
     </contour>
     <contour>
-      <point x="557" y="852" type="curve" name="dv02" smooth="yes"/>
+      <point x="557" y="852" type="curve" smooth="yes" name="dv02"/>
       <point x="614" y="852"/>
       <point x="658" y="913"/>
-      <point x="681" y="1034" type="curve" name="sh04" smooth="yes"/>
+      <point x="681" y="1034" type="curve" smooth="yes" name="sh04"/>
       <point x="686" y="1061"/>
       <point x="688" y="1084"/>
-      <point x="688" y="1101" type="curve" name="ah01" smooth="yes"/>
+      <point x="688" y="1101" type="curve" smooth="yes" name="ah01"/>
       <point x="688" y="1161"/>
       <point x="664" y="1190"/>
-      <point x="623" y="1190" type="curve" name="dv05" smooth="yes"/>
+      <point x="623" y="1190" type="curve" smooth="yes" name="dv05"/>
       <point x="567" y="1190"/>
       <point x="526" y="1137"/>
-      <point x="506" y="1028" type="curve" name="sh06" smooth="yes"/>
+      <point x="506" y="1028" type="curve" smooth="yes" name="sh06"/>
       <point x="500" y="994"/>
       <point x="497" y="965"/>
-      <point x="497" y="942" type="curve" name="sh05" smooth="yes"/>
+      <point x="497" y="942" type="curve" smooth="yes" name="sh05"/>
       <point x="497" y="882"/>
       <point x="517" y="852"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni1E_B_C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni1E_B_C_.glif
index afba838ea..bafb2a1cf 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni1E_B_C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni1E_B_C_.glif
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni1EBC" format="1">
+<glyph name="uni1EBC" format="2">
   <advance width="1233"/>
   <unicode hex="1EBC"/>
   <outline>
     <contour>
-      <point x="686" y="1708" type="curve" name="hr00" smooth="yes"/>
+      <point x="686" y="1708" type="curve" smooth="yes" name="hr00"/>
       <point x="707" y="1708"/>
       <point x="727" y="1700"/>
       <point x="759" y="1676" type="curve" smooth="yes"/>
       <point x="808" y="1639" type="line" smooth="yes"/>
       <point x="857" y="1602"/>
       <point x="896" y="1588"/>
-      <point x="945" y="1588" type="curve" name="hr01" smooth="yes"/>
+      <point x="945" y="1588" type="curve" smooth="yes" name="hr01"/>
       <point x="1076" y="1588"/>
       <point x="1161" y="1685"/>
       <point x="1197" y="1854" type="curve" name="hr02"/>
       <point x="1060" y="1854" type="line"/>
       <point x="1045" y="1777"/>
       <point x="1009" y="1735"/>
-      <point x="960" y="1735" type="curve" name="hr03" smooth="yes"/>
+      <point x="960" y="1735" type="curve" smooth="yes" name="hr03"/>
       <point x="934" y="1735"/>
       <point x="911" y="1744"/>
       <point x="890" y="1762" type="curve"/>
       <point x="837" y="1803" type="line" smooth="yes"/>
       <point x="790" y="1839"/>
       <point x="751" y="1854"/>
-      <point x="700" y="1854" type="curve" name="hr04" smooth="yes"/>
+      <point x="700" y="1854" type="curve" smooth="yes" name="hr04"/>
       <point x="572" y="1854"/>
       <point x="481" y="1760"/>
       <point x="448" y="1588" type="curve" name="hr05"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni1E_B_D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni1E_B_D_.glif
index c3b53b65f..6a5899bfd 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni1E_B_D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni1E_B_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni1EBD" format="1">
+<glyph name="uni1EBD" format="2">
   <advance width="1233"/>
   <unicode hex="1EBD"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="974" y="1554" type="line"/>
       <point x="961" y="1470"/>
       <point x="925" y="1425"/>
-      <point x="874" y="1425" type="curve" name="hr01" smooth="yes"/>
+      <point x="874" y="1425" type="curve" smooth="yes" name="hr01"/>
       <point x="853" y="1425"/>
       <point x="829" y="1435"/>
       <point x="804" y="1456" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="501" y="1272" type="line"/>
       <point x="514" y="1352"/>
       <point x="552" y="1401"/>
-      <point x="597" y="1401" type="curve" name="hr02" smooth="yes"/>
+      <point x="597" y="1401" type="curve" smooth="yes" name="hr02"/>
       <point x="618" y="1401"/>
       <point x="642" y="1390"/>
       <point x="670" y="1368" type="curve" smooth="yes"/>
@@ -36,12 +36,12 @@
       <point x="724" y="1327" type="line" smooth="yes"/>
       <point x="777" y="1286"/>
       <point x="817" y="1270"/>
-      <point x="864" y="1270" type="curve" name="hr03" smooth="yes"/>
+      <point x="864" y="1270" type="curve" smooth="yes" name="hr03"/>
       <point x="999" y="1270"/>
       <point x="1082" y="1365"/>
     </contour>
     <contour>
-      <point x="205" y="89" type="curve" name="hr04" smooth="yes"/>
+      <point x="205" y="89" type="curve" smooth="yes" name="hr04"/>
       <point x="119" y="168"/>
       <point x="76" y="285"/>
       <point x="76" y="438" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni1E_F_8.glif b/source/Hack-BoldItalic.ufo/glyphs/uni1E_F_8.glif
index c32afeb86..9a3dcb47c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni1E_F_8.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni1E_F_8.glif
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni1EF8" format="1">
+<glyph name="uni1EF8" format="2">
   <advance width="1233"/>
   <unicode hex="1EF8"/>
   <outline>
     <contour>
-      <point x="676" y="1709" type="curve" name="hr00" smooth="yes"/>
+      <point x="676" y="1709" type="curve" smooth="yes" name="hr00"/>
       <point x="697" y="1709"/>
       <point x="717" y="1701"/>
       <point x="749" y="1677" type="curve" smooth="yes"/>
       <point x="798" y="1640" type="line" smooth="yes"/>
       <point x="847" y="1603"/>
       <point x="886" y="1589"/>
-      <point x="935" y="1589" type="curve" name="hr01" smooth="yes"/>
+      <point x="935" y="1589" type="curve" smooth="yes" name="hr01"/>
       <point x="1066" y="1589"/>
       <point x="1151" y="1686"/>
       <point x="1187" y="1855" type="curve" name="hr02"/>
       <point x="1050" y="1855" type="line"/>
       <point x="1035" y="1778"/>
       <point x="999" y="1736"/>
-      <point x="950" y="1736" type="curve" name="hr03" smooth="yes"/>
+      <point x="950" y="1736" type="curve" smooth="yes" name="hr03"/>
       <point x="925" y="1736"/>
       <point x="901" y="1745"/>
       <point x="880" y="1763" type="curve"/>
       <point x="827" y="1804" type="line" smooth="yes"/>
       <point x="780" y="1840"/>
       <point x="741" y="1855"/>
-      <point x="690" y="1855" type="curve" name="hr04" smooth="yes"/>
+      <point x="690" y="1855" type="curve" smooth="yes" name="hr04"/>
       <point x="562" y="1855"/>
       <point x="471" y="1761"/>
       <point x="438" y="1589" type="curve" name="hr05"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni1E_F_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni1E_F_9.glif
index 112e8524b..7e4ce6618 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni1E_F_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni1E_F_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni1EF9" format="1">
+<glyph name="uni1EF9" format="2">
   <advance width="1233"/>
   <unicode hex="1EF9"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="1019" y="1554" type="line"/>
       <point x="1007" y="1473"/>
       <point x="972" y="1425"/>
-      <point x="921" y="1425" type="curve" name="hr01" smooth="yes"/>
+      <point x="921" y="1425" type="curve" smooth="yes" name="hr01"/>
       <point x="900" y="1425"/>
       <point x="876" y="1435"/>
       <point x="849" y="1456" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="546" y="1272" type="line"/>
       <point x="559" y="1352"/>
       <point x="597" y="1401"/>
-      <point x="642" y="1401" type="curve" name="hr02" smooth="yes"/>
+      <point x="642" y="1401" type="curve" smooth="yes" name="hr02"/>
       <point x="663" y="1401"/>
       <point x="687" y="1390"/>
       <point x="715" y="1368" type="curve" smooth="yes"/>
@@ -39,12 +39,12 @@
       <point x="841" y="1283" type="curve" smooth="yes"/>
       <point x="863" y="1274"/>
       <point x="887" y="1270"/>
-      <point x="912" y="1270" type="curve" name="hr03" smooth="yes"/>
+      <point x="912" y="1270" type="curve" smooth="yes" name="hr03"/>
       <point x="1044" y="1270"/>
       <point x="1127" y="1366"/>
     </contour>
     <contour>
-      <point x="175" y="-424" type="line" name="hr04" smooth="yes"/>
+      <point x="175" y="-424" type="line" smooth="yes" name="hr04"/>
       <point x="263" y="-424"/>
       <point x="332" y="-407"/>
       <point x="383" y="-372" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2000.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2000.glif
index d0ebf1f93..fcf33b66d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2000.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2000.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2000" format="1">
+<glyph name="uni2000" format="2">
   <advance width="1233"/>
   <unicode hex="2000"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2001.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2001.glif
index 2d9044ed7..52cc3eb33 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2001.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2001.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2001" format="1">
+<glyph name="uni2001" format="2">
   <advance width="1233"/>
   <unicode hex="2001"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2002.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2002.glif
index 118881251..d3ed2c892 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2002.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2002.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2002" format="1">
+<glyph name="uni2002" format="2">
   <advance width="1233"/>
   <unicode hex="2002"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2003.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2003.glif
index ed1727198..6c33cbbb4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2003.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2003.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2003" format="1">
+<glyph name="uni2003" format="2">
   <advance width="1233"/>
   <unicode hex="2003"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2004.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2004.glif
index 7760d1614..832cf5e86 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2004.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2004.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2004" format="1">
+<glyph name="uni2004" format="2">
   <advance width="1233"/>
   <unicode hex="2004"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2005.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2005.glif
index c74724fd0..d3890d22c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2005.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2005.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2005" format="1">
+<glyph name="uni2005" format="2">
   <advance width="1233"/>
   <unicode hex="2005"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2006.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2006.glif
index 8ebfe7b0f..38d77599d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2006.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2006.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2006" format="1">
+<glyph name="uni2006" format="2">
   <advance width="1233"/>
   <unicode hex="2006"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2007.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2007.glif
index 9feeb6e4e..efb323052 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2007.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2007.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2007" format="1">
+<glyph name="uni2007" format="2">
   <advance width="1233"/>
   <unicode hex="2007"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2008.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2008.glif
index ead1bfbab..98b293250 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2008.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2008.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2008" format="1">
+<glyph name="uni2008" format="2">
   <advance width="1233"/>
   <unicode hex="2008"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2009.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2009.glif
index 6bcafac01..ccc5dddc7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2009.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2009.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2009" format="1">
+<glyph name="uni2009" format="2">
   <advance width="1233"/>
   <unicode hex="2009"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni200A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni200A_.glif
index 7f7754a85..e24c197d9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni200A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni200A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni200A" format="1">
+<glyph name="uni200A" format="2">
   <advance width="1233"/>
   <unicode hex="200A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2010.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2010.glif
index 1dfbe19a0..956744730 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2010.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2010.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2010" format="1">
+<glyph name="uni2010" format="2">
   <advance width="1233"/>
   <unicode hex="2010"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2011.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2011.glif
index ca9af3ad4..ddd8abc07 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2011.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2011.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2011" format="1">
+<glyph name="uni2011" format="2">
   <advance width="1233"/>
   <unicode hex="2011"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2015.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2015.glif
index 0f9fd64f4..cfd9a6232 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2015.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2015.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2015" format="1">
+<glyph name="uni2015" format="2">
   <advance width="1233"/>
   <unicode hex="2015"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2016.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2016.glif
index 85cf9fb51..3096e137d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2016.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2016.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2016" format="1">
+<glyph name="uni2016" format="2">
   <advance width="1233"/>
   <unicode hex="2016"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni201F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni201F_.glif
index 2f45f499e..7a9823750 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni201F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni201F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni201F" format="1">
+<glyph name="uni201F" format="2">
   <advance width="1233"/>
   <unicode hex="201F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2023.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2023.glif
index 2eecf46b8..14f028134 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2023.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2023.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2023" format="1">
+<glyph name="uni2023" format="2">
   <advance width="1233"/>
   <unicode hex="2023"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni202F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni202F_.glif
index 33cb9cc4c..ce697df98 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni202F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni202F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni202F" format="1">
+<glyph name="uni202F" format="2">
   <advance width="1233"/>
   <unicode hex="202F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2031.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2031.glif
index 537595ec2..ba5ad67b2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2031.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2031.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2031" format="1">
+<glyph name="uni2031" format="2">
   <advance width="1233"/>
   <unicode hex="2031"/>
   <outline>
     <contour>
-      <point x="286" y="856" type="curve" name="dv05" smooth="yes"/>
+      <point x="286" y="856" type="curve" smooth="yes" name="dv05"/>
       <point x="129" y="856"/>
       <point x="0" y="984"/>
-      <point x="0" y="1145" type="curve" name="dh01" smooth="yes"/>
+      <point x="0" y="1145" type="curve" smooth="yes" name="dh01"/>
       <point x="0" y="1305"/>
       <point x="129" y="1432"/>
-      <point x="286" y="1432" type="curve" name="dv02" smooth="yes"/>
+      <point x="286" y="1432" type="curve" smooth="yes" name="dv02"/>
       <point x="446" y="1432"/>
       <point x="571" y="1304"/>
-      <point x="571" y="1145" type="curve" name="sh01" smooth="yes"/>
+      <point x="571" y="1145" type="curve" smooth="yes" name="sh01"/>
       <point x="571" y="985"/>
       <point x="443" y="856"/>
     </contour>
     <contour>
-      <point x="285" y="1018" type="curve" name="dv06" smooth="yes"/>
+      <point x="285" y="1018" type="curve" smooth="yes" name="dv06"/>
       <point x="353" y="1018"/>
       <point x="410" y="1078"/>
-      <point x="410" y="1146" type="curve" name="ih01" smooth="yes"/>
+      <point x="410" y="1146" type="curve" smooth="yes" name="ih01"/>
       <point x="410" y="1213"/>
       <point x="353" y="1270"/>
-      <point x="284" y="1270" type="curve" name="dv01" smooth="yes"/>
+      <point x="284" y="1270" type="curve" smooth="yes" name="dv01"/>
       <point x="216" y="1270"/>
       <point x="162" y="1216"/>
-      <point x="162" y="1147" type="curve" name="dh02" smooth="yes"/>
+      <point x="162" y="1147" type="curve" smooth="yes" name="dh02"/>
       <point x="162" y="1078"/>
       <point x="217" y="1018"/>
     </contour>
@@ -38,13 +38,13 @@
       <point x="72" y="565" type="line"/>
     </contour>
     <contour>
-      <point x="254" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="254" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="111" y="0"/>
       <point x="0" y="128"/>
-      <point x="0" y="289" type="curve" name="sh02" smooth="yes"/>
+      <point x="0" y="289" type="curve" smooth="yes" name="sh02"/>
       <point x="0" y="450"/>
       <point x="113" y="575"/>
-      <point x="257" y="575" type="curve" name="dv04" smooth="yes"/>
+      <point x="257" y="575" type="curve" smooth="yes" name="dv04"/>
       <point x="326" y="575"/>
       <point x="384" y="547"/>
       <point x="432" y="492" type="curve" smooth="yes"/>
@@ -52,7 +52,7 @@
       <point x="437" y="492" type="line" smooth="yes"/>
       <point x="486" y="548"/>
       <point x="551" y="576"/>
-      <point x="616" y="576" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="576" type="curve" smooth="yes" name="sv01"/>
       <point x="681" y="576"/>
       <point x="745" y="548"/>
       <point x="796" y="492" type="curve"/>
@@ -60,13 +60,13 @@
       <point x="800" y="492" type="line" smooth="yes"/>
       <point x="849" y="547"/>
       <point x="908" y="575"/>
-      <point x="976" y="575" type="curve" name="sv02" smooth="yes"/>
+      <point x="976" y="575" type="curve" smooth="yes" name="sv02"/>
       <point x="1120" y="575"/>
       <point x="1233" y="448"/>
-      <point x="1233" y="289" type="curve" name="dh06" smooth="yes"/>
+      <point x="1233" y="289" type="curve" smooth="yes" name="dh06"/>
       <point x="1233" y="129"/>
       <point x="1120" y="0"/>
-      <point x="977" y="0" type="curve" name="ab02" smooth="yes"/>
+      <point x="977" y="0" type="curve" smooth="yes" name="ab02"/>
       <point x="909" y="0"/>
       <point x="850" y="28"/>
       <point x="801" y="83" type="curve" smooth="yes"/>
@@ -74,7 +74,7 @@
       <point x="796" y="84" type="line"/>
       <point x="746" y="28"/>
       <point x="686" y="0"/>
-      <point x="616" y="0" type="curve" name="ab03" smooth="yes"/>
+      <point x="616" y="0" type="curve" smooth="yes" name="ab03"/>
       <point x="547" y="0"/>
       <point x="487" y="28"/>
       <point x="438" y="83" type="curve" smooth="yes"/>
@@ -84,13 +84,13 @@
       <point x="323" y="0"/>
     </contour>
     <contour>
-      <point x="253" y="162" type="curve" name="sv03" smooth="yes"/>
+      <point x="253" y="162" type="curve" smooth="yes" name="sv03"/>
       <point x="313" y="162"/>
       <point x="364" y="223"/>
-      <point x="364" y="290" type="curve" name="dh03" smooth="yes"/>
+      <point x="364" y="290" type="curve" smooth="yes" name="dh03"/>
       <point x="364" y="357"/>
       <point x="312" y="414"/>
-      <point x="252" y="414" type="curve" name="dv03" smooth="yes"/>
+      <point x="252" y="414" type="curve" smooth="yes" name="dv03"/>
       <point x="193" y="414"/>
       <point x="144" y="359"/>
       <point x="144" y="290" type="curve" smooth="yes"/>
@@ -98,25 +98,25 @@
       <point x="193" y="162"/>
     </contour>
     <contour>
-      <point x="616" y="162" type="curve" name="sv04" smooth="yes"/>
+      <point x="616" y="162" type="curve" smooth="yes" name="sv04"/>
       <point x="675" y="162"/>
       <point x="726" y="220"/>
       <point x="726" y="285" type="curve" smooth="yes"/>
-      <point x="726" y="289" type="line" name="dh05" smooth="yes"/>
+      <point x="726" y="289" type="line" smooth="yes" name="dh05"/>
       <point x="726" y="357"/>
       <point x="674" y="414"/>
-      <point x="615" y="414" type="curve" name="sv05" smooth="yes"/>
+      <point x="615" y="414" type="curve" smooth="yes" name="sv05"/>
       <point x="556" y="414"/>
       <point x="507" y="356"/>
-      <point x="507" y="288" type="curve" name="dh04" smooth="yes"/>
+      <point x="507" y="288" type="curve" smooth="yes" name="dh04"/>
       <point x="507" y="221"/>
       <point x="555" y="162"/>
     </contour>
     <contour>
-      <point x="978" y="162" type="curve" name="sv06" smooth="yes"/>
+      <point x="978" y="162" type="curve" smooth="yes" name="sv06"/>
       <point x="1038" y="162"/>
       <point x="1089" y="220"/>
-      <point x="1089" y="288" type="curve" name="sh03" smooth="yes"/>
+      <point x="1089" y="288" type="curve" smooth="yes" name="sh03"/>
       <point x="1089" y="357"/>
       <point x="1038" y="411"/>
       <point x="978" y="414" type="curve" name="sv07"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2035.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2035.glif
index de3b46733..ef99ccbeb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2035.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2035.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2035" format="1">
+<glyph name="uni2035" format="2">
   <advance width="1233"/>
   <unicode hex="2035"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2036.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2036.glif
index e4a84f748..6175b3c55 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2036.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2036.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2036" format="1">
+<glyph name="uni2036" format="2">
   <advance width="1233"/>
   <unicode hex="2036"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2037.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2037.glif
index ad0b6de23..10084680c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2037.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2037.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2037" format="1">
+<glyph name="uni2037" format="2">
   <advance width="1233"/>
   <unicode hex="2037"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni203D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni203D_.glif
index 73f401f36..df6d961eb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni203D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni203D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni203D" format="1">
+<glyph name="uni203D" format="2">
   <advance width="1233"/>
   <unicode hex="203D"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="359" y="1407" type="line"/>
       <point x="504" y="1482"/>
       <point x="646" y="1520"/>
-      <point x="785" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="785" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1017" y="1520"/>
       <point x="1152" y="1415"/>
       <point x="1152" y="1244" type="curve" smooth="yes"/>
@@ -48,7 +48,7 @@
       <point x="804" y="1261" type="curve"/>
     </contour>
     <contour>
-      <point x="440" y="-55" type="curve" name="dv01" smooth="yes"/>
+      <point x="440" y="-55" type="curve" smooth="yes" name="dv01"/>
       <point x="393" y="-55"/>
       <point x="363" y="-38"/>
       <point x="340" y="-13" type="curve" smooth="yes"/>
@@ -61,7 +61,7 @@
       <point x="319" y="164" type="curve" smooth="yes"/>
       <point x="342" y="210"/>
       <point x="398" y="279"/>
-      <point x="491" y="279" type="curve" name="dv02" smooth="yes"/>
+      <point x="491" y="279" type="curve" smooth="yes" name="dv02"/>
       <point x="554" y="279"/>
       <point x="601" y="252"/>
       <point x="622" y="192" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni203E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni203E_.glif
index 30bfeccbb..5c14d6dbf 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni203E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni203E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni203E" format="1">
+<glyph name="uni203E" format="2">
   <advance width="1233"/>
   <unicode hex="203E"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni203F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni203F_.glif
index a9bf99ad8..83d5184a2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni203F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni203F_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni203F" format="1">
+<glyph name="uni203F" format="2">
   <advance width="1233"/>
   <unicode hex="203F"/>
   <outline>
     <contour>
-      <point x="618" y="-485" type="curve" name="hr00" smooth="yes"/>
+      <point x="618" y="-485" type="curve" smooth="yes" name="hr00"/>
       <point x="399" y="-485"/>
       <point x="178" y="-433"/>
       <point x="-67" y="-322" type="curve"/>
       <point x="-67" y="-161" type="line" name="av01"/>
       <point x="172" y="-253"/>
       <point x="393" y="-300"/>
-      <point x="616" y="-300" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-300" type="curve" smooth="yes" name="dv01"/>
       <point x="837" y="-300"/>
       <point x="1065" y="-254"/>
       <point x="1301" y="-161" type="curve" name="av02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2045.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2045.glif
index 6cc7cea9f..0fdbe4477 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2045.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2045.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2045" format="1">
+<glyph name="uni2045" format="2">
   <advance width="1233"/>
   <unicode hex="2045"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2046.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2046.glif
index 911f8d9ad..fffdf784b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2046.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2046.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2046" format="1">
+<glyph name="uni2046" format="2">
   <advance width="1233"/>
   <unicode hex="2046"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2047.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2047.glif
index e984dc3e9..7903c8e69 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2047.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2047.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2047" format="1">
+<glyph name="uni2047" format="2">
   <advance width="1233"/>
   <unicode hex="2047"/>
   <outline>
@@ -16,7 +16,7 @@
       <point x="445" y="1157" type="curve" smooth="yes"/>
       <point x="445" y="1186"/>
       <point x="425" y="1232"/>
-      <point x="381" y="1232" type="curve" name="sv01" smooth="yes"/>
+      <point x="381" y="1232" type="curve" smooth="yes" name="sv01"/>
       <point x="364" y="1232"/>
       <point x="344" y="1226"/>
       <point x="323" y="1213" type="curve"/>
@@ -26,7 +26,7 @@
       <point x="225" y="1407" type="line"/>
       <point x="332" y="1487"/>
       <point x="420" y="1520"/>
-      <point x="511" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="511" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="682" y="1520"/>
       <point x="731" y="1395"/>
       <point x="731" y="1271" type="curve" smooth="yes"/>
@@ -59,7 +59,7 @@
       <point x="1061" y="1157" type="curve" smooth="yes"/>
       <point x="1061" y="1186"/>
       <point x="1041" y="1232"/>
-      <point x="997" y="1232" type="curve" name="sv02" smooth="yes"/>
+      <point x="997" y="1232" type="curve" smooth="yes" name="sv02"/>
       <point x="980" y="1232"/>
       <point x="960" y="1226"/>
       <point x="939" y="1213" type="curve"/>
@@ -69,7 +69,7 @@
       <point x="841" y="1407" type="line"/>
       <point x="948" y="1487"/>
       <point x="1036" y="1520"/>
-      <point x="1127" y="1520" type="curve" name="at02" smooth="yes"/>
+      <point x="1127" y="1520" type="curve" smooth="yes" name="at02"/>
       <point x="1298" y="1520"/>
       <point x="1347" y="1395"/>
       <point x="1347" y="1271" type="curve" smooth="yes"/>
@@ -90,7 +90,7 @@
       <point x="740" y="401" type="line"/>
     </contour>
     <contour>
-      <point x="211" y="-55" type="curve" name="dv01" smooth="yes"/>
+      <point x="211" y="-55" type="curve" smooth="yes" name="dv01"/>
       <point x="164" y="-55"/>
       <point x="134" y="-38"/>
       <point x="111" y="-13" type="curve" smooth="yes"/>
@@ -103,7 +103,7 @@
       <point x="90" y="164" type="curve" smooth="yes"/>
       <point x="113" y="210"/>
       <point x="169" y="279"/>
-      <point x="262" y="279" type="curve" name="dv02" smooth="yes"/>
+      <point x="262" y="279" type="curve" smooth="yes" name="dv02"/>
       <point x="325" y="279"/>
       <point x="372" y="252"/>
       <point x="393" y="192" type="curve" smooth="yes"/>
@@ -117,7 +117,7 @@
       <point x="262" y="-55"/>
     </contour>
     <contour>
-      <point x="842" y="-55" type="curve" name="sv03" smooth="yes"/>
+      <point x="842" y="-55" type="curve" smooth="yes" name="sv03"/>
       <point x="795" y="-55"/>
       <point x="765" y="-38"/>
       <point x="742" y="-13" type="curve" smooth="yes"/>
@@ -130,7 +130,7 @@
       <point x="721" y="164" type="curve" smooth="yes"/>
       <point x="744" y="210"/>
       <point x="800" y="279"/>
-      <point x="893" y="279" type="curve" name="sv04" smooth="yes"/>
+      <point x="893" y="279" type="curve" smooth="yes" name="sv04"/>
       <point x="956" y="279"/>
       <point x="1003" y="252"/>
       <point x="1024" y="192" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2048.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2048.glif
index 832a5fbec..6084d8637 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2048.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2048.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2048" format="1">
+<glyph name="uni2048" format="2">
   <advance width="1233"/>
   <unicode hex="2048"/>
   <outline>
@@ -16,7 +16,7 @@
       <point x="429" y="1157" type="curve" smooth="yes"/>
       <point x="429" y="1186"/>
       <point x="409" y="1232"/>
-      <point x="365" y="1232" type="curve" name="sv01" smooth="yes"/>
+      <point x="365" y="1232" type="curve" smooth="yes" name="sv01"/>
       <point x="348" y="1232"/>
       <point x="328" y="1226"/>
       <point x="307" y="1213" type="curve"/>
@@ -26,7 +26,7 @@
       <point x="209" y="1407" type="line"/>
       <point x="316" y="1487"/>
       <point x="404" y="1520"/>
-      <point x="495" y="1520" type="curve" name="at02" smooth="yes"/>
+      <point x="495" y="1520" type="curve" smooth="yes" name="at02"/>
       <point x="666" y="1520"/>
       <point x="715" y="1395"/>
       <point x="715" y="1271" type="curve" smooth="yes"/>
@@ -55,7 +55,7 @@
       <point x="775" y="481" type="line"/>
     </contour>
     <contour>
-      <point x="183" y="-55" type="curve" name="dv01" smooth="yes"/>
+      <point x="183" y="-55" type="curve" smooth="yes" name="dv01"/>
       <point x="136" y="-55"/>
       <point x="106" y="-38"/>
       <point x="83" y="-13" type="curve" smooth="yes"/>
@@ -68,7 +68,7 @@
       <point x="62" y="164" type="curve" smooth="yes"/>
       <point x="85" y="210"/>
       <point x="141" y="279"/>
-      <point x="234" y="279" type="curve" name="dv02" smooth="yes"/>
+      <point x="234" y="279" type="curve" smooth="yes" name="dv02"/>
       <point x="297" y="279"/>
       <point x="344" y="252"/>
       <point x="365" y="192" type="curve" smooth="yes"/>
@@ -82,20 +82,20 @@
       <point x="234" y="-55"/>
     </contour>
     <contour>
-      <point x="792" y="-55" type="curve" name="sv02" smooth="yes"/>
+      <point x="792" y="-55" type="curve" smooth="yes" name="sv02"/>
       <point x="745" y="-55"/>
       <point x="715" y="-38"/>
       <point x="692" y="-13" type="curve" smooth="yes"/>
       <point x="671" y="11"/>
       <point x="656" y="46"/>
       <point x="656" y="83" type="curve" smooth="yes"/>
-      <point x="656" y="113" type="line" name="hr01" smooth="yes"/>
+      <point x="656" y="113" type="line" smooth="yes" name="hr01"/>
       <point x="656" y="126"/>
       <point x="663" y="148"/>
       <point x="671" y="164" type="curve" smooth="yes"/>
       <point x="694" y="210"/>
       <point x="750" y="279"/>
-      <point x="843" y="279" type="curve" name="sv03" smooth="yes"/>
+      <point x="843" y="279" type="curve" smooth="yes" name="sv03"/>
       <point x="906" y="279"/>
       <point x="953" y="252"/>
       <point x="974" y="192" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2049.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2049.glif
index 2dae213a2..151bcbd64 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2049.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2049.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2049" format="1">
+<glyph name="uni2049" format="2">
   <advance width="1233"/>
   <unicode hex="2049"/>
   <outline>
@@ -16,7 +16,7 @@
       <point x="987" y="1157" type="curve" smooth="yes"/>
       <point x="987" y="1186"/>
       <point x="967" y="1232"/>
-      <point x="923" y="1232" type="curve" name="sv01" smooth="yes"/>
+      <point x="923" y="1232" type="curve" smooth="yes" name="sv01"/>
       <point x="906" y="1232"/>
       <point x="886" y="1226"/>
       <point x="865" y="1213" type="curve"/>
@@ -26,7 +26,7 @@
       <point x="767" y="1407" type="line"/>
       <point x="874" y="1487"/>
       <point x="962" y="1520"/>
-      <point x="1053" y="1520" type="curve" name="at02" smooth="yes"/>
+      <point x="1053" y="1520" type="curve" smooth="yes" name="at02"/>
       <point x="1224" y="1520"/>
       <point x="1273" y="1395"/>
       <point x="1273" y="1271" type="curve" smooth="yes"/>
@@ -55,7 +55,7 @@
       <point x="229" y="481" type="line"/>
     </contour>
     <contour>
-      <point x="253" y="-55" type="curve" name="dv01" smooth="yes"/>
+      <point x="253" y="-55" type="curve" smooth="yes" name="dv01"/>
       <point x="206" y="-55"/>
       <point x="176" y="-38"/>
       <point x="153" y="-13" type="curve" smooth="yes"/>
@@ -68,7 +68,7 @@
       <point x="132" y="164" type="curve" smooth="yes"/>
       <point x="155" y="210"/>
       <point x="211" y="279"/>
-      <point x="304" y="279" type="curve" name="dv02" smooth="yes"/>
+      <point x="304" y="279" type="curve" smooth="yes" name="dv02"/>
       <point x="367" y="279"/>
       <point x="414" y="252"/>
       <point x="435" y="192" type="curve" smooth="yes"/>
@@ -82,20 +82,20 @@
       <point x="304" y="-55"/>
     </contour>
     <contour>
-      <point x="782" y="-55" type="curve" name="sv02" smooth="yes"/>
+      <point x="782" y="-55" type="curve" smooth="yes" name="sv02"/>
       <point x="735" y="-55"/>
       <point x="705" y="-38"/>
       <point x="682" y="-13" type="curve" smooth="yes"/>
       <point x="661" y="11"/>
       <point x="646" y="46"/>
       <point x="646" y="83" type="curve" smooth="yes"/>
-      <point x="646" y="113" type="line" name="hr01" smooth="yes"/>
+      <point x="646" y="113" type="line" smooth="yes" name="hr01"/>
       <point x="646" y="126"/>
       <point x="653" y="148"/>
       <point x="661" y="164" type="curve" smooth="yes"/>
       <point x="684" y="210"/>
       <point x="740" y="279"/>
-      <point x="833" y="279" type="curve" name="sv03" smooth="yes"/>
+      <point x="833" y="279" type="curve" smooth="yes" name="sv03"/>
       <point x="896" y="279"/>
       <point x="943" y="252"/>
       <point x="964" y="192" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni204B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni204B_.glif
index 59565269b..9a319301f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni204B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni204B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni204B" format="1">
+<glyph name="uni204B" format="2">
   <advance width="1233"/>
   <unicode hex="204B"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni205F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni205F_.glif
index 94f3ccd11..5eac8ab7f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni205F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni205F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni205F" format="1">
+<glyph name="uni205F" format="2">
   <advance width="1233"/>
   <unicode hex="205F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2070.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2070.glif
index 14e71d61c..f96faf5ad 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2070.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2070.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2070" format="1">
+<glyph name="uni2070" format="2">
   <advance width="1233"/>
   <unicode hex="2070"/>
   <outline>
     <contour>
-      <point x="586" y="1103" type="curve" name="dv01" smooth="yes"/>
+      <point x="586" y="1103" type="curve" smooth="yes" name="dv01"/>
       <point x="409" y="1103"/>
       <point x="303" y="1188"/>
-      <point x="303" y="1372" type="curve" name="dh01" smooth="yes"/>
+      <point x="303" y="1372" type="curve" smooth="yes" name="dh01"/>
       <point x="303" y="1503"/>
       <point x="356" y="1699"/>
       <point x="433" y="1807" type="curve" smooth="yes"/>
       <point x="508" y="1914"/>
       <point x="622" y="1970"/>
-      <point x="766" y="1970" type="curve" name="dv03" smooth="yes"/>
+      <point x="766" y="1970" type="curve" smooth="yes" name="dv03"/>
       <point x="942" y="1970"/>
       <point x="1050" y="1884"/>
-      <point x="1050" y="1703" type="curve" name="dh06" smooth="yes"/>
+      <point x="1050" y="1703" type="curve" smooth="yes" name="dh06"/>
       <point x="1050" y="1581"/>
       <point x="1000" y="1379"/>
       <point x="917" y="1264" type="curve"/>
@@ -24,22 +24,22 @@
       <point x="734" y="1103"/>
     </contour>
     <contour>
-      <point x="608" y="1241" type="curve" name="hr01" smooth="yes"/>
+      <point x="608" y="1241" type="curve" smooth="yes" name="hr01"/>
       <point x="679" y="1241"/>
       <point x="721" y="1287"/>
       <point x="756" y="1356" type="curve" smooth="yes"/>
       <point x="805" y="1456"/>
       <point x="841" y="1616"/>
-      <point x="841" y="1707" type="curve" name="dh05" smooth="yes"/>
+      <point x="841" y="1707" type="curve" smooth="yes" name="dh05"/>
       <point x="841" y="1791"/>
       <point x="812" y="1831"/>
-      <point x="744" y="1831" type="curve" name="dv02" smooth="yes"/>
+      <point x="744" y="1831" type="curve" smooth="yes" name="dv02"/>
       <point x="677" y="1831"/>
       <point x="632" y="1793"/>
       <point x="595" y="1717" type="curve" smooth="yes"/>
       <point x="549" y="1623"/>
       <point x="511" y="1461"/>
-      <point x="511" y="1366" type="curve" name="dh02" smooth="yes"/>
+      <point x="511" y="1366" type="curve" smooth="yes" name="dh02"/>
       <point x="511" y="1283"/>
       <point x="543" y="1241"/>
     </contour>
@@ -47,13 +47,13 @@
       <point x="674" y="1466" type="curve" smooth="yes"/>
       <point x="626" y="1466"/>
       <point x="586" y="1496"/>
-      <point x="586" y="1535" type="curve" name="dh03" smooth="yes"/>
+      <point x="586" y="1535" type="curve" smooth="yes" name="dh03"/>
       <point x="586" y="1576"/>
       <point x="626" y="1607"/>
-      <point x="674" y="1607" type="curve" name="sv01" smooth="yes"/>
+      <point x="674" y="1607" type="curve" smooth="yes" name="sv01"/>
       <point x="722" y="1607"/>
       <point x="765" y="1576"/>
-      <point x="765" y="1537" type="curve" name="dh04" smooth="yes"/>
+      <point x="765" y="1537" type="curve" smooth="yes" name="dh04"/>
       <point x="765" y="1498"/>
       <point x="725" y="1466"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2074.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2074.glif
index ce50cdaae..2caa571b4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2074.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2074.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2074" format="1">
+<glyph name="uni2074" format="2">
   <advance width="1233"/>
   <unicode hex="2074"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2075.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2075.glif
index eb22eab11..b2be331c5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2075.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2075.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2075" format="1">
+<glyph name="uni2075" format="2">
   <advance width="1233"/>
   <unicode hex="2075"/>
   <outline>
     <contour>
-      <point x="507" y="1103" type="curve" name="hr00" smooth="yes"/>
+      <point x="507" y="1103" type="curve" smooth="yes" name="hr00"/>
       <point x="416" y="1103"/>
       <point x="317" y="1115"/>
       <point x="237" y="1138" type="curve"/>
       <point x="273" y="1287" type="line"/>
       <point x="341" y="1258"/>
       <point x="423" y="1241"/>
-      <point x="508" y="1241" type="curve" name="dv01" smooth="yes"/>
+      <point x="508" y="1241" type="curve" smooth="yes" name="dv01"/>
       <point x="672" y="1241"/>
       <point x="775" y="1304"/>
-      <point x="775" y="1403" type="curve" name="dh01" smooth="yes"/>
+      <point x="775" y="1403" type="curve" smooth="yes" name="dh01"/>
       <point x="775" y="1484"/>
       <point x="707" y="1531"/>
-      <point x="584" y="1531" type="curve" name="dv04" smooth="yes"/>
+      <point x="584" y="1531" type="curve" smooth="yes" name="dv04"/>
       <point x="515" y="1531"/>
       <point x="435" y="1516"/>
       <point x="359" y="1488" type="curve"/>
@@ -28,10 +28,10 @@
       <point x="570" y="1654" type="line" name="iv01"/>
       <point x="601" y="1663"/>
       <point x="634" y="1668"/>
-      <point x="677" y="1668" type="curve" name="dv05" smooth="yes"/>
+      <point x="677" y="1668" type="curve" smooth="yes" name="dv05"/>
       <point x="859" y="1668"/>
       <point x="979" y="1576"/>
-      <point x="979" y="1421" type="curve" name="dh02" smooth="yes"/>
+      <point x="979" y="1421" type="curve" smooth="yes" name="dh02"/>
       <point x="979" y="1232"/>
       <point x="799" y="1103"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2076.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2076.glif
index 2bd0590ed..055cc2e00 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2076.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2076.glif
@@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2076" format="1">
+<glyph name="uni2076" format="2">
   <advance width="1233"/>
   <unicode hex="2076"/>
   <outline>
     <contour>
-      <point x="596" y="1103" type="curve" name="hr00" smooth="yes"/>
+      <point x="596" y="1103" type="curve" smooth="yes" name="hr00"/>
       <point x="397" y="1103"/>
       <point x="289" y="1196"/>
-      <point x="289" y="1391" type="curve" name="sh01" smooth="yes"/>
+      <point x="289" y="1391" type="curve" smooth="yes" name="sh01"/>
       <point x="289" y="1535"/>
       <point x="349" y="1707"/>
       <point x="452" y="1818" type="curve" smooth="yes"/>
       <point x="546" y="1919"/>
       <point x="676" y="1970"/>
-      <point x="843" y="1970" type="curve" name="dv03" smooth="yes"/>
+      <point x="843" y="1970" type="curve" smooth="yes" name="dv03"/>
       <point x="916" y="1970"/>
       <point x="974" y="1960"/>
       <point x="1050" y="1936" type="curve"/>
       <point x="1014" y="1787" type="line"/>
       <point x="958" y="1819"/>
       <point x="889" y="1837"/>
-      <point x="821" y="1837" type="curve" name="dv02" smooth="yes"/>
+      <point x="821" y="1837" type="curve" smooth="yes" name="dv02"/>
       <point x="676" y="1837"/>
       <point x="570" y="1756"/>
       <point x="526" y="1599" type="curve" name="ih01"/>
       <point x="582" y="1644"/>
       <point x="654" y="1672"/>
-      <point x="742" y="1672" type="curve" name="dv05" smooth="yes"/>
+      <point x="742" y="1672" type="curve" smooth="yes" name="dv05"/>
       <point x="897" y="1672"/>
       <point x="996" y="1584"/>
-      <point x="996" y="1434" type="curve" name="sh02" smooth="yes"/>
+      <point x="996" y="1434" type="curve" smooth="yes" name="sh02"/>
       <point x="996" y="1244"/>
       <point x="839" y="1103"/>
     </contour>
     <contour>
-      <point x="609" y="1237" type="curve" name="dv01" smooth="yes"/>
+      <point x="609" y="1237" type="curve" smooth="yes" name="dv01"/>
       <point x="716" y="1237"/>
       <point x="791" y="1329"/>
-      <point x="791" y="1425" type="curve" name="ah01" smooth="yes"/>
+      <point x="791" y="1425" type="curve" smooth="yes" name="ah01"/>
       <point x="791" y="1501"/>
       <point x="744" y="1539"/>
-      <point x="675" y="1539" type="curve" name="dv04" smooth="yes"/>
+      <point x="675" y="1539" type="curve" smooth="yes" name="dv04"/>
       <point x="568" y="1539"/>
       <point x="493" y="1448"/>
-      <point x="493" y="1352" type="curve" name="sh03" smooth="yes"/>
+      <point x="493" y="1352" type="curve" smooth="yes" name="sh03"/>
       <point x="493" y="1276"/>
       <point x="538" y="1237"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2077.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2077.glif
index 7d749d491..d3241e6cb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2077.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2077.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2077" format="1">
+<glyph name="uni2077" format="2">
   <advance width="1233"/>
   <unicode hex="2077"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2078.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2078.glif
index 8a618d2c4..c89c83736 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2078.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2078.glif
@@ -1,59 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2078" format="1">
+<glyph name="uni2078" format="2">
   <advance width="1233"/>
   <unicode hex="2078"/>
   <outline>
     <contour>
-      <point x="596" y="1103" type="curve" name="dv01" smooth="yes"/>
+      <point x="596" y="1103" type="curve" smooth="yes" name="dv01"/>
       <point x="403" y="1103"/>
       <point x="288" y="1180"/>
-      <point x="288" y="1315" type="curve" name="dh01" smooth="yes"/>
+      <point x="288" y="1315" type="curve" smooth="yes" name="dh01"/>
       <point x="288" y="1443"/>
       <point x="391" y="1535"/>
       <point x="551" y="1567" type="curve" name="ih02"/>
       <point x="447" y="1588"/>
       <point x="401" y="1645"/>
-      <point x="401" y="1721" type="curve" name="ih01" smooth="yes"/>
+      <point x="401" y="1721" type="curve" smooth="yes" name="ih01"/>
       <point x="401" y="1860"/>
       <point x="561" y="1970"/>
-      <point x="762" y="1970" type="curve" name="dv04" smooth="yes"/>
+      <point x="762" y="1970" type="curve" smooth="yes" name="dv04"/>
       <point x="933" y="1970"/>
       <point x="1050" y="1890"/>
-      <point x="1050" y="1769" type="curve" name="sh03" smooth="yes"/>
+      <point x="1050" y="1769" type="curve" smooth="yes" name="sh03"/>
       <point x="1050" y="1666"/>
       <point x="963" y="1579"/>
       <point x="817" y="1560" type="curve" name="hr01"/>
       <point x="924" y="1536"/>
       <point x="981" y="1475"/>
-      <point x="981" y="1375" type="curve" name="dh03" smooth="yes"/>
+      <point x="981" y="1375" type="curve" smooth="yes" name="dh03"/>
       <point x="981" y="1212"/>
       <point x="825" y="1103"/>
     </contour>
     <contour>
-      <point x="707" y="1625" type="curve" name="dv06" smooth="yes"/>
+      <point x="707" y="1625" type="curve" smooth="yes" name="dv06"/>
       <point x="793" y="1625"/>
       <point x="865" y="1675"/>
-      <point x="865" y="1746" type="curve" name="sh02" smooth="yes"/>
+      <point x="865" y="1746" type="curve" smooth="yes" name="sh02"/>
       <point x="865" y="1803"/>
       <point x="819" y="1838"/>
-      <point x="744" y="1838" type="curve" name="dv03" smooth="yes"/>
+      <point x="744" y="1838" type="curve" smooth="yes" name="dv03"/>
       <point x="652" y="1838"/>
       <point x="587" y="1787"/>
-      <point x="587" y="1719" type="curve" name="sh01" smooth="yes"/>
+      <point x="587" y="1719" type="curve" smooth="yes" name="sh01"/>
       <point x="587" y="1663"/>
       <point x="631" y="1625"/>
     </contour>
     <contour>
-      <point x="616" y="1236" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1236" type="curve" smooth="yes" name="dv02"/>
       <point x="721" y="1236"/>
       <point x="795" y="1298"/>
-      <point x="795" y="1382" type="curve" name="hr02" smooth="yes"/>
+      <point x="795" y="1382" type="curve" smooth="yes" name="hr02"/>
       <point x="795" y="1454"/>
       <point x="740" y="1493"/>
-      <point x="656" y="1493" type="curve" name="dv05" smooth="yes"/>
+      <point x="656" y="1493" type="curve" smooth="yes" name="dv05"/>
       <point x="547" y="1493"/>
       <point x="474" y="1428"/>
-      <point x="474" y="1347" type="curve" name="dh02" smooth="yes"/>
+      <point x="474" y="1347" type="curve" smooth="yes" name="dh02"/>
       <point x="474" y="1271"/>
       <point x="538" y="1236"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2079.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2079.glif
index 8cdbb35d6..1b55f6f59 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2079.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2079.glif
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2079" format="1">
+<glyph name="uni2079" format="2">
   <advance width="1233"/>
   <unicode hex="2079"/>
   <outline>
     <contour>
-      <point x="496" y="1103" type="curve" name="hr00" smooth="yes"/>
+      <point x="496" y="1103" type="curve" smooth="yes" name="hr00"/>
       <point x="432" y="1103"/>
       <point x="372" y="1109"/>
       <point x="289" y="1136" type="curve"/>
       <point x="325" y="1286" type="line"/>
       <point x="382" y="1253"/>
       <point x="451" y="1236"/>
-      <point x="519" y="1236" type="curve" name="dv01" smooth="yes"/>
+      <point x="519" y="1236" type="curve" smooth="yes" name="dv01"/>
       <point x="668" y="1236"/>
       <point x="769" y="1317"/>
       <point x="814" y="1474" type="curve" name="ih01"/>
       <point x="756" y="1425"/>
       <point x="685" y="1401"/>
-      <point x="600" y="1401" type="curve" name="dv04" smooth="yes"/>
+      <point x="600" y="1401" type="curve" smooth="yes" name="dv04"/>
       <point x="443" y="1401"/>
       <point x="346" y="1488"/>
-      <point x="346" y="1636" type="curve" name="sh01" smooth="yes"/>
+      <point x="346" y="1636" type="curve" smooth="yes" name="sh01"/>
       <point x="346" y="1820"/>
       <point x="495" y="1970"/>
-      <point x="744" y="1970" type="curve" name="dv03" smooth="yes"/>
+      <point x="744" y="1970" type="curve" smooth="yes" name="dv03"/>
       <point x="943" y="1970"/>
       <point x="1050" y="1877"/>
-      <point x="1050" y="1682" type="curve" name="sh02" smooth="yes"/>
+      <point x="1050" y="1682" type="curve" smooth="yes" name="sh02"/>
       <point x="1050" y="1541"/>
       <point x="992" y="1365"/>
       <point x="888" y="1253" type="curve" smooth="yes"/>
@@ -34,16 +34,16 @@
       <point x="663" y="1103"/>
     </contour>
     <contour>
-      <point x="665" y="1533" type="curve" name="dv05" smooth="yes"/>
+      <point x="665" y="1533" type="curve" smooth="yes" name="dv05"/>
       <point x="772" y="1533"/>
       <point x="847" y="1627"/>
-      <point x="847" y="1721" type="curve" name="ah01" smooth="yes"/>
+      <point x="847" y="1721" type="curve" smooth="yes" name="ah01"/>
       <point x="847" y="1798"/>
       <point x="798" y="1836"/>
-      <point x="730" y="1836" type="curve" name="dv02" smooth="yes"/>
+      <point x="730" y="1836" type="curve" smooth="yes" name="dv02"/>
       <point x="627" y="1836"/>
       <point x="551" y="1747"/>
-      <point x="551" y="1648" type="curve" name="sh03" smooth="yes"/>
+      <point x="551" y="1648" type="curve" smooth="yes" name="sh03"/>
       <point x="551" y="1571"/>
       <point x="596" y="1533"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni207A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni207A_.glif
index 588be9938..ade849746 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni207A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni207A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni207A" format="1">
+<glyph name="uni207A" format="2">
   <advance width="1233"/>
   <unicode hex="207A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni207B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni207B_.glif
index b03f6bb9a..0d76a04a0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni207B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni207B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni207B" format="1">
+<glyph name="uni207B" format="2">
   <advance width="1233"/>
   <unicode hex="207B"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni207C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni207C_.glif
index 6ab85d091..f4fcf4ed3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni207C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni207C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni207C" format="1">
+<glyph name="uni207C" format="2">
   <advance width="1233"/>
   <unicode hex="207C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni207D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni207D_.glif
index ff0ae9ec6..ac9973d8c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni207D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni207D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni207D" format="1">
+<glyph name="uni207D" format="2">
   <advance width="1233"/>
   <unicode hex="207D"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="485" y="517" type="line" name="hr00"/>
       <point x="416" y="646"/>
       <point x="383" y="767"/>
-      <point x="383" y="888" type="curve" name="dh01" smooth="yes"/>
+      <point x="383" y="888" type="curve" smooth="yes" name="dh01"/>
       <point x="383" y="1105"/>
       <point x="491" y="1321"/>
       <point x="708" y="1538" type="curve" name="av01"/>
       <point x="850" y="1538" type="line"/>
       <point x="654" y="1306"/>
       <point x="556" y="1081"/>
-      <point x="556" y="862" type="curve" name="dh02" smooth="yes"/>
+      <point x="556" y="862" type="curve" smooth="yes" name="dh02"/>
       <point x="556" y="754"/>
       <point x="579" y="642"/>
       <point x="627" y="517" type="curve" name="av02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni207E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni207E_.glif
index 3d91753c8..564dcc559 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni207E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni207E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni207E" format="1">
+<glyph name="uni207E" format="2">
   <advance width="1233"/>
   <unicode hex="207E"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="383" y="517" type="line" name="hr00"/>
       <point x="579" y="750"/>
       <point x="677" y="975"/>
-      <point x="677" y="1193" type="curve" name="dh01" smooth="yes"/>
+      <point x="677" y="1193" type="curve" smooth="yes" name="dh01"/>
       <point x="677" y="1301"/>
       <point x="654" y="1413"/>
       <point x="606" y="1538" type="curve" name="av01"/>
       <point x="748" y="1538" type="line"/>
       <point x="816" y="1410"/>
       <point x="850" y="1286"/>
-      <point x="850" y="1167" type="curve" name="dh02" smooth="yes"/>
+      <point x="850" y="1167" type="curve" smooth="yes" name="dh02"/>
       <point x="850" y="950"/>
       <point x="742" y="734"/>
       <point x="525" y="517" type="curve" name="av02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni208A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni208A_.glif
index a71322b00..19f859e48 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni208A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni208A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni208A" format="1">
+<glyph name="uni208A" format="2">
   <advance width="1233"/>
   <unicode hex="208A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni208B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni208B_.glif
index d7513cda3..ad53d7a22 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni208B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni208B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni208B" format="1">
+<glyph name="uni208B" format="2">
   <advance width="1233"/>
   <unicode hex="208B"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni208C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni208C_.glif
index bd415ad98..7ab92b57d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni208C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni208C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni208C" format="1">
+<glyph name="uni208C" format="2">
   <advance width="1233"/>
   <unicode hex="208C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni208D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni208D_.glif
index c85168bfb..edaf85252 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni208D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni208D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni208D" format="1">
+<glyph name="uni208D" format="2">
   <advance width="1233"/>
   <unicode hex="208D"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="485" y="-151" type="line" name="hr00"/>
       <point x="416" y="-22"/>
       <point x="383" y="99"/>
-      <point x="383" y="220" type="curve" name="dh01" smooth="yes"/>
+      <point x="383" y="220" type="curve" smooth="yes" name="dh01"/>
       <point x="383" y="437"/>
       <point x="491" y="653"/>
       <point x="708" y="870" type="curve" name="av01"/>
       <point x="850" y="870" type="line"/>
       <point x="654" y="638"/>
       <point x="556" y="413"/>
-      <point x="556" y="194" type="curve" name="dh02" smooth="yes"/>
+      <point x="556" y="194" type="curve" smooth="yes" name="dh02"/>
       <point x="556" y="86"/>
       <point x="579" y="-26"/>
       <point x="627" y="-151" type="curve" name="av02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni208E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni208E_.glif
index 94cd46200..edf60efb4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni208E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni208E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni208E" format="1">
+<glyph name="uni208E" format="2">
   <advance width="1233"/>
   <unicode hex="208E"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="383" y="-151" type="line" name="hr00"/>
       <point x="579" y="82"/>
       <point x="677" y="307"/>
-      <point x="677" y="525" type="curve" name="dh01" smooth="yes"/>
+      <point x="677" y="525" type="curve" smooth="yes" name="dh01"/>
       <point x="677" y="633"/>
       <point x="654" y="745"/>
       <point x="606" y="870" type="curve" name="av01"/>
       <point x="748" y="870" type="line"/>
       <point x="816" y="742"/>
       <point x="850" y="618"/>
-      <point x="850" y="499" type="curve" name="dh02" smooth="yes"/>
+      <point x="850" y="499" type="curve" smooth="yes" name="dh02"/>
       <point x="850" y="282"/>
       <point x="742" y="66"/>
       <point x="525" y="-151" type="curve" name="av02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni20A_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni20A_0.glif
index e9e9245f5..b09e3fc9e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni20A_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni20A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20A0" format="1">
+<glyph name="uni20A0" format="2">
   <advance width="1233"/>
   <unicode hex="20A0"/>
   <outline>
@@ -7,32 +7,32 @@
       <point x="674" y="416" type="line" name="iv01"/>
       <point x="593" y="360"/>
       <point x="508" y="332"/>
-      <point x="419" y="332" type="curve" name="dv01" smooth="yes"/>
+      <point x="419" y="332" type="curve" smooth="yes" name="dv01"/>
       <point x="196" y="332"/>
       <point x="66" y="503"/>
-      <point x="66" y="770" type="curve" name="dh01" smooth="yes"/>
+      <point x="66" y="770" type="curve" smooth="yes" name="dh01"/>
       <point x="66" y="817"/>
       <point x="69" y="868"/>
       <point x="76" y="913" type="curve" name="sh01"/>
       <point x="121" y="1261"/>
       <point x="316" y="1494"/>
-      <point x="577" y="1494" type="curve" name="at01" smooth="yes"/>
+      <point x="577" y="1494" type="curve" smooth="yes" name="at01"/>
       <point x="668" y="1494"/>
       <point x="741" y="1467"/>
       <point x="809" y="1411" type="curve"/>
       <point x="777" y="1179" type="line" name="iv02"/>
       <point x="717" y="1247"/>
       <point x="649" y="1285"/>
-      <point x="572" y="1285" type="curve" name="sv01" smooth="yes"/>
+      <point x="572" y="1285" type="curve" smooth="yes" name="sv01"/>
       <point x="424" y="1285"/>
       <point x="313" y="1145"/>
-      <point x="284" y="913" type="curve" name="sh02" smooth="yes"/>
+      <point x="284" y="913" type="curve" smooth="yes" name="sh02"/>
       <point x="280" y="881"/>
       <point x="277" y="843"/>
-      <point x="277" y="808" type="curve" name="dh02" smooth="yes"/>
+      <point x="277" y="808" type="curve" smooth="yes" name="dh02"/>
       <point x="277" y="640"/>
       <point x="344" y="542"/>
-      <point x="469" y="542" type="curve" name="dv02" smooth="yes"/>
+      <point x="469" y="542" type="curve" smooth="yes" name="dv02"/>
       <point x="545" y="542"/>
       <point x="624" y="577"/>
       <point x="705" y="647" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni20A_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni20A_2.glif
index ea4fa417c..d00dd76c0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni20A_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni20A_2.glif
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20A2" format="1">
+<glyph name="uni20A2" format="2">
   <advance width="1233"/>
   <unicode hex="20A2"/>
   <outline>
     <contour>
-      <point x="611" y="-29" type="curve" name="av01" smooth="yes"/>
+      <point x="611" y="-29" type="curve" smooth="yes" name="av01"/>
       <point x="280" y="-29"/>
       <point x="66" y="201"/>
-      <point x="66" y="591" type="curve" name="dh01" smooth="yes"/>
+      <point x="66" y="591" type="curve" smooth="yes" name="dh01"/>
       <point x="66" y="802"/>
       <point x="129" y="1024"/>
       <point x="252" y="1200" type="curve" smooth="yes"/>
       <point x="397" y="1406"/>
       <point x="608" y="1520"/>
-      <point x="839" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="839" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="970" y="1520"/>
       <point x="1097" y="1485"/>
       <point x="1230" y="1409" type="curve"/>
       <point x="1179" y="1100" type="line" name="iv01"/>
       <point x="1071" y="1201"/>
       <point x="959" y="1241"/>
-      <point x="856" y="1241" type="curve" name="sv01" smooth="yes"/>
+      <point x="856" y="1241" type="curve" smooth="yes" name="sv01"/>
       <point x="592" y="1241"/>
       <point x="398" y="975"/>
-      <point x="398" y="627" type="curve" name="dh02" smooth="yes"/>
+      <point x="398" y="627" type="curve" smooth="yes" name="dh02"/>
       <point x="398" y="496"/>
       <point x="425" y="415"/>
       <point x="478" y="348" type="curve" smooth="yes"/>
@@ -35,14 +35,14 @@
       <point x="886" y="835" type="line"/>
       <point x="954" y="960"/>
       <point x="1062" y="1032"/>
-      <point x="1191" y="1032" type="curve" name="sv02" smooth="yes"/>
+      <point x="1191" y="1032" type="curve" smooth="yes" name="sv02"/>
       <point x="1214" y="1032"/>
       <point x="1235" y="1030"/>
       <point x="1267" y="1025" type="curve" name="sv03"/>
       <point x="1221" y="734" type="line"/>
       <point x="1184" y="758"/>
       <point x="1140" y="772"/>
-      <point x="1089" y="772" type="curve" name="dv01" smooth="yes"/>
+      <point x="1089" y="772" type="curve" smooth="yes" name="dv01"/>
       <point x="952" y="772"/>
       <point x="860" y="667"/>
       <point x="827" y="464" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni20A_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni20A_5.glif
index 9a4693b62..fa0292b36 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni20A_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni20A_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20A5" format="1">
+<glyph name="uni20A5" format="2">
   <advance width="1233"/>
   <unicode hex="20A5"/>
   <outline>
@@ -14,7 +14,7 @@
       <point x="509" y="824" type="curve" smooth="yes"/>
       <point x="502" y="856"/>
       <point x="480" y="877"/>
-      <point x="444" y="877" type="curve" name="sv01" smooth="yes"/>
+      <point x="444" y="877" type="curve" smooth="yes" name="sv01"/>
       <point x="401" y="877"/>
       <point x="364" y="849"/>
       <point x="334" y="792" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="319" y="956" type="line" name="iv01"/>
       <point x="390" y="1083"/>
       <point x="469" y="1147"/>
-      <point x="555" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="555" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="652" y="1147"/>
       <point x="718" y="1072"/>
       <point x="741" y="939" type="curve" name="iv02"/>
@@ -37,34 +37,34 @@
       <point x="934" y="1136" type="line" name="at03"/>
       <point x="955" y="1143"/>
       <point x="975" y="1147"/>
-      <point x="999" y="1147" type="curve" name="at04" smooth="yes"/>
+      <point x="999" y="1147" type="curve" smooth="yes" name="at04"/>
       <point x="1130" y="1147"/>
       <point x="1198" y="1034"/>
-      <point x="1198" y="835" type="curve" name="dh02" smooth="yes"/>
+      <point x="1198" y="835" type="curve" smooth="yes" name="dh02"/>
       <point x="1198" y="787"/>
       <point x="1195" y="733"/>
-      <point x="1188" y="682" type="curve" name="sh01" smooth="yes"/>
+      <point x="1188" y="682" type="curve" smooth="yes" name="sh01"/>
       <point x="1104" y="0" type="line" name="ab02"/>
       <point x="879" y="0" type="line"/>
       <point x="951" y="584" type="line"/>
       <point x="955" y="610" type="line" name="sh02"/>
-      <point x="960" y="651" type="line" name="hr01" smooth="yes"/>
+      <point x="960" y="651" type="line" smooth="yes" name="hr01"/>
       <point x="963" y="676"/>
       <point x="967" y="722"/>
-      <point x="967" y="754" type="curve" name="dh01" smooth="yes"/>
+      <point x="967" y="754" type="curve" smooth="yes" name="dh01"/>
       <point x="967" y="781"/>
       <point x="964" y="804"/>
       <point x="959" y="824" type="curve" smooth="yes"/>
       <point x="949" y="859"/>
       <point x="928" y="877"/>
-      <point x="895" y="877" type="curve" name="sv02" smooth="yes"/>
+      <point x="895" y="877" type="curve" smooth="yes" name="sv02"/>
       <point x="853" y="877"/>
       <point x="817" y="849"/>
       <point x="786" y="793" type="curve"/>
       <point x="772" y="764" type="line"/>
       <point x="749" y="708"/>
       <point x="732" y="634"/>
-      <point x="721" y="550" type="curve" name="hr02" smooth="yes"/>
+      <point x="721" y="550" type="curve" smooth="yes" name="hr02"/>
       <point x="654" y="0" type="line" name="ab03"/>
       <point x="440" y="0" type="line"/>
       <point x="358" y="-190" type="line" name="av01"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni20A_6.glif b/source/Hack-BoldItalic.ufo/glyphs/uni20A_6.glif
index 7a4ad37db..5cc18da21 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni20A_6.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni20A_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20A6" format="1">
+<glyph name="uni20A6" format="2">
   <advance width="1233"/>
   <unicode hex="20A6"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni20A_8.glif b/source/Hack-BoldItalic.ufo/glyphs/uni20A_8.glif
index a7a157a8a..2c612259a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni20A_8.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni20A_8.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20A8" format="1">
+<glyph name="uni20A8" format="2">
   <advance width="1233"/>
   <unicode hex="20A8"/>
   <outline>
     <contour>
-      <point x="871" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="871" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="828" y="-29"/>
       <point x="795" y="-23"/>
-      <point x="752" y="-11" type="curve" name="ab01" smooth="yes"/>
+      <point x="752" y="-11" type="curve" smooth="yes" name="ab01"/>
       <point x="737" y="-7"/>
       <point x="724" y="-3"/>
       <point x="711" y="2" type="curve"/>
@@ -27,10 +27,10 @@
       <point x="463" y="1493" type="line" smooth="yes"/>
       <point x="646" y="1493"/>
       <point x="728" y="1398"/>
-      <point x="728" y="1185" type="curve" name="dh02" smooth="yes"/>
+      <point x="728" y="1185" type="curve" smooth="yes" name="dh02"/>
       <point x="728" y="1152"/>
       <point x="726" y="1118"/>
-      <point x="722" y="1081" type="curve" name="sh01" smooth="yes"/>
+      <point x="722" y="1081" type="curve" smooth="yes" name="sh01"/>
       <point x="702" y="894"/>
       <point x="647" y="763"/>
       <point x="531" y="698" type="curve" name="ih01"/>
@@ -43,46 +43,46 @@
       <point x="663" y="306" type="line"/>
       <point x="727" y="242"/>
       <point x="805" y="209"/>
-      <point x="877" y="209" type="curve" name="dv02" smooth="yes"/>
+      <point x="877" y="209" type="curve" smooth="yes" name="dv02"/>
       <point x="962" y="209"/>
       <point x="1006" y="255"/>
-      <point x="1006" y="342" type="curve" name="dh03" smooth="yes"/>
+      <point x="1006" y="342" type="curve" smooth="yes" name="dh03"/>
       <point x="1006" y="395"/>
       <point x="989" y="416"/>
       <point x="920" y="432" type="curve" smooth="yes"/>
       <point x="888" y="440" type="line" smooth="yes"/>
       <point x="748" y="475"/>
       <point x="692" y="551"/>
-      <point x="692" y="706" type="curve" name="ih02" smooth="yes"/>
+      <point x="692" y="706" type="curve" smooth="yes" name="ih02"/>
       <point x="692" y="735"/>
       <point x="694" y="764"/>
-      <point x="697" y="797" type="curve" name="sh02" smooth="yes"/>
+      <point x="697" y="797" type="curve" smooth="yes" name="sh02"/>
       <point x="720" y="1030"/>
       <point x="819" y="1147"/>
-      <point x="994" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="994" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1066" y="1147"/>
       <point x="1138" y="1128"/>
       <point x="1223" y="1085" type="curve"/>
       <point x="1195" y="813" type="line" name="sh03"/>
       <point x="1120" y="877"/>
       <point x="1049" y="909"/>
-      <point x="982" y="909" type="curve" name="hr02" smooth="yes"/>
+      <point x="982" y="909" type="curve" smooth="yes" name="hr02"/>
       <point x="913" y="909"/>
       <point x="869" y="875"/>
       <point x="864" y="806" type="curve" name="sh05"/>
       <point x="864" y="803"/>
       <point x="863" y="791"/>
-      <point x="863" y="783" type="curve" name="sh04" smooth="yes"/>
+      <point x="863" y="783" type="curve" smooth="yes" name="sh04"/>
       <point x="863" y="744"/>
       <point x="886" y="718"/>
       <point x="945" y="705" type="curve"/>
       <point x="977" y="696" type="line" smooth="yes"/>
       <point x="1140" y="651"/>
       <point x="1191" y="590"/>
-      <point x="1191" y="429" type="curve" name="dh04" smooth="yes"/>
+      <point x="1191" y="429" type="curve" smooth="yes" name="dh04"/>
       <point x="1191" y="400"/>
       <point x="1189" y="367"/>
-      <point x="1185" y="330" type="curve" name="sh06" smooth="yes"/>
+      <point x="1185" y="330" type="curve" smooth="yes" name="sh06"/>
       <point x="1158" y="98"/>
       <point x="1064" y="-29"/>
     </contour>
@@ -90,13 +90,13 @@
       <point x="374" y="831" type="line" smooth="yes"/>
       <point x="459" y="831"/>
       <point x="500" y="891"/>
-      <point x="513" y="1024" type="curve" name="sh07" smooth="yes"/>
+      <point x="513" y="1024" type="curve" smooth="yes" name="sh07"/>
       <point x="515" y="1045"/>
       <point x="516" y="1064"/>
-      <point x="516" y="1081" type="curve" name="dh01" smooth="yes"/>
+      <point x="516" y="1081" type="curve" smooth="yes" name="dh01"/>
       <point x="516" y="1176"/>
       <point x="485" y="1214"/>
-      <point x="413" y="1214" type="curve" name="sv01" smooth="yes"/>
+      <point x="413" y="1214" type="curve" smooth="yes" name="sv01"/>
       <point x="328" y="1214" type="line"/>
       <point x="288" y="831" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni20A_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni20A_9.glif
index 033e68f5a..d32c08f4f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni20A_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni20A_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20A9" format="1">
+<glyph name="uni20A9" format="2">
   <advance width="1233"/>
   <unicode hex="20A9"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni20A_A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni20A_A_.glif
index 90bdaa92e..8db0ffe4e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni20A_A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni20A_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20AA" format="1">
+<glyph name="uni20AA" format="2">
   <advance width="1233"/>
   <unicode hex="20AA"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="607" y="1493" type="line" smooth="yes"/>
       <point x="816" y="1493"/>
       <point x="921" y="1364"/>
-      <point x="921" y="1107" type="curve" name="sh01" smooth="yes"/>
+      <point x="921" y="1107" type="curve" smooth="yes" name="sh01"/>
       <point x="921" y="1035"/>
       <point x="913" y="958"/>
       <point x="898" y="866" type="curve" name="hr01"/>
@@ -17,10 +17,10 @@
       <point x="722" y="866" type="line" smooth="yes"/>
       <point x="734" y="938"/>
       <point x="742" y="996"/>
-      <point x="742" y="1045" type="curve" name="ah01" smooth="yes"/>
+      <point x="742" y="1045" type="curve" smooth="yes" name="ah01"/>
       <point x="742" y="1161"/>
       <point x="698" y="1210"/>
-      <point x="589" y="1210" type="curve" name="sv01" smooth="yes"/>
+      <point x="589" y="1210" type="curve" smooth="yes" name="sv01"/>
       <point x="400" y="1210" type="line"/>
       <point x="189" y="-28" type="line" name="hr02"/>
       <point x="-49" y="-28" type="line" name="sv02"/>
@@ -29,7 +29,7 @@
       <point x="685" y="-28" type="line" name="hr03"/>
       <point x="473" y="-28"/>
       <point x="370" y="95"/>
-      <point x="370" y="355" type="curve" name="sh02" smooth="yes"/>
+      <point x="370" y="355" type="curve" smooth="yes" name="sh02"/>
       <point x="370" y="427"/>
       <point x="378" y="503"/>
       <point x="394" y="598" type="curve" smooth="yes"/>
@@ -38,10 +38,10 @@
       <point x="570" y="598" type="line" smooth="yes"/>
       <point x="558" y="527"/>
       <point x="550" y="472"/>
-      <point x="550" y="420" type="curve" name="sh03" smooth="yes"/>
+      <point x="550" y="420" type="curve" smooth="yes" name="sh03"/>
       <point x="550" y="303"/>
       <point x="590" y="254"/>
-      <point x="702" y="254" type="curve" name="dv01" smooth="yes"/>
+      <point x="702" y="254" type="curve" smooth="yes" name="dv01"/>
       <point x="892" y="254" type="line"/>
       <point x="1102" y="1493" type="line" name="at02"/>
       <point x="1341" y="1493" type="line"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni20A_D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni20A_D_.glif
index 3ae708968..f4fd130d8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni20A_D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni20A_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20AD" format="1">
+<glyph name="uni20AD" format="2">
   <advance width="1233"/>
   <unicode hex="20AD"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni20A_E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni20A_E_.glif
index 84c1e7c68..b72fab4f8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni20A_E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni20A_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20AE" format="1">
+<glyph name="uni20AE" format="2">
   <advance width="1233"/>
   <unicode hex="20AE"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni20A_F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni20A_F_.glif
index 428201cbe..b010eb1d2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni20A_F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni20A_F_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20AF" format="1">
+<glyph name="uni20AF" format="2">
   <advance width="1233"/>
   <unicode hex="20AF"/>
   <outline>
     <contour>
-      <point x="140" y="-29" type="curve" name="sv01" smooth="yes"/>
+      <point x="140" y="-29" type="curve" smooth="yes" name="sv01"/>
       <point x="40" y="-29"/>
       <point x="0" y="66"/>
       <point x="0" y="157" type="curve" smooth="yes"/>
@@ -13,7 +13,7 @@
       <point x="2" y="198" type="curve" smooth="yes"/>
       <point x="13" y="321"/>
       <point x="76" y="434"/>
-      <point x="177" y="434" type="curve" name="sv02" smooth="yes"/>
+      <point x="177" y="434" type="curve" smooth="yes" name="sv02"/>
       <point x="198" y="434"/>
       <point x="221" y="429"/>
       <point x="240" y="418" type="curve"/>
@@ -33,13 +33,13 @@
       <point x="372" y="1456" type="curve"/>
       <point x="419" y="1500"/>
       <point x="481" y="1520"/>
-      <point x="553" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="553" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="702" y="1520"/>
       <point x="801" y="1433"/>
       <point x="857" y="1288" type="curve"/>
       <point x="903" y="1165"/>
       <point x="906" y="1033"/>
-      <point x="906" y="981" type="curve" name="dh02" smooth="yes"/>
+      <point x="906" y="981" type="curve" smooth="yes" name="dh02"/>
       <point x="906" y="897"/>
       <point x="899" y="751"/>
       <point x="856" y="563" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="651" y="76" type="curve" smooth="yes"/>
       <point x="595" y="8"/>
       <point x="530" y="-29"/>
-      <point x="466" y="-29" type="curve" name="sv03" smooth="yes"/>
+      <point x="466" y="-29" type="curve" smooth="yes" name="sv03"/>
       <point x="425" y="-29"/>
       <point x="392" y="-15"/>
       <point x="363" y="12" type="curve" smooth="yes"/>
@@ -66,19 +66,19 @@
       <point x="196" y="-29"/>
     </contour>
     <contour>
-      <point x="482" y="181" type="curve" name="sv04" smooth="yes"/>
+      <point x="482" y="181" type="curve" smooth="yes" name="sv04"/>
       <point x="552" y="181"/>
       <point x="612" y="276"/>
       <point x="660" y="412" type="curve" smooth="yes"/>
       <point x="698" y="520"/>
       <point x="736" y="679"/>
-      <point x="749" y="808" type="curve" name="sh01" smooth="yes"/>
+      <point x="749" y="808" type="curve" smooth="yes" name="sh01"/>
       <point x="753" y="848"/>
       <point x="756" y="901"/>
-      <point x="756" y="942" type="curve" name="dh01" smooth="yes"/>
+      <point x="756" y="942" type="curve" smooth="yes" name="dh01"/>
       <point x="756" y="965"/>
       <point x="755" y="1062"/>
-      <point x="728" y="1147" type="curve" name="hr01" smooth="yes"/>
+      <point x="728" y="1147" type="curve" smooth="yes" name="hr01"/>
       <point x="700" y="1236"/>
       <point x="648" y="1300"/>
       <point x="580" y="1308" type="curve"/>
@@ -98,7 +98,7 @@
       <point x="1058" y="718" type="curve" smooth="yes"/>
       <point x="1086" y="749"/>
       <point x="1120" y="773"/>
-      <point x="1163" y="773" type="curve" name="dv04" smooth="yes"/>
+      <point x="1163" y="773" type="curve" smooth="yes" name="dv04"/>
       <point x="1222" y="773"/>
       <point x="1267" y="730"/>
       <point x="1290" y="654" type="curve" smooth="yes"/>
@@ -113,14 +113,14 @@
       <point x="1252" y="190" type="curve" smooth="yes"/>
       <point x="1201" y="46"/>
       <point x="1128" y="-29"/>
-      <point x="1053" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="1053" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="1008" y="-29"/>
       <point x="981" y="-1"/>
       <point x="962" y="83" type="curve" name="iv02"/>
       <point x="840" y="-457" type="line" name="av01"/>
     </contour>
     <contour>
-      <point x="1064" y="149" type="curve" name="dv02" smooth="yes"/>
+      <point x="1064" y="149" type="curve" smooth="yes" name="dv02"/>
       <point x="1087" y="149"/>
       <point x="1114" y="171"/>
       <point x="1138" y="218" type="curve" smooth="yes"/>
@@ -132,7 +132,7 @@
       <point x="1193" y="480" type="curve" smooth="yes"/>
       <point x="1193" y="515"/>
       <point x="1187" y="579"/>
-      <point x="1151" y="579" type="curve" name="dv03" smooth="yes"/>
+      <point x="1151" y="579" type="curve" smooth="yes" name="dv03"/>
       <point x="1124" y="579"/>
       <point x="1091" y="548"/>
       <point x="1063" y="473" type="curve" smooth="yes"/>
@@ -146,7 +146,7 @@
       <point x="1025" y="149"/>
     </contour>
     <contour>
-      <point x="146" y="154" type="curve" name="sv05" smooth="yes"/>
+      <point x="146" y="154" type="curve" smooth="yes" name="sv05"/>
       <point x="162" y="154"/>
       <point x="171" y="169"/>
       <point x="184" y="218" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni20B_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni20B_0.glif
index 326f8781c..47bfbd50c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni20B_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni20B_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B0" format="1">
+<glyph name="uni20B0" format="2">
   <advance width="1233"/>
   <unicode hex="20B0"/>
   <outline>
@@ -10,26 +10,26 @@
       <point x="927" y="414" type="curve" smooth="yes"/>
       <point x="930" y="427"/>
       <point x="931" y="440"/>
-      <point x="931" y="452" type="curve" name="dh03" smooth="yes"/>
+      <point x="931" y="452" type="curve" smooth="yes" name="dh03"/>
       <point x="931" y="493"/>
       <point x="917" y="531"/>
       <point x="890" y="566" type="curve"/>
       <point x="798" y="485"/>
       <point x="700" y="450"/>
-      <point x="609" y="450" type="curve" name="dv02" smooth="yes"/>
+      <point x="609" y="450" type="curve" smooth="yes" name="dv02"/>
       <point x="516" y="450"/>
       <point x="472" y="487"/>
       <point x="429" y="554" type="curve" smooth="yes"/>
       <point x="410" y="583"/>
       <point x="380" y="634"/>
-      <point x="343" y="634" type="curve" name="sv01" smooth="yes"/>
+      <point x="343" y="634" type="curve" smooth="yes" name="sv01"/>
       <point x="311" y="634"/>
       <point x="261" y="594"/>
       <point x="177" y="490" type="curve"/>
       <point x="3" y="622" type="line"/>
       <point x="155" y="817"/>
       <point x="263" y="892"/>
-      <point x="376" y="892" type="curve" name="hr01" smooth="yes"/>
+      <point x="376" y="892" type="curve" smooth="yes" name="hr01"/>
       <point x="440" y="892"/>
       <point x="498" y="868"/>
       <point x="537" y="824" type="curve" smooth="yes"/>
@@ -41,16 +41,16 @@
       <point x="724" y="743" type="curve" name="hr02"/>
       <point x="640" y="835"/>
       <point x="600" y="946"/>
-      <point x="600" y="1054" type="curve" name="dh01" smooth="yes"/>
+      <point x="600" y="1054" type="curve" smooth="yes" name="dh01"/>
       <point x="600" y="1085"/>
       <point x="602" y="1125"/>
       <point x="609" y="1164" type="curve" name="sh01"/>
       <point x="641" y="1377"/>
       <point x="778" y="1520"/>
-      <point x="1007" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="1007" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1218" y="1520"/>
       <point x="1283" y="1399"/>
-      <point x="1283" y="1272" type="curve" name="sh02" smooth="yes"/>
+      <point x="1283" y="1272" type="curve" smooth="yes" name="sh02"/>
       <point x="1283" y="1240"/>
       <point x="1279" y="1204"/>
       <point x="1272" y="1164" type="curve" smooth="yes"/>
@@ -59,7 +59,7 @@
       <point x="1097" y="766" type="curve"/>
       <point x="1170" y="678"/>
       <point x="1206" y="589"/>
-      <point x="1206" y="486" type="curve" name="dh04" smooth="yes"/>
+      <point x="1206" y="486" type="curve" smooth="yes" name="dh04"/>
       <point x="1206" y="462"/>
       <point x="1204" y="440"/>
       <point x="1199" y="412" type="curve" smooth="yes"/>
@@ -74,16 +74,16 @@
       <point x="1016" y="1164" type="curve" smooth="yes"/>
       <point x="1020" y="1188"/>
       <point x="1022" y="1209"/>
-      <point x="1022" y="1228" type="curve" name="hr03" smooth="yes"/>
+      <point x="1022" y="1228" type="curve" smooth="yes" name="hr03"/>
       <point x="1022" y="1267"/>
       <point x="1010" y="1336"/>
-      <point x="965" y="1336" type="curve" name="sv02" smooth="yes"/>
+      <point x="965" y="1336" type="curve" smooth="yes" name="sv02"/>
       <point x="913" y="1336"/>
       <point x="868" y="1255"/>
       <point x="852" y="1164" type="curve" smooth="yes"/>
       <point x="848" y="1141"/>
       <point x="846" y="1119"/>
-      <point x="846" y="1098" type="curve" name="dh02" smooth="yes"/>
+      <point x="846" y="1098" type="curve" smooth="yes" name="dh02"/>
       <point x="846" y="1027"/>
       <point x="870" y="970"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni20B_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni20B_1.glif
index eeed79feb..8240f5b05 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni20B_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni20B_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B1" format="1">
+<glyph name="uni20B1" format="2">
   <advance width="1233"/>
   <unicode hex="20B1"/>
   <outline>
@@ -31,7 +31,7 @@
       <point x="885" y="600" type="curve" smooth="yes"/>
       <point x="807" y="573"/>
       <point x="707" y="559"/>
-      <point x="584" y="559" type="curve" name="dv01" smooth="yes"/>
+      <point x="584" y="559" type="curve" smooth="yes" name="dv01"/>
       <point x="420" y="559" type="line"/>
       <point x="311" y="0" type="line" name="ab01"/>
       <point x="16" y="0" type="line"/>
@@ -40,7 +40,7 @@
       <point x="894" y="1143" type="line" name="at04"/>
       <point x="873" y="1211"/>
       <point x="799" y="1245"/>
-      <point x="674" y="1245" type="curve" name="sv06" smooth="yes"/>
+      <point x="674" y="1245" type="curve" smooth="yes" name="sv06"/>
       <point x="553" y="1245" type="line"/>
       <point x="533" y="1143" type="line"/>
     </contour>
@@ -53,7 +53,7 @@
       <point x="502" y="981" type="line"/>
     </contour>
     <contour>
-      <point x="612" y="807" type="line" name="dv02" smooth="yes"/>
+      <point x="612" y="807" type="line" smooth="yes" name="dv02"/>
       <point x="731" y="807"/>
       <point x="814" y="841"/>
       <point x="860" y="909" type="curve" name="sv10"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni20B_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni20B_2.glif
index b30b1c1cc..ad1d4db39 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni20B_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni20B_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B2" format="1">
+<glyph name="uni20B2" format="2">
   <advance width="1233"/>
   <unicode hex="20B2"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="470" y="-22" type="line" name="hr00"/>
       <point x="194" y="18"/>
       <point x="69" y="249"/>
-      <point x="69" y="529" type="curve" name="dh01" smooth="yes"/>
+      <point x="69" y="529" type="curve" smooth="yes" name="dh01"/>
       <point x="69" y="596"/>
       <point x="76" y="668"/>
       <point x="90" y="745" type="curve" smooth="yes"/>
@@ -52,7 +52,7 @@
       <point x="353" y="745" type="curve" smooth="yes"/>
       <point x="342" y="680"/>
       <point x="336" y="624"/>
-      <point x="336" y="569" type="curve" name="dh02" smooth="yes"/>
+      <point x="336" y="569" type="curve" smooth="yes" name="dh02"/>
       <point x="336" y="386"/>
       <point x="401" y="268"/>
       <point x="513" y="223" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni20B_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni20B_3.glif
index 72021ac9e..c13f692b0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni20B_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni20B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B3" format="1">
+<glyph name="uni20B3" format="2">
   <advance width="1233"/>
   <unicode hex="20B3"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni20B_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni20B_4.glif
index 0d62e7989..07f39cced 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni20B_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni20B_4.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B4" format="1">
+<glyph name="uni20B4" format="2">
   <advance width="1233"/>
   <unicode hex="20B4"/>
   <outline>
     <contour>
-      <point x="505" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="505" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="212" y="-29"/>
       <point x="54" y="79"/>
-      <point x="54" y="302" type="curve" name="sh01" smooth="yes"/>
+      <point x="54" y="302" type="curve" smooth="yes" name="sh01"/>
       <point x="54" y="342"/>
       <point x="59" y="373"/>
-      <point x="67" y="420" type="curve" name="sh02" smooth="yes"/>
+      <point x="67" y="420" type="curve" smooth="yes" name="sh02"/>
       <point x="70" y="438" type="line" name="dv02"/>
       <point x="-59" y="438" type="line"/>
       <point x="-21" y="632" type="line"/>
@@ -26,26 +26,26 @@
       <point x="872" y="1055" type="line" name="dv05"/>
       <point x="881" y="1070"/>
       <point x="889" y="1089"/>
-      <point x="893" y="1110" type="curve" name="sh05" smooth="yes"/>
+      <point x="893" y="1110" type="curve" smooth="yes" name="sh05"/>
       <point x="896" y="1121"/>
       <point x="897" y="1134"/>
-      <point x="897" y="1149" type="curve" name="ah01" smooth="yes"/>
+      <point x="897" y="1149" type="curve" smooth="yes" name="ah01"/>
       <point x="897" y="1229"/>
       <point x="830" y="1276"/>
-      <point x="703" y="1276" type="curve" name="sv01" smooth="yes"/>
+      <point x="703" y="1276" type="curve" smooth="yes" name="sv01"/>
       <point x="575" y="1276"/>
       <point x="435" y="1228"/>
       <point x="290" y="1139" type="curve" name="ih02"/>
       <point x="346" y="1427" type="line" name="sh07"/>
       <point x="494" y="1488"/>
       <point x="638" y="1520"/>
-      <point x="774" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="774" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1042" y="1520"/>
       <point x="1187" y="1397"/>
-      <point x="1187" y="1184" type="curve" name="sh03" smooth="yes"/>
+      <point x="1187" y="1184" type="curve" smooth="yes" name="sh03"/>
       <point x="1187" y="1153"/>
       <point x="1184" y="1120"/>
-      <point x="1177" y="1085" type="curve" name="sh08" smooth="yes"/>
+      <point x="1177" y="1085" type="curve" smooth="yes" name="sh08"/>
       <point x="1174" y="1074"/>
       <point x="1173" y="1066"/>
       <point x="1170" y="1055" type="curve" name="sv02"/>
@@ -64,13 +64,13 @@
       <point x="372" y="438" type="line" name="sh10"/>
       <point x="368" y="427"/>
       <point x="365" y="415"/>
-      <point x="362" y="403" type="curve" name="sh11" smooth="yes"/>
+      <point x="362" y="403" type="curve" smooth="yes" name="sh11"/>
       <point x="359" y="388"/>
       <point x="358" y="374"/>
-      <point x="358" y="362" type="curve" name="sh06" smooth="yes"/>
+      <point x="358" y="362" type="curve" smooth="yes" name="sh06"/>
       <point x="358" y="267"/>
       <point x="424" y="215"/>
-      <point x="560" y="215" type="curve" name="dv01" smooth="yes"/>
+      <point x="560" y="215" type="curve" smooth="yes" name="dv01"/>
       <point x="699" y="215"/>
       <point x="858" y="270"/>
       <point x="1034" y="381" type="curve" name="ih04"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni20B_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni20B_5.glif
index 1859cd9a0..ff1321db2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni20B_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni20B_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B5" format="1">
+<glyph name="uni20B5" format="2">
   <advance width="1233"/>
   <unicode hex="20B5"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="585" y="-27" type="line" name="hr00"/>
       <point x="351" y="-11"/>
       <point x="38" y="120"/>
-      <point x="38" y="505" type="curve" name="dh01" smooth="yes"/>
+      <point x="38" y="505" type="curve" smooth="yes" name="dh01"/>
       <point x="38" y="554"/>
       <point x="43" y="612"/>
       <point x="55" y="673" type="curve" smooth="yes"/>
@@ -48,7 +48,7 @@
       <point x="686" y="1046" type="curve" smooth="yes"/>
       <point x="530" y="951"/>
       <point x="431" y="751"/>
-      <point x="431" y="575" type="curve" name="dh02" smooth="yes"/>
+      <point x="431" y="575" type="curve" smooth="yes" name="dh02"/>
       <point x="431" y="466"/>
       <point x="469" y="359"/>
       <point x="545" y="294" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni20B_7.glif b/source/Hack-BoldItalic.ufo/glyphs/uni20B_7.glif
index 3881e5f68..fa50f7f4a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni20B_7.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni20B_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B7" format="1">
+<glyph name="uni20B7" format="2">
   <advance width="1233"/>
   <unicode hex="20B7"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni20B_8.glif b/source/Hack-BoldItalic.ufo/glyphs/uni20B_8.glif
index ddf3d173e..5ce119963 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni20B_8.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni20B_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B8" format="1">
+<glyph name="uni20B8" format="2">
   <advance width="1233"/>
   <unicode hex="20B8"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni20B_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni20B_9.glif
index 5f9959ec3..5b6e473bc 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni20B_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni20B_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B9" format="1">
+<glyph name="uni20B9" format="2">
   <advance width="1233"/>
   <unicode hex="20B9"/>
   <outline>
@@ -8,10 +8,10 @@
       <point x="433" y="421" type="line" smooth="yes"/>
       <point x="402" y="534"/>
       <point x="351" y="590"/>
-      <point x="280" y="590" type="curve" name="dv03" smooth="yes"/>
+      <point x="280" y="590" type="curve" smooth="yes" name="dv03"/>
       <point x="114" y="590" type="line"/>
       <point x="162" y="838" type="line"/>
-      <point x="373" y="838" type="line" name="dv04" smooth="yes"/>
+      <point x="373" y="838" type="line" smooth="yes" name="dv04"/>
       <point x="453" y="838"/>
       <point x="515" y="859"/>
       <point x="558" y="900" type="curve" smooth="yes"/>
@@ -26,7 +26,7 @@
       <point x="625" y="1239" type="curve" smooth="yes"/>
       <point x="598" y="1278"/>
       <point x="543" y="1298"/>
-      <point x="462" y="1298" type="curve" name="sv01" smooth="yes"/>
+      <point x="462" y="1298" type="curve" smooth="yes" name="sv01"/>
       <point x="210" y="1298" type="line"/>
       <point x="336" y="1493" type="line" name="at01"/>
       <point x="1291" y="1493" type="line"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2116.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2116.glif
index e58a50260..5ca339cea 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2116.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2116.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2116" format="1">
+<glyph name="uni2116" format="2">
   <advance width="1233"/>
   <unicode hex="2116"/>
   <outline>
@@ -28,7 +28,7 @@
       <point x="1286" y="1364" type="curve"/>
       <point x="1258" y="1443"/>
       <point x="1209" y="1492"/>
-      <point x="1134" y="1492" type="curve" name="hr01" smooth="yes"/>
+      <point x="1134" y="1492" type="curve" smooth="yes" name="hr01"/>
       <point x="1067" y="1492"/>
       <point x="999" y="1450"/>
       <point x="932" y="1365" type="curve"/>
@@ -57,7 +57,7 @@
       <point x="1097" y="1277" type="curve" smooth="yes"/>
       <point x="1134" y="1277"/>
       <point x="1158" y="1223"/>
-      <point x="1158" y="1143" type="curve" name="hr02" smooth="yes"/>
+      <point x="1158" y="1143" type="curve" smooth="yes" name="hr02"/>
       <point x="1158" y="1118"/>
       <point x="1155" y="1086"/>
       <point x="1148" y="1048" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2126.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2126.glif
index 1c3e569fa..07301f51e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2126.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2126.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2126" format="1">
+<glyph name="uni2126" format="2">
   <advance width="1233"/>
   <unicode hex="2126"/>
   <outline>
@@ -8,16 +8,16 @@
       <point x="228" y="211" type="line" name="ih01"/>
       <point x="133" y="315"/>
       <point x="90" y="430"/>
-      <point x="90" y="582" type="curve" name="sh01" smooth="yes"/>
+      <point x="90" y="582" type="curve" smooth="yes" name="sh01"/>
       <point x="90" y="642"/>
       <point x="97" y="709"/>
       <point x="111" y="782" type="curve" smooth="yes"/>
       <point x="191" y="1192"/>
       <point x="440" y="1460"/>
-      <point x="758" y="1460" type="curve" name="dv02" smooth="yes"/>
+      <point x="758" y="1460" type="curve" smooth="yes" name="dv02"/>
       <point x="1016" y="1460"/>
       <point x="1165" y="1282"/>
-      <point x="1165" y="989" type="curve" name="sh03" smooth="yes"/>
+      <point x="1165" y="989" type="curve" smooth="yes" name="sh03"/>
       <point x="1165" y="925"/>
       <point x="1158" y="856"/>
       <point x="1144" y="782" type="curve" smooth="yes"/>
@@ -33,19 +33,19 @@
       <point x="835" y="748" type="curve" smooth="yes"/>
       <point x="851" y="828"/>
       <point x="859" y="898"/>
-      <point x="859" y="957" type="curve" name="ah01" smooth="yes"/>
+      <point x="859" y="957" type="curve" smooth="yes" name="ah01"/>
       <point x="859" y="1004"/>
       <point x="854" y="1044"/>
       <point x="844" y="1078" type="curve" smooth="yes"/>
       <point x="821" y="1157"/>
       <point x="775" y="1194"/>
-      <point x="708" y="1194" type="curve" name="dv01" smooth="yes"/>
+      <point x="708" y="1194" type="curve" smooth="yes" name="dv01"/>
       <point x="568" y="1194"/>
       <point x="459" y="1024"/>
       <point x="405" y="748" type="curve" smooth="yes"/>
       <point x="391" y="676"/>
       <point x="384" y="611"/>
-      <point x="384" y="552" type="curve" name="sh02" smooth="yes"/>
+      <point x="384" y="552" type="curve" smooth="yes" name="sh02"/>
       <point x="384" y="431"/>
       <point x="414" y="337"/>
       <point x="474" y="268" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2150.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2150.glif
index 5258cef44..33a257e47 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2150.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2150.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2150" format="1">
+<glyph name="uni2150" format="2">
   <advance width="1233"/>
   <unicode hex="2150"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2151.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2151.glif
index b4050dbbe..6f1313a0e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2151.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2151.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2151" format="1">
+<glyph name="uni2151" format="2">
   <advance width="1233"/>
   <unicode hex="2151"/>
   <outline>
@@ -23,29 +23,29 @@
       <point x="84" y="500" type="line"/>
     </contour>
     <contour>
-      <point x="633" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="633" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="569" y="-285"/>
       <point x="509" y="-279"/>
       <point x="426" y="-252" type="curve"/>
       <point x="462" y="-102" type="line"/>
       <point x="519" y="-135"/>
       <point x="588" y="-152"/>
-      <point x="656" y="-152" type="curve" name="dv02" smooth="yes"/>
+      <point x="656" y="-152" type="curve" smooth="yes" name="dv02"/>
       <point x="805" y="-152"/>
       <point x="906" y="-71"/>
       <point x="951" y="86" type="curve" name="ih01"/>
       <point x="893" y="37"/>
       <point x="822" y="13"/>
-      <point x="737" y="13" type="curve" name="dv03" smooth="yes"/>
+      <point x="737" y="13" type="curve" smooth="yes" name="dv03"/>
       <point x="580" y="13"/>
       <point x="483" y="100"/>
-      <point x="483" y="248" type="curve" name="sh01" smooth="yes"/>
+      <point x="483" y="248" type="curve" smooth="yes" name="sh01"/>
       <point x="483" y="432"/>
       <point x="632" y="582"/>
-      <point x="881" y="582" type="curve" name="dv06" smooth="yes"/>
+      <point x="881" y="582" type="curve" smooth="yes" name="dv06"/>
       <point x="1080" y="582"/>
       <point x="1187" y="489"/>
-      <point x="1187" y="294" type="curve" name="sh05" smooth="yes"/>
+      <point x="1187" y="294" type="curve" smooth="yes" name="sh05"/>
       <point x="1187" y="153"/>
       <point x="1129" y="-23"/>
       <point x="1025" y="-135" type="curve" smooth="yes"/>
@@ -53,16 +53,16 @@
       <point x="800" y="-285"/>
     </contour>
     <contour>
-      <point x="802" y="145" type="curve" name="dv04" smooth="yes"/>
+      <point x="802" y="145" type="curve" smooth="yes" name="dv04"/>
       <point x="909" y="145"/>
       <point x="984" y="239"/>
-      <point x="984" y="333" type="curve" name="ah01" smooth="yes"/>
+      <point x="984" y="333" type="curve" smooth="yes" name="ah01"/>
       <point x="984" y="410"/>
       <point x="935" y="448"/>
-      <point x="867" y="448" type="curve" name="dv05" smooth="yes"/>
+      <point x="867" y="448" type="curve" smooth="yes" name="dv05"/>
       <point x="764" y="448"/>
       <point x="688" y="359"/>
-      <point x="688" y="260" type="curve" name="sh03" smooth="yes"/>
+      <point x="688" y="260" type="curve" smooth="yes" name="sh03"/>
       <point x="688" y="183"/>
       <point x="733" y="145"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2153.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2153.glif
index 7c0b4e27f..1abc38157 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2153.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2153.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2153" format="1">
+<glyph name="uni2153" format="2">
   <advance width="1233"/>
   <unicode hex="2153"/>
   <outline>
@@ -23,45 +23,45 @@
       <point x="84" y="500" type="line"/>
     </contour>
     <contour>
-      <point x="703" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="703" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="603" y="-285"/>
       <point x="506" y="-271"/>
       <point x="413" y="-244" type="curve"/>
       <point x="444" y="-90" type="line"/>
       <point x="523" y="-125"/>
       <point x="634" y="-145"/>
-      <point x="717" y="-145" type="curve" name="dv02" smooth="yes"/>
+      <point x="717" y="-145" type="curve" smooth="yes" name="dv02"/>
       <point x="860" y="-145"/>
       <point x="938" y="-87"/>
-      <point x="938" y="-3" type="curve" name="dh01" smooth="yes"/>
+      <point x="938" y="-3" type="curve" smooth="yes" name="dh01"/>
       <point x="938" y="72"/>
       <point x="876" y="104"/>
-      <point x="776" y="104" type="curve" name="dv03" smooth="yes"/>
+      <point x="776" y="104" type="curve" smooth="yes" name="dv03"/>
       <point x="665" y="104" type="line"/>
       <point x="694" y="250" type="line"/>
-      <point x="803" y="250" type="line" name="dv04" smooth="yes"/>
+      <point x="803" y="250" type="line" smooth="yes" name="dv04"/>
       <point x="920" y="250"/>
       <point x="985" y="289"/>
-      <point x="985" y="352" type="curve" name="sh01" smooth="yes"/>
+      <point x="985" y="352" type="curve" smooth="yes" name="sh01"/>
       <point x="985" y="412"/>
       <point x="928" y="442"/>
-      <point x="836" y="442" type="curve" name="dv05" smooth="yes"/>
+      <point x="836" y="442" type="curve" smooth="yes" name="dv05"/>
       <point x="771" y="442"/>
       <point x="677" y="426"/>
       <point x="569" y="395" type="curve"/>
       <point x="598" y="547" type="line"/>
       <point x="695" y="570"/>
       <point x="792" y="582"/>
-      <point x="873" y="582" type="curve" name="dv06" smooth="yes"/>
+      <point x="873" y="582" type="curve" smooth="yes" name="dv06"/>
       <point x="1068" y="582"/>
       <point x="1177" y="515"/>
-      <point x="1177" y="386" type="curve" name="sh02" smooth="yes"/>
+      <point x="1177" y="386" type="curve" smooth="yes" name="sh02"/>
       <point x="1177" y="274"/>
       <point x="1092" y="194"/>
       <point x="944" y="178" type="curve" name="ih01"/>
       <point x="1052" y="165"/>
       <point x="1126" y="104"/>
-      <point x="1126" y="-13" type="curve" name="dh02" smooth="yes"/>
+      <point x="1126" y="-13" type="curve" smooth="yes" name="dh02"/>
       <point x="1126" y="-179"/>
       <point x="975" y="-285"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2154.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2154.glif
index f7f362c96..a9fc6d8e8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2154.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2154.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2154" format="1">
+<glyph name="uni2154" format="2">
   <advance width="1233"/>
   <unicode hex="2154"/>
   <outline>
@@ -10,20 +10,20 @@
       <point x="173" y="1067" type="curve" smooth="yes"/>
       <point x="442" y="1260"/>
       <point x="573" y="1378"/>
-      <point x="573" y="1454" type="curve" name="dh01" smooth="yes"/>
+      <point x="573" y="1454" type="curve" smooth="yes" name="dh01"/>
       <point x="573" y="1501"/>
       <point x="524" y="1538"/>
-      <point x="429" y="1538" type="curve" name="hr01" smooth="yes"/>
+      <point x="429" y="1538" type="curve" smooth="yes" name="hr01"/>
       <point x="353" y="1538"/>
       <point x="248" y="1514"/>
       <point x="145" y="1467" type="curve"/>
       <point x="176" y="1629" type="line"/>
       <point x="277" y="1660"/>
       <point x="376" y="1676"/>
-      <point x="464" y="1676" type="curve" name="dv03" smooth="yes"/>
+      <point x="464" y="1676" type="curve" smooth="yes" name="dv03"/>
       <point x="661" y="1676"/>
       <point x="770" y="1594"/>
-      <point x="770" y="1488" type="curve" name="dh02" smooth="yes"/>
+      <point x="770" y="1488" type="curve" smooth="yes" name="dh02"/>
       <point x="770" y="1373"/>
       <point x="642" y="1236"/>
       <point x="360" y="1042" type="curve" smooth="yes"/>
@@ -41,45 +41,45 @@
       <point x="84" y="500" type="line"/>
     </contour>
     <contour>
-      <point x="703" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="703" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="603" y="-285"/>
       <point x="506" y="-271"/>
       <point x="413" y="-244" type="curve"/>
       <point x="444" y="-90" type="line"/>
       <point x="523" y="-125"/>
       <point x="634" y="-145"/>
-      <point x="717" y="-145" type="curve" name="dv02" smooth="yes"/>
+      <point x="717" y="-145" type="curve" smooth="yes" name="dv02"/>
       <point x="860" y="-145"/>
       <point x="938" y="-87"/>
-      <point x="938" y="-3" type="curve" name="dh03" smooth="yes"/>
+      <point x="938" y="-3" type="curve" smooth="yes" name="dh03"/>
       <point x="938" y="72"/>
       <point x="876" y="104"/>
-      <point x="776" y="104" type="curve" name="dv04" smooth="yes"/>
+      <point x="776" y="104" type="curve" smooth="yes" name="dv04"/>
       <point x="665" y="104" type="line"/>
       <point x="694" y="250" type="line"/>
-      <point x="803" y="250" type="line" name="dv05" smooth="yes"/>
+      <point x="803" y="250" type="line" smooth="yes" name="dv05"/>
       <point x="920" y="250"/>
       <point x="985" y="289"/>
-      <point x="985" y="352" type="curve" name="sh01" smooth="yes"/>
+      <point x="985" y="352" type="curve" smooth="yes" name="sh01"/>
       <point x="985" y="412"/>
       <point x="928" y="442"/>
-      <point x="836" y="442" type="curve" name="dv06" smooth="yes"/>
+      <point x="836" y="442" type="curve" smooth="yes" name="dv06"/>
       <point x="771" y="442"/>
       <point x="677" y="426"/>
       <point x="569" y="395" type="curve" name="sh02"/>
       <point x="598" y="547" type="line"/>
       <point x="695" y="570"/>
       <point x="792" y="582"/>
-      <point x="873" y="582" type="curve" name="dv07" smooth="yes"/>
+      <point x="873" y="582" type="curve" smooth="yes" name="dv07"/>
       <point x="1068" y="582"/>
       <point x="1177" y="515"/>
-      <point x="1177" y="386" type="curve" name="sh03" smooth="yes"/>
+      <point x="1177" y="386" type="curve" smooth="yes" name="sh03"/>
       <point x="1177" y="274"/>
       <point x="1092" y="194"/>
       <point x="944" y="178" type="curve" name="ih01"/>
       <point x="1052" y="165"/>
       <point x="1126" y="104"/>
-      <point x="1126" y="-13" type="curve" name="dh04" smooth="yes"/>
+      <point x="1126" y="-13" type="curve" smooth="yes" name="dh04"/>
       <point x="1126" y="-179"/>
       <point x="975" y="-285"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2155.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2155.glif
index 8931c9d04..df0adfaa1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2155.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2155.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2155" format="1">
+<glyph name="uni2155" format="2">
   <advance width="1233"/>
   <unicode hex="2155"/>
   <outline>
@@ -23,20 +23,20 @@
       <point x="84" y="500" type="line"/>
     </contour>
     <contour>
-      <point x="644" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="644" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="553" y="-285"/>
       <point x="454" y="-273"/>
       <point x="374" y="-250" type="curve"/>
       <point x="410" y="-101" type="line"/>
       <point x="478" y="-130"/>
       <point x="560" y="-147"/>
-      <point x="645" y="-147" type="curve" name="dv02" smooth="yes"/>
+      <point x="645" y="-147" type="curve" smooth="yes" name="dv02"/>
       <point x="809" y="-147"/>
       <point x="912" y="-84"/>
-      <point x="912" y="15" type="curve" name="dh01" smooth="yes"/>
+      <point x="912" y="15" type="curve" smooth="yes" name="dh01"/>
       <point x="912" y="96"/>
       <point x="844" y="143"/>
-      <point x="721" y="143" type="curve" name="dv03" smooth="yes"/>
+      <point x="721" y="143" type="curve" smooth="yes" name="dv03"/>
       <point x="652" y="143"/>
       <point x="572" y="128"/>
       <point x="496" y="100" type="curve"/>
@@ -47,10 +47,10 @@
       <point x="707" y="266" type="line" name="iv01"/>
       <point x="738" y="275"/>
       <point x="771" y="280"/>
-      <point x="814" y="280" type="curve" name="dv04" smooth="yes"/>
+      <point x="814" y="280" type="curve" smooth="yes" name="dv04"/>
       <point x="996" y="280"/>
       <point x="1116" y="188"/>
-      <point x="1116" y="33" type="curve" name="dh02" smooth="yes"/>
+      <point x="1116" y="33" type="curve" smooth="yes" name="dh02"/>
       <point x="1116" y="-156"/>
       <point x="936" y="-285"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2156.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2156.glif
index c83c48b23..b0aa382bf 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2156.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2156.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2156" format="1">
+<glyph name="uni2156" format="2">
   <advance width="1233"/>
   <unicode hex="2156"/>
   <outline>
@@ -10,20 +10,20 @@
       <point x="173" y="1067" type="curve" smooth="yes"/>
       <point x="442" y="1260"/>
       <point x="573" y="1378"/>
-      <point x="573" y="1454" type="curve" name="sh01" smooth="yes"/>
+      <point x="573" y="1454" type="curve" smooth="yes" name="sh01"/>
       <point x="573" y="1501"/>
       <point x="524" y="1538"/>
-      <point x="429" y="1538" type="curve" name="dv03" smooth="yes"/>
+      <point x="429" y="1538" type="curve" smooth="yes" name="dv03"/>
       <point x="353" y="1538"/>
       <point x="248" y="1514"/>
       <point x="145" y="1467" type="curve"/>
       <point x="176" y="1629" type="line"/>
       <point x="277" y="1660"/>
       <point x="376" y="1676"/>
-      <point x="464" y="1676" type="curve" name="dv04" smooth="yes"/>
+      <point x="464" y="1676" type="curve" smooth="yes" name="dv04"/>
       <point x="661" y="1676"/>
       <point x="770" y="1594"/>
-      <point x="770" y="1488" type="curve" name="sh02" smooth="yes"/>
+      <point x="770" y="1488" type="curve" smooth="yes" name="sh02"/>
       <point x="770" y="1373"/>
       <point x="642" y="1236"/>
       <point x="360" y="1042" type="curve" smooth="yes"/>
@@ -41,20 +41,20 @@
       <point x="84" y="500" type="line"/>
     </contour>
     <contour>
-      <point x="644" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="644" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="553" y="-285"/>
       <point x="454" y="-273"/>
       <point x="374" y="-250" type="curve"/>
       <point x="410" y="-101" type="line"/>
       <point x="478" y="-130"/>
       <point x="560" y="-147"/>
-      <point x="645" y="-147" type="curve" name="dv02" smooth="yes"/>
+      <point x="645" y="-147" type="curve" smooth="yes" name="dv02"/>
       <point x="809" y="-147"/>
       <point x="912" y="-84"/>
-      <point x="912" y="15" type="curve" name="ah01" smooth="yes"/>
+      <point x="912" y="15" type="curve" smooth="yes" name="ah01"/>
       <point x="912" y="96"/>
       <point x="844" y="143"/>
-      <point x="721" y="143" type="curve" name="dv05" smooth="yes"/>
+      <point x="721" y="143" type="curve" smooth="yes" name="dv05"/>
       <point x="652" y="143"/>
       <point x="572" y="128"/>
       <point x="496" y="100" type="curve"/>
@@ -65,10 +65,10 @@
       <point x="707" y="266" type="line" name="ih01"/>
       <point x="738" y="275"/>
       <point x="771" y="280"/>
-      <point x="814" y="280" type="curve" name="dv06" smooth="yes"/>
+      <point x="814" y="280" type="curve" smooth="yes" name="dv06"/>
       <point x="996" y="280"/>
       <point x="1116" y="188"/>
-      <point x="1116" y="33" type="curve" name="sh03" smooth="yes"/>
+      <point x="1116" y="33" type="curve" smooth="yes" name="sh03"/>
       <point x="1116" y="-156"/>
       <point x="936" y="-285"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2157.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2157.glif
index 96e3af76b..4b5c96436 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2157.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2157.glif
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2157" format="1">
+<glyph name="uni2157" format="2">
   <advance width="1233"/>
   <unicode hex="2157"/>
   <outline>
     <contour>
-      <point x="338" y="809" type="curve" name="dv11" smooth="yes"/>
+      <point x="338" y="809" type="curve" smooth="yes" name="dv11"/>
       <point x="238" y="809"/>
       <point x="141" y="823"/>
       <point x="48" y="850" type="curve"/>
       <point x="79" y="1004" type="line"/>
       <point x="158" y="969"/>
       <point x="269" y="949"/>
-      <point x="352" y="949" type="curve" name="dv12" smooth="yes"/>
+      <point x="352" y="949" type="curve" smooth="yes" name="dv12"/>
       <point x="495" y="949"/>
       <point x="573" y="1007"/>
-      <point x="573" y="1091" type="curve" name="dh01" smooth="yes"/>
+      <point x="573" y="1091" type="curve" smooth="yes" name="dh01"/>
       <point x="573" y="1166"/>
       <point x="511" y="1198"/>
-      <point x="411" y="1198" type="curve" name="dv07" smooth="yes"/>
+      <point x="411" y="1198" type="curve" smooth="yes" name="dv07"/>
       <point x="300" y="1198" type="line"/>
       <point x="329" y="1344" type="line"/>
-      <point x="438" y="1344" type="line" name="dv08" smooth="yes"/>
+      <point x="438" y="1344" type="line" smooth="yes" name="dv08"/>
       <point x="555" y="1344"/>
       <point x="620" y="1383"/>
-      <point x="620" y="1446" type="curve" name="sh01" smooth="yes"/>
+      <point x="620" y="1446" type="curve" smooth="yes" name="sh01"/>
       <point x="620" y="1506"/>
       <point x="563" y="1536"/>
-      <point x="471" y="1536" type="curve" name="dv03" smooth="yes"/>
+      <point x="471" y="1536" type="curve" smooth="yes" name="dv03"/>
       <point x="406" y="1536"/>
       <point x="312" y="1520"/>
       <point x="204" y="1489" type="curve"/>
       <point x="233" y="1641" type="line"/>
       <point x="330" y="1664"/>
       <point x="427" y="1676"/>
-      <point x="508" y="1676" type="curve" name="dv04" smooth="yes"/>
+      <point x="508" y="1676" type="curve" smooth="yes" name="dv04"/>
       <point x="703" y="1676"/>
       <point x="812" y="1609"/>
-      <point x="812" y="1480" type="curve" name="sh02" smooth="yes"/>
+      <point x="812" y="1480" type="curve" smooth="yes" name="sh02"/>
       <point x="812" y="1368"/>
       <point x="727" y="1288"/>
       <point x="579" y="1272" type="curve" name="ih01"/>
       <point x="687" y="1259"/>
       <point x="761" y="1198"/>
-      <point x="761" y="1081" type="curve" name="dh02" smooth="yes"/>
+      <point x="761" y="1081" type="curve" smooth="yes" name="dh02"/>
       <point x="761" y="915"/>
       <point x="610" y="809"/>
     </contour>
@@ -53,20 +53,20 @@
       <point x="84" y="500" type="line"/>
     </contour>
     <contour>
-      <point x="644" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="644" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="553" y="-285"/>
       <point x="454" y="-273"/>
       <point x="374" y="-250" type="curve" name="hr01"/>
       <point x="410" y="-101" type="line"/>
       <point x="478" y="-130"/>
       <point x="560" y="-147"/>
-      <point x="645" y="-147" type="curve" name="dv02" smooth="yes"/>
+      <point x="645" y="-147" type="curve" smooth="yes" name="dv02"/>
       <point x="809" y="-147"/>
       <point x="912" y="-84"/>
-      <point x="912" y="15" type="curve" name="dh03" smooth="yes"/>
+      <point x="912" y="15" type="curve" smooth="yes" name="dh03"/>
       <point x="912" y="96"/>
       <point x="844" y="143"/>
-      <point x="721" y="143" type="curve" name="dv05" smooth="yes"/>
+      <point x="721" y="143" type="curve" smooth="yes" name="dv05"/>
       <point x="652" y="143"/>
       <point x="572" y="128"/>
       <point x="496" y="100" type="curve"/>
@@ -77,10 +77,10 @@
       <point x="707" y="266" type="line" name="hr02"/>
       <point x="738" y="275"/>
       <point x="771" y="280"/>
-      <point x="814" y="280" type="curve" name="dv06" smooth="yes"/>
+      <point x="814" y="280" type="curve" smooth="yes" name="dv06"/>
       <point x="996" y="280"/>
       <point x="1116" y="188"/>
-      <point x="1116" y="33" type="curve" name="dh04" smooth="yes"/>
+      <point x="1116" y="33" type="curve" smooth="yes" name="dh04"/>
       <point x="1116" y="-156"/>
       <point x="936" y="-285"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2158.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2158.glif
index 68936259e..ae124296d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2158.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2158.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2158" format="1">
+<glyph name="uni2158" format="2">
   <advance width="1233"/>
   <unicode hex="2158"/>
   <outline>
@@ -28,20 +28,20 @@
       <point x="84" y="500" type="line"/>
     </contour>
     <contour>
-      <point x="644" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="644" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="553" y="-285"/>
       <point x="454" y="-273"/>
       <point x="374" y="-250" type="curve"/>
       <point x="410" y="-101" type="line"/>
       <point x="478" y="-130"/>
       <point x="560" y="-147"/>
-      <point x="645" y="-147" type="curve" name="dv02" smooth="yes"/>
+      <point x="645" y="-147" type="curve" smooth="yes" name="dv02"/>
       <point x="809" y="-147"/>
       <point x="912" y="-84"/>
-      <point x="912" y="15" type="curve" name="dh01" smooth="yes"/>
+      <point x="912" y="15" type="curve" smooth="yes" name="dh01"/>
       <point x="912" y="96"/>
       <point x="844" y="143"/>
-      <point x="721" y="143" type="curve" name="dv03" smooth="yes"/>
+      <point x="721" y="143" type="curve" smooth="yes" name="dv03"/>
       <point x="652" y="143"/>
       <point x="572" y="128"/>
       <point x="496" y="100" type="curve" name="hr01"/>
@@ -52,10 +52,10 @@
       <point x="707" y="266" type="line" name="iv01"/>
       <point x="738" y="275"/>
       <point x="771" y="280"/>
-      <point x="814" y="280" type="curve" name="dv04" smooth="yes"/>
+      <point x="814" y="280" type="curve" smooth="yes" name="dv04"/>
       <point x="996" y="280"/>
       <point x="1116" y="188"/>
-      <point x="1116" y="33" type="curve" name="hr02" smooth="yes"/>
+      <point x="1116" y="33" type="curve" smooth="yes" name="hr02"/>
       <point x="1116" y="-156"/>
       <point x="936" y="-285"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2159.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2159.glif
index 2f11d2782..fc5a822ff 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2159.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2159.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2159" format="1">
+<glyph name="uni2159" format="2">
   <advance width="1233"/>
   <unicode hex="2159"/>
   <outline>
@@ -23,46 +23,46 @@
       <point x="84" y="500" type="line"/>
     </contour>
     <contour>
-      <point x="733" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="733" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="534" y="-285"/>
       <point x="426" y="-192"/>
-      <point x="426" y="3" type="curve" name="sh01" smooth="yes"/>
+      <point x="426" y="3" type="curve" smooth="yes" name="sh01"/>
       <point x="426" y="147"/>
       <point x="486" y="319"/>
       <point x="589" y="430" type="curve" smooth="yes"/>
       <point x="683" y="531"/>
       <point x="813" y="582"/>
-      <point x="980" y="582" type="curve" name="dv06" smooth="yes"/>
+      <point x="980" y="582" type="curve" smooth="yes" name="dv06"/>
       <point x="1053" y="582"/>
       <point x="1111" y="572"/>
       <point x="1187" y="548" type="curve"/>
       <point x="1151" y="399" type="line"/>
       <point x="1095" y="431"/>
       <point x="1026" y="449"/>
-      <point x="958" y="449" type="curve" name="dv05" smooth="yes"/>
+      <point x="958" y="449" type="curve" smooth="yes" name="dv05"/>
       <point x="813" y="449"/>
       <point x="707" y="368"/>
       <point x="663" y="211" type="curve" name="ih01"/>
       <point x="719" y="256"/>
       <point x="791" y="284"/>
-      <point x="879" y="284" type="curve" name="dv04" smooth="yes"/>
+      <point x="879" y="284" type="curve" smooth="yes" name="dv04"/>
       <point x="1034" y="284"/>
       <point x="1133" y="196"/>
-      <point x="1133" y="46" type="curve" name="sh05" smooth="yes"/>
+      <point x="1133" y="46" type="curve" smooth="yes" name="sh05"/>
       <point x="1133" y="-144"/>
       <point x="976" y="-285"/>
     </contour>
     <contour>
-      <point x="746" y="-151" type="curve" name="dv02" smooth="yes"/>
+      <point x="746" y="-151" type="curve" smooth="yes" name="dv02"/>
       <point x="853" y="-151"/>
       <point x="928" y="-59"/>
-      <point x="928" y="37" type="curve" name="ah01" smooth="yes"/>
+      <point x="928" y="37" type="curve" smooth="yes" name="ah01"/>
       <point x="928" y="113"/>
       <point x="881" y="151"/>
-      <point x="812" y="151" type="curve" name="dv03" smooth="yes"/>
+      <point x="812" y="151" type="curve" smooth="yes" name="dv03"/>
       <point x="705" y="151"/>
       <point x="630" y="60"/>
-      <point x="630" y="-36" type="curve" name="sh03" smooth="yes"/>
+      <point x="630" y="-36" type="curve" smooth="yes" name="sh03"/>
       <point x="630" y="-112"/>
       <point x="675" y="-151"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni215A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni215A_.glif
index f92db538d..5c37fd896 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni215A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni215A_.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni215A" format="1">
+<glyph name="uni215A" format="2">
   <advance width="1233"/>
   <unicode hex="215A"/>
   <outline>
     <contour>
-      <point x="279" y="809" type="curve" name="dv10" smooth="yes"/>
+      <point x="279" y="809" type="curve" smooth="yes" name="dv10"/>
       <point x="188" y="809"/>
       <point x="89" y="821"/>
       <point x="9" y="844" type="curve"/>
       <point x="45" y="993" type="line"/>
       <point x="113" y="964"/>
       <point x="195" y="947"/>
-      <point x="280" y="947" type="curve" name="dv11" smooth="yes"/>
+      <point x="280" y="947" type="curve" smooth="yes" name="dv11"/>
       <point x="444" y="947"/>
       <point x="547" y="1010"/>
-      <point x="547" y="1109" type="curve" name="ih01" smooth="yes"/>
+      <point x="547" y="1109" type="curve" smooth="yes" name="ih01"/>
       <point x="547" y="1190"/>
       <point x="479" y="1237"/>
-      <point x="356" y="1237" type="curve" name="dv05" smooth="yes"/>
+      <point x="356" y="1237" type="curve" smooth="yes" name="dv05"/>
       <point x="287" y="1237"/>
       <point x="207" y="1222"/>
       <point x="131" y="1194" type="curve"/>
@@ -28,10 +28,10 @@
       <point x="342" y="1360" type="line" name="iv01"/>
       <point x="373" y="1369"/>
       <point x="406" y="1374"/>
-      <point x="449" y="1374" type="curve" name="dv06" smooth="yes"/>
+      <point x="449" y="1374" type="curve" smooth="yes" name="dv06"/>
       <point x="631" y="1374"/>
       <point x="751" y="1282"/>
-      <point x="751" y="1127" type="curve" name="sh01" smooth="yes"/>
+      <point x="751" y="1127" type="curve" smooth="yes" name="sh01"/>
       <point x="751" y="938"/>
       <point x="571" y="809"/>
     </contour>
@@ -42,46 +42,46 @@
       <point x="84" y="500" type="line"/>
     </contour>
     <contour>
-      <point x="733" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="733" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="534" y="-285"/>
       <point x="426" y="-192"/>
-      <point x="426" y="3" type="curve" name="dh01" smooth="yes"/>
+      <point x="426" y="3" type="curve" smooth="yes" name="dh01"/>
       <point x="426" y="147"/>
       <point x="486" y="319"/>
       <point x="589" y="430" type="curve" smooth="yes"/>
       <point x="683" y="531"/>
       <point x="813" y="582"/>
-      <point x="980" y="582" type="curve" name="hr01" smooth="yes"/>
+      <point x="980" y="582" type="curve" smooth="yes" name="hr01"/>
       <point x="1053" y="582"/>
       <point x="1111" y="572"/>
       <point x="1187" y="548" type="curve"/>
       <point x="1151" y="399" type="line"/>
       <point x="1095" y="431"/>
       <point x="1026" y="449"/>
-      <point x="958" y="449" type="curve" name="dv09" smooth="yes"/>
+      <point x="958" y="449" type="curve" smooth="yes" name="dv09"/>
       <point x="813" y="449"/>
       <point x="707" y="368"/>
       <point x="663" y="211" type="curve" name="ih02"/>
       <point x="719" y="256"/>
       <point x="791" y="284"/>
-      <point x="879" y="284" type="curve" name="dv08" smooth="yes"/>
+      <point x="879" y="284" type="curve" smooth="yes" name="dv08"/>
       <point x="1034" y="284"/>
       <point x="1133" y="196"/>
-      <point x="1133" y="46" type="curve" name="dh04" smooth="yes"/>
+      <point x="1133" y="46" type="curve" smooth="yes" name="dh04"/>
       <point x="1133" y="-144"/>
       <point x="976" y="-285"/>
     </contour>
     <contour>
-      <point x="746" y="-151" type="curve" name="dv02" smooth="yes"/>
+      <point x="746" y="-151" type="curve" smooth="yes" name="dv02"/>
       <point x="853" y="-151"/>
       <point x="928" y="-59"/>
-      <point x="928" y="37" type="curve" name="dh03" smooth="yes"/>
+      <point x="928" y="37" type="curve" smooth="yes" name="dh03"/>
       <point x="928" y="113"/>
       <point x="881" y="151"/>
-      <point x="812" y="151" type="curve" name="dv07" smooth="yes"/>
+      <point x="812" y="151" type="curve" smooth="yes" name="dv07"/>
       <point x="705" y="151"/>
       <point x="630" y="60"/>
-      <point x="630" y="-36" type="curve" name="dh02" smooth="yes"/>
+      <point x="630" y="-36" type="curve" smooth="yes" name="dh02"/>
       <point x="630" y="-112"/>
       <point x="675" y="-151"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni215F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni215F_.glif
index 0bdce051d..5285d2f89 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni215F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni215F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni215F" format="1">
+<glyph name="uni215F" format="2">
   <advance width="1233"/>
   <unicode hex="215F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2189.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2189.glif
index 75909e06d..ea3016d87 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2189.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2189.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2189" format="1">
+<glyph name="uni2189" format="2">
   <advance width="1233"/>
   <unicode hex="2189"/>
   <outline>
     <contour>
-      <point x="328" y="809" type="curve" name="dv08" smooth="yes"/>
+      <point x="328" y="809" type="curve" smooth="yes" name="dv08"/>
       <point x="151" y="809"/>
       <point x="45" y="894"/>
-      <point x="45" y="1078" type="curve" name="dh01" smooth="yes"/>
+      <point x="45" y="1078" type="curve" smooth="yes" name="dh01"/>
       <point x="45" y="1209"/>
       <point x="98" y="1405"/>
       <point x="175" y="1513" type="curve" smooth="yes"/>
       <point x="250" y="1620"/>
       <point x="364" y="1676"/>
-      <point x="508" y="1676" type="curve" name="hr01" smooth="yes"/>
+      <point x="508" y="1676" type="curve" smooth="yes" name="hr01"/>
       <point x="684" y="1676"/>
       <point x="792" y="1590"/>
-      <point x="792" y="1409" type="curve" name="dh06" smooth="yes"/>
+      <point x="792" y="1409" type="curve" smooth="yes" name="dh06"/>
       <point x="792" y="1287"/>
       <point x="742" y="1085"/>
       <point x="659" y="970" type="curve"/>
@@ -24,22 +24,22 @@
       <point x="476" y="809"/>
     </contour>
     <contour>
-      <point x="350" y="947" type="curve" name="dv09" smooth="yes"/>
+      <point x="350" y="947" type="curve" smooth="yes" name="dv09"/>
       <point x="421" y="947"/>
       <point x="463" y="993"/>
       <point x="498" y="1062" type="curve" smooth="yes"/>
       <point x="547" y="1162"/>
       <point x="583" y="1322"/>
-      <point x="583" y="1413" type="curve" name="dh05" smooth="yes"/>
+      <point x="583" y="1413" type="curve" smooth="yes" name="dh05"/>
       <point x="583" y="1497"/>
       <point x="554" y="1537"/>
-      <point x="486" y="1537" type="curve" name="dv03" smooth="yes"/>
+      <point x="486" y="1537" type="curve" smooth="yes" name="dv03"/>
       <point x="419" y="1537"/>
       <point x="374" y="1499"/>
       <point x="337" y="1423" type="curve" smooth="yes"/>
       <point x="291" y="1329"/>
       <point x="253" y="1167"/>
-      <point x="253" y="1072" type="curve" name="dh02" smooth="yes"/>
+      <point x="253" y="1072" type="curve" smooth="yes" name="dh02"/>
       <point x="253" y="989"/>
       <point x="285" y="947"/>
     </contour>
@@ -47,13 +47,13 @@
       <point x="416" y="1172" type="curve" smooth="yes"/>
       <point x="368" y="1172"/>
       <point x="328" y="1202"/>
-      <point x="328" y="1241" type="curve" name="dh03" smooth="yes"/>
+      <point x="328" y="1241" type="curve" smooth="yes" name="dh03"/>
       <point x="328" y="1282"/>
       <point x="368" y="1313"/>
-      <point x="416" y="1313" type="curve" name="sv01" smooth="yes"/>
+      <point x="416" y="1313" type="curve" smooth="yes" name="sv01"/>
       <point x="464" y="1313"/>
       <point x="507" y="1282"/>
-      <point x="507" y="1243" type="curve" name="dh04" smooth="yes"/>
+      <point x="507" y="1243" type="curve" smooth="yes" name="dh04"/>
       <point x="507" y="1204"/>
       <point x="467" y="1172"/>
     </contour>
@@ -64,45 +64,45 @@
       <point x="84" y="500" type="line"/>
     </contour>
     <contour>
-      <point x="703" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="703" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="603" y="-285"/>
       <point x="506" y="-271"/>
       <point x="413" y="-244" type="curve"/>
       <point x="444" y="-90" type="line"/>
       <point x="523" y="-125"/>
       <point x="634" y="-145"/>
-      <point x="717" y="-145" type="curve" name="dv02" smooth="yes"/>
+      <point x="717" y="-145" type="curve" smooth="yes" name="dv02"/>
       <point x="860" y="-145"/>
       <point x="938" y="-87"/>
-      <point x="938" y="-3" type="curve" name="dh07" smooth="yes"/>
+      <point x="938" y="-3" type="curve" smooth="yes" name="dh07"/>
       <point x="938" y="72"/>
       <point x="876" y="104"/>
-      <point x="776" y="104" type="curve" name="dv04" smooth="yes"/>
+      <point x="776" y="104" type="curve" smooth="yes" name="dv04"/>
       <point x="665" y="104" type="line"/>
       <point x="694" y="250" type="line" name="hr03"/>
-      <point x="803" y="250" type="line" name="dv05" smooth="yes"/>
+      <point x="803" y="250" type="line" smooth="yes" name="dv05"/>
       <point x="920" y="250"/>
       <point x="985" y="289"/>
-      <point x="985" y="352" type="curve" name="sh01" smooth="yes"/>
+      <point x="985" y="352" type="curve" smooth="yes" name="sh01"/>
       <point x="985" y="412"/>
       <point x="928" y="442"/>
-      <point x="836" y="442" type="curve" name="dv06" smooth="yes"/>
+      <point x="836" y="442" type="curve" smooth="yes" name="dv06"/>
       <point x="771" y="442"/>
       <point x="677" y="426"/>
       <point x="569" y="395" type="curve" name="sh02"/>
       <point x="598" y="547" type="line"/>
       <point x="695" y="570"/>
       <point x="792" y="582"/>
-      <point x="873" y="582" type="curve" name="dv07" smooth="yes"/>
+      <point x="873" y="582" type="curve" smooth="yes" name="dv07"/>
       <point x="1068" y="582"/>
       <point x="1177" y="515"/>
-      <point x="1177" y="386" type="curve" name="sh03" smooth="yes"/>
+      <point x="1177" y="386" type="curve" smooth="yes" name="sh03"/>
       <point x="1177" y="274"/>
       <point x="1092" y="194"/>
       <point x="944" y="178" type="curve" name="ih01"/>
       <point x="1052" y="165"/>
       <point x="1126" y="104"/>
-      <point x="1126" y="-13" type="curve" name="dh08" smooth="yes"/>
+      <point x="1126" y="-13" type="curve" smooth="yes" name="dh08"/>
       <point x="1126" y="-179"/>
       <point x="975" y="-285"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2196.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2196.glif
index 91899269f..4cb02437b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2196.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2196.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2196" format="1">
+<glyph name="uni2196" format="2">
   <advance width="1233"/>
   <unicode hex="2196"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2197.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2197.glif
index 34d37ee1a..d3c17b60f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2197.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2197.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2197" format="1">
+<glyph name="uni2197" format="2">
   <advance width="1233"/>
   <unicode hex="2197"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2198.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2198.glif
index 94fdf82a7..a8dbf5303 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2198.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2198.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2198" format="1">
+<glyph name="uni2198" format="2">
   <advance width="1233"/>
   <unicode hex="2198"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2199.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2199.glif
index 0cc3a3b90..dc5ab4cbe 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2199.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2199.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2199" format="1">
+<glyph name="uni2199" format="2">
   <advance width="1233"/>
   <unicode hex="2199"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni219A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni219A_.glif
index 8ce0e62e2..0435e0cf2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni219A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni219A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni219A" format="1">
+<glyph name="uni219A" format="2">
   <advance width="1233"/>
   <unicode hex="219A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni219B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni219B_.glif
index ae1b5fb43..2667857c6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni219B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni219B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni219B" format="1">
+<glyph name="uni219B" format="2">
   <advance width="1233"/>
   <unicode hex="219B"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni219C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni219C_.glif
index bb81ec6c5..1cbcc72a4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni219C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni219C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni219C" format="1">
+<glyph name="uni219C" format="2">
   <advance width="1233"/>
   <unicode hex="219C"/>
   <outline>
@@ -17,7 +17,7 @@
       <point x="462" y="611" type="curve" smooth="yes"/>
       <point x="478" y="601"/>
       <point x="494" y="596"/>
-      <point x="509" y="596" type="curve" name="dv02" smooth="yes"/>
+      <point x="509" y="596" type="curve" smooth="yes" name="dv02"/>
       <point x="555" y="596"/>
       <point x="606" y="649"/>
       <point x="606" y="652" type="curve"/>
@@ -29,7 +29,7 @@
       <point x="795" y="861" type="curve" smooth="yes"/>
       <point x="819" y="876"/>
       <point x="858" y="884"/>
-      <point x="902" y="884" type="curve" name="sv01" smooth="yes"/>
+      <point x="902" y="884" type="curve" smooth="yes" name="sv01"/>
       <point x="946" y="884"/>
       <point x="969" y="876"/>
       <point x="992" y="864" type="curve" smooth="yes"/>
@@ -42,7 +42,7 @@
       <point x="948" y="665" type="curve" smooth="yes"/>
       <point x="933" y="673"/>
       <point x="916" y="679"/>
-      <point x="896" y="679" type="curve" name="sv02" smooth="yes"/>
+      <point x="896" y="679" type="curve" smooth="yes" name="sv02"/>
       <point x="860" y="679"/>
       <point x="813" y="661"/>
       <point x="793" y="617" type="curve"/>
@@ -54,7 +54,7 @@
       <point x="611" y="393" type="curve" smooth="yes"/>
       <point x="579" y="376"/>
       <point x="546" y="369"/>
-      <point x="511" y="369" type="curve" name="hr01" smooth="yes"/>
+      <point x="511" y="369" type="curve" smooth="yes" name="hr01"/>
       <point x="435" y="369"/>
       <point x="377" y="402"/>
       <point x="326" y="461" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni219D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni219D_.glif
index c4c3e4902..9e3d7be72 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni219D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni219D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni219D" format="1">
+<glyph name="uni219D" format="2">
   <advance width="1233"/>
   <unicode hex="219D"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="907" y="461" type="line" smooth="yes"/>
       <point x="855" y="401"/>
       <point x="794" y="369"/>
-      <point x="726" y="369" type="curve" name="sv01" smooth="yes"/>
+      <point x="726" y="369" type="curve" smooth="yes" name="sv01"/>
       <point x="646" y="369"/>
       <point x="570" y="413"/>
       <point x="537" y="459" type="curve" smooth="yes"/>
@@ -20,7 +20,7 @@
       <point x="440" y="617" type="curve" name="hr01"/>
       <point x="419" y="661"/>
       <point x="373" y="679"/>
-      <point x="340" y="679" type="curve" name="sv02" smooth="yes"/>
+      <point x="340" y="679" type="curve" smooth="yes" name="sv02"/>
       <point x="299" y="679"/>
       <point x="254" y="652"/>
       <point x="238" y="624" type="curve" smooth="yes"/>
@@ -33,7 +33,7 @@
       <point x="241" y="864" type="curve" smooth="yes"/>
       <point x="264" y="876"/>
       <point x="289" y="884"/>
-      <point x="333" y="884" type="curve" name="sv03" smooth="yes"/>
+      <point x="333" y="884" type="curve" smooth="yes" name="sv03"/>
       <point x="376" y="884"/>
       <point x="414" y="876"/>
       <point x="438" y="861" type="curve" smooth="yes"/>
@@ -48,7 +48,7 @@
       <point x="627" y="652" type="curve"/>
       <point x="630" y="644"/>
       <point x="679" y="596"/>
-      <point x="722" y="596" type="curve" name="dv01" smooth="yes"/>
+      <point x="722" y="596" type="curve" smooth="yes" name="dv01"/>
       <point x="754" y="596"/>
       <point x="800" y="622"/>
       <point x="824" y="653" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni219E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni219E_.glif
index 3bb6430ce..a66b90fea 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni219E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni219E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni219E" format="1">
+<glyph name="uni219E" format="2">
   <advance width="1233"/>
   <unicode hex="219E"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni219F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni219F_.glif
index 95a541e48..622471ac2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni219F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni219F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni219F" format="1">
+<glyph name="uni219F" format="2">
   <advance width="1233"/>
   <unicode hex="219F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21A_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21A_0.glif
index 864eb268b..0a6e03d88 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21A_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A0" format="1">
+<glyph name="uni21A0" format="2">
   <advance width="1233"/>
   <unicode hex="21A0"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21A_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21A_1.glif
index 8b31bd2c6..79a8cfae5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21A_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21A_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A1" format="1">
+<glyph name="uni21A1" format="2">
   <advance width="1233"/>
   <unicode hex="21A1"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21A_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21A_2.glif
index 4ec18ccfc..765f28d69 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21A_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21A_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A2" format="1">
+<glyph name="uni21A2" format="2">
   <advance width="1233"/>
   <unicode hex="21A2"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21A_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21A_3.glif
index 8842181ae..ccc54a7c7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21A_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21A_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A3" format="1">
+<glyph name="uni21A3" format="2">
   <advance width="1233"/>
   <unicode hex="21A3"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21A_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21A_4.glif
index fc3f07abf..ca55a897d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21A_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A4" format="1">
+<glyph name="uni21A4" format="2">
   <advance width="1233"/>
   <unicode hex="21A4"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21A_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21A_5.glif
index 96349ee28..ae56834e0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21A_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21A_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A5" format="1">
+<glyph name="uni21A5" format="2">
   <advance width="1233"/>
   <unicode hex="21A5"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21A_6.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21A_6.glif
index 81ed3d819..46410d269 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21A_6.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21A_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A6" format="1">
+<glyph name="uni21A6" format="2">
   <advance width="1233"/>
   <unicode hex="21A6"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21A_7.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21A_7.glif
index f3d9ff15d..fc5d79141 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21A_7.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21A_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A7" format="1">
+<glyph name="uni21A7" format="2">
   <advance width="1233"/>
   <unicode hex="21A7"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21A_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21A_9.glif
index 56c8601f8..3ffd6fb92 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21A_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21A_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A9" format="1">
+<glyph name="uni21A9" format="2">
   <advance width="1233"/>
   <unicode hex="21A9"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="357" y="923" type="line"/>
       <point x="477" y="803" type="line"/>
       <point x="347" y="673" type="line"/>
-      <point x="871" y="673" type="line" name="dv02" smooth="yes"/>
+      <point x="871" y="673" type="line" smooth="yes" name="dv02"/>
       <point x="887" y="673"/>
       <point x="907" y="679"/>
       <point x="922" y="694" type="curve" smooth="yes"/>
@@ -28,13 +28,13 @@
       <point x="1080" y="956" type="curve" smooth="yes"/>
       <point x="1141" y="895"/>
       <point x="1167" y="821"/>
-      <point x="1167" y="746" type="curve" name="dh02" smooth="yes"/>
+      <point x="1167" y="746" type="curve" smooth="yes" name="dh02"/>
       <point x="1167" y="662"/>
       <point x="1135" y="589"/>
       <point x="1080" y="534" type="curve" smooth="yes"/>
       <point x="1035" y="489"/>
       <point x="964" y="449"/>
-      <point x="871" y="449" type="curve" name="dv01" smooth="yes"/>
+      <point x="871" y="449" type="curve" smooth="yes" name="dv01"/>
       <point x="347" y="449" type="line"/>
       <point x="477" y="319" type="line"/>
       <point x="357" y="199" type="line" name="av02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21A_A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21A_A_.glif
index ce65a4f1b..332a6edac 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21A_A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21A_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21AA" format="1">
+<glyph name="uni21AA" format="2">
   <advance width="1233"/>
   <unicode hex="21AA"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="153" y="534" type="curve" smooth="yes"/>
       <point x="98" y="589"/>
       <point x="66" y="662"/>
-      <point x="66" y="746" type="curve" name="dh01" smooth="yes"/>
+      <point x="66" y="746" type="curve" smooth="yes" name="dh01"/>
       <point x="66" y="821"/>
       <point x="92" y="895"/>
       <point x="153" y="956" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21A_B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21A_B_.glif
index b6bf13fde..82df60b9b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21A_B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21A_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21AB" format="1">
+<glyph name="uni21AB" format="2">
   <advance width="1233"/>
   <unicode hex="21AB"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="575" y="745" type="line" smooth="yes"/>
       <point x="575" y="911"/>
       <point x="708" y="1042"/>
-      <point x="870" y="1042" type="curve" name="av01" smooth="yes"/>
+      <point x="870" y="1042" type="curve" smooth="yes" name="av01"/>
       <point x="957" y="1042"/>
       <point x="1028" y="1008"/>
       <point x="1080" y="956" type="curve" smooth="yes"/>
@@ -25,7 +25,7 @@
       <point x="1081" y="535" type="curve" smooth="yes"/>
       <point x="1032" y="484"/>
       <point x="960" y="449"/>
-      <point x="871" y="449" type="curve" name="dv01" smooth="yes"/>
+      <point x="871" y="449" type="curve" smooth="yes" name="dv01"/>
       <point x="800" y="449" type="line" name="sh01"/>
       <point x="800" y="225" type="line"/>
       <point x="575" y="225" type="line" name="sh02"/>
@@ -35,7 +35,7 @@
       <point x="357" y="199" type="line" name="av02"/>
     </contour>
     <contour>
-      <point x="871" y="673" type="line" name="dv02" smooth="yes"/>
+      <point x="871" y="673" type="line" smooth="yes" name="dv02"/>
       <point x="908" y="673"/>
       <point x="943" y="705"/>
       <point x="943" y="747" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21A_C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21A_C_.glif
index a1c84a434..fea1a6968 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21A_C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21A_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21AC" format="1">
+<glyph name="uni21AC" format="2">
   <advance width="1233"/>
   <unicode hex="21AC"/>
   <outline>
@@ -22,10 +22,10 @@
       <point x="153" y="956" type="curve" smooth="yes"/>
       <point x="205" y="1008"/>
       <point x="276" y="1042"/>
-      <point x="363" y="1042" type="curve" name="av01" smooth="yes"/>
+      <point x="363" y="1042" type="curve" smooth="yes" name="av01"/>
       <point x="525" y="1042"/>
       <point x="658" y="911"/>
-      <point x="658" y="745" type="curve" name="sh01" smooth="yes"/>
+      <point x="658" y="745" type="curve" smooth="yes" name="sh01"/>
       <point x="658" y="673" type="line"/>
       <point x="886" y="673" type="line" name="dv02"/>
       <point x="756" y="803" type="line"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21A_D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21A_D_.glif
index 670cb58d4..1cd14f2bc 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21A_D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21A_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21AD" format="1">
+<glyph name="uni21AD" format="2">
   <advance width="1233"/>
   <unicode hex="21AD"/>
   <outline>
@@ -26,7 +26,7 @@
       <point x="552" y="774" type="curve" smooth="yes"/>
       <point x="572" y="784"/>
       <point x="594" y="789"/>
-      <point x="617" y="789" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="789" type="curve" smooth="yes" name="dv02"/>
       <point x="662" y="789"/>
       <point x="702" y="769"/>
       <point x="735" y="730" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="886" y="449" type="line" name="iv01"/>
       <point x="871" y="440"/>
       <point x="847" y="436"/>
-      <point x="824" y="436" type="curve" name="dv01" smooth="yes"/>
+      <point x="824" y="436" type="curve" smooth="yes" name="dv01"/>
       <point x="773" y="436"/>
       <point x="737" y="456"/>
       <point x="702" y="495" type="curve" smooth="yes"/>
@@ -75,7 +75,7 @@
       <point x="478" y="451" type="curve" smooth="yes"/>
       <point x="458" y="440"/>
       <point x="439" y="436"/>
-      <point x="410" y="436" type="curve" name="sv01" smooth="yes"/>
+      <point x="410" y="436" type="curve" smooth="yes" name="sv01"/>
       <point x="385" y="436"/>
       <point x="360" y="440"/>
       <point x="347" y="449" type="curve" name="iv02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21A_E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21A_E_.glif
index a499c184b..efddd812c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21A_E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21A_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21AE" format="1">
+<glyph name="uni21AE" format="2">
   <advance width="1233"/>
   <unicode hex="21AE"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21A_F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21A_F_.glif
index bd52a4532..652012e47 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21A_F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21A_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21AF" format="1">
+<glyph name="uni21AF" format="2">
   <advance width="1233"/>
   <unicode hex="21AF"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21B_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21B_0.glif
index e1897faf0..2a1138586 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21B_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21B_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B0" format="1">
+<glyph name="uni21B0" format="2">
   <advance width="1233"/>
   <unicode hex="21B0"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21B_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21B_1.glif
index 14caef5d7..0c3e96df5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21B_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21B_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B1" format="1">
+<glyph name="uni21B1" format="2">
   <advance width="1233"/>
   <unicode hex="21B1"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21B_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21B_2.glif
index fcb071e65..ef84eb313 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21B_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21B_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B2" format="1">
+<glyph name="uni21B2" format="2">
   <advance width="1233"/>
   <unicode hex="21B2"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21B_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21B_3.glif
index 0b6ca701f..e2b7f3015 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21B_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B3" format="1">
+<glyph name="uni21B3" format="2">
   <advance width="1233"/>
   <unicode hex="21B3"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21B_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21B_4.glif
index 56b7f1f8a..1fc77a451 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21B_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21B_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B4" format="1">
+<glyph name="uni21B4" format="2">
   <advance width="1233"/>
   <unicode hex="21B4"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21B_6.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21B_6.glif
index 71279b087..5223f68fe 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21B_6.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21B_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B6" format="1">
+<glyph name="uni21B6" format="2">
   <advance width="1233"/>
   <unicode hex="21B6"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="433" y="910" type="curve" smooth="yes"/>
       <point x="514" y="994"/>
       <point x="621" y="1037"/>
-      <point x="742" y="1037" type="curve" name="dv02" smooth="yes"/>
+      <point x="742" y="1037" type="curve" smooth="yes" name="dv02"/>
       <point x="863" y="1037"/>
       <point x="968" y="994"/>
       <point x="1052" y="910" type="curve" smooth="yes"/>
@@ -26,7 +26,7 @@
       <point x="904" y="759" type="curve" smooth="yes"/>
       <point x="864" y="800"/>
       <point x="809" y="824"/>
-      <point x="745" y="824" type="curve" name="dv01" smooth="yes"/>
+      <point x="745" y="824" type="curve" smooth="yes" name="dv01"/>
       <point x="682" y="824"/>
       <point x="630" y="802"/>
       <point x="587" y="758" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21B_7.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21B_7.glif
index dd08fc712..1a54a5615 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21B_7.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21B_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B7" format="1">
+<glyph name="uni21B7" format="2">
   <advance width="1233"/>
   <unicode hex="21B7"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="646" y="758" type="curve" smooth="yes"/>
       <point x="603" y="802"/>
       <point x="549" y="824"/>
-      <point x="486" y="824" type="curve" name="dv01" smooth="yes"/>
+      <point x="486" y="824" type="curve" smooth="yes" name="dv01"/>
       <point x="418" y="824"/>
       <point x="370" y="801"/>
       <point x="330" y="758" type="curve" smooth="yes"/>
@@ -25,7 +25,7 @@
       <point x="181" y="910" type="curve" smooth="yes"/>
       <point x="265" y="994"/>
       <point x="370" y="1037"/>
-      <point x="491" y="1037" type="curve" name="dv02" smooth="yes"/>
+      <point x="491" y="1037" type="curve" smooth="yes" name="dv02"/>
       <point x="612" y="1037"/>
       <point x="719" y="994"/>
       <point x="800" y="910" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21B_8.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21B_8.glif
index 999bd5595..182b7c075 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21B_8.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21B_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B8" format="1">
+<glyph name="uni21B8" format="2">
   <advance width="1233"/>
   <unicode hex="21B8"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21B_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21B_9.glif
index cd4dc913c..6f06c37f8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21B_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21B_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B9" format="1">
+<glyph name="uni21B9" format="2">
   <advance width="1233"/>
   <unicode hex="21B9"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21B_A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21B_A_.glif
index ce9e95b5c..6b538c67b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21B_A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21B_A_.glif
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21BA" format="1">
+<glyph name="uni21BA" format="2">
   <advance width="1233"/>
   <unicode hex="21BA"/>
   <outline>
     <contour>
-      <point x="593" y="-39" type="curve" name="hr00" smooth="yes"/>
+      <point x="593" y="-39" type="curve" smooth="yes" name="hr00"/>
       <point x="445" y="-39"/>
       <point x="315" y="18"/>
       <point x="214" y="118" type="curve" smooth="yes"/>
       <point x="109" y="222"/>
       <point x="55" y="353"/>
-      <point x="55" y="502" type="curve" name="dh01" smooth="yes"/>
+      <point x="55" y="502" type="curve" smooth="yes" name="dh01"/>
       <point x="55" y="646"/>
       <point x="105" y="769"/>
       <point x="214" y="882" type="curve"/>
       <point x="385" y="733" type="line"/>
       <point x="324" y="673"/>
       <point x="294" y="594"/>
-      <point x="294" y="513" type="curve" name="dh02" smooth="yes"/>
+      <point x="294" y="513" type="curve" smooth="yes" name="dh02"/>
       <point x="294" y="425"/>
       <point x="328" y="349"/>
       <point x="384" y="293" type="curve" smooth="yes"/>
       <point x="436" y="240"/>
       <point x="508" y="203"/>
-      <point x="601" y="203" type="curve" name="dv01" smooth="yes"/>
+      <point x="601" y="203" type="curve" smooth="yes" name="dv01"/>
       <point x="684" y="203"/>
       <point x="756" y="233"/>
       <point x="816" y="293" type="curve" smooth="yes"/>
       <point x="881" y="358"/>
       <point x="906" y="434"/>
-      <point x="906" y="519" type="curve" name="dh05" smooth="yes"/>
+      <point x="906" y="519" type="curve" smooth="yes" name="dh05"/>
       <point x="906" y="570"/>
       <point x="898" y="615"/>
       <point x="883" y="632" type="curve"/>
@@ -40,10 +40,10 @@
       <point x="766" y="1047" type="line"/>
       <point x="1178" y="1047" type="line" name="dv03"/>
       <point x="1178" y="860" type="line" name="dv02"/>
-      <point x="991" y="860" type="line" name="ih01" smooth="yes"/>
+      <point x="991" y="860" type="line" smooth="yes" name="ih01"/>
       <point x="1040" y="860"/>
       <point x="1131" y="654"/>
-      <point x="1131" y="488" type="curve" name="dh06" smooth="yes"/>
+      <point x="1131" y="488" type="curve" smooth="yes" name="dh06"/>
       <point x="1131" y="357"/>
       <point x="1076" y="222"/>
       <point x="972" y="118" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21B_B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21B_B_.glif
index c612b8836..0fa629f50 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21B_B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21B_B_.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21BB" format="1">
+<glyph name="uni21BB" format="2">
   <advance width="1233"/>
   <unicode hex="21BB"/>
   <outline>
     <contour>
-      <point x="640" y="-39" type="curve" name="hr00" smooth="yes"/>
+      <point x="640" y="-39" type="curve" smooth="yes" name="hr00"/>
       <point x="487" y="-39"/>
       <point x="357" y="22"/>
       <point x="261" y="118" type="curve" smooth="yes"/>
       <point x="157" y="222"/>
       <point x="102" y="357"/>
-      <point x="102" y="488" type="curve" name="dh01" smooth="yes"/>
+      <point x="102" y="488" type="curve" smooth="yes" name="dh01"/>
       <point x="102" y="652"/>
       <point x="190" y="860"/>
-      <point x="242" y="860" type="curve" name="ih01" smooth="yes"/>
+      <point x="242" y="860" type="curve" smooth="yes" name="ih01"/>
       <point x="55" y="860" type="line" name="dv02"/>
       <point x="55" y="1047" type="line" name="dv03"/>
       <point x="467" y="1047" type="line"/>
@@ -24,26 +24,26 @@
       <point x="350" y="632" type="line"/>
       <point x="335" y="615"/>
       <point x="327" y="570"/>
-      <point x="327" y="519" type="curve" name="dh02" smooth="yes"/>
+      <point x="327" y="519" type="curve" smooth="yes" name="dh02"/>
       <point x="327" y="434"/>
       <point x="352" y="358"/>
       <point x="417" y="293" type="curve" smooth="yes"/>
       <point x="477" y="233"/>
       <point x="549" y="203"/>
-      <point x="632" y="203" type="curve" name="dv01" smooth="yes"/>
+      <point x="632" y="203" type="curve" smooth="yes" name="dv01"/>
       <point x="725" y="203"/>
       <point x="797" y="240"/>
       <point x="849" y="293" type="curve" smooth="yes"/>
       <point x="905" y="349"/>
       <point x="939" y="425"/>
-      <point x="939" y="513" type="curve" name="dh05" smooth="yes"/>
+      <point x="939" y="513" type="curve" smooth="yes" name="dh05"/>
       <point x="939" y="594"/>
       <point x="909" y="673"/>
       <point x="848" y="733" type="curve"/>
       <point x="1019" y="882" type="line"/>
       <point x="1128" y="769"/>
       <point x="1178" y="646"/>
-      <point x="1178" y="502" type="curve" name="dh06" smooth="yes"/>
+      <point x="1178" y="502" type="curve" smooth="yes" name="dh06"/>
       <point x="1178" y="353"/>
       <point x="1124" y="222"/>
       <point x="1019" y="118" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21B_C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21B_C_.glif
index d570c0cc6..16cc04b3c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21B_C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21B_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21BC" format="1">
+<glyph name="uni21BC" format="2">
   <advance width="1233"/>
   <unicode hex="21BC"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21B_D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21B_D_.glif
index 0769e3c72..275978c53 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21B_D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21B_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21BD" format="1">
+<glyph name="uni21BD" format="2">
   <advance width="1233"/>
   <unicode hex="21BD"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21B_E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21B_E_.glif
index 38311ddb0..c30de15c3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21B_E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21B_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21BE" format="1">
+<glyph name="uni21BE" format="2">
   <advance width="1233"/>
   <unicode hex="21BE"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21B_F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21B_F_.glif
index b0a3caad2..22362708f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21B_F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21B_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21BF" format="1">
+<glyph name="uni21BF" format="2">
   <advance width="1233"/>
   <unicode hex="21BF"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21C_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21C_0.glif
index ff4f9e5af..0a38d53bf 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21C_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21C_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C0" format="1">
+<glyph name="uni21C0" format="2">
   <advance width="1233"/>
   <unicode hex="21C0"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21C_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21C_1.glif
index edecfde8c..5c4de0f54 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21C_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21C_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C1" format="1">
+<glyph name="uni21C1" format="2">
   <advance width="1233"/>
   <unicode hex="21C1"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21C_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21C_2.glif
index 4b128d383..af7583f94 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21C_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21C_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C2" format="1">
+<glyph name="uni21C2" format="2">
   <advance width="1233"/>
   <unicode hex="21C2"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21C_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21C_3.glif
index 68cef44e4..038a4bc3e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21C_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21C_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C3" format="1">
+<glyph name="uni21C3" format="2">
   <advance width="1233"/>
   <unicode hex="21C3"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21C_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21C_4.glif
index eef8ce437..d5c047a74 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21C_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21C_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C4" format="1">
+<glyph name="uni21C4" format="2">
   <advance width="1233"/>
   <unicode hex="21C4"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21C_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21C_5.glif
index 221468728..e7d2f2cd6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21C_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21C_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C5" format="1">
+<glyph name="uni21C5" format="2">
   <advance width="1233"/>
   <unicode hex="21C5"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21C_6.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21C_6.glif
index a52aaeb2b..3e1c82f55 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21C_6.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21C_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C6" format="1">
+<glyph name="uni21C6" format="2">
   <advance width="1233"/>
   <unicode hex="21C6"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21C_7.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21C_7.glif
index 9d06c9c52..86ee0a139 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21C_7.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21C_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C7" format="1">
+<glyph name="uni21C7" format="2">
   <advance width="1233"/>
   <unicode hex="21C7"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21C_8.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21C_8.glif
index 67f84022b..dd0b9b253 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21C_8.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21C_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C8" format="1">
+<glyph name="uni21C8" format="2">
   <advance width="1233"/>
   <unicode hex="21C8"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21C_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21C_9.glif
index 21df4238d..0b64c6900 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21C_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21C_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C9" format="1">
+<glyph name="uni21C9" format="2">
   <advance width="1233"/>
   <unicode hex="21C9"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21C_A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21C_A_.glif
index 02a88ac0d..b8801804d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21C_A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21C_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21CA" format="1">
+<glyph name="uni21CA" format="2">
   <advance width="1233"/>
   <unicode hex="21CA"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21C_B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21C_B_.glif
index ed1d8efdf..0818ce158 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21C_B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21C_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21CB" format="1">
+<glyph name="uni21CB" format="2">
   <advance width="1233"/>
   <unicode hex="21CB"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21C_C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21C_C_.glif
index 96700f464..a8499baef 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21C_C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21C_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21CC" format="1">
+<glyph name="uni21CC" format="2">
   <advance width="1233"/>
   <unicode hex="21CC"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21C_D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21C_D_.glif
index f70828afd..ba3fbe6e7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21C_D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21C_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21CD" format="1">
+<glyph name="uni21CD" format="2">
   <advance width="1233"/>
   <unicode hex="21CD"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21C_E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21C_E_.glif
index d885d3999..b78a4b05f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21C_E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21C_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21CE" format="1">
+<glyph name="uni21CE" format="2">
   <advance width="1233"/>
   <unicode hex="21CE"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21C_F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21C_F_.glif
index 1d64b4b24..ca546e6f3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21C_F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21C_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21CF" format="1">
+<glyph name="uni21CF" format="2">
   <advance width="1233"/>
   <unicode hex="21CF"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21D_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21D_5.glif
index 269e3777c..86cbe0e16 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21D_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21D_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21D5" format="1">
+<glyph name="uni21D5" format="2">
   <advance width="1233"/>
   <unicode hex="21D5"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21D_6.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21D_6.glif
index 698b13d6b..f17ecd0e8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21D_6.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21D_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21D6" format="1">
+<glyph name="uni21D6" format="2">
   <advance width="1233"/>
   <unicode hex="21D6"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21D_7.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21D_7.glif
index 5db555343..c4140dcf1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21D_7.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21D_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21D7" format="1">
+<glyph name="uni21D7" format="2">
   <advance width="1233"/>
   <unicode hex="21D7"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21D_8.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21D_8.glif
index 94c793b0a..cbaac5d68 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21D_8.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21D_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21D8" format="1">
+<glyph name="uni21D8" format="2">
   <advance width="1233"/>
   <unicode hex="21D8"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21D_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21D_9.glif
index da52e0229..f687e3d94 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21D_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21D_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21D9" format="1">
+<glyph name="uni21D9" format="2">
   <advance width="1233"/>
   <unicode hex="21D9"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21D_A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21D_A_.glif
index 64bb38780..99015c792 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21D_A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21D_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21DA" format="1">
+<glyph name="uni21DA" format="2">
   <advance width="1233"/>
   <unicode hex="21DA"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21D_B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21D_B_.glif
index da67f1620..8931a3631 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21D_B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21D_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21DB" format="1">
+<glyph name="uni21DB" format="2">
   <advance width="1233"/>
   <unicode hex="21DB"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21D_C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21D_C_.glif
index efdb36784..e6bb9e743 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21D_C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21D_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21DC" format="1">
+<glyph name="uni21DC" format="2">
   <advance width="1233"/>
   <unicode hex="21DC"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21D_D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21D_D_.glif
index 2ab629d5f..0521f9d95 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21D_D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21D_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21DD" format="1">
+<glyph name="uni21DD" format="2">
   <advance width="1233"/>
   <unicode hex="21DD"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21E_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21E_0.glif
index 536923091..c3ec992b8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21E_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21E_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E0" format="1">
+<glyph name="uni21E0" format="2">
   <advance width="1233"/>
   <unicode hex="21E0"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21E_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21E_1.glif
index 29bf8105a..a16f665ec 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21E_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21E_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E1" format="1">
+<glyph name="uni21E1" format="2">
   <advance width="1233"/>
   <unicode hex="21E1"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21E_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21E_2.glif
index a27f62d8e..40798f89d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21E_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21E_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E2" format="1">
+<glyph name="uni21E2" format="2">
   <advance width="1233"/>
   <unicode hex="21E2"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21E_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21E_3.glif
index f29c2aca0..88d288a5c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21E_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21E_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E3" format="1">
+<glyph name="uni21E3" format="2">
   <advance width="1233"/>
   <unicode hex="21E3"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21E_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21E_4.glif
index 0f8d11a44..f9e61244f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21E_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21E_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E4" format="1">
+<glyph name="uni21E4" format="2">
   <advance width="1233"/>
   <unicode hex="21E4"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21E_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21E_5.glif
index d031f5be2..2b8a04403 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21E_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21E_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E5" format="1">
+<glyph name="uni21E5" format="2">
   <advance width="1233"/>
   <unicode hex="21E5"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21E_6.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21E_6.glif
index b013c6602..a6f587b68 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21E_6.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21E_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E6" format="1">
+<glyph name="uni21E6" format="2">
   <advance width="1233"/>
   <unicode hex="21E6"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21E_7.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21E_7.glif
index 0e0ebce11..431b4ad5d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21E_7.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21E_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E7" format="1">
+<glyph name="uni21E7" format="2">
   <advance width="1233"/>
   <unicode hex="21E7"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21E_8.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21E_8.glif
index 9a8f598b1..0d6a89210 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21E_8.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21E_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E8" format="1">
+<glyph name="uni21E8" format="2">
   <advance width="1233"/>
   <unicode hex="21E8"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21E_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21E_9.glif
index 87f19620a..556795ccb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21E_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21E_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E9" format="1">
+<glyph name="uni21E9" format="2">
   <advance width="1233"/>
   <unicode hex="21E9"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21E_B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21E_B_.glif
index 2ae37a87b..31bb58e48 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21E_B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21E_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21EB" format="1">
+<glyph name="uni21EB" format="2">
   <advance width="1233"/>
   <unicode hex="21EB"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21E_C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21E_C_.glif
index e77358a4e..3f28c37a7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21E_C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21E_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21EC" format="1">
+<glyph name="uni21EC" format="2">
   <advance width="1233"/>
   <unicode hex="21EC"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21E_D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21E_D_.glif
index 6cfa59cde..c43596829 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21E_D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21E_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21ED" format="1">
+<glyph name="uni21ED" format="2">
   <advance width="1233"/>
   <unicode hex="21ED"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21E_E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21E_E_.glif
index 5b0e758b8..93d745cb2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21E_E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21E_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21EE" format="1">
+<glyph name="uni21EE" format="2">
   <advance width="1233"/>
   <unicode hex="21EE"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21E_F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21E_F_.glif
index 76723b660..ad52ad786 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21E_F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21E_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21EF" format="1">
+<glyph name="uni21EF" format="2">
   <advance width="1233"/>
   <unicode hex="21EF"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21F_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21F_0.glif
index f3fa4b469..ad6d72027 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21F_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21F_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F0" format="1">
+<glyph name="uni21F0" format="2">
   <advance width="1233"/>
   <unicode hex="21F0"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21F_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21F_1.glif
index 6c48c0ab6..3c0b6565b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21F_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21F_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F1" format="1">
+<glyph name="uni21F1" format="2">
   <advance width="1233"/>
   <unicode hex="21F1"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21F_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21F_2.glif
index be1ea2e72..c73a3bb41 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21F_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21F_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F2" format="1">
+<glyph name="uni21F2" format="2">
   <advance width="1233"/>
   <unicode hex="21F2"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21F_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21F_3.glif
index b1ab377fb..ace256a2b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21F_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21F_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F3" format="1">
+<glyph name="uni21F3" format="2">
   <advance width="1233"/>
   <unicode hex="21F3"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21F_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21F_4.glif
index 8bf45058c..b869c312e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21F_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21F_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F4" format="1">
+<glyph name="uni21F4" format="2">
   <advance width="1233"/>
   <unicode hex="21F4"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="739" y="449" type="line"/>
       <point x="713" y="357"/>
       <point x="616" y="230"/>
-      <point x="437" y="230" type="curve" name="dv01" smooth="yes"/>
+      <point x="437" y="230" type="curve" smooth="yes" name="dv01"/>
       <point x="265" y="230"/>
       <point x="173" y="345"/>
       <point x="144" y="449" type="curve" name="sv01"/>
@@ -18,10 +18,10 @@
       <point x="144" y="673" type="line" name="dv02"/>
       <point x="171" y="773"/>
       <point x="273" y="896"/>
-      <point x="433" y="896" type="curve" name="hr01" smooth="yes"/>
+      <point x="433" y="896" type="curve" smooth="yes" name="hr01"/>
       <point x="487" y="896"/>
       <point x="573" y="882"/>
-      <point x="662" y="807" type="curve" name="hr02" smooth="yes"/>
+      <point x="662" y="807" type="curve" smooth="yes" name="hr02"/>
       <point x="707" y="768"/>
       <point x="728" y="733"/>
       <point x="739" y="673" type="curve" name="sv02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21F_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21F_5.glif
index 65d1e027d..a6a02451f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21F_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21F_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F5" format="1">
+<glyph name="uni21F5" format="2">
   <advance width="1233"/>
   <unicode hex="21F5"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21F_6.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21F_6.glif
index 3037dd63e..026d78f84 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21F_6.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21F_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F6" format="1">
+<glyph name="uni21F6" format="2">
   <advance width="1233"/>
   <unicode hex="21F6"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21F_7.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21F_7.glif
index 1d21b24f3..3e1d76405 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21F_7.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21F_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F7" format="1">
+<glyph name="uni21F7" format="2">
   <advance width="1233"/>
   <unicode hex="21F7"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21F_8.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21F_8.glif
index abee08574..6f95e0ac0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21F_8.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21F_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F8" format="1">
+<glyph name="uni21F8" format="2">
   <advance width="1233"/>
   <unicode hex="21F8"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21F_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21F_9.glif
index fee831336..9a287cdc8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21F_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21F_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F9" format="1">
+<glyph name="uni21F9" format="2">
   <advance width="1233"/>
   <unicode hex="21F9"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21F_A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21F_A_.glif
index 2b64bfa04..ee333e062 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21F_A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21F_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21FA" format="1">
+<glyph name="uni21FA" format="2">
   <advance width="1233"/>
   <unicode hex="21FA"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21F_B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21F_B_.glif
index 7c824316d..f4e3f5343 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21F_B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21F_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21FB" format="1">
+<glyph name="uni21FB" format="2">
   <advance width="1233"/>
   <unicode hex="21FB"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21F_C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21F_C_.glif
index 765750813..8677c3cd9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21F_C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21F_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21FC" format="1">
+<glyph name="uni21FC" format="2">
   <advance width="1233"/>
   <unicode hex="21FC"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21F_D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21F_D_.glif
index b750d9f4a..8ff29da36 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21F_D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21F_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21FD" format="1">
+<glyph name="uni21FD" format="2">
   <advance width="1233"/>
   <unicode hex="21FD"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21F_E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21F_E_.glif
index 777ba614c..1100b4e1a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21F_E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21F_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21FE" format="1">
+<glyph name="uni21FE" format="2">
   <advance width="1233"/>
   <unicode hex="21FE"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni21F_F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni21F_F_.glif
index 58b0d6fb3..297c1587e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni21F_F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni21F_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21FF" format="1">
+<glyph name="uni21FF" format="2">
   <advance width="1233"/>
   <unicode hex="21FF"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2201.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2201.glif
index 7dacc5a4c..839e78ef9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2201.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2201.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2201" format="1">
+<glyph name="uni2201" format="2">
   <advance width="1233"/>
   <unicode hex="2201"/>
   <outline>
     <contour>
-      <point x="639" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="639" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="243" y="-29"/>
       <point x="23" y="252"/>
       <point x="23" y="745" type="curve" name="dh01"/>
       <point x="23" y="746" type="line"/>
       <point x="23" y="1239"/>
       <point x="243" y="1520"/>
-      <point x="639" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="639" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="838" y="1520"/>
       <point x="988" y="1451"/>
       <point x="1092" y="1319" type="curve" smooth="yes"/>
@@ -24,20 +24,20 @@
       <point x="815" y="1143" type="curve" smooth="yes"/>
       <point x="784" y="1215"/>
       <point x="724" y="1257"/>
-      <point x="637" y="1257" type="curve" name="sv01" smooth="yes"/>
+      <point x="637" y="1257" type="curve" smooth="yes" name="sv01"/>
       <point x="554" y="1257"/>
       <point x="496" y="1219"/>
       <point x="461" y="1143" type="curve" smooth="yes"/>
       <point x="426" y="1065"/>
       <point x="408" y="933"/>
       <point x="408" y="748" type="curve" smooth="yes"/>
-      <point x="408" y="743" type="line" name="dh02" smooth="yes"/>
+      <point x="408" y="743" type="line" smooth="yes" name="dh02"/>
       <point x="408" y="536"/>
       <point x="427" y="424"/>
-      <point x="462" y="349" type="curve" name="hr02" smooth="yes"/>
+      <point x="462" y="349" type="curve" smooth="yes" name="hr02"/>
       <point x="497" y="276"/>
       <point x="548" y="234"/>
-      <point x="636" y="234" type="curve" name="dv02" smooth="yes"/>
+      <point x="636" y="234" type="curve" smooth="yes" name="dv02"/>
       <point x="724" y="234"/>
       <point x="784" y="276"/>
       <point x="815" y="348" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2204.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2204.glif
index ce7168eae..fa10abb79 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2204.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2204.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2204" format="1">
+<glyph name="uni2204" format="2">
   <advance width="1233"/>
   <unicode hex="2204"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2206.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2206.glif
index 31ec4182d..a9779b41b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2206.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2206.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2206" format="1">
+<glyph name="uni2206" format="2">
   <advance width="1233"/>
   <unicode hex="2206"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni220A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni220A_.glif
index e5ece41f6..d8e5f20aa 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni220A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni220A_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni220A" format="1">
+<glyph name="uni220A" format="2">
   <advance width="1233"/>
   <unicode hex="220A"/>
   <outline>
     <contour>
-      <point x="636" y="129" type="line" name="hr00" smooth="yes"/>
+      <point x="636" y="129" type="line" smooth="yes" name="hr00"/>
       <point x="440" y="129"/>
       <point x="267" y="228"/>
       <point x="171" y="385" type="curve" smooth="yes"/>
@@ -34,7 +34,7 @@
       <point x="402" y="449" type="curve" smooth="yes"/>
       <point x="465" y="384"/>
       <point x="543" y="351"/>
-      <point x="636" y="351" type="curve" name="dv01" smooth="yes"/>
+      <point x="636" y="351" type="curve" smooth="yes" name="dv01"/>
       <point x="1134" y="351" type="line"/>
       <point x="1134" y="129" type="line" name="sv01"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni220C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni220C_.glif
index aa12e3a8a..3709abec9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni220C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni220C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni220C" format="1">
+<glyph name="uni220C" format="2">
   <advance width="1233"/>
   <unicode hex="220C"/>
   <outline>
@@ -16,16 +16,16 @@
       <point x="628" y="1293" type="line"/>
       <point x="621" y="1294"/>
       <point x="614" y="1294"/>
-      <point x="607" y="1294" type="curve" name="dv01" smooth="yes"/>
+      <point x="607" y="1294" type="curve" smooth="yes" name="dv01"/>
       <point x="110" y="1294" type="line"/>
       <point x="110" y="1524" type="line"/>
-      <point x="607" y="1524" type="line" name="dv02" smooth="yes"/>
+      <point x="607" y="1524" type="line" smooth="yes" name="dv02"/>
       <point x="651" y="1524"/>
       <point x="677" y="1518"/>
-      <point x="710" y="1510" type="curve" name="at01" smooth="yes"/>
+      <point x="710" y="1510" type="curve" smooth="yes" name="at01"/>
       <point x="715" y="1509"/>
       <point x="721" y="1508"/>
-      <point x="726" y="1508" type="curve" name="at02" smooth="yes"/>
+      <point x="726" y="1508" type="curve" smooth="yes" name="at02"/>
       <point x="769" y="1508"/>
       <point x="790" y="1569"/>
       <point x="790" y="1677" type="curve" smooth="yes"/>
@@ -42,7 +42,7 @@
       <point x="876" y="102" type="curve" smooth="yes"/>
       <point x="794" y="34"/>
       <point x="704" y="0"/>
-      <point x="607" y="0" type="curve" name="ab02" smooth="yes"/>
+      <point x="607" y="0" type="curve" smooth="yes" name="ab02"/>
       <point x="390" y="0" type="line"/>
       <point x="315" y="-197" type="line" name="av01"/>
     </contour>
@@ -54,7 +54,7 @@
       <point x="718" y="877" type="line" name="iv02"/>
     </contour>
     <contour>
-      <point x="607" y="230" type="line" name="sv03" smooth="yes"/>
+      <point x="607" y="230" type="line" smooth="yes" name="sv03"/>
       <point x="717" y="230"/>
       <point x="816" y="330"/>
       <point x="872" y="495" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni220D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni220D_.glif
index 1c8ea1362..10d202ab2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni220D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni220D_.glif
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni220D" format="1">
+<glyph name="uni220D" format="2">
   <advance width="1233"/>
   <unicode hex="220D"/>
   <outline>
     <contour>
       <point x="99" y="353" type="line" name="hr00"/>
-      <point x="597" y="353" type="line" name="dv02" smooth="yes"/>
+      <point x="597" y="353" type="line" smooth="yes" name="dv02"/>
       <point x="697" y="353"/>
       <point x="767" y="388"/>
       <point x="830" y="449" type="curve" smooth="yes"/>
@@ -20,10 +20,10 @@
       <point x="830" y="835" type="curve" smooth="yes"/>
       <point x="767" y="900"/>
       <point x="689" y="933"/>
-      <point x="597" y="933" type="curve" name="dv03" smooth="yes"/>
+      <point x="597" y="933" type="curve" smooth="yes" name="dv03"/>
       <point x="99" y="933" type="line"/>
       <point x="99" y="1155" type="line"/>
-      <point x="597" y="1155" type="line" name="dv04" smooth="yes"/>
+      <point x="597" y="1155" type="line" smooth="yes" name="dv04"/>
       <point x="793" y="1155"/>
       <point x="966" y="1058"/>
       <point x="1062" y="900" type="curve" smooth="yes"/>
@@ -35,7 +35,7 @@
       <point x="867" y="198" type="curve" smooth="yes"/>
       <point x="784" y="152"/>
       <point x="694" y="129"/>
-      <point x="597" y="129" type="curve" name="dv01" smooth="yes"/>
+      <point x="597" y="129" type="curve" smooth="yes" name="dv01"/>
       <point x="99" y="129" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni220E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni220E_.glif
index 6daf54592..eeaff1bf1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni220E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni220E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni220E" format="1">
+<glyph name="uni220E" format="2">
   <advance width="1233"/>
   <unicode hex="220E"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2210.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2210.glif
index 39f518dea..10a94a884 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2210.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2210.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2210" format="1">
+<glyph name="uni2210" format="2">
   <advance width="1233"/>
   <unicode hex="2210"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2213.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2213.glif
index 2251a35d9..3794caa8d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2213.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2213.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2213" format="1">
+<glyph name="uni2213" format="2">
   <advance width="1233"/>
   <unicode hex="2213"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2215.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2215.glif
index 849ab7c15..db9e61ffb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2215.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2215.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2215" format="1">
+<glyph name="uni2215" format="2">
   <advance width="1233"/>
   <unicode hex="2215"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2218.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2218.glif
index 4d64b24a4..f6147c06e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2218.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2218.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2218" format="1">
+<glyph name="uni2218" format="2">
   <advance width="1233"/>
   <unicode hex="2218"/>
   <outline>
     <contour>
-      <point x="613" y="372" type="curve" name="hr00" smooth="yes"/>
+      <point x="613" y="372" type="curve" smooth="yes" name="hr00"/>
       <point x="427" y="372"/>
       <point x="283" y="515"/>
-      <point x="283" y="703" type="curve" name="sh01" smooth="yes"/>
+      <point x="283" y="703" type="curve" smooth="yes" name="sh01"/>
       <point x="283" y="891"/>
       <point x="429" y="1038"/>
-      <point x="614" y="1038" type="curve" name="dv03" smooth="yes"/>
+      <point x="614" y="1038" type="curve" smooth="yes" name="dv03"/>
       <point x="710" y="1038"/>
       <point x="793" y="999"/>
       <point x="853" y="939" type="curve" smooth="yes"/>
       <point x="916" y="875"/>
       <point x="948" y="793"/>
-      <point x="948" y="705" type="curve" name="sh02" smooth="yes"/>
+      <point x="948" y="705" type="curve" smooth="yes" name="sh02"/>
       <point x="948" y="616"/>
       <point x="913" y="531"/>
       <point x="852" y="470" type="curve" smooth="yes"/>
@@ -24,16 +24,16 @@
       <point x="704" y="372"/>
     </contour>
     <contour>
-      <point x="614" y="534" type="curve" name="dv01" smooth="yes"/>
+      <point x="614" y="534" type="curve" smooth="yes" name="dv01"/>
       <point x="710" y="534"/>
       <point x="786" y="609"/>
-      <point x="786" y="705" type="curve" name="ah01" smooth="yes"/>
+      <point x="786" y="705" type="curve" smooth="yes" name="ah01"/>
       <point x="786" y="800"/>
       <point x="712" y="876"/>
-      <point x="616" y="876" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="876" type="curve" smooth="yes" name="dv02"/>
       <point x="520" y="876"/>
       <point x="444" y="800"/>
-      <point x="444" y="704" type="curve" name="sh03" smooth="yes"/>
+      <point x="444" y="704" type="curve" smooth="yes" name="sh03"/>
       <point x="444" y="608"/>
       <point x="518" y="534"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2219.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2219.glif
index 1917b8215..e1c6c6ded 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2219.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2219.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2219" format="1">
+<glyph name="uni2219" format="2">
   <advance width="1233"/>
   <unicode hex="2219"/>
   <outline>
     <contour>
-      <point x="441" y="530" type="line" name="hr00" smooth="yes"/>
+      <point x="441" y="530" type="line" smooth="yes" name="hr00"/>
       <point x="422" y="530"/>
       <point x="413" y="538"/>
       <point x="413" y="555" type="curve" smooth="yes"/>
@@ -14,7 +14,7 @@
       <point x="474" y="868" type="line"/>
       <point x="477" y="886"/>
       <point x="487" y="895"/>
-      <point x="506" y="895" type="curve" name="dv01" smooth="yes"/>
+      <point x="506" y="895" type="curve" smooth="yes" name="dv01"/>
       <point x="780" y="895" type="line" smooth="yes"/>
       <point x="799" y="895"/>
       <point x="808" y="887"/>
@@ -25,7 +25,7 @@
       <point x="746" y="557" type="line" smooth="yes"/>
       <point x="743" y="539"/>
       <point x="732" y="530"/>
-      <point x="714" y="530" type="curve" name="sv01" smooth="yes"/>
+      <point x="714" y="530" type="curve" smooth="yes" name="sv01"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni221B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni221B_.glif
index 98e8d88e1..c237a93b5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni221B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni221B_.glif
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni221B" format="1">
+<glyph name="uni221B" format="2">
   <advance width="1233"/>
   <unicode hex="221B"/>
   <outline>
     <contour>
-      <point x="370" y="1043" type="curve" name="dv05" smooth="yes"/>
+      <point x="370" y="1043" type="curve" smooth="yes" name="dv05"/>
       <point x="271" y="1043"/>
       <point x="172" y="1057"/>
       <point x="72" y="1084" type="curve"/>
       <point x="72" y="1238" type="line" name="iv01"/>
       <point x="159" y="1201"/>
       <point x="273" y="1183"/>
-      <point x="358" y="1183" type="curve" name="dv06" smooth="yes"/>
+      <point x="358" y="1183" type="curve" smooth="yes" name="dv06"/>
       <point x="491" y="1183"/>
       <point x="551" y="1227"/>
-      <point x="551" y="1303" type="curve" name="sh01" smooth="yes"/>
+      <point x="551" y="1303" type="curve" smooth="yes" name="sh01"/>
       <point x="551" y="1384"/>
       <point x="483" y="1432"/>
-      <point x="367" y="1432" type="curve" name="dv03" smooth="yes"/>
+      <point x="367" y="1432" type="curve" smooth="yes" name="dv03"/>
       <point x="256" y="1432" type="line"/>
       <point x="256" y="1578" type="line" name="dh01"/>
-      <point x="367" y="1578" type="line" name="dv04" smooth="yes"/>
+      <point x="367" y="1578" type="line" smooth="yes" name="dv04"/>
       <point x="467" y="1578"/>
       <point x="526" y="1611"/>
-      <point x="526" y="1674" type="curve" name="sh02" smooth="yes"/>
+      <point x="526" y="1674" type="curve" smooth="yes" name="sh02"/>
       <point x="526" y="1733"/>
       <point x="476" y="1768"/>
-      <point x="365" y="1768" type="curve" name="dv01" smooth="yes"/>
+      <point x="365" y="1768" type="curve" smooth="yes" name="dv01"/>
       <point x="301" y="1768"/>
       <point x="198" y="1755"/>
       <point x="102" y="1723" type="curve"/>
       <point x="102" y="1875" type="line" name="hr01"/>
       <point x="194" y="1898"/>
       <point x="289" y="1910"/>
-      <point x="373" y="1910" type="curve" name="dv02" smooth="yes"/>
+      <point x="373" y="1910" type="curve" smooth="yes" name="dv02"/>
       <point x="592" y="1910"/>
       <point x="723" y="1827"/>
-      <point x="723" y="1694" type="curve" name="hr02" smooth="yes"/>
+      <point x="723" y="1694" type="curve" smooth="yes" name="hr02"/>
       <point x="723" y="1594"/>
       <point x="652" y="1531"/>
       <point x="520" y="1510" type="curve" name="ih01"/>
       <point x="663" y="1491"/>
       <point x="748" y="1419"/>
-      <point x="748" y="1290" type="curve" name="sh03" smooth="yes"/>
+      <point x="748" y="1290" type="curve" smooth="yes" name="sh03"/>
       <point x="748" y="1129"/>
       <point x="618" y="1043"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni221C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni221C_.glif
index 3d672f6b2..18dd9fe2c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni221C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni221C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni221C" format="1">
+<glyph name="uni221C" format="2">
   <advance width="1233"/>
   <unicode hex="221C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2223.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2223.glif
index b5c335234..ec5f9d561 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2223.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2223.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2223" format="1">
+<glyph name="uni2223" format="2">
   <advance width="1233"/>
   <unicode hex="2223"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni222C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni222C_.glif
index 9c38b6b26..8f1a47de5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni222C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni222C_.glif
@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni222C" format="1">
+<glyph name="uni222C" format="2">
   <advance width="1233"/>
   <unicode hex="222C"/>
   <outline>
     <contour>
-      <point x="242" y="-418" type="curve" name="hr00" smooth="yes"/>
+      <point x="242" y="-418" type="curve" smooth="yes" name="hr00"/>
       <point x="170" y="-418"/>
       <point x="72" y="-394"/>
       <point x="0" y="-343" type="curve"/>
       <point x="81" y="-199" type="line"/>
       <point x="110" y="-224"/>
       <point x="157" y="-237"/>
-      <point x="180" y="-237" type="curve" name="dv01" smooth="yes"/>
+      <point x="180" y="-237" type="curve" smooth="yes" name="dv01"/>
       <point x="217" y="-237"/>
       <point x="230" y="-202"/>
-      <point x="230" y="-68" type="curve" name="sh01" smooth="yes"/>
+      <point x="230" y="-68" type="curve" smooth="yes" name="sh01"/>
       <point x="230" y="1502" type="line" smooth="yes"/>
       <point x="230" y="1695"/>
       <point x="300" y="1827"/>
-      <point x="468" y="1827" type="curve" name="sh03" smooth="yes"/>
+      <point x="468" y="1827" type="curve" smooth="yes" name="sh03"/>
       <point x="540" y="1827"/>
       <point x="638" y="1803"/>
       <point x="710" y="1752" type="curve"/>
       <point x="629" y="1608" type="line"/>
       <point x="600" y="1633"/>
       <point x="553" y="1646"/>
-      <point x="530" y="1646" type="curve" name="dv02" smooth="yes"/>
+      <point x="530" y="1646" type="curve" smooth="yes" name="dv02"/>
       <point x="493" y="1646"/>
       <point x="480" y="1611"/>
       <point x="480" y="1477" type="curve" smooth="yes"/>
-      <point x="480" y="-93" type="line" name="sh02" smooth="yes"/>
+      <point x="480" y="-93" type="line" smooth="yes" name="sh02"/>
       <point x="480" y="-286"/>
       <point x="410" y="-418"/>
     </contour>
     <contour>
-      <point x="765" y="-418" type="curve" name="sh04" smooth="yes"/>
+      <point x="765" y="-418" type="curve" smooth="yes" name="sh04"/>
       <point x="693" y="-418"/>
       <point x="595" y="-394"/>
       <point x="523" y="-343" type="curve"/>
       <point x="604" y="-199" type="line"/>
       <point x="633" y="-224"/>
       <point x="680" y="-237"/>
-      <point x="703" y="-237" type="curve" name="sv01" smooth="yes"/>
+      <point x="703" y="-237" type="curve" smooth="yes" name="sv01"/>
       <point x="740" y="-237"/>
       <point x="753" y="-202"/>
-      <point x="753" y="-68" type="curve" name="ah01" smooth="yes"/>
+      <point x="753" y="-68" type="curve" smooth="yes" name="ah01"/>
       <point x="753" y="1502" type="line" smooth="yes"/>
       <point x="753" y="1695"/>
       <point x="823" y="1827"/>
-      <point x="991" y="1827" type="curve" name="sh06" smooth="yes"/>
+      <point x="991" y="1827" type="curve" smooth="yes" name="sh06"/>
       <point x="1063" y="1827"/>
       <point x="1161" y="1803"/>
       <point x="1233" y="1752" type="curve"/>
       <point x="1152" y="1608" type="line"/>
       <point x="1123" y="1633"/>
       <point x="1076" y="1646"/>
-      <point x="1053" y="1646" type="curve" name="sv02" smooth="yes"/>
+      <point x="1053" y="1646" type="curve" smooth="yes" name="sv02"/>
       <point x="1016" y="1646"/>
       <point x="1003" y="1611"/>
       <point x="1003" y="1477" type="curve" smooth="yes"/>
-      <point x="1003" y="-93" type="line" name="sh05" smooth="yes"/>
+      <point x="1003" y="-93" type="line" smooth="yes" name="sh05"/>
       <point x="1003" y="-286"/>
       <point x="933" y="-418"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni222D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni222D_.glif
index b2c3114ef..752243202 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni222D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni222D_.glif
@@ -1,95 +1,95 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni222D" format="1">
+<glyph name="uni222D" format="2">
   <advance width="1233"/>
   <unicode hex="222D"/>
   <outline>
     <contour>
-      <point x="149" y="-418" type="curve" name="hr00" smooth="yes"/>
+      <point x="149" y="-418" type="curve" smooth="yes" name="hr00"/>
       <point x="97" y="-418"/>
       <point x="42" y="-400"/>
       <point x="-42" y="-343" type="curve"/>
       <point x="40" y="-221" type="line"/>
       <point x="49" y="-232"/>
       <point x="65" y="-237"/>
-      <point x="76" y="-237" type="curve" name="dv01" smooth="yes"/>
+      <point x="76" y="-237" type="curve" smooth="yes" name="dv01"/>
       <point x="105" y="-237"/>
       <point x="118" y="-189"/>
-      <point x="118" y="-68" type="curve" name="dh01" smooth="yes"/>
+      <point x="118" y="-68" type="curve" smooth="yes" name="dh01"/>
       <point x="118" y="1502" type="line" smooth="yes"/>
       <point x="118" y="1695"/>
       <point x="197" y="1827"/>
-      <point x="337" y="1827" type="curve" name="dv03" smooth="yes"/>
+      <point x="337" y="1827" type="curve" smooth="yes" name="dv03"/>
       <point x="389" y="1827"/>
       <point x="444" y="1809"/>
       <point x="528" y="1752" type="curve"/>
       <point x="446" y="1630" type="line" name="ih01"/>
       <point x="437" y="1641"/>
       <point x="421" y="1646"/>
-      <point x="410" y="1646" type="curve" name="dv02" smooth="yes"/>
+      <point x="410" y="1646" type="curve" smooth="yes" name="dv02"/>
       <point x="381" y="1646"/>
       <point x="368" y="1598"/>
       <point x="368" y="1477" type="curve" smooth="yes"/>
-      <point x="368" y="-93" type="line" name="dh02" smooth="yes"/>
+      <point x="368" y="-93" type="line" smooth="yes" name="dh02"/>
       <point x="368" y="-286"/>
       <point x="289" y="-418"/>
     </contour>
     <contour>
-      <point x="522" y="-418" type="curve" name="sv01" smooth="yes"/>
+      <point x="522" y="-418" type="curve" smooth="yes" name="sv01"/>
       <point x="466" y="-418"/>
       <point x="413" y="-399"/>
       <point x="332" y="-343" type="curve"/>
       <point x="414" y="-221" type="line" name="ih02"/>
       <point x="423" y="-232"/>
       <point x="439" y="-237"/>
-      <point x="450" y="-237" type="curve" name="sv02" smooth="yes"/>
+      <point x="450" y="-237" type="curve" smooth="yes" name="sv02"/>
       <point x="479" y="-237"/>
       <point x="492" y="-189"/>
-      <point x="492" y="-68" type="curve" name="dh03" smooth="yes"/>
+      <point x="492" y="-68" type="curve" smooth="yes" name="dh03"/>
       <point x="492" y="1502" type="line" smooth="yes"/>
       <point x="492" y="1695"/>
       <point x="571" y="1827"/>
-      <point x="711" y="1827" type="curve" name="sv03" smooth="yes"/>
+      <point x="711" y="1827" type="curve" smooth="yes" name="sv03"/>
       <point x="771" y="1827"/>
       <point x="827" y="1803"/>
       <point x="902" y="1752" type="curve"/>
       <point x="820" y="1630" type="line" name="ih03"/>
       <point x="811" y="1641"/>
       <point x="795" y="1646"/>
-      <point x="784" y="1646" type="curve" name="sv04" smooth="yes"/>
+      <point x="784" y="1646" type="curve" smooth="yes" name="sv04"/>
       <point x="755" y="1646"/>
       <point x="742" y="1598"/>
       <point x="742" y="1477" type="curve" smooth="yes"/>
-      <point x="742" y="-93" type="line" name="dh04" smooth="yes"/>
+      <point x="742" y="-93" type="line" smooth="yes" name="dh04"/>
       <point x="742" y="-286"/>
       <point x="662" y="-418"/>
     </contour>
     <contour>
-      <point x="896" y="-418" type="curve" name="sv05" smooth="yes"/>
+      <point x="896" y="-418" type="curve" smooth="yes" name="sv05"/>
       <point x="844" y="-418"/>
       <point x="789" y="-400"/>
       <point x="705" y="-343" type="curve"/>
       <point x="787" y="-221" type="line" name="ih04"/>
       <point x="796" y="-232"/>
       <point x="812" y="-237"/>
-      <point x="823" y="-237" type="curve" name="sv06" smooth="yes"/>
+      <point x="823" y="-237" type="curve" smooth="yes" name="sv06"/>
       <point x="852" y="-237"/>
       <point x="865" y="-189"/>
-      <point x="865" y="-68" type="curve" name="dh05" smooth="yes"/>
+      <point x="865" y="-68" type="curve" smooth="yes" name="dh05"/>
       <point x="865" y="1502" type="line" smooth="yes"/>
       <point x="865" y="1695"/>
       <point x="944" y="1827"/>
-      <point x="1084" y="1827" type="curve" name="sv07" smooth="yes"/>
+      <point x="1084" y="1827" type="curve" smooth="yes" name="sv07"/>
       <point x="1136" y="1827"/>
       <point x="1191" y="1809"/>
       <point x="1275" y="1752" type="curve"/>
       <point x="1193" y="1630" type="line"/>
       <point x="1184" y="1641"/>
       <point x="1168" y="1646"/>
-      <point x="1157" y="1646" type="curve" name="sv08" smooth="yes"/>
+      <point x="1157" y="1646" type="curve" smooth="yes" name="sv08"/>
       <point x="1128" y="1646"/>
       <point x="1115" y="1598"/>
       <point x="1115" y="1477" type="curve" smooth="yes"/>
-      <point x="1115" y="-93" type="line" name="dh06" smooth="yes"/>
+      <point x="1115" y="-93" type="line" smooth="yes" name="dh06"/>
       <point x="1115" y="-286"/>
       <point x="1036" y="-418"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2235.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2235.glif
index 70cd74a71..c84f1403b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2235.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2235.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2235" format="1">
+<glyph name="uni2235" format="2">
   <advance width="1233"/>
   <unicode hex="2235"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2236.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2236.glif
index 22541e1e0..9d80e7855 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2236.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2236.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2236" format="1">
+<glyph name="uni2236" format="2">
   <advance width="1233"/>
   <unicode hex="2236"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2237.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2237.glif
index 396720782..e91746f16 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2237.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2237.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2237" format="1">
+<glyph name="uni2237" format="2">
   <advance width="1233"/>
   <unicode hex="2237"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2238.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2238.glif
index ef4004de5..bcecceb7c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2238.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2238.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2238" format="1">
+<glyph name="uni2238" format="2">
   <advance width="1233"/>
   <unicode hex="2238"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2239.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2239.glif
index cf55df1d8..ee29991cc 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2239.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2239.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2239" format="1">
+<glyph name="uni2239" format="2">
   <advance width="1233"/>
   <unicode hex="2239"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni223A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni223A_.glif
index 6fa57def4..1fb491f00 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni223A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni223A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni223A" format="1">
+<glyph name="uni223A" format="2">
   <advance width="1233"/>
   <unicode hex="223A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni223B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni223B_.glif
index fffb28abf..7483e4c1b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni223B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni223B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni223B" format="1">
+<glyph name="uni223B" format="2">
   <advance width="1233"/>
   <unicode hex="223B"/>
   <outline>
@@ -10,21 +10,21 @@
       <point x="451" y="912" type="line"/>
     </contour>
     <contour>
-      <point x="850" y="468" type="curve" name="dv02" smooth="yes"/>
+      <point x="850" y="468" type="curve" smooth="yes" name="dv02"/>
       <point x="778" y="468"/>
       <point x="726" y="484"/>
       <point x="645" y="519" type="curve" smooth="yes"/>
       <point x="612" y="533" type="line" smooth="yes"/>
       <point x="522" y="570"/>
       <point x="468" y="591"/>
-      <point x="385" y="591" type="curve" name="dv04" smooth="yes"/>
+      <point x="385" y="591" type="curve" smooth="yes" name="dv04"/>
       <point x="280" y="591"/>
       <point x="192" y="558"/>
       <point x="88" y="470" type="curve" name="iv01"/>
       <point x="88" y="699" type="line"/>
       <point x="192" y="779"/>
       <point x="287" y="814"/>
-      <point x="390" y="814" type="curve" name="dv05" smooth="yes"/>
+      <point x="390" y="814" type="curve" smooth="yes" name="dv05"/>
       <point x="463" y="814"/>
       <point x="533" y="796"/>
       <point x="621" y="759" type="curve" name="hr01"/>
@@ -32,7 +32,7 @@
       <point x="652" y="745" type="line" smooth="yes"/>
       <point x="725" y="710"/>
       <point x="797" y="691"/>
-      <point x="865" y="691" type="curve" name="dv03" smooth="yes"/>
+      <point x="865" y="691" type="curve" smooth="yes" name="dv03"/>
       <point x="958" y="691"/>
       <point x="1045" y="728"/>
       <point x="1145" y="816" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni223D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni223D_.glif
index 7e19c0aca..4070e57ff 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni223D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni223D_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni223D" format="1">
+<glyph name="uni223D" format="2">
   <advance width="1233"/>
   <unicode hex="223D"/>
   <outline>
     <contour>
-      <point x="381" y="468" type="curve" name="dv01" smooth="yes"/>
+      <point x="381" y="468" type="curve" smooth="yes" name="dv01"/>
       <point x="281" y="468"/>
       <point x="188" y="502"/>
       <point x="88" y="582" type="curve"/>
       <point x="88" y="816" type="line" name="av01"/>
       <point x="188" y="728"/>
       <point x="275" y="691"/>
-      <point x="368" y="691" type="curve" name="hr01" smooth="yes"/>
+      <point x="368" y="691" type="curve" smooth="yes" name="hr01"/>
       <point x="436" y="691"/>
       <point x="508" y="710"/>
       <point x="581" y="745" type="curve" smooth="yes"/>
@@ -19,14 +19,14 @@
       <point x="612" y="759" type="line"/>
       <point x="700" y="796"/>
       <point x="770" y="814"/>
-      <point x="843" y="814" type="curve" name="av02" smooth="yes"/>
+      <point x="843" y="814" type="curve" smooth="yes" name="av02"/>
       <point x="946" y="814"/>
       <point x="1041" y="779"/>
       <point x="1145" y="699" type="curve"/>
       <point x="1145" y="470" type="line" name="iv01"/>
       <point x="1041" y="558"/>
       <point x="953" y="591"/>
-      <point x="848" y="591" type="curve" name="hr02" smooth="yes"/>
+      <point x="848" y="591" type="curve" smooth="yes" name="hr02"/>
       <point x="765" y="591"/>
       <point x="711" y="570"/>
       <point x="621" y="533" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2241.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2241.glif
index a8daefb6b..525b3a2cd 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2241.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2241.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2241" format="1">
+<glyph name="uni2241" format="2">
   <advance width="1233"/>
   <unicode hex="2241"/>
   <outline>
@@ -8,14 +8,14 @@
       <point x="484" y="579" type="line"/>
       <point x="449" y="587"/>
       <point x="414" y="591"/>
-      <point x="381" y="591" type="curve" name="dv02" smooth="yes"/>
+      <point x="381" y="591" type="curve" smooth="yes" name="dv02"/>
       <point x="277" y="591"/>
       <point x="188" y="554"/>
       <point x="88" y="470" type="curve" name="iv01"/>
       <point x="88" y="699" type="line"/>
       <point x="191" y="779"/>
       <point x="285" y="814"/>
-      <point x="389" y="814" type="curve" name="dv03" smooth="yes"/>
+      <point x="389" y="814" type="curve" smooth="yes" name="dv03"/>
       <point x="445" y="814"/>
       <point x="493" y="804"/>
       <point x="553" y="785" type="curve"/>
@@ -24,14 +24,14 @@
       <point x="752" y="708" type="line"/>
       <point x="792" y="697"/>
       <point x="830" y="691"/>
-      <point x="865" y="691" type="curve" name="hr01" smooth="yes"/>
+      <point x="865" y="691" type="curve" smooth="yes" name="hr01"/>
       <point x="958" y="691"/>
       <point x="1045" y="728"/>
       <point x="1145" y="816" type="curve" name="iv02"/>
       <point x="1145" y="582" type="line"/>
       <point x="1049" y="506"/>
       <point x="952" y="468"/>
-      <point x="853" y="468" type="curve" name="dv01" smooth="yes"/>
+      <point x="853" y="468" type="curve" smooth="yes" name="dv01"/>
       <point x="796" y="468"/>
       <point x="743" y="480"/>
       <point x="682" y="503" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2242.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2242.glif
index d1008f14f..e55565885 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2242.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2242.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2242" format="1">
+<glyph name="uni2242" format="2">
   <advance width="1233"/>
   <unicode hex="2242"/>
   <outline>
@@ -10,29 +10,29 @@
       <point x="88" y="752" type="line"/>
     </contour>
     <contour>
-      <point x="850" y="254" type="curve" name="dv01" smooth="yes"/>
+      <point x="850" y="254" type="curve" smooth="yes" name="dv01"/>
       <point x="778" y="254"/>
       <point x="726" y="270"/>
       <point x="645" y="305" type="curve" smooth="yes"/>
       <point x="612" y="319" type="line" smooth="yes"/>
       <point x="522" y="356"/>
       <point x="468" y="377"/>
-      <point x="385" y="377" type="curve" name="hr01" smooth="yes"/>
+      <point x="385" y="377" type="curve" smooth="yes" name="hr01"/>
       <point x="280" y="377"/>
       <point x="192" y="344"/>
       <point x="88" y="256" type="curve" name="iv01"/>
       <point x="88" y="485" type="line"/>
       <point x="192" y="566"/>
       <point x="287" y="600"/>
-      <point x="390" y="600" type="curve" name="dv03" smooth="yes"/>
+      <point x="390" y="600" type="curve" smooth="yes" name="dv03"/>
       <point x="455" y="600"/>
       <point x="524" y="586"/>
       <point x="621" y="545" type="curve"/>
       <point x="622" y="545" type="line"/>
-      <point x="653" y="531" type="line" name="hr02" smooth="yes"/>
+      <point x="653" y="531" type="line" smooth="yes" name="hr02"/>
       <point x="729" y="496"/>
       <point x="795" y="477"/>
-      <point x="863" y="477" type="curve" name="dv02" smooth="yes"/>
+      <point x="863" y="477" type="curve" smooth="yes" name="dv02"/>
       <point x="959" y="477"/>
       <point x="1048" y="517"/>
       <point x="1145" y="602" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2243.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2243.glif
index 4dfc38d6f..555052865 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2243.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2243.glif
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2243" format="1">
+<glyph name="uni2243" format="2">
   <advance width="1233"/>
   <unicode hex="2243"/>
   <outline>
     <contour>
-      <point x="850" y="672" type="curve" name="dv03" smooth="yes"/>
+      <point x="850" y="672" type="curve" smooth="yes" name="dv03"/>
       <point x="778" y="672"/>
       <point x="726" y="688"/>
       <point x="645" y="723" type="curve" smooth="yes"/>
       <point x="612" y="737" type="line" smooth="yes"/>
       <point x="522" y="774"/>
       <point x="468" y="795"/>
-      <point x="385" y="795" type="curve" name="sv01" smooth="yes"/>
+      <point x="385" y="795" type="curve" smooth="yes" name="sv01"/>
       <point x="280" y="795"/>
       <point x="192" y="762"/>
       <point x="88" y="674" type="curve" name="iv01"/>
       <point x="88" y="903" type="line"/>
       <point x="192" y="983"/>
       <point x="287" y="1018"/>
-      <point x="390" y="1018" type="curve" name="av01" smooth="yes"/>
+      <point x="390" y="1018" type="curve" smooth="yes" name="av01"/>
       <point x="463" y="1018"/>
       <point x="533" y="1000"/>
       <point x="621" y="963" type="curve"/>
@@ -26,7 +26,7 @@
       <point x="652" y="949" type="line" smooth="yes"/>
       <point x="725" y="914"/>
       <point x="797" y="895"/>
-      <point x="865" y="895" type="curve" name="dv04" smooth="yes"/>
+      <point x="865" y="895" type="curve" smooth="yes" name="dv04"/>
       <point x="958" y="895"/>
       <point x="1045" y="932"/>
       <point x="1145" y="1020" type="curve" name="hr01"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2244.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2244.glif
index 52d2c518b..80abb4333 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2244.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2244.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2244" format="1">
+<glyph name="uni2244" format="2">
   <advance width="1233"/>
   <unicode hex="2244"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="559" y="760" type="line"/>
       <point x="515" y="783"/>
       <point x="450" y="796"/>
-      <point x="382" y="796" type="curve" name="dv03" smooth="yes"/>
+      <point x="382" y="796" type="curve" smooth="yes" name="dv03"/>
       <point x="326" y="796"/>
       <point x="281" y="787"/>
       <point x="240" y="770" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="88" y="899" type="line"/>
       <point x="200" y="995"/>
       <point x="314" y="1018"/>
-      <point x="402" y="1018" type="curve" name="dv04" smooth="yes"/>
+      <point x="402" y="1018" type="curve" smooth="yes" name="dv04"/>
       <point x="471" y="1018"/>
       <point x="521" y="1002"/>
       <point x="614" y="968" type="curve" smooth="yes"/>
@@ -33,7 +33,7 @@
       <point x="827" y="898" type="line" name="iv02"/>
       <point x="842" y="895"/>
       <point x="855" y="893"/>
-      <point x="872" y="893" type="curve" name="hr01" smooth="yes"/>
+      <point x="872" y="893" type="curve" smooth="yes" name="hr01"/>
       <point x="958" y="893"/>
       <point x="1067" y="945"/>
       <point x="1145" y="1020" type="curve" name="iv03"/>
@@ -43,7 +43,7 @@
       <point x="985" y="698" type="curve" smooth="yes"/>
       <point x="936" y="679"/>
       <point x="901" y="671"/>
-      <point x="856" y="671" type="curve" name="dv05" smooth="yes"/>
+      <point x="856" y="671" type="curve" smooth="yes" name="dv05"/>
       <point x="809" y="671"/>
       <point x="765" y="679"/>
       <point x="712" y="698" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2246.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2246.glif
index 7d4edc979..76e510441 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2246.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2246.glif
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2246" format="1">
+<glyph name="uni2246" format="2">
   <advance width="1233"/>
   <unicode hex="2246"/>
   <outline>
     <contour>
-      <point x="850" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="850" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="778" y="909"/>
       <point x="726" y="925"/>
       <point x="645" y="960" type="curve" smooth="yes"/>
       <point x="612" y="974" type="line" smooth="yes"/>
       <point x="522" y="1011"/>
       <point x="468" y="1032"/>
-      <point x="385" y="1032" type="curve" name="sv02" smooth="yes"/>
+      <point x="385" y="1032" type="curve" smooth="yes" name="sv02"/>
       <point x="280" y="1032"/>
       <point x="192" y="999"/>
       <point x="88" y="911" type="curve" name="iv01"/>
       <point x="88" y="1140" type="line" name="at01"/>
       <point x="192" y="1220"/>
       <point x="287" y="1255"/>
-      <point x="390" y="1255" type="curve" name="av01" smooth="yes"/>
+      <point x="390" y="1255" type="curve" smooth="yes" name="av01"/>
       <point x="463" y="1255"/>
       <point x="533" y="1237"/>
       <point x="621" y="1200" type="curve"/>
@@ -26,7 +26,7 @@
       <point x="652" y="1186" type="line" smooth="yes"/>
       <point x="725" y="1151"/>
       <point x="797" y="1132"/>
-      <point x="865" y="1132" type="curve" name="at02" smooth="yes"/>
+      <point x="865" y="1132" type="curve" smooth="yes" name="at02"/>
       <point x="958" y="1132"/>
       <point x="1045" y="1169"/>
       <point x="1145" y="1257" type="curve" name="av02"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2247.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2247.glif
index 043ea06f6..54b0296db 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2247.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2247.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2247" format="1">
+<glyph name="uni2247" format="2">
   <advance width="1233"/>
   <unicode hex="2247"/>
   <outline>
@@ -16,14 +16,14 @@
       <point x="623" y="970" type="line"/>
       <point x="515" y="1017"/>
       <point x="448" y="1032"/>
-      <point x="382" y="1032" type="curve" name="dv03" smooth="yes"/>
+      <point x="382" y="1032" type="curve" smooth="yes" name="dv03"/>
       <point x="277" y="1032"/>
       <point x="188" y="995"/>
       <point x="88" y="911" type="curve" name="iv01"/>
       <point x="88" y="1140" type="line"/>
       <point x="192" y="1220"/>
       <point x="287" y="1255"/>
-      <point x="390" y="1255" type="curve" name="dv04" smooth="yes"/>
+      <point x="390" y="1255" type="curve" smooth="yes" name="dv04"/>
       <point x="463" y="1255"/>
       <point x="533" y="1237"/>
       <point x="621" y="1200" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2249.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2249.glif
index 36a65474a..1a502032e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2249.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2249.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2249" format="1">
+<glyph name="uni2249" format="2">
   <advance width="1233"/>
   <unicode hex="2249"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="88" y="485" type="line"/>
       <point x="192" y="566"/>
       <point x="285" y="600"/>
-      <point x="393" y="600" type="curve" name="dv04" smooth="yes"/>
+      <point x="393" y="600" type="curve" smooth="yes" name="dv04"/>
       <point x="419" y="600"/>
       <point x="445" y="598"/>
       <point x="470" y="593" type="curve" name="sv01"/>
@@ -22,14 +22,14 @@
       <point x="484" y="783" type="curve" smooth="yes"/>
       <point x="455" y="790"/>
       <point x="418" y="795"/>
-      <point x="381" y="795" type="curve" name="dv05" smooth="yes"/>
+      <point x="381" y="795" type="curve" smooth="yes" name="dv05"/>
       <point x="278" y="795"/>
       <point x="188" y="758"/>
       <point x="88" y="674" type="curve" name="iv02"/>
       <point x="88" y="903" type="line"/>
       <point x="192" y="983"/>
       <point x="287" y="1018"/>
-      <point x="390" y="1018" type="curve" name="dv06" smooth="yes"/>
+      <point x="390" y="1018" type="curve" smooth="yes" name="dv06"/>
       <point x="463" y="1018"/>
       <point x="532" y="1000"/>
       <point x="620" y="964" type="curve"/>
@@ -43,21 +43,21 @@
       <point x="1145" y="786" type="line"/>
       <point x="1045" y="706"/>
       <point x="952" y="672"/>
-      <point x="852" y="672" type="curve" name="dv07" smooth="yes"/>
+      <point x="852" y="672" type="curve" smooth="yes" name="dv07"/>
       <point x="819" y="672"/>
       <point x="793" y="676"/>
       <point x="762" y="683" type="curve"/>
       <point x="694" y="514" type="line"/>
       <point x="754" y="489"/>
       <point x="811" y="477"/>
-      <point x="864" y="477" type="curve" name="dv02" smooth="yes"/>
+      <point x="864" y="477" type="curve" smooth="yes" name="dv02"/>
       <point x="957" y="477"/>
       <point x="1048" y="517"/>
       <point x="1145" y="602" type="curve" name="iv03"/>
       <point x="1145" y="369" type="line"/>
       <point x="1049" y="292"/>
       <point x="955" y="254"/>
-      <point x="852" y="254" type="curve" name="dv01" smooth="yes"/>
+      <point x="852" y="254" type="curve" smooth="yes" name="dv01"/>
       <point x="783" y="254"/>
       <point x="722" y="270"/>
       <point x="645" y="305" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni224A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni224A_.glif
index 33dad8381..aa04c5504 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni224A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni224A_.glif
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni224A" format="1">
+<glyph name="uni224A" format="2">
   <advance width="1233"/>
   <unicode hex="224A"/>
   <outline>
     <contour>
-      <point x="850" y="854" type="curve" name="dv03" smooth="yes"/>
+      <point x="850" y="854" type="curve" smooth="yes" name="dv03"/>
       <point x="778" y="854"/>
       <point x="726" y="870"/>
       <point x="645" y="905" type="curve" smooth="yes"/>
       <point x="612" y="919" type="line" smooth="yes"/>
       <point x="522" y="956"/>
       <point x="468" y="977"/>
-      <point x="385" y="977" type="curve" name="sv01" smooth="yes"/>
+      <point x="385" y="977" type="curve" smooth="yes" name="sv01"/>
       <point x="280" y="977"/>
       <point x="192" y="944"/>
       <point x="88" y="856" type="curve" name="iv01"/>
       <point x="88" y="1085" type="line"/>
       <point x="192" y="1165"/>
       <point x="287" y="1200"/>
-      <point x="390" y="1200" type="curve" name="av01" smooth="yes"/>
+      <point x="390" y="1200" type="curve" smooth="yes" name="av01"/>
       <point x="463" y="1200"/>
       <point x="533" y="1182"/>
       <point x="621" y="1145" type="curve" name="at01"/>
       <point x="622" y="1145" type="line"/>
-      <point x="652" y="1131" type="line" name="at02" smooth="yes"/>
+      <point x="652" y="1131" type="line" smooth="yes" name="at02"/>
       <point x="730" y="1095"/>
       <point x="801" y="1077"/>
-      <point x="865" y="1077" type="curve" name="dv04" smooth="yes"/>
+      <point x="865" y="1077" type="curve" smooth="yes" name="dv04"/>
       <point x="960" y="1077"/>
       <point x="1045" y="1114"/>
       <point x="1145" y="1202" type="curve" name="hr01"/>
@@ -35,21 +35,21 @@
       <point x="959" y="854"/>
     </contour>
     <contour>
-      <point x="850" y="437" type="curve" name="dv05" smooth="yes"/>
+      <point x="850" y="437" type="curve" smooth="yes" name="dv05"/>
       <point x="778" y="437"/>
       <point x="726" y="453"/>
       <point x="645" y="488" type="curve" smooth="yes"/>
       <point x="612" y="502" type="line" smooth="yes"/>
       <point x="522" y="539"/>
       <point x="468" y="560"/>
-      <point x="385" y="560" type="curve" name="dv07" smooth="yes"/>
+      <point x="385" y="560" type="curve" smooth="yes" name="dv07"/>
       <point x="280" y="560"/>
       <point x="192" y="527"/>
       <point x="88" y="439" type="curve" name="hr02"/>
       <point x="88" y="668" type="line"/>
       <point x="192" y="748"/>
       <point x="287" y="783"/>
-      <point x="390" y="783" type="curve" name="dv08" smooth="yes"/>
+      <point x="390" y="783" type="curve" smooth="yes" name="dv08"/>
       <point x="463" y="783"/>
       <point x="533" y="765"/>
       <point x="621" y="728" type="curve"/>
@@ -57,7 +57,7 @@
       <point x="652" y="714" type="line" smooth="yes"/>
       <point x="725" y="679"/>
       <point x="797" y="660"/>
-      <point x="865" y="660" type="curve" name="dv06" smooth="yes"/>
+      <point x="865" y="660" type="curve" smooth="yes" name="dv06"/>
       <point x="958" y="660"/>
       <point x="1045" y="697"/>
       <point x="1145" y="785" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni224B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni224B_.glif
index 00c9e581a..49bb842d8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni224B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni224B_.glif
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni224B" format="1">
+<glyph name="uni224B" format="2">
   <advance width="1233"/>
   <unicode hex="224B"/>
   <outline>
     <contour>
-      <point x="850" y="854" type="curve" name="dv05" smooth="yes"/>
+      <point x="850" y="854" type="curve" smooth="yes" name="dv05"/>
       <point x="778" y="854"/>
       <point x="726" y="870"/>
       <point x="645" y="905" type="curve" smooth="yes"/>
       <point x="612" y="919" type="line" smooth="yes"/>
       <point x="522" y="956"/>
       <point x="468" y="977"/>
-      <point x="385" y="977" type="curve" name="sv01" smooth="yes"/>
+      <point x="385" y="977" type="curve" smooth="yes" name="sv01"/>
       <point x="280" y="977"/>
       <point x="192" y="944"/>
       <point x="88" y="856" type="curve" name="iv01"/>
       <point x="88" y="1085" type="line"/>
       <point x="192" y="1165"/>
       <point x="287" y="1200"/>
-      <point x="390" y="1200" type="curve" name="av01" smooth="yes"/>
+      <point x="390" y="1200" type="curve" smooth="yes" name="av01"/>
       <point x="463" y="1200"/>
       <point x="533" y="1182"/>
       <point x="621" y="1145" type="curve" name="hr01"/>
       <point x="622" y="1145" type="line"/>
-      <point x="652" y="1131" type="line" name="at01" smooth="yes"/>
+      <point x="652" y="1131" type="line" smooth="yes" name="at01"/>
       <point x="730" y="1095"/>
       <point x="801" y="1077"/>
-      <point x="865" y="1077" type="curve" name="dv06" smooth="yes"/>
+      <point x="865" y="1077" type="curve" smooth="yes" name="dv06"/>
       <point x="960" y="1077"/>
       <point x="1045" y="1114"/>
       <point x="1145" y="1202" type="curve" name="av02"/>
@@ -35,21 +35,21 @@
       <point x="959" y="854"/>
     </contour>
     <contour>
-      <point x="850" y="437" type="curve" name="hr02" smooth="yes"/>
+      <point x="850" y="437" type="curve" smooth="yes" name="hr02"/>
       <point x="778" y="437"/>
       <point x="726" y="453"/>
       <point x="645" y="488" type="curve" smooth="yes"/>
       <point x="612" y="502" type="line" smooth="yes"/>
       <point x="522" y="539"/>
       <point x="468" y="560"/>
-      <point x="385" y="560" type="curve" name="dv08" smooth="yes"/>
+      <point x="385" y="560" type="curve" smooth="yes" name="dv08"/>
       <point x="280" y="560"/>
       <point x="192" y="527"/>
       <point x="88" y="439" type="curve" name="iv02"/>
       <point x="88" y="668" type="line"/>
       <point x="192" y="748"/>
       <point x="287" y="783"/>
-      <point x="390" y="783" type="curve" name="dv09" smooth="yes"/>
+      <point x="390" y="783" type="curve" smooth="yes" name="dv09"/>
       <point x="463" y="783"/>
       <point x="533" y="765"/>
       <point x="621" y="728" type="curve"/>
@@ -57,7 +57,7 @@
       <point x="652" y="714" type="line" smooth="yes"/>
       <point x="725" y="679"/>
       <point x="797" y="660"/>
-      <point x="865" y="660" type="curve" name="dv07" smooth="yes"/>
+      <point x="865" y="660" type="curve" smooth="yes" name="dv07"/>
       <point x="958" y="660"/>
       <point x="1045" y="697"/>
       <point x="1145" y="785" type="curve"/>
@@ -66,29 +66,29 @@
       <point x="959" y="437"/>
     </contour>
     <contour>
-      <point x="850" y="25" type="curve" name="dv01" smooth="yes"/>
+      <point x="850" y="25" type="curve" smooth="yes" name="dv01"/>
       <point x="778" y="25"/>
       <point x="726" y="41"/>
-      <point x="645" y="76" type="curve" name="hr04" smooth="yes"/>
+      <point x="645" y="76" type="curve" smooth="yes" name="hr04"/>
       <point x="612" y="90" type="line" smooth="yes"/>
       <point x="522" y="127"/>
       <point x="468" y="148"/>
-      <point x="385" y="148" type="curve" name="dv03" smooth="yes"/>
+      <point x="385" y="148" type="curve" smooth="yes" name="dv03"/>
       <point x="280" y="148"/>
       <point x="192" y="115"/>
       <point x="88" y="27" type="curve" name="iv03"/>
       <point x="88" y="256" type="line"/>
       <point x="192" y="337"/>
       <point x="287" y="371"/>
-      <point x="390" y="371" type="curve" name="dv04" smooth="yes"/>
+      <point x="390" y="371" type="curve" smooth="yes" name="dv04"/>
       <point x="455" y="371"/>
       <point x="524" y="357"/>
       <point x="621" y="316" type="curve"/>
       <point x="622" y="316" type="line"/>
-      <point x="653" y="302" type="line" name="hr05" smooth="yes"/>
+      <point x="653" y="302" type="line" smooth="yes" name="hr05"/>
       <point x="729" y="267"/>
       <point x="794" y="248"/>
-      <point x="862" y="248" type="curve" name="dv02" smooth="yes"/>
+      <point x="862" y="248" type="curve" smooth="yes" name="dv02"/>
       <point x="958" y="248"/>
       <point x="1048" y="288"/>
       <point x="1145" y="373" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni224C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni224C_.glif
index 217afa41b..ed99583c2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni224C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni224C_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni224C" format="1">
+<glyph name="uni224C" format="2">
   <advance width="1233"/>
   <unicode hex="224C"/>
   <outline>
     <contour>
-      <point x="381" y="909" type="curve" name="sv01" smooth="yes"/>
+      <point x="381" y="909" type="curve" smooth="yes" name="sv01"/>
       <point x="281" y="909"/>
       <point x="188" y="943"/>
       <point x="88" y="1023" type="curve"/>
       <point x="88" y="1257" type="line" name="av01"/>
       <point x="188" y="1169"/>
       <point x="275" y="1132"/>
-      <point x="368" y="1132" type="curve" name="at01" smooth="yes"/>
+      <point x="368" y="1132" type="curve" smooth="yes" name="at01"/>
       <point x="436" y="1132"/>
       <point x="508" y="1151"/>
       <point x="581" y="1186" type="curve" smooth="yes"/>
@@ -19,14 +19,14 @@
       <point x="612" y="1200" type="line"/>
       <point x="700" y="1237"/>
       <point x="770" y="1255"/>
-      <point x="843" y="1255" type="curve" name="av02" smooth="yes"/>
+      <point x="843" y="1255" type="curve" smooth="yes" name="av02"/>
       <point x="946" y="1255"/>
       <point x="1041" y="1220"/>
       <point x="1145" y="1140" type="curve" name="at02"/>
       <point x="1145" y="911" type="line" name="iv01"/>
       <point x="1041" y="999"/>
       <point x="953" y="1032"/>
-      <point x="848" y="1032" type="curve" name="sv02" smooth="yes"/>
+      <point x="848" y="1032" type="curve" smooth="yes" name="sv02"/>
       <point x="765" y="1032"/>
       <point x="711" y="1011"/>
       <point x="621" y="974" type="curve" name="hr01"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni224D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni224D_.glif
index 04c6130fa..fa35202e5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni224D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni224D_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni224D" format="1">
+<glyph name="uni224D" format="2">
   <advance width="1233"/>
   <unicode hex="224D"/>
   <outline>
     <contour>
-      <point x="617" y="728" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="728" type="curve" smooth="yes" name="hr00"/>
       <point x="484" y="728"/>
       <point x="307" y="780"/>
       <point x="87" y="884" type="curve"/>
@@ -23,7 +23,7 @@
       <point x="88" y="398" type="line"/>
       <point x="307" y="502"/>
       <point x="483" y="554"/>
-      <point x="616" y="554" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="554" type="curve" smooth="yes" name="dv02"/>
       <point x="749" y="554"/>
       <point x="926" y="502"/>
       <point x="1145" y="398" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni224E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni224E_.glif
index cef510dec..ca0a60f05 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni224E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni224E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni224E" format="1">
+<glyph name="uni224E" format="2">
   <advance width="1233"/>
   <unicode hex="224E"/>
   <outline>
@@ -11,7 +11,7 @@
       <point x="461" y="1213" type="curve" smooth="yes"/>
       <point x="515" y="1242"/>
       <point x="585" y="1264"/>
-      <point x="624" y="1264" type="curve" name="dv04" smooth="yes"/>
+      <point x="624" y="1264" type="curve" smooth="yes" name="dv04"/>
       <point x="694" y="1264"/>
       <point x="831" y="1201"/>
       <point x="893" y="1088" type="curve" smooth="yes"/>
@@ -26,7 +26,7 @@
       <point x="708" y="979" type="curve" smooth="yes"/>
       <point x="681" y="1004"/>
       <point x="653" y="1014"/>
-      <point x="617" y="1013" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="1013" type="curve" smooth="yes" name="dv03"/>
       <point x="541" y="1010"/>
       <point x="491" y="961"/>
       <point x="456" y="868" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="88" y="752" type="line" name="sh02"/>
     </contour>
     <contour>
-      <point x="615" y="20" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="20" type="curve" smooth="yes" name="dv01"/>
       <point x="546" y="20"/>
       <point x="409" y="72"/>
       <point x="340" y="196" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni224F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni224F_.glif
index fd5a7901a..9a439f6d4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni224F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni224F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni224F" format="1">
+<glyph name="uni224F" format="2">
   <advance width="1233"/>
   <unicode hex="224F"/>
   <outline>
@@ -11,7 +11,7 @@
       <point x="461" y="1213" type="curve" smooth="yes"/>
       <point x="515" y="1242"/>
       <point x="585" y="1264"/>
-      <point x="624" y="1264" type="curve" name="dv04" smooth="yes"/>
+      <point x="624" y="1264" type="curve" smooth="yes" name="dv04"/>
       <point x="694" y="1264"/>
       <point x="831" y="1201"/>
       <point x="893" y="1088" type="curve" smooth="yes"/>
@@ -26,7 +26,7 @@
       <point x="708" y="979" type="curve" smooth="yes"/>
       <point x="681" y="1004"/>
       <point x="653" y="1014"/>
-      <point x="617" y="1013" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="1013" type="curve" smooth="yes" name="dv03"/>
       <point x="541" y="1010"/>
       <point x="491" y="961"/>
       <point x="456" y="868" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2250.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2250.glif
index 1f04f346d..93e23c1a4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2250.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2250.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2250" format="1">
+<glyph name="uni2250" format="2">
   <advance width="1233"/>
   <unicode hex="2250"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2251.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2251.glif
index 73e39f590..80771361b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2251.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2251.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2251" format="1">
+<glyph name="uni2251" format="2">
   <advance width="1233"/>
   <unicode hex="2251"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2252.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2252.glif
index 93e309513..06c6980cf 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2252.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2252.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2252" format="1">
+<glyph name="uni2252" format="2">
   <advance width="1233"/>
   <unicode hex="2252"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2253.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2253.glif
index 075efc4b0..35970643f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2253.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2253.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2253" format="1">
+<glyph name="uni2253" format="2">
   <advance width="1233"/>
   <unicode hex="2253"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2254.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2254.glif
index e1b9cc8ec..27b83a9d9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2254.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2254.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2254" format="1">
+<glyph name="uni2254" format="2">
   <advance width="1233"/>
   <unicode hex="2254"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2255.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2255.glif
index 3c26d6937..f16eb232f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2255.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2255.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2255" format="1">
+<glyph name="uni2255" format="2">
   <advance width="1233"/>
   <unicode hex="2255"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2256.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2256.glif
index 34273fe36..f6cc4a02f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2256.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2256.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2256" format="1">
+<glyph name="uni2256" format="2">
   <advance width="1233"/>
   <unicode hex="2256"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="344" y="532" type="line" name="ih01"/>
       <point x="327" y="573"/>
       <point x="319" y="610"/>
-      <point x="319" y="642" type="curve" name="sh01" smooth="yes"/>
+      <point x="319" y="642" type="curve" smooth="yes" name="sh01"/>
       <point x="319" y="676"/>
       <point x="328" y="713"/>
       <point x="346" y="752" type="curve" name="ih02"/>
@@ -19,7 +19,7 @@
       <point x="889" y="752" type="line" name="ih03"/>
       <point x="908" y="735"/>
       <point x="915" y="691"/>
-      <point x="915" y="648" type="curve" name="sh03" smooth="yes"/>
+      <point x="915" y="648" type="curve" smooth="yes" name="sh03"/>
       <point x="915" y="611"/>
       <point x="909" y="583"/>
       <point x="888" y="532" type="curve" name="ih04"/>
@@ -31,14 +31,14 @@
       <point x="693" y="532" type="line" name="sv02"/>
       <point x="728" y="564"/>
       <point x="744" y="605"/>
-      <point x="744" y="645" type="curve" name="ah01" smooth="yes"/>
+      <point x="744" y="645" type="curve" smooth="yes" name="ah01"/>
       <point x="744" y="686"/>
       <point x="727" y="725"/>
       <point x="692" y="752" type="curve" name="sv03"/>
       <point x="549" y="752" type="line"/>
       <point x="514" y="720"/>
       <point x="497" y="683"/>
-      <point x="497" y="641" type="curve" name="sh02" smooth="yes"/>
+      <point x="497" y="641" type="curve" smooth="yes" name="sh02"/>
       <point x="497" y="600"/>
       <point x="514" y="564"/>
       <point x="548" y="532" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2257.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2257.glif
index 95254c859..5db6633aa 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2257.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2257.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2257" format="1">
+<glyph name="uni2257" format="2">
   <advance width="1233"/>
   <unicode hex="2257"/>
   <outline>
     <contour>
-      <point x="614" y="1082" type="curve" name="hr00" smooth="yes"/>
+      <point x="614" y="1082" type="curve" smooth="yes" name="hr00"/>
       <point x="443" y="1082"/>
       <point x="314" y="1207"/>
-      <point x="314" y="1371" type="curve" name="sh01" smooth="yes"/>
+      <point x="314" y="1371" type="curve" smooth="yes" name="sh01"/>
       <point x="314" y="1537"/>
       <point x="449" y="1670"/>
       <point x="617" y="1667" type="curve" smooth="yes"/>
       <point x="784" y="1664"/>
       <point x="920" y="1536"/>
-      <point x="920" y="1371" type="curve" name="sh02" smooth="yes"/>
+      <point x="920" y="1371" type="curve" smooth="yes" name="sh02"/>
       <point x="920" y="1207"/>
       <point x="784" y="1082"/>
     </contour>
     <contour>
-      <point x="617" y="1257" type="curve" name="dv07" smooth="yes"/>
+      <point x="617" y="1257" type="curve" smooth="yes" name="dv07"/>
       <point x="685" y="1257"/>
       <point x="738" y="1308"/>
-      <point x="738" y="1372" type="curve" name="ah01" smooth="yes"/>
+      <point x="738" y="1372" type="curve" smooth="yes" name="ah01"/>
       <point x="738" y="1436"/>
       <point x="684" y="1490"/>
-      <point x="616" y="1490" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1490" type="curve" smooth="yes" name="dv03"/>
       <point x="549" y="1490"/>
       <point x="496" y="1438"/>
-      <point x="496" y="1373" type="curve" name="sh03" smooth="yes"/>
+      <point x="496" y="1373" type="curve" smooth="yes" name="sh03"/>
       <point x="496" y="1308"/>
       <point x="549" y="1257"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2258.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2258.glif
index cd570298c..fd513bdcc 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2258.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2258.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2258" format="1">
+<glyph name="uni2258" format="2">
   <advance width="1233"/>
   <unicode hex="2258"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="182" y="1314" type="line" name="hr00"/>
       <point x="321" y="1415"/>
       <point x="467" y="1465"/>
-      <point x="618" y="1465" type="curve" name="dv04" smooth="yes"/>
+      <point x="618" y="1465" type="curve" smooth="yes" name="dv04"/>
       <point x="771" y="1465"/>
       <point x="915" y="1415"/>
       <point x="1050" y="1314" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2259.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2259.glif
index 2557a5fb2..ce30d748a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2259.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2259.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2259" format="1">
+<glyph name="uni2259" format="2">
   <advance width="1233"/>
   <unicode hex="2259"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni225A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni225A_.glif
index f72663c60..226164822 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni225A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni225A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni225A" format="1">
+<glyph name="uni225A" format="2">
   <advance width="1233"/>
   <unicode hex="225A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni225B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni225B_.glif
index 7193166a2..b1506d6b6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni225B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni225B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni225B" format="1">
+<glyph name="uni225B" format="2">
   <advance width="1233"/>
   <unicode hex="225B"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni225C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni225C_.glif
index ae5906f40..e55bc3ce3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni225C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni225C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni225C" format="1">
+<glyph name="uni225C" format="2">
   <advance width="1233"/>
   <unicode hex="225C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni225D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni225D_.glif
index dead8dcb1..9a282a698 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni225D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni225D_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni225D" format="1">
+<glyph name="uni225D" format="2">
   <advance width="1233"/>
   <unicode hex="225D"/>
   <outline>
     <contour>
-      <point x="257" y="1073" type="curve" name="sv01" smooth="yes"/>
+      <point x="257" y="1073" type="curve" smooth="yes" name="sv01"/>
       <point x="173" y="1073"/>
       <point x="116" y="1143"/>
-      <point x="116" y="1245" type="curve" name="dh01" smooth="yes"/>
+      <point x="116" y="1245" type="curve" smooth="yes" name="dh01"/>
       <point x="116" y="1346"/>
       <point x="173" y="1416"/>
-      <point x="257" y="1416" type="curve" name="sv02" smooth="yes"/>
+      <point x="257" y="1416" type="curve" smooth="yes" name="sv02"/>
       <point x="298" y="1416"/>
       <point x="333" y="1399"/>
       <point x="362" y="1360" type="curve" name="iv01"/>
@@ -30,13 +30,13 @@
       <point x="915" y="1431" type="line" smooth="yes"/>
       <point x="915" y="1503"/>
       <point x="953" y="1535"/>
-      <point x="1037" y="1535" type="curve" name="dv03" smooth="yes"/>
+      <point x="1037" y="1535" type="curve" smooth="yes" name="dv03"/>
       <point x="1117" y="1535" type="line" name="sh03"/>
       <point x="1117" y="1467" type="line"/>
       <point x="1059" y="1467" type="line" smooth="yes"/>
       <point x="1030" y="1467"/>
       <point x="1019" y="1458"/>
-      <point x="1019" y="1431" type="curve" name="sh05" smooth="yes"/>
+      <point x="1019" y="1431" type="curve" smooth="yes" name="sh05"/>
       <point x="1019" y="1408" type="line" name="hr01"/>
       <point x="1108" y="1408" type="line"/>
       <point x="1108" y="1333" type="line" name="sh02"/>
@@ -45,21 +45,21 @@
       <point x="915" y="1081" type="line" name="sv05"/>
     </contour>
     <contour>
-      <point x="676" y="1073" type="curve" name="hr02" smooth="yes"/>
+      <point x="676" y="1073" type="curve" smooth="yes" name="hr02"/>
       <point x="555" y="1073"/>
       <point x="487" y="1135"/>
-      <point x="487" y="1243" type="curve" name="dh05" smooth="yes"/>
+      <point x="487" y="1243" type="curve" smooth="yes" name="dh05"/>
       <point x="487" y="1351"/>
       <point x="556" y="1416"/>
-      <point x="664" y="1416" type="curve" name="dv05" smooth="yes"/>
+      <point x="664" y="1416" type="curve" smooth="yes" name="dv05"/>
       <point x="773" y="1416"/>
       <point x="838" y="1350"/>
-      <point x="838" y="1246" type="curve" name="dh06" smooth="yes"/>
+      <point x="838" y="1246" type="curve" smooth="yes" name="dh06"/>
       <point x="838" y="1216" type="line" name="hr03"/>
       <point x="594" y="1216" type="line"/>
       <point x="598" y="1167"/>
       <point x="629" y="1142"/>
-      <point x="686" y="1142" type="curve" name="hr04" smooth="yes"/>
+      <point x="686" y="1142" type="curve" smooth="yes" name="hr04"/>
       <point x="727" y="1142"/>
       <point x="774" y="1155"/>
       <point x="822" y="1182" type="curve" name="ih02"/>
@@ -71,22 +71,22 @@
       <point x="730" y="1280" type="line" name="dv06"/>
       <point x="730" y="1320"/>
       <point x="706" y="1346"/>
-      <point x="666" y="1346" type="curve" name="sv06" smooth="yes"/>
+      <point x="666" y="1346" type="curve" smooth="yes" name="sv06"/>
       <point x="627" y="1346"/>
       <point x="600" y="1323"/>
       <point x="595" y="1280" type="curve"/>
     </contour>
     <contour>
-      <point x="293" y="1149" type="curve" name="av01" smooth="yes"/>
+      <point x="293" y="1149" type="curve" smooth="yes" name="av01"/>
       <point x="338" y="1149"/>
       <point x="362" y="1182"/>
-      <point x="362" y="1245" type="curve" name="sh06" smooth="yes"/>
+      <point x="362" y="1245" type="curve" smooth="yes" name="sh06"/>
       <point x="362" y="1308"/>
       <point x="339" y="1340"/>
-      <point x="293" y="1340" type="curve" name="sv07" smooth="yes"/>
+      <point x="293" y="1340" type="curve" smooth="yes" name="sv07"/>
       <point x="248" y="1340"/>
       <point x="225" y="1308"/>
-      <point x="225" y="1245" type="curve" name="dh02" smooth="yes"/>
+      <point x="225" y="1245" type="curve" smooth="yes" name="dh02"/>
       <point x="225" y="1182"/>
       <point x="249" y="1149"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni225E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni225E_.glif
index 3d78354d2..679312a1f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni225E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni225E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni225E" format="1">
+<glyph name="uni225E" format="2">
   <advance width="1233"/>
   <unicode hex="225E"/>
   <outline>
@@ -9,13 +9,13 @@
       <point x="355" y="1546" type="line" name="iv01"/>
       <point x="398" y="1609"/>
       <point x="452" y="1640"/>
-      <point x="519" y="1640" type="curve" name="sh03" smooth="yes"/>
+      <point x="519" y="1640" type="curve" smooth="yes" name="sh03"/>
       <point x="595" y="1640"/>
       <point x="655" y="1601"/>
       <point x="684" y="1536" type="curve" name="ih01"/>
       <point x="729" y="1605"/>
       <point x="790" y="1640"/>
-      <point x="865" y="1640" type="curve" name="sh05" smooth="yes"/>
+      <point x="865" y="1640" type="curve" smooth="yes" name="sh05"/>
       <point x="985" y="1640"/>
       <point x="1053" y="1561"/>
       <point x="1053" y="1412" type="curve" smooth="yes"/>
@@ -24,11 +24,11 @@
       <point x="878" y="1364" type="line"/>
       <point x="879" y="1367"/>
       <point x="879" y="1372"/>
-      <point x="879" y="1378" type="curve" name="sh07" smooth="yes"/>
+      <point x="879" y="1378" type="curve" smooth="yes" name="sh07"/>
       <point x="879" y="1397" type="line" smooth="yes"/>
       <point x="879" y="1474"/>
       <point x="858" y="1508"/>
-      <point x="807" y="1508" type="curve" name="dv03" smooth="yes"/>
+      <point x="807" y="1508" type="curve" smooth="yes" name="dv03"/>
       <point x="740" y="1508"/>
       <point x="704" y="1448"/>
       <point x="704" y="1347" type="curve" smooth="yes"/>
@@ -40,10 +40,10 @@
       <point x="514" y="1482" type="curve"/>
       <point x="503" y="1499"/>
       <point x="484" y="1508"/>
-      <point x="459" y="1508" type="curve" name="sv01" smooth="yes"/>
+      <point x="459" y="1508" type="curve" smooth="yes" name="sv01"/>
       <point x="391" y="1508"/>
       <point x="355" y="1452"/>
-      <point x="355" y="1348" type="curve" name="sh09" smooth="yes"/>
+      <point x="355" y="1348" type="curve" smooth="yes" name="sh09"/>
       <point x="355" y="1078" type="line"/>
       <point x="180" y="1078" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni225F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni225F_.glif
index 1d830ec57..090f8ea5e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni225F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni225F_.glif
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni225F" format="1">
+<glyph name="uni225F" format="2">
   <advance width="1233"/>
   <unicode hex="225F"/>
   <outline>
     <contour>
-      <point x="492" y="1366" type="line" name="ih01" smooth="yes"/>
+      <point x="492" y="1366" type="line" smooth="yes" name="ih01"/>
       <point x="492" y="1421"/>
       <point x="506" y="1456"/>
       <point x="578" y="1520" type="curve" smooth="yes"/>
       <point x="610" y="1549" type="line" smooth="yes"/>
       <point x="646" y="1582"/>
       <point x="664" y="1614"/>
-      <point x="664" y="1646" type="curve" name="sh02" smooth="yes"/>
+      <point x="664" y="1646" type="curve" smooth="yes" name="sh02"/>
       <point x="664" y="1691"/>
       <point x="631" y="1718"/>
-      <point x="572" y="1718" type="curve" name="dv03" smooth="yes"/>
+      <point x="572" y="1718" type="curve" smooth="yes" name="dv03"/>
       <point x="520" y="1718"/>
       <point x="456" y="1696"/>
       <point x="388" y="1652" type="curve" name="dh01"/>
       <point x="388" y="1809" type="line"/>
       <point x="468" y="1837"/>
       <point x="530" y="1850"/>
-      <point x="598" y="1850" type="curve" name="dv04" smooth="yes"/>
+      <point x="598" y="1850" type="curve" smooth="yes" name="dv04"/>
       <point x="755" y="1850"/>
       <point x="845" y="1782"/>
-      <point x="845" y="1657" type="curve" name="dh02" smooth="yes"/>
+      <point x="845" y="1657" type="curve" smooth="yes" name="dh02"/>
       <point x="845" y="1592"/>
       <point x="820" y="1539"/>
       <point x="759" y="1484" type="curve" smooth="yes"/>
       <point x="727" y="1456" type="line"/>
       <point x="682" y="1414"/>
       <point x="672" y="1394"/>
-      <point x="672" y="1364" type="curve" name="sh01" smooth="yes"/>
+      <point x="672" y="1364" type="curve" smooth="yes" name="sh01"/>
       <point x="672" y="1342" type="line" name="sv01"/>
       <point x="492" y="1342" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2262.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2262.glif
index c7d89d4a9..6cf1b9936 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2262.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2262.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2262" format="1">
+<glyph name="uni2262" format="2">
   <advance width="1233"/>
   <unicode hex="2262"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2263.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2263.glif
index cbe33acdc..f8a298abd 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2263.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2263.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2263" format="1">
+<glyph name="uni2263" format="2">
   <advance width="1233"/>
   <unicode hex="2263"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2266.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2266.glif
index e979c06d5..04cb41d38 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2266.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2266.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2266" format="1">
+<glyph name="uni2266" format="2">
   <advance width="1233"/>
   <unicode hex="2266"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2267.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2267.glif
index 523c303a0..4cbc1cd8e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2267.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2267.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2267" format="1">
+<glyph name="uni2267" format="2">
   <advance width="1233"/>
   <unicode hex="2267"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2268.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2268.glif
index 4c20ed473..b1234094c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2268.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2268.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2268" format="1">
+<glyph name="uni2268" format="2">
   <advance width="1233"/>
   <unicode hex="2268"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2269.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2269.glif
index 99bbe802b..76d8c8079 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2269.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2269.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2269" format="1">
+<glyph name="uni2269" format="2">
   <advance width="1233"/>
   <unicode hex="2269"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni226D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni226D_.glif
index 5c5130b6f..22c7ac471 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni226D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni226D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni226D" format="1">
+<glyph name="uni226D" format="2">
   <advance width="1233"/>
   <unicode hex="226D"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni226E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni226E_.glif
index 3cfad470f..77994ba7a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni226E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni226E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni226E" format="1">
+<glyph name="uni226E" format="2">
   <advance width="1233"/>
   <unicode hex="226E"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni226F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni226F_.glif
index 21ba34a57..326f63431 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni226F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni226F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni226F" format="1">
+<glyph name="uni226F" format="2">
   <advance width="1233"/>
   <unicode hex="226F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2270.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2270.glif
index 2edf75ef1..ea857e71c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2270.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2270.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2270" format="1">
+<glyph name="uni2270" format="2">
   <advance width="1233"/>
   <unicode hex="2270"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2271.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2271.glif
index acf3b58cd..a7710b97b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2271.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2271.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2271" format="1">
+<glyph name="uni2271" format="2">
   <advance width="1233"/>
   <unicode hex="2271"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2272.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2272.glif
index 617a53e19..c1c5c2cbc 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2272.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2272.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2272" format="1">
+<glyph name="uni2272" format="2">
   <advance width="1233"/>
   <unicode hex="2272"/>
   <outline>
@@ -13,21 +13,21 @@
       <point x="1145" y="287" type="line"/>
     </contour>
     <contour>
-      <point x="850" y="-78" type="curve" name="hr01" smooth="yes"/>
+      <point x="850" y="-78" type="curve" smooth="yes" name="hr01"/>
       <point x="778" y="-78"/>
       <point x="726" y="-62"/>
       <point x="645" y="-27" type="curve" smooth="yes"/>
       <point x="612" y="-13" type="line" smooth="yes"/>
       <point x="522" y="24"/>
       <point x="468" y="45"/>
-      <point x="385" y="45" type="curve" name="dv02" smooth="yes"/>
+      <point x="385" y="45" type="curve" smooth="yes" name="dv02"/>
       <point x="280" y="45"/>
       <point x="192" y="12"/>
       <point x="88" y="-76" type="curve" name="iv01"/>
       <point x="88" y="153" type="line"/>
       <point x="192" y="233"/>
       <point x="287" y="268"/>
-      <point x="390" y="268" type="curve" name="hr02" smooth="yes"/>
+      <point x="390" y="268" type="curve" smooth="yes" name="hr02"/>
       <point x="463" y="268"/>
       <point x="533" y="250"/>
       <point x="621" y="213" type="curve"/>
@@ -35,7 +35,7 @@
       <point x="652" y="199" type="line" smooth="yes"/>
       <point x="725" y="164"/>
       <point x="797" y="145"/>
-      <point x="865" y="145" type="curve" name="dv01" smooth="yes"/>
+      <point x="865" y="145" type="curve" smooth="yes" name="dv01"/>
       <point x="958" y="145"/>
       <point x="1045" y="182"/>
       <point x="1145" y="270" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2273.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2273.glif
index 9d3d58ab5..6b96876a2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2273.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2273.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2273" format="1">
+<glyph name="uni2273" format="2">
   <advance width="1233"/>
   <unicode hex="2273"/>
   <outline>
@@ -13,21 +13,21 @@
       <point x="88" y="287" type="line"/>
     </contour>
     <contour>
-      <point x="850" y="-78" type="curve" name="hr01" smooth="yes"/>
+      <point x="850" y="-78" type="curve" smooth="yes" name="hr01"/>
       <point x="778" y="-78"/>
       <point x="726" y="-62"/>
       <point x="645" y="-27" type="curve" smooth="yes"/>
       <point x="612" y="-13" type="line" smooth="yes"/>
       <point x="522" y="24"/>
       <point x="468" y="45"/>
-      <point x="385" y="45" type="curve" name="dv02" smooth="yes"/>
+      <point x="385" y="45" type="curve" smooth="yes" name="dv02"/>
       <point x="280" y="45"/>
       <point x="192" y="12"/>
       <point x="88" y="-76" type="curve" name="iv01"/>
       <point x="88" y="153" type="line"/>
       <point x="192" y="233"/>
       <point x="287" y="268"/>
-      <point x="390" y="268" type="curve" name="hr02" smooth="yes"/>
+      <point x="390" y="268" type="curve" smooth="yes" name="hr02"/>
       <point x="463" y="268"/>
       <point x="533" y="250"/>
       <point x="621" y="213" type="curve"/>
@@ -35,7 +35,7 @@
       <point x="652" y="199" type="line" smooth="yes"/>
       <point x="725" y="164"/>
       <point x="797" y="145"/>
-      <point x="865" y="145" type="curve" name="dv01" smooth="yes"/>
+      <point x="865" y="145" type="curve" smooth="yes" name="dv01"/>
       <point x="958" y="145"/>
       <point x="1045" y="182"/>
       <point x="1145" y="270" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2274.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2274.glif
index 31de81180..0692c16ac 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2274.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2274.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2274" format="1">
+<glyph name="uni2274" format="2">
   <advance width="1233"/>
   <unicode hex="2274"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="88" y="153" type="line"/>
       <point x="192" y="233"/>
       <point x="285" y="268"/>
-      <point x="393" y="268" type="curve" name="dv04" smooth="yes"/>
+      <point x="393" y="268" type="curve" smooth="yes" name="dv04"/>
       <point x="410" y="268"/>
       <point x="427" y="267"/>
       <point x="444" y="265" type="curve" name="sv01"/>
@@ -34,14 +34,14 @@
       <point x="652" y="199" type="line" smooth="yes"/>
       <point x="727" y="164"/>
       <point x="798" y="145"/>
-      <point x="865" y="145" type="curve" name="dv02" smooth="yes"/>
+      <point x="865" y="145" type="curve" smooth="yes" name="dv02"/>
       <point x="960" y="145"/>
       <point x="1045" y="182"/>
       <point x="1145" y="270" type="curve" name="iv05"/>
       <point x="1145" y="36" type="line"/>
       <point x="1049" y="-40"/>
       <point x="951" y="-78"/>
-      <point x="852" y="-78" type="curve" name="dv01" smooth="yes"/>
+      <point x="852" y="-78" type="curve" smooth="yes" name="dv01"/>
       <point x="787" y="-78"/>
       <point x="726" y="-63"/>
       <point x="645" y="-27" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2275.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2275.glif
index 002aa4eda..2b24c2cf7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2275.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2275.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2275" format="1">
+<glyph name="uni2275" format="2">
   <advance width="1233"/>
   <unicode hex="2275"/>
   <outline>
@@ -38,14 +38,14 @@
       <point x="652" y="199" type="line" smooth="yes"/>
       <point x="729" y="163"/>
       <point x="800" y="145"/>
-      <point x="865" y="145" type="curve" name="dv02" smooth="yes"/>
+      <point x="865" y="145" type="curve" smooth="yes" name="dv02"/>
       <point x="960" y="145"/>
       <point x="1045" y="182"/>
       <point x="1145" y="270" type="curve" name="iv06"/>
       <point x="1145" y="36" type="line"/>
       <point x="1045" y="-44"/>
       <point x="953" y="-78"/>
-      <point x="850" y="-78" type="curve" name="dv01" smooth="yes"/>
+      <point x="850" y="-78" type="curve" smooth="yes" name="dv01"/>
       <point x="778" y="-78"/>
       <point x="726" y="-62"/>
       <point x="645" y="-27" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2276.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2276.glif
index 27911c9b1..18593a82c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2276.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2276.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2276" format="1">
+<glyph name="uni2276" format="2">
   <advance width="1233"/>
   <unicode hex="2276"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2277.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2277.glif
index 71243c601..b2df02af9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2277.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2277.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2277" format="1">
+<glyph name="uni2277" format="2">
   <advance width="1233"/>
   <unicode hex="2277"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2278.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2278.glif
index e66d77f3c..3cfea8d27 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2278.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2278.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2278" format="1">
+<glyph name="uni2278" format="2">
   <advance width="1233"/>
   <unicode hex="2278"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2279.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2279.glif
index cdb6d4c78..be45993b1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2279.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2279.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2279" format="1">
+<glyph name="uni2279" format="2">
   <advance width="1233"/>
   <unicode hex="2279"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni227A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni227A_.glif
index 279616087..0b12efbce 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni227A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni227A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni227A" format="1">
+<glyph name="uni227A" format="2">
   <advance width="1233"/>
   <unicode hex="227A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni227B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni227B_.glif
index ff669e8d8..91bda208e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni227B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni227B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni227B" format="1">
+<glyph name="uni227B" format="2">
   <advance width="1233"/>
   <unicode hex="227B"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni227C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni227C_.glif
index 08547d55c..e73f02dae 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni227C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni227C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni227C" format="1">
+<glyph name="uni227C" format="2">
   <advance width="1233"/>
   <unicode hex="227C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni227D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni227D_.glif
index 14c978ba1..d0f4864a5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni227D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni227D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni227D" format="1">
+<glyph name="uni227D" format="2">
   <advance width="1233"/>
   <unicode hex="227D"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni227E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni227E_.glif
index 6663ca46f..99590973a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni227E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni227E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni227E" format="1">
+<glyph name="uni227E" format="2">
   <advance width="1233"/>
   <unicode hex="227E"/>
   <outline>
@@ -21,21 +21,21 @@
       <point x="1145" y="485" type="curve"/>
     </contour>
     <contour>
-      <point x="850" y="-206" type="curve" name="hr01" smooth="yes"/>
+      <point x="850" y="-206" type="curve" smooth="yes" name="hr01"/>
       <point x="778" y="-206"/>
       <point x="726" y="-190"/>
       <point x="645" y="-155" type="curve" smooth="yes"/>
       <point x="612" y="-141" type="line" smooth="yes"/>
       <point x="522" y="-104"/>
       <point x="468" y="-83"/>
-      <point x="385" y="-83" type="curve" name="dv02" smooth="yes"/>
+      <point x="385" y="-83" type="curve" smooth="yes" name="dv02"/>
       <point x="280" y="-83"/>
       <point x="192" y="-116"/>
       <point x="88" y="-204" type="curve" name="iv01"/>
       <point x="88" y="25" type="line"/>
       <point x="192" y="105"/>
       <point x="287" y="140"/>
-      <point x="390" y="140" type="curve" name="hr02" smooth="yes"/>
+      <point x="390" y="140" type="curve" smooth="yes" name="hr02"/>
       <point x="463" y="140"/>
       <point x="533" y="122"/>
       <point x="621" y="85" type="curve"/>
@@ -43,7 +43,7 @@
       <point x="652" y="71" type="line" smooth="yes"/>
       <point x="725" y="36"/>
       <point x="797" y="17"/>
-      <point x="865" y="17" type="curve" name="dv01" smooth="yes"/>
+      <point x="865" y="17" type="curve" smooth="yes" name="dv01"/>
       <point x="958" y="17"/>
       <point x="1045" y="54"/>
       <point x="1145" y="142" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni227F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni227F_.glif
index d6208bf17..e74437eb3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni227F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni227F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni227F" format="1">
+<glyph name="uni227F" format="2">
   <advance width="1233"/>
   <unicode hex="227F"/>
   <outline>
@@ -21,21 +21,21 @@
       <point x="88" y="147" type="curve"/>
     </contour>
     <contour>
-      <point x="850" y="-206" type="curve" name="hr01" smooth="yes"/>
+      <point x="850" y="-206" type="curve" smooth="yes" name="hr01"/>
       <point x="778" y="-206"/>
       <point x="726" y="-190"/>
       <point x="645" y="-155" type="curve" smooth="yes"/>
       <point x="612" y="-141" type="line" smooth="yes"/>
       <point x="522" y="-104"/>
       <point x="468" y="-83"/>
-      <point x="385" y="-83" type="curve" name="dv02" smooth="yes"/>
+      <point x="385" y="-83" type="curve" smooth="yes" name="dv02"/>
       <point x="280" y="-83"/>
       <point x="192" y="-116"/>
       <point x="88" y="-204" type="curve" name="iv01"/>
       <point x="88" y="25" type="line"/>
       <point x="192" y="105"/>
       <point x="287" y="140"/>
-      <point x="390" y="140" type="curve" name="hr02" smooth="yes"/>
+      <point x="390" y="140" type="curve" smooth="yes" name="hr02"/>
       <point x="463" y="140"/>
       <point x="533" y="122"/>
       <point x="621" y="85" type="curve"/>
@@ -43,7 +43,7 @@
       <point x="652" y="71" type="line" smooth="yes"/>
       <point x="725" y="36"/>
       <point x="797" y="17"/>
-      <point x="865" y="17" type="curve" name="dv01" smooth="yes"/>
+      <point x="865" y="17" type="curve" smooth="yes" name="dv01"/>
       <point x="958" y="17"/>
       <point x="1045" y="54"/>
       <point x="1145" y="142" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2280.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2280.glif
index 2abbad207..6204fb534 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2280.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2280.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2280" format="1">
+<glyph name="uni2280" format="2">
   <advance width="1233"/>
   <unicode hex="2280"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2281.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2281.glif
index 4f0953043..c65437408 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2281.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2281.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2281" format="1">
+<glyph name="uni2281" format="2">
   <advance width="1233"/>
   <unicode hex="2281"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2285.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2285.glif
index b1fbf0f00..a7b5fe465 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2285.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2285.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2285" format="1">
+<glyph name="uni2285" format="2">
   <advance width="1233"/>
   <unicode hex="2285"/>
   <outline>
@@ -24,18 +24,18 @@
       <point x="1003" y="1003" type="curve" smooth="yes"/>
       <point x="1099" y="902"/>
       <point x="1145" y="778"/>
-      <point x="1145" y="642" type="curve" name="dh02" smooth="yes"/>
+      <point x="1145" y="642" type="curve" smooth="yes" name="dh02"/>
       <point x="1145" y="353"/>
       <point x="930" y="139"/>
-      <point x="658" y="139" type="curve" name="sv03" smooth="yes"/>
+      <point x="658" y="139" type="curve" smooth="yes" name="sv03"/>
       <point x="524" y="139" type="line"/>
       <point x="425" y="-118" type="line" name="av02"/>
     </contour>
     <contour>
-      <point x="658" y="364" type="line" name="sv04" smooth="yes"/>
+      <point x="658" y="364" type="line" smooth="yes" name="sv04"/>
       <point x="805" y="364"/>
       <point x="920" y="475"/>
-      <point x="920" y="646" type="curve" name="dh01" smooth="yes"/>
+      <point x="920" y="646" type="curve" smooth="yes" name="dh01"/>
       <point x="920" y="725"/>
       <point x="896" y="791"/>
       <point x="844" y="843" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2288.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2288.glif
index 70e0b16d6..7e02dc9c3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2288.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2288.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2288" format="1">
+<glyph name="uni2288" format="2">
   <advance width="1233"/>
   <unicode hex="2288"/>
   <outline>
@@ -15,10 +15,10 @@
       <point x="230" y="457" type="curve" smooth="yes"/>
       <point x="137" y="557"/>
       <point x="88" y="679"/>
-      <point x="88" y="818" type="curve" name="dh01" smooth="yes"/>
+      <point x="88" y="818" type="curve" smooth="yes" name="dh01"/>
       <point x="88" y="1107"/>
       <point x="303" y="1321"/>
-      <point x="575" y="1321" type="curve" name="sv01" smooth="yes"/>
+      <point x="575" y="1321" type="curve" smooth="yes" name="sv01"/>
       <point x="741" y="1321" type="line"/>
       <point x="808" y="1494" type="line" name="at01"/>
       <point x="987" y="1425" type="line"/>
@@ -42,7 +42,7 @@
       <point x="575" y="1096" type="line" smooth="yes"/>
       <point x="428" y="1096"/>
       <point x="313" y="985"/>
-      <point x="313" y="814" type="curve" name="dh02" smooth="yes"/>
+      <point x="313" y="814" type="curve" smooth="yes" name="dh02"/>
       <point x="313" y="733"/>
       <point x="338" y="668"/>
       <point x="389" y="617" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2289.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2289.glif
index a43ba9cf4..4998cb91f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2289.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2289.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2289" format="1">
+<glyph name="uni2289" format="2">
   <advance width="1233"/>
   <unicode hex="2289"/>
   <outline>
@@ -16,7 +16,7 @@
       <point x="654" y="1096" type="line" name="dv03"/>
       <point x="88" y="1096" type="line"/>
       <point x="88" y="1321" type="line"/>
-      <point x="658" y="1321" type="line" name="dv04" smooth="yes"/>
+      <point x="658" y="1321" type="line" smooth="yes" name="dv04"/>
       <point x="686" y="1321"/>
       <point x="713" y="1319"/>
       <point x="739" y="1315" type="curve" name="sv01"/>
@@ -28,10 +28,10 @@
       <point x="1004" y="1179" type="curve" smooth="yes"/>
       <point x="1100" y="1082"/>
       <point x="1145" y="947"/>
-      <point x="1145" y="816" type="curve" name="dh02" smooth="yes"/>
+      <point x="1145" y="816" type="curve" smooth="yes" name="dh02"/>
       <point x="1145" y="541"/>
       <point x="944" y="315"/>
-      <point x="657" y="315" type="curve" name="sv02" smooth="yes"/>
+      <point x="657" y="315" type="curve" smooth="yes" name="sv02"/>
       <point x="561" y="315" type="line"/>
       <point x="516" y="198" type="line" name="sv03"/>
       <point x="1145" y="198" type="line" name="sh01"/>
@@ -40,10 +40,10 @@
       <point x="349" y="-236" type="line" name="av01"/>
     </contour>
     <contour>
-      <point x="658" y="540" type="line" name="sv05" smooth="yes"/>
+      <point x="658" y="540" type="line" smooth="yes" name="sv05"/>
       <point x="803" y="540"/>
       <point x="920" y="649"/>
-      <point x="920" y="821" type="curve" name="dh01" smooth="yes"/>
+      <point x="920" y="821" type="curve" smooth="yes" name="dh01"/>
       <point x="920" y="901"/>
       <point x="895" y="968"/>
       <point x="844" y="1019" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni228A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni228A_.glif
index 46c98c3d1..4965984a1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni228A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni228A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni228A" format="1">
+<glyph name="uni228A" format="2">
   <advance width="1233"/>
   <unicode hex="228A"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="88" y="198" type="line"/>
       <point x="560" y="198" type="line" name="dv02"/>
       <point x="654" y="315" type="line"/>
-      <point x="576" y="315" type="line" name="dv05" smooth="yes"/>
+      <point x="576" y="315" type="line" smooth="yes" name="dv05"/>
       <point x="289" y="315"/>
       <point x="88" y="541"/>
-      <point x="88" y="819" type="curve" name="dh01" smooth="yes"/>
+      <point x="88" y="819" type="curve" smooth="yes" name="dh01"/>
       <point x="88" y="1106"/>
       <point x="303" y="1321"/>
       <point x="575" y="1321" type="curve" smooth="yes"/>
@@ -22,10 +22,10 @@
       <point x="575" y="1096" type="line" smooth="yes"/>
       <point x="428" y="1096"/>
       <point x="313" y="983"/>
-      <point x="313" y="818" type="curve" name="dh02" smooth="yes"/>
+      <point x="313" y="818" type="curve" smooth="yes" name="dh02"/>
       <point x="313" y="650"/>
       <point x="431" y="540"/>
-      <point x="575" y="540" type="curve" name="dv06" smooth="yes"/>
+      <point x="575" y="540" type="curve" smooth="yes" name="dv06"/>
       <point x="1145" y="540" type="line"/>
       <point x="1145" y="315" type="line" name="sv02"/>
       <point x="856" y="315" type="line"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni228B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni228B_.glif
index 0064a3f27..85ea59fb4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni228B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni228B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni228B" format="1">
+<glyph name="uni228B" format="2">
   <advance width="1233"/>
   <unicode hex="228B"/>
   <outline>
@@ -12,19 +12,19 @@
       <point x="654" y="315" type="line" name="dv05"/>
       <point x="88" y="315" type="line"/>
       <point x="88" y="540" type="line"/>
-      <point x="658" y="540" type="line" name="dv06" smooth="yes"/>
+      <point x="658" y="540" type="line" smooth="yes" name="dv06"/>
       <point x="802" y="540"/>
       <point x="920" y="650"/>
-      <point x="920" y="818" type="curve" name="dh01" smooth="yes"/>
+      <point x="920" y="818" type="curve" smooth="yes" name="dh01"/>
       <point x="920" y="983"/>
       <point x="805" y="1096"/>
-      <point x="658" y="1096" type="curve" name="dv03" smooth="yes"/>
+      <point x="658" y="1096" type="curve" smooth="yes" name="dv03"/>
       <point x="88" y="1096" type="line"/>
       <point x="88" y="1321" type="line"/>
-      <point x="658" y="1321" type="line" name="dv04" smooth="yes"/>
+      <point x="658" y="1321" type="line" smooth="yes" name="dv04"/>
       <point x="930" y="1321"/>
       <point x="1145" y="1107"/>
-      <point x="1145" y="817" type="curve" name="dh02" smooth="yes"/>
+      <point x="1145" y="817" type="curve" smooth="yes" name="dh02"/>
       <point x="1145" y="684"/>
       <point x="1100" y="561"/>
       <point x="1003" y="457" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni228D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni228D_.glif
index ca9e3534d..905a2d969 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni228D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni228D_.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni228D" format="1">
+<glyph name="uni228D" format="2">
   <advance width="1233"/>
   <unicode hex="228D"/>
   <outline>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="232" y="-29"/>
       <point x="90" y="134"/>
-      <point x="90" y="582" type="curve" name="dh01" smooth="yes"/>
+      <point x="90" y="582" type="curve" smooth="yes" name="dh01"/>
       <point x="90" y="1284" type="line" name="av01"/>
       <point x="328" y="1284" type="line"/>
-      <point x="328" y="602" type="line" name="dh02" smooth="yes"/>
+      <point x="328" y="602" type="line" smooth="yes" name="dh02"/>
       <point x="328" y="291"/>
       <point x="392" y="214"/>
-      <point x="616" y="214" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="214" type="curve" smooth="yes" name="dv01"/>
       <point x="841" y="214"/>
       <point x="905" y="292"/>
-      <point x="905" y="602" type="curve" name="dh05" smooth="yes"/>
+      <point x="905" y="602" type="curve" smooth="yes" name="dh05"/>
       <point x="905" y="1284" type="line" name="av02"/>
       <point x="1143" y="1284" type="line"/>
-      <point x="1143" y="582" type="line" name="dh06" smooth="yes"/>
+      <point x="1143" y="582" type="line" smooth="yes" name="dh06"/>
       <point x="1143" y="134"/>
       <point x="999" y="-29"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni228E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni228E_.glif
index 6d13d6450..44e66e25b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni228E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni228E_.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni228E" format="1">
+<glyph name="uni228E" format="2">
   <advance width="1233"/>
   <unicode hex="228E"/>
   <outline>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="232" y="-29"/>
       <point x="90" y="134"/>
-      <point x="90" y="582" type="curve" name="dh01" smooth="yes"/>
+      <point x="90" y="582" type="curve" smooth="yes" name="dh01"/>
       <point x="90" y="1284" type="line" name="av01"/>
       <point x="328" y="1284" type="line"/>
-      <point x="328" y="602" type="line" name="dh02" smooth="yes"/>
+      <point x="328" y="602" type="line" smooth="yes" name="dh02"/>
       <point x="328" y="291"/>
       <point x="392" y="214"/>
-      <point x="616" y="214" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="214" type="curve" smooth="yes" name="dv01"/>
       <point x="841" y="214"/>
       <point x="905" y="292"/>
-      <point x="905" y="602" type="curve" name="dh05" smooth="yes"/>
+      <point x="905" y="602" type="curve" smooth="yes" name="dh05"/>
       <point x="905" y="1284" type="line" name="av02"/>
       <point x="1143" y="1284" type="line"/>
-      <point x="1143" y="582" type="line" name="dh06" smooth="yes"/>
+      <point x="1143" y="582" type="line" smooth="yes" name="dh06"/>
       <point x="1143" y="134"/>
       <point x="999" y="-29"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni228F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni228F_.glif
index 3ce7872ec..2ba909164 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni228F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni228F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni228F" format="1">
+<glyph name="uni228F" format="2">
   <advance width="1233"/>
   <unicode hex="228F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2290.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2290.glif
index b903de39c..36c6d8a40 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2290.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2290.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2290" format="1">
+<glyph name="uni2290" format="2">
   <advance width="1233"/>
   <unicode hex="2290"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2291.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2291.glif
index fb312e330..a44615bc8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2291.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2291.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2291" format="1">
+<glyph name="uni2291" format="2">
   <advance width="1233"/>
   <unicode hex="2291"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2292.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2292.glif
index f3de0fba1..2bcd77157 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2292.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2292.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2292" format="1">
+<glyph name="uni2292" format="2">
   <advance width="1233"/>
   <unicode hex="2292"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2293.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2293.glif
index f53b75fed..fc807f691 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2293.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2293.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2293" format="1">
+<glyph name="uni2293" format="2">
   <advance width="1233"/>
   <unicode hex="2293"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2294.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2294.glif
index 8b3785775..cb29aae10 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2294.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2294.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2294" format="1">
+<glyph name="uni2294" format="2">
   <advance width="1233"/>
   <unicode hex="2294"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2296.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2296.glif
index f6ac4f3cb..629ef5bb2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2296.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2296.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2296" format="1">
+<glyph name="uni2296" format="2">
   <advance width="1233"/>
   <unicode hex="2296"/>
   <outline>
     <contour>
-      <point x="617" y="52" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="52" type="curve" smooth="yes" name="hr00"/>
       <point x="448" y="52"/>
       <point x="302" y="121"/>
       <point x="198" y="225" type="curve" smooth="yes"/>
       <point x="82" y="341"/>
       <point x="26" y="488"/>
-      <point x="26" y="643" type="curve" name="sh01" smooth="yes"/>
+      <point x="26" y="643" type="curve" smooth="yes" name="sh01"/>
       <point x="26" y="810"/>
       <point x="90" y="954"/>
       <point x="198" y="1061" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="391" y="1191" type="curve" smooth="yes"/>
       <point x="461" y="1220"/>
       <point x="536" y="1235"/>
-      <point x="615" y="1235" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1235" type="curve" smooth="yes" name="dv03"/>
       <point x="772" y="1235"/>
       <point x="922" y="1175"/>
       <point x="1035" y="1062" type="curve" smooth="yes"/>
       <point x="1140" y="957"/>
       <point x="1207" y="810"/>
-      <point x="1207" y="643" type="curve" name="sh02" smooth="yes"/>
+      <point x="1207" y="643" type="curve" smooth="yes" name="sh02"/>
       <point x="1207" y="487"/>
       <point x="1150" y="340"/>
       <point x="1035" y="225" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="786" y="52"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="533"/>
-      <point x="1012" y="646" type="curve" name="ah01" smooth="yes"/>
+      <point x="1012" y="646" type="curve" smooth="yes" name="ah01"/>
       <point x="1012" y="747"/>
       <point x="977" y="844"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="412" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2298.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2298.glif
index d085aea82..cff7bbc33 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2298.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2298.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2298" format="1">
+<glyph name="uni2298" format="2">
   <advance width="1233"/>
   <unicode hex="2298"/>
   <outline>
     <contour>
-      <point x="617" y="52" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="52" type="curve" smooth="yes" name="hr00"/>
       <point x="448" y="52"/>
       <point x="302" y="121"/>
       <point x="198" y="225" type="curve" smooth="yes"/>
       <point x="82" y="341"/>
       <point x="26" y="488"/>
-      <point x="26" y="643" type="curve" name="sh01" smooth="yes"/>
+      <point x="26" y="643" type="curve" smooth="yes" name="sh01"/>
       <point x="26" y="810"/>
       <point x="90" y="954"/>
       <point x="198" y="1061" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="391" y="1191" type="curve" smooth="yes"/>
       <point x="461" y="1220"/>
       <point x="536" y="1235"/>
-      <point x="615" y="1235" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1235" type="curve" smooth="yes" name="dv03"/>
       <point x="772" y="1235"/>
       <point x="922" y="1175"/>
       <point x="1035" y="1062" type="curve" smooth="yes"/>
       <point x="1140" y="957"/>
       <point x="1207" y="810"/>
-      <point x="1207" y="643" type="curve" name="sh02" smooth="yes"/>
+      <point x="1207" y="643" type="curve" smooth="yes" name="sh02"/>
       <point x="1207" y="487"/>
       <point x="1150" y="340"/>
       <point x="1035" y="225" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="786" y="52"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="533"/>
-      <point x="1012" y="646" type="curve" name="ah01" smooth="yes"/>
+      <point x="1012" y="646" type="curve" smooth="yes" name="ah01"/>
       <point x="1012" y="747"/>
       <point x="977" y="844"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="412" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2299.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2299.glif
index 4fac4b927..cd58b4d49 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2299.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2299.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2299" format="1">
+<glyph name="uni2299" format="2">
   <advance width="1233"/>
   <unicode hex="2299"/>
   <outline>
     <contour>
-      <point x="617" y="52" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="52" type="curve" smooth="yes" name="hr00"/>
       <point x="448" y="52"/>
       <point x="302" y="121"/>
       <point x="198" y="225" type="curve" smooth="yes"/>
       <point x="82" y="341"/>
       <point x="26" y="488"/>
-      <point x="26" y="643" type="curve" name="dh01" smooth="yes"/>
+      <point x="26" y="643" type="curve" smooth="yes" name="dh01"/>
       <point x="26" y="810"/>
       <point x="90" y="954"/>
       <point x="198" y="1061" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="391" y="1191" type="curve" smooth="yes"/>
       <point x="461" y="1220"/>
       <point x="536" y="1235"/>
-      <point x="615" y="1235" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1235" type="curve" smooth="yes" name="dv03"/>
       <point x="772" y="1235"/>
       <point x="922" y="1175"/>
       <point x="1035" y="1062" type="curve" smooth="yes"/>
       <point x="1140" y="957"/>
       <point x="1207" y="810"/>
-      <point x="1207" y="643" type="curve" name="dh06" smooth="yes"/>
+      <point x="1207" y="643" type="curve" smooth="yes" name="dh06"/>
       <point x="1207" y="487"/>
       <point x="1150" y="340"/>
       <point x="1035" y="225" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="786" y="52"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="533"/>
-      <point x="1012" y="646" type="curve" name="dh05" smooth="yes"/>
+      <point x="1012" y="646" type="curve" smooth="yes" name="dh05"/>
       <point x="1012" y="747"/>
       <point x="977" y="844"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="412" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="dh02" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="dh02"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni229A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni229A_.glif
index 4324aaa3b..932cf9a62 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni229A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni229A_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni229A" format="1">
+<glyph name="uni229A" format="2">
   <advance width="1233"/>
   <unicode hex="229A"/>
   <outline>
     <contour>
-      <point x="617" y="52" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="52" type="curve" smooth="yes" name="hr00"/>
       <point x="448" y="52"/>
       <point x="302" y="121"/>
       <point x="198" y="225" type="curve" smooth="yes"/>
       <point x="82" y="341"/>
       <point x="26" y="488"/>
-      <point x="26" y="643" type="curve" name="dh01" smooth="yes"/>
+      <point x="26" y="643" type="curve" smooth="yes" name="dh01"/>
       <point x="26" y="810"/>
       <point x="90" y="954"/>
       <point x="198" y="1061" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="391" y="1191" type="curve" smooth="yes"/>
       <point x="461" y="1220"/>
       <point x="536" y="1235"/>
-      <point x="615" y="1235" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1235" type="curve" smooth="yes" name="dv03"/>
       <point x="772" y="1235"/>
       <point x="922" y="1175"/>
       <point x="1035" y="1062" type="curve" smooth="yes"/>
       <point x="1140" y="957"/>
       <point x="1207" y="810"/>
-      <point x="1207" y="643" type="curve" name="dh08" smooth="yes"/>
+      <point x="1207" y="643" type="curve" smooth="yes" name="dh08"/>
       <point x="1207" y="487"/>
       <point x="1150" y="340"/>
       <point x="1035" y="225" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="786" y="52"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="533"/>
-      <point x="1012" y="646" type="curve" name="dh07" smooth="yes"/>
+      <point x="1012" y="646" type="curve" smooth="yes" name="dh07"/>
       <point x="1012" y="747"/>
       <point x="977" y="844"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="412" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="dh02" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="dh02"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
@@ -62,36 +62,36 @@
       <point x="509" y="246"/>
     </contour>
     <contour>
-      <point x="614" y="378" type="curve" name="dv04" smooth="yes"/>
+      <point x="614" y="378" type="curve" smooth="yes" name="dv04"/>
       <point x="463" y="378"/>
       <point x="350" y="492"/>
-      <point x="350" y="641" type="curve" name="dh03" smooth="yes"/>
+      <point x="350" y="641" type="curve" smooth="yes" name="dh03"/>
       <point x="350" y="793"/>
       <point x="467" y="911"/>
-      <point x="616" y="911" type="curve" name="dv07" smooth="yes"/>
+      <point x="616" y="911" type="curve" smooth="yes" name="dv07"/>
       <point x="689" y="911"/>
       <point x="757" y="883"/>
       <point x="806" y="831" type="curve"/>
       <point x="857" y="782"/>
       <point x="883" y="717"/>
-      <point x="883" y="645" type="curve" name="dh06" smooth="yes"/>
+      <point x="883" y="645" type="curve" smooth="yes" name="dh06"/>
       <point x="883" y="493"/>
       <point x="765" y="378"/>
     </contour>
     <contour>
-      <point x="615" y="538" type="curve" name="dv05" smooth="yes"/>
+      <point x="615" y="538" type="curve" smooth="yes" name="dv05"/>
       <point x="675" y="538"/>
       <point x="723" y="584"/>
-      <point x="723" y="644" type="curve" name="dh05" smooth="yes"/>
+      <point x="723" y="644" type="curve" smooth="yes" name="dh05"/>
       <point x="723" y="671"/>
       <point x="715" y="696"/>
       <point x="692" y="719" type="curve" smooth="yes"/>
       <point x="671" y="740"/>
       <point x="646" y="750"/>
-      <point x="617" y="750" type="curve" name="dv06" smooth="yes"/>
+      <point x="617" y="750" type="curve" smooth="yes" name="dv06"/>
       <point x="556" y="750"/>
       <point x="510" y="703"/>
-      <point x="510" y="643" type="curve" name="dh04" smooth="yes"/>
+      <point x="510" y="643" type="curve" smooth="yes" name="dh04"/>
       <point x="510" y="583"/>
       <point x="556" y="538"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni229B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni229B_.glif
index 7a5a5f32b..fc64362ad 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni229B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni229B_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni229B" format="1">
+<glyph name="uni229B" format="2">
   <advance width="1233"/>
   <unicode hex="229B"/>
   <outline>
     <contour>
-      <point x="617" y="52" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="52" type="curve" smooth="yes" name="hr00"/>
       <point x="448" y="52"/>
       <point x="302" y="121"/>
       <point x="198" y="225" type="curve" smooth="yes"/>
       <point x="82" y="341"/>
       <point x="26" y="488"/>
-      <point x="26" y="643" type="curve" name="dh01" smooth="yes"/>
+      <point x="26" y="643" type="curve" smooth="yes" name="dh01"/>
       <point x="26" y="810"/>
       <point x="90" y="954"/>
       <point x="198" y="1061" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="391" y="1191" type="curve" smooth="yes"/>
       <point x="461" y="1220"/>
       <point x="536" y="1235"/>
-      <point x="615" y="1235" type="curve" name="av01" smooth="yes"/>
+      <point x="615" y="1235" type="curve" smooth="yes" name="av01"/>
       <point x="772" y="1235"/>
       <point x="922" y="1175"/>
       <point x="1035" y="1062" type="curve" smooth="yes"/>
       <point x="1140" y="957"/>
       <point x="1207" y="810"/>
-      <point x="1207" y="643" type="curve" name="dh06" smooth="yes"/>
+      <point x="1207" y="643" type="curve" smooth="yes" name="dh06"/>
       <point x="1207" y="487"/>
       <point x="1150" y="340"/>
       <point x="1035" y="225" type="curve" smooth="yes"/>
@@ -62,7 +62,7 @@
       <point x="994" y="519" type="line"/>
       <point x="1006" y="558"/>
       <point x="1012" y="599"/>
-      <point x="1012" y="644" type="curve" name="dh05" smooth="yes"/>
+      <point x="1012" y="644" type="curve" smooth="yes" name="dh05"/>
       <point x="1012" y="680"/>
       <point x="1008" y="716"/>
       <point x="999" y="749" type="curve"/>
@@ -73,7 +73,7 @@
       <point x="233" y="747" type="line"/>
       <point x="225" y="714"/>
       <point x="221" y="679"/>
-      <point x="221" y="643" type="curve" name="dh02" smooth="yes"/>
+      <point x="221" y="643" type="curve" smooth="yes" name="dh02"/>
       <point x="221" y="600"/>
       <point x="227" y="559"/>
       <point x="239" y="521" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni229C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni229C_.glif
index 4b580eb0f..9cc580bb1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni229C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni229C_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni229C" format="1">
+<glyph name="uni229C" format="2">
   <advance width="1233"/>
   <unicode hex="229C"/>
   <outline>
     <contour>
-      <point x="617" y="52" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="52" type="curve" smooth="yes" name="hr00"/>
       <point x="448" y="52"/>
       <point x="302" y="121"/>
       <point x="198" y="225" type="curve" smooth="yes"/>
       <point x="82" y="341"/>
       <point x="26" y="488"/>
-      <point x="26" y="643" type="curve" name="sh01" smooth="yes"/>
+      <point x="26" y="643" type="curve" smooth="yes" name="sh01"/>
       <point x="26" y="810"/>
       <point x="90" y="954"/>
       <point x="198" y="1061" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="391" y="1191" type="curve" smooth="yes"/>
       <point x="461" y="1220"/>
       <point x="536" y="1235"/>
-      <point x="615" y="1235" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1235" type="curve" smooth="yes" name="dv03"/>
       <point x="772" y="1235"/>
       <point x="922" y="1175"/>
       <point x="1035" y="1062" type="curve" smooth="yes"/>
       <point x="1140" y="957"/>
       <point x="1207" y="810"/>
-      <point x="1207" y="643" type="curve" name="sh02" smooth="yes"/>
+      <point x="1207" y="643" type="curve" smooth="yes" name="sh02"/>
       <point x="1207" y="487"/>
       <point x="1150" y="340"/>
       <point x="1035" y="225" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="786" y="52"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="533"/>
-      <point x="1012" y="646" type="curve" name="ah01" smooth="yes"/>
+      <point x="1012" y="646" type="curve" smooth="yes" name="ah01"/>
       <point x="1012" y="747"/>
       <point x="977" y="844"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="412" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni229D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni229D_.glif
index 2f2c01912..feafd74e4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni229D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni229D_.glif
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni229D" format="1">
+<glyph name="uni229D" format="2">
   <advance width="1233"/>
   <unicode hex="229D"/>
   <outline>
     <contour>
-      <point x="617" y="52" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="52" type="curve" smooth="yes" name="hr00"/>
       <point x="448" y="52"/>
       <point x="302" y="121"/>
       <point x="198" y="225" type="curve" smooth="yes"/>
       <point x="82" y="341"/>
       <point x="26" y="488"/>
-      <point x="26" y="643" type="curve" name="sh01" smooth="yes"/>
+      <point x="26" y="643" type="curve" smooth="yes" name="sh01"/>
       <point x="26" y="810"/>
       <point x="90" y="954"/>
       <point x="198" y="1061" type="curve" smooth="yes"/>
       <point x="254" y="1117"/>
       <point x="320" y="1160"/>
-      <point x="391" y="1191" type="curve" name="sh03" smooth="yes"/>
+      <point x="391" y="1191" type="curve" smooth="yes" name="sh03"/>
       <point x="461" y="1220"/>
       <point x="536" y="1235"/>
-      <point x="615" y="1235" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1235" type="curve" smooth="yes" name="dv03"/>
       <point x="772" y="1235"/>
       <point x="922" y="1175"/>
       <point x="1035" y="1062" type="curve" smooth="yes"/>
       <point x="1140" y="957"/>
       <point x="1207" y="810"/>
-      <point x="1207" y="643" type="curve" name="sh05" smooth="yes"/>
+      <point x="1207" y="643" type="curve" smooth="yes" name="sh05"/>
       <point x="1207" y="487"/>
       <point x="1150" y="340"/>
       <point x="1035" y="225" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="786" y="52"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="533"/>
-      <point x="1012" y="646" type="curve" name="sh04" smooth="yes"/>
+      <point x="1012" y="646" type="curve" smooth="yes" name="sh04"/>
       <point x="1012" y="747"/>
       <point x="977" y="844"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="412" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="sh06" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="sh06"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni229E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni229E_.glif
index fa93e467e..73445d488 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni229E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni229E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni229E" format="1">
+<glyph name="uni229E" format="2">
   <advance width="1233"/>
   <unicode hex="229E"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni229F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni229F_.glif
index 0b32d9a75..40fd2ed68 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni229F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni229F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni229F" format="1">
+<glyph name="uni229F" format="2">
   <advance width="1233"/>
   <unicode hex="229F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22A_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22A_0.glif
index 0cf18482d..fad7b6307 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22A_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22A0" format="1">
+<glyph name="uni22A0" format="2">
   <advance width="1233"/>
   <unicode hex="22A0"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22A_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22A_1.glif
index e4b6db101..a949f80b1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22A_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22A_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22A1" format="1">
+<glyph name="uni22A1" format="2">
   <advance width="1233"/>
   <unicode hex="22A1"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22A_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22A_2.glif
index 6c0dcd644..343508b6a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22A_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22A_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22A2" format="1">
+<glyph name="uni22A2" format="2">
   <advance width="1233"/>
   <unicode hex="22A2"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22A_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22A_3.glif
index abea865a0..31c4b6a7b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22A_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22A_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22A3" format="1">
+<glyph name="uni22A3" format="2">
   <advance width="1233"/>
   <unicode hex="22A3"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22A_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22A_4.glif
index abe8467de..00f9e4cf6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22A_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22A4" format="1">
+<glyph name="uni22A4" format="2">
   <advance width="1233"/>
   <unicode hex="22A4"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22B_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22B_2.glif
index 5f82cc355..723bb77e0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22B_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22B_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22B2" format="1">
+<glyph name="uni22B2" format="2">
   <advance width="1233"/>
   <unicode hex="22B2"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22B_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22B_3.glif
index 1c3a8d1d4..9b2ad8843 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22B_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22B3" format="1">
+<glyph name="uni22B3" format="2">
   <advance width="1233"/>
   <unicode hex="22B3"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22B_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22B_4.glif
index cf8b56e58..9ae92c604 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22B_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22B_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22B4" format="1">
+<glyph name="uni22B4" format="2">
   <advance width="1233"/>
   <unicode hex="22B4"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22B_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22B_5.glif
index 0309960a9..e9b5799df 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22B_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22B_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22B5" format="1">
+<glyph name="uni22B5" format="2">
   <advance width="1233"/>
   <unicode hex="22B5"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22B_8.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22B_8.glif
index c98de3098..9d25201b5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22B_8.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22B_8.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22B8" format="1">
+<glyph name="uni22B8" format="2">
   <advance width="1233"/>
   <unicode hex="22B8"/>
   <outline>
     <contour>
-      <point x="918" y="359" type="curve" name="hr00" smooth="yes"/>
+      <point x="918" y="359" type="curve" smooth="yes" name="hr00"/>
       <point x="837" y="359"/>
       <point x="774" y="388"/>
       <point x="718" y="441" type="curve" smooth="yes"/>
@@ -19,21 +19,21 @@
       <point x="714" y="841" type="curve" smooth="yes"/>
       <point x="774" y="901"/>
       <point x="847" y="930"/>
-      <point x="923" y="930" type="curve" name="dv03" smooth="yes"/>
+      <point x="923" y="930" type="curve" smooth="yes" name="dv03"/>
       <point x="1079" y="930"/>
       <point x="1205" y="805"/>
-      <point x="1205" y="641" type="curve" name="dh02" smooth="yes"/>
+      <point x="1205" y="641" type="curve" smooth="yes" name="dh02"/>
       <point x="1205" y="481"/>
       <point x="1083" y="359"/>
     </contour>
     <contour>
-      <point x="920" y="507" type="curve" name="dv01" smooth="yes"/>
+      <point x="920" y="507" type="curve" smooth="yes" name="dv01"/>
       <point x="997" y="507"/>
       <point x="1057" y="567"/>
-      <point x="1057" y="643" type="curve" name="dh01" smooth="yes"/>
+      <point x="1057" y="643" type="curve" smooth="yes" name="dh01"/>
       <point x="1057" y="719"/>
       <point x="997" y="780"/>
-      <point x="921" y="780" type="curve" name="dv02" smooth="yes"/>
+      <point x="921" y="780" type="curve" smooth="yes" name="dv02"/>
       <point x="844" y="780"/>
       <point x="783" y="718"/>
       <point x="783" y="642" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22C_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22C_2.glif
index 7caf3a355..d74cf5589 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22C_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22C_2.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22C2" format="1">
+<glyph name="uni22C2" format="2">
   <advance width="1233"/>
   <unicode hex="22C2"/>
   <outline>
     <contour>
-      <point x="90" y="936" type="line" name="hr00" smooth="yes"/>
+      <point x="90" y="936" type="line" smooth="yes" name="hr00"/>
       <point x="90" y="1384"/>
       <point x="234" y="1547"/>
-      <point x="617" y="1547" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="1547" type="curve" smooth="yes" name="dv02"/>
       <point x="1001" y="1547"/>
       <point x="1143" y="1384"/>
       <point x="1143" y="936" type="curve" smooth="yes"/>
@@ -16,10 +16,10 @@
       <point x="905" y="916" type="line" smooth="yes"/>
       <point x="905" y="1227"/>
       <point x="841" y="1304"/>
-      <point x="617" y="1304" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="1304" type="curve" smooth="yes" name="dv01"/>
       <point x="392" y="1304"/>
       <point x="328" y="1226"/>
-      <point x="328" y="916" type="curve" name="sh02" smooth="yes"/>
+      <point x="328" y="916" type="curve" smooth="yes" name="sh02"/>
       <point x="328" y="-436" type="line" name="av01"/>
       <point x="90" y="-436" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22C_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22C_3.glif
index 5149fb982..800c5a30d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22C_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22C_3.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22C3" format="1">
+<glyph name="uni22C3" format="2">
   <advance width="1233"/>
   <unicode hex="22C3"/>
   <outline>
     <contour>
-      <point x="616" y="-465" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-465" type="curve" smooth="yes" name="hr00"/>
       <point x="232" y="-465"/>
       <point x="90" y="-302"/>
-      <point x="90" y="146" type="curve" name="sh01" smooth="yes"/>
+      <point x="90" y="146" type="curve" smooth="yes" name="sh01"/>
       <point x="90" y="1518" type="line" name="at01"/>
       <point x="328" y="1518" type="line"/>
-      <point x="328" y="166" type="line" name="sh02" smooth="yes"/>
+      <point x="328" y="166" type="line" smooth="yes" name="sh02"/>
       <point x="328" y="-145"/>
       <point x="392" y="-222"/>
-      <point x="616" y="-222" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-222" type="curve" smooth="yes" name="dv01"/>
       <point x="841" y="-222"/>
       <point x="905" y="-144"/>
-      <point x="905" y="166" type="curve" name="ah01" smooth="yes"/>
+      <point x="905" y="166" type="curve" smooth="yes" name="ah01"/>
       <point x="905" y="1518" type="line" name="at02"/>
       <point x="1143" y="1518" type="line"/>
-      <point x="1143" y="146" type="line" name="sh03" smooth="yes"/>
+      <point x="1143" y="146" type="line" smooth="yes" name="sh03"/>
       <point x="1143" y="-302"/>
       <point x="999" y="-465"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22C_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22C_4.glif
index aac9968be..e6d88ed35 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22C_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22C_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22C4" format="1">
+<glyph name="uni22C4" format="2">
   <advance width="1233"/>
   <unicode hex="22C4"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22C_6.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22C_6.glif
index 72bc367df..de4f01806 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22C_6.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22C_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22C6" format="1">
+<glyph name="uni22C6" format="2">
   <advance width="1233"/>
   <unicode hex="22C6"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22C_D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22C_D_.glif
index 296eb627b..ae4a030be 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22C_D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22C_D_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22CD" format="1">
+<glyph name="uni22CD" format="2">
   <advance width="1233"/>
   <unicode hex="22CD"/>
   <outline>
     <contour>
-      <point x="381" y="672" type="curve" name="dv02" smooth="yes"/>
+      <point x="381" y="672" type="curve" smooth="yes" name="dv02"/>
       <point x="281" y="672"/>
       <point x="188" y="706"/>
       <point x="88" y="786" type="curve"/>
       <point x="88" y="1020" type="line" name="av01"/>
       <point x="188" y="932"/>
       <point x="275" y="895"/>
-      <point x="368" y="895" type="curve" name="dv03" smooth="yes"/>
+      <point x="368" y="895" type="curve" smooth="yes" name="dv03"/>
       <point x="436" y="895"/>
       <point x="508" y="914"/>
       <point x="581" y="949" type="curve" smooth="yes"/>
@@ -19,14 +19,14 @@
       <point x="612" y="963" type="line"/>
       <point x="700" y="1000"/>
       <point x="770" y="1018"/>
-      <point x="843" y="1018" type="curve" name="hr01" smooth="yes"/>
+      <point x="843" y="1018" type="curve" smooth="yes" name="hr01"/>
       <point x="946" y="1018"/>
       <point x="1041" y="983"/>
       <point x="1145" y="903" type="curve"/>
       <point x="1145" y="674" type="line" name="iv01"/>
       <point x="1041" y="762"/>
       <point x="953" y="795"/>
-      <point x="848" y="795" type="curve" name="sv01" smooth="yes"/>
+      <point x="848" y="795" type="curve" smooth="yes" name="sv01"/>
       <point x="765" y="795"/>
       <point x="711" y="774"/>
       <point x="621" y="737" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22C_E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22C_E_.glif
index 0644a1fff..2037ea0c4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22C_E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22C_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22CE" format="1">
+<glyph name="uni22CE" format="2">
   <advance width="1233"/>
   <unicode hex="22CE"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22C_F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22C_F_.glif
index 6dbf1cde0..82b545765 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22C_F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22C_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22CF" format="1">
+<glyph name="uni22CF" format="2">
   <advance width="1233"/>
   <unicode hex="22CF"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22D_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22D_0.glif
index ef1258736..93e862d84 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22D_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22D_0.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22D0" format="1">
+<glyph name="uni22D0" format="2">
   <advance width="1233"/>
   <unicode hex="22D0"/>
   <outline>
     <contour>
-      <point x="778" y="-46" type="line" name="hr00" smooth="yes"/>
+      <point x="778" y="-46" type="line" smooth="yes" name="hr00"/>
       <point x="398" y="-46"/>
       <point x="90" y="262"/>
-      <point x="90" y="642" type="curve" name="sh01" smooth="yes"/>
+      <point x="90" y="642" type="curve" smooth="yes" name="sh01"/>
       <point x="90" y="1022"/>
       <point x="398" y="1330"/>
       <point x="778" y="1330" type="curve" smooth="yes"/>
@@ -16,18 +16,18 @@
       <point x="778" y="1110" type="line" smooth="yes"/>
       <point x="518" y="1110"/>
       <point x="310" y="902"/>
-      <point x="310" y="642" type="curve" name="sh02" smooth="yes"/>
+      <point x="310" y="642" type="curve" smooth="yes" name="sh02"/>
       <point x="310" y="382"/>
       <point x="518" y="174"/>
-      <point x="778" y="174" type="curve" name="dv01" smooth="yes"/>
+      <point x="778" y="174" type="curve" smooth="yes" name="dv01"/>
       <point x="1143" y="174" type="line"/>
       <point x="1143" y="-46" type="line"/>
     </contour>
     <contour>
-      <point x="778" y="324" type="line" name="dv04" smooth="yes"/>
+      <point x="778" y="324" type="line" smooth="yes" name="dv04"/>
       <point x="602" y="324"/>
       <point x="460" y="466"/>
-      <point x="460" y="642" type="curve" name="ah01" smooth="yes"/>
+      <point x="460" y="642" type="curve" smooth="yes" name="ah01"/>
       <point x="460" y="818"/>
       <point x="602" y="960"/>
       <point x="778" y="960" type="curve" smooth="yes"/>
@@ -36,10 +36,10 @@
       <point x="778" y="740" type="line" smooth="yes"/>
       <point x="722" y="740"/>
       <point x="680" y="698"/>
-      <point x="680" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="680" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="680" y="586"/>
       <point x="722" y="544"/>
-      <point x="778" y="544" type="curve" name="dv05" smooth="yes"/>
+      <point x="778" y="544" type="curve" smooth="yes" name="dv05"/>
       <point x="1143" y="544" type="line"/>
       <point x="1143" y="324" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22D_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22D_1.glif
index 1d4d646d8..ae4ba8740 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22D_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22D_1.glif
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22D1" format="1">
+<glyph name="uni22D1" format="2">
   <advance width="1233"/>
   <unicode hex="22D1"/>
   <outline>
     <contour>
       <point x="90" y="174" type="line" name="hr00"/>
-      <point x="455" y="174" type="line" name="dv02" smooth="yes"/>
+      <point x="455" y="174" type="line" smooth="yes" name="dv02"/>
       <point x="715" y="174"/>
       <point x="923" y="382"/>
-      <point x="923" y="642" type="curve" name="ah01" smooth="yes"/>
+      <point x="923" y="642" type="curve" smooth="yes" name="ah01"/>
       <point x="923" y="902"/>
       <point x="715" y="1110"/>
-      <point x="455" y="1110" type="curve" name="dv03" smooth="yes"/>
+      <point x="455" y="1110" type="curve" smooth="yes" name="dv03"/>
       <point x="90" y="1110" type="line"/>
       <point x="90" y="1330" type="line"/>
-      <point x="455" y="1330" type="line" name="dv04" smooth="yes"/>
+      <point x="455" y="1330" type="line" smooth="yes" name="dv04"/>
       <point x="835" y="1330"/>
       <point x="1143" y="1022"/>
-      <point x="1143" y="642" type="curve" name="sh01" smooth="yes"/>
+      <point x="1143" y="642" type="curve" smooth="yes" name="sh01"/>
       <point x="1143" y="262"/>
       <point x="835" y="-46"/>
-      <point x="455" y="-46" type="curve" name="dv01" smooth="yes"/>
+      <point x="455" y="-46" type="curve" smooth="yes" name="dv01"/>
       <point x="90" y="-46" type="line"/>
     </contour>
     <contour>
       <point x="90" y="544" type="line"/>
-      <point x="455" y="544" type="line" name="dv06" smooth="yes"/>
+      <point x="455" y="544" type="line" smooth="yes" name="dv06"/>
       <point x="511" y="544"/>
       <point x="553" y="586"/>
-      <point x="553" y="642" type="curve" name="sh02" smooth="yes"/>
+      <point x="553" y="642" type="curve" smooth="yes" name="sh02"/>
       <point x="553" y="698"/>
       <point x="511" y="740"/>
-      <point x="455" y="740" type="curve" name="dv07" smooth="yes"/>
+      <point x="455" y="740" type="curve" smooth="yes" name="dv07"/>
       <point x="90" y="740" type="line"/>
       <point x="90" y="960" type="line"/>
-      <point x="455" y="960" type="line" name="dv08" smooth="yes"/>
+      <point x="455" y="960" type="line" smooth="yes" name="dv08"/>
       <point x="631" y="960"/>
       <point x="773" y="818"/>
-      <point x="773" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="773" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="773" y="466"/>
       <point x="631" y="324"/>
-      <point x="455" y="324" type="curve" name="dv05" smooth="yes"/>
+      <point x="455" y="324" type="curve" smooth="yes" name="dv05"/>
       <point x="90" y="324" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22D_A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22D_A_.glif
index e401f1915..55a5f620b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22D_A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22D_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22DA" format="1">
+<glyph name="uni22DA" format="2">
   <advance width="1233"/>
   <unicode hex="22DA"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22D_B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22D_B_.glif
index 20a3e393e..0925bd6a7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22D_B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22D_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22DB" format="1">
+<glyph name="uni22DB" format="2">
   <advance width="1233"/>
   <unicode hex="22DB"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22D_C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22D_C_.glif
index 04eb1b478..738082bc7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22D_C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22D_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22DC" format="1">
+<glyph name="uni22DC" format="2">
   <advance width="1233"/>
   <unicode hex="22DC"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22D_D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22D_D_.glif
index 2becc814c..7eeed144b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22D_D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22D_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22DD" format="1">
+<glyph name="uni22DD" format="2">
   <advance width="1233"/>
   <unicode hex="22DD"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22D_E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22D_E_.glif
index 9860708eb..def396d57 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22D_E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22D_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22DE" format="1">
+<glyph name="uni22DE" format="2">
   <advance width="1233"/>
   <unicode hex="22DE"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22D_F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22D_F_.glif
index 40251698e..7698fc0da 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22D_F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22D_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22DF" format="1">
+<glyph name="uni22DF" format="2">
   <advance width="1233"/>
   <unicode hex="22DF"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22E_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22E_0.glif
index 47d710229..aec616bf9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22E_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22E_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E0" format="1">
+<glyph name="uni22E0" format="2">
   <advance width="1233"/>
   <unicode hex="22E0"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22E_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22E_1.glif
index bcccc0273..5c2b69cd6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22E_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22E_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E1" format="1">
+<glyph name="uni22E1" format="2">
   <advance width="1233"/>
   <unicode hex="22E1"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22E_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22E_2.glif
index aa99bbf16..a44e98341 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22E_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22E_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E2" format="1">
+<glyph name="uni22E2" format="2">
   <advance width="1233"/>
   <unicode hex="22E2"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22E_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22E_3.glif
index 0563e76c4..b8c30d012 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22E_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22E_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E3" format="1">
+<glyph name="uni22E3" format="2">
   <advance width="1233"/>
   <unicode hex="22E3"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22E_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22E_4.glif
index e714286e2..20620dc6d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22E_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22E_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E4" format="1">
+<glyph name="uni22E4" format="2">
   <advance width="1233"/>
   <unicode hex="22E4"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22E_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22E_5.glif
index 4d9844301..cd6138e5a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22E_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22E_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E5" format="1">
+<glyph name="uni22E5" format="2">
   <advance width="1233"/>
   <unicode hex="22E5"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22E_6.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22E_6.glif
index 7283b62b9..0e99fed1d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22E_6.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22E_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E6" format="1">
+<glyph name="uni22E6" format="2">
   <advance width="1233"/>
   <unicode hex="22E6"/>
   <outline>
@@ -8,14 +8,14 @@
       <point x="484" y="33" type="line"/>
       <point x="449" y="41"/>
       <point x="414" y="45"/>
-      <point x="381" y="45" type="curve" name="dv02" smooth="yes"/>
+      <point x="381" y="45" type="curve" smooth="yes" name="dv02"/>
       <point x="277" y="45"/>
       <point x="188" y="8"/>
       <point x="88" y="-76" type="curve" name="iv01"/>
       <point x="88" y="153" type="line"/>
       <point x="191" y="233"/>
       <point x="285" y="268"/>
-      <point x="389" y="268" type="curve" name="dv03" smooth="yes"/>
+      <point x="389" y="268" type="curve" smooth="yes" name="dv03"/>
       <point x="445" y="268"/>
       <point x="493" y="258"/>
       <point x="553" y="239" type="curve"/>
@@ -31,14 +31,14 @@
       <point x="752" y="162" type="line"/>
       <point x="792" y="151"/>
       <point x="830" y="145"/>
-      <point x="865" y="145" type="curve" name="hr01" smooth="yes"/>
+      <point x="865" y="145" type="curve" smooth="yes" name="hr01"/>
       <point x="958" y="145"/>
       <point x="1045" y="182"/>
       <point x="1145" y="270" type="curve" name="iv04"/>
       <point x="1145" y="36" type="line"/>
       <point x="1049" y="-40"/>
       <point x="952" y="-78"/>
-      <point x="853" y="-78" type="curve" name="dv01" smooth="yes"/>
+      <point x="853" y="-78" type="curve" smooth="yes" name="dv01"/>
       <point x="796" y="-78"/>
       <point x="743" y="-66"/>
       <point x="682" y="-42" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22E_7.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22E_7.glif
index b54735378..e2447fb7e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22E_7.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22E_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E7" format="1">
+<glyph name="uni22E7" format="2">
   <advance width="1233"/>
   <unicode hex="22E7"/>
   <outline>
@@ -8,14 +8,14 @@
       <point x="484" y="33" type="line"/>
       <point x="449" y="41"/>
       <point x="414" y="45"/>
-      <point x="381" y="45" type="curve" name="dv02" smooth="yes"/>
+      <point x="381" y="45" type="curve" smooth="yes" name="dv02"/>
       <point x="277" y="45"/>
       <point x="188" y="8"/>
       <point x="88" y="-76" type="curve" name="iv01"/>
       <point x="88" y="153" type="line"/>
       <point x="191" y="233"/>
       <point x="285" y="268"/>
-      <point x="389" y="268" type="curve" name="dv03" smooth="yes"/>
+      <point x="389" y="268" type="curve" smooth="yes" name="dv03"/>
       <point x="445" y="268"/>
       <point x="493" y="258"/>
       <point x="553" y="239" type="curve"/>
@@ -32,14 +32,14 @@
       <point x="752" y="162" type="line"/>
       <point x="792" y="151"/>
       <point x="830" y="145"/>
-      <point x="865" y="145" type="curve" name="hr01" smooth="yes"/>
+      <point x="865" y="145" type="curve" smooth="yes" name="hr01"/>
       <point x="958" y="145"/>
       <point x="1045" y="182"/>
       <point x="1145" y="270" type="curve" name="iv06"/>
       <point x="1145" y="36" type="line"/>
       <point x="1049" y="-40"/>
       <point x="952" y="-78"/>
-      <point x="853" y="-78" type="curve" name="dv01" smooth="yes"/>
+      <point x="853" y="-78" type="curve" smooth="yes" name="dv01"/>
       <point x="796" y="-78"/>
       <point x="743" y="-66"/>
       <point x="682" y="-42" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22E_8.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22E_8.glif
index c18d7e681..9a8400794 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22E_8.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22E_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E8" format="1">
+<glyph name="uni22E8" format="2">
   <advance width="1233"/>
   <unicode hex="22E8"/>
   <outline>
@@ -25,14 +25,14 @@
       <point x="484" y="-95" type="line"/>
       <point x="449" y="-87"/>
       <point x="414" y="-83"/>
-      <point x="381" y="-83" type="curve" name="dv03" smooth="yes"/>
+      <point x="381" y="-83" type="curve" smooth="yes" name="dv03"/>
       <point x="277" y="-83"/>
       <point x="188" y="-120"/>
       <point x="88" y="-204" type="curve" name="hr01"/>
       <point x="88" y="25" type="line"/>
       <point x="191" y="105"/>
       <point x="285" y="140"/>
-      <point x="389" y="140" type="curve" name="dv04" smooth="yes"/>
+      <point x="389" y="140" type="curve" smooth="yes" name="dv04"/>
       <point x="445" y="140"/>
       <point x="493" y="130"/>
       <point x="553" y="111" type="curve"/>
@@ -41,14 +41,14 @@
       <point x="752" y="34" type="line"/>
       <point x="792" y="23"/>
       <point x="830" y="17"/>
-      <point x="865" y="17" type="curve" name="dv02" smooth="yes"/>
+      <point x="865" y="17" type="curve" smooth="yes" name="dv02"/>
       <point x="958" y="17"/>
       <point x="1045" y="54"/>
       <point x="1145" y="142" type="curve" name="iv03"/>
       <point x="1145" y="-92" type="line"/>
       <point x="1049" y="-168"/>
       <point x="952" y="-206"/>
-      <point x="853" y="-206" type="curve" name="dv01" smooth="yes"/>
+      <point x="853" y="-206" type="curve" smooth="yes" name="dv01"/>
       <point x="796" y="-206"/>
       <point x="743" y="-194"/>
       <point x="682" y="-171" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22E_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22E_9.glif
index ad5ef059b..b4bb9dbe6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22E_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22E_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E9" format="1">
+<glyph name="uni22E9" format="2">
   <advance width="1233"/>
   <unicode hex="22E9"/>
   <outline>
@@ -25,14 +25,14 @@
       <point x="484" y="-95" type="line"/>
       <point x="449" y="-87"/>
       <point x="414" y="-83"/>
-      <point x="381" y="-83" type="curve" name="dv03" smooth="yes"/>
+      <point x="381" y="-83" type="curve" smooth="yes" name="dv03"/>
       <point x="277" y="-83"/>
       <point x="188" y="-120"/>
       <point x="88" y="-204" type="curve" name="hr01"/>
       <point x="88" y="25" type="line"/>
       <point x="191" y="105"/>
       <point x="285" y="140"/>
-      <point x="389" y="140" type="curve" name="dv04" smooth="yes"/>
+      <point x="389" y="140" type="curve" smooth="yes" name="dv04"/>
       <point x="445" y="140"/>
       <point x="493" y="130"/>
       <point x="553" y="111" type="curve"/>
@@ -41,14 +41,14 @@
       <point x="752" y="34" type="line"/>
       <point x="792" y="23"/>
       <point x="830" y="17"/>
-      <point x="865" y="17" type="curve" name="dv02" smooth="yes"/>
+      <point x="865" y="17" type="curve" smooth="yes" name="dv02"/>
       <point x="958" y="17"/>
       <point x="1045" y="54"/>
       <point x="1145" y="142" type="curve" name="iv03"/>
       <point x="1145" y="-92" type="line"/>
       <point x="1049" y="-168"/>
       <point x="952" y="-206"/>
-      <point x="853" y="-206" type="curve" name="dv01" smooth="yes"/>
+      <point x="853" y="-206" type="curve" smooth="yes" name="dv01"/>
       <point x="796" y="-206"/>
       <point x="743" y="-194"/>
       <point x="682" y="-171" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni22E_F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni22E_F_.glif
index 4056d0808..a6d6a94b4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni22E_F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni22E_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22EF" format="1">
+<glyph name="uni22EF" format="2">
   <advance width="1233"/>
   <unicode hex="22EF"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2304.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2304.glif
index f27b8a3ca..fa13d6261 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2304.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2304.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2304" format="1">
+<glyph name="uni2304" format="2">
   <advance width="1233"/>
   <unicode hex="2304"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2308.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2308.glif
index 7b046338f..80fa4ea3a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2308.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2308.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2308" format="1">
+<glyph name="uni2308" format="2">
   <advance width="1233"/>
   <unicode hex="2308"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2309.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2309.glif
index 13694431f..b40522b7e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2309.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2309.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2309" format="1">
+<glyph name="uni2309" format="2">
   <advance width="1233"/>
   <unicode hex="2309"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni230A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni230A_.glif
index c98801c26..ba23683bb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni230A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni230A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni230A" format="1">
+<glyph name="uni230A" format="2">
   <advance width="1233"/>
   <unicode hex="230A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni230B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni230B_.glif
index 49a62869f..ae1291a75 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni230B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni230B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni230B" format="1">
+<glyph name="uni230B" format="2">
   <advance width="1233"/>
   <unicode hex="230B"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni239B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni239B_.glif
index 32b75b130..78694ee9e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni239B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni239B_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni239B" format="1">
+<glyph name="uni239B" format="2">
   <advance width="1233"/>
   <unicode hex="239B"/>
   <outline>
     <contour>
-      <point x="232" y="-282" type="line" name="hr00" smooth="yes"/>
+      <point x="232" y="-282" type="line" smooth="yes" name="hr00"/>
       <point x="232" y="894"/>
       <point x="523" y="1556"/>
       <point x="744" y="1901" type="curve" name="av01"/>
       <point x="1000" y="1901" type="line"/>
       <point x="764" y="1422"/>
       <point x="523" y="891"/>
-      <point x="523" y="-282" type="curve" name="dh01" smooth="yes"/>
+      <point x="523" y="-282" type="curve" smooth="yes" name="dh01"/>
       <point x="523" y="-516" type="line" name="av02"/>
       <point x="232" y="-516" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni239C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni239C_.glif
index 4425f28ce..ed39639f3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni239C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni239C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni239C" format="1">
+<glyph name="uni239C" format="2">
   <advance width="1233"/>
   <unicode hex="239C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni239D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni239D_.glif
index 75d06994b..6a4ea46fa 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni239D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni239D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni239D" format="1">
+<glyph name="uni239D" format="2">
   <advance width="1233"/>
   <unicode hex="239D"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="744" y="-492" type="line" name="hr00"/>
       <point x="539" y="-171"/>
       <point x="232" y="495"/>
-      <point x="232" y="1692" type="curve" name="dh01" smooth="yes"/>
+      <point x="232" y="1692" type="curve" smooth="yes" name="dh01"/>
       <point x="232" y="1926" type="line" name="av01"/>
       <point x="523" y="1926" type="line"/>
-      <point x="523" y="1692" type="line" name="dh02" smooth="yes"/>
+      <point x="523" y="1692" type="line" smooth="yes" name="dh02"/>
       <point x="523" y="555"/>
       <point x="724" y="64"/>
       <point x="1000" y="-492" type="curve" name="ab01"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni239E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni239E_.glif
index d0926320e..5fa6ffdba 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni239E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni239E_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni239E" format="1">
+<glyph name="uni239E" format="2">
   <advance width="1233"/>
   <unicode hex="239E"/>
   <outline>
     <contour>
-      <point x="710" y="-282" type="line" name="hr00" smooth="yes"/>
+      <point x="710" y="-282" type="line" smooth="yes" name="hr00"/>
       <point x="710" y="891"/>
       <point x="469" y="1422"/>
       <point x="233" y="1901" type="curve" name="av01"/>
       <point x="489" y="1901" type="line"/>
       <point x="710" y="1556"/>
       <point x="1001" y="894"/>
-      <point x="1001" y="-282" type="curve" name="dh01" smooth="yes"/>
+      <point x="1001" y="-282" type="curve" smooth="yes" name="dh01"/>
       <point x="1001" y="-516" type="line" name="av02"/>
       <point x="710" y="-516" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni239F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni239F_.glif
index f7a3bb46e..bb8147883 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni239F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni239F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni239F" format="1">
+<glyph name="uni239F" format="2">
   <advance width="1233"/>
   <unicode hex="239F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni23A_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni23A_0.glif
index 2b0835ea5..ab8411dc5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni23A_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni23A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A0" format="1">
+<glyph name="uni23A0" format="2">
   <advance width="1233"/>
   <unicode hex="23A0"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="233" y="-492" type="line" name="hr00"/>
       <point x="509" y="64"/>
       <point x="710" y="555"/>
-      <point x="710" y="1692" type="curve" name="dh01" smooth="yes"/>
+      <point x="710" y="1692" type="curve" smooth="yes" name="dh01"/>
       <point x="710" y="1926" type="line" name="av01"/>
       <point x="1001" y="1926" type="line"/>
-      <point x="1001" y="1692" type="line" name="dh02" smooth="yes"/>
+      <point x="1001" y="1692" type="line" smooth="yes" name="dh02"/>
       <point x="1001" y="495"/>
       <point x="694" y="-171"/>
       <point x="489" y="-492" type="curve" name="ab01"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni23A_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni23A_1.glif
index 6a6ffe766..954d19e20 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni23A_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni23A_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A1" format="1">
+<glyph name="uni23A1" format="2">
   <advance width="1233"/>
   <unicode hex="23A1"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni23A_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni23A_2.glif
index ab8a3e0ae..bb1dba39b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni23A_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni23A_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A2" format="1">
+<glyph name="uni23A2" format="2">
   <advance width="1233"/>
   <unicode hex="23A2"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni23A_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni23A_3.glif
index b43a83b8e..a14484b68 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni23A_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni23A_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A3" format="1">
+<glyph name="uni23A3" format="2">
   <advance width="1233"/>
   <unicode hex="23A3"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni23A_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni23A_4.glif
index fc8b65725..9aa68b3a3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni23A_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni23A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A4" format="1">
+<glyph name="uni23A4" format="2">
   <advance width="1233"/>
   <unicode hex="23A4"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni23A_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni23A_5.glif
index 8e6f254e6..47457c4fc 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni23A_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni23A_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A5" format="1">
+<glyph name="uni23A5" format="2">
   <advance width="1233"/>
   <unicode hex="23A5"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni23A_6.glif b/source/Hack-BoldItalic.ufo/glyphs/uni23A_6.glif
index 1f5e21495..646c3c9d8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni23A_6.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni23A_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A6" format="1">
+<glyph name="uni23A6" format="2">
   <advance width="1233"/>
   <unicode hex="23A6"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni23A_7.glif b/source/Hack-BoldItalic.ufo/glyphs/uni23A_7.glif
index fd9921050..a25a8824d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni23A_7.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni23A_7.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A7" format="1">
+<glyph name="uni23A7" format="2">
   <advance width="1233"/>
   <unicode hex="23A7"/>
   <outline>
     <contour>
-      <point x="476" y="1375" type="line" name="hr00" smooth="yes"/>
+      <point x="476" y="1375" type="line" smooth="yes" name="hr00"/>
       <point x="476" y="1703"/>
       <point x="647" y="1901"/>
       <point x="942" y="1901" type="curve" smooth="yes"/>
@@ -13,7 +13,7 @@
       <point x="936" y="1629" type="line" smooth="yes"/>
       <point x="800" y="1629"/>
       <point x="758" y="1599"/>
-      <point x="758" y="1383" type="curve" name="dh01" smooth="yes"/>
+      <point x="758" y="1383" type="curve" smooth="yes" name="dh01"/>
       <point x="758" y="-534" type="line" name="av01"/>
       <point x="476" y="-534" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni23A_8.glif b/source/Hack-BoldItalic.ufo/glyphs/uni23A_8.glif
index cf08a96e0..10e7d67e2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni23A_8.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni23A_8.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A8" format="1">
+<glyph name="uni23A8" format="2">
   <advance width="1233"/>
   <unicode hex="23A8"/>
   <outline>
     <contour>
-      <point x="476" y="181" type="line" name="hr00" smooth="yes"/>
+      <point x="476" y="181" type="line" smooth="yes" name="hr00"/>
       <point x="476" y="433"/>
       <point x="385" y="558"/>
-      <point x="78" y="563" type="curve" name="dv01" smooth="yes"/>
+      <point x="78" y="563" type="curve" smooth="yes" name="dv01"/>
       <point x="17" y="564" type="line"/>
       <point x="17" y="847" type="line"/>
-      <point x="78" y="847" type="line" name="dv02" smooth="yes"/>
+      <point x="78" y="847" type="line" smooth="yes" name="dv02"/>
       <point x="378" y="847"/>
       <point x="476" y="968"/>
-      <point x="476" y="1229" type="curve" name="sh01" smooth="yes"/>
+      <point x="476" y="1229" type="curve" smooth="yes" name="sh01"/>
       <point x="476" y="1913" type="line" name="av01"/>
       <point x="758" y="1913" type="line" name="sh02"/>
       <point x="758" y="1217" type="line" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="657" y="612" type="curve" smooth="yes"/>
       <point x="725" y="515"/>
       <point x="758" y="372"/>
-      <point x="758" y="193" type="curve" name="dh01" smooth="yes"/>
+      <point x="758" y="193" type="curve" smooth="yes" name="dh01"/>
       <point x="758" y="-505" type="line" name="ab01"/>
       <point x="476" y="-505" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni23A_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni23A_9.glif
index 74efaede4..bd9d5d074 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni23A_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni23A_9.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A9" format="1">
+<glyph name="uni23A9" format="2">
   <advance width="1233"/>
   <unicode hex="23A9"/>
   <outline>
     <contour>
-      <point x="942" y="-492" type="line" name="hr00" smooth="yes"/>
+      <point x="942" y="-492" type="line" smooth="yes" name="hr00"/>
       <point x="651" y="-492"/>
       <point x="476" y="-298"/>
-      <point x="476" y="34" type="curve" name="dh01" smooth="yes"/>
+      <point x="476" y="34" type="curve" smooth="yes" name="dh01"/>
       <point x="476" y="1913" type="line" name="av01"/>
       <point x="758" y="1913" type="line"/>
-      <point x="758" y="26" type="line" name="dh02" smooth="yes"/>
+      <point x="758" y="26" type="line" smooth="yes" name="dh02"/>
       <point x="758" y="-190"/>
       <point x="800" y="-220"/>
-      <point x="936" y="-220" type="curve" name="sv01" smooth="yes"/>
+      <point x="936" y="-220" type="curve" smooth="yes" name="sv01"/>
       <point x="1217" y="-220" type="line" name="sv02"/>
       <point x="1217" y="-492" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni23A_A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni23A_A_.glif
index 8d144ba5a..0453ee1ca 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni23A_A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni23A_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23AA" format="1">
+<glyph name="uni23AA" format="2">
   <advance width="1233"/>
   <unicode hex="23AA"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni23A_B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni23A_B_.glif
index d0898a1d6..758d1f0e7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni23A_B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni23A_B_.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23AB" format="1">
+<glyph name="uni23AB" format="2">
   <advance width="1233"/>
   <unicode hex="23AB"/>
   <outline>
     <contour>
-      <point x="475" y="1383" type="line" name="hr00" smooth="yes"/>
+      <point x="475" y="1383" type="line" smooth="yes" name="hr00"/>
       <point x="475" y="1599"/>
       <point x="433" y="1629"/>
-      <point x="297" y="1629" type="curve" name="dv01" smooth="yes"/>
+      <point x="297" y="1629" type="curve" smooth="yes" name="dv01"/>
       <point x="16" y="1629" type="line"/>
       <point x="16" y="1901" type="line"/>
-      <point x="291" y="1901" type="line" name="dv02" smooth="yes"/>
+      <point x="291" y="1901" type="line" smooth="yes" name="dv02"/>
       <point x="586" y="1901"/>
       <point x="757" y="1703"/>
-      <point x="757" y="1375" type="curve" name="dh01" smooth="yes"/>
+      <point x="757" y="1375" type="curve" smooth="yes" name="dh01"/>
       <point x="757" y="-534" type="line" name="av01"/>
       <point x="475" y="-534" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni23A_C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni23A_C_.glif
index c72f1c02d..92aff1758 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni23A_C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni23A_C_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23AC" format="1">
+<glyph name="uni23AC" format="2">
   <advance width="1233"/>
   <unicode hex="23AC"/>
   <outline>
     <contour>
-      <point x="475" y="193" type="line" name="hr00" smooth="yes"/>
+      <point x="475" y="193" type="line" smooth="yes" name="hr00"/>
       <point x="475" y="372"/>
       <point x="508" y="515"/>
       <point x="576" y="612" type="curve" smooth="yes"/>
@@ -16,19 +16,19 @@
       <point x="576" y="798" type="curve" smooth="yes"/>
       <point x="509" y="895"/>
       <point x="475" y="1038"/>
-      <point x="475" y="1217" type="curve" name="sh01" smooth="yes"/>
+      <point x="475" y="1217" type="curve" smooth="yes" name="sh01"/>
       <point x="475" y="1913" type="line" name="av01"/>
       <point x="757" y="1913" type="line" name="sh02"/>
       <point x="757" y="1229" type="line" smooth="yes"/>
       <point x="757" y="968"/>
       <point x="855" y="847"/>
-      <point x="1155" y="847" type="curve" name="dv02" smooth="yes"/>
+      <point x="1155" y="847" type="curve" smooth="yes" name="dv02"/>
       <point x="1216" y="847" type="line"/>
       <point x="1216" y="564" type="line"/>
-      <point x="1155" y="563" type="line" name="dv01" smooth="yes"/>
+      <point x="1155" y="563" type="line" smooth="yes" name="dv01"/>
       <point x="848" y="558"/>
       <point x="757" y="433"/>
-      <point x="757" y="181" type="curve" name="dh01" smooth="yes"/>
+      <point x="757" y="181" type="curve" smooth="yes" name="dh01"/>
       <point x="757" y="-505" type="line" name="ab01"/>
       <point x="475" y="-505" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni23A_D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni23A_D_.glif
index 922ff1fed..775c1ed70 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni23A_D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni23A_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23AD" format="1">
+<glyph name="uni23AD" format="2">
   <advance width="1233"/>
   <unicode hex="23AD"/>
   <outline>
@@ -8,13 +8,13 @@
       <point x="297" y="-220" type="line" smooth="yes"/>
       <point x="433" y="-220"/>
       <point x="475" y="-190"/>
-      <point x="475" y="26" type="curve" name="dh01" smooth="yes"/>
+      <point x="475" y="26" type="curve" smooth="yes" name="dh01"/>
       <point x="475" y="1913" type="line" name="av01"/>
       <point x="757" y="1913" type="line"/>
-      <point x="757" y="34" type="line" name="dh02" smooth="yes"/>
+      <point x="757" y="34" type="line" smooth="yes" name="dh02"/>
       <point x="757" y="-298"/>
       <point x="582" y="-492"/>
-      <point x="291" y="-492" type="curve" name="ab01" smooth="yes"/>
+      <point x="291" y="-492" type="curve" smooth="yes" name="ab01"/>
       <point x="16" y="-492" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni23A_E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni23A_E_.glif
index b8c3dc4c8..8704b9271 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni23A_E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni23A_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23AE" format="1">
+<glyph name="uni23AE" format="2">
   <advance width="1233"/>
   <unicode hex="23AE"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2500.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2500.glif
index 73488f5b9..4c3c724bd 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2500.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2500.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2500" format="1">
+<glyph name="uni2500" format="2">
   <advance width="1233"/>
   <unicode hex="2500"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2501.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2501.glif
index 407b806a5..b4b7c57cb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2501.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2501.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2501" format="1">
+<glyph name="uni2501" format="2">
   <advance width="1233"/>
   <unicode hex="2501"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2502.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2502.glif
index fa8872f18..13a2c6442 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2502.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2502.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2502" format="1">
+<glyph name="uni2502" format="2">
   <advance width="1233"/>
   <unicode hex="2502"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2503.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2503.glif
index 0e067d62b..1e6d150a4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2503.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2503.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2503" format="1">
+<glyph name="uni2503" format="2">
   <advance width="1233"/>
   <unicode hex="2503"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2504.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2504.glif
index d50a36d0e..5d4329be7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2504.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2504.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2504" format="1">
+<glyph name="uni2504" format="2">
   <advance width="1233"/>
   <unicode hex="2504"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2505.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2505.glif
index 5ba7c8463..754eec4a6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2505.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2505.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2505" format="1">
+<glyph name="uni2505" format="2">
   <advance width="1233"/>
   <unicode hex="2505"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2506.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2506.glif
index 5efa3b8d6..f78770484 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2506.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2506.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2506" format="1">
+<glyph name="uni2506" format="2">
   <advance width="1233"/>
   <unicode hex="2506"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2507.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2507.glif
index 5708e0d89..b4eba2c2b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2507.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2507.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2507" format="1">
+<glyph name="uni2507" format="2">
   <advance width="1233"/>
   <unicode hex="2507"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2508.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2508.glif
index 36048e87f..24c5f527c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2508.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2508.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2508" format="1">
+<glyph name="uni2508" format="2">
   <advance width="1233"/>
   <unicode hex="2508"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2509.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2509.glif
index 72288fcc1..5ba4882de 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2509.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2509.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2509" format="1">
+<glyph name="uni2509" format="2">
   <advance width="1233"/>
   <unicode hex="2509"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni250A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni250A_.glif
index 326419d4f..cc5657bf8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni250A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni250A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni250A" format="1">
+<glyph name="uni250A" format="2">
   <advance width="1233"/>
   <unicode hex="250A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni250B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni250B_.glif
index c3ee89732..62cafe2d5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni250B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni250B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni250B" format="1">
+<glyph name="uni250B" format="2">
   <advance width="1233"/>
   <unicode hex="250B"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni250C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni250C_.glif
index 3bb58457a..fc997d4f4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni250C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni250C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni250C" format="1">
+<glyph name="uni250C" format="2">
   <advance width="1233"/>
   <unicode hex="250C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni250D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni250D_.glif
index c13da916a..e34115b1f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni250D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni250D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni250D" format="1">
+<glyph name="uni250D" format="2">
   <advance width="1233"/>
   <unicode hex="250D"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni250E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni250E_.glif
index 4c1a00c1f..7696eb5f3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni250E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni250E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni250E" format="1">
+<glyph name="uni250E" format="2">
   <advance width="1233"/>
   <unicode hex="250E"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni250F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni250F_.glif
index de7ebbd8c..8ce72f96a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni250F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni250F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni250F" format="1">
+<glyph name="uni250F" format="2">
   <advance width="1233"/>
   <unicode hex="250F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2510.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2510.glif
index ca6ae96b8..b619a2b32 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2510.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2510.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2510" format="1">
+<glyph name="uni2510" format="2">
   <advance width="1233"/>
   <unicode hex="2510"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2511.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2511.glif
index 730313a7f..49566b695 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2511.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2511.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2511" format="1">
+<glyph name="uni2511" format="2">
   <advance width="1233"/>
   <unicode hex="2511"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2512.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2512.glif
index 6ac0b73da..57d91c592 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2512.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2512.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2512" format="1">
+<glyph name="uni2512" format="2">
   <advance width="1233"/>
   <unicode hex="2512"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2513.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2513.glif
index 07da56005..939e456bd 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2513.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2513.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2513" format="1">
+<glyph name="uni2513" format="2">
   <advance width="1233"/>
   <unicode hex="2513"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2514.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2514.glif
index 6ea01e67e..cd4e6db7a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2514.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2514.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2514" format="1">
+<glyph name="uni2514" format="2">
   <advance width="1233"/>
   <unicode hex="2514"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2515.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2515.glif
index d80bfefe6..8a437d13f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2515.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2515.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2515" format="1">
+<glyph name="uni2515" format="2">
   <advance width="1233"/>
   <unicode hex="2515"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2516.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2516.glif
index a1e7786d8..a4d2007fb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2516.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2516.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2516" format="1">
+<glyph name="uni2516" format="2">
   <advance width="1233"/>
   <unicode hex="2516"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2517.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2517.glif
index 80b5b9a16..e1218e29e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2517.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2517.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2517" format="1">
+<glyph name="uni2517" format="2">
   <advance width="1233"/>
   <unicode hex="2517"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2518.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2518.glif
index 017273e68..837c14e81 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2518.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2518.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2518" format="1">
+<glyph name="uni2518" format="2">
   <advance width="1233"/>
   <unicode hex="2518"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2519.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2519.glif
index 754033b48..16fd46687 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2519.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2519.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2519" format="1">
+<glyph name="uni2519" format="2">
   <advance width="1233"/>
   <unicode hex="2519"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni251A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni251A_.glif
index 0079f5dcb..29771eed8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni251A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni251A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni251A" format="1">
+<glyph name="uni251A" format="2">
   <advance width="1233"/>
   <unicode hex="251A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni251B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni251B_.glif
index 0975ba76c..4d876080f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni251B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni251B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni251B" format="1">
+<glyph name="uni251B" format="2">
   <advance width="1233"/>
   <unicode hex="251B"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni251C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni251C_.glif
index 317eef6ff..035384e8e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni251C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni251C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni251C" format="1">
+<glyph name="uni251C" format="2">
   <advance width="1233"/>
   <unicode hex="251C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni251D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni251D_.glif
index 7917d89b5..82133e678 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni251D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni251D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni251D" format="1">
+<glyph name="uni251D" format="2">
   <advance width="1233"/>
   <unicode hex="251D"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni251E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni251E_.glif
index ec76929ee..6f8e608a6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni251E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni251E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni251E" format="1">
+<glyph name="uni251E" format="2">
   <advance width="1233"/>
   <unicode hex="251E"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni251F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni251F_.glif
index 7951311b3..0ba4a983e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni251F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni251F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni251F" format="1">
+<glyph name="uni251F" format="2">
   <advance width="1233"/>
   <unicode hex="251F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2520.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2520.glif
index 48b8d811d..d7db40b19 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2520.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2520.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2520" format="1">
+<glyph name="uni2520" format="2">
   <advance width="1233"/>
   <unicode hex="2520"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2521.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2521.glif
index 9a9189030..99d8e5651 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2521.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2521.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2521" format="1">
+<glyph name="uni2521" format="2">
   <advance width="1233"/>
   <unicode hex="2521"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2522.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2522.glif
index beec610ae..e46fe28b7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2522.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2522.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2522" format="1">
+<glyph name="uni2522" format="2">
   <advance width="1233"/>
   <unicode hex="2522"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2523.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2523.glif
index 64dbc41bc..f4dacb474 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2523.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2523.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2523" format="1">
+<glyph name="uni2523" format="2">
   <advance width="1233"/>
   <unicode hex="2523"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2524.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2524.glif
index e25dd4855..7c1c49f3b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2524.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2524.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2524" format="1">
+<glyph name="uni2524" format="2">
   <advance width="1233"/>
   <unicode hex="2524"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2525.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2525.glif
index 3a2ba11c6..ebd9cd8f1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2525.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2525.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2525" format="1">
+<glyph name="uni2525" format="2">
   <advance width="1233"/>
   <unicode hex="2525"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2526.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2526.glif
index b23927ce0..fd5234524 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2526.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2526.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2526" format="1">
+<glyph name="uni2526" format="2">
   <advance width="1233"/>
   <unicode hex="2526"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2527.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2527.glif
index f08eebe71..f746e9af2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2527.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2527.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2527" format="1">
+<glyph name="uni2527" format="2">
   <advance width="1233"/>
   <unicode hex="2527"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2528.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2528.glif
index fc50e2952..dddc9bfb3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2528.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2528.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2528" format="1">
+<glyph name="uni2528" format="2">
   <advance width="1233"/>
   <unicode hex="2528"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2529.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2529.glif
index 4c4a6320d..36019c98c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2529.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2529.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2529" format="1">
+<glyph name="uni2529" format="2">
   <advance width="1233"/>
   <unicode hex="2529"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni252A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni252A_.glif
index de1e3f6ca..58ce526ba 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni252A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni252A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni252A" format="1">
+<glyph name="uni252A" format="2">
   <advance width="1233"/>
   <unicode hex="252A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni252B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni252B_.glif
index 9af4bb7e3..1bb97939d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni252B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni252B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni252B" format="1">
+<glyph name="uni252B" format="2">
   <advance width="1233"/>
   <unicode hex="252B"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni252C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni252C_.glif
index 71c9aebce..a5ceefa4a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni252C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni252C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni252C" format="1">
+<glyph name="uni252C" format="2">
   <advance width="1233"/>
   <unicode hex="252C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni252D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni252D_.glif
index 7870a65dc..3adb19018 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni252D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni252D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni252D" format="1">
+<glyph name="uni252D" format="2">
   <advance width="1233"/>
   <unicode hex="252D"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni252E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni252E_.glif
index 3a5c6d74d..1d2a8974d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni252E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni252E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni252E" format="1">
+<glyph name="uni252E" format="2">
   <advance width="1233"/>
   <unicode hex="252E"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni252F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni252F_.glif
index 3e6e9d1f0..b4b65ba37 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni252F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni252F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni252F" format="1">
+<glyph name="uni252F" format="2">
   <advance width="1233"/>
   <unicode hex="252F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2530.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2530.glif
index 50e93e19a..c37b0a903 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2530.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2530.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2530" format="1">
+<glyph name="uni2530" format="2">
   <advance width="1233"/>
   <unicode hex="2530"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2531.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2531.glif
index fe41525b6..ab1daaa5b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2531.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2531.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2531" format="1">
+<glyph name="uni2531" format="2">
   <advance width="1233"/>
   <unicode hex="2531"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2532.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2532.glif
index 2113c7f6e..d27193aee 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2532.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2532.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2532" format="1">
+<glyph name="uni2532" format="2">
   <advance width="1233"/>
   <unicode hex="2532"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2533.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2533.glif
index 7158447b9..b2340787d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2533.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2533.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2533" format="1">
+<glyph name="uni2533" format="2">
   <advance width="1233"/>
   <unicode hex="2533"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2534.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2534.glif
index fc64d96bd..44f1e90ec 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2534.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2534.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2534" format="1">
+<glyph name="uni2534" format="2">
   <advance width="1233"/>
   <unicode hex="2534"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2535.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2535.glif
index 86b705611..92b5d9fb4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2535.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2535.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2535" format="1">
+<glyph name="uni2535" format="2">
   <advance width="1233"/>
   <unicode hex="2535"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2536.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2536.glif
index 5ba854889..0bc16e000 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2536.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2536.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2536" format="1">
+<glyph name="uni2536" format="2">
   <advance width="1233"/>
   <unicode hex="2536"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2537.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2537.glif
index d06adad76..50634f1f0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2537.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2537.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2537" format="1">
+<glyph name="uni2537" format="2">
   <advance width="1233"/>
   <unicode hex="2537"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2538.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2538.glif
index 63679b811..3fbe88513 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2538.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2538.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2538" format="1">
+<glyph name="uni2538" format="2">
   <advance width="1233"/>
   <unicode hex="2538"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2539.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2539.glif
index 0aeb1ae5b..871292d9f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2539.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2539.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2539" format="1">
+<glyph name="uni2539" format="2">
   <advance width="1233"/>
   <unicode hex="2539"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni253A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni253A_.glif
index d1f9403e1..6f14e3242 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni253A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni253A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni253A" format="1">
+<glyph name="uni253A" format="2">
   <advance width="1233"/>
   <unicode hex="253A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni253B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni253B_.glif
index 6d1f8b5c9..14fe114d1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni253B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni253B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni253B" format="1">
+<glyph name="uni253B" format="2">
   <advance width="1233"/>
   <unicode hex="253B"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni253C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni253C_.glif
index 581841704..74676cf9e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni253C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni253C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni253C" format="1">
+<glyph name="uni253C" format="2">
   <advance width="1233"/>
   <unicode hex="253C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni253D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni253D_.glif
index f5841e09a..c4b47a679 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni253D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni253D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni253D" format="1">
+<glyph name="uni253D" format="2">
   <advance width="1233"/>
   <unicode hex="253D"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni253E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni253E_.glif
index 7ba89e7b1..5b551a63a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni253E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni253E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni253E" format="1">
+<glyph name="uni253E" format="2">
   <advance width="1233"/>
   <unicode hex="253E"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni253F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni253F_.glif
index 1fcc62cbd..fefe01919 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni253F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni253F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni253F" format="1">
+<glyph name="uni253F" format="2">
   <advance width="1233"/>
   <unicode hex="253F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2540.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2540.glif
index 8734d3ccf..2ad2367f8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2540.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2540.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2540" format="1">
+<glyph name="uni2540" format="2">
   <advance width="1233"/>
   <unicode hex="2540"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2541.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2541.glif
index 9bef0eee8..874c8ee08 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2541.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2541.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2541" format="1">
+<glyph name="uni2541" format="2">
   <advance width="1233"/>
   <unicode hex="2541"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2542.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2542.glif
index ad562119e..99e2e676f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2542.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2542.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2542" format="1">
+<glyph name="uni2542" format="2">
   <advance width="1233"/>
   <unicode hex="2542"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2543.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2543.glif
index 5166af2b6..0a2c4cf84 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2543.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2543.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2543" format="1">
+<glyph name="uni2543" format="2">
   <advance width="1233"/>
   <unicode hex="2543"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2544.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2544.glif
index 48e31de5c..58ec46752 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2544.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2544.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2544" format="1">
+<glyph name="uni2544" format="2">
   <advance width="1233"/>
   <unicode hex="2544"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2545.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2545.glif
index b9f2378bd..b005e36e2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2545.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2545.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2545" format="1">
+<glyph name="uni2545" format="2">
   <advance width="1233"/>
   <unicode hex="2545"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2546.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2546.glif
index cdaaf29e8..6e0d525bd 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2546.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2546.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2546" format="1">
+<glyph name="uni2546" format="2">
   <advance width="1233"/>
   <unicode hex="2546"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2547.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2547.glif
index fbbbae3de..9dc7aeab4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2547.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2547.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2547" format="1">
+<glyph name="uni2547" format="2">
   <advance width="1233"/>
   <unicode hex="2547"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2548.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2548.glif
index 3c3e28a92..c34823556 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2548.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2548.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2548" format="1">
+<glyph name="uni2548" format="2">
   <advance width="1233"/>
   <unicode hex="2548"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2549.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2549.glif
index b3d0471df..5d6be817d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2549.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2549.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2549" format="1">
+<glyph name="uni2549" format="2">
   <advance width="1233"/>
   <unicode hex="2549"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni254A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni254A_.glif
index f2328d0bc..01a40ee11 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni254A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni254A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni254A" format="1">
+<glyph name="uni254A" format="2">
   <advance width="1233"/>
   <unicode hex="254A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni254B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni254B_.glif
index 89e3ecc7c..86d15e211 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni254B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni254B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni254B" format="1">
+<glyph name="uni254B" format="2">
   <advance width="1233"/>
   <unicode hex="254B"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni254C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni254C_.glif
index bf16884c5..0d7049383 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni254C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni254C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni254C" format="1">
+<glyph name="uni254C" format="2">
   <advance width="1233"/>
   <unicode hex="254C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni254D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni254D_.glif
index 79d4abc50..2f595fd35 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni254D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni254D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni254D" format="1">
+<glyph name="uni254D" format="2">
   <advance width="1233"/>
   <unicode hex="254D"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni254E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni254E_.glif
index 170dcfdd4..7fe74afe7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni254E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni254E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni254E" format="1">
+<glyph name="uni254E" format="2">
   <advance width="1233"/>
   <unicode hex="254E"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni254F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni254F_.glif
index 7a00fdbf5..598352872 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni254F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni254F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni254F" format="1">
+<glyph name="uni254F" format="2">
   <advance width="1233"/>
   <unicode hex="254F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2550.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2550.glif
index b47e7f6cf..3a3127b08 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2550.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2550.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2550" format="1">
+<glyph name="uni2550" format="2">
   <advance width="1233"/>
   <unicode hex="2550"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2551.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2551.glif
index 261f33ce0..b86f5797d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2551.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2551.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2551" format="1">
+<glyph name="uni2551" format="2">
   <advance width="1233"/>
   <unicode hex="2551"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2552.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2552.glif
index 5e8a62bfd..5cf675e17 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2552.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2552.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2552" format="1">
+<glyph name="uni2552" format="2">
   <advance width="1233"/>
   <unicode hex="2552"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2553.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2553.glif
index 03e805d83..b79ca303d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2553.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2553.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2553" format="1">
+<glyph name="uni2553" format="2">
   <advance width="1233"/>
   <unicode hex="2553"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2554.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2554.glif
index 97badf786..2dd8ae161 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2554.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2554.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2554" format="1">
+<glyph name="uni2554" format="2">
   <advance width="1233"/>
   <unicode hex="2554"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2555.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2555.glif
index 94103017c..68866dfb1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2555.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2555.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2555" format="1">
+<glyph name="uni2555" format="2">
   <advance width="1233"/>
   <unicode hex="2555"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2556.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2556.glif
index b3208e323..cdab621c7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2556.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2556.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2556" format="1">
+<glyph name="uni2556" format="2">
   <advance width="1233"/>
   <unicode hex="2556"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2557.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2557.glif
index bb82a4b47..e2af7ab8d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2557.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2557.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2557" format="1">
+<glyph name="uni2557" format="2">
   <advance width="1233"/>
   <unicode hex="2557"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2558.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2558.glif
index 396f9de67..4e262549a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2558.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2558.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2558" format="1">
+<glyph name="uni2558" format="2">
   <advance width="1233"/>
   <unicode hex="2558"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2559.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2559.glif
index ba1eeeb4e..c122a93c1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2559.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2559.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2559" format="1">
+<glyph name="uni2559" format="2">
   <advance width="1233"/>
   <unicode hex="2559"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni255A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni255A_.glif
index 1136c2a8e..f017411f2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni255A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni255A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni255A" format="1">
+<glyph name="uni255A" format="2">
   <advance width="1233"/>
   <unicode hex="255A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni255B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni255B_.glif
index 904566700..0d441cda2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni255B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni255B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni255B" format="1">
+<glyph name="uni255B" format="2">
   <advance width="1233"/>
   <unicode hex="255B"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni255C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni255C_.glif
index fc8692c05..8419d131f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni255C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni255C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni255C" format="1">
+<glyph name="uni255C" format="2">
   <advance width="1233"/>
   <unicode hex="255C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni255D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni255D_.glif
index d1873f016..b093d68da 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni255D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni255D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni255D" format="1">
+<glyph name="uni255D" format="2">
   <advance width="1233"/>
   <unicode hex="255D"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni255E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni255E_.glif
index 18076afa2..b1469a4aa 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni255E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni255E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni255E" format="1">
+<glyph name="uni255E" format="2">
   <advance width="1233"/>
   <unicode hex="255E"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni255F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni255F_.glif
index 40de34e6f..a1b53b07d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni255F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni255F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni255F" format="1">
+<glyph name="uni255F" format="2">
   <advance width="1233"/>
   <unicode hex="255F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2560.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2560.glif
index 256d00fbc..e06097e96 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2560.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2560.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2560" format="1">
+<glyph name="uni2560" format="2">
   <advance width="1233"/>
   <unicode hex="2560"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2561.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2561.glif
index 217236652..9da45f067 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2561.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2561.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2561" format="1">
+<glyph name="uni2561" format="2">
   <advance width="1233"/>
   <unicode hex="2561"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2562.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2562.glif
index 852242a73..be486e9ba 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2562.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2562.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2562" format="1">
+<glyph name="uni2562" format="2">
   <advance width="1233"/>
   <unicode hex="2562"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2563.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2563.glif
index 3135ce979..2f5b42d98 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2563.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2563.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2563" format="1">
+<glyph name="uni2563" format="2">
   <advance width="1233"/>
   <unicode hex="2563"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2564.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2564.glif
index f38dc6867..b3e049b39 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2564.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2564.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2564" format="1">
+<glyph name="uni2564" format="2">
   <advance width="1233"/>
   <unicode hex="2564"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2565.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2565.glif
index 32918026a..d73b072df 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2565.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2565.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2565" format="1">
+<glyph name="uni2565" format="2">
   <advance width="1233"/>
   <unicode hex="2565"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2566.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2566.glif
index 56e6dd721..a94f7d09c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2566.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2566.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2566" format="1">
+<glyph name="uni2566" format="2">
   <advance width="1233"/>
   <unicode hex="2566"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2567.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2567.glif
index 68b908f96..223af2028 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2567.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2567.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2567" format="1">
+<glyph name="uni2567" format="2">
   <advance width="1233"/>
   <unicode hex="2567"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2568.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2568.glif
index f549fa3bb..d38e8939e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2568.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2568.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2568" format="1">
+<glyph name="uni2568" format="2">
   <advance width="1233"/>
   <unicode hex="2568"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2569.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2569.glif
index 1a12528ef..b4e716f26 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2569.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2569.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2569" format="1">
+<glyph name="uni2569" format="2">
   <advance width="1233"/>
   <unicode hex="2569"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni256A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni256A_.glif
index 04e260d1f..2ef579caa 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni256A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni256A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni256A" format="1">
+<glyph name="uni256A" format="2">
   <advance width="1233"/>
   <unicode hex="256A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni256B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni256B_.glif
index 7333d3239..6d45122c3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni256B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni256B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni256B" format="1">
+<glyph name="uni256B" format="2">
   <advance width="1233"/>
   <unicode hex="256B"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni256C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni256C_.glif
index cd88ad20e..496a383b9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni256C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni256C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni256C" format="1">
+<glyph name="uni256C" format="2">
   <advance width="1233"/>
   <unicode hex="256C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni256D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni256D_.glif
index 8760acadf..d93b489d4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni256D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni256D_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni256D" format="1">
+<glyph name="uni256D" format="2">
   <advance width="1233"/>
   <unicode hex="256D"/>
   <outline>
     <contour>
-      <point x="536" y="368" type="line" name="hr00" smooth="yes"/>
+      <point x="536" y="368" type="line" smooth="yes" name="hr00"/>
       <point x="536" y="588"/>
       <point x="648" y="790"/>
       <point x="876" y="790" type="curve" smooth="yes"/>
@@ -13,7 +13,7 @@
       <point x="876" y="618" type="line" smooth="yes"/>
       <point x="756" y="618"/>
       <point x="696" y="535"/>
-      <point x="696" y="368" type="curve" name="dh01" smooth="yes"/>
+      <point x="696" y="368" type="curve" smooth="yes" name="dh01"/>
       <point x="696" y="-530" type="line" name="av01"/>
       <point x="536" y="-530" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni256E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni256E_.glif
index 8e445e2ab..e58b7c33a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni256E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni256E_.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni256E" format="1">
+<glyph name="uni256E" format="2">
   <advance width="1233"/>
   <unicode hex="256E"/>
   <outline>
     <contour>
-      <point x="536" y="368" type="line" name="hr00" smooth="yes"/>
+      <point x="536" y="368" type="line" smooth="yes" name="hr00"/>
       <point x="536" y="535"/>
       <point x="476" y="618"/>
-      <point x="356" y="618" type="curve" name="dv01" smooth="yes"/>
+      <point x="356" y="618" type="curve" smooth="yes" name="dv01"/>
       <point x="-20" y="618" type="line"/>
       <point x="-20" y="790" type="line"/>
-      <point x="356" y="790" type="line" name="dv02" smooth="yes"/>
+      <point x="356" y="790" type="line" smooth="yes" name="dv02"/>
       <point x="580" y="790"/>
       <point x="696" y="592"/>
-      <point x="696" y="368" type="curve" name="dh01" smooth="yes"/>
+      <point x="696" y="368" type="curve" smooth="yes" name="dh01"/>
       <point x="696" y="-530" type="line" name="av01"/>
       <point x="536" y="-530" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni256F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni256F_.glif
index 5351c8523..e21cf5a0a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni256F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni256F_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni256F" format="1">
+<glyph name="uni256F" format="2">
   <advance width="1233"/>
   <unicode hex="256F"/>
   <outline>
     <contour>
       <point x="-20" y="790" type="line" name="hr00"/>
-      <point x="356" y="790" type="line" name="dv02" smooth="yes"/>
+      <point x="356" y="790" type="line" smooth="yes" name="dv02"/>
       <point x="476" y="790"/>
       <point x="536" y="873"/>
-      <point x="536" y="1040" type="curve" name="dh01" smooth="yes"/>
+      <point x="536" y="1040" type="curve" smooth="yes" name="dh01"/>
       <point x="536" y="1950" type="line" name="av01"/>
       <point x="696" y="1950" type="line"/>
-      <point x="696" y="1040" type="line" name="dh02" smooth="yes"/>
+      <point x="696" y="1040" type="line" smooth="yes" name="dh02"/>
       <point x="696" y="816"/>
       <point x="580" y="618"/>
-      <point x="356" y="618" type="curve" name="dv01" smooth="yes"/>
+      <point x="356" y="618" type="curve" smooth="yes" name="dv01"/>
       <point x="-20" y="618" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2570.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2570.glif
index 4aa6427df..cd040d380 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2570.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2570.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2570" format="1">
+<glyph name="uni2570" format="2">
   <advance width="1233"/>
   <unicode hex="2570"/>
   <outline>
     <contour>
-      <point x="876" y="618" type="line" name="hr00" smooth="yes"/>
+      <point x="876" y="618" type="line" smooth="yes" name="hr00"/>
       <point x="652" y="618"/>
       <point x="536" y="816"/>
-      <point x="536" y="1040" type="curve" name="dh01" smooth="yes"/>
+      <point x="536" y="1040" type="curve" smooth="yes" name="dh01"/>
       <point x="536" y="1950" type="line" name="av01"/>
       <point x="696" y="1950" type="line"/>
-      <point x="696" y="1040" type="line" name="dh02" smooth="yes"/>
+      <point x="696" y="1040" type="line" smooth="yes" name="dh02"/>
       <point x="696" y="873"/>
       <point x="756" y="790"/>
-      <point x="876" y="790" type="curve" name="dv01" smooth="yes"/>
+      <point x="876" y="790" type="curve" smooth="yes" name="dv01"/>
       <point x="1253" y="790" type="line"/>
       <point x="1253" y="618" type="line" name="sv01"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2571.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2571.glif
index 44ff55c93..eef474427 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2571.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2571.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2571" format="1">
+<glyph name="uni2571" format="2">
   <advance width="1233"/>
   <unicode hex="2571"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2572.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2572.glif
index ca5e423c0..498ab0ee7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2572.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2572.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2572" format="1">
+<glyph name="uni2572" format="2">
   <advance width="1233"/>
   <unicode hex="2572"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2573.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2573.glif
index 159f35381..8fbf5b682 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2573.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2573.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2573" format="1">
+<glyph name="uni2573" format="2">
   <advance width="1233"/>
   <unicode hex="2573"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2574.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2574.glif
index e7c84c71f..0e09ba91f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2574.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2574.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2574" format="1">
+<glyph name="uni2574" format="2">
   <advance width="1233"/>
   <unicode hex="2574"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2575.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2575.glif
index 96e280131..ec944d0a4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2575.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2575.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2575" format="1">
+<glyph name="uni2575" format="2">
   <advance width="1233"/>
   <unicode hex="2575"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2576.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2576.glif
index 1b39e2a22..11ed02cb6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2576.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2576.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2576" format="1">
+<glyph name="uni2576" format="2">
   <advance width="1233"/>
   <unicode hex="2576"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2577.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2577.glif
index aa48e51a7..53060389c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2577.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2577.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2577" format="1">
+<glyph name="uni2577" format="2">
   <advance width="1233"/>
   <unicode hex="2577"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2578.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2578.glif
index 00736562c..0945fca2e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2578.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2578.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2578" format="1">
+<glyph name="uni2578" format="2">
   <advance width="1233"/>
   <unicode hex="2578"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2579.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2579.glif
index 8c11f2f6e..128bd20e7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2579.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2579.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2579" format="1">
+<glyph name="uni2579" format="2">
   <advance width="1233"/>
   <unicode hex="2579"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni257A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni257A_.glif
index b3693128a..a0d9bff9c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni257A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni257A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni257A" format="1">
+<glyph name="uni257A" format="2">
   <advance width="1233"/>
   <unicode hex="257A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni257B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni257B_.glif
index 2393151f1..5912156b3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni257B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni257B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni257B" format="1">
+<glyph name="uni257B" format="2">
   <advance width="1233"/>
   <unicode hex="257B"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni257C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni257C_.glif
index 283219c78..b38ca326b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni257C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni257C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni257C" format="1">
+<glyph name="uni257C" format="2">
   <advance width="1233"/>
   <unicode hex="257C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni257D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni257D_.glif
index 194dbdb46..3f8e9ceeb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni257D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni257D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni257D" format="1">
+<glyph name="uni257D" format="2">
   <advance width="1233"/>
   <unicode hex="257D"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni257E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni257E_.glif
index 2aff928e0..7115d7f36 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni257E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni257E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni257E" format="1">
+<glyph name="uni257E" format="2">
   <advance width="1233"/>
   <unicode hex="257E"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni257F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni257F_.glif
index d48717c62..4d3d7d4d6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni257F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni257F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni257F" format="1">
+<glyph name="uni257F" format="2">
   <advance width="1233"/>
   <unicode hex="257F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2581.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2581.glif
index 8405625ca..079423173 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2581.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2581.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2581" format="1">
+<glyph name="uni2581" format="2">
   <advance width="1233"/>
   <unicode hex="2581"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2582.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2582.glif
index 7f765cf2a..f63f6933a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2582.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2582.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2582" format="1">
+<glyph name="uni2582" format="2">
   <advance width="1233"/>
   <unicode hex="2582"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2583.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2583.glif
index 6fbe0d6eb..120b07d2c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2583.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2583.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2583" format="1">
+<glyph name="uni2583" format="2">
   <advance width="1233"/>
   <unicode hex="2583"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2585.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2585.glif
index ed0ee82ae..bb0e93e9a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2585.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2585.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2585" format="1">
+<glyph name="uni2585" format="2">
   <advance width="1233"/>
   <unicode hex="2585"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2586.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2586.glif
index 5a8fa5b09..d263128b3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2586.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2586.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2586" format="1">
+<glyph name="uni2586" format="2">
   <advance width="1233"/>
   <unicode hex="2586"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2587.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2587.glif
index e8035ccb0..56c99eafd 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2587.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2587.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2587" format="1">
+<glyph name="uni2587" format="2">
   <advance width="1233"/>
   <unicode hex="2587"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2589.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2589.glif
index 786359c88..8f262f1f7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2589.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2589.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2589" format="1">
+<glyph name="uni2589" format="2">
   <advance width="1233"/>
   <unicode hex="2589"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni258A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni258A_.glif
index 0d4a83b45..93a17e9c0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni258A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni258A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni258A" format="1">
+<glyph name="uni258A" format="2">
   <advance width="1233"/>
   <unicode hex="258A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni258B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni258B_.glif
index be5747641..5bae0499b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni258B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni258B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni258B" format="1">
+<glyph name="uni258B" format="2">
   <advance width="1233"/>
   <unicode hex="258B"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni258D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni258D_.glif
index dbf54fe4e..869644627 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni258D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni258D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni258D" format="1">
+<glyph name="uni258D" format="2">
   <advance width="1233"/>
   <unicode hex="258D"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni258E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni258E_.glif
index b5dd2b7f4..1845ea7c8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni258E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni258E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni258E" format="1">
+<glyph name="uni258E" format="2">
   <advance width="1233"/>
   <unicode hex="258E"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni258F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni258F_.glif
index d02cd90c7..73576f872 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni258F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni258F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni258F" format="1">
+<glyph name="uni258F" format="2">
   <advance width="1233"/>
   <unicode hex="258F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2594.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2594.glif
index f2265c59a..ffe1c0bc6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2594.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2594.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2594" format="1">
+<glyph name="uni2594" format="2">
   <advance width="1233"/>
   <unicode hex="2594"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2595.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2595.glif
index b10165576..e6e015d6a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2595.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2595.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2595" format="1">
+<glyph name="uni2595" format="2">
   <advance width="1233"/>
   <unicode hex="2595"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2596.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2596.glif
index 1f57b343a..b6179a5f7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2596.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2596.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2596" format="1">
+<glyph name="uni2596" format="2">
   <advance width="1233"/>
   <unicode hex="2596"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2597.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2597.glif
index d427aa9da..2c11348a4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2597.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2597.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2597" format="1">
+<glyph name="uni2597" format="2">
   <advance width="1233"/>
   <unicode hex="2597"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2598.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2598.glif
index 819a90323..b00f88201 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2598.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2598.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2598" format="1">
+<glyph name="uni2598" format="2">
   <advance width="1233"/>
   <unicode hex="2598"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2599.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2599.glif
index f90045b44..b5ba9b42e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2599.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2599.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2599" format="1">
+<glyph name="uni2599" format="2">
   <advance width="1233"/>
   <unicode hex="2599"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni259A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni259A_.glif
index 633681312..1a4e2ca22 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni259A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni259A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni259A" format="1">
+<glyph name="uni259A" format="2">
   <advance width="1233"/>
   <unicode hex="259A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni259B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni259B_.glif
index 5baba3b40..e59de2ffa 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni259B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni259B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni259B" format="1">
+<glyph name="uni259B" format="2">
   <advance width="1233"/>
   <unicode hex="259B"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni259C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni259C_.glif
index 7f2559138..2fd4f9fd3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni259C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni259C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni259C" format="1">
+<glyph name="uni259C" format="2">
   <advance width="1233"/>
   <unicode hex="259C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni259D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni259D_.glif
index 0fdf62a17..093f5d2c9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni259D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni259D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni259D" format="1">
+<glyph name="uni259D" format="2">
   <advance width="1233"/>
   <unicode hex="259D"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni259E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni259E_.glif
index 95413af23..927d3fd52 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni259E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni259E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni259E" format="1">
+<glyph name="uni259E" format="2">
   <advance width="1233"/>
   <unicode hex="259E"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni259F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni259F_.glif
index 051cb47ed..022450334 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni259F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni259F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni259F" format="1">
+<glyph name="uni259F" format="2">
   <advance width="1233"/>
   <unicode hex="259F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25A_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25A_1.glif
index c26194bf7..6315b4736 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25A_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25A_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A1" format="1">
+<glyph name="uni25A1" format="2">
   <advance width="1233"/>
   <unicode hex="25A1"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25A_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25A_2.glif
index f2127405e..858066667 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25A_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25A_2.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A2" format="1">
+<glyph name="uni25A2" format="2">
   <advance width="1233"/>
   <unicode hex="25A2"/>
   <outline>
     <contour>
-      <point x="348" y="-78" type="line" name="hr00" smooth="yes"/>
+      <point x="348" y="-78" type="line" smooth="yes" name="hr00"/>
       <point x="120" y="-78"/>
       <point x="6" y="36"/>
-      <point x="6" y="264" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="264" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="800" type="line" smooth="yes"/>
       <point x="6" y="1028"/>
       <point x="120" y="1142"/>
-      <point x="348" y="1142" type="curve" name="at01" smooth="yes"/>
+      <point x="348" y="1142" type="curve" smooth="yes" name="at01"/>
       <point x="885" y="1142" type="line" smooth="yes"/>
       <point x="1113" y="1142"/>
       <point x="1227" y="1028"/>
       <point x="1227" y="800" type="curve" smooth="yes"/>
-      <point x="1227" y="264" type="line" name="sh02" smooth="yes"/>
+      <point x="1227" y="264" type="line" smooth="yes" name="sh02"/>
       <point x="1227" y="36"/>
       <point x="1113" y="-78"/>
       <point x="885" y="-78" type="curve" smooth="yes"/>
@@ -25,19 +25,19 @@
       <point x="885" y="36" type="line" smooth="yes"/>
       <point x="1037" y="36"/>
       <point x="1113" y="112"/>
-      <point x="1113" y="264" type="curve" name="ah01" smooth="yes"/>
+      <point x="1113" y="264" type="curve" smooth="yes" name="ah01"/>
       <point x="1113" y="800" type="line" smooth="yes"/>
       <point x="1113" y="952"/>
       <point x="1037" y="1028"/>
-      <point x="885" y="1028" type="curve" name="sv01" smooth="yes"/>
+      <point x="885" y="1028" type="curve" smooth="yes" name="sv01"/>
       <point x="348" y="1028" type="line" smooth="yes"/>
       <point x="196" y="1028"/>
       <point x="120" y="952"/>
       <point x="120" y="800" type="curve" smooth="yes"/>
-      <point x="120" y="264" type="line" name="sh03" smooth="yes"/>
+      <point x="120" y="264" type="line" smooth="yes" name="sh03"/>
       <point x="120" y="112"/>
       <point x="196" y="36"/>
-      <point x="348" y="36" type="curve" name="dv01" smooth="yes"/>
+      <point x="348" y="36" type="curve" smooth="yes" name="dv01"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25A_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25A_3.glif
index 36c94bbfe..c042b6bc1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25A_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25A_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A3" format="1">
+<glyph name="uni25A3" format="2">
   <advance width="1233"/>
   <unicode hex="25A3"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25A_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25A_4.glif
index 5e3714ff2..21fdb7759 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25A_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A4" format="1">
+<glyph name="uni25A4" format="2">
   <advance width="1233"/>
   <unicode hex="25A4"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25A_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25A_5.glif
index 0fbe65d2c..812b2bcc5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25A_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25A_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A5" format="1">
+<glyph name="uni25A5" format="2">
   <advance width="1233"/>
   <unicode hex="25A5"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25A_6.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25A_6.glif
index c26e2bbc0..6144835f6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25A_6.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25A_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A6" format="1">
+<glyph name="uni25A6" format="2">
   <advance width="1233"/>
   <unicode hex="25A6"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25A_7.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25A_7.glif
index ab64b0c85..e6dce2a0d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25A_7.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25A_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A7" format="1">
+<glyph name="uni25A7" format="2">
   <advance width="1233"/>
   <unicode hex="25A7"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25A_8.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25A_8.glif
index 401d22e1b..5e76c45f1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25A_8.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25A_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A8" format="1">
+<glyph name="uni25A8" format="2">
   <advance width="1233"/>
   <unicode hex="25A8"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25A_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25A_9.glif
index 61797e14b..4ed18f324 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25A_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25A_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A9" format="1">
+<glyph name="uni25A9" format="2">
   <advance width="1233"/>
   <unicode hex="25A9"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25A_A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25A_A_.glif
index 959453953..16104d2c6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25A_A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25A_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25AA" format="1">
+<glyph name="uni25AA" format="2">
   <advance width="1233"/>
   <unicode hex="25AA"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25A_B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25A_B_.glif
index 0b3cb50c9..638b2ab31 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25A_B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25A_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25AB" format="1">
+<glyph name="uni25AB" format="2">
   <advance width="1233"/>
   <unicode hex="25AB"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25A_D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25A_D_.glif
index b22543c04..2eb4c8ecb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25A_D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25A_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25AD" format="1">
+<glyph name="uni25AD" format="2">
   <advance width="1233"/>
   <unicode hex="25AD"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25A_E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25A_E_.glif
index 813bd9b32..24040b324 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25A_E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25A_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25AE" format="1">
+<glyph name="uni25AE" format="2">
   <advance width="1233"/>
   <unicode hex="25AE"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25A_F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25A_F_.glif
index 7c8ab6805..fb0cb65b0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25A_F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25A_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25AF" format="1">
+<glyph name="uni25AF" format="2">
   <advance width="1233"/>
   <unicode hex="25AF"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25B_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25B_0.glif
index 32067171c..36e07ee33 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25B_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25B_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B0" format="1">
+<glyph name="uni25B0" format="2">
   <advance width="1233"/>
   <unicode hex="25B0"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25B_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25B_1.glif
index accea48ba..880415fd6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25B_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25B_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B1" format="1">
+<glyph name="uni25B1" format="2">
   <advance width="1233"/>
   <unicode hex="25B1"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25B_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25B_3.glif
index fd52a7831..8eeebcbe8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25B_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B3" format="1">
+<glyph name="uni25B3" format="2">
   <advance width="1233"/>
   <unicode hex="25B3"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25B_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25B_4.glif
index 2f4c8ad2d..a7300a0c1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25B_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25B_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B4" format="1">
+<glyph name="uni25B4" format="2">
   <advance width="1233"/>
   <unicode hex="25B4"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25B_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25B_5.glif
index 3da52a099..3d8d86a09 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25B_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25B_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B5" format="1">
+<glyph name="uni25B5" format="2">
   <advance width="1233"/>
   <unicode hex="25B5"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25B_6.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25B_6.glif
index b24ca8021..a353e767f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25B_6.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25B_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B6" format="1">
+<glyph name="uni25B6" format="2">
   <advance width="1233"/>
   <unicode hex="25B6"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25B_7.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25B_7.glif
index 0e05e4231..efa8ffeea 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25B_7.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25B_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B7" format="1">
+<glyph name="uni25B7" format="2">
   <advance width="1233"/>
   <unicode hex="25B7"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25B_8.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25B_8.glif
index 283363ed9..d95e6bf41 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25B_8.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25B_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B8" format="1">
+<glyph name="uni25B8" format="2">
   <advance width="1233"/>
   <unicode hex="25B8"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25B_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25B_9.glif
index 6ee625376..385aca318 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25B_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25B_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B9" format="1">
+<glyph name="uni25B9" format="2">
   <advance width="1233"/>
   <unicode hex="25B9"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25B_B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25B_B_.glif
index 129f3d1dc..140725d5b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25B_B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25B_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25BB" format="1">
+<glyph name="uni25BB" format="2">
   <advance width="1233"/>
   <unicode hex="25BB"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25B_D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25B_D_.glif
index c31e03aff..dac5c1954 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25B_D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25B_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25BD" format="1">
+<glyph name="uni25BD" format="2">
   <advance width="1233"/>
   <unicode hex="25BD"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25B_E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25B_E_.glif
index ab81e1a04..c8b768042 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25B_E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25B_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25BE" format="1">
+<glyph name="uni25BE" format="2">
   <advance width="1233"/>
   <unicode hex="25BE"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25B_F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25B_F_.glif
index ad009b48a..79b3c7447 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25B_F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25B_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25BF" format="1">
+<glyph name="uni25BF" format="2">
   <advance width="1233"/>
   <unicode hex="25BF"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25C_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25C_0.glif
index fc2633cbd..f87fcba59 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25C_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25C_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C0" format="1">
+<glyph name="uni25C0" format="2">
   <advance width="1233"/>
   <unicode hex="25C0"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25C_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25C_1.glif
index 219fd6c09..fa5e5e82b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25C_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25C_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C1" format="1">
+<glyph name="uni25C1" format="2">
   <advance width="1233"/>
   <unicode hex="25C1"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25C_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25C_2.glif
index 93b5430fb..92d86f80b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25C_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25C_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C2" format="1">
+<glyph name="uni25C2" format="2">
   <advance width="1233"/>
   <unicode hex="25C2"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25C_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25C_3.glif
index 426dc11ea..ebc3ff8c4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25C_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25C_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C3" format="1">
+<glyph name="uni25C3" format="2">
   <advance width="1233"/>
   <unicode hex="25C3"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25C_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25C_5.glif
index 8f0472fdc..097675f8b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25C_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25C_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C5" format="1">
+<glyph name="uni25C5" format="2">
   <advance width="1233"/>
   <unicode hex="25C5"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25C_6.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25C_6.glif
index bbd364d75..0cc721da9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25C_6.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25C_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C6" format="1">
+<glyph name="uni25C6" format="2">
   <advance width="1233"/>
   <unicode hex="25C6"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25C_7.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25C_7.glif
index a8339f14f..fabe1cfa1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25C_7.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25C_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C7" format="1">
+<glyph name="uni25C7" format="2">
   <advance width="1233"/>
   <unicode hex="25C7"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25C_8.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25C_8.glif
index c7309c626..f5ee8c31b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25C_8.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25C_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C8" format="1">
+<glyph name="uni25C8" format="2">
   <advance width="1233"/>
   <unicode hex="25C8"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25C_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25C_9.glif
index 8fa8f4de4..d332acdad 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25C_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25C_9.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C9" format="1">
+<glyph name="uni25C9" format="2">
   <advance width="1233"/>
   <unicode hex="25C9"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv03"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="616" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="692" y="39"/>
       <point x="778" y="62"/>
       <point x="861" y="109" type="curve" smooth="yes"/>
       <point x="1021" y="200"/>
       <point x="1105" y="349"/>
-      <point x="1105" y="532" type="curve" name="ah01" smooth="yes"/>
+      <point x="1105" y="532" type="curve" smooth="yes" name="ah01"/>
       <point x="1105" y="715"/>
       <point x="1021" y="864"/>
       <point x="861" y="955" type="curve" smooth="yes"/>
       <point x="778" y="1002"/>
       <point x="692" y="1025"/>
-      <point x="616" y="1025" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1025" type="curve" smooth="yes" name="dv02"/>
       <point x="540" y="1025"/>
       <point x="454" y="1002"/>
       <point x="371" y="955" type="curve" smooth="yes"/>
       <point x="216" y="867"/>
       <point x="128" y="723"/>
-      <point x="128" y="532" type="curve" name="sh03" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="sh03"/>
       <point x="128" y="341"/>
       <point x="216" y="197"/>
       <point x="371" y="109" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25C_C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25C_C_.glif
index 3177e0fe4..aa01bcc3c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25C_C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25C_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25CC" format="1">
+<glyph name="uni25CC" format="2">
   <advance width="1233"/>
   <unicode hex="25CC"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="466" y="1127" type="line" name="hr00"/>
       <point x="516" y="1141"/>
       <point x="566" y="1148"/>
-      <point x="616" y="1148" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="1148" type="curve" smooth="yes" name="dv04"/>
       <point x="666" y="1148"/>
       <point x="716" y="1141"/>
       <point x="766" y="1127" type="curve"/>
       <point x="726" y="970" type="line"/>
       <point x="690" y="981"/>
       <point x="653" y="986"/>
-      <point x="616" y="986" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="986" type="curve" smooth="yes" name="dv03"/>
       <point x="579" y="986"/>
       <point x="542" y="981"/>
       <point x="506" y="970" type="curve"/>
@@ -43,14 +43,14 @@
       <point x="22" y="382" type="line"/>
       <point x="11" y="427"/>
       <point x="6" y="477"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="587"/>
       <point x="11" y="637"/>
       <point x="22" y="682" type="curve"/>
       <point x="179" y="642" type="line" name="sh03"/>
       <point x="171" y="607"/>
       <point x="167" y="570"/>
-      <point x="167" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="167" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="167" y="493"/>
       <point x="171" y="457"/>
       <point x="179" y="422" type="curve" name="sh04"/>
@@ -59,14 +59,14 @@
       <point x="1054" y="422" type="line" name="sh05"/>
       <point x="1062" y="457"/>
       <point x="1066" y="493"/>
-      <point x="1066" y="532" type="curve" name="ah01" smooth="yes"/>
+      <point x="1066" y="532" type="curve" smooth="yes" name="ah01"/>
       <point x="1066" y="570"/>
       <point x="1062" y="607"/>
       <point x="1054" y="642" type="curve" name="sh06"/>
       <point x="1211" y="682" type="line"/>
       <point x="1222" y="637"/>
       <point x="1227" y="587"/>
-      <point x="1227" y="532" type="curve" name="sh07" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh07"/>
       <point x="1227" y="477"/>
       <point x="1222" y="427"/>
       <point x="1211" y="382" type="curve"/>
@@ -92,14 +92,14 @@
       <point x="921" y="4" type="curve"/>
     </contour>
     <contour>
-      <point x="616" y="-84" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-84" type="curve" smooth="yes" name="dv01"/>
       <point x="566" y="-84"/>
       <point x="516" y="-77"/>
       <point x="466" y="-63" type="curve"/>
       <point x="506" y="94" type="line"/>
       <point x="542" y="83"/>
       <point x="579" y="78"/>
-      <point x="616" y="78" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="78" type="curve" smooth="yes" name="dv02"/>
       <point x="653" y="78"/>
       <point x="690" y="83"/>
       <point x="726" y="94" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25C_D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25C_D_.glif
index edbff584f..0af4260c5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25C_D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25C_D_.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25CD" format="1">
+<glyph name="uni25CD" format="2">
   <advance width="1233"/>
   <unicode hex="25CD"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="dh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="dh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="dh12" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="dh12"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -81,7 +81,7 @@
       <point x="1002" y="226" type="line" name="dh10"/>
       <point x="1071" y="309"/>
       <point x="1105" y="411"/>
-      <point x="1105" y="532" type="curve" name="dh11" smooth="yes"/>
+      <point x="1105" y="532" type="curve" smooth="yes" name="dh11"/>
       <point x="1105" y="653"/>
       <point x="1071" y="755"/>
       <point x="1002" y="838" type="curve" name="iv03"/>
@@ -90,7 +90,7 @@
       <point x="226" y="832" type="line" name="dh03"/>
       <point x="161" y="751"/>
       <point x="128" y="651"/>
-      <point x="128" y="532" type="curve" name="dh02" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="dh02"/>
       <point x="128" y="413"/>
       <point x="161" y="313"/>
       <point x="226" y="232" type="curve" name="iv04"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25C_E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25C_E_.glif
index 7dcea4c87..296c2acbd 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25C_E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25C_E_.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25CE" format="1">
+<glyph name="uni25CE" format="2">
   <advance width="1233"/>
   <unicode hex="25CE"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="dh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="dh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv03"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="dh08" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="dh08"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -30,13 +30,13 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="616" y="79" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="79" type="curve" smooth="yes" name="dv01"/>
       <point x="691" y="79"/>
       <point x="766" y="100"/>
       <point x="841" y="143" type="curve" smooth="yes"/>
       <point x="990" y="228"/>
       <point x="1066" y="357"/>
-      <point x="1066" y="532" type="curve" name="dh07" smooth="yes"/>
+      <point x="1066" y="532" type="curve" smooth="yes" name="dh07"/>
       <point x="1066" y="619"/>
       <point x="1047" y="695"/>
       <point x="1010" y="760" type="curve" smooth="yes"/>
@@ -45,13 +45,13 @@
       <point x="841" y="921" type="curve" smooth="yes"/>
       <point x="766" y="964"/>
       <point x="691" y="985"/>
-      <point x="616" y="985" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="985" type="curve" smooth="yes" name="dv02"/>
       <point x="541" y="985"/>
       <point x="467" y="964"/>
       <point x="392" y="921" type="curve" smooth="yes"/>
       <point x="243" y="836"/>
       <point x="167" y="707"/>
-      <point x="167" y="532" type="curve" name="dh02" smooth="yes"/>
+      <point x="167" y="532" type="curve" smooth="yes" name="dh02"/>
       <point x="167" y="445"/>
       <point x="186" y="369"/>
       <point x="224" y="304" type="curve" smooth="yes"/>
@@ -62,25 +62,25 @@
       <point x="541" y="79"/>
     </contour>
     <contour>
-      <point x="616" y="286" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="286" type="curve" smooth="yes" name="dv04"/>
       <point x="580" y="286"/>
       <point x="536" y="297"/>
       <point x="493" y="321" type="curve" smooth="yes"/>
       <point x="414" y="365"/>
       <point x="372" y="440"/>
-      <point x="372" y="532" type="curve" name="dh03" smooth="yes"/>
+      <point x="372" y="532" type="curve" smooth="yes" name="dh03"/>
       <point x="372" y="624"/>
       <point x="414" y="699"/>
       <point x="493" y="743" type="curve" smooth="yes"/>
       <point x="536" y="767"/>
       <point x="580" y="778"/>
-      <point x="616" y="778" type="curve" name="dv05" smooth="yes"/>
+      <point x="616" y="778" type="curve" smooth="yes" name="dv05"/>
       <point x="655" y="778"/>
       <point x="700" y="766"/>
       <point x="739" y="743" type="curve" smooth="yes"/>
       <point x="812" y="702"/>
       <point x="861" y="632"/>
-      <point x="861" y="532" type="curve" name="dh06" smooth="yes"/>
+      <point x="861" y="532" type="curve" smooth="yes" name="dh06"/>
       <point x="861" y="432"/>
       <point x="812" y="362"/>
       <point x="739" y="321" type="curve" smooth="yes"/>
@@ -94,7 +94,7 @@
       <point x="684" y="416" type="curve" smooth="yes"/>
       <point x="729" y="443"/>
       <point x="751" y="481"/>
-      <point x="751" y="532" type="curve" name="dh05" smooth="yes"/>
+      <point x="751" y="532" type="curve" smooth="yes" name="dh05"/>
       <point x="751" y="583"/>
       <point x="729" y="621"/>
       <point x="684" y="648" type="curve" smooth="yes"/>
@@ -106,7 +106,7 @@
       <point x="549" y="648" type="curve" smooth="yes"/>
       <point x="504" y="622"/>
       <point x="482" y="583"/>
-      <point x="482" y="532" type="curve" name="dh04" smooth="yes"/>
+      <point x="482" y="532" type="curve" smooth="yes" name="dh04"/>
       <point x="482" y="481"/>
       <point x="504" y="442"/>
       <point x="549" y="416" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25C_F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25C_F_.glif
index 46c39961b..309ec8c30 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25C_F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25C_F_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25CF" format="1">
+<glyph name="uni25CF" format="2">
   <advance width="1233"/>
   <unicode hex="25CF"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25D_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25D_0.glif
index 718c14e9a..b2dc1c3b4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25D_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25D_0.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D0" format="1">
+<glyph name="uni25D0" format="2">
   <advance width="1233"/>
   <unicode hex="25D0"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
@@ -16,13 +16,13 @@
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="dh02" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="dh02"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="861" y="109" type="curve" smooth="yes"/>
       <point x="1021" y="200"/>
       <point x="1105" y="349"/>
-      <point x="1105" y="532" type="curve" name="dh01" smooth="yes"/>
+      <point x="1105" y="532" type="curve" smooth="yes" name="dh01"/>
       <point x="1105" y="715"/>
       <point x="1021" y="864"/>
       <point x="861" y="955" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25D_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25D_1.glif
index bc2550c08..0b5101c8b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25D_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25D_1.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D1" format="1">
+<glyph name="uni25D1" format="2">
   <advance width="1233"/>
   <unicode hex="25D1"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="dh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="dh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="372" y="954" type="curve" smooth="yes"/>
       <point x="211" y="861"/>
       <point x="128" y="725"/>
-      <point x="128" y="532" type="curve" name="dh02" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="dh02"/>
       <point x="128" y="339"/>
       <point x="211" y="203"/>
       <point x="372" y="110" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25D_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25D_2.glif
index ef60c8abd..351ade671 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25D_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25D_2.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D2" format="1">
+<glyph name="uni25D2" format="2">
   <advance width="1233"/>
   <unicode hex="25D2"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="860" y="954" type="curve" smooth="yes"/>
       <point x="779" y="1001"/>
       <point x="697" y="1025"/>
-      <point x="616" y="1025" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1025" type="curve" smooth="yes" name="dv01"/>
       <point x="535" y="1025"/>
       <point x="453" y="1001"/>
       <point x="372" y="954" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25D_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25D_3.glif
index 874e183a5..cca1ef30a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25D_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25D_3.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D3" format="1">
+<glyph name="uni25D3" format="2">
   <advance width="1233"/>
   <unicode hex="25D3"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -30,7 +30,7 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="616" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="692" y="39"/>
       <point x="778" y="62"/>
       <point x="861" y="109" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25D_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25D_4.glif
index 0cc033e00..edb500728 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25D_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25D_4.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D4" format="1">
+<glyph name="uni25D4" format="2">
   <advance width="1233"/>
   <unicode hex="25D4"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -30,7 +30,7 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="616" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="692" y="39"/>
       <point x="778" y="62"/>
       <point x="861" y="109" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="371" y="955" type="curve" smooth="yes"/>
       <point x="216" y="867"/>
       <point x="128" y="723"/>
-      <point x="128" y="532" type="curve" name="sh03" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="sh03"/>
       <point x="128" y="341"/>
       <point x="216" y="197"/>
       <point x="371" y="109" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25D_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25D_5.glif
index 9f56ce75e..06acd4559 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25D_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25D_5.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D5" format="1">
+<glyph name="uni25D5" format="2">
   <advance width="1233"/>
   <unicode hex="25D5"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="dh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="dh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25D_6.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25D_6.glif
index a98f8f614..4416ff83d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25D_6.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25D_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D6" format="1">
+<glyph name="uni25D6" format="2">
   <advance width="1233"/>
   <unicode hex="25D6"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25D_7.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25D_7.glif
index 61e4f5dc1..946edb7a2 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25D_7.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25D_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D7" format="1">
+<glyph name="uni25D7" format="2">
   <advance width="1233"/>
   <unicode hex="25D7"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25D_A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25D_A_.glif
index 7857beb74..6d2901ac1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25D_A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25D_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25DA" format="1">
+<glyph name="uni25DA" format="2">
   <advance width="1233"/>
   <unicode hex="25DA"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="818" y="1120"/>
       <point x="710" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv03"/>
       <point x="524" y="1148"/>
       <point x="413" y="1119"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
@@ -29,7 +29,7 @@
       <point x="371" y="955" type="curve" smooth="yes"/>
       <point x="454" y="1002"/>
       <point x="540" y="1025"/>
-      <point x="616" y="1025" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1025" type="curve" smooth="yes" name="dv02"/>
       <point x="692" y="1025"/>
       <point x="778" y="1002"/>
       <point x="861" y="955" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25D_B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25D_B_.glif
index ab0e28865..aa100b37b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25D_B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25D_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25DB" format="1">
+<glyph name="uni25DB" format="2">
   <advance width="1233"/>
   <unicode hex="25DB"/>
   <outline>
@@ -11,7 +11,7 @@
       <point x="311" y="4" type="curve" smooth="yes"/>
       <point x="416" y="-57"/>
       <point x="516" y="-84"/>
-      <point x="615" y="-84" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="-84" type="curve" smooth="yes" name="dv02"/>
       <point x="718" y="-84"/>
       <point x="820" y="-55"/>
       <point x="921" y="4" type="curve" smooth="yes"/>
@@ -23,7 +23,7 @@
       <point x="-20" y="-512" type="line" name="dv01"/>
     </contour>
     <contour>
-      <point x="616" y="39" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv03"/>
       <point x="535" y="39"/>
       <point x="453" y="63"/>
       <point x="372" y="110" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25D_C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25D_C_.glif
index ab269c712..5e74179ce 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25D_C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25D_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25DC" format="1">
+<glyph name="uni25DC" format="2">
   <advance width="1233"/>
   <unicode hex="25DC"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25D_D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25D_D_.glif
index 1ea0f735d..669f3e26b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25D_D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25D_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25DD" format="1">
+<glyph name="uni25DD" format="2">
   <advance width="1233"/>
   <unicode hex="25DD"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25D_E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25D_E_.glif
index 740a2bcbf..3480c12da 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25D_E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25D_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25DE" format="1">
+<glyph name="uni25DE" format="2">
   <advance width="1233"/>
   <unicode hex="25DE"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25D_F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25D_F_.glif
index 10dbdd9ff..dbb34517f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25D_F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25D_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25DF" format="1">
+<glyph name="uni25DF" format="2">
   <advance width="1233"/>
   <unicode hex="25DF"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25E_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25E_0.glif
index f9c528304..ee6d883f7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25E_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25E_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E0" format="1">
+<glyph name="uni25E0" format="2">
   <advance width="1233"/>
   <unicode hex="25E0"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="311" y="1060" type="curve" smooth="yes"/>
       <point x="416" y="1121"/>
       <point x="516" y="1148"/>
-      <point x="615" y="1148" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="1148" type="curve" smooth="yes" name="dv02"/>
       <point x="718" y="1148"/>
       <point x="820" y="1119"/>
       <point x="921" y="1060" type="curve" smooth="yes"/>
@@ -23,7 +23,7 @@
       <point x="841" y="922" type="curve" smooth="yes"/>
       <point x="772" y="961"/>
       <point x="692" y="986"/>
-      <point x="617" y="986" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="986" type="curve" smooth="yes" name="dv01"/>
       <point x="541" y="986"/>
       <point x="460" y="961"/>
       <point x="392" y="922" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25E_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25E_1.glif
index 459e25ead..fef286646 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25E_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25E_1.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E1" format="1">
+<glyph name="uni25E1" format="2">
   <advance width="1233"/>
   <unicode hex="25E1"/>
   <outline>
     <contour>
-      <point x="615" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="615" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="516" y="-84"/>
       <point x="416" y="-57"/>
       <point x="311" y="4" type="curve" smooth="yes"/>
@@ -17,7 +17,7 @@
       <point x="391" y="142" type="curve" smooth="yes"/>
       <point x="467" y="99"/>
       <point x="546" y="79"/>
-      <point x="617" y="79" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="79" type="curve" smooth="yes" name="dv01"/>
       <point x="686" y="79"/>
       <point x="765" y="99"/>
       <point x="841" y="142" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25E_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25E_2.glif
index 9812325a2..2273a2640 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25E_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25E_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E2" format="1">
+<glyph name="uni25E2" format="2">
   <advance width="1233"/>
   <unicode hex="25E2"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25E_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25E_3.glif
index 2c0c2bed2..9395dfd74 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25E_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25E_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E3" format="1">
+<glyph name="uni25E3" format="2">
   <advance width="1233"/>
   <unicode hex="25E3"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25E_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25E_4.glif
index 3cdf55d01..d928816df 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25E_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25E_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E4" format="1">
+<glyph name="uni25E4" format="2">
   <advance width="1233"/>
   <unicode hex="25E4"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25E_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25E_5.glif
index cf4b9096d..36495ab5b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25E_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25E_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E5" format="1">
+<glyph name="uni25E5" format="2">
   <advance width="1233"/>
   <unicode hex="25E5"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25E_7.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25E_7.glif
index 34b659d78..09d1bd3b3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25E_7.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25E_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E7" format="1">
+<glyph name="uni25E7" format="2">
   <advance width="1233"/>
   <unicode hex="25E7"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25E_8.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25E_8.glif
index ff7393846..be563b66d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25E_8.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25E_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E8" format="1">
+<glyph name="uni25E8" format="2">
   <advance width="1233"/>
   <unicode hex="25E8"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25E_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25E_9.glif
index a4a76e740..a3fe5337a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25E_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25E_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E9" format="1">
+<glyph name="uni25E9" format="2">
   <advance width="1233"/>
   <unicode hex="25E9"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25E_A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25E_A_.glif
index 5b8b31cce..89cb828c5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25E_A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25E_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25EA" format="1">
+<glyph name="uni25EA" format="2">
   <advance width="1233"/>
   <unicode hex="25EA"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25E_B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25E_B_.glif
index da4f0b67f..9f6d2d523 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25E_B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25E_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25EB" format="1">
+<glyph name="uni25EB" format="2">
   <advance width="1233"/>
   <unicode hex="25EB"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25E_C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25E_C_.glif
index 6e64bb63c..16c28af2c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25E_C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25E_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25EC" format="1">
+<glyph name="uni25EC" format="2">
   <advance width="1233"/>
   <unicode hex="25EC"/>
   <outline>
@@ -14,16 +14,16 @@
       <point x="177" y="36" type="line"/>
     </contour>
     <contour>
-      <point x="615" y="229" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="229" type="curve" smooth="yes" name="dv03"/>
       <point x="539" y="229"/>
       <point x="482" y="286"/>
-      <point x="482" y="362" type="curve" name="dh01" smooth="yes"/>
+      <point x="482" y="362" type="curve" smooth="yes" name="dh01"/>
       <point x="482" y="438"/>
       <point x="541" y="495"/>
-      <point x="616" y="495" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="495" type="curve" smooth="yes" name="dv04"/>
       <point x="691" y="495"/>
       <point x="750" y="438"/>
-      <point x="750" y="362" type="curve" name="dh02" smooth="yes"/>
+      <point x="750" y="362" type="curve" smooth="yes" name="dh02"/>
       <point x="750" y="289"/>
       <point x="690" y="229"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25E_D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25E_D_.glif
index 023c62b95..718ea1d30 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25E_D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25E_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25ED" format="1">
+<glyph name="uni25ED" format="2">
   <advance width="1233"/>
   <unicode hex="25ED"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25E_E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25E_E_.glif
index 65a848776..08d9455fb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25E_E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25E_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25EE" format="1">
+<glyph name="uni25EE" format="2">
   <advance width="1233"/>
   <unicode hex="25EE"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25E_F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25E_F_.glif
index 018ff748c..c63414932 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25E_F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25E_F_.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25EF" format="1">
+<glyph name="uni25EF" format="2">
   <advance width="1233"/>
   <unicode hex="25EF"/>
   <outline>
     <contour>
-      <point x="615" y="-110" type="curve" name="hr00" smooth="yes"/>
+      <point x="615" y="-110" type="curve" smooth="yes" name="hr00"/>
       <point x="511" y="-110"/>
       <point x="407" y="-83"/>
       <point x="298" y="-19" type="curve" smooth="yes"/>
       <point x="91" y="101"/>
       <point x="-20" y="280"/>
-      <point x="-20" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="-20" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="-20" y="784"/>
       <point x="91" y="963"/>
       <point x="298" y="1083" type="curve" smooth="yes"/>
       <point x="407" y="1147"/>
       <point x="511" y="1174"/>
-      <point x="615" y="1174" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1174" type="curve" smooth="yes" name="dv03"/>
       <point x="722" y="1174"/>
       <point x="829" y="1144"/>
       <point x="934" y="1083" type="curve" smooth="yes"/>
       <point x="1142" y="963"/>
       <point x="1253" y="784"/>
-      <point x="1253" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="1253" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="1253" y="280"/>
       <point x="1142" y="101"/>
       <point x="934" y="-19" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="722" y="-110"/>
     </contour>
     <contour>
-      <point x="616" y="18" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="18" type="curve" smooth="yes" name="dv01"/>
       <point x="700" y="18"/>
       <point x="792" y="45"/>
       <point x="872" y="90" type="curve" smooth="yes"/>
       <point x="1033" y="181"/>
       <point x="1126" y="333"/>
-      <point x="1126" y="532" type="curve" name="ah01" smooth="yes"/>
+      <point x="1126" y="532" type="curve" smooth="yes" name="ah01"/>
       <point x="1126" y="731"/>
       <point x="1033" y="883"/>
       <point x="872" y="974" type="curve" smooth="yes"/>
       <point x="792" y="1019"/>
       <point x="700" y="1046"/>
-      <point x="616" y="1046" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1046" type="curve" smooth="yes" name="dv02"/>
       <point x="540" y="1046"/>
       <point x="450" y="1025"/>
       <point x="361" y="974" type="curve" smooth="yes"/>
       <point x="204" y="886"/>
       <point x="107" y="734"/>
-      <point x="107" y="532" type="curve" name="sh03" smooth="yes"/>
+      <point x="107" y="532" type="curve" smooth="yes" name="sh03"/>
       <point x="107" y="329"/>
       <point x="205" y="178"/>
       <point x="361" y="90" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25F_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25F_0.glif
index 95a4712e3..dfa5bb855 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25F_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25F_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F0" format="1">
+<glyph name="uni25F0" format="2">
   <advance width="1233"/>
   <unicode hex="25F0"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25F_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25F_1.glif
index c3724eede..0930ad292 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25F_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25F_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F1" format="1">
+<glyph name="uni25F1" format="2">
   <advance width="1233"/>
   <unicode hex="25F1"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25F_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25F_2.glif
index fd3427be5..cfb1f711c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25F_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25F_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F2" format="1">
+<glyph name="uni25F2" format="2">
   <advance width="1233"/>
   <unicode hex="25F2"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25F_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25F_3.glif
index 333a31b57..8b36f1ebe 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25F_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25F_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F3" format="1">
+<glyph name="uni25F3" format="2">
   <advance width="1233"/>
   <unicode hex="25F3"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25F_4.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25F_4.glif
index 6b5bdbb8e..8540a59c1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25F_4.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25F_4.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F4" format="1">
+<glyph name="uni25F4" format="2">
   <advance width="1233"/>
   <unicode hex="25F4"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
@@ -16,13 +16,13 @@
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -30,13 +30,13 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="619" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="619" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="695" y="39"/>
       <point x="779" y="63"/>
       <point x="860" y="110" type="curve" smooth="yes"/>
       <point x="1023" y="204"/>
       <point x="1105" y="345"/>
-      <point x="1105" y="532" type="curve" name="ah01" smooth="yes"/>
+      <point x="1105" y="532" type="curve" smooth="yes" name="ah01"/>
       <point x="1105" y="719"/>
       <point x="1023" y="860"/>
       <point x="860" y="954" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25F_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25F_5.glif
index ee34f5d27..a7100203e 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25F_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25F_5.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F5" format="1">
+<glyph name="uni25F5" format="2">
   <advance width="1233"/>
   <unicode hex="25F5"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
@@ -16,13 +16,13 @@
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -36,13 +36,13 @@
       <point x="861" y="110" type="curve" smooth="yes"/>
       <point x="1008" y="193"/>
       <point x="1105" y="334"/>
-      <point x="1105" y="530" type="curve" name="ah01" smooth="yes"/>
+      <point x="1105" y="530" type="curve" smooth="yes" name="ah01"/>
       <point x="1105" y="713"/>
       <point x="1022" y="863"/>
       <point x="861" y="955" type="curve" smooth="yes"/>
       <point x="778" y="1002"/>
       <point x="691" y="1025"/>
-      <point x="615" y="1025" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="1025" type="curve" smooth="yes" name="dv01"/>
       <point x="448" y="1025"/>
       <point x="159" y="903"/>
       <point x="131" y="588" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25F_6.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25F_6.glif
index 7a25ab7dd..4a05da63c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25F_6.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25F_6.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F6" format="1">
+<glyph name="uni25F6" format="2">
   <advance width="1233"/>
   <unicode hex="25F6"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
@@ -34,13 +34,13 @@
       <point x="1102" y="588" type="line" name="dv04"/>
       <point x="1074" y="905"/>
       <point x="785" y="1025"/>
-      <point x="613" y="1025" type="curve" name="dv01" smooth="yes"/>
+      <point x="613" y="1025" type="curve" smooth="yes" name="dv01"/>
       <point x="540" y="1025"/>
       <point x="457" y="1003"/>
       <point x="372" y="954" type="curve" smooth="yes"/>
       <point x="209" y="860"/>
       <point x="128" y="719"/>
-      <point x="128" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="128" y="345"/>
       <point x="209" y="204"/>
       <point x="372" y="110" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25F_7.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25F_7.glif
index 27b1d258e..caa6425eb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25F_7.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25F_7.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F7" format="1">
+<glyph name="uni25F7" format="2">
   <advance width="1233"/>
   <unicode hex="25F7"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
@@ -30,7 +30,7 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="616" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="782" y="39"/>
       <point x="1070" y="158"/>
       <point x="1102" y="474" type="curve" name="dv02"/>
@@ -41,7 +41,7 @@
       <point x="371" y="954" type="curve" smooth="yes"/>
       <point x="214" y="865"/>
       <point x="128" y="722"/>
-      <point x="128" y="534" type="curve" name="sh02" smooth="yes"/>
+      <point x="128" y="534" type="curve" smooth="yes" name="sh02"/>
       <point x="128" y="351"/>
       <point x="210" y="201"/>
       <point x="371" y="109" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25F_8.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25F_8.glif
index 9267c054b..a42fa75c0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25F_8.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25F_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F8" format="1">
+<glyph name="uni25F8" format="2">
   <advance width="1233"/>
   <unicode hex="25F8"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25F_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25F_9.glif
index 1f5a37479..cc8543602 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25F_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25F_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F9" format="1">
+<glyph name="uni25F9" format="2">
   <advance width="1233"/>
   <unicode hex="25F9"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25F_A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25F_A_.glif
index fc9bc6d69..3194c7f3f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25F_A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25F_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25FA" format="1">
+<glyph name="uni25FA" format="2">
   <advance width="1233"/>
   <unicode hex="25FA"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25F_B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25F_B_.glif
index 3b80d593c..d0c40cedb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25F_B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25F_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25FB" format="1">
+<glyph name="uni25FB" format="2">
   <advance width="1233"/>
   <unicode hex="25FB"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25F_C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25F_C_.glif
index 3be0a387b..212ba910f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25F_C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25F_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25FC" format="1">
+<glyph name="uni25FC" format="2">
   <advance width="1233"/>
   <unicode hex="25FC"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25F_D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25F_D_.glif
index 8814150b8..ef2bba730 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25F_D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25F_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25FD" format="1">
+<glyph name="uni25FD" format="2">
   <advance width="1233"/>
   <unicode hex="25FD"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25F_E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25F_E_.glif
index 00ff683ce..5b20fe01a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25F_E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25F_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25FE" format="1">
+<glyph name="uni25FE" format="2">
   <advance width="1233"/>
   <unicode hex="25FE"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni25F_F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni25F_F_.glif
index 32d916c21..1e6646d70 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni25F_F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni25F_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25FF" format="1">
+<glyph name="uni25FF" format="2">
   <advance width="1233"/>
   <unicode hex="25FF"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni27C_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uni27C_2.glif
index 248de81fb..3f20c7693 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni27C_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni27C_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27C2" format="1">
+<glyph name="uni27C2" format="2">
   <advance width="1233"/>
   <unicode hex="27C2"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni27C_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni27C_5.glif
index d26d01a19..7208ceae7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni27C_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni27C_5.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27C5" format="1">
+<glyph name="uni27C5" format="2">
   <advance width="1233"/>
   <unicode hex="27C5"/>
   <outline>
     <contour>
-      <point x="680" y="-334" type="line" name="hr00" smooth="yes"/>
+      <point x="680" y="-334" type="line" smooth="yes" name="hr00"/>
       <point x="597" y="-334"/>
       <point x="560" y="-330"/>
       <point x="525" y="-323" type="curve" name="av01"/>
       <point x="247" y="-275"/>
       <point x="139" y="-159"/>
-      <point x="139" y="-1" type="curve" name="dh01" smooth="yes"/>
+      <point x="139" y="-1" type="curve" smooth="yes" name="dh01"/>
       <point x="139" y="178"/>
       <point x="280" y="428"/>
       <point x="472" y="756" type="curve" smooth="yes"/>
@@ -22,14 +22,14 @@
       <point x="768" y="1304" type="curve" smooth="yes"/>
       <point x="768" y="1338"/>
       <point x="749" y="1355"/>
-      <point x="710" y="1355" type="curve" name="sv01" smooth="yes"/>
+      <point x="710" y="1355" type="curve" smooth="yes" name="sv01"/>
       <point x="669" y="1355"/>
       <point x="635" y="1333"/>
       <point x="607" y="1290" type="curve"/>
       <point x="411" y="1390" type="line"/>
       <point x="510" y="1511"/>
       <point x="660" y="1574"/>
-      <point x="792" y="1574" type="curve" name="at01" smooth="yes"/>
+      <point x="792" y="1574" type="curve" smooth="yes" name="at01"/>
       <point x="959" y="1574"/>
       <point x="1045" y="1471"/>
       <point x="1042" y="1371" type="curve" smooth="yes"/>
@@ -41,7 +41,7 @@
       <point x="448" y="165" type="curve" smooth="yes"/>
       <point x="441" y="137"/>
       <point x="438" y="109"/>
-      <point x="438" y="86" type="curve" name="dh02" smooth="yes"/>
+      <point x="438" y="86" type="curve" smooth="yes" name="dh02"/>
       <point x="438" y="-19"/>
       <point x="502" y="-80"/>
       <point x="647" y="-93" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni27C_6.glif b/source/Hack-BoldItalic.ufo/glyphs/uni27C_6.glif
index 7030e0b56..987c83856 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni27C_6.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni27C_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27C6" format="1">
+<glyph name="uni27C6" format="2">
   <advance width="1233"/>
   <unicode hex="27C6"/>
   <outline>
@@ -16,38 +16,38 @@
       <point x="309" y="-93" type="curve"/>
       <point x="533" y="-72"/>
       <point x="613" y="17"/>
-      <point x="613" y="248" type="curve" name="ih01" smooth="yes"/>
+      <point x="613" y="248" type="curve" smooth="yes" name="ih01"/>
       <point x="613" y="395"/>
       <point x="582" y="555"/>
-      <point x="534" y="791" type="curve" name="hr01" smooth="yes"/>
+      <point x="534" y="791" type="curve" smooth="yes" name="hr01"/>
       <point x="497" y="977"/>
       <point x="475" y="1108"/>
-      <point x="475" y="1226" type="curve" name="dh01" smooth="yes"/>
+      <point x="475" y="1226" type="curve" smooth="yes" name="dh01"/>
       <point x="475" y="1492"/>
       <point x="585" y="1574"/>
-      <point x="801" y="1574" type="curve" name="at01" smooth="yes"/>
+      <point x="801" y="1574" type="curve" smooth="yes" name="at01"/>
       <point x="969" y="1574"/>
       <point x="1062" y="1523"/>
       <point x="1121" y="1390" type="curve"/>
       <point x="887" y="1290" type="line"/>
       <point x="875" y="1333"/>
       <point x="849" y="1355"/>
-      <point x="809" y="1355" type="curve" name="sv01" smooth="yes"/>
+      <point x="809" y="1355" type="curve" smooth="yes" name="sv01"/>
       <point x="760" y="1355"/>
       <point x="727" y="1323"/>
-      <point x="724" y="1275" type="curve" name="dh02" smooth="yes"/>
+      <point x="724" y="1275" type="curve" smooth="yes" name="dh02"/>
       <point x="721" y="1222"/>
       <point x="751" y="1079"/>
-      <point x="815" y="756" type="curve" name="hr02" smooth="yes"/>
+      <point x="815" y="756" type="curve" smooth="yes" name="hr02"/>
       <point x="858" y="543"/>
       <point x="888" y="379"/>
-      <point x="888" y="236" type="curve" name="sh01" smooth="yes"/>
+      <point x="888" y="236" type="curve" smooth="yes" name="sh01"/>
       <point x="888" y="-74"/>
       <point x="749" y="-256"/>
       <point x="341" y="-323" type="curve" name="av01"/>
       <point x="304" y="-328"/>
       <point x="265" y="-334"/>
-      <point x="182" y="-334" type="curve" name="av02" smooth="yes"/>
+      <point x="182" y="-334" type="curve" smooth="yes" name="av02"/>
       <point x="71" y="-334" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni27D_C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni27D_C_.glif
index 2e05f2300..3c36c5683 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni27D_C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni27D_C_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27DC" format="1">
+<glyph name="uni27DC" format="2">
   <advance width="1233"/>
   <unicode hex="27DC"/>
   <outline>
     <contour>
-      <point x="311" y="359" type="curve" name="hr00" smooth="yes"/>
+      <point x="311" y="359" type="curve" smooth="yes" name="hr00"/>
       <point x="154" y="359"/>
       <point x="28" y="487"/>
-      <point x="28" y="647" type="curve" name="dh01" smooth="yes"/>
+      <point x="28" y="647" type="curve" smooth="yes" name="dh01"/>
       <point x="28" y="808"/>
       <point x="150" y="930"/>
-      <point x="311" y="930" type="curve" name="dv03" smooth="yes"/>
+      <point x="311" y="930" type="curve" smooth="yes" name="dv03"/>
       <point x="392" y="930"/>
       <point x="460" y="903"/>
       <point x="515" y="848" type="curve" smooth="yes"/>
@@ -27,16 +27,16 @@
       <point x="388" y="359"/>
     </contour>
     <contour>
-      <point x="313" y="509" type="curve" name="dv01" smooth="yes"/>
+      <point x="313" y="509" type="curve" smooth="yes" name="dv01"/>
       <point x="389" y="509"/>
       <point x="450" y="571"/>
       <point x="450" y="647" type="curve" smooth="yes"/>
       <point x="450" y="722"/>
       <point x="390" y="782"/>
-      <point x="313" y="782" type="curve" name="dv02" smooth="yes"/>
+      <point x="313" y="782" type="curve" smooth="yes" name="dv02"/>
       <point x="236" y="782"/>
       <point x="176" y="722"/>
-      <point x="176" y="646" type="curve" name="dh02" smooth="yes"/>
+      <point x="176" y="646" type="curve" smooth="yes" name="dh02"/>
       <point x="176" y="570"/>
       <point x="236" y="509"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni27E_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uni27E_0.glif
index 2485cb6d3..298a6d061 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni27E_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni27E_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27E0" format="1">
+<glyph name="uni27E0" format="2">
   <advance width="1233"/>
   <unicode hex="27E0"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni27E_6.glif b/source/Hack-BoldItalic.ufo/glyphs/uni27E_6.glif
index c9fb81b43..ff1e50b12 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni27E_6.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni27E_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27E6" format="1">
+<glyph name="uni27E6" format="2">
   <advance width="1233"/>
   <unicode hex="27E6"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni27E_7.glif b/source/Hack-BoldItalic.ufo/glyphs/uni27E_7.glif
index 582a1b3c6..557a5d159 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni27E_7.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni27E_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27E7" format="1">
+<glyph name="uni27E7" format="2">
   <advance width="1233"/>
   <unicode hex="27E7"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni27E_8.glif b/source/Hack-BoldItalic.ufo/glyphs/uni27E_8.glif
index 382181bc5..ff5db0086 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni27E_8.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni27E_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27E8" format="1">
+<glyph name="uni27E8" format="2">
   <advance width="1233"/>
   <unicode hex="27E8"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni27E_9.glif b/source/Hack-BoldItalic.ufo/glyphs/uni27E_9.glif
index 94ef82d64..6ec76f6da 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni27E_9.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni27E_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27E9" format="1">
+<glyph name="uni27E9" format="2">
   <advance width="1233"/>
   <unicode hex="27E9"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni27E_A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni27E_A_.glif
index d533ffcef..e0c2b4d55 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni27E_A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni27E_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27EA" format="1">
+<glyph name="uni27EA" format="2">
   <advance width="1233"/>
   <unicode hex="27EA"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni27E_B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni27E_B_.glif
index ea73b8bb0..c1b32f453 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni27E_B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni27E_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27EB" format="1">
+<glyph name="uni27EB" format="2">
   <advance width="1233"/>
   <unicode hex="27EB"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni27F_5.glif b/source/Hack-BoldItalic.ufo/glyphs/uni27F_5.glif
index 276f0007f..93ecc9ae9 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni27F_5.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni27F_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27F5" format="1">
+<glyph name="uni27F5" format="2">
   <advance width="1233"/>
   <unicode hex="27F5"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni27F_6.glif b/source/Hack-BoldItalic.ufo/glyphs/uni27F_6.glif
index e71ce27a8..2bf3fd397 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni27F_6.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni27F_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27F6" format="1">
+<glyph name="uni27F6" format="2">
   <advance width="1233"/>
   <unicode hex="27F6"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni27F_7.glif b/source/Hack-BoldItalic.ufo/glyphs/uni27F_7.glif
index 0d784c960..d7511f3ac 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni27F_7.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni27F_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27F7" format="1">
+<glyph name="uni27F7" format="2">
   <advance width="1233"/>
   <unicode hex="27F7"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2987.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2987.glif
index be7868f28..5251fd8da 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2987.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2987.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2987" format="1">
+<glyph name="uni2987" format="2">
   <advance width="1233"/>
   <unicode hex="2987"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="801" y="-270" type="line" name="hr00"/>
       <point x="412" y="-182"/>
       <point x="236" y="122"/>
-      <point x="236" y="450" type="curve" name="dh01" smooth="yes"/>
+      <point x="236" y="450" type="curve" smooth="yes" name="dh01"/>
       <point x="236" y="517"/>
       <point x="243" y="579"/>
       <point x="255" y="643" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="510" y="642" type="curve" smooth="yes"/>
       <point x="496" y="568"/>
       <point x="489" y="495"/>
-      <point x="489" y="423" type="curve" name="dh02" smooth="yes"/>
+      <point x="489" y="423" type="curve" smooth="yes" name="dh02"/>
       <point x="489" y="171"/>
       <point x="573" y="-49"/>
       <point x="716" y="-89" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2988.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2988.glif
index 20031dd7f..73d1c3f23 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2988.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2988.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2988" format="1">
+<glyph name="uni2988" format="2">
   <advance width="1233"/>
   <unicode hex="2988"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="432" y="1554" type="line" name="hr00"/>
       <point x="821" y="1466"/>
       <point x="997" y="1162"/>
-      <point x="997" y="834" type="curve" name="dh02" smooth="yes"/>
+      <point x="997" y="834" type="curve" smooth="yes" name="dh02"/>
       <point x="997" y="767"/>
       <point x="990" y="705"/>
       <point x="978" y="641" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="723" y="642" type="curve" smooth="yes"/>
       <point x="737" y="716"/>
       <point x="744" y="789"/>
-      <point x="744" y="861" type="curve" name="dh01" smooth="yes"/>
+      <point x="744" y="861" type="curve" smooth="yes" name="dh01"/>
       <point x="744" y="1113"/>
       <point x="660" y="1333"/>
       <point x="517" y="1373" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2997.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2997.glif
index 0c697909b..d466d2c6b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2997.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2997.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2997" format="1">
+<glyph name="uni2997" format="2">
   <advance width="1233"/>
   <unicode hex="2997"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2998.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2998.glif
index 245e2d444..5d1bf42f3 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2998.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2998.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2998" format="1">
+<glyph name="uni2998" format="2">
   <advance width="1233"/>
   <unicode hex="2998"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni29E_B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni29E_B_.glif
index dff97d656..419f61c0f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni29E_B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni29E_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni29EB" format="1">
+<glyph name="uni29EB" format="2">
   <advance width="1233"/>
   <unicode hex="29EB"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni29F_A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni29F_A_.glif
index f476c9f78..aacd7228a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni29F_A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni29F_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni29FA" format="1">
+<glyph name="uni29FA" format="2">
   <advance width="1233"/>
   <unicode hex="29FA"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni29F_B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni29F_B_.glif
index a6f422217..30d8b8fdd 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni29F_B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni29F_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni29FB" format="1">
+<glyph name="uni29FB" format="2">
   <advance width="1233"/>
   <unicode hex="29FB"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2A_00.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2A_00.glif
index e04c21ec0..a6d7bc2ee 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2A_00.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2A_00.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2A00" format="1">
+<glyph name="uni2A00" format="2">
   <advance width="1233"/>
   <unicode hex="2A00"/>
   <outline>
     <contour>
-      <point x="616" y="-465" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-465" type="curve" smooth="yes" name="hr00"/>
       <point x="259" y="-465"/>
       <point x="80" y="-130"/>
-      <point x="80" y="540" type="curve" name="dh01" smooth="yes"/>
+      <point x="80" y="540" type="curve" smooth="yes" name="dh01"/>
       <point x="80" y="1211"/>
       <point x="259" y="1547"/>
-      <point x="616" y="1547" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1547" type="curve" smooth="yes" name="dv03"/>
       <point x="974" y="1547"/>
       <point x="1153" y="1211"/>
-      <point x="1153" y="540" type="curve" name="dh06" smooth="yes"/>
+      <point x="1153" y="540" type="curve" smooth="yes" name="dh06"/>
       <point x="1153" y="-130"/>
       <point x="974" y="-465"/>
     </contour>
     <contour>
-      <point x="616" y="-275" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-275" type="curve" smooth="yes" name="dv01"/>
       <point x="847" y="-275"/>
       <point x="963" y="-4"/>
-      <point x="963" y="539" type="curve" name="dh05" smooth="yes"/>
+      <point x="963" y="539" type="curve" smooth="yes" name="dh05"/>
       <point x="963" y="1084"/>
       <point x="847" y="1357"/>
-      <point x="616" y="1357" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1357" type="curve" smooth="yes" name="dv02"/>
       <point x="385" y="1357"/>
       <point x="270" y="1084"/>
-      <point x="270" y="539" type="curve" name="dh02" smooth="yes"/>
+      <point x="270" y="539" type="curve" smooth="yes" name="dh02"/>
       <point x="270" y="-4"/>
       <point x="385" y="-275"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2A_2F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2A_2F_.glif
index 38c30e648..9287caa2c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2A_2F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2A_2F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2A2F" format="1">
+<glyph name="uni2A2F" format="2">
   <advance width="1233"/>
   <unicode hex="2A2F"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2A_6A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2A_6A_.glif
index 3328d7df8..80fcc8dc7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2A_6A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2A_6A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2A6A" format="1">
+<glyph name="uni2A6A" format="2">
   <advance width="1233"/>
   <unicode hex="2A6A"/>
   <outline>
@@ -10,29 +10,29 @@
       <point x="451" y="912" type="line"/>
     </contour>
     <contour>
-      <point x="850" y="468" type="curve" name="dv01" smooth="yes"/>
+      <point x="850" y="468" type="curve" smooth="yes" name="dv01"/>
       <point x="778" y="468"/>
       <point x="726" y="484"/>
       <point x="645" y="519" type="curve" smooth="yes"/>
       <point x="612" y="533" type="line" smooth="yes"/>
       <point x="522" y="570"/>
       <point x="468" y="591"/>
-      <point x="385" y="591" type="curve" name="hr01" smooth="yes"/>
+      <point x="385" y="591" type="curve" smooth="yes" name="hr01"/>
       <point x="280" y="591"/>
       <point x="192" y="558"/>
       <point x="88" y="470" type="curve" name="iv01"/>
       <point x="88" y="699" type="line"/>
       <point x="192" y="779"/>
       <point x="287" y="814"/>
-      <point x="390" y="814" type="curve" name="dv03" smooth="yes"/>
+      <point x="390" y="814" type="curve" smooth="yes" name="dv03"/>
       <point x="463" y="814"/>
       <point x="533" y="796"/>
       <point x="621" y="759" type="curve"/>
       <point x="622" y="759" type="line"/>
-      <point x="652" y="745" type="line" name="hr02" smooth="yes"/>
+      <point x="652" y="745" type="line" smooth="yes" name="hr02"/>
       <point x="725" y="710"/>
       <point x="797" y="691"/>
-      <point x="865" y="691" type="curve" name="dv02" smooth="yes"/>
+      <point x="865" y="691" type="curve" smooth="yes" name="dv02"/>
       <point x="958" y="691"/>
       <point x="1045" y="728"/>
       <point x="1145" y="816" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2A_6B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2A_6B_.glif
index e26502ea4..a74fb89f1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2A_6B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2A_6B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2A6B" format="1">
+<glyph name="uni2A6B" format="2">
   <advance width="1233"/>
   <unicode hex="2A6B"/>
   <outline>
@@ -10,21 +10,21 @@
       <point x="691" y="912" type="line"/>
     </contour>
     <contour>
-      <point x="850" y="468" type="curve" name="dv02" smooth="yes"/>
+      <point x="850" y="468" type="curve" smooth="yes" name="dv02"/>
       <point x="778" y="468"/>
       <point x="726" y="484"/>
       <point x="645" y="519" type="curve" smooth="yes"/>
       <point x="612" y="533" type="line" smooth="yes"/>
       <point x="522" y="570"/>
       <point x="468" y="591"/>
-      <point x="385" y="591" type="curve" name="dv04" smooth="yes"/>
+      <point x="385" y="591" type="curve" smooth="yes" name="dv04"/>
       <point x="280" y="591"/>
       <point x="192" y="558"/>
       <point x="88" y="470" type="curve" name="iv01"/>
       <point x="88" y="699" type="line"/>
       <point x="192" y="779"/>
       <point x="287" y="814"/>
-      <point x="390" y="814" type="curve" name="dv05" smooth="yes"/>
+      <point x="390" y="814" type="curve" smooth="yes" name="dv05"/>
       <point x="463" y="814"/>
       <point x="533" y="796"/>
       <point x="621" y="759" type="curve" name="hr01"/>
@@ -32,7 +32,7 @@
       <point x="652" y="745" type="line" smooth="yes"/>
       <point x="725" y="710"/>
       <point x="797" y="691"/>
-      <point x="865" y="691" type="curve" name="dv03" smooth="yes"/>
+      <point x="865" y="691" type="curve" smooth="yes" name="dv03"/>
       <point x="958" y="691"/>
       <point x="1045" y="728"/>
       <point x="1145" y="816" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2B_05.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2B_05.glif
index aae2dafb0..1c57ffc1d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2B_05.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2B_05.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B05" format="1">
+<glyph name="uni2B05" format="2">
   <advance width="1233"/>
   <unicode hex="2B05"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2B_06.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2B_06.glif
index 8301a2c45..e781b0ca5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2B_06.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2B_06.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B06" format="1">
+<glyph name="uni2B06" format="2">
   <advance width="1233"/>
   <unicode hex="2B06"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2B_07.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2B_07.glif
index 9b1a7e792..94c3f0bc7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2B_07.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2B_07.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B07" format="1">
+<glyph name="uni2B07" format="2">
   <advance width="1233"/>
   <unicode hex="2B07"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2B_08.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2B_08.glif
index a1663e612..bf05515aa 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2B_08.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2B_08.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B08" format="1">
+<glyph name="uni2B08" format="2">
   <advance width="1233"/>
   <unicode hex="2B08"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2B_09.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2B_09.glif
index 53bd2854b..443a0a27b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2B_09.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2B_09.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B09" format="1">
+<glyph name="uni2B09" format="2">
   <advance width="1233"/>
   <unicode hex="2B09"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2B_0A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2B_0A_.glif
index 07d99088d..8d7b58520 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2B_0A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2B_0A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B0A" format="1">
+<glyph name="uni2B0A" format="2">
   <advance width="1233"/>
   <unicode hex="2B0A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2B_0B_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2B_0B_.glif
index 1ff77d49c..40a643378 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2B_0B_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2B_0B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B0B" format="1">
+<glyph name="uni2B0B" format="2">
   <advance width="1233"/>
   <unicode hex="2B0B"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2B_0C_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2B_0C_.glif
index 7464efd15..e77854f14 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2B_0C_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2B_0C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B0C" format="1">
+<glyph name="uni2B0C" format="2">
   <advance width="1233"/>
   <unicode hex="2B0C"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2B_0D_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2B_0D_.glif
index 13acb4c41..bd4b267a7 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2B_0D_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2B_0D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B0D" format="1">
+<glyph name="uni2B0D" format="2">
   <advance width="1233"/>
   <unicode hex="2B0D"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2B_16.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2B_16.glif
index 874df6ab1..5a1a56a23 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2B_16.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2B_16.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B16" format="1">
+<glyph name="uni2B16" format="2">
   <advance width="1233"/>
   <unicode hex="2B16"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2B_17.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2B_17.glif
index 074464fff..083909981 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2B_17.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2B_17.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B17" format="1">
+<glyph name="uni2B17" format="2">
   <advance width="1233"/>
   <unicode hex="2B17"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2B_18.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2B_18.glif
index 1834720d1..91a26a4d4 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2B_18.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2B_18.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B18" format="1">
+<glyph name="uni2B18" format="2">
   <advance width="1233"/>
   <unicode hex="2B18"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2B_19.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2B_19.glif
index d47b5b184..41eb9616d 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2B_19.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2B_19.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B19" format="1">
+<glyph name="uni2B19" format="2">
   <advance width="1233"/>
   <unicode hex="2B19"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2B_1A_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2B_1A_.glif
index d926e42c8..492f88fb0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2B_1A_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2B_1A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B1A" format="1">
+<glyph name="uni2B1A" format="2">
   <advance width="1233"/>
   <unicode hex="2B1A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2E_18.case.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2E_18.case.glif
index 5696d061b..9ebc0f9d6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2E_18.case.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2E_18.case.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E18.case" format="1">
+<glyph name="uni2E18.case" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="739" y="1222" type="curve" name="hr00" smooth="yes"/>
+      <point x="739" y="1222" type="curve" smooth="yes" name="hr00"/>
       <point x="692" y="1222"/>
       <point x="662" y="1239"/>
       <point x="639" y="1264" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="618" y="1441" type="curve" smooth="yes"/>
       <point x="641" y="1487"/>
       <point x="697" y="1556"/>
-      <point x="790" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="790" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="853" y="1556"/>
       <point x="900" y="1529"/>
       <point x="921" y="1469" type="curve" smooth="yes"/>
@@ -30,7 +30,7 @@
       <point x="790" y="1222"/>
     </contour>
     <contour>
-      <point x="446" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="446" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="214" y="-27"/>
       <point x="79" y="78"/>
       <point x="79" y="249" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2E_18.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2E_18.glif
index f384b1de2..6e5610f0f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2E_18.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2E_18.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E18" format="1">
+<glyph name="uni2E18" format="2">
   <advance width="1233"/>
   <unicode hex="2E18"/>
   <outline>
     <contour>
-      <point x="747" y="904" type="curve" name="hr00" smooth="yes"/>
+      <point x="747" y="904" type="curve" smooth="yes" name="hr00"/>
       <point x="700" y="904"/>
       <point x="670" y="921"/>
       <point x="647" y="946" type="curve" smooth="yes"/>
@@ -17,7 +17,7 @@
       <point x="626" y="1123" type="curve" smooth="yes"/>
       <point x="649" y="1169"/>
       <point x="705" y="1238"/>
-      <point x="798" y="1238" type="curve" name="dv01" smooth="yes"/>
+      <point x="798" y="1238" type="curve" smooth="yes" name="dv01"/>
       <point x="861" y="1238"/>
       <point x="908" y="1211"/>
       <point x="929" y="1151" type="curve" smooth="yes"/>
@@ -31,7 +31,7 @@
       <point x="798" y="904"/>
     </contour>
     <contour>
-      <point x="446" y="-400" type="curve" name="av01" smooth="yes"/>
+      <point x="446" y="-400" type="curve" smooth="yes" name="av01"/>
       <point x="214" y="-400"/>
       <point x="79" y="-295"/>
       <point x="79" y="-124" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2E_1F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2E_1F_.glif
index 3b5a6d5fc..7dc9fce32 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2E_1F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2E_1F_.glif
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E1F" format="1">
+<glyph name="uni2E1F" format="2">
   <advance width="1233"/>
   <unicode hex="2E1F"/>
   <outline>
     <contour>
-      <point x="850" y="468" type="curve" name="dv01" smooth="yes"/>
+      <point x="850" y="468" type="curve" smooth="yes" name="dv01"/>
       <point x="778" y="468"/>
       <point x="726" y="484"/>
       <point x="645" y="519" type="curve" smooth="yes"/>
       <point x="612" y="533" type="line" smooth="yes"/>
       <point x="522" y="570"/>
       <point x="468" y="591"/>
-      <point x="385" y="591" type="curve" name="sv01" smooth="yes"/>
+      <point x="385" y="591" type="curve" smooth="yes" name="sv01"/>
       <point x="280" y="591"/>
       <point x="192" y="558"/>
       <point x="88" y="470" type="curve" name="iv01"/>
       <point x="88" y="699" type="line"/>
       <point x="192" y="779"/>
       <point x="287" y="814"/>
-      <point x="390" y="814" type="curve" name="av01" smooth="yes"/>
+      <point x="390" y="814" type="curve" smooth="yes" name="av01"/>
       <point x="463" y="814"/>
       <point x="533" y="796"/>
       <point x="621" y="759" type="curve"/>
@@ -26,7 +26,7 @@
       <point x="652" y="745" type="line" smooth="yes"/>
       <point x="725" y="710"/>
       <point x="797" y="691"/>
-      <point x="865" y="691" type="curve" name="dv02" smooth="yes"/>
+      <point x="865" y="691" type="curve" smooth="yes" name="dv02"/>
       <point x="958" y="691"/>
       <point x="1045" y="728"/>
       <point x="1145" y="816" type="curve" name="av02"/>
@@ -35,19 +35,19 @@
       <point x="959" y="468"/>
     </contour>
     <contour>
-      <point x="480" y="0" type="line" name="ab01" smooth="yes"/>
+      <point x="480" y="0" type="line" smooth="yes" name="ab01"/>
       <point x="460" y="0"/>
       <point x="450" y="10"/>
-      <point x="450" y="30" type="curve" name="dh01" smooth="yes"/>
-      <point x="450" y="335" type="line" name="hr01" smooth="yes"/>
+      <point x="450" y="30" type="curve" smooth="yes" name="dh01"/>
+      <point x="450" y="335" type="line" smooth="yes" name="hr01"/>
       <point x="450" y="355"/>
       <point x="460" y="365"/>
-      <point x="480" y="365" type="curve" name="sv02" smooth="yes"/>
+      <point x="480" y="365" type="curve" smooth="yes" name="sv02"/>
       <point x="753" y="365" type="line" smooth="yes"/>
       <point x="773" y="365"/>
       <point x="783" y="355"/>
       <point x="783" y="335" type="curve" smooth="yes"/>
-      <point x="783" y="30" type="line" name="dh02" smooth="yes"/>
+      <point x="783" y="30" type="line" smooth="yes" name="dh02"/>
       <point x="783" y="10"/>
       <point x="773" y="0"/>
       <point x="753" y="0" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2E_22.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2E_22.glif
index 13e4d357e..422616bac 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2E_22.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2E_22.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E22" format="1">
+<glyph name="uni2E22" format="2">
   <advance width="1233"/>
   <unicode hex="2E22"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2E_23.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2E_23.glif
index 6e31d2a75..c04052319 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2E_23.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2E_23.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E23" format="1">
+<glyph name="uni2E23" format="2">
   <advance width="1233"/>
   <unicode hex="2E23"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2E_24.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2E_24.glif
index bf725b41e..bad77354c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2E_24.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2E_24.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E24" format="1">
+<glyph name="uni2E24" format="2">
   <advance width="1233"/>
   <unicode hex="2E24"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2E_25.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2E_25.glif
index 1dac14b5a..577c80048 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2E_25.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2E_25.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E25" format="1">
+<glyph name="uni2E25" format="2">
   <advance width="1233"/>
   <unicode hex="2E25"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uni2E_2E_.glif b/source/Hack-BoldItalic.ufo/glyphs/uni2E_2E_.glif
index c566a5a74..f72d921bf 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uni2E_2E_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uni2E_2E_.glif
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E2E" format="1">
+<glyph name="uni2E2E" format="2">
   <advance width="1233"/>
   <unicode hex="2E2E"/>
   <outline>
     <contour>
-      <point x="480" y="524" type="line" name="hr00" smooth="yes"/>
+      <point x="480" y="524" type="line" smooth="yes" name="hr00"/>
       <point x="481" y="533"/>
       <point x="483" y="542"/>
       <point x="484" y="550" type="curve" smooth="yes"/>
       <point x="487" y="571" type="line" smooth="yes"/>
       <point x="490" y="588"/>
       <point x="494" y="600"/>
-      <point x="494" y="627" type="curve" name="ih01" smooth="yes"/>
+      <point x="494" y="627" type="curve" smooth="yes" name="ih01"/>
       <point x="494" y="678"/>
       <point x="475" y="718"/>
       <point x="422" y="782" type="curve" smooth="yes"/>
       <point x="351" y="868" type="line" smooth="yes"/>
       <point x="271" y="965"/>
       <point x="240" y="1035"/>
-      <point x="240" y="1102" type="curve" name="dh01" smooth="yes"/>
+      <point x="240" y="1102" type="curve" smooth="yes" name="dh01"/>
       <point x="240" y="1123"/>
       <point x="243" y="1147"/>
       <point x="247" y="1167" type="curve" smooth="yes"/>
       <point x="290" y="1386"/>
       <point x="480" y="1520"/>
-      <point x="744" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="744" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="885" y="1520"/>
       <point x="1009" y="1483"/>
       <point x="1126" y="1407" type="curve"/>
       <point x="1074" y="1139" type="line"/>
       <point x="961" y="1235"/>
       <point x="850" y="1280"/>
-      <point x="734" y="1280" type="curve" name="sv01" smooth="yes"/>
+      <point x="734" y="1280" type="curve" smooth="yes" name="sv01"/>
       <point x="611" y="1280"/>
       <point x="543" y="1229"/>
       <point x="528" y="1145" type="curve" smooth="yes"/>
       <point x="526" y="1134"/>
       <point x="525" y="1123"/>
-      <point x="525" y="1113" type="curve" name="dh02" smooth="yes"/>
+      <point x="525" y="1113" type="curve" smooth="yes" name="dh02"/>
       <point x="525" y="1062"/>
       <point x="549" y="1024"/>
       <point x="600" y="961" type="curve" smooth="yes"/>
       <point x="673" y="872" type="line" smooth="yes"/>
       <point x="734" y="798"/>
       <point x="763" y="739"/>
-      <point x="763" y="651" type="curve" name="sh01" smooth="yes"/>
+      <point x="763" y="651" type="curve" smooth="yes" name="sh01"/>
       <point x="763" y="623"/>
       <point x="760" y="590"/>
-      <point x="753" y="555" type="curve" name="hr01" smooth="yes"/>
+      <point x="753" y="555" type="curve" smooth="yes" name="hr01"/>
       <point x="723" y="401" type="line"/>
       <point x="456" y="401" type="line"/>
     </contour>
     <contour>
-      <point x="513" y="-55" type="curve" name="dv01" smooth="yes"/>
+      <point x="513" y="-55" type="curve" smooth="yes" name="dv01"/>
       <point x="466" y="-55"/>
       <point x="436" y="-38"/>
       <point x="413" y="-13" type="curve" smooth="yes"/>
@@ -65,10 +65,10 @@
       <point x="392" y="164" type="curve" smooth="yes"/>
       <point x="415" y="210"/>
       <point x="471" y="279"/>
-      <point x="564" y="279" type="curve" name="dv02" smooth="yes"/>
+      <point x="564" y="279" type="curve" smooth="yes" name="dv02"/>
       <point x="627" y="279"/>
       <point x="674" y="252"/>
-      <point x="695" y="192" type="curve" name="hr02" smooth="yes"/>
+      <point x="695" y="192" type="curve" smooth="yes" name="hr02"/>
       <point x="701" y="175"/>
       <point x="704" y="156"/>
       <point x="704" y="136" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uniE_0A_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uniE_0A_0.glif
index 4b063facc..33d485208 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uniE_0A_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uniE_0A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0A0" format="1">
+<glyph name="uniE0A0" format="2">
   <advance width="1233"/>
   <unicode hex="E0A0"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="279" y="624" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="279" y="159" type="line" name="sh01" smooth="yes"/>
+      <point x="279" y="159" type="line" smooth="yes" name="sh01"/>
       <point x="279" y="266"/>
       <point x="302" y="352"/>
       <point x="349" y="419" type="curve" smooth="yes"/>
@@ -23,13 +23,13 @@
       <point x="747" y="765" type="curve" smooth="yes"/>
       <point x="770" y="811"/>
       <point x="781" y="873"/>
-      <point x="781" y="950" type="curve" name="dh02" smooth="yes"/>
+      <point x="781" y="950" type="curve" smooth="yes" name="dh02"/>
       <point x="781" y="1242" type="line"/>
       <point x="596" y="1242" type="line" name="ih01"/>
       <point x="856" y="1545" type="line"/>
       <point x="1113" y="1242" type="line" name="iv02"/>
       <point x="928" y="1242" type="line"/>
-      <point x="928" y="901" type="line" name="dh03" smooth="yes"/>
+      <point x="928" y="901" type="line" smooth="yes" name="dh03"/>
       <point x="928" y="793"/>
       <point x="916" y="708"/>
       <point x="881" y="640" type="curve" smooth="yes"/>
@@ -39,7 +39,7 @@
       <point x="672" y="442" type="line" smooth="yes"/>
       <point x="567" y="369"/>
       <point x="524" y="319"/>
-      <point x="524" y="159" type="curve" name="sh02" smooth="yes"/>
+      <point x="524" y="159" type="curve" smooth="yes" name="sh02"/>
       <point x="524" y="-267" type="line" name="ab01"/>
       <point x="279" y="-267" type="line"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uniE_0A_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uniE_0A_1.glif
index 946a5d679..b19d5baaa 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uniE_0A_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uniE_0A_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0A1" format="1">
+<glyph name="uniE0A1" format="2">
   <advance width="1233"/>
   <unicode hex="E0A1"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uniE_0A_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uniE_0A_2.glif
index 64091a334..5c402e4dc 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uniE_0A_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uniE_0A_2.glif
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0A2" format="1">
+<glyph name="uniE0A2" format="2">
   <advance width="1233"/>
   <unicode hex="E0A2"/>
   <outline>
     <contour>
-      <point x="276" y="-267" type="line" name="ab01" smooth="yes"/>
+      <point x="276" y="-267" type="line" smooth="yes" name="ab01"/>
       <point x="157" y="-267"/>
       <point x="98" y="-207"/>
       <point x="98" y="-86" type="curve" smooth="yes"/>
-      <point x="98" y="795" type="line" name="dh01" smooth="yes"/>
+      <point x="98" y="795" type="line" smooth="yes" name="dh01"/>
       <point x="98" y="924"/>
       <point x="150" y="989"/>
       <point x="253" y="989" type="curve" name="hr01"/>
@@ -18,24 +18,24 @@
       <point x="360" y="1673" type="curve" smooth="yes"/>
       <point x="428" y="1746"/>
       <point x="514" y="1783"/>
-      <point x="617" y="1783" type="curve" name="at01" smooth="yes"/>
+      <point x="617" y="1783" type="curve" smooth="yes" name="at01"/>
       <point x="720" y="1783"/>
       <point x="806" y="1746"/>
       <point x="874" y="1673" type="curve" smooth="yes"/>
       <point x="939" y="1601"/>
       <point x="981" y="1504"/>
-      <point x="981" y="1379" type="curve" name="hr02" smooth="yes"/>
+      <point x="981" y="1379" type="curve" smooth="yes" name="hr02"/>
       <point x="981" y="989" type="line" name="sh01"/>
       <point x="1084" y="989"/>
       <point x="1136" y="924"/>
-      <point x="1136" y="795" type="curve" name="dh03" smooth="yes"/>
-      <point x="1136" y="-86" type="line" name="hr03" smooth="yes"/>
+      <point x="1136" y="795" type="curve" smooth="yes" name="dh03"/>
+      <point x="1136" y="-86" type="line" smooth="yes" name="hr03"/>
       <point x="1136" y="-207"/>
       <point x="1076" y="-267"/>
       <point x="955" y="-267" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="617" y="1618" type="curve" name="sv01" smooth="yes"/>
+      <point x="617" y="1618" type="curve" smooth="yes" name="sv01"/>
       <point x="558" y="1618"/>
       <point x="513" y="1595"/>
       <point x="478" y="1552" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="428" y="1379" type="curve" smooth="yes"/>
       <point x="428" y="989" type="line" name="sh02"/>
       <point x="806" y="989" type="line" name="ih01"/>
-      <point x="806" y="1379" type="line" name="hr04" smooth="yes"/>
+      <point x="806" y="1379" type="line" smooth="yes" name="hr04"/>
       <point x="806" y="1523"/>
       <point x="729" y="1618"/>
     </contour>
@@ -52,19 +52,19 @@
       <point x="688" y="449" type="line" name="hr05"/>
       <point x="745" y="478"/>
       <point x="774" y="525"/>
-      <point x="774" y="590" type="curve" name="sh03" smooth="yes"/>
+      <point x="774" y="590" type="curve" smooth="yes" name="sh03"/>
       <point x="774" y="635"/>
       <point x="761" y="671"/>
       <point x="730" y="703" type="curve"/>
       <point x="698" y="734"/>
       <point x="662" y="750"/>
-      <point x="617" y="750" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="750" type="curve" smooth="yes" name="dv01"/>
       <point x="572" y="750"/>
       <point x="536" y="734"/>
       <point x="504" y="703" type="curve"/>
       <point x="473" y="671"/>
       <point x="457" y="635"/>
-      <point x="457" y="588" type="curve" name="dh02" smooth="yes"/>
+      <point x="457" y="588" type="curve" smooth="yes" name="dh02"/>
       <point x="457" y="524"/>
       <point x="486" y="478"/>
       <point x="544" y="449" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uniE_0B_0.glif b/source/Hack-BoldItalic.ufo/glyphs/uniE_0B_0.glif
index 0c37c5316..b6d912aac 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uniE_0B_0.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uniE_0B_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0B0" format="1">
+<glyph name="uniE0B0" format="2">
   <advance width="1233"/>
   <unicode hex="E0B0"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uniE_0B_1.glif b/source/Hack-BoldItalic.ufo/glyphs/uniE_0B_1.glif
index 8b0f5914b..4eb33e829 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uniE_0B_1.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uniE_0B_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0B1" format="1">
+<glyph name="uniE0B1" format="2">
   <advance width="1233"/>
   <unicode hex="E0B1"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uniE_0B_2.glif b/source/Hack-BoldItalic.ufo/glyphs/uniE_0B_2.glif
index c9c536151..3b9433769 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uniE_0B_2.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uniE_0B_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0B2" format="1">
+<glyph name="uniE0B2" format="2">
   <advance width="1233"/>
   <unicode hex="E0B2"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uniE_0B_3.glif b/source/Hack-BoldItalic.ufo/glyphs/uniE_0B_3.glif
index 244bd9d3a..d644e1e16 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uniE_0B_3.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uniE_0B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0B3" format="1">
+<glyph name="uniE0B3" format="2">
   <advance width="1233"/>
   <unicode hex="E0B3"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uniF_E_F_F_.glif b/source/Hack-BoldItalic.ufo/glyphs/uniF_E_F_F_.glif
index 3ca2362e7..f5d2cecac 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uniF_E_F_F_.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uniF_E_F_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniFEFF" format="1">
+<glyph name="uniFEFF" format="2">
   <advance width="1233"/>
   <unicode hex="FEFF"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/union.glif b/source/Hack-BoldItalic.ufo/glyphs/union.glif
index c688b36a7..1b826add6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/union.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/union.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="union" format="1">
+<glyph name="union" format="2">
   <advance width="1233"/>
   <unicode hex="222A"/>
   <outline>
     <contour>
-      <point x="616" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="312" y="0"/>
       <point x="182" y="173"/>
-      <point x="182" y="584" type="curve" name="sh01" smooth="yes"/>
+      <point x="182" y="584" type="curve" smooth="yes" name="sh01"/>
       <point x="182" y="1186" type="line" name="av01"/>
       <point x="433" y="1186" type="line"/>
-      <point x="433" y="510" type="line" name="sh02" smooth="yes"/>
+      <point x="433" y="510" type="line" smooth="yes" name="sh02"/>
       <point x="433" y="354"/>
       <point x="500" y="267"/>
-      <point x="616" y="267" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="267" type="curve" smooth="yes" name="sv01"/>
       <point x="732" y="267"/>
       <point x="799" y="354"/>
-      <point x="799" y="510" type="curve" name="ah01" smooth="yes"/>
+      <point x="799" y="510" type="curve" smooth="yes" name="ah01"/>
       <point x="799" y="1186" type="line" name="av02"/>
       <point x="1050" y="1186" type="line"/>
-      <point x="1050" y="584" type="line" name="sh03" smooth="yes"/>
+      <point x="1050" y="584" type="line" smooth="yes" name="sh03"/>
       <point x="1050" y="173"/>
       <point x="920" y="0"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/universal.glif b/source/Hack-BoldItalic.ufo/glyphs/universal.glif
index 2d48f6713..0a87210b5 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/universal.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/universal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="universal" format="1">
+<glyph name="universal" format="2">
   <advance width="1233"/>
   <unicode hex="2200"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uogonek.glif b/source/Hack-BoldItalic.ufo/glyphs/uogonek.glif
index 373b86bcd..01623d157 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uogonek.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uogonek.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uogonek" format="1">
+<glyph name="uogonek" format="2">
   <advance width="1233"/>
   <unicode hex="0173"/>
   <outline>
     <contour>
-      <point x="823" y="-182" type="curve" name="hr00" smooth="yes"/>
+      <point x="823" y="-182" type="curve" smooth="yes" name="hr00"/>
       <point x="823" y="-221"/>
       <point x="854" y="-254"/>
-      <point x="923" y="-254" type="curve" name="dv02" smooth="yes"/>
+      <point x="923" y="-254" type="curve" smooth="yes" name="dv02"/>
       <point x="959" y="-254"/>
       <point x="1016" y="-246"/>
       <point x="1079" y="-223" type="curve"/>
       <point x="1048" y="-379" type="line"/>
       <point x="983" y="-394"/>
       <point x="920" y="-401"/>
-      <point x="869" y="-401" type="curve" name="dv01" smooth="yes"/>
+      <point x="869" y="-401" type="curve" smooth="yes" name="dv01"/>
       <point x="732" y="-401"/>
       <point x="649" y="-350"/>
       <point x="649" y="-255" type="curve" smooth="yes"/>
@@ -25,22 +25,22 @@
       <point x="688" y="166" type="line" name="iv01"/>
       <point x="628" y="45"/>
       <point x="513" y="-29"/>
-      <point x="368" y="-29" type="curve" name="sv01" smooth="yes"/>
+      <point x="368" y="-29" type="curve" smooth="yes" name="sv01"/>
       <point x="204" y="-29"/>
       <point x="106" y="67"/>
-      <point x="106" y="244" type="curve" name="dh01" smooth="yes"/>
+      <point x="106" y="244" type="curve" smooth="yes" name="dh01"/>
       <point x="106" y="283"/>
       <point x="111" y="327"/>
       <point x="123" y="391" type="curve" smooth="yes"/>
       <point x="266" y="1120" type="line" name="at01"/>
       <point x="557" y="1120" type="line"/>
-      <point x="426" y="436" type="line" name="hr01" smooth="yes"/>
+      <point x="426" y="436" type="line" smooth="yes" name="hr01"/>
       <point x="419" y="400"/>
       <point x="416" y="362"/>
-      <point x="416" y="338" type="curve" name="dh02" smooth="yes"/>
+      <point x="416" y="338" type="curve" smooth="yes" name="dh02"/>
       <point x="416" y="251"/>
       <point x="456" y="211"/>
-      <point x="528" y="211" type="curve" name="hr02" smooth="yes"/>
+      <point x="528" y="211" type="curve" smooth="yes" name="hr02"/>
       <point x="635" y="211"/>
       <point x="715" y="298"/>
       <point x="752" y="489" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/upblock.glif b/source/Hack-BoldItalic.ufo/glyphs/upblock.glif
index 98203446b..d75b178db 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/upblock.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/upblock.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="upblock" format="1">
+<glyph name="upblock" format="2">
   <advance width="1233"/>
   <unicode hex="2580"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/upsilon.glif b/source/Hack-BoldItalic.ufo/glyphs/upsilon.glif
index ec73d8afe..b3d6ccae8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/upsilon.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/upsilon.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="upsilon" format="1">
+<glyph name="upsilon" format="2">
   <advance width="1233"/>
   <unicode hex="03C5"/>
   <outline>
     <contour>
-      <point x="494" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="494" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="260" y="0"/>
       <point x="179" y="88"/>
-      <point x="179" y="232" type="curve" name="sh01" smooth="yes"/>
+      <point x="179" y="232" type="curve" smooth="yes" name="sh01"/>
       <point x="179" y="271"/>
       <point x="185" y="320"/>
       <point x="196" y="379" type="curve"/>
@@ -15,26 +15,26 @@
       <point x="131" y="895" type="line"/>
       <point x="175" y="1120" type="line" name="sh03"/>
       <point x="632" y="1120" type="line"/>
-      <point x="485" y="365" type="line" name="sh04" smooth="yes"/>
+      <point x="485" y="365" type="line" smooth="yes" name="sh04"/>
       <point x="482" y="350"/>
       <point x="481" y="336"/>
-      <point x="481" y="325" type="curve" name="sh02" smooth="yes"/>
+      <point x="481" y="325" type="curve" smooth="yes" name="sh02"/>
       <point x="481" y="254"/>
       <point x="525" y="225"/>
-      <point x="586" y="225" type="curve" name="sv02" smooth="yes"/>
+      <point x="586" y="225" type="curve" smooth="yes" name="sv02"/>
       <point x="711" y="225"/>
       <point x="811" y="356"/>
       <point x="871" y="640" type="curve" smooth="yes"/>
       <point x="886" y="711"/>
       <point x="897" y="784"/>
-      <point x="897" y="888" type="curve" name="ah01" smooth="yes"/>
+      <point x="897" y="888" type="curve" smooth="yes" name="ah01"/>
       <point x="897" y="990"/>
       <point x="886" y="1057"/>
       <point x="836" y="1120" type="curve" name="ih01"/>
       <point x="1127" y="1120" type="line"/>
       <point x="1162" y="1060"/>
       <point x="1181" y="956"/>
-      <point x="1181" y="835" type="curve" name="sh05" smooth="yes"/>
+      <point x="1181" y="835" type="curve" smooth="yes" name="sh05"/>
       <point x="1181" y="762"/>
       <point x="1174" y="702"/>
       <point x="1162" y="638" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/upsilondieresis.glif b/source/Hack-BoldItalic.ufo/glyphs/upsilondieresis.glif
index 25afcb201..6381d9ad0 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/upsilondieresis.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/upsilondieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="upsilondieresis" format="1">
+<glyph name="upsilondieresis" format="2">
   <advance width="1233"/>
   <unicode hex="03CB"/>
   <outline>
     <contour>
-      <point x="429" y="1320" type="line" name="hr00" smooth="yes"/>
+      <point x="429" y="1320" type="line" smooth="yes" name="hr00"/>
       <point x="409" y="1320"/>
       <point x="398" y="1333"/>
       <point x="402" y="1353" type="curve" smooth="yes"/>
       <point x="438" y="1539" type="line"/>
       <point x="441" y="1557"/>
       <point x="451" y="1566"/>
-      <point x="470" y="1566" type="curve" name="sh03" smooth="yes"/>
+      <point x="470" y="1566" type="curve" smooth="yes" name="sh03"/>
       <point x="647" y="1566" type="line" smooth="yes"/>
       <point x="668" y="1566"/>
       <point x="677" y="1553"/>
@@ -22,14 +22,14 @@
       <point x="604" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="824" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="824" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="804" y="1320"/>
       <point x="793" y="1333"/>
       <point x="797" y="1353" type="curve" smooth="yes"/>
       <point x="833" y="1539" type="line"/>
       <point x="836" y="1557"/>
       <point x="846" y="1566"/>
-      <point x="865" y="1566" type="curve" name="at01" smooth="yes"/>
+      <point x="865" y="1566" type="curve" smooth="yes" name="at01"/>
       <point x="1043" y="1566" type="line" smooth="yes"/>
       <point x="1064" y="1566"/>
       <point x="1073" y="1553"/>
@@ -37,13 +37,13 @@
       <point x="1032" y="1347" type="line" smooth="yes"/>
       <point x="1029" y="1329"/>
       <point x="1018" y="1320"/>
-      <point x="1000" y="1320" type="curve" name="sv02" smooth="yes"/>
+      <point x="1000" y="1320" type="curve" smooth="yes" name="sv02"/>
     </contour>
     <contour>
-      <point x="484" y="0" type="curve" name="sh04" smooth="yes"/>
+      <point x="484" y="0" type="curve" smooth="yes" name="sh04"/>
       <point x="250" y="0"/>
       <point x="169" y="88"/>
-      <point x="169" y="232" type="curve" name="sh01" smooth="yes"/>
+      <point x="169" y="232" type="curve" smooth="yes" name="sh01"/>
       <point x="169" y="271"/>
       <point x="175" y="320"/>
       <point x="186" y="379" type="curve"/>
@@ -51,26 +51,26 @@
       <point x="121" y="895" type="line"/>
       <point x="165" y="1120" type="line" name="sh05"/>
       <point x="622" y="1120" type="line"/>
-      <point x="475" y="365" type="line" name="sh06" smooth="yes"/>
+      <point x="475" y="365" type="line" smooth="yes" name="sh06"/>
       <point x="472" y="350"/>
       <point x="471" y="336"/>
-      <point x="471" y="325" type="curve" name="sh02" smooth="yes"/>
+      <point x="471" y="325" type="curve" smooth="yes" name="sh02"/>
       <point x="471" y="254"/>
       <point x="515" y="225"/>
-      <point x="576" y="225" type="curve" name="sv04" smooth="yes"/>
+      <point x="576" y="225" type="curve" smooth="yes" name="sv04"/>
       <point x="701" y="225"/>
       <point x="801" y="356"/>
       <point x="861" y="640" type="curve" smooth="yes"/>
       <point x="876" y="711"/>
       <point x="887" y="784"/>
-      <point x="887" y="888" type="curve" name="ah01" smooth="yes"/>
+      <point x="887" y="888" type="curve" smooth="yes" name="ah01"/>
       <point x="887" y="990"/>
       <point x="876" y="1057"/>
       <point x="826" y="1120" type="curve" name="ih01"/>
       <point x="1117" y="1120" type="line"/>
       <point x="1152" y="1060"/>
       <point x="1171" y="956"/>
-      <point x="1171" y="835" type="curve" name="sh07" smooth="yes"/>
+      <point x="1171" y="835" type="curve" smooth="yes" name="sh07"/>
       <point x="1171" y="762"/>
       <point x="1164" y="702"/>
       <point x="1152" y="638" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/upsilondieresistonos.glif b/source/Hack-BoldItalic.ufo/glyphs/upsilondieresistonos.glif
index 0997502e1..615d9a4a1 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/upsilondieresistonos.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/upsilondieresistonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="upsilondieresistonos" format="1">
+<glyph name="upsilondieresistonos" format="2">
   <advance width="1233"/>
   <unicode hex="03B0"/>
   <outline>
@@ -10,14 +10,14 @@
       <point x="641" y="1570" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="379" y="1339" type="line" name="dv01" smooth="yes"/>
+      <point x="379" y="1339" type="line" smooth="yes" name="dv01"/>
       <point x="359" y="1339"/>
       <point x="348" y="1352"/>
       <point x="352" y="1372" type="curve" smooth="yes"/>
       <point x="388" y="1558" type="line"/>
       <point x="391" y="1576"/>
       <point x="401" y="1585"/>
-      <point x="420" y="1585" type="curve" name="dv02" smooth="yes"/>
+      <point x="420" y="1585" type="curve" smooth="yes" name="dv02"/>
       <point x="597" y="1585" type="line" smooth="yes"/>
       <point x="618" y="1585"/>
       <point x="627" y="1572"/>
@@ -28,14 +28,14 @@
       <point x="554" y="1339" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="874" y="1339" type="line" name="sh04" smooth="yes"/>
+      <point x="874" y="1339" type="line" smooth="yes" name="sh04"/>
       <point x="854" y="1339"/>
       <point x="843" y="1352"/>
       <point x="847" y="1372" type="curve" smooth="yes"/>
       <point x="883" y="1558" type="line" name="sh05"/>
       <point x="886" y="1576"/>
       <point x="896" y="1585"/>
-      <point x="915" y="1585" type="curve" name="sv01" smooth="yes"/>
+      <point x="915" y="1585" type="curve" smooth="yes" name="sv01"/>
       <point x="1093" y="1585" type="line" smooth="yes"/>
       <point x="1114" y="1585"/>
       <point x="1123" y="1572"/>
@@ -46,10 +46,10 @@
       <point x="1050" y="1339" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="484" y="0" type="curve" name="sh07" smooth="yes"/>
+      <point x="484" y="0" type="curve" smooth="yes" name="sh07"/>
       <point x="250" y="0"/>
       <point x="169" y="88"/>
-      <point x="169" y="232" type="curve" name="sh01" smooth="yes"/>
+      <point x="169" y="232" type="curve" smooth="yes" name="sh01"/>
       <point x="169" y="271"/>
       <point x="175" y="320"/>
       <point x="186" y="379" type="curve"/>
@@ -57,26 +57,26 @@
       <point x="121" y="895" type="line"/>
       <point x="165" y="1120" type="line" name="sh02"/>
       <point x="622" y="1120" type="line"/>
-      <point x="475" y="365" type="line" name="sh08" smooth="yes"/>
+      <point x="475" y="365" type="line" smooth="yes" name="sh08"/>
       <point x="472" y="350"/>
       <point x="471" y="336"/>
-      <point x="471" y="325" type="curve" name="sh06" smooth="yes"/>
+      <point x="471" y="325" type="curve" smooth="yes" name="sh06"/>
       <point x="471" y="254"/>
       <point x="515" y="225"/>
-      <point x="576" y="225" type="curve" name="sv03" smooth="yes"/>
+      <point x="576" y="225" type="curve" smooth="yes" name="sv03"/>
       <point x="701" y="225"/>
       <point x="801" y="356"/>
       <point x="861" y="640" type="curve" smooth="yes"/>
       <point x="876" y="711"/>
       <point x="887" y="784"/>
-      <point x="887" y="888" type="curve" name="ah01" smooth="yes"/>
+      <point x="887" y="888" type="curve" smooth="yes" name="ah01"/>
       <point x="887" y="990"/>
       <point x="876" y="1057"/>
       <point x="826" y="1120" type="curve" name="ih02"/>
       <point x="1117" y="1120" type="line"/>
       <point x="1152" y="1060"/>
       <point x="1171" y="956"/>
-      <point x="1171" y="835" type="curve" name="sh03" smooth="yes"/>
+      <point x="1171" y="835" type="curve" smooth="yes" name="sh03"/>
       <point x="1171" y="762"/>
       <point x="1164" y="702"/>
       <point x="1152" y="638" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/upsilontonos.glif b/source/Hack-BoldItalic.ufo/glyphs/upsilontonos.glif
index ab58eecd1..b500ceb5b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/upsilontonos.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/upsilontonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="upsilontonos" format="1">
+<glyph name="upsilontonos" format="2">
   <advance width="1233"/>
   <unicode hex="03CD"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="549" y="1272" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="484" y="0" type="curve" name="sh05" smooth="yes"/>
+      <point x="484" y="0" type="curve" smooth="yes" name="sh05"/>
       <point x="250" y="0"/>
       <point x="169" y="88"/>
-      <point x="169" y="232" type="curve" name="sh01" smooth="yes"/>
+      <point x="169" y="232" type="curve" smooth="yes" name="sh01"/>
       <point x="169" y="271"/>
       <point x="175" y="320"/>
       <point x="186" y="379" type="curve"/>
@@ -21,26 +21,26 @@
       <point x="121" y="895" type="line"/>
       <point x="165" y="1120" type="line" name="sh02"/>
       <point x="622" y="1120" type="line"/>
-      <point x="475" y="365" type="line" name="sh06" smooth="yes"/>
+      <point x="475" y="365" type="line" smooth="yes" name="sh06"/>
       <point x="472" y="350"/>
       <point x="471" y="336"/>
-      <point x="471" y="325" type="curve" name="sh04" smooth="yes"/>
+      <point x="471" y="325" type="curve" smooth="yes" name="sh04"/>
       <point x="471" y="254"/>
       <point x="515" y="225"/>
-      <point x="576" y="225" type="curve" name="sv02" smooth="yes"/>
+      <point x="576" y="225" type="curve" smooth="yes" name="sv02"/>
       <point x="701" y="225"/>
       <point x="801" y="356"/>
       <point x="861" y="640" type="curve" smooth="yes"/>
       <point x="876" y="711"/>
       <point x="887" y="784"/>
-      <point x="887" y="888" type="curve" name="ah01" smooth="yes"/>
+      <point x="887" y="888" type="curve" smooth="yes" name="ah01"/>
       <point x="887" y="990"/>
       <point x="876" y="1057"/>
       <point x="826" y="1120" type="curve" name="ih02"/>
       <point x="1117" y="1120" type="line"/>
       <point x="1152" y="1060"/>
       <point x="1171" y="956"/>
-      <point x="1171" y="835" type="curve" name="sh03" smooth="yes"/>
+      <point x="1171" y="835" type="curve" smooth="yes" name="sh03"/>
       <point x="1171" y="762"/>
       <point x="1164" y="702"/>
       <point x="1152" y="638" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/uring.glif b/source/Hack-BoldItalic.ufo/glyphs/uring.glif
index e4bf7923c..7ac8ad792 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/uring.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/uring.glif
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uring" format="1">
+<glyph name="uring" format="2">
   <advance width="1233"/>
   <unicode hex="016F"/>
   <outline>
     <contour>
-      <point x="737" y="1254" type="curve" name="dv02" smooth="yes"/>
+      <point x="737" y="1254" type="curve" smooth="yes" name="dv02"/>
       <point x="579" y="1254"/>
       <point x="453" y="1382"/>
-      <point x="453" y="1539" type="curve" name="dh02" smooth="yes"/>
+      <point x="453" y="1539" type="curve" smooth="yes" name="dh02"/>
       <point x="453" y="1696"/>
       <point x="579" y="1824"/>
-      <point x="737" y="1824" type="curve" name="hr01" smooth="yes"/>
+      <point x="737" y="1824" type="curve" smooth="yes" name="hr01"/>
       <point x="894" y="1824"/>
       <point x="1022" y="1696"/>
-      <point x="1022" y="1539" type="curve" name="dh05" smooth="yes"/>
+      <point x="1022" y="1539" type="curve" smooth="yes" name="dh05"/>
       <point x="1022" y="1382"/>
       <point x="894" y="1254"/>
     </contour>
     <contour>
-      <point x="737" y="1408" type="curve" name="dv03" smooth="yes"/>
+      <point x="737" y="1408" type="curve" smooth="yes" name="dv03"/>
       <point x="809" y="1408"/>
       <point x="869" y="1467"/>
-      <point x="869" y="1539" type="curve" name="dh04" smooth="yes"/>
+      <point x="869" y="1539" type="curve" smooth="yes" name="dh04"/>
       <point x="869" y="1611"/>
       <point x="809" y="1670"/>
-      <point x="737" y="1670" type="curve" name="dv01" smooth="yes"/>
+      <point x="737" y="1670" type="curve" smooth="yes" name="dv01"/>
       <point x="665" y="1670"/>
       <point x="606" y="1611"/>
-      <point x="606" y="1539" type="curve" name="dh03" smooth="yes"/>
+      <point x="606" y="1539" type="curve" smooth="yes" name="dh03"/>
       <point x="606" y="1466"/>
       <point x="665" y="1408"/>
     </contour>
     <contour>
-      <point x="368" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="368" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="204" y="-29"/>
       <point x="106" y="67"/>
-      <point x="106" y="244" type="curve" name="dh01" smooth="yes"/>
+      <point x="106" y="244" type="curve" smooth="yes" name="dh01"/>
       <point x="106" y="283"/>
       <point x="111" y="327"/>
       <point x="123" y="391" type="curve" smooth="yes"/>
@@ -44,10 +44,10 @@
       <point x="426" y="436" type="line" smooth="yes"/>
       <point x="419" y="400"/>
       <point x="416" y="362"/>
-      <point x="416" y="338" type="curve" name="hr02" smooth="yes"/>
+      <point x="416" y="338" type="curve" smooth="yes" name="hr02"/>
       <point x="416" y="251"/>
       <point x="456" y="211"/>
-      <point x="528" y="211" type="curve" name="sv01" smooth="yes"/>
+      <point x="528" y="211" type="curve" smooth="yes" name="sv01"/>
       <point x="635" y="211"/>
       <point x="715" y="298"/>
       <point x="752" y="489" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/utilde.glif b/source/Hack-BoldItalic.ufo/glyphs/utilde.glif
index 94cd80a84..63bbedb24 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/utilde.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/utilde.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="utilde" format="1">
+<glyph name="utilde" format="2">
   <advance width="1233"/>
   <unicode hex="0169"/>
   <outline>
     <contour>
-      <point x="892" y="1270" type="curve" name="dv01" smooth="yes"/>
+      <point x="892" y="1270" type="curve" smooth="yes" name="dv01"/>
       <point x="839" y="1270"/>
       <point x="803" y="1286"/>
       <point x="749" y="1327" type="curve" smooth="yes"/>
@@ -14,21 +14,21 @@
       <point x="695" y="1368" type="curve" smooth="yes"/>
       <point x="667" y="1390"/>
       <point x="643" y="1401"/>
-      <point x="622" y="1401" type="curve" name="sv01" smooth="yes"/>
+      <point x="622" y="1401" type="curve" smooth="yes" name="sv01"/>
       <point x="577" y="1401"/>
       <point x="539" y="1352"/>
       <point x="526" y="1272" type="curve" name="sv02"/>
       <point x="387" y="1272" type="line"/>
       <point x="411" y="1445"/>
       <point x="510" y="1556"/>
-      <point x="638" y="1556" type="curve" name="at03" smooth="yes"/>
+      <point x="638" y="1556" type="curve" smooth="yes" name="at03"/>
       <point x="687" y="1556"/>
       <point x="716" y="1540"/>
       <point x="778" y="1495" type="curve" smooth="yes"/>
       <point x="829" y="1456" type="line" smooth="yes"/>
       <point x="856" y="1435"/>
       <point x="880" y="1425"/>
-      <point x="901" y="1425" type="curve" name="dv02" smooth="yes"/>
+      <point x="901" y="1425" type="curve" smooth="yes" name="dv02"/>
       <point x="952" y="1425"/>
       <point x="987" y="1474"/>
       <point x="999" y="1554" type="curve" name="at04"/>
@@ -37,10 +37,10 @@
       <point x="1024" y="1270"/>
     </contour>
     <contour>
-      <point x="368" y="-29" type="curve" name="sv04" smooth="yes"/>
+      <point x="368" y="-29" type="curve" smooth="yes" name="sv04"/>
       <point x="204" y="-29"/>
       <point x="106" y="67"/>
-      <point x="106" y="244" type="curve" name="hr02" smooth="yes"/>
+      <point x="106" y="244" type="curve" smooth="yes" name="hr02"/>
       <point x="106" y="283"/>
       <point x="111" y="327"/>
       <point x="123" y="391" type="curve" smooth="yes"/>
@@ -49,13 +49,13 @@
       <point x="426" y="436" type="line" smooth="yes"/>
       <point x="419" y="400"/>
       <point x="416" y="362"/>
-      <point x="416" y="338" type="curve" name="dh01" smooth="yes"/>
+      <point x="416" y="338" type="curve" smooth="yes" name="dh01"/>
       <point x="416" y="251"/>
       <point x="456" y="211"/>
-      <point x="528" y="211" type="curve" name="sv03" smooth="yes"/>
+      <point x="528" y="211" type="curve" smooth="yes" name="sv03"/>
       <point x="635" y="211"/>
       <point x="715" y="298"/>
-      <point x="752" y="489" type="curve" name="hr03" smooth="yes"/>
+      <point x="752" y="489" type="curve" smooth="yes" name="hr03"/>
       <point x="874" y="1120" type="line" name="at02"/>
       <point x="1165" y="1120" type="line"/>
       <point x="948" y="0" type="line" name="ab01"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/v.glif b/source/Hack-BoldItalic.ufo/glyphs/v.glif
index 1bd15d555..f9010ab33 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/v.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/v.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="v" format="1">
+<glyph name="v" format="2">
   <advance width="1233"/>
   <unicode hex="0076"/>
   <outline>
@@ -14,9 +14,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/w.glif b/source/Hack-BoldItalic.ufo/glyphs/w.glif
index 62c5f18b1..cfb2ee76c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/w.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/w.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="w" format="1">
+<glyph name="w" format="2">
   <advance width="1233"/>
   <unicode hex="0077"/>
   <outline>
@@ -13,16 +13,16 @@
       <point x="1073" y="1120" type="line"/>
       <point x="1325" y="1120" type="line"/>
       <point x="907" y="0" type="line"/>
-      <point x="617.5" y="-0" type="line"/>
+      <point x="617.5" y="0" type="line"/>
       <point x="617.5" y="590" type="line"/>
       <point x="369" y="0" type="line"/>
-      <point x="93" y="-0" type="line"/>
+      <point x="93" y="0" type="line"/>
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/wacute.glif b/source/Hack-BoldItalic.ufo/glyphs/wacute.glif
index e40295cdc..f82e28b8a 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/wacute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/wacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="wacute" format="1">
+<glyph name="wacute" format="2">
   <advance width="1233"/>
   <unicode hex="1E83"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/wcircumflex.glif b/source/Hack-BoldItalic.ufo/glyphs/wcircumflex.glif
index 3ee7dec73..0c6da769c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/wcircumflex.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/wcircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="wcircumflex" format="1">
+<glyph name="wcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0175"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/wdieresis.glif b/source/Hack-BoldItalic.ufo/glyphs/wdieresis.glif
index 2390e4d2f..20a7d5d3b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/wdieresis.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/wdieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="wdieresis" format="1">
+<glyph name="wdieresis" format="2">
   <advance width="1233"/>
   <unicode hex="1E85"/>
   <outline>
     <contour>
-      <point x="467" y="1320" type="line" name="hr00" smooth="yes"/>
+      <point x="467" y="1320" type="line" smooth="yes" name="hr00"/>
       <point x="447" y="1320"/>
       <point x="436" y="1333"/>
       <point x="440" y="1353" type="curve" smooth="yes"/>
       <point x="476" y="1539" type="line"/>
       <point x="479" y="1557"/>
       <point x="489" y="1566"/>
-      <point x="508" y="1566" type="curve" name="at03" smooth="yes"/>
+      <point x="508" y="1566" type="curve" smooth="yes" name="at03"/>
       <point x="685" y="1566" type="line" smooth="yes"/>
       <point x="703" y="1566"/>
       <point x="712" y="1558"/>
@@ -25,14 +25,14 @@
       <point x="642" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="862" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="862" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="842" y="1320"/>
       <point x="831" y="1333"/>
       <point x="835" y="1353" type="curve" smooth="yes"/>
       <point x="871" y="1539" type="line"/>
       <point x="874" y="1557"/>
       <point x="884" y="1566"/>
-      <point x="903" y="1566" type="curve" name="at04" smooth="yes"/>
+      <point x="903" y="1566" type="curve" smooth="yes" name="at04"/>
       <point x="1081" y="1566" type="line" smooth="yes"/>
       <point x="1099" y="1566"/>
       <point x="1108" y="1558"/>
@@ -43,7 +43,7 @@
       <point x="1070" y="1347" type="line" smooth="yes"/>
       <point x="1067" y="1329"/>
       <point x="1056" y="1320"/>
-      <point x="1038" y="1320" type="curve" name="sv02" smooth="yes"/>
+      <point x="1038" y="1320" type="curve" smooth="yes" name="sv02"/>
     </contour>
     <contour>
       <point x="96" y="1120" type="line" name="at01"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/wgrave.glif b/source/Hack-BoldItalic.ufo/glyphs/wgrave.glif
index a29cb5a27..35aa04352 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/wgrave.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/wgrave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="wgrave" format="1">
+<glyph name="wgrave" format="2">
   <advance width="1233"/>
   <unicode hex="1E81"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/x.glif b/source/Hack-BoldItalic.ufo/glyphs/x.glif
index f27454e20..b5bc12b1f 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/x.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/x.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="x" format="1">
+<glyph name="x" format="2">
   <advance width="1233"/>
   <unicode hex="0078"/>
   <outline>
@@ -19,9 +19,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/xi.glif b/source/Hack-BoldItalic.ufo/glyphs/xi.glif
index 2a42aab37..a4a7a07a6 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/xi.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/xi.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="xi" format="1">
+<glyph name="xi" format="2">
   <advance width="1233"/>
   <unicode hex="03BE"/>
   <outline>
@@ -10,19 +10,19 @@
       <point x="750" y="-104" type="curve" smooth="yes"/>
       <point x="751" y="-97"/>
       <point x="752" y="-90"/>
-      <point x="752" y="-83" type="curve" name="dh02" smooth="yes"/>
+      <point x="752" y="-83" type="curve" smooth="yes" name="dh02"/>
       <point x="752" y="-34"/>
       <point x="725" y="-7"/>
       <point x="652" y="0" type="curve"/>
       <point x="555" y="12"/>
       <point x="121" y="6"/>
-      <point x="121" y="322" type="curve" name="dh01" smooth="yes"/>
+      <point x="121" y="322" type="curve" smooth="yes" name="dh01"/>
       <point x="121" y="526"/>
       <point x="305" y="731"/>
       <point x="576" y="779" type="curve" name="ih02"/>
       <point x="387" y="806"/>
       <point x="306" y="901"/>
-      <point x="306" y="1008" type="curve" name="ih01" smooth="yes"/>
+      <point x="306" y="1008" type="curve" smooth="yes" name="ih01"/>
       <point x="306" y="1133"/>
       <point x="414" y="1272"/>
       <point x="585" y="1331" type="curve" name="ih03"/>
@@ -32,7 +32,7 @@
       <point x="1214" y="1331" type="line" name="sv01"/>
       <point x="809" y="1331"/>
       <point x="610" y="1202"/>
-      <point x="610" y="1082" type="curve" name="sh01" smooth="yes"/>
+      <point x="610" y="1082" type="curve" smooth="yes" name="sh01"/>
       <point x="610" y="980"/>
       <point x="749" y="888"/>
       <point x="1025" y="880" type="curve" name="dv02"/>
@@ -42,13 +42,13 @@
       <point x="425" y="410" type="curve" smooth="yes"/>
       <point x="423" y="399"/>
       <point x="422" y="388"/>
-      <point x="422" y="378" type="curve" name="hr02" smooth="yes"/>
+      <point x="422" y="378" type="curve" smooth="yes" name="hr02"/>
       <point x="422" y="249"/>
       <point x="585" y="233"/>
       <point x="696" y="225" type="curve"/>
       <point x="767" y="221"/>
       <point x="958" y="196"/>
-      <point x="958" y="-20" type="curve" name="dh03" smooth="yes"/>
+      <point x="958" y="-20" type="curve" smooth="yes" name="dh03"/>
       <point x="958" y="-46"/>
       <point x="955" y="-74"/>
       <point x="949" y="-104" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/y.glif b/source/Hack-BoldItalic.ufo/glyphs/y.glif
index 1635cb1a4..43c2e03dd 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/y.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/y.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="y" format="1">
+<glyph name="y" format="2">
   <advance width="1233"/>
   <unicode hex="0079"/>
   <outline>
@@ -21,9 +21,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/yacute.glif b/source/Hack-BoldItalic.ufo/glyphs/yacute.glif
index 6775952f4..7e6492008 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/yacute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/yacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="yacute" format="1">
+<glyph name="yacute" format="2">
   <advance width="1233"/>
   <unicode hex="00FD"/>
   <outline>
@@ -30,7 +30,7 @@
       <point x="383" y="-372" type="curve" smooth="yes"/>
       <point x="332" y="-407"/>
       <point x="259" y="-424"/>
-      <point x="175" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="175" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="-65" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ycircumflex.glif b/source/Hack-BoldItalic.ufo/glyphs/ycircumflex.glif
index cc734669a..af15c6caa 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ycircumflex.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ycircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ycircumflex" format="1">
+<glyph name="ycircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0177"/>
   <outline>
@@ -27,7 +27,7 @@
       <point x="576" y="-121" type="line" smooth="yes"/>
       <point x="426" y="-386"/>
       <point x="343" y="-424"/>
-      <point x="175" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="175" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="-65" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ydieresis.glif b/source/Hack-BoldItalic.ufo/glyphs/ydieresis.glif
index 29d5955b9..3f6d93ccb 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ydieresis.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ydieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ydieresis" format="1">
+<glyph name="ydieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00FF"/>
   <outline>
     <contour>
-      <point x="484" y="1320" type="line" name="hr00" smooth="yes"/>
+      <point x="484" y="1320" type="line" smooth="yes" name="hr00"/>
       <point x="464" y="1320"/>
       <point x="453" y="1333"/>
       <point x="457" y="1353" type="curve" smooth="yes"/>
       <point x="493" y="1539" type="line"/>
       <point x="496" y="1557"/>
       <point x="506" y="1566"/>
-      <point x="525" y="1566" type="curve" name="at03" smooth="yes"/>
+      <point x="525" y="1566" type="curve" smooth="yes" name="at03"/>
       <point x="702" y="1566" type="line" smooth="yes"/>
       <point x="720" y="1566"/>
       <point x="729" y="1558"/>
@@ -25,14 +25,14 @@
       <point x="659" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="879" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="879" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="859" y="1320"/>
       <point x="848" y="1333"/>
       <point x="852" y="1353" type="curve" smooth="yes"/>
       <point x="888" y="1539" type="line"/>
       <point x="891" y="1557"/>
       <point x="901" y="1566"/>
-      <point x="920" y="1566" type="curve" name="at04" smooth="yes"/>
+      <point x="920" y="1566" type="curve" smooth="yes" name="at04"/>
       <point x="1098" y="1566" type="line" smooth="yes"/>
       <point x="1116" y="1566"/>
       <point x="1125" y="1558"/>
@@ -43,7 +43,7 @@
       <point x="1087" y="1347" type="line" smooth="yes"/>
       <point x="1084" y="1329"/>
       <point x="1073" y="1320"/>
-      <point x="1055" y="1320" type="curve" name="sv02" smooth="yes"/>
+      <point x="1055" y="1320" type="curve" smooth="yes" name="sv02"/>
     </contour>
     <contour>
       <point x="-20" y="-201" type="line" name="sv03"/>
@@ -66,7 +66,7 @@
       <point x="383" y="-372" type="curve" smooth="yes"/>
       <point x="332" y="-407"/>
       <point x="259" y="-424"/>
-      <point x="175" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="175" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="-65" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/yen.glif b/source/Hack-BoldItalic.ufo/glyphs/yen.glif
index 212fbeaa3..196f07212 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/yen.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/yen.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="yen" format="1">
+<glyph name="yen" format="2">
   <advance width="1233"/>
   <unicode hex="00A5"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/ygrave.glif b/source/Hack-BoldItalic.ufo/glyphs/ygrave.glif
index 6cfb4db73..e681e1fef 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/ygrave.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/ygrave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ygrave" format="1">
+<glyph name="ygrave" format="2">
   <advance width="1233"/>
   <unicode hex="1EF3"/>
   <outline>
@@ -24,7 +24,7 @@
       <point x="576" y="-121" type="line" smooth="yes"/>
       <point x="426" y="-386"/>
       <point x="343" y="-424"/>
-      <point x="175" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="175" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="-65" y="-424" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/z.glif b/source/Hack-BoldItalic.ufo/glyphs/z.glif
index f853a7ba7..7e3596770 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/z.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/z.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="z" format="1">
+<glyph name="z" format="2">
   <advance width="1233"/>
   <unicode hex="007A"/>
   <outline>
@@ -17,9 +17,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/zacute.glif b/source/Hack-BoldItalic.ufo/glyphs/zacute.glif
index ccc363439..c361dfc01 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/zacute.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/zacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="zacute" format="1">
+<glyph name="zacute" format="2">
   <advance width="1233"/>
   <unicode hex="017A"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/zcaron.glif b/source/Hack-BoldItalic.ufo/glyphs/zcaron.glif
index 41d38636e..4508fb8b8 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/zcaron.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/zcaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="zcaron" format="1">
+<glyph name="zcaron" format="2">
   <advance width="1233"/>
   <unicode hex="017E"/>
   <outline>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/zdotaccent.glif b/source/Hack-BoldItalic.ufo/glyphs/zdotaccent.glif
index a80d26efb..6907bd6df 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/zdotaccent.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/zdotaccent.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="zdotaccent" format="1">
+<glyph name="zdotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="017C"/>
   <outline>
     <contour>
-      <point x="667" y="1320" type="line" name="hr00" smooth="yes"/>
+      <point x="667" y="1320" type="line" smooth="yes" name="hr00"/>
       <point x="646" y="1320"/>
       <point x="637" y="1333"/>
       <point x="641" y="1353" type="curve" smooth="yes"/>
       <point x="678" y="1539" type="line"/>
       <point x="681" y="1557"/>
       <point x="691" y="1566"/>
-      <point x="710" y="1566" type="curve" name="at01" smooth="yes"/>
+      <point x="710" y="1566" type="curve" smooth="yes" name="at01"/>
       <point x="922" y="1566" type="line" smooth="yes"/>
       <point x="942" y="1566"/>
       <point x="953" y="1553"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/zero.glif b/source/Hack-BoldItalic.ufo/glyphs/zero.glif
index a416b546a..18582461b 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/zero.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/zero.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="zero" format="1">
+<glyph name="zero" format="2">
   <advance width="1233"/>
   <unicode hex="0030"/>
   <outline>
     <contour>
-      <point x="504" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="504" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="360" y="-29"/>
       <point x="262" y="13"/>
       <point x="195" y="98" type="curve" smooth="yes"/>
       <point x="131" y="181"/>
       <point x="98" y="300"/>
-      <point x="98" y="477" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="477" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="553"/>
       <point x="104" y="611"/>
       <point x="113" y="675" type="curve" smooth="yes"/>
@@ -31,13 +31,13 @@
       <point x="508" y="1452" type="curve" smooth="yes"/>
       <point x="589" y="1497"/>
       <point x="679" y="1520"/>
-      <point x="786" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="786" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="935" y="1520"/>
       <point x="1032" y="1475"/>
       <point x="1096" y="1394" type="curve" smooth="yes"/>
       <point x="1163" y="1310"/>
       <point x="1195" y="1186"/>
-      <point x="1195" y="1023" type="curve" name="sh02" smooth="yes"/>
+      <point x="1195" y="1023" type="curve" smooth="yes" name="sh02"/>
       <point x="1195" y="899"/>
       <point x="1177" y="751"/>
       <point x="1138" y="606" type="curve" smooth="yes"/>
@@ -54,7 +54,7 @@
       <point x="610" y="-29"/>
     </contour>
     <contour>
-      <point x="529" y="165" type="curve" name="dv01" smooth="yes"/>
+      <point x="529" y="165" type="curve" smooth="yes" name="dv01"/>
       <point x="558" y="165"/>
       <point x="582" y="169"/>
       <point x="607" y="177" type="curve" smooth="yes"/>
@@ -81,10 +81,10 @@
       <point x="941" y="816" type="curve"/>
       <point x="956" y="904"/>
       <point x="962" y="980"/>
-      <point x="962" y="1051" type="curve" name="ah01" smooth="yes"/>
+      <point x="962" y="1051" type="curve" smooth="yes" name="ah01"/>
       <point x="962" y="1100"/>
       <point x="961" y="1124"/>
-      <point x="954" y="1160" type="curve" name="sh05" smooth="yes"/>
+      <point x="954" y="1160" type="curve" smooth="yes" name="sh05"/>
       <point x="953" y="1167"/>
       <point x="948" y="1190"/>
       <point x="945" y="1201" type="curve" smooth="yes"/>
@@ -96,7 +96,7 @@
       <point x="914" y="1264" type="curve" smooth="yes"/>
       <point x="884" y="1305"/>
       <point x="832" y="1326"/>
-      <point x="766" y="1326" type="curve" name="sv01" smooth="yes"/>
+      <point x="766" y="1326" type="curve" smooth="yes" name="sv01"/>
       <point x="710" y="1326"/>
       <point x="658" y="1310"/>
       <point x="614" y="1279" type="curve" smooth="yes"/>
@@ -108,7 +108,7 @@
       <point x="376" y="807" type="curve" smooth="yes"/>
       <point x="344" y="670"/>
       <point x="329" y="532"/>
-      <point x="329" y="433" type="curve" name="sh06" smooth="yes"/>
+      <point x="329" y="433" type="curve" smooth="yes" name="sh06"/>
       <point x="329" y="332"/>
       <point x="344" y="269"/>
       <point x="379" y="226" type="curve" smooth="yes"/>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/zero.subs.glif b/source/Hack-BoldItalic.ufo/glyphs/zero.subs.glif
index 85beca65f..0d63e9946 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/zero.subs.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/zero.subs.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="zero.subs" format="1">
+<glyph name="zero.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="586" y="-445" type="curve" name="dv01" smooth="yes"/>
+      <point x="586" y="-445" type="curve" smooth="yes" name="dv01"/>
       <point x="409" y="-445"/>
       <point x="303" y="-360"/>
-      <point x="303" y="-176" type="curve" name="dh01" smooth="yes"/>
+      <point x="303" y="-176" type="curve" smooth="yes" name="dh01"/>
       <point x="303" y="-45"/>
       <point x="356" y="151"/>
       <point x="433" y="259" type="curve" smooth="yes"/>
       <point x="508" y="366"/>
       <point x="622" y="422"/>
-      <point x="766" y="422" type="curve" name="dv03" smooth="yes"/>
+      <point x="766" y="422" type="curve" smooth="yes" name="dv03"/>
       <point x="942" y="422"/>
       <point x="1050" y="336"/>
-      <point x="1050" y="155" type="curve" name="dh06" smooth="yes"/>
+      <point x="1050" y="155" type="curve" smooth="yes" name="dh06"/>
       <point x="1050" y="33"/>
       <point x="1000" y="-169"/>
       <point x="917" y="-284" type="curve"/>
@@ -23,22 +23,22 @@
       <point x="734" y="-445"/>
     </contour>
     <contour>
-      <point x="608" y="-307" type="curve" name="hr01" smooth="yes"/>
+      <point x="608" y="-307" type="curve" smooth="yes" name="hr01"/>
       <point x="679" y="-307"/>
       <point x="721" y="-261"/>
       <point x="756" y="-192" type="curve" smooth="yes"/>
       <point x="805" y="-92"/>
       <point x="841" y="68"/>
-      <point x="841" y="159" type="curve" name="dh05" smooth="yes"/>
+      <point x="841" y="159" type="curve" smooth="yes" name="dh05"/>
       <point x="841" y="243"/>
       <point x="812" y="283"/>
-      <point x="744" y="283" type="curve" name="dv02" smooth="yes"/>
+      <point x="744" y="283" type="curve" smooth="yes" name="dv02"/>
       <point x="677" y="283"/>
       <point x="632" y="245"/>
       <point x="595" y="169" type="curve" smooth="yes"/>
       <point x="549" y="75"/>
       <point x="511" y="-87"/>
-      <point x="511" y="-182" type="curve" name="dh02" smooth="yes"/>
+      <point x="511" y="-182" type="curve" smooth="yes" name="dh02"/>
       <point x="511" y="-265"/>
       <point x="543" y="-307"/>
     </contour>
@@ -46,13 +46,13 @@
       <point x="674" y="-82" type="curve" smooth="yes"/>
       <point x="626" y="-82"/>
       <point x="586" y="-52"/>
-      <point x="586" y="-13" type="curve" name="dh03" smooth="yes"/>
+      <point x="586" y="-13" type="curve" smooth="yes" name="dh03"/>
       <point x="586" y="28"/>
       <point x="626" y="59"/>
-      <point x="674" y="59" type="curve" name="sv01" smooth="yes"/>
+      <point x="674" y="59" type="curve" smooth="yes" name="sv01"/>
       <point x="722" y="59"/>
       <point x="765" y="28"/>
-      <point x="765" y="-11" type="curve" name="dh04" smooth="yes"/>
+      <point x="765" y="-11" type="curve" smooth="yes" name="dh04"/>
       <point x="765" y="-50"/>
       <point x="725" y="-82"/>
     </contour>
diff --git a/source/Hack-BoldItalic.ufo/glyphs/zeta.glif b/source/Hack-BoldItalic.ufo/glyphs/zeta.glif
index 7d574b295..bdac21c6c 100644
--- a/source/Hack-BoldItalic.ufo/glyphs/zeta.glif
+++ b/source/Hack-BoldItalic.ufo/glyphs/zeta.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="zeta" format="1">
+<glyph name="zeta" format="2">
   <advance width="1233"/>
   <unicode hex="03B6"/>
   <outline>
@@ -20,7 +20,7 @@
       <point x="459" y="534" type="curve" smooth="yes"/>
       <point x="420" y="336"/>
       <point x="503" y="233"/>
-      <point x="706" y="225" type="curve" name="sv02" smooth="yes"/>
+      <point x="706" y="225" type="curve" smooth="yes" name="sv02"/>
       <point x="891" y="217"/>
       <point x="999" y="107"/>
       <point x="959" y="-104" type="curve"/>
diff --git a/source/Hack-BoldItalic.ufo/layercontents.plist b/source/Hack-BoldItalic.ufo/layercontents.plist
new file mode 100644
index 000000000..cf95d3573
--- /dev/null
+++ b/source/Hack-BoldItalic.ufo/layercontents.plist
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<array>
+		<string>public.default</string>
+		<string>glyphs</string>
+	</array>
+</array>
+</plist>
diff --git a/source/Hack-BoldItalic.ufo/lib.plist b/source/Hack-BoldItalic.ufo/lib.plist
index c695d712f..17c1f30a1 100644
--- a/source/Hack-BoldItalic.ufo/lib.plist
+++ b/source/Hack-BoldItalic.ufo/lib.plist
@@ -1562,6 +1562,7 @@
 		<string>uni2077</string>
 		<string>uni2078</string>
 		<string>uni2079</string>
+		<string>ruble</string>
 		<string>guillemotleft</string>
 		<string>guillemotright</string>
 		<string>uni00B5</string>
diff --git a/source/Hack-BoldItalic.ufo/metainfo.plist b/source/Hack-BoldItalic.ufo/metainfo.plist
index 12a792239..632695b5a 100644
--- a/source/Hack-BoldItalic.ufo/metainfo.plist
+++ b/source/Hack-BoldItalic.ufo/metainfo.plist
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>creator</key>
-	<string>com.schriftgestaltung.GlyphsUFOExport</string>
+	<string>org.robofab.ufoLib</string>
 	<key>formatVersion</key>
-	<integer>2</integer>
+	<integer>3</integer>
 </dict>
 </plist>
diff --git a/source/Hack-Italic.ufo/fontinfo.plist b/source/Hack-Italic.ufo/fontinfo.plist
index 5c038b407..3f6fef558 100644
--- a/source/Hack-Italic.ufo/fontinfo.plist
+++ b/source/Hack-Italic.ufo/fontinfo.plist
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>ascender</key>
@@ -12,8 +12,10 @@
 	<integer>-492</integer>
 	<key>familyName</key>
 	<string>Hack</string>
+	<key>guidelines</key>
+	<array/>
 	<key>italicAngle</key>
-	<real>-11</real>
+	<real>-11.0</real>
 	<key>macintoshFONDFamilyID</key>
 	<integer>128</integer>
 	<key>macintoshFONDName</key>
@@ -23,8 +25,7 @@
 	<key>openTypeHeadCreated</key>
 	<string>2017/10/23 12:00:00</string>
 	<key>openTypeHeadFlags</key>
-	<array>
-	</array>
+	<array/>
 	<key>openTypeHheaAscender</key>
 	<integer>1901</integer>
 	<key>openTypeHheaDescender</key>
@@ -100,7 +101,7 @@ Except as contained in this notice, the names of Gnome, the Gnome Foundation, an
 	<key>openTypeNameUniqueID</key>
 	<string>SourceFoundry: Hack Italic: 2018</string>
 	<key>openTypeNameVersion</key>
-	<string>Version 3.003</string>
+	<string>Version 4.000</string>
 	<key>openTypeOS2CodePageRanges</key>
 	<array>
 		<integer>0</integer>
@@ -143,8 +144,7 @@ Except as contained in this notice, the names of Gnome, the Gnome Foundation, an
 		<integer>4</integer>
 	</array>
 	<key>openTypeOS2Selection</key>
-	<array>
-	</array>
+	<array/>
 	<key>openTypeOS2StrikeoutPosition</key>
 	<integer>530</integer>
 	<key>openTypeOS2StrikeoutSize</key>
@@ -214,7 +214,7 @@ Except as contained in this notice, the names of Gnome, the Gnome Foundation, an
 	<key>postscriptBlueFuzz</key>
 	<integer>0</integer>
 	<key>postscriptBlueScale</key>
-	<real>0.036999999999999998</real>
+	<real>0.037</real>
 	<key>postscriptBlueShift</key>
 	<integer>14</integer>
 	<key>postscriptBlueValues</key>
@@ -226,6 +226,10 @@ Except as contained in this notice, the names of Gnome, the Gnome Foundation, an
 		<integer>1493</integer>
 		<integer>1520</integer>
 	</array>
+	<key>postscriptFamilyBlues</key>
+	<array/>
+	<key>postscriptFamilyOtherBlues</key>
+	<array/>
 	<key>postscriptFontName</key>
 	<string>Hack-Italic</string>
 	<key>postscriptForceBold</key>
@@ -269,9 +273,9 @@ Except as contained in this notice, the names of Gnome, the Gnome Foundation, an
 	<key>unitsPerEm</key>
 	<integer>2048</integer>
 	<key>versionMajor</key>
-	<integer>3</integer>
+	<integer>4</integer>
 	<key>versionMinor</key>
-	<integer>003</integer>
+	<integer>0</integer>
 	<key>xHeight</key>
 	<integer>1120</integer>
 </dict>
diff --git a/source/Hack-Italic.ufo/glyphs/A_.glif b/source/Hack-Italic.ufo/glyphs/A_.glif
index b5bed9cf7..e659131be 100644
--- a/source/Hack-Italic.ufo/glyphs/A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/A_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="A" format="1">
+<glyph name="A" format="2">
   <advance width="1233"/>
   <unicode hex="0041"/>
   <outline>
     <contour>
-      <point x="639" y="1493" type="line" name="hr00"/>
+      <point x="639" y="1493" type="line"/>
       <point x="885" y="1493" type="line"/>
-      <point x="1051" y="0" type="line" name="ab01"/>
+      <point x="1051" y="0" type="line"/>
       <point x="850" y="0" type="line"/>
-      <point x="815" y="389" type="line" name="dv01"/>
+      <point x="815" y="389" type="line"/>
       <point x="295" y="389" type="line"/>
-      <point x="111" y="0" type="line" name="ab02"/>
+      <point x="111" y="0" type="line"/>
       <point x="-106" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="801" y="551" type="line" name="dv02"/>
+      <point x="801" y="551" type="line"/>
       <point x="735" y="1325" type="line"/>
       <point x="371" y="551" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/A_E_.glif b/source/Hack-Italic.ufo/glyphs/A_E_.glif
index 7c502b527..801be9c1d 100644
--- a/source/Hack-Italic.ufo/glyphs/A_E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/A_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="AE" format="1">
+<glyph name="AE" format="2">
   <advance width="1233"/>
   <unicode hex="00C6"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/A_acute.glif b/source/Hack-Italic.ufo/glyphs/A_acute.glif
index 35eb605e6..ce7474c2f 100644
--- a/source/Hack-Italic.ufo/glyphs/A_acute.glif
+++ b/source/Hack-Italic.ufo/glyphs/A_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Aacute" format="1">
+<glyph name="Aacute" format="2">
   <advance width="1233"/>
   <unicode hex="00C1"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/A_breve.glif b/source/Hack-Italic.ufo/glyphs/A_breve.glif
index 9e709f4a9..3300448be 100644
--- a/source/Hack-Italic.ufo/glyphs/A_breve.glif
+++ b/source/Hack-Italic.ufo/glyphs/A_breve.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Abreve" format="1">
+<glyph name="Abreve" format="2">
   <advance width="1233"/>
   <unicode hex="0102"/>
   <outline>
     <contour>
-      <point x="794" y="1612" type="curve" name="dv01" smooth="yes"/>
+      <point x="794" y="1612" type="curve" smooth="yes" name="dv01"/>
       <point x="616" y="1612"/>
       <point x="527" y="1680"/>
-      <point x="527" y="1817" type="curve" name="dh01" smooth="yes"/>
+      <point x="527" y="1817" type="curve" smooth="yes" name="dh01"/>
       <point x="527" y="1829"/>
       <point x="528" y="1841"/>
       <point x="529" y="1854" type="curve"/>
       <point x="648" y="1854" type="line" name="dh02"/>
       <point x="649" y="1782"/>
       <point x="709" y="1743"/>
-      <point x="822" y="1743" type="curve" name="dv02" smooth="yes"/>
+      <point x="822" y="1743" type="curve" smooth="yes" name="dv02"/>
       <point x="931" y="1743"/>
       <point x="1002" y="1780"/>
       <point x="1037" y="1854" type="curve" name="sv01"/>
diff --git a/source/Hack-Italic.ufo/glyphs/A_circumflex.glif b/source/Hack-Italic.ufo/glyphs/A_circumflex.glif
index d384033f8..d2787324c 100644
--- a/source/Hack-Italic.ufo/glyphs/A_circumflex.glif
+++ b/source/Hack-Italic.ufo/glyphs/A_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Acircumflex" format="1">
+<glyph name="Acircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00C2"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/A_dieresis.glif b/source/Hack-Italic.ufo/glyphs/A_dieresis.glif
index 5c262075e..fe6c2b698 100644
--- a/source/Hack-Italic.ufo/glyphs/A_dieresis.glif
+++ b/source/Hack-Italic.ufo/glyphs/A_dieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Adieresis" format="1">
+<glyph name="Adieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00C4"/>
   <outline>
     <contour>
-      <point x="500" y="1620" type="line" name="hr00" smooth="yes"/>
+      <point x="500" y="1620" type="line" smooth="yes" name="hr00"/>
       <point x="480" y="1620"/>
       <point x="469" y="1633"/>
       <point x="473" y="1653" type="curve" smooth="yes"/>
       <point x="501" y="1796" type="line"/>
       <point x="504" y="1814"/>
       <point x="514" y="1823"/>
-      <point x="533" y="1823" type="curve" name="dv01" smooth="yes"/>
+      <point x="533" y="1823" type="curve" smooth="yes" name="dv01"/>
       <point x="677" y="1823" type="line" smooth="yes"/>
       <point x="695" y="1823"/>
       <point x="704" y="1815"/>
@@ -25,14 +25,14 @@
       <point x="642" y="1620" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="891" y="1620" type="line" name="sv01" smooth="yes"/>
+      <point x="891" y="1620" type="line" smooth="yes" name="sv01"/>
       <point x="871" y="1620"/>
       <point x="860" y="1633"/>
       <point x="864" y="1653" type="curve" smooth="yes"/>
       <point x="892" y="1796" type="line"/>
       <point x="895" y="1814"/>
       <point x="905" y="1823"/>
-      <point x="924" y="1823" type="curve" name="sv02" smooth="yes"/>
+      <point x="924" y="1823" type="curve" smooth="yes" name="sv02"/>
       <point x="1067" y="1823" type="line" smooth="yes"/>
       <point x="1087" y="1823"/>
       <point x="1098" y="1810"/>
diff --git a/source/Hack-Italic.ufo/glyphs/A_grave.glif b/source/Hack-Italic.ufo/glyphs/A_grave.glif
index 4e9afb851..b43f884aa 100644
--- a/source/Hack-Italic.ufo/glyphs/A_grave.glif
+++ b/source/Hack-Italic.ufo/glyphs/A_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Agrave" format="1">
+<glyph name="Agrave" format="2">
   <advance width="1233"/>
   <unicode hex="00C0"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/A_lpha.glif b/source/Hack-Italic.ufo/glyphs/A_lpha.glif
index 300c075d1..24ab9eae8 100644
--- a/source/Hack-Italic.ufo/glyphs/A_lpha.glif
+++ b/source/Hack-Italic.ufo/glyphs/A_lpha.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Alpha" format="1">
+<glyph name="Alpha" format="2">
   <advance width="1233"/>
   <unicode hex="0391"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/A_lphatonos.glif b/source/Hack-Italic.ufo/glyphs/A_lphatonos.glif
index 3917db6f6..3c76cdaac 100644
--- a/source/Hack-Italic.ufo/glyphs/A_lphatonos.glif
+++ b/source/Hack-Italic.ufo/glyphs/A_lphatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Alphatonos" format="1">
+<glyph name="Alphatonos" format="2">
   <advance width="1233"/>
   <unicode hex="0386"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/A_macron.glif b/source/Hack-Italic.ufo/glyphs/A_macron.glif
index f94d7333e..c150003cd 100644
--- a/source/Hack-Italic.ufo/glyphs/A_macron.glif
+++ b/source/Hack-Italic.ufo/glyphs/A_macron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Amacron" format="1">
+<glyph name="Amacron" format="2">
   <advance width="1233"/>
   <unicode hex="0100"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/A_ogonek.glif b/source/Hack-Italic.ufo/glyphs/A_ogonek.glif
index 88fb9d55d..e72bbc9c2 100644
--- a/source/Hack-Italic.ufo/glyphs/A_ogonek.glif
+++ b/source/Hack-Italic.ufo/glyphs/A_ogonek.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Aogonek" format="1">
+<glyph name="Aogonek" format="2">
   <advance width="1233"/>
   <unicode hex="0104"/>
   <outline>
     <contour>
-      <point x="943" y="-272" type="curve" name="hr00" smooth="yes"/>
+      <point x="943" y="-272" type="curve" smooth="yes" name="hr00"/>
       <point x="982" y="-272"/>
       <point x="1027" y="-262"/>
       <point x="1070" y="-242" type="curve"/>
       <point x="1045" y="-375" type="line"/>
       <point x="999" y="-388"/>
       <point x="953" y="-395"/>
-      <point x="906" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="906" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="775" y="-395"/>
       <point x="701" y="-338"/>
-      <point x="701" y="-245" type="curve" name="dh01" smooth="yes"/>
+      <point x="701" y="-245" type="curve" smooth="yes" name="dh01"/>
       <point x="701" y="-170"/>
       <point x="749" y="-93"/>
       <point x="853" y="0" type="curve" name="ab01"/>
@@ -29,7 +29,7 @@
       <point x="972" y="0" type="line"/>
       <point x="891" y="-77"/>
       <point x="847" y="-144"/>
-      <point x="847" y="-200" type="curve" name="dh02" smooth="yes"/>
+      <point x="847" y="-200" type="curve" smooth="yes" name="dh02"/>
       <point x="847" y="-247"/>
       <point x="879" y="-272"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/A_ring.glif b/source/Hack-Italic.ufo/glyphs/A_ring.glif
index 2fa5c9401..b072fe220 100644
--- a/source/Hack-Italic.ufo/glyphs/A_ring.glif
+++ b/source/Hack-Italic.ufo/glyphs/A_ring.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Aring" format="1">
+<glyph name="Aring" format="2">
   <advance width="1233"/>
   <unicode hex="00C5"/>
   <outline>
@@ -7,19 +7,19 @@
       <point x="600" y="1415" type="line" name="hr00"/>
       <point x="533" y="1460"/>
       <point x="498" y="1537"/>
-      <point x="498" y="1624" type="curve" name="sh01" smooth="yes"/>
+      <point x="498" y="1624" type="curve" smooth="yes" name="sh01"/>
       <point x="498" y="1703"/>
       <point x="526" y="1770"/>
       <point x="577" y="1821" type="curve" smooth="yes"/>
       <point x="626" y="1872"/>
       <point x="694" y="1901"/>
-      <point x="773" y="1901" type="curve" name="dv02" smooth="yes"/>
+      <point x="773" y="1901" type="curve" smooth="yes" name="dv02"/>
       <point x="850" y="1901"/>
       <point x="916" y="1872"/>
       <point x="967" y="1821" type="curve" smooth="yes"/>
       <point x="1016" y="1772"/>
       <point x="1047" y="1708"/>
-      <point x="1047" y="1624" type="curve" name="sh02" smooth="yes"/>
+      <point x="1047" y="1624" type="curve" smooth="yes" name="sh02"/>
       <point x="1047" y="1567"/>
       <point x="1032" y="1522"/>
       <point x="1007" y="1482" type="curve" smooth="yes"/>
@@ -40,19 +40,19 @@
       <point x="880" y="1519" type="curve" smooth="yes"/>
       <point x="909" y="1548"/>
       <point x="924" y="1584"/>
-      <point x="924" y="1626" type="curve" name="ah01" smooth="yes"/>
+      <point x="924" y="1626" type="curve" smooth="yes" name="ah01"/>
       <point x="924" y="1671"/>
       <point x="907" y="1707"/>
       <point x="880" y="1734" type="curve" smooth="yes"/>
       <point x="849" y="1765"/>
       <point x="810" y="1778"/>
-      <point x="771" y="1778" type="curve" name="dv01" smooth="yes"/>
+      <point x="771" y="1778" type="curve" smooth="yes" name="dv01"/>
       <point x="729" y="1778"/>
       <point x="694" y="1764"/>
       <point x="665" y="1735" type="curve" smooth="yes"/>
       <point x="636" y="1706"/>
       <point x="621" y="1670"/>
-      <point x="621" y="1627" type="curve" name="sh04" smooth="yes"/>
+      <point x="621" y="1627" type="curve" smooth="yes" name="sh04"/>
       <point x="621" y="1584"/>
       <point x="636" y="1547"/>
       <point x="665" y="1518" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/A_tilde.glif b/source/Hack-Italic.ufo/glyphs/A_tilde.glif
index c28ef02a5..ff12efcab 100644
--- a/source/Hack-Italic.ufo/glyphs/A_tilde.glif
+++ b/source/Hack-Italic.ufo/glyphs/A_tilde.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Atilde" format="1">
+<glyph name="Atilde" format="2">
   <advance width="1233"/>
   <unicode hex="00C3"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="539" y="1791" type="curve" smooth="yes"/>
       <point x="580" y="1828"/>
       <point x="629" y="1846"/>
-      <point x="684" y="1846" type="curve" name="dv02" smooth="yes"/>
+      <point x="684" y="1846" type="curve" smooth="yes" name="dv02"/>
       <point x="711" y="1846"/>
       <point x="730" y="1842"/>
       <point x="751" y="1835" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="1062" y="1682" type="curve" smooth="yes"/>
       <point x="1023" y="1647"/>
       <point x="972" y="1627"/>
-      <point x="911" y="1627" type="curve" name="sv02" smooth="yes"/>
+      <point x="911" y="1627" type="curve" smooth="yes" name="sv02"/>
       <point x="884" y="1627"/>
       <point x="868" y="1631"/>
       <point x="849" y="1638" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/B_.glif b/source/Hack-Italic.ufo/glyphs/B_.glif
index d55a30fde..6feec0048 100644
--- a/source/Hack-Italic.ufo/glyphs/B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/B_.glif
@@ -1,68 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="B" format="1">
+<glyph name="B" format="2">
   <advance width="1233"/>
   <unicode hex="0042"/>
   <outline>
     <contour>
-      <point x="313" y="1493" type="line" name="at01"/>
+      <point x="313" y="1493" type="line"/>
       <point x="756" y="1493" type="line" smooth="yes"/>
-      <point x="892" y="1493"/>
-      <point x="994" y="1467"/>
-      <point x="1063" y="1414" type="curve" smooth="yes"/>
-      <point x="1132" y="1361"/>
-      <point x="1167" y="1285"/>
-      <point x="1167" y="1178" type="curve" name="sh01" smooth="yes"/>
-      <point x="1167" y="1077"/>
-      <point x="1136" y="992"/>
-      <point x="1075" y="923" type="curve" smooth="yes"/>
-      <point x="1014" y="853"/>
-      <point x="931" y="812"/>
-      <point x="827" y="799" type="curve" name="iv01"/>
-      <point x="910" y="784"/>
-      <point x="974" y="750"/>
-      <point x="1019" y="697" type="curve" smooth="yes"/>
-      <point x="1064" y="644"/>
-      <point x="1085" y="578"/>
-      <point x="1085" y="486" type="curve" name="dh02" smooth="yes"/>
-      <point x="1085" y="341"/>
-      <point x="1033" y="218"/>
-      <point x="926" y="130" type="curve" smooth="yes"/>
-      <point x="820" y="43"/>
-      <point x="670" y="0"/>
-      <point x="475" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="980.227" y="1493"/>
+      <point x="1167" y="1349.85"/>
+      <point x="1167" y="1178" type="curve" smooth="yes"/>
+      <point x="1167" y="973.814"/>
+      <point x="1033.2" y="824.664"/>
+      <point x="827" y="799" type="curve"/>
+      <point x="996.412" y="768.523"/>
+      <point x="1085" y="661.05"/>
+      <point x="1085" y="477.32" type="curve" smooth="yes"/>
+      <point x="1085" y="182.156"/>
+      <point x="856.368" y="0"/>
+      <point x="475" y="0" type="curve" smooth="yes"/>
       <point x="23" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="639" y="877" type="line" name="hr01" smooth="yes"/>
-      <point x="740" y="877"/>
-      <point x="820" y="901"/>
-      <point x="877" y="950" type="curve" smooth="yes"/>
-      <point x="934" y="998"/>
-      <point x="963" y="1064"/>
-      <point x="963" y="1148" type="curve" name="ih01" smooth="yes"/>
-      <point x="963" y="1211"/>
-      <point x="945" y="1257"/>
-      <point x="908" y="1285" type="curve" smooth="yes"/>
-      <point x="871" y="1313"/>
-      <point x="810" y="1327"/>
-      <point x="727" y="1327" type="curve" name="sv01" smooth="yes"/>
+      <point x="639" y="877" type="line" smooth="yes"/>
+      <point x="806.85" y="877"/>
+      <point x="963" y="1007.61"/>
+      <point x="963" y="1148" type="curve" smooth="yes"/>
+      <point x="963" y="1273.07"/>
+      <point x="891.896" y="1327"/>
+      <point x="727" y="1327" type="curve" smooth="yes"/>
       <point x="483" y="1327" type="line"/>
-      <point x="395" y="877" type="line" name="hr02"/>
+      <point x="395" y="877" type="line"/>
     </contour>
     <contour>
-      <point x="506" y="166" type="line" name="sv02" smooth="yes"/>
-      <point x="629" y="166"/>
-      <point x="723" y="195"/>
-      <point x="788" y="253" type="curve" smooth="yes"/>
-      <point x="853" y="312"/>
-      <point x="885" y="399"/>
-      <point x="885" y="496" type="curve" name="dh01" smooth="yes"/>
-      <point x="885" y="580"/>
-      <point x="862" y="627"/>
-      <point x="817" y="662" type="curve" name="hr03" smooth="yes"/>
-      <point x="772" y="696"/>
-      <point x="701" y="713"/>
-      <point x="606" y="713" type="curve" name="dv01" smooth="yes"/>
+      <point x="506" y="166" type="line" smooth="yes"/>
+      <point x="708.775" y="166"/>
+      <point x="885" y="319.442"/>
+      <point x="885" y="496" type="curve" smooth="yes"/>
+      <point x="885" y="645.342"/>
+      <point x="798.011" y="713"/>
+      <point x="606" y="713" type="curve" smooth="yes"/>
       <point x="365" y="713" type="line"/>
       <point x="258" y="166" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/B_eta.glif b/source/Hack-Italic.ufo/glyphs/B_eta.glif
index 777a04ce0..6f42764e6 100644
--- a/source/Hack-Italic.ufo/glyphs/B_eta.glif
+++ b/source/Hack-Italic.ufo/glyphs/B_eta.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Beta" format="1">
+<glyph name="Beta" format="2">
   <advance width="1233"/>
   <unicode hex="0392"/>
   <outline>
@@ -8,37 +8,37 @@
       <point x="756" y="1493" type="line" smooth="yes"/>
       <point x="1028" y="1493"/>
       <point x="1167" y="1387"/>
-      <point x="1167" y="1178" type="curve" name="sh01" smooth="yes"/>
+      <point x="1167" y="1178" type="curve" smooth="yes" name="sh01"/>
       <point x="1167" y="975"/>
       <point x="1035" y="826"/>
       <point x="827" y="799" type="curve" name="iv01"/>
       <point x="1008" y="763"/>
       <point x="1085" y="653"/>
-      <point x="1085" y="482" type="curve" name="dh02" smooth="yes"/>
+      <point x="1085" y="482" type="curve" smooth="yes" name="dh02"/>
       <point x="1085" y="189"/>
       <point x="862" y="0"/>
-      <point x="475" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="475" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="23" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="639" y="877" type="line" name="dv01" smooth="yes"/>
+      <point x="639" y="877" type="line" smooth="yes" name="dv01"/>
       <point x="839" y="877"/>
       <point x="963" y="980"/>
-      <point x="963" y="1148" type="curve" name="hr01" smooth="yes"/>
+      <point x="963" y="1148" type="curve" smooth="yes" name="hr01"/>
       <point x="963" y="1273"/>
       <point x="894" y="1327"/>
-      <point x="727" y="1327" type="curve" name="sv01" smooth="yes"/>
+      <point x="727" y="1327" type="curve" smooth="yes" name="sv01"/>
       <point x="483" y="1327" type="line"/>
       <point x="395" y="877" type="line"/>
     </contour>
     <contour>
-      <point x="506" y="166" type="line" name="sv02" smooth="yes"/>
+      <point x="506" y="166" type="line" smooth="yes" name="sv02"/>
       <point x="750" y="166"/>
       <point x="885" y="291"/>
-      <point x="885" y="492" type="curve" name="dh01" smooth="yes"/>
+      <point x="885" y="492" type="curve" smooth="yes" name="dh01"/>
       <point x="885" y="647"/>
       <point x="805" y="713"/>
-      <point x="606" y="713" type="curve" name="hr02" smooth="yes"/>
+      <point x="606" y="713" type="curve" smooth="yes" name="hr02"/>
       <point x="365" y="713" type="line"/>
       <point x="258" y="166" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/C_.glif b/source/Hack-Italic.ufo/glyphs/C_.glif
index 8de67e79a..0d957ebe7 100644
--- a/source/Hack-Italic.ufo/glyphs/C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/C_.glif
@@ -1,68 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="C" format="1">
+<glyph name="C" format="2">
   <advance width="1233"/>
   <unicode hex="0043"/>
   <outline>
     <contour>
-      <point x="597" y="-29" type="curve" name="hr00" smooth="yes"/>
-      <point x="440" y="-29"/>
-      <point x="321" y="20"/>
-      <point x="241" y="103" type="curve" smooth="yes"/>
-      <point x="158" y="188"/>
-      <point x="115" y="313"/>
-      <point x="115" y="492" type="curve" name="dh01" smooth="yes"/>
-      <point x="115" y="624"/>
-      <point x="138" y="769"/>
-      <point x="185" y="913" type="curve" smooth="yes"/>
-      <point x="232" y="1060"/>
-      <point x="292" y="1170"/>
-      <point x="369" y="1266" type="curve" smooth="yes"/>
-      <point x="444" y="1358"/>
-      <point x="519" y="1417"/>
-      <point x="606" y="1458" type="curve" smooth="yes"/>
-      <point x="693" y="1499"/>
-      <point x="788" y="1520"/>
-      <point x="893" y="1520" type="curve" name="at01" smooth="yes"/>
-      <point x="954" y="1520"/>
-      <point x="1005" y="1514"/>
-      <point x="1058" y="1499" type="curve" smooth="yes"/>
-      <point x="1111" y="1485"/>
-      <point x="1163" y="1465"/>
+      <point x="598.527" y="-29" type="curve" smooth="yes"/>
+      <point x="318.179" y="-29"/>
+      <point x="115" y="193.24"/>
+      <point x="115" y="499.889" type="curve" smooth="yes"/>
+      <point x="115" y="628.144"/>
+      <point x="138.74" y="769.937"/>
+      <point x="183.268" y="907.645" type="curve" smooth="yes"/>
+      <point x="310.684" y="1301.69"/>
+      <point x="561.193" y="1520"/>
+      <point x="887.489" y="1520" type="curve" smooth="yes"/>
+      <point x="1003.49" y="1520"/>
+      <point x="1113.21" y="1492.41"/>
       <point x="1212" y="1438" type="curve"/>
       <point x="1171" y="1231" type="line"/>
-      <point x="1128" y="1272"/>
-      <point x="1083" y="1304"/>
-      <point x="1036" y="1325" type="curve" smooth="yes"/>
-      <point x="990" y="1346"/>
-      <point x="939" y="1356"/>
-      <point x="884" y="1356" type="curve" name="sv01" smooth="yes"/>
-      <point x="757" y="1356"/>
-      <point x="653" y="1304"/>
-      <point x="557" y="1192" type="curve" smooth="yes"/>
-      <point x="489" y="1112"/>
-      <point x="431" y="1003"/>
-      <point x="390" y="878" type="curve" smooth="yes"/>
-      <point x="346" y="745"/>
-      <point x="326" y="614"/>
-      <point x="326" y="503" type="curve" name="dh02" smooth="yes"/>
-      <point x="326" y="378"/>
-      <point x="352" y="286"/>
-      <point x="404" y="226" type="curve" smooth="yes"/>
-      <point x="449" y="174"/>
-      <point x="521" y="135"/>
-      <point x="628" y="135" type="curve" name="dv01" smooth="yes"/>
-      <point x="685" y="135"/>
-      <point x="744" y="146"/>
-      <point x="805" y="167" type="curve" smooth="yes"/>
-      <point x="864" y="188"/>
-      <point x="924" y="219"/>
+      <point x="1081.07" y="1316.83"/>
+      <point x="992.05" y="1356"/>
+      <point x="896.179" y="1356" type="curve" smooth="yes"/>
+      <point x="589.643" y="1356"/>
+      <point x="326" y="955.534"/>
+      <point x="326" y="503.961" type="curve" smooth="yes"/>
+      <point x="326" y="262.373"/>
+      <point x="429.836" y="135"/>
+      <point x="626.782" y="135" type="curve" smooth="yes"/>
+      <point x="742.064" y="135"/>
+      <point x="865.431" y="178.29"/>
       <point x="983" y="260" type="curve"/>
       <point x="944" y="53" type="line"/>
-      <point x="888" y="26"/>
-      <point x="832" y="6"/>
-      <point x="775" y="-9" type="curve" smooth="yes"/>
-      <point x="724" y="-21"/>
-      <point x="661" y="-29"/>
+      <point x="828.236" y="-2.80685"/>
+      <point x="717.882" y="-29"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Italic.ufo/glyphs/C_R_.glif b/source/Hack-Italic.ufo/glyphs/C_R_.glif
index 8dd4ab034..9c88b2cdc 100644
--- a/source/Hack-Italic.ufo/glyphs/C_R_.glif
+++ b/source/Hack-Italic.ufo/glyphs/C_R_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="CR" format="1">
+<glyph name="CR" format="2">
   <advance width="1233"/>
   <unicode hex="000D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/C_acute.glif b/source/Hack-Italic.ufo/glyphs/C_acute.glif
index a2b64eebb..d76c5baca 100644
--- a/source/Hack-Italic.ufo/glyphs/C_acute.glif
+++ b/source/Hack-Italic.ufo/glyphs/C_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Cacute" format="1">
+<glyph name="Cacute" format="2">
   <advance width="1233"/>
   <unicode hex="0106"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="749" y="1595" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="597" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="597" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="440" y="-29"/>
       <point x="321" y="20"/>
       <point x="241" y="103" type="curve" smooth="yes"/>
       <point x="158" y="188"/>
       <point x="115" y="313"/>
-      <point x="115" y="492" type="curve" name="dh01" smooth="yes"/>
+      <point x="115" y="492" type="curve" smooth="yes" name="dh01"/>
       <point x="115" y="624"/>
       <point x="138" y="769"/>
       <point x="185" y="913" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="606" y="1458" type="curve" smooth="yes"/>
       <point x="693" y="1499"/>
       <point x="788" y="1520"/>
-      <point x="893" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="893" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="954" y="1520"/>
       <point x="1005" y="1514"/>
       <point x="1058" y="1499" type="curve" smooth="yes"/>
@@ -41,7 +41,7 @@
       <point x="1036" y="1325" type="curve" smooth="yes"/>
       <point x="990" y="1346"/>
       <point x="939" y="1356"/>
-      <point x="884" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="884" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="757" y="1356"/>
       <point x="653" y="1304"/>
       <point x="557" y="1192" type="curve" smooth="yes"/>
@@ -50,13 +50,13 @@
       <point x="390" y="878" type="curve" smooth="yes"/>
       <point x="346" y="745"/>
       <point x="326" y="614"/>
-      <point x="326" y="503" type="curve" name="dh02" smooth="yes"/>
+      <point x="326" y="503" type="curve" smooth="yes" name="dh02"/>
       <point x="326" y="378"/>
       <point x="352" y="286"/>
       <point x="404" y="226" type="curve" smooth="yes"/>
       <point x="449" y="174"/>
       <point x="521" y="135"/>
-      <point x="628" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="628" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="685" y="135"/>
       <point x="744" y="146"/>
       <point x="805" y="167" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/C_caron.glif b/source/Hack-Italic.ufo/glyphs/C_caron.glif
index 1eefef224..6869016cc 100644
--- a/source/Hack-Italic.ufo/glyphs/C_caron.glif
+++ b/source/Hack-Italic.ufo/glyphs/C_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ccaron" format="1">
+<glyph name="Ccaron" format="2">
   <advance width="1233"/>
   <unicode hex="010C"/>
   <outline>
@@ -13,13 +13,13 @@
       <point x="774" y="1595" type="line"/>
     </contour>
     <contour>
-      <point x="597" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="597" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="440" y="-29"/>
       <point x="321" y="20"/>
       <point x="241" y="103" type="curve" smooth="yes"/>
       <point x="158" y="188"/>
       <point x="115" y="313"/>
-      <point x="115" y="492" type="curve" name="dh01" smooth="yes"/>
+      <point x="115" y="492" type="curve" smooth="yes" name="dh01"/>
       <point x="115" y="624"/>
       <point x="138" y="769"/>
       <point x="185" y="913" type="curve" smooth="yes"/>
@@ -31,7 +31,7 @@
       <point x="606" y="1458" type="curve" smooth="yes"/>
       <point x="693" y="1499"/>
       <point x="788" y="1520"/>
-      <point x="893" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="893" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="954" y="1520"/>
       <point x="1005" y="1514"/>
       <point x="1058" y="1499" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="1036" y="1325" type="curve" smooth="yes"/>
       <point x="990" y="1346"/>
       <point x="939" y="1356"/>
-      <point x="884" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="884" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="757" y="1356"/>
       <point x="653" y="1304"/>
       <point x="557" y="1192" type="curve" smooth="yes"/>
@@ -53,16 +53,16 @@
       <point x="390" y="878" type="curve" smooth="yes"/>
       <point x="346" y="745"/>
       <point x="326" y="614"/>
-      <point x="326" y="503" type="curve" name="dh02" smooth="yes"/>
+      <point x="326" y="503" type="curve" smooth="yes" name="dh02"/>
       <point x="326" y="378"/>
       <point x="352" y="286"/>
       <point x="404" y="226" type="curve" smooth="yes"/>
       <point x="449" y="174"/>
       <point x="521" y="135"/>
-      <point x="628" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="628" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="685" y="135"/>
       <point x="744" y="146"/>
-      <point x="805" y="167" type="curve" name="hr01" smooth="yes"/>
+      <point x="805" y="167" type="curve" smooth="yes" name="hr01"/>
       <point x="864" y="188"/>
       <point x="924" y="219"/>
       <point x="983" y="260" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/C_cedilla.glif b/source/Hack-Italic.ufo/glyphs/C_cedilla.glif
index 65ff99fd1..b6cac65a7 100644
--- a/source/Hack-Italic.ufo/glyphs/C_cedilla.glif
+++ b/source/Hack-Italic.ufo/glyphs/C_cedilla.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ccedilla" format="1">
+<glyph name="Ccedilla" format="2">
   <advance width="1233"/>
   <unicode hex="00C7"/>
   <outline>
     <contour>
-      <point x="1058" y="1499" type="curve" name="hr00" smooth="yes"/>
+      <point x="1058" y="1499" type="curve" smooth="yes" name="hr00"/>
       <point x="1111" y="1485"/>
       <point x="1163" y="1465"/>
       <point x="1212" y="1438" type="curve"/>
@@ -14,7 +14,7 @@
       <point x="1036" y="1325" type="curve" smooth="yes"/>
       <point x="990" y="1346"/>
       <point x="939" y="1356"/>
-      <point x="884" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="884" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="757" y="1356"/>
       <point x="653" y="1304"/>
       <point x="557" y="1192" type="curve" smooth="yes"/>
@@ -23,13 +23,13 @@
       <point x="390" y="878" type="curve" smooth="yes"/>
       <point x="346" y="745"/>
       <point x="326" y="614"/>
-      <point x="326" y="503" type="curve" name="dh02" smooth="yes"/>
+      <point x="326" y="503" type="curve" smooth="yes" name="dh02"/>
       <point x="326" y="378"/>
       <point x="352" y="286"/>
       <point x="404" y="226" type="curve" smooth="yes"/>
       <point x="449" y="174"/>
       <point x="521" y="135"/>
-      <point x="628" y="135" type="curve" name="dv04" smooth="yes"/>
+      <point x="628" y="135" type="curve" smooth="yes" name="dv04"/>
       <point x="685" y="135"/>
       <point x="744" y="146"/>
       <point x="805" y="167" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="714" y="-111" type="curve" smooth="yes"/>
       <point x="725" y="-141"/>
       <point x="731" y="-170"/>
-      <point x="731" y="-198" type="curve" name="dh04" smooth="yes"/>
+      <point x="731" y="-198" type="curve" smooth="yes" name="dh04"/>
       <point x="731" y="-254"/>
       <point x="708" y="-304"/>
       <point x="661" y="-341" type="curve" smooth="yes"/>
       <point x="615" y="-377"/>
       <point x="551" y="-395"/>
-      <point x="470" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="470" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="443" y="-395"/>
       <point x="411" y="-393"/>
       <point x="380" y="-388" type="curve" smooth="yes"/>
@@ -67,10 +67,10 @@
       <point x="388" y="-265" type="curve" smooth="yes"/>
       <point x="411" y="-271"/>
       <point x="434" y="-274"/>
-      <point x="457" y="-274" type="curve" name="dv02" smooth="yes"/>
+      <point x="457" y="-274" type="curve" smooth="yes" name="dv02"/>
       <point x="544" y="-274"/>
       <point x="598" y="-230"/>
-      <point x="598" y="-163" type="curve" name="dh03" smooth="yes"/>
+      <point x="598" y="-163" type="curve" smooth="yes" name="dh03"/>
       <point x="598" y="-140"/>
       <point x="592" y="-114"/>
       <point x="584" y="-93" type="curve" smooth="yes"/>
@@ -82,7 +82,7 @@
       <point x="241" y="103" type="curve" smooth="yes"/>
       <point x="158" y="188"/>
       <point x="115" y="313"/>
-      <point x="115" y="492" type="curve" name="dh01" smooth="yes"/>
+      <point x="115" y="492" type="curve" smooth="yes" name="dh01"/>
       <point x="115" y="624"/>
       <point x="138" y="769"/>
       <point x="185" y="913" type="curve" smooth="yes"/>
@@ -94,7 +94,7 @@
       <point x="606" y="1458" type="curve" smooth="yes"/>
       <point x="693" y="1499"/>
       <point x="788" y="1520"/>
-      <point x="893" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="893" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="954" y="1520"/>
       <point x="1005" y="1514"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/C_circumflex.glif b/source/Hack-Italic.ufo/glyphs/C_circumflex.glif
index 1b0c6471b..af9b337f6 100644
--- a/source/Hack-Italic.ufo/glyphs/C_circumflex.glif
+++ b/source/Hack-Italic.ufo/glyphs/C_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ccircumflex" format="1">
+<glyph name="Ccircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0108"/>
   <outline>
@@ -39,7 +39,7 @@
       <point x="1212" y="1438" type="line"/>
       <point x="1113" y="1493"/>
       <point x="1006" y="1520"/>
-      <point x="893" y="1520" type="curve" name="hr01" smooth="yes"/>
+      <point x="893" y="1520" type="curve" smooth="yes" name="hr01"/>
       <point x="792" y="1520"/>
       <point x="696" y="1499"/>
       <point x="606" y="1458" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/C_dotaccent.glif b/source/Hack-Italic.ufo/glyphs/C_dotaccent.glif
index 29678d97e..af0aaa05f 100644
--- a/source/Hack-Italic.ufo/glyphs/C_dotaccent.glif
+++ b/source/Hack-Italic.ufo/glyphs/C_dotaccent.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Cdotaccent" format="1">
+<glyph name="Cdotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="010A"/>
   <outline>
     <contour>
-      <point x="808" y="1627" type="line" name="hr00" smooth="yes"/>
+      <point x="808" y="1627" type="line" smooth="yes" name="hr00"/>
       <point x="787" y="1627"/>
       <point x="772" y="1643"/>
       <point x="776" y="1666" type="curve" smooth="yes"/>
       <point x="803" y="1809" type="line" smooth="yes"/>
       <point x="806" y="1824"/>
       <point x="817" y="1832"/>
-      <point x="832" y="1832" type="curve" name="dv03" smooth="yes"/>
+      <point x="832" y="1832" type="curve" smooth="yes" name="dv03"/>
       <point x="973" y="1832" type="line" smooth="yes"/>
       <point x="994" y="1832"/>
       <point x="1010" y="1816"/>
@@ -22,32 +22,32 @@
       <point x="949" y="1627" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="598" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="598" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="291" y="-29"/>
       <point x="115" y="144"/>
-      <point x="115" y="499" type="curve" name="dh01" smooth="yes"/>
+      <point x="115" y="499" type="curve" smooth="yes" name="dh01"/>
       <point x="115" y="773"/>
       <point x="219" y="1076"/>
       <point x="369" y="1266" type="curve" smooth="yes"/>
       <point x="505" y="1437"/>
       <point x="684" y="1520"/>
-      <point x="892" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="892" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1007" y="1520"/>
       <point x="1104" y="1494"/>
       <point x="1212" y="1438" type="curve"/>
       <point x="1171" y="1231" type="line"/>
       <point x="1087" y="1314"/>
       <point x="991" y="1356"/>
-      <point x="884" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="884" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="755" y="1356"/>
       <point x="648" y="1300"/>
       <point x="557" y="1192" type="curve" smooth="yes"/>
       <point x="421" y="1030"/>
       <point x="326" y="749"/>
-      <point x="326" y="508" type="curve" name="dh02" smooth="yes"/>
+      <point x="326" y="508" type="curve" smooth="yes" name="dh02"/>
       <point x="326" y="253"/>
       <point x="433" y="135"/>
-      <point x="626" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="626" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="743" y="135"/>
       <point x="866" y="179"/>
       <point x="983" y="260" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/C_hi.glif b/source/Hack-Italic.ufo/glyphs/C_hi.glif
index bbab91cbe..a957ed933 100644
--- a/source/Hack-Italic.ufo/glyphs/C_hi.glif
+++ b/source/Hack-Italic.ufo/glyphs/C_hi.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Chi" format="1">
+<glyph name="Chi" format="2">
   <advance width="1233"/>
   <unicode hex="03A7"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/D_.glif b/source/Hack-Italic.ufo/glyphs/D_.glif
index c50d9a80f..aec18b144 100644
--- a/source/Hack-Italic.ufo/glyphs/D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/D_.glif
@@ -1,51 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="D" format="1">
+<glyph name="D" format="2">
   <advance width="1233"/>
   <unicode hex="0044"/>
   <outline>
     <contour>
-      <point x="283" y="1493" type="line" name="hr00"/>
+      <point x="283" y="1493" type="line"/>
       <point x="586" y="1493" type="line" smooth="yes"/>
-      <point x="768" y="1493"/>
-      <point x="904" y="1452"/>
-      <point x="995" y="1369" type="curve" smooth="yes"/>
-      <point x="1087" y="1285"/>
-      <point x="1130" y="1161"/>
-      <point x="1130" y="986" type="curve" name="dh02" smooth="yes"/>
-      <point x="1130" y="887"/>
-      <point x="1116" y="775"/>
-      <point x="1088" y="659" type="curve" smooth="yes"/>
-      <point x="1059" y="539"/>
-      <point x="1018" y="434"/>
-      <point x="975" y="354" type="curve" smooth="yes"/>
-      <point x="904" y="223"/>
-      <point x="816" y="135"/>
-      <point x="716" y="82" type="curve" smooth="yes"/>
-      <point x="613" y="27"/>
-      <point x="472" y="0"/>
-      <point x="295" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="903.109" y="1493"/>
+      <point x="1130" y="1276.85"/>
+      <point x="1130" y="974.742" type="curve" smooth="yes"/>
+      <point x="1130" y="591.049"/>
+      <point x="952.253" y="207.999"/>
+      <point x="711.778" y="79.7485" type="curve" smooth="yes"/>
+      <point x="613.776" y="27.4815"/>
+      <point x="472.48" y="0"/>
+      <point x="295" y="0" type="curve" smooth="yes"/>
       <point x="-8" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="324" y="166" type="line" name="sv01" smooth="yes"/>
-      <point x="447" y="166"/>
-      <point x="546" y="187"/>
-      <point x="621" y="229" type="curve" smooth="yes"/>
-      <point x="696" y="270"/>
-      <point x="756" y="338"/>
-      <point x="801" y="432" type="curve" smooth="yes"/>
-      <point x="834" y="501"/>
-      <point x="866" y="596"/>
-      <point x="890" y="707" type="curve" smooth="yes"/>
-      <point x="913" y="814"/>
-      <point x="924" y="913"/>
-      <point x="924" y="993" type="curve" name="dh01" smooth="yes"/>
-      <point x="924" y="1120"/>
-      <point x="898" y="1200"/>
-      <point x="842" y="1251" type="curve" smooth="yes"/>
-      <point x="787" y="1302"/>
-      <point x="696" y="1327"/>
-      <point x="567" y="1327" type="curve" name="sv02" smooth="yes"/>
+      <point x="324" y="166" type="line" smooth="yes"/>
+      <point x="612.811" y="166"/>
+      <point x="814.402" y="356.203"/>
+      <point x="888.113" y="698.244" type="curve" smooth="yes"/>
+      <point x="912.367" y="810.788"/>
+      <point x="924" y="904.743"/>
+      <point x="924" y="988.081" type="curve" smooth="yes"/>
+      <point x="924" y="1233.73"/>
+      <point x="825.756" y="1327"/>
+      <point x="567" y="1327" type="curve" smooth="yes"/>
       <point x="453" y="1327" type="line"/>
       <point x="227" y="166" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/D_caron.glif b/source/Hack-Italic.ufo/glyphs/D_caron.glif
index d3dca6cf0..a78026e20 100644
--- a/source/Hack-Italic.ufo/glyphs/D_caron.glif
+++ b/source/Hack-Italic.ufo/glyphs/D_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Dcaron" format="1">
+<glyph name="Dcaron" format="2">
   <advance width="1233"/>
   <unicode hex="010E"/>
   <outline>
@@ -17,26 +17,26 @@
       <point x="586" y="1493" type="line" smooth="yes"/>
       <point x="955" y="1493"/>
       <point x="1130" y="1328"/>
-      <point x="1130" y="983" type="curve" name="dh02" smooth="yes"/>
+      <point x="1130" y="983" type="curve" smooth="yes" name="dh02"/>
       <point x="1130" y="783"/>
       <point x="1071" y="538"/>
       <point x="975" y="354" type="curve"/>
       <point x="839" y="98"/>
       <point x="641" y="0"/>
-      <point x="295" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="295" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="-8" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="324" y="166" type="line" name="sv01" smooth="yes"/>
+      <point x="324" y="166" type="line" smooth="yes" name="sv01"/>
       <point x="571" y="166"/>
       <point x="713" y="246"/>
       <point x="801" y="432" type="curve"/>
       <point x="870" y="576"/>
       <point x="924" y="820"/>
-      <point x="924" y="996" type="curve" name="dh01" smooth="yes"/>
+      <point x="924" y="996" type="curve" smooth="yes" name="dh01"/>
       <point x="924" y="1233"/>
       <point x="825" y="1327"/>
-      <point x="567" y="1327" type="curve" name="sv02" smooth="yes"/>
+      <point x="567" y="1327" type="curve" smooth="yes" name="sv02"/>
       <point x="453" y="1327" type="line"/>
       <point x="227" y="166" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/D_croat.glif b/source/Hack-Italic.ufo/glyphs/D_croat.glif
index e7cc88974..5bc337c3e 100644
--- a/source/Hack-Italic.ufo/glyphs/D_croat.glif
+++ b/source/Hack-Italic.ufo/glyphs/D_croat.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Dcroat" format="1">
+<glyph name="Dcroat" format="2">
   <advance width="1233"/>
   <unicode hex="0110"/>
   <outline>
@@ -12,26 +12,26 @@
       <point x="586" y="1493" type="line" smooth="yes"/>
       <point x="955" y="1493"/>
       <point x="1130" y="1328"/>
-      <point x="1130" y="983" type="curve" name="dh02" smooth="yes"/>
+      <point x="1130" y="983" type="curve" smooth="yes" name="dh02"/>
       <point x="1130" y="783"/>
       <point x="1071" y="538"/>
       <point x="975" y="354" type="curve"/>
       <point x="839" y="98"/>
       <point x="641" y="0"/>
-      <point x="295" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="295" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="-8" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="324" y="166" type="line" name="sv01" smooth="yes"/>
+      <point x="324" y="166" type="line" smooth="yes" name="sv01"/>
       <point x="571" y="166"/>
       <point x="713" y="246"/>
       <point x="801" y="432" type="curve"/>
       <point x="870" y="576"/>
       <point x="924" y="820"/>
-      <point x="924" y="996" type="curve" name="dh01" smooth="yes"/>
+      <point x="924" y="996" type="curve" smooth="yes" name="dh01"/>
       <point x="924" y="1233"/>
       <point x="825" y="1327"/>
-      <point x="567" y="1327" type="curve" name="sv02" smooth="yes"/>
+      <point x="567" y="1327" type="curve" smooth="yes" name="sv02"/>
       <point x="453" y="1327" type="line"/>
       <point x="362" y="858" type="line" name="sv03"/>
       <point x="629" y="858" type="line"/>
diff --git a/source/Hack-Italic.ufo/glyphs/E_.glif b/source/Hack-Italic.ufo/glyphs/E_.glif
index 134062544..f4a1d8401 100644
--- a/source/Hack-Italic.ufo/glyphs/E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/E_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="E" format="1">
+<glyph name="E" format="2">
   <advance width="1233"/>
   <unicode hex="0045"/>
   <outline>
     <contour>
-      <point x="344" y="1493" type="line" name="hr00"/>
+      <point x="344" y="1493" type="line"/>
       <point x="1229" y="1493" type="line"/>
-      <point x="1196" y="1323" type="line" name="sv01"/>
+      <point x="1196" y="1323" type="line"/>
       <point x="512" y="1323" type="line"/>
       <point x="426" y="881" type="line"/>
-      <point x="1079" y="881" type="line" name="dv02"/>
-      <point x="1047" y="711" type="line" name="dv01"/>
+      <point x="1079" y="881" type="line"/>
+      <point x="1047" y="711" type="line"/>
       <point x="393" y="711" type="line"/>
-      <point x="289" y="170" type="line" name="sv02"/>
+      <point x="289" y="170" type="line"/>
       <point x="991" y="170" type="line"/>
-      <point x="958" y="0" type="line" name="ab01"/>
+      <point x="958" y="0" type="line"/>
       <point x="53" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/E_acute.glif b/source/Hack-Italic.ufo/glyphs/E_acute.glif
index 4985ee2e7..d93224eda 100644
--- a/source/Hack-Italic.ufo/glyphs/E_acute.glif
+++ b/source/Hack-Italic.ufo/glyphs/E_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Eacute" format="1">
+<glyph name="Eacute" format="2">
   <advance width="1233"/>
   <unicode hex="00C9"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/E_breve.glif b/source/Hack-Italic.ufo/glyphs/E_breve.glif
index d3bcfde56..baded2b98 100644
--- a/source/Hack-Italic.ufo/glyphs/E_breve.glif
+++ b/source/Hack-Italic.ufo/glyphs/E_breve.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ebreve" format="1">
+<glyph name="Ebreve" format="2">
   <advance width="1233"/>
   <unicode hex="0114"/>
   <outline>
@@ -20,7 +20,7 @@
     <contour>
       <point x="946" y="1641"/>
       <point x="873" y="1619"/>
-      <point x="788" y="1619" type="curve" name="dv03" smooth="yes"/>
+      <point x="788" y="1619" type="curve" smooth="yes" name="dv03"/>
       <point x="708" y="1619"/>
       <point x="645" y="1639"/>
       <point x="598" y="1680" type="curve" smooth="yes"/>
@@ -33,7 +33,7 @@
       <point x="678" y="1773" type="curve" smooth="yes"/>
       <point x="705" y="1754"/>
       <point x="740" y="1746"/>
-      <point x="795" y="1746" type="curve" name="dv04" smooth="yes"/>
+      <point x="795" y="1746" type="curve" smooth="yes" name="dv04"/>
       <point x="850" y="1746"/>
       <point x="897" y="1755"/>
       <point x="933" y="1774" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/E_caron.glif b/source/Hack-Italic.ufo/glyphs/E_caron.glif
index a76468771..38235509b 100644
--- a/source/Hack-Italic.ufo/glyphs/E_caron.glif
+++ b/source/Hack-Italic.ufo/glyphs/E_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ecaron" format="1">
+<glyph name="Ecaron" format="2">
   <advance width="1233"/>
   <unicode hex="011A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/E_circumflex.glif b/source/Hack-Italic.ufo/glyphs/E_circumflex.glif
index d74134345..3e3255ee3 100644
--- a/source/Hack-Italic.ufo/glyphs/E_circumflex.glif
+++ b/source/Hack-Italic.ufo/glyphs/E_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ecircumflex" format="1">
+<glyph name="Ecircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00CA"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/E_dieresis.glif b/source/Hack-Italic.ufo/glyphs/E_dieresis.glif
index 207f86ab3..f19ac36ba 100644
--- a/source/Hack-Italic.ufo/glyphs/E_dieresis.glif
+++ b/source/Hack-Italic.ufo/glyphs/E_dieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Edieresis" format="1">
+<glyph name="Edieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00CB"/>
   <outline>
     <contour>
-      <point x="545" y="1627" type="line" name="hr00" smooth="yes"/>
+      <point x="545" y="1627" type="line" smooth="yes" name="hr00"/>
       <point x="525" y="1627"/>
       <point x="514" y="1640"/>
       <point x="518" y="1660" type="curve" smooth="yes"/>
       <point x="546" y="1803" type="line"/>
       <point x="549" y="1821"/>
       <point x="559" y="1830"/>
-      <point x="578" y="1830" type="curve" name="dv01" smooth="yes"/>
+      <point x="578" y="1830" type="curve" smooth="yes" name="dv01"/>
       <point x="722" y="1830" type="line" smooth="yes"/>
       <point x="740" y="1830"/>
       <point x="749" y="1822"/>
@@ -25,14 +25,14 @@
       <point x="687" y="1627" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="936" y="1627" type="line" name="sv01" smooth="yes"/>
+      <point x="936" y="1627" type="line" smooth="yes" name="sv01"/>
       <point x="916" y="1627"/>
       <point x="905" y="1640"/>
       <point x="909" y="1660" type="curve" smooth="yes"/>
       <point x="937" y="1803" type="line"/>
       <point x="940" y="1821"/>
       <point x="950" y="1830"/>
-      <point x="969" y="1830" type="curve" name="sv02" smooth="yes"/>
+      <point x="969" y="1830" type="curve" smooth="yes" name="sv02"/>
       <point x="1112" y="1830" type="line" smooth="yes"/>
       <point x="1132" y="1830"/>
       <point x="1143" y="1817"/>
diff --git a/source/Hack-Italic.ufo/glyphs/E_dotaccent.glif b/source/Hack-Italic.ufo/glyphs/E_dotaccent.glif
index e6d3ddd8e..50a90d744 100644
--- a/source/Hack-Italic.ufo/glyphs/E_dotaccent.glif
+++ b/source/Hack-Italic.ufo/glyphs/E_dotaccent.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Edotaccent" format="1">
+<glyph name="Edotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="0116"/>
   <outline>
     <contour>
-      <point x="751" y="1627" type="line" name="hr00" smooth="yes"/>
+      <point x="751" y="1627" type="line" smooth="yes" name="hr00"/>
       <point x="730" y="1627"/>
       <point x="715" y="1643"/>
       <point x="719" y="1666" type="curve" smooth="yes"/>
       <point x="746" y="1809" type="line" smooth="yes"/>
       <point x="749" y="1824"/>
       <point x="760" y="1832"/>
-      <point x="775" y="1832" type="curve" name="dv01" smooth="yes"/>
+      <point x="775" y="1832" type="curve" smooth="yes" name="dv01"/>
       <point x="916" y="1832" type="line" smooth="yes"/>
       <point x="937" y="1832"/>
       <point x="953" y="1816"/>
diff --git a/source/Hack-Italic.ufo/glyphs/E_grave.glif b/source/Hack-Italic.ufo/glyphs/E_grave.glif
index 524bc7d97..2945ae81e 100644
--- a/source/Hack-Italic.ufo/glyphs/E_grave.glif
+++ b/source/Hack-Italic.ufo/glyphs/E_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Egrave" format="1">
+<glyph name="Egrave" format="2">
   <advance width="1233"/>
   <unicode hex="00C8"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/E_macron.glif b/source/Hack-Italic.ufo/glyphs/E_macron.glif
index 26fd2fdc3..5ba222b62 100644
--- a/source/Hack-Italic.ufo/glyphs/E_macron.glif
+++ b/source/Hack-Italic.ufo/glyphs/E_macron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Emacron" format="1">
+<glyph name="Emacron" format="2">
   <advance width="1233"/>
   <unicode hex="0112"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/E_ng.glif b/source/Hack-Italic.ufo/glyphs/E_ng.glif
index 068923f1d..32a3ee9b2 100644
--- a/source/Hack-Italic.ufo/glyphs/E_ng.glif
+++ b/source/Hack-Italic.ufo/glyphs/E_ng.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Eng" format="1">
+<glyph name="Eng" format="2">
   <advance width="1233"/>
   <unicode hex="014A"/>
   <outline>
     <contour>
       <point x="377" y="-270" type="line" name="hr00"/>
-      <point x="544" y="-270" type="line" name="dv02" smooth="yes"/>
+      <point x="544" y="-270" type="line" smooth="yes" name="dv02"/>
       <point x="668" y="-270"/>
       <point x="738" y="-191"/>
-      <point x="775" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="775" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="972" y="1009" type="line" smooth="yes"/>
       <point x="983" y="1062"/>
       <point x="988" y="1110"/>
-      <point x="988" y="1153" type="curve" name="dh01" smooth="yes"/>
+      <point x="988" y="1153" type="curve" smooth="yes" name="dh01"/>
       <point x="988" y="1294"/>
       <point x="927" y="1358"/>
-      <point x="800" y="1358" type="curve" name="sv01" smooth="yes"/>
+      <point x="800" y="1358" type="curve" smooth="yes" name="sv01"/>
       <point x="613" y="1358"/>
       <point x="480" y="1217"/>
       <point x="425" y="937" type="curve" smooth="yes"/>
@@ -26,17 +26,17 @@
       <point x="494" y="1295" type="line" name="iv01"/>
       <point x="595" y="1444"/>
       <point x="733" y="1522"/>
-      <point x="902" y="1522" type="curve" name="sv02" smooth="yes"/>
+      <point x="902" y="1522" type="curve" smooth="yes" name="sv02"/>
       <point x="1097" y="1522"/>
       <point x="1195" y="1415"/>
-      <point x="1195" y="1200" type="curve" name="dh02" smooth="yes"/>
+      <point x="1195" y="1200" type="curve" smooth="yes" name="dh02"/>
       <point x="1195" y="1139"/>
       <point x="1188" y="1072"/>
       <point x="1173" y="999" type="curve" smooth="yes"/>
       <point x="975" y="-20" type="line" smooth="yes"/>
       <point x="925" y="-280"/>
       <point x="772" y="-426"/>
-      <point x="552" y="-426" type="curve" name="dv01" smooth="yes"/>
+      <point x="552" y="-426" type="curve" smooth="yes" name="dv01"/>
       <point x="347" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/E_ogonek.glif b/source/Hack-Italic.ufo/glyphs/E_ogonek.glif
index 4781eff02..61a857559 100644
--- a/source/Hack-Italic.ufo/glyphs/E_ogonek.glif
+++ b/source/Hack-Italic.ufo/glyphs/E_ogonek.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Eogonek" format="1">
+<glyph name="Eogonek" format="2">
   <advance width="1233"/>
   <unicode hex="0118"/>
   <outline>
@@ -15,20 +15,20 @@
       <point x="862" y="0" type="line"/>
       <point x="781" y="-77"/>
       <point x="737" y="-144"/>
-      <point x="737" y="-200" type="curve" name="dh02" smooth="yes"/>
+      <point x="737" y="-200" type="curve" smooth="yes" name="dh02"/>
       <point x="737" y="-247"/>
       <point x="769" y="-272"/>
-      <point x="833" y="-272" type="curve" name="dv02" smooth="yes"/>
+      <point x="833" y="-272" type="curve" smooth="yes" name="dv02"/>
       <point x="872" y="-272"/>
       <point x="917" y="-262"/>
       <point x="960" y="-242" type="curve"/>
       <point x="935" y="-375" type="line"/>
       <point x="889" y="-388"/>
       <point x="843" y="-395"/>
-      <point x="796" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="796" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="665" y="-395"/>
       <point x="591" y="-338"/>
-      <point x="591" y="-245" type="curve" name="dh01" smooth="yes"/>
+      <point x="591" y="-245" type="curve" smooth="yes" name="dh01"/>
       <point x="591" y="-170"/>
       <point x="639" y="-93"/>
       <point x="743" y="0" type="curve" name="ab02"/>
diff --git a/source/Hack-Italic.ufo/glyphs/E_psilon.glif b/source/Hack-Italic.ufo/glyphs/E_psilon.glif
index 7a55fae39..cc84f3aee 100644
--- a/source/Hack-Italic.ufo/glyphs/E_psilon.glif
+++ b/source/Hack-Italic.ufo/glyphs/E_psilon.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Epsilon" format="1">
+<glyph name="Epsilon" format="2">
   <advance width="1233"/>
   <unicode hex="0395"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/E_psilontonos.glif b/source/Hack-Italic.ufo/glyphs/E_psilontonos.glif
index 6567712c7..d2fcdb07a 100644
--- a/source/Hack-Italic.ufo/glyphs/E_psilontonos.glif
+++ b/source/Hack-Italic.ufo/glyphs/E_psilontonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Epsilontonos" format="1">
+<glyph name="Epsilontonos" format="2">
   <advance width="1233"/>
   <unicode hex="0388"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/E_ta.glif b/source/Hack-Italic.ufo/glyphs/E_ta.glif
index 95083ad63..f7cc84697 100644
--- a/source/Hack-Italic.ufo/glyphs/E_ta.glif
+++ b/source/Hack-Italic.ufo/glyphs/E_ta.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Eta" format="1">
+<glyph name="Eta" format="2">
   <advance width="1233"/>
   <unicode hex="0397"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/E_tatonos.glif b/source/Hack-Italic.ufo/glyphs/E_tatonos.glif
index 84e57be43..88396de23 100644
--- a/source/Hack-Italic.ufo/glyphs/E_tatonos.glif
+++ b/source/Hack-Italic.ufo/glyphs/E_tatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Etatonos" format="1">
+<glyph name="Etatonos" format="2">
   <advance width="1233"/>
   <unicode hex="0389"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/E_th.glif b/source/Hack-Italic.ufo/glyphs/E_th.glif
index 834dea517..c321d058c 100644
--- a/source/Hack-Italic.ufo/glyphs/E_th.glif
+++ b/source/Hack-Italic.ufo/glyphs/E_th.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Eth" format="1">
+<glyph name="Eth" format="2">
   <advance width="1233"/>
   <unicode hex="00D0"/>
   <outline>
@@ -15,7 +15,7 @@
       <point x="995" y="1369" type="curve" smooth="yes"/>
       <point x="1087" y="1285"/>
       <point x="1130" y="1161"/>
-      <point x="1130" y="986" type="curve" name="dh02" smooth="yes"/>
+      <point x="1130" y="986" type="curve" smooth="yes" name="dh02"/>
       <point x="1130" y="887"/>
       <point x="1116" y="775"/>
       <point x="1088" y="659" type="curve" smooth="yes"/>
@@ -27,11 +27,11 @@
       <point x="716" y="82" type="curve" smooth="yes"/>
       <point x="613" y="27"/>
       <point x="472" y="0"/>
-      <point x="295" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="295" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="-8" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="324" y="166" type="line" name="sv01" smooth="yes"/>
+      <point x="324" y="166" type="line" smooth="yes" name="sv01"/>
       <point x="456" y="166"/>
       <point x="548" y="189"/>
       <point x="621" y="229" type="curve" smooth="yes"/>
@@ -43,13 +43,13 @@
       <point x="890" y="707" type="curve" smooth="yes"/>
       <point x="913" y="814"/>
       <point x="924" y="913"/>
-      <point x="924" y="993" type="curve" name="dh01" smooth="yes"/>
+      <point x="924" y="993" type="curve" smooth="yes" name="dh01"/>
       <point x="924" y="1120"/>
       <point x="898" y="1200"/>
       <point x="842" y="1251" type="curve" smooth="yes"/>
       <point x="787" y="1302"/>
       <point x="696" y="1327"/>
-      <point x="567" y="1327" type="curve" name="sv02" smooth="yes"/>
+      <point x="567" y="1327" type="curve" smooth="yes" name="sv02"/>
       <point x="453" y="1327" type="line"/>
       <point x="362" y="858" type="line" name="sv03"/>
       <point x="629" y="858" type="line"/>
diff --git a/source/Hack-Italic.ufo/glyphs/E_uro.glif b/source/Hack-Italic.ufo/glyphs/E_uro.glif
index b91bf1471..3a6c5719d 100644
--- a/source/Hack-Italic.ufo/glyphs/E_uro.glif
+++ b/source/Hack-Italic.ufo/glyphs/E_uro.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Euro" format="1">
+<glyph name="Euro" format="2">
   <advance width="1233"/>
   <unicode hex="20AC"/>
   <outline>
     <contour>
-      <point x="612" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="612" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="460" y="-29"/>
       <point x="350" y="20"/>
       <point x="277" y="105" type="curve" smooth="yes"/>
       <point x="197" y="197"/>
       <point x="162" y="331"/>
-      <point x="162" y="498" type="curve" name="dh01" smooth="yes"/>
+      <point x="162" y="498" type="curve" smooth="yes" name="dh01"/>
       <point x="162" y="543" type="line" name="dv02"/>
       <point x="-10" y="543" type="line"/>
       <point x="39" y="653" type="line"/>
@@ -29,7 +29,7 @@
       <point x="497" y="1376" type="curve" smooth="yes"/>
       <point x="609" y="1472"/>
       <point x="742" y="1520"/>
-      <point x="891" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="891" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="947" y="1520"/>
       <point x="994" y="1514"/>
       <point x="1045" y="1499" type="curve" smooth="yes"/>
@@ -42,7 +42,7 @@
       <point x="1018" y="1326" type="curve" smooth="yes"/>
       <point x="975" y="1346"/>
       <point x="929" y="1356"/>
-      <point x="880" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="880" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="789" y="1356"/>
       <point x="706" y="1321"/>
       <point x="632" y="1251" type="curve" smooth="yes"/>
@@ -61,13 +61,13 @@
       <point x="788" y="653" type="line"/>
       <point x="741" y="543" type="line" name="sv04"/>
       <point x="365" y="543" type="line"/>
-      <point x="365" y="489" type="line" name="dh02" smooth="yes"/>
+      <point x="365" y="489" type="line" smooth="yes" name="dh02"/>
       <point x="365" y="375"/>
       <point x="389" y="288"/>
       <point x="438" y="227" type="curve" smooth="yes"/>
       <point x="485" y="167"/>
       <point x="552" y="135"/>
-      <point x="644" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="644" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="697" y="135"/>
       <point x="750" y="146"/>
       <point x="807" y="167" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/F_.glif b/source/Hack-Italic.ufo/glyphs/F_.glif
index 0ea67cf2e..c32810b3e 100644
--- a/source/Hack-Italic.ufo/glyphs/F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/F_.glif
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="F" format="1">
+<glyph name="F" format="2">
   <advance width="1233"/>
   <unicode hex="0046"/>
   <outline>
     <contour>
-      <point x="383" y="1493" type="line" name="hr00"/>
+      <point x="383" y="1493" type="line"/>
       <point x="1262" y="1493" type="line"/>
-      <point x="1229" y="1323" type="line" name="sv01"/>
+      <point x="1229" y="1323" type="line"/>
       <point x="553" y="1323" type="line"/>
       <point x="467" y="873" type="line"/>
-      <point x="1079" y="873" type="line" name="dv02"/>
-      <point x="1047" y="703" type="line" name="dv01"/>
+      <point x="1079" y="873" type="line"/>
+      <point x="1047" y="703" type="line"/>
       <point x="434" y="703" type="line"/>
-      <point x="295" y="0" type="line" name="ab01"/>
+      <point x="295" y="0" type="line"/>
       <point x="92" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/G_.glif b/source/Hack-Italic.ufo/glyphs/G_.glif
index f7494dfd4..046622fc1 100644
--- a/source/Hack-Italic.ufo/glyphs/G_.glif
+++ b/source/Hack-Italic.ufo/glyphs/G_.glif
@@ -1,87 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="G" format="1">
+<glyph name="G" format="2">
   <advance width="1233"/>
   <unicode hex="0047"/>
   <outline>
     <contour>
-      <point x="564" y="-29" type="curve" name="hr00" smooth="yes"/>
-      <point x="401" y="-29"/>
-      <point x="283" y="18"/>
-      <point x="202" y="106" type="curve" smooth="yes"/>
-      <point x="118" y="198"/>
-      <point x="78" y="327"/>
-      <point x="78" y="488" type="curve" name="dh01" smooth="yes"/>
-      <point x="78" y="551"/>
-      <point x="84" y="613"/>
-      <point x="95" y="681" type="curve" smooth="yes"/>
-      <point x="106" y="742"/>
-      <point x="123" y="825"/>
-      <point x="143" y="893" type="curve" smooth="yes"/>
-      <point x="166" y="969"/>
-      <point x="194" y="1041"/>
-      <point x="225" y="1105" type="curve" smooth="yes"/>
-      <point x="258" y="1172"/>
-      <point x="293" y="1223"/>
-      <point x="328" y="1267" type="curve" smooth="yes"/>
-      <point x="395" y="1350"/>
-      <point x="475" y="1415"/>
-      <point x="566" y="1458" type="curve" smooth="yes"/>
-      <point x="653" y="1499"/>
-      <point x="749" y="1520"/>
-      <point x="854" y="1520" type="curve" name="at01" smooth="yes"/>
-      <point x="915" y="1520"/>
-      <point x="967" y="1514"/>
-      <point x="1020" y="1499" type="curve" smooth="yes"/>
-      <point x="1074" y="1485"/>
-      <point x="1126" y="1465"/>
+      <point x="560.014" y="-29" type="curve" smooth="yes"/>
+      <point x="283.611" y="-29"/>
+      <point x="78" y="192.776"/>
+      <point x="78" y="490.909" type="curve" smooth="yes"/>
+      <point x="78" y="609.167"/>
+      <point x="100.047" y="748.439"/>
+      <point x="140.117" y="883.298" type="curve" smooth="yes"/>
+      <point x="262.664" y="1295.74"/>
+      <point x="511.182" y="1520"/>
+      <point x="847.103" y="1520" type="curve" smooth="yes"/>
+      <point x="964.517" y="1520"/>
+      <point x="1074.88" y="1492.6"/>
       <point x="1176" y="1438" type="curve"/>
       <point x="1135" y="1231" type="line"/>
-      <point x="1088" y="1276"/>
-      <point x="1040" y="1306"/>
-      <point x="999" y="1325" type="curve" smooth="yes"/>
-      <point x="952" y="1346"/>
-      <point x="901" y="1356"/>
-      <point x="846" y="1356" type="curve" name="sv01" smooth="yes"/>
-      <point x="779" y="1356"/>
-      <point x="717" y="1342"/>
-      <point x="662" y="1315" type="curve" smooth="yes"/>
-      <point x="606" y="1288"/>
-      <point x="551" y="1244"/>
-      <point x="508" y="1192" type="curve" smooth="yes"/>
-      <point x="478" y="1156"/>
-      <point x="450" y="1113"/>
-      <point x="425" y="1062" type="curve" smooth="yes"/>
-      <point x="397" y="1006"/>
-      <point x="375" y="948"/>
-      <point x="356" y="887" type="curve" smooth="yes"/>
-      <point x="333" y="812"/>
-      <point x="316" y="738"/>
-      <point x="305" y="673" type="curve" smooth="yes"/>
-      <point x="293" y="604"/>
-      <point x="287" y="550"/>
-      <point x="287" y="494" type="curve" name="dh02" smooth="yes"/>
-      <point x="287" y="378"/>
-      <point x="313" y="289"/>
-      <point x="366" y="228" type="curve" smooth="yes"/>
-      <point x="419" y="165"/>
-      <point x="492" y="135"/>
-      <point x="592" y="135" type="curve" name="dv01" smooth="yes"/>
-      <point x="640" y="135"/>
-      <point x="677" y="142"/>
-      <point x="712" y="154" type="curve" smooth="yes"/>
-      <point x="751" y="167"/>
-      <point x="778" y="184"/>
+      <point x="1045.78" y="1316.38"/>
+      <point x="952.262" y="1356"/>
+      <point x="841.623" y="1356" type="curve" smooth="yes"/>
+      <point x="616.094" y="1356"/>
+      <point x="449.994" y="1191.39"/>
+      <point x="350.265" y="868.428" type="curve" smooth="yes"/>
+      <point x="310.306" y="739.026"/>
+      <point x="287" y="603.627"/>
+      <point x="287" y="495.776" type="curve" smooth="yes"/>
+      <point x="287" y="263.986"/>
+      <point x="394.649" y="135"/>
+      <point x="590.169" y="135" type="curve" smooth="yes"/>
+      <point x="665.875" y="135"/>
+      <point x="759.307" y="166.608"/>
       <point x="803" y="207" type="curve"/>
       <point x="879" y="600" type="line"/>
-      <point x="662" y="600" type="line" name="dv02"/>
-      <point x="692" y="766" type="line" name="dv03"/>
+      <point x="662" y="600" type="line"/>
+      <point x="692" y="766" type="line"/>
       <point x="1102" y="766" type="line"/>
       <point x="969" y="96" type="line"/>
-      <point x="912" y="55"/>
-      <point x="848" y="24"/>
-      <point x="779" y="3" type="curve" smooth="yes"/>
-      <point x="711" y="-18"/>
-      <point x="643" y="-29"/>
+      <point x="856.221" y="14.885"/>
+      <point x="712.634" y="-29"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Italic.ufo/glyphs/G_amma.glif b/source/Hack-Italic.ufo/glyphs/G_amma.glif
index a8cfdee2b..b3f932343 100644
--- a/source/Hack-Italic.ufo/glyphs/G_amma.glif
+++ b/source/Hack-Italic.ufo/glyphs/G_amma.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Gamma" format="1">
+<glyph name="Gamma" format="2">
   <advance width="1233"/>
   <unicode hex="0393"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/G_breve.glif b/source/Hack-Italic.ufo/glyphs/G_breve.glif
index b71426773..cffafe353 100644
--- a/source/Hack-Italic.ufo/glyphs/G_breve.glif
+++ b/source/Hack-Italic.ufo/glyphs/G_breve.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Gbreve" format="1">
+<glyph name="Gbreve" format="2">
   <advance width="1233"/>
   <unicode hex="011E"/>
   <outline>
     <contour>
-      <point x="788" y="1619" type="curve" name="dv03" smooth="yes"/>
+      <point x="788" y="1619" type="curve" smooth="yes" name="dv03"/>
       <point x="708" y="1619"/>
       <point x="645" y="1639"/>
       <point x="598" y="1680" type="curve" smooth="yes"/>
@@ -17,7 +17,7 @@
       <point x="678" y="1773" type="curve" smooth="yes"/>
       <point x="705" y="1754"/>
       <point x="740" y="1746"/>
-      <point x="795" y="1746" type="curve" name="dv04" smooth="yes"/>
+      <point x="795" y="1746" type="curve" smooth="yes" name="dv04"/>
       <point x="850" y="1746"/>
       <point x="897" y="1755"/>
       <point x="933" y="1774" type="curve" smooth="yes"/>
@@ -32,13 +32,13 @@
       <point x="873" y="1619"/>
     </contour>
     <contour>
-      <point x="564" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="564" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="401" y="-29"/>
       <point x="283" y="18"/>
       <point x="202" y="106" type="curve" smooth="yes"/>
       <point x="118" y="198"/>
       <point x="78" y="327"/>
-      <point x="78" y="488" type="curve" name="dh01" smooth="yes"/>
+      <point x="78" y="488" type="curve" smooth="yes" name="dh01"/>
       <point x="78" y="551"/>
       <point x="84" y="613"/>
       <point x="95" y="681" type="curve" smooth="yes"/>
@@ -56,7 +56,7 @@
       <point x="566" y="1458" type="curve" smooth="yes"/>
       <point x="653" y="1499"/>
       <point x="749" y="1520"/>
-      <point x="854" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="854" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="915" y="1520"/>
       <point x="967" y="1514"/>
       <point x="1020" y="1499" type="curve" smooth="yes"/>
@@ -69,7 +69,7 @@
       <point x="999" y="1325" type="curve" smooth="yes"/>
       <point x="952" y="1346"/>
       <point x="901" y="1356"/>
-      <point x="846" y="1356" type="curve" name="sv03" smooth="yes"/>
+      <point x="846" y="1356" type="curve" smooth="yes" name="sv03"/>
       <point x="779" y="1356"/>
       <point x="717" y="1342"/>
       <point x="662" y="1315" type="curve" smooth="yes"/>
@@ -87,13 +87,13 @@
       <point x="305" y="673" type="curve" smooth="yes"/>
       <point x="293" y="604"/>
       <point x="287" y="550"/>
-      <point x="287" y="494" type="curve" name="dh02" smooth="yes"/>
+      <point x="287" y="494" type="curve" smooth="yes" name="dh02"/>
       <point x="287" y="378"/>
       <point x="313" y="289"/>
       <point x="366" y="228" type="curve" smooth="yes"/>
       <point x="419" y="165"/>
       <point x="492" y="135"/>
-      <point x="592" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="592" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="640" y="135"/>
       <point x="677" y="142"/>
       <point x="712" y="154" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/G_caron.glif b/source/Hack-Italic.ufo/glyphs/G_caron.glif
index 3c7fde0bc..7324bcc96 100644
--- a/source/Hack-Italic.ufo/glyphs/G_caron.glif
+++ b/source/Hack-Italic.ufo/glyphs/G_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Gcaron" format="1">
+<glyph name="Gcaron" format="2">
   <advance width="1233"/>
   <unicode hex="01E6"/>
   <outline>
@@ -13,10 +13,10 @@
       <point x="687" y="1595" type="line"/>
     </contour>
     <contour>
-      <point x="563" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="563" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="248" y="-29"/>
       <point x="78" y="156"/>
-      <point x="78" y="487" type="curve" name="dh01" smooth="yes"/>
+      <point x="78" y="487" type="curve" smooth="yes" name="dh01"/>
       <point x="78" y="612"/>
       <point x="102" y="754"/>
       <point x="143" y="893" type="curve" smooth="yes"/>
@@ -25,14 +25,14 @@
       <point x="328" y="1266" type="curve" smooth="yes"/>
       <point x="465" y="1435"/>
       <point x="640" y="1520"/>
-      <point x="852" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="852" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="965" y="1520"/>
       <point x="1064" y="1495"/>
       <point x="1176" y="1438" type="curve"/>
       <point x="1135" y="1231" type="line"/>
       <point x="1049" y="1314"/>
       <point x="952" y="1356"/>
-      <point x="845" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="845" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="716" y="1356"/>
       <point x="599" y="1300"/>
       <point x="508" y="1192" type="curve" smooth="yes"/>
@@ -41,10 +41,10 @@
       <point x="356" y="887" type="curve"/>
       <point x="311" y="738"/>
       <point x="287" y="589"/>
-      <point x="287" y="487" type="curve" name="dh02" smooth="yes"/>
+      <point x="287" y="487" type="curve" smooth="yes" name="dh02"/>
       <point x="287" y="263"/>
       <point x="396" y="135"/>
-      <point x="593" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="593" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="681" y="135"/>
       <point x="754" y="160"/>
       <point x="803" y="207" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/G_circumflex.glif b/source/Hack-Italic.ufo/glyphs/G_circumflex.glif
index 687a00da5..6783aed74 100644
--- a/source/Hack-Italic.ufo/glyphs/G_circumflex.glif
+++ b/source/Hack-Italic.ufo/glyphs/G_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Gcircumflex" format="1">
+<glyph name="Gcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="011C"/>
   <outline>
@@ -52,7 +52,7 @@
       <point x="1020" y="1499" type="curve"/>
       <point x="971" y="1513"/>
       <point x="915" y="1520"/>
-      <point x="854" y="1520" type="curve" name="hr01" smooth="yes"/>
+      <point x="854" y="1520" type="curve" smooth="yes" name="hr01"/>
       <point x="749" y="1520"/>
       <point x="652" y="1499"/>
       <point x="563" y="1457" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/G_dotaccent.glif b/source/Hack-Italic.ufo/glyphs/G_dotaccent.glif
index 8c89c1ad1..90397c81b 100644
--- a/source/Hack-Italic.ufo/glyphs/G_dotaccent.glif
+++ b/source/Hack-Italic.ufo/glyphs/G_dotaccent.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Gdotaccent" format="1">
+<glyph name="Gdotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="0120"/>
   <outline>
     <contour>
-      <point x="783" y="1627" type="line" name="hr00" smooth="yes"/>
+      <point x="783" y="1627" type="line" smooth="yes" name="hr00"/>
       <point x="762" y="1627"/>
       <point x="747" y="1643"/>
       <point x="751" y="1666" type="curve" smooth="yes"/>
       <point x="778" y="1809" type="line" smooth="yes"/>
       <point x="781" y="1824"/>
       <point x="792" y="1832"/>
-      <point x="807" y="1832" type="curve" name="dv03" smooth="yes"/>
+      <point x="807" y="1832" type="curve" smooth="yes" name="dv03"/>
       <point x="948" y="1832" type="line" smooth="yes"/>
       <point x="969" y="1832"/>
       <point x="985" y="1816"/>
@@ -22,10 +22,10 @@
       <point x="924" y="1627" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="563" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="563" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="248" y="-29"/>
       <point x="78" y="156"/>
-      <point x="78" y="487" type="curve" name="dh01" smooth="yes"/>
+      <point x="78" y="487" type="curve" smooth="yes" name="dh01"/>
       <point x="78" y="612"/>
       <point x="102" y="754"/>
       <point x="143" y="893" type="curve" smooth="yes"/>
@@ -34,14 +34,14 @@
       <point x="328" y="1266" type="curve" smooth="yes"/>
       <point x="465" y="1435"/>
       <point x="640" y="1520"/>
-      <point x="852" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="852" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="965" y="1520"/>
       <point x="1064" y="1495"/>
       <point x="1176" y="1438" type="curve"/>
       <point x="1135" y="1231" type="line"/>
       <point x="1049" y="1314"/>
       <point x="952" y="1356"/>
-      <point x="845" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="845" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="716" y="1356"/>
       <point x="599" y="1300"/>
       <point x="508" y="1192" type="curve" smooth="yes"/>
@@ -50,10 +50,10 @@
       <point x="356" y="887" type="curve"/>
       <point x="311" y="738"/>
       <point x="287" y="589"/>
-      <point x="287" y="487" type="curve" name="dh02" smooth="yes"/>
+      <point x="287" y="487" type="curve" smooth="yes" name="dh02"/>
       <point x="287" y="263"/>
       <point x="396" y="135"/>
-      <point x="593" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="593" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="681" y="135"/>
       <point x="754" y="160"/>
       <point x="803" y="207" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/H_.glif b/source/Hack-Italic.ufo/glyphs/H_.glif
index e065fe160..02ac2597c 100644
--- a/source/Hack-Italic.ufo/glyphs/H_.glif
+++ b/source/Hack-Italic.ufo/glyphs/H_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="H" format="1">
+<glyph name="H" format="2">
   <advance width="1233"/>
   <unicode hex="0048"/>
   <outline>
     <contour>
-      <point x="283" y="1493" type="line" name="hr00"/>
+      <point x="283" y="1493" type="line"/>
       <point x="485" y="1493" type="line"/>
       <point x="367" y="881" type="line"/>
-      <point x="920" y="881" type="line" name="dv02"/>
-      <point x="1038" y="1493" type="line" name="at01"/>
+      <point x="920" y="881" type="line"/>
+      <point x="1038" y="1493" type="line"/>
       <point x="1241" y="1493" type="line"/>
-      <point x="950" y="0" type="line" name="ab01"/>
+      <point x="950" y="0" type="line"/>
       <point x="748" y="0" type="line"/>
-      <point x="887" y="711" type="line" name="dv01"/>
+      <point x="887" y="711" type="line"/>
       <point x="332" y="711" type="line"/>
-      <point x="195" y="0" type="line" name="ab02"/>
+      <point x="195" y="0" type="line"/>
       <point x="-8" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/H_bar.glif b/source/Hack-Italic.ufo/glyphs/H_bar.glif
index 78094a894..e654cac09 100644
--- a/source/Hack-Italic.ufo/glyphs/H_bar.glif
+++ b/source/Hack-Italic.ufo/glyphs/H_bar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Hbar" format="1">
+<glyph name="Hbar" format="2">
   <advance width="1233"/>
   <unicode hex="0126"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/H_circumflex.glif b/source/Hack-Italic.ufo/glyphs/H_circumflex.glif
index 2d96325fd..74b3fa641 100644
--- a/source/Hack-Italic.ufo/glyphs/H_circumflex.glif
+++ b/source/Hack-Italic.ufo/glyphs/H_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Hcircumflex" format="1">
+<glyph name="Hcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0124"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/I_.glif b/source/Hack-Italic.ufo/glyphs/I_.glif
index 7603025ac..f4b6872a9 100644
--- a/source/Hack-Italic.ufo/glyphs/I_.glif
+++ b/source/Hack-Italic.ufo/glyphs/I_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="I" format="1">
+<glyph name="I" format="2">
   <advance width="1233"/>
   <unicode hex="0049"/>
   <outline>
     <contour>
-      <point x="90" y="170" type="line" name="hr00"/>
+      <point x="90" y="170" type="line"/>
       <point x="403" y="170" type="line"/>
-      <point x="627" y="1323" type="line" name="sv01"/>
+      <point x="627" y="1323" type="line"/>
       <point x="313" y="1323" type="line"/>
-      <point x="346" y="1493" type="line" name="at01"/>
+      <point x="346" y="1493" type="line"/>
       <point x="1176" y="1493" type="line"/>
-      <point x="1143" y="1323" type="line" name="sv02"/>
-      <point x="829" y="1323" type="line" name="sv03"/>
-      <point x="606" y="170" type="line" name="sv04"/>
-      <point x="920" y="170" type="line" name="sv05"/>
-      <point x="887" y="0" type="line" name="ab01"/>
+      <point x="1143" y="1323" type="line"/>
+      <point x="829" y="1323" type="line"/>
+      <point x="606" y="170" type="line"/>
+      <point x="920" y="170" type="line"/>
+      <point x="887" y="0" type="line"/>
       <point x="57" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/I_J_.glif b/source/Hack-Italic.ufo/glyphs/I_J_.glif
index 3794b1c2b..49c5390d4 100644
--- a/source/Hack-Italic.ufo/glyphs/I_J_.glif
+++ b/source/Hack-Italic.ufo/glyphs/I_J_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="IJ" format="1">
+<glyph name="IJ" format="2">
   <advance width="1233"/>
   <unicode hex="0132"/>
   <outline>
@@ -19,10 +19,10 @@
       <point x="1069" y="406" type="line"/>
       <point x="1054" y="332"/>
       <point x="1022" y="264"/>
-      <point x="975" y="203" type="curve" name="hr01" smooth="yes"/>
+      <point x="975" y="203" type="curve" smooth="yes" name="hr01"/>
       <point x="878" y="78"/>
       <point x="731" y="0"/>
-      <point x="584" y="0" type="curve" name="hr02" smooth="yes"/>
+      <point x="584" y="0" type="curve" smooth="yes" name="hr02"/>
       <point x="26" y="0" type="line"/>
     </contour>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/I_acute.glif b/source/Hack-Italic.ufo/glyphs/I_acute.glif
index e57ed5f30..714f56947 100644
--- a/source/Hack-Italic.ufo/glyphs/I_acute.glif
+++ b/source/Hack-Italic.ufo/glyphs/I_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Iacute" format="1">
+<glyph name="Iacute" format="2">
   <advance width="1233"/>
   <unicode hex="00CD"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/I_breve.glif b/source/Hack-Italic.ufo/glyphs/I_breve.glif
index a55664f71..764778ab2 100644
--- a/source/Hack-Italic.ufo/glyphs/I_breve.glif
+++ b/source/Hack-Italic.ufo/glyphs/I_breve.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ibreve" format="1">
+<glyph name="Ibreve" format="2">
   <advance width="1233"/>
   <unicode hex="012C"/>
   <outline>
@@ -18,7 +18,7 @@
       <point x="57" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="788" y="1629" type="curve" name="dv03" smooth="yes"/>
+      <point x="788" y="1629" type="curve" smooth="yes" name="dv03"/>
       <point x="708" y="1629"/>
       <point x="646" y="1649"/>
       <point x="598" y="1690" type="curve" smooth="yes"/>
@@ -31,7 +31,7 @@
       <point x="678" y="1783" type="curve" smooth="yes"/>
       <point x="705" y="1764"/>
       <point x="740" y="1756"/>
-      <point x="795" y="1756" type="curve" name="dv04" smooth="yes"/>
+      <point x="795" y="1756" type="curve" smooth="yes" name="dv04"/>
       <point x="850" y="1756"/>
       <point x="897" y="1765"/>
       <point x="933" y="1784" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/I_circumflex.glif b/source/Hack-Italic.ufo/glyphs/I_circumflex.glif
index d551718fd..5972f0587 100644
--- a/source/Hack-Italic.ufo/glyphs/I_circumflex.glif
+++ b/source/Hack-Italic.ufo/glyphs/I_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Icircumflex" format="1">
+<glyph name="Icircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00CE"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/I_dieresis.glif b/source/Hack-Italic.ufo/glyphs/I_dieresis.glif
index 098a8ff9f..63121b923 100644
--- a/source/Hack-Italic.ufo/glyphs/I_dieresis.glif
+++ b/source/Hack-Italic.ufo/glyphs/I_dieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Idieresis" format="1">
+<glyph name="Idieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00CF"/>
   <outline>
     <contour>
-      <point x="506" y="1627" type="line" name="hr00" smooth="yes"/>
+      <point x="506" y="1627" type="line" smooth="yes" name="hr00"/>
       <point x="486" y="1627"/>
       <point x="475" y="1640"/>
       <point x="479" y="1660" type="curve" smooth="yes"/>
       <point x="507" y="1803" type="line"/>
       <point x="510" y="1821"/>
       <point x="520" y="1830"/>
-      <point x="539" y="1830" type="curve" name="dv01" smooth="yes"/>
+      <point x="539" y="1830" type="curve" smooth="yes" name="dv01"/>
       <point x="683" y="1830" type="line" smooth="yes"/>
       <point x="701" y="1830"/>
       <point x="710" y="1822"/>
@@ -25,14 +25,14 @@
       <point x="648" y="1627" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="897" y="1627" type="line" name="sv01" smooth="yes"/>
+      <point x="897" y="1627" type="line" smooth="yes" name="sv01"/>
       <point x="877" y="1627"/>
       <point x="866" y="1640"/>
       <point x="870" y="1660" type="curve" smooth="yes"/>
       <point x="898" y="1803" type="line"/>
       <point x="901" y="1821"/>
       <point x="911" y="1830"/>
-      <point x="930" y="1830" type="curve" name="sv02" smooth="yes"/>
+      <point x="930" y="1830" type="curve" smooth="yes" name="sv02"/>
       <point x="1073" y="1830" type="line" smooth="yes"/>
       <point x="1093" y="1830"/>
       <point x="1104" y="1817"/>
diff --git a/source/Hack-Italic.ufo/glyphs/I_dotaccent.glif b/source/Hack-Italic.ufo/glyphs/I_dotaccent.glif
index 6be1adf2d..31499ce5f 100644
--- a/source/Hack-Italic.ufo/glyphs/I_dotaccent.glif
+++ b/source/Hack-Italic.ufo/glyphs/I_dotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Idotaccent" format="1">
+<glyph name="Idotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="0130"/>
   <outline>
     <contour>
-      <point x="711" y="1627" type="line" name="hr00" smooth="yes"/>
+      <point x="711" y="1627" type="line" smooth="yes" name="hr00"/>
       <point x="693" y="1627"/>
       <point x="684" y="1635"/>
       <point x="684" y="1651" type="curve" smooth="yes"/>
@@ -14,7 +14,7 @@
       <point x="714" y="1805" type="line"/>
       <point x="717" y="1823"/>
       <point x="727" y="1832"/>
-      <point x="746" y="1832" type="curve" name="dv01" smooth="yes"/>
+      <point x="746" y="1832" type="curve" smooth="yes" name="dv01"/>
       <point x="888" y="1832" type="line" smooth="yes"/>
       <point x="908" y="1832"/>
       <point x="919" y="1819"/>
diff --git a/source/Hack-Italic.ufo/glyphs/I_grave.glif b/source/Hack-Italic.ufo/glyphs/I_grave.glif
index 7d20a0d81..14bb0990b 100644
--- a/source/Hack-Italic.ufo/glyphs/I_grave.glif
+++ b/source/Hack-Italic.ufo/glyphs/I_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Igrave" format="1">
+<glyph name="Igrave" format="2">
   <advance width="1233"/>
   <unicode hex="00CC"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/I_macron.glif b/source/Hack-Italic.ufo/glyphs/I_macron.glif
index 53b04bd81..c7be5223c 100644
--- a/source/Hack-Italic.ufo/glyphs/I_macron.glif
+++ b/source/Hack-Italic.ufo/glyphs/I_macron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Imacron" format="1">
+<glyph name="Imacron" format="2">
   <advance width="1233"/>
   <unicode hex="012A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/I_ogonek.glif b/source/Hack-Italic.ufo/glyphs/I_ogonek.glif
index 83fbb2d98..50256e9f0 100644
--- a/source/Hack-Italic.ufo/glyphs/I_ogonek.glif
+++ b/source/Hack-Italic.ufo/glyphs/I_ogonek.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Iogonek" format="1">
+<glyph name="Iogonek" format="2">
   <advance width="1233"/>
   <unicode hex="012E"/>
   <outline>
@@ -11,20 +11,20 @@
       <point x="610" y="0" type="line"/>
       <point x="529" y="-77"/>
       <point x="485" y="-144"/>
-      <point x="485" y="-200" type="curve" name="dh02" smooth="yes"/>
+      <point x="485" y="-200" type="curve" smooth="yes" name="dh02"/>
       <point x="485" y="-247"/>
       <point x="517" y="-272"/>
-      <point x="581" y="-272" type="curve" name="dv02" smooth="yes"/>
+      <point x="581" y="-272" type="curve" smooth="yes" name="dv02"/>
       <point x="620" y="-272"/>
       <point x="665" y="-262"/>
       <point x="708" y="-242" type="curve"/>
       <point x="683" y="-375" type="line"/>
       <point x="637" y="-388"/>
       <point x="591" y="-395"/>
-      <point x="544" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="544" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="413" y="-395"/>
       <point x="339" y="-338"/>
-      <point x="339" y="-245" type="curve" name="dh01" smooth="yes"/>
+      <point x="339" y="-245" type="curve" smooth="yes" name="dh01"/>
       <point x="339" y="-170"/>
       <point x="387" y="-93"/>
       <point x="491" y="0" type="curve" name="ab02"/>
diff --git a/source/Hack-Italic.ufo/glyphs/I_ota.glif b/source/Hack-Italic.ufo/glyphs/I_ota.glif
index e5ed23b6d..8b922aec9 100644
--- a/source/Hack-Italic.ufo/glyphs/I_ota.glif
+++ b/source/Hack-Italic.ufo/glyphs/I_ota.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Iota" format="1">
+<glyph name="Iota" format="2">
   <advance width="1233"/>
   <unicode hex="0399"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/I_otadieresis.glif b/source/Hack-Italic.ufo/glyphs/I_otadieresis.glif
index 5f479f2fa..5575ffac6 100644
--- a/source/Hack-Italic.ufo/glyphs/I_otadieresis.glif
+++ b/source/Hack-Italic.ufo/glyphs/I_otadieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Iotadieresis" format="1">
+<glyph name="Iotadieresis" format="2">
   <advance width="1233"/>
   <unicode hex="03AA"/>
   <outline>
     <contour>
-      <point x="506" y="1647" type="line" name="hr00" smooth="yes"/>
+      <point x="506" y="1647" type="line" smooth="yes" name="hr00"/>
       <point x="486" y="1647"/>
       <point x="475" y="1660"/>
       <point x="479" y="1680" type="curve" smooth="yes"/>
       <point x="507" y="1823" type="line"/>
       <point x="510" y="1841"/>
       <point x="520" y="1850"/>
-      <point x="539" y="1850" type="curve" name="dv01" smooth="yes"/>
+      <point x="539" y="1850" type="curve" smooth="yes" name="dv01"/>
       <point x="683" y="1850" type="line" smooth="yes"/>
       <point x="704" y="1850"/>
       <point x="713" y="1837"/>
@@ -22,14 +22,14 @@
       <point x="648" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="897" y="1647" type="line" name="sv01" smooth="yes"/>
+      <point x="897" y="1647" type="line" smooth="yes" name="sv01"/>
       <point x="877" y="1647"/>
       <point x="866" y="1660"/>
       <point x="870" y="1680" type="curve" smooth="yes"/>
       <point x="898" y="1823" type="line"/>
       <point x="901" y="1841"/>
       <point x="911" y="1850"/>
-      <point x="930" y="1850" type="curve" name="sv02" smooth="yes"/>
+      <point x="930" y="1850" type="curve" smooth="yes" name="sv02"/>
       <point x="1073" y="1850" type="line" smooth="yes"/>
       <point x="1093" y="1850"/>
       <point x="1104" y="1837"/>
diff --git a/source/Hack-Italic.ufo/glyphs/I_otatonos.glif b/source/Hack-Italic.ufo/glyphs/I_otatonos.glif
index 2e184f3f4..9087f70cb 100644
--- a/source/Hack-Italic.ufo/glyphs/I_otatonos.glif
+++ b/source/Hack-Italic.ufo/glyphs/I_otatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Iotatonos" format="1">
+<glyph name="Iotatonos" format="2">
   <advance width="1233"/>
   <unicode hex="038A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/I_tilde.glif b/source/Hack-Italic.ufo/glyphs/I_tilde.glif
index 9a2d74cfb..a2b522750 100644
--- a/source/Hack-Italic.ufo/glyphs/I_tilde.glif
+++ b/source/Hack-Italic.ufo/glyphs/I_tilde.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Itilde" format="1">
+<glyph name="Itilde" format="2">
   <advance width="1233"/>
   <unicode hex="0128"/>
   <outline>
@@ -7,21 +7,21 @@
       <point x="448" y="1627" type="line" name="sv01"/>
       <point x="495" y="1772"/>
       <point x="580" y="1846"/>
-      <point x="688" y="1846" type="curve" name="dv02" smooth="yes"/>
+      <point x="688" y="1846" type="curve" smooth="yes" name="dv02"/>
       <point x="733" y="1846"/>
       <point x="776" y="1834"/>
       <point x="823" y="1799" type="curve" smooth="yes"/>
       <point x="858" y="1773" type="line" smooth="yes"/>
       <point x="882" y="1755"/>
       <point x="906" y="1746"/>
-      <point x="930" y="1746" type="curve" name="dv04" smooth="yes"/>
+      <point x="930" y="1746" type="curve" smooth="yes" name="dv04"/>
       <point x="986" y="1746"/>
       <point x="1023" y="1785"/>
       <point x="1038" y="1846" type="curve" name="sv02"/>
       <point x="1163" y="1846" type="line"/>
       <point x="1120" y="1698"/>
       <point x="1029" y="1627"/>
-      <point x="918" y="1627" type="curve" name="dv03" smooth="yes"/>
+      <point x="918" y="1627" type="curve" smooth="yes" name="dv03"/>
       <point x="875" y="1627"/>
       <point x="840" y="1638"/>
       <point x="796" y="1670" type="curve" smooth="yes"/>
@@ -29,7 +29,7 @@
       <point x="760" y="1696" type="line" smooth="yes"/>
       <point x="731" y="1717"/>
       <point x="705" y="1728"/>
-      <point x="680" y="1728" type="curve" name="dv01" smooth="yes"/>
+      <point x="680" y="1728" type="curve" smooth="yes" name="dv01"/>
       <point x="634" y="1728"/>
       <point x="598" y="1694"/>
       <point x="573" y="1627" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/J_.glif b/source/Hack-Italic.ufo/glyphs/J_.glif
index f23d0ee1b..57e428dad 100644
--- a/source/Hack-Italic.ufo/glyphs/J_.glif
+++ b/source/Hack-Italic.ufo/glyphs/J_.glif
@@ -1,39 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="J" format="1">
+<glyph name="J" format="2">
   <advance width="1233"/>
   <unicode hex="004A"/>
   <outline>
     <contour>
-      <point x="375" y="-29" type="curve" name="hr00" smooth="yes"/>
-      <point x="303" y="-29"/>
-      <point x="242" y="-21"/>
-      <point x="174" y="-6" type="curve" smooth="yes"/>
-      <point x="103" y="10"/>
-      <point x="42" y="32"/>
+      <point x="381.255" y="-29" type="curve" smooth="yes"/>
+      <point x="257.173" y="-29"/>
+      <point x="104.78" y="4.76044"/>
       <point x="-25" y="61" type="curve"/>
       <point x="20" y="297" type="line"/>
-      <point x="71" y="241"/>
-      <point x="124" y="204"/>
-      <point x="184" y="177" type="curve" smooth="yes"/>
-      <point x="243" y="150"/>
-      <point x="303" y="135"/>
-      <point x="380" y="135" type="curve" name="dv01" smooth="yes"/>
-      <point x="475" y="135"/>
-      <point x="545" y="159"/>
-      <point x="592" y="208" type="curve" smooth="yes"/>
-      <point x="635" y="252"/>
-      <point x="673" y="336"/>
+      <point x="116.096" y="191.426"/>
+      <point x="242.831" y="135"/>
+      <point x="388.459" y="135" type="curve" smooth="yes"/>
+      <point x="570.533" y="135"/>
+      <point x="650.25" y="223.202"/>
       <point x="702" y="487" type="curve" smooth="yes"/>
-      <point x="866" y="1323" type="line" name="sv01"/>
+      <point x="866" y="1323" type="line"/>
       <point x="485" y="1323" type="line"/>
-      <point x="518" y="1493" type="line" name="at01"/>
+      <point x="518" y="1493" type="line"/>
       <point x="1102" y="1493" type="line"/>
       <point x="905" y="487" type="line" smooth="yes"/>
-      <point x="866" y="287"/>
-      <point x="810" y="162"/>
-      <point x="729" y="86" type="curve" smooth="yes"/>
-      <point x="645" y="7"/>
-      <point x="532" y="-29"/>
+      <point x="831.477" y="111.549"/>
+      <point x="688.819" y="-29"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Italic.ufo/glyphs/J_circumflex.glif b/source/Hack-Italic.ufo/glyphs/J_circumflex.glif
index 2f141494f..a82fe50cf 100644
--- a/source/Hack-Italic.ufo/glyphs/J_circumflex.glif
+++ b/source/Hack-Italic.ufo/glyphs/J_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Jcircumflex" format="1">
+<glyph name="Jcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0134"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/K_.glif b/source/Hack-Italic.ufo/glyphs/K_.glif
index 8a3116ac8..55ac22424 100644
--- a/source/Hack-Italic.ufo/glyphs/K_.glif
+++ b/source/Hack-Italic.ufo/glyphs/K_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="K" format="1">
+<glyph name="K" format="2">
   <advance width="1233"/>
   <unicode hex="004B"/>
   <outline>
     <contour>
-      <point x="283" y="1493" type="line" name="hr00"/>
+      <point x="283" y="1493" type="line"/>
       <point x="485" y="1493" type="line"/>
-      <point x="358" y="846" type="line" name="iv01"/>
-      <point x="1100" y="1493" type="line" name="at01"/>
+      <point x="358" y="846" type="line"/>
+      <point x="1100" y="1493" type="line"/>
       <point x="1354" y="1493" type="line"/>
       <point x="651" y="874" type="line"/>
-      <point x="1079" y="0" type="line" name="ab01"/>
+      <point x="1079" y="0" type="line"/>
       <point x="860" y="0" type="line"/>
-      <point x="500" y="741" type="line" name="iv02"/>
+      <point x="500" y="741" type="line"/>
       <point x="307" y="573" type="line"/>
-      <point x="195" y="0" type="line" name="ab02"/>
+      <point x="195" y="0" type="line"/>
       <point x="-8" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/K_appa.glif b/source/Hack-Italic.ufo/glyphs/K_appa.glif
index ac6ba9b1e..2d5278b99 100644
--- a/source/Hack-Italic.ufo/glyphs/K_appa.glif
+++ b/source/Hack-Italic.ufo/glyphs/K_appa.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Kappa" format="1">
+<glyph name="Kappa" format="2">
   <advance width="1233"/>
   <unicode hex="039A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/L_.glif b/source/Hack-Italic.ufo/glyphs/L_.glif
index ac68071f7..474e0e595 100644
--- a/source/Hack-Italic.ufo/glyphs/L_.glif
+++ b/source/Hack-Italic.ufo/glyphs/L_.glif
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="L" format="1">
+<glyph name="L" format="2">
   <advance width="1233"/>
   <unicode hex="004C"/>
   <outline>
     <contour>
-      <point x="369" y="1493" type="line" name="hr00"/>
+      <point x="369" y="1493" type="line"/>
       <point x="571" y="1493" type="line"/>
-      <point x="313" y="170" type="line" name="sv01"/>
+      <point x="313" y="170" type="line"/>
       <point x="1034" y="170" type="line"/>
-      <point x="1001" y="0" type="line" name="ab01"/>
+      <point x="1001" y="0" type="line"/>
       <point x="78" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/L_acute.glif b/source/Hack-Italic.ufo/glyphs/L_acute.glif
index 0b8f03c66..c8dca523a 100644
--- a/source/Hack-Italic.ufo/glyphs/L_acute.glif
+++ b/source/Hack-Italic.ufo/glyphs/L_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Lacute" format="1">
+<glyph name="Lacute" format="2">
   <advance width="1233"/>
   <unicode hex="0139"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/L_ambda.glif b/source/Hack-Italic.ufo/glyphs/L_ambda.glif
index 9f89b873a..c7f8fe8f4 100644
--- a/source/Hack-Italic.ufo/glyphs/L_ambda.glif
+++ b/source/Hack-Italic.ufo/glyphs/L_ambda.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Lambda" format="1">
+<glyph name="Lambda" format="2">
   <advance width="1233"/>
   <unicode hex="039B"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/L_caron.glif b/source/Hack-Italic.ufo/glyphs/L_caron.glif
index b5aba3665..3cd9eca9c 100644
--- a/source/Hack-Italic.ufo/glyphs/L_caron.glif
+++ b/source/Hack-Italic.ufo/glyphs/L_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Lcaron" format="1">
+<glyph name="Lcaron" format="2">
   <advance width="1233"/>
   <unicode hex="013D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/L_dot.glif b/source/Hack-Italic.ufo/glyphs/L_dot.glif
index 7ab5dd637..d23aed00c 100644
--- a/source/Hack-Italic.ufo/glyphs/L_dot.glif
+++ b/source/Hack-Italic.ufo/glyphs/L_dot.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ldot" format="1">
+<glyph name="Ldot" format="2">
   <advance width="1233"/>
   <unicode hex="013F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/L_slash.glif b/source/Hack-Italic.ufo/glyphs/L_slash.glif
index 06dd0a2ca..3b8f89197 100644
--- a/source/Hack-Italic.ufo/glyphs/L_slash.glif
+++ b/source/Hack-Italic.ufo/glyphs/L_slash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Lslash" format="1">
+<glyph name="Lslash" format="2">
   <advance width="1233"/>
   <unicode hex="0141"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/M_.glif b/source/Hack-Italic.ufo/glyphs/M_.glif
index 7f27234e4..fe9c4389c 100644
--- a/source/Hack-Italic.ufo/glyphs/M_.glif
+++ b/source/Hack-Italic.ufo/glyphs/M_.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="M" format="1">
+<glyph name="M" format="2">
   <advance width="1233"/>
   <unicode hex="004D"/>
   <outline>
     <contour>
-      <point x="229" y="1493" type="line" name="hr00"/>
+      <point x="229" y="1493" type="line"/>
       <point x="498" y="1493" type="line"/>
-      <point x="608" y="737" type="line" name="iv01"/>
-      <point x="1022" y="1493" type="line" name="at01"/>
+      <point x="608" y="737" type="line"/>
+      <point x="1022" y="1493" type="line"/>
       <point x="1292" y="1493" type="line"/>
-      <point x="1001" y="0" type="line" name="ab01"/>
+      <point x="1001" y="0" type="line"/>
       <point x="815" y="0" type="line"/>
-      <point x="1073" y="1327" type="line" name="iv02"/>
+      <point x="1073" y="1327" type="line"/>
       <point x="639" y="532" type="line"/>
       <point x="498" y="532" type="line"/>
-      <point x="383" y="1327" type="line" name="iv03"/>
-      <point x="127" y="0" type="line" name="ab02"/>
+      <point x="383" y="1327" type="line"/>
+      <point x="127" y="0" type="line"/>
       <point x="-59" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/M_u.glif b/source/Hack-Italic.ufo/glyphs/M_u.glif
index ffff459c7..1dd62498b 100644
--- a/source/Hack-Italic.ufo/glyphs/M_u.glif
+++ b/source/Hack-Italic.ufo/glyphs/M_u.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Mu" format="1">
+<glyph name="Mu" format="2">
   <advance width="1233"/>
   <unicode hex="039C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/N_.glif b/source/Hack-Italic.ufo/glyphs/N_.glif
index 903db8b25..8e87e9559 100644
--- a/source/Hack-Italic.ufo/glyphs/N_.glif
+++ b/source/Hack-Italic.ufo/glyphs/N_.glif
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="N" format="1">
+<glyph name="N" format="2">
   <advance width="1233"/>
   <unicode hex="004E"/>
   <outline>
     <contour>
-      <point x="285" y="1493" type="line" name="hr00"/>
+      <point x="285" y="1493" type="line"/>
       <point x="541" y="1493" type="line"/>
-      <point x="805" y="264" type="line" name="iv01"/>
-      <point x="1044" y="1493" type="line" name="at01"/>
+      <point x="805" y="264" type="line"/>
+      <point x="1044" y="1493" type="line"/>
       <point x="1239" y="1493" type="line"/>
-      <point x="948" y="0" type="line" name="ab01"/>
+      <point x="948" y="0" type="line"/>
       <point x="692" y="0" type="line"/>
-      <point x="428" y="1229" type="line" name="iv02"/>
-      <point x="188" y="0" type="line" name="ab02"/>
+      <point x="428" y="1229" type="line"/>
+      <point x="188" y="0" type="line"/>
       <point x="-6" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/N_U_L_L_.glif b/source/Hack-Italic.ufo/glyphs/N_U_L_L_.glif
index fa0b87887..79a4001e6 100644
--- a/source/Hack-Italic.ufo/glyphs/N_U_L_L_.glif
+++ b/source/Hack-Italic.ufo/glyphs/N_U_L_L_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="NULL" format="1">
-  <advance width="0"/>
+<glyph name="NULL" format="2">
   <unicode hex="0000"/>
   <outline>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/N_acute.glif b/source/Hack-Italic.ufo/glyphs/N_acute.glif
index a6a60db19..601e391fe 100644
--- a/source/Hack-Italic.ufo/glyphs/N_acute.glif
+++ b/source/Hack-Italic.ufo/glyphs/N_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Nacute" format="1">
+<glyph name="Nacute" format="2">
   <advance width="1233"/>
   <unicode hex="0143"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/N_caron.glif b/source/Hack-Italic.ufo/glyphs/N_caron.glif
index 694361643..f4e702717 100644
--- a/source/Hack-Italic.ufo/glyphs/N_caron.glif
+++ b/source/Hack-Italic.ufo/glyphs/N_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ncaron" format="1">
+<glyph name="Ncaron" format="2">
   <advance width="1233"/>
   <unicode hex="0147"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/N_tilde.glif b/source/Hack-Italic.ufo/glyphs/N_tilde.glif
index a29181e02..48eaf076b 100644
--- a/source/Hack-Italic.ufo/glyphs/N_tilde.glif
+++ b/source/Hack-Italic.ufo/glyphs/N_tilde.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ntilde" format="1">
+<glyph name="Ntilde" format="2">
   <advance width="1233"/>
   <unicode hex="00D1"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="535" y="1791" type="curve" smooth="yes"/>
       <point x="576" y="1828"/>
       <point x="625" y="1846"/>
-      <point x="680" y="1846" type="curve" name="dv02" smooth="yes"/>
+      <point x="680" y="1846" type="curve" smooth="yes" name="dv02"/>
       <point x="707" y="1846"/>
       <point x="726" y="1842"/>
       <point x="747" y="1835" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="1058" y="1682" type="curve" smooth="yes"/>
       <point x="1019" y="1647"/>
       <point x="968" y="1627"/>
-      <point x="907" y="1627" type="curve" name="sv02" smooth="yes"/>
+      <point x="907" y="1627" type="curve" smooth="yes" name="sv02"/>
       <point x="880" y="1627"/>
       <point x="864" y="1631"/>
       <point x="845" y="1638" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/N_u.glif b/source/Hack-Italic.ufo/glyphs/N_u.glif
index b404f0578..2e9a1b5b9 100644
--- a/source/Hack-Italic.ufo/glyphs/N_u.glif
+++ b/source/Hack-Italic.ufo/glyphs/N_u.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Nu" format="1">
+<glyph name="Nu" format="2">
   <advance width="1233"/>
   <unicode hex="039D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/O_.glif b/source/Hack-Italic.ufo/glyphs/O_.glif
index 93eaf8c65..adb0b170c 100644
--- a/source/Hack-Italic.ufo/glyphs/O_.glif
+++ b/source/Hack-Italic.ufo/glyphs/O_.glif
@@ -1,95 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="O" format="1">
+<glyph name="O" format="2">
   <advance width="1233"/>
   <unicode hex="004F"/>
   <outline>
     <contour>
-      <point x="478" y="-29" type="curve" name="hr00" smooth="yes"/>
-      <point x="343" y="-29"/>
-      <point x="244" y="12"/>
-      <point x="179" y="94" type="curve" smooth="yes"/>
-      <point x="114" y="175"/>
-      <point x="82" y="302"/>
-      <point x="82" y="473" type="curve" name="sh01" smooth="yes"/>
-      <point x="82" y="558"/>
-      <point x="89" y="628"/>
-      <point x="104" y="712" type="curve" smooth="yes"/>
-      <point x="120" y="805"/>
-      <point x="137" y="880"/>
-      <point x="168" y="975" type="curve" smooth="yes"/>
-      <point x="189" y="1042"/>
-      <point x="208" y="1090"/>
-      <point x="231" y="1141" type="curve" smooth="yes"/>
-      <point x="258" y="1198"/>
-      <point x="280" y="1236"/>
-      <point x="303" y="1271" type="curve" smooth="yes"/>
-      <point x="360" y="1356"/>
-      <point x="426" y="1419"/>
-      <point x="501" y="1460" type="curve" smooth="yes"/>
-      <point x="569" y="1497"/>
-      <point x="648" y="1520"/>
-      <point x="753" y="1520" type="curve" name="at01" smooth="yes"/>
-      <point x="886" y="1520"/>
-      <point x="986" y="1484"/>
-      <point x="1054" y="1397" type="curve" smooth="yes"/>
-      <point x="1119" y="1316"/>
-      <point x="1151" y="1191"/>
-      <point x="1151" y="1024" type="curve" name="sh02" smooth="yes"/>
-      <point x="1151" y="944"/>
-      <point x="1144" y="868"/>
-      <point x="1129" y="781" type="curve" smooth="yes"/>
-      <point x="1114" y="696"/>
-      <point x="1092" y="607"/>
-      <point x="1063" y="516" type="curve" smooth="yes"/>
-      <point x="1042" y="449"/>
-      <point x="1024" y="402"/>
-      <point x="1001" y="351" type="curve"/>
-      <point x="982" y="312"/>
-      <point x="956" y="262"/>
-      <point x="928" y="219" type="curve" smooth="yes"/>
-      <point x="876" y="140"/>
-      <point x="807" y="75"/>
-      <point x="731" y="32" type="curve" smooth="yes"/>
-      <point x="658" y="-9"/>
-      <point x="574" y="-29"/>
+      <point x="477.106" y="-29" type="curve" smooth="yes"/>
+      <point x="233.394" y="-29"/>
+      <point x="82" y="156.328"/>
+      <point x="82" y="454.665" type="curve" smooth="yes"/>
+      <point x="82" y="887.829"/>
+      <point x="268.523" y="1332.84"/>
+      <point x="508.458" y="1464.08" type="curve" smooth="yes"/>
+      <point x="574.757" y="1500.34"/>
+      <point x="658.567" y="1520"/>
+      <point x="752.718" y="1520" type="curve" smooth="yes"/>
+      <point x="1020.25" y="1520"/>
+      <point x="1151" y="1358.94"/>
+      <point x="1151" y="1029.4" type="curve" smooth="yes"/>
+      <point x="1151" y="885.734"/>
+      <point x="1118.77" y="692.195"/>
+      <point x="1068.3" y="532.733" type="curve" smooth="yes"/>
+      <point x="947.836" y="152.176"/>
+      <point x="757.158" y="-29"/>
     </contour>
     <contour>
-      <point x="498" y="135" type="curve" name="dv01" smooth="yes"/>
-      <point x="555" y="135"/>
-      <point x="611" y="151"/>
-      <point x="660" y="186" type="curve" smooth="yes"/>
-      <point x="713" y="225"/>
-      <point x="750" y="278"/>
-      <point x="778" y="331" type="curve" smooth="yes"/>
-      <point x="829" y="427"/>
-      <point x="871" y="565"/>
-      <point x="898" y="684" type="curve" smooth="yes"/>
-      <point x="929" y="821"/>
-      <point x="944" y="959"/>
-      <point x="944" y="1067" type="curve" name="ah01" smooth="yes"/>
-      <point x="944" y="1182"/>
-      <point x="927" y="1245"/>
-      <point x="892" y="1289" type="curve" smooth="yes"/>
-      <point x="857" y="1332"/>
-      <point x="805" y="1356"/>
-      <point x="734" y="1356" type="curve" name="sv01" smooth="yes"/>
-      <point x="675" y="1356"/>
-      <point x="620" y="1340"/>
-      <point x="572" y="1305" type="curve" smooth="yes"/>
-      <point x="525" y="1270"/>
-      <point x="486" y="1220"/>
-      <point x="455" y="1160" type="curve" smooth="yes"/>
-      <point x="408" y="1072"/>
-      <point x="364" y="945"/>
-      <point x="333" y="808" type="curve" smooth="yes"/>
-      <point x="302" y="675"/>
-      <point x="287" y="541"/>
-      <point x="287" y="429" type="curve" name="sh03" smooth="yes"/>
-      <point x="287" y="311"/>
-      <point x="305" y="248"/>
-      <point x="340" y="203" type="curve"/>
-      <point x="379" y="155"/>
-      <point x="434" y="135"/>
+      <point x="494.808" y="135" type="curve" smooth="yes"/>
+      <point x="555.783" y="135"/>
+      <point x="613.53" y="152.654"/>
+      <point x="651.151" y="179.65" type="curve" smooth="yes"/>
+      <point x="796.393" y="283.873"/>
+      <point x="944" y="744.281"/>
+      <point x="944" y="1074.75" type="curve" smooth="yes"/>
+      <point x="944" y="1265.19"/>
+      <point x="877.131" y="1356"/>
+      <point x="736.895" y="1356" type="curve" smooth="yes"/>
+      <point x="674.514" y="1356"/>
+      <point x="618.014" y="1338.54"/>
+      <point x="576.43" y="1308.23" type="curve" smooth="yes"/>
+      <point x="423.096" y="1196.46"/>
+      <point x="287" y="774.654"/>
+      <point x="287" y="421.439" type="curve" smooth="yes"/>
+      <point x="287" y="228.879"/>
+      <point x="355.108" y="135"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Italic.ufo/glyphs/O_E_.glif b/source/Hack-Italic.ufo/glyphs/O_E_.glif
index 3522c4b35..246589cb0 100644
--- a/source/Hack-Italic.ufo/glyphs/O_E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/O_E_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="OE" format="1">
+<glyph name="OE" format="2">
   <advance width="1233"/>
   <unicode hex="0152"/>
   <outline>
     <contour>
-      <point x="467" y="0" type="line" name="hr00" smooth="yes"/>
+      <point x="467" y="0" type="line" smooth="yes" name="hr00"/>
       <point x="323" y="0"/>
       <point x="213" y="34"/>
       <point x="141" y="103" type="curve" smooth="yes"/>
       <point x="66" y="175"/>
       <point x="35" y="283"/>
-      <point x="35" y="424" type="curve" name="dh01" smooth="yes"/>
+      <point x="35" y="424" type="curve" smooth="yes" name="dh01"/>
       <point x="35" y="588"/>
       <point x="88" y="893"/>
       <point x="154" y="1067" type="curve" smooth="yes"/>
@@ -19,7 +19,7 @@
       <point x="379" y="1396" type="curve" smooth="yes"/>
       <point x="470" y="1461"/>
       <point x="597" y="1493"/>
-      <point x="758" y="1493" type="curve" name="at01" smooth="yes"/>
+      <point x="758" y="1493" type="curve" smooth="yes" name="at01"/>
       <point x="1352" y="1493" type="line"/>
       <point x="1319" y="1323" type="line" name="sv01"/>
       <point x="961" y="1323" type="line"/>
@@ -34,7 +34,7 @@
     <contour>
       <point x="539" y="170" type="line" name="sv03"/>
       <point x="764" y="1323" type="line" name="sv04"/>
-      <point x="702" y="1323" type="line" name="sv05" smooth="yes"/>
+      <point x="702" y="1323" type="line" smooth="yes" name="sv05"/>
       <point x="623" y="1323"/>
       <point x="556" y="1305"/>
       <point x="501" y="1269" type="curve" smooth="yes"/>
@@ -49,16 +49,16 @@
       <point x="272" y="745" type="curve" smooth="yes"/>
       <point x="257" y="674"/>
       <point x="248" y="616"/>
-      <point x="240" y="556" type="curve" name="sh01" smooth="yes"/>
+      <point x="240" y="556" type="curve" smooth="yes" name="sh01"/>
       <point x="233" y="500"/>
       <point x="229" y="452"/>
-      <point x="229" y="416" type="curve" name="dh02" smooth="yes"/>
+      <point x="229" y="416" type="curve" smooth="yes" name="dh02"/>
       <point x="229" y="336"/>
       <point x="249" y="273"/>
       <point x="292" y="230" type="curve" smooth="yes"/>
       <point x="336" y="187"/>
       <point x="401" y="170"/>
-      <point x="477" y="170" type="curve" name="sv06" smooth="yes"/>
+      <point x="477" y="170" type="curve" smooth="yes" name="sv06"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Italic.ufo/glyphs/O_acute.glif b/source/Hack-Italic.ufo/glyphs/O_acute.glif
index 995ffe65d..e323f0d6d 100644
--- a/source/Hack-Italic.ufo/glyphs/O_acute.glif
+++ b/source/Hack-Italic.ufo/glyphs/O_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Oacute" format="1">
+<glyph name="Oacute" format="2">
   <advance width="1233"/>
   <unicode hex="00D3"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="638" y="1595" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="478" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="478" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="343" y="-29"/>
       <point x="244" y="12"/>
       <point x="179" y="94" type="curve" smooth="yes"/>
       <point x="114" y="175"/>
       <point x="82" y="302"/>
-      <point x="82" y="473" type="curve" name="sh02" smooth="yes"/>
+      <point x="82" y="473" type="curve" smooth="yes" name="sh02"/>
       <point x="82" y="558"/>
       <point x="89" y="628"/>
       <point x="104" y="712" type="curve" smooth="yes"/>
@@ -34,13 +34,13 @@
       <point x="501" y="1460" type="curve" smooth="yes"/>
       <point x="569" y="1497"/>
       <point x="648" y="1520"/>
-      <point x="753" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="753" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="886" y="1520"/>
       <point x="986" y="1484"/>
       <point x="1054" y="1397" type="curve" smooth="yes"/>
       <point x="1119" y="1316"/>
       <point x="1151" y="1191"/>
-      <point x="1151" y="1024" type="curve" name="sh01" smooth="yes"/>
+      <point x="1151" y="1024" type="curve" smooth="yes" name="sh01"/>
       <point x="1151" y="944"/>
       <point x="1144" y="868"/>
       <point x="1129" y="781" type="curve" smooth="yes"/>
@@ -60,7 +60,7 @@
       <point x="574" y="-29"/>
     </contour>
     <contour>
-      <point x="498" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="498" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="555" y="135"/>
       <point x="611" y="151"/>
       <point x="660" y="186" type="curve" smooth="yes"/>
@@ -72,13 +72,13 @@
       <point x="898" y="684" type="curve" smooth="yes"/>
       <point x="929" y="821"/>
       <point x="944" y="959"/>
-      <point x="944" y="1067" type="curve" name="ah01" smooth="yes"/>
+      <point x="944" y="1067" type="curve" smooth="yes" name="ah01"/>
       <point x="944" y="1182"/>
       <point x="927" y="1245"/>
       <point x="892" y="1289" type="curve" smooth="yes"/>
       <point x="857" y="1332"/>
       <point x="805" y="1356"/>
-      <point x="734" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="734" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="675" y="1356"/>
       <point x="620" y="1340"/>
       <point x="572" y="1305" type="curve" smooth="yes"/>
@@ -90,7 +90,7 @@
       <point x="333" y="808" type="curve" smooth="yes"/>
       <point x="302" y="675"/>
       <point x="287" y="541"/>
-      <point x="287" y="429" type="curve" name="sh03" smooth="yes"/>
+      <point x="287" y="429" type="curve" smooth="yes" name="sh03"/>
       <point x="287" y="311"/>
       <point x="305" y="248"/>
       <point x="340" y="203" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/O_breve.glif b/source/Hack-Italic.ufo/glyphs/O_breve.glif
index 04f6c9a2f..9541759e3 100644
--- a/source/Hack-Italic.ufo/glyphs/O_breve.glif
+++ b/source/Hack-Italic.ufo/glyphs/O_breve.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Obreve" format="1">
+<glyph name="Obreve" format="2">
   <advance width="1233"/>
   <unicode hex="014E"/>
   <outline>
     <contour>
-      <point x="478" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="478" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="343" y="-29"/>
       <point x="244" y="12"/>
       <point x="179" y="94" type="curve" smooth="yes"/>
       <point x="114" y="175"/>
       <point x="82" y="302"/>
-      <point x="82" y="473" type="curve" name="sh01" smooth="yes"/>
+      <point x="82" y="473" type="curve" smooth="yes" name="sh01"/>
       <point x="82" y="558"/>
       <point x="89" y="628"/>
       <point x="104" y="712" type="curve" smooth="yes"/>
@@ -28,13 +28,13 @@
       <point x="501" y="1460" type="curve" smooth="yes"/>
       <point x="569" y="1497"/>
       <point x="648" y="1520"/>
-      <point x="753" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="753" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="886" y="1520"/>
       <point x="986" y="1484"/>
       <point x="1054" y="1397" type="curve" smooth="yes"/>
       <point x="1119" y="1316"/>
       <point x="1151" y="1191"/>
-      <point x="1151" y="1024" type="curve" name="sh02" smooth="yes"/>
+      <point x="1151" y="1024" type="curve" smooth="yes" name="sh02"/>
       <point x="1151" y="944"/>
       <point x="1144" y="868"/>
       <point x="1129" y="781" type="curve" smooth="yes"/>
@@ -54,7 +54,7 @@
       <point x="574" y="-29"/>
     </contour>
     <contour>
-      <point x="498" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="498" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="555" y="135"/>
       <point x="611" y="151"/>
       <point x="660" y="186" type="curve" smooth="yes"/>
@@ -66,13 +66,13 @@
       <point x="898" y="684" type="curve" smooth="yes"/>
       <point x="929" y="821"/>
       <point x="944" y="959"/>
-      <point x="944" y="1067" type="curve" name="ah01" smooth="yes"/>
+      <point x="944" y="1067" type="curve" smooth="yes" name="ah01"/>
       <point x="944" y="1182"/>
       <point x="927" y="1245"/>
       <point x="892" y="1289" type="curve" smooth="yes"/>
       <point x="857" y="1332"/>
       <point x="805" y="1356"/>
-      <point x="734" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="734" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="675" y="1356"/>
       <point x="620" y="1340"/>
       <point x="572" y="1305" type="curve" smooth="yes"/>
@@ -84,7 +84,7 @@
       <point x="333" y="808" type="curve" smooth="yes"/>
       <point x="302" y="675"/>
       <point x="287" y="541"/>
-      <point x="287" y="429" type="curve" name="sh03" smooth="yes"/>
+      <point x="287" y="429" type="curve" smooth="yes" name="sh03"/>
       <point x="287" y="311"/>
       <point x="305" y="248"/>
       <point x="340" y="203" type="curve"/>
@@ -92,7 +92,7 @@
       <point x="434" y="135"/>
     </contour>
     <contour>
-      <point x="788" y="1619" type="curve" name="dv03" smooth="yes"/>
+      <point x="788" y="1619" type="curve" smooth="yes" name="dv03"/>
       <point x="708" y="1619"/>
       <point x="645" y="1639"/>
       <point x="598" y="1680" type="curve" smooth="yes"/>
@@ -105,7 +105,7 @@
       <point x="678" y="1773" type="curve" smooth="yes"/>
       <point x="705" y="1754"/>
       <point x="740" y="1746"/>
-      <point x="795" y="1746" type="curve" name="dv04" smooth="yes"/>
+      <point x="795" y="1746" type="curve" smooth="yes" name="dv04"/>
       <point x="850" y="1746"/>
       <point x="897" y="1755"/>
       <point x="933" y="1774" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/O_circumflex.glif b/source/Hack-Italic.ufo/glyphs/O_circumflex.glif
index 2d16bdc2a..dde653ef4 100644
--- a/source/Hack-Italic.ufo/glyphs/O_circumflex.glif
+++ b/source/Hack-Italic.ufo/glyphs/O_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ocircumflex" format="1">
+<glyph name="Ocircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00D4"/>
   <outline>
@@ -13,13 +13,13 @@
       <point x="434" y="1595" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="478" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="478" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="343" y="-29"/>
       <point x="244" y="12"/>
       <point x="179" y="94" type="curve" smooth="yes"/>
       <point x="114" y="175"/>
       <point x="82" y="302"/>
-      <point x="82" y="473" type="curve" name="sh03" smooth="yes"/>
+      <point x="82" y="473" type="curve" smooth="yes" name="sh03"/>
       <point x="82" y="558"/>
       <point x="89" y="628"/>
       <point x="104" y="712" type="curve" smooth="yes"/>
@@ -37,13 +37,13 @@
       <point x="501" y="1460" type="curve" smooth="yes"/>
       <point x="569" y="1497"/>
       <point x="648" y="1520"/>
-      <point x="753" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="753" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="886" y="1520"/>
       <point x="986" y="1484"/>
       <point x="1054" y="1397" type="curve" smooth="yes"/>
       <point x="1119" y="1316"/>
       <point x="1151" y="1191"/>
-      <point x="1151" y="1024" type="curve" name="sh01" smooth="yes"/>
+      <point x="1151" y="1024" type="curve" smooth="yes" name="sh01"/>
       <point x="1151" y="944"/>
       <point x="1144" y="868"/>
       <point x="1129" y="781" type="curve" smooth="yes"/>
@@ -63,7 +63,7 @@
       <point x="574" y="-29"/>
     </contour>
     <contour>
-      <point x="498" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="498" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="555" y="135"/>
       <point x="611" y="151"/>
       <point x="660" y="186" type="curve" smooth="yes"/>
@@ -75,13 +75,13 @@
       <point x="898" y="684" type="curve" smooth="yes"/>
       <point x="929" y="821"/>
       <point x="944" y="959"/>
-      <point x="944" y="1067" type="curve" name="ah01" smooth="yes"/>
+      <point x="944" y="1067" type="curve" smooth="yes" name="ah01"/>
       <point x="944" y="1182"/>
       <point x="927" y="1245"/>
       <point x="892" y="1289" type="curve" smooth="yes"/>
       <point x="857" y="1332"/>
       <point x="805" y="1356"/>
-      <point x="734" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="734" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="675" y="1356"/>
       <point x="620" y="1340"/>
       <point x="572" y="1305" type="curve" smooth="yes"/>
@@ -93,7 +93,7 @@
       <point x="333" y="808" type="curve" smooth="yes"/>
       <point x="302" y="675"/>
       <point x="287" y="541"/>
-      <point x="287" y="429" type="curve" name="sh04" smooth="yes"/>
+      <point x="287" y="429" type="curve" smooth="yes" name="sh04"/>
       <point x="287" y="311"/>
       <point x="305" y="248"/>
       <point x="340" y="203" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/O_dieresis.glif b/source/Hack-Italic.ufo/glyphs/O_dieresis.glif
index 1e06d0799..3ea430d87 100644
--- a/source/Hack-Italic.ufo/glyphs/O_dieresis.glif
+++ b/source/Hack-Italic.ufo/glyphs/O_dieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Odieresis" format="1">
+<glyph name="Odieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00D6"/>
   <outline>
     <contour>
-      <point x="492" y="1627" type="line" name="hr00" smooth="yes"/>
+      <point x="492" y="1627" type="line" smooth="yes" name="hr00"/>
       <point x="472" y="1627"/>
       <point x="461" y="1640"/>
       <point x="465" y="1660" type="curve" smooth="yes"/>
       <point x="493" y="1803" type="line"/>
       <point x="496" y="1821"/>
       <point x="506" y="1830"/>
-      <point x="525" y="1830" type="curve" name="dv03" smooth="yes"/>
+      <point x="525" y="1830" type="curve" smooth="yes" name="dv03"/>
       <point x="669" y="1830" type="line" smooth="yes"/>
       <point x="687" y="1830"/>
       <point x="696" y="1822"/>
@@ -25,14 +25,14 @@
       <point x="634" y="1627" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="883" y="1627" type="line" name="sv01" smooth="yes"/>
+      <point x="883" y="1627" type="line" smooth="yes" name="sv01"/>
       <point x="863" y="1627"/>
       <point x="852" y="1640"/>
       <point x="856" y="1660" type="curve" smooth="yes"/>
       <point x="884" y="1803" type="line"/>
       <point x="887" y="1821"/>
       <point x="897" y="1830"/>
-      <point x="916" y="1830" type="curve" name="sv02" smooth="yes"/>
+      <point x="916" y="1830" type="curve" smooth="yes" name="sv02"/>
       <point x="1059" y="1830" type="line" smooth="yes"/>
       <point x="1079" y="1830"/>
       <point x="1090" y="1817"/>
@@ -43,13 +43,13 @@
       <point x="1026" y="1627" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="478" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="478" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="343" y="-29"/>
       <point x="244" y="12"/>
       <point x="179" y="94" type="curve" smooth="yes"/>
       <point x="114" y="175"/>
       <point x="82" y="302"/>
-      <point x="82" y="473" type="curve" name="sh01" smooth="yes"/>
+      <point x="82" y="473" type="curve" smooth="yes" name="sh01"/>
       <point x="82" y="558"/>
       <point x="89" y="628"/>
       <point x="104" y="712" type="curve" smooth="yes"/>
@@ -67,13 +67,13 @@
       <point x="501" y="1460" type="curve" smooth="yes"/>
       <point x="569" y="1497"/>
       <point x="648" y="1520"/>
-      <point x="753" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="753" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="886" y="1520"/>
       <point x="986" y="1484"/>
       <point x="1054" y="1397" type="curve" smooth="yes"/>
       <point x="1119" y="1316"/>
       <point x="1151" y="1191"/>
-      <point x="1151" y="1024" type="curve" name="sh02" smooth="yes"/>
+      <point x="1151" y="1024" type="curve" smooth="yes" name="sh02"/>
       <point x="1151" y="944"/>
       <point x="1144" y="868"/>
       <point x="1129" y="781" type="curve" smooth="yes"/>
@@ -93,7 +93,7 @@
       <point x="574" y="-29"/>
     </contour>
     <contour>
-      <point x="498" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="498" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="555" y="135"/>
       <point x="611" y="151"/>
       <point x="660" y="186" type="curve" smooth="yes"/>
@@ -105,13 +105,13 @@
       <point x="898" y="684" type="curve" smooth="yes"/>
       <point x="929" y="821"/>
       <point x="944" y="959"/>
-      <point x="944" y="1067" type="curve" name="ah01" smooth="yes"/>
+      <point x="944" y="1067" type="curve" smooth="yes" name="ah01"/>
       <point x="944" y="1182"/>
       <point x="927" y="1245"/>
       <point x="892" y="1289" type="curve" smooth="yes"/>
       <point x="857" y="1332"/>
       <point x="805" y="1356"/>
-      <point x="734" y="1356" type="curve" name="sv03" smooth="yes"/>
+      <point x="734" y="1356" type="curve" smooth="yes" name="sv03"/>
       <point x="675" y="1356"/>
       <point x="620" y="1340"/>
       <point x="572" y="1305" type="curve" smooth="yes"/>
@@ -123,7 +123,7 @@
       <point x="333" y="808" type="curve" smooth="yes"/>
       <point x="302" y="675"/>
       <point x="287" y="541"/>
-      <point x="287" y="429" type="curve" name="sh03" smooth="yes"/>
+      <point x="287" y="429" type="curve" smooth="yes" name="sh03"/>
       <point x="287" y="311"/>
       <point x="305" y="248"/>
       <point x="340" y="203" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/O_grave.glif b/source/Hack-Italic.ufo/glyphs/O_grave.glif
index 48d106207..748c0759c 100644
--- a/source/Hack-Italic.ufo/glyphs/O_grave.glif
+++ b/source/Hack-Italic.ufo/glyphs/O_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ograve" format="1">
+<glyph name="Ograve" format="2">
   <advance width="1233"/>
   <unicode hex="00D2"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="733" y="1595" type="line"/>
     </contour>
     <contour>
-      <point x="478" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="478" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="343" y="-29"/>
       <point x="244" y="12"/>
       <point x="179" y="94" type="curve" smooth="yes"/>
       <point x="114" y="175"/>
       <point x="82" y="302"/>
-      <point x="82" y="473" type="curve" name="sh01" smooth="yes"/>
+      <point x="82" y="473" type="curve" smooth="yes" name="sh01"/>
       <point x="82" y="558"/>
       <point x="89" y="628"/>
       <point x="104" y="712" type="curve" smooth="yes"/>
@@ -34,13 +34,13 @@
       <point x="501" y="1460" type="curve" smooth="yes"/>
       <point x="569" y="1497"/>
       <point x="648" y="1520"/>
-      <point x="753" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="753" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="886" y="1520"/>
       <point x="986" y="1484"/>
       <point x="1054" y="1397" type="curve" smooth="yes"/>
       <point x="1119" y="1316"/>
       <point x="1151" y="1191"/>
-      <point x="1151" y="1024" type="curve" name="sh02" smooth="yes"/>
+      <point x="1151" y="1024" type="curve" smooth="yes" name="sh02"/>
       <point x="1151" y="944"/>
       <point x="1144" y="868"/>
       <point x="1129" y="781" type="curve" smooth="yes"/>
@@ -60,7 +60,7 @@
       <point x="574" y="-29"/>
     </contour>
     <contour>
-      <point x="498" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="498" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="555" y="135"/>
       <point x="611" y="151"/>
       <point x="660" y="186" type="curve" smooth="yes"/>
@@ -72,13 +72,13 @@
       <point x="898" y="684" type="curve" smooth="yes"/>
       <point x="929" y="821"/>
       <point x="944" y="959"/>
-      <point x="944" y="1067" type="curve" name="ah01" smooth="yes"/>
+      <point x="944" y="1067" type="curve" smooth="yes" name="ah01"/>
       <point x="944" y="1182"/>
       <point x="927" y="1245"/>
       <point x="892" y="1289" type="curve" smooth="yes"/>
       <point x="857" y="1332"/>
       <point x="805" y="1356"/>
-      <point x="734" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="734" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="675" y="1356"/>
       <point x="620" y="1340"/>
       <point x="572" y="1305" type="curve" smooth="yes"/>
@@ -90,7 +90,7 @@
       <point x="333" y="808" type="curve" smooth="yes"/>
       <point x="302" y="675"/>
       <point x="287" y="541"/>
-      <point x="287" y="429" type="curve" name="sh03" smooth="yes"/>
+      <point x="287" y="429" type="curve" smooth="yes" name="sh03"/>
       <point x="287" y="311"/>
       <point x="305" y="248"/>
       <point x="340" y="203" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/O_horn.glif b/source/Hack-Italic.ufo/glyphs/O_horn.glif
index 08184f52c..f7fc30726 100644
--- a/source/Hack-Italic.ufo/glyphs/O_horn.glif
+++ b/source/Hack-Italic.ufo/glyphs/O_horn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ohorn" format="1">
+<glyph name="Ohorn" format="2">
   <advance width="1233"/>
   <unicode hex="01A0"/>
   <outline>
@@ -7,46 +7,46 @@
       <point x="1367" y="1557" type="line" name="sh02"/>
       <point x="1368" y="1538"/>
       <point x="1369" y="1523"/>
-      <point x="1369" y="1508" type="curve" name="sh01" smooth="yes"/>
+      <point x="1369" y="1508" type="curve" smooth="yes" name="sh01"/>
       <point x="1369" y="1472"/>
       <point x="1365" y="1445"/>
       <point x="1361" y="1421" type="curve" smooth="yes"/>
       <point x="1333" y="1269"/>
       <point x="1263" y="1184"/>
-      <point x="1142" y="1184" type="curve" name="sv01" smooth="yes"/>
+      <point x="1142" y="1184" type="curve" smooth="yes" name="sv01"/>
       <point x="1121" y="1184"/>
       <point x="1103" y="1186"/>
       <point x="1086" y="1191" type="curve" name="sh03"/>
       <point x="1094" y="1145"/>
       <point x="1098" y="1094"/>
-      <point x="1098" y="1037" type="curve" name="dh04" smooth="yes"/>
+      <point x="1098" y="1037" type="curve" smooth="yes" name="dh04"/>
       <point x="1098" y="877"/>
       <point x="1064" y="683"/>
       <point x="1011" y="516" type="curve" smooth="yes"/>
       <point x="971" y="391"/>
       <point x="923" y="292"/>
-      <point x="874" y="219" type="curve" name="hr01" smooth="yes"/>
+      <point x="874" y="219" type="curve" smooth="yes" name="hr01"/>
       <point x="761" y="48"/>
       <point x="614" y="-29"/>
-      <point x="427" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="427" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="162" y="-29"/>
       <point x="29" y="134"/>
-      <point x="29" y="459" type="curve" name="dh01" smooth="yes"/>
+      <point x="29" y="459" type="curve" smooth="yes" name="dh01"/>
       <point x="29" y="630"/>
       <point x="63" y="818"/>
-      <point x="114" y="975" type="curve" name="hr02" smooth="yes"/>
+      <point x="114" y="975" type="curve" smooth="yes" name="hr02"/>
       <point x="155" y="1104"/>
       <point x="203" y="1200"/>
       <point x="251" y="1272" type="curve" smooth="yes"/>
       <point x="363" y="1439"/>
       <point x="507" y="1520"/>
-      <point x="698" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="698" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="849" y="1520"/>
       <point x="958" y="1468"/>
       <point x="1024" y="1364" type="curve"/>
       <point x="1067" y="1335"/>
       <point x="1099" y="1323"/>
-      <point x="1131" y="1323" type="curve" name="sv02" smooth="yes"/>
+      <point x="1131" y="1323" type="curve" smooth="yes" name="sv02"/>
       <point x="1187" y="1323"/>
       <point x="1225" y="1360"/>
       <point x="1240" y="1432" type="curve" smooth="yes"/>
@@ -61,19 +61,19 @@
       <point x="725" y="333" type="curve" smooth="yes"/>
       <point x="825" y="521"/>
       <point x="891" y="841"/>
-      <point x="891" y="1060" type="curve" name="dh03" smooth="yes"/>
+      <point x="891" y="1060" type="curve" smooth="yes" name="dh03"/>
       <point x="891" y="1236"/>
       <point x="848" y="1356"/>
-      <point x="681" y="1356" type="curve" name="sv03" smooth="yes"/>
+      <point x="681" y="1356" type="curve" smooth="yes" name="sv03"/>
       <point x="550" y="1356"/>
       <point x="469" y="1283"/>
       <point x="402" y="1159" type="curve" smooth="yes"/>
       <point x="302" y="972"/>
       <point x="234" y="651"/>
-      <point x="234" y="432" type="curve" name="dh02" smooth="yes"/>
+      <point x="234" y="432" type="curve" smooth="yes" name="dh02"/>
       <point x="234" y="247"/>
       <point x="281" y="135"/>
-      <point x="444" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="444" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="575" y="135"/>
       <point x="659" y="209"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/O_hungarumlaut.glif b/source/Hack-Italic.ufo/glyphs/O_hungarumlaut.glif
index 6485e1004..40922e5f1 100644
--- a/source/Hack-Italic.ufo/glyphs/O_hungarumlaut.glif
+++ b/source/Hack-Italic.ufo/glyphs/O_hungarumlaut.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ohungarumlaut" format="1">
+<glyph name="Ohungarumlaut" format="2">
   <advance width="1233"/>
   <unicode hex="0150"/>
   <outline>
@@ -16,10 +16,10 @@
       <point x="837" y="1595" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="480" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="480" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="215" y="-29"/>
       <point x="82" y="134"/>
-      <point x="82" y="459" type="curve" name="sh02" smooth="yes"/>
+      <point x="82" y="459" type="curve" smooth="yes" name="sh02"/>
       <point x="82" y="630"/>
       <point x="116" y="818"/>
       <point x="167" y="975" type="curve" smooth="yes"/>
@@ -28,10 +28,10 @@
       <point x="304" y="1272" type="curve" smooth="yes"/>
       <point x="416" y="1439"/>
       <point x="560" y="1520"/>
-      <point x="751" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="751" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1019" y="1520"/>
       <point x="1151" y="1362"/>
-      <point x="1151" y="1037" type="curve" name="sh03" smooth="yes"/>
+      <point x="1151" y="1037" type="curve" smooth="yes" name="sh03"/>
       <point x="1151" y="877"/>
       <point x="1117" y="683"/>
       <point x="1064" y="516" type="curve" smooth="yes"/>
@@ -42,22 +42,22 @@
       <point x="667" y="-29"/>
     </contour>
     <contour>
-      <point x="497" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="497" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="660" y="135"/>
       <point x="752" y="249"/>
       <point x="825" y="437" type="curve" smooth="yes"/>
       <point x="897" y="625"/>
       <point x="944" y="877"/>
-      <point x="944" y="1060" type="curve" name="ah01" smooth="yes"/>
+      <point x="944" y="1060" type="curve" smooth="yes" name="ah01"/>
       <point x="944" y="1236"/>
       <point x="901" y="1356"/>
-      <point x="734" y="1356" type="curve" name="sv03" smooth="yes"/>
+      <point x="734" y="1356" type="curve" smooth="yes" name="sv03"/>
       <point x="603" y="1356"/>
       <point x="522" y="1283"/>
       <point x="455" y="1159" type="curve" smooth="yes"/>
       <point x="355" y="972"/>
       <point x="287" y="651"/>
-      <point x="287" y="432" type="curve" name="sh04" smooth="yes"/>
+      <point x="287" y="432" type="curve" smooth="yes" name="sh04"/>
       <point x="287" y="247"/>
       <point x="334" y="135"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/O_macron.glif b/source/Hack-Italic.ufo/glyphs/O_macron.glif
index 1686791cf..f5ebccf57 100644
--- a/source/Hack-Italic.ufo/glyphs/O_macron.glif
+++ b/source/Hack-Italic.ufo/glyphs/O_macron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Omacron" format="1">
+<glyph name="Omacron" format="2">
   <advance width="1233"/>
   <unicode hex="014C"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="502" y="1652" type="line"/>
     </contour>
     <contour>
-      <point x="480" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="480" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="215" y="-29"/>
       <point x="82" y="134"/>
-      <point x="82" y="459" type="curve" name="sh01" smooth="yes"/>
+      <point x="82" y="459" type="curve" smooth="yes" name="sh01"/>
       <point x="82" y="630"/>
       <point x="116" y="818"/>
       <point x="167" y="975" type="curve" smooth="yes"/>
@@ -22,10 +22,10 @@
       <point x="304" y="1272" type="curve" smooth="yes"/>
       <point x="416" y="1439"/>
       <point x="560" y="1520"/>
-      <point x="751" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="751" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1019" y="1520"/>
       <point x="1151" y="1362"/>
-      <point x="1151" y="1037" type="curve" name="sh02" smooth="yes"/>
+      <point x="1151" y="1037" type="curve" smooth="yes" name="sh02"/>
       <point x="1151" y="877"/>
       <point x="1117" y="683"/>
       <point x="1064" y="516" type="curve" smooth="yes"/>
@@ -36,22 +36,22 @@
       <point x="667" y="-29"/>
     </contour>
     <contour>
-      <point x="497" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="497" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="660" y="135"/>
       <point x="752" y="249"/>
       <point x="825" y="437" type="curve" smooth="yes"/>
       <point x="897" y="625"/>
       <point x="944" y="877"/>
-      <point x="944" y="1060" type="curve" name="ah01" smooth="yes"/>
+      <point x="944" y="1060" type="curve" smooth="yes" name="ah01"/>
       <point x="944" y="1236"/>
       <point x="901" y="1356"/>
-      <point x="734" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="734" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="603" y="1356"/>
       <point x="522" y="1283"/>
       <point x="455" y="1159" type="curve" smooth="yes"/>
       <point x="355" y="972"/>
       <point x="287" y="651"/>
-      <point x="287" y="432" type="curve" name="sh03" smooth="yes"/>
+      <point x="287" y="432" type="curve" smooth="yes" name="sh03"/>
       <point x="287" y="247"/>
       <point x="334" y="135"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/O_megatonos.glif b/source/Hack-Italic.ufo/glyphs/O_megatonos.glif
index 3a88ca212..1f0381e34 100644
--- a/source/Hack-Italic.ufo/glyphs/O_megatonos.glif
+++ b/source/Hack-Italic.ufo/glyphs/O_megatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Omegatonos" format="1">
+<glyph name="Omegatonos" format="2">
   <advance width="1233"/>
   <unicode hex="038F"/>
   <outline>
@@ -14,16 +14,16 @@
       <point x="212" y="172" type="line" name="ih02"/>
       <point x="120" y="297"/>
       <point x="76" y="428"/>
-      <point x="76" y="585" type="curve" name="sh01" smooth="yes"/>
+      <point x="76" y="585" type="curve" smooth="yes" name="sh01"/>
       <point x="76" y="646"/>
       <point x="83" y="712"/>
       <point x="97" y="782" type="curve" smooth="yes"/>
       <point x="177" y="1194"/>
       <point x="433" y="1460"/>
-      <point x="759" y="1460" type="curve" name="dv02" smooth="yes"/>
+      <point x="759" y="1460" type="curve" smooth="yes" name="dv02"/>
       <point x="1028" y="1460"/>
       <point x="1177" y="1278"/>
-      <point x="1177" y="985" type="curve" name="sh02" smooth="yes"/>
+      <point x="1177" y="985" type="curve" smooth="yes" name="sh02"/>
       <point x="1177" y="922"/>
       <point x="1170" y="854"/>
       <point x="1156" y="782" type="curve" smooth="yes"/>
@@ -39,16 +39,16 @@
       <point x="964" y="799" type="curve"/>
       <point x="975" y="862"/>
       <point x="981" y="919"/>
-      <point x="981" y="971" type="curve" name="ah01" smooth="yes"/>
+      <point x="981" y="971" type="curve" smooth="yes" name="ah01"/>
       <point x="981" y="1175"/>
       <point x="896" y="1294"/>
-      <point x="728" y="1294" type="curve" name="dv01" smooth="yes"/>
+      <point x="728" y="1294" type="curve" smooth="yes" name="dv01"/>
       <point x="525" y="1294"/>
       <point x="361" y="1117"/>
       <point x="297" y="799" type="curve" smooth="yes"/>
       <point x="281" y="721"/>
       <point x="273" y="647"/>
-      <point x="273" y="577" type="curve" name="hr01" smooth="yes"/>
+      <point x="273" y="577" type="curve" smooth="yes" name="hr01"/>
       <point x="273" y="390"/>
       <point x="327" y="244"/>
       <point x="430" y="172" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/O_micron.glif b/source/Hack-Italic.ufo/glyphs/O_micron.glif
index e82ed51ac..417bd64e6 100644
--- a/source/Hack-Italic.ufo/glyphs/O_micron.glif
+++ b/source/Hack-Italic.ufo/glyphs/O_micron.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Omicron" format="1">
+<glyph name="Omicron" format="2">
   <advance width="1233"/>
   <unicode hex="039F"/>
   <outline>
     <contour>
-      <point x="480" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="480" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="215" y="-29"/>
       <point x="82" y="134"/>
-      <point x="82" y="459" type="curve" name="sh01" smooth="yes"/>
+      <point x="82" y="459" type="curve" smooth="yes" name="sh01"/>
       <point x="82" y="630"/>
       <point x="116" y="818"/>
       <point x="167" y="975" type="curve" smooth="yes"/>
@@ -16,10 +16,10 @@
       <point x="304" y="1272" type="curve" smooth="yes"/>
       <point x="416" y="1439"/>
       <point x="560" y="1520"/>
-      <point x="751" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="751" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1019" y="1520"/>
       <point x="1151" y="1362"/>
-      <point x="1151" y="1037" type="curve" name="sh02" smooth="yes"/>
+      <point x="1151" y="1037" type="curve" smooth="yes" name="sh02"/>
       <point x="1151" y="877"/>
       <point x="1117" y="683"/>
       <point x="1064" y="516" type="curve" smooth="yes"/>
@@ -30,22 +30,22 @@
       <point x="667" y="-29"/>
     </contour>
     <contour>
-      <point x="497" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="497" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="660" y="135"/>
       <point x="752" y="249"/>
       <point x="825" y="437" type="curve" smooth="yes"/>
       <point x="897" y="625"/>
       <point x="944" y="877"/>
-      <point x="944" y="1060" type="curve" name="ah01" smooth="yes"/>
+      <point x="944" y="1060" type="curve" smooth="yes" name="ah01"/>
       <point x="944" y="1236"/>
       <point x="901" y="1356"/>
-      <point x="734" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="734" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="603" y="1356"/>
       <point x="522" y="1283"/>
       <point x="455" y="1159" type="curve" smooth="yes"/>
       <point x="355" y="972"/>
       <point x="287" y="651"/>
-      <point x="287" y="432" type="curve" name="sh03" smooth="yes"/>
+      <point x="287" y="432" type="curve" smooth="yes" name="sh03"/>
       <point x="287" y="247"/>
       <point x="334" y="135"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/O_microntonos.glif b/source/Hack-Italic.ufo/glyphs/O_microntonos.glif
index 5965a8266..e772f7294 100644
--- a/source/Hack-Italic.ufo/glyphs/O_microntonos.glif
+++ b/source/Hack-Italic.ufo/glyphs/O_microntonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Omicrontonos" format="1">
+<glyph name="Omicrontonos" format="2">
   <advance width="1233"/>
   <unicode hex="038C"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="25" y="1262" type="line"/>
     </contour>
     <contour>
-      <point x="480" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="480" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="215" y="-29"/>
       <point x="82" y="134"/>
-      <point x="82" y="459" type="curve" name="sh01" smooth="yes"/>
+      <point x="82" y="459" type="curve" smooth="yes" name="sh01"/>
       <point x="82" y="630"/>
       <point x="116" y="818"/>
       <point x="167" y="975" type="curve" smooth="yes"/>
@@ -22,10 +22,10 @@
       <point x="304" y="1272" type="curve" smooth="yes"/>
       <point x="416" y="1439"/>
       <point x="560" y="1520"/>
-      <point x="751" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="751" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1019" y="1520"/>
       <point x="1151" y="1362"/>
-      <point x="1151" y="1037" type="curve" name="sh02" smooth="yes"/>
+      <point x="1151" y="1037" type="curve" smooth="yes" name="sh02"/>
       <point x="1151" y="877"/>
       <point x="1117" y="683"/>
       <point x="1064" y="516" type="curve" smooth="yes"/>
@@ -36,22 +36,22 @@
       <point x="667" y="-29"/>
     </contour>
     <contour>
-      <point x="497" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="497" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="660" y="135"/>
       <point x="752" y="249"/>
       <point x="825" y="437" type="curve" smooth="yes"/>
       <point x="897" y="625"/>
       <point x="944" y="877"/>
-      <point x="944" y="1060" type="curve" name="ah01" smooth="yes"/>
+      <point x="944" y="1060" type="curve" smooth="yes" name="ah01"/>
       <point x="944" y="1236"/>
       <point x="901" y="1356"/>
-      <point x="734" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="734" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="603" y="1356"/>
       <point x="522" y="1283"/>
       <point x="455" y="1159" type="curve" smooth="yes"/>
       <point x="355" y="972"/>
       <point x="287" y="651"/>
-      <point x="287" y="432" type="curve" name="sh03" smooth="yes"/>
+      <point x="287" y="432" type="curve" smooth="yes" name="sh03"/>
       <point x="287" y="247"/>
       <point x="334" y="135"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/O_slash.glif b/source/Hack-Italic.ufo/glyphs/O_slash.glif
index 5bbfc1057..2893fb844 100644
--- a/source/Hack-Italic.ufo/glyphs/O_slash.glif
+++ b/source/Hack-Italic.ufo/glyphs/O_slash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Oslash" format="1">
+<glyph name="Oslash" format="2">
   <advance width="1233"/>
   <unicode hex="00D8"/>
   <outline>
@@ -8,10 +8,10 @@
       <point x="133" y="164" type="line"/>
       <point x="114" y="205"/>
       <point x="101" y="250"/>
-      <point x="93" y="293" type="curve" name="sh02" smooth="yes"/>
+      <point x="93" y="293" type="curve" smooth="yes" name="sh02"/>
       <point x="84" y="338"/>
       <point x="80" y="391"/>
-      <point x="80" y="452" type="curve" name="sh01" smooth="yes"/>
+      <point x="80" y="452" type="curve" smooth="yes" name="sh01"/>
       <point x="80" y="579"/>
       <point x="97" y="716"/>
       <point x="132" y="859" type="curve" smooth="yes"/>
@@ -23,7 +23,7 @@
       <point x="476" y="1445" type="curve" smooth="yes"/>
       <point x="559" y="1496"/>
       <point x="650" y="1520"/>
-      <point x="750" y="1520" type="curve" name="at02" smooth="yes"/>
+      <point x="750" y="1520" type="curve" smooth="yes" name="at02"/>
       <point x="805" y="1520"/>
       <point x="854" y="1514"/>
       <point x="897" y="1499" type="curve" smooth="yes"/>
@@ -35,10 +35,10 @@
       <point x="1094" y="1337" type="line"/>
       <point x="1115" y="1292"/>
       <point x="1128" y="1252"/>
-      <point x="1137" y="1205" type="curve" name="sh04" smooth="yes"/>
+      <point x="1137" y="1205" type="curve" smooth="yes" name="sh04"/>
       <point x="1146" y="1157"/>
       <point x="1151" y="1107"/>
-      <point x="1151" y="1039" type="curve" name="sh03" smooth="yes"/>
+      <point x="1151" y="1039" type="curve" smooth="yes" name="sh03"/>
       <point x="1151" y="914"/>
       <point x="1134" y="777"/>
       <point x="1099" y="634" type="curve" smooth="yes"/>
@@ -47,7 +47,7 @@
       <point x="962" y="276" type="curve" smooth="yes"/>
       <point x="845" y="69"/>
       <point x="690" y="-29"/>
-      <point x="479" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="479" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="422" y="-29"/>
       <point x="374" y="-21"/>
       <point x="329" y="-6" type="curve" smooth="yes"/>
@@ -63,7 +63,7 @@
       <point x="831" y="1335" type="curve" smooth="yes"/>
       <point x="804" y="1348"/>
       <point x="767" y="1356"/>
-      <point x="727" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="727" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="655" y="1356"/>
       <point x="592" y="1331"/>
       <point x="536" y="1274" type="curve" smooth="yes"/>
@@ -82,7 +82,7 @@
       <point x="291" y="389" type="curve" name="sh06"/>
     </contour>
     <contour>
-      <point x="501" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="501" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="576" y="135"/>
       <point x="641" y="162"/>
       <point x="695" y="217" type="curve" smooth="yes"/>
@@ -94,7 +94,7 @@
       <point x="913" y="766" type="curve" smooth="yes"/>
       <point x="931" y="864"/>
       <point x="940" y="954"/>
-      <point x="940" y="1036" type="curve" name="ah01" smooth="yes"/>
+      <point x="940" y="1036" type="curve" smooth="yes" name="ah01"/>
       <point x="940" y="1082" type="line" smooth="yes"/>
       <point x="940" y="1086"/>
       <point x="939" y="1105"/>
diff --git a/source/Hack-Italic.ufo/glyphs/O_slashacute.glif b/source/Hack-Italic.ufo/glyphs/O_slashacute.glif
index c4a2025e7..2777859b8 100644
--- a/source/Hack-Italic.ufo/glyphs/O_slashacute.glif
+++ b/source/Hack-Italic.ufo/glyphs/O_slashacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Oslashacute" format="1">
+<glyph name="Oslashacute" format="2">
   <advance width="1233"/>
   <unicode hex="01FE"/>
   <outline>
@@ -14,13 +14,13 @@
       <point x="133" y="164" type="line"/>
       <point x="97" y="241"/>
       <point x="80" y="332"/>
-      <point x="80" y="453" type="curve" name="sh02" smooth="yes"/>
+      <point x="80" y="453" type="curve" smooth="yes" name="sh02"/>
       <point x="80" y="706"/>
       <point x="154" y="1015"/>
       <point x="268" y="1217" type="curve" smooth="yes"/>
       <point x="384" y="1421"/>
       <point x="544" y="1520"/>
-      <point x="749" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="749" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="860" y="1520"/>
       <point x="944" y="1491"/>
       <point x="1016" y="1434" type="curve"/>
@@ -29,13 +29,13 @@
       <point x="1094" y="1337" type="line"/>
       <point x="1133" y="1257"/>
       <point x="1151" y="1165"/>
-      <point x="1151" y="1040" type="curve" name="sh01" smooth="yes"/>
+      <point x="1151" y="1040" type="curve" smooth="yes" name="sh01"/>
       <point x="1151" y="783"/>
       <point x="1075" y="473"/>
       <point x="963" y="276" type="curve" smooth="yes"/>
       <point x="843" y="64"/>
       <point x="679" y="-29"/>
-      <point x="480" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="480" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="372" y="-29"/>
       <point x="283" y="-1"/>
       <point x="207" y="63" type="curve"/>
@@ -45,25 +45,25 @@
       <point x="905" y="1274" type="line"/>
       <point x="866" y="1326"/>
       <point x="806" y="1356"/>
-      <point x="726" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="726" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="574" y="1356"/>
       <point x="474" y="1243"/>
       <point x="395" y="1018" type="curve" smooth="yes"/>
       <point x="331" y="834"/>
       <point x="287" y="597"/>
-      <point x="287" y="469" type="curve" name="sh03" smooth="yes"/>
+      <point x="287" y="469" type="curve" smooth="yes" name="sh03"/>
       <point x="287" y="434"/>
       <point x="290" y="409"/>
       <point x="291" y="389" type="curve" name="sh04"/>
     </contour>
     <contour>
-      <point x="502" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="502" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="655" y="135"/>
       <point x="753" y="244"/>
       <point x="836" y="473" type="curve"/>
       <point x="900" y="655"/>
       <point x="940" y="872"/>
-      <point x="940" y="1043" type="curve" name="ah01" smooth="yes"/>
+      <point x="940" y="1043" type="curve" smooth="yes" name="ah01"/>
       <point x="940" y="1070"/>
       <point x="939" y="1093"/>
       <point x="938" y="1116" type="curve" name="sh05"/>
diff --git a/source/Hack-Italic.ufo/glyphs/O_tilde.glif b/source/Hack-Italic.ufo/glyphs/O_tilde.glif
index 2e376de5f..1f21d2bde 100644
--- a/source/Hack-Italic.ufo/glyphs/O_tilde.glif
+++ b/source/Hack-Italic.ufo/glyphs/O_tilde.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Otilde" format="1">
+<glyph name="Otilde" format="2">
   <advance width="1233"/>
   <unicode hex="00D5"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="531" y="1791" type="curve" smooth="yes"/>
       <point x="572" y="1828"/>
       <point x="621" y="1846"/>
-      <point x="676" y="1846" type="curve" name="dv04" smooth="yes"/>
+      <point x="676" y="1846" type="curve" smooth="yes" name="dv04"/>
       <point x="703" y="1846"/>
       <point x="722" y="1842"/>
       <point x="743" y="1835" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="1054" y="1682" type="curve" smooth="yes"/>
       <point x="1015" y="1647"/>
       <point x="964" y="1627"/>
-      <point x="903" y="1627" type="curve" name="sv02" smooth="yes"/>
+      <point x="903" y="1627" type="curve" smooth="yes" name="sv02"/>
       <point x="876" y="1627"/>
       <point x="860" y="1631"/>
       <point x="841" y="1638" type="curve" smooth="yes"/>
@@ -56,13 +56,13 @@
       <point x="559" y="1627" type="curve" name="dv03"/>
     </contour>
     <contour>
-      <point x="478" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="478" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="343" y="-29"/>
       <point x="244" y="12"/>
       <point x="179" y="94" type="curve" smooth="yes"/>
       <point x="114" y="175"/>
       <point x="82" y="302"/>
-      <point x="82" y="473" type="curve" name="sh01" smooth="yes"/>
+      <point x="82" y="473" type="curve" smooth="yes" name="sh01"/>
       <point x="82" y="558"/>
       <point x="89" y="628"/>
       <point x="104" y="712" type="curve" smooth="yes"/>
@@ -80,13 +80,13 @@
       <point x="501" y="1460" type="curve" smooth="yes"/>
       <point x="569" y="1497"/>
       <point x="648" y="1520"/>
-      <point x="753" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="753" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="886" y="1520"/>
       <point x="986" y="1484"/>
       <point x="1054" y="1397" type="curve" smooth="yes"/>
       <point x="1119" y="1316"/>
       <point x="1151" y="1191"/>
-      <point x="1151" y="1024" type="curve" name="sh02" smooth="yes"/>
+      <point x="1151" y="1024" type="curve" smooth="yes" name="sh02"/>
       <point x="1151" y="944"/>
       <point x="1144" y="868"/>
       <point x="1129" y="781" type="curve" smooth="yes"/>
@@ -106,7 +106,7 @@
       <point x="574" y="-29"/>
     </contour>
     <contour>
-      <point x="498" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="498" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="555" y="135"/>
       <point x="611" y="151"/>
       <point x="660" y="186" type="curve" smooth="yes"/>
@@ -118,13 +118,13 @@
       <point x="898" y="684" type="curve" smooth="yes"/>
       <point x="929" y="821"/>
       <point x="944" y="959"/>
-      <point x="944" y="1067" type="curve" name="ah01" smooth="yes"/>
+      <point x="944" y="1067" type="curve" smooth="yes" name="ah01"/>
       <point x="944" y="1182"/>
       <point x="927" y="1245"/>
       <point x="892" y="1289" type="curve" smooth="yes"/>
       <point x="857" y="1332"/>
       <point x="805" y="1356"/>
-      <point x="734" y="1356" type="curve" name="sv03" smooth="yes"/>
+      <point x="734" y="1356" type="curve" smooth="yes" name="sv03"/>
       <point x="675" y="1356"/>
       <point x="620" y="1340"/>
       <point x="572" y="1305" type="curve" smooth="yes"/>
@@ -136,7 +136,7 @@
       <point x="333" y="808" type="curve" smooth="yes"/>
       <point x="302" y="675"/>
       <point x="287" y="541"/>
-      <point x="287" y="429" type="curve" name="sh04" smooth="yes"/>
+      <point x="287" y="429" type="curve" smooth="yes" name="sh04"/>
       <point x="287" y="311"/>
       <point x="305" y="248"/>
       <point x="340" y="203" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/P_.glif b/source/Hack-Italic.ufo/glyphs/P_.glif
index 12189511e..39f861b64 100644
--- a/source/Hack-Italic.ufo/glyphs/P_.glif
+++ b/source/Hack-Italic.ufo/glyphs/P_.glif
@@ -1,35 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="P" format="1">
+<glyph name="P" format="2">
   <advance width="1233"/>
   <unicode hex="0050"/>
   <outline>
     <contour>
-      <point x="321" y="1493" type="line" name="hr00"/>
+      <point x="321" y="1493" type="line"/>
       <point x="761" y="1493" type="line" smooth="yes"/>
-      <point x="1037" y="1493"/>
-      <point x="1183" y="1373"/>
-      <point x="1183" y="1126" type="curve" name="dh02" smooth="yes"/>
-      <point x="1183" y="806"/>
-      <point x="959" y="600"/>
-      <point x="583" y="600" type="curve" name="dv01" smooth="yes"/>
+      <point x="1009.79" y="1493"/>
+      <point x="1183" y="1394.8"/>
+      <point x="1183" y="1115.98" type="curve" smooth="yes"/>
+      <point x="1183" y="769.168"/>
+      <point x="915.019" y="600"/>
+      <point x="583" y="600" type="curve" smooth="yes"/>
       <point x="350" y="600" type="line"/>
-      <point x="233" y="0" type="line" name="ab01"/>
+      <point x="233" y="0" type="line"/>
       <point x="30" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="616" y="766" type="line" name="dv02" smooth="yes"/>
-      <point x="726" y="766"/>
-      <point x="814" y="798"/>
-      <point x="880" y="862" type="curve" smooth="yes"/>
-      <point x="945" y="926"/>
-      <point x="978" y="1012"/>
-      <point x="978" y="1111" type="curve" name="dh01" smooth="yes"/>
-      <point x="978" y="1182"/>
-      <point x="961" y="1239"/>
-      <point x="916" y="1276" type="curve" smooth="yes"/>
-      <point x="875" y="1310"/>
-      <point x="811" y="1327"/>
-      <point x="724" y="1327" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="766" type="line" smooth="yes"/>
+      <point x="825.317" y="766"/>
+      <point x="978" y="895.289"/>
+      <point x="978" y="1106.87" type="curve" smooth="yes"/>
+      <point x="978" y="1278.96"/>
+      <point x="877.006" y="1327"/>
+      <point x="724" y="1327" type="curve" smooth="yes"/>
       <point x="491" y="1327" type="line"/>
       <point x="382" y="766" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/P_hi.glif b/source/Hack-Italic.ufo/glyphs/P_hi.glif
index bb063fea8..693dc1b22 100644
--- a/source/Hack-Italic.ufo/glyphs/P_hi.glif
+++ b/source/Hack-Italic.ufo/glyphs/P_hi.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Phi" format="1">
+<glyph name="Phi" format="2">
   <advance width="1233"/>
   <unicode hex="03A6"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="424" y="286" type="line"/>
       <point x="230" y="307"/>
       <point x="103" y="396"/>
-      <point x="103" y="608" type="curve" name="sh01" smooth="yes"/>
+      <point x="103" y="608" type="curve" smooth="yes" name="sh01"/>
       <point x="103" y="649"/>
       <point x="106" y="694"/>
       <point x="117" y="745" type="curve" name="sh02"/>
@@ -25,7 +25,7 @@
       <point x="806" y="1205" type="line"/>
       <point x="1001" y="1184"/>
       <point x="1128" y="1092"/>
-      <point x="1128" y="880" type="curve" name="sh03" smooth="yes"/>
+      <point x="1128" y="880" type="curve" smooth="yes" name="sh03"/>
       <point x="1128" y="840"/>
       <point x="1125" y="796"/>
       <point x="1114" y="745" type="curve" name="sh04"/>
@@ -44,7 +44,7 @@
       <point x="439" y="971" type="curve"/>
       <point x="367" y="907"/>
       <point x="318" y="767"/>
-      <point x="318" y="651" type="curve" name="sh05" smooth="yes"/>
+      <point x="318" y="651" type="curve" smooth="yes" name="sh05"/>
       <point x="318" y="596"/>
       <point x="329" y="551"/>
       <point x="352" y="520" type="curve"/>
@@ -59,7 +59,7 @@
       <point x="792" y="520" type="curve" smooth="yes"/>
       <point x="865" y="582"/>
       <point x="912" y="726"/>
-      <point x="912" y="841" type="curve" name="ah01" smooth="yes"/>
+      <point x="912" y="841" type="curve" smooth="yes" name="ah01"/>
       <point x="912" y="896"/>
       <point x="902" y="942"/>
       <point x="879" y="971" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/P_i.glif b/source/Hack-Italic.ufo/glyphs/P_i.glif
index 929fc2ab7..57338d7fd 100644
--- a/source/Hack-Italic.ufo/glyphs/P_i.glif
+++ b/source/Hack-Italic.ufo/glyphs/P_i.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Pi" format="1">
+<glyph name="Pi" format="2">
   <advance width="1233"/>
   <unicode hex="03A0"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/P_si.glif b/source/Hack-Italic.ufo/glyphs/P_si.glif
index 35eb88af8..afe2453a3 100644
--- a/source/Hack-Italic.ufo/glyphs/P_si.glif
+++ b/source/Hack-Italic.ufo/glyphs/P_si.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Psi" format="1">
+<glyph name="Psi" format="2">
   <advance width="1233"/>
   <unicode hex="03A8"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="205" y="567" type="curve" smooth="yes"/>
       <point x="174" y="636"/>
       <point x="159" y="723"/>
-      <point x="159" y="827" type="curve" name="dh01" smooth="yes"/>
+      <point x="159" y="827" type="curve" smooth="yes" name="dh01"/>
       <point x="159" y="920"/>
       <point x="171" y="1028"/>
       <point x="195" y="1150" type="curve" smooth="yes"/>
@@ -21,7 +21,7 @@
       <point x="398" y="1150" type="line" smooth="yes"/>
       <point x="374" y="1027"/>
       <point x="362" y="923"/>
-      <point x="362" y="840" type="curve" name="dh02" smooth="yes"/>
+      <point x="362" y="840" type="curve" smooth="yes" name="dh02"/>
       <point x="362" y="776"/>
       <point x="369" y="723"/>
       <point x="383" y="681" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/Q_.glif b/source/Hack-Italic.ufo/glyphs/Q_.glif
index f82d21fd7..f424e5b9a 100644
--- a/source/Hack-Italic.ufo/glyphs/Q_.glif
+++ b/source/Hack-Italic.ufo/glyphs/Q_.glif
@@ -1,93 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Q" format="1">
+<glyph name="Q" format="2">
   <advance width="1233"/>
   <unicode hex="0051"/>
   <outline>
     <contour>
-      <point x="504" y="-27" type="line" name="hr00"/>
-      <point x="494" y="-27" type="line" smooth="yes"/>
-      <point x="206" y="-27"/>
-      <point x="82" y="123"/>
-      <point x="82" y="472" type="curve" smooth="yes" name="sh01"/>
-      <point x="82" y="560"/>
-      <point x="89" y="628"/>
-      <point x="104" y="712" type="curve" smooth="yes"/>
-      <point x="117" y="794"/>
-      <point x="134" y="866"/>
-      <point x="168" y="975" type="curve" smooth="yes"/>
-      <point x="189" y="1042"/>
-      <point x="208" y="1090"/>
-      <point x="231" y="1141" type="curve" smooth="yes"/>
-      <point x="249" y="1180"/>
-      <point x="279" y="1237"/>
-      <point x="303" y="1272" type="curve" smooth="yes"/>
-      <point x="354" y="1348"/>
-      <point x="422" y="1417"/>
-      <point x="501" y="1460" type="curve" smooth="yes"/>
-      <point x="576" y="1501"/>
-      <point x="657" y="1520"/>
-      <point x="753" y="1520" type="curve" smooth="yes" name="at01"/>
-      <point x="889" y="1520"/>
-      <point x="987" y="1481"/>
-      <point x="1054" y="1397" type="curve" smooth="yes"/>
-      <point x="1118" y="1317"/>
-      <point x="1151" y="1196"/>
-      <point x="1151" y="1029" type="curve" smooth="yes" name="sh02"/>
-      <point x="1151" y="900"/>
-      <point x="1133" y="784"/>
-      <point x="1094" y="629" type="curve"/>
-      <point x="1075" y="558"/>
-      <point x="1052" y="482"/>
-      <point x="1032" y="427" type="curve" smooth="yes"/>
-      <point x="1011" y="370"/>
-      <point x="986" y="315"/>
-      <point x="963" y="274" type="curve" smooth="yes"/>
-      <point x="934" y="222"/>
-      <point x="894" y="163"/>
-      <point x="839" y="111" type="curve" smooth="yes"/>
-      <point x="798" y="71"/>
-      <point x="747" y="33"/>
-      <point x="690" y="10" type="curve" name="ih01"/>
-      <point x="990" y="-350" type="line" name="ih02"/>
+      <point x="504" y="-27" type="line"/>
+      <point x="209.133" y="-27"/>
+      <point x="82" y="118.99"/>
+      <point x="82" y="461.172" type="curve" smooth="yes"/>
+      <point x="82" y="619.247"/>
+      <point x="109.131" y="787.363"/>
+      <point x="161.614" y="954.644" type="curve" smooth="yes"/>
+      <point x="281.954" y="1338.22"/>
+      <point x="473.651" y="1520"/>
+      <point x="754.869" y="1520" type="curve" smooth="yes"/>
+      <point x="1019.53" y="1520"/>
+      <point x="1151" y="1358.38"/>
+      <point x="1151" y="1041.26" type="curve" smooth="yes"/>
+      <point x="1151" y="710.511"/>
+      <point x="1007.98" y="138.718"/>
+      <point x="690" y="10" type="curve"/>
+      <point x="990" y="-350" type="line"/>
       <point x="754" y="-350" type="line"/>
     </contour>
     <contour>
-      <point x="498" y="135" type="curve" smooth="yes" name="sv01"/>
-      <point x="555" y="135"/>
-      <point x="611" y="151"/>
-      <point x="660" y="186" type="curve" smooth="yes"/>
-      <point x="713" y="225"/>
-      <point x="750" y="278"/>
-      <point x="778" y="331" type="curve" smooth="yes"/>
-      <point x="829" y="427"/>
-      <point x="871" y="565"/>
-      <point x="898" y="684" type="curve" smooth="yes"/>
-      <point x="929" y="821"/>
-      <point x="944" y="959"/>
-      <point x="944" y="1067" type="curve" smooth="yes" name="ah01"/>
-      <point x="944" y="1182"/>
-      <point x="927" y="1245"/>
-      <point x="892" y="1289" type="curve" smooth="yes"/>
-      <point x="857" y="1332"/>
-      <point x="805" y="1356"/>
-      <point x="734" y="1356" type="curve" smooth="yes" name="sv02"/>
-      <point x="675" y="1356"/>
-      <point x="620" y="1340"/>
-      <point x="572" y="1305" type="curve" smooth="yes"/>
-      <point x="525" y="1270"/>
-      <point x="486" y="1220"/>
-      <point x="455" y="1160" type="curve" smooth="yes"/>
-      <point x="408" y="1072"/>
-      <point x="364" y="945"/>
-      <point x="333" y="808" type="curve" smooth="yes"/>
-      <point x="302" y="675"/>
-      <point x="287" y="541"/>
-      <point x="287" y="429" type="curve" smooth="yes" name="sh04"/>
-      <point x="287" y="311"/>
-      <point x="305" y="248"/>
-      <point x="340" y="203" type="curve"/>
-      <point x="379" y="155"/>
-      <point x="434" y="135"/>
+      <point x="494.808" y="135" type="curve" smooth="yes"/>
+      <point x="555.783" y="135"/>
+      <point x="613.53" y="152.654"/>
+      <point x="651.151" y="179.65" type="curve" smooth="yes"/>
+      <point x="796.393" y="283.873"/>
+      <point x="944" y="744.281"/>
+      <point x="944" y="1074.75" type="curve" smooth="yes"/>
+      <point x="944" y="1265.19"/>
+      <point x="877.131" y="1356"/>
+      <point x="736.895" y="1356" type="curve" smooth="yes"/>
+      <point x="674.514" y="1356"/>
+      <point x="618.014" y="1338.54"/>
+      <point x="576.43" y="1308.23" type="curve" smooth="yes"/>
+      <point x="423.096" y="1196.46"/>
+      <point x="287" y="774.654"/>
+      <point x="287" y="421.439" type="curve" smooth="yes"/>
+      <point x="287" y="228.879"/>
+      <point x="355.108" y="135"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Italic.ufo/glyphs/R_.glif b/source/Hack-Italic.ufo/glyphs/R_.glif
index d069dbea6..505636ea4 100644
--- a/source/Hack-Italic.ufo/glyphs/R_.glif
+++ b/source/Hack-Italic.ufo/glyphs/R_.glif
@@ -1,56 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="R" format="1">
+<glyph name="R" format="2">
   <advance width="1233"/>
   <unicode hex="0052"/>
   <outline>
     <contour>
-      <point x="281" y="1493" type="line" name="hr00"/>
+      <point x="281" y="1493" type="line"/>
       <point x="697" y="1493" type="line" smooth="yes"/>
-      <point x="834" y="1493"/>
-      <point x="941" y="1463"/>
-      <point x="1018" y="1404" type="curve" smooth="yes"/>
-      <point x="1097" y="1343"/>
-      <point x="1131" y="1257"/>
-      <point x="1131" y="1144" type="curve" name="dh02" smooth="yes"/>
-      <point x="1131" y="1032"/>
-      <point x="1097" y="928"/>
-      <point x="1028" y="848" type="curve" smooth="yes"/>
-      <point x="960" y="769"/>
-      <point x="867" y="720"/>
-      <point x="746" y="705" type="curve" name="iv01"/>
-      <point x="791" y="697"/>
-      <point x="834" y="673"/>
-      <point x="862" y="638" type="curve" smooth="yes"/>
-      <point x="889" y="605"/>
-      <point x="922" y="533"/>
+      <point x="929.052" y="1493"/>
+      <point x="1131" y="1406.12"/>
+      <point x="1131" y="1137.53" type="curve" smooth="yes"/>
+      <point x="1131" y="906.681"/>
+      <point x="981.817" y="734.178"/>
+      <point x="746" y="705" type="curve"/>
+      <point x="878.753" y="681.323"/>
+      <point x="920.167" y="540.228"/>
+      <point x="953.601" y="426.324" type="curve" smooth="yes"/>
+      <point x="955.42" y="420.128"/>
+      <point x="957.215" y="414.012"/>
       <point x="959" y="408" type="curve" smooth="yes"/>
-      <point x="1080" y="0" type="line" name="ih01"/>
+      <point x="1080" y="0" type="line"/>
       <point x="879" y="0" type="line"/>
       <point x="773" y="377" type="line" smooth="yes"/>
-      <point x="744" y="480"/>
-      <point x="711" y="549"/>
-      <point x="675" y="582" type="curve" smooth="yes"/>
-      <point x="638" y="617"/>
-      <point x="579" y="631"/>
-      <point x="510" y="631" type="curve" name="dv01" smooth="yes"/>
+      <point x="729.255" y="532.285"/>
+      <point x="690.553" y="631"/>
+      <point x="510" y="631" type="curve" smooth="yes"/>
       <point x="318" y="631" type="line"/>
-      <point x="195" y="0" type="line" name="ab01"/>
+      <point x="195" y="0" type="line"/>
       <point x="-8" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="570" y="797" type="line" name="dv02" smooth="yes"/>
-      <point x="679" y="797"/>
-      <point x="766" y="826"/>
-      <point x="831" y="883" type="curve" smooth="yes"/>
-      <point x="896" y="940"/>
-      <point x="928" y="1015"/>
-      <point x="928" y="1109" type="curve" name="dh01" smooth="yes"/>
-      <point x="928" y="1184"/>
-      <point x="907" y="1240"/>
-      <point x="865" y="1275" type="curve" smooth="yes"/>
-      <point x="824" y="1310"/>
-      <point x="757" y="1327"/>
-      <point x="666" y="1327" type="curve" name="sv01" smooth="yes"/>
+      <point x="570" y="797" type="line" smooth="yes"/>
+      <point x="763.144" y="797"/>
+      <point x="928" y="899.767"/>
+      <point x="928" y="1110.75" type="curve" smooth="yes"/>
+      <point x="928" y="1281.46"/>
+      <point x="820.066" y="1327"/>
+      <point x="666" y="1327" type="curve" smooth="yes"/>
       <point x="453" y="1327" type="line"/>
       <point x="351" y="797" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/R_acute.glif b/source/Hack-Italic.ufo/glyphs/R_acute.glif
index 70e964419..06eb37c68 100644
--- a/source/Hack-Italic.ufo/glyphs/R_acute.glif
+++ b/source/Hack-Italic.ufo/glyphs/R_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Racute" format="1">
+<glyph name="Racute" format="2">
   <advance width="1233"/>
   <unicode hex="0154"/>
   <outline>
@@ -14,7 +14,7 @@
       <point x="697" y="1493" type="line" smooth="yes"/>
       <point x="973" y="1493"/>
       <point x="1131" y="1373"/>
-      <point x="1131" y="1140" type="curve" name="dh02" smooth="yes"/>
+      <point x="1131" y="1140" type="curve" smooth="yes" name="dh02"/>
       <point x="1131" y="913"/>
       <point x="982" y="734"/>
       <point x="746" y="705" type="curve" name="iv02"/>
@@ -29,19 +29,19 @@
       <point x="773" y="377" type="line" smooth="yes"/>
       <point x="714" y="585"/>
       <point x="656" y="631"/>
-      <point x="510" y="631" type="curve" name="dv01" smooth="yes"/>
+      <point x="510" y="631" type="curve" smooth="yes" name="dv01"/>
       <point x="318" y="631" type="line"/>
       <point x="195" y="0" type="line" name="ab01"/>
       <point x="-8" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="570" y="797" type="line" name="dv02" smooth="yes"/>
+      <point x="570" y="797" type="line" smooth="yes" name="dv02"/>
       <point x="787" y="797"/>
       <point x="928" y="920"/>
-      <point x="928" y="1112" type="curve" name="dh01" smooth="yes"/>
+      <point x="928" y="1112" type="curve" smooth="yes" name="dh01"/>
       <point x="928" y="1260"/>
       <point x="847" y="1327"/>
-      <point x="666" y="1327" type="curve" name="sv01" smooth="yes"/>
+      <point x="666" y="1327" type="curve" smooth="yes" name="sv01"/>
       <point x="453" y="1327" type="line"/>
       <point x="351" y="797" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/R_caron.glif b/source/Hack-Italic.ufo/glyphs/R_caron.glif
index 732a48040..038af4bf1 100644
--- a/source/Hack-Italic.ufo/glyphs/R_caron.glif
+++ b/source/Hack-Italic.ufo/glyphs/R_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Rcaron" format="1">
+<glyph name="Rcaron" format="2">
   <advance width="1233"/>
   <unicode hex="0158"/>
   <outline>
@@ -17,7 +17,7 @@
       <point x="697" y="1493" type="line" smooth="yes"/>
       <point x="973" y="1493"/>
       <point x="1131" y="1373"/>
-      <point x="1131" y="1140" type="curve" name="dh02" smooth="yes"/>
+      <point x="1131" y="1140" type="curve" smooth="yes" name="dh02"/>
       <point x="1131" y="913"/>
       <point x="982" y="734"/>
       <point x="746" y="705" type="curve" name="iv01"/>
@@ -32,19 +32,19 @@
       <point x="773" y="377" type="line" smooth="yes"/>
       <point x="714" y="585"/>
       <point x="656" y="631"/>
-      <point x="510" y="631" type="curve" name="dv01" smooth="yes"/>
+      <point x="510" y="631" type="curve" smooth="yes" name="dv01"/>
       <point x="318" y="631" type="line"/>
       <point x="195" y="0" type="line" name="ab01"/>
       <point x="-8" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="570" y="797" type="line" name="dv02" smooth="yes"/>
+      <point x="570" y="797" type="line" smooth="yes" name="dv02"/>
       <point x="787" y="797"/>
       <point x="928" y="920"/>
-      <point x="928" y="1112" type="curve" name="dh01" smooth="yes"/>
+      <point x="928" y="1112" type="curve" smooth="yes" name="dh01"/>
       <point x="928" y="1260"/>
       <point x="847" y="1327"/>
-      <point x="666" y="1327" type="curve" name="sv01" smooth="yes"/>
+      <point x="666" y="1327" type="curve" smooth="yes" name="sv01"/>
       <point x="453" y="1327" type="line"/>
       <point x="351" y="797" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/R_ho.glif b/source/Hack-Italic.ufo/glyphs/R_ho.glif
index b9a150e3b..214efece5 100644
--- a/source/Hack-Italic.ufo/glyphs/R_ho.glif
+++ b/source/Hack-Italic.ufo/glyphs/R_ho.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Rho" format="1">
+<glyph name="Rho" format="2">
   <advance width="1233"/>
   <unicode hex="03A1"/>
   <outline>
@@ -8,22 +8,22 @@
       <point x="782" y="1493" type="line" smooth="yes"/>
       <point x="1055" y="1493"/>
       <point x="1204" y="1374"/>
-      <point x="1204" y="1122" type="curve" name="dh02" smooth="yes"/>
+      <point x="1204" y="1122" type="curve" smooth="yes" name="dh02"/>
       <point x="1204" y="810"/>
       <point x="976" y="600"/>
-      <point x="604" y="600" type="curve" name="dv01" smooth="yes"/>
+      <point x="604" y="600" type="curve" smooth="yes" name="dv01"/>
       <point x="371" y="600" type="line"/>
       <point x="254" y="0" type="line" name="ab01"/>
       <point x="51" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="637" y="766" type="line" name="dv02" smooth="yes"/>
+      <point x="637" y="766" type="line" smooth="yes" name="dv02"/>
       <point x="857" y="766"/>
       <point x="999" y="906"/>
-      <point x="999" y="1110" type="curve" name="dh01" smooth="yes"/>
+      <point x="999" y="1110" type="curve" smooth="yes" name="dh01"/>
       <point x="999" y="1259"/>
       <point x="921" y="1327"/>
-      <point x="745" y="1327" type="curve" name="sv01" smooth="yes"/>
+      <point x="745" y="1327" type="curve" smooth="yes" name="sv01"/>
       <point x="512" y="1327" type="line"/>
       <point x="403" y="766" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/S_.glif b/source/Hack-Italic.ufo/glyphs/S_.glif
index 17e3e18d2..eb23fbdc0 100644
--- a/source/Hack-Italic.ufo/glyphs/S_.glif
+++ b/source/Hack-Italic.ufo/glyphs/S_.glif
@@ -1,76 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="S" format="1">
+<glyph name="S" format="2">
   <advance width="1233"/>
   <unicode hex="0053"/>
   <outline>
     <contour>
-      <point x="435" y="-29" type="curve" name="hr00"/>
-      <point x="358" y="-29"/>
-      <point x="294" y="-21"/>
-      <point x="226" y="-6" type="curve" smooth="yes"/>
-      <point x="157" y="9"/>
-      <point x="90" y="32"/>
       <point x="25" y="61" type="curve"/>
       <point x="66" y="270" type="line"/>
-      <point x="131" y="225"/>
-      <point x="197" y="191"/>
-      <point x="265" y="168" type="curve" smooth="yes"/>
-      <point x="333" y="145"/>
-      <point x="403" y="135"/>
-      <point x="475" y="135" type="curve" name="dv01" smooth="yes"/>
-      <point x="590" y="135"/>
-      <point x="676" y="163"/>
-      <point x="745" y="223" type="curve" smooth="yes"/>
-      <point x="814" y="282"/>
-      <point x="848" y="355"/>
-      <point x="848" y="444" type="curve" name="ah01" smooth="yes"/>
-      <point x="848" y="503"/>
-      <point x="833" y="542"/>
-      <point x="804" y="573" type="curve" smooth="yes"/>
-      <point x="769" y="608"/>
-      <point x="715" y="631"/>
-      <point x="627" y="659" type="curve" smooth="yes"/>
-      <point x="526" y="692" type="line" smooth="yes"/>
-      <point x="418" y="727"/>
-      <point x="328" y="765"/>
-      <point x="269" y="824" type="curve" smooth="yes"/>
-      <point x="220" y="873"/>
-      <point x="195" y="933"/>
-      <point x="195" y="1025" type="curve" name="sh01" smooth="yes"/>
-      <point x="195" y="1160"/>
-      <point x="248" y="1285"/>
-      <point x="360" y="1380" type="curve" smooth="yes"/>
-      <point x="471" y="1473"/>
-      <point x="618" y="1520"/>
-      <point x="783" y="1520" type="curve" name="at01" smooth="yes"/>
-      <point x="847" y="1520"/>
-      <point x="902" y="1513"/>
-      <point x="962" y="1500" type="curve" smooth="yes"/>
-      <point x="1023" y="1487"/>
-      <point x="1080" y="1469"/>
+      <point x="197.048" y="179.246"/>
+      <point x="326.195" y="135"/>
+      <point x="462.756" y="135" type="curve" smooth="yes"/>
+      <point x="691.675" y="135"/>
+      <point x="848" y="259.332"/>
+      <point x="848" y="443.557" type="curve" smooth="yes"/>
+      <point x="848" y="582.694"/>
+      <point x="758.943" y="615.937"/>
+      <point x="647.977" y="652.154" type="curve" smooth="yes"/>
+      <point x="622.106" y="660.597"/>
+      <point x="603.232" y="666.53"/>
+      <point x="584.349" y="672.466" type="curve" smooth="yes"/>
+      <point x="390.129" y="733.518"/>
+      <point x="195" y="794.855"/>
+      <point x="195" y="1039.48" type="curve" smooth="yes"/>
+      <point x="195" y="1316.93"/>
+      <point x="446.002" y="1520"/>
+      <point x="778.293" y="1520" type="curve" smooth="yes"/>
+      <point x="896.835" y="1520"/>
+      <point x="1017.71" y="1494.16"/>
       <point x="1147" y="1442" type="curve"/>
       <point x="1108" y="1237" type="line"/>
-      <point x="1053" y="1276"/>
-      <point x="997" y="1306"/>
-      <point x="940" y="1326" type="curve" smooth="yes"/>
-      <point x="882" y="1346"/>
-      <point x="822" y="1356"/>
-      <point x="759" y="1356" type="curve" name="sv01" smooth="yes"/>
-      <point x="536" y="1356"/>
-      <point x="387" y="1234"/>
-      <point x="387" y="1068" type="curve" name="sh02" smooth="yes"/>
-      <point x="387" y="966"/>
-      <point x="440" y="921"/>
-      <point x="614" y="866" type="curve" smooth="yes"/>
-      <point x="735" y="827" type="line" smooth="yes"/>
-      <point x="848" y="791"/>
-      <point x="921" y="753"/>
-      <point x="974" y="694" type="curve" smooth="yes"/>
-      <point x="1025" y="638"/>
-      <point x="1049" y="572"/>
-      <point x="1049" y="473" type="curve" name="sh03"/>
-      <point x="1058" y="181"/>
-      <point x="800" y="-37"/>
+      <point x="994.859" y="1317.27"/>
+      <point x="882.782" y="1356"/>
+      <point x="759.336" y="1356" type="curve" smooth="yes"/>
+      <point x="545.616" y="1356"/>
+      <point x="387" y="1239.9"/>
+      <point x="387" y="1076.15" type="curve" smooth="yes"/>
+      <point x="387" y="938.942"/>
+      <point x="498.363" y="903.183"/>
+      <point x="582.565" y="876.145" type="curve" smooth="yes"/>
+      <point x="591.204" y="873.365" type="line" smooth="yes"/>
+      <point x="611.392" y="866.843"/>
+      <point x="631.783" y="860.545"/>
+      <point x="652.176" y="854.246" type="curve" smooth="yes"/>
+      <point x="853.185" y="792.164"/>
+      <point x="1049.23" y="727.455"/>
+      <point x="1049.23" y="483.052" type="curve" smooth="yes"/>
+      <point x="1049.23" y="178.348"/>
+      <point x="798.062" y="-29.2132"/>
+      <point x="433.13" y="-29.2132" type="curve" smooth="yes"/>
+      <point x="294.379" y="-29.2132"/>
+      <point x="159.893" y="0.791846"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Italic.ufo/glyphs/S_acute.glif b/source/Hack-Italic.ufo/glyphs/S_acute.glif
index 51f0eaafd..215b81ff5 100644
--- a/source/Hack-Italic.ufo/glyphs/S_acute.glif
+++ b/source/Hack-Italic.ufo/glyphs/S_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Sacute" format="1">
+<glyph name="Sacute" format="2">
   <advance width="1233"/>
   <unicode hex="015A"/>
   <outline>
@@ -10,44 +10,44 @@
       <point x="648" y="1602" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="435" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="435" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="288" y="-29"/>
       <point x="158" y="1"/>
       <point x="25" y="61" type="curve"/>
       <point x="66" y="270" type="line"/>
       <point x="201" y="174"/>
       <point x="338" y="135"/>
-      <point x="469" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="469" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="705" y="135"/>
       <point x="848" y="266"/>
-      <point x="848" y="452" type="curve" name="ah01" smooth="yes"/>
+      <point x="848" y="452" type="curve" smooth="yes" name="ah01"/>
       <point x="848" y="559"/>
       <point x="800" y="603"/>
       <point x="627" y="659" type="curve" smooth="yes"/>
       <point x="526" y="692" type="line" smooth="yes"/>
       <point x="277" y="772"/>
       <point x="195" y="855"/>
-      <point x="195" y="1022" type="curve" name="sh01" smooth="yes"/>
+      <point x="195" y="1022" type="curve" smooth="yes" name="sh01"/>
       <point x="195" y="1313"/>
       <point x="443" y="1520"/>
-      <point x="782" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="782" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="898" y="1520"/>
       <point x="1011" y="1495"/>
       <point x="1147" y="1442" type="curve"/>
       <point x="1108" y="1237" type="line"/>
       <point x="999" y="1316"/>
       <point x="883" y="1356"/>
-      <point x="759" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="759" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="539" y="1356"/>
       <point x="387" y="1233"/>
-      <point x="387" y="1066" type="curve" name="sh02" smooth="yes"/>
+      <point x="387" y="1066" type="curve" smooth="yes" name="sh02"/>
       <point x="387" y="966"/>
       <point x="441" y="922"/>
       <point x="614" y="866" type="curve" smooth="yes"/>
       <point x="735" y="827" type="line" smooth="yes"/>
       <point x="965" y="752"/>
       <point x="1049" y="652"/>
-      <point x="1049" y="472" type="curve" name="hr01" smooth="yes"/>
+      <point x="1049" y="472" type="curve" smooth="yes" name="hr01"/>
       <point x="1049" y="174"/>
       <point x="813" y="-29"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/S_caron.glif b/source/Hack-Italic.ufo/glyphs/S_caron.glif
index 09bf879fe..a0c2d3f59 100644
--- a/source/Hack-Italic.ufo/glyphs/S_caron.glif
+++ b/source/Hack-Italic.ufo/glyphs/S_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Scaron" format="1">
+<glyph name="Scaron" format="2">
   <advance width="1233"/>
   <unicode hex="0160"/>
   <outline>
@@ -26,13 +26,13 @@
       <point x="265" y="168" type="curve" smooth="yes"/>
       <point x="333" y="145"/>
       <point x="403" y="135"/>
-      <point x="475" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="475" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="590" y="135"/>
       <point x="676" y="163"/>
       <point x="745" y="223" type="curve" smooth="yes"/>
       <point x="814" y="282"/>
       <point x="848" y="355"/>
-      <point x="848" y="444" type="curve" name="ah01" smooth="yes"/>
+      <point x="848" y="444" type="curve" smooth="yes" name="ah01"/>
       <point x="848" y="503"/>
       <point x="833" y="542"/>
       <point x="804" y="573" type="curve" smooth="yes"/>
@@ -45,13 +45,13 @@
       <point x="269" y="824" type="curve" smooth="yes"/>
       <point x="220" y="873"/>
       <point x="195" y="933"/>
-      <point x="195" y="1025" type="curve" name="sh01" smooth="yes"/>
+      <point x="195" y="1025" type="curve" smooth="yes" name="sh01"/>
       <point x="195" y="1160"/>
       <point x="248" y="1285"/>
       <point x="360" y="1380" type="curve" smooth="yes"/>
       <point x="471" y="1473"/>
       <point x="618" y="1520"/>
-      <point x="783" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="783" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="847" y="1520"/>
       <point x="902" y="1513"/>
       <point x="962" y="1500" type="curve" smooth="yes"/>
@@ -64,14 +64,14 @@
       <point x="940" y="1326" type="curve" smooth="yes"/>
       <point x="882" y="1346"/>
       <point x="822" y="1356"/>
-      <point x="759" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="759" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="536" y="1356"/>
       <point x="387" y="1234"/>
-      <point x="387" y="1068" type="curve" name="sh04" smooth="yes"/>
+      <point x="387" y="1068" type="curve" smooth="yes" name="sh04"/>
       <point x="387" y="966"/>
       <point x="440" y="921"/>
       <point x="614" y="866" type="curve" smooth="yes"/>
-      <point x="735" y="827" type="line" name="hr01" smooth="yes"/>
+      <point x="735" y="827" type="line" smooth="yes" name="hr01"/>
       <point x="848" y="791"/>
       <point x="921" y="753"/>
       <point x="974" y="694" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/S_cedilla.glif b/source/Hack-Italic.ufo/glyphs/S_cedilla.glif
index 582e5bda3..08b5f2f81 100644
--- a/source/Hack-Italic.ufo/glyphs/S_cedilla.glif
+++ b/source/Hack-Italic.ufo/glyphs/S_cedilla.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Scedilla" format="1">
+<glyph name="Scedilla" format="2">
   <advance width="1233"/>
   <unicode hex="015E"/>
   <outline>
     <contour>
-      <point x="490" y="1274" type="curve" name="hr00" smooth="yes"/>
+      <point x="490" y="1274" type="curve" smooth="yes" name="hr00"/>
       <point x="426" y="1223"/>
       <point x="387" y="1151"/>
-      <point x="387" y="1068" type="curve" name="dh02" smooth="yes"/>
+      <point x="387" y="1068" type="curve" smooth="yes" name="dh02"/>
       <point x="387" y="966"/>
       <point x="440" y="921"/>
       <point x="614" y="866" type="curve" smooth="yes"/>
@@ -17,7 +17,7 @@
       <point x="974" y="694" type="curve" smooth="yes"/>
       <point x="1025" y="638"/>
       <point x="1049" y="572"/>
-      <point x="1049" y="473" type="curve" name="dh06" smooth="yes"/>
+      <point x="1049" y="473" type="curve" smooth="yes" name="dh06"/>
       <point x="1049" y="326"/>
       <point x="995" y="201"/>
       <point x="883" y="109" type="curve" smooth="yes"/>
@@ -29,13 +29,13 @@
       <point x="610" y="-111" type="curve" smooth="yes"/>
       <point x="622" y="-143"/>
       <point x="627" y="-171"/>
-      <point x="627" y="-198" type="curve" name="dh04" smooth="yes"/>
+      <point x="627" y="-198" type="curve" smooth="yes" name="dh04"/>
       <point x="627" y="-254"/>
       <point x="604" y="-304"/>
       <point x="557" y="-341" type="curve" smooth="yes"/>
       <point x="511" y="-377"/>
       <point x="447" y="-395"/>
-      <point x="366" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="366" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="339" y="-395"/>
       <point x="307" y="-393"/>
       <point x="276" y="-388" type="curve" smooth="yes"/>
@@ -48,10 +48,10 @@
       <point x="284" y="-265" type="curve" smooth="yes"/>
       <point x="307" y="-271"/>
       <point x="330" y="-274"/>
-      <point x="353" y="-274" type="curve" name="dv02" smooth="yes"/>
+      <point x="353" y="-274" type="curve" smooth="yes" name="dv02"/>
       <point x="440" y="-274"/>
       <point x="494" y="-230"/>
-      <point x="494" y="-163" type="curve" name="dh03" smooth="yes"/>
+      <point x="494" y="-163" type="curve" smooth="yes" name="dh03"/>
       <point x="494" y="-140"/>
       <point x="488" y="-114"/>
       <point x="480" y="-93" type="curve" smooth="yes"/>
@@ -77,7 +77,7 @@
       <point x="745" y="223" type="curve" smooth="yes"/>
       <point x="814" y="282"/>
       <point x="848" y="355"/>
-      <point x="848" y="444" type="curve" name="dh05" smooth="yes"/>
+      <point x="848" y="444" type="curve" smooth="yes" name="dh05"/>
       <point x="848" y="503"/>
       <point x="833" y="542"/>
       <point x="804" y="573" type="curve" smooth="yes"/>
@@ -90,13 +90,13 @@
       <point x="269" y="824" type="curve" smooth="yes"/>
       <point x="220" y="873"/>
       <point x="195" y="933"/>
-      <point x="195" y="1025" type="curve" name="dh01" smooth="yes"/>
+      <point x="195" y="1025" type="curve" smooth="yes" name="dh01"/>
       <point x="195" y="1160"/>
       <point x="248" y="1285"/>
       <point x="360" y="1380" type="curve" smooth="yes"/>
       <point x="471" y="1473"/>
       <point x="618" y="1520"/>
-      <point x="783" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="783" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="847" y="1520"/>
       <point x="902" y="1513"/>
       <point x="962" y="1500" type="curve" smooth="yes"/>
@@ -109,7 +109,7 @@
       <point x="940" y="1326" type="curve" smooth="yes"/>
       <point x="882" y="1346"/>
       <point x="822" y="1356"/>
-      <point x="759" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="759" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="646" y="1356"/>
       <point x="554" y="1325"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/S_circumflex.glif b/source/Hack-Italic.ufo/glyphs/S_circumflex.glif
index 260ef0e48..7cce05926 100644
--- a/source/Hack-Italic.ufo/glyphs/S_circumflex.glif
+++ b/source/Hack-Italic.ufo/glyphs/S_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Scircumflex" format="1">
+<glyph name="Scircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="015C"/>
   <outline>
@@ -39,7 +39,7 @@
       <point x="1147" y="1442" type="line"/>
       <point x="1016" y="1494"/>
       <point x="895" y="1520"/>
-      <point x="783" y="1520" type="curve" name="hr01" smooth="yes"/>
+      <point x="783" y="1520" type="curve" smooth="yes" name="hr01"/>
       <point x="616" y="1520"/>
       <point x="471" y="1472"/>
       <point x="360" y="1380" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/S_igma.glif b/source/Hack-Italic.ufo/glyphs/S_igma.glif
index aef640392..0532f4f6d 100644
--- a/source/Hack-Italic.ufo/glyphs/S_igma.glif
+++ b/source/Hack-Italic.ufo/glyphs/S_igma.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Sigma" format="1">
+<glyph name="Sigma" format="2">
   <advance width="1233"/>
   <unicode hex="03A3"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/T_.glif b/source/Hack-Italic.ufo/glyphs/T_.glif
index 11882c3ec..c6b9777f0 100644
--- a/source/Hack-Italic.ufo/glyphs/T_.glif
+++ b/source/Hack-Italic.ufo/glyphs/T_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="T" format="1">
+<glyph name="T" format="2">
   <advance width="1233"/>
   <unicode hex="0054"/>
   <outline>
     <contour>
-      <point x="629" y="1323" type="line" name="hr00"/>
+      <point x="629" y="1323" type="line"/>
       <point x="160" y="1323" type="line"/>
-      <point x="193" y="1493" type="line" name="at01"/>
+      <point x="193" y="1493" type="line"/>
       <point x="1333" y="1493" type="line"/>
-      <point x="1300" y="1323" type="line" name="sv01"/>
-      <point x="831" y="1323" type="line" name="sv02"/>
-      <point x="575" y="0" type="line" name="ab01"/>
+      <point x="1300" y="1323" type="line"/>
+      <point x="831" y="1323" type="line"/>
+      <point x="575" y="0" type="line"/>
       <point x="371" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/T_au.glif b/source/Hack-Italic.ufo/glyphs/T_au.glif
index 385b42397..3b2041297 100644
--- a/source/Hack-Italic.ufo/glyphs/T_au.glif
+++ b/source/Hack-Italic.ufo/glyphs/T_au.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Tau" format="1">
+<glyph name="Tau" format="2">
   <advance width="1233"/>
   <unicode hex="03A4"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/T_bar.glif b/source/Hack-Italic.ufo/glyphs/T_bar.glif
index cf25b3e24..8780dfac1 100644
--- a/source/Hack-Italic.ufo/glyphs/T_bar.glif
+++ b/source/Hack-Italic.ufo/glyphs/T_bar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Tbar" format="1">
+<glyph name="Tbar" format="2">
   <advance width="1233"/>
   <unicode hex="0166"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/T_caron.glif b/source/Hack-Italic.ufo/glyphs/T_caron.glif
index 82ad1bde1..1a873fc29 100644
--- a/source/Hack-Italic.ufo/glyphs/T_caron.glif
+++ b/source/Hack-Italic.ufo/glyphs/T_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Tcaron" format="1">
+<glyph name="Tcaron" format="2">
   <advance width="1233"/>
   <unicode hex="0164"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/T_heta.glif b/source/Hack-Italic.ufo/glyphs/T_heta.glif
index 869334baa..574180e87 100644
--- a/source/Hack-Italic.ufo/glyphs/T_heta.glif
+++ b/source/Hack-Italic.ufo/glyphs/T_heta.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Theta" format="1">
+<glyph name="Theta" format="2">
   <advance width="1233"/>
   <unicode hex="0398"/>
   <outline>
     <contour>
-      <point x="26" y="501" type="curve" name="hr00" smooth="yes"/>
+      <point x="26" y="501" type="curve" smooth="yes" name="hr00"/>
       <point x="26" y="561"/>
       <point x="32" y="619"/>
       <point x="43" y="676" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/T_horn.glif b/source/Hack-Italic.ufo/glyphs/T_horn.glif
index 8196b749a..57f501c59 100644
--- a/source/Hack-Italic.ufo/glyphs/T_horn.glif
+++ b/source/Hack-Italic.ufo/glyphs/T_horn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Thorn" format="1">
+<glyph name="Thorn" format="2">
   <advance width="1233"/>
   <unicode hex="00DE"/>
   <outline>
@@ -7,37 +7,37 @@
       <point x="342" y="1493" type="line" name="at01"/>
       <point x="545" y="1491" type="line"/>
       <point x="494" y="1217" type="line"/>
-      <point x="735" y="1217" type="line" name="sv02" smooth="yes"/>
+      <point x="735" y="1217" type="line" smooth="yes" name="sv02"/>
       <point x="873" y="1217"/>
       <point x="978" y="1188"/>
       <point x="1051" y="1129" type="curve" smooth="yes"/>
       <point x="1123" y="1070"/>
       <point x="1159" y="988"/>
-      <point x="1159" y="867" type="curve" name="dh02" smooth="yes"/>
+      <point x="1159" y="867" type="curve" smooth="yes" name="dh02"/>
       <point x="1159" y="719"/>
       <point x="1106" y="594"/>
       <point x="998" y="502" type="curve" smooth="yes"/>
       <point x="891" y="411"/>
       <point x="744" y="365"/>
-      <point x="557" y="365" type="curve" name="dv01" smooth="yes"/>
+      <point x="557" y="365" type="curve" smooth="yes" name="dv01"/>
       <point x="326" y="365" type="line"/>
       <point x="254" y="0" type="line" name="ab01"/>
       <point x="51" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="590" y="522" type="line" name="dv02" smooth="yes"/>
+      <point x="590" y="522" type="line" smooth="yes" name="dv02"/>
       <point x="699" y="522"/>
       <point x="786" y="553"/>
       <point x="853" y="614" type="curve" smooth="yes"/>
       <point x="920" y="675"/>
       <point x="952" y="758"/>
-      <point x="952" y="853" type="curve" name="dh01" smooth="yes"/>
+      <point x="952" y="853" type="curve" smooth="yes" name="dh01"/>
       <point x="952" y="933"/>
       <point x="929" y="979"/>
-      <point x="890" y="1010" type="curve" name="hr01" smooth="yes"/>
+      <point x="890" y="1010" type="curve" smooth="yes" name="hr01"/>
       <point x="849" y="1043"/>
       <point x="785" y="1059"/>
-      <point x="698" y="1059" type="curve" name="sv01" smooth="yes"/>
+      <point x="698" y="1059" type="curve" smooth="yes" name="sv01"/>
       <point x="461" y="1059" type="line"/>
       <point x="356" y="522" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/U_.glif b/source/Hack-Italic.ufo/glyphs/U_.glif
index 5265dbd84..69314c8ce 100644
--- a/source/Hack-Italic.ufo/glyphs/U_.glif
+++ b/source/Hack-Italic.ufo/glyphs/U_.glif
@@ -1,60 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="U" format="1">
+<glyph name="U" format="2">
   <advance width="1233"/>
   <unicode hex="0055"/>
   <outline>
     <contour>
-      <point x="477" y="-29" type="curve" name="hr00" smooth="yes"/>
-      <point x="350" y="-29"/>
-      <point x="253" y="1"/>
-      <point x="184" y="61" type="curve" smooth="yes"/>
-      <point x="115" y="121"/>
-      <point x="80" y="206"/>
-      <point x="80" y="315" type="curve" name="dh01" smooth="yes"/>
-      <point x="80" y="347"/>
-      <point x="82" y="372"/>
-      <point x="89" y="417" type="curve" smooth="yes"/>
-      <point x="97" y="477"/>
-      <point x="102" y="506"/>
-      <point x="115" y="573" type="curve" smooth="yes"/>
-      <point x="293" y="1493" type="line" name="at01"/>
+      <point x="491.118" y="-29" type="curve" smooth="yes"/>
+      <point x="285.735" y="-29"/>
+      <point x="80" y="112.707"/>
+      <point x="80" y="334.572" type="curve" smooth="yes"/>
+      <point x="80" y="392.87"/>
+      <point x="94.205" y="465.979"/>
+      <point x="108.259" y="538.312" type="curve" smooth="yes"/>
+      <point x="293" y="1493" type="line"/>
       <point x="496" y="1493" type="line"/>
       <point x="317" y="573" type="line" smooth="yes"/>
-      <point x="316" y="564"/>
-      <point x="313" y="551"/>
-      <point x="309" y="532" type="curve" smooth="yes"/>
-      <point x="289" y="433"/>
-      <point x="279" y="353"/>
-      <point x="279" y="313" type="curve" name="dh02" smooth="yes"/>
-      <point x="279" y="256"/>
-      <point x="299" y="210"/>
-      <point x="334" y="181" type="curve" smooth="yes"/>
-      <point x="369" y="150"/>
-      <point x="425" y="135"/>
-      <point x="501" y="135" type="curve" name="dv01" smooth="yes"/>
-      <point x="612" y="135"/>
-      <point x="702" y="176"/>
-      <point x="756" y="254" type="curve" smooth="yes"/>
-      <point x="771" y="275"/>
-      <point x="784" y="302"/>
-      <point x="801" y="361" type="curve" smooth="yes"/>
-      <point x="816" y="409"/>
-      <point x="831" y="481"/>
-      <point x="850" y="573" type="curve"/>
-      <point x="1028" y="1493" type="line" name="at02"/>
+      <point x="313.55" y="555.27"/>
+      <point x="309.76" y="537.412"/>
+      <point x="305.95" y="519.462" type="curve" smooth="yes"/>
+      <point x="292.595" y="456.536"/>
+      <point x="279" y="392.481"/>
+      <point x="279" y="335.116" type="curve" smooth="yes"/>
+      <point x="279" y="185.328"/>
+      <point x="371.693" y="135"/>
+      <point x="503.959" y="135" type="curve" smooth="yes"/>
+      <point x="766.812" y="135"/>
+      <point x="804.545" y="333.767"/>
+      <point x="843.674" y="539.887" type="curve" smooth="yes"/>
+      <point x="845.767" y="550.913"/>
+      <point x="847.864" y="561.961"/>
+      <point x="850" y="573" type="curve" smooth="yes"/>
+      <point x="1028" y="1493" type="line"/>
       <point x="1231" y="1493" type="line"/>
-      <point x="1053" y="573" type="line"/>
-      <point x="1021" y="402"/>
-      <point x="991" y="314"/>
-      <point x="964" y="253" type="curve"/>
-      <point x="931" y="181"/>
-      <point x="890" y="129"/>
-      <point x="838" y="86" type="curve" smooth="yes"/>
-      <point x="791" y="47"/>
-      <point x="733" y="20"/>
-      <point x="676" y="1" type="curve" smooth="yes"/>
-      <point x="615" y="-19"/>
-      <point x="548" y="-29"/>
+      <point x="1053" y="573" type="line" smooth="yes"/>
+      <point x="1005.1" y="325.691"/>
+      <point x="947.903" y="90.2204"/>
+      <point x="680.528" y="2.48627" type="curve" smooth="yes"/>
+      <point x="617.354" y="-18.243"/>
+      <point x="547.704" y="-29"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Italic.ufo/glyphs/U_acute.glif b/source/Hack-Italic.ufo/glyphs/U_acute.glif
index 7a3142509..122f22242 100644
--- a/source/Hack-Italic.ufo/glyphs/U_acute.glif
+++ b/source/Hack-Italic.ufo/glyphs/U_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Uacute" format="1">
+<glyph name="Uacute" format="2">
   <advance width="1233"/>
   <unicode hex="00DA"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="630" y="1595" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="477" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="477" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="350" y="-29"/>
       <point x="253" y="1"/>
       <point x="184" y="61" type="curve" smooth="yes"/>
       <point x="115" y="121"/>
       <point x="80" y="206"/>
-      <point x="80" y="315" type="curve" name="dh01" smooth="yes"/>
+      <point x="80" y="315" type="curve" smooth="yes" name="dh01"/>
       <point x="80" y="347"/>
       <point x="82" y="372"/>
       <point x="89" y="417" type="curve" smooth="yes"/>
@@ -31,13 +31,13 @@
       <point x="309" y="532" type="curve" smooth="yes"/>
       <point x="289" y="433"/>
       <point x="279" y="353"/>
-      <point x="279" y="313" type="curve" name="dh02" smooth="yes"/>
+      <point x="279" y="313" type="curve" smooth="yes" name="dh02"/>
       <point x="279" y="256"/>
       <point x="299" y="210"/>
       <point x="334" y="181" type="curve" smooth="yes"/>
       <point x="369" y="150"/>
       <point x="425" y="135"/>
-      <point x="501" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="501" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="612" y="135"/>
       <point x="702" y="176"/>
       <point x="756" y="254" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/U_breve.glif b/source/Hack-Italic.ufo/glyphs/U_breve.glif
index 2ff8e75b5..6d4d29f57 100644
--- a/source/Hack-Italic.ufo/glyphs/U_breve.glif
+++ b/source/Hack-Italic.ufo/glyphs/U_breve.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ubreve" format="1">
+<glyph name="Ubreve" format="2">
   <advance width="1233"/>
   <unicode hex="016C"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="1018" y="1861" type="line"/>
       <point x="982" y="1784"/>
       <point x="912" y="1746"/>
-      <point x="800" y="1746" type="curve" name="hr01" smooth="yes"/>
+      <point x="800" y="1746" type="curve" smooth="yes" name="hr01"/>
       <point x="745" y="1746"/>
       <point x="710" y="1754"/>
       <point x="683" y="1773" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/U_circumflex.glif b/source/Hack-Italic.ufo/glyphs/U_circumflex.glif
index a03769465..0267ce948 100644
--- a/source/Hack-Italic.ufo/glyphs/U_circumflex.glif
+++ b/source/Hack-Italic.ufo/glyphs/U_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ucircumflex" format="1">
+<glyph name="Ucircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00DB"/>
   <outline>
@@ -13,13 +13,13 @@
       <point x="446" y="1595" type="line" name="iv02"/>
     </contour>
     <contour>
-      <point x="477" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="477" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="350" y="-29"/>
       <point x="253" y="1"/>
       <point x="184" y="61" type="curve" smooth="yes"/>
       <point x="115" y="121"/>
       <point x="80" y="206"/>
-      <point x="80" y="315" type="curve" name="dh01" smooth="yes"/>
+      <point x="80" y="315" type="curve" smooth="yes" name="dh01"/>
       <point x="80" y="347"/>
       <point x="82" y="372"/>
       <point x="89" y="417" type="curve" smooth="yes"/>
@@ -34,13 +34,13 @@
       <point x="309" y="532" type="curve" smooth="yes"/>
       <point x="289" y="433"/>
       <point x="279" y="353"/>
-      <point x="279" y="313" type="curve" name="dh02" smooth="yes"/>
+      <point x="279" y="313" type="curve" smooth="yes" name="dh02"/>
       <point x="279" y="256"/>
       <point x="299" y="210"/>
       <point x="334" y="181" type="curve" smooth="yes"/>
       <point x="369" y="150"/>
       <point x="425" y="135"/>
-      <point x="501" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="501" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="612" y="135"/>
       <point x="702" y="176"/>
       <point x="756" y="254" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/U_dieresis.glif b/source/Hack-Italic.ufo/glyphs/U_dieresis.glif
index 77e3a20ad..f22c7c8b7 100644
--- a/source/Hack-Italic.ufo/glyphs/U_dieresis.glif
+++ b/source/Hack-Italic.ufo/glyphs/U_dieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Udieresis" format="1">
+<glyph name="Udieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00DC"/>
   <outline>
     <contour>
-      <point x="504" y="1627" type="line" name="hr00" smooth="yes"/>
+      <point x="504" y="1627" type="line" smooth="yes" name="hr00"/>
       <point x="484" y="1627"/>
       <point x="473" y="1640"/>
       <point x="477" y="1660" type="curve" smooth="yes"/>
       <point x="505" y="1803" type="line"/>
       <point x="508" y="1821"/>
       <point x="518" y="1830"/>
-      <point x="537" y="1830" type="curve" name="dv03" smooth="yes"/>
+      <point x="537" y="1830" type="curve" smooth="yes" name="dv03"/>
       <point x="681" y="1830" type="line" smooth="yes"/>
       <point x="699" y="1830"/>
       <point x="708" y="1822"/>
@@ -25,14 +25,14 @@
       <point x="646" y="1627" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="895" y="1627" type="line" name="sv01" smooth="yes"/>
+      <point x="895" y="1627" type="line" smooth="yes" name="sv01"/>
       <point x="875" y="1627"/>
       <point x="864" y="1640"/>
       <point x="868" y="1660" type="curve" smooth="yes"/>
       <point x="896" y="1803" type="line"/>
       <point x="899" y="1821"/>
       <point x="909" y="1830"/>
-      <point x="928" y="1830" type="curve" name="sv02" smooth="yes"/>
+      <point x="928" y="1830" type="curve" smooth="yes" name="sv02"/>
       <point x="1071" y="1830" type="line" smooth="yes"/>
       <point x="1091" y="1830"/>
       <point x="1102" y="1817"/>
@@ -43,13 +43,13 @@
       <point x="1038" y="1627" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="477" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="477" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="350" y="-29"/>
       <point x="253" y="1"/>
       <point x="184" y="61" type="curve" smooth="yes"/>
       <point x="115" y="121"/>
       <point x="80" y="206"/>
-      <point x="80" y="315" type="curve" name="dh01" smooth="yes"/>
+      <point x="80" y="315" type="curve" smooth="yes" name="dh01"/>
       <point x="80" y="347"/>
       <point x="82" y="372"/>
       <point x="89" y="417" type="curve" smooth="yes"/>
@@ -64,13 +64,13 @@
       <point x="309" y="532" type="curve" smooth="yes"/>
       <point x="289" y="433"/>
       <point x="279" y="353"/>
-      <point x="279" y="313" type="curve" name="dh02" smooth="yes"/>
+      <point x="279" y="313" type="curve" smooth="yes" name="dh02"/>
       <point x="279" y="256"/>
       <point x="299" y="210"/>
       <point x="334" y="181" type="curve" smooth="yes"/>
       <point x="369" y="150"/>
       <point x="425" y="135"/>
-      <point x="501" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="501" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="612" y="135"/>
       <point x="702" y="176"/>
       <point x="756" y="254" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/U_grave.glif b/source/Hack-Italic.ufo/glyphs/U_grave.glif
index e91fcc7f5..f689102c3 100644
--- a/source/Hack-Italic.ufo/glyphs/U_grave.glif
+++ b/source/Hack-Italic.ufo/glyphs/U_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ugrave" format="1">
+<glyph name="Ugrave" format="2">
   <advance width="1233"/>
   <unicode hex="00D9"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="745" y="1595" type="line"/>
     </contour>
     <contour>
-      <point x="477" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="477" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="350" y="-29"/>
       <point x="253" y="1"/>
       <point x="184" y="61" type="curve" smooth="yes"/>
       <point x="115" y="121"/>
       <point x="80" y="206"/>
-      <point x="80" y="315" type="curve" name="dh01" smooth="yes"/>
+      <point x="80" y="315" type="curve" smooth="yes" name="dh01"/>
       <point x="80" y="347"/>
       <point x="82" y="372"/>
       <point x="89" y="417" type="curve" smooth="yes"/>
@@ -31,13 +31,13 @@
       <point x="309" y="532" type="curve" smooth="yes"/>
       <point x="289" y="433"/>
       <point x="279" y="353"/>
-      <point x="279" y="313" type="curve" name="dh02" smooth="yes"/>
+      <point x="279" y="313" type="curve" smooth="yes" name="dh02"/>
       <point x="279" y="256"/>
       <point x="299" y="210"/>
       <point x="334" y="181" type="curve" smooth="yes"/>
       <point x="369" y="150"/>
       <point x="425" y="135"/>
-      <point x="501" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="501" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="612" y="135"/>
       <point x="702" y="176"/>
       <point x="756" y="254" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/U_horn.glif b/source/Hack-Italic.ufo/glyphs/U_horn.glif
index 1dfa26198..1992f4b90 100644
--- a/source/Hack-Italic.ufo/glyphs/U_horn.glif
+++ b/source/Hack-Italic.ufo/glyphs/U_horn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Uhorn" format="1">
+<glyph name="Uhorn" format="2">
   <advance width="1233"/>
   <unicode hex="01AF"/>
   <outline>
@@ -13,20 +13,20 @@
       <point x="1379" y="1421" type="curve" smooth="yes"/>
       <point x="1351" y="1269"/>
       <point x="1281" y="1184"/>
-      <point x="1160" y="1184" type="curve" name="hr01" smooth="yes"/>
+      <point x="1160" y="1184" type="curve" smooth="yes" name="hr01"/>
       <point x="1133" y="1184"/>
       <point x="1109" y="1188"/>
       <point x="1087" y="1197" type="curve"/>
-      <point x="966" y="573" type="line" name="hr02" smooth="yes"/>
+      <point x="966" y="573" type="line" smooth="yes" name="hr02"/>
       <point x="910" y="289"/>
       <point x="858" y="172"/>
       <point x="751" y="86" type="curve" smooth="yes"/>
       <point x="654" y="9"/>
       <point x="530" y="-29"/>
-      <point x="391" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="391" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="136" y="-29"/>
       <point x="-7" y="100"/>
-      <point x="-7" y="311" type="curve" name="dh01" smooth="yes"/>
+      <point x="-7" y="311" type="curve" smooth="yes" name="dh01"/>
       <point x="-7" y="370"/>
       <point x="4" y="448"/>
       <point x="28" y="573" type="curve" smooth="yes"/>
@@ -38,10 +38,10 @@
       <point x="222" y="532" type="curve" smooth="yes"/>
       <point x="202" y="433"/>
       <point x="192" y="355"/>
-      <point x="192" y="312" type="curve" name="dh02" smooth="yes"/>
+      <point x="192" y="312" type="curve" smooth="yes" name="dh02"/>
       <point x="192" y="199"/>
       <point x="265" y="135"/>
-      <point x="409" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="409" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="508" y="135"/>
       <point x="613" y="165"/>
       <point x="669" y="253" type="curve" smooth="yes"/>
@@ -56,13 +56,13 @@
       <point x="1112" y="1328" type="line"/>
       <point x="1125" y="1325"/>
       <point x="1137" y="1323"/>
-      <point x="1149" y="1323" type="curve" name="sv01" smooth="yes"/>
+      <point x="1149" y="1323" type="curve" smooth="yes" name="sv01"/>
       <point x="1205" y="1323"/>
       <point x="1243" y="1360"/>
       <point x="1258" y="1432" type="curve" smooth="yes"/>
       <point x="1261" y="1451"/>
       <point x="1263" y="1468"/>
-      <point x="1263" y="1483" type="curve" name="at04" smooth="yes"/>
+      <point x="1263" y="1483" type="curve" smooth="yes" name="at04"/>
       <point x="1263" y="1506"/>
       <point x="1259" y="1531"/>
       <point x="1252" y="1557" type="curve" name="hr03"/>
diff --git a/source/Hack-Italic.ufo/glyphs/U_hungarumlaut.glif b/source/Hack-Italic.ufo/glyphs/U_hungarumlaut.glif
index c4bbb5627..4ef46731d 100644
--- a/source/Hack-Italic.ufo/glyphs/U_hungarumlaut.glif
+++ b/source/Hack-Italic.ufo/glyphs/U_hungarumlaut.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Uhungarumlaut" format="1">
+<glyph name="Uhungarumlaut" format="2">
   <advance width="1233"/>
   <unicode hex="0170"/>
   <outline>
@@ -16,10 +16,10 @@
       <point x="837" y="1595" type="line" name="dv03"/>
     </contour>
     <contour>
-      <point x="478" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="478" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="223" y="-29"/>
       <point x="80" y="100"/>
-      <point x="80" y="311" type="curve" name="dh01" smooth="yes"/>
+      <point x="80" y="311" type="curve" smooth="yes" name="dh01"/>
       <point x="80" y="370"/>
       <point x="91" y="448"/>
       <point x="115" y="573" type="curve" smooth="yes"/>
@@ -31,10 +31,10 @@
       <point x="309" y="532" type="curve" smooth="yes"/>
       <point x="289" y="433"/>
       <point x="279" y="355"/>
-      <point x="279" y="312" type="curve" name="dh02" smooth="yes"/>
+      <point x="279" y="312" type="curve" smooth="yes" name="dh02"/>
       <point x="279" y="199"/>
       <point x="352" y="135"/>
-      <point x="496" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="496" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="595" y="135"/>
       <point x="700" y="165"/>
       <point x="756" y="253" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/U_macron.glif b/source/Hack-Italic.ufo/glyphs/U_macron.glif
index a6815920a..129ae372e 100644
--- a/source/Hack-Italic.ufo/glyphs/U_macron.glif
+++ b/source/Hack-Italic.ufo/glyphs/U_macron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Umacron" format="1">
+<glyph name="Umacron" format="2">
   <advance width="1233"/>
   <unicode hex="016A"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="502" y="1652" type="line"/>
     </contour>
     <contour>
-      <point x="478" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="478" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="223" y="-29"/>
       <point x="80" y="100"/>
-      <point x="80" y="311" type="curve" name="dh01" smooth="yes"/>
+      <point x="80" y="311" type="curve" smooth="yes" name="dh01"/>
       <point x="80" y="370"/>
       <point x="91" y="448"/>
       <point x="115" y="573" type="curve" smooth="yes"/>
@@ -25,10 +25,10 @@
       <point x="309" y="532" type="curve" smooth="yes"/>
       <point x="289" y="433"/>
       <point x="279" y="355"/>
-      <point x="279" y="312" type="curve" name="dh02" smooth="yes"/>
+      <point x="279" y="312" type="curve" smooth="yes" name="dh02"/>
       <point x="279" y="199"/>
       <point x="352" y="135"/>
-      <point x="496" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="496" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="595" y="135"/>
       <point x="700" y="165"/>
       <point x="756" y="253" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/U_ogonek.glif b/source/Hack-Italic.ufo/glyphs/U_ogonek.glif
index 312f4f36c..deeb8bf7a 100644
--- a/source/Hack-Italic.ufo/glyphs/U_ogonek.glif
+++ b/source/Hack-Italic.ufo/glyphs/U_ogonek.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Uogonek" format="1">
+<glyph name="Uogonek" format="2">
   <advance width="1233"/>
   <unicode hex="0172"/>
   <outline>
@@ -11,33 +11,33 @@
       <point x="838" y="86" type="curve" smooth="yes"/>
       <point x="741" y="9"/>
       <point x="617" y="-29"/>
-      <point x="478" y="-29" type="curve" name="dv03" smooth="yes"/>
+      <point x="478" y="-29" type="curve" smooth="yes" name="dv03"/>
       <point x="455" y="-29" type="line"/>
       <point x="382" y="-101"/>
       <point x="343" y="-164"/>
-      <point x="343" y="-216" type="curve" name="sh01" smooth="yes"/>
+      <point x="343" y="-216" type="curve" smooth="yes" name="sh01"/>
       <point x="343" y="-263"/>
       <point x="375" y="-288"/>
-      <point x="439" y="-288" type="curve" name="dv02" smooth="yes"/>
+      <point x="439" y="-288" type="curve" smooth="yes" name="dv02"/>
       <point x="478" y="-288"/>
       <point x="523" y="-278"/>
       <point x="566" y="-258" type="curve"/>
       <point x="541" y="-391" type="line"/>
       <point x="495" y="-404"/>
       <point x="449" y="-411"/>
-      <point x="402" y="-411" type="curve" name="dv01" smooth="yes"/>
+      <point x="402" y="-411" type="curve" smooth="yes" name="dv01"/>
       <point x="271" y="-411"/>
       <point x="197" y="-354"/>
-      <point x="197" y="-261" type="curve" name="ih01" smooth="yes"/>
+      <point x="197" y="-261" type="curve" smooth="yes" name="ih01"/>
       <point x="197" y="-186"/>
       <point x="245" y="-109"/>
       <point x="349" y="-16" type="curve" name="sv01"/>
       <point x="174" y="21"/>
       <point x="80" y="138"/>
-      <point x="80" y="311" type="curve" name="dh01" smooth="yes"/>
+      <point x="80" y="311" type="curve" smooth="yes" name="dh01"/>
       <point x="80" y="370"/>
       <point x="91" y="448"/>
-      <point x="115" y="573" type="curve" name="hr01" smooth="yes"/>
+      <point x="115" y="573" type="curve" smooth="yes" name="hr01"/>
       <point x="293" y="1493" type="line" name="at02"/>
       <point x="496" y="1493" type="line"/>
       <point x="317" y="573" type="line" smooth="yes"/>
@@ -46,10 +46,10 @@
       <point x="309" y="532" type="curve" smooth="yes"/>
       <point x="289" y="433"/>
       <point x="279" y="355"/>
-      <point x="279" y="312" type="curve" name="dh02" smooth="yes"/>
+      <point x="279" y="312" type="curve" smooth="yes" name="dh02"/>
       <point x="279" y="199"/>
       <point x="352" y="135"/>
-      <point x="496" y="135" type="curve" name="dv04" smooth="yes"/>
+      <point x="496" y="135" type="curve" smooth="yes" name="dv04"/>
       <point x="595" y="135"/>
       <point x="700" y="165"/>
       <point x="756" y="253" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/U_psilon.glif b/source/Hack-Italic.ufo/glyphs/U_psilon.glif
index b9a850fa6..ae2ba9613 100644
--- a/source/Hack-Italic.ufo/glyphs/U_psilon.glif
+++ b/source/Hack-Italic.ufo/glyphs/U_psilon.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Upsilon" format="1">
+<glyph name="Upsilon" format="2">
   <advance width="1233"/>
   <unicode hex="03A5"/>
   <outline>
@@ -7,20 +7,20 @@
       <point x="496" y="650" type="line" name="hr00"/>
       <point x="509" y="715"/>
       <point x="515" y="787"/>
-      <point x="515" y="860" type="curve" name="dh01" smooth="yes"/>
+      <point x="515" y="860" type="curve" smooth="yes" name="dh01"/>
       <point x="515" y="1057"/>
       <point x="470" y="1255"/>
       <point x="388" y="1297" type="curve"/>
       <point x="340" y="1320"/>
       <point x="290" y="1332"/>
-      <point x="239" y="1332" type="curve" name="sv01" smooth="yes"/>
+      <point x="239" y="1332" type="curve" smooth="yes" name="sv01"/>
       <point x="212" y="1332"/>
       <point x="185" y="1329"/>
       <point x="157" y="1323" type="curve" name="sv02"/>
       <point x="190" y="1493" type="line" name="at01"/>
       <point x="215" y="1501"/>
       <point x="246" y="1504"/>
-      <point x="281" y="1504" type="curve" name="at02" smooth="yes"/>
+      <point x="281" y="1504" type="curve" smooth="yes" name="at02"/>
       <point x="320" y="1504"/>
       <point x="366" y="1501"/>
       <point x="417" y="1490" type="curve" name="at03"/>
@@ -29,13 +29,13 @@
       <point x="675" y="1044" type="curve" name="dh02"/>
       <point x="802" y="1306"/>
       <point x="946" y="1455"/>
-      <point x="1105" y="1490" type="curve" name="at04" smooth="yes"/>
+      <point x="1105" y="1490" type="curve" smooth="yes" name="at04"/>
       <point x="1124" y="1495"/>
       <point x="1143" y="1497"/>
-      <point x="1164" y="1497" type="curve" name="at05" smooth="yes"/>
+      <point x="1164" y="1497" type="curve" smooth="yes" name="at05"/>
       <point x="1257" y="1497"/>
       <point x="1335" y="1445"/>
-      <point x="1335" y="1352" type="curve" name="hr01" smooth="yes"/>
+      <point x="1335" y="1352" type="curve" smooth="yes" name="hr01"/>
       <point x="1335" y="1316"/>
       <point x="1323" y="1273"/>
       <point x="1295" y="1224" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/U_psilondieresis.glif b/source/Hack-Italic.ufo/glyphs/U_psilondieresis.glif
index 589ae4dbf..457020a73 100644
--- a/source/Hack-Italic.ufo/glyphs/U_psilondieresis.glif
+++ b/source/Hack-Italic.ufo/glyphs/U_psilondieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Upsilondieresis" format="1">
+<glyph name="Upsilondieresis" format="2">
   <advance width="1233"/>
   <unicode hex="03AB"/>
   <outline>
     <contour>
-      <point x="506" y="1647" type="line" name="dv01" smooth="yes"/>
+      <point x="506" y="1647" type="line" smooth="yes" name="dv01"/>
       <point x="486" y="1647"/>
       <point x="475" y="1660"/>
       <point x="479" y="1680" type="curve" smooth="yes"/>
       <point x="507" y="1823" type="line"/>
       <point x="510" y="1841"/>
       <point x="520" y="1850"/>
-      <point x="539" y="1850" type="curve" name="dv02" smooth="yes"/>
+      <point x="539" y="1850" type="curve" smooth="yes" name="dv02"/>
       <point x="683" y="1850" type="line" smooth="yes"/>
       <point x="704" y="1850"/>
       <point x="713" y="1837"/>
@@ -22,19 +22,19 @@
       <point x="648" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="897" y="1647" type="line" name="sv01" smooth="yes"/>
+      <point x="897" y="1647" type="line" smooth="yes" name="sv01"/>
       <point x="877" y="1647"/>
       <point x="866" y="1660"/>
       <point x="870" y="1680" type="curve" smooth="yes"/>
       <point x="898" y="1823" type="line"/>
       <point x="901" y="1841"/>
       <point x="911" y="1850"/>
-      <point x="930" y="1850" type="curve" name="hr01" smooth="yes"/>
+      <point x="930" y="1850" type="curve" smooth="yes" name="hr01"/>
       <point x="1073" y="1850" type="line" smooth="yes"/>
       <point x="1093" y="1850"/>
       <point x="1104" y="1837"/>
       <point x="1100" y="1817" type="curve" smooth="yes"/>
-      <point x="1072" y="1674" type="line" name="hr02" smooth="yes"/>
+      <point x="1072" y="1674" type="line" smooth="yes" name="hr02"/>
       <point x="1069" y="1656"/>
       <point x="1058" y="1647"/>
       <point x="1040" y="1647" type="curve" smooth="yes"/>
@@ -43,20 +43,20 @@
       <point x="496" y="650" type="line"/>
       <point x="509" y="715"/>
       <point x="515" y="787"/>
-      <point x="515" y="860" type="curve" name="dh01" smooth="yes"/>
+      <point x="515" y="860" type="curve" smooth="yes" name="dh01"/>
       <point x="515" y="1057"/>
       <point x="470" y="1255"/>
       <point x="388" y="1297" type="curve"/>
       <point x="340" y="1320"/>
       <point x="290" y="1332"/>
-      <point x="239" y="1332" type="curve" name="sv02" smooth="yes"/>
+      <point x="239" y="1332" type="curve" smooth="yes" name="sv02"/>
       <point x="212" y="1332"/>
       <point x="185" y="1329"/>
       <point x="157" y="1323" type="curve" name="sv03"/>
       <point x="190" y="1493" type="line" name="at01"/>
       <point x="215" y="1501"/>
       <point x="246" y="1504"/>
-      <point x="281" y="1504" type="curve" name="at02" smooth="yes"/>
+      <point x="281" y="1504" type="curve" smooth="yes" name="at02"/>
       <point x="320" y="1504"/>
       <point x="366" y="1501"/>
       <point x="417" y="1490" type="curve" name="at03"/>
@@ -65,10 +65,10 @@
       <point x="675" y="1044" type="curve" name="dh02"/>
       <point x="802" y="1306"/>
       <point x="946" y="1455"/>
-      <point x="1105" y="1490" type="curve" name="at04" smooth="yes"/>
+      <point x="1105" y="1490" type="curve" smooth="yes" name="at04"/>
       <point x="1124" y="1495"/>
       <point x="1143" y="1497"/>
-      <point x="1164" y="1497" type="curve" name="at05" smooth="yes"/>
+      <point x="1164" y="1497" type="curve" smooth="yes" name="at05"/>
       <point x="1257" y="1497"/>
       <point x="1335" y="1445"/>
       <point x="1335" y="1352" type="curve" smooth="yes"/>
@@ -77,7 +77,7 @@
       <point x="1295" y="1224" type="curve" smooth="yes"/>
       <point x="1268" y="1179"/>
       <point x="1224" y="1157"/>
-      <point x="1181" y="1157" type="curve" name="sv04" smooth="yes"/>
+      <point x="1181" y="1157" type="curve" smooth="yes" name="sv04"/>
       <point x="1115" y="1157"/>
       <point x="1051" y="1205"/>
       <point x="1059" y="1297" type="curve" name="iv01"/>
diff --git a/source/Hack-Italic.ufo/glyphs/U_psilontonos.glif b/source/Hack-Italic.ufo/glyphs/U_psilontonos.glif
index ca14539dd..0aebfcc03 100644
--- a/source/Hack-Italic.ufo/glyphs/U_psilontonos.glif
+++ b/source/Hack-Italic.ufo/glyphs/U_psilontonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Upsilontonos" format="1">
+<glyph name="Upsilontonos" format="2">
   <advance width="1233"/>
   <unicode hex="038E"/>
   <outline>
@@ -13,20 +13,20 @@
       <point x="496" y="650" type="line"/>
       <point x="509" y="715"/>
       <point x="515" y="787"/>
-      <point x="515" y="860" type="curve" name="dh01" smooth="yes"/>
+      <point x="515" y="860" type="curve" smooth="yes" name="dh01"/>
       <point x="515" y="1057"/>
       <point x="470" y="1255"/>
       <point x="388" y="1297" type="curve"/>
       <point x="340" y="1320"/>
       <point x="290" y="1332"/>
-      <point x="239" y="1332" type="curve" name="sv01" smooth="yes"/>
+      <point x="239" y="1332" type="curve" smooth="yes" name="sv01"/>
       <point x="212" y="1332"/>
       <point x="185" y="1329"/>
       <point x="157" y="1323" type="curve" name="sv03"/>
       <point x="190" y="1493" type="line" name="at01"/>
       <point x="215" y="1501"/>
       <point x="246" y="1504"/>
-      <point x="281" y="1504" type="curve" name="at02" smooth="yes"/>
+      <point x="281" y="1504" type="curve" smooth="yes" name="at02"/>
       <point x="320" y="1504"/>
       <point x="366" y="1501"/>
       <point x="417" y="1490" type="curve" name="hr01"/>
@@ -35,10 +35,10 @@
       <point x="675" y="1044" type="curve" name="dh02"/>
       <point x="802" y="1306"/>
       <point x="946" y="1455"/>
-      <point x="1105" y="1490" type="curve" name="at03" smooth="yes"/>
+      <point x="1105" y="1490" type="curve" smooth="yes" name="at03"/>
       <point x="1124" y="1495"/>
       <point x="1143" y="1497"/>
-      <point x="1164" y="1497" type="curve" name="hr02" smooth="yes"/>
+      <point x="1164" y="1497" type="curve" smooth="yes" name="hr02"/>
       <point x="1257" y="1497"/>
       <point x="1335" y="1445"/>
       <point x="1335" y="1352" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/U_ring.glif b/source/Hack-Italic.ufo/glyphs/U_ring.glif
index 40354266e..dcab8aa19 100644
--- a/source/Hack-Italic.ufo/glyphs/U_ring.glif
+++ b/source/Hack-Italic.ufo/glyphs/U_ring.glif
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Uring" format="1">
+<glyph name="Uring" format="2">
   <advance width="1233"/>
   <unicode hex="016E"/>
   <outline>
     <contour>
-      <point x="760" y="1352" type="curve" name="hr00" smooth="yes"/>
+      <point x="760" y="1352" type="curve" smooth="yes" name="hr00"/>
       <point x="608" y="1352"/>
       <point x="486" y="1473"/>
-      <point x="486" y="1627" type="curve" name="dh03" smooth="yes"/>
+      <point x="486" y="1627" type="curve" smooth="yes" name="dh03"/>
       <point x="486" y="1782"/>
       <point x="608" y="1901"/>
-      <point x="760" y="1901" type="curve" name="dv04" smooth="yes"/>
+      <point x="760" y="1901" type="curve" smooth="yes" name="dv04"/>
       <point x="913" y="1901"/>
       <point x="1035" y="1782"/>
-      <point x="1035" y="1627" type="curve" name="dh06" smooth="yes"/>
+      <point x="1035" y="1627" type="curve" smooth="yes" name="dh06"/>
       <point x="1035" y="1473"/>
       <point x="913" y="1352"/>
     </contour>
     <contour>
-      <point x="760" y="1475" type="curve" name="dv05" smooth="yes"/>
+      <point x="760" y="1475" type="curve" smooth="yes" name="dv05"/>
       <point x="844" y="1475"/>
       <point x="912" y="1542"/>
-      <point x="912" y="1626" type="curve" name="dh05" smooth="yes"/>
+      <point x="912" y="1626" type="curve" smooth="yes" name="dh05"/>
       <point x="912" y="1710"/>
       <point x="844" y="1778"/>
-      <point x="760" y="1778" type="curve" name="dv03" smooth="yes"/>
+      <point x="760" y="1778" type="curve" smooth="yes" name="dv03"/>
       <point x="675" y="1778"/>
       <point x="609" y="1712"/>
-      <point x="609" y="1627" type="curve" name="dh04" smooth="yes"/>
+      <point x="609" y="1627" type="curve" smooth="yes" name="dh04"/>
       <point x="609" y="1541"/>
       <point x="675" y="1475"/>
     </contour>
     <contour>
-      <point x="478" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="478" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="223" y="-29"/>
       <point x="80" y="100"/>
-      <point x="80" y="311" type="curve" name="dh01" smooth="yes"/>
+      <point x="80" y="311" type="curve" smooth="yes" name="dh01"/>
       <point x="80" y="370"/>
       <point x="91" y="448"/>
       <point x="115" y="573" type="curve" smooth="yes"/>
@@ -47,10 +47,10 @@
       <point x="309" y="532" type="curve" smooth="yes"/>
       <point x="289" y="433"/>
       <point x="279" y="355"/>
-      <point x="279" y="312" type="curve" name="dh02" smooth="yes"/>
+      <point x="279" y="312" type="curve" smooth="yes" name="dh02"/>
       <point x="279" y="199"/>
       <point x="352" y="135"/>
-      <point x="496" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="496" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="595" y="135"/>
       <point x="700" y="165"/>
       <point x="756" y="253" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/U_tilde.glif b/source/Hack-Italic.ufo/glyphs/U_tilde.glif
index c11f8b244..6d9ca171c 100644
--- a/source/Hack-Italic.ufo/glyphs/U_tilde.glif
+++ b/source/Hack-Italic.ufo/glyphs/U_tilde.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Utilde" format="1">
+<glyph name="Utilde" format="2">
   <advance width="1233"/>
   <unicode hex="0168"/>
   <outline>
@@ -7,21 +7,21 @@
       <point x="446" y="1627" type="line" name="sv01"/>
       <point x="493" y="1772"/>
       <point x="578" y="1846"/>
-      <point x="686" y="1846" type="curve" name="dv04" smooth="yes"/>
+      <point x="686" y="1846" type="curve" smooth="yes" name="dv04"/>
       <point x="731" y="1846"/>
       <point x="774" y="1834"/>
       <point x="821" y="1799" type="curve" smooth="yes"/>
       <point x="856" y="1773" type="line" smooth="yes"/>
       <point x="880" y="1755"/>
       <point x="904" y="1746"/>
-      <point x="928" y="1746" type="curve" name="dv06" smooth="yes"/>
+      <point x="928" y="1746" type="curve" smooth="yes" name="dv06"/>
       <point x="984" y="1746"/>
       <point x="1021" y="1785"/>
       <point x="1036" y="1846" type="curve" name="sv02"/>
       <point x="1161" y="1846" type="line"/>
       <point x="1118" y="1698"/>
       <point x="1027" y="1627"/>
-      <point x="916" y="1627" type="curve" name="dv05" smooth="yes"/>
+      <point x="916" y="1627" type="curve" smooth="yes" name="dv05"/>
       <point x="873" y="1627"/>
       <point x="838" y="1638"/>
       <point x="794" y="1670" type="curve" smooth="yes"/>
@@ -29,37 +29,37 @@
       <point x="758" y="1696" type="line" smooth="yes"/>
       <point x="729" y="1717"/>
       <point x="703" y="1728"/>
-      <point x="678" y="1728" type="curve" name="dv03" smooth="yes"/>
+      <point x="678" y="1728" type="curve" smooth="yes" name="dv03"/>
       <point x="632" y="1728"/>
       <point x="596" y="1694"/>
       <point x="571" y="1627" type="curve"/>
     </contour>
     <contour>
-      <point x="478" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="478" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="223" y="-29"/>
       <point x="80" y="100"/>
-      <point x="80" y="311" type="curve" name="dh01" smooth="yes"/>
+      <point x="80" y="311" type="curve" smooth="yes" name="dh01"/>
       <point x="80" y="370"/>
       <point x="91" y="448"/>
       <point x="115" y="573" type="curve" smooth="yes"/>
       <point x="293" y="1493" type="line" name="at01"/>
       <point x="496" y="1493" type="line"/>
-      <point x="317" y="573" type="line" name="hr01" smooth="yes"/>
+      <point x="317" y="573" type="line" smooth="yes" name="hr01"/>
       <point x="314" y="557"/>
       <point x="317" y="568"/>
       <point x="309" y="532" type="curve" smooth="yes"/>
       <point x="289" y="433"/>
       <point x="279" y="355"/>
-      <point x="279" y="312" type="curve" name="dh02" smooth="yes"/>
+      <point x="279" y="312" type="curve" smooth="yes" name="dh02"/>
       <point x="279" y="199"/>
       <point x="352" y="135"/>
-      <point x="496" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="496" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="595" y="135"/>
       <point x="700" y="165"/>
-      <point x="756" y="253" type="curve" name="hr02" smooth="yes"/>
+      <point x="756" y="253" type="curve" smooth="yes" name="hr02"/>
       <point x="771" y="277"/>
       <point x="785" y="306"/>
-      <point x="801" y="361" type="curve" name="hr03" smooth="yes"/>
+      <point x="801" y="361" type="curve" smooth="yes" name="hr03"/>
       <point x="816" y="412"/>
       <point x="833" y="485"/>
       <point x="850" y="573" type="curve" smooth="yes"/>
@@ -68,7 +68,7 @@
       <point x="1053" y="573" type="line"/>
       <point x="997" y="289"/>
       <point x="945" y="172"/>
-      <point x="838" y="86" type="curve" name="hr05" smooth="yes"/>
+      <point x="838" y="86" type="curve" smooth="yes" name="hr05"/>
       <point x="741" y="9"/>
       <point x="617" y="-29"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/V_.glif b/source/Hack-Italic.ufo/glyphs/V_.glif
index 2026e021e..0b595101b 100644
--- a/source/Hack-Italic.ufo/glyphs/V_.glif
+++ b/source/Hack-Italic.ufo/glyphs/V_.glif
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="V" format="1">
+<glyph name="V" format="2">
   <advance width="1233"/>
   <unicode hex="0056"/>
   <outline>
     <contour>
-      <point x="199" y="1493" type="line" name="hr00"/>
+      <point x="199" y="1493" type="line"/>
       <point x="397" y="1493" type="line"/>
-      <point x="510" y="190" type="line" name="iv01"/>
-      <point x="1108" y="1493" type="line" name="at01"/>
+      <point x="510" y="190" type="line"/>
+      <point x="1108" y="1493" type="line"/>
       <point x="1323" y="1493" type="line"/>
-      <point x="604" y="0" type="line" name="ab01"/>
+      <point x="604" y="0" type="line"/>
       <point x="346" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/W_.glif b/source/Hack-Italic.ufo/glyphs/W_.glif
index 333626bde..926627310 100644
--- a/source/Hack-Italic.ufo/glyphs/W_.glif
+++ b/source/Hack-Italic.ufo/glyphs/W_.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="W" format="1">
+<glyph name="W" format="2">
   <advance width="1233"/>
   <unicode hex="0057"/>
   <outline>
     <contour>
-      <point x="145" y="1493" type="line" name="hr00"/>
+      <point x="145" y="1493" type="line"/>
       <point x="336" y="1493" type="line"/>
-      <point x="246" y="283" type="line" name="iv01"/>
+      <point x="246" y="283" type="line"/>
       <point x="575" y="1083" type="line"/>
-      <point x="786" y="1083" type="line"/>
-      <point x="801" y="281" type="line" name="iv02"/>
-      <point x="1178" y="1493" type="line" name="at01"/>
+      <point x="793.5" y="1083" type="line"/>
+      <point x="793.5" y="281" type="line"/>
+      <point x="1178" y="1493" type="line"/>
       <point x="1376" y="1493" type="line"/>
-      <point x="866" y="0" type="line" name="ab01"/>
+      <point x="866" y="0" type="line"/>
       <point x="672" y="0" type="line"/>
-      <point x="641" y="870" type="line" name="iv03"/>
-      <point x="270" y="0" type="line" name="ab02"/>
+      <point x="641" y="870" type="line"/>
+      <point x="270" y="0" type="line"/>
       <point x="82" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/W_acute.glif b/source/Hack-Italic.ufo/glyphs/W_acute.glif
index 310a66ee9..3727f1dab 100644
--- a/source/Hack-Italic.ufo/glyphs/W_acute.glif
+++ b/source/Hack-Italic.ufo/glyphs/W_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Wacute" format="1">
+<glyph name="Wacute" format="2">
   <advance width="1233"/>
   <unicode hex="1E82"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/W_circumflex.glif b/source/Hack-Italic.ufo/glyphs/W_circumflex.glif
index a4700f753..cfabd1000 100644
--- a/source/Hack-Italic.ufo/glyphs/W_circumflex.glif
+++ b/source/Hack-Italic.ufo/glyphs/W_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Wcircumflex" format="1">
+<glyph name="Wcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0174"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/W_dieresis.glif b/source/Hack-Italic.ufo/glyphs/W_dieresis.glif
index 64bc2a3ba..57f8ae9b6 100644
--- a/source/Hack-Italic.ufo/glyphs/W_dieresis.glif
+++ b/source/Hack-Italic.ufo/glyphs/W_dieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Wdieresis" format="1">
+<glyph name="Wdieresis" format="2">
   <advance width="1233"/>
   <unicode hex="1E84"/>
   <outline>
     <contour>
-      <point x="532" y="1602" type="line" name="hr00" smooth="yes"/>
+      <point x="532" y="1602" type="line" smooth="yes" name="hr00"/>
       <point x="511" y="1602"/>
       <point x="495" y="1618"/>
       <point x="499" y="1641" type="curve" smooth="yes"/>
       <point x="526" y="1781" type="line" smooth="yes"/>
       <point x="529" y="1796"/>
       <point x="540" y="1804"/>
-      <point x="555" y="1804" type="curve" name="dv01" smooth="yes"/>
+      <point x="555" y="1804" type="curve" smooth="yes" name="dv01"/>
       <point x="695" y="1804" type="line" smooth="yes"/>
       <point x="716" y="1804"/>
       <point x="731" y="1788"/>
@@ -22,14 +22,14 @@
       <point x="671" y="1602" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="923" y="1602" type="line" name="sv01" smooth="yes"/>
+      <point x="923" y="1602" type="line" smooth="yes" name="sv01"/>
       <point x="902" y="1602"/>
       <point x="886" y="1618"/>
       <point x="890" y="1641" type="curve" smooth="yes"/>
       <point x="917" y="1781" type="line" smooth="yes"/>
       <point x="920" y="1796"/>
       <point x="931" y="1804"/>
-      <point x="946" y="1804" type="curve" name="sv02" smooth="yes"/>
+      <point x="946" y="1804" type="curve" smooth="yes" name="sv02"/>
       <point x="1086" y="1804" type="line" smooth="yes"/>
       <point x="1107" y="1804"/>
       <point x="1122" y="1788"/>
diff --git a/source/Hack-Italic.ufo/glyphs/W_grave.glif b/source/Hack-Italic.ufo/glyphs/W_grave.glif
index 2305f3722..2746f2db5 100644
--- a/source/Hack-Italic.ufo/glyphs/W_grave.glif
+++ b/source/Hack-Italic.ufo/glyphs/W_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Wgrave" format="1">
+<glyph name="Wgrave" format="2">
   <advance width="1233"/>
   <unicode hex="1E80"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/X_.glif b/source/Hack-Italic.ufo/glyphs/X_.glif
index f59edf8c8..a6d72ba26 100644
--- a/source/Hack-Italic.ufo/glyphs/X_.glif
+++ b/source/Hack-Italic.ufo/glyphs/X_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="X" format="1">
+<glyph name="X" format="2">
   <advance width="1233"/>
   <unicode hex="0058"/>
   <outline>
     <contour>
-      <point x="546" y="797" type="line" name="hr00"/>
-      <point x="258" y="1493" type="line" name="at01"/>
+      <point x="546" y="797" type="line"/>
+      <point x="258" y="1493" type="line"/>
       <point x="458" y="1493" type="line"/>
-      <point x="682" y="961" type="line" name="iv01"/>
-      <point x="1122" y="1493" type="line" name="at02"/>
+      <point x="682" y="961" type="line"/>
+      <point x="1122" y="1493" type="line"/>
       <point x="1353" y="1493" type="line"/>
       <point x="757" y="774" type="line"/>
-      <point x="1081" y="0" type="line" name="ab01"/>
+      <point x="1081" y="0" type="line"/>
       <point x="880" y="0" type="line"/>
-      <point x="626" y="612" type="line" name="iv02"/>
-      <point x="120" y="0" type="line" name="ab02"/>
+      <point x="626" y="612" type="line"/>
+      <point x="120" y="0" type="line"/>
       <point x="-111" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/X_i.glif b/source/Hack-Italic.ufo/glyphs/X_i.glif
index f2a393b2f..eb84d83b0 100644
--- a/source/Hack-Italic.ufo/glyphs/X_i.glif
+++ b/source/Hack-Italic.ufo/glyphs/X_i.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Xi" format="1">
+<glyph name="Xi" format="2">
   <advance width="1233"/>
   <unicode hex="039E"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/Y_.glif b/source/Hack-Italic.ufo/glyphs/Y_.glif
index a7925bb34..874b1e229 100644
--- a/source/Hack-Italic.ufo/glyphs/Y_.glif
+++ b/source/Hack-Italic.ufo/glyphs/Y_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Y" format="1">
+<glyph name="Y" format="2">
   <advance width="1233"/>
   <unicode hex="0059"/>
   <outline>
     <contour>
-      <point x="508" y="670" type="line" name="hr00"/>
-      <point x="195" y="1493" type="line" name="at01"/>
+      <point x="508" y="670" type="line"/>
+      <point x="195" y="1493" type="line"/>
       <point x="397" y="1493" type="line"/>
-      <point x="633" y="842" type="line" name="iv01"/>
-      <point x="1130" y="1493" type="line" name="at02"/>
+      <point x="633" y="842" type="line"/>
+      <point x="1130" y="1493" type="line"/>
       <point x="1348" y="1493" type="line"/>
       <point x="713" y="670" type="line"/>
-      <point x="584" y="0" type="line" name="ab01"/>
+      <point x="584" y="0" type="line"/>
       <point x="377" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/Y_acute.glif b/source/Hack-Italic.ufo/glyphs/Y_acute.glif
index 13a9df909..53467a01e 100644
--- a/source/Hack-Italic.ufo/glyphs/Y_acute.glif
+++ b/source/Hack-Italic.ufo/glyphs/Y_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Yacute" format="1">
+<glyph name="Yacute" format="2">
   <advance width="1233"/>
   <unicode hex="00DD"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/Y_circumflex.glif b/source/Hack-Italic.ufo/glyphs/Y_circumflex.glif
index fb7d25477..a34ccc326 100644
--- a/source/Hack-Italic.ufo/glyphs/Y_circumflex.glif
+++ b/source/Hack-Italic.ufo/glyphs/Y_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ycircumflex" format="1">
+<glyph name="Ycircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0176"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/Y_dieresis.glif b/source/Hack-Italic.ufo/glyphs/Y_dieresis.glif
index 7847367d4..77ebdcd19 100644
--- a/source/Hack-Italic.ufo/glyphs/Y_dieresis.glif
+++ b/source/Hack-Italic.ufo/glyphs/Y_dieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ydieresis" format="1">
+<glyph name="Ydieresis" format="2">
   <advance width="1233"/>
   <unicode hex="0178"/>
   <outline>
     <contour>
-      <point x="506" y="1627" type="line" name="hr00" smooth="yes"/>
+      <point x="506" y="1627" type="line" smooth="yes" name="hr00"/>
       <point x="486" y="1627"/>
       <point x="475" y="1640"/>
       <point x="479" y="1660" type="curve" smooth="yes"/>
       <point x="507" y="1803" type="line"/>
       <point x="510" y="1821"/>
       <point x="520" y="1830"/>
-      <point x="539" y="1830" type="curve" name="dv01" smooth="yes"/>
+      <point x="539" y="1830" type="curve" smooth="yes" name="dv01"/>
       <point x="683" y="1830" type="line" smooth="yes"/>
       <point x="701" y="1830"/>
       <point x="710" y="1822"/>
@@ -25,14 +25,14 @@
       <point x="648" y="1627" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="897" y="1627" type="line" name="sv01" smooth="yes"/>
+      <point x="897" y="1627" type="line" smooth="yes" name="sv01"/>
       <point x="877" y="1627"/>
       <point x="866" y="1640"/>
       <point x="870" y="1660" type="curve" smooth="yes"/>
       <point x="898" y="1803" type="line"/>
       <point x="901" y="1821"/>
       <point x="911" y="1830"/>
-      <point x="930" y="1830" type="curve" name="sv02" smooth="yes"/>
+      <point x="930" y="1830" type="curve" smooth="yes" name="sv02"/>
       <point x="1073" y="1830" type="line" smooth="yes"/>
       <point x="1093" y="1830"/>
       <point x="1104" y="1817"/>
diff --git a/source/Hack-Italic.ufo/glyphs/Y_grave.glif b/source/Hack-Italic.ufo/glyphs/Y_grave.glif
index a1867715e..948fd203a 100644
--- a/source/Hack-Italic.ufo/glyphs/Y_grave.glif
+++ b/source/Hack-Italic.ufo/glyphs/Y_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ygrave" format="1">
+<glyph name="Ygrave" format="2">
   <advance width="1233"/>
   <unicode hex="1EF2"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/Z_.glif b/source/Hack-Italic.ufo/glyphs/Z_.glif
index f2ac4e3b7..6dd659212 100644
--- a/source/Hack-Italic.ufo/glyphs/Z_.glif
+++ b/source/Hack-Italic.ufo/glyphs/Z_.glif
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Z" format="1">
+<glyph name="Z" format="2">
   <advance width="1233"/>
   <unicode hex="005A"/>
   <outline>
     <contour>
-      <point x="32" y="154" type="line" name="hr00"/>
-      <point x="1008" y="1323" type="line" name="sv01"/>
+      <point x="32" y="154" type="line"/>
+      <point x="1008" y="1323" type="line"/>
       <point x="281" y="1323" type="line"/>
-      <point x="314" y="1493" type="line" name="at01"/>
+      <point x="314" y="1493" type="line"/>
       <point x="1283" y="1493" type="line"/>
       <point x="1254" y="1339" type="line"/>
-      <point x="275" y="170" type="line" name="sv02"/>
+      <point x="275" y="170" type="line"/>
       <point x="1049" y="170" type="line"/>
-      <point x="1015" y="0" type="line" name="ab01"/>
+      <point x="1015" y="0" type="line"/>
       <point x="3" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/Z_acute.glif b/source/Hack-Italic.ufo/glyphs/Z_acute.glif
index f243b4723..ac0bb803f 100644
--- a/source/Hack-Italic.ufo/glyphs/Z_acute.glif
+++ b/source/Hack-Italic.ufo/glyphs/Z_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Zacute" format="1">
+<glyph name="Zacute" format="2">
   <advance width="1233"/>
   <unicode hex="0179"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/Z_caron.glif b/source/Hack-Italic.ufo/glyphs/Z_caron.glif
index 0469eb027..5e522a389 100644
--- a/source/Hack-Italic.ufo/glyphs/Z_caron.glif
+++ b/source/Hack-Italic.ufo/glyphs/Z_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Zcaron" format="1">
+<glyph name="Zcaron" format="2">
   <advance width="1233"/>
   <unicode hex="017D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/Z_dotaccent.glif b/source/Hack-Italic.ufo/glyphs/Z_dotaccent.glif
index 6feea8a3a..0c8b3e20b 100644
--- a/source/Hack-Italic.ufo/glyphs/Z_dotaccent.glif
+++ b/source/Hack-Italic.ufo/glyphs/Z_dotaccent.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Zdotaccent" format="1">
+<glyph name="Zdotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="017B"/>
   <outline>
     <contour>
-      <point x="783" y="1627" type="line" name="hr00" smooth="yes"/>
+      <point x="783" y="1627" type="line" smooth="yes" name="hr00"/>
       <point x="762" y="1627"/>
       <point x="747" y="1643"/>
       <point x="751" y="1666" type="curve" smooth="yes"/>
       <point x="778" y="1809" type="line" smooth="yes"/>
       <point x="781" y="1824"/>
       <point x="792" y="1832"/>
-      <point x="807" y="1832" type="curve" name="dv01" smooth="yes"/>
+      <point x="807" y="1832" type="curve" smooth="yes" name="dv01"/>
       <point x="948" y="1832" type="line" smooth="yes"/>
       <point x="969" y="1832"/>
       <point x="985" y="1816"/>
diff --git a/source/Hack-Italic.ufo/glyphs/Z_eta.glif b/source/Hack-Italic.ufo/glyphs/Z_eta.glif
index 115223778..d40977452 100644
--- a/source/Hack-Italic.ufo/glyphs/Z_eta.glif
+++ b/source/Hack-Italic.ufo/glyphs/Z_eta.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Zeta" format="1">
+<glyph name="Zeta" format="2">
   <advance width="1233"/>
   <unicode hex="0396"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/_1550.glif b/source/Hack-Italic.ufo/glyphs/_1550.glif
index ba96fab64..e20b4863e 100644
--- a/source/Hack-Italic.ufo/glyphs/_1550.glif
+++ b/source/Hack-Italic.ufo/glyphs/_1550.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="_1550" format="1">
-  <advance width="0"/>
+<glyph name="_1550" format="2">
   <outline>
   </outline>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/_notdef.glif b/source/Hack-Italic.ufo/glyphs/_notdef.glif
index 112158991..5c8a9cc25 100644
--- a/source/Hack-Italic.ufo/glyphs/_notdef.glif
+++ b/source/Hack-Italic.ufo/glyphs/_notdef.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name=".notdef" format="1">
+<glyph name=".notdef" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/a.glif b/source/Hack-Italic.ufo/glyphs/a.glif
index 8e1fce67e..b5d745480 100644
--- a/source/Hack-Italic.ufo/glyphs/a.glif
+++ b/source/Hack-Italic.ufo/glyphs/a.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="a" format="1">
+<glyph name="a" format="2">
   <advance width="1233"/>
   <unicode hex="0061"/>
   <outline>
@@ -53,9 +53,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/aacute.glif b/source/Hack-Italic.ufo/glyphs/aacute.glif
index 6d9e64f7a..16c80d12e 100644
--- a/source/Hack-Italic.ufo/glyphs/aacute.glif
+++ b/source/Hack-Italic.ufo/glyphs/aacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="aacute" format="1">
+<glyph name="aacute" format="2">
   <advance width="1233"/>
   <unicode hex="00E1"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="579" y="1297" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="407" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="407" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="308" y="-29"/>
       <point x="225" y="-2"/>
       <point x="164" y="54" type="curve" smooth="yes"/>
       <point x="100" y="111"/>
       <point x="72" y="188"/>
-      <point x="72" y="280" type="curve" name="dh01" smooth="yes"/>
+      <point x="72" y="280" type="curve" smooth="yes" name="dh01"/>
       <point x="72" y="534"/>
       <point x="293" y="707"/>
       <point x="645" y="707" type="curve" smooth="yes"/>
@@ -31,7 +31,7 @@
       <point x="844" y="946" type="curve" smooth="yes"/>
       <point x="805" y="974"/>
       <point x="748" y="991"/>
-      <point x="665" y="991" type="curve" name="hr01" smooth="yes"/>
+      <point x="665" y="991" type="curve" smooth="yes" name="hr01"/>
       <point x="608" y="991"/>
       <point x="546" y="983"/>
       <point x="479" y="966" type="curve" smooth="yes"/>
@@ -41,7 +41,7 @@
       <point x="303" y="1069" type="line"/>
       <point x="446" y="1122"/>
       <point x="577" y="1147"/>
-      <point x="693" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="693" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="816" y="1147"/>
       <point x="916" y="1121"/>
       <point x="985" y="1065" type="curve" smooth="yes"/>
@@ -64,7 +64,7 @@
       <point x="483" y="-29"/>
     </contour>
     <contour>
-      <point x="461" y="125" type="curve" name="dv02" smooth="yes"/>
+      <point x="461" y="125" type="curve" smooth="yes" name="dv02"/>
       <point x="557" y="125"/>
       <point x="640" y="161"/>
       <point x="711" y="232" type="curve" smooth="yes"/>
@@ -78,10 +78,10 @@
       <point x="414" y="530" type="curve" smooth="yes"/>
       <point x="379" y="515"/>
       <point x="338" y="493"/>
-      <point x="305" y="442" type="curve" name="hr02" smooth="yes"/>
+      <point x="305" y="442" type="curve" smooth="yes" name="hr02"/>
       <point x="278" y="401"/>
       <point x="264" y="356"/>
-      <point x="264" y="307" type="curve" name="dh02" smooth="yes"/>
+      <point x="264" y="307" type="curve" smooth="yes" name="dh02"/>
       <point x="264" y="243"/>
       <point x="288" y="201"/>
       <point x="316" y="174" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/abreve.glif b/source/Hack-Italic.ufo/glyphs/abreve.glif
index 4d32620a1..6cb36fc8d 100644
--- a/source/Hack-Italic.ufo/glyphs/abreve.glif
+++ b/source/Hack-Italic.ufo/glyphs/abreve.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="abreve" format="1">
+<glyph name="abreve" format="2">
   <advance width="1233"/>
   <unicode hex="0103"/>
   <outline>
     <contour>
-      <point x="747" y="1297" type="curve" name="dv01" smooth="yes"/>
+      <point x="747" y="1297" type="curve" smooth="yes" name="dv01"/>
       <point x="568" y="1297"/>
       <point x="469" y="1386"/>
-      <point x="469" y="1543" type="curve" name="dh01" smooth="yes"/>
+      <point x="469" y="1543" type="curve" smooth="yes" name="dh01"/>
       <point x="469" y="1566"/>
       <point x="469" y="1573"/>
       <point x="472" y="1584" type="curve"/>
       <point x="592" y="1584" type="line" name="sv01"/>
-      <point x="592" y="1567" type="line" name="dh02" smooth="yes"/>
+      <point x="592" y="1567" type="line" smooth="yes" name="dh02"/>
       <point x="592" y="1479"/>
       <point x="652" y="1434"/>
-      <point x="761" y="1434" type="curve" name="dv02" smooth="yes"/>
+      <point x="761" y="1434" type="curve" smooth="yes" name="dv02"/>
       <point x="874" y="1434"/>
       <point x="940" y="1484"/>
       <point x="979" y="1584" type="curve" name="sv02"/>
@@ -24,10 +24,10 @@
       <point x="932" y="1297"/>
     </contour>
     <contour>
-      <point x="404" y="-29" type="curve" name="sv04" smooth="yes"/>
+      <point x="404" y="-29" type="curve" smooth="yes" name="sv04"/>
       <point x="203" y="-29"/>
       <point x="72" y="90"/>
-      <point x="72" y="283" type="curve" name="hr01" smooth="yes"/>
+      <point x="72" y="283" type="curve" smooth="yes" name="hr01"/>
       <point x="72" y="534"/>
       <point x="293" y="707"/>
       <point x="645" y="707" type="curve" smooth="yes"/>
@@ -35,20 +35,20 @@
       <point x="903" y="768" type="line" smooth="yes"/>
       <point x="906" y="780"/>
       <point x="907" y="794"/>
-      <point x="907" y="807" type="curve" name="dh03" smooth="yes"/>
+      <point x="907" y="807" type="curve" smooth="yes" name="dh03"/>
       <point x="907" y="932"/>
       <point x="821" y="991"/>
-      <point x="665" y="991" type="curve" name="sv05" smooth="yes"/>
+      <point x="665" y="991" type="curve" smooth="yes" name="sv05"/>
       <point x="548" y="991"/>
       <point x="416" y="957"/>
       <point x="268" y="889" type="curve" name="sh02"/>
       <point x="303" y="1069" type="line"/>
       <point x="448" y="1121"/>
       <point x="574" y="1147"/>
-      <point x="693" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="693" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="942" y="1147"/>
       <point x="1087" y="1030"/>
-      <point x="1087" y="839" type="curve" name="dh04" smooth="yes"/>
+      <point x="1087" y="839" type="curve" smooth="yes" name="dh04"/>
       <point x="1087" y="794"/>
       <point x="1079" y="723"/>
       <point x="1063" y="639" type="curve" smooth="yes"/>
@@ -59,18 +59,18 @@
       <point x="561" y="-29"/>
     </contour>
     <contour>
-      <point x="461" y="125" type="curve" name="sv03" smooth="yes"/>
+      <point x="461" y="125" type="curve" smooth="yes" name="sv03"/>
       <point x="640" y="125"/>
       <point x="805" y="269"/>
       <point x="856" y="522" type="curve" smooth="yes"/>
       <point x="864" y="563" type="line" name="dv03"/>
-      <point x="692" y="563" type="line" name="hr03" smooth="yes"/>
+      <point x="692" y="563" type="line" smooth="yes" name="hr03"/>
       <point x="542" y="563"/>
       <point x="472" y="555"/>
       <point x="414" y="530" type="curve" smooth="yes"/>
       <point x="323" y="491"/>
       <point x="264" y="411"/>
-      <point x="264" y="307" type="curve" name="hr04" smooth="yes"/>
+      <point x="264" y="307" type="curve" smooth="yes" name="hr04"/>
       <point x="264" y="195"/>
       <point x="334" y="125"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/acircumflex.glif b/source/Hack-Italic.ufo/glyphs/acircumflex.glif
index 5cc684f6d..1b40a08e0 100644
--- a/source/Hack-Italic.ufo/glyphs/acircumflex.glif
+++ b/source/Hack-Italic.ufo/glyphs/acircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="acircumflex" format="1">
+<glyph name="acircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00E2"/>
   <outline>
@@ -13,19 +13,19 @@
       <point x="401" y="1297" type="line" name="iv03"/>
     </contour>
     <contour>
-      <point x="407" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="407" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="308" y="-29"/>
       <point x="225" y="-2"/>
       <point x="164" y="54" type="curve" smooth="yes"/>
       <point x="100" y="111"/>
       <point x="72" y="188"/>
-      <point x="72" y="280" type="curve" name="dh01" smooth="yes"/>
+      <point x="72" y="280" type="curve" smooth="yes" name="dh01"/>
       <point x="72" y="534"/>
       <point x="293" y="707"/>
       <point x="645" y="707" type="curve" smooth="yes"/>
       <point x="891" y="707" type="line" name="dv04"/>
       <point x="903" y="768" type="line"/>
-      <point x="906" y="787" type="line" name="hr01" smooth="yes"/>
+      <point x="906" y="787" type="line" smooth="yes" name="hr01"/>
       <point x="907" y="794"/>
       <point x="907" y="801"/>
       <point x="907" y="804" type="curve" smooth="yes"/>
@@ -34,7 +34,7 @@
       <point x="844" y="946" type="curve" smooth="yes"/>
       <point x="805" y="974"/>
       <point x="748" y="991"/>
-      <point x="665" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="665" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="608" y="991"/>
       <point x="546" y="983"/>
       <point x="479" y="966" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="303" y="1069" type="line"/>
       <point x="446" y="1122"/>
       <point x="577" y="1147"/>
-      <point x="693" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="693" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="816" y="1147"/>
       <point x="916" y="1121"/>
       <point x="985" y="1065" type="curve" smooth="yes"/>
@@ -67,7 +67,7 @@
       <point x="483" y="-29"/>
     </contour>
     <contour>
-      <point x="461" y="125" type="curve" name="dv02" smooth="yes"/>
+      <point x="461" y="125" type="curve" smooth="yes" name="dv02"/>
       <point x="557" y="125"/>
       <point x="640" y="161"/>
       <point x="711" y="232" type="curve" smooth="yes"/>
@@ -75,7 +75,7 @@
       <point x="833" y="407"/>
       <point x="856" y="522" type="curve" smooth="yes"/>
       <point x="864" y="563" type="line" name="dv03"/>
-      <point x="692" y="563" type="line" name="hr02" smooth="yes"/>
+      <point x="692" y="563" type="line" smooth="yes" name="hr02"/>
       <point x="529" y="563"/>
       <point x="475" y="554"/>
       <point x="414" y="530" type="curve" smooth="yes"/>
@@ -84,7 +84,7 @@
       <point x="305" y="442" type="curve" smooth="yes"/>
       <point x="278" y="401"/>
       <point x="264" y="356"/>
-      <point x="264" y="307" type="curve" name="dh02" smooth="yes"/>
+      <point x="264" y="307" type="curve" smooth="yes" name="dh02"/>
       <point x="264" y="243"/>
       <point x="288" y="201"/>
       <point x="316" y="174" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/acute.glif b/source/Hack-Italic.ufo/glyphs/acute.glif
index 5336b48e2..81c94071c 100644
--- a/source/Hack-Italic.ufo/glyphs/acute.glif
+++ b/source/Hack-Italic.ufo/glyphs/acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="acute" format="1">
+<glyph name="acute" format="2">
   <advance width="1233"/>
   <unicode hex="00B4"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/acutecomb.glif b/source/Hack-Italic.ufo/glyphs/acutecomb.glif
index 1e64a1573..04531afa2 100644
--- a/source/Hack-Italic.ufo/glyphs/acutecomb.glif
+++ b/source/Hack-Italic.ufo/glyphs/acutecomb.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="acutecomb" format="1">
-  <advance width="0"/>
+<glyph name="acutecomb" format="2">
   <unicode hex="0301"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/adieresis.glif b/source/Hack-Italic.ufo/glyphs/adieresis.glif
index a6f69e05d..0b28417d4 100644
--- a/source/Hack-Italic.ufo/glyphs/adieresis.glif
+++ b/source/Hack-Italic.ufo/glyphs/adieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="adieresis" format="1">
+<glyph name="adieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00E4"/>
   <outline>
     <contour>
-      <point x="473" y="1350" type="line" name="dv03" smooth="yes"/>
+      <point x="473" y="1350" type="line" smooth="yes" name="dv03"/>
       <point x="453" y="1350"/>
       <point x="442" y="1363"/>
       <point x="446" y="1383" type="curve" smooth="yes"/>
       <point x="474" y="1525" type="line"/>
       <point x="477" y="1543"/>
       <point x="487" y="1552"/>
-      <point x="506" y="1552" type="curve" name="dv04" smooth="yes"/>
+      <point x="506" y="1552" type="curve" smooth="yes" name="dv04"/>
       <point x="649" y="1552" type="line" smooth="yes"/>
       <point x="669" y="1552"/>
       <point x="680" y="1539"/>
@@ -22,31 +22,31 @@
       <point x="616" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="864" y="1350" type="line" name="sv01" smooth="yes"/>
+      <point x="864" y="1350" type="line" smooth="yes" name="sv01"/>
       <point x="844" y="1350"/>
       <point x="833" y="1363"/>
       <point x="837" y="1383" type="curve" smooth="yes"/>
       <point x="865" y="1525" type="line"/>
       <point x="868" y="1543"/>
       <point x="878" y="1552"/>
-      <point x="897" y="1552" type="curve" name="sv02" smooth="yes"/>
+      <point x="897" y="1552" type="curve" smooth="yes" name="sv02"/>
       <point x="1040" y="1552" type="line" smooth="yes"/>
       <point x="1060" y="1552"/>
       <point x="1071" y="1539"/>
       <point x="1067" y="1519" type="curve" smooth="yes"/>
-      <point x="1039" y="1377" type="line" name="hr01" smooth="yes"/>
+      <point x="1039" y="1377" type="line" smooth="yes" name="hr01"/>
       <point x="1036" y="1359"/>
       <point x="1025" y="1350"/>
       <point x="1007" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="407" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="407" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="308" y="-29"/>
       <point x="225" y="-2"/>
       <point x="164" y="54" type="curve" smooth="yes"/>
       <point x="100" y="111"/>
       <point x="72" y="188"/>
-      <point x="72" y="280" type="curve" name="dh01" smooth="yes"/>
+      <point x="72" y="280" type="curve" smooth="yes" name="dh01"/>
       <point x="72" y="534"/>
       <point x="293" y="707"/>
       <point x="645" y="707" type="curve" smooth="yes"/>
@@ -61,7 +61,7 @@
       <point x="845" y="946" type="curve" smooth="yes"/>
       <point x="806" y="974"/>
       <point x="744" y="991"/>
-      <point x="663" y="991" type="curve" name="sv03" smooth="yes"/>
+      <point x="663" y="991" type="curve" smooth="yes" name="sv03"/>
       <point x="607" y="991"/>
       <point x="546" y="983"/>
       <point x="479" y="966" type="curve" smooth="yes"/>
@@ -71,7 +71,7 @@
       <point x="303" y="1069" type="line"/>
       <point x="446" y="1122"/>
       <point x="577" y="1147"/>
-      <point x="693" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="693" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="816" y="1147"/>
       <point x="916" y="1121"/>
       <point x="985" y="1065" type="curve" smooth="yes"/>
@@ -94,7 +94,7 @@
       <point x="483" y="-29"/>
     </contour>
     <contour>
-      <point x="461" y="125" type="curve" name="dv02" smooth="yes"/>
+      <point x="461" y="125" type="curve" smooth="yes" name="dv02"/>
       <point x="557" y="125"/>
       <point x="640" y="161"/>
       <point x="711" y="232" type="curve" smooth="yes"/>
@@ -111,7 +111,7 @@
       <point x="305" y="442" type="curve" smooth="yes"/>
       <point x="278" y="401"/>
       <point x="264" y="356"/>
-      <point x="264" y="307" type="curve" name="dh02" smooth="yes"/>
+      <point x="264" y="307" type="curve" smooth="yes" name="dh02"/>
       <point x="264" y="243"/>
       <point x="288" y="201"/>
       <point x="316" y="174" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/ae.glif b/source/Hack-Italic.ufo/glyphs/ae.glif
index 1afa8ce4e..d8ad586dc 100644
--- a/source/Hack-Italic.ufo/glyphs/ae.glif
+++ b/source/Hack-Italic.ufo/glyphs/ae.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ae" format="1">
+<glyph name="ae" format="2">
   <advance width="1233"/>
   <unicode hex="00E6"/>
   <outline>
     <contour>
-      <point x="234" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="234" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="143" y="-29"/>
       <point x="72" y="0"/>
       <point x="28" y="43" type="curve"/>
       <point x="-27" y="94"/>
       <point x="-47" y="168"/>
-      <point x="-47" y="252" type="curve" name="sh01" smooth="yes"/>
+      <point x="-47" y="252" type="curve" smooth="yes" name="sh01"/>
       <point x="-47" y="368"/>
       <point x="-7" y="476"/>
       <point x="74" y="549" type="curve" smooth="yes"/>
       <point x="154" y="621"/>
       <point x="269" y="657"/>
-      <point x="418" y="657" type="curve" name="sv01" smooth="yes"/>
+      <point x="418" y="657" type="curve" smooth="yes" name="sv01"/>
       <point x="535" y="657" type="line"/>
       <point x="553" y="745" type="line" smooth="yes"/>
       <point x="557" y="764"/>
@@ -30,7 +30,7 @@
       <point x="519" y="953" type="curve" smooth="yes"/>
       <point x="494" y="978"/>
       <point x="453" y="995"/>
-      <point x="400" y="995" type="curve" name="sv02" smooth="yes"/>
+      <point x="400" y="995" type="curve" smooth="yes" name="sv02"/>
       <point x="364" y="995"/>
       <point x="324" y="987"/>
       <point x="284" y="974" type="curve" smooth="yes"/>
@@ -43,7 +43,7 @@
       <point x="324" y="1130" type="curve" smooth="yes"/>
       <point x="371" y="1141"/>
       <point x="411" y="1147"/>
-      <point x="450" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="450" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="504" y="1147"/>
       <point x="551" y="1136"/>
       <point x="590" y="1114" type="curve" smooth="yes"/>
@@ -55,13 +55,13 @@
       <point x="800" y="1114" type="curve" smooth="yes"/>
       <point x="848" y="1137"/>
       <point x="901" y="1147"/>
-      <point x="950" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="950" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1029" y="1147"/>
       <point x="1095" y="1122"/>
       <point x="1143" y="1070" type="curve" smooth="yes"/>
       <point x="1190" y="1019"/>
       <point x="1214" y="947"/>
-      <point x="1214" y="867" type="curve" name="sh02" smooth="yes"/>
+      <point x="1214" y="867" type="curve" smooth="yes" name="sh02"/>
       <point x="1214" y="839"/>
       <point x="1211" y="799"/>
       <point x="1206" y="760" type="curve" name="sh03"/>
@@ -81,7 +81,7 @@
       <point x="682" y="163" type="curve" smooth="yes"/>
       <point x="715" y="134"/>
       <point x="759" y="119"/>
-      <point x="815" y="119" type="curve" name="dv02" smooth="yes"/>
+      <point x="815" y="119" type="curve" smooth="yes" name="dv02"/>
       <point x="861" y="119"/>
       <point x="908" y="129"/>
       <point x="957" y="148" type="curve" smooth="yes"/>
@@ -94,7 +94,7 @@
       <point x="922" y="-8" type="curve" smooth="yes"/>
       <point x="879" y="-22"/>
       <point x="833" y="-29"/>
-      <point x="785" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="785" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="642" y="-29"/>
       <point x="546" y="29"/>
       <point x="514" y="131" type="curve" name="ih04"/>
@@ -106,13 +106,13 @@
     </contour>
     <contour>
       <point x="1024" y="657" type="line" name="dv04"/>
-      <point x="1040" y="731" type="line" name="sh05" smooth="yes"/>
+      <point x="1040" y="731" type="line" smooth="yes" name="sh05"/>
       <point x="1045" y="754"/>
       <point x="1048" y="774"/>
-      <point x="1049" y="786" type="curve" name="sh06" smooth="yes"/>
+      <point x="1049" y="786" type="curve" smooth="yes" name="sh06"/>
       <point x="1050" y="801"/>
       <point x="1051" y="829"/>
-      <point x="1051" y="844" type="curve" name="ah01" smooth="yes"/>
+      <point x="1051" y="844" type="curve" smooth="yes" name="ah01"/>
       <point x="1051" y="896"/>
       <point x="1039" y="932"/>
       <point x="1016" y="957" type="curve" smooth="yes"/>
@@ -125,7 +125,7 @@
       <point x="694" y="657" type="line"/>
     </contour>
     <contour>
-      <point x="267" y="123" type="curve" name="sv04" smooth="yes"/>
+      <point x="267" y="123" type="curve" smooth="yes" name="sv04"/>
       <point x="322" y="123"/>
       <point x="367" y="146"/>
       <point x="401" y="191" type="curve" smooth="yes"/>
@@ -145,7 +145,7 @@
       <point x="141" y="362" type="curve" smooth="yes"/>
       <point x="129" y="328"/>
       <point x="123" y="296"/>
-      <point x="123" y="267" type="curve" name="sh07" smooth="yes"/>
+      <point x="123" y="267" type="curve" smooth="yes" name="sh07"/>
       <point x="123" y="231"/>
       <point x="133" y="191"/>
       <point x="161" y="162" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/agrave.glif b/source/Hack-Italic.ufo/glyphs/agrave.glif
index 483764b75..05509303f 100644
--- a/source/Hack-Italic.ufo/glyphs/agrave.glif
+++ b/source/Hack-Italic.ufo/glyphs/agrave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="agrave" format="1">
+<glyph name="agrave" format="2">
   <advance width="1233"/>
   <unicode hex="00E0"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="709" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="407" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="407" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="308" y="-29"/>
       <point x="225" y="-2"/>
       <point x="164" y="54" type="curve" smooth="yes"/>
       <point x="100" y="111"/>
       <point x="72" y="188"/>
-      <point x="72" y="280" type="curve" name="dh01" smooth="yes"/>
+      <point x="72" y="280" type="curve" smooth="yes" name="dh01"/>
       <point x="72" y="534"/>
       <point x="293" y="707"/>
       <point x="645" y="707" type="curve" smooth="yes"/>
@@ -31,7 +31,7 @@
       <point x="844" y="946" type="curve" smooth="yes"/>
       <point x="805" y="974"/>
       <point x="748" y="991"/>
-      <point x="665" y="991" type="curve" name="hr01" smooth="yes"/>
+      <point x="665" y="991" type="curve" smooth="yes" name="hr01"/>
       <point x="608" y="991"/>
       <point x="546" y="983"/>
       <point x="479" y="966" type="curve" smooth="yes"/>
@@ -41,7 +41,7 @@
       <point x="303" y="1069" type="line"/>
       <point x="446" y="1122"/>
       <point x="577" y="1147"/>
-      <point x="693" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="693" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="816" y="1147"/>
       <point x="916" y="1121"/>
       <point x="985" y="1065" type="curve" smooth="yes"/>
@@ -64,7 +64,7 @@
       <point x="483" y="-29"/>
     </contour>
     <contour>
-      <point x="461" y="125" type="curve" name="dv02" smooth="yes"/>
+      <point x="461" y="125" type="curve" smooth="yes" name="dv02"/>
       <point x="557" y="125"/>
       <point x="640" y="161"/>
       <point x="711" y="232" type="curve" smooth="yes"/>
@@ -78,10 +78,10 @@
       <point x="414" y="530" type="curve" smooth="yes"/>
       <point x="379" y="515"/>
       <point x="338" y="493"/>
-      <point x="305" y="442" type="curve" name="hr02" smooth="yes"/>
+      <point x="305" y="442" type="curve" smooth="yes" name="hr02"/>
       <point x="278" y="401"/>
       <point x="264" y="356"/>
-      <point x="264" y="307" type="curve" name="dh02" smooth="yes"/>
+      <point x="264" y="307" type="curve" smooth="yes" name="dh02"/>
       <point x="264" y="243"/>
       <point x="288" y="201"/>
       <point x="316" y="174" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/alpha.glif b/source/Hack-Italic.ufo/glyphs/alpha.glif
index 85c66d011..de57e2bd4 100644
--- a/source/Hack-Italic.ufo/glyphs/alpha.glif
+++ b/source/Hack-Italic.ufo/glyphs/alpha.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="alpha" format="1">
+<glyph name="alpha" format="2">
   <advance width="1233"/>
   <unicode hex="03B1"/>
   <outline>
     <contour>
-      <point x="396" y="-25" type="curve" name="ab01" smooth="yes"/>
+      <point x="396" y="-25" type="curve" smooth="yes" name="ab01"/>
       <point x="176" y="-25"/>
       <point x="49" y="112"/>
-      <point x="49" y="367" type="curve" name="sh01" smooth="yes"/>
+      <point x="49" y="367" type="curve" smooth="yes" name="sh01"/>
       <point x="49" y="425"/>
       <point x="56" y="489"/>
       <point x="70" y="559" type="curve" smooth="yes"/>
@@ -24,7 +24,7 @@
       <point x="915" y="294" type="line" name="sh02"/>
       <point x="915" y="230"/>
       <point x="961" y="156"/>
-      <point x="1005" y="156" type="curve" name="sv02" smooth="yes"/>
+      <point x="1005" y="156" type="curve" smooth="yes" name="sv02"/>
       <point x="1094" y="156" type="line"/>
       <point x="1064" y="0" type="line" name="hr01"/>
       <point x="953" y="0" type="line" smooth="yes"/>
@@ -38,7 +38,7 @@
       <point x="585" y="-25"/>
     </contour>
     <contour>
-      <point x="421" y="127" type="curve" name="sv03" smooth="yes"/>
+      <point x="421" y="127" type="curve" smooth="yes" name="sv03"/>
       <point x="501" y="127"/>
       <point x="583" y="192"/>
       <point x="662" y="340" type="curve" smooth="yes"/>
@@ -46,13 +46,13 @@
       <point x="759" y="752" type="line" name="ah01"/>
       <point x="759" y="925"/>
       <point x="690" y="991"/>
-      <point x="606" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="606" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="537" y="991"/>
       <point x="459" y="947"/>
-      <point x="403" y="879" type="curve" name="hr02" smooth="yes"/>
+      <point x="403" y="879" type="curve" smooth="yes" name="hr02"/>
       <point x="318" y="779"/>
       <point x="245" y="567"/>
-      <point x="245" y="396" type="curve" name="sh05" smooth="yes"/>
+      <point x="245" y="396" type="curve" smooth="yes" name="sh05"/>
       <point x="245" y="336"/>
       <point x="254" y="279"/>
       <point x="275" y="234" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/alphatonos.glif b/source/Hack-Italic.ufo/glyphs/alphatonos.glif
index 1aa023d6c..c6daee924 100644
--- a/source/Hack-Italic.ufo/glyphs/alphatonos.glif
+++ b/source/Hack-Italic.ufo/glyphs/alphatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="alphatonos" format="1">
+<glyph name="alphatonos" format="2">
   <advance width="1233"/>
   <unicode hex="03AC"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="585" y="1297" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="396" y="-25" type="curve" name="ab01" smooth="yes"/>
+      <point x="396" y="-25" type="curve" smooth="yes" name="ab01"/>
       <point x="176" y="-25"/>
       <point x="49" y="112"/>
-      <point x="49" y="367" type="curve" name="sh03" smooth="yes"/>
+      <point x="49" y="367" type="curve" smooth="yes" name="sh03"/>
       <point x="49" y="425"/>
       <point x="56" y="489"/>
       <point x="70" y="559" type="curve" smooth="yes"/>
@@ -30,7 +30,7 @@
       <point x="915" y="294" type="line" name="sh01"/>
       <point x="915" y="230"/>
       <point x="961" y="156"/>
-      <point x="1005" y="156" type="curve" name="sv02" smooth="yes"/>
+      <point x="1005" y="156" type="curve" smooth="yes" name="sv02"/>
       <point x="1094" y="156" type="line"/>
       <point x="1064" y="0" type="line" name="ab02"/>
       <point x="953" y="0" type="line" smooth="yes"/>
@@ -44,21 +44,21 @@
       <point x="585" y="-25"/>
     </contour>
     <contour>
-      <point x="421" y="127" type="curve" name="sv03" smooth="yes"/>
+      <point x="421" y="127" type="curve" smooth="yes" name="sv03"/>
       <point x="501" y="127"/>
       <point x="583" y="192"/>
-      <point x="662" y="340" type="curve" name="hr02" smooth="yes"/>
+      <point x="662" y="340" type="curve" smooth="yes" name="hr02"/>
       <point x="758" y="521" type="line"/>
       <point x="759" y="752" type="line" name="ah01"/>
       <point x="759" y="925"/>
       <point x="690" y="991"/>
-      <point x="606" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="606" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="537" y="991"/>
       <point x="459" y="947"/>
       <point x="403" y="879" type="curve" smooth="yes"/>
       <point x="318" y="779"/>
       <point x="245" y="567"/>
-      <point x="245" y="396" type="curve" name="sh06" smooth="yes"/>
+      <point x="245" y="396" type="curve" smooth="yes" name="sh06"/>
       <point x="245" y="336"/>
       <point x="254" y="279"/>
       <point x="275" y="234" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/amacron.glif b/source/Hack-Italic.ufo/glyphs/amacron.glif
index ce90e01c9..219b93c1c 100644
--- a/source/Hack-Italic.ufo/glyphs/amacron.glif
+++ b/source/Hack-Italic.ufo/glyphs/amacron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="amacron" format="1">
+<glyph name="amacron" format="2">
   <advance width="1233"/>
   <unicode hex="0101"/>
   <outline>
@@ -10,31 +10,31 @@
       <point x="440" y="1347" type="line"/>
     </contour>
     <contour>
-      <point x="404" y="-29" type="curve" name="sv03" smooth="yes"/>
+      <point x="404" y="-29" type="curve" smooth="yes" name="sv03"/>
       <point x="203" y="-29"/>
       <point x="72" y="90"/>
-      <point x="72" y="283" type="curve" name="sh01" smooth="yes"/>
+      <point x="72" y="283" type="curve" smooth="yes" name="sh01"/>
       <point x="72" y="534"/>
       <point x="293" y="707"/>
       <point x="645" y="707" type="curve" smooth="yes"/>
       <point x="891" y="707" type="line" name="dv02"/>
-      <point x="903" y="768" type="line" name="sh02" smooth="yes"/>
+      <point x="903" y="768" type="line" smooth="yes" name="sh02"/>
       <point x="906" y="780"/>
       <point x="907" y="794"/>
-      <point x="907" y="807" type="curve" name="hr01" smooth="yes"/>
+      <point x="907" y="807" type="curve" smooth="yes" name="hr01"/>
       <point x="907" y="932"/>
       <point x="821" y="991"/>
-      <point x="665" y="991" type="curve" name="sv04" smooth="yes"/>
+      <point x="665" y="991" type="curve" smooth="yes" name="sv04"/>
       <point x="548" y="991"/>
       <point x="416" y="957"/>
       <point x="268" y="889" type="curve" name="sh04"/>
       <point x="303" y="1069" type="line"/>
       <point x="448" y="1121"/>
       <point x="574" y="1147"/>
-      <point x="693" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="693" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="942" y="1147"/>
       <point x="1087" y="1030"/>
-      <point x="1087" y="839" type="curve" name="sh05" smooth="yes"/>
+      <point x="1087" y="839" type="curve" smooth="yes" name="sh05"/>
       <point x="1087" y="794"/>
       <point x="1079" y="723"/>
       <point x="1063" y="639" type="curve" smooth="yes"/>
@@ -45,18 +45,18 @@
       <point x="561" y="-29"/>
     </contour>
     <contour>
-      <point x="461" y="125" type="curve" name="sv02" smooth="yes"/>
+      <point x="461" y="125" type="curve" smooth="yes" name="sv02"/>
       <point x="640" y="125"/>
       <point x="805" y="269"/>
       <point x="856" y="522" type="curve" smooth="yes"/>
       <point x="864" y="563" type="line" name="dv01"/>
-      <point x="692" y="563" type="line" name="hr02" smooth="yes"/>
+      <point x="692" y="563" type="line" smooth="yes" name="hr02"/>
       <point x="542" y="563"/>
       <point x="472" y="555"/>
       <point x="414" y="530" type="curve" smooth="yes"/>
       <point x="323" y="491"/>
       <point x="264" y="411"/>
-      <point x="264" y="307" type="curve" name="sh03" smooth="yes"/>
+      <point x="264" y="307" type="curve" smooth="yes" name="sh03"/>
       <point x="264" y="195"/>
       <point x="334" y="125"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/ampersand.glif b/source/Hack-Italic.ufo/glyphs/ampersand.glif
index 00eb38dfa..27b7fde93 100644
--- a/source/Hack-Italic.ufo/glyphs/ampersand.glif
+++ b/source/Hack-Italic.ufo/glyphs/ampersand.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ampersand" format="1">
+<glyph name="ampersand" format="2">
   <advance width="1233"/>
   <unicode hex="0026"/>
   <outline>
     <contour>
-      <point x="408" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="408" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="283" y="-29"/>
       <point x="173" y="7"/>
       <point x="96" y="78" type="curve" smooth="yes"/>
       <point x="20" y="146"/>
       <point x="-20" y="242"/>
-      <point x="-20" y="362" type="curve" name="sh01" smooth="yes"/>
+      <point x="-20" y="362" type="curve" smooth="yes" name="sh01"/>
       <point x="-20" y="584"/>
       <point x="116" y="781"/>
       <point x="367" y="920" type="curve"/>
@@ -19,16 +19,16 @@
       <point x="324" y="1026" type="curve" smooth="yes"/>
       <point x="315" y="1061"/>
       <point x="309" y="1092"/>
-      <point x="309" y="1135" type="curve" name="ah01" smooth="yes"/>
+      <point x="309" y="1135" type="curve" smooth="yes" name="ah01"/>
       <point x="309" y="1247"/>
       <point x="349" y="1345"/>
       <point x="432" y="1416" type="curve" smooth="yes"/>
       <point x="512" y="1484"/>
       <point x="626" y="1520"/>
-      <point x="761" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="761" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="805" y="1520"/>
       <point x="848" y="1516"/>
-      <point x="889" y="1508" type="curve" name="at02" smooth="yes"/>
+      <point x="889" y="1508" type="curve" smooth="yes" name="at02"/>
       <point x="929" y="1500"/>
       <point x="969" y="1488"/>
       <point x="1008" y="1473" type="curve"/>
@@ -38,13 +38,13 @@
       <point x="870" y="1347" type="curve" smooth="yes"/>
       <point x="829" y="1360"/>
       <point x="782" y="1366"/>
-      <point x="738" y="1366" type="curve" name="sv01" smooth="yes"/>
+      <point x="738" y="1366" type="curve" smooth="yes" name="sv01"/>
       <point x="658" y="1366"/>
       <point x="596" y="1347"/>
       <point x="551" y="1309" type="curve" smooth="yes"/>
       <point x="506" y="1270"/>
       <point x="483" y="1217"/>
-      <point x="483" y="1157" type="curve" name="sh02" smooth="yes"/>
+      <point x="483" y="1157" type="curve" smooth="yes" name="sh02"/>
       <point x="483" y="1126"/>
       <point x="489" y="1092"/>
       <point x="505" y="1045" type="curve" smooth="yes"/>
@@ -70,12 +70,12 @@
       <point x="809" y="113" type="line"/>
       <point x="744" y="65"/>
       <point x="686" y="32"/>
-      <point x="614" y="7" type="curve" name="ab02" smooth="yes"/>
+      <point x="614" y="7" type="curve" smooth="yes" name="ab02"/>
       <point x="547" y="-17"/>
       <point x="478" y="-29"/>
     </contour>
     <contour>
-      <point x="456" y="129" type="curve" name="dv02" smooth="yes"/>
+      <point x="456" y="129" type="curve" smooth="yes" name="dv02"/>
       <point x="504" y="129"/>
       <point x="548" y="139"/>
       <point x="597" y="158" type="curve" smooth="yes"/>
@@ -88,7 +88,7 @@
       <point x="228" y="624" type="curve" smooth="yes"/>
       <point x="181" y="557"/>
       <point x="158" y="483"/>
-      <point x="158" y="411" type="curve" name="sh03" smooth="yes"/>
+      <point x="158" y="411" type="curve" smooth="yes" name="sh03"/>
       <point x="158" y="324"/>
       <point x="191" y="257"/>
       <point x="243" y="209" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/angle.glif b/source/Hack-Italic.ufo/glyphs/angle.glif
index 3e37e3fea..15ed0c692 100644
--- a/source/Hack-Italic.ufo/glyphs/angle.glif
+++ b/source/Hack-Italic.ufo/glyphs/angle.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="angle" format="1">
+<glyph name="angle" format="2">
   <advance width="1233"/>
   <unicode hex="2220"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/aogonek.glif b/source/Hack-Italic.ufo/glyphs/aogonek.glif
index f27e182a7..4e5ed78e9 100644
--- a/source/Hack-Italic.ufo/glyphs/aogonek.glif
+++ b/source/Hack-Italic.ufo/glyphs/aogonek.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="aogonek" format="1">
+<glyph name="aogonek" format="2">
   <advance width="1233"/>
   <unicode hex="0105"/>
   <outline>
@@ -7,20 +7,20 @@
       <point x="868" y="0" type="line" name="ab01"/>
       <point x="787" y="-77"/>
       <point x="743" y="-144"/>
-      <point x="743" y="-200" type="curve" name="dh04" smooth="yes"/>
+      <point x="743" y="-200" type="curve" smooth="yes" name="dh04"/>
       <point x="743" y="-247"/>
       <point x="775" y="-272"/>
-      <point x="839" y="-272" type="curve" name="dv02" smooth="yes"/>
+      <point x="839" y="-272" type="curve" smooth="yes" name="dv02"/>
       <point x="878" y="-272"/>
       <point x="923" y="-262"/>
       <point x="966" y="-242" type="curve" name="ih01"/>
       <point x="941" y="-375" type="line"/>
       <point x="895" y="-388"/>
       <point x="849" y="-395"/>
-      <point x="802" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="802" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="671" y="-395"/>
       <point x="597" y="-338"/>
-      <point x="597" y="-245" type="curve" name="dh03" smooth="yes"/>
+      <point x="597" y="-245" type="curve" smooth="yes" name="dh03"/>
       <point x="597" y="-170"/>
       <point x="645" y="-93"/>
       <point x="749" y="0" type="curve" name="hr01"/>
@@ -28,10 +28,10 @@
       <point x="786" y="166" type="line" name="iv01"/>
       <point x="690" y="42"/>
       <point x="561" y="-29"/>
-      <point x="404" y="-29" type="curve" name="dv03" smooth="yes"/>
+      <point x="404" y="-29" type="curve" smooth="yes" name="dv03"/>
       <point x="203" y="-29"/>
       <point x="72" y="90"/>
-      <point x="72" y="283" type="curve" name="dh01" smooth="yes"/>
+      <point x="72" y="283" type="curve" smooth="yes" name="dh01"/>
       <point x="72" y="534"/>
       <point x="293" y="707"/>
       <point x="645" y="707" type="curve" smooth="yes"/>
@@ -39,27 +39,27 @@
       <point x="903" y="768" type="line" smooth="yes"/>
       <point x="906" y="780"/>
       <point x="907" y="794"/>
-      <point x="907" y="807" type="curve" name="dh05" smooth="yes"/>
+      <point x="907" y="807" type="curve" smooth="yes" name="dh05"/>
       <point x="907" y="932"/>
       <point x="821" y="991"/>
-      <point x="665" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="665" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="548" y="991"/>
       <point x="416" y="957"/>
       <point x="268" y="889" type="curve" name="sh02"/>
       <point x="303" y="1069" type="line"/>
       <point x="448" y="1121"/>
       <point x="574" y="1147"/>
-      <point x="693" y="1147" type="curve" name="hr02" smooth="yes"/>
+      <point x="693" y="1147" type="curve" smooth="yes" name="hr02"/>
       <point x="942" y="1147"/>
       <point x="1087" y="1030"/>
-      <point x="1087" y="839" type="curve" name="dh06" smooth="yes"/>
+      <point x="1087" y="839" type="curve" smooth="yes" name="dh06"/>
       <point x="1087" y="794"/>
       <point x="1079" y="723"/>
-      <point x="1063" y="639" type="curve" name="hr03" smooth="yes"/>
+      <point x="1063" y="639" type="curve" smooth="yes" name="hr03"/>
       <point x="938" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="461" y="125" type="curve" name="dv04" smooth="yes"/>
+      <point x="461" y="125" type="curve" smooth="yes" name="dv04"/>
       <point x="640" y="125"/>
       <point x="805" y="269"/>
       <point x="856" y="522" type="curve" smooth="yes"/>
@@ -70,7 +70,7 @@
       <point x="414" y="530" type="curve" smooth="yes"/>
       <point x="323" y="491"/>
       <point x="264" y="411"/>
-      <point x="264" y="307" type="curve" name="dh02" smooth="yes"/>
+      <point x="264" y="307" type="curve" smooth="yes" name="dh02"/>
       <point x="264" y="195"/>
       <point x="334" y="125"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/approxequal.glif b/source/Hack-Italic.ufo/glyphs/approxequal.glif
index d1db4cbc6..b254886eb 100644
--- a/source/Hack-Italic.ufo/glyphs/approxequal.glif
+++ b/source/Hack-Italic.ufo/glyphs/approxequal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="approxequal" format="1">
+<glyph name="approxequal" format="2">
   <advance width="1233"/>
   <unicode hex="2248"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="239" y="936" type="curve" smooth="yes"/>
       <point x="287" y="955"/>
       <point x="335" y="963"/>
-      <point x="407" y="963" type="curve" name="hr01" smooth="yes"/>
+      <point x="407" y="963" type="curve" smooth="yes" name="hr01"/>
       <point x="430" y="963"/>
       <point x="448" y="962"/>
       <point x="498" y="951" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="655" y="894" type="curve" smooth="yes"/>
       <point x="718" y="863"/>
       <point x="798" y="840"/>
-      <point x="866" y="840" type="curve" name="hr02" smooth="yes"/>
+      <point x="866" y="840" type="curve" smooth="yes" name="hr02"/>
       <point x="911" y="840"/>
       <point x="957" y="850"/>
       <point x="1003" y="870" type="curve" smooth="yes"/>
@@ -35,7 +35,7 @@
       <point x="999" y="702" type="curve" smooth="yes"/>
       <point x="955" y="685"/>
       <point x="907" y="674"/>
-      <point x="850" y="674" type="curve" name="hr04" smooth="yes"/>
+      <point x="850" y="674" type="curve" smooth="yes" name="hr04"/>
       <point x="770" y="674"/>
       <point x="714" y="696"/>
       <point x="645" y="725" type="curve"/>
@@ -47,10 +47,10 @@
       <point x="484" y="785" type="curve" smooth="yes"/>
       <point x="449" y="793"/>
       <point x="415" y="797"/>
-      <point x="382" y="797" type="curve" name="hr05" smooth="yes"/>
+      <point x="382" y="797" type="curve" smooth="yes" name="hr05"/>
       <point x="327" y="797"/>
       <point x="275" y="787"/>
-      <point x="232" y="768" type="curve" name="hr06" smooth="yes"/>
+      <point x="232" y="768" type="curve" smooth="yes" name="hr06"/>
       <point x="187" y="749"/>
       <point x="137" y="717"/>
       <point x="88" y="674" type="curve"/>
@@ -62,7 +62,7 @@
       <point x="240" y="569" type="curve" smooth="yes"/>
       <point x="283" y="585"/>
       <point x="337" y="596"/>
-      <point x="392" y="596" type="curve" name="hr07" smooth="yes"/>
+      <point x="392" y="596" type="curve" smooth="yes" name="hr07"/>
       <point x="459" y="596"/>
       <point x="535" y="578"/>
       <point x="621" y="541" type="curve"/>
@@ -70,7 +70,7 @@
       <point x="655" y="526" type="line" smooth="yes"/>
       <point x="735" y="490"/>
       <point x="794" y="471"/>
-      <point x="862" y="471" type="curve" name="hr08" smooth="yes"/>
+      <point x="862" y="471" type="curve" smooth="yes" name="hr08"/>
       <point x="917" y="471"/>
       <point x="958" y="483"/>
       <point x="1001" y="502" type="curve" smooth="yes"/>
@@ -83,7 +83,7 @@
       <point x="999" y="333" type="curve" smooth="yes"/>
       <point x="951" y="314"/>
       <point x="899" y="305"/>
-      <point x="851" y="305" type="curve" name="hr10" smooth="yes"/>
+      <point x="851" y="305" type="curve" smooth="yes" name="hr10"/>
       <point x="786" y="305"/>
       <point x="721" y="321"/>
       <point x="645" y="356" type="curve" smooth="yes"/>
@@ -93,10 +93,10 @@
       <point x="480" y="419" type="curve" smooth="yes"/>
       <point x="455" y="426"/>
       <point x="414" y="430"/>
-      <point x="379" y="430" type="curve" name="hr11" smooth="yes"/>
+      <point x="379" y="430" type="curve" smooth="yes" name="hr11"/>
       <point x="328" y="430"/>
       <point x="280" y="420"/>
-      <point x="233" y="400" type="curve" name="hr12" smooth="yes"/>
+      <point x="233" y="400" type="curve" smooth="yes" name="hr12"/>
       <point x="186" y="380"/>
       <point x="137" y="348"/>
       <point x="88" y="305" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/aring.glif b/source/Hack-Italic.ufo/glyphs/aring.glif
index 361976590..a95a23aea 100644
--- a/source/Hack-Italic.ufo/glyphs/aring.glif
+++ b/source/Hack-Italic.ufo/glyphs/aring.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="aring" format="1">
+<glyph name="aring" format="2">
   <advance width="1233"/>
   <unicode hex="00E5"/>
   <outline>
     <contour>
-      <point x="782" y="1321" type="curve" name="dv05" smooth="yes"/>
+      <point x="782" y="1321" type="curve" smooth="yes" name="dv05"/>
       <point x="706" y="1321"/>
       <point x="641" y="1348"/>
       <point x="588" y="1401" type="curve" smooth="yes"/>
       <point x="535" y="1454"/>
       <point x="508" y="1519"/>
-      <point x="508" y="1595" type="curve" name="dh03" smooth="yes"/>
+      <point x="508" y="1595" type="curve" smooth="yes" name="dh03"/>
       <point x="508" y="1672"/>
       <point x="535" y="1738"/>
       <point x="588" y="1791" type="curve" smooth="yes"/>
       <point x="641" y="1844"/>
       <point x="705" y="1870"/>
-      <point x="782" y="1870" type="curve" name="dv04" smooth="yes"/>
+      <point x="782" y="1870" type="curve" smooth="yes" name="dv04"/>
       <point x="859" y="1870"/>
       <point x="924" y="1844"/>
       <point x="977" y="1791" type="curve" smooth="yes"/>
@@ -30,30 +30,30 @@
       <point x="859" y="1321"/>
     </contour>
     <contour>
-      <point x="782" y="1444" type="curve" name="dv06" smooth="yes"/>
+      <point x="782" y="1444" type="curve" smooth="yes" name="dv06"/>
       <point x="867" y="1444"/>
       <point x="934" y="1511"/>
       <point x="934" y="1595" type="curve" smooth="yes"/>
       <point x="934" y="1680"/>
       <point x="867" y="1747"/>
-      <point x="782" y="1747" type="curve" name="dv03" smooth="yes"/>
+      <point x="782" y="1747" type="curve" smooth="yes" name="dv03"/>
       <point x="739" y="1747"/>
       <point x="704" y="1733"/>
       <point x="675" y="1704" type="curve" smooth="yes"/>
       <point x="646" y="1675"/>
       <point x="631" y="1638"/>
-      <point x="631" y="1595" type="curve" name="hr01" smooth="yes"/>
+      <point x="631" y="1595" type="curve" smooth="yes" name="hr01"/>
       <point x="631" y="1511"/>
       <point x="698" y="1444"/>
     </contour>
     <contour>
-      <point x="407" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="407" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="308" y="-29"/>
       <point x="225" y="-2"/>
       <point x="164" y="54" type="curve" smooth="yes"/>
       <point x="100" y="111"/>
       <point x="72" y="188"/>
-      <point x="72" y="280" type="curve" name="dh01" smooth="yes"/>
+      <point x="72" y="280" type="curve" smooth="yes" name="dh01"/>
       <point x="72" y="534"/>
       <point x="293" y="707"/>
       <point x="645" y="707" type="curve" smooth="yes"/>
@@ -68,7 +68,7 @@
       <point x="844" y="946" type="curve" smooth="yes"/>
       <point x="805" y="974"/>
       <point x="748" y="991"/>
-      <point x="665" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="665" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="608" y="991"/>
       <point x="546" y="983"/>
       <point x="479" y="966" type="curve" smooth="yes"/>
@@ -78,7 +78,7 @@
       <point x="303" y="1069" type="line"/>
       <point x="446" y="1122"/>
       <point x="577" y="1147"/>
-      <point x="693" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="693" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="816" y="1147"/>
       <point x="916" y="1121"/>
       <point x="985" y="1065" type="curve" smooth="yes"/>
@@ -101,7 +101,7 @@
       <point x="483" y="-29"/>
     </contour>
     <contour>
-      <point x="461" y="125" type="curve" name="dv02" smooth="yes"/>
+      <point x="461" y="125" type="curve" smooth="yes" name="dv02"/>
       <point x="557" y="125"/>
       <point x="640" y="161"/>
       <point x="711" y="232" type="curve" smooth="yes"/>
@@ -118,7 +118,7 @@
       <point x="305" y="442" type="curve" smooth="yes"/>
       <point x="278" y="401"/>
       <point x="264" y="356"/>
-      <point x="264" y="307" type="curve" name="dh02" smooth="yes"/>
+      <point x="264" y="307" type="curve" smooth="yes" name="dh02"/>
       <point x="264" y="243"/>
       <point x="288" y="201"/>
       <point x="316" y="174" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/arrowboth.glif b/source/Hack-Italic.ufo/glyphs/arrowboth.glif
index 579e9af35..a682509b7 100644
--- a/source/Hack-Italic.ufo/glyphs/arrowboth.glif
+++ b/source/Hack-Italic.ufo/glyphs/arrowboth.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowboth" format="1">
+<glyph name="arrowboth" format="2">
   <advance width="1233"/>
   <unicode hex="2194"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/arrowdblboth.glif b/source/Hack-Italic.ufo/glyphs/arrowdblboth.glif
index b2b312569..8d65e12c1 100644
--- a/source/Hack-Italic.ufo/glyphs/arrowdblboth.glif
+++ b/source/Hack-Italic.ufo/glyphs/arrowdblboth.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowdblboth" format="1">
+<glyph name="arrowdblboth" format="2">
   <advance width="1233"/>
   <unicode hex="21D4"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/arrowdbldown.glif b/source/Hack-Italic.ufo/glyphs/arrowdbldown.glif
index 3d57ac1b2..894acf78d 100644
--- a/source/Hack-Italic.ufo/glyphs/arrowdbldown.glif
+++ b/source/Hack-Italic.ufo/glyphs/arrowdbldown.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowdbldown" format="1">
+<glyph name="arrowdbldown" format="2">
   <advance width="1233"/>
   <unicode hex="21D3"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/arrowdblleft.glif b/source/Hack-Italic.ufo/glyphs/arrowdblleft.glif
index 6d3550a27..abca25d60 100644
--- a/source/Hack-Italic.ufo/glyphs/arrowdblleft.glif
+++ b/source/Hack-Italic.ufo/glyphs/arrowdblleft.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowdblleft" format="1">
+<glyph name="arrowdblleft" format="2">
   <advance width="1233"/>
   <unicode hex="21D0"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/arrowdblright.glif b/source/Hack-Italic.ufo/glyphs/arrowdblright.glif
index 7c0c7ef9d..5a557ebef 100644
--- a/source/Hack-Italic.ufo/glyphs/arrowdblright.glif
+++ b/source/Hack-Italic.ufo/glyphs/arrowdblright.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowdblright" format="1">
+<glyph name="arrowdblright" format="2">
   <advance width="1233"/>
   <unicode hex="21D2"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/arrowdblup.glif b/source/Hack-Italic.ufo/glyphs/arrowdblup.glif
index f5e947b63..e25b57598 100644
--- a/source/Hack-Italic.ufo/glyphs/arrowdblup.glif
+++ b/source/Hack-Italic.ufo/glyphs/arrowdblup.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowdblup" format="1">
+<glyph name="arrowdblup" format="2">
   <advance width="1233"/>
   <unicode hex="21D1"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/arrowdown.glif b/source/Hack-Italic.ufo/glyphs/arrowdown.glif
index 56d9f1a7b..1bf71f83e 100644
--- a/source/Hack-Italic.ufo/glyphs/arrowdown.glif
+++ b/source/Hack-Italic.ufo/glyphs/arrowdown.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowdown" format="1">
+<glyph name="arrowdown" format="2">
   <advance width="1233"/>
   <unicode hex="2193"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/arrowleft.glif b/source/Hack-Italic.ufo/glyphs/arrowleft.glif
index 9acc9edb5..fcae395a4 100644
--- a/source/Hack-Italic.ufo/glyphs/arrowleft.glif
+++ b/source/Hack-Italic.ufo/glyphs/arrowleft.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowleft" format="1">
+<glyph name="arrowleft" format="2">
   <advance width="1233"/>
   <unicode hex="2190"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/arrowright.glif b/source/Hack-Italic.ufo/glyphs/arrowright.glif
index bcc97f9c1..86d12a464 100644
--- a/source/Hack-Italic.ufo/glyphs/arrowright.glif
+++ b/source/Hack-Italic.ufo/glyphs/arrowright.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowright" format="1">
+<glyph name="arrowright" format="2">
   <advance width="1233"/>
   <unicode hex="2192"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/arrowup.glif b/source/Hack-Italic.ufo/glyphs/arrowup.glif
index 4d5cf67e5..fb5330471 100644
--- a/source/Hack-Italic.ufo/glyphs/arrowup.glif
+++ b/source/Hack-Italic.ufo/glyphs/arrowup.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowup" format="1">
+<glyph name="arrowup" format="2">
   <advance width="1233"/>
   <unicode hex="2191"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/arrowupdn.glif b/source/Hack-Italic.ufo/glyphs/arrowupdn.glif
index 2db0da577..73c605f8e 100644
--- a/source/Hack-Italic.ufo/glyphs/arrowupdn.glif
+++ b/source/Hack-Italic.ufo/glyphs/arrowupdn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowupdn" format="1">
+<glyph name="arrowupdn" format="2">
   <advance width="1233"/>
   <unicode hex="2195"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/arrowupdnbse.glif b/source/Hack-Italic.ufo/glyphs/arrowupdnbse.glif
index 9ebab81c0..db093e9ac 100644
--- a/source/Hack-Italic.ufo/glyphs/arrowupdnbse.glif
+++ b/source/Hack-Italic.ufo/glyphs/arrowupdnbse.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowupdnbse" format="1">
+<glyph name="arrowupdnbse" format="2">
   <advance width="1233"/>
   <unicode hex="21A8"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/asciicircum.glif b/source/Hack-Italic.ufo/glyphs/asciicircum.glif
index 9b7325077..91f231c12 100644
--- a/source/Hack-Italic.ufo/glyphs/asciicircum.glif
+++ b/source/Hack-Italic.ufo/glyphs/asciicircum.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="asciicircum" format="1">
+<glyph name="asciicircum" format="2">
   <advance width="1233"/>
   <unicode hex="005E"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/asciitilde.glif b/source/Hack-Italic.ufo/glyphs/asciitilde.glif
index 2c2a98ec4..ef85e23d3 100644
--- a/source/Hack-Italic.ufo/glyphs/asciitilde.glif
+++ b/source/Hack-Italic.ufo/glyphs/asciitilde.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="asciitilde" format="1">
+<glyph name="asciitilde" format="2">
   <advance width="1233"/>
   <unicode hex="007E"/>
   <outline>
@@ -44,7 +44,7 @@
       <point x="649" y="679" type="curve" smooth="yes"/>
       <point x="685" y="630"/>
       <point x="720" y="588"/>
-      <point x="754" y="554" type="curve" name="hr01" smooth="yes"/>
+      <point x="754" y="554" type="curve" smooth="yes" name="hr01"/>
       <point x="782" y="525"/>
       <point x="809" y="510"/>
       <point x="842" y="510" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/asterisk.glif b/source/Hack-Italic.ufo/glyphs/asterisk.glif
index ae25225ac..c473e3f21 100644
--- a/source/Hack-Italic.ufo/glyphs/asterisk.glif
+++ b/source/Hack-Italic.ufo/glyphs/asterisk.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="asterisk" format="1">
+<glyph name="asterisk" format="2">
   <advance width="1233"/>
   <unicode hex="002A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/asteriskmath.glif b/source/Hack-Italic.ufo/glyphs/asteriskmath.glif
index 7a17e9143..dc2a1e93a 100644
--- a/source/Hack-Italic.ufo/glyphs/asteriskmath.glif
+++ b/source/Hack-Italic.ufo/glyphs/asteriskmath.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="asteriskmath" format="1">
+<glyph name="asteriskmath" format="2">
   <advance width="1233"/>
   <unicode hex="2217"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/at.glif b/source/Hack-Italic.ufo/glyphs/at.glif
index c34713bfa..a36f8d406 100644
--- a/source/Hack-Italic.ufo/glyphs/at.glif
+++ b/source/Hack-Italic.ufo/glyphs/at.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="at" format="1">
+<glyph name="at" format="2">
   <advance width="1233"/>
   <unicode hex="0040"/>
   <outline>
     <contour>
-      <point x="607" y="-317" type="curve" name="hr00" smooth="yes"/>
+      <point x="607" y="-317" type="curve" smooth="yes" name="hr00"/>
       <point x="406" y="-317"/>
       <point x="251" y="-246"/>
       <point x="144" y="-129" type="curve" smooth="yes"/>
       <point x="28" y="-2"/>
       <point x="-29" y="175"/>
-      <point x="-29" y="379" type="curve" name="dh01" smooth="yes"/>
+      <point x="-29" y="379" type="curve" smooth="yes" name="dh01"/>
       <point x="-29" y="508"/>
       <point x="-6" y="644"/>
       <point x="43" y="781" type="curve" smooth="yes"/>
@@ -22,13 +22,13 @@
       <point x="495" y="1326" type="curve" smooth="yes"/>
       <point x="591" y="1373"/>
       <point x="695" y="1397"/>
-      <point x="800" y="1397" type="curve" name="dv03" smooth="yes"/>
+      <point x="800" y="1397" type="curve" smooth="yes" name="dv03"/>
       <point x="927" y="1397"/>
       <point x="1029" y="1362"/>
       <point x="1102" y="1294" type="curve" smooth="yes"/>
       <point x="1178" y="1223"/>
       <point x="1214" y="1127"/>
-      <point x="1214" y="1015" type="curve" name="dh06" smooth="yes"/>
+      <point x="1214" y="1015" type="curve" smooth="yes" name="dh06"/>
       <point x="1214" y="974"/>
       <point x="1209" y="920"/>
       <point x="1196" y="858" type="curve"/>
@@ -40,32 +40,32 @@
       <point x="814" y="149" type="curve" smooth="yes"/>
       <point x="767" y="126"/>
       <point x="715" y="115"/>
-      <point x="662" y="115" type="curve" name="dv04" smooth="yes"/>
+      <point x="662" y="115" type="curve" smooth="yes" name="dv04"/>
       <point x="567" y="115"/>
       <point x="500" y="150"/>
       <point x="448" y="207" type="curve" smooth="yes"/>
       <point x="392" y="268"/>
       <point x="365" y="343"/>
-      <point x="365" y="451" type="curve" name="dh03" smooth="yes"/>
+      <point x="365" y="451" type="curve" smooth="yes" name="dh03"/>
       <point x="365" y="588"/>
       <point x="409" y="716"/>
       <point x="497" y="821" type="curve" smooth="yes"/>
       <point x="581" y="921"/>
       <point x="685" y="977"/>
-      <point x="810" y="977" type="curve" name="dv07" smooth="yes"/>
+      <point x="810" y="977" type="curve" smooth="yes" name="dv07"/>
       <point x="923" y="977"/>
       <point x="1016" y="925"/>
       <point x="1053" y="844" type="curve" name="ih02"/>
       <point x="1061" y="887" type="line" smooth="yes"/>
       <point x="1068" y="929"/>
       <point x="1073" y="968"/>
-      <point x="1073" y="993" type="curve" name="dh05" smooth="yes"/>
+      <point x="1073" y="993" type="curve" smooth="yes" name="dh05"/>
       <point x="1073" y="1072"/>
       <point x="1049" y="1138"/>
       <point x="1000" y="1185" type="curve" smooth="yes"/>
       <point x="951" y="1232"/>
       <point x="883" y="1255"/>
-      <point x="796" y="1255" type="curve" name="dv02" smooth="yes"/>
+      <point x="796" y="1255" type="curve" smooth="yes" name="dv02"/>
       <point x="700" y="1255"/>
       <point x="611" y="1228"/>
       <point x="524" y="1177" type="curve" smooth="yes"/>
@@ -77,13 +77,13 @@
       <point x="169" y="682" type="curve" smooth="yes"/>
       <point x="141" y="586"/>
       <point x="125" y="481"/>
-      <point x="125" y="377" type="curve" name="dh02" smooth="yes"/>
+      <point x="125" y="377" type="curve" smooth="yes" name="dh02"/>
       <point x="125" y="206"/>
       <point x="168" y="68"/>
       <point x="253" y="-29" type="curve" smooth="yes"/>
       <point x="337" y="-125"/>
       <point x="459" y="-176"/>
-      <point x="603" y="-176" type="curve" name="dv01" smooth="yes"/>
+      <point x="603" y="-176" type="curve" smooth="yes" name="dv01"/>
       <point x="643" y="-176"/>
       <point x="688" y="-172"/>
       <point x="725" y="-164" type="curve" smooth="yes"/>
@@ -98,7 +98,7 @@
       <point x="662" y="-317"/>
     </contour>
     <contour>
-      <point x="710" y="260" type="curve" name="dv05" smooth="yes"/>
+      <point x="710" y="260" type="curve" smooth="yes" name="dv05"/>
       <point x="794" y="260"/>
       <point x="867" y="299"/>
       <point x="922" y="366" type="curve" smooth="yes"/>
@@ -110,10 +110,10 @@
       <point x="958" y="774" type="curve" smooth="yes"/>
       <point x="925" y="811"/>
       <point x="879" y="829"/>
-      <point x="820" y="829" type="curve" name="dv06" smooth="yes"/>
+      <point x="820" y="829" type="curve" smooth="yes" name="dv06"/>
       <point x="657" y="829"/>
       <point x="524" y="669"/>
-      <point x="524" y="474" type="curve" name="dh04" smooth="yes"/>
+      <point x="524" y="474" type="curve" smooth="yes" name="dh04"/>
       <point x="524" y="410"/>
       <point x="539" y="354"/>
       <point x="574" y="315" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/atilde.glif b/source/Hack-Italic.ufo/glyphs/atilde.glif
index 3abfd8190..32eda220a 100644
--- a/source/Hack-Italic.ufo/glyphs/atilde.glif
+++ b/source/Hack-Italic.ufo/glyphs/atilde.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="atilde" format="1">
+<glyph name="atilde" format="2">
   <advance width="1233"/>
   <unicode hex="00E3"/>
   <outline>
     <contour>
-      <point x="894" y="1297" type="curve" name="sv01" smooth="yes"/>
+      <point x="894" y="1297" type="curve" smooth="yes" name="sv01"/>
       <point x="865" y="1297"/>
       <point x="840" y="1302"/>
       <point x="818" y="1312" type="curve" smooth="yes"/>
@@ -30,7 +30,7 @@
       <point x="479" y="1508" type="curve" smooth="yes"/>
       <point x="517" y="1557"/>
       <point x="566" y="1581"/>
-      <point x="626" y="1581" type="curve" name="dv04" smooth="yes"/>
+      <point x="626" y="1581" type="curve" smooth="yes" name="dv04"/>
       <point x="655" y="1581"/>
       <point x="680" y="1576"/>
       <point x="702" y="1566" type="curve" smooth="yes"/>
@@ -40,7 +40,7 @@
       <point x="821" y="1465" type="line" smooth="yes"/>
       <point x="840" y="1446"/>
       <point x="843" y="1443"/>
-      <point x="858" y="1435" type="curve" name="hr01" smooth="yes"/>
+      <point x="858" y="1435" type="curve" smooth="yes" name="hr01"/>
       <point x="869" y="1429"/>
       <point x="880" y="1426"/>
       <point x="892" y="1426" type="curve" smooth="yes"/>
@@ -52,13 +52,13 @@
       <point x="1014" y="1297"/>
     </contour>
     <contour>
-      <point x="407" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="407" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="308" y="-29"/>
       <point x="225" y="-2"/>
       <point x="164" y="54" type="curve" smooth="yes"/>
       <point x="100" y="111"/>
       <point x="72" y="188"/>
-      <point x="72" y="280" type="curve" name="dh01" smooth="yes"/>
+      <point x="72" y="280" type="curve" smooth="yes" name="dh01"/>
       <point x="72" y="534"/>
       <point x="293" y="707"/>
       <point x="645" y="707" type="curve" smooth="yes"/>
@@ -73,7 +73,7 @@
       <point x="844" y="946" type="curve" smooth="yes"/>
       <point x="805" y="974"/>
       <point x="748" y="991"/>
-      <point x="665" y="991" type="curve" name="sv03" smooth="yes"/>
+      <point x="665" y="991" type="curve" smooth="yes" name="sv03"/>
       <point x="608" y="991"/>
       <point x="546" y="983"/>
       <point x="479" y="966" type="curve" smooth="yes"/>
@@ -83,7 +83,7 @@
       <point x="303" y="1069" type="line"/>
       <point x="446" y="1122"/>
       <point x="577" y="1147"/>
-      <point x="693" y="1147" type="curve" name="hr02" smooth="yes"/>
+      <point x="693" y="1147" type="curve" smooth="yes" name="hr02"/>
       <point x="816" y="1147"/>
       <point x="916" y="1121"/>
       <point x="985" y="1065" type="curve" smooth="yes"/>
@@ -106,7 +106,7 @@
       <point x="483" y="-29"/>
     </contour>
     <contour>
-      <point x="461" y="125" type="curve" name="dv02" smooth="yes"/>
+      <point x="461" y="125" type="curve" smooth="yes" name="dv02"/>
       <point x="557" y="125"/>
       <point x="640" y="161"/>
       <point x="711" y="232" type="curve" smooth="yes"/>
@@ -123,7 +123,7 @@
       <point x="305" y="442" type="curve" smooth="yes"/>
       <point x="278" y="401"/>
       <point x="264" y="356"/>
-      <point x="264" y="307" type="curve" name="dh02" smooth="yes"/>
+      <point x="264" y="307" type="curve" smooth="yes" name="dh02"/>
       <point x="264" y="243"/>
       <point x="288" y="201"/>
       <point x="316" y="174" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/b.glif b/source/Hack-Italic.ufo/glyphs/b.glif
index e2bb814ae..d5e00356c 100644
--- a/source/Hack-Italic.ufo/glyphs/b.glif
+++ b/source/Hack-Italic.ufo/glyphs/b.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="b" format="1">
+<glyph name="b" format="2">
   <advance width="1233"/>
   <unicode hex="0062"/>
   <outline>
@@ -38,9 +38,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/backslash.glif b/source/Hack-Italic.ufo/glyphs/backslash.glif
index 055f57ac5..f7e847f48 100644
--- a/source/Hack-Italic.ufo/glyphs/backslash.glif
+++ b/source/Hack-Italic.ufo/glyphs/backslash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="backslash" format="1">
+<glyph name="backslash" format="2">
   <advance width="1233"/>
   <unicode hex="005C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/bar.glif b/source/Hack-Italic.ufo/glyphs/bar.glif
index 58db8a601..81720854f 100644
--- a/source/Hack-Italic.ufo/glyphs/bar.glif
+++ b/source/Hack-Italic.ufo/glyphs/bar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="bar" format="1">
+<glyph name="bar" format="2">
   <advance width="1233"/>
   <unicode hex="007C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/beta.glif b/source/Hack-Italic.ufo/glyphs/beta.glif
index 5a76815bf..c1082ec2b 100644
--- a/source/Hack-Italic.ufo/glyphs/beta.glif
+++ b/source/Hack-Italic.ufo/glyphs/beta.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="beta" format="1">
+<glyph name="beta" format="2">
   <advance width="1233"/>
   <unicode hex="03B2"/>
   <outline>
@@ -7,25 +7,25 @@
       <point x="258" y="1113" type="line" name="hr00"/>
       <point x="320" y="1434"/>
       <point x="552" y="1574"/>
-      <point x="761" y="1574" type="curve" name="at01" smooth="yes"/>
+      <point x="761" y="1574" type="curve" smooth="yes" name="at01"/>
       <point x="958" y="1574"/>
       <point x="1136" y="1451"/>
-      <point x="1136" y="1240" type="curve" name="sh01" smooth="yes"/>
+      <point x="1136" y="1240" type="curve" smooth="yes" name="sh01"/>
       <point x="1136" y="1221"/>
       <point x="1135" y="1203"/>
-      <point x="1132" y="1184" type="curve" name="sh02" smooth="yes"/>
+      <point x="1132" y="1184" type="curve" smooth="yes" name="sh02"/>
       <point x="1111" y="1034"/>
       <point x="1012" y="869"/>
       <point x="887" y="810" type="curve" name="iv01"/>
       <point x="1039" y="779"/>
       <point x="1108" y="694"/>
-      <point x="1108" y="553" type="curve" name="dh02" smooth="yes"/>
+      <point x="1108" y="553" type="curve" smooth="yes" name="dh02"/>
       <point x="1108" y="522"/>
       <point x="1105" y="489"/>
       <point x="1098" y="453" type="curve" smooth="yes"/>
       <point x="1045" y="153"/>
       <point x="824" y="-21"/>
-      <point x="523" y="-21" type="curve" name="ab01" smooth="yes"/>
+      <point x="523" y="-21" type="curve" smooth="yes" name="ab01"/>
       <point x="438" y="-21"/>
       <point x="362" y="-8"/>
       <point x="240" y="69" type="curve" name="hr01"/>
@@ -36,32 +36,32 @@
       <point x="293" y="342" type="line"/>
       <point x="325" y="249"/>
       <point x="460" y="181"/>
-      <point x="596" y="181" type="curve" name="sv01" smooth="yes"/>
+      <point x="596" y="181" type="curve" smooth="yes" name="sv01"/>
       <point x="738" y="181"/>
       <point x="881" y="255"/>
-      <point x="910" y="450" type="curve" name="sh03" smooth="yes"/>
+      <point x="910" y="450" type="curve" smooth="yes" name="sh03"/>
       <point x="913" y="469"/>
       <point x="914" y="486"/>
-      <point x="914" y="502" type="curve" name="dh01" smooth="yes"/>
+      <point x="914" y="502" type="curve" smooth="yes" name="dh01"/>
       <point x="914" y="642"/>
       <point x="811" y="711"/>
-      <point x="561" y="711" type="curve" name="dv01" smooth="yes"/>
+      <point x="561" y="711" type="curve" smooth="yes" name="dv01"/>
       <point x="540" y="711"/>
       <point x="519" y="711"/>
       <point x="496" y="710" type="curve" name="sv02"/>
       <point x="529" y="880" type="line" name="sv03"/>
       <point x="538" y="880"/>
       <point x="547" y="879"/>
-      <point x="556" y="879" type="curve" name="dv02" smooth="yes"/>
+      <point x="556" y="879" type="curve" smooth="yes" name="dv02"/>
       <point x="684" y="879"/>
       <point x="779" y="919"/>
       <point x="846" y="979" type="curve"/>
       <point x="918" y="1042"/>
       <point x="952" y="1124"/>
-      <point x="952" y="1197" type="curve" name="hr02" smooth="yes"/>
+      <point x="952" y="1197" type="curve" smooth="yes" name="hr02"/>
       <point x="952" y="1317"/>
       <point x="854" y="1384"/>
-      <point x="745" y="1384" type="curve" name="sv04" smooth="yes"/>
+      <point x="745" y="1384" type="curve" smooth="yes" name="sv04"/>
       <point x="620" y="1384"/>
       <point x="479" y="1298"/>
       <point x="442" y="1107" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/block.glif b/source/Hack-Italic.ufo/glyphs/block.glif
index bf10efca1..89dc04bf7 100644
--- a/source/Hack-Italic.ufo/glyphs/block.glif
+++ b/source/Hack-Italic.ufo/glyphs/block.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="block" format="1">
+<glyph name="block" format="2">
   <advance width="1233"/>
   <unicode hex="2588"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/braceleft.glif b/source/Hack-Italic.ufo/glyphs/braceleft.glif
index df96d8519..fc94d1791 100644
--- a/source/Hack-Italic.ufo/glyphs/braceleft.glif
+++ b/source/Hack-Italic.ufo/glyphs/braceleft.glif
@@ -1,104 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="braceleft" format="1">
+<glyph name="braceleft" format="2">
   <advance width="1233"/>
   <unicode hex="007B"/>
   <outline>
     <contour>
-      <point x="685" y="-334" type="line" name="hr00" smooth="yes"/>
-      <point x="560" y="-334"/>
-      <point x="471" y="-316"/>
-      <point x="417" y="-280" type="curve" smooth="yes"/>
-      <point x="362" y="-243"/>
-      <point x="335" y="-184"/>
-      <point x="335" y="-102" type="curve" smooth="yes"/>
-      <point x="335" y="-89" type="line" name="dh01"/>
-      <point x="334" y="-70"/>
-      <point x="335" y="-60"/>
-      <point x="338" y="-37" type="curve" smooth="yes"/>
-      <point x="343" y="2"/>
-      <point x="346" y="19"/>
-      <point x="349" y="34" type="curve" smooth="yes"/>
-      <point x="394" y="270" type="line"/>
-      <point x="397" y="277"/>
-      <point x="396" y="279"/>
-      <point x="397" y="282" type="curve"/>
-      <point x="404" y="315"/>
-      <point x="407" y="339"/>
-      <point x="407" y="372" type="curve" smooth="yes"/>
-      <point x="407" y="437"/>
-      <point x="391" y="475"/>
-      <point x="358" y="500" type="curve" smooth="yes"/>
-      <point x="325" y="525"/>
-      <point x="271" y="537"/>
-      <point x="196" y="537" type="curve" name="dv02" smooth="yes"/>
-      <point x="104" y="537" type="line"/>
-      <point x="133" y="684" type="line"/>
-      <point x="224" y="684" type="line" name="dv03" smooth="yes"/>
-      <point x="321" y="684"/>
-      <point x="391" y="702"/>
-      <point x="432" y="739" type="curve" smooth="yes"/>
-      <point x="473" y="775"/>
-      <point x="504" y="843"/>
-      <point x="525" y="944" type="curve" smooth="yes"/>
-      <point x="575" y="1188" type="line" smooth="yes"/>
-      <point x="592" y="1271"/>
-      <point x="612" y="1335"/>
-      <point x="636" y="1382" type="curve" smooth="yes"/>
-      <point x="660" y="1429"/>
-      <point x="690" y="1466"/>
-      <point x="726" y="1493" type="curve" smooth="yes"/>
-      <point x="755" y="1514"/>
-      <point x="790" y="1531"/>
-      <point x="843" y="1542" type="curve" name="at01" smooth="yes"/>
-      <point x="888" y="1551"/>
-      <point x="952" y="1556"/>
-      <point x="1044" y="1556" type="curve" name="at02" smooth="yes"/>
-      <point x="1126" y="1556" type="line"/>
-      <point x="1097" y="1413" type="line" name="sv01"/>
-      <point x="1012" y="1413" type="line" smooth="yes"/>
-      <point x="920" y="1413"/>
-      <point x="867" y="1401"/>
-      <point x="836" y="1374" type="curve" smooth="yes"/>
-      <point x="803" y="1345"/>
-      <point x="778" y="1280"/>
-      <point x="759" y="1184" type="curve" smooth="yes"/>
-      <point x="708" y="932" type="line" smooth="yes"/>
-      <point x="688" y="832"/>
-      <point x="659" y="753"/>
-      <point x="615" y="700" type="curve" smooth="yes"/>
-      <point x="576" y="653"/>
-      <point x="519" y="621"/>
-      <point x="444" y="606" type="curve" name="ih01"/>
-      <point x="492" y="594"/>
-      <point x="530" y="571"/>
-      <point x="557" y="537" type="curve" smooth="yes"/>
-      <point x="584" y="502"/>
-      <point x="597" y="460"/>
-      <point x="597" y="410" type="curve"/>
-      <point x="598" y="393"/>
-      <point x="598" y="386"/>
-      <point x="594" y="353" type="curve" smooth="yes"/>
-      <point x="589" y="310"/>
-      <point x="588" y="315"/>
-      <point x="583" y="283" type="curve"/>
-      <point x="536" y="39" type="line" smooth="yes"/>
-      <point x="531" y="12"/>
-      <point x="529" y="-3"/>
-      <point x="528" y="-20" type="curve" name="dh02" smooth="yes"/>
-      <point x="525" y="-64"/>
-      <point x="525" y="-62"/>
-      <point x="525" y="-70" type="curve" name="sh01" smooth="yes"/>
-      <point x="525" y="-155"/>
-      <point x="579" y="-190"/>
-      <point x="708" y="-190" type="curve" name="dv01" smooth="yes"/>
-      <point x="786" y="-190" type="line"/>
-      <point x="757" y="-334" type="line" name="sv02"/>
+      <point x="685" y="-197" type="line" smooth="yes" name="hr00"/>
+      <point x="448.348" y="-197"/>
+      <point x="334.813" y="-121.782"/>
+      <point x="334.813" y="35" type="curve" smooth="yes"/>
+      <point x="334.813" y="60.9062" type="line" smooth="yes"/>
+      <point x="334.813" y="137.335"/>
+      <point x="352.985" y="218.611"/>
+      <point x="369.888" y="294.208" type="curve" smooth="yes"/>
+      <point x="374.057" y="312.856"/>
+      <point x="378.15" y="331.159"/>
+      <point x="381.873" y="348.958" type="curve" smooth="yes"/>
+      <point x="383.189" y="355.249"/>
+      <point x="384.533" y="361.535"/>
+      <point x="385.813" y="367.457" type="curve" smooth="yes"/>
+      <point x="402.09" y="442.749"/>
+      <point x="407" y="476.455"/>
+      <point x="407" y="508.548" type="curve" smooth="yes"/>
+      <point x="407" y="627.12"/>
+      <point x="339.982" y="674.436"/>
+      <point x="173.673" y="674.436" type="curve" smooth="yes"/>
+      <point x="113.539" y="674.436" type="line"/>
+      <point x="133" y="820.82" type="line"/>
+      <point x="179.473" y="820.82" type="line"/>
+      <point x="445.746" y="820.82"/>
+      <point x="505.737" y="882.822"/>
+      <point x="555.518" y="1209.46" type="curve" smooth="yes"/>
+      <point x="612.658" y="1584.4"/>
+      <point x="717.404" y="1693.34"/>
+      <point x="1020.75" y="1693.34" type="curve" smooth="yes"/>
+      <point x="1126" y="1693.34" type="line"/>
+      <point x="1097" y="1550" type="line" name="sv01"/>
+      <point x="1089.43" y="1550"/>
+      <point x="1082.04" y="1550.14"/>
+      <point x="1074.5" y="1550.28" type="curve" smooth="yes"/>
+      <point x="1066.64" y="1550.42"/>
+      <point x="1058.62" y="1550.57"/>
+      <point x="1040.88" y="1550.57" type="curve" smooth="yes"/>
+      <point x="828.319" y="1550.57"/>
+      <point x="801.192" y="1529.17"/>
+      <point x="759" y="1321" type="curve" smooth="yes"/>
+      <point x="708" y="1069" type="line" smooth="yes"/>
+      <point x="666.714" y="865.644"/>
+      <point x="591.127" y="772.307"/>
+      <point x="444" y="743" type="curve" name="ih01"/>
+      <point x="546.517" y="717.478"/>
+      <point x="597.556" y="646.351"/>
+      <point x="597.556" y="529.008" type="curve" smooth="yes"/>
+      <point x="597.556" y="456.444"/>
+      <point x="578.054" y="377.99"/>
+      <point x="559.272" y="302.43" type="curve" smooth="yes"/>
+      <point x="541.825" y="232.245"/>
+      <point x="525" y="164.557"/>
+      <point x="525" y="108.178" type="curve" smooth="yes" name="sh01"/>
+      <point x="525" y="-53.6761"/>
+      <point x="663.668" y="-53.525"/>
+      <point x="782.945" y="-53.525" type="curve" smooth="yes"/>
+      <point x="786" y="-53.5241" type="line"/>
+      <point x="757" y="-197" type="line" name="sv02"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
+      <string>2018-06-05 19:08:37 +0000</string>
     </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/braceright.glif b/source/Hack-Italic.ufo/glyphs/braceright.glif
index 007efda9e..e8b064104 100644
--- a/source/Hack-Italic.ufo/glyphs/braceright.glif
+++ b/source/Hack-Italic.ufo/glyphs/braceright.glif
@@ -1,98 +1,74 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="braceright" format="1">
+<glyph name="braceright" format="2">
   <advance width="1233"/>
   <unicode hex="007D"/>
   <outline>
     <contour>
-      <point x="64" y="-190" type="line" name="hr00"/>
-      <point x="142" y="-190" type="line" name="dv02" smooth="yes"/>
-      <point x="233" y="-190"/>
-      <point x="294" y="-177"/>
-      <point x="325" y="-150" type="curve" smooth="yes"/>
-      <point x="354" y="-125"/>
-      <point x="379" y="-70"/>
-      <point x="402" y="39" type="curve" smooth="yes"/>
-      <point x="453" y="291" type="line" smooth="yes"/>
-      <point x="473" y="391"/>
-      <point x="501" y="469"/>
-      <point x="546" y="524" type="curve" smooth="yes"/>
-      <point x="587" y="573"/>
-      <point x="644" y="603"/>
-      <point x="718" y="616" type="curve" name="ih01"/>
-      <point x="669" y="629"/>
-      <point x="631" y="653"/>
-      <point x="604" y="686" type="curve" smooth="yes"/>
-      <point x="577" y="721"/>
-      <point x="564" y="757"/>
-      <point x="564" y="813" type="curve" name="dh01" smooth="yes"/>
-      <point x="564" y="829"/>
-      <point x="565" y="846"/>
-      <point x="568" y="870" type="curve" name="sh01" smooth="yes"/>
-      <point x="571" y="898"/>
-      <point x="571" y="909"/>
-      <point x="578" y="940" type="curve"/>
-      <point x="625" y="1183" type="line" name="sh02"/>
-      <point x="625" y="1188"/>
-      <point x="634" y="1239"/>
-      <point x="634" y="1243" type="curve" name="sh03"/>
-      <point x="635" y="1259"/>
-      <point x="636" y="1278"/>
-      <point x="636" y="1290" type="curve" name="ih02" smooth="yes"/>
-      <point x="636" y="1334"/>
-      <point x="622" y="1366"/>
-      <point x="594" y="1385" type="curve" smooth="yes"/>
-      <point x="565" y="1404"/>
-      <point x="518" y="1413"/>
-      <point x="453" y="1413" type="curve" name="sv01" smooth="yes"/>
-      <point x="376" y="1413" type="line"/>
-      <point x="402" y="1556" type="line" name="at01"/>
-      <point x="476" y="1556" type="line" name="hr01"/>
-      <point x="739" y="1546"/>
-      <point x="817" y="1505"/>
-      <point x="826" y="1320" type="curve" name="sh04"/>
-      <point x="826" y="1301"/>
-      <point x="825" y="1288"/>
-      <point x="822" y="1259" type="curve" name="sh05" smooth="yes"/>
-      <point x="819" y="1234"/>
-      <point x="819" y="1223"/>
-      <point x="812" y="1188" type="curve" smooth="yes"/>
-      <point x="767" y="952" type="line"/>
-      <point x="765" y="940" type="line" smooth="yes"/>
-      <point x="758" y="907"/>
-      <point x="755" y="876"/>
-      <point x="755" y="849" type="curve" name="dh02" smooth="yes"/>
-      <point x="755" y="730"/>
-      <point x="816" y="686"/>
-      <point x="965" y="686" type="curve" smooth="yes"/>
-      <point x="1057" y="686" type="line" name="dv04"/>
-      <point x="1028" y="539" type="line" name="dv03"/>
-      <point x="937" y="539" type="line" name="hr02" smooth="yes"/>
-      <point x="842" y="539"/>
-      <point x="773" y="521"/>
-      <point x="730" y="484" type="curve" smooth="yes"/>
-      <point x="687" y="448"/>
-      <point x="654" y="383"/>
-      <point x="634" y="279" type="curve" smooth="yes"/>
-      <point x="587" y="35" type="line" smooth="yes"/>
-      <point x="571" y="-49"/>
-      <point x="549" y="-113"/>
-      <point x="525" y="-160" type="curve" smooth="yes"/>
-      <point x="501" y="-207"/>
-      <point x="471" y="-244"/>
-      <point x="435" y="-270" type="curve" smooth="yes"/>
-      <point x="402" y="-294"/>
-      <point x="366" y="-308"/>
-      <point x="319" y="-319" type="curve" smooth="yes"/>
-      <point x="273" y="-329"/>
-      <point x="206" y="-334"/>
-      <point x="118" y="-334" type="curve" name="dv01" smooth="yes"/>
-      <point x="36" y="-334" type="line"/>
+      <point x="64" y="-53.308" type="line" name="hr00"/>
+      <point x="131.086" y="-53.308" type="line"/>
+      <point x="326.723" y="-53.308"/>
+      <point x="362.875" y="-16.4804"/>
+      <point x="402" y="176" type="curve" smooth="yes"/>
+      <point x="453" y="428" type="line" smooth="yes"/>
+      <point x="495.097" y="635.883"/>
+      <point x="569.331" y="726.925"/>
+      <point x="718" y="753" type="curve" name="ih01"/>
+      <point x="614.717" y="780.365"/>
+      <point x="564" y="851.869"/>
+      <point x="564" y="970.121" type="curve" smooth="yes" name="dh01"/>
+      <point x="564" y="1042.82"/>
+      <point x="583.169" y="1119.38"/>
+      <point x="601.726" y="1193.49" type="curve" smooth="yes"/>
+      <point x="619.133" y="1263"/>
+      <point x="636" y="1330.36"/>
+      <point x="636" y="1390.37" type="curve" smooth="yes" name="ih02"/>
+      <point x="636" y="1537.01"/>
+      <point x="535.279" y="1550.25"/>
+      <point x="427.75" y="1550.25" type="curve" smooth="yes"/>
+      <point x="376" y="1550.25" type="line"/>
+      <point x="402" y="1693" type="line" name="at01"/>
+      <point x="476" y="1693" type="line" smooth="yes" name="hr01"/>
+      <point x="512.06" y="1693"/>
+      <point x="557.057" y="1689.83"/>
+      <point x="595.412" y="1684.68" type="curve" smooth="yes"/>
+      <point x="763.106" y="1662.18"/>
+      <point x="826" y="1598.92"/>
+      <point x="826" y="1455.23" type="curve" smooth="yes" name="sh04"/>
+      <point x="826" y="1369.55"/>
+      <point x="803.641" y="1264.22"/>
+      <point x="783.935" y="1171.39" type="curve" smooth="yes"/>
+      <point x="777.788" y="1142.43"/>
+      <point x="771.899" y="1114.69"/>
+      <point x="767.393" y="1091.06" type="curve" smooth="yes"/>
+      <point x="758.619" y="1045.05"/>
+      <point x="755" y="1014.15"/>
+      <point x="755" y="986.48" type="curve" smooth="yes" name="dh02"/>
+      <point x="755" y="835.647"/>
+      <point x="872.889" y="822.398"/>
+      <point x="986.295" y="822.398" type="curve" smooth="yes"/>
+      <point x="998.584" y="822.398"/>
+      <point x="1010.82" y="822.554"/>
+      <point x="1022.85" y="822.707" type="curve" smooth="yes"/>
+      <point x="1034.47" y="822.855"/>
+      <point x="1045.9" y="823"/>
+      <point x="1057" y="823" type="curve" name="dv04"/>
+      <point x="1028" y="676.285" type="line" name="dv03"/>
+      <point x="965.124" y="676.285" type="line" smooth="yes"/>
+      <point x="886.385" y="676.285"/>
+      <point x="791.239" y="673.291"/>
+      <point x="728.453" y="619.679" type="curve" smooth="yes"/>
+      <point x="652.949" y="555.208"/>
+      <point x="630.749" y="422.063"/>
+      <point x="607.489" y="282.567" type="curve" smooth="yes"/>
+      <point x="535.423" y="-149.642"/>
+      <point x="457.757" y="-197"/>
+      <point x="36" y="-197" type="curve"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
+      <string>2018-06-05 19:10:01 +0000</string>
     </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/bracketleft.glif b/source/Hack-Italic.ufo/glyphs/bracketleft.glif
index f11af1b02..6bfc2e55e 100644
--- a/source/Hack-Italic.ufo/glyphs/bracketleft.glif
+++ b/source/Hack-Italic.ufo/glyphs/bracketleft.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="bracketleft" format="1">
+<glyph name="bracketleft" format="2">
   <advance width="1233"/>
   <unicode hex="005B"/>
   <outline>
     <contour>
-      <point x="582" y="1636" type="line" name="hr00"/>
-      <point x="1206" y="1636" type="line" name="dv04"/>
-      <point x="1183" y="1493" type="line" name="dv03"/>
-      <point x="743" y="1493" type="line"/>
-      <point x="487" y="-127" type="line"/>
-      <point x="927" y="-127" type="line" name="dv02"/>
-      <point x="904" y="-270" type="line" name="dv01"/>
-      <point x="280" y="-270" type="line"/>
+      <point x="582" y="1700" type="line" name="hr00"/>
+      <point x="1206" y="1700" type="line" name="dv04"/>
+      <point x="1183" y="1557" type="line" name="dv03"/>
+      <point x="743" y="1557" type="line"/>
+      <point x="487" y="-63" type="line"/>
+      <point x="927" y="-63" type="line" name="dv02"/>
+      <point x="904" y="-206" type="line" name="dv01"/>
+      <point x="280" y="-206" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
+      <string>2018-06-05 19:10:44 +0000</string>
     </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/bracketright.glif b/source/Hack-Italic.ufo/glyphs/bracketright.glif
index 7e44fcd6c..e41fdae3e 100644
--- a/source/Hack-Italic.ufo/glyphs/bracketright.glif
+++ b/source/Hack-Italic.ufo/glyphs/bracketright.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="bracketright" format="1">
+<glyph name="bracketright" format="2">
   <advance width="1233"/>
   <unicode hex="005D"/>
   <outline>
     <contour>
-      <point x="266" y="-127" type="line" name="hr00"/>
-      <point x="706" y="-127" type="line" name="dv02"/>
-      <point x="962" y="1492" type="line" name="dv03"/>
-      <point x="522" y="1492" type="line"/>
-      <point x="545" y="1635" type="line"/>
-      <point x="1169" y="1635" type="line" name="dv04"/>
-      <point x="867" y="-270" type="line" name="dv01"/>
-      <point x="243" y="-270" type="line"/>
+      <point x="266" y="-62" type="line" name="hr00"/>
+      <point x="706" y="-62" type="line" name="dv02"/>
+      <point x="962" y="1557" type="line" name="dv03"/>
+      <point x="522" y="1557" type="line"/>
+      <point x="545" y="1700" type="line"/>
+      <point x="1169" y="1700" type="line" name="dv04"/>
+      <point x="867" y="-205" type="line" name="dv01"/>
+      <point x="243" y="-205" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
+      <string>2018-06-05 19:11:26 +0000</string>
     </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/breve.glif b/source/Hack-Italic.ufo/glyphs/breve.glif
index 712637fb8..ee3ea6f70 100644
--- a/source/Hack-Italic.ufo/glyphs/breve.glif
+++ b/source/Hack-Italic.ufo/glyphs/breve.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="breve" format="1">
+<glyph name="breve" format="2">
   <advance width="1233"/>
   <unicode hex="02D8"/>
   <outline>
     <contour>
-      <point x="748" y="1321" type="curve" name="dv01" smooth="yes"/>
+      <point x="748" y="1321" type="curve" smooth="yes" name="dv01"/>
       <point x="658" y="1321"/>
       <point x="589" y="1342"/>
       <point x="542" y="1385" type="curve" smooth="yes"/>
@@ -24,7 +24,7 @@
       <point x="636" y="1492" type="curve" smooth="yes"/>
       <point x="665" y="1469"/>
       <point x="707" y="1458"/>
-      <point x="764" y="1458" type="curve" name="hr02" smooth="yes"/>
+      <point x="764" y="1458" type="curve" smooth="yes" name="hr02"/>
       <point x="818" y="1458"/>
       <point x="862" y="1470"/>
       <point x="897" y="1495" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/brokenbar.glif b/source/Hack-Italic.ufo/glyphs/brokenbar.glif
index cb08926a1..3e6712bf7 100644
--- a/source/Hack-Italic.ufo/glyphs/brokenbar.glif
+++ b/source/Hack-Italic.ufo/glyphs/brokenbar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="brokenbar" format="1">
+<glyph name="brokenbar" format="2">
   <advance width="1233"/>
   <unicode hex="00A6"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/bullet.glif b/source/Hack-Italic.ufo/glyphs/bullet.glif
index 90cb00552..696b7e309 100644
--- a/source/Hack-Italic.ufo/glyphs/bullet.glif
+++ b/source/Hack-Italic.ufo/glyphs/bullet.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="bullet" format="1">
+<glyph name="bullet" format="2">
   <advance width="1233"/>
   <unicode hex="2022"/>
   <outline>
     <contour>
-      <point x="614" y="465" type="curve" name="hr00" smooth="yes"/>
+      <point x="614" y="465" type="curve" smooth="yes" name="hr00"/>
       <point x="533" y="465"/>
       <point x="460" y="495"/>
       <point x="404" y="551" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="404" y="972" type="curve" smooth="yes"/>
       <point x="456" y="1024"/>
       <point x="530" y="1057"/>
-      <point x="615" y="1057" type="curve" name="av01" smooth="yes"/>
+      <point x="615" y="1057" type="curve" smooth="yes" name="av01"/>
       <point x="699" y="1057"/>
       <point x="771" y="1027"/>
       <point x="827" y="972" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/c.glif b/source/Hack-Italic.ufo/glyphs/c.glif
index 0699e3267..6fdf11d59 100644
--- a/source/Hack-Italic.ufo/glyphs/c.glif
+++ b/source/Hack-Italic.ufo/glyphs/c.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c" format="1">
+<glyph name="c" format="2">
   <advance width="1233"/>
   <unicode hex="0063"/>
   <outline>
@@ -33,9 +33,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/c6459.glif b/source/Hack-Italic.ufo/glyphs/c6459.glif
index c0f07e839..fe091ece7 100644
--- a/source/Hack-Italic.ufo/glyphs/c6459.glif
+++ b/source/Hack-Italic.ufo/glyphs/c6459.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6459" format="1">
+<glyph name="c6459" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="449" y="1294" type="line" name="hr00" smooth="yes"/>
+      <point x="449" y="1294" type="line" smooth="yes" name="hr00"/>
       <point x="429" y="1294"/>
       <point x="418" y="1307"/>
       <point x="422" y="1327" type="curve" smooth="yes"/>
       <point x="450" y="1470" type="line"/>
       <point x="453" y="1488"/>
       <point x="463" y="1497"/>
-      <point x="482" y="1497" type="curve" name="at01" smooth="yes"/>
+      <point x="482" y="1497" type="curve" smooth="yes" name="at01"/>
       <point x="626" y="1497" type="line" smooth="yes"/>
       <point x="644" y="1497"/>
       <point x="653" y="1489"/>
@@ -24,14 +24,14 @@
       <point x="591" y="1294" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="840" y="1294" type="line" name="sv01" smooth="yes"/>
+      <point x="840" y="1294" type="line" smooth="yes" name="sv01"/>
       <point x="820" y="1294"/>
       <point x="809" y="1307"/>
       <point x="813" y="1327" type="curve" smooth="yes"/>
       <point x="841" y="1470" type="line"/>
       <point x="844" y="1488"/>
       <point x="854" y="1497"/>
-      <point x="873" y="1497" type="curve" name="at02" smooth="yes"/>
+      <point x="873" y="1497" type="curve" smooth="yes" name="at02"/>
       <point x="1016" y="1497" type="line" smooth="yes"/>
       <point x="1036" y="1497"/>
       <point x="1047" y="1484"/>
@@ -39,7 +39,7 @@
       <point x="1015" y="1321" type="line" smooth="yes"/>
       <point x="1012" y="1303"/>
       <point x="1001" y="1294"/>
-      <point x="983" y="1294" type="curve" name="sv02" smooth="yes"/>
+      <point x="983" y="1294" type="curve" smooth="yes" name="sv02"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Italic.ufo/glyphs/c6460.glif b/source/Hack-Italic.ufo/glyphs/c6460.glif
index 777dc17e7..0b34b0687 100644
--- a/source/Hack-Italic.ufo/glyphs/c6460.glif
+++ b/source/Hack-Italic.ufo/glyphs/c6460.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6460" format="1">
+<glyph name="c6460" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/c6461.glif b/source/Hack-Italic.ufo/glyphs/c6461.glif
index 4ed3b7c24..6d9c66818 100644
--- a/source/Hack-Italic.ufo/glyphs/c6461.glif
+++ b/source/Hack-Italic.ufo/glyphs/c6461.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6461" format="1">
+<glyph name="c6461" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
@@ -9,10 +9,10 @@
       <point x="488" y="1458" type="curve" smooth="yes"/>
       <point x="529" y="1495"/>
       <point x="578" y="1513"/>
-      <point x="633" y="1513" type="curve" name="at01" smooth="yes"/>
+      <point x="633" y="1513" type="curve" smooth="yes" name="at01"/>
       <point x="660" y="1513"/>
       <point x="679" y="1509"/>
-      <point x="700" y="1502" type="curve" name="at02" smooth="yes"/>
+      <point x="700" y="1502" type="curve" smooth="yes" name="at02"/>
       <point x="722" y="1495"/>
       <point x="744" y="1483"/>
       <point x="766" y="1466" type="curve" smooth="yes"/>
@@ -35,7 +35,7 @@
       <point x="1011" y="1349" type="curve" smooth="yes"/>
       <point x="972" y="1314"/>
       <point x="921" y="1294"/>
-      <point x="860" y="1294" type="curve" name="sv01" smooth="yes"/>
+      <point x="860" y="1294" type="curve" smooth="yes" name="sv01"/>
       <point x="833" y="1294"/>
       <point x="817" y="1298"/>
       <point x="798" y="1305" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/c6468.glif b/source/Hack-Italic.ufo/glyphs/c6468.glif
index 691088e9d..90dba5446 100644
--- a/source/Hack-Italic.ufo/glyphs/c6468.glif
+++ b/source/Hack-Italic.ufo/glyphs/c6468.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6468" format="1">
+<glyph name="c6468" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/c6470.glif b/source/Hack-Italic.ufo/glyphs/c6470.glif
index 4b454fcd3..c0dd5214c 100644
--- a/source/Hack-Italic.ufo/glyphs/c6470.glif
+++ b/source/Hack-Italic.ufo/glyphs/c6470.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6470" format="1">
+<glyph name="c6470" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/c6472.glif b/source/Hack-Italic.ufo/glyphs/c6472.glif
index 11284f2a9..6ab78a17f 100644
--- a/source/Hack-Italic.ufo/glyphs/c6472.glif
+++ b/source/Hack-Italic.ufo/glyphs/c6472.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6472" format="1">
+<glyph name="c6472" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/c6475.glif b/source/Hack-Italic.ufo/glyphs/c6475.glif
index 389992d8b..76b54d108 100644
--- a/source/Hack-Italic.ufo/glyphs/c6475.glif
+++ b/source/Hack-Italic.ufo/glyphs/c6475.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6475" format="1">
+<glyph name="c6475" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="731" y="1286" type="curve" name="dv01" smooth="yes"/>
+      <point x="731" y="1286" type="curve" smooth="yes" name="dv01"/>
       <point x="651" y="1286"/>
       <point x="588" y="1306"/>
       <point x="541" y="1347" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="621" y="1440" type="curve" smooth="yes"/>
       <point x="648" y="1421"/>
       <point x="683" y="1413"/>
-      <point x="738" y="1413" type="curve" name="hr01" smooth="yes"/>
+      <point x="738" y="1413" type="curve" smooth="yes" name="hr01"/>
       <point x="793" y="1413"/>
       <point x="840" y="1422"/>
       <point x="876" y="1441" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/c6476.glif b/source/Hack-Italic.ufo/glyphs/c6476.glif
index 08458f422..a8116b032 100644
--- a/source/Hack-Italic.ufo/glyphs/c6476.glif
+++ b/source/Hack-Italic.ufo/glyphs/c6476.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6476" format="1">
+<glyph name="c6476" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="654" y="1294" type="line" name="hr00" smooth="yes"/>
+      <point x="654" y="1294" type="line" smooth="yes" name="hr00"/>
       <point x="636" y="1294"/>
       <point x="627" y="1302"/>
       <point x="627" y="1318" type="curve" smooth="yes"/>
@@ -13,7 +13,7 @@
       <point x="657" y="1472" type="line"/>
       <point x="660" y="1490"/>
       <point x="670" y="1499"/>
-      <point x="689" y="1499" type="curve" name="at01" smooth="yes"/>
+      <point x="689" y="1499" type="curve" smooth="yes" name="at01"/>
       <point x="831" y="1499" type="line" smooth="yes"/>
       <point x="851" y="1499"/>
       <point x="862" y="1486"/>
@@ -21,7 +21,7 @@
       <point x="830" y="1321" type="line" smooth="yes"/>
       <point x="827" y="1303"/>
       <point x="816" y="1294"/>
-      <point x="798" y="1294" type="curve" name="sv01" smooth="yes"/>
+      <point x="798" y="1294" type="curve" smooth="yes" name="sv01"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Italic.ufo/glyphs/c6477.glif b/source/Hack-Italic.ufo/glyphs/c6477.glif
index c6d6cb280..e060f5091 100644
--- a/source/Hack-Italic.ufo/glyphs/c6477.glif
+++ b/source/Hack-Italic.ufo/glyphs/c6477.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6477" format="1">
+<glyph name="c6477" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/c6478.glif b/source/Hack-Italic.ufo/glyphs/c6478.glif
index 53a7b9721..a2c64f241 100644
--- a/source/Hack-Italic.ufo/glyphs/c6478.glif
+++ b/source/Hack-Italic.ufo/glyphs/c6478.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6478" format="1">
+<glyph name="c6478" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/cacute.glif b/source/Hack-Italic.ufo/glyphs/cacute.glif
index 98bfcd621..f3e491d89 100644
--- a/source/Hack-Italic.ufo/glyphs/cacute.glif
+++ b/source/Hack-Italic.ufo/glyphs/cacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="cacute" format="1">
+<glyph name="cacute" format="2">
   <advance width="1233"/>
   <unicode hex="0107"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="665" y="1297" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="607" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="607" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="454" y="-29"/>
       <point x="344" y="12"/>
       <point x="271" y="84" type="curve" smooth="yes"/>
       <point x="194" y="160"/>
       <point x="156" y="271"/>
-      <point x="156" y="412" type="curve" name="dh01" smooth="yes"/>
+      <point x="156" y="412" type="curve" smooth="yes" name="dh01"/>
       <point x="156" y="619"/>
       <point x="233" y="816"/>
       <point x="354" y="950" type="curve" smooth="yes"/>
@@ -25,7 +25,7 @@
       <point x="559" y="1098" type="curve" smooth="yes"/>
       <point x="632" y="1131"/>
       <point x="714" y="1147"/>
-      <point x="804" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="804" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="863" y="1147"/>
       <point x="920" y="1140"/>
       <point x="975" y="1126" type="curve" smooth="yes"/>
@@ -35,7 +35,7 @@
       <point x="1100" y="879" type="line"/>
       <point x="1013" y="956"/>
       <point x="921" y="991"/>
-      <point x="810" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="810" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="736" y="991"/>
       <point x="671" y="976"/>
       <point x="614" y="947" type="curve" smooth="yes"/>
@@ -47,13 +47,13 @@
       <point x="382" y="626" type="curve" smooth="yes"/>
       <point x="361" y="554"/>
       <point x="350" y="485"/>
-      <point x="350" y="418" type="curve" name="dh02" smooth="yes"/>
+      <point x="350" y="418" type="curve" smooth="yes" name="dh02"/>
       <point x="350" y="326"/>
       <point x="371" y="251"/>
       <point x="418" y="200" type="curve" smooth="yes"/>
       <point x="461" y="153"/>
       <point x="526" y="127"/>
-      <point x="625" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="625" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="685" y="127"/>
       <point x="748" y="137"/>
       <point x="808" y="158" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/caron.glif b/source/Hack-Italic.ufo/glyphs/caron.glif
index 9ccb08ecb..35fe2a7af 100644
--- a/source/Hack-Italic.ufo/glyphs/caron.glif
+++ b/source/Hack-Italic.ufo/glyphs/caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="caron" format="1">
+<glyph name="caron" format="2">
   <advance width="1233"/>
   <unicode hex="02C7"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/carriagereturn.glif b/source/Hack-Italic.ufo/glyphs/carriagereturn.glif
index 3d3e92fb9..c86459e08 100644
--- a/source/Hack-Italic.ufo/glyphs/carriagereturn.glif
+++ b/source/Hack-Italic.ufo/glyphs/carriagereturn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="carriagereturn" format="1">
+<glyph name="carriagereturn" format="2">
   <advance width="1233"/>
   <unicode hex="21B5"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/ccaron.glif b/source/Hack-Italic.ufo/glyphs/ccaron.glif
index d82d09e35..0edc44717 100644
--- a/source/Hack-Italic.ufo/glyphs/ccaron.glif
+++ b/source/Hack-Italic.ufo/glyphs/ccaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ccaron" format="1">
+<glyph name="ccaron" format="2">
   <advance width="1233"/>
   <unicode hex="010D"/>
   <outline>
@@ -13,13 +13,13 @@
       <point x="725" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="607" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="607" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="454" y="-29"/>
       <point x="344" y="12"/>
       <point x="271" y="84" type="curve" smooth="yes"/>
       <point x="194" y="160"/>
       <point x="156" y="271"/>
-      <point x="156" y="412" type="curve" name="dh01" smooth="yes"/>
+      <point x="156" y="412" type="curve" smooth="yes" name="dh01"/>
       <point x="156" y="619"/>
       <point x="233" y="816"/>
       <point x="354" y="950" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="559" y="1098" type="curve" smooth="yes"/>
       <point x="632" y="1131"/>
       <point x="714" y="1147"/>
-      <point x="804" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="804" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="863" y="1147"/>
       <point x="920" y="1140"/>
       <point x="975" y="1126" type="curve" smooth="yes"/>
@@ -38,7 +38,7 @@
       <point x="1100" y="879" type="line"/>
       <point x="1013" y="956"/>
       <point x="921" y="991"/>
-      <point x="810" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="810" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="736" y="991"/>
       <point x="671" y="976"/>
       <point x="614" y="947" type="curve" smooth="yes"/>
@@ -50,13 +50,13 @@
       <point x="382" y="626" type="curve" smooth="yes"/>
       <point x="361" y="554"/>
       <point x="350" y="485"/>
-      <point x="350" y="418" type="curve" name="dh02" smooth="yes"/>
+      <point x="350" y="418" type="curve" smooth="yes" name="dh02"/>
       <point x="350" y="326"/>
       <point x="371" y="251"/>
       <point x="418" y="200" type="curve" smooth="yes"/>
       <point x="461" y="153"/>
       <point x="526" y="127"/>
-      <point x="625" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="625" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="685" y="127"/>
       <point x="748" y="137"/>
       <point x="808" y="158" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/ccedilla.glif b/source/Hack-Italic.ufo/glyphs/ccedilla.glif
index 76526d1da..208a94c87 100644
--- a/source/Hack-Italic.ufo/glyphs/ccedilla.glif
+++ b/source/Hack-Italic.ufo/glyphs/ccedilla.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ccedilla" format="1">
+<glyph name="ccedilla" format="2">
   <advance width="1233"/>
   <unicode hex="00E7"/>
   <outline>
     <contour>
-      <point x="469" y="813" type="curve" name="hr00" smooth="yes"/>
+      <point x="469" y="813" type="curve" smooth="yes" name="hr00"/>
       <point x="434" y="762"/>
       <point x="403" y="698"/>
       <point x="382" y="626" type="curve" smooth="yes"/>
       <point x="361" y="554"/>
       <point x="350" y="485"/>
-      <point x="350" y="418" type="curve" name="sh02" smooth="yes"/>
+      <point x="350" y="418" type="curve" smooth="yes" name="sh02"/>
       <point x="350" y="326"/>
       <point x="371" y="251"/>
       <point x="418" y="200" type="curve" smooth="yes"/>
       <point x="461" y="153"/>
       <point x="526" y="127"/>
-      <point x="625" y="127" type="curve" name="sh03" smooth="yes"/>
+      <point x="625" y="127" type="curve" smooth="yes" name="sh03"/>
       <point x="685" y="127"/>
       <point x="748" y="137"/>
       <point x="808" y="158" type="curve" smooth="yes"/>
@@ -35,13 +35,13 @@
       <point x="729" y="-111" type="curve" smooth="yes"/>
       <point x="740" y="-141"/>
       <point x="746" y="-170"/>
-      <point x="746" y="-198" type="curve" name="sh04" smooth="yes"/>
+      <point x="746" y="-198" type="curve" smooth="yes" name="sh04"/>
       <point x="746" y="-254"/>
       <point x="723" y="-304"/>
       <point x="676" y="-341" type="curve" smooth="yes"/>
       <point x="630" y="-377"/>
       <point x="566" y="-395"/>
-      <point x="485" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="485" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="458" y="-395"/>
       <point x="426" y="-393"/>
       <point x="395" y="-388" type="curve" smooth="yes"/>
@@ -54,13 +54,13 @@
       <point x="403" y="-265" type="curve" smooth="yes"/>
       <point x="426" y="-271"/>
       <point x="449" y="-274"/>
-      <point x="472" y="-274" type="curve" name="dv02" smooth="yes"/>
+      <point x="472" y="-274" type="curve" smooth="yes" name="dv02"/>
       <point x="559" y="-274"/>
       <point x="613" y="-230"/>
-      <point x="613" y="-163" type="curve" name="ah01" smooth="yes"/>
+      <point x="613" y="-163" type="curve" smooth="yes" name="ah01"/>
       <point x="613" y="-140"/>
       <point x="607" y="-114"/>
-      <point x="599" y="-93" type="curve" name="sh05" smooth="yes"/>
+      <point x="599" y="-93" type="curve" smooth="yes" name="sh05"/>
       <point x="595" y="-81"/>
       <point x="583" y="-56"/>
       <point x="570" y="-28" type="curve" name="dv03"/>
@@ -69,16 +69,16 @@
       <point x="271" y="84" type="curve" smooth="yes"/>
       <point x="194" y="160"/>
       <point x="156" y="271"/>
-      <point x="156" y="412" type="curve" name="sh01" smooth="yes"/>
+      <point x="156" y="412" type="curve" smooth="yes" name="sh01"/>
       <point x="156" y="619"/>
       <point x="233" y="816"/>
-      <point x="354" y="950" type="curve" name="sh06" smooth="yes"/>
+      <point x="354" y="950" type="curve" smooth="yes" name="sh06"/>
       <point x="418" y="1021"/>
       <point x="495" y="1070"/>
       <point x="559" y="1098" type="curve" smooth="yes"/>
       <point x="632" y="1131"/>
       <point x="714" y="1147"/>
-      <point x="804" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="804" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="863" y="1147"/>
       <point x="920" y="1140"/>
       <point x="975" y="1126" type="curve" smooth="yes"/>
@@ -88,10 +88,10 @@
       <point x="1100" y="879" type="line"/>
       <point x="1013" y="956"/>
       <point x="921" y="991"/>
-      <point x="810" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="810" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="736" y="991"/>
       <point x="671" y="976"/>
-      <point x="614" y="947" type="curve" name="sh07" smooth="yes"/>
+      <point x="614" y="947" type="curve" smooth="yes" name="sh07"/>
       <point x="558" y="918"/>
       <point x="509" y="873"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/ccircumflex.glif b/source/Hack-Italic.ufo/glyphs/ccircumflex.glif
index bf0e5af27..94977e90b 100644
--- a/source/Hack-Italic.ufo/glyphs/ccircumflex.glif
+++ b/source/Hack-Italic.ufo/glyphs/ccircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ccircumflex" format="1">
+<glyph name="ccircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0109"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/cdotaccent.glif b/source/Hack-Italic.ufo/glyphs/cdotaccent.glif
index b77f66916..88623d066 100644
--- a/source/Hack-Italic.ufo/glyphs/cdotaccent.glif
+++ b/source/Hack-Italic.ufo/glyphs/cdotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="cdotaccent" format="1">
+<glyph name="cdotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="010B"/>
   <outline>
     <contour>
-      <point x="739" y="1348" type="line" name="hr00" smooth="yes"/>
+      <point x="739" y="1348" type="line" smooth="yes" name="hr00"/>
       <point x="721" y="1348"/>
       <point x="712" y="1356"/>
       <point x="712" y="1372" type="curve" smooth="yes"/>
@@ -14,7 +14,7 @@
       <point x="742" y="1525" type="line"/>
       <point x="745" y="1543"/>
       <point x="755" y="1552"/>
-      <point x="774" y="1552" type="curve" name="dv03" smooth="yes"/>
+      <point x="774" y="1552" type="curve" smooth="yes" name="dv03"/>
       <point x="919" y="1552" type="line" smooth="yes"/>
       <point x="937" y="1552"/>
       <point x="946" y="1544"/>
@@ -28,32 +28,32 @@
       <point x="884" y="1348" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="606" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="606" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="311" y="-29"/>
       <point x="156" y="121"/>
-      <point x="156" y="414" type="curve" name="dh01" smooth="yes"/>
+      <point x="156" y="414" type="curve" smooth="yes" name="dh01"/>
       <point x="156" y="613"/>
       <point x="229" y="812"/>
       <point x="354" y="950" type="curve" smooth="yes"/>
       <point x="471" y="1079"/>
       <point x="625" y="1147"/>
-      <point x="805" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="805" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="921" y="1147"/>
       <point x="1032" y="1118"/>
       <point x="1137" y="1061" type="curve"/>
       <point x="1100" y="879" type="line"/>
       <point x="1012" y="956"/>
       <point x="923" y="991"/>
-      <point x="808" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="808" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="655" y="991"/>
       <point x="549" y="929"/>
       <point x="469" y="813" type="curve" smooth="yes"/>
       <point x="395" y="704"/>
       <point x="350" y="555"/>
-      <point x="350" y="418" type="curve" name="dh02" smooth="yes"/>
+      <point x="350" y="418" type="curve" smooth="yes" name="dh02"/>
       <point x="350" y="219"/>
       <point x="440" y="127"/>
-      <point x="627" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="627" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="750" y="127"/>
       <point x="867" y="168"/>
       <point x="979" y="252" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/cedilla.glif b/source/Hack-Italic.ufo/glyphs/cedilla.glif
index fb15042af..ce6faa511 100644
--- a/source/Hack-Italic.ufo/glyphs/cedilla.glif
+++ b/source/Hack-Italic.ufo/glyphs/cedilla.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="cedilla" format="1">
+<glyph name="cedilla" format="2">
   <advance width="1233"/>
   <unicode hex="00B8"/>
   <outline>
     <contour>
-      <point x="366" y="-395" type="curve" name="hr00" smooth="yes"/>
+      <point x="366" y="-395" type="curve" smooth="yes" name="hr00"/>
       <point x="339" y="-395"/>
       <point x="307" y="-393"/>
       <point x="276" y="-388" type="curve" smooth="yes"/>
@@ -17,13 +17,13 @@
       <point x="284" y="-265" type="curve" smooth="yes"/>
       <point x="308" y="-271"/>
       <point x="331" y="-274"/>
-      <point x="352" y="-274" type="curve" name="dv01" smooth="yes"/>
+      <point x="352" y="-274" type="curve" smooth="yes" name="dv01"/>
       <point x="397" y="-274"/>
       <point x="432" y="-264"/>
       <point x="457" y="-244" type="curve" smooth="yes"/>
       <point x="482" y="-224"/>
       <point x="494" y="-195"/>
-      <point x="494" y="-163" type="curve" name="dh01" smooth="yes"/>
+      <point x="494" y="-163" type="curve" smooth="yes" name="dh01"/>
       <point x="494" y="-140"/>
       <point x="488" y="-114"/>
       <point x="480" y="-93" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="610" y="-111" type="curve" smooth="yes"/>
       <point x="621" y="-141"/>
       <point x="627" y="-170"/>
-      <point x="627" y="-198" type="curve" name="dh02" smooth="yes"/>
+      <point x="627" y="-198" type="curve" smooth="yes" name="dh02"/>
       <point x="627" y="-254"/>
       <point x="604" y="-304"/>
       <point x="557" y="-341" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/cent.glif b/source/Hack-Italic.ufo/glyphs/cent.glif
index 56180bc46..41df7607c 100644
--- a/source/Hack-Italic.ufo/glyphs/cent.glif
+++ b/source/Hack-Italic.ufo/glyphs/cent.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="cent" format="1">
+<glyph name="cent" format="2">
   <advance width="1233"/>
   <unicode hex="00A2"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="510" y="-27" type="line" name="hr00"/>
       <point x="269" y="-2"/>
       <point x="123" y="168"/>
-      <point x="123" y="434" type="curve" name="dh01" smooth="yes"/>
+      <point x="123" y="434" type="curve" smooth="yes" name="dh01"/>
       <point x="123" y="551"/>
       <point x="149" y="670"/>
       <point x="204" y="778" type="curve" smooth="yes"/>
@@ -54,7 +54,7 @@
       <point x="430" y="812" type="curve" smooth="yes"/>
       <point x="353" y="700"/>
       <point x="315" y="570"/>
-      <point x="315" y="431" type="curve" name="dh02" smooth="yes"/>
+      <point x="315" y="431" type="curve" smooth="yes" name="dh02"/>
       <point x="315" y="331"/>
       <point x="335" y="267"/>
       <point x="374" y="216" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/chi.glif b/source/Hack-Italic.ufo/glyphs/chi.glif
index 11d772926..12da1e14d 100644
--- a/source/Hack-Italic.ufo/glyphs/chi.glif
+++ b/source/Hack-Italic.ufo/glyphs/chi.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="chi" format="1">
+<glyph name="chi" format="2">
   <advance width="1233"/>
   <unicode hex="03C7"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="436" y="836" type="line" smooth="yes"/>
       <point x="421" y="920"/>
       <point x="361" y="962"/>
-      <point x="258" y="962" type="curve" name="sv01" smooth="yes"/>
+      <point x="258" y="962" type="curve" smooth="yes" name="sv01"/>
       <point x="209" y="962" type="line"/>
       <point x="239" y="1120" type="line" name="at01"/>
       <point x="309" y="1120" type="line" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="796" y="-142" type="line" smooth="yes"/>
       <point x="811" y="-226"/>
       <point x="870" y="-268"/>
-      <point x="975" y="-268" type="curve" name="dv02" smooth="yes"/>
+      <point x="975" y="-268" type="curve" smooth="yes" name="dv02"/>
       <point x="1024" y="-268" type="line"/>
       <point x="994" y="-426" type="line" name="dv01"/>
       <point x="924" y="-426" type="line" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/circle.glif b/source/Hack-Italic.ufo/glyphs/circle.glif
index 039d68867..14db8f49a 100644
--- a/source/Hack-Italic.ufo/glyphs/circle.glif
+++ b/source/Hack-Italic.ufo/glyphs/circle.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="circle" format="1">
+<glyph name="circle" format="2">
   <advance width="1233"/>
   <unicode hex="25CB"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv03"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="616" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="692" y="39"/>
       <point x="778" y="62"/>
       <point x="861" y="109" type="curve" smooth="yes"/>
       <point x="1021" y="200"/>
       <point x="1105" y="349"/>
-      <point x="1105" y="532" type="curve" name="ah01" smooth="yes"/>
+      <point x="1105" y="532" type="curve" smooth="yes" name="ah01"/>
       <point x="1105" y="715"/>
       <point x="1021" y="864"/>
       <point x="861" y="955" type="curve" smooth="yes"/>
       <point x="778" y="1002"/>
       <point x="692" y="1025"/>
-      <point x="616" y="1025" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1025" type="curve" smooth="yes" name="dv02"/>
       <point x="540" y="1025"/>
       <point x="454" y="1002"/>
       <point x="371" y="955" type="curve" smooth="yes"/>
       <point x="216" y="867"/>
       <point x="128" y="723"/>
-      <point x="128" y="532" type="curve" name="sh03" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="sh03"/>
       <point x="128" y="341"/>
       <point x="216" y="197"/>
       <point x="371" y="109" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/circlemultiply.glif b/source/Hack-Italic.ufo/glyphs/circlemultiply.glif
index fd7dde9ef..e09dc69d1 100644
--- a/source/Hack-Italic.ufo/glyphs/circlemultiply.glif
+++ b/source/Hack-Italic.ufo/glyphs/circlemultiply.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="circlemultiply" format="1">
+<glyph name="circlemultiply" format="2">
   <advance width="1233"/>
   <unicode hex="2297"/>
   <outline>
     <contour>
-      <point x="617" y="106" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="106" type="curve" smooth="yes" name="hr00"/>
       <point x="465" y="106"/>
       <point x="331" y="168"/>
       <point x="236" y="263" type="curve" smooth="yes"/>
       <point x="132" y="367"/>
       <point x="80" y="503"/>
-      <point x="80" y="644" type="curve" name="sh01" smooth="yes"/>
+      <point x="80" y="644" type="curve" smooth="yes" name="sh01"/>
       <point x="80" y="793"/>
       <point x="137" y="925"/>
       <point x="237" y="1024" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="412" y="1142" type="curve" smooth="yes"/>
       <point x="479" y="1170"/>
       <point x="544" y="1182"/>
-      <point x="613" y="1182" type="curve" name="dv03" smooth="yes"/>
+      <point x="613" y="1182" type="curve" smooth="yes" name="dv03"/>
       <point x="770" y="1182"/>
       <point x="901" y="1120"/>
       <point x="997" y="1024" type="curve" smooth="yes"/>
       <point x="1101" y="920"/>
       <point x="1153" y="786"/>
-      <point x="1153" y="643" type="curve" name="sh02" smooth="yes"/>
+      <point x="1153" y="643" type="curve" smooth="yes" name="sh02"/>
       <point x="1153" y="504"/>
       <point x="1102" y="368"/>
       <point x="997" y="263" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="770" y="106"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="532"/>
-      <point x="1012" y="645" type="curve" name="ah01" smooth="yes"/>
+      <point x="1012" y="645" type="curve" smooth="yes" name="ah01"/>
       <point x="1012" y="745"/>
       <point x="979" y="843"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="413" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/circleplus.glif b/source/Hack-Italic.ufo/glyphs/circleplus.glif
index d0500786a..c6011b543 100644
--- a/source/Hack-Italic.ufo/glyphs/circleplus.glif
+++ b/source/Hack-Italic.ufo/glyphs/circleplus.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="circleplus" format="1">
+<glyph name="circleplus" format="2">
   <advance width="1233"/>
   <unicode hex="2295"/>
   <outline>
     <contour>
-      <point x="617" y="106" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="106" type="curve" smooth="yes" name="hr00"/>
       <point x="465" y="106"/>
       <point x="331" y="168"/>
       <point x="236" y="263" type="curve" smooth="yes"/>
       <point x="132" y="367"/>
       <point x="80" y="503"/>
-      <point x="80" y="644" type="curve" name="dh01" smooth="yes"/>
+      <point x="80" y="644" type="curve" smooth="yes" name="dh01"/>
       <point x="80" y="793"/>
       <point x="137" y="925"/>
       <point x="237" y="1024" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="412" y="1142" type="curve" smooth="yes"/>
       <point x="479" y="1170"/>
       <point x="544" y="1182"/>
-      <point x="613" y="1182" type="curve" name="dv03" smooth="yes"/>
+      <point x="613" y="1182" type="curve" smooth="yes" name="dv03"/>
       <point x="770" y="1182"/>
       <point x="901" y="1120"/>
       <point x="997" y="1024" type="curve" smooth="yes"/>
       <point x="1101" y="920"/>
       <point x="1153" y="786"/>
-      <point x="1153" y="643" type="curve" name="dh06" smooth="yes"/>
+      <point x="1153" y="643" type="curve" smooth="yes" name="dh06"/>
       <point x="1153" y="504"/>
       <point x="1102" y="368"/>
       <point x="997" y="263" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="770" y="106"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="532"/>
-      <point x="1012" y="645" type="curve" name="dh05" smooth="yes"/>
+      <point x="1012" y="645" type="curve" smooth="yes" name="dh05"/>
       <point x="1012" y="745"/>
       <point x="979" y="843"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="413" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="dh02" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="dh02"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/circumflex.glif b/source/Hack-Italic.ufo/glyphs/circumflex.glif
index 7af62d1d9..b0db4c146 100644
--- a/source/Hack-Italic.ufo/glyphs/circumflex.glif
+++ b/source/Hack-Italic.ufo/glyphs/circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="circumflex" format="1">
+<glyph name="circumflex" format="2">
   <advance width="1233"/>
   <unicode hex="02C6"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/colon.glif b/source/Hack-Italic.ufo/glyphs/colon.glif
index 45d0ac958..1ef48d0e6 100644
--- a/source/Hack-Italic.ufo/glyphs/colon.glif
+++ b/source/Hack-Italic.ufo/glyphs/colon.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="colon" format="1">
+<glyph name="colon" format="2">
   <advance width="1233"/>
   <unicode hex="003A"/>
   <outline>
     <contour>
-      <point x="728" y="776" type="curve" name="dv01" smooth="yes"/>
+      <point x="728" y="776" type="curve" smooth="yes" name="dv01"/>
       <point x="691" y="776"/>
       <point x="658" y="788"/>
       <point x="631" y="817" type="curve" smooth="yes"/>
       <point x="603" y="848"/>
       <point x="595" y="884"/>
-      <point x="595" y="923" type="curve" name="ih01" smooth="yes"/>
+      <point x="595" y="923" type="curve" smooth="yes" name="ih01"/>
       <point x="595" y="975"/>
       <point x="616" y="1023"/>
       <point x="657" y="1060" type="curve" smooth="yes"/>
       <point x="693" y="1093"/>
       <point x="739" y="1114"/>
-      <point x="790" y="1114" type="curve" name="dv02" smooth="yes"/>
+      <point x="790" y="1114" type="curve" smooth="yes" name="dv02"/>
       <point x="837" y="1114"/>
       <point x="867" y="1097"/>
       <point x="890" y="1073" type="curve" smooth="yes"/>
       <point x="911" y="1050"/>
       <point x="925" y="1016"/>
-      <point x="925" y="973" type="curve" name="sh01" smooth="yes"/>
+      <point x="925" y="973" type="curve" smooth="yes" name="sh01"/>
       <point x="925" y="922"/>
       <point x="907" y="869"/>
       <point x="864" y="830" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="772" y="776"/>
     </contour>
     <contour>
-      <point x="617" y="60" type="curve" name="ab01" smooth="yes"/>
+      <point x="617" y="60" type="curve" smooth="yes" name="ab01"/>
       <point x="574" y="60"/>
       <point x="539" y="75"/>
       <point x="516" y="102" type="curve" smooth="yes"/>
       <point x="492" y="129"/>
       <point x="482" y="166"/>
-      <point x="482" y="203" type="curve" name="dh01" smooth="yes"/>
+      <point x="482" y="203" type="curve" smooth="yes" name="dh01"/>
       <point x="482" y="255"/>
       <point x="501" y="306"/>
-      <point x="544" y="345" type="curve" name="hr01" smooth="yes"/>
+      <point x="544" y="345" type="curve" smooth="yes" name="hr01"/>
       <point x="579" y="377"/>
       <point x="626" y="398"/>
-      <point x="677" y="398" type="curve" name="sv01" smooth="yes"/>
+      <point x="677" y="398" type="curve" smooth="yes" name="sv01"/>
       <point x="714" y="398"/>
       <point x="750" y="388"/>
       <point x="777" y="357" type="curve" smooth="yes"/>
       <point x="798" y="334"/>
       <point x="812" y="301"/>
-      <point x="812" y="254" type="curve" name="dh02" smooth="yes"/>
+      <point x="812" y="254" type="curve" smooth="yes" name="dh02"/>
       <point x="812" y="199"/>
       <point x="791" y="152"/>
       <point x="750" y="114" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/colonmonetary.glif b/source/Hack-Italic.ufo/glyphs/colonmonetary.glif
index fd60b8f30..a242a6e54 100644
--- a/source/Hack-Italic.ufo/glyphs/colonmonetary.glif
+++ b/source/Hack-Italic.ufo/glyphs/colonmonetary.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="colonmonetary" format="1">
+<glyph name="colonmonetary" format="2">
   <advance width="1233"/>
   <unicode hex="20A1"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="211" y="127" type="curve" smooth="yes"/>
       <point x="122" y="230"/>
       <point x="78" y="375"/>
-      <point x="78" y="562" type="curve" name="dh01" smooth="yes"/>
+      <point x="78" y="562" type="curve" smooth="yes" name="dh01"/>
       <point x="78" y="805"/>
       <point x="149" y="1038"/>
       <point x="274" y="1225" type="curve"/>
       <point x="405" y="1423"/>
       <point x="569" y="1520"/>
-      <point x="803" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="803" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="813" y="1520" type="line"/>
       <point x="843" y="1593" type="line" name="av01"/>
       <point x="965" y="1593" type="line"/>
@@ -43,7 +43,7 @@
       <point x="977" y="74" type="line"/>
       <point x="847" y="5"/>
       <point x="715" y="-29"/>
-      <point x="580" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="580" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="557" y="-29"/>
       <point x="536" y="-28"/>
       <point x="515" y="-25" type="curve" name="sv01"/>
@@ -63,7 +63,7 @@
       <point x="355" y="1024" type="curve" smooth="yes"/>
       <point x="287" y="876"/>
       <point x="253" y="719"/>
-      <point x="253" y="559" type="curve" name="dh02" smooth="yes"/>
+      <point x="253" y="559" type="curve" smooth="yes" name="dh02"/>
       <point x="253" y="444"/>
       <point x="271" y="362"/>
       <point x="306" y="294" type="curve" name="iv05"/>
diff --git a/source/Hack-Italic.ufo/glyphs/comma.glif b/source/Hack-Italic.ufo/glyphs/comma.glif
index 78ca6ba28..b2b08550d 100644
--- a/source/Hack-Italic.ufo/glyphs/comma.glif
+++ b/source/Hack-Italic.ufo/glyphs/comma.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="comma" format="1">
+<glyph name="comma" format="2">
   <advance width="1233"/>
   <unicode hex="002C"/>
   <outline>
@@ -10,28 +10,28 @@
       <point x="652" y="51" type="curve" name="sh01"/>
       <point x="636" y="48"/>
       <point x="624" y="47"/>
-      <point x="612" y="47" type="curve" name="dv01" smooth="yes"/>
+      <point x="612" y="47" type="curve" smooth="yes" name="dv01"/>
       <point x="569" y="47"/>
       <point x="531" y="59"/>
       <point x="502" y="86" type="curve" smooth="yes"/>
       <point x="473" y="112"/>
       <point x="458" y="149"/>
-      <point x="458" y="197" type="curve" name="dh01" smooth="yes"/>
+      <point x="458" y="197" type="curve" smooth="yes" name="dh01"/>
       <point x="458" y="244"/>
       <point x="473" y="281"/>
       <point x="504" y="308" type="curve" smooth="yes"/>
       <point x="531" y="332"/>
       <point x="568" y="349"/>
-      <point x="619" y="349" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="349" type="curve" smooth="yes" name="dv02"/>
       <point x="676" y="349"/>
       <point x="721" y="326"/>
       <point x="752" y="281" type="curve" smooth="yes"/>
       <point x="783" y="236"/>
       <point x="798" y="174"/>
-      <point x="798" y="93" type="curve" name="dh02" smooth="yes"/>
+      <point x="798" y="93" type="curve" smooth="yes" name="dh02"/>
       <point x="798" y="-21"/>
       <point x="767" y="-119"/>
-      <point x="706" y="-202" type="curve" name="hr01" smooth="yes"/>
+      <point x="706" y="-202" type="curve" smooth="yes" name="hr01"/>
       <point x="645" y="-284"/>
       <point x="558" y="-346"/>
       <point x="446" y="-387" type="curve" name="av01"/>
diff --git a/source/Hack-Italic.ufo/glyphs/congruent.glif b/source/Hack-Italic.ufo/glyphs/congruent.glif
index 1829325a4..d4e015914 100644
--- a/source/Hack-Italic.ufo/glyphs/congruent.glif
+++ b/source/Hack-Italic.ufo/glyphs/congruent.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="congruent" format="1">
+<glyph name="congruent" format="2">
   <advance width="1233"/>
   <unicode hex="2245"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="88" y="1052" type="line" name="hr00"/>
       <point x="200" y="1137"/>
       <point x="289" y="1167"/>
-      <point x="402" y="1167" type="curve" name="dv03" smooth="yes"/>
+      <point x="402" y="1167" type="curve" smooth="yes" name="dv03"/>
       <point x="478" y="1167"/>
       <point x="513" y="1153"/>
       <point x="623" y="1113" type="curve" smooth="yes"/>
@@ -16,14 +16,14 @@
       <point x="655" y="1098" type="curve" smooth="yes"/>
       <point x="722" y="1066"/>
       <point x="798" y="1044"/>
-      <point x="866" y="1044" type="curve" name="dv05" smooth="yes"/>
+      <point x="866" y="1044" type="curve" smooth="yes" name="dv05"/>
       <point x="957" y="1044"/>
       <point x="1045" y="1083"/>
       <point x="1145" y="1167" type="curve"/>
       <point x="1145" y="992" type="line"/>
       <point x="1045" y="912"/>
       <point x="952" y="878"/>
-      <point x="852" y="878" type="curve" name="dv04" smooth="yes"/>
+      <point x="852" y="878" type="curve" smooth="yes" name="dv04"/>
       <point x="776" y="878"/>
       <point x="717" y="898"/>
       <point x="645" y="929" type="curve"/>
@@ -32,7 +32,7 @@
       <point x="612" y="943" type="curve" name="hr01"/>
       <point x="522" y="980"/>
       <point x="468" y="1001"/>
-      <point x="385" y="1001" type="curve" name="dv02" smooth="yes"/>
+      <point x="385" y="1001" type="curve" smooth="yes" name="dv02"/>
       <point x="277" y="1001"/>
       <point x="189" y="966"/>
       <point x="88" y="878" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/contents.plist b/source/Hack-Italic.ufo/glyphs/contents.plist
index 301e263d7..b606ff0ef 100644
--- a/source/Hack-Italic.ufo/glyphs/contents.plist
+++ b/source/Hack-Italic.ufo/glyphs/contents.plist
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>.notdef</key>
@@ -60,6 +60,8 @@
 	<string>E_.glif</string>
 	<key>Eacute</key>
 	<string>E_acute.glif</string>
+	<key>Ebreve</key>
+	<string>E_breve.glif</string>
 	<key>Ecaron</key>
 	<string>E_caron.glif</string>
 	<key>Ecircumflex</key>
@@ -114,6 +116,8 @@
 	<string>I_J_.glif</string>
 	<key>Iacute</key>
 	<string>I_acute.glif</string>
+	<key>Ibreve</key>
+	<string>I_breve.glif</string>
 	<key>Icircumflex</key>
 	<string>I_circumflex.glif</string>
 	<key>Idieresis</key>
@@ -152,8 +156,6 @@
 	<string>L_caron.glif</string>
 	<key>Ldot</key>
 	<string>L_dot.glif</string>
-	<key>longs</key>
-	<string>longs.glif</string>
 	<key>Lslash</key>
 	<string>L_slash.glif</string>
 	<key>M</key>
@@ -178,6 +180,8 @@
 	<string>O_E_.glif</string>
 	<key>Oacute</key>
 	<string>O_acute.glif</string>
+	<key>Obreve</key>
+	<string>O_breve.glif</string>
 	<key>Ocircumflex</key>
 	<string>O_circumflex.glif</string>
 	<key>Odieresis</key>
@@ -508,6 +512,8 @@
 	<string>e.glif</string>
 	<key>eacute</key>
 	<string>eacute.glif</string>
+	<key>ebreve</key>
+	<string>ebreve.glif</string>
 	<key>ecaron</key>
 	<string>ecaron.glif</string>
 	<key>ecircumflex</key>
@@ -524,18 +530,10 @@
 	<string>eight.subs.glif</string>
 	<key>element</key>
 	<string>element.glif</string>
-	<key>onedotenleader</key>
-	<string>onedotenleader.glif</string>
-	<key>twodotenleader</key>
-	<string>twodotenleader.glif</string>
 	<key>ellipsis</key>
 	<string>ellipsis.glif</string>
 	<key>emacron</key>
 	<string>emacron.glif</string>
-	<key>Ebreve</key>
-	<string>E_breve.glif</string>
-	<key>ebreve</key>
-	<string>ebreve.glif</string>
 	<key>emdash</key>
 	<string>emdash.glif</string>
 	<key>emptyset</key>
@@ -636,10 +634,14 @@
 	<string>hungarumlaut.glif</string>
 	<key>hyphen</key>
 	<string>hyphen.glif</string>
+	<key>hyphenationpoint</key>
+	<string>hyphenationpoint.glif</string>
 	<key>i</key>
 	<string>i.glif</string>
 	<key>iacute</key>
 	<string>iacute.glif</string>
+	<key>ibreve</key>
+	<string>ibreve.glif</string>
 	<key>icircumflex</key>
 	<string>icircumflex.glif</string>
 	<key>idieresis</key>
@@ -650,10 +652,6 @@
 	<string>ij.glif</string>
 	<key>imacron</key>
 	<string>imacron.glif</string>
-	<key>Ibreve</key>
-	<string>I_breve.glif</string>
-	<key>ibreve</key>
-	<string>ibreve.glif</string>
 	<key>infinity</key>
 	<string>infinity.glif</string>
 	<key>integral</key>
@@ -714,6 +712,8 @@
 	<string>logicalnot.glif</string>
 	<key>logicalor</key>
 	<string>logicalor.glif</string>
+	<key>longs</key>
+	<string>longs.glif</string>
 	<key>lozenge</key>
 	<string>lozenge.glif</string>
 	<key>lslash</key>
@@ -724,8 +724,12 @@
 	<string>m.glif</string>
 	<key>macron</key>
 	<string>macron.glif</string>
+	<key>millisecond</key>
+	<string>millisecond.glif</string>
 	<key>minus</key>
 	<string>minus.glif</string>
+	<key>minute</key>
+	<string>minute.glif</string>
 	<key>multiply</key>
 	<string>multiply.glif</string>
 	<key>musicalnote</key>
@@ -758,6 +762,8 @@
 	<string>o.glif</string>
 	<key>oacute</key>
 	<string>oacute.glif</string>
+	<key>obreve</key>
+	<string>obreve.glif</string>
 	<key>ocircumflex</key>
 	<string>ocircumflex.glif</string>
 	<key>odieresis</key>
@@ -774,10 +780,6 @@
 	<string>ohungarumlaut.glif</string>
 	<key>omacron</key>
 	<string>omacron.glif</string>
-	<key>Obreve</key>
-	<string>O_breve.glif</string>
-	<key>obreve</key>
-	<string>obreve.glif</string>
 	<key>omega</key>
 	<string>omega.glif</string>
 	<key>omegatonos</key>
@@ -790,6 +792,8 @@
 	<string>one.glif</string>
 	<key>one.subs</key>
 	<string>one.subs.glif</string>
+	<key>onedotenleader</key>
+	<string>onedotenleader.glif</string>
 	<key>oneeighth</key>
 	<string>oneeighth.glif</string>
 	<key>onehalf</key>
@@ -896,6 +900,8 @@
 	<string>ring.glif</string>
 	<key>rtblock</key>
 	<string>rtblock.glif</string>
+	<key>ruble</key>
+	<string>ruble.glif</string>
 	<key>s</key>
 	<string>s.glif</string>
 	<key>sacute</key>
@@ -906,6 +912,8 @@
 	<string>scedilla.glif</string>
 	<key>scircumflex</key>
 	<string>scircumflex.glif</string>
+	<key>second</key>
+	<string>second.glif</string>
 	<key>section</key>
 	<string>section.glif</string>
 	<key>semicolon</key>
@@ -978,6 +986,8 @@
 	<string>two.glif</string>
 	<key>two.subs</key>
 	<string>two.subs.glif</string>
+	<key>twodotenleader</key>
+	<string>twodotenleader.glif</string>
 	<key>u</key>
 	<string>u.glif</string>
 	<key>uacute</key>
@@ -1900,18 +1910,10 @@
 	<string>uni201F_.glif</string>
 	<key>uni2023</key>
 	<string>uni2023.glif</string>
-	<key>hyphenationpoint</key>
-	<string>hyphenationpoint.glif</string>
 	<key>uni202F</key>
 	<string>uni202F_.glif</string>
 	<key>uni2031</key>
 	<string>uni2031.glif</string>
-	<key>minute</key>
-	<string>minute.glif</string>
-	<key>second</key>
-	<string>second.glif</string>
-	<key>millisecond</key>
-	<string>millisecond.glif</string>
 	<key>uni2035</key>
 	<string>uni2035.glif</string>
 	<key>uni2036</key>
diff --git a/source/Hack-Italic.ufo/glyphs/copyright.glif b/source/Hack-Italic.ufo/glyphs/copyright.glif
index c2109d1de..7a421a4ce 100644
--- a/source/Hack-Italic.ufo/glyphs/copyright.glif
+++ b/source/Hack-Italic.ufo/glyphs/copyright.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="copyright" format="1">
+<glyph name="copyright" format="2">
   <advance width="1233"/>
   <unicode hex="00A9"/>
   <outline>
     <contour>
-      <point x="616" y="125" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="125" type="curve" smooth="yes" name="hr00"/>
       <point x="528" y="125"/>
       <point x="454" y="140"/>
       <point x="382" y="171" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="45" y="508" type="curve" smooth="yes"/>
       <point x="15" y="579"/>
       <point x="0" y="656"/>
-      <point x="0" y="741" type="curve" name="dh01" smooth="yes"/>
+      <point x="0" y="741" type="curve" smooth="yes" name="dh01"/>
       <point x="0" y="825"/>
       <point x="15" y="904"/>
       <point x="46" y="977" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="381" y="1313" type="curve" smooth="yes"/>
       <point x="454" y="1343"/>
       <point x="532" y="1358"/>
-      <point x="616" y="1358" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1358" type="curve" smooth="yes" name="dv03"/>
       <point x="700" y="1358"/>
       <point x="779" y="1343"/>
       <point x="852" y="1313" type="curve" smooth="yes"/>
@@ -40,7 +40,7 @@
       <point x="1187" y="977" type="curve" smooth="yes"/>
       <point x="1218" y="905"/>
       <point x="1233" y="827"/>
-      <point x="1233" y="742" type="curve" name="dh06" smooth="yes"/>
+      <point x="1233" y="742" type="curve" smooth="yes" name="dh06"/>
       <point x="1233" y="657"/>
       <point x="1218" y="579"/>
       <point x="1188" y="508" type="curve" smooth="yes"/>
@@ -54,7 +54,7 @@
       <point x="701" y="125"/>
     </contour>
     <contour>
-      <point x="617" y="227" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="227" type="curve" smooth="yes" name="dv01"/>
       <point x="686" y="227"/>
       <point x="751" y="240"/>
       <point x="812" y="265" type="curve" smooth="yes"/>
@@ -66,7 +66,7 @@
       <point x="1093" y="546" type="curve" smooth="yes"/>
       <point x="1118" y="605"/>
       <point x="1130" y="670"/>
-      <point x="1130" y="741" type="curve" name="dh05" smooth="yes"/>
+      <point x="1130" y="741" type="curve" smooth="yes" name="dh05"/>
       <point x="1130" y="813"/>
       <point x="1117" y="878"/>
       <point x="1092" y="939" type="curve" smooth="yes"/>
@@ -78,7 +78,7 @@
       <point x="814" y="1218" type="curve" smooth="yes"/>
       <point x="754" y="1243"/>
       <point x="688" y="1255"/>
-      <point x="616" y="1255" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1255" type="curve" smooth="yes" name="dv02"/>
       <point x="545" y="1255"/>
       <point x="479" y="1243"/>
       <point x="420" y="1218" type="curve" smooth="yes"/>
@@ -90,7 +90,7 @@
       <point x="141" y="939" type="curve" smooth="yes"/>
       <point x="115" y="877"/>
       <point x="102" y="811"/>
-      <point x="102" y="742" type="curve" name="dh02" smooth="yes"/>
+      <point x="102" y="742" type="curve" smooth="yes" name="dh02"/>
       <point x="102" y="670"/>
       <point x="114" y="609"/>
       <point x="141" y="546" type="curve" smooth="yes"/>
@@ -104,16 +104,16 @@
       <point x="545" y="227"/>
     </contour>
     <contour>
-      <point x="638" y="369" type="curve" name="dv04" smooth="yes"/>
+      <point x="638" y="369" type="curve" smooth="yes" name="dv04"/>
       <point x="395" y="369"/>
       <point x="250" y="512"/>
-      <point x="250" y="741" type="curve" name="dh03" smooth="yes"/>
+      <point x="250" y="741" type="curve" smooth="yes" name="dh03"/>
       <point x="250" y="854"/>
       <point x="286" y="949"/>
       <point x="354" y="1016" type="curve" smooth="yes"/>
       <point x="421" y="1080"/>
       <point x="518" y="1116"/>
-      <point x="638" y="1116" type="curve" name="dv07" smooth="yes"/>
+      <point x="638" y="1116" type="curve" smooth="yes" name="dv07"/>
       <point x="678" y="1116"/>
       <point x="716" y="1112"/>
       <point x="755" y="1105" type="curve" smooth="yes"/>
@@ -126,16 +126,16 @@
       <point x="751" y="1005" type="curve" smooth="yes"/>
       <point x="714" y="1014"/>
       <point x="674" y="1018"/>
-      <point x="641" y="1018" type="curve" name="dv06" smooth="yes"/>
+      <point x="641" y="1018" type="curve" smooth="yes" name="dv06"/>
       <point x="565" y="1018"/>
       <point x="500" y="996"/>
       <point x="453" y="945" type="curve" smooth="yes"/>
       <point x="410" y="898"/>
       <point x="385" y="827"/>
-      <point x="385" y="739" type="curve" name="dh04" smooth="yes"/>
+      <point x="385" y="739" type="curve" smooth="yes" name="dh04"/>
       <point x="385" y="567"/>
       <point x="480" y="467"/>
-      <point x="657" y="467" type="curve" name="dv05" smooth="yes"/>
+      <point x="657" y="467" type="curve" smooth="yes" name="dv05"/>
       <point x="733" y="467"/>
       <point x="798" y="482"/>
       <point x="864" y="518" type="curve" name="ih02"/>
diff --git a/source/Hack-Italic.ufo/glyphs/currency.glif b/source/Hack-Italic.ufo/glyphs/currency.glif
index 5c4ca754f..0640004e3 100644
--- a/source/Hack-Italic.ufo/glyphs/currency.glif
+++ b/source/Hack-Italic.ufo/glyphs/currency.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="currency" format="1">
+<glyph name="currency" format="2">
   <advance width="1233"/>
   <unicode hex="00A4"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="371" y="451" type="line"/>
       <point x="327" y="523"/>
       <point x="311" y="577"/>
-      <point x="311" y="642" type="curve" name="sh01" smooth="yes"/>
+      <point x="311" y="642" type="curve" smooth="yes" name="sh01"/>
       <point x="311" y="679"/>
       <point x="316" y="707"/>
       <point x="327" y="738" type="curve" smooth="yes"/>
@@ -23,7 +23,7 @@
       <point x="557" y="968" type="curve" smooth="yes"/>
       <point x="587" y="978"/>
       <point x="618" y="983"/>
-      <point x="651" y="983" type="curve" name="dv04" smooth="yes"/>
+      <point x="651" y="983" type="curve" smooth="yes" name="dv04"/>
       <point x="716" y="983"/>
       <point x="775" y="964"/>
       <point x="844" y="924" type="curve"/>
@@ -32,10 +32,10 @@
       <point x="934" y="831" type="line"/>
       <point x="954" y="798"/>
       <point x="972" y="760"/>
-      <point x="979" y="736" type="curve" name="sh04" smooth="yes"/>
+      <point x="979" y="736" type="curve" smooth="yes" name="sh04"/>
       <point x="988" y="707"/>
       <point x="993" y="671"/>
-      <point x="993" y="640" type="curve" name="sh03" smooth="yes"/>
+      <point x="993" y="640" type="curve" smooth="yes" name="sh03"/>
       <point x="993" y="607"/>
       <point x="988" y="576"/>
       <point x="978" y="546" type="curve" smooth="yes"/>
@@ -50,32 +50,32 @@
       <point x="749" y="316" type="curve" smooth="yes"/>
       <point x="718" y="306"/>
       <point x="685" y="301"/>
-      <point x="652" y="301" type="curve" name="dv01" smooth="yes"/>
+      <point x="652" y="301" type="curve" smooth="yes" name="dv01"/>
       <point x="588" y="301"/>
       <point x="527" y="319"/>
       <point x="461" y="358" type="curve"/>
       <point x="297" y="195" type="line" name="sh06"/>
     </contour>
     <contour>
-      <point x="653" y="426" type="curve" name="dv02" smooth="yes"/>
+      <point x="653" y="426" type="curve" smooth="yes" name="dv02"/>
       <point x="712" y="426"/>
       <point x="765" y="447"/>
       <point x="806" y="488" type="curve" smooth="yes"/>
       <point x="846" y="529"/>
       <point x="868" y="583"/>
-      <point x="868" y="643" type="curve" name="ah01" smooth="yes"/>
+      <point x="868" y="643" type="curve" smooth="yes" name="ah01"/>
       <point x="868" y="703"/>
       <point x="846" y="756"/>
       <point x="807" y="795" type="curve" smooth="yes"/>
       <point x="767" y="835"/>
       <point x="713" y="856"/>
-      <point x="653" y="856" type="curve" name="dv03" smooth="yes"/>
+      <point x="653" y="856" type="curve" smooth="yes" name="dv03"/>
       <point x="596" y="856"/>
       <point x="542" y="836"/>
       <point x="501" y="796" type="curve" smooth="yes"/>
       <point x="462" y="759"/>
       <point x="438" y="706"/>
-      <point x="438" y="642" type="curve" name="sh07" smooth="yes"/>
+      <point x="438" y="642" type="curve" smooth="yes" name="sh07"/>
       <point x="438" y="583"/>
       <point x="459" y="532"/>
       <point x="500" y="489" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/d.glif b/source/Hack-Italic.ufo/glyphs/d.glif
index 18b8cc3db..bd7a7eeda 100644
--- a/source/Hack-Italic.ufo/glyphs/d.glif
+++ b/source/Hack-Italic.ufo/glyphs/d.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="d" format="1">
+<glyph name="d" format="2">
   <advance width="1233"/>
   <unicode hex="0064"/>
   <outline>
@@ -38,9 +38,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/dagger.glif b/source/Hack-Italic.ufo/glyphs/dagger.glif
index 123306f4f..4f3a6d071 100644
--- a/source/Hack-Italic.ufo/glyphs/dagger.glif
+++ b/source/Hack-Italic.ufo/glyphs/dagger.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dagger" format="1">
+<glyph name="dagger" format="2">
   <advance width="1233"/>
   <unicode hex="2020"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/daggerdbl.glif b/source/Hack-Italic.ufo/glyphs/daggerdbl.glif
index 2ba351d3f..2e5880872 100644
--- a/source/Hack-Italic.ufo/glyphs/daggerdbl.glif
+++ b/source/Hack-Italic.ufo/glyphs/daggerdbl.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="daggerdbl" format="1">
+<glyph name="daggerdbl" format="2">
   <advance width="1233"/>
   <unicode hex="2021"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/dcaron.glif b/source/Hack-Italic.ufo/glyphs/dcaron.glif
index d646f64e3..ffcf9c841 100644
--- a/source/Hack-Italic.ufo/glyphs/dcaron.glif
+++ b/source/Hack-Italic.ufo/glyphs/dcaron.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dcaron" format="1">
+<glyph name="dcaron" format="2">
   <advance width="1233"/>
   <unicode hex="010F"/>
   <outline>
     <contour>
-      <point x="460" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="460" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="245" y="-29"/>
       <point x="119" y="112"/>
-      <point x="119" y="379" type="curve" name="dh01" smooth="yes"/>
+      <point x="119" y="379" type="curve" smooth="yes" name="dh01"/>
       <point x="119" y="555"/>
       <point x="175" y="762"/>
       <point x="268" y="909" type="curve" smooth="yes"/>
       <point x="368" y="1066"/>
       <point x="506" y="1147"/>
-      <point x="666" y="1147" type="curve" name="at03" smooth="yes"/>
+      <point x="666" y="1147" type="curve" smooth="yes" name="at03"/>
       <point x="799" y="1147"/>
       <point x="897" y="1092"/>
       <point x="954" y="977" type="curve" name="iv01"/>
@@ -32,22 +32,22 @@
       <point x="1186" y="1179" type="line" name="hr01"/>
     </contour>
     <contour>
-      <point x="517" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="517" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="636" y="127"/>
       <point x="724" y="189"/>
-      <point x="788" y="305" type="curve" name="sh01" smooth="yes"/>
+      <point x="788" y="305" type="curve" smooth="yes" name="sh01"/>
       <point x="852" y="420"/>
       <point x="893" y="592"/>
       <point x="893" y="724" type="curve" smooth="yes"/>
       <point x="893" y="908"/>
       <point x="818" y="991"/>
-      <point x="681" y="991" type="curve" name="sv03" smooth="yes"/>
+      <point x="681" y="991" type="curve" smooth="yes" name="sv03"/>
       <point x="562" y="991"/>
       <point x="479" y="929"/>
       <point x="418" y="817" type="curve" smooth="yes"/>
       <point x="354" y="700"/>
       <point x="315" y="531"/>
-      <point x="315" y="392" type="curve" name="dh02" smooth="yes"/>
+      <point x="315" y="392" type="curve" smooth="yes" name="dh02"/>
       <point x="315" y="211"/>
       <point x="380" y="127"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/dcroat.glif b/source/Hack-Italic.ufo/glyphs/dcroat.glif
index 3c6a1bbf1..e7473cdf9 100644
--- a/source/Hack-Italic.ufo/glyphs/dcroat.glif
+++ b/source/Hack-Italic.ufo/glyphs/dcroat.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dcroat" format="1">
+<glyph name="dcroat" format="2">
   <advance width="1233"/>
   <unicode hex="0111"/>
   <outline>
     <contour>
-      <point x="462" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="462" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="349" y="-29"/>
       <point x="269" y="8"/>
       <point x="210" y="76" type="curve" smooth="yes"/>
       <point x="149" y="147"/>
       <point x="119" y="241"/>
-      <point x="119" y="374" type="curve" name="dh01" smooth="yes"/>
+      <point x="119" y="374" type="curve" smooth="yes" name="dh01"/>
       <point x="119" y="462"/>
       <point x="132" y="560"/>
       <point x="159" y="657" type="curve" smooth="yes"/>
@@ -19,7 +19,7 @@
       <point x="268" y="909" type="curve" smooth="yes"/>
       <point x="369" y="1069"/>
       <point x="505" y="1147"/>
-      <point x="668" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="668" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="736" y="1147"/>
       <point x="791" y="1133"/>
       <point x="840" y="1104" type="curve" smooth="yes"/>
@@ -41,15 +41,15 @@
       <point x="793" y="141" type="line" name="iv01"/>
       <point x="750" y="86"/>
       <point x="701" y="43"/>
-      <point x="646" y="14" type="curve" name="hr02" smooth="yes"/>
+      <point x="646" y="14" type="curve" smooth="yes" name="hr02"/>
       <point x="591" y="-15"/>
       <point x="530" y="-29"/>
     </contour>
     <contour>
-      <point x="518" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="518" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="575" y="127"/>
       <point x="626" y="142"/>
-      <point x="672" y="172" type="curve" name="hr03" smooth="yes"/>
+      <point x="672" y="172" type="curve" smooth="yes" name="hr03"/>
       <point x="719" y="203"/>
       <point x="755" y="245"/>
       <point x="788" y="305" type="curve" smooth="yes"/>
@@ -64,7 +64,7 @@
       <point x="840" y="924" type="curve" smooth="yes"/>
       <point x="807" y="965"/>
       <point x="754" y="991"/>
-      <point x="682" y="991" type="curve" name="sv06" smooth="yes"/>
+      <point x="682" y="991" type="curve" smooth="yes" name="sv06"/>
       <point x="626" y="991"/>
       <point x="572" y="975"/>
       <point x="531" y="948" type="curve" smooth="yes"/>
@@ -73,7 +73,7 @@
       <point x="417" y="817" type="curve" smooth="yes"/>
       <point x="356" y="706"/>
       <point x="315" y="526"/>
-      <point x="315" y="388" type="curve" name="dh02" smooth="yes"/>
+      <point x="315" y="388" type="curve" smooth="yes" name="dh02"/>
       <point x="315" y="296"/>
       <point x="331" y="234"/>
       <point x="366" y="191" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/degree.glif b/source/Hack-Italic.ufo/glyphs/degree.glif
index 4063b195d..114dc5894 100644
--- a/source/Hack-Italic.ufo/glyphs/degree.glif
+++ b/source/Hack-Italic.ufo/glyphs/degree.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="degree" format="1">
+<glyph name="degree" format="2">
   <advance width="1233"/>
   <unicode hex="00B0"/>
   <outline>
     <contour>
-      <point x="612" y="885" type="curve" name="hr00" smooth="yes"/>
+      <point x="612" y="885" type="curve" smooth="yes" name="hr00"/>
       <point x="528" y="885"/>
       <point x="448" y="915"/>
       <point x="388" y="975" type="curve" smooth="yes"/>
       <point x="335" y="1028"/>
       <point x="299" y="1106"/>
-      <point x="299" y="1199" type="curve" name="sh01" smooth="yes"/>
+      <point x="299" y="1199" type="curve" smooth="yes" name="sh01"/>
       <point x="299" y="1288"/>
       <point x="331" y="1367"/>
       <point x="390" y="1427" type="curve" smooth="yes"/>
       <point x="447" y="1486"/>
       <point x="526" y="1520"/>
-      <point x="615" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="615" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="655" y="1520"/>
       <point x="700" y="1513"/>
       <point x="740" y="1496" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="911" y="1322" type="curve" smooth="yes"/>
       <point x="926" y="1285"/>
       <point x="934" y="1245"/>
-      <point x="934" y="1202" type="curve" name="sh02" smooth="yes"/>
+      <point x="934" y="1202" type="curve" smooth="yes" name="sh02"/>
       <point x="934" y="1114"/>
       <point x="901" y="1033"/>
       <point x="842" y="976" type="curve" smooth="yes"/>
@@ -36,25 +36,25 @@
       <point x="703" y="885"/>
     </contour>
     <contour>
-      <point x="614" y="1012" type="curve" name="dv01" smooth="yes"/>
+      <point x="614" y="1012" type="curve" smooth="yes" name="dv01"/>
       <point x="669" y="1012"/>
       <point x="719" y="1034"/>
       <point x="752" y="1067" type="curve" smooth="yes"/>
       <point x="791" y="1106"/>
       <point x="807" y="1154"/>
-      <point x="807" y="1201" type="curve" name="ah01" smooth="yes"/>
+      <point x="807" y="1201" type="curve" smooth="yes" name="ah01"/>
       <point x="807" y="1252"/>
       <point x="787" y="1300"/>
       <point x="751" y="1336" type="curve" smooth="yes"/>
       <point x="720" y="1367"/>
       <point x="672" y="1391"/>
-      <point x="616" y="1391" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1391" type="curve" smooth="yes" name="sv01"/>
       <point x="563" y="1391"/>
       <point x="515" y="1370"/>
       <point x="482" y="1337" type="curve" smooth="yes"/>
       <point x="446" y="1301"/>
       <point x="426" y="1251"/>
-      <point x="426" y="1199" type="curve" name="sh03" smooth="yes"/>
+      <point x="426" y="1199" type="curve" smooth="yes" name="sh03"/>
       <point x="426" y="1144"/>
       <point x="446" y="1100"/>
       <point x="481" y="1065" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/delta.glif b/source/Hack-Italic.ufo/glyphs/delta.glif
index 157a953c8..62754f9c5 100644
--- a/source/Hack-Italic.ufo/glyphs/delta.glif
+++ b/source/Hack-Italic.ufo/glyphs/delta.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="delta" format="1">
+<glyph name="delta" format="2">
   <advance width="1233"/>
   <unicode hex="03B4"/>
   <outline>
     <contour>
-      <point x="502" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="502" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="250" y="-29"/>
       <point x="115" y="101"/>
-      <point x="115" y="364" type="curve" name="sh01" smooth="yes"/>
+      <point x="115" y="364" type="curve" smooth="yes" name="sh01"/>
       <point x="115" y="423"/>
       <point x="122" y="488"/>
       <point x="136" y="559" type="curve" smooth="yes"/>
@@ -28,15 +28,15 @@
       <point x="350" y="1269" type="curve" smooth="yes"/>
       <point x="385" y="1453"/>
       <point x="581" y="1569"/>
-      <point x="853" y="1569" type="curve" name="at01" smooth="yes"/>
+      <point x="853" y="1569" type="curve" smooth="yes" name="at01"/>
       <point x="904" y="1569"/>
       <point x="960" y="1565"/>
-      <point x="992" y="1557" type="curve" name="at02" smooth="yes"/>
+      <point x="992" y="1557" type="curve" smooth="yes" name="at02"/>
       <point x="1136" y="1521" type="line"/>
       <point x="1102" y="1348" type="line" name="sh03"/>
       <point x="1021" y="1380"/>
       <point x="918" y="1405"/>
-      <point x="810" y="1402" type="curve" name="sv02" smooth="yes"/>
+      <point x="810" y="1402" type="curve" smooth="yes" name="sv02"/>
       <point x="778" y="1401" type="line" smooth="yes"/>
       <point x="729" y="1400"/>
       <point x="681" y="1385"/>
@@ -50,13 +50,13 @@
       <point x="554" y="1206" type="curve" smooth="yes"/>
       <point x="561" y="1193"/>
       <point x="576" y="1176"/>
-      <point x="603" y="1161" type="curve" name="at03" smooth="yes"/>
+      <point x="603" y="1161" type="curve" smooth="yes" name="at03"/>
       <point x="624" y="1150"/>
       <point x="654" y="1148"/>
-      <point x="729" y="1147" type="curve" name="at04" smooth="yes"/>
+      <point x="729" y="1147" type="curve" smooth="yes" name="at04"/>
       <point x="989" y="1140"/>
       <point x="1116" y="1008"/>
-      <point x="1116" y="756" type="curve" name="sh02" smooth="yes"/>
+      <point x="1116" y="756" type="curve" smooth="yes" name="sh02"/>
       <point x="1116" y="697"/>
       <point x="1109" y="631"/>
       <point x="1095" y="559" type="curve" smooth="yes"/>
@@ -64,22 +64,22 @@
       <point x="815" y="-29"/>
     </contour>
     <contour>
-      <point x="531" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="531" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="715" y="127"/>
       <point x="843" y="266"/>
       <point x="900" y="559" type="curve"/>
       <point x="913" y="623"/>
       <point x="919" y="680"/>
-      <point x="919" y="731" type="curve" name="ah01" smooth="yes"/>
+      <point x="919" y="731" type="curve" smooth="yes" name="ah01"/>
       <point x="919" y="906"/>
       <point x="845" y="991"/>
-      <point x="700" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="700" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="508" y="991"/>
       <point x="384" y="836"/>
       <point x="331" y="559" type="curve" smooth="yes"/>
       <point x="319" y="495"/>
       <point x="312" y="439"/>
-      <point x="312" y="388" type="curve" name="sh04" smooth="yes"/>
+      <point x="312" y="388" type="curve" smooth="yes" name="sh04"/>
       <point x="312" y="217"/>
       <point x="383" y="127"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/dieresis.glif b/source/Hack-Italic.ufo/glyphs/dieresis.glif
index 0af925fbe..adbfb7e16 100644
--- a/source/Hack-Italic.ufo/glyphs/dieresis.glif
+++ b/source/Hack-Italic.ufo/glyphs/dieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dieresis" format="1">
+<glyph name="dieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00A8"/>
   <outline>
     <contour>
-      <point x="469" y="1350" type="line" name="hr00" smooth="yes"/>
+      <point x="469" y="1350" type="line" smooth="yes" name="hr00"/>
       <point x="449" y="1350"/>
       <point x="438" y="1363"/>
       <point x="442" y="1383" type="curve" smooth="yes"/>
       <point x="470" y="1525" type="line"/>
       <point x="473" y="1543"/>
       <point x="483" y="1552"/>
-      <point x="502" y="1552" type="curve" name="dv01" smooth="yes"/>
+      <point x="502" y="1552" type="curve" smooth="yes" name="dv01"/>
       <point x="645" y="1552" type="line" smooth="yes"/>
       <point x="665" y="1552"/>
       <point x="676" y="1539"/>
@@ -22,14 +22,14 @@
       <point x="612" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="860" y="1350" type="line" name="sv01" smooth="yes"/>
+      <point x="860" y="1350" type="line" smooth="yes" name="sv01"/>
       <point x="840" y="1350"/>
       <point x="829" y="1363"/>
       <point x="833" y="1383" type="curve" smooth="yes"/>
       <point x="861" y="1525" type="line"/>
       <point x="864" y="1543"/>
       <point x="874" y="1552"/>
-      <point x="893" y="1552" type="curve" name="sv02" smooth="yes"/>
+      <point x="893" y="1552" type="curve" smooth="yes" name="sv02"/>
       <point x="1036" y="1552" type="line" smooth="yes"/>
       <point x="1056" y="1552"/>
       <point x="1067" y="1539"/>
diff --git a/source/Hack-Italic.ufo/glyphs/dieresistonos.glif b/source/Hack-Italic.ufo/glyphs/dieresistonos.glif
index e62a4e3ea..e1ceb5a26 100644
--- a/source/Hack-Italic.ufo/glyphs/dieresistonos.glif
+++ b/source/Hack-Italic.ufo/glyphs/dieresistonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dieresistonos" format="1">
+<glyph name="dieresistonos" format="2">
   <advance width="1233"/>
   <unicode hex="0385"/>
   <outline>
@@ -10,14 +10,14 @@
       <point x="676" y="1520" type="line" name="sv01"/>
     </contour>
     <contour>
-      <point x="439" y="1320" type="line" name="sv02" smooth="yes"/>
+      <point x="439" y="1320" type="line" smooth="yes" name="sv02"/>
       <point x="419" y="1320"/>
       <point x="408" y="1333"/>
       <point x="412" y="1353" type="curve" smooth="yes"/>
       <point x="440" y="1495" type="line"/>
       <point x="443" y="1513"/>
       <point x="453" y="1522"/>
-      <point x="472" y="1522" type="curve" name="at02" smooth="yes"/>
+      <point x="472" y="1522" type="curve" smooth="yes" name="at02"/>
       <point x="615" y="1522" type="line" smooth="yes"/>
       <point x="635" y="1522"/>
       <point x="646" y="1509"/>
@@ -28,15 +28,15 @@
       <point x="582" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="870" y="1320" type="line" name="sv03" smooth="yes"/>
+      <point x="870" y="1320" type="line" smooth="yes" name="sv03"/>
       <point x="850" y="1320"/>
       <point x="839" y="1333"/>
       <point x="843" y="1353" type="curve" smooth="yes"/>
       <point x="871" y="1495" type="line"/>
       <point x="874" y="1513"/>
       <point x="884" y="1522"/>
-      <point x="903" y="1522" type="curve" name="at03" smooth="yes"/>
-      <point x="1046" y="1522" type="line" name="hr01" smooth="yes"/>
+      <point x="903" y="1522" type="curve" smooth="yes" name="at03"/>
+      <point x="1046" y="1522" type="line" smooth="yes" name="hr01"/>
       <point x="1066" y="1522"/>
       <point x="1077" y="1509"/>
       <point x="1073" y="1489" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/divide.glif b/source/Hack-Italic.ufo/glyphs/divide.glif
index 59455b3d0..eef0f29cc 100644
--- a/source/Hack-Italic.ufo/glyphs/divide.glif
+++ b/source/Hack-Italic.ufo/glyphs/divide.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="divide" format="1">
+<glyph name="divide" format="2">
   <advance width="1233"/>
   <unicode hex="00F7"/>
   <outline>
     <contour>
-      <point x="524" y="889" type="line" name="hr00" smooth="yes"/>
+      <point x="524" y="889" type="line" smooth="yes" name="hr00"/>
       <point x="504" y="889"/>
       <point x="494" y="899"/>
-      <point x="494" y="919" type="curve" name="dh01" smooth="yes"/>
+      <point x="494" y="919" type="curve" smooth="yes" name="dh01"/>
       <point x="494" y="1105" type="line" smooth="yes"/>
       <point x="494" y="1125"/>
       <point x="504" y="1135"/>
-      <point x="524" y="1135" type="curve" name="at01" smooth="yes"/>
+      <point x="524" y="1135" type="curve" smooth="yes" name="at01"/>
       <point x="709" y="1135" type="line" smooth="yes"/>
       <point x="729" y="1135"/>
       <point x="739" y="1125"/>
       <point x="739" y="1105" type="curve" smooth="yes"/>
-      <point x="739" y="919" type="line" name="dh02" smooth="yes"/>
+      <point x="739" y="919" type="line" smooth="yes" name="dh02"/>
       <point x="739" y="899"/>
       <point x="729" y="889"/>
       <point x="709" y="889" type="curve" smooth="yes"/>
@@ -28,18 +28,18 @@
       <point x="88" y="557" type="line"/>
     </contour>
     <contour>
-      <point x="524" y="150" type="line" name="dv01" smooth="yes"/>
+      <point x="524" y="150" type="line" smooth="yes" name="dv01"/>
       <point x="504" y="150"/>
       <point x="494" y="160"/>
-      <point x="494" y="180" type="curve" name="sh01" smooth="yes"/>
+      <point x="494" y="180" type="curve" smooth="yes" name="sh01"/>
       <point x="494" y="365" type="line" smooth="yes"/>
       <point x="494" y="385"/>
       <point x="504" y="395"/>
-      <point x="524" y="395" type="curve" name="dv02" smooth="yes"/>
+      <point x="524" y="395" type="curve" smooth="yes" name="dv02"/>
       <point x="709" y="395" type="line" smooth="yes"/>
       <point x="729" y="395"/>
       <point x="739" y="385"/>
-      <point x="739" y="365" type="curve" name="sh02" smooth="yes"/>
+      <point x="739" y="365" type="curve" smooth="yes" name="sh02"/>
       <point x="739" y="180" type="line" smooth="yes"/>
       <point x="739" y="160"/>
       <point x="729" y="150"/>
diff --git a/source/Hack-Italic.ufo/glyphs/dkshade.glif b/source/Hack-Italic.ufo/glyphs/dkshade.glif
index 4107a505a..8a2848824 100644
--- a/source/Hack-Italic.ufo/glyphs/dkshade.glif
+++ b/source/Hack-Italic.ufo/glyphs/dkshade.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dkshade" format="1">
+<glyph name="dkshade" format="2">
   <advance width="1233"/>
   <unicode hex="2593"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/dnblock.glif b/source/Hack-Italic.ufo/glyphs/dnblock.glif
index d5c91abc5..ae024e4f7 100644
--- a/source/Hack-Italic.ufo/glyphs/dnblock.glif
+++ b/source/Hack-Italic.ufo/glyphs/dnblock.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dnblock" format="1">
+<glyph name="dnblock" format="2">
   <advance width="1233"/>
   <unicode hex="2584"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/dollar.glif b/source/Hack-Italic.ufo/glyphs/dollar.glif
index f6c69161f..4bfa1f631 100644
--- a/source/Hack-Italic.ufo/glyphs/dollar.glif
+++ b/source/Hack-Italic.ufo/glyphs/dollar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dollar" format="1">
+<glyph name="dollar" format="2">
   <advance width="1233"/>
   <unicode hex="0024"/>
   <outline>
@@ -24,7 +24,7 @@
       <point x="275" y="714" type="curve" smooth="yes"/>
       <point x="224" y="761"/>
       <point x="195" y="821"/>
-      <point x="195" y="912" type="curve" name="sh01" smooth="yes"/>
+      <point x="195" y="912" type="curve" smooth="yes" name="sh01"/>
       <point x="195" y="1023"/>
       <point x="239" y="1123"/>
       <point x="328" y="1200" type="curve" smooth="yes"/>
@@ -50,13 +50,13 @@
       <point x="925" y="639" type="curve" smooth="yes"/>
       <point x="985" y="583"/>
       <point x="1014" y="516"/>
-      <point x="1014" y="421" type="curve" name="sh02" smooth="yes"/>
+      <point x="1014" y="421" type="curve" smooth="yes" name="sh02"/>
       <point x="1014" y="304"/>
       <point x="969" y="202"/>
       <point x="877" y="122" type="curve" smooth="yes"/>
       <point x="786" y="42"/>
       <point x="668" y="2"/>
-      <point x="524" y="2" type="curve" name="ab02" smooth="yes"/>
+      <point x="524" y="2" type="curve" smooth="yes" name="ab02"/>
       <point x="554" y="2" type="line"/>
       <point x="495" y="-301" type="line" name="av01"/>
       <point x="314" y="-301" type="line"/>
@@ -65,7 +65,7 @@
       <point x="633" y="1184" type="line"/>
       <point x="489" y="1175"/>
       <point x="373" y="1072"/>
-      <point x="373" y="941" type="curve" name="sh03" smooth="yes"/>
+      <point x="373" y="941" type="curve" smooth="yes" name="sh03"/>
       <point x="373" y="894"/>
       <point x="387" y="859"/>
       <point x="415" y="834" type="curve" smooth="yes"/>
@@ -80,7 +80,7 @@
       <point x="752" y="218" type="curve" smooth="yes"/>
       <point x="803" y="265"/>
       <point x="831" y="326"/>
-      <point x="831" y="402" type="curve" name="ah01" smooth="yes"/>
+      <point x="831" y="402" type="curve" smooth="yes" name="ah01"/>
       <point x="831" y="461"/>
       <point x="815" y="500"/>
       <point x="784" y="527" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/dong.glif b/source/Hack-Italic.ufo/glyphs/dong.glif
index d6c023eb8..54ad7647d 100644
--- a/source/Hack-Italic.ufo/glyphs/dong.glif
+++ b/source/Hack-Italic.ufo/glyphs/dong.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dong" format="1">
+<glyph name="dong" format="2">
   <advance width="1233"/>
   <unicode hex="20AB"/>
   <outline>
     <contour>
-      <point x="567" y="-30" type="curve" name="sv02" smooth="yes"/>
+      <point x="567" y="-30" type="curve" smooth="yes" name="sv02"/>
       <point x="352" y="-30"/>
       <point x="226" y="111"/>
-      <point x="226" y="378" type="curve" name="dh01" smooth="yes"/>
+      <point x="226" y="378" type="curve" smooth="yes" name="dh01"/>
       <point x="226" y="554"/>
       <point x="282" y="761"/>
       <point x="375" y="908" type="curve" smooth="yes"/>
       <point x="475" y="1065"/>
       <point x="613" y="1146"/>
-      <point x="773" y="1146" type="curve" name="at02" smooth="yes"/>
+      <point x="773" y="1146" type="curve" smooth="yes" name="at02"/>
       <point x="906" y="1146"/>
       <point x="1004" y="1091"/>
       <point x="1061" y="976" type="curve"/>
@@ -34,22 +34,22 @@
       <point x="704" y="-30"/>
     </contour>
     <contour>
-      <point x="624" y="126" type="curve" name="sv01" smooth="yes"/>
+      <point x="624" y="126" type="curve" smooth="yes" name="sv01"/>
       <point x="743" y="126"/>
       <point x="831" y="188"/>
-      <point x="895" y="304" type="curve" name="hr02" smooth="yes"/>
+      <point x="895" y="304" type="curve" smooth="yes" name="hr02"/>
       <point x="959" y="419"/>
       <point x="1000" y="591"/>
       <point x="1000" y="723" type="curve" smooth="yes"/>
       <point x="1000" y="907"/>
       <point x="925" y="990"/>
-      <point x="788" y="990" type="curve" name="hr03" smooth="yes"/>
+      <point x="788" y="990" type="curve" smooth="yes" name="hr03"/>
       <point x="669" y="990"/>
       <point x="586" y="928"/>
       <point x="525" y="816" type="curve" smooth="yes"/>
       <point x="461" y="699"/>
       <point x="422" y="530"/>
-      <point x="422" y="391" type="curve" name="dh02" smooth="yes"/>
+      <point x="422" y="391" type="curve" smooth="yes" name="dh02"/>
       <point x="422" y="210"/>
       <point x="487" y="126"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/dotaccent.glif b/source/Hack-Italic.ufo/glyphs/dotaccent.glif
index 205ffb7e1..7ec471c41 100644
--- a/source/Hack-Italic.ufo/glyphs/dotaccent.glif
+++ b/source/Hack-Italic.ufo/glyphs/dotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dotaccent" format="1">
+<glyph name="dotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="02D9"/>
   <outline>
     <contour>
-      <point x="664" y="1348" type="line" name="hr00" smooth="yes"/>
+      <point x="664" y="1348" type="line" smooth="yes" name="hr00"/>
       <point x="646" y="1348"/>
       <point x="637" y="1356"/>
       <point x="637" y="1372" type="curve" smooth="yes"/>
@@ -14,7 +14,7 @@
       <point x="667" y="1525" type="line"/>
       <point x="670" y="1543"/>
       <point x="680" y="1552"/>
-      <point x="699" y="1552" type="curve" name="dv01" smooth="yes"/>
+      <point x="699" y="1552" type="curve" smooth="yes" name="dv01"/>
       <point x="844" y="1552" type="line" smooth="yes"/>
       <point x="862" y="1552"/>
       <point x="871" y="1544"/>
@@ -25,7 +25,7 @@
       <point x="841" y="1375" type="line" smooth="yes"/>
       <point x="838" y="1357"/>
       <point x="827" y="1348"/>
-      <point x="809" y="1348" type="curve" name="sv01" smooth="yes"/>
+      <point x="809" y="1348" type="curve" smooth="yes" name="sv01"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Italic.ufo/glyphs/dotbelowcomb.glif b/source/Hack-Italic.ufo/glyphs/dotbelowcomb.glif
index 6e02b577b..e849782c4 100644
--- a/source/Hack-Italic.ufo/glyphs/dotbelowcomb.glif
+++ b/source/Hack-Italic.ufo/glyphs/dotbelowcomb.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dotbelowcomb" format="1">
-  <advance width="0"/>
+<glyph name="dotbelowcomb" format="2">
   <unicode hex="0323"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/dotlessi.glif b/source/Hack-Italic.ufo/glyphs/dotlessi.glif
index 626d599fb..a1c145693 100644
--- a/source/Hack-Italic.ufo/glyphs/dotlessi.glif
+++ b/source/Hack-Italic.ufo/glyphs/dotlessi.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dotlessi" format="1">
+<glyph name="dotlessi" format="2">
   <advance width="1233"/>
   <unicode hex="0131"/>
   <outline>
     <contour>
-      <point x="749" y="-4" type="line" name="hr00" smooth="yes"/>
+      <point x="749" y="-4" type="line" smooth="yes" name="hr00"/>
       <point x="633" y="-4"/>
       <point x="547" y="17"/>
       <point x="492" y="60" type="curve" smooth="yes"/>
       <point x="435" y="103"/>
       <point x="407" y="167"/>
-      <point x="407" y="252" type="curve" name="dh01" smooth="yes"/>
+      <point x="407" y="252" type="curve" smooth="yes" name="dh01"/>
       <point x="407" y="293"/>
       <point x="412" y="348"/>
       <point x="426" y="408" type="curve" smooth="yes"/>
@@ -24,13 +24,13 @@
       <point x="600" y="342" type="curve" smooth="yes"/>
       <point x="597" y="321"/>
       <point x="596" y="310"/>
-      <point x="596" y="297" type="curve" name="dh02" smooth="yes"/>
+      <point x="596" y="297" type="curve" smooth="yes" name="dh02"/>
       <point x="596" y="248"/>
       <point x="611" y="211"/>
       <point x="640" y="188" type="curve" smooth="yes"/>
       <point x="670" y="164"/>
       <point x="715" y="152"/>
-      <point x="776" y="152" type="curve" name="sv02" smooth="yes"/>
+      <point x="776" y="152" type="curve" smooth="yes" name="sv02"/>
       <point x="987" y="152" type="line" name="sv03"/>
       <point x="956" y="-4" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/dotmath.glif b/source/Hack-Italic.ufo/glyphs/dotmath.glif
index 26abf5f07..e30c524ff 100644
--- a/source/Hack-Italic.ufo/glyphs/dotmath.glif
+++ b/source/Hack-Italic.ufo/glyphs/dotmath.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dotmath" format="1">
+<glyph name="dotmath" format="2">
   <advance width="1233"/>
   <unicode hex="22C5"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/e.glif b/source/Hack-Italic.ufo/glyphs/e.glif
index 482e38653..913ab35e0 100644
--- a/source/Hack-Italic.ufo/glyphs/e.glif
+++ b/source/Hack-Italic.ufo/glyphs/e.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="e" format="1">
+<glyph name="e" format="2">
   <advance width="1233"/>
   <unicode hex="0065"/>
   <outline>
@@ -45,9 +45,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/eacute.glif b/source/Hack-Italic.ufo/glyphs/eacute.glif
index 53bbde48b..03fc41458 100644
--- a/source/Hack-Italic.ufo/glyphs/eacute.glif
+++ b/source/Hack-Italic.ufo/glyphs/eacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eacute" format="1">
+<glyph name="eacute" format="2">
   <advance width="1233"/>
   <unicode hex="00E9"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="575" y="1297" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="558" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="558" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="398" y="-29"/>
       <point x="288" y="11"/>
       <point x="213" y="83" type="curve" smooth="yes"/>
       <point x="136" y="158"/>
       <point x="98" y="267"/>
-      <point x="98" y="410" type="curve" name="sh03" smooth="yes"/>
+      <point x="98" y="410" type="curve" smooth="yes" name="sh03"/>
       <point x="98" y="615"/>
       <point x="183" y="828"/>
       <point x="324" y="973" type="curve" smooth="yes"/>
@@ -25,13 +25,13 @@
       <point x="508" y="1104" type="curve" smooth="yes"/>
       <point x="576" y="1135"/>
       <point x="643" y="1149"/>
-      <point x="719" y="1149" type="curve" name="dv05" smooth="yes"/>
+      <point x="719" y="1149" type="curve" smooth="yes" name="dv05"/>
       <point x="846" y="1149"/>
       <point x="944" y="1107"/>
       <point x="1015" y="1035" type="curve" smooth="yes"/>
       <point x="1088" y="959"/>
       <point x="1126" y="852"/>
-      <point x="1126" y="729" type="curve" name="sh01" smooth="yes"/>
+      <point x="1126" y="729" type="curve" smooth="yes" name="sh01"/>
       <point x="1126" y="701"/>
       <point x="1124" y="678"/>
       <point x="1121" y="645" type="curve" name="sh04"/>
@@ -41,16 +41,16 @@
       <point x="297" y="516" type="line" name="sh06"/>
       <point x="293" y="496"/>
       <point x="290" y="477"/>
-      <point x="288" y="458" type="curve" name="sh07" smooth="yes"/>
+      <point x="288" y="458" type="curve" smooth="yes" name="sh07"/>
       <point x="286" y="441"/>
       <point x="285" y="424"/>
-      <point x="285" y="409" type="curve" name="sh05" smooth="yes"/>
+      <point x="285" y="409" type="curve" smooth="yes" name="sh05"/>
       <point x="285" y="319"/>
       <point x="311" y="249"/>
       <point x="362" y="200" type="curve" smooth="yes"/>
       <point x="413" y="151"/>
       <point x="488" y="127"/>
-      <point x="584" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="584" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="647" y="127"/>
       <point x="708" y="137"/>
       <point x="779" y="156" type="curve" smooth="yes"/>
@@ -68,16 +68,16 @@
       <point x="938" y="659" type="line" name="sh09"/>
       <point x="942" y="678"/>
       <point x="945" y="692"/>
-      <point x="946" y="704" type="curve" name="sh10" smooth="yes"/>
+      <point x="946" y="704" type="curve" smooth="yes" name="sh10"/>
       <point x="947" y="715"/>
       <point x="948" y="725"/>
-      <point x="948" y="741" type="curve" name="ah01" smooth="yes"/>
+      <point x="948" y="741" type="curve" smooth="yes" name="ah01"/>
       <point x="948" y="818"/>
       <point x="926" y="879"/>
       <point x="883" y="924" type="curve" smooth="yes"/>
       <point x="840" y="969"/>
       <point x="778" y="991"/>
-      <point x="706" y="991" type="curve" name="dv04" smooth="yes"/>
+      <point x="706" y="991" type="curve" smooth="yes" name="dv04"/>
       <point x="626" y="991"/>
       <point x="548" y="965"/>
       <point x="477" y="901" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/ebreve.glif b/source/Hack-Italic.ufo/glyphs/ebreve.glif
index 5103fcde5..1b122ee83 100644
--- a/source/Hack-Italic.ufo/glyphs/ebreve.glif
+++ b/source/Hack-Italic.ufo/glyphs/ebreve.glif
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ebreve" format="1">
+<glyph name="ebreve" format="2">
   <advance width="1233"/>
   <unicode hex="0115"/>
   <outline>
     <contour>
       <point x="689" y="-22"/>
       <point x="630" y="-29"/>
-      <point x="558" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="558" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="398" y="-29"/>
       <point x="288" y="11"/>
       <point x="213" y="83" type="curve" smooth="yes"/>
       <point x="136" y="158"/>
       <point x="98" y="267"/>
-      <point x="98" y="410" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="410" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="615"/>
       <point x="183" y="828"/>
       <point x="324" y="973" type="curve" smooth="yes"/>
@@ -21,13 +21,13 @@
       <point x="508" y="1104" type="curve" smooth="yes"/>
       <point x="576" y="1135"/>
       <point x="643" y="1149"/>
-      <point x="719" y="1149" type="curve" name="dv03" smooth="yes"/>
+      <point x="719" y="1149" type="curve" smooth="yes" name="dv03"/>
       <point x="846" y="1149"/>
       <point x="944" y="1107"/>
       <point x="1015" y="1035" type="curve" smooth="yes"/>
       <point x="1088" y="959"/>
       <point x="1126" y="852"/>
-      <point x="1126" y="729" type="curve" name="sh02" smooth="yes"/>
+      <point x="1126" y="729" type="curve" smooth="yes" name="sh02"/>
       <point x="1126" y="701"/>
       <point x="1124" y="678"/>
       <point x="1121" y="645" type="curve" name="sh03"/>
@@ -37,16 +37,16 @@
       <point x="297" y="516" type="line" name="sh05"/>
       <point x="293" y="496"/>
       <point x="290" y="477"/>
-      <point x="288" y="458" type="curve" name="sh06" smooth="yes"/>
+      <point x="288" y="458" type="curve" smooth="yes" name="sh06"/>
       <point x="286" y="441"/>
       <point x="285" y="424"/>
-      <point x="285" y="409" type="curve" name="sh04" smooth="yes"/>
+      <point x="285" y="409" type="curve" smooth="yes" name="sh04"/>
       <point x="285" y="319"/>
       <point x="311" y="249"/>
       <point x="362" y="200" type="curve" smooth="yes"/>
       <point x="413" y="151"/>
       <point x="488" y="127"/>
-      <point x="584" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="584" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="647" y="127"/>
       <point x="708" y="137"/>
       <point x="779" y="156" type="curve" smooth="yes"/>
@@ -62,16 +62,16 @@
       <point x="938" y="659" type="line" name="sh08"/>
       <point x="942" y="678"/>
       <point x="945" y="692"/>
-      <point x="946" y="704" type="curve" name="sh09" smooth="yes"/>
+      <point x="946" y="704" type="curve" smooth="yes" name="sh09"/>
       <point x="947" y="715"/>
       <point x="948" y="725"/>
-      <point x="948" y="741" type="curve" name="ah01" smooth="yes"/>
+      <point x="948" y="741" type="curve" smooth="yes" name="ah01"/>
       <point x="948" y="818"/>
       <point x="926" y="879"/>
       <point x="883" y="924" type="curve" smooth="yes"/>
       <point x="840" y="969"/>
       <point x="778" y="991"/>
-      <point x="706" y="991" type="curve" name="dv02" smooth="yes"/>
+      <point x="706" y="991" type="curve" smooth="yes" name="dv02"/>
       <point x="626" y="991"/>
       <point x="548" y="965"/>
       <point x="477" y="901" type="curve" smooth="yes"/>
@@ -82,7 +82,7 @@
     <contour>
       <point x="918" y="1321"/>
       <point x="841" y="1297"/>
-      <point x="748" y="1297" type="curve" name="dv03" smooth="yes"/>
+      <point x="748" y="1297" type="curve" smooth="yes" name="dv03"/>
       <point x="660" y="1297"/>
       <point x="591" y="1318"/>
       <point x="542" y="1360" type="curve" smooth="yes"/>
@@ -102,7 +102,7 @@
       <point x="636" y="1468" type="curve" smooth="yes"/>
       <point x="665" y="1445"/>
       <point x="707" y="1434"/>
-      <point x="762" y="1434" type="curve" name="dv04" smooth="yes"/>
+      <point x="762" y="1434" type="curve" smooth="yes" name="dv04"/>
       <point x="817" y="1434"/>
       <point x="862" y="1446"/>
       <point x="897" y="1471" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/ecaron.glif b/source/Hack-Italic.ufo/glyphs/ecaron.glif
index dfe639e78..2984fd14b 100644
--- a/source/Hack-Italic.ufo/glyphs/ecaron.glif
+++ b/source/Hack-Italic.ufo/glyphs/ecaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ecaron" format="1">
+<glyph name="ecaron" format="2">
   <advance width="1233"/>
   <unicode hex="011B"/>
   <outline>
@@ -13,29 +13,29 @@
       <point x="690" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="556" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="556" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="253" y="-29"/>
       <point x="98" y="122"/>
-      <point x="98" y="407" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="407" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="615"/>
       <point x="183" y="829"/>
       <point x="324" y="973" type="curve"/>
       <point x="436" y="1089"/>
       <point x="570" y="1149"/>
-      <point x="719" y="1149" type="curve" name="dv05" smooth="yes"/>
+      <point x="719" y="1149" type="curve" smooth="yes" name="dv05"/>
       <point x="964" y="1149"/>
       <point x="1126" y="983"/>
-      <point x="1126" y="731" type="curve" name="sh02" smooth="yes"/>
+      <point x="1126" y="731" type="curve" smooth="yes" name="sh02"/>
       <point x="1126" y="683"/>
       <point x="1120" y="620"/>
       <point x="1104" y="516" type="curve" name="dv03"/>
       <point x="297" y="516" type="line" name="sh04"/>
       <point x="289" y="473"/>
       <point x="285" y="441"/>
-      <point x="285" y="406" type="curve" name="sh03" smooth="yes"/>
+      <point x="285" y="406" type="curve" smooth="yes" name="sh03"/>
       <point x="285" y="229"/>
       <point x="388" y="127"/>
-      <point x="584" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="584" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="704" y="127"/>
       <point x="844" y="164"/>
       <point x="997" y="240" type="curve" name="ih02"/>
@@ -47,10 +47,10 @@
       <point x="938" y="659" type="line" name="sh06"/>
       <point x="946" y="695"/>
       <point x="948" y="716"/>
-      <point x="948" y="739" type="curve" name="ah01" smooth="yes"/>
+      <point x="948" y="739" type="curve" smooth="yes" name="ah01"/>
       <point x="948" y="897"/>
       <point x="854" y="991"/>
-      <point x="707" y="991" type="curve" name="dv04" smooth="yes"/>
+      <point x="707" y="991" type="curve" smooth="yes" name="dv04"/>
       <point x="533" y="991"/>
       <point x="391" y="860"/>
       <point x="332" y="659" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/ecircumflex.glif b/source/Hack-Italic.ufo/glyphs/ecircumflex.glif
index 910c62d28..9df745129 100644
--- a/source/Hack-Italic.ufo/glyphs/ecircumflex.glif
+++ b/source/Hack-Italic.ufo/glyphs/ecircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ecircumflex" format="1">
+<glyph name="ecircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00EA"/>
   <outline>
@@ -13,13 +13,13 @@
       <point x="397" y="1297" type="line" name="ih03"/>
     </contour>
     <contour>
-      <point x="558" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="558" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="398" y="-29"/>
       <point x="288" y="11"/>
       <point x="213" y="83" type="curve" smooth="yes"/>
       <point x="136" y="158"/>
       <point x="98" y="267"/>
-      <point x="98" y="410" type="curve" name="sh02" smooth="yes"/>
+      <point x="98" y="410" type="curve" smooth="yes" name="sh02"/>
       <point x="98" y="615"/>
       <point x="183" y="828"/>
       <point x="324" y="973" type="curve" smooth="yes"/>
@@ -28,13 +28,13 @@
       <point x="508" y="1104" type="curve" smooth="yes"/>
       <point x="576" y="1135"/>
       <point x="643" y="1149"/>
-      <point x="719" y="1149" type="curve" name="dv05" smooth="yes"/>
+      <point x="719" y="1149" type="curve" smooth="yes" name="dv05"/>
       <point x="846" y="1149"/>
       <point x="944" y="1107"/>
       <point x="1015" y="1035" type="curve" smooth="yes"/>
       <point x="1088" y="959"/>
       <point x="1126" y="852"/>
-      <point x="1126" y="729" type="curve" name="sh01" smooth="yes"/>
+      <point x="1126" y="729" type="curve" smooth="yes" name="sh01"/>
       <point x="1126" y="701"/>
       <point x="1124" y="678"/>
       <point x="1121" y="645" type="curve" name="sh03"/>
@@ -44,16 +44,16 @@
       <point x="297" y="516" type="line" name="sh05"/>
       <point x="293" y="496"/>
       <point x="290" y="477"/>
-      <point x="288" y="458" type="curve" name="sh06" smooth="yes"/>
+      <point x="288" y="458" type="curve" smooth="yes" name="sh06"/>
       <point x="286" y="441"/>
       <point x="285" y="424"/>
-      <point x="285" y="409" type="curve" name="sh04" smooth="yes"/>
+      <point x="285" y="409" type="curve" smooth="yes" name="sh04"/>
       <point x="285" y="319"/>
       <point x="311" y="249"/>
       <point x="362" y="200" type="curve" smooth="yes"/>
       <point x="413" y="151"/>
       <point x="488" y="127"/>
-      <point x="584" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="584" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="647" y="127"/>
       <point x="708" y="137"/>
       <point x="779" y="156" type="curve" smooth="yes"/>
@@ -71,16 +71,16 @@
       <point x="938" y="659" type="line" name="sh08"/>
       <point x="942" y="678"/>
       <point x="945" y="692"/>
-      <point x="946" y="704" type="curve" name="sh09" smooth="yes"/>
+      <point x="946" y="704" type="curve" smooth="yes" name="sh09"/>
       <point x="947" y="715"/>
       <point x="948" y="725"/>
-      <point x="948" y="741" type="curve" name="ah01" smooth="yes"/>
+      <point x="948" y="741" type="curve" smooth="yes" name="ah01"/>
       <point x="948" y="818"/>
       <point x="926" y="879"/>
       <point x="883" y="924" type="curve" smooth="yes"/>
       <point x="840" y="969"/>
       <point x="778" y="991"/>
-      <point x="706" y="991" type="curve" name="dv04" smooth="yes"/>
+      <point x="706" y="991" type="curve" smooth="yes" name="dv04"/>
       <point x="626" y="991"/>
       <point x="548" y="965"/>
       <point x="477" y="901" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/edieresis.glif b/source/Hack-Italic.ufo/glyphs/edieresis.glif
index e117d5cb2..4473c6158 100644
--- a/source/Hack-Italic.ufo/glyphs/edieresis.glif
+++ b/source/Hack-Italic.ufo/glyphs/edieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="edieresis" format="1">
+<glyph name="edieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00EB"/>
   <outline>
     <contour>
-      <point x="469" y="1350" type="line" name="hr00" smooth="yes"/>
+      <point x="469" y="1350" type="line" smooth="yes" name="hr00"/>
       <point x="449" y="1350"/>
       <point x="438" y="1363"/>
       <point x="442" y="1383" type="curve" smooth="yes"/>
       <point x="470" y="1525" type="line"/>
       <point x="473" y="1543"/>
       <point x="483" y="1552"/>
-      <point x="502" y="1552" type="curve" name="dv03" smooth="yes"/>
+      <point x="502" y="1552" type="curve" smooth="yes" name="dv03"/>
       <point x="645" y="1552" type="line" smooth="yes"/>
       <point x="665" y="1552"/>
       <point x="676" y="1539"/>
@@ -22,14 +22,14 @@
       <point x="612" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="860" y="1350" type="line" name="sv01" smooth="yes"/>
+      <point x="860" y="1350" type="line" smooth="yes" name="sv01"/>
       <point x="840" y="1350"/>
       <point x="829" y="1363"/>
       <point x="833" y="1383" type="curve" smooth="yes"/>
       <point x="861" y="1525" type="line"/>
       <point x="864" y="1543"/>
       <point x="874" y="1552"/>
-      <point x="893" y="1552" type="curve" name="sv02" smooth="yes"/>
+      <point x="893" y="1552" type="curve" smooth="yes" name="sv02"/>
       <point x="1036" y="1552" type="line" smooth="yes"/>
       <point x="1056" y="1552"/>
       <point x="1067" y="1539"/>
@@ -40,13 +40,13 @@
       <point x="1003" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="558" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="558" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="398" y="-29"/>
       <point x="288" y="11"/>
       <point x="213" y="83" type="curve" smooth="yes"/>
       <point x="136" y="158"/>
       <point x="98" y="267"/>
-      <point x="98" y="410" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="410" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="615"/>
       <point x="183" y="828"/>
       <point x="324" y="973" type="curve" smooth="yes"/>
@@ -55,13 +55,13 @@
       <point x="508" y="1104" type="curve" smooth="yes"/>
       <point x="576" y="1135"/>
       <point x="643" y="1149"/>
-      <point x="719" y="1149" type="curve" name="dv06" smooth="yes"/>
+      <point x="719" y="1149" type="curve" smooth="yes" name="dv06"/>
       <point x="846" y="1149"/>
       <point x="944" y="1107"/>
       <point x="1015" y="1035" type="curve" smooth="yes"/>
       <point x="1088" y="959"/>
       <point x="1126" y="852"/>
-      <point x="1126" y="729" type="curve" name="sh02" smooth="yes"/>
+      <point x="1126" y="729" type="curve" smooth="yes" name="sh02"/>
       <point x="1126" y="701"/>
       <point x="1124" y="678"/>
       <point x="1121" y="645" type="curve" name="sh03"/>
@@ -71,16 +71,16 @@
       <point x="297" y="516" type="line" name="sh05"/>
       <point x="293" y="496"/>
       <point x="290" y="477"/>
-      <point x="288" y="458" type="curve" name="sh06" smooth="yes"/>
+      <point x="288" y="458" type="curve" smooth="yes" name="sh06"/>
       <point x="286" y="441"/>
       <point x="285" y="424"/>
-      <point x="285" y="409" type="curve" name="sh04" smooth="yes"/>
+      <point x="285" y="409" type="curve" smooth="yes" name="sh04"/>
       <point x="285" y="319"/>
       <point x="311" y="249"/>
       <point x="362" y="200" type="curve" smooth="yes"/>
       <point x="413" y="151"/>
       <point x="488" y="127"/>
-      <point x="584" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="584" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="647" y="127"/>
       <point x="708" y="137"/>
       <point x="779" y="156" type="curve" smooth="yes"/>
@@ -98,16 +98,16 @@
       <point x="938" y="659" type="line" name="sh08"/>
       <point x="942" y="678"/>
       <point x="945" y="692"/>
-      <point x="946" y="704" type="curve" name="sh09" smooth="yes"/>
+      <point x="946" y="704" type="curve" smooth="yes" name="sh09"/>
       <point x="947" y="715"/>
       <point x="948" y="725"/>
-      <point x="948" y="741" type="curve" name="ah01" smooth="yes"/>
+      <point x="948" y="741" type="curve" smooth="yes" name="ah01"/>
       <point x="948" y="818"/>
       <point x="926" y="879"/>
       <point x="883" y="924" type="curve" smooth="yes"/>
       <point x="840" y="969"/>
       <point x="778" y="991"/>
-      <point x="706" y="991" type="curve" name="dv05" smooth="yes"/>
+      <point x="706" y="991" type="curve" smooth="yes" name="dv05"/>
       <point x="626" y="991"/>
       <point x="548" y="965"/>
       <point x="477" y="901" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/edotaccent.glif b/source/Hack-Italic.ufo/glyphs/edotaccent.glif
index db1d17444..4eca2ad60 100644
--- a/source/Hack-Italic.ufo/glyphs/edotaccent.glif
+++ b/source/Hack-Italic.ufo/glyphs/edotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="edotaccent" format="1">
+<glyph name="edotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="0117"/>
   <outline>
     <contour>
-      <point x="678" y="1349" type="line" name="hr00" smooth="yes"/>
+      <point x="678" y="1349" type="line" smooth="yes" name="hr00"/>
       <point x="660" y="1349"/>
       <point x="651" y="1357"/>
       <point x="651" y="1373" type="curve" smooth="yes"/>
@@ -14,7 +14,7 @@
       <point x="681" y="1526" type="line"/>
       <point x="684" y="1544"/>
       <point x="694" y="1553"/>
-      <point x="713" y="1553" type="curve" name="dv03" smooth="yes"/>
+      <point x="713" y="1553" type="curve" smooth="yes" name="dv03"/>
       <point x="858" y="1553" type="line" smooth="yes"/>
       <point x="876" y="1553"/>
       <point x="885" y="1545"/>
@@ -28,29 +28,29 @@
       <point x="823" y="1349" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="556" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="556" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="253" y="-29"/>
       <point x="98" y="122"/>
-      <point x="98" y="407" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="407" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="615"/>
       <point x="183" y="829"/>
       <point x="324" y="973" type="curve"/>
       <point x="436" y="1089"/>
       <point x="570" y="1149"/>
-      <point x="719" y="1149" type="curve" name="dv06" smooth="yes"/>
+      <point x="719" y="1149" type="curve" smooth="yes" name="dv06"/>
       <point x="964" y="1149"/>
       <point x="1126" y="983"/>
-      <point x="1126" y="731" type="curve" name="sh02" smooth="yes"/>
+      <point x="1126" y="731" type="curve" smooth="yes" name="sh02"/>
       <point x="1126" y="683"/>
       <point x="1120" y="620"/>
       <point x="1104" y="516" type="curve" name="dv04"/>
       <point x="297" y="516" type="line" name="sh04"/>
       <point x="289" y="473"/>
       <point x="285" y="441"/>
-      <point x="285" y="406" type="curve" name="sh03" smooth="yes"/>
+      <point x="285" y="406" type="curve" smooth="yes" name="sh03"/>
       <point x="285" y="229"/>
       <point x="388" y="127"/>
-      <point x="584" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="584" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="704" y="127"/>
       <point x="844" y="164"/>
       <point x="997" y="240" type="curve" name="ih01"/>
@@ -62,10 +62,10 @@
       <point x="938" y="659" type="line" name="sh06"/>
       <point x="946" y="695"/>
       <point x="948" y="716"/>
-      <point x="948" y="739" type="curve" name="ah01" smooth="yes"/>
+      <point x="948" y="739" type="curve" smooth="yes" name="ah01"/>
       <point x="948" y="897"/>
       <point x="854" y="991"/>
-      <point x="707" y="991" type="curve" name="dv05" smooth="yes"/>
+      <point x="707" y="991" type="curve" smooth="yes" name="dv05"/>
       <point x="533" y="991"/>
       <point x="391" y="860"/>
       <point x="332" y="659" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/egrave.glif b/source/Hack-Italic.ufo/glyphs/egrave.glif
index 61230020d..8f31a0269 100644
--- a/source/Hack-Italic.ufo/glyphs/egrave.glif
+++ b/source/Hack-Italic.ufo/glyphs/egrave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="egrave" format="1">
+<glyph name="egrave" format="2">
   <advance width="1233"/>
   <unicode hex="00E8"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="705" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="558" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="558" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="398" y="-29"/>
       <point x="288" y="11"/>
       <point x="213" y="83" type="curve" smooth="yes"/>
       <point x="136" y="158"/>
       <point x="98" y="267"/>
-      <point x="98" y="410" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="410" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="615"/>
       <point x="183" y="828"/>
       <point x="324" y="973" type="curve" smooth="yes"/>
@@ -25,13 +25,13 @@
       <point x="508" y="1104" type="curve" smooth="yes"/>
       <point x="576" y="1135"/>
       <point x="643" y="1149"/>
-      <point x="719" y="1149" type="curve" name="dv05" smooth="yes"/>
+      <point x="719" y="1149" type="curve" smooth="yes" name="dv05"/>
       <point x="846" y="1149"/>
       <point x="944" y="1107"/>
       <point x="1015" y="1035" type="curve" smooth="yes"/>
       <point x="1088" y="959"/>
       <point x="1126" y="852"/>
-      <point x="1126" y="729" type="curve" name="sh02" smooth="yes"/>
+      <point x="1126" y="729" type="curve" smooth="yes" name="sh02"/>
       <point x="1126" y="701"/>
       <point x="1124" y="678"/>
       <point x="1121" y="645" type="curve" name="sh03"/>
@@ -41,16 +41,16 @@
       <point x="297" y="516" type="line" name="sh05"/>
       <point x="293" y="496"/>
       <point x="290" y="477"/>
-      <point x="288" y="458" type="curve" name="sh06" smooth="yes"/>
+      <point x="288" y="458" type="curve" smooth="yes" name="sh06"/>
       <point x="286" y="441"/>
       <point x="285" y="424"/>
-      <point x="285" y="409" type="curve" name="sh04" smooth="yes"/>
+      <point x="285" y="409" type="curve" smooth="yes" name="sh04"/>
       <point x="285" y="319"/>
       <point x="311" y="249"/>
       <point x="362" y="200" type="curve" smooth="yes"/>
       <point x="413" y="151"/>
       <point x="488" y="127"/>
-      <point x="584" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="584" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="647" y="127"/>
       <point x="708" y="137"/>
       <point x="779" y="156" type="curve" smooth="yes"/>
@@ -68,16 +68,16 @@
       <point x="938" y="659" type="line" name="sh08"/>
       <point x="942" y="678"/>
       <point x="945" y="692"/>
-      <point x="946" y="704" type="curve" name="sh09" smooth="yes"/>
+      <point x="946" y="704" type="curve" smooth="yes" name="sh09"/>
       <point x="947" y="715"/>
       <point x="948" y="725"/>
-      <point x="948" y="741" type="curve" name="ah01" smooth="yes"/>
+      <point x="948" y="741" type="curve" smooth="yes" name="ah01"/>
       <point x="948" y="818"/>
       <point x="926" y="879"/>
       <point x="883" y="924" type="curve" smooth="yes"/>
       <point x="840" y="969"/>
       <point x="778" y="991"/>
-      <point x="706" y="991" type="curve" name="dv04" smooth="yes"/>
+      <point x="706" y="991" type="curve" smooth="yes" name="dv04"/>
       <point x="626" y="991"/>
       <point x="548" y="965"/>
       <point x="477" y="901" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/eight.glif b/source/Hack-Italic.ufo/glyphs/eight.glif
index 362e98638..932d1e685 100644
--- a/source/Hack-Italic.ufo/glyphs/eight.glif
+++ b/source/Hack-Italic.ufo/glyphs/eight.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eight" format="1">
+<glyph name="eight" format="2">
   <advance width="1233"/>
   <unicode hex="0038"/>
   <outline>
     <contour>
-      <point x="483" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="483" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="350" y="-29"/>
       <point x="239" y="5"/>
       <point x="159" y="73" type="curve" smooth="yes"/>
       <point x="87" y="136"/>
       <point x="41" y="229"/>
-      <point x="41" y="354" type="curve" name="dh01" smooth="yes"/>
+      <point x="41" y="354" type="curve" smooth="yes" name="dh01"/>
       <point x="41" y="581"/>
       <point x="188" y="744"/>
       <point x="430" y="793" type="curve" name="ih02"/>
@@ -19,19 +19,19 @@
       <point x="269" y="904" type="curve" smooth="yes"/>
       <point x="230" y="955"/>
       <point x="215" y="1014"/>
-      <point x="215" y="1081" type="curve" name="ih03" smooth="yes"/>
+      <point x="215" y="1081" type="curve" smooth="yes" name="ih03"/>
       <point x="215" y="1201"/>
       <point x="267" y="1312"/>
       <point x="362" y="1393" type="curve" smooth="yes"/>
       <point x="462" y="1478"/>
       <point x="591" y="1520"/>
-      <point x="726" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="726" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="842" y="1520"/>
       <point x="942" y="1490"/>
       <point x="1015" y="1430" type="curve" smooth="yes"/>
       <point x="1084" y="1374"/>
       <point x="1126" y="1294"/>
-      <point x="1126" y="1191" type="curve" name="sh01" smooth="yes"/>
+      <point x="1126" y="1191" type="curve" smooth="yes" name="sh01"/>
       <point x="1126" y="1004"/>
       <point x="984" y="834"/>
       <point x="772" y="782" type="curve" name="ih04"/>
@@ -40,7 +40,7 @@
       <point x="962" y="669" type="curve" smooth="yes"/>
       <point x="1005" y="613"/>
       <point x="1026" y="542"/>
-      <point x="1026" y="455" type="curve" name="dh04" smooth="yes"/>
+      <point x="1026" y="455" type="curve" smooth="yes" name="dh04"/>
       <point x="1026" y="318"/>
       <point x="974" y="195"/>
       <point x="875" y="107" type="curve" smooth="yes"/>
@@ -48,25 +48,25 @@
       <point x="644" y="-29"/>
     </contour>
     <contour>
-      <point x="634" y="866" type="curve" name="dv03" smooth="yes"/>
+      <point x="634" y="866" type="curve" smooth="yes" name="dv03"/>
       <point x="717" y="866"/>
       <point x="786" y="895"/>
       <point x="842" y="953" type="curve" smooth="yes"/>
       <point x="898" y="1012"/>
       <point x="926" y="1083"/>
-      <point x="926" y="1162" type="curve" name="ih01" smooth="yes"/>
+      <point x="926" y="1162" type="curve" smooth="yes" name="ih01"/>
       <point x="926" y="1229"/>
       <point x="906" y="1274"/>
       <point x="866" y="1310" type="curve" smooth="yes"/>
       <point x="826" y="1346"/>
       <point x="773" y="1364"/>
-      <point x="706" y="1364" type="curve" name="hr02" smooth="yes"/>
+      <point x="706" y="1364" type="curve" smooth="yes" name="hr02"/>
       <point x="618" y="1364"/>
       <point x="549" y="1335"/>
       <point x="498" y="1284" type="curve" smooth="yes"/>
       <point x="443" y="1230"/>
       <point x="416" y="1162"/>
-      <point x="416" y="1081" type="curve" name="sh02" smooth="yes"/>
+      <point x="416" y="1081" type="curve" smooth="yes" name="sh02"/>
       <point x="416" y="1014"/>
       <point x="436" y="961"/>
       <point x="475" y="923" type="curve" smooth="yes"/>
@@ -74,25 +74,25 @@
       <point x="567" y="866"/>
     </contour>
     <contour>
-      <point x="494" y="127" type="curve" name="hr03" smooth="yes"/>
+      <point x="494" y="127" type="curve" smooth="yes" name="hr03"/>
       <point x="590" y="127"/>
       <point x="671" y="159"/>
       <point x="731" y="219" type="curve" smooth="yes"/>
       <point x="791" y="280"/>
       <point x="821" y="362"/>
-      <point x="821" y="458" type="curve" name="dh03" smooth="yes"/>
+      <point x="821" y="458" type="curve" smooth="yes" name="dh03"/>
       <point x="821" y="541"/>
       <point x="799" y="599"/>
       <point x="755" y="643" type="curve" smooth="yes"/>
       <point x="711" y="687"/>
       <point x="650" y="709"/>
-      <point x="572" y="709" type="curve" name="dv02" smooth="yes"/>
+      <point x="572" y="709" type="curve" smooth="yes" name="dv02"/>
       <point x="476" y="709"/>
       <point x="398" y="676"/>
       <point x="338" y="611" type="curve" smooth="yes"/>
       <point x="277" y="544"/>
       <point x="246" y="459"/>
-      <point x="246" y="364" type="curve" name="dh02" smooth="yes"/>
+      <point x="246" y="364" type="curve" smooth="yes" name="dh02"/>
       <point x="246" y="214"/>
       <point x="341" y="127"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/eight.subs.glif b/source/Hack-Italic.ufo/glyphs/eight.subs.glif
index c52b5fff8..fce9bb10a 100644
--- a/source/Hack-Italic.ufo/glyphs/eight.subs.glif
+++ b/source/Hack-Italic.ufo/glyphs/eight.subs.glif
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eight.subs" format="1">
+<glyph name="eight.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="617" y="-413" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="-413" type="curve" smooth="yes" name="dv01"/>
       <point x="435" y="-413"/>
       <point x="321" y="-332"/>
-      <point x="321" y="-199" type="curve" name="dh01" smooth="yes"/>
+      <point x="321" y="-199" type="curve" smooth="yes" name="dh01"/>
       <point x="321" y="-75"/>
       <point x="422" y="19"/>
       <point x="582" y="48" type="curve" name="ih01"/>
       <point x="482" y="77"/>
       <point x="437" y="133"/>
-      <point x="437" y="209" type="curve" name="ih02" smooth="yes"/>
+      <point x="437" y="209" type="curve" smooth="yes" name="ih02"/>
       <point x="437" y="345"/>
       <point x="588" y="454"/>
-      <point x="780" y="454" type="curve" name="dv04" smooth="yes"/>
+      <point x="780" y="454" type="curve" smooth="yes" name="dv04"/>
       <point x="939" y="454"/>
       <point x="1050" y="379"/>
-      <point x="1050" y="270" type="curve" name="sh02" smooth="yes"/>
+      <point x="1050" y="270" type="curve" smooth="yes" name="sh02"/>
       <point x="1050" y="169"/>
       <point x="956" y="73"/>
       <point x="812" y="41" type="curve" name="hr01"/>
       <point x="929" y="18"/>
       <point x="982" y="-48"/>
-      <point x="982" y="-143" type="curve" name="dh03" smooth="yes"/>
+      <point x="982" y="-143" type="curve" smooth="yes" name="dh03"/>
       <point x="982" y="-300"/>
       <point x="832" y="-413"/>
     </contour>
     <contour>
-      <point x="716" y="88" type="curve" name="sv01" smooth="yes"/>
+      <point x="716" y="88" type="curve" smooth="yes" name="sv01"/>
       <point x="828" y="88"/>
       <point x="915" y="163"/>
-      <point x="915" y="252" type="curve" name="sh01" smooth="yes"/>
+      <point x="915" y="252" type="curve" smooth="yes" name="sh01"/>
       <point x="915" y="325"/>
       <point x="857" y="367"/>
-      <point x="768" y="367" type="curve" name="dv03" smooth="yes"/>
+      <point x="768" y="367" type="curve" smooth="yes" name="dv03"/>
       <point x="655" y="367"/>
       <point x="573" y="300"/>
-      <point x="573" y="209" type="curve" name="sh03" smooth="yes"/>
+      <point x="573" y="209" type="curve" smooth="yes" name="sh03"/>
       <point x="573" y="133"/>
       <point x="628" y="88"/>
     </contour>
     <contour>
-      <point x="625" y="-326" type="curve" name="dv02" smooth="yes"/>
+      <point x="625" y="-326" type="curve" smooth="yes" name="dv02"/>
       <point x="756" y="-326"/>
       <point x="845" y="-250"/>
-      <point x="845" y="-142" type="curve" name="hr02" smooth="yes"/>
+      <point x="845" y="-142" type="curve" smooth="yes" name="hr02"/>
       <point x="845" y="-51"/>
       <point x="783" y="0"/>
-      <point x="679" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="679" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="548" y="0"/>
       <point x="458" y="-84"/>
-      <point x="458" y="-190" type="curve" name="dh02" smooth="yes"/>
+      <point x="458" y="-190" type="curve" smooth="yes" name="dh02"/>
       <point x="458" y="-281"/>
       <point x="522" y="-326"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/element.glif b/source/Hack-Italic.ufo/glyphs/element.glif
index e7cae931d..332cfd83e 100644
--- a/source/Hack-Italic.ufo/glyphs/element.glif
+++ b/source/Hack-Italic.ufo/glyphs/element.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="element" format="1">
+<glyph name="element" format="2">
   <advance width="1233"/>
   <unicode hex="2208"/>
   <outline>
     <contour>
-      <point x="632" y="0" type="line" name="hr00" smooth="yes"/>
+      <point x="632" y="0" type="line" smooth="yes" name="hr00"/>
       <point x="448" y="0"/>
       <point x="285" y="144"/>
       <point x="197" y="364" type="curve" smooth="yes"/>
       <point x="152" y="477"/>
       <point x="130" y="601"/>
-      <point x="130" y="729" type="curve" name="dh01" smooth="yes"/>
+      <point x="130" y="729" type="curve" smooth="yes" name="dh01"/>
       <point x="130" y="1004"/>
       <point x="231" y="1242"/>
       <point x="379" y="1366" type="curve" smooth="yes"/>
@@ -34,7 +34,7 @@
       <point x="346" y="450" type="curve" smooth="yes"/>
       <point x="413" y="265"/>
       <point x="515" y="170"/>
-      <point x="632" y="170" type="curve" name="sv01" smooth="yes"/>
+      <point x="632" y="170" type="curve" smooth="yes" name="sv01"/>
       <point x="1104" y="170" type="line" name="sv02"/>
       <point x="1104" y="0" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/ellipsis.glif b/source/Hack-Italic.ufo/glyphs/ellipsis.glif
index a29cdb95a..32c7b0846 100644
--- a/source/Hack-Italic.ufo/glyphs/ellipsis.glif
+++ b/source/Hack-Italic.ufo/glyphs/ellipsis.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ellipsis" format="1">
+<glyph name="ellipsis" format="2">
   <advance width="1233"/>
   <unicode hex="2026"/>
   <outline>
     <contour>
-      <point x="-33" y="0" type="line" name="hr00" smooth="yes"/>
+      <point x="-33" y="0" type="line" smooth="yes" name="hr00"/>
       <point x="-52" y="0"/>
       <point x="-61" y="8"/>
       <point x="-61" y="25" type="curve" smooth="yes"/>
@@ -14,8 +14,8 @@
       <point x="-11" y="276" type="line" smooth="yes"/>
       <point x="-7" y="294"/>
       <point x="4" y="303"/>
-      <point x="21" y="303" type="curve" name="sv01" smooth="yes"/>
-      <point x="213" y="303" type="line" name="sv02" smooth="yes"/>
+      <point x="21" y="303" type="curve" smooth="yes" name="sv01"/>
+      <point x="213" y="303" type="line" smooth="yes" name="sv02"/>
       <point x="232" y="303"/>
       <point x="241" y="295"/>
       <point x="241" y="278" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="159" y="0" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="377" y="0" type="line" name="ab01" smooth="yes"/>
+      <point x="377" y="0" type="line" smooth="yes" name="ab01"/>
       <point x="358" y="0"/>
       <point x="349" y="8"/>
       <point x="349" y="25" type="curve" smooth="yes"/>
@@ -38,8 +38,8 @@
       <point x="398" y="276" type="line"/>
       <point x="401" y="294"/>
       <point x="411" y="303"/>
-      <point x="430" y="303" type="curve" name="sv03" smooth="yes"/>
-      <point x="622" y="303" type="line" name="sv04" smooth="yes"/>
+      <point x="430" y="303" type="curve" smooth="yes" name="sv03"/>
+      <point x="622" y="303" type="line" smooth="yes" name="sv04"/>
       <point x="641" y="303"/>
       <point x="650" y="295"/>
       <point x="650" y="278" type="curve" smooth="yes"/>
@@ -52,7 +52,7 @@
       <point x="569" y="0" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="787" y="0" type="line" name="ab02" smooth="yes"/>
+      <point x="787" y="0" type="line" smooth="yes" name="ab02"/>
       <point x="768" y="0"/>
       <point x="759" y="8"/>
       <point x="759" y="25" type="curve" smooth="yes"/>
@@ -62,8 +62,8 @@
       <point x="808" y="276" type="line"/>
       <point x="811" y="294"/>
       <point x="821" y="303"/>
-      <point x="840" y="303" type="curve" name="sv05" smooth="yes"/>
-      <point x="1032" y="303" type="line" name="sv06" smooth="yes"/>
+      <point x="840" y="303" type="curve" smooth="yes" name="sv05"/>
+      <point x="1032" y="303" type="line" smooth="yes" name="sv06"/>
       <point x="1051" y="303"/>
       <point x="1060" y="295"/>
       <point x="1060" y="278" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/emacron.glif b/source/Hack-Italic.ufo/glyphs/emacron.glif
index 832bf6a05..0ae03cbf0 100644
--- a/source/Hack-Italic.ufo/glyphs/emacron.glif
+++ b/source/Hack-Italic.ufo/glyphs/emacron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="emacron" format="1">
+<glyph name="emacron" format="2">
   <advance width="1233"/>
   <unicode hex="0113"/>
   <outline>
@@ -10,29 +10,29 @@
       <point x="475" y="1338" type="line"/>
     </contour>
     <contour>
-      <point x="556" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="556" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="253" y="-29"/>
       <point x="98" y="122"/>
-      <point x="98" y="407" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="407" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="615"/>
       <point x="183" y="829"/>
       <point x="324" y="973" type="curve"/>
       <point x="436" y="1089"/>
       <point x="570" y="1149"/>
-      <point x="719" y="1149" type="curve" name="dv06" smooth="yes"/>
+      <point x="719" y="1149" type="curve" smooth="yes" name="dv06"/>
       <point x="964" y="1149"/>
       <point x="1126" y="983"/>
-      <point x="1126" y="731" type="curve" name="sh02" smooth="yes"/>
+      <point x="1126" y="731" type="curve" smooth="yes" name="sh02"/>
       <point x="1126" y="683"/>
       <point x="1120" y="620"/>
       <point x="1104" y="516" type="curve" name="dv07"/>
       <point x="297" y="516" type="line" name="sh04"/>
       <point x="289" y="473"/>
       <point x="285" y="441"/>
-      <point x="285" y="406" type="curve" name="sh03" smooth="yes"/>
+      <point x="285" y="406" type="curve" smooth="yes" name="sh03"/>
       <point x="285" y="229"/>
       <point x="388" y="127"/>
-      <point x="584" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="584" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="704" y="127"/>
       <point x="844" y="164"/>
       <point x="997" y="240" type="curve" name="ih01"/>
@@ -44,10 +44,10 @@
       <point x="938" y="659" type="line" name="sh06"/>
       <point x="946" y="695"/>
       <point x="948" y="716"/>
-      <point x="948" y="739" type="curve" name="ah01" smooth="yes"/>
+      <point x="948" y="739" type="curve" smooth="yes" name="ah01"/>
       <point x="948" y="897"/>
       <point x="854" y="991"/>
-      <point x="707" y="991" type="curve" name="dv05" smooth="yes"/>
+      <point x="707" y="991" type="curve" smooth="yes" name="dv05"/>
       <point x="533" y="991"/>
       <point x="391" y="860"/>
       <point x="332" y="659" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/emdash.glif b/source/Hack-Italic.ufo/glyphs/emdash.glif
index ff48868b7..e9017adad 100644
--- a/source/Hack-Italic.ufo/glyphs/emdash.glif
+++ b/source/Hack-Italic.ufo/glyphs/emdash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="emdash" format="1">
+<glyph name="emdash" format="2">
   <advance width="1233"/>
   <unicode hex="2014"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/emptyset.glif b/source/Hack-Italic.ufo/glyphs/emptyset.glif
index 63d2c8954..6075b883f 100644
--- a/source/Hack-Italic.ufo/glyphs/emptyset.glif
+++ b/source/Hack-Italic.ufo/glyphs/emptyset.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="emptyset" format="1">
+<glyph name="emptyset" format="2">
   <advance width="1233"/>
   <unicode hex="2205"/>
   <outline>
@@ -8,13 +8,13 @@
       <point x="191" y="315" type="line"/>
       <point x="130" y="392"/>
       <point x="80" y="498"/>
-      <point x="80" y="643" type="curve" name="sh01" smooth="yes"/>
+      <point x="80" y="643" type="curve" smooth="yes" name="sh01"/>
       <point x="80" y="792"/>
       <point x="132" y="918"/>
       <point x="237" y="1023" type="curve" smooth="yes"/>
       <point x="343" y="1129"/>
       <point x="470" y="1182"/>
-      <point x="617" y="1182" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1182" type="curve" smooth="yes" name="av01"/>
       <point x="765" y="1182"/>
       <point x="867" y="1128"/>
       <point x="945" y="1069" type="curve"/>
@@ -23,13 +23,13 @@
       <point x="1043" y="969" type="line"/>
       <point x="1103" y="894"/>
       <point x="1153" y="789"/>
-      <point x="1153" y="644" type="curve" name="sh03" smooth="yes"/>
+      <point x="1153" y="644" type="curve" smooth="yes" name="sh03"/>
       <point x="1153" y="495"/>
       <point x="1101" y="369"/>
       <point x="996" y="264" type="curve" smooth="yes"/>
       <point x="896" y="164"/>
       <point x="770" y="106"/>
-      <point x="615" y="106" type="curve" name="av03" smooth="yes"/>
+      <point x="615" y="106" type="curve" smooth="yes" name="av03"/>
       <point x="471" y="106"/>
       <point x="365" y="156"/>
       <point x="291" y="217" type="curve"/>
@@ -39,16 +39,16 @@
       <point x="844" y="968" type="line"/>
       <point x="821" y="984"/>
       <point x="801" y="996"/>
-      <point x="768" y="1011" type="curve" name="hr01" smooth="yes"/>
+      <point x="768" y="1011" type="curve" smooth="yes" name="hr01"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="sv01" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="sv01"/>
       <point x="515" y="1041"/>
       <point x="413" y="1001"/>
-      <point x="336" y="925" type="curve" name="hr02" smooth="yes"/>
+      <point x="336" y="925" type="curve" smooth="yes" name="hr02"/>
       <point x="256" y="845"/>
       <point x="221" y="744"/>
-      <point x="221" y="640" type="curve" name="sh05" smooth="yes"/>
+      <point x="221" y="640" type="curve" smooth="yes" name="sh05"/>
       <point x="221" y="587"/>
       <point x="230" y="538"/>
       <point x="249" y="492" type="curve" smooth="yes"/>
@@ -57,16 +57,16 @@
       <point x="292" y="416" type="curve"/>
     </contour>
     <contour>
-      <point x="614" y="246" type="curve" name="sv02" smooth="yes"/>
+      <point x="614" y="246" type="curve" smooth="yes" name="sv02"/>
       <point x="718" y="246"/>
       <point x="821" y="286"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="976" y="441"/>
       <point x="1012" y="541"/>
-      <point x="1012" y="645" type="curve" name="ah01" smooth="yes"/>
+      <point x="1012" y="645" type="curve" smooth="yes" name="ah01"/>
       <point x="1012" y="696"/>
       <point x="1003" y="748"/>
-      <point x="984" y="795" type="curve" name="hr03" smooth="yes"/>
+      <point x="984" y="795" type="curve" smooth="yes" name="hr03"/>
       <point x="973" y="819"/>
       <point x="960" y="846"/>
       <point x="943" y="869" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/endash.glif b/source/Hack-Italic.ufo/glyphs/endash.glif
index 87ba0672b..ccafcb405 100644
--- a/source/Hack-Italic.ufo/glyphs/endash.glif
+++ b/source/Hack-Italic.ufo/glyphs/endash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="endash" format="1">
+<glyph name="endash" format="2">
   <advance width="1233"/>
   <unicode hex="2013"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/eng.glif b/source/Hack-Italic.ufo/glyphs/eng.glif
index 1d86c1d0c..150abbb82 100644
--- a/source/Hack-Italic.ufo/glyphs/eng.glif
+++ b/source/Hack-Italic.ufo/glyphs/eng.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eng" format="1">
+<glyph name="eng" format="2">
   <advance width="1233"/>
   <unicode hex="014B"/>
   <outline>
     <contour>
       <point x="379" y="-270" type="line" name="hr00"/>
-      <point x="564" y="-270" type="line" name="dv02" smooth="yes"/>
+      <point x="564" y="-270" type="line" smooth="yes" name="dv02"/>
       <point x="688" y="-270"/>
       <point x="760" y="-187"/>
       <point x="792" y="-20" type="curve" smooth="yes"/>
       <point x="931" y="694" type="line" smooth="yes"/>
       <point x="939" y="737"/>
       <point x="943" y="775"/>
-      <point x="943" y="810" type="curve" name="dh01" smooth="yes"/>
+      <point x="943" y="810" type="curve" smooth="yes" name="dh01"/>
       <point x="943" y="895"/>
       <point x="920" y="987"/>
-      <point x="771" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="771" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="595" y="987"/>
       <point x="476" y="862"/>
       <point x="432" y="633" type="curve" smooth="yes"/>
@@ -26,17 +26,17 @@
       <point x="494" y="952" type="line" name="iv01"/>
       <point x="586" y="1081"/>
       <point x="710" y="1147"/>
-      <point x="865" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="865" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1091" y="1147"/>
       <point x="1134" y="1004"/>
-      <point x="1134" y="864" type="curve" name="dh02" smooth="yes"/>
+      <point x="1134" y="864" type="curve" smooth="yes" name="dh02"/>
       <point x="1134" y="813"/>
       <point x="1128" y="757"/>
       <point x="1116" y="694" type="curve" smooth="yes"/>
       <point x="977" y="-20" type="line" smooth="yes"/>
       <point x="927" y="-280"/>
       <point x="774" y="-426"/>
-      <point x="554" y="-426" type="curve" name="dv01" smooth="yes"/>
+      <point x="554" y="-426" type="curve" smooth="yes" name="dv01"/>
       <point x="349" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/eogonek.glif b/source/Hack-Italic.ufo/glyphs/eogonek.glif
index e236aba82..e303131de 100644
--- a/source/Hack-Italic.ufo/glyphs/eogonek.glif
+++ b/source/Hack-Italic.ufo/glyphs/eogonek.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eogonek" format="1">
+<glyph name="eogonek" format="2">
   <advance width="1233"/>
   <unicode hex="0119"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="297" y="516" type="line" name="hr00"/>
       <point x="289" y="473"/>
       <point x="285" y="441"/>
-      <point x="285" y="406" type="curve" name="dh02" smooth="yes"/>
+      <point x="285" y="406" type="curve" smooth="yes" name="dh02"/>
       <point x="285" y="229"/>
       <point x="388" y="127"/>
-      <point x="584" y="127" type="curve" name="dv06" smooth="yes"/>
+      <point x="584" y="127" type="curve" smooth="yes" name="dv06"/>
       <point x="704" y="127"/>
       <point x="844" y="164"/>
       <point x="997" y="240" type="curve" name="ih01"/>
@@ -20,51 +20,51 @@
       <point x="787" y="0" type="curve"/>
       <point x="706" y="-77"/>
       <point x="662" y="-144"/>
-      <point x="662" y="-200" type="curve" name="dh04" smooth="yes"/>
+      <point x="662" y="-200" type="curve" smooth="yes" name="dh04"/>
       <point x="662" y="-247"/>
       <point x="694" y="-272"/>
-      <point x="758" y="-272" type="curve" name="dv02" smooth="yes"/>
+      <point x="758" y="-272" type="curve" smooth="yes" name="dv02"/>
       <point x="797" y="-272"/>
       <point x="842" y="-262"/>
       <point x="885" y="-242" type="curve" name="ih02"/>
       <point x="860" y="-375" type="line"/>
       <point x="814" y="-388"/>
       <point x="768" y="-395"/>
-      <point x="721" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="721" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="590" y="-395"/>
       <point x="516" y="-338"/>
-      <point x="516" y="-245" type="curve" name="dh03" smooth="yes"/>
+      <point x="516" y="-245" type="curve" smooth="yes" name="dh03"/>
       <point x="516" y="-177"/>
       <point x="556" y="-108"/>
       <point x="641" y="-25" type="curve" name="ih03"/>
       <point x="613" y="-28"/>
       <point x="584" y="-29"/>
-      <point x="556" y="-29" type="curve" name="dv05" smooth="yes"/>
+      <point x="556" y="-29" type="curve" smooth="yes" name="dv05"/>
       <point x="253" y="-29"/>
       <point x="98" y="122"/>
-      <point x="98" y="407" type="curve" name="dh01" smooth="yes"/>
+      <point x="98" y="407" type="curve" smooth="yes" name="dh01"/>
       <point x="98" y="615"/>
       <point x="183" y="829"/>
       <point x="324" y="973" type="curve"/>
       <point x="436" y="1089"/>
       <point x="570" y="1149"/>
-      <point x="719" y="1149" type="curve" name="dv04" smooth="yes"/>
+      <point x="719" y="1149" type="curve" smooth="yes" name="dv04"/>
       <point x="964" y="1149"/>
       <point x="1126" y="983"/>
-      <point x="1126" y="731" type="curve" name="dh06" smooth="yes"/>
+      <point x="1126" y="731" type="curve" smooth="yes" name="dh06"/>
       <point x="1126" y="683"/>
       <point x="1120" y="620"/>
       <point x="1104" y="516" type="curve"/>
     </contour>
     <contour>
-      <point x="707" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="707" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="533" y="991"/>
       <point x="391" y="860"/>
       <point x="332" y="659" type="curve" name="ih04"/>
       <point x="938" y="659" type="line"/>
       <point x="946" y="695"/>
       <point x="948" y="716"/>
-      <point x="948" y="739" type="curve" name="dh05" smooth="yes"/>
+      <point x="948" y="739" type="curve" smooth="yes" name="dh05"/>
       <point x="948" y="897"/>
       <point x="854" y="991"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/epsilon.glif b/source/Hack-Italic.ufo/glyphs/epsilon.glif
index 33ed2b842..2d22f462c 100644
--- a/source/Hack-Italic.ufo/glyphs/epsilon.glif
+++ b/source/Hack-Italic.ufo/glyphs/epsilon.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="epsilon" format="1">
+<glyph name="epsilon" format="2">
   <advance width="1233"/>
   <unicode hex="03B5"/>
   <outline>
     <contour>
-      <point x="544" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="544" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="399" y="-29"/>
       <point x="284" y="-2"/>
       <point x="211" y="59" type="curve" smooth="yes"/>
@@ -29,14 +29,14 @@
       <point x="268" y="832" type="curve" smooth="yes"/>
       <point x="298" y="1009"/>
       <point x="498" y="1132"/>
-      <point x="757" y="1132" type="curve" name="at01" smooth="yes"/>
+      <point x="757" y="1132" type="curve" smooth="yes" name="at01"/>
       <point x="850" y="1132"/>
       <point x="956" y="1116"/>
       <point x="1097" y="1084" type="curve"/>
       <point x="1062" y="905" type="line"/>
       <point x="936" y="948"/>
       <point x="803" y="968"/>
-      <point x="727" y="965" type="curve" name="sv01" smooth="yes"/>
+      <point x="727" y="965" type="curve" smooth="yes" name="sv01"/>
       <point x="696" y="964" type="line" smooth="yes"/>
       <point x="645" y="961"/>
       <point x="590" y="942"/>
@@ -74,7 +74,7 @@
       <point x="407" y="169" type="curve"/>
       <point x="450" y="138"/>
       <point x="512" y="124"/>
-      <point x="584" y="124" type="curve" name="dv01" smooth="yes"/>
+      <point x="584" y="124" type="curve" smooth="yes" name="dv01"/>
       <point x="611" y="124"/>
       <point x="627" y="126"/>
       <point x="648" y="129" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/epsilontonos.glif b/source/Hack-Italic.ufo/glyphs/epsilontonos.glif
index b2f52a7d9..5af362218 100644
--- a/source/Hack-Italic.ufo/glyphs/epsilontonos.glif
+++ b/source/Hack-Italic.ufo/glyphs/epsilontonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="epsilontonos" format="1">
+<glyph name="epsilontonos" format="2">
   <advance width="1233"/>
   <unicode hex="03AD"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="615" y="1297" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="544" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="544" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="399" y="-29"/>
       <point x="284" y="-2"/>
       <point x="211" y="59" type="curve" smooth="yes"/>
@@ -35,14 +35,14 @@
       <point x="268" y="832" type="curve" smooth="yes"/>
       <point x="298" y="1009"/>
       <point x="498" y="1132"/>
-      <point x="757" y="1132" type="curve" name="at01" smooth="yes"/>
+      <point x="757" y="1132" type="curve" smooth="yes" name="at01"/>
       <point x="850" y="1132"/>
       <point x="956" y="1116"/>
       <point x="1097" y="1084" type="curve"/>
       <point x="1062" y="905" type="line"/>
       <point x="936" y="948"/>
       <point x="803" y="968"/>
-      <point x="727" y="965" type="curve" name="sv01" smooth="yes"/>
+      <point x="727" y="965" type="curve" smooth="yes" name="sv01"/>
       <point x="696" y="964" type="line" smooth="yes"/>
       <point x="645" y="961"/>
       <point x="590" y="942"/>
@@ -80,7 +80,7 @@
       <point x="407" y="169" type="curve"/>
       <point x="450" y="138"/>
       <point x="512" y="124"/>
-      <point x="584" y="124" type="curve" name="dv02" smooth="yes"/>
+      <point x="584" y="124" type="curve" smooth="yes" name="dv02"/>
       <point x="611" y="124"/>
       <point x="627" y="126"/>
       <point x="648" y="129" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/equal.glif b/source/Hack-Italic.ufo/glyphs/equal.glif
index d73313a4c..7628dca26 100644
--- a/source/Hack-Italic.ufo/glyphs/equal.glif
+++ b/source/Hack-Italic.ufo/glyphs/equal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="equal" format="1">
+<glyph name="equal" format="2">
   <advance width="1233"/>
   <unicode hex="003D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/equivalence.glif b/source/Hack-Italic.ufo/glyphs/equivalence.glif
index 8f382f691..339685b14 100644
--- a/source/Hack-Italic.ufo/glyphs/equivalence.glif
+++ b/source/Hack-Italic.ufo/glyphs/equivalence.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="equivalence" format="1">
+<glyph name="equivalence" format="2">
   <advance width="1233"/>
   <unicode hex="2261"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/eta.glif b/source/Hack-Italic.ufo/glyphs/eta.glif
index 740a68116..38b1a1087 100644
--- a/source/Hack-Italic.ufo/glyphs/eta.glif
+++ b/source/Hack-Italic.ufo/glyphs/eta.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eta" format="1">
+<glyph name="eta" format="2">
   <advance width="1233"/>
   <unicode hex="03B7"/>
   <outline>
     <contour>
-      <point x="890" y="694" type="line" name="hr00" smooth="yes"/>
+      <point x="890" y="694" type="line" smooth="yes" name="hr00"/>
       <point x="898" y="737"/>
       <point x="903" y="774"/>
-      <point x="903" y="809" type="curve" name="dh01" smooth="yes"/>
+      <point x="903" y="809" type="curve" smooth="yes" name="dh01"/>
       <point x="903" y="933"/>
       <point x="845" y="987"/>
-      <point x="729" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="729" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="557" y="987"/>
       <point x="436" y="866"/>
       <point x="391" y="633" type="curve" smooth="yes"/>
@@ -21,10 +21,10 @@
       <point x="453" y="952" type="line" name="iv01"/>
       <point x="545" y="1081"/>
       <point x="670" y="1147"/>
-      <point x="823" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="823" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1003" y="1147"/>
       <point x="1093" y="1052"/>
-      <point x="1093" y="863" type="curve" name="dh02" smooth="yes"/>
+      <point x="1093" y="863" type="curve" smooth="yes" name="dh02"/>
       <point x="1093" y="813"/>
       <point x="1087" y="757"/>
       <point x="1075" y="694" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/etatonos.glif b/source/Hack-Italic.ufo/glyphs/etatonos.glif
index 905f82d85..3414d58c5 100644
--- a/source/Hack-Italic.ufo/glyphs/etatonos.glif
+++ b/source/Hack-Italic.ufo/glyphs/etatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="etatonos" format="1">
+<glyph name="etatonos" format="2">
   <advance width="1233"/>
   <unicode hex="03AE"/>
   <outline>
@@ -13,10 +13,10 @@
       <point x="890" y="694" type="line" smooth="yes"/>
       <point x="898" y="737"/>
       <point x="903" y="774"/>
-      <point x="903" y="809" type="curve" name="dh01" smooth="yes"/>
+      <point x="903" y="809" type="curve" smooth="yes" name="dh01"/>
       <point x="903" y="933"/>
       <point x="845" y="987"/>
-      <point x="729" y="987" type="curve" name="hr01" smooth="yes"/>
+      <point x="729" y="987" type="curve" smooth="yes" name="hr01"/>
       <point x="557" y="987"/>
       <point x="436" y="866"/>
       <point x="391" y="633" type="curve" smooth="yes"/>
@@ -27,10 +27,10 @@
       <point x="453" y="952" type="line" name="iv02"/>
       <point x="545" y="1081"/>
       <point x="670" y="1147"/>
-      <point x="823" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="823" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1003" y="1147"/>
       <point x="1093" y="1052"/>
-      <point x="1093" y="863" type="curve" name="dh02" smooth="yes"/>
+      <point x="1093" y="863" type="curve" smooth="yes" name="dh02"/>
       <point x="1093" y="813"/>
       <point x="1087" y="757"/>
       <point x="1075" y="694" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/eth.glif b/source/Hack-Italic.ufo/glyphs/eth.glif
index e81deac15..4fb1918a4 100644
--- a/source/Hack-Italic.ufo/glyphs/eth.glif
+++ b/source/Hack-Italic.ufo/glyphs/eth.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eth" format="1">
+<glyph name="eth" format="2">
   <advance width="1233"/>
   <unicode hex="00F0"/>
   <outline>
     <contour>
-      <point x="516" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="516" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="387" y="-29"/>
       <point x="289" y="7"/>
       <point x="221" y="79" type="curve" smooth="yes"/>
       <point x="149" y="155"/>
       <point x="119" y="258"/>
-      <point x="119" y="389" type="curve" name="sh01" smooth="yes"/>
+      <point x="119" y="389" type="curve" smooth="yes" name="sh01"/>
       <point x="119" y="472"/>
       <point x="132" y="555"/>
       <point x="157" y="637" type="curve" smooth="yes"/>
@@ -22,10 +22,10 @@
       <point x="458" y="1037" type="curve" smooth="yes"/>
       <point x="535" y="1078"/>
       <point x="622" y="1098"/>
-      <point x="697" y="1098" type="curve" name="dv03" smooth="yes"/>
+      <point x="697" y="1098" type="curve" smooth="yes" name="dv03"/>
       <point x="721" y="1098"/>
       <point x="741" y="1096"/>
-      <point x="772" y="1093" type="curve" name="sv01" smooth="yes"/>
+      <point x="772" y="1093" type="curve" smooth="yes" name="sv01"/>
       <point x="805" y="1090" type="line" name="ih01"/>
       <point x="792" y="1115"/>
       <point x="777" y="1142"/>
@@ -47,7 +47,7 @@
       <point x="1050" y="1007" type="curve" smooth="yes"/>
       <point x="1087" y="909"/>
       <point x="1106" y="807"/>
-      <point x="1106" y="701" type="curve" name="sh02" smooth="yes"/>
+      <point x="1106" y="701" type="curve" smooth="yes" name="sh02"/>
       <point x="1106" y="616"/>
       <point x="1094" y="527"/>
       <point x="1069" y="440" type="curve" smooth="yes"/>
@@ -61,16 +61,16 @@
       <point x="610" y="-29"/>
     </contour>
     <contour>
-      <point x="534" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="534" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="639" y="127"/>
       <point x="735" y="181"/>
       <point x="806" y="288" type="curve" smooth="yes"/>
       <point x="877" y="396"/>
       <point x="911" y="539"/>
-      <point x="911" y="702" type="curve" name="ah01" smooth="yes"/>
+      <point x="911" y="702" type="curve" smooth="yes" name="ah01"/>
       <point x="911" y="750"/>
       <point x="909" y="785"/>
-      <point x="902" y="820" type="curve" name="sh04" smooth="yes"/>
+      <point x="902" y="820" type="curve" smooth="yes" name="sh04"/>
       <point x="896" y="854"/>
       <point x="887" y="883"/>
       <point x="874" y="907" type="curve"/>
@@ -79,13 +79,13 @@
       <point x="797" y="935" type="curve" smooth="yes"/>
       <point x="770" y="941"/>
       <point x="742" y="944"/>
-      <point x="714" y="944" type="curve" name="dv02" smooth="yes"/>
+      <point x="714" y="944" type="curve" smooth="yes" name="dv02"/>
       <point x="589" y="944"/>
       <point x="492" y="886"/>
       <point x="424" y="789" type="curve" smooth="yes"/>
       <point x="349" y="682"/>
       <point x="313" y="534"/>
-      <point x="313" y="398" type="curve" name="sh05" smooth="yes"/>
+      <point x="313" y="398" type="curve" smooth="yes" name="sh05"/>
       <point x="313" y="309"/>
       <point x="327" y="239"/>
       <point x="370" y="192" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/exclam.glif b/source/Hack-Italic.ufo/glyphs/exclam.glif
index acb3d2495..047a5f0db 100644
--- a/source/Hack-Italic.ufo/glyphs/exclam.glif
+++ b/source/Hack-Italic.ufo/glyphs/exclam.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="exclam" format="1">
+<glyph name="exclam" format="2">
   <advance width="1233"/>
   <unicode hex="0021"/>
   <outline>
@@ -12,25 +12,25 @@
       <point x="634" y="486" type="line"/>
     </contour>
     <contour>
-      <point x="606" y="-60" type="curve" name="dv01" smooth="yes"/>
+      <point x="606" y="-60" type="curve" smooth="yes" name="dv01"/>
       <point x="562" y="-60"/>
       <point x="529" y="-48"/>
       <point x="505" y="-19" type="curve" smooth="yes"/>
       <point x="477" y="14"/>
       <point x="470" y="58"/>
-      <point x="470" y="89" type="curve" name="dh01" smooth="yes"/>
+      <point x="470" y="89" type="curve" smooth="yes" name="dh01"/>
       <point x="470" y="144"/>
       <point x="492" y="190"/>
       <point x="531" y="229" type="curve" smooth="yes"/>
       <point x="570" y="266"/>
       <point x="616" y="284"/>
-      <point x="664" y="284" type="curve" name="dv02" smooth="yes"/>
+      <point x="664" y="284" type="curve" smooth="yes" name="dv02"/>
       <point x="705" y="284"/>
       <point x="743" y="271"/>
       <point x="768" y="244" type="curve" smooth="yes"/>
       <point x="797" y="212"/>
       <point x="802" y="168"/>
-      <point x="802" y="148" type="curve" name="dh02" smooth="yes"/>
+      <point x="802" y="148" type="curve" smooth="yes" name="dh02"/>
       <point x="802" y="91"/>
       <point x="778" y="31"/>
       <point x="731" y="-12" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/exclamdbl.glif b/source/Hack-Italic.ufo/glyphs/exclamdbl.glif
index b3894bbc4..3f5149d74 100644
--- a/source/Hack-Italic.ufo/glyphs/exclamdbl.glif
+++ b/source/Hack-Italic.ufo/glyphs/exclamdbl.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="exclamdbl" format="1">
+<glyph name="exclamdbl" format="2">
   <advance width="1233"/>
   <unicode hex="203C"/>
   <outline>
@@ -20,25 +20,25 @@
       <point x="824" y="486" type="line"/>
     </contour>
     <contour>
-      <point x="296" y="-60" type="curve" name="dv01" smooth="yes"/>
+      <point x="296" y="-60" type="curve" smooth="yes" name="dv01"/>
       <point x="252" y="-60"/>
       <point x="219" y="-48"/>
       <point x="195" y="-19" type="curve" smooth="yes"/>
       <point x="167" y="14"/>
       <point x="160" y="58"/>
-      <point x="160" y="89" type="curve" name="sh02" smooth="yes"/>
+      <point x="160" y="89" type="curve" smooth="yes" name="sh02"/>
       <point x="160" y="144"/>
       <point x="182" y="190"/>
       <point x="221" y="229" type="curve" smooth="yes"/>
       <point x="260" y="266"/>
       <point x="306" y="284"/>
-      <point x="354" y="284" type="curve" name="dv02" smooth="yes"/>
+      <point x="354" y="284" type="curve" smooth="yes" name="dv02"/>
       <point x="395" y="284"/>
       <point x="433" y="271"/>
       <point x="458" y="244" type="curve" smooth="yes"/>
       <point x="487" y="212"/>
       <point x="492" y="168"/>
-      <point x="492" y="148" type="curve" name="sh03" smooth="yes"/>
+      <point x="492" y="148" type="curve" smooth="yes" name="sh03"/>
       <point x="492" y="91"/>
       <point x="468" y="31"/>
       <point x="421" y="-12" type="curve" smooth="yes"/>
@@ -46,25 +46,25 @@
       <point x="349" y="-60"/>
     </contour>
     <contour>
-      <point x="796" y="-60" type="curve" name="sv01" smooth="yes"/>
+      <point x="796" y="-60" type="curve" smooth="yes" name="sv01"/>
       <point x="752" y="-60"/>
       <point x="719" y="-48"/>
       <point x="695" y="-19" type="curve" smooth="yes"/>
       <point x="667" y="14"/>
       <point x="660" y="58"/>
-      <point x="660" y="89" type="curve" name="ah01" smooth="yes"/>
+      <point x="660" y="89" type="curve" smooth="yes" name="ah01"/>
       <point x="660" y="144"/>
       <point x="682" y="190"/>
       <point x="721" y="229" type="curve" smooth="yes"/>
       <point x="760" y="266"/>
       <point x="806" y="284"/>
-      <point x="854" y="284" type="curve" name="sv02" smooth="yes"/>
+      <point x="854" y="284" type="curve" smooth="yes" name="sv02"/>
       <point x="895" y="284"/>
       <point x="933" y="271"/>
       <point x="958" y="244" type="curve" smooth="yes"/>
       <point x="987" y="212"/>
       <point x="992" y="168"/>
-      <point x="992" y="148" type="curve" name="sh04" smooth="yes"/>
+      <point x="992" y="148" type="curve" smooth="yes" name="sh04"/>
       <point x="992" y="91"/>
       <point x="968" y="31"/>
       <point x="921" y="-12" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/exclamdown.case.glif b/source/Hack-Italic.ufo/glyphs/exclamdown.case.glif
index 337d21569..a6228c54b 100644
--- a/source/Hack-Italic.ufo/glyphs/exclamdown.case.glif
+++ b/source/Hack-Italic.ufo/glyphs/exclamdown.case.glif
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="exclamdown.case" format="1">
+<glyph name="exclamdown.case" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="713" y="1170" type="curve" name="hr00" smooth="yes"/>
+      <point x="713" y="1170" type="curve" smooth="yes" name="hr00"/>
       <point x="669" y="1170"/>
       <point x="636" y="1182"/>
       <point x="612" y="1211" type="curve" smooth="yes"/>
       <point x="584" y="1244"/>
       <point x="577" y="1288"/>
-      <point x="577" y="1319" type="curve" name="dh01" smooth="yes"/>
+      <point x="577" y="1319" type="curve" smooth="yes" name="dh01"/>
       <point x="577" y="1374"/>
       <point x="599" y="1420"/>
       <point x="638" y="1459" type="curve" smooth="yes"/>
       <point x="677" y="1496"/>
       <point x="723" y="1514"/>
-      <point x="771" y="1514" type="curve" name="at01" smooth="yes"/>
+      <point x="771" y="1514" type="curve" smooth="yes" name="at01"/>
       <point x="812" y="1514"/>
       <point x="850" y="1501"/>
       <point x="875" y="1474" type="curve" smooth="yes"/>
       <point x="904" y="1442"/>
       <point x="909" y="1398"/>
-      <point x="909" y="1378" type="curve" name="dh02" smooth="yes"/>
+      <point x="909" y="1378" type="curve" smooth="yes" name="dh02"/>
       <point x="909" y="1321"/>
       <point x="885" y="1261"/>
       <point x="838" y="1218" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/exclamdown.glif b/source/Hack-Italic.ufo/glyphs/exclamdown.glif
index 40254500b..bf31af0d7 100644
--- a/source/Hack-Italic.ufo/glyphs/exclamdown.glif
+++ b/source/Hack-Italic.ufo/glyphs/exclamdown.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="exclamdown" format="1">
+<glyph name="exclamdown" format="2">
   <advance width="1233"/>
   <unicode hex="00A1"/>
   <outline>
     <contour>
-      <point x="713" y="1170" type="curve" name="hr00" smooth="yes"/>
+      <point x="713" y="1170" type="curve" smooth="yes" name="hr00"/>
       <point x="669" y="1170"/>
       <point x="636" y="1182"/>
       <point x="612" y="1211" type="curve" smooth="yes"/>
       <point x="584" y="1244"/>
       <point x="577" y="1288"/>
-      <point x="577" y="1319" type="curve" name="dh01" smooth="yes"/>
+      <point x="577" y="1319" type="curve" smooth="yes" name="dh01"/>
       <point x="577" y="1374"/>
       <point x="599" y="1420"/>
       <point x="638" y="1459" type="curve" smooth="yes"/>
       <point x="677" y="1496"/>
       <point x="723" y="1514"/>
-      <point x="771" y="1514" type="curve" name="at01" smooth="yes"/>
+      <point x="771" y="1514" type="curve" smooth="yes" name="at01"/>
       <point x="812" y="1514"/>
       <point x="850" y="1501"/>
       <point x="875" y="1474" type="curve" smooth="yes"/>
       <point x="904" y="1442"/>
       <point x="909" y="1398"/>
-      <point x="909" y="1378" type="curve" name="dh02" smooth="yes"/>
+      <point x="909" y="1378" type="curve" smooth="yes" name="dh02"/>
       <point x="909" y="1321"/>
       <point x="885" y="1261"/>
       <point x="838" y="1218" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/existential.glif b/source/Hack-Italic.ufo/glyphs/existential.glif
index 0dd4a56d8..f5dfcdbd2 100644
--- a/source/Hack-Italic.ufo/glyphs/existential.glif
+++ b/source/Hack-Italic.ufo/glyphs/existential.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="existential" format="1">
+<glyph name="existential" format="2">
   <advance width="1233"/>
   <unicode hex="2203"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/f.glif b/source/Hack-Italic.ufo/glyphs/f.glif
index 89991f1b8..7a1867f95 100644
--- a/source/Hack-Italic.ufo/glyphs/f.glif
+++ b/source/Hack-Italic.ufo/glyphs/f.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="f" format="1">
+<glyph name="f" format="2">
   <advance width="1233"/>
   <unicode hex="0066"/>
   <outline>
@@ -27,9 +27,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/figuredash.glif b/source/Hack-Italic.ufo/glyphs/figuredash.glif
index 9dfcda10f..8b551f6d8 100644
--- a/source/Hack-Italic.ufo/glyphs/figuredash.glif
+++ b/source/Hack-Italic.ufo/glyphs/figuredash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="figuredash" format="1">
+<glyph name="figuredash" format="2">
   <advance width="1233"/>
   <unicode hex="2012"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/filledbox.glif b/source/Hack-Italic.ufo/glyphs/filledbox.glif
index ce4481119..a7028df70 100644
--- a/source/Hack-Italic.ufo/glyphs/filledbox.glif
+++ b/source/Hack-Italic.ufo/glyphs/filledbox.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="filledbox" format="1">
+<glyph name="filledbox" format="2">
   <advance width="1233"/>
   <unicode hex="25A0"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/filledrect.glif b/source/Hack-Italic.ufo/glyphs/filledrect.glif
index 2dfc9ac67..eca6c2868 100644
--- a/source/Hack-Italic.ufo/glyphs/filledrect.glif
+++ b/source/Hack-Italic.ufo/glyphs/filledrect.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="filledrect" format="1">
+<glyph name="filledrect" format="2">
   <advance width="1233"/>
   <unicode hex="25AC"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/five.glif b/source/Hack-Italic.ufo/glyphs/five.glif
index db4137da8..8b89901e7 100644
--- a/source/Hack-Italic.ufo/glyphs/five.glif
+++ b/source/Hack-Italic.ufo/glyphs/five.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="five" format="1">
+<glyph name="five" format="2">
   <advance width="1233"/>
   <unicode hex="0035"/>
   <outline>
     <contour>
-      <point x="366" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="366" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="302" y="-29"/>
       <point x="233" y="-24"/>
       <point x="170" y="-13" type="curve" smooth="yes"/>
@@ -17,16 +17,16 @@
       <point x="217" y="164" type="curve" smooth="yes"/>
       <point x="277" y="147"/>
       <point x="339" y="139"/>
-      <point x="395" y="139" type="curve" name="dv01" smooth="yes"/>
+      <point x="395" y="139" type="curve" smooth="yes" name="dv01"/>
       <point x="519" y="139"/>
       <point x="628" y="178"/>
       <point x="708" y="255" type="curve" smooth="yes"/>
       <point x="781" y="326"/>
       <point x="829" y="429"/>
-      <point x="829" y="545" type="curve" name="dh01" smooth="yes"/>
+      <point x="829" y="545" type="curve" smooth="yes" name="dh01"/>
       <point x="829" y="718"/>
       <point x="717" y="821"/>
-      <point x="525" y="821" type="curve" name="dv02" smooth="yes"/>
+      <point x="525" y="821" type="curve" smooth="yes" name="dv02"/>
       <point x="423" y="821"/>
       <point x="306" y="793"/>
       <point x="207" y="743" type="curve"/>
@@ -40,13 +40,13 @@
       <point x="524" y="980" type="curve" smooth="yes"/>
       <point x="553" y="985"/>
       <point x="584" y="987"/>
-      <point x="612" y="987" type="curve" name="dv03" smooth="yes"/>
+      <point x="612" y="987" type="curve" smooth="yes" name="dv03"/>
       <point x="740" y="987"/>
       <point x="842" y="947"/>
       <point x="915" y="875" type="curve" smooth="yes"/>
       <point x="991" y="802"/>
       <point x="1030" y="698"/>
-      <point x="1030" y="574" type="curve" name="dh02" smooth="yes"/>
+      <point x="1030" y="574" type="curve" smooth="yes" name="dh02"/>
       <point x="1030" y="491"/>
       <point x="1013" y="411"/>
       <point x="978" y="334" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/five.subs.glif b/source/Hack-Italic.ufo/glyphs/five.subs.glif
index 869ac76c1..de0ce9f75 100644
--- a/source/Hack-Italic.ufo/glyphs/five.subs.glif
+++ b/source/Hack-Italic.ufo/glyphs/five.subs.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="five.subs" format="1">
+<glyph name="five.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="548" y="-415" type="curve" name="hr00" smooth="yes"/>
+      <point x="548" y="-415" type="curve" smooth="yes" name="hr00"/>
       <point x="460" y="-415"/>
       <point x="372" y="-403"/>
       <point x="308" y="-379" type="curve"/>
       <point x="335" y="-265" type="line"/>
       <point x="411" y="-302"/>
       <point x="493" y="-321"/>
-      <point x="569" y="-321" type="curve" name="dv01" smooth="yes"/>
+      <point x="569" y="-321" type="curve" smooth="yes" name="dv01"/>
       <point x="741" y="-321"/>
       <point x="862" y="-222"/>
-      <point x="862" y="-95" type="curve" name="dh01" smooth="yes"/>
+      <point x="862" y="-95" type="curve" smooth="yes" name="dh01"/>
       <point x="862" y="5"/>
       <point x="787" y="60"/>
-      <point x="656" y="60" type="curve" name="dv04" smooth="yes"/>
+      <point x="656" y="60" type="curve" smooth="yes" name="dv04"/>
       <point x="588" y="60"/>
       <point x="512" y="45"/>
       <point x="444" y="17" type="curve"/>
@@ -27,10 +27,10 @@
       <point x="595" y="136" type="line" name="iv01"/>
       <point x="638" y="148"/>
       <point x="677" y="153"/>
-      <point x="716" y="153" type="curve" name="dv05" smooth="yes"/>
+      <point x="716" y="153" type="curve" smooth="yes" name="dv05"/>
       <point x="885" y="153"/>
       <point x="997" y="61"/>
-      <point x="997" y="-79" type="curve" name="dh02" smooth="yes"/>
+      <point x="997" y="-79" type="curve" smooth="yes" name="dh02"/>
       <point x="997" y="-175"/>
       <point x="946" y="-262"/>
       <point x="862" y="-326" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/fiveeighths.glif b/source/Hack-Italic.ufo/glyphs/fiveeighths.glif
index 2314a126f..2a9041269 100644
--- a/source/Hack-Italic.ufo/glyphs/fiveeighths.glif
+++ b/source/Hack-Italic.ufo/glyphs/fiveeighths.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="fiveeighths" format="1">
+<glyph name="fiveeighths" format="2">
   <advance width="1233"/>
   <unicode hex="215D"/>
   <outline>
     <contour>
-      <point x="320" y="809" type="curve" name="dv11" smooth="yes"/>
+      <point x="320" y="809" type="curve" smooth="yes" name="dv11"/>
       <point x="232" y="809"/>
       <point x="144" y="821"/>
       <point x="80" y="845" type="curve"/>
       <point x="107" y="959" type="line"/>
       <point x="183" y="922"/>
       <point x="265" y="903"/>
-      <point x="341" y="903" type="curve" name="dv12" smooth="yes"/>
+      <point x="341" y="903" type="curve" smooth="yes" name="dv12"/>
       <point x="513" y="903"/>
       <point x="634" y="1002"/>
-      <point x="634" y="1129" type="curve" name="dh03" smooth="yes"/>
+      <point x="634" y="1129" type="curve" smooth="yes" name="dh03"/>
       <point x="634" y="1229"/>
       <point x="559" y="1284"/>
-      <point x="428" y="1284" type="curve" name="dv05" smooth="yes"/>
+      <point x="428" y="1284" type="curve" smooth="yes" name="dv05"/>
       <point x="360" y="1284"/>
       <point x="284" y="1269"/>
       <point x="216" y="1241" type="curve" name="hr01"/>
@@ -28,10 +28,10 @@
       <point x="367" y="1360" type="line" name="iv01"/>
       <point x="410" y="1372"/>
       <point x="449" y="1377"/>
-      <point x="488" y="1377" type="curve" name="dv06" smooth="yes"/>
+      <point x="488" y="1377" type="curve" smooth="yes" name="dv06"/>
       <point x="657" y="1377"/>
       <point x="769" y="1285"/>
-      <point x="769" y="1145" type="curve" name="hr02" smooth="yes"/>
+      <point x="769" y="1145" type="curve" smooth="yes" name="hr02"/>
       <point x="769" y="1049"/>
       <point x="718" y="962"/>
       <point x="634" y="898" type="curve" smooth="yes"/>
@@ -45,56 +45,56 @@
       <point x="70" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="754" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="754" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="572" y="-285"/>
       <point x="458" y="-204"/>
-      <point x="458" y="-71" type="curve" name="dh01" smooth="yes"/>
+      <point x="458" y="-71" type="curve" smooth="yes" name="dh01"/>
       <point x="458" y="53"/>
       <point x="559" y="147"/>
       <point x="719" y="176" type="curve" name="ih01"/>
       <point x="619" y="205"/>
       <point x="574" y="261"/>
-      <point x="574" y="337" type="curve" name="ih02" smooth="yes"/>
+      <point x="574" y="337" type="curve" smooth="yes" name="ih02"/>
       <point x="574" y="473"/>
       <point x="725" y="582"/>
-      <point x="917" y="582" type="curve" name="dv10" smooth="yes"/>
+      <point x="917" y="582" type="curve" smooth="yes" name="dv10"/>
       <point x="1076" y="582"/>
       <point x="1187" y="507"/>
-      <point x="1187" y="398" type="curve" name="sh02" smooth="yes"/>
+      <point x="1187" y="398" type="curve" smooth="yes" name="sh02"/>
       <point x="1187" y="297"/>
       <point x="1093" y="201"/>
       <point x="949" y="169" type="curve" name="ih03"/>
       <point x="1066" y="146"/>
       <point x="1119" y="80"/>
-      <point x="1119" y="-15" type="curve" name="dh05" smooth="yes"/>
+      <point x="1119" y="-15" type="curve" smooth="yes" name="dh05"/>
       <point x="1119" y="-172"/>
       <point x="969" y="-285"/>
     </contour>
     <contour>
-      <point x="853" y="216" type="curve" name="dv08" smooth="yes"/>
+      <point x="853" y="216" type="curve" smooth="yes" name="dv08"/>
       <point x="965" y="216"/>
       <point x="1052" y="291"/>
-      <point x="1052" y="380" type="curve" name="sh01" smooth="yes"/>
+      <point x="1052" y="380" type="curve" smooth="yes" name="sh01"/>
       <point x="1052" y="453"/>
       <point x="994" y="495"/>
-      <point x="905" y="495" type="curve" name="dv09" smooth="yes"/>
+      <point x="905" y="495" type="curve" smooth="yes" name="dv09"/>
       <point x="792" y="495"/>
       <point x="710" y="428"/>
-      <point x="710" y="337" type="curve" name="sh03" smooth="yes"/>
+      <point x="710" y="337" type="curve" smooth="yes" name="sh03"/>
       <point x="710" y="261"/>
       <point x="765" y="216"/>
     </contour>
     <contour>
-      <point x="762" y="-198" type="curve" name="dv02" smooth="yes"/>
+      <point x="762" y="-198" type="curve" smooth="yes" name="dv02"/>
       <point x="893" y="-198"/>
       <point x="982" y="-122"/>
-      <point x="982" y="-14" type="curve" name="dh04" smooth="yes"/>
+      <point x="982" y="-14" type="curve" smooth="yes" name="dh04"/>
       <point x="982" y="77"/>
       <point x="920" y="128"/>
-      <point x="816" y="128" type="curve" name="dv07" smooth="yes"/>
+      <point x="816" y="128" type="curve" smooth="yes" name="dv07"/>
       <point x="685" y="128"/>
       <point x="595" y="44"/>
-      <point x="595" y="-62" type="curve" name="dh02" smooth="yes"/>
+      <point x="595" y="-62" type="curve" smooth="yes" name="dh02"/>
       <point x="595" y="-153"/>
       <point x="659" y="-198"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/florin.glif b/source/Hack-Italic.ufo/glyphs/florin.glif
index 8c35eae60..bb6233b84 100644
--- a/source/Hack-Italic.ufo/glyphs/florin.glif
+++ b/source/Hack-Italic.ufo/glyphs/florin.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="florin" format="1">
+<glyph name="florin" format="2">
   <advance width="1233"/>
   <unicode hex="0192"/>
   <outline>
     <contour>
-      <point x="203" y="-426" type="curve" name="hr00" smooth="yes"/>
+      <point x="203" y="-426" type="curve" smooth="yes" name="hr00"/>
       <point x="168" y="-426"/>
       <point x="132" y="-423"/>
       <point x="97" y="-416" type="curve" smooth="yes"/>
@@ -17,7 +17,7 @@
       <point x="99" y="-267" type="curve" smooth="yes"/>
       <point x="132" y="-278"/>
       <point x="166" y="-283"/>
-      <point x="195" y="-283" type="curve" name="dv01" smooth="yes"/>
+      <point x="195" y="-283" type="curve" smooth="yes" name="dv01"/>
       <point x="331" y="-283"/>
       <point x="404" y="-188"/>
       <point x="440" y="18" type="curve"/>
@@ -31,10 +31,10 @@
       <point x="754" y="1456" type="curve" smooth="yes"/>
       <point x="820" y="1523"/>
       <point x="903" y="1556"/>
-      <point x="1002" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="1002" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="1034" y="1556"/>
       <point x="1067" y="1553"/>
-      <point x="1100" y="1547" type="curve" name="at02" smooth="yes"/>
+      <point x="1100" y="1547" type="curve" smooth="yes" name="at02"/>
       <point x="1132" y="1541"/>
       <point x="1165" y="1532"/>
       <point x="1200" y="1520" type="curve"/>
@@ -44,7 +44,7 @@
       <point x="1123" y="1399" type="curve" smooth="yes"/>
       <point x="1100" y="1407"/>
       <point x="1070" y="1413"/>
-      <point x="1035" y="1413" type="curve" name="sv01" smooth="yes"/>
+      <point x="1035" y="1413" type="curve" smooth="yes" name="sv01"/>
       <point x="967" y="1413"/>
       <point x="916" y="1390"/>
       <point x="879" y="1351" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/four.glif b/source/Hack-Italic.ufo/glyphs/four.glif
index 944c7ec74..b07f03e8b 100644
--- a/source/Hack-Italic.ufo/glyphs/four.glif
+++ b/source/Hack-Italic.ufo/glyphs/four.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="four" format="1">
+<glyph name="four" format="2">
   <advance width="1233"/>
   <unicode hex="0034"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/four.subs.glif b/source/Hack-Italic.ufo/glyphs/four.subs.glif
index 623a2aa18..fd9ff605b 100644
--- a/source/Hack-Italic.ufo/glyphs/four.subs.glif
+++ b/source/Hack-Italic.ufo/glyphs/four.subs.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="four.subs" format="1">
+<glyph name="four.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/franc.glif b/source/Hack-Italic.ufo/glyphs/franc.glif
index 77db3b6bb..fcca72a95 100644
--- a/source/Hack-Italic.ufo/glyphs/franc.glif
+++ b/source/Hack-Italic.ufo/glyphs/franc.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="franc" format="1">
+<glyph name="franc" format="2">
   <advance width="1233"/>
   <unicode hex="20A3"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/g.glif b/source/Hack-Italic.ufo/glyphs/g.glif
index 9d1bdcc94..cbc3cf68d 100644
--- a/source/Hack-Italic.ufo/glyphs/g.glif
+++ b/source/Hack-Italic.ufo/glyphs/g.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="g" format="1">
+<glyph name="g" format="2">
   <advance width="1233"/>
   <unicode hex="0067"/>
   <outline>
@@ -50,9 +50,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/gamma.glif b/source/Hack-Italic.ufo/glyphs/gamma.glif
index 207766db8..4183c846d 100644
--- a/source/Hack-Italic.ufo/glyphs/gamma.glif
+++ b/source/Hack-Italic.ufo/glyphs/gamma.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gamma" format="1">
+<glyph name="gamma" format="2">
   <advance width="1233"/>
   <unicode hex="03B3"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="306" y="836" type="line" smooth="yes"/>
       <point x="292" y="920"/>
       <point x="254" y="962"/>
-      <point x="191" y="962" type="curve" name="sv01" smooth="yes"/>
+      <point x="191" y="962" type="curve" smooth="yes" name="sv01"/>
       <point x="142" y="962" type="line"/>
       <point x="173" y="1120" type="line" name="at01"/>
       <point x="243" y="1120" type="line" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/gbreve.glif b/source/Hack-Italic.ufo/glyphs/gbreve.glif
index d73123f8d..994f0bfd9 100644
--- a/source/Hack-Italic.ufo/glyphs/gbreve.glif
+++ b/source/Hack-Italic.ufo/glyphs/gbreve.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gbreve" format="1">
+<glyph name="gbreve" format="2">
   <advance width="1233"/>
   <unicode hex="011F"/>
   <outline>
     <contour>
-      <point x="748" y="1297" type="curve" name="dv03" smooth="yes"/>
+      <point x="748" y="1297" type="curve" smooth="yes" name="dv03"/>
       <point x="660" y="1297"/>
       <point x="591" y="1318"/>
       <point x="542" y="1360" type="curve" smooth="yes"/>
@@ -24,7 +24,7 @@
       <point x="636" y="1468" type="curve" smooth="yes"/>
       <point x="665" y="1445"/>
       <point x="707" y="1434"/>
-      <point x="762" y="1434" type="curve" name="dv04" smooth="yes"/>
+      <point x="762" y="1434" type="curve" smooth="yes" name="dv04"/>
       <point x="817" y="1434"/>
       <point x="862" y="1446"/>
       <point x="897" y="1471" type="curve" smooth="yes"/>
@@ -39,7 +39,7 @@
       <point x="841" y="1297"/>
     </contour>
     <contour>
-      <point x="376" y="-440" type="curve" name="dv01" smooth="yes"/>
+      <point x="376" y="-440" type="curve" smooth="yes" name="dv01"/>
       <point x="319" y="-440"/>
       <point x="267" y="-435"/>
       <point x="214" y="-426" type="curve" smooth="yes"/>
@@ -52,7 +52,7 @@
       <point x="248" y="-270" type="curve" smooth="yes"/>
       <point x="301" y="-285"/>
       <point x="354" y="-293"/>
-      <point x="406" y="-293" type="curve" name="dv02" smooth="yes"/>
+      <point x="406" y="-293" type="curve" smooth="yes" name="dv02"/>
       <point x="505" y="-293"/>
       <point x="582" y="-266"/>
       <point x="637" y="-213" type="curve" smooth="yes"/>
@@ -65,13 +65,13 @@
       <point x="635" y="38" type="curve" smooth="yes"/>
       <point x="575" y="7"/>
       <point x="511" y="-8"/>
-      <point x="443" y="-8" type="curve" name="ab01" smooth="yes"/>
+      <point x="443" y="-8" type="curve" smooth="yes" name="ab01"/>
       <point x="338" y="-8"/>
       <point x="252" y="28"/>
       <point x="192" y="99" type="curve" smooth="yes"/>
       <point x="131" y="171"/>
       <point x="102" y="273"/>
-      <point x="102" y="398" type="curve" name="dh01" smooth="yes"/>
+      <point x="102" y="398" type="curve" smooth="yes" name="dh01"/>
       <point x="102" y="482"/>
       <point x="115" y="576"/>
       <point x="142" y="668" type="curve" smooth="yes"/>
@@ -83,7 +83,7 @@
       <point x="432" y="1085" type="curve" smooth="yes"/>
       <point x="501" y="1126"/>
       <point x="573" y="1147"/>
-      <point x="648" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="648" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="714" y="1147"/>
       <point x="773" y="1131"/>
       <point x="824" y="1099" type="curve"/>
@@ -100,7 +100,7 @@
       <point x="540" y="-440"/>
     </contour>
     <contour>
-      <point x="513" y="145" type="curve" name="sv03" smooth="yes"/>
+      <point x="513" y="145" type="curve" smooth="yes" name="sv03"/>
       <point x="564" y="145"/>
       <point x="611" y="159"/>
       <point x="658" y="190" type="curve" smooth="yes"/>
@@ -112,19 +112,19 @@
       <point x="847" y="521" type="curve"/>
       <point x="866" y="594"/>
       <point x="874" y="673"/>
-      <point x="874" y="733" type="curve" name="hr01" smooth="yes"/>
+      <point x="874" y="733" type="curve" smooth="yes" name="hr01"/>
       <point x="874" y="817"/>
       <point x="855" y="881"/>
       <point x="818" y="925" type="curve" smooth="yes"/>
       <point x="781" y="969"/>
       <point x="728" y="991"/>
-      <point x="664" y="991" type="curve" name="sv04" smooth="yes"/>
+      <point x="664" y="991" type="curve" smooth="yes" name="sv04"/>
       <point x="552" y="991"/>
       <point x="465" y="924"/>
-      <point x="402" y="823" type="curve" name="hr02" smooth="yes"/>
+      <point x="402" y="823" type="curve" smooth="yes" name="hr02"/>
       <point x="335" y="715"/>
       <point x="297" y="565"/>
-      <point x="297" y="421" type="curve" name="dh02" smooth="yes"/>
+      <point x="297" y="421" type="curve" smooth="yes" name="dh02"/>
       <point x="297" y="310"/>
       <point x="320" y="251"/>
       <point x="353" y="212" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/gcaron.glif b/source/Hack-Italic.ufo/glyphs/gcaron.glif
index e0d763455..e4a6ead8a 100644
--- a/source/Hack-Italic.ufo/glyphs/gcaron.glif
+++ b/source/Hack-Italic.ufo/glyphs/gcaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gcaron" format="1">
+<glyph name="gcaron" format="2">
   <advance width="1233"/>
   <unicode hex="01E7"/>
   <outline>
@@ -13,30 +13,30 @@
       <point x="635" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="378" y="-440" type="curve" name="dv01" smooth="yes"/>
+      <point x="378" y="-440" type="curve" smooth="yes" name="dv01"/>
       <point x="263" y="-440"/>
       <point x="159" y="-421"/>
       <point x="59" y="-385" type="curve"/>
       <point x="96" y="-203" type="line" name="sh01"/>
       <point x="193" y="-263"/>
       <point x="297" y="-293"/>
-      <point x="409" y="-293" type="curve" name="dv02" smooth="yes"/>
+      <point x="409" y="-293" type="curve" smooth="yes" name="dv02"/>
       <point x="612" y="-293"/>
       <point x="705" y="-190"/>
       <point x="756" y="53" type="curve" smooth="yes"/>
       <point x="780" y="170" type="line" name="iv02"/>
       <point x="701" y="50"/>
       <point x="578" y="-8"/>
-      <point x="443" y="-8" type="curve" name="ab01" smooth="yes"/>
+      <point x="443" y="-8" type="curve" smooth="yes" name="ab01"/>
       <point x="232" y="-8"/>
       <point x="102" y="138"/>
-      <point x="102" y="401" type="curve" name="dh01" smooth="yes"/>
+      <point x="102" y="401" type="curve" smooth="yes" name="dh01"/>
       <point x="102" y="574"/>
       <point x="158" y="770"/>
       <point x="254" y="911" type="curve" smooth="yes"/>
       <point x="353" y="1058"/>
       <point x="495" y="1147"/>
-      <point x="648" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="648" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="783" y="1147"/>
       <point x="889" y="1078"/>
       <point x="934" y="965" type="curve" name="iv03"/>
@@ -47,7 +47,7 @@
       <point x="709" y="-440"/>
     </contour>
     <contour>
-      <point x="507" y="145" type="curve" name="sv01" smooth="yes"/>
+      <point x="507" y="145" type="curve" smooth="yes" name="sv01"/>
       <point x="618" y="145"/>
       <point x="705" y="203"/>
       <point x="770" y="319" type="curve" smooth="yes"/>
@@ -56,10 +56,10 @@
       <point x="874" y="728" type="curve" smooth="yes"/>
       <point x="874" y="901"/>
       <point x="796" y="991"/>
-      <point x="667" y="991" type="curve" name="sv02" smooth="yes"/>
+      <point x="667" y="991" type="curve" smooth="yes" name="sv02"/>
       <point x="438" y="991"/>
       <point x="297" y="697"/>
-      <point x="297" y="429" type="curve" name="dh02" smooth="yes"/>
+      <point x="297" y="429" type="curve" smooth="yes" name="dh02"/>
       <point x="297" y="227"/>
       <point x="376" y="145"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/gcircumflex.glif b/source/Hack-Italic.ufo/glyphs/gcircumflex.glif
index cbde9f80d..a59d8c24e 100644
--- a/source/Hack-Italic.ufo/glyphs/gcircumflex.glif
+++ b/source/Hack-Italic.ufo/glyphs/gcircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gcircumflex" format="1">
+<glyph name="gcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="011D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/gdotaccent.glif b/source/Hack-Italic.ufo/glyphs/gdotaccent.glif
index 583e768b6..028e3431c 100644
--- a/source/Hack-Italic.ufo/glyphs/gdotaccent.glif
+++ b/source/Hack-Italic.ufo/glyphs/gdotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gdotaccent" format="1">
+<glyph name="gdotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="0121"/>
   <outline>
     <contour>
-      <point x="664" y="1348" type="line" name="hr00" smooth="yes"/>
+      <point x="664" y="1348" type="line" smooth="yes" name="hr00"/>
       <point x="646" y="1348"/>
       <point x="637" y="1356"/>
       <point x="637" y="1372" type="curve" smooth="yes"/>
@@ -14,7 +14,7 @@
       <point x="667" y="1525" type="line"/>
       <point x="670" y="1543"/>
       <point x="680" y="1552"/>
-      <point x="699" y="1552" type="curve" name="dv03" smooth="yes"/>
+      <point x="699" y="1552" type="curve" smooth="yes" name="dv03"/>
       <point x="844" y="1552" type="line" smooth="yes"/>
       <point x="862" y="1552"/>
       <point x="871" y="1544"/>
@@ -28,30 +28,30 @@
       <point x="809" y="1348" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="378" y="-440" type="curve" name="dv01" smooth="yes"/>
+      <point x="378" y="-440" type="curve" smooth="yes" name="dv01"/>
       <point x="263" y="-440"/>
       <point x="159" y="-421"/>
       <point x="59" y="-385" type="curve"/>
       <point x="96" y="-203" type="line" name="sh01"/>
       <point x="193" y="-263"/>
       <point x="297" y="-293"/>
-      <point x="409" y="-293" type="curve" name="dv02" smooth="yes"/>
+      <point x="409" y="-293" type="curve" smooth="yes" name="dv02"/>
       <point x="612" y="-293"/>
       <point x="705" y="-190"/>
       <point x="756" y="53" type="curve" smooth="yes"/>
       <point x="780" y="170" type="line" name="iv01"/>
       <point x="701" y="50"/>
       <point x="578" y="-8"/>
-      <point x="443" y="-8" type="curve" name="ab01" smooth="yes"/>
+      <point x="443" y="-8" type="curve" smooth="yes" name="ab01"/>
       <point x="232" y="-8"/>
       <point x="102" y="138"/>
-      <point x="102" y="401" type="curve" name="dh01" smooth="yes"/>
+      <point x="102" y="401" type="curve" smooth="yes" name="dh01"/>
       <point x="102" y="574"/>
       <point x="158" y="770"/>
       <point x="254" y="911" type="curve" smooth="yes"/>
       <point x="353" y="1058"/>
       <point x="495" y="1147"/>
-      <point x="648" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="648" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="783" y="1147"/>
       <point x="889" y="1078"/>
       <point x="934" y="965" type="curve" name="iv02"/>
@@ -62,7 +62,7 @@
       <point x="709" y="-440"/>
     </contour>
     <contour>
-      <point x="507" y="145" type="curve" name="sv01" smooth="yes"/>
+      <point x="507" y="145" type="curve" smooth="yes" name="sv01"/>
       <point x="618" y="145"/>
       <point x="705" y="203"/>
       <point x="770" y="319" type="curve" smooth="yes"/>
@@ -71,10 +71,10 @@
       <point x="874" y="728" type="curve" smooth="yes"/>
       <point x="874" y="901"/>
       <point x="796" y="991"/>
-      <point x="667" y="991" type="curve" name="sv02" smooth="yes"/>
+      <point x="667" y="991" type="curve" smooth="yes" name="sv02"/>
       <point x="438" y="991"/>
       <point x="297" y="697"/>
-      <point x="297" y="429" type="curve" name="dh02" smooth="yes"/>
+      <point x="297" y="429" type="curve" smooth="yes" name="dh02"/>
       <point x="297" y="227"/>
       <point x="376" y="145"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/germandbls.glif b/source/Hack-Italic.ufo/glyphs/germandbls.glif
index 592472798..0d829f18b 100644
--- a/source/Hack-Italic.ufo/glyphs/germandbls.glif
+++ b/source/Hack-Italic.ufo/glyphs/germandbls.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="germandbls" format="1">
+<glyph name="germandbls" format="2">
   <advance width="1233"/>
   <unicode hex="00DF"/>
   <outline>
     <contour>
-      <point x="599" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="599" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="548" y="-29"/>
       <point x="510" y="-25"/>
       <point x="462" y="-16" type="curve"/>
@@ -17,13 +17,13 @@
       <point x="486" y="136" type="curve" smooth="yes"/>
       <point x="531" y="125"/>
       <point x="577" y="119"/>
-      <point x="623" y="119" type="curve" name="dv02" smooth="yes"/>
+      <point x="623" y="119" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="119"/>
       <point x="779" y="140"/>
       <point x="830" y="182" type="curve" smooth="yes"/>
       <point x="878" y="222"/>
       <point x="905" y="277"/>
-      <point x="905" y="348" type="curve" name="ah01" smooth="yes"/>
+      <point x="905" y="348" type="curve" smooth="yes" name="ah01"/>
       <point x="905" y="389"/>
       <point x="897" y="418"/>
       <point x="878" y="445" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="587" y="710" type="curve" smooth="yes"/>
       <point x="568" y="741"/>
       <point x="559" y="777"/>
-      <point x="559" y="820" type="curve" name="sh01" smooth="yes"/>
+      <point x="559" y="820" type="curve" smooth="yes" name="sh01"/>
       <point x="559" y="907"/>
       <point x="593" y="982"/>
       <point x="661" y="1046" type="curve" smooth="yes"/>
@@ -48,16 +48,16 @@
       <point x="945" y="1208" type="curve" smooth="yes"/>
       <point x="946" y="1217"/>
       <point x="946" y="1224"/>
-      <point x="946" y="1227" type="curve" name="hr01" smooth="yes"/>
+      <point x="946" y="1227" type="curve" smooth="yes" name="hr01"/>
       <point x="946" y="1280"/>
       <point x="934" y="1328"/>
-      <point x="895" y="1361" type="curve" name="sh02" smooth="yes"/>
+      <point x="895" y="1361" type="curve" smooth="yes" name="sh02"/>
       <point x="863" y="1388"/>
       <point x="814" y="1405"/>
-      <point x="747" y="1405" type="curve" name="sh04" smooth="yes"/>
+      <point x="747" y="1405" type="curve" smooth="yes" name="sh04"/>
       <point x="671" y="1405"/>
       <point x="605" y="1383"/>
-      <point x="558" y="1338" type="curve" name="sh05" smooth="yes"/>
+      <point x="558" y="1338" type="curve" smooth="yes" name="sh05"/>
       <point x="515" y="1297"/>
       <point x="480" y="1232"/>
       <point x="461" y="1133" type="curve" smooth="yes"/>
@@ -69,7 +69,7 @@
       <point x="438" y="1453" type="curve" smooth="yes"/>
       <point x="522" y="1525"/>
       <point x="631" y="1556"/>
-      <point x="758" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="758" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="879" y="1556"/>
       <point x="972" y="1527"/>
       <point x="1032" y="1476" type="curve" smooth="yes"/>
@@ -84,20 +84,20 @@
       <point x="834" y="1020" type="curve" smooth="yes"/>
       <point x="767" y="975"/>
       <point x="733" y="920"/>
-      <point x="733" y="857" type="curve" name="sh03" smooth="yes"/>
+      <point x="733" y="857" type="curve" smooth="yes" name="sh03"/>
       <point x="733" y="829"/>
       <point x="739" y="809"/>
       <point x="754" y="788" type="curve" smooth="yes"/>
       <point x="773" y="761"/>
       <point x="794" y="744"/>
-      <point x="834" y="713" type="curve" name="hr02" smooth="yes"/>
+      <point x="834" y="713" type="curve" smooth="yes" name="hr02"/>
       <point x="885" y="674" type="line" smooth="yes"/>
       <point x="957" y="618"/>
       <point x="1010" y="574"/>
       <point x="1041" y="523" type="curve" smooth="yes"/>
       <point x="1068" y="480"/>
       <point x="1081" y="427"/>
-      <point x="1081" y="364" type="curve" name="sh06" smooth="yes"/>
+      <point x="1081" y="364" type="curve" smooth="yes" name="sh06"/>
       <point x="1081" y="252"/>
       <point x="1041" y="154"/>
       <point x="952" y="79" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/gradient.glif b/source/Hack-Italic.ufo/glyphs/gradient.glif
index dd29e1d1e..42fec63dd 100644
--- a/source/Hack-Italic.ufo/glyphs/gradient.glif
+++ b/source/Hack-Italic.ufo/glyphs/gradient.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gradient" format="1">
+<glyph name="gradient" format="2">
   <advance width="1233"/>
   <unicode hex="2207"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/grave.glif b/source/Hack-Italic.ufo/glyphs/grave.glif
index 41be21fdf..f21fe7b2c 100644
--- a/source/Hack-Italic.ufo/glyphs/grave.glif
+++ b/source/Hack-Italic.ufo/glyphs/grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="grave" format="1">
+<glyph name="grave" format="2">
   <advance width="1233"/>
   <unicode hex="0060"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/gravecomb.glif b/source/Hack-Italic.ufo/glyphs/gravecomb.glif
index e707b1d03..447f5c32b 100644
--- a/source/Hack-Italic.ufo/glyphs/gravecomb.glif
+++ b/source/Hack-Italic.ufo/glyphs/gravecomb.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gravecomb" format="1">
-  <advance width="0"/>
+<glyph name="gravecomb" format="2">
   <unicode hex="0300"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/greater.glif b/source/Hack-Italic.ufo/glyphs/greater.glif
index 9eed786ea..827840932 100644
--- a/source/Hack-Italic.ufo/glyphs/greater.glif
+++ b/source/Hack-Italic.ufo/glyphs/greater.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="greater" format="1">
+<glyph name="greater" format="2">
   <advance width="1233"/>
   <unicode hex="003E"/>
   <outline>
     <contour>
-      <point x="88" y="324" type="line" name="hr00"/>
-      <point x="938" y="641" type="line" name="iv01"/>
-      <point x="88" y="961" type="line"/>
-      <point x="88" y="1143" type="line" name="at01"/>
+      <point x="88" y="234" type="line" name="hr00"/>
+      <point x="928" y="641" type="line" name="iv01"/>
+      <point x="88" y="1051" type="line"/>
+      <point x="88" y="1243" type="line" name="at01"/>
       <point x="1145" y="725" type="line"/>
       <point x="1145" y="559" type="line"/>
-      <point x="88" y="141" type="line" name="av01"/>
+      <point x="88" y="41" type="line" name="av01"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Italic.ufo/glyphs/greaterequal.glif b/source/Hack-Italic.ufo/glyphs/greaterequal.glif
index aa5bab370..f390c010e 100644
--- a/source/Hack-Italic.ufo/glyphs/greaterequal.glif
+++ b/source/Hack-Italic.ufo/glyphs/greaterequal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="greaterequal" format="1">
+<glyph name="greaterequal" format="2">
   <advance width="1233"/>
   <unicode hex="2265"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/guillemotleft.glif b/source/Hack-Italic.ufo/glyphs/guillemotleft.glif
index a5a201e58..0330fa1b9 100644
--- a/source/Hack-Italic.ufo/glyphs/guillemotleft.glif
+++ b/source/Hack-Italic.ufo/glyphs/guillemotleft.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="guillemotleft" format="1">
+<glyph name="guillemotleft" format="2">
   <advance width="1233"/>
   <unicode hex="00AB"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/guillemotright.glif b/source/Hack-Italic.ufo/glyphs/guillemotright.glif
index 8c5f4b8f0..2224f9263 100644
--- a/source/Hack-Italic.ufo/glyphs/guillemotright.glif
+++ b/source/Hack-Italic.ufo/glyphs/guillemotright.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="guillemotright" format="1">
+<glyph name="guillemotright" format="2">
   <advance width="1233"/>
   <unicode hex="00BB"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/guilsinglleft.glif b/source/Hack-Italic.ufo/glyphs/guilsinglleft.glif
index 378411976..0c9aa38bd 100644
--- a/source/Hack-Italic.ufo/glyphs/guilsinglleft.glif
+++ b/source/Hack-Italic.ufo/glyphs/guilsinglleft.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="guilsinglleft" format="1">
+<glyph name="guilsinglleft" format="2">
   <advance width="1233"/>
   <unicode hex="2039"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/guilsinglright.glif b/source/Hack-Italic.ufo/glyphs/guilsinglright.glif
index 4061ccbdc..090e2e3bb 100644
--- a/source/Hack-Italic.ufo/glyphs/guilsinglright.glif
+++ b/source/Hack-Italic.ufo/glyphs/guilsinglright.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="guilsinglright" format="1">
+<glyph name="guilsinglright" format="2">
   <advance width="1233"/>
   <unicode hex="203A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/h.glif b/source/Hack-Italic.ufo/glyphs/h.glif
index 2b47667ec..d394c7f72 100644
--- a/source/Hack-Italic.ufo/glyphs/h.glif
+++ b/source/Hack-Italic.ufo/glyphs/h.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="h" format="1">
+<glyph name="h" format="2">
   <advance width="1233"/>
   <unicode hex="0068"/>
   <outline>
@@ -36,9 +36,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/hbar.glif b/source/Hack-Italic.ufo/glyphs/hbar.glif
index 35c40a48d..99402e689 100644
--- a/source/Hack-Italic.ufo/glyphs/hbar.glif
+++ b/source/Hack-Italic.ufo/glyphs/hbar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="hbar" format="1">
+<glyph name="hbar" format="2">
   <advance width="1233"/>
   <unicode hex="0127"/>
   <outline>
@@ -17,22 +17,22 @@
       <point x="413" y="952" type="line" name="iv01"/>
       <point x="502" y="1081"/>
       <point x="628" y="1147"/>
-      <point x="784" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="784" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1011" y="1147"/>
       <point x="1053" y="1002"/>
-      <point x="1053" y="862" type="curve" name="dh02" smooth="yes"/>
+      <point x="1053" y="862" type="curve" smooth="yes" name="dh02"/>
       <point x="1053" y="805"/>
       <point x="1046" y="755"/>
       <point x="1034" y="694" type="curve" smooth="yes"/>
       <point x="900" y="0" type="line" name="ab01"/>
       <point x="715" y="0" type="line"/>
-      <point x="850" y="695" type="line" name="hr01" smooth="yes"/>
+      <point x="850" y="695" type="line" smooth="yes" name="hr01"/>
       <point x="858" y="738"/>
       <point x="862" y="776"/>
-      <point x="862" y="809" type="curve" name="dh01" smooth="yes"/>
+      <point x="862" y="809" type="curve" smooth="yes" name="dh01"/>
       <point x="862" y="897"/>
       <point x="836" y="987"/>
-      <point x="689" y="987" type="curve" name="hr02" smooth="yes"/>
+      <point x="689" y="987" type="curve" smooth="yes" name="hr02"/>
       <point x="522" y="987"/>
       <point x="396" y="870"/>
       <point x="351" y="633" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/hcircumflex.glif b/source/Hack-Italic.ufo/glyphs/hcircumflex.glif
index e17c97ef8..9f8a35de4 100644
--- a/source/Hack-Italic.ufo/glyphs/hcircumflex.glif
+++ b/source/Hack-Italic.ufo/glyphs/hcircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="hcircumflex" format="1">
+<glyph name="hcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0125"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/hookabovecomb.glif b/source/Hack-Italic.ufo/glyphs/hookabovecomb.glif
index 028908413..17a54602e 100644
--- a/source/Hack-Italic.ufo/glyphs/hookabovecomb.glif
+++ b/source/Hack-Italic.ufo/glyphs/hookabovecomb.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="hookabovecomb" format="1">
-  <advance width="0"/>
+<glyph name="hookabovecomb" format="2">
   <unicode hex="0309"/>
   <outline>
     <contour>
@@ -10,20 +9,20 @@
       <point x="-582" y="1444" type="curve" smooth="yes"/>
       <point x="-562" y="1463"/>
       <point x="-541" y="1501"/>
-      <point x="-541" y="1536" type="curve" name="dh01" smooth="yes"/>
+      <point x="-541" y="1536" type="curve" smooth="yes" name="dh01"/>
       <point x="-541" y="1576"/>
       <point x="-567" y="1611"/>
-      <point x="-654" y="1611" type="curve" name="sv01" smooth="yes"/>
+      <point x="-654" y="1611" type="curve" smooth="yes" name="sv01"/>
       <point x="-701" y="1611"/>
       <point x="-760" y="1602"/>
       <point x="-808" y="1579" type="curve" name="iv01"/>
       <point x="-783" y="1710" type="line"/>
       <point x="-722" y="1726"/>
       <point x="-663" y="1734"/>
-      <point x="-604" y="1734" type="curve" name="dv01" smooth="yes"/>
+      <point x="-604" y="1734" type="curve" smooth="yes" name="dv01"/>
       <point x="-464" y="1734"/>
       <point x="-394" y="1688"/>
-      <point x="-394" y="1596" type="curve" name="dh02" smooth="yes"/>
+      <point x="-394" y="1596" type="curve" smooth="yes" name="dh02"/>
       <point x="-394" y="1585"/>
       <point x="-395" y="1575"/>
       <point x="-397" y="1564" type="curve" name="sh01"/>
diff --git a/source/Hack-Italic.ufo/glyphs/hungarumlaut.glif b/source/Hack-Italic.ufo/glyphs/hungarumlaut.glif
index 687cc1d53..5979d6d60 100644
--- a/source/Hack-Italic.ufo/glyphs/hungarumlaut.glif
+++ b/source/Hack-Italic.ufo/glyphs/hungarumlaut.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="hungarumlaut" format="1">
+<glyph name="hungarumlaut" format="2">
   <advance width="1233"/>
   <unicode hex="02DD"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/hyphen.glif b/source/Hack-Italic.ufo/glyphs/hyphen.glif
index 3e4139a25..63aaf0b80 100644
--- a/source/Hack-Italic.ufo/glyphs/hyphen.glif
+++ b/source/Hack-Italic.ufo/glyphs/hyphen.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="hyphen" format="1">
+<glyph name="hyphen" format="2">
   <advance width="1233"/>
   <unicode hex="002D"/>
   <outline>
     <contour>
-      <point x="226" y="683" type="line" name="hr00"/>
-      <point x="1048" y="683" type="line" name="dv02"/>
-      <point x="1015" y="519" type="line" name="dv01"/>
-      <point x="193" y="519" type="line"/>
+      <point x="226" y="727" type="line" name="hr00"/>
+      <point x="1048" y="727" type="line" name="dv02"/>
+      <point x="1015" y="563" type="line" name="dv01"/>
+      <point x="193" y="563" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
+      <string>2018-06-07 23:56:49 +0000</string>
     </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/hyphenationpoint.glif b/source/Hack-Italic.ufo/glyphs/hyphenationpoint.glif
index e21ab649e..2a9fa1b42 100644
--- a/source/Hack-Italic.ufo/glyphs/hyphenationpoint.glif
+++ b/source/Hack-Italic.ufo/glyphs/hyphenationpoint.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="hyphenationpoint" format="1">
+<glyph name="hyphenationpoint" format="2">
   <advance width="1233"/>
   <unicode hex="2027"/>
   <outline>
     <contour>
-      <point x="616" y="576" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="576" type="curve" smooth="yes" name="hr00"/>
       <point x="525" y="576"/>
       <point x="454" y="645"/>
       <point x="454" y="745" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/i.glif b/source/Hack-Italic.ufo/glyphs/i.glif
index 224f85e6c..3c50f41d6 100644
--- a/source/Hack-Italic.ufo/glyphs/i.glif
+++ b/source/Hack-Italic.ufo/glyphs/i.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="i" format="1">
+<glyph name="i" format="2">
   <advance width="1233"/>
   <unicode hex="0069"/>
   <outline>
@@ -51,9 +51,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/iacute.glif b/source/Hack-Italic.ufo/glyphs/iacute.glif
index f48f7b338..b8edc78c9 100644
--- a/source/Hack-Italic.ufo/glyphs/iacute.glif
+++ b/source/Hack-Italic.ufo/glyphs/iacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="iacute" format="1">
+<glyph name="iacute" format="2">
   <advance width="1233"/>
   <unicode hex="00ED"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="496" y="1297" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="749" y="-4" type="line" name="ab01" smooth="yes"/>
+      <point x="749" y="-4" type="line" smooth="yes" name="ab01"/>
       <point x="633" y="-4"/>
       <point x="547" y="17"/>
       <point x="492" y="60" type="curve" smooth="yes"/>
       <point x="435" y="103"/>
       <point x="407" y="167"/>
-      <point x="407" y="252" type="curve" name="dh01" smooth="yes"/>
+      <point x="407" y="252" type="curve" smooth="yes" name="dh01"/>
       <point x="407" y="293"/>
       <point x="412" y="348"/>
       <point x="426" y="408" type="curve" smooth="yes"/>
@@ -30,13 +30,13 @@
       <point x="600" y="342" type="curve" smooth="yes"/>
       <point x="597" y="321"/>
       <point x="596" y="310"/>
-      <point x="596" y="297" type="curve" name="dh02" smooth="yes"/>
+      <point x="596" y="297" type="curve" smooth="yes" name="dh02"/>
       <point x="596" y="248"/>
       <point x="611" y="211"/>
       <point x="640" y="188" type="curve" smooth="yes"/>
       <point x="670" y="164"/>
       <point x="715" y="152"/>
-      <point x="776" y="152" type="curve" name="sv02" smooth="yes"/>
+      <point x="776" y="152" type="curve" smooth="yes" name="sv02"/>
       <point x="987" y="152" type="line"/>
       <point x="956" y="-4" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/ibreve.glif b/source/Hack-Italic.ufo/glyphs/ibreve.glif
index b96e334bc..5335fadbc 100644
--- a/source/Hack-Italic.ufo/glyphs/ibreve.glif
+++ b/source/Hack-Italic.ufo/glyphs/ibreve.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ibreve" format="1">
+<glyph name="ibreve" format="2">
   <advance width="1233"/>
   <unicode hex="012D"/>
   <outline>
     <contour>
-      <point x="749" y="-4" type="line" name="hr00" smooth="yes"/>
+      <point x="749" y="-4" type="line" smooth="yes" name="hr00"/>
       <point x="633" y="-4"/>
       <point x="547" y="17"/>
       <point x="492" y="60" type="curve" smooth="yes"/>
       <point x="435" y="103"/>
       <point x="407" y="167"/>
-      <point x="407" y="252" type="curve" name="dh01" smooth="yes"/>
+      <point x="407" y="252" type="curve" smooth="yes" name="dh01"/>
       <point x="407" y="293"/>
       <point x="412" y="348"/>
       <point x="426" y="408" type="curve" smooth="yes"/>
@@ -24,13 +24,13 @@
       <point x="600" y="342" type="curve" smooth="yes"/>
       <point x="597" y="321"/>
       <point x="596" y="310"/>
-      <point x="596" y="297" type="curve" name="dh02" smooth="yes"/>
+      <point x="596" y="297" type="curve" smooth="yes" name="dh02"/>
       <point x="596" y="248"/>
       <point x="611" y="211"/>
       <point x="640" y="188" type="curve" smooth="yes"/>
       <point x="670" y="164"/>
       <point x="715" y="152"/>
-      <point x="776" y="152" type="curve" name="sv02" smooth="yes"/>
+      <point x="776" y="152" type="curve" smooth="yes" name="sv02"/>
       <point x="987" y="152" type="line" name="sv03"/>
       <point x="956" y="-4" type="line" name="ab01"/>
     </contour>
@@ -39,7 +39,7 @@
       <point x="940" y="1584" type="line"/>
       <point x="903" y="1483"/>
       <point x="834" y="1434"/>
-      <point x="723" y="1434" type="curve" name="hr01" smooth="yes"/>
+      <point x="723" y="1434" type="curve" smooth="yes" name="hr01"/>
       <point x="612" y="1434"/>
       <point x="553" y="1482"/>
       <point x="553" y="1567" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/icircumflex.glif b/source/Hack-Italic.ufo/glyphs/icircumflex.glif
index 2c63dd7cf..7e8ea577a 100644
--- a/source/Hack-Italic.ufo/glyphs/icircumflex.glif
+++ b/source/Hack-Italic.ufo/glyphs/icircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="icircumflex" format="1">
+<glyph name="icircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00EE"/>
   <outline>
@@ -13,13 +13,13 @@
       <point x="368" y="1297" type="line" name="iv03"/>
     </contour>
     <contour>
-      <point x="749" y="-4" type="line" name="ab01" smooth="yes"/>
+      <point x="749" y="-4" type="line" smooth="yes" name="ab01"/>
       <point x="633" y="-4"/>
       <point x="547" y="17"/>
       <point x="492" y="60" type="curve" smooth="yes"/>
       <point x="435" y="103"/>
       <point x="407" y="167"/>
-      <point x="407" y="252" type="curve" name="dh01" smooth="yes"/>
+      <point x="407" y="252" type="curve" smooth="yes" name="dh01"/>
       <point x="407" y="293"/>
       <point x="412" y="348"/>
       <point x="426" y="408" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="600" y="342" type="curve" smooth="yes"/>
       <point x="597" y="321"/>
       <point x="596" y="310"/>
-      <point x="596" y="297" type="curve" name="dh02" smooth="yes"/>
+      <point x="596" y="297" type="curve" smooth="yes" name="dh02"/>
       <point x="596" y="248"/>
       <point x="611" y="211"/>
       <point x="640" y="188" type="curve" smooth="yes"/>
       <point x="670" y="164"/>
       <point x="715" y="152"/>
-      <point x="776" y="152" type="curve" name="sv02" smooth="yes"/>
+      <point x="776" y="152" type="curve" smooth="yes" name="sv02"/>
       <point x="987" y="152" type="line"/>
       <point x="956" y="-4" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/idieresis.glif b/source/Hack-Italic.ufo/glyphs/idieresis.glif
index c495a94c7..c92c4c652 100644
--- a/source/Hack-Italic.ufo/glyphs/idieresis.glif
+++ b/source/Hack-Italic.ufo/glyphs/idieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="idieresis" format="1">
+<glyph name="idieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00EF"/>
   <outline>
     <contour>
-      <point x="380" y="1350" type="line" name="hr00" smooth="yes"/>
+      <point x="380" y="1350" type="line" smooth="yes" name="hr00"/>
       <point x="360" y="1350"/>
       <point x="349" y="1363"/>
       <point x="353" y="1383" type="curve" smooth="yes"/>
       <point x="381" y="1525" type="line"/>
       <point x="384" y="1543"/>
       <point x="394" y="1552"/>
-      <point x="413" y="1552" type="curve" name="dv01" smooth="yes"/>
+      <point x="413" y="1552" type="curve" smooth="yes" name="dv01"/>
       <point x="556" y="1552" type="line" smooth="yes"/>
       <point x="576" y="1552"/>
       <point x="587" y="1539"/>
@@ -22,14 +22,14 @@
       <point x="523" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="771" y="1350" type="line" name="sv01" smooth="yes"/>
+      <point x="771" y="1350" type="line" smooth="yes" name="sv01"/>
       <point x="751" y="1350"/>
       <point x="740" y="1363"/>
       <point x="744" y="1383" type="curve" smooth="yes"/>
       <point x="772" y="1525" type="line"/>
       <point x="775" y="1543"/>
       <point x="785" y="1552"/>
-      <point x="804" y="1552" type="curve" name="sv02" smooth="yes"/>
+      <point x="804" y="1552" type="curve" smooth="yes" name="sv02"/>
       <point x="947" y="1552" type="line" smooth="yes"/>
       <point x="967" y="1552"/>
       <point x="978" y="1539"/>
@@ -40,13 +40,13 @@
       <point x="914" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="749" y="-4" type="line" name="ab01" smooth="yes"/>
+      <point x="749" y="-4" type="line" smooth="yes" name="ab01"/>
       <point x="633" y="-4"/>
       <point x="547" y="17"/>
       <point x="492" y="60" type="curve" smooth="yes"/>
       <point x="435" y="103"/>
       <point x="407" y="167"/>
-      <point x="407" y="252" type="curve" name="dh01" smooth="yes"/>
+      <point x="407" y="252" type="curve" smooth="yes" name="dh01"/>
       <point x="407" y="293"/>
       <point x="412" y="348"/>
       <point x="426" y="408" type="curve" smooth="yes"/>
@@ -60,13 +60,13 @@
       <point x="600" y="342" type="curve" smooth="yes"/>
       <point x="597" y="321"/>
       <point x="596" y="310"/>
-      <point x="596" y="297" type="curve" name="dh02" smooth="yes"/>
+      <point x="596" y="297" type="curve" smooth="yes" name="dh02"/>
       <point x="596" y="248"/>
       <point x="611" y="211"/>
       <point x="640" y="188" type="curve" smooth="yes"/>
       <point x="670" y="164"/>
       <point x="715" y="152"/>
-      <point x="776" y="152" type="curve" name="sv04" smooth="yes"/>
+      <point x="776" y="152" type="curve" smooth="yes" name="sv04"/>
       <point x="987" y="152" type="line"/>
       <point x="956" y="-4" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/igrave.glif b/source/Hack-Italic.ufo/glyphs/igrave.glif
index 3fc5203ab..a202a1ece 100644
--- a/source/Hack-Italic.ufo/glyphs/igrave.glif
+++ b/source/Hack-Italic.ufo/glyphs/igrave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="igrave" format="1">
+<glyph name="igrave" format="2">
   <advance width="1233"/>
   <unicode hex="00EC"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="635" y="1270" type="line"/>
     </contour>
     <contour>
-      <point x="749" y="-4" type="line" name="ab01" smooth="yes"/>
+      <point x="749" y="-4" type="line" smooth="yes" name="ab01"/>
       <point x="633" y="-4"/>
       <point x="547" y="17"/>
       <point x="492" y="60" type="curve" smooth="yes"/>
       <point x="435" y="103"/>
       <point x="407" y="167"/>
-      <point x="407" y="252" type="curve" name="dh01" smooth="yes"/>
+      <point x="407" y="252" type="curve" smooth="yes" name="dh01"/>
       <point x="407" y="293"/>
       <point x="412" y="348"/>
       <point x="426" y="408" type="curve" smooth="yes"/>
@@ -30,13 +30,13 @@
       <point x="600" y="342" type="curve" smooth="yes"/>
       <point x="597" y="321"/>
       <point x="596" y="310"/>
-      <point x="596" y="297" type="curve" name="dh02" smooth="yes"/>
+      <point x="596" y="297" type="curve" smooth="yes" name="dh02"/>
       <point x="596" y="248"/>
       <point x="611" y="211"/>
       <point x="640" y="188" type="curve" smooth="yes"/>
       <point x="670" y="164"/>
       <point x="715" y="152"/>
-      <point x="776" y="152" type="curve" name="sv02" smooth="yes"/>
+      <point x="776" y="152" type="curve" smooth="yes" name="sv02"/>
       <point x="987" y="152" type="line"/>
       <point x="956" y="-4" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/ij.glif b/source/Hack-Italic.ufo/glyphs/ij.glif
index 3d36b9563..b55cfe098 100644
--- a/source/Hack-Italic.ufo/glyphs/ij.glif
+++ b/source/Hack-Italic.ufo/glyphs/ij.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ij" format="1">
+<glyph name="ij" format="2">
   <advance width="1233"/>
   <unicode hex="0133"/>
   <outline>
     <contour>
-      <point x="324" y="1344" type="curve" name="hr00" smooth="yes"/>
+      <point x="324" y="1344" type="curve" smooth="yes" name="hr00"/>
       <point x="324" y="1349"/>
       <point x="324" y="1352"/>
       <point x="325" y="1353" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/imacron.glif b/source/Hack-Italic.ufo/glyphs/imacron.glif
index 1a6f6d72d..70cb24935 100644
--- a/source/Hack-Italic.ufo/glyphs/imacron.glif
+++ b/source/Hack-Italic.ufo/glyphs/imacron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="imacron" format="1">
+<glyph name="imacron" format="2">
   <advance width="1233"/>
   <unicode hex="012B"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="380" y="1320" type="line"/>
     </contour>
     <contour>
-      <point x="749" y="-4" type="line" name="ab01" smooth="yes"/>
+      <point x="749" y="-4" type="line" smooth="yes" name="ab01"/>
       <point x="633" y="-4"/>
       <point x="547" y="17"/>
       <point x="492" y="60" type="curve" smooth="yes"/>
       <point x="435" y="103"/>
       <point x="407" y="167"/>
-      <point x="407" y="252" type="curve" name="dh01" smooth="yes"/>
+      <point x="407" y="252" type="curve" smooth="yes" name="dh01"/>
       <point x="407" y="293"/>
       <point x="412" y="348"/>
       <point x="426" y="408" type="curve" smooth="yes"/>
@@ -30,13 +30,13 @@
       <point x="600" y="342" type="curve" smooth="yes"/>
       <point x="597" y="321"/>
       <point x="596" y="310"/>
-      <point x="596" y="297" type="curve" name="dh02" smooth="yes"/>
+      <point x="596" y="297" type="curve" smooth="yes" name="dh02"/>
       <point x="596" y="248"/>
       <point x="611" y="211"/>
       <point x="640" y="188" type="curve" smooth="yes"/>
       <point x="670" y="164"/>
       <point x="715" y="152"/>
-      <point x="776" y="152" type="curve" name="sv02" smooth="yes"/>
+      <point x="776" y="152" type="curve" smooth="yes" name="sv02"/>
       <point x="987" y="152" type="line"/>
       <point x="956" y="-4" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/infinity.glif b/source/Hack-Italic.ufo/glyphs/infinity.glif
index 413b0303f..dde3d7bf6 100644
--- a/source/Hack-Italic.ufo/glyphs/infinity.glif
+++ b/source/Hack-Italic.ufo/glyphs/infinity.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="infinity" format="1">
+<glyph name="infinity" format="2">
   <advance width="1233"/>
   <unicode hex="221E"/>
   <outline>
     <contour>
-      <point x="332" y="250" type="curve" name="hr00" smooth="yes"/>
+      <point x="332" y="250" type="curve" smooth="yes" name="hr00"/>
       <point x="165" y="250"/>
       <point x="41" y="410"/>
-      <point x="41" y="632" type="curve" name="sh01" smooth="yes"/>
+      <point x="41" y="632" type="curve" smooth="yes" name="sh01"/>
       <point x="41" y="739"/>
       <point x="67" y="836"/>
       <point x="119" y="905" type="curve" smooth="yes"/>
       <point x="168" y="970"/>
       <point x="240" y="1008"/>
-      <point x="332" y="1008" type="curve" name="dv03" smooth="yes"/>
+      <point x="332" y="1008" type="curve" smooth="yes" name="dv03"/>
       <point x="399" y="1008"/>
       <point x="447" y="988"/>
       <point x="491" y="951" type="curve" smooth="yes"/>
@@ -22,19 +22,19 @@
       <point x="616" y="764" type="curve" name="ih01"/>
       <point x="679" y="924"/>
       <point x="778" y="1008"/>
-      <point x="900" y="1008" type="curve" name="sv01" smooth="yes"/>
+      <point x="900" y="1008" type="curve" smooth="yes" name="sv01"/>
       <point x="984" y="1008"/>
       <point x="1055" y="967"/>
       <point x="1107" y="899" type="curve" smooth="yes"/>
       <point x="1156" y="835"/>
       <point x="1192" y="746"/>
-      <point x="1192" y="626" type="curve" name="sh02" smooth="yes"/>
+      <point x="1192" y="626" type="curve" smooth="yes" name="sh02"/>
       <point x="1192" y="515"/>
       <point x="1162" y="420"/>
       <point x="1111" y="355" type="curve" smooth="yes"/>
       <point x="1058" y="286"/>
       <point x="984" y="250"/>
-      <point x="903" y="250" type="curve" name="sv02" smooth="yes"/>
+      <point x="903" y="250" type="curve" smooth="yes" name="sv02"/>
       <point x="848" y="250"/>
       <point x="799" y="267"/>
       <point x="756" y="300" type="curve" smooth="yes"/>
@@ -48,7 +48,7 @@
       <point x="387" y="250"/>
     </contour>
     <contour>
-      <point x="318" y="391" type="curve" name="dv01" smooth="yes"/>
+      <point x="318" y="391" type="curve" smooth="yes" name="dv01"/>
       <point x="362" y="391"/>
       <point x="402" y="411"/>
       <point x="437" y="450" type="curve" smooth="yes"/>
@@ -60,13 +60,13 @@
       <point x="435" y="819" type="curve" smooth="yes"/>
       <point x="404" y="852"/>
       <point x="369" y="868"/>
-      <point x="329" y="868" type="curve" name="dv02" smooth="yes"/>
+      <point x="329" y="868" type="curve" smooth="yes" name="dv02"/>
       <point x="284" y="868"/>
       <point x="242" y="846"/>
       <point x="211" y="802" type="curve" smooth="yes"/>
       <point x="184" y="763"/>
       <point x="166" y="706"/>
-      <point x="166" y="627" type="curve" name="sh03" smooth="yes"/>
+      <point x="166" y="627" type="curve" smooth="yes" name="sh03"/>
       <point x="166" y="559"/>
       <point x="180" y="499"/>
       <point x="208" y="455" type="curve" smooth="yes"/>
@@ -74,19 +74,19 @@
       <point x="270" y="391"/>
     </contour>
     <contour>
-      <point x="903" y="391" type="curve" name="sv03" smooth="yes"/>
+      <point x="903" y="391" type="curve" smooth="yes" name="sv03"/>
       <point x="948" y="391"/>
       <point x="989" y="411"/>
       <point x="1020" y="458" type="curve" smooth="yes"/>
       <point x="1049" y="501"/>
       <point x="1065" y="560"/>
-      <point x="1065" y="633" type="curve" name="ah01" smooth="yes"/>
+      <point x="1065" y="633" type="curve" smooth="yes" name="ah01"/>
       <point x="1065" y="709"/>
       <point x="1048" y="766"/>
       <point x="1023" y="805" type="curve" smooth="yes"/>
       <point x="996" y="847"/>
       <point x="958" y="868"/>
-      <point x="910" y="868" type="curve" name="sv04" smooth="yes"/>
+      <point x="910" y="868" type="curve" smooth="yes" name="sv04"/>
       <point x="867" y="868"/>
       <point x="828" y="849"/>
       <point x="793" y="810" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/integral.glif b/source/Hack-Italic.ufo/glyphs/integral.glif
index f6803f446..438b9aebc 100644
--- a/source/Hack-Italic.ufo/glyphs/integral.glif
+++ b/source/Hack-Italic.ufo/glyphs/integral.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="integral" format="1">
+<glyph name="integral" format="2">
   <advance width="1233"/>
   <unicode hex="222B"/>
   <outline>
     <contour>
-      <point x="314" y="-371" type="curve" name="dv01" smooth="yes"/>
+      <point x="314" y="-371" type="curve" smooth="yes" name="dv01"/>
       <point x="259" y="-371"/>
       <point x="214" y="-358"/>
       <point x="179" y="-330" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="163" y="-136" type="curve" smooth="yes"/>
       <point x="186" y="-115"/>
       <point x="217" y="-104"/>
-      <point x="256" y="-104" type="curve" name="sv01" smooth="yes"/>
+      <point x="256" y="-104" type="curve" smooth="yes" name="sv01"/>
       <point x="279" y="-104"/>
       <point x="299" y="-109"/>
       <point x="315" y="-119" type="curve" smooth="yes"/>
@@ -25,7 +25,7 @@
       <point x="354" y="-161" type="curve" smooth="yes"/>
       <point x="366" y="-186"/>
       <point x="365" y="-262"/>
-      <point x="395" y="-262" type="curve" name="hr01" smooth="yes"/>
+      <point x="395" y="-262" type="curve" smooth="yes" name="hr01"/>
       <point x="468" y="-262"/>
       <point x="502" y="-18"/>
       <point x="513" y="426" type="curve"/>
@@ -34,7 +34,7 @@
       <point x="516" y="591" type="curve"/>
       <point x="535" y="1272"/>
       <point x="654" y="1550"/>
-      <point x="915" y="1550" type="curve" name="dv02" smooth="yes"/>
+      <point x="915" y="1550" type="curve" smooth="yes" name="dv02"/>
       <point x="967" y="1550"/>
       <point x="1016" y="1539"/>
       <point x="1051" y="1508" type="curve" smooth="yes"/>
@@ -43,7 +43,7 @@
       <point x="1100" y="1399" type="curve" smooth="yes"/>
       <point x="1100" y="1331"/>
       <point x="1054" y="1284"/>
-      <point x="981" y="1284" type="curve" name="sv02" smooth="yes"/>
+      <point x="981" y="1284" type="curve" smooth="yes" name="sv02"/>
       <point x="953" y="1284"/>
       <point x="930" y="1290"/>
       <point x="911" y="1303" type="curve" smooth="yes"/>
@@ -55,7 +55,7 @@
       <point x="861" y="1408" type="curve" smooth="yes"/>
       <point x="857" y="1433"/>
       <point x="853" y="1444"/>
-      <point x="837" y="1444" type="curve" name="hr02" smooth="yes"/>
+      <point x="837" y="1444" type="curve" smooth="yes" name="hr02"/>
       <point x="768" y="1444"/>
       <point x="729" y="1238"/>
       <point x="719" y="825" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/integralbt.glif b/source/Hack-Italic.ufo/glyphs/integralbt.glif
index ef1dfa023..42d7fbac4 100644
--- a/source/Hack-Italic.ufo/glyphs/integralbt.glif
+++ b/source/Hack-Italic.ufo/glyphs/integralbt.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="integralbt" format="1">
+<glyph name="integralbt" format="2">
   <advance width="1233"/>
   <unicode hex="2321"/>
   <outline>
     <contour>
-      <point x="310" y="-486" type="curve" name="hr00" smooth="yes"/>
+      <point x="310" y="-486" type="curve" smooth="yes" name="hr00"/>
       <point x="193" y="-486"/>
       <point x="124" y="-424"/>
       <point x="124" y="-336" type="curve" smooth="yes"/>
@@ -19,17 +19,17 @@
       <point x="364" y="-344" type="curve" smooth="yes"/>
       <point x="368" y="-372"/>
       <point x="373" y="-380"/>
-      <point x="386" y="-380" type="curve" name="dv01" smooth="yes"/>
+      <point x="386" y="-380" type="curve" smooth="yes" name="dv01"/>
       <point x="451" y="-380"/>
       <point x="494" y="-174"/>
       <point x="505" y="239" type="curve" smooth="yes"/>
       <point x="513" y="542" type="line" name="dh01"/>
       <point x="513" y="1929" type="line" name="av01"/>
       <point x="711" y="1929" type="line"/>
-      <point x="711" y="638" type="line" name="dh02" smooth="yes"/>
+      <point x="711" y="638" type="line" smooth="yes" name="dh02"/>
       <point x="711" y="614"/>
       <point x="710" y="559"/>
-      <point x="708" y="473" type="curve" name="sh01" smooth="yes"/>
+      <point x="708" y="473" type="curve" smooth="yes" name="sh01"/>
       <point x="699" y="122"/>
       <point x="664" y="-117"/>
       <point x="601" y="-264" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/integraltp.glif b/source/Hack-Italic.ufo/glyphs/integraltp.glif
index 9517a64b4..280cf79e6 100644
--- a/source/Hack-Italic.ufo/glyphs/integraltp.glif
+++ b/source/Hack-Italic.ufo/glyphs/integraltp.glif
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="integraltp" format="1">
+<glyph name="integraltp" format="2">
   <advance width="1233"/>
   <unicode hex="2320"/>
   <outline>
     <contour>
-      <point x="513" y="776" type="line" name="dh01" smooth="yes"/>
+      <point x="513" y="776" type="line" smooth="yes" name="dh01"/>
       <point x="513" y="800"/>
       <point x="514" y="855"/>
-      <point x="516" y="941" type="curve" name="sh01" smooth="yes"/>
+      <point x="516" y="941" type="curve" smooth="yes" name="sh01"/>
       <point x="525" y="1290"/>
       <point x="560" y="1531"/>
       <point x="623" y="1678" type="curve" smooth="yes"/>
       <point x="687" y="1827"/>
       <point x="787" y="1900"/>
-      <point x="914" y="1900" type="curve" name="dv02" smooth="yes"/>
+      <point x="914" y="1900" type="curve" smooth="yes" name="dv02"/>
       <point x="1031" y="1900"/>
       <point x="1100" y="1838"/>
       <point x="1100" y="1750" type="curve" smooth="yes"/>
       <point x="1100" y="1678"/>
       <point x="1055" y="1634"/>
-      <point x="980" y="1634" type="curve" name="sv01" smooth="yes"/>
+      <point x="980" y="1634" type="curve" smooth="yes" name="sv01"/>
       <point x="929" y="1634"/>
       <point x="890" y="1655"/>
       <point x="871" y="1707" type="curve"/>
       <point x="864" y="1723"/>
       <point x="862" y="1749"/>
-      <point x="861" y="1758" type="curve" name="hr01" smooth="yes"/>
+      <point x="861" y="1758" type="curve" smooth="yes" name="hr01"/>
       <point x="857" y="1786"/>
       <point x="851" y="1794"/>
-      <point x="838" y="1794" type="curve" name="dv01" smooth="yes"/>
+      <point x="838" y="1794" type="curve" smooth="yes" name="dv01"/>
       <point x="771" y="1794"/>
       <point x="730" y="1588"/>
       <point x="719" y="1175" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/intersection.glif b/source/Hack-Italic.ufo/glyphs/intersection.glif
index 8c9fb5079..02436f0a7 100644
--- a/source/Hack-Italic.ufo/glyphs/intersection.glif
+++ b/source/Hack-Italic.ufo/glyphs/intersection.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="intersection" format="1">
+<glyph name="intersection" format="2">
   <advance width="1233"/>
   <unicode hex="2229"/>
   <outline>
     <contour>
-      <point x="164" y="580" type="line" name="hr00" smooth="yes"/>
+      <point x="164" y="580" type="line" smooth="yes" name="hr00"/>
       <point x="164" y="740"/>
       <point x="172" y="839"/>
       <point x="189" y="908" type="curve" smooth="yes"/>
@@ -13,7 +13,7 @@
       <point x="426" y="1157" type="curve" smooth="yes"/>
       <point x="484" y="1176"/>
       <point x="547" y="1186"/>
-      <point x="615" y="1186" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="1186" type="curve" smooth="yes" name="dv02"/>
       <point x="760" y="1186"/>
       <point x="882" y="1142"/>
       <point x="958" y="1069" type="curve" smooth="yes"/>
@@ -28,22 +28,22 @@
       <point x="896" y="674" type="line" smooth="yes"/>
       <point x="896" y="708"/>
       <point x="893" y="784"/>
-      <point x="885" y="832" type="curve" name="sh02" smooth="yes"/>
+      <point x="885" y="832" type="curve" smooth="yes" name="sh02"/>
       <point x="878" y="872"/>
       <point x="869" y="898"/>
       <point x="866" y="903" type="curve" smooth="yes"/>
       <point x="839" y="968"/>
       <point x="729" y="1022"/>
-      <point x="614" y="1022" type="curve" name="dv01" smooth="yes"/>
+      <point x="614" y="1022" type="curve" smooth="yes" name="dv01"/>
       <point x="512" y="1022"/>
       <point x="405" y="979"/>
       <point x="367" y="903" type="curve" smooth="yes"/>
       <point x="359" y="886"/>
       <point x="354" y="872"/>
-      <point x="349" y="832" type="curve" name="sh04" smooth="yes"/>
+      <point x="349" y="832" type="curve" smooth="yes" name="sh04"/>
       <point x="341" y="775"/>
       <point x="337" y="696"/>
-      <point x="337" y="672" type="curve" name="sh03" smooth="yes"/>
+      <point x="337" y="672" type="curve" smooth="yes" name="sh03"/>
       <point x="337" y="0" type="line" name="ab01"/>
       <point x="164" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/invbullet.glif b/source/Hack-Italic.ufo/glyphs/invbullet.glif
index a3eb0a7ae..44022180d 100644
--- a/source/Hack-Italic.ufo/glyphs/invbullet.glif
+++ b/source/Hack-Italic.ufo/glyphs/invbullet.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="invbullet" format="1">
+<glyph name="invbullet" format="2">
   <advance width="1233"/>
   <unicode hex="25D8"/>
   <outline>
@@ -10,16 +10,16 @@
       <point x="-20" y="-20" type="line" name="sh02"/>
     </contour>
     <contour>
-      <point x="614" y="465" type="curve" name="sv01" smooth="yes"/>
+      <point x="614" y="465" type="curve" smooth="yes" name="sv01"/>
       <point x="782" y="465"/>
       <point x="913" y="597"/>
-      <point x="913" y="762" type="curve" name="ah01" smooth="yes"/>
+      <point x="913" y="762" type="curve" smooth="yes" name="ah01"/>
       <point x="913" y="926"/>
       <point x="782" y="1057"/>
       <point x="615" y="1057" type="curve" smooth="yes"/>
       <point x="450" y="1057"/>
       <point x="319" y="926"/>
-      <point x="319" y="761" type="curve" name="sh03" smooth="yes"/>
+      <point x="319" y="761" type="curve" smooth="yes" name="sh03"/>
       <point x="319" y="596"/>
       <point x="449" y="465"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/invcircle.glif b/source/Hack-Italic.ufo/glyphs/invcircle.glif
index e0d36fb47..a59eb9cc6 100644
--- a/source/Hack-Italic.ufo/glyphs/invcircle.glif
+++ b/source/Hack-Italic.ufo/glyphs/invcircle.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="invcircle" format="1">
+<glyph name="invcircle" format="2">
   <advance width="1233"/>
   <unicode hex="25D9"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="-20" y="-512" type="line"/>
     </contour>
     <contour>
-      <point x="617" y="-84" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="-84"/>
       <point x="818" y="-56"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="818" y="1120"/>
       <point x="710" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv03"/>
       <point x="524" y="1148"/>
       <point x="413" y="1119"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/iogonek.glif b/source/Hack-Italic.ufo/glyphs/iogonek.glif
index b9fb856c3..89b0e2ce8 100644
--- a/source/Hack-Italic.ufo/glyphs/iogonek.glif
+++ b/source/Hack-Italic.ufo/glyphs/iogonek.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="iogonek" format="1">
+<glyph name="iogonek" format="2">
   <advance width="1233"/>
   <unicode hex="012F"/>
   <outline>
     <contour>
-      <point x="631" y="1323" type="line" name="sv01" smooth="yes"/>
+      <point x="631" y="1323" type="line" smooth="yes" name="sv01"/>
       <point x="611" y="1323"/>
       <point x="600" y="1336"/>
       <point x="604" y="1356" type="curve" smooth="yes"/>
       <point x="638" y="1529" type="line"/>
       <point x="641" y="1547"/>
       <point x="651" y="1556"/>
-      <point x="670" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="670" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="794" y="1556" type="line" smooth="yes"/>
       <point x="814" y="1556"/>
       <point x="825" y="1543"/>
@@ -25,29 +25,29 @@
       <point x="774" y="-4" type="line" name="ab01"/>
       <point x="706" y="-73"/>
       <point x="669" y="-133"/>
-      <point x="669" y="-184" type="curve" name="sh01" smooth="yes"/>
+      <point x="669" y="-184" type="curve" smooth="yes" name="sh01"/>
       <point x="669" y="-231"/>
       <point x="701" y="-256"/>
-      <point x="765" y="-256" type="curve" name="dv02" smooth="yes"/>
+      <point x="765" y="-256" type="curve" smooth="yes" name="dv02"/>
       <point x="804" y="-256"/>
       <point x="849" y="-246"/>
       <point x="892" y="-226" type="curve"/>
       <point x="867" y="-359" type="line"/>
       <point x="821" y="-372"/>
       <point x="775" y="-379"/>
-      <point x="728" y="-379" type="curve" name="dv01" smooth="yes"/>
+      <point x="728" y="-379" type="curve" smooth="yes" name="dv01"/>
       <point x="597" y="-379"/>
       <point x="523" y="-322"/>
-      <point x="523" y="-229" type="curve" name="ih01" smooth="yes"/>
+      <point x="523" y="-229" type="curve" smooth="yes" name="ih01"/>
       <point x="523" y="-158"/>
       <point x="566" y="-86"/>
       <point x="659" y="1" type="curve" name="ih02"/>
       <point x="586" y="10"/>
       <point x="531" y="30"/>
-      <point x="492" y="60" type="curve" name="hr01" smooth="yes"/>
+      <point x="492" y="60" type="curve" smooth="yes" name="hr01"/>
       <point x="435" y="103"/>
       <point x="407" y="167"/>
-      <point x="407" y="252" type="curve" name="dh01" smooth="yes"/>
+      <point x="407" y="252" type="curve" smooth="yes" name="dh01"/>
       <point x="407" y="293"/>
       <point x="413" y="346"/>
       <point x="426" y="408" type="curve"/>
@@ -61,13 +61,13 @@
       <point x="600" y="342" type="curve" smooth="yes"/>
       <point x="597" y="319"/>
       <point x="596" y="311"/>
-      <point x="596" y="298" type="curve" name="dh02" smooth="yes"/>
+      <point x="596" y="298" type="curve" smooth="yes" name="dh02"/>
       <point x="596" y="248"/>
       <point x="611" y="211"/>
       <point x="640" y="188" type="curve" smooth="yes"/>
       <point x="670" y="164"/>
       <point x="715" y="152"/>
-      <point x="776" y="152" type="curve" name="sv03" smooth="yes"/>
+      <point x="776" y="152" type="curve" smooth="yes" name="sv03"/>
       <point x="987" y="152" type="line"/>
       <point x="956" y="-4" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/iota.glif b/source/Hack-Italic.ufo/glyphs/iota.glif
index daa1b8992..a7dfc5611 100644
--- a/source/Hack-Italic.ufo/glyphs/iota.glif
+++ b/source/Hack-Italic.ufo/glyphs/iota.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="iota" format="1">
+<glyph name="iota" format="2">
   <advance width="1233"/>
   <unicode hex="03B9"/>
   <outline>
     <contour>
-      <point x="756" y="-5" type="line" name="hr00" smooth="yes"/>
+      <point x="756" y="-5" type="line" smooth="yes" name="hr00"/>
       <point x="563" y="-5"/>
       <point x="474" y="73"/>
-      <point x="474" y="249" type="curve" name="dh01" smooth="yes"/>
+      <point x="474" y="249" type="curve" smooth="yes" name="dh01"/>
       <point x="474" y="292"/>
       <point x="480" y="342"/>
       <point x="491" y="401" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="676" y="390" type="line" smooth="yes"/>
       <point x="666" y="339"/>
       <point x="661" y="297"/>
-      <point x="661" y="265" type="curve" name="dh02" smooth="yes"/>
+      <point x="661" y="265" type="curve" smooth="yes" name="dh02"/>
       <point x="661" y="177"/>
       <point x="701" y="151"/>
-      <point x="808" y="151" type="curve" name="sv02" smooth="yes"/>
+      <point x="808" y="151" type="curve" smooth="yes" name="sv02"/>
       <point x="896" y="151" type="line" name="sv03"/>
       <point x="866" y="-5" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/iotadieresis.glif b/source/Hack-Italic.ufo/glyphs/iotadieresis.glif
index 75381b3e2..ac80e7fe4 100644
--- a/source/Hack-Italic.ufo/glyphs/iotadieresis.glif
+++ b/source/Hack-Italic.ufo/glyphs/iotadieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="iotadieresis" format="1">
+<glyph name="iotadieresis" format="2">
   <advance width="1233"/>
   <unicode hex="03CA"/>
   <outline>
     <contour>
-      <point x="459" y="1320" type="line" name="hr00" smooth="yes"/>
+      <point x="459" y="1320" type="line" smooth="yes" name="hr00"/>
       <point x="439" y="1320"/>
       <point x="428" y="1333"/>
       <point x="432" y="1353" type="curve" smooth="yes"/>
       <point x="460" y="1495" type="line"/>
       <point x="463" y="1513"/>
       <point x="473" y="1522"/>
-      <point x="492" y="1522" type="curve" name="dv01" smooth="yes"/>
+      <point x="492" y="1522" type="curve" smooth="yes" name="dv01"/>
       <point x="635" y="1522" type="line" smooth="yes"/>
       <point x="655" y="1522"/>
       <point x="666" y="1509"/>
@@ -22,14 +22,14 @@
       <point x="602" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="850" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="850" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="830" y="1320"/>
       <point x="819" y="1333"/>
       <point x="823" y="1353" type="curve" smooth="yes"/>
       <point x="851" y="1495" type="line"/>
       <point x="854" y="1513"/>
       <point x="864" y="1522"/>
-      <point x="883" y="1522" type="curve" name="sv02" smooth="yes"/>
+      <point x="883" y="1522" type="curve" smooth="yes" name="sv02"/>
       <point x="1026" y="1522" type="line" smooth="yes"/>
       <point x="1046" y="1522"/>
       <point x="1057" y="1509"/>
@@ -40,10 +40,10 @@
       <point x="993" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="746" y="-5" type="line" name="ab01" smooth="yes"/>
+      <point x="746" y="-5" type="line" smooth="yes" name="ab01"/>
       <point x="553" y="-5"/>
       <point x="464" y="73"/>
-      <point x="464" y="249" type="curve" name="dh01" smooth="yes"/>
+      <point x="464" y="249" type="curve" smooth="yes" name="dh01"/>
       <point x="464" y="292"/>
       <point x="470" y="342"/>
       <point x="481" y="401" type="curve" smooth="yes"/>
@@ -54,10 +54,10 @@
       <point x="666" y="390" type="line" smooth="yes"/>
       <point x="656" y="339"/>
       <point x="651" y="297"/>
-      <point x="651" y="265" type="curve" name="dh02" smooth="yes"/>
+      <point x="651" y="265" type="curve" smooth="yes" name="dh02"/>
       <point x="651" y="177"/>
       <point x="691" y="151"/>
-      <point x="798" y="151" type="curve" name="sv04" smooth="yes"/>
+      <point x="798" y="151" type="curve" smooth="yes" name="sv04"/>
       <point x="886" y="151" type="line"/>
       <point x="856" y="-5" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/iotadieresistonos.glif b/source/Hack-Italic.ufo/glyphs/iotadieresistonos.glif
index a9e3a3414..0a7e2f3ee 100644
--- a/source/Hack-Italic.ufo/glyphs/iotadieresistonos.glif
+++ b/source/Hack-Italic.ufo/glyphs/iotadieresistonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="iotadieresistonos" format="1">
+<glyph name="iotadieresistonos" format="2">
   <advance width="1233"/>
   <unicode hex="0390"/>
   <outline>
@@ -10,14 +10,14 @@
       <point x="676" y="1520" type="line" name="sv01"/>
     </contour>
     <contour>
-      <point x="439" y="1320" type="line" name="sv02" smooth="yes"/>
+      <point x="439" y="1320" type="line" smooth="yes" name="sv02"/>
       <point x="419" y="1320"/>
       <point x="408" y="1333"/>
       <point x="412" y="1353" type="curve" smooth="yes"/>
       <point x="440" y="1495" type="line"/>
       <point x="443" y="1513"/>
       <point x="453" y="1522"/>
-      <point x="472" y="1522" type="curve" name="at02" smooth="yes"/>
+      <point x="472" y="1522" type="curve" smooth="yes" name="at02"/>
       <point x="615" y="1522" type="line" smooth="yes"/>
       <point x="635" y="1522"/>
       <point x="646" y="1509"/>
@@ -28,15 +28,15 @@
       <point x="582" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="870" y="1320" type="line" name="sv03" smooth="yes"/>
+      <point x="870" y="1320" type="line" smooth="yes" name="sv03"/>
       <point x="850" y="1320"/>
       <point x="839" y="1333"/>
       <point x="843" y="1353" type="curve" smooth="yes"/>
       <point x="871" y="1495" type="line"/>
       <point x="874" y="1513"/>
       <point x="884" y="1522"/>
-      <point x="903" y="1522" type="curve" name="at03" smooth="yes"/>
-      <point x="1046" y="1522" type="line" name="sv04" smooth="yes"/>
+      <point x="903" y="1522" type="curve" smooth="yes" name="at03"/>
+      <point x="1046" y="1522" type="line" smooth="yes" name="sv04"/>
       <point x="1066" y="1522"/>
       <point x="1077" y="1509"/>
       <point x="1073" y="1489" type="curve" smooth="yes"/>
@@ -46,10 +46,10 @@
       <point x="1013" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="746" y="-5" type="line" name="ab01" smooth="yes"/>
+      <point x="746" y="-5" type="line" smooth="yes" name="ab01"/>
       <point x="553" y="-5"/>
       <point x="464" y="73"/>
-      <point x="464" y="249" type="curve" name="dh01" smooth="yes"/>
+      <point x="464" y="249" type="curve" smooth="yes" name="dh01"/>
       <point x="464" y="292"/>
       <point x="470" y="342"/>
       <point x="481" y="401" type="curve" smooth="yes"/>
@@ -60,10 +60,10 @@
       <point x="666" y="390" type="line" smooth="yes"/>
       <point x="656" y="339"/>
       <point x="651" y="297"/>
-      <point x="651" y="265" type="curve" name="hr01" smooth="yes"/>
+      <point x="651" y="265" type="curve" smooth="yes" name="hr01"/>
       <point x="651" y="177"/>
       <point x="691" y="151"/>
-      <point x="798" y="151" type="curve" name="sv06" smooth="yes"/>
+      <point x="798" y="151" type="curve" smooth="yes" name="sv06"/>
       <point x="886" y="151" type="line"/>
       <point x="856" y="-5" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/iotatonos.glif b/source/Hack-Italic.ufo/glyphs/iotatonos.glif
index 7a7532477..9a515b83e 100644
--- a/source/Hack-Italic.ufo/glyphs/iotatonos.glif
+++ b/source/Hack-Italic.ufo/glyphs/iotatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="iotatonos" format="1">
+<glyph name="iotatonos" format="2">
   <advance width="1233"/>
   <unicode hex="03AF"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="555" y="1272" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="716" y="-5" type="line" name="ab01" smooth="yes"/>
+      <point x="716" y="-5" type="line" smooth="yes" name="ab01"/>
       <point x="523" y="-5"/>
       <point x="434" y="73"/>
-      <point x="434" y="249" type="curve" name="dh01" smooth="yes"/>
+      <point x="434" y="249" type="curve" smooth="yes" name="dh01"/>
       <point x="434" y="292"/>
       <point x="440" y="342"/>
       <point x="451" y="401" type="curve" smooth="yes"/>
@@ -24,10 +24,10 @@
       <point x="636" y="390" type="line" smooth="yes"/>
       <point x="626" y="339"/>
       <point x="621" y="297"/>
-      <point x="621" y="265" type="curve" name="dh02" smooth="yes"/>
+      <point x="621" y="265" type="curve" smooth="yes" name="dh02"/>
       <point x="621" y="177"/>
       <point x="661" y="151"/>
-      <point x="768" y="151" type="curve" name="sv02" smooth="yes"/>
+      <point x="768" y="151" type="curve" smooth="yes" name="sv02"/>
       <point x="856" y="151" type="line"/>
       <point x="826" y="-5" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/itilde.glif b/source/Hack-Italic.ufo/glyphs/itilde.glif
index 3e366e138..aaf8f996a 100644
--- a/source/Hack-Italic.ufo/glyphs/itilde.glif
+++ b/source/Hack-Italic.ufo/glyphs/itilde.glif
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="itilde" format="1">
+<glyph name="itilde" format="2">
   <advance width="1233"/>
   <unicode hex="0129"/>
   <outline>
     <contour>
-      <point x="817" y="1270" type="curve" name="hr00" smooth="yes"/>
+      <point x="817" y="1270" type="curve" smooth="yes" name="hr00"/>
       <point x="772" y="1270"/>
       <point x="727" y="1283"/>
       <point x="672" y="1339" type="curve" smooth="yes"/>
       <point x="625" y="1388" type="line" smooth="yes"/>
       <point x="601" y="1413"/>
       <point x="576" y="1425"/>
-      <point x="551" y="1425" type="curve" name="sv01" smooth="yes"/>
+      <point x="551" y="1425" type="curve" smooth="yes" name="sv01"/>
       <point x="495" y="1425"/>
       <point x="468" y="1369"/>
       <point x="457" y="1272" type="curve" name="sv02"/>
       <point x="332" y="1272" type="line"/>
       <point x="355" y="1451"/>
       <point x="428" y="1554"/>
-      <point x="555" y="1554" type="curve" name="at01" smooth="yes"/>
+      <point x="555" y="1554" type="curve" smooth="yes" name="at01"/>
       <point x="608" y="1554"/>
       <point x="650" y="1536"/>
       <point x="701" y="1485" type="curve" smooth="yes"/>
       <point x="748" y="1438" type="line" smooth="yes"/>
       <point x="775" y="1411"/>
       <point x="791" y="1399"/>
-      <point x="818" y="1399" type="curve" name="dv01" smooth="yes"/>
+      <point x="818" y="1399" type="curve" smooth="yes" name="dv01"/>
       <point x="872" y="1399"/>
       <point x="905" y="1451"/>
       <point x="916" y="1554" type="curve" name="at02"/>
@@ -34,13 +34,13 @@
       <point x="944" y="1270"/>
     </contour>
     <contour>
-      <point x="749" y="-4" type="line" name="ab01" smooth="yes"/>
+      <point x="749" y="-4" type="line" smooth="yes" name="ab01"/>
       <point x="633" y="-4"/>
       <point x="547" y="17"/>
       <point x="492" y="60" type="curve" smooth="yes"/>
       <point x="435" y="103"/>
       <point x="407" y="167"/>
-      <point x="407" y="252" type="curve" name="dh01" smooth="yes"/>
+      <point x="407" y="252" type="curve" smooth="yes" name="dh01"/>
       <point x="407" y="293"/>
       <point x="413" y="346"/>
       <point x="426" y="408" type="curve"/>
@@ -54,13 +54,13 @@
       <point x="600" y="342" type="curve" smooth="yes"/>
       <point x="597" y="319"/>
       <point x="596" y="311"/>
-      <point x="596" y="298" type="curve" name="dh02" smooth="yes"/>
+      <point x="596" y="298" type="curve" smooth="yes" name="dh02"/>
       <point x="596" y="248"/>
       <point x="611" y="211"/>
       <point x="640" y="188" type="curve" smooth="yes"/>
       <point x="670" y="164"/>
       <point x="715" y="152"/>
-      <point x="776" y="152" type="curve" name="sv04" smooth="yes"/>
+      <point x="776" y="152" type="curve" smooth="yes" name="sv04"/>
       <point x="987" y="152" type="line"/>
       <point x="956" y="-4" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/j.glif b/source/Hack-Italic.ufo/glyphs/j.glif
index 9a9e4d6ed..efdef1fd5 100644
--- a/source/Hack-Italic.ufo/glyphs/j.glif
+++ b/source/Hack-Italic.ufo/glyphs/j.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="j" format="1">
+<glyph name="j" format="2">
   <advance width="1233"/>
   <unicode hex="006A"/>
   <outline>
@@ -45,9 +45,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/jcircumflex.glif b/source/Hack-Italic.ufo/glyphs/jcircumflex.glif
index af98e6ff6..5bb018090 100644
--- a/source/Hack-Italic.ufo/glyphs/jcircumflex.glif
+++ b/source/Hack-Italic.ufo/glyphs/jcircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="jcircumflex" format="1">
+<glyph name="jcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0135"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/k.glif b/source/Hack-Italic.ufo/glyphs/k.glif
index b630a8eb2..b49f4f036 100644
--- a/source/Hack-Italic.ufo/glyphs/k.glif
+++ b/source/Hack-Italic.ufo/glyphs/k.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="k" format="1">
+<glyph name="k" format="2">
   <advance width="1233"/>
   <unicode hex="006B"/>
   <outline>
@@ -19,9 +19,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/kappa.glif b/source/Hack-Italic.ufo/glyphs/kappa.glif
index 146e2c3cd..b2182d88e 100644
--- a/source/Hack-Italic.ufo/glyphs/kappa.glif
+++ b/source/Hack-Italic.ufo/glyphs/kappa.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="kappa" format="1">
+<glyph name="kappa" format="2">
   <advance width="1233"/>
   <unicode hex="03BA"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/kgreenlandic.glif b/source/Hack-Italic.ufo/glyphs/kgreenlandic.glif
index e493e7d9e..135794d4a 100644
--- a/source/Hack-Italic.ufo/glyphs/kgreenlandic.glif
+++ b/source/Hack-Italic.ufo/glyphs/kgreenlandic.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="kgreenlandic" format="1">
+<glyph name="kgreenlandic" format="2">
   <advance width="1233"/>
   <unicode hex="0138"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/l.glif b/source/Hack-Italic.ufo/glyphs/l.glif
index 358dadf48..55e84a0dc 100644
--- a/source/Hack-Italic.ufo/glyphs/l.glif
+++ b/source/Hack-Italic.ufo/glyphs/l.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="l" format="1">
+<glyph name="l" format="2">
   <advance width="1233"/>
   <unicode hex="006C"/>
   <outline>
@@ -27,9 +27,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/lacute.glif b/source/Hack-Italic.ufo/glyphs/lacute.glif
index 13b6c49f8..a5d2644ad 100644
--- a/source/Hack-Italic.ufo/glyphs/lacute.glif
+++ b/source/Hack-Italic.ufo/glyphs/lacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lacute" format="1">
+<glyph name="lacute" format="2">
   <advance width="1233"/>
   <unicode hex="013A"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="630" y="1637" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="739" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="739" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="511" y="-8"/>
       <point x="397" y="76"/>
-      <point x="397" y="245" type="curve" name="dh01" smooth="yes"/>
+      <point x="397" y="245" type="curve" smooth="yes" name="dh01"/>
       <point x="397" y="290"/>
       <point x="405" y="349"/>
       <point x="416" y="404" type="curve"/>
@@ -24,10 +24,10 @@
       <point x="600" y="400" type="line" smooth="yes"/>
       <point x="591" y="353"/>
       <point x="586" y="316"/>
-      <point x="586" y="289" type="curve" name="dh02" smooth="yes"/>
+      <point x="586" y="289" type="curve" smooth="yes" name="dh02"/>
       <point x="586" y="197"/>
       <point x="645" y="148"/>
-      <point x="766" y="148" type="curve" name="sv02" smooth="yes"/>
+      <point x="766" y="148" type="curve" smooth="yes" name="sv02"/>
       <point x="977" y="148" type="line"/>
       <point x="946" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/lambda.glif b/source/Hack-Italic.ufo/glyphs/lambda.glif
index f697a3e4a..9501c0302 100644
--- a/source/Hack-Italic.ufo/glyphs/lambda.glif
+++ b/source/Hack-Italic.ufo/glyphs/lambda.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lambda" format="1">
+<glyph name="lambda" format="2">
   <advance width="1233"/>
   <unicode hex="03BB"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="631" y="1272" type="line" smooth="yes"/>
       <point x="616" y="1356"/>
       <point x="557" y="1398"/>
-      <point x="454" y="1398" type="curve" name="sv01" smooth="yes"/>
+      <point x="454" y="1398" type="curve" smooth="yes" name="sv01"/>
       <point x="405" y="1398" type="line"/>
       <point x="436" y="1556" type="line" name="at01"/>
       <point x="505" y="1554" type="line" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/layerinfo.plist b/source/Hack-Italic.ufo/glyphs/layerinfo.plist
new file mode 100644
index 000000000..0c67376eb
--- /dev/null
+++ b/source/Hack-Italic.ufo/glyphs/layerinfo.plist
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
diff --git a/source/Hack-Italic.ufo/glyphs/lcaron.glif b/source/Hack-Italic.ufo/glyphs/lcaron.glif
index f002dd0ad..54ce67df8 100644
--- a/source/Hack-Italic.ufo/glyphs/lcaron.glif
+++ b/source/Hack-Italic.ufo/glyphs/lcaron.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lcaron" format="1">
+<glyph name="lcaron" format="2">
   <advance width="1233"/>
   <unicode hex="013E"/>
   <outline>
     <contour>
-      <point x="739" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="739" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="511" y="-8"/>
       <point x="397" y="76"/>
-      <point x="397" y="245" type="curve" name="dh01" smooth="yes"/>
+      <point x="397" y="245" type="curve" smooth="yes" name="dh01"/>
       <point x="397" y="290"/>
       <point x="405" y="349"/>
       <point x="416" y="404" type="curve"/>
@@ -18,10 +18,10 @@
       <point x="600" y="400" type="line" smooth="yes"/>
       <point x="591" y="353"/>
       <point x="586" y="316"/>
-      <point x="586" y="289" type="curve" name="dh02" smooth="yes"/>
+      <point x="586" y="289" type="curve" smooth="yes" name="dh02"/>
       <point x="586" y="197"/>
       <point x="645" y="148"/>
-      <point x="766" y="148" type="curve" name="sv02" smooth="yes"/>
+      <point x="766" y="148" type="curve" smooth="yes" name="sv02"/>
       <point x="977" y="148" type="line"/>
       <point x="946" y="-8" type="line" name="hr01"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/ldot.glif b/source/Hack-Italic.ufo/glyphs/ldot.glif
index f56a6f612..3cc4ac25e 100644
--- a/source/Hack-Italic.ufo/glyphs/ldot.glif
+++ b/source/Hack-Italic.ufo/glyphs/ldot.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ldot" format="1">
+<glyph name="ldot" format="2">
   <advance width="1233"/>
   <unicode hex="0140"/>
   <outline>
     <contour>
-      <point x="536" y="18" type="curve" name="hr00" smooth="yes"/>
+      <point x="536" y="18" type="curve" smooth="yes" name="hr00"/>
       <point x="453" y="55"/>
       <point x="395" y="143"/>
       <point x="395" y="272" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/less.glif b/source/Hack-Italic.ufo/glyphs/less.glif
index 0d1f12cc9..f69a55b5d 100644
--- a/source/Hack-Italic.ufo/glyphs/less.glif
+++ b/source/Hack-Italic.ufo/glyphs/less.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="less" format="1">
+<glyph name="less" format="2">
   <advance width="1233"/>
   <unicode hex="003C"/>
   <outline>
     <contour>
       <point x="88" y="559" type="line" name="hr00"/>
       <point x="88" y="725" type="line"/>
-      <point x="1145" y="1143" type="line" name="at01"/>
-      <point x="1145" y="961" type="line"/>
-      <point x="295" y="641" type="line" name="iv01"/>
-      <point x="1145" y="324" type="line"/>
-      <point x="1145" y="141" type="line" name="av01"/>
+      <point x="1145" y="1243" type="line" name="at01"/>
+      <point x="1145" y="1051" type="line"/>
+      <point x="305" y="641" type="line" name="iv01"/>
+      <point x="1145" y="234" type="line"/>
+      <point x="1145" y="41" type="line" name="av01"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Italic.ufo/glyphs/lessequal.glif b/source/Hack-Italic.ufo/glyphs/lessequal.glif
index 579f938f3..20aa154aa 100644
--- a/source/Hack-Italic.ufo/glyphs/lessequal.glif
+++ b/source/Hack-Italic.ufo/glyphs/lessequal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lessequal" format="1">
+<glyph name="lessequal" format="2">
   <advance width="1233"/>
   <unicode hex="2264"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/lfblock.glif b/source/Hack-Italic.ufo/glyphs/lfblock.glif
index 8a76fb3d0..379f2131b 100644
--- a/source/Hack-Italic.ufo/glyphs/lfblock.glif
+++ b/source/Hack-Italic.ufo/glyphs/lfblock.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lfblock" format="1">
+<glyph name="lfblock" format="2">
   <advance width="1233"/>
   <unicode hex="258C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/lira.glif b/source/Hack-Italic.ufo/glyphs/lira.glif
index b9d7dd380..c22eb0232 100644
--- a/source/Hack-Italic.ufo/glyphs/lira.glif
+++ b/source/Hack-Italic.ufo/glyphs/lira.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lira" format="1">
+<glyph name="lira" format="2">
   <advance width="1233"/>
   <unicode hex="20A4"/>
   <outline>
@@ -17,14 +17,14 @@
       <point x="443" y="1016" type="line" smooth="yes"/>
       <point x="505" y="1366"/>
       <point x="670" y="1520"/>
-      <point x="939" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="939" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1036" y="1520"/>
       <point x="1116" y="1500"/>
       <point x="1203" y="1460" type="curve"/>
       <point x="1170" y="1278" type="line" name="iv01"/>
       <point x="1091" y="1333"/>
       <point x="1018" y="1360"/>
-      <point x="926" y="1360" type="curve" name="sv01" smooth="yes"/>
+      <point x="926" y="1360" type="curve" smooth="yes" name="sv01"/>
       <point x="754" y="1360"/>
       <point x="673" y="1261"/>
       <point x="625" y="993" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/logicaland.glif b/source/Hack-Italic.ufo/glyphs/logicaland.glif
index 301a644c5..bf3b706b5 100644
--- a/source/Hack-Italic.ufo/glyphs/logicaland.glif
+++ b/source/Hack-Italic.ufo/glyphs/logicaland.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="logicaland" format="1">
+<glyph name="logicaland" format="2">
   <advance width="1233"/>
   <unicode hex="2227"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/logicalnot.glif b/source/Hack-Italic.ufo/glyphs/logicalnot.glif
index 84962a17b..cb4d3f9cd 100644
--- a/source/Hack-Italic.ufo/glyphs/logicalnot.glif
+++ b/source/Hack-Italic.ufo/glyphs/logicalnot.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="logicalnot" format="1">
+<glyph name="logicalnot" format="2">
   <advance width="1233"/>
   <unicode hex="00AC"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/logicalor.glif b/source/Hack-Italic.ufo/glyphs/logicalor.glif
index 4ae815258..62c85e6c2 100644
--- a/source/Hack-Italic.ufo/glyphs/logicalor.glif
+++ b/source/Hack-Italic.ufo/glyphs/logicalor.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="logicalor" format="1">
+<glyph name="logicalor" format="2">
   <advance width="1233"/>
   <unicode hex="2228"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/longs.glif b/source/Hack-Italic.ufo/glyphs/longs.glif
index 1c7881992..4112c5287 100644
--- a/source/Hack-Italic.ufo/glyphs/longs.glif
+++ b/source/Hack-Italic.ufo/glyphs/longs.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="longs" format="1">
+<glyph name="longs" format="2">
   <advance width="1233"/>
   <unicode hex="017F"/>
   <outline>
@@ -14,7 +14,7 @@
       <point x="741" y="1474" type="curve" smooth="yes"/>
       <point x="808" y="1530"/>
       <point x="899" y="1556"/>
-      <point x="1024" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="1024" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="1245" y="1556" type="line"/>
       <point x="1214" y="1403" type="line" name="sv02"/>
       <point x="1006" y="1403" type="line" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/lozenge.glif b/source/Hack-Italic.ufo/glyphs/lozenge.glif
index 88d12a8f8..4252cd2f9 100644
--- a/source/Hack-Italic.ufo/glyphs/lozenge.glif
+++ b/source/Hack-Italic.ufo/glyphs/lozenge.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lozenge" format="1">
+<glyph name="lozenge" format="2">
   <advance width="1233"/>
   <unicode hex="25CA"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/lslash.glif b/source/Hack-Italic.ufo/glyphs/lslash.glif
index 32f7f506f..7ff849779 100644
--- a/source/Hack-Italic.ufo/glyphs/lslash.glif
+++ b/source/Hack-Italic.ufo/glyphs/lslash.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lslash" format="1">
+<glyph name="lslash" format="2">
   <advance width="1233"/>
   <unicode hex="0142"/>
   <outline>
     <contour>
-      <point x="739" y="-8" type="line" name="hr00" smooth="yes"/>
+      <point x="739" y="-8" type="line" smooth="yes" name="hr00"/>
       <point x="614" y="-8"/>
       <point x="535" y="16"/>
       <point x="482" y="56" type="curve" smooth="yes"/>
       <point x="425" y="99"/>
       <point x="397" y="163"/>
-      <point x="397" y="250" type="curve" name="dh01" smooth="yes"/>
+      <point x="397" y="250" type="curve" smooth="yes" name="dh01"/>
       <point x="397" y="274"/>
       <point x="399" y="298"/>
-      <point x="402" y="325" type="curve" name="sh01" smooth="yes"/>
+      <point x="402" y="325" type="curve" smooth="yes" name="sh01"/>
       <point x="406" y="358"/>
       <point x="409" y="377"/>
       <point x="416" y="404" type="curve"/>
@@ -35,13 +35,13 @@
       <point x="590" y="336" type="curve" smooth="yes"/>
       <point x="587" y="316"/>
       <point x="586" y="304"/>
-      <point x="586" y="291" type="curve" name="dh02" smooth="yes"/>
+      <point x="586" y="291" type="curve" smooth="yes" name="dh02"/>
       <point x="586" y="240"/>
       <point x="600" y="208"/>
       <point x="631" y="184" type="curve" smooth="yes"/>
       <point x="660" y="161"/>
       <point x="701" y="148"/>
-      <point x="766" y="148" type="curve" name="sv02" smooth="yes"/>
+      <point x="766" y="148" type="curve" smooth="yes" name="sv02"/>
       <point x="977" y="148" type="line" name="sv03"/>
       <point x="946" y="-8" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/ltshade.glif b/source/Hack-Italic.ufo/glyphs/ltshade.glif
index 80c634926..d044e38f7 100644
--- a/source/Hack-Italic.ufo/glyphs/ltshade.glif
+++ b/source/Hack-Italic.ufo/glyphs/ltshade.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ltshade" format="1">
+<glyph name="ltshade" format="2">
   <advance width="1233"/>
   <unicode hex="2591"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/m.glif b/source/Hack-Italic.ufo/glyphs/m.glif
index 1cb7ab73d..5dc060d9f 100644
--- a/source/Hack-Italic.ufo/glyphs/m.glif
+++ b/source/Hack-Italic.ufo/glyphs/m.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="m" format="1">
+<glyph name="m" format="2">
   <advance width="1233"/>
   <unicode hex="006D"/>
   <outline>
@@ -60,9 +60,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/macron.glif b/source/Hack-Italic.ufo/glyphs/macron.glif
index a0225d87d..f43541083 100644
--- a/source/Hack-Italic.ufo/glyphs/macron.glif
+++ b/source/Hack-Italic.ufo/glyphs/macron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="macron" format="1">
+<glyph name="macron" format="2">
   <advance width="1233"/>
   <unicode hex="00AF"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/millisecond.glif b/source/Hack-Italic.ufo/glyphs/millisecond.glif
index b149cfd4b..f7046b2f3 100644
--- a/source/Hack-Italic.ufo/glyphs/millisecond.glif
+++ b/source/Hack-Italic.ufo/glyphs/millisecond.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="millisecond" format="1">
+<glyph name="millisecond" format="2">
   <advance width="1233"/>
   <unicode hex="2034"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/minus.glif b/source/Hack-Italic.ufo/glyphs/minus.glif
index 93f5769bb..d76106efb 100644
--- a/source/Hack-Italic.ufo/glyphs/minus.glif
+++ b/source/Hack-Italic.ufo/glyphs/minus.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="minus" format="1">
+<glyph name="minus" format="2">
   <advance width="1233"/>
   <unicode hex="2212"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/minute.glif b/source/Hack-Italic.ufo/glyphs/minute.glif
index f1630881e..885e083ac 100644
--- a/source/Hack-Italic.ufo/glyphs/minute.glif
+++ b/source/Hack-Italic.ufo/glyphs/minute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="minute" format="1">
+<glyph name="minute" format="2">
   <advance width="1233"/>
   <unicode hex="2032"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/multiply.glif b/source/Hack-Italic.ufo/glyphs/multiply.glif
index 1d9b4fbd6..3c9831f81 100644
--- a/source/Hack-Italic.ufo/glyphs/multiply.glif
+++ b/source/Hack-Italic.ufo/glyphs/multiply.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="multiply" format="1">
+<glyph name="multiply" format="2">
   <advance width="1233"/>
   <unicode hex="00D7"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/musicalnote.glif b/source/Hack-Italic.ufo/glyphs/musicalnote.glif
index 8ef12cbb1..30fb75a06 100644
--- a/source/Hack-Italic.ufo/glyphs/musicalnote.glif
+++ b/source/Hack-Italic.ufo/glyphs/musicalnote.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="musicalnote" format="1">
+<glyph name="musicalnote" format="2">
   <advance width="1233"/>
   <unicode hex="266A"/>
   <outline>
     <contour>
-      <point x="656" y="267" type="line" name="hr00" smooth="yes"/>
+      <point x="656" y="267" type="line" smooth="yes" name="hr00"/>
       <point x="647" y="222"/>
       <point x="634" y="181"/>
       <point x="617" y="143" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/n.glif b/source/Hack-Italic.ufo/glyphs/n.glif
index bad7471f6..8796458e6 100644
--- a/source/Hack-Italic.ufo/glyphs/n.glif
+++ b/source/Hack-Italic.ufo/glyphs/n.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="n" format="1">
+<glyph name="n" format="2">
   <advance width="1233"/>
   <unicode hex="006E"/>
   <outline>
@@ -36,9 +36,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/nacute.glif b/source/Hack-Italic.ufo/glyphs/nacute.glif
index 53b198372..42e0bedc2 100644
--- a/source/Hack-Italic.ufo/glyphs/nacute.glif
+++ b/source/Hack-Italic.ufo/glyphs/nacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="nacute" format="1">
+<glyph name="nacute" format="2">
   <advance width="1233"/>
   <unicode hex="0144"/>
   <outline>
@@ -15,10 +15,10 @@
       <point x="455" y="952" type="line" name="iv02"/>
       <point x="559" y="1085"/>
       <point x="672" y="1147"/>
-      <point x="809" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="809" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="985" y="1147"/>
       <point x="1096" y="1045"/>
-      <point x="1096" y="874" type="curve" name="dh02" smooth="yes"/>
+      <point x="1096" y="874" type="curve" smooth="yes" name="dh02"/>
       <point x="1096" y="827"/>
       <point x="1088" y="763"/>
       <point x="1075" y="694" type="curve" smooth="yes"/>
@@ -27,13 +27,13 @@
       <point x="891" y="695" type="line"/>
       <point x="892" y="698"/>
       <point x="893" y="703"/>
-      <point x="894" y="709" type="curve" name="hr01" smooth="yes"/>
+      <point x="894" y="709" type="curve" smooth="yes" name="hr01"/>
       <point x="904" y="756"/>
       <point x="909" y="793"/>
-      <point x="909" y="821" type="curve" name="dh01" smooth="yes"/>
+      <point x="909" y="821" type="curve" smooth="yes" name="dh01"/>
       <point x="909" y="926"/>
       <point x="846" y="987"/>
-      <point x="729" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="729" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="562" y="987"/>
       <point x="434" y="857"/>
       <point x="391" y="633" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/napostrophe.glif b/source/Hack-Italic.ufo/glyphs/napostrophe.glif
index 81b095487..2426b1ea5 100644
--- a/source/Hack-Italic.ufo/glyphs/napostrophe.glif
+++ b/source/Hack-Italic.ufo/glyphs/napostrophe.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="napostrophe" format="1">
+<glyph name="napostrophe" format="2">
   <advance width="1233"/>
   <unicode hex="0149"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/ncaron.glif b/source/Hack-Italic.ufo/glyphs/ncaron.glif
index 91dd4d7b7..f7455b69b 100644
--- a/source/Hack-Italic.ufo/glyphs/ncaron.glif
+++ b/source/Hack-Italic.ufo/glyphs/ncaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ncaron" format="1">
+<glyph name="ncaron" format="2">
   <advance width="1233"/>
   <unicode hex="0148"/>
   <outline>
@@ -18,10 +18,10 @@
       <point x="455" y="952" type="line" name="iv02"/>
       <point x="559" y="1085"/>
       <point x="672" y="1147"/>
-      <point x="809" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="809" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="985" y="1147"/>
       <point x="1096" y="1045"/>
-      <point x="1096" y="874" type="curve" name="dh02" smooth="yes"/>
+      <point x="1096" y="874" type="curve" smooth="yes" name="dh02"/>
       <point x="1096" y="827"/>
       <point x="1088" y="763"/>
       <point x="1075" y="694" type="curve" smooth="yes"/>
@@ -33,10 +33,10 @@
       <point x="894" y="709" type="curve" smooth="yes"/>
       <point x="904" y="756"/>
       <point x="909" y="793"/>
-      <point x="909" y="821" type="curve" name="dh01" smooth="yes"/>
+      <point x="909" y="821" type="curve" smooth="yes" name="dh01"/>
       <point x="909" y="926"/>
       <point x="846" y="987"/>
-      <point x="729" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="729" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="562" y="987"/>
       <point x="434" y="857"/>
       <point x="391" y="633" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/nine.glif b/source/Hack-Italic.ufo/glyphs/nine.glif
index f94cfc616..443042108 100644
--- a/source/Hack-Italic.ufo/glyphs/nine.glif
+++ b/source/Hack-Italic.ufo/glyphs/nine.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="nine" format="1">
+<glyph name="nine" format="2">
   <advance width="1233"/>
   <unicode hex="0039"/>
   <outline>
     <contour>
-      <point x="343" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="343" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="292" y="-29"/>
       <point x="244" y="-24"/>
       <point x="197" y="-14" type="curve" smooth="yes"/>
@@ -17,7 +17,7 @@
       <point x="224" y="161" type="curve" smooth="yes"/>
       <point x="270" y="148"/>
       <point x="317" y="141"/>
-      <point x="366" y="141" type="curve" name="dv01" smooth="yes"/>
+      <point x="366" y="141" type="curve" smooth="yes" name="dv01"/>
       <point x="495" y="141"/>
       <point x="602" y="189"/>
       <point x="686" y="285" type="curve" smooth="yes"/>
@@ -29,13 +29,13 @@
       <point x="705" y="557" type="curve" smooth="yes"/>
       <point x="637" y="518"/>
       <point x="568" y="504"/>
-      <point x="492" y="504" type="curve" name="dv02" smooth="yes"/>
+      <point x="492" y="504" type="curve" smooth="yes" name="dv02"/>
       <point x="376" y="504"/>
       <point x="288" y="539"/>
       <point x="224" y="604" type="curve" smooth="yes"/>
       <point x="159" y="671"/>
       <point x="127" y="766"/>
-      <point x="127" y="889" type="curve" name="sh01" smooth="yes"/>
+      <point x="127" y="889" type="curve" smooth="yes" name="sh01"/>
       <point x="127" y="973"/>
       <point x="142" y="1052"/>
       <point x="167" y="1127" type="curve" smooth="yes"/>
@@ -47,13 +47,13 @@
       <point x="452" y="1472" type="curve" smooth="yes"/>
       <point x="518" y="1504"/>
       <point x="593" y="1520"/>
-      <point x="676" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="676" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="811" y="1520"/>
       <point x="918" y="1479"/>
       <point x="990" y="1403" type="curve" smooth="yes"/>
       <point x="1063" y="1326"/>
       <point x="1100" y="1211"/>
-      <point x="1100" y="1059" type="curve" name="sh03" smooth="yes"/>
+      <point x="1100" y="1059" type="curve" smooth="yes" name="sh03"/>
       <point x="1100" y="967"/>
       <point x="1088" y="846"/>
       <point x="1061" y="726" type="curve" smooth="yes"/>
@@ -67,19 +67,19 @@
       <point x="476" y="-29"/>
     </contour>
     <contour>
-      <point x="551" y="662" type="curve" name="dv03" smooth="yes"/>
+      <point x="551" y="662" type="curve" smooth="yes" name="dv03"/>
       <point x="751" y="662"/>
       <point x="897" y="855"/>
-      <point x="897" y="1097" type="curve" name="ah01" smooth="yes"/>
+      <point x="897" y="1097" type="curve" smooth="yes" name="ah01"/>
       <point x="897" y="1274"/>
       <point x="811" y="1362"/>
-      <point x="671" y="1362" type="curve" name="sv01" smooth="yes"/>
+      <point x="671" y="1362" type="curve" smooth="yes" name="sv01"/>
       <point x="575" y="1362"/>
       <point x="490" y="1315"/>
       <point x="427" y="1228" type="curve" smooth="yes"/>
       <point x="367" y="1144"/>
       <point x="330" y="1027"/>
-      <point x="330" y="907" type="curve" name="sh02" smooth="yes"/>
+      <point x="330" y="907" type="curve" smooth="yes" name="sh02"/>
       <point x="330" y="831"/>
       <point x="345" y="766"/>
       <point x="388" y="722" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/nine.subs.glif b/source/Hack-Italic.ufo/glyphs/nine.subs.glif
index 03b87e6a0..46f288b4c 100644
--- a/source/Hack-Italic.ufo/glyphs/nine.subs.glif
+++ b/source/Hack-Italic.ufo/glyphs/nine.subs.glif
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="nine.subs" format="1">
+<glyph name="nine.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="543" y="-412" type="curve" name="hr00" smooth="yes"/>
+      <point x="543" y="-412" type="curve" smooth="yes" name="hr00"/>
       <point x="471" y="-412"/>
       <point x="410" y="-400"/>
       <point x="353" y="-379" type="curve"/>
       <point x="377" y="-275" type="line"/>
       <point x="429" y="-302"/>
       <point x="491" y="-317"/>
-      <point x="556" y="-317" type="curve" name="dv01" smooth="yes"/>
+      <point x="556" y="-317" type="curve" smooth="yes" name="dv01"/>
       <point x="736" y="-317"/>
       <point x="845" y="-206"/>
       <point x="893" y="2" type="curve" name="ih01"/>
       <point x="832" y="-74"/>
       <point x="753" y="-114"/>
-      <point x="641" y="-114" type="curve" name="dv04" smooth="yes"/>
+      <point x="641" y="-114" type="curve" smooth="yes" name="dv04"/>
       <point x="488" y="-114"/>
       <point x="396" y="-37"/>
-      <point x="396" y="102" type="curve" name="sh01" smooth="yes"/>
+      <point x="396" y="102" type="curve" smooth="yes" name="sh01"/>
       <point x="396" y="186"/>
       <point x="430" y="278"/>
       <point x="495" y="347" type="curve" smooth="yes"/>
       <point x="563" y="419"/>
       <point x="655" y="455"/>
-      <point x="770" y="455" type="curve" name="dv03" smooth="yes"/>
+      <point x="770" y="455" type="curve" smooth="yes" name="dv03"/>
       <point x="945" y="455"/>
       <point x="1050" y="369"/>
-      <point x="1050" y="190" type="curve" name="sh03" smooth="yes"/>
+      <point x="1050" y="190" type="curve" smooth="yes" name="sh03"/>
       <point x="1050" y="83"/>
       <point x="1012" y="-64"/>
       <point x="952" y="-172" type="curve" smooth="yes"/>
@@ -36,16 +36,16 @@
       <point x="727" y="-412"/>
     </contour>
     <contour>
-      <point x="677" y="-26" type="curve" name="dv05" smooth="yes"/>
+      <point x="677" y="-26" type="curve" smooth="yes" name="dv05"/>
       <point x="820" y="-26"/>
       <point x="914" y="88"/>
-      <point x="914" y="216" type="curve" name="ah01" smooth="yes"/>
+      <point x="914" y="216" type="curve" smooth="yes" name="ah01"/>
       <point x="914" y="316"/>
       <point x="857" y="367"/>
-      <point x="765" y="367" type="curve" name="dv02" smooth="yes"/>
+      <point x="765" y="367" type="curve" smooth="yes" name="dv02"/>
       <point x="624" y="367"/>
       <point x="533" y="241"/>
-      <point x="533" y="116" type="curve" name="sh02" smooth="yes"/>
+      <point x="533" y="116" type="curve" smooth="yes" name="sh02"/>
       <point x="533" y="19"/>
       <point x="586" y="-26"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/notelement.glif b/source/Hack-Italic.ufo/glyphs/notelement.glif
index 451922707..729a403c1 100644
--- a/source/Hack-Italic.ufo/glyphs/notelement.glif
+++ b/source/Hack-Italic.ufo/glyphs/notelement.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="notelement" format="1">
+<glyph name="notelement" format="2">
   <advance width="1233"/>
   <unicode hex="2209"/>
   <outline>
@@ -8,13 +8,13 @@
       <point x="386" y="93" type="line"/>
       <point x="226" y="224"/>
       <point x="130" y="468"/>
-      <point x="130" y="732" type="curve" name="dh01" smooth="yes"/>
+      <point x="130" y="732" type="curve" smooth="yes" name="dh01"/>
       <point x="130" y="996"/>
       <point x="225" y="1235"/>
       <point x="380" y="1366" type="curve" smooth="yes"/>
       <point x="457" y="1431"/>
       <point x="541" y="1464"/>
-      <point x="632" y="1464" type="curve" name="sv01" smooth="yes"/>
+      <point x="632" y="1464" type="curve" smooth="yes" name="sv01"/>
       <point x="802" y="1464" type="line"/>
       <point x="856" y="1641" type="line" name="av02"/>
       <point x="1019" y="1591" type="line"/>
@@ -29,7 +29,7 @@
       <point x="588" y="174" type="line"/>
       <point x="601" y="171"/>
       <point x="615" y="170"/>
-      <point x="632" y="170" type="curve" name="sv02" smooth="yes"/>
+      <point x="632" y="170" type="curve" smooth="yes" name="sv02"/>
       <point x="1104" y="170" type="line" name="sv03"/>
       <point x="1104" y="0" type="line" name="ab01"/>
       <point x="632" y="0" type="line" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/notequal.glif b/source/Hack-Italic.ufo/glyphs/notequal.glif
index d0f2c40a9..9ed3d2fc4 100644
--- a/source/Hack-Italic.ufo/glyphs/notequal.glif
+++ b/source/Hack-Italic.ufo/glyphs/notequal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="notequal" format="1">
+<glyph name="notequal" format="2">
   <advance width="1233"/>
   <unicode hex="2260"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/notsubset.glif b/source/Hack-Italic.ufo/glyphs/notsubset.glif
index 609d68443..812d24388 100644
--- a/source/Hack-Italic.ufo/glyphs/notsubset.glif
+++ b/source/Hack-Italic.ufo/glyphs/notsubset.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="notsubset" format="1">
+<glyph name="notsubset" format="2">
   <advance width="1233"/>
   <unicode hex="2284"/>
   <outline>
@@ -11,10 +11,10 @@
       <point x="227" y="302" type="curve" smooth="yes"/>
       <point x="136" y="394"/>
       <point x="88" y="504"/>
-      <point x="88" y="636" type="curve" name="dh01" smooth="yes"/>
+      <point x="88" y="636" type="curve" smooth="yes" name="dh01"/>
       <point x="88" y="908"/>
       <point x="298" y="1119"/>
-      <point x="565" y="1119" type="curve" name="at01" smooth="yes"/>
+      <point x="565" y="1119" type="curve" smooth="yes" name="at01"/>
       <point x="691" y="1119" type="line"/>
       <point x="766" y="1342" type="line" name="av02"/>
       <point x="927" y="1289" type="line"/>
@@ -31,10 +31,10 @@
     </contour>
     <contour>
       <point x="639" y="969" type="line" name="sv03"/>
-      <point x="565" y="969" type="line" name="sv04" smooth="yes"/>
+      <point x="565" y="969" type="line" smooth="yes" name="sv04"/>
       <point x="382" y="969"/>
       <point x="238" y="825"/>
-      <point x="238" y="638" type="curve" name="dh02" smooth="yes"/>
+      <point x="238" y="638" type="curve" smooth="yes" name="dh02"/>
       <point x="238" y="550"/>
       <point x="269" y="473"/>
       <point x="333" y="409" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/ntilde.glif b/source/Hack-Italic.ufo/glyphs/ntilde.glif
index d10ea6185..c9f19cc33 100644
--- a/source/Hack-Italic.ufo/glyphs/ntilde.glif
+++ b/source/Hack-Italic.ufo/glyphs/ntilde.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ntilde" format="1">
+<glyph name="ntilde" format="2">
   <advance width="1233"/>
   <unicode hex="00F1"/>
   <outline>
     <contour>
-      <point x="890" y="1297" type="curve" name="sv01" smooth="yes"/>
+      <point x="890" y="1297" type="curve" smooth="yes" name="sv01"/>
       <point x="861" y="1297"/>
       <point x="836" y="1302"/>
       <point x="814" y="1312" type="curve" smooth="yes"/>
@@ -30,7 +30,7 @@
       <point x="475" y="1508" type="curve" smooth="yes"/>
       <point x="513" y="1557"/>
       <point x="562" y="1581"/>
-      <point x="622" y="1581" type="curve" name="dv02" smooth="yes"/>
+      <point x="622" y="1581" type="curve" smooth="yes" name="dv02"/>
       <point x="651" y="1581"/>
       <point x="676" y="1576"/>
       <point x="698" y="1566" type="curve" smooth="yes"/>
@@ -60,13 +60,13 @@
       <point x="618" y="1098" type="curve" smooth="yes"/>
       <point x="675" y="1130"/>
       <point x="732" y="1147"/>
-      <point x="807" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="807" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="895" y="1147"/>
       <point x="968" y="1123"/>
       <point x="1019" y="1075" type="curve" smooth="yes"/>
       <point x="1070" y="1028"/>
       <point x="1096" y="957"/>
-      <point x="1096" y="877" type="curve" name="dh02" smooth="yes"/>
+      <point x="1096" y="877" type="curve" smooth="yes" name="dh02"/>
       <point x="1096" y="818"/>
       <point x="1092" y="778"/>
       <point x="1075" y="694" type="curve" smooth="yes"/>
@@ -78,13 +78,13 @@
       <point x="894" y="709" type="curve"/>
       <point x="905" y="764"/>
       <point x="909" y="783"/>
-      <point x="909" y="817" type="curve" name="dh01" smooth="yes"/>
+      <point x="909" y="817" type="curve" smooth="yes" name="dh01"/>
       <point x="909" y="876"/>
       <point x="894" y="915"/>
       <point x="863" y="944" type="curve" smooth="yes"/>
       <point x="832" y="973"/>
       <point x="788" y="987"/>
-      <point x="730" y="987" type="curve" name="sv03" smooth="yes"/>
+      <point x="730" y="987" type="curve" smooth="yes" name="sv03"/>
       <point x="644" y="987"/>
       <point x="572" y="956"/>
       <point x="513" y="894" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/nu.glif b/source/Hack-Italic.ufo/glyphs/nu.glif
index 3c7e3e7f1..c8a08a3d5 100644
--- a/source/Hack-Italic.ufo/glyphs/nu.glif
+++ b/source/Hack-Italic.ufo/glyphs/nu.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="nu" format="1">
+<glyph name="nu" format="2">
   <advance width="1233"/>
   <unicode hex="03BD"/>
   <outline>
@@ -12,14 +12,14 @@
       <point x="934" y="717" type="curve"/>
       <point x="941" y="740"/>
       <point x="945" y="774"/>
-      <point x="945" y="817" type="curve" name="dh01" smooth="yes"/>
+      <point x="945" y="817" type="curve" smooth="yes" name="dh01"/>
       <point x="945" y="898"/>
       <point x="925" y="1005"/>
       <point x="856" y="1120" type="curve" name="at01"/>
       <point x="1042" y="1120" type="line"/>
       <point x="1095" y="1027"/>
       <point x="1126" y="898"/>
-      <point x="1126" y="791" type="curve" name="dh02" smooth="yes"/>
+      <point x="1126" y="791" type="curve" smooth="yes" name="dh02"/>
       <point x="1126" y="763"/>
       <point x="1124" y="738"/>
       <point x="1120" y="715" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/numbersign.glif b/source/Hack-Italic.ufo/glyphs/numbersign.glif
index 91c4d74c8..cd4ee52a0 100644
--- a/source/Hack-Italic.ufo/glyphs/numbersign.glif
+++ b/source/Hack-Italic.ufo/glyphs/numbersign.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="numbersign" format="1">
+<glyph name="numbersign" format="2">
   <advance width="1233"/>
   <unicode hex="0023"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/o.glif b/source/Hack-Italic.ufo/glyphs/o.glif
index c83d5f585..b1b33558a 100644
--- a/source/Hack-Italic.ufo/glyphs/o.glif
+++ b/source/Hack-Italic.ufo/glyphs/o.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="o" format="1">
+<glyph name="o" format="2">
   <advance width="1233"/>
   <unicode hex="006F"/>
   <outline>
@@ -39,9 +39,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/oacute.glif b/source/Hack-Italic.ufo/glyphs/oacute.glif
index 15754ee45..131b8cae1 100644
--- a/source/Hack-Italic.ufo/glyphs/oacute.glif
+++ b/source/Hack-Italic.ufo/glyphs/oacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="oacute" format="1">
+<glyph name="oacute" format="2">
   <advance width="1233"/>
   <unicode hex="00F3"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="575" y="1297" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="510" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="510" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="387" y="-29"/>
       <point x="287" y="4"/>
       <point x="218" y="80" type="curve" smooth="yes"/>
       <point x="155" y="148"/>
       <point x="117" y="251"/>
-      <point x="117" y="396" type="curve" name="sh03" smooth="yes"/>
+      <point x="117" y="396" type="curve" smooth="yes" name="sh03"/>
       <point x="117" y="483"/>
       <point x="131" y="572"/>
       <point x="158" y="663" type="curve" smooth="yes"/>
@@ -28,13 +28,13 @@
       <point x="464" y="1087" type="curve" smooth="yes"/>
       <point x="539" y="1127"/>
       <point x="623" y="1147"/>
-      <point x="717" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="717" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="838" y="1147"/>
       <point x="941" y="1113"/>
       <point x="1012" y="1040" type="curve" smooth="yes"/>
       <point x="1080" y="969"/>
       <point x="1114" y="864"/>
-      <point x="1114" y="726" type="curve" name="sh01" smooth="yes"/>
+      <point x="1114" y="726" type="curve" smooth="yes" name="sh01"/>
       <point x="1114" y="636"/>
       <point x="1100" y="545"/>
       <point x="1073" y="453" type="curve" smooth="yes"/>
@@ -45,25 +45,25 @@
       <point x="702" y="-29"/>
     </contour>
     <contour>
-      <point x="533" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="533" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="649" y="127"/>
       <point x="744" y="190"/>
       <point x="812" y="298" type="curve" smooth="yes"/>
       <point x="884" y="409"/>
       <point x="920" y="567"/>
-      <point x="920" y="718" type="curve" name="ah01" smooth="yes"/>
+      <point x="920" y="718" type="curve" smooth="yes" name="ah01"/>
       <point x="920" y="814"/>
       <point x="905" y="880"/>
       <point x="864" y="927" type="curve" smooth="yes"/>
       <point x="824" y="972"/>
       <point x="767" y="991"/>
-      <point x="702" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="702" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="582" y="991"/>
       <point x="490" y="928"/>
       <point x="422" y="820" type="curve" smooth="yes"/>
       <point x="355" y="715"/>
       <point x="313" y="563"/>
-      <point x="313" y="402" type="curve" name="sh04" smooth="yes"/>
+      <point x="313" y="402" type="curve" smooth="yes" name="sh04"/>
       <point x="313" y="306"/>
       <point x="328" y="238"/>
       <point x="369" y="191" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/obreve.glif b/source/Hack-Italic.ufo/glyphs/obreve.glif
index b26ddbde1..9d0c358e8 100644
--- a/source/Hack-Italic.ufo/glyphs/obreve.glif
+++ b/source/Hack-Italic.ufo/glyphs/obreve.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="obreve" format="1">
+<glyph name="obreve" format="2">
   <advance width="1233"/>
   <unicode hex="014F"/>
   <outline>
     <contour>
-      <point x="510" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="510" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="387" y="-29"/>
       <point x="287" y="4"/>
       <point x="218" y="80" type="curve" smooth="yes"/>
       <point x="155" y="148"/>
       <point x="117" y="251"/>
-      <point x="117" y="396" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="396" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="483"/>
       <point x="131" y="572"/>
       <point x="158" y="663" type="curve" smooth="yes"/>
@@ -22,13 +22,13 @@
       <point x="464" y="1087" type="curve" smooth="yes"/>
       <point x="539" y="1127"/>
       <point x="623" y="1147"/>
-      <point x="717" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="717" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="838" y="1147"/>
       <point x="941" y="1113"/>
       <point x="1012" y="1040" type="curve" smooth="yes"/>
       <point x="1080" y="969"/>
       <point x="1114" y="864"/>
-      <point x="1114" y="726" type="curve" name="sh02" smooth="yes"/>
+      <point x="1114" y="726" type="curve" smooth="yes" name="sh02"/>
       <point x="1114" y="636"/>
       <point x="1100" y="545"/>
       <point x="1073" y="453" type="curve" smooth="yes"/>
@@ -39,25 +39,25 @@
       <point x="702" y="-29"/>
     </contour>
     <contour>
-      <point x="533" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="533" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="649" y="127"/>
       <point x="744" y="190"/>
       <point x="812" y="298" type="curve" smooth="yes"/>
       <point x="884" y="409"/>
       <point x="920" y="567"/>
-      <point x="920" y="718" type="curve" name="ah01" smooth="yes"/>
+      <point x="920" y="718" type="curve" smooth="yes" name="ah01"/>
       <point x="920" y="814"/>
       <point x="905" y="880"/>
       <point x="864" y="927" type="curve" smooth="yes"/>
       <point x="824" y="972"/>
       <point x="767" y="991"/>
-      <point x="702" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="702" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="582" y="991"/>
       <point x="490" y="928"/>
       <point x="422" y="820" type="curve" smooth="yes"/>
       <point x="355" y="715"/>
       <point x="313" y="563"/>
-      <point x="313" y="402" type="curve" name="sh03" smooth="yes"/>
+      <point x="313" y="402" type="curve" smooth="yes" name="sh03"/>
       <point x="313" y="306"/>
       <point x="328" y="238"/>
       <point x="369" y="191" type="curve" smooth="yes"/>
@@ -65,7 +65,7 @@
       <point x="466" y="127"/>
     </contour>
     <contour>
-      <point x="748" y="1297" type="curve" name="dv03" smooth="yes"/>
+      <point x="748" y="1297" type="curve" smooth="yes" name="dv03"/>
       <point x="660" y="1297"/>
       <point x="591" y="1318"/>
       <point x="542" y="1360" type="curve" smooth="yes"/>
@@ -85,7 +85,7 @@
       <point x="636" y="1468" type="curve" smooth="yes"/>
       <point x="665" y="1445"/>
       <point x="707" y="1434"/>
-      <point x="762" y="1434" type="curve" name="dv04" smooth="yes"/>
+      <point x="762" y="1434" type="curve" smooth="yes" name="dv04"/>
       <point x="817" y="1434"/>
       <point x="862" y="1446"/>
       <point x="897" y="1471" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/ocircumflex.glif b/source/Hack-Italic.ufo/glyphs/ocircumflex.glif
index 47699e1c8..381a27da3 100644
--- a/source/Hack-Italic.ufo/glyphs/ocircumflex.glif
+++ b/source/Hack-Italic.ufo/glyphs/ocircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ocircumflex" format="1">
+<glyph name="ocircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00F4"/>
   <outline>
@@ -13,13 +13,13 @@
       <point x="397" y="1297" type="line" name="ih03"/>
     </contour>
     <contour>
-      <point x="510" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="510" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="387" y="-29"/>
       <point x="287" y="4"/>
       <point x="218" y="80" type="curve" smooth="yes"/>
       <point x="155" y="148"/>
       <point x="117" y="251"/>
-      <point x="117" y="396" type="curve" name="sh02" smooth="yes"/>
+      <point x="117" y="396" type="curve" smooth="yes" name="sh02"/>
       <point x="117" y="483"/>
       <point x="131" y="572"/>
       <point x="158" y="663" type="curve" smooth="yes"/>
@@ -31,13 +31,13 @@
       <point x="464" y="1087" type="curve" smooth="yes"/>
       <point x="539" y="1127"/>
       <point x="623" y="1147"/>
-      <point x="717" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="717" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="838" y="1147"/>
       <point x="941" y="1113"/>
       <point x="1012" y="1040" type="curve" smooth="yes"/>
       <point x="1080" y="969"/>
       <point x="1114" y="864"/>
-      <point x="1114" y="726" type="curve" name="sh01" smooth="yes"/>
+      <point x="1114" y="726" type="curve" smooth="yes" name="sh01"/>
       <point x="1114" y="636"/>
       <point x="1100" y="545"/>
       <point x="1073" y="453" type="curve" smooth="yes"/>
@@ -48,25 +48,25 @@
       <point x="702" y="-29"/>
     </contour>
     <contour>
-      <point x="533" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="533" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="649" y="127"/>
       <point x="744" y="190"/>
       <point x="812" y="298" type="curve" smooth="yes"/>
       <point x="884" y="409"/>
       <point x="920" y="567"/>
-      <point x="920" y="718" type="curve" name="ah01" smooth="yes"/>
+      <point x="920" y="718" type="curve" smooth="yes" name="ah01"/>
       <point x="920" y="814"/>
       <point x="905" y="880"/>
       <point x="864" y="927" type="curve" smooth="yes"/>
       <point x="824" y="972"/>
       <point x="767" y="991"/>
-      <point x="702" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="702" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="582" y="991"/>
       <point x="490" y="928"/>
       <point x="422" y="820" type="curve" smooth="yes"/>
       <point x="355" y="715"/>
       <point x="313" y="563"/>
-      <point x="313" y="402" type="curve" name="sh03" smooth="yes"/>
+      <point x="313" y="402" type="curve" smooth="yes" name="sh03"/>
       <point x="313" y="306"/>
       <point x="328" y="238"/>
       <point x="369" y="191" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/odieresis.glif b/source/Hack-Italic.ufo/glyphs/odieresis.glif
index 5c53f5c10..226077bb2 100644
--- a/source/Hack-Italic.ufo/glyphs/odieresis.glif
+++ b/source/Hack-Italic.ufo/glyphs/odieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="odieresis" format="1">
+<glyph name="odieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00F6"/>
   <outline>
     <contour>
-      <point x="469" y="1350" type="line" name="hr00" smooth="yes"/>
+      <point x="469" y="1350" type="line" smooth="yes" name="hr00"/>
       <point x="449" y="1350"/>
       <point x="438" y="1363"/>
       <point x="442" y="1383" type="curve" smooth="yes"/>
       <point x="470" y="1525" type="line"/>
       <point x="473" y="1543"/>
       <point x="483" y="1552"/>
-      <point x="502" y="1552" type="curve" name="dv03" smooth="yes"/>
+      <point x="502" y="1552" type="curve" smooth="yes" name="dv03"/>
       <point x="645" y="1552" type="line" smooth="yes"/>
       <point x="665" y="1552"/>
       <point x="676" y="1539"/>
@@ -22,14 +22,14 @@
       <point x="612" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="860" y="1350" type="line" name="sv01" smooth="yes"/>
+      <point x="860" y="1350" type="line" smooth="yes" name="sv01"/>
       <point x="840" y="1350"/>
       <point x="829" y="1363"/>
       <point x="833" y="1383" type="curve" smooth="yes"/>
       <point x="861" y="1525" type="line"/>
       <point x="864" y="1543"/>
       <point x="874" y="1552"/>
-      <point x="893" y="1552" type="curve" name="sv02" smooth="yes"/>
+      <point x="893" y="1552" type="curve" smooth="yes" name="sv02"/>
       <point x="1036" y="1552" type="line" smooth="yes"/>
       <point x="1056" y="1552"/>
       <point x="1067" y="1539"/>
@@ -40,13 +40,13 @@
       <point x="1003" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="510" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="510" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="387" y="-29"/>
       <point x="287" y="4"/>
       <point x="218" y="80" type="curve" smooth="yes"/>
       <point x="155" y="148"/>
       <point x="117" y="251"/>
-      <point x="117" y="396" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="396" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="483"/>
       <point x="131" y="572"/>
       <point x="158" y="663" type="curve" smooth="yes"/>
@@ -58,13 +58,13 @@
       <point x="464" y="1087" type="curve" smooth="yes"/>
       <point x="539" y="1127"/>
       <point x="623" y="1147"/>
-      <point x="717" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="717" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="838" y="1147"/>
       <point x="941" y="1113"/>
       <point x="1012" y="1040" type="curve" smooth="yes"/>
       <point x="1080" y="969"/>
       <point x="1114" y="864"/>
-      <point x="1114" y="726" type="curve" name="sh02" smooth="yes"/>
+      <point x="1114" y="726" type="curve" smooth="yes" name="sh02"/>
       <point x="1114" y="636"/>
       <point x="1100" y="545"/>
       <point x="1073" y="453" type="curve" smooth="yes"/>
@@ -75,25 +75,25 @@
       <point x="702" y="-29"/>
     </contour>
     <contour>
-      <point x="533" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="533" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="649" y="127"/>
       <point x="744" y="190"/>
       <point x="812" y="298" type="curve" smooth="yes"/>
       <point x="884" y="409"/>
       <point x="920" y="567"/>
-      <point x="920" y="718" type="curve" name="ah01" smooth="yes"/>
+      <point x="920" y="718" type="curve" smooth="yes" name="ah01"/>
       <point x="920" y="814"/>
       <point x="905" y="880"/>
       <point x="864" y="927" type="curve" smooth="yes"/>
       <point x="824" y="972"/>
       <point x="767" y="991"/>
-      <point x="702" y="991" type="curve" name="sv03" smooth="yes"/>
+      <point x="702" y="991" type="curve" smooth="yes" name="sv03"/>
       <point x="582" y="991"/>
       <point x="490" y="928"/>
       <point x="422" y="820" type="curve" smooth="yes"/>
       <point x="355" y="715"/>
       <point x="313" y="563"/>
-      <point x="313" y="402" type="curve" name="sh03" smooth="yes"/>
+      <point x="313" y="402" type="curve" smooth="yes" name="sh03"/>
       <point x="313" y="306"/>
       <point x="328" y="238"/>
       <point x="369" y="191" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/oe.glif b/source/Hack-Italic.ufo/glyphs/oe.glif
index da5b16023..fa856714f 100644
--- a/source/Hack-Italic.ufo/glyphs/oe.glif
+++ b/source/Hack-Italic.ufo/glyphs/oe.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="oe" format="1">
+<glyph name="oe" format="2">
   <advance width="1233"/>
   <unicode hex="0153"/>
   <outline>
     <contour>
-      <point x="288" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="288" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="101" y="-29"/>
       <point x="-6" y="85"/>
-      <point x="-6" y="292" type="curve" name="sh01" smooth="yes"/>
+      <point x="-6" y="292" type="curve" smooth="yes" name="sh01"/>
       <point x="-6" y="327"/>
       <point x="-3" y="371"/>
       <point x="2" y="414" type="curve" name="sh02"/>
@@ -25,7 +25,7 @@
       <point x="291" y="1094" type="curve" smooth="yes"/>
       <point x="352" y="1129"/>
       <point x="420" y="1147"/>
-      <point x="495" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="495" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="551" y="1147"/>
       <point x="599" y="1136"/>
       <point x="640" y="1113" type="curve" smooth="yes"/>
@@ -37,16 +37,16 @@
       <point x="861" y="1115" type="curve" smooth="yes"/>
       <point x="907" y="1136"/>
       <point x="956" y="1147"/>
-      <point x="1008" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="1008" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1090" y="1147"/>
       <point x="1154" y="1122"/>
       <point x="1201" y="1071" type="curve" smooth="yes"/>
       <point x="1248" y="1020"/>
       <point x="1272" y="948"/>
-      <point x="1272" y="863" type="curve" name="sh03" smooth="yes"/>
+      <point x="1272" y="863" type="curve" smooth="yes" name="sh03"/>
       <point x="1272" y="828"/>
       <point x="1268" y="786"/>
-      <point x="1264" y="754" type="curve" name="sh04" smooth="yes"/>
+      <point x="1264" y="754" type="curve" smooth="yes" name="sh04"/>
       <point x="1259" y="715"/>
       <point x="1250" y="657"/>
       <point x="1239" y="604" type="curve"/>
@@ -63,7 +63,7 @@
       <point x="735" y="163" type="curve" smooth="yes"/>
       <point x="768" y="134"/>
       <point x="812" y="119"/>
-      <point x="868" y="119" type="curve" name="dv02" smooth="yes"/>
+      <point x="868" y="119" type="curve" smooth="yes" name="dv02"/>
       <point x="915" y="119"/>
       <point x="962" y="129"/>
       <point x="1010" y="148" type="curve" smooth="yes"/>
@@ -76,7 +76,7 @@
       <point x="975" y="-7" type="curve" smooth="yes"/>
       <point x="932" y="-22"/>
       <point x="891" y="-29"/>
-      <point x="839" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="839" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="711" y="-29"/>
       <point x="618" y="20"/>
       <point x="573" y="104" type="curve" name="ih03"/>
@@ -87,7 +87,7 @@
       <point x="345" y="-29"/>
     </contour>
     <contour>
-      <point x="309" y="123" type="curve" name="sv02" smooth="yes"/>
+      <point x="309" y="123" type="curve" smooth="yes" name="sv02"/>
       <point x="350" y="123"/>
       <point x="386" y="135"/>
       <point x="419" y="158" type="curve" smooth="yes"/>
@@ -108,7 +108,7 @@
       <point x="576" y="953" type="curve" smooth="yes"/>
       <point x="552" y="981"/>
       <point x="517" y="995"/>
-      <point x="472" y="995" type="curve" name="sv01" smooth="yes"/>
+      <point x="472" y="995" type="curve" smooth="yes" name="sv01"/>
       <point x="424" y="995"/>
       <point x="389" y="981"/>
       <point x="361" y="961" type="curve" smooth="yes"/>
@@ -123,10 +123,10 @@
       <point x="205" y="559" type="curve" smooth="yes"/>
       <point x="194" y="500"/>
       <point x="186" y="456"/>
-      <point x="178" y="400" type="curve" name="sh07" smooth="yes"/>
+      <point x="178" y="400" type="curve" smooth="yes" name="sh07"/>
       <point x="171" y="351"/>
       <point x="168" y="316"/>
-      <point x="168" y="289" type="curve" name="sh06" smooth="yes"/>
+      <point x="168" y="289" type="curve" smooth="yes" name="sh06"/>
       <point x="168" y="236"/>
       <point x="180" y="196"/>
       <point x="205" y="167" type="curve" smooth="yes"/>
@@ -135,19 +135,19 @@
     </contour>
     <contour>
       <point x="1083" y="653" type="line" name="dv04"/>
-      <point x="1098" y="729" type="line" name="sh08" smooth="yes"/>
+      <point x="1098" y="729" type="line" smooth="yes" name="sh08"/>
       <point x="1102" y="750"/>
       <point x="1106" y="777"/>
-      <point x="1107" y="788" type="curve" name="sh09" smooth="yes"/>
+      <point x="1107" y="788" type="curve" smooth="yes" name="sh09"/>
       <point x="1110" y="807"/>
       <point x="1110" y="825"/>
-      <point x="1110" y="840" type="curve" name="ah01" smooth="yes"/>
+      <point x="1110" y="840" type="curve" smooth="yes" name="ah01"/>
       <point x="1110" y="884"/>
       <point x="1100" y="926"/>
       <point x="1077" y="953" type="curve" smooth="yes"/>
       <point x="1053" y="981"/>
       <point x="1017" y="991"/>
-      <point x="980" y="991" type="curve" name="sv03" smooth="yes"/>
+      <point x="980" y="991" type="curve" smooth="yes" name="sv03"/>
       <point x="923" y="991"/>
       <point x="880" y="967"/>
       <point x="847" y="926" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/ogonek.glif b/source/Hack-Italic.ufo/glyphs/ogonek.glif
index 109fd8b14..6bc209a49 100644
--- a/source/Hack-Italic.ufo/glyphs/ogonek.glif
+++ b/source/Hack-Italic.ufo/glyphs/ogonek.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ogonek" format="1">
+<glyph name="ogonek" format="2">
   <advance width="1233"/>
   <unicode hex="02DB"/>
   <outline>
     <contour>
-      <point x="438" y="-395" type="curve" name="hr00" smooth="yes"/>
+      <point x="438" y="-395" type="curve" smooth="yes" name="hr00"/>
       <point x="374" y="-395"/>
       <point x="321" y="-382"/>
       <point x="285" y="-355" type="curve" smooth="yes"/>
@@ -39,7 +39,7 @@
       <point x="575" y="-375" type="line"/>
       <point x="548" y="-383"/>
       <point x="529" y="-387"/>
-      <point x="506" y="-390" type="curve" name="av01" smooth="yes"/>
+      <point x="506" y="-390" type="curve" smooth="yes" name="av01"/>
       <point x="482" y="-393"/>
       <point x="463" y="-395"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/ograve.glif b/source/Hack-Italic.ufo/glyphs/ograve.glif
index d371f2485..f0530ca26 100644
--- a/source/Hack-Italic.ufo/glyphs/ograve.glif
+++ b/source/Hack-Italic.ufo/glyphs/ograve.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ograve" format="1">
+<glyph name="ograve" format="2">
   <advance width="1233"/>
   <unicode hex="00F2"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="705" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="510" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="510" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="387" y="-29"/>
       <point x="287" y="4"/>
       <point x="218" y="80" type="curve" smooth="yes"/>
       <point x="155" y="148"/>
       <point x="117" y="251"/>
-      <point x="117" y="396" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="396" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="483"/>
       <point x="131" y="572"/>
       <point x="158" y="663" type="curve" smooth="yes"/>
@@ -28,13 +28,13 @@
       <point x="464" y="1087" type="curve" smooth="yes"/>
       <point x="539" y="1127"/>
       <point x="623" y="1147"/>
-      <point x="717" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="717" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="838" y="1147"/>
       <point x="941" y="1113"/>
       <point x="1012" y="1040" type="curve" smooth="yes"/>
       <point x="1080" y="969"/>
       <point x="1114" y="864"/>
-      <point x="1114" y="726" type="curve" name="sh02" smooth="yes"/>
+      <point x="1114" y="726" type="curve" smooth="yes" name="sh02"/>
       <point x="1114" y="636"/>
       <point x="1100" y="545"/>
       <point x="1073" y="453" type="curve" smooth="yes"/>
@@ -45,25 +45,25 @@
       <point x="702" y="-29"/>
     </contour>
     <contour>
-      <point x="533" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="533" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="649" y="127"/>
       <point x="744" y="190"/>
       <point x="812" y="298" type="curve" smooth="yes"/>
       <point x="884" y="409"/>
       <point x="920" y="567"/>
-      <point x="920" y="718" type="curve" name="ah01" smooth="yes"/>
+      <point x="920" y="718" type="curve" smooth="yes" name="ah01"/>
       <point x="920" y="814"/>
       <point x="905" y="880"/>
       <point x="864" y="927" type="curve" smooth="yes"/>
       <point x="824" y="972"/>
       <point x="767" y="991"/>
-      <point x="702" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="702" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="582" y="991"/>
       <point x="490" y="928"/>
       <point x="422" y="820" type="curve" smooth="yes"/>
       <point x="355" y="715"/>
       <point x="313" y="563"/>
-      <point x="313" y="402" type="curve" name="sh03" smooth="yes"/>
+      <point x="313" y="402" type="curve" smooth="yes" name="sh03"/>
       <point x="313" y="306"/>
       <point x="328" y="238"/>
       <point x="369" y="191" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/ohorn.glif b/source/Hack-Italic.ufo/glyphs/ohorn.glif
index 49ec267b8..c6a5ca19e 100644
--- a/source/Hack-Italic.ufo/glyphs/ohorn.glif
+++ b/source/Hack-Italic.ufo/glyphs/ohorn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ohorn" format="1">
+<glyph name="ohorn" format="2">
   <advance width="1233"/>
   <unicode hex="01A1"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="1218" y="1137" type="line" name="sh02"/>
       <point x="1219" y="1118"/>
       <point x="1220" y="1103"/>
-      <point x="1220" y="1088" type="curve" name="sh01" smooth="yes"/>
+      <point x="1220" y="1088" type="curve" smooth="yes" name="sh01"/>
       <point x="1220" y="1052"/>
       <point x="1216" y="1025"/>
       <point x="1212" y="1001" type="curve" smooth="yes"/>
@@ -16,22 +16,22 @@
       <point x="1007" y="764" type="curve" name="sv01"/>
       <point x="1008" y="751"/>
       <point x="1008" y="739"/>
-      <point x="1008" y="724" type="curve" name="dh03" smooth="yes"/>
+      <point x="1008" y="724" type="curve" smooth="yes" name="dh03"/>
       <point x="1008" y="550"/>
       <point x="954" y="354"/>
-      <point x="852" y="207" type="curve" name="hr01" smooth="yes"/>
+      <point x="852" y="207" type="curve" smooth="yes" name="hr01"/>
       <point x="745" y="52"/>
       <point x="601" y="-29"/>
-      <point x="408" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="408" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="147" y="-29"/>
       <point x="11" y="121"/>
-      <point x="11" y="392" type="curve" name="dh01" smooth="yes"/>
+      <point x="11" y="392" type="curve" smooth="yes" name="dh01"/>
       <point x="11" y="571"/>
       <point x="71" y="769"/>
       <point x="168" y="911" type="curve" smooth="yes"/>
       <point x="276" y="1068"/>
       <point x="420" y="1147"/>
-      <point x="611" y="1147" type="curve" name="hr02" smooth="yes"/>
+      <point x="611" y="1147" type="curve" smooth="yes" name="hr02"/>
       <point x="806" y="1147"/>
       <point x="932" y="1064"/>
       <point x="983" y="903" type="curve"/>
@@ -46,16 +46,16 @@
       <point x="1085" y="1137" type="curve" name="ih01"/>
     </contour>
     <contour>
-      <point x="418" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="418" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="686" y="127"/>
       <point x="814" y="442"/>
-      <point x="814" y="707" type="curve" name="dh02" smooth="yes"/>
+      <point x="814" y="707" type="curve" smooth="yes" name="dh02"/>
       <point x="814" y="906"/>
       <point x="744" y="991"/>
-      <point x="603" y="991" type="curve" name="sv02" smooth="yes"/>
+      <point x="603" y="991" type="curve" smooth="yes" name="sv02"/>
       <point x="335" y="991"/>
       <point x="207" y="676"/>
-      <point x="207" y="411" type="curve" name="hr03" smooth="yes"/>
+      <point x="207" y="411" type="curve" smooth="yes" name="hr03"/>
       <point x="207" y="212"/>
       <point x="277" y="127"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/ohungarumlaut.glif b/source/Hack-Italic.ufo/glyphs/ohungarumlaut.glif
index c7e0151bc..b86b8c9e8 100644
--- a/source/Hack-Italic.ufo/glyphs/ohungarumlaut.glif
+++ b/source/Hack-Italic.ufo/glyphs/ohungarumlaut.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ohungarumlaut" format="1">
+<glyph name="ohungarumlaut" format="2">
   <advance width="1233"/>
   <unicode hex="0151"/>
   <outline>
@@ -16,19 +16,19 @@
       <point x="766" y="1297" type="line" name="ih03"/>
     </contour>
     <contour>
-      <point x="514" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="514" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="253" y="-29"/>
       <point x="117" y="121"/>
-      <point x="117" y="392" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="392" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="571"/>
       <point x="177" y="769"/>
       <point x="274" y="911" type="curve" smooth="yes"/>
       <point x="382" y="1068"/>
       <point x="526" y="1147"/>
-      <point x="717" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="717" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="974" y="1147"/>
       <point x="1114" y="1004"/>
-      <point x="1114" y="724" type="curve" name="sh02" smooth="yes"/>
+      <point x="1114" y="724" type="curve" smooth="yes" name="sh02"/>
       <point x="1114" y="550"/>
       <point x="1060" y="354"/>
       <point x="958" y="207" type="curve" smooth="yes"/>
@@ -36,16 +36,16 @@
       <point x="707" y="-29"/>
     </contour>
     <contour>
-      <point x="524" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="524" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="792" y="127"/>
       <point x="920" y="442"/>
-      <point x="920" y="707" type="curve" name="ah01" smooth="yes"/>
+      <point x="920" y="707" type="curve" smooth="yes" name="ah01"/>
       <point x="920" y="906"/>
       <point x="850" y="991"/>
-      <point x="709" y="991" type="curve" name="sv03" smooth="yes"/>
+      <point x="709" y="991" type="curve" smooth="yes" name="sv03"/>
       <point x="441" y="991"/>
       <point x="313" y="676"/>
-      <point x="313" y="411" type="curve" name="sh03" smooth="yes"/>
+      <point x="313" y="411" type="curve" smooth="yes" name="sh03"/>
       <point x="313" y="212"/>
       <point x="383" y="127"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/omacron.glif b/source/Hack-Italic.ufo/glyphs/omacron.glif
index 9aa6ec873..c861b4a1b 100644
--- a/source/Hack-Italic.ufo/glyphs/omacron.glif
+++ b/source/Hack-Italic.ufo/glyphs/omacron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="omacron" format="1">
+<glyph name="omacron" format="2">
   <advance width="1233"/>
   <unicode hex="014D"/>
   <outline>
@@ -10,19 +10,19 @@
       <point x="440" y="1347" type="line"/>
     </contour>
     <contour>
-      <point x="514" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="514" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="253" y="-29"/>
       <point x="117" y="121"/>
-      <point x="117" y="392" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="392" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="571"/>
       <point x="177" y="769"/>
       <point x="274" y="911" type="curve" smooth="yes"/>
       <point x="382" y="1068"/>
       <point x="526" y="1147"/>
-      <point x="717" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="717" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="974" y="1147"/>
       <point x="1114" y="1004"/>
-      <point x="1114" y="724" type="curve" name="sh02" smooth="yes"/>
+      <point x="1114" y="724" type="curve" smooth="yes" name="sh02"/>
       <point x="1114" y="550"/>
       <point x="1060" y="354"/>
       <point x="958" y="207" type="curve" smooth="yes"/>
@@ -30,16 +30,16 @@
       <point x="707" y="-29"/>
     </contour>
     <contour>
-      <point x="524" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="524" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="792" y="127"/>
       <point x="920" y="442"/>
-      <point x="920" y="707" type="curve" name="ah01" smooth="yes"/>
+      <point x="920" y="707" type="curve" smooth="yes" name="ah01"/>
       <point x="920" y="906"/>
       <point x="850" y="991"/>
-      <point x="709" y="991" type="curve" name="sv02" smooth="yes"/>
+      <point x="709" y="991" type="curve" smooth="yes" name="sv02"/>
       <point x="441" y="991"/>
       <point x="313" y="676"/>
-      <point x="313" y="411" type="curve" name="sh03" smooth="yes"/>
+      <point x="313" y="411" type="curve" smooth="yes" name="sh03"/>
       <point x="313" y="212"/>
       <point x="383" y="127"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/omega.glif b/source/Hack-Italic.ufo/glyphs/omega.glif
index 351cf40c4..6b36dfa0a 100644
--- a/source/Hack-Italic.ufo/glyphs/omega.glif
+++ b/source/Hack-Italic.ufo/glyphs/omega.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="omega" format="1">
+<glyph name="omega" format="2">
   <advance width="1233"/>
   <unicode hex="03C9"/>
   <outline>
     <contour>
-      <point x="268" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="268" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="151" y="-29"/>
       <point x="74" y="36"/>
-      <point x="51" y="156" type="curve" name="sh02" smooth="yes"/>
+      <point x="51" y="156" type="curve" smooth="yes" name="sh02"/>
       <point x="45" y="187"/>
       <point x="42" y="224"/>
-      <point x="42" y="268" type="curve" name="sh01" smooth="yes"/>
+      <point x="42" y="268" type="curve" smooth="yes" name="sh01"/>
       <point x="42" y="480"/>
       <point x="118" y="829"/>
       <point x="319" y="1120" type="curve" name="at01"/>
@@ -20,10 +20,10 @@
       <point x="273" y="558" type="curve" smooth="yes"/>
       <point x="242" y="411"/>
       <point x="234" y="307"/>
-      <point x="234" y="268" type="curve" name="sh04" smooth="yes"/>
+      <point x="234" y="268" type="curve" smooth="yes" name="sh04"/>
       <point x="234" y="179"/>
       <point x="277" y="131"/>
-      <point x="328" y="131" type="curve" name="dv01" smooth="yes"/>
+      <point x="328" y="131" type="curve" smooth="yes" name="dv01"/>
       <point x="371" y="131"/>
       <point x="419" y="165"/>
       <point x="454" y="240" type="curve"/>
@@ -39,7 +39,7 @@
       <point x="674" y="240" type="curve"/>
       <point x="679" y="167"/>
       <point x="715" y="131"/>
-      <point x="758" y="131" type="curve" name="sv01" smooth="yes"/>
+      <point x="758" y="131" type="curve" smooth="yes" name="sv01"/>
       <point x="807" y="131"/>
       <point x="867" y="177"/>
       <point x="904" y="270" type="curve" smooth="yes"/>
@@ -48,20 +48,20 @@
       <point x="977" y="558" type="curve" smooth="yes"/>
       <point x="993" y="649"/>
       <point x="1002" y="729"/>
-      <point x="1002" y="813" type="curve" name="ah01" smooth="yes"/>
+      <point x="1002" y="813" type="curve" smooth="yes" name="ah01"/>
       <point x="1002" y="909"/>
       <point x="990" y="1007"/>
       <point x="961" y="1120" type="curve" name="ih02"/>
       <point x="1151" y="1120" type="line"/>
       <point x="1182" y="1019"/>
       <point x="1193" y="911"/>
-      <point x="1193" y="804" type="curve" name="sh03" smooth="yes"/>
+      <point x="1193" y="804" type="curve" smooth="yes" name="sh03"/>
       <point x="1193" y="537"/>
       <point x="1116" y="282"/>
       <point x="1044" y="156" type="curve" smooth="yes"/>
       <point x="976" y="39"/>
       <point x="871" y="-29"/>
-      <point x="754" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="754" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="629" y="-29"/>
       <point x="554" y="50"/>
       <point x="546" y="150" type="curve" name="ih03"/>
diff --git a/source/Hack-Italic.ufo/glyphs/omegatonos.glif b/source/Hack-Italic.ufo/glyphs/omegatonos.glif
index 33f0fc9fa..eb66b4e2f 100644
--- a/source/Hack-Italic.ufo/glyphs/omegatonos.glif
+++ b/source/Hack-Italic.ufo/glyphs/omegatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="omegatonos" format="1">
+<glyph name="omegatonos" format="2">
   <advance width="1233"/>
   <unicode hex="03CE"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="635" y="1297" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="268" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="268" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="151" y="-29"/>
       <point x="74" y="36"/>
-      <point x="51" y="156" type="curve" name="sh04" smooth="yes"/>
+      <point x="51" y="156" type="curve" smooth="yes" name="sh04"/>
       <point x="45" y="187"/>
       <point x="42" y="224"/>
-      <point x="42" y="268" type="curve" name="sh03" smooth="yes"/>
+      <point x="42" y="268" type="curve" smooth="yes" name="sh03"/>
       <point x="42" y="480"/>
       <point x="118" y="829"/>
       <point x="319" y="1120" type="curve" name="at01"/>
@@ -26,10 +26,10 @@
       <point x="273" y="558" type="curve" smooth="yes"/>
       <point x="242" y="411"/>
       <point x="234" y="307"/>
-      <point x="234" y="268" type="curve" name="sh05" smooth="yes"/>
+      <point x="234" y="268" type="curve" smooth="yes" name="sh05"/>
       <point x="234" y="179"/>
       <point x="277" y="131"/>
-      <point x="328" y="131" type="curve" name="dv02" smooth="yes"/>
+      <point x="328" y="131" type="curve" smooth="yes" name="dv02"/>
       <point x="371" y="131"/>
       <point x="419" y="165"/>
       <point x="454" y="240" type="curve"/>
@@ -45,7 +45,7 @@
       <point x="674" y="240" type="curve"/>
       <point x="679" y="167"/>
       <point x="715" y="131"/>
-      <point x="758" y="131" type="curve" name="sv01" smooth="yes"/>
+      <point x="758" y="131" type="curve" smooth="yes" name="sv01"/>
       <point x="807" y="131"/>
       <point x="867" y="177"/>
       <point x="904" y="270" type="curve" smooth="yes"/>
@@ -54,20 +54,20 @@
       <point x="977" y="558" type="curve" smooth="yes"/>
       <point x="993" y="649"/>
       <point x="1002" y="729"/>
-      <point x="1002" y="813" type="curve" name="ah01" smooth="yes"/>
+      <point x="1002" y="813" type="curve" smooth="yes" name="ah01"/>
       <point x="1002" y="909"/>
       <point x="990" y="1007"/>
       <point x="961" y="1120" type="curve" name="ih03"/>
       <point x="1151" y="1120" type="line"/>
       <point x="1182" y="1019"/>
       <point x="1193" y="911"/>
-      <point x="1193" y="804" type="curve" name="sh01" smooth="yes"/>
+      <point x="1193" y="804" type="curve" smooth="yes" name="sh01"/>
       <point x="1193" y="537"/>
       <point x="1116" y="282"/>
       <point x="1044" y="156" type="curve" smooth="yes"/>
       <point x="976" y="39"/>
       <point x="871" y="-29"/>
-      <point x="754" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="754" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="629" y="-29"/>
       <point x="554" y="50"/>
       <point x="546" y="150" type="curve" name="ih04"/>
diff --git a/source/Hack-Italic.ufo/glyphs/omicron.glif b/source/Hack-Italic.ufo/glyphs/omicron.glif
index 21e2bb293..460f81344 100644
--- a/source/Hack-Italic.ufo/glyphs/omicron.glif
+++ b/source/Hack-Italic.ufo/glyphs/omicron.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="omicron" format="1">
+<glyph name="omicron" format="2">
   <advance width="1233"/>
   <unicode hex="03BF"/>
   <outline>
     <contour>
-      <point x="514" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="514" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="253" y="-29"/>
       <point x="117" y="121"/>
-      <point x="117" y="392" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="392" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="571"/>
       <point x="177" y="769"/>
       <point x="274" y="911" type="curve" smooth="yes"/>
       <point x="382" y="1068"/>
       <point x="526" y="1147"/>
-      <point x="717" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="717" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="974" y="1147"/>
       <point x="1114" y="1004"/>
-      <point x="1114" y="724" type="curve" name="sh02" smooth="yes"/>
+      <point x="1114" y="724" type="curve" smooth="yes" name="sh02"/>
       <point x="1114" y="550"/>
       <point x="1060" y="354"/>
       <point x="958" y="207" type="curve" smooth="yes"/>
@@ -24,16 +24,16 @@
       <point x="707" y="-29"/>
     </contour>
     <contour>
-      <point x="524" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="524" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="792" y="127"/>
       <point x="920" y="442"/>
-      <point x="920" y="707" type="curve" name="ah01" smooth="yes"/>
+      <point x="920" y="707" type="curve" smooth="yes" name="ah01"/>
       <point x="920" y="906"/>
       <point x="850" y="991"/>
-      <point x="709" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="709" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="441" y="991"/>
       <point x="313" y="676"/>
-      <point x="313" y="411" type="curve" name="sh03" smooth="yes"/>
+      <point x="313" y="411" type="curve" smooth="yes" name="sh03"/>
       <point x="313" y="212"/>
       <point x="383" y="127"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/omicrontonos.glif b/source/Hack-Italic.ufo/glyphs/omicrontonos.glif
index ba2b5b2b2..5e9860608 100644
--- a/source/Hack-Italic.ufo/glyphs/omicrontonos.glif
+++ b/source/Hack-Italic.ufo/glyphs/omicrontonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="omicrontonos" format="1">
+<glyph name="omicrontonos" format="2">
   <advance width="1233"/>
   <unicode hex="03CC"/>
   <outline>
@@ -10,19 +10,19 @@
       <point x="605" y="1297" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="514" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="514" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="253" y="-29"/>
       <point x="117" y="121"/>
-      <point x="117" y="392" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="392" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="571"/>
       <point x="177" y="769"/>
       <point x="274" y="911" type="curve" smooth="yes"/>
       <point x="382" y="1068"/>
       <point x="526" y="1147"/>
-      <point x="717" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="717" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="974" y="1147"/>
       <point x="1114" y="1004"/>
-      <point x="1114" y="724" type="curve" name="sh02" smooth="yes"/>
+      <point x="1114" y="724" type="curve" smooth="yes" name="sh02"/>
       <point x="1114" y="550"/>
       <point x="1060" y="354"/>
       <point x="958" y="207" type="curve" smooth="yes"/>
@@ -30,16 +30,16 @@
       <point x="707" y="-29"/>
     </contour>
     <contour>
-      <point x="524" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="524" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="792" y="127"/>
       <point x="920" y="442"/>
-      <point x="920" y="707" type="curve" name="ah01" smooth="yes"/>
+      <point x="920" y="707" type="curve" smooth="yes" name="ah01"/>
       <point x="920" y="906"/>
       <point x="850" y="991"/>
-      <point x="709" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="709" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="441" y="991"/>
       <point x="313" y="676"/>
-      <point x="313" y="411" type="curve" name="sh03" smooth="yes"/>
+      <point x="313" y="411" type="curve" smooth="yes" name="sh03"/>
       <point x="313" y="212"/>
       <point x="383" y="127"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/one.glif b/source/Hack-Italic.ufo/glyphs/one.glif
index 9bebfc54c..cd22d042e 100644
--- a/source/Hack-Italic.ufo/glyphs/one.glif
+++ b/source/Hack-Italic.ufo/glyphs/one.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="one" format="1">
+<glyph name="one" format="2">
   <advance width="1233"/>
   <unicode hex="0031"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/one.subs.glif b/source/Hack-Italic.ufo/glyphs/one.subs.glif
index b51e90a38..982371998 100644
--- a/source/Hack-Italic.ufo/glyphs/one.subs.glif
+++ b/source/Hack-Italic.ufo/glyphs/one.subs.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="one.subs" format="1">
+<glyph name="one.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/onedotenleader.glif b/source/Hack-Italic.ufo/glyphs/onedotenleader.glif
index 061c2ef45..a90317139 100644
--- a/source/Hack-Italic.ufo/glyphs/onedotenleader.glif
+++ b/source/Hack-Italic.ufo/glyphs/onedotenleader.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="onedotenleader" format="1">
+<glyph name="onedotenleader" format="2">
   <advance width="1233"/>
   <unicode hex="2024"/>
   <outline>
     <contour>
-      <point x="377" y="0" type="line" name="ab01" smooth="yes"/>
+      <point x="377" y="0" type="line" smooth="yes" name="ab01"/>
       <point x="358" y="0"/>
       <point x="349" y="8"/>
       <point x="349" y="25" type="curve" smooth="yes"/>
@@ -14,8 +14,8 @@
       <point x="398" y="276" type="line"/>
       <point x="401" y="294"/>
       <point x="411" y="303"/>
-      <point x="430" y="303" type="curve" name="sv03" smooth="yes"/>
-      <point x="622" y="303" type="line" name="sv04" smooth="yes"/>
+      <point x="430" y="303" type="curve" smooth="yes" name="sv03"/>
+      <point x="622" y="303" type="line" smooth="yes" name="sv04"/>
       <point x="641" y="303"/>
       <point x="650" y="295"/>
       <point x="650" y="278" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/oneeighth.glif b/source/Hack-Italic.ufo/glyphs/oneeighth.glif
index 01572501d..434446748 100644
--- a/source/Hack-Italic.ufo/glyphs/oneeighth.glif
+++ b/source/Hack-Italic.ufo/glyphs/oneeighth.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="oneeighth" format="1">
+<glyph name="oneeighth" format="2">
   <advance width="1233"/>
   <unicode hex="215B"/>
   <outline>
@@ -23,56 +23,56 @@
       <point x="70" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="754" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="754" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="572" y="-285"/>
       <point x="458" y="-204"/>
-      <point x="458" y="-71" type="curve" name="dh01" smooth="yes"/>
+      <point x="458" y="-71" type="curve" smooth="yes" name="dh01"/>
       <point x="458" y="53"/>
       <point x="559" y="147"/>
       <point x="719" y="176" type="curve" name="hr03"/>
       <point x="619" y="205"/>
       <point x="574" y="261"/>
-      <point x="574" y="337" type="curve" name="ih01" smooth="yes"/>
+      <point x="574" y="337" type="curve" smooth="yes" name="ih01"/>
       <point x="574" y="473"/>
       <point x="725" y="582"/>
-      <point x="917" y="582" type="curve" name="dv06" smooth="yes"/>
+      <point x="917" y="582" type="curve" smooth="yes" name="dv06"/>
       <point x="1076" y="582"/>
       <point x="1187" y="507"/>
-      <point x="1187" y="398" type="curve" name="sh02" smooth="yes"/>
+      <point x="1187" y="398" type="curve" smooth="yes" name="sh02"/>
       <point x="1187" y="297"/>
       <point x="1093" y="201"/>
       <point x="949" y="169" type="curve" name="ih02"/>
       <point x="1066" y="146"/>
       <point x="1119" y="80"/>
-      <point x="1119" y="-15" type="curve" name="dh04" smooth="yes"/>
+      <point x="1119" y="-15" type="curve" smooth="yes" name="dh04"/>
       <point x="1119" y="-172"/>
       <point x="969" y="-285"/>
     </contour>
     <contour>
-      <point x="853" y="216" type="curve" name="dv04" smooth="yes"/>
+      <point x="853" y="216" type="curve" smooth="yes" name="dv04"/>
       <point x="965" y="216"/>
       <point x="1052" y="291"/>
-      <point x="1052" y="380" type="curve" name="sh01" smooth="yes"/>
+      <point x="1052" y="380" type="curve" smooth="yes" name="sh01"/>
       <point x="1052" y="453"/>
       <point x="994" y="495"/>
-      <point x="905" y="495" type="curve" name="dv05" smooth="yes"/>
+      <point x="905" y="495" type="curve" smooth="yes" name="dv05"/>
       <point x="792" y="495"/>
       <point x="710" y="428"/>
-      <point x="710" y="337" type="curve" name="sh03" smooth="yes"/>
+      <point x="710" y="337" type="curve" smooth="yes" name="sh03"/>
       <point x="710" y="261"/>
       <point x="765" y="216"/>
     </contour>
     <contour>
-      <point x="762" y="-198" type="curve" name="dv02" smooth="yes"/>
+      <point x="762" y="-198" type="curve" smooth="yes" name="dv02"/>
       <point x="893" y="-198"/>
       <point x="982" y="-122"/>
-      <point x="982" y="-14" type="curve" name="dh03" smooth="yes"/>
+      <point x="982" y="-14" type="curve" smooth="yes" name="dh03"/>
       <point x="982" y="77"/>
       <point x="920" y="128"/>
-      <point x="816" y="128" type="curve" name="dv03" smooth="yes"/>
+      <point x="816" y="128" type="curve" smooth="yes" name="dv03"/>
       <point x="685" y="128"/>
       <point x="595" y="44"/>
-      <point x="595" y="-62" type="curve" name="dh02" smooth="yes"/>
+      <point x="595" y="-62" type="curve" smooth="yes" name="dh02"/>
       <point x="595" y="-153"/>
       <point x="659" y="-198"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/onehalf.glif b/source/Hack-Italic.ufo/glyphs/onehalf.glif
index 8d9e1eec6..588704c1c 100644
--- a/source/Hack-Italic.ufo/glyphs/onehalf.glif
+++ b/source/Hack-Italic.ufo/glyphs/onehalf.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="onehalf" format="1">
+<glyph name="onehalf" format="2">
   <advance width="1233"/>
   <unicode hex="00BD"/>
   <outline>
@@ -27,13 +27,13 @@
       <point x="685" y="7" type="line" smooth="yes"/>
       <point x="889" y="174"/>
       <point x="998" y="287"/>
-      <point x="998" y="370" type="curve" name="dh01" smooth="yes"/>
+      <point x="998" y="370" type="curve" smooth="yes" name="dh01"/>
       <point x="998" y="397"/>
       <point x="986" y="426"/>
       <point x="961" y="447" type="curve" smooth="yes"/>
       <point x="937" y="467"/>
       <point x="904" y="477"/>
-      <point x="861" y="477" type="curve" name="dv03" smooth="yes"/>
+      <point x="861" y="477" type="curve" smooth="yes" name="dv03"/>
       <point x="830" y="477"/>
       <point x="788" y="471"/>
       <point x="749" y="459" type="curve" smooth="yes"/>
@@ -46,13 +46,13 @@
       <point x="776" y="569" type="curve" smooth="yes"/>
       <point x="817" y="578"/>
       <point x="856" y="582"/>
-      <point x="892" y="582" type="curve" name="dv04" smooth="yes"/>
+      <point x="892" y="582" type="curve" smooth="yes" name="dv04"/>
       <point x="975" y="582"/>
       <point x="1034" y="562"/>
       <point x="1077" y="527" type="curve" smooth="yes"/>
       <point x="1122" y="490"/>
       <point x="1145" y="434"/>
-      <point x="1145" y="387" type="curve" name="dh02" smooth="yes"/>
+      <point x="1145" y="387" type="curve" smooth="yes" name="dh02"/>
       <point x="1145" y="282"/>
       <point x="1028" y="139"/>
       <point x="836" y="-5" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/onequarter.glif b/source/Hack-Italic.ufo/glyphs/onequarter.glif
index 37d7a9ed3..749e5f599 100644
--- a/source/Hack-Italic.ufo/glyphs/onequarter.glif
+++ b/source/Hack-Italic.ufo/glyphs/onequarter.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="onequarter" format="1">
+<glyph name="onequarter" format="2">
   <advance width="1233"/>
   <unicode hex="00BC"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/openbullet.glif b/source/Hack-Italic.ufo/glyphs/openbullet.glif
index a865861d3..a5a69714a 100644
--- a/source/Hack-Italic.ufo/glyphs/openbullet.glif
+++ b/source/Hack-Italic.ufo/glyphs/openbullet.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="openbullet" format="1">
+<glyph name="openbullet" format="2">
   <advance width="1233"/>
   <unicode hex="25E6"/>
   <outline>
     <contour>
-      <point x="614" y="465" type="curve" name="hr00" smooth="yes"/>
+      <point x="614" y="465" type="curve" smooth="yes" name="hr00"/>
       <point x="449" y="465"/>
       <point x="319" y="596"/>
-      <point x="319" y="761" type="curve" name="sh01" smooth="yes"/>
+      <point x="319" y="761" type="curve" smooth="yes" name="sh01"/>
       <point x="319" y="926"/>
       <point x="450" y="1057"/>
-      <point x="615" y="1057" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1057" type="curve" smooth="yes" name="dv03"/>
       <point x="782" y="1057"/>
       <point x="913" y="926"/>
-      <point x="913" y="762" type="curve" name="sh02" smooth="yes"/>
+      <point x="913" y="762" type="curve" smooth="yes" name="sh02"/>
       <point x="913" y="597"/>
       <point x="782" y="465"/>
     </contour>
     <contour>
-      <point x="614" y="524" type="curve" name="dv01" smooth="yes"/>
+      <point x="614" y="524" type="curve" smooth="yes" name="dv01"/>
       <point x="746" y="524"/>
       <point x="854" y="630"/>
-      <point x="854" y="762" type="curve" name="ah01" smooth="yes"/>
+      <point x="854" y="762" type="curve" smooth="yes" name="ah01"/>
       <point x="854" y="893"/>
       <point x="748" y="998"/>
-      <point x="615" y="998" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="998" type="curve" smooth="yes" name="dv02"/>
       <point x="483" y="998"/>
       <point x="378" y="893"/>
-      <point x="378" y="761" type="curve" name="sh03" smooth="yes"/>
+      <point x="378" y="761" type="curve" smooth="yes" name="sh03"/>
       <point x="378" y="629"/>
       <point x="482" y="524"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/ordfeminine.glif b/source/Hack-Italic.ufo/glyphs/ordfeminine.glif
index 86f4bed85..96a003281 100644
--- a/source/Hack-Italic.ufo/glyphs/ordfeminine.glif
+++ b/source/Hack-Italic.ufo/glyphs/ordfeminine.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ordfeminine" format="1">
+<glyph name="ordfeminine" format="2">
   <advance width="1233"/>
   <unicode hex="00AA"/>
   <outline>
     <contour>
-      <point x="534" y="698" type="curve" name="hr00" smooth="yes"/>
+      <point x="534" y="698" type="curve" smooth="yes" name="hr00"/>
       <point x="453" y="698"/>
       <point x="395" y="723"/>
       <point x="358" y="758" type="curve" smooth="yes"/>
       <point x="316" y="798"/>
       <point x="295" y="852"/>
-      <point x="295" y="921" type="curve" name="dh01" smooth="yes"/>
+      <point x="295" y="921" type="curve" smooth="yes" name="dh01"/>
       <point x="295" y="1016"/>
       <point x="335" y="1089"/>
       <point x="406" y="1140" type="curve" smooth="yes"/>
@@ -29,17 +29,17 @@
       <point x="850" y="1372" type="curve" smooth="yes"/>
       <point x="821" y="1395"/>
       <point x="779" y="1405"/>
-      <point x="711" y="1405" type="curve" name="sv01" smooth="yes"/>
+      <point x="711" y="1405" type="curve" smooth="yes" name="sv01"/>
       <point x="617" y="1405"/>
       <point x="532" y="1383"/>
       <point x="434" y="1337" type="curve" name="sh01"/>
       <point x="457" y="1464" type="line"/>
       <point x="507" y="1483"/>
       <point x="556" y="1497"/>
-      <point x="605" y="1506" type="curve" name="at01" smooth="yes"/>
+      <point x="605" y="1506" type="curve" smooth="yes" name="at01"/>
       <point x="654" y="1515"/>
       <point x="698" y="1520"/>
-      <point x="745" y="1520" type="curve" name="at02" smooth="yes"/>
+      <point x="745" y="1520" type="curve" smooth="yes" name="at02"/>
       <point x="938" y="1520"/>
       <point x="1036" y="1437"/>
       <point x="1036" y="1272" type="curve" smooth="yes"/>
@@ -59,7 +59,7 @@
       <point x="586" y="698"/>
     </contour>
     <contour>
-      <point x="581" y="817" type="curve" name="dv04" smooth="yes"/>
+      <point x="581" y="817" type="curve" smooth="yes" name="dv04"/>
       <point x="646" y="817"/>
       <point x="711" y="839"/>
       <point x="762" y="884" type="curve" smooth="yes"/>
@@ -73,7 +73,7 @@
       <point x="512" y="1064" type="curve" smooth="yes"/>
       <point x="465" y="1037"/>
       <point x="442" y="993"/>
-      <point x="442" y="941" type="curve" name="dh02" smooth="yes"/>
+      <point x="442" y="941" type="curve" smooth="yes" name="dh02"/>
       <point x="442" y="902"/>
       <point x="454" y="871"/>
       <point x="479" y="849" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/ordmasculine.glif b/source/Hack-Italic.ufo/glyphs/ordmasculine.glif
index d257bbf7b..5202f38ac 100644
--- a/source/Hack-Italic.ufo/glyphs/ordmasculine.glif
+++ b/source/Hack-Italic.ufo/glyphs/ordmasculine.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ordmasculine" format="1">
+<glyph name="ordmasculine" format="2">
   <advance width="1233"/>
   <unicode hex="00BA"/>
   <outline>
     <contour>
-      <point x="630" y="698" type="curve" name="hr00" smooth="yes"/>
+      <point x="630" y="698" type="curve" smooth="yes" name="hr00"/>
       <point x="526" y="698"/>
       <point x="450" y="732"/>
       <point x="394" y="789" type="curve" smooth="yes"/>
       <point x="335" y="849"/>
       <point x="307" y="934"/>
-      <point x="307" y="1030" type="curve" name="sh01" smooth="yes"/>
+      <point x="307" y="1030" type="curve" smooth="yes" name="sh01"/>
       <point x="307" y="1091"/>
       <point x="319" y="1156"/>
       <point x="339" y="1212" type="curve" smooth="yes"/>
@@ -22,13 +22,13 @@
       <point x="570" y="1481" type="curve" smooth="yes"/>
       <point x="625" y="1508"/>
       <point x="680" y="1520"/>
-      <point x="744" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="744" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="843" y="1520"/>
       <point x="921" y="1490"/>
       <point x="979" y="1429" type="curve" smooth="yes"/>
       <point x="1034" y="1372"/>
       <point x="1065" y="1288"/>
-      <point x="1065" y="1184" type="curve" name="sh02" smooth="yes"/>
+      <point x="1065" y="1184" type="curve" smooth="yes" name="sh02"/>
       <point x="1065" y="1128"/>
       <point x="1056" y="1067"/>
       <point x="1033" y="1003" type="curve" smooth="yes"/>
@@ -42,25 +42,25 @@
       <point x="693" y="698"/>
     </contour>
     <contour>
-      <point x="645" y="813" type="curve" name="dv01" smooth="yes"/>
+      <point x="645" y="813" type="curve" smooth="yes" name="dv01"/>
       <point x="716" y="813"/>
       <point x="783" y="848"/>
       <point x="834" y="920" type="curve" smooth="yes"/>
       <point x="885" y="991"/>
       <point x="911" y="1086"/>
-      <point x="911" y="1179" type="curve" name="ah01" smooth="yes"/>
+      <point x="911" y="1179" type="curve" smooth="yes" name="ah01"/>
       <point x="911" y="1250"/>
       <point x="895" y="1306"/>
       <point x="862" y="1345" type="curve" smooth="yes"/>
       <point x="827" y="1388"/>
       <point x="779" y="1405"/>
-      <point x="728" y="1405" type="curve" name="sv01" smooth="yes"/>
+      <point x="728" y="1405" type="curve" smooth="yes" name="sv01"/>
       <point x="652" y="1405"/>
       <point x="588" y="1366"/>
       <point x="540" y="1298" type="curve" smooth="yes"/>
       <point x="489" y="1226"/>
       <point x="463" y="1134"/>
-      <point x="463" y="1041" type="curve" name="sh03" smooth="yes"/>
+      <point x="463" y="1041" type="curve" smooth="yes" name="sh03"/>
       <point x="463" y="895"/>
       <point x="537" y="813"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/orthogonal.glif b/source/Hack-Italic.ufo/glyphs/orthogonal.glif
index c52bf58bd..f94efeca9 100644
--- a/source/Hack-Italic.ufo/glyphs/orthogonal.glif
+++ b/source/Hack-Italic.ufo/glyphs/orthogonal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="orthogonal" format="1">
+<glyph name="orthogonal" format="2">
   <advance width="1233"/>
   <unicode hex="221F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/oslash.glif b/source/Hack-Italic.ufo/glyphs/oslash.glif
index b057e3933..156c49c6a 100644
--- a/source/Hack-Italic.ufo/glyphs/oslash.glif
+++ b/source/Hack-Italic.ufo/glyphs/oslash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="oslash" format="1">
+<glyph name="oslash" format="2">
   <advance width="1233"/>
   <unicode hex="00F8"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="176" y="133" type="line"/>
       <point x="138" y="199"/>
       <point x="119" y="279"/>
-      <point x="119" y="391" type="curve" name="sh01" smooth="yes"/>
+      <point x="119" y="391" type="curve" smooth="yes" name="sh01"/>
       <point x="119" y="483"/>
       <point x="132" y="575"/>
       <point x="159" y="666" type="curve" smooth="yes"/>
@@ -17,7 +17,7 @@
       <point x="467" y="1089" type="curve" smooth="yes"/>
       <point x="542" y="1128"/>
       <point x="628" y="1147"/>
-      <point x="724" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="724" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="777" y="1147"/>
       <point x="823" y="1141"/>
       <point x="863" y="1129" type="curve" smooth="yes"/>
@@ -32,7 +32,7 @@
       <point x="1099" y="875" type="curve" smooth="yes"/>
       <point x="1110" y="834"/>
       <point x="1114" y="781"/>
-      <point x="1114" y="726" type="curve" name="sh03" smooth="yes"/>
+      <point x="1114" y="726" type="curve" smooth="yes" name="sh03"/>
       <point x="1114" y="636"/>
       <point x="1100" y="545"/>
       <point x="1073" y="453" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="766" y="30" type="curve" smooth="yes"/>
       <point x="691" y="-9"/>
       <point x="604" y="-29"/>
-      <point x="507" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="507" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="454" y="-29"/>
       <point x="414" y="-23"/>
       <point x="371" y="-10" type="curve" smooth="yes"/>
@@ -60,28 +60,28 @@
       <point x="784" y="979" type="curve" smooth="yes"/>
       <point x="760" y="987"/>
       <point x="730" y="991"/>
-      <point x="701" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="701" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="472" y="991"/>
       <point x="313" y="734"/>
-      <point x="313" y="388" type="curve" name="sh04" smooth="yes"/>
+      <point x="313" y="388" type="curve" smooth="yes" name="sh04"/>
       <point x="313" y="361"/>
       <point x="314" y="353"/>
-      <point x="315" y="340" type="curve" name="sh05" smooth="yes"/>
+      <point x="315" y="340" type="curve" smooth="yes" name="sh05"/>
       <point x="318" y="315"/>
       <point x="318" y="307"/>
       <point x="319" y="302" type="curve" name="sh06"/>
     </contour>
     <contour>
-      <point x="534" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="534" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="645" y="127"/>
       <point x="739" y="184"/>
       <point x="811" y="299" type="curve" smooth="yes"/>
       <point x="878" y="404"/>
       <point x="920" y="550"/>
-      <point x="920" y="725" type="curve" name="ah01" smooth="yes"/>
+      <point x="920" y="725" type="curve" smooth="yes" name="ah01"/>
       <point x="920" y="752"/>
       <point x="919" y="770"/>
-      <point x="918" y="782" type="curve" name="sh07" smooth="yes"/>
+      <point x="918" y="782" type="curve" smooth="yes" name="sh07"/>
       <point x="917" y="795"/>
       <point x="915" y="810"/>
       <point x="911" y="825" type="curve" name="sh08"/>
diff --git a/source/Hack-Italic.ufo/glyphs/oslashacute.glif b/source/Hack-Italic.ufo/glyphs/oslashacute.glif
index cb557395c..bdb61117e 100644
--- a/source/Hack-Italic.ufo/glyphs/oslashacute.glif
+++ b/source/Hack-Italic.ufo/glyphs/oslashacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="oslashacute" format="1">
+<glyph name="oslashacute" format="2">
   <advance width="1233"/>
   <unicode hex="01FF"/>
   <outline>
@@ -14,13 +14,13 @@
       <point x="176" y="133" type="line"/>
       <point x="138" y="196"/>
       <point x="119" y="281"/>
-      <point x="119" y="389" type="curve" name="sh03" smooth="yes"/>
+      <point x="119" y="389" type="curve" smooth="yes" name="sh03"/>
       <point x="119" y="576"/>
       <point x="173" y="763"/>
       <point x="274" y="911" type="curve" smooth="yes"/>
       <point x="381" y="1066"/>
       <point x="521" y="1147"/>
-      <point x="722" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="722" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="830" y="1147"/>
       <point x="908" y="1123"/>
       <point x="969" y="1075" type="curve"/>
@@ -29,13 +29,13 @@
       <point x="1051" y="989" type="line"/>
       <point x="1094" y="921"/>
       <point x="1114" y="838"/>
-      <point x="1114" y="729" type="curve" name="sh01" smooth="yes"/>
+      <point x="1114" y="729" type="curve" smooth="yes" name="sh01"/>
       <point x="1114" y="539"/>
       <point x="1054" y="346"/>
       <point x="958" y="207" type="curve" smooth="yes"/>
       <point x="854" y="56"/>
       <point x="711" y="-29"/>
-      <point x="511" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="511" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="403" y="-29"/>
       <point x="327" y="-4"/>
       <point x="258" y="45" type="curve"/>
@@ -45,19 +45,19 @@
       <point x="852" y="938" type="line"/>
       <point x="812" y="975"/>
       <point x="760" y="991"/>
-      <point x="703" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="703" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="475" y="991"/>
       <point x="313" y="736"/>
-      <point x="313" y="388" type="curve" name="sh04" smooth="yes"/>
+      <point x="313" y="388" type="curve" smooth="yes" name="sh04"/>
       <point x="313" y="349"/>
       <point x="315" y="326"/>
       <point x="319" y="302" type="curve" name="sh05"/>
     </contour>
     <contour>
-      <point x="533" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="533" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="756" y="127"/>
       <point x="920" y="383"/>
-      <point x="920" y="731" type="curve" name="ah01" smooth="yes"/>
+      <point x="920" y="731" type="curve" smooth="yes" name="ah01"/>
       <point x="920" y="770"/>
       <point x="918" y="798"/>
       <point x="911" y="825" type="curve" name="sh06"/>
diff --git a/source/Hack-Italic.ufo/glyphs/otilde.glif b/source/Hack-Italic.ufo/glyphs/otilde.glif
index a77f1914a..b70cffe1a 100644
--- a/source/Hack-Italic.ufo/glyphs/otilde.glif
+++ b/source/Hack-Italic.ufo/glyphs/otilde.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="otilde" format="1">
+<glyph name="otilde" format="2">
   <advance width="1233"/>
   <unicode hex="00F5"/>
   <outline>
     <contour>
-      <point x="890" y="1297" type="curve" name="hr00" smooth="yes"/>
+      <point x="890" y="1297" type="curve" smooth="yes" name="hr00"/>
       <point x="861" y="1297"/>
       <point x="836" y="1302"/>
       <point x="814" y="1312" type="curve" smooth="yes"/>
@@ -30,7 +30,7 @@
       <point x="475" y="1508" type="curve" smooth="yes"/>
       <point x="513" y="1557"/>
       <point x="562" y="1581"/>
-      <point x="622" y="1581" type="curve" name="dv04" smooth="yes"/>
+      <point x="622" y="1581" type="curve" smooth="yes" name="dv04"/>
       <point x="651" y="1581"/>
       <point x="676" y="1576"/>
       <point x="698" y="1566" type="curve" smooth="yes"/>
@@ -52,13 +52,13 @@
       <point x="1010" y="1297"/>
     </contour>
     <contour>
-      <point x="510" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="510" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="387" y="-29"/>
       <point x="287" y="4"/>
       <point x="218" y="80" type="curve" smooth="yes"/>
       <point x="155" y="148"/>
       <point x="117" y="251"/>
-      <point x="117" y="396" type="curve" name="sh03" smooth="yes"/>
+      <point x="117" y="396" type="curve" smooth="yes" name="sh03"/>
       <point x="117" y="483"/>
       <point x="131" y="572"/>
       <point x="158" y="663" type="curve" smooth="yes"/>
@@ -70,13 +70,13 @@
       <point x="464" y="1087" type="curve" smooth="yes"/>
       <point x="539" y="1127"/>
       <point x="623" y="1147"/>
-      <point x="717" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="717" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="838" y="1147"/>
       <point x="941" y="1113"/>
       <point x="1012" y="1040" type="curve" smooth="yes"/>
       <point x="1080" y="969"/>
       <point x="1114" y="864"/>
-      <point x="1114" y="726" type="curve" name="sh01" smooth="yes"/>
+      <point x="1114" y="726" type="curve" smooth="yes" name="sh01"/>
       <point x="1114" y="636"/>
       <point x="1100" y="545"/>
       <point x="1073" y="453" type="curve" smooth="yes"/>
@@ -87,25 +87,25 @@
       <point x="702" y="-29"/>
     </contour>
     <contour>
-      <point x="533" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="533" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="649" y="127"/>
       <point x="744" y="190"/>
       <point x="812" y="298" type="curve" smooth="yes"/>
       <point x="884" y="409"/>
       <point x="920" y="567"/>
-      <point x="920" y="718" type="curve" name="ah01" smooth="yes"/>
+      <point x="920" y="718" type="curve" smooth="yes" name="ah01"/>
       <point x="920" y="814"/>
       <point x="905" y="880"/>
       <point x="864" y="927" type="curve" smooth="yes"/>
       <point x="824" y="972"/>
       <point x="767" y="991"/>
-      <point x="702" y="991" type="curve" name="sv02" smooth="yes"/>
+      <point x="702" y="991" type="curve" smooth="yes" name="sv02"/>
       <point x="582" y="991"/>
       <point x="490" y="928"/>
       <point x="422" y="820" type="curve" smooth="yes"/>
       <point x="355" y="715"/>
       <point x="313" y="563"/>
-      <point x="313" y="402" type="curve" name="sh04" smooth="yes"/>
+      <point x="313" y="402" type="curve" smooth="yes" name="sh04"/>
       <point x="313" y="306"/>
       <point x="328" y="238"/>
       <point x="369" y="191" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/p.glif b/source/Hack-Italic.ufo/glyphs/p.glif
index bd11da2a4..4c1a3f216 100644
--- a/source/Hack-Italic.ufo/glyphs/p.glif
+++ b/source/Hack-Italic.ufo/glyphs/p.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="p" format="1">
+<glyph name="p" format="2">
   <advance width="1233"/>
   <unicode hex="0070"/>
   <outline>
@@ -38,9 +38,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/paragraph.glif b/source/Hack-Italic.ufo/glyphs/paragraph.glif
index 49421c4d5..71ccf4444 100644
--- a/source/Hack-Italic.ufo/glyphs/paragraph.glif
+++ b/source/Hack-Italic.ufo/glyphs/paragraph.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="paragraph" format="1">
+<glyph name="paragraph" format="2">
   <advance width="1233"/>
   <unicode hex="00B6"/>
   <outline>
@@ -16,7 +16,7 @@
       <point x="298" y="1353" type="curve" smooth="yes"/>
       <point x="413" y="1446"/>
       <point x="559" y="1493"/>
-      <point x="735" y="1493" type="curve" name="at01" smooth="yes"/>
+      <point x="735" y="1493" type="curve" smooth="yes" name="at01"/>
       <point x="1141" y="1493" type="line"/>
       <point x="813" y="-197" type="line" name="av01"/>
       <point x="674" y="-197" type="line"/>
diff --git a/source/Hack-Italic.ufo/glyphs/parenleft.glif b/source/Hack-Italic.ufo/glyphs/parenleft.glif
index 6664e4908..7bfc688f5 100644
--- a/source/Hack-Italic.ufo/glyphs/parenleft.glif
+++ b/source/Hack-Italic.ufo/glyphs/parenleft.glif
@@ -1,38 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="parenleft" format="1">
+<glyph name="parenleft" format="2">
   <advance width="1233"/>
   <unicode hex="0028"/>
   <outline>
     <contour>
-      <point x="426" y="-270" type="line" name="hr00"/>
-      <point x="319" y="-15"/>
-      <point x="273" y="179"/>
-      <point x="273" y="381" type="curve" name="dh01" smooth="yes"/>
-      <point x="273" y="576"/>
-      <point x="315" y="777"/>
-      <point x="402" y="978" type="curve" smooth="yes"/>
-      <point x="486" y="1174"/>
-      <point x="612" y="1366"/>
-      <point x="783" y="1554" type="curve" name="at01"/>
-      <point x="942" y="1554" type="line"/>
-      <point x="785" y="1351"/>
-      <point x="668" y="1156"/>
-      <point x="587" y="948" type="curve" smooth="yes"/>
-      <point x="507" y="744"/>
-      <point x="467" y="541"/>
-      <point x="467" y="340" type="curve" name="dh02" smooth="yes"/>
-      <point x="467" y="235"/>
-      <point x="478" y="142"/>
-      <point x="497" y="43" type="curve" smooth="yes"/>
-      <point x="518" y="-65"/>
-      <point x="546" y="-162"/>
-      <point x="586" y="-270" type="curve" name="av01"/>
+      <point x="798" y="-206" type="line" name="hr00"/>
+      <point x="474" y="-105"/>
+      <point x="284" y="155"/>
+      <point x="284" y="578" type="curve" smooth="yes"/>
+      <point x="284" y="1133"/>
+      <point x="630" y="1560"/>
+      <point x="1100" y="1700" type="curve" name="at01"/>
+      <point x="1077" y="1557" type="line"/>
+      <point x="666" y="1373"/>
+      <point x="456" y="1048"/>
+      <point x="456" y="593" type="curve" smooth="yes"/>
+      <point x="456" y="251"/>
+      <point x="574" y="39"/>
+      <point x="821" y="-63" type="curve" name="av01"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
+      <string>2018-06-05 00:44:29 +0000</string>
     </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/parenright.glif b/source/Hack-Italic.ufo/glyphs/parenright.glif
index 565bc01c3..aece2543a 100644
--- a/source/Hack-Italic.ufo/glyphs/parenright.glif
+++ b/source/Hack-Italic.ufo/glyphs/parenright.glif
@@ -1,41 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="parenright" format="1">
+<glyph name="parenright" format="2">
   <advance width="1233"/>
   <unicode hex="0029"/>
   <outline>
     <contour>
-      <point x="320" y="-270" type="line" name="hr00"/>
-      <point x="478" y="-69"/>
-      <point x="597" y="133"/>
-      <point x="676" y="336" type="curve" smooth="yes"/>
-      <point x="756" y="540"/>
-      <point x="795" y="743"/>
-      <point x="795" y="940" type="curve" name="dh01" smooth="yes"/>
-      <point x="795" y="1039"/>
-      <point x="785" y="1142"/>
-      <point x="766" y="1241" type="curve" smooth="yes"/>
-      <point x="747" y="1338"/>
-      <point x="716" y="1446"/>
-      <point x="676" y="1554" type="curve" name="at01"/>
-      <point x="836" y="1554" type="line"/>
-      <point x="889" y="1427"/>
-      <point x="927" y="1312"/>
-      <point x="952" y="1209" type="curve" smooth="yes"/>
-      <point x="977" y="1104"/>
-      <point x="989" y="1008"/>
-      <point x="989" y="904" type="curve" name="dh02" smooth="yes"/>
-      <point x="989" y="709"/>
-      <point x="947" y="507"/>
-      <point x="860" y="307" type="curve" smooth="yes"/>
-      <point x="772" y="104"/>
-      <point x="647" y="-85"/>
-      <point x="479" y="-270" type="curve" name="av01"/>
+      <point x="508" y="1700" type="line" name="hr00"/>
+      <point x="840" y="1575"/>
+      <point x="1019" y="1335"/>
+      <point x="1019" y="914" type="curve" smooth="yes"/>
+      <point x="1019" y="362"/>
+      <point x="717" y="-48"/>
+      <point x="200" y="-205" type="curve" name="at01"/>
+      <point x="223" y="-62" type="line"/>
+      <point x="594" y="102"/>
+      <point x="765" y="328"/>
+      <point x="829" y="746" type="curve" smooth="yes" name="dh02"/>
+      <point x="841" y="825"/>
+      <point x="847" y="894"/>
+      <point x="847" y="958" type="curve" smooth="yes"/>
+      <point x="847" y="1252"/>
+      <point x="722" y="1459"/>
+      <point x="485" y="1557" type="curve" name="av01"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
+      <string>2018-06-05 00:44:49 +0000</string>
     </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/partialdiff.glif b/source/Hack-Italic.ufo/glyphs/partialdiff.glif
index 66feb3b88..3c297a1b0 100644
--- a/source/Hack-Italic.ufo/glyphs/partialdiff.glif
+++ b/source/Hack-Italic.ufo/glyphs/partialdiff.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="partialdiff" format="1">
+<glyph name="partialdiff" format="2">
   <advance width="1233"/>
   <unicode hex="2202"/>
   <outline>
     <contour>
-      <point x="545" y="-25" type="curve" name="ab01" smooth="yes"/>
+      <point x="545" y="-25" type="curve" smooth="yes" name="ab01"/>
       <point x="449" y="-25"/>
       <point x="358" y="11"/>
       <point x="291" y="82" type="curve" smooth="yes"/>
       <point x="223" y="154"/>
       <point x="190" y="249"/>
-      <point x="190" y="361" type="curve" name="dh01" smooth="yes"/>
+      <point x="190" y="361" type="curve" smooth="yes" name="dh01"/>
       <point x="190" y="477"/>
       <point x="227" y="595"/>
       <point x="300" y="682" type="curve" smooth="yes"/>
       <point x="376" y="771"/>
       <point x="477" y="809"/>
-      <point x="578" y="809" type="curve" name="dv04" smooth="yes"/>
+      <point x="578" y="809" type="curve" smooth="yes" name="dv04"/>
       <point x="641" y="809"/>
       <point x="695" y="794"/>
       <point x="738" y="764" type="curve" smooth="yes"/>
@@ -25,16 +25,16 @@
       <point x="842" y="621" type="curve" name="ih01"/>
       <point x="853" y="680"/>
       <point x="860" y="734"/>
-      <point x="865" y="790" type="curve" name="sh02" smooth="yes"/>
+      <point x="865" y="790" type="curve" smooth="yes" name="sh02"/>
       <point x="870" y="845"/>
       <point x="872" y="900"/>
-      <point x="872" y="939" type="curve" name="sh01" smooth="yes"/>
+      <point x="872" y="939" type="curve" smooth="yes" name="sh01"/>
       <point x="872" y="1027"/>
       <point x="863" y="1094"/>
       <point x="836" y="1141" type="curve" smooth="yes"/>
       <point x="811" y="1185"/>
       <point x="772" y="1206"/>
-      <point x="727" y="1206" type="curve" name="dv01" smooth="yes"/>
+      <point x="727" y="1206" type="curve" smooth="yes" name="dv01"/>
       <point x="683" y="1206"/>
       <point x="651" y="1187"/>
       <point x="600" y="1148" type="curve" smooth="yes"/>
@@ -52,13 +52,13 @@
       <point x="480" y="1277" type="curve"/>
       <point x="524" y="1308"/>
       <point x="586" y="1325"/>
-      <point x="654" y="1325" type="curve" name="dv02" smooth="yes"/>
+      <point x="654" y="1325" type="curve" smooth="yes" name="dv02"/>
       <point x="770" y="1325"/>
       <point x="869" y="1274"/>
       <point x="941" y="1170" type="curve" smooth="yes"/>
       <point x="1009" y="1070"/>
       <point x="1047" y="930"/>
-      <point x="1047" y="746" type="curve" name="dh04" smooth="yes"/>
+      <point x="1047" y="746" type="curve" smooth="yes" name="dh04"/>
       <point x="1047" y="523"/>
       <point x="992" y="331"/>
       <point x="904" y="195" type="curve" smooth="yes"/>
@@ -66,13 +66,13 @@
       <point x="686" y="-25"/>
     </contour>
     <contour>
-      <point x="543" y="31" type="curve" name="sv01" smooth="yes"/>
+      <point x="543" y="31" type="curve" smooth="yes" name="sv01"/>
       <point x="614" y="31"/>
       <point x="676" y="72"/>
-      <point x="723" y="160" type="curve" name="hr01" smooth="yes"/>
+      <point x="723" y="160" type="curve" smooth="yes" name="hr01"/>
       <point x="768" y="244"/>
       <point x="793" y="360"/>
-      <point x="793" y="483" type="curve" name="dh03" smooth="yes"/>
+      <point x="793" y="483" type="curve" smooth="yes" name="dh03"/>
       <point x="793" y="575"/>
       <point x="779" y="632"/>
       <point x="750" y="673" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/percent.glif b/source/Hack-Italic.ufo/glyphs/percent.glif
index 2886f7fe2..7745fce6d 100644
--- a/source/Hack-Italic.ufo/glyphs/percent.glif
+++ b/source/Hack-Italic.ufo/glyphs/percent.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="percent" format="1">
+<glyph name="percent" format="2">
   <advance width="1233"/>
   <unicode hex="0025"/>
   <outline>
     <contour>
-      <point x="351" y="793" type="curve" name="dv05" smooth="yes"/>
+      <point x="351" y="793" type="curve" smooth="yes" name="dv05"/>
       <point x="260" y="793"/>
       <point x="181" y="828"/>
       <point x="125" y="884" type="curve" smooth="yes"/>
       <point x="65" y="944"/>
       <point x="33" y="1024"/>
-      <point x="33" y="1112" type="curve" name="dh01" smooth="yes"/>
+      <point x="33" y="1112" type="curve" smooth="yes" name="dh01"/>
       <point x="33" y="1298"/>
       <point x="171" y="1432"/>
-      <point x="352" y="1432" type="curve" name="dv02" smooth="yes"/>
+      <point x="352" y="1432" type="curve" smooth="yes" name="dv02"/>
       <point x="395" y="1432"/>
       <point x="436" y="1424"/>
       <point x="475" y="1408" type="curve" smooth="yes"/>
@@ -25,7 +25,7 @@
       <point x="648" y="1236" type="curve" smooth="yes"/>
       <point x="664" y="1197"/>
       <point x="672" y="1156"/>
-      <point x="672" y="1113" type="curve" name="dh04" smooth="yes"/>
+      <point x="672" y="1113" type="curve" smooth="yes" name="dh04"/>
       <point x="672" y="1025"/>
       <point x="639" y="944"/>
       <point x="580" y="885" type="curve" smooth="yes"/>
@@ -33,25 +33,25 @@
       <point x="443" y="793"/>
     </contour>
     <contour>
-      <point x="351" y="928" type="curve" name="dv06" smooth="yes"/>
+      <point x="351" y="928" type="curve" smooth="yes" name="dv06"/>
       <point x="400" y="928"/>
       <point x="447" y="946"/>
       <point x="483" y="981" type="curve" smooth="yes"/>
       <point x="514" y="1012"/>
       <point x="537" y="1057"/>
-      <point x="537" y="1113" type="curve" name="dh03" smooth="yes"/>
+      <point x="537" y="1113" type="curve" smooth="yes" name="dh03"/>
       <point x="537" y="1164"/>
       <point x="519" y="1207"/>
       <point x="483" y="1243" type="curve" smooth="yes"/>
       <point x="446" y="1278"/>
       <point x="403" y="1296"/>
-      <point x="353" y="1296" type="curve" name="dv01" smooth="yes"/>
+      <point x="353" y="1296" type="curve" smooth="yes" name="dv01"/>
       <point x="302" y="1296"/>
       <point x="258" y="1279"/>
       <point x="222" y="1244" type="curve" smooth="yes"/>
       <point x="189" y="1212"/>
       <point x="168" y="1165"/>
-      <point x="168" y="1112" type="curve" name="dh02" smooth="yes"/>
+      <point x="168" y="1112" type="curve" smooth="yes" name="dh02"/>
       <point x="168" y="1059"/>
       <point x="186" y="1015"/>
       <point x="221" y="980" type="curve" smooth="yes"/>
@@ -65,16 +65,16 @@
       <point x="42" y="453" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="879" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="879" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="788" y="0"/>
       <point x="712" y="31"/>
       <point x="651" y="92" type="curve" smooth="yes"/>
       <point x="591" y="153"/>
       <point x="561" y="231"/>
-      <point x="561" y="318" type="curve" name="ih02" smooth="yes"/>
+      <point x="561" y="318" type="curve" smooth="yes" name="ih02"/>
       <point x="561" y="505"/>
       <point x="699" y="639"/>
-      <point x="879" y="639" type="curve" name="dv04" smooth="yes"/>
+      <point x="879" y="639" type="curve" smooth="yes" name="dv04"/>
       <point x="923" y="639"/>
       <point x="962" y="631"/>
       <point x="1001" y="615" type="curve" smooth="yes"/>
@@ -86,7 +86,7 @@
       <point x="1175" y="440" type="curve" smooth="yes"/>
       <point x="1192" y="402"/>
       <point x="1200" y="362"/>
-      <point x="1200" y="319" type="curve" name="hr01" smooth="yes"/>
+      <point x="1200" y="319" type="curve" smooth="yes" name="hr01"/>
       <point x="1200" y="235"/>
       <point x="1171" y="156"/>
       <point x="1107" y="92" type="curve" smooth="yes"/>
@@ -94,19 +94,19 @@
       <point x="967" y="0"/>
     </contour>
     <contour>
-      <point x="879" y="135" type="curve" name="sv01" smooth="yes"/>
+      <point x="879" y="135" type="curve" smooth="yes" name="sv01"/>
       <point x="930" y="135"/>
       <point x="974" y="153"/>
       <point x="1010" y="189" type="curve" smooth="yes"/>
       <point x="1045" y="224"/>
       <point x="1063" y="268"/>
-      <point x="1063" y="319" type="curve" name="dh05" smooth="yes"/>
+      <point x="1063" y="319" type="curve" smooth="yes" name="dh05"/>
       <point x="1063" y="422"/>
       <point x="980" y="504"/>
-      <point x="879" y="504" type="curve" name="dv03" smooth="yes"/>
+      <point x="879" y="504" type="curve" smooth="yes" name="dv03"/>
       <point x="776" y="504"/>
       <point x="696" y="424"/>
-      <point x="696" y="319" type="curve" name="sh03" smooth="yes"/>
+      <point x="696" y="319" type="curve" smooth="yes" name="sh03"/>
       <point x="696" y="215"/>
       <point x="776" y="135"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/period.glif b/source/Hack-Italic.ufo/glyphs/period.glif
index ac5398460..12407b08e 100644
--- a/source/Hack-Italic.ufo/glyphs/period.glif
+++ b/source/Hack-Italic.ufo/glyphs/period.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="period" format="1">
+<glyph name="period" format="2">
   <advance width="1233"/>
   <unicode hex="002E"/>
   <outline>
     <contour>
-      <point x="613" y="-27" type="curve" name="hr00" smooth="yes"/>
+      <point x="613" y="-27" type="curve" smooth="yes" name="hr00"/>
       <point x="522" y="-27"/>
       <point x="451" y="42"/>
-      <point x="451" y="142" type="curve" name="dh01" smooth="yes"/>
+      <point x="451" y="142" type="curve" smooth="yes" name="dh01"/>
       <point x="451" y="242"/>
       <point x="522" y="311"/>
-      <point x="613" y="311" type="curve" name="sv01" smooth="yes"/>
+      <point x="613" y="311" type="curve" smooth="yes" name="sv01"/>
       <point x="704" y="311"/>
       <point x="775" y="242"/>
-      <point x="775" y="142" type="curve" name="dh02" smooth="yes"/>
+      <point x="775" y="142" type="curve" smooth="yes" name="dh02"/>
       <point x="775" y="42"/>
       <point x="704" y="-27"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/periodcentered.glif b/source/Hack-Italic.ufo/glyphs/periodcentered.glif
index 6468628af..c9fd415fa 100644
--- a/source/Hack-Italic.ufo/glyphs/periodcentered.glif
+++ b/source/Hack-Italic.ufo/glyphs/periodcentered.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="periodcentered" format="1">
+<glyph name="periodcentered" format="2">
   <advance width="1233"/>
   <unicode hex="00B7"/>
   <outline>
     <contour>
-      <point x="616" y="576" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="576" type="curve" smooth="yes" name="hr00"/>
       <point x="525" y="576"/>
       <point x="454" y="645"/>
       <point x="454" y="745" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/perthousand.glif b/source/Hack-Italic.ufo/glyphs/perthousand.glif
index 6e258a594..6d64d48c3 100644
--- a/source/Hack-Italic.ufo/glyphs/perthousand.glif
+++ b/source/Hack-Italic.ufo/glyphs/perthousand.glif
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="perthousand" format="1">
+<glyph name="perthousand" format="2">
   <advance width="1233"/>
   <unicode hex="2030"/>
   <outline>
     <contour>
-      <point x="287" y="856" type="curve" name="dv05" smooth="yes"/>
+      <point x="287" y="856" type="curve" smooth="yes" name="dv05"/>
       <point x="203" y="856"/>
       <point x="133" y="888"/>
       <point x="82" y="940" type="curve" smooth="yes"/>
       <point x="27" y="996"/>
       <point x="0" y="1067"/>
-      <point x="0" y="1144" type="curve" name="dh01" smooth="yes"/>
+      <point x="0" y="1144" type="curve" smooth="yes" name="dh01"/>
       <point x="0" y="1225"/>
       <point x="31" y="1298"/>
       <point x="83" y="1350" type="curve" smooth="yes"/>
       <point x="134" y="1401"/>
       <point x="206" y="1432"/>
-      <point x="286" y="1432" type="curve" name="dv02" smooth="yes"/>
+      <point x="286" y="1432" type="curve" smooth="yes" name="dv02"/>
       <point x="363" y="1432"/>
       <point x="435" y="1405"/>
       <point x="490" y="1350" type="curve" smooth="yes"/>
       <point x="538" y="1302"/>
       <point x="573" y="1231"/>
-      <point x="573" y="1144" type="curve" name="dh04" smooth="yes"/>
+      <point x="573" y="1144" type="curve" smooth="yes" name="dh04"/>
       <point x="573" y="984"/>
       <point x="449" y="856"/>
     </contour>
     <contour>
-      <point x="287" y="979" type="curve" name="dv06" smooth="yes"/>
+      <point x="287" y="979" type="curve" smooth="yes" name="dv06"/>
       <point x="333" y="979"/>
       <point x="372" y="995"/>
       <point x="405" y="1028" type="curve" smooth="yes"/>
       <point x="437" y="1060"/>
       <point x="453" y="1099"/>
-      <point x="453" y="1145" type="curve" name="dh03" smooth="yes"/>
+      <point x="453" y="1145" type="curve" smooth="yes" name="dh03"/>
       <point x="453" y="1236"/>
       <point x="378" y="1311"/>
-      <point x="287" y="1311" type="curve" name="dv01" smooth="yes"/>
+      <point x="287" y="1311" type="curve" smooth="yes" name="dv01"/>
       <point x="241" y="1311"/>
       <point x="202" y="1295"/>
       <point x="170" y="1263" type="curve" smooth="yes"/>
       <point x="137" y="1230"/>
       <point x="121" y="1191"/>
-      <point x="121" y="1145" type="curve" name="dh02" smooth="yes"/>
+      <point x="121" y="1145" type="curve" smooth="yes" name="dh02"/>
       <point x="121" y="1052"/>
       <point x="194" y="979"/>
     </contour>
@@ -53,25 +53,25 @@
       <point x="72" y="567" type="line"/>
     </contour>
     <contour>
-      <point x="329" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="329" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="246" y="0"/>
       <point x="175" y="32"/>
       <point x="126" y="83" type="curve" smooth="yes"/>
       <point x="71" y="139"/>
       <point x="45" y="210"/>
-      <point x="45" y="289" type="curve" name="ih01" smooth="yes"/>
+      <point x="45" y="289" type="curve" smooth="yes" name="ih01"/>
       <point x="45" y="369"/>
       <point x="72" y="438"/>
       <point x="128" y="494" type="curve" smooth="yes"/>
       <point x="184" y="549"/>
       <point x="253" y="575"/>
-      <point x="329" y="575" type="curve" name="dv04" smooth="yes"/>
+      <point x="329" y="575" type="curve" smooth="yes" name="dv04"/>
       <point x="413" y="575"/>
       <point x="484" y="542"/>
       <point x="533" y="493" type="curve" smooth="yes"/>
       <point x="588" y="438"/>
       <point x="616" y="368"/>
-      <point x="616" y="289" type="curve" name="sh01" smooth="yes"/>
+      <point x="616" y="289" type="curve" smooth="yes" name="sh01"/>
       <point x="616" y="210"/>
       <point x="587" y="139"/>
       <point x="534" y="84" type="curve" smooth="yes"/>
@@ -79,25 +79,25 @@
       <point x="412" y="0"/>
     </contour>
     <contour>
-      <point x="946" y="0" type="curve" name="ab02" smooth="yes"/>
+      <point x="946" y="0" type="curve" smooth="yes" name="ab02"/>
       <point x="867" y="0"/>
       <point x="795" y="29"/>
       <point x="742" y="82" type="curve" smooth="yes"/>
       <point x="691" y="133"/>
       <point x="659" y="206"/>
-      <point x="659" y="289" type="curve" name="dh05" smooth="yes"/>
+      <point x="659" y="289" type="curve" smooth="yes" name="dh05"/>
       <point x="659" y="373"/>
       <point x="692" y="443"/>
       <point x="741" y="492" type="curve" smooth="yes"/>
       <point x="796" y="547"/>
       <point x="866" y="575"/>
-      <point x="945" y="575" type="curve" name="sv01" smooth="yes"/>
+      <point x="945" y="575" type="curve" smooth="yes" name="sv01"/>
       <point x="1028" y="575"/>
       <point x="1100" y="543"/>
       <point x="1151" y="492" type="curve" smooth="yes"/>
       <point x="1206" y="437"/>
       <point x="1233" y="365"/>
-      <point x="1233" y="289" type="curve" name="dh08" smooth="yes"/>
+      <point x="1233" y="289" type="curve" smooth="yes" name="dh08"/>
       <point x="1233" y="210"/>
       <point x="1204" y="139"/>
       <point x="1151" y="84" type="curve" smooth="yes"/>
@@ -105,22 +105,22 @@
       <point x="1027" y="0"/>
     </contour>
     <contour>
-      <point x="329" y="121" type="curve" name="sv02" smooth="yes"/>
+      <point x="329" y="121" type="curve" smooth="yes" name="sv02"/>
       <point x="422" y="121"/>
       <point x="496" y="195"/>
-      <point x="496" y="288" type="curve" name="ih02" smooth="yes"/>
+      <point x="496" y="288" type="curve" smooth="yes" name="ih02"/>
       <point x="496" y="332"/>
       <point x="479" y="375"/>
       <point x="447" y="407" type="curve" smooth="yes"/>
       <point x="420" y="434"/>
       <point x="378" y="455"/>
-      <point x="329" y="455" type="curve" name="dv03" smooth="yes"/>
+      <point x="329" y="455" type="curve" smooth="yes" name="dv03"/>
       <point x="286" y="455"/>
       <point x="245" y="439"/>
       <point x="214" y="408" type="curve" smooth="yes"/>
       <point x="187" y="381"/>
       <point x="166" y="339"/>
-      <point x="166" y="288" type="curve" name="hr01" smooth="yes"/>
+      <point x="166" y="288" type="curve" smooth="yes" name="hr01"/>
       <point x="166" y="241"/>
       <point x="184" y="201"/>
       <point x="213" y="170" type="curve" smooth="yes"/>
@@ -128,25 +128,25 @@
       <point x="284" y="121"/>
     </contour>
     <contour>
-      <point x="946" y="121" type="curve" name="sv03" smooth="yes"/>
+      <point x="946" y="121" type="curve" smooth="yes" name="sv03"/>
       <point x="993" y="121"/>
       <point x="1032" y="137"/>
       <point x="1064" y="170" type="curve" smooth="yes"/>
       <point x="1099" y="205"/>
       <point x="1112" y="244"/>
-      <point x="1112" y="288" type="curve" name="dh07" smooth="yes"/>
+      <point x="1112" y="288" type="curve" smooth="yes" name="dh07"/>
       <point x="1112" y="333"/>
       <point x="1098" y="371"/>
       <point x="1063" y="406" type="curve" smooth="yes"/>
       <point x="1030" y="439"/>
       <point x="991" y="455"/>
-      <point x="946" y="455" type="curve" name="sv04" smooth="yes"/>
+      <point x="946" y="455" type="curve" smooth="yes" name="sv04"/>
       <point x="900" y="455"/>
       <point x="861" y="439"/>
       <point x="829" y="407" type="curve" smooth="yes"/>
       <point x="796" y="374"/>
       <point x="780" y="335"/>
-      <point x="780" y="288" type="curve" name="dh06" smooth="yes"/>
+      <point x="780" y="288" type="curve" smooth="yes" name="dh06"/>
       <point x="780" y="244"/>
       <point x="794" y="205"/>
       <point x="829" y="170" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/peseta.glif b/source/Hack-Italic.ufo/glyphs/peseta.glif
index 77a321a54..e0092f035 100644
--- a/source/Hack-Italic.ufo/glyphs/peseta.glif
+++ b/source/Hack-Italic.ufo/glyphs/peseta.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="peseta" format="1">
+<glyph name="peseta" format="2">
   <advance width="1233"/>
   <unicode hex="20A7"/>
   <outline>
     <contour>
-      <point x="928" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="928" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="901" y="-29"/>
       <point x="871" y="-23"/>
-      <point x="839" y="-12" type="curve" name="ab01" smooth="yes"/>
+      <point x="839" y="-12" type="curve" smooth="yes" name="ab01"/>
       <point x="824" y="-7"/>
       <point x="806" y="2"/>
       <point x="799" y="5" type="curve"/>
@@ -18,12 +18,12 @@
       <point x="555" y="258" type="curve" smooth="yes"/>
       <point x="555" y="291"/>
       <point x="557" y="325"/>
-      <point x="561" y="369" type="curve" name="sh01" smooth="yes"/>
+      <point x="561" y="369" type="curve" smooth="yes" name="sh01"/>
       <point x="619" y="977" type="line"/>
       <point x="568" y="977" type="line" name="sh02"/>
       <point x="547" y="782"/>
       <point x="468" y="600"/>
-      <point x="283" y="600" type="curve" name="dv03" smooth="yes"/>
+      <point x="283" y="600" type="curve" smooth="yes" name="dv03"/>
       <point x="160" y="600" type="line"/>
       <point x="103" y="0" type="line" name="ab03"/>
       <point x="5" y="0" type="line"/>
@@ -40,17 +40,17 @@
       <point x="895" y="1073" type="line" name="iv01"/>
       <point x="936" y="1122"/>
       <point x="989" y="1147"/>
-      <point x="1052" y="1147" type="curve" name="at03" smooth="yes"/>
+      <point x="1052" y="1147" type="curve" smooth="yes" name="at03"/>
       <point x="1110" y="1147"/>
       <point x="1166" y="1127"/>
       <point x="1219" y="1087" type="curve"/>
       <point x="1202" y="913" type="line" name="iv02"/>
       <point x="1155" y="966"/>
       <point x="1103" y="993"/>
-      <point x="1046" y="993" type="curve" name="sv01" smooth="yes"/>
+      <point x="1046" y="993" type="curve" smooth="yes" name="sv01"/>
       <point x="953" y="993"/>
       <point x="895" y="920"/>
-      <point x="895" y="813" type="curve" name="dh04" smooth="yes"/>
+      <point x="895" y="813" type="curve" smooth="yes" name="dh04"/>
       <point x="895" y="727"/>
       <point x="932" y="697"/>
       <point x="990" y="657" type="curve" smooth="yes"/>
@@ -60,26 +60,26 @@
       <point x="1029" y="633" type="line"/>
       <point x="1148" y="564"/>
       <point x="1178" y="503"/>
-      <point x="1178" y="373" type="curve" name="hr02" smooth="yes"/>
+      <point x="1178" y="373" type="curve" smooth="yes" name="hr02"/>
       <point x="1178" y="136"/>
       <point x="1077" y="-29"/>
     </contour>
     <contour>
-      <point x="299" y="766" type="line" name="dv04" smooth="yes"/>
+      <point x="299" y="766" type="line" smooth="yes" name="dv04"/>
       <point x="411" y="766"/>
       <point x="472" y="894"/>
-      <point x="472" y="1090" type="curve" name="dh01" smooth="yes"/>
+      <point x="472" y="1090" type="curve" smooth="yes" name="dh01"/>
       <point x="472" y="1255"/>
       <point x="429" y="1327"/>
-      <point x="357" y="1327" type="curve" name="sv02" smooth="yes"/>
+      <point x="357" y="1327" type="curve" smooth="yes" name="sv02"/>
       <point x="229" y="1327" type="line"/>
       <point x="176" y="766" type="line"/>
     </contour>
     <contour>
-      <point x="938" y="125" type="curve" name="dv02" smooth="yes"/>
+      <point x="938" y="125" type="curve" smooth="yes" name="dv02"/>
       <point x="1029" y="125"/>
       <point x="1087" y="217"/>
-      <point x="1087" y="320" type="curve" name="dh05" smooth="yes"/>
+      <point x="1087" y="320" type="curve" smooth="yes" name="dh05"/>
       <point x="1087" y="400"/>
       <point x="1052" y="444"/>
       <point x="979" y="485" type="curve" smooth="yes"/>
@@ -87,15 +87,15 @@
       <point x="939" y="506" type="line" smooth="yes"/>
       <point x="843" y="555"/>
       <point x="808" y="637"/>
-      <point x="808" y="766" type="curve" name="dh03" smooth="yes"/>
+      <point x="808" y="766" type="curve" smooth="yes" name="dh03"/>
       <point x="808" y="830"/>
       <point x="817" y="913"/>
       <point x="842" y="977" type="curve" name="ih01"/>
       <point x="708" y="977" type="line"/>
-      <point x="651" y="369" type="line" name="sh05" smooth="yes"/>
+      <point x="651" y="369" type="line" smooth="yes" name="sh05"/>
       <point x="647" y="324"/>
       <point x="645" y="297"/>
-      <point x="645" y="274" type="curve" name="hr03" smooth="yes"/>
+      <point x="645" y="274" type="curve" smooth="yes" name="hr03"/>
       <point x="645" y="191"/>
       <point x="670" y="154"/>
       <point x="723" y="154" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/phi.glif b/source/Hack-Italic.ufo/glyphs/phi.glif
index bf2ff4a3c..4e04bafa1 100644
--- a/source/Hack-Italic.ufo/glyphs/phi.glif
+++ b/source/Hack-Italic.ufo/glyphs/phi.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="phi" format="1">
+<glyph name="phi" format="2">
   <advance width="1233"/>
   <unicode hex="03C6"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="422" y="-25" type="line" name="ab01"/>
       <point x="201" y="-25"/>
       <point x="69" y="121"/>
-      <point x="69" y="384" type="curve" name="sh01" smooth="yes"/>
+      <point x="69" y="384" type="curve" smooth="yes" name="sh01"/>
       <point x="69" y="436"/>
       <point x="75" y="494"/>
       <point x="86" y="559" type="curve" smooth="yes"/>
@@ -20,7 +20,7 @@
       <point x="416" y="864" type="curve" smooth="yes"/>
       <point x="320" y="749"/>
       <point x="263" y="559"/>
-      <point x="263" y="405" type="curve" name="sh03" smooth="yes"/>
+      <point x="263" y="405" type="curve" smooth="yes" name="sh03"/>
       <point x="263" y="341"/>
       <point x="273" y="285"/>
       <point x="294" y="242" type="curve" smooth="yes"/>
@@ -30,10 +30,10 @@
       <point x="587" y="826" type="line" smooth="yes"/>
       <point x="626" y="1027"/>
       <point x="733" y="1128"/>
-      <point x="885" y="1128" type="curve" name="at01" smooth="yes"/>
+      <point x="885" y="1128" type="curve" smooth="yes" name="at01"/>
       <point x="1061" y="1128"/>
       <point x="1187" y="991"/>
-      <point x="1187" y="741" type="curve" name="sh02" smooth="yes"/>
+      <point x="1187" y="741" type="curve" smooth="yes" name="sh02"/>
       <point x="1187" y="685"/>
       <point x="1181" y="627"/>
       <point x="1168" y="560" type="curve" smooth="yes"/>
@@ -50,16 +50,16 @@
       <point x="974" y="560" type="curve" smooth="yes"/>
       <point x="986" y="620"/>
       <point x="991" y="671"/>
-      <point x="991" y="718" type="curve" name="ah01" smooth="yes"/>
+      <point x="991" y="718" type="curve" smooth="yes" name="ah01"/>
       <point x="991" y="786"/>
       <point x="979" y="837"/>
       <point x="959" y="880" type="curve" smooth="yes"/>
       <point x="931" y="939"/>
       <point x="890" y="971"/>
-      <point x="859" y="971" type="curve" name="sv02" smooth="yes"/>
+      <point x="859" y="971" type="curve" smooth="yes" name="sv02"/>
       <point x="824" y="971"/>
       <point x="789" y="925"/>
-      <point x="770" y="826" type="curve" name="hr02" smooth="yes"/>
+      <point x="770" y="826" type="curve" smooth="yes" name="hr02"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Italic.ufo/glyphs/pi.glif b/source/Hack-Italic.ufo/glyphs/pi.glif
index 49829c76f..2fc647d80 100644
--- a/source/Hack-Italic.ufo/glyphs/pi.glif
+++ b/source/Hack-Italic.ufo/glyphs/pi.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="pi" format="1">
+<glyph name="pi" format="2">
   <advance width="1233"/>
   <unicode hex="03C0"/>
   <outline>
     <contour>
-      <point x="1027" y="-39" type="curve" name="av01" smooth="yes"/>
+      <point x="1027" y="-39" type="curve" smooth="yes" name="av01"/>
       <point x="951" y="-39"/>
       <point x="898" y="-17"/>
       <point x="867" y="27" type="curve" smooth="yes"/>
       <point x="836" y="70"/>
       <point x="821" y="144"/>
-      <point x="821" y="268" type="curve" name="dh03" smooth="yes"/>
+      <point x="821" y="268" type="curve" smooth="yes" name="dh03"/>
       <point x="821" y="952" type="line" name="sv01"/>
       <point x="393" y="952" type="line"/>
       <point x="393" y="0" type="line" name="dh02"/>
@@ -21,7 +21,7 @@
       <point x="1143" y="1100" type="line" name="dv02"/>
       <point x="1143" y="952" type="line" name="dv01"/>
       <point x="1002" y="952" type="line"/>
-      <point x="1002" y="248" type="line" name="dh04" smooth="yes"/>
+      <point x="1002" y="248" type="line" smooth="yes" name="dh04"/>
       <point x="1002" y="201"/>
       <point x="1008" y="168"/>
       <point x="1027" y="145" type="curve" smooth="yes"/>
@@ -37,7 +37,7 @@
       <point x="1172" y="-14" type="line" name="ab01"/>
       <point x="1151" y="-23"/>
       <point x="1127" y="-29"/>
-      <point x="1100" y="-33" type="curve" name="av02" smooth="yes"/>
+      <point x="1100" y="-33" type="curve" smooth="yes" name="av02"/>
       <point x="1075" y="-37"/>
       <point x="1050" y="-39"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/plus.glif b/source/Hack-Italic.ufo/glyphs/plus.glif
index 2a463ade1..6a3378ff5 100644
--- a/source/Hack-Italic.ufo/glyphs/plus.glif
+++ b/source/Hack-Italic.ufo/glyphs/plus.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="plus" format="1">
+<glyph name="plus" format="2">
   <advance width="1233"/>
   <unicode hex="002B"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/plusminus.glif b/source/Hack-Italic.ufo/glyphs/plusminus.glif
index d5ac0b452..92c518908 100644
--- a/source/Hack-Italic.ufo/glyphs/plusminus.glif
+++ b/source/Hack-Italic.ufo/glyphs/plusminus.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="plusminus" format="1">
+<glyph name="plusminus" format="2">
   <advance width="1233"/>
   <unicode hex="00B1"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/product.glif b/source/Hack-Italic.ufo/glyphs/product.glif
index 2a263063f..8fd878f16 100644
--- a/source/Hack-Italic.ufo/glyphs/product.glif
+++ b/source/Hack-Italic.ufo/glyphs/product.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="product" format="1">
+<glyph name="product" format="2">
   <advance width="1233"/>
   <unicode hex="220F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/propersubset.glif b/source/Hack-Italic.ufo/glyphs/propersubset.glif
index 2a455601e..a1741e6d8 100644
--- a/source/Hack-Italic.ufo/glyphs/propersubset.glif
+++ b/source/Hack-Italic.ufo/glyphs/propersubset.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="propersubset" format="1">
+<glyph name="propersubset" format="2">
   <advance width="1233"/>
   <unicode hex="2282"/>
   <outline>
     <contour>
-      <point x="566" y="163" type="line" name="hr00" smooth="yes"/>
+      <point x="566" y="163" type="line" smooth="yes" name="hr00"/>
       <point x="298" y="163"/>
       <point x="88" y="375"/>
-      <point x="88" y="641" type="curve" name="dh01" smooth="yes"/>
+      <point x="88" y="641" type="curve" smooth="yes" name="dh01"/>
       <point x="88" y="906"/>
       <point x="298" y="1119"/>
-      <point x="565" y="1119" type="curve" name="at01" smooth="yes"/>
+      <point x="565" y="1119" type="curve" smooth="yes" name="at01"/>
       <point x="1145" y="1119" type="line"/>
       <point x="1145" y="969" type="line" name="sv01"/>
       <point x="565" y="969" type="line" smooth="yes"/>
       <point x="382" y="969"/>
       <point x="238" y="821"/>
-      <point x="238" y="640" type="curve" name="dh02" smooth="yes"/>
+      <point x="238" y="640" type="curve" smooth="yes" name="dh02"/>
       <point x="238" y="457"/>
       <point x="384" y="313"/>
-      <point x="565" y="313" type="curve" name="dv01" smooth="yes"/>
+      <point x="565" y="313" type="curve" smooth="yes" name="dv01"/>
       <point x="1145" y="313" type="line"/>
       <point x="1145" y="163" type="line" name="sv02"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/propersuperset.glif b/source/Hack-Italic.ufo/glyphs/propersuperset.glif
index fc75a3015..a2f81ac1a 100644
--- a/source/Hack-Italic.ufo/glyphs/propersuperset.glif
+++ b/source/Hack-Italic.ufo/glyphs/propersuperset.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="propersuperset" format="1">
+<glyph name="propersuperset" format="2">
   <advance width="1233"/>
   <unicode hex="2283"/>
   <outline>
     <contour>
       <point x="88" y="313" type="line" name="hr00"/>
-      <point x="668" y="313" type="line" name="dv02" smooth="yes"/>
+      <point x="668" y="313" type="line" smooth="yes" name="dv02"/>
       <point x="849" y="313"/>
       <point x="995" y="457"/>
-      <point x="995" y="640" type="curve" name="dh01" smooth="yes"/>
+      <point x="995" y="640" type="curve" smooth="yes" name="dh01"/>
       <point x="995" y="821"/>
       <point x="851" y="969"/>
-      <point x="668" y="969" type="curve" name="sv01" smooth="yes"/>
+      <point x="668" y="969" type="curve" smooth="yes" name="sv01"/>
       <point x="88" y="969" type="line"/>
       <point x="88" y="1119" type="line" name="at01"/>
       <point x="668" y="1119" type="line" smooth="yes"/>
       <point x="935" y="1119"/>
       <point x="1145" y="906"/>
-      <point x="1145" y="641" type="curve" name="dh02" smooth="yes"/>
+      <point x="1145" y="641" type="curve" smooth="yes" name="dh02"/>
       <point x="1145" y="375"/>
       <point x="935" y="163"/>
-      <point x="667" y="163" type="curve" name="dv01" smooth="yes"/>
+      <point x="667" y="163" type="curve" smooth="yes" name="dv01"/>
       <point x="88" y="163" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/proportional.glif b/source/Hack-Italic.ufo/glyphs/proportional.glif
index fc7946c30..3e2b9ee92 100644
--- a/source/Hack-Italic.ufo/glyphs/proportional.glif
+++ b/source/Hack-Italic.ufo/glyphs/proportional.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="proportional" format="1">
+<glyph name="proportional" format="2">
   <advance width="1233"/>
   <unicode hex="221D"/>
   <outline>
     <contour>
-      <point x="479" y="250" type="curve" name="hr00" smooth="yes"/>
+      <point x="479" y="250" type="curve" smooth="yes" name="hr00"/>
       <point x="310" y="250"/>
       <point x="186" y="405"/>
-      <point x="186" y="636" type="curve" name="dh01" smooth="yes"/>
+      <point x="186" y="636" type="curve" smooth="yes" name="dh01"/>
       <point x="186" y="857"/>
       <point x="300" y="1008"/>
-      <point x="477" y="1008" type="curve" name="sv01" smooth="yes"/>
+      <point x="477" y="1008" type="curve" smooth="yes" name="sv01"/>
       <point x="600" y="1008"/>
       <point x="687" y="936"/>
       <point x="762" y="764" type="curve"/>
@@ -35,7 +35,7 @@
       <point x="595" y="250"/>
     </contour>
     <contour>
-      <point x="465" y="391" type="curve" name="dv01" smooth="yes"/>
+      <point x="465" y="391" type="curve" smooth="yes" name="dv01"/>
       <point x="557" y="391"/>
       <point x="625" y="476"/>
       <point x="682" y="635" type="curve"/>
@@ -44,10 +44,10 @@
       <point x="580" y="819" type="curve" smooth="yes"/>
       <point x="549" y="852"/>
       <point x="514" y="868"/>
-      <point x="474" y="868" type="curve" name="sv04" smooth="yes"/>
+      <point x="474" y="868" type="curve" smooth="yes" name="sv04"/>
       <point x="378" y="868"/>
       <point x="312" y="773"/>
-      <point x="312" y="624" type="curve" name="dh02" smooth="yes"/>
+      <point x="312" y="624" type="curve" smooth="yes" name="dh02"/>
       <point x="312" y="484"/>
       <point x="371" y="391"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/psi.glif b/source/Hack-Italic.ufo/glyphs/psi.glif
index 89c01f25f..d3e233a03 100644
--- a/source/Hack-Italic.ufo/glyphs/psi.glif
+++ b/source/Hack-Italic.ufo/glyphs/psi.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="psi" format="1">
+<glyph name="psi" format="2">
   <advance width="1233"/>
   <unicode hex="03C8"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="413" y="-25" type="line" name="hr00"/>
       <point x="248" y="-25"/>
       <point x="104" y="131"/>
-      <point x="104" y="359" type="curve" name="dh01" smooth="yes"/>
+      <point x="104" y="359" type="curve" smooth="yes" name="dh01"/>
       <point x="104" y="395"/>
       <point x="107" y="433"/>
       <point x="115" y="472" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="302" y="479" type="line"/>
       <point x="295" y="440"/>
       <point x="291" y="407"/>
-      <point x="291" y="376" type="curve" name="dh02" smooth="yes"/>
+      <point x="291" y="376" type="curve" smooth="yes" name="dh02"/>
       <point x="291" y="317"/>
       <point x="306" y="267"/>
       <point x="336" y="226" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/q.glif b/source/Hack-Italic.ufo/glyphs/q.glif
index 7d9d54bd1..0c23fb315 100644
--- a/source/Hack-Italic.ufo/glyphs/q.glif
+++ b/source/Hack-Italic.ufo/glyphs/q.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="q" format="1">
+<glyph name="q" format="2">
   <advance width="1233"/>
   <unicode hex="0071"/>
   <outline>
@@ -41,9 +41,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/question.glif b/source/Hack-Italic.ufo/glyphs/question.glif
index 43011f005..a9600b263 100644
--- a/source/Hack-Italic.ufo/glyphs/question.glif
+++ b/source/Hack-Italic.ufo/glyphs/question.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="question" format="1">
+<glyph name="question" format="2">
   <advance width="1233"/>
   <unicode hex="003F"/>
   <outline>
     <contour>
-      <point x="546" y="583" type="line" name="hr00" smooth="yes"/>
+      <point x="546" y="583" type="line" smooth="yes" name="hr00"/>
       <point x="554" y="635"/>
       <point x="572" y="684"/>
       <point x="599" y="729" type="curve" smooth="yes"/>
@@ -17,16 +17,16 @@
       <point x="944" y="1072" type="curve" smooth="yes"/>
       <point x="965" y="1102"/>
       <point x="978" y="1133"/>
-      <point x="983" y="1165" type="curve" name="sh01" smooth="yes"/>
+      <point x="983" y="1165" type="curve" smooth="yes" name="sh01"/>
       <point x="985" y="1177"/>
       <point x="986" y="1188"/>
-      <point x="986" y="1199" type="curve" name="ah01" smooth="yes"/>
+      <point x="986" y="1199" type="curve" smooth="yes" name="ah01"/>
       <point x="986" y="1242"/>
       <point x="971" y="1280"/>
       <point x="940" y="1309" type="curve" smooth="yes"/>
       <point x="904" y="1344"/>
       <point x="848" y="1364"/>
-      <point x="775" y="1364" type="curve" name="dv03" smooth="yes"/>
+      <point x="775" y="1364" type="curve" smooth="yes" name="dv03"/>
       <point x="722" y="1364"/>
       <point x="664" y="1353"/>
       <point x="602" y="1330" type="curve" smooth="yes"/>
@@ -36,22 +36,22 @@
       <point x="428" y="1415" type="line" name="sh03"/>
       <point x="562" y="1489"/>
       <point x="700" y="1528"/>
-      <point x="833" y="1528" type="curve" name="dv04" smooth="yes"/>
+      <point x="833" y="1528" type="curve" smooth="yes" name="dv04"/>
       <point x="954" y="1528"/>
       <point x="1049" y="1499"/>
       <point x="1116" y="1432" type="curve" smooth="yes"/>
       <point x="1164" y="1384"/>
       <point x="1192" y="1318"/>
-      <point x="1192" y="1250" type="curve" name="sh04" smooth="yes"/>
+      <point x="1192" y="1250" type="curve" smooth="yes" name="sh04"/>
       <point x="1192" y="1227"/>
       <point x="1189" y="1196"/>
-      <point x="1186" y="1175" type="curve" name="sh05" smooth="yes"/>
+      <point x="1186" y="1175" type="curve" smooth="yes" name="sh05"/>
       <point x="1179" y="1126"/>
       <point x="1162" y="1081"/>
       <point x="1130" y="1034" type="curve" smooth="yes"/>
       <point x="1095" y="983"/>
       <point x="1043" y="932"/>
-      <point x="978" y="876" type="curve" name="sh06" smooth="yes"/>
+      <point x="978" y="876" type="curve" smooth="yes" name="sh06"/>
       <point x="876" y="790" type="line" smooth="yes"/>
       <point x="819" y="742"/>
       <point x="788" y="709"/>
@@ -64,22 +64,22 @@
       <point x="529" y="472" type="line"/>
     </contour>
     <contour>
-      <point x="542" y="-40" type="curve" name="dv01" smooth="yes"/>
+      <point x="542" y="-40" type="curve" smooth="yes" name="dv01"/>
       <point x="507" y="-40"/>
       <point x="478" y="-30"/>
       <point x="454" y="-3" type="curve" smooth="yes"/>
       <point x="429" y="26"/>
       <point x="421" y="58"/>
-      <point x="421" y="93" type="curve" name="sh02" smooth="yes"/>
+      <point x="421" y="93" type="curve" smooth="yes" name="sh02"/>
       <point x="421" y="195"/>
       <point x="509" y="264"/>
-      <point x="596" y="264" type="curve" name="dv02" smooth="yes"/>
+      <point x="596" y="264" type="curve" smooth="yes" name="dv02"/>
       <point x="627" y="264"/>
       <point x="663" y="254"/>
       <point x="687" y="227" type="curve" smooth="yes"/>
       <point x="707" y="204"/>
       <point x="718" y="171"/>
-      <point x="718" y="134" type="curve" name="sh07" smooth="yes"/>
+      <point x="718" y="134" type="curve" smooth="yes" name="sh07"/>
       <point x="718" y="89"/>
       <point x="701" y="44"/>
       <point x="664" y="9" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/questiondown.case.glif b/source/Hack-Italic.ufo/glyphs/questiondown.case.glif
index 0e9da313d..3053dd470 100644
--- a/source/Hack-Italic.ufo/glyphs/questiondown.case.glif
+++ b/source/Hack-Italic.ufo/glyphs/questiondown.case.glif
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="questiondown.case" format="1">
+<glyph name="questiondown.case" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="772" y="1252" type="curve" name="hr00" smooth="yes"/>
+      <point x="772" y="1252" type="curve" smooth="yes" name="hr00"/>
       <point x="737" y="1252"/>
       <point x="708" y="1262"/>
       <point x="684" y="1289" type="curve" smooth="yes"/>
       <point x="659" y="1318"/>
       <point x="651" y="1350"/>
-      <point x="651" y="1385" type="curve" name="ah01" smooth="yes"/>
+      <point x="651" y="1385" type="curve" smooth="yes" name="ah01"/>
       <point x="651" y="1487"/>
       <point x="739" y="1556"/>
-      <point x="826" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="826" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="857" y="1556"/>
       <point x="893" y="1546"/>
       <point x="917" y="1519" type="curve" smooth="yes"/>
       <point x="937" y="1496"/>
       <point x="948" y="1463"/>
-      <point x="948" y="1426" type="curve" name="sh01" smooth="yes"/>
+      <point x="948" y="1426" type="curve" smooth="yes" name="sh01"/>
       <point x="948" y="1381"/>
       <point x="931" y="1336"/>
       <point x="894" y="1301" type="curve" smooth="yes"/>
@@ -26,10 +26,10 @@
       <point x="820" y="1252"/>
     </contour>
     <contour>
-      <point x="497" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="497" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="282" y="-27"/>
       <point x="143" y="90"/>
-      <point x="143" y="269" type="curve" name="sh02" smooth="yes"/>
+      <point x="143" y="269" type="curve" smooth="yes" name="sh02"/>
       <point x="143" y="390"/>
       <point x="207" y="490"/>
       <point x="371" y="625" type="curve" smooth="yes"/>
@@ -46,10 +46,10 @@
       <point x="502" y="532" type="line" smooth="yes"/>
       <point x="389" y="437"/>
       <point x="346" y="366"/>
-      <point x="346" y="294" type="curve" name="sh04" smooth="yes"/>
+      <point x="346" y="294" type="curve" smooth="yes" name="sh04"/>
       <point x="346" y="194"/>
       <point x="427" y="137"/>
-      <point x="551" y="137" type="curve" name="sv01" smooth="yes"/>
+      <point x="551" y="137" type="curve" smooth="yes" name="sv01"/>
       <point x="670" y="137"/>
       <point x="798" y="187"/>
       <point x="938" y="274" type="curve" name="sh05"/>
diff --git a/source/Hack-Italic.ufo/glyphs/questiondown.glif b/source/Hack-Italic.ufo/glyphs/questiondown.glif
index bedaf40c8..7f35ee259 100644
--- a/source/Hack-Italic.ufo/glyphs/questiondown.glif
+++ b/source/Hack-Italic.ufo/glyphs/questiondown.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="questiondown" format="1">
+<glyph name="questiondown" format="2">
   <advance width="1233"/>
   <unicode hex="00BF"/>
   <outline>
     <contour>
-      <point x="752" y="1252" type="curve" name="hr00" smooth="yes"/>
+      <point x="752" y="1252" type="curve" smooth="yes" name="hr00"/>
       <point x="717" y="1252"/>
       <point x="688" y="1262"/>
       <point x="664" y="1289" type="curve" smooth="yes"/>
       <point x="639" y="1318"/>
       <point x="631" y="1350"/>
-      <point x="631" y="1385" type="curve" name="ah01" smooth="yes"/>
+      <point x="631" y="1385" type="curve" smooth="yes" name="ah01"/>
       <point x="631" y="1487"/>
       <point x="719" y="1556"/>
-      <point x="806" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="806" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="837" y="1556"/>
       <point x="873" y="1546"/>
       <point x="897" y="1519" type="curve" smooth="yes"/>
       <point x="917" y="1496"/>
       <point x="928" y="1463"/>
-      <point x="928" y="1426" type="curve" name="sh01" smooth="yes"/>
+      <point x="928" y="1426" type="curve" smooth="yes" name="sh01"/>
       <point x="928" y="1381"/>
       <point x="911" y="1336"/>
       <point x="874" y="1301" type="curve" smooth="yes"/>
@@ -27,13 +27,13 @@
       <point x="800" y="1252"/>
     </contour>
     <contour>
-      <point x="495" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="495" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="399" y="-27"/>
       <point x="307" y="-3"/>
       <point x="239" y="54" type="curve" smooth="yes"/>
       <point x="175" y="109"/>
       <point x="143" y="182"/>
-      <point x="143" y="267" type="curve" name="sh02" smooth="yes"/>
+      <point x="143" y="267" type="curve" smooth="yes" name="sh02"/>
       <point x="143" y="326"/>
       <point x="159" y="383"/>
       <point x="192" y="436" type="curve" smooth="yes"/>
@@ -46,7 +46,7 @@
       <point x="590" y="832" type="curve" smooth="yes"/>
       <point x="610" y="865"/>
       <point x="627" y="920"/>
-      <point x="635" y="969" type="curve" name="sh03" smooth="yes"/>
+      <point x="635" y="969" type="curve" smooth="yes" name="sh03"/>
       <point x="655" y="1092" type="line"/>
       <point x="846" y="1092" type="line"/>
       <point x="817" y="938" type="line" smooth="yes"/>
@@ -62,10 +62,10 @@
       <point x="382" y="405" type="curve" smooth="yes"/>
       <point x="358" y="368"/>
       <point x="346" y="330"/>
-      <point x="346" y="292" type="curve" name="sh04" smooth="yes"/>
+      <point x="346" y="292" type="curve" smooth="yes" name="sh04"/>
       <point x="346" y="195"/>
       <point x="426" y="137"/>
-      <point x="555" y="137" type="curve" name="sv01" smooth="yes"/>
+      <point x="555" y="137" type="curve" smooth="yes" name="sv01"/>
       <point x="611" y="137"/>
       <point x="665" y="148"/>
       <point x="734" y="173" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/quotedbl.glif b/source/Hack-Italic.ufo/glyphs/quotedbl.glif
index a061881d9..4843ea44a 100644
--- a/source/Hack-Italic.ufo/glyphs/quotedbl.glif
+++ b/source/Hack-Italic.ufo/glyphs/quotedbl.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotedbl" format="1">
+<glyph name="quotedbl" format="2">
   <advance width="1233"/>
   <unicode hex="0022"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/quotedblbase.glif b/source/Hack-Italic.ufo/glyphs/quotedblbase.glif
index 3c565b4b6..f4ba01bff 100644
--- a/source/Hack-Italic.ufo/glyphs/quotedblbase.glif
+++ b/source/Hack-Italic.ufo/glyphs/quotedblbase.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotedblbase" format="1">
+<glyph name="quotedblbase" format="2">
   <advance width="1233"/>
   <unicode hex="201E"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/quotedblleft.glif b/source/Hack-Italic.ufo/glyphs/quotedblleft.glif
index e08bce379..fca8a6206 100644
--- a/source/Hack-Italic.ufo/glyphs/quotedblleft.glif
+++ b/source/Hack-Italic.ufo/glyphs/quotedblleft.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotedblleft" format="1">
+<glyph name="quotedblleft" format="2">
   <advance width="1233"/>
   <unicode hex="201C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/quotedblright.glif b/source/Hack-Italic.ufo/glyphs/quotedblright.glif
index 8cab4806f..3495668a6 100644
--- a/source/Hack-Italic.ufo/glyphs/quotedblright.glif
+++ b/source/Hack-Italic.ufo/glyphs/quotedblright.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotedblright" format="1">
+<glyph name="quotedblright" format="2">
   <advance width="1233"/>
   <unicode hex="201D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/quoteleft.glif b/source/Hack-Italic.ufo/glyphs/quoteleft.glif
index e757f33c8..603f314b7 100644
--- a/source/Hack-Italic.ufo/glyphs/quoteleft.glif
+++ b/source/Hack-Italic.ufo/glyphs/quoteleft.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quoteleft" format="1">
+<glyph name="quoteleft" format="2">
   <advance width="1233"/>
   <unicode hex="2018"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/quotereversed.glif b/source/Hack-Italic.ufo/glyphs/quotereversed.glif
index 7473daf89..d985f7b5c 100644
--- a/source/Hack-Italic.ufo/glyphs/quotereversed.glif
+++ b/source/Hack-Italic.ufo/glyphs/quotereversed.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotereversed" format="1">
+<glyph name="quotereversed" format="2">
   <advance width="1233"/>
   <unicode hex="201B"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/quoteright.glif b/source/Hack-Italic.ufo/glyphs/quoteright.glif
index cd79a2c7e..e444ac2c1 100644
--- a/source/Hack-Italic.ufo/glyphs/quoteright.glif
+++ b/source/Hack-Italic.ufo/glyphs/quoteright.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quoteright" format="1">
+<glyph name="quoteright" format="2">
   <advance width="1233"/>
   <unicode hex="2019"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/quotesinglbase.glif b/source/Hack-Italic.ufo/glyphs/quotesinglbase.glif
index 498017f43..adbc6ce98 100644
--- a/source/Hack-Italic.ufo/glyphs/quotesinglbase.glif
+++ b/source/Hack-Italic.ufo/glyphs/quotesinglbase.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotesinglbase" format="1">
+<glyph name="quotesinglbase" format="2">
   <advance width="1233"/>
   <unicode hex="201A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/quotesingle.glif b/source/Hack-Italic.ufo/glyphs/quotesingle.glif
index 33d2c4213..3eea5dde4 100644
--- a/source/Hack-Italic.ufo/glyphs/quotesingle.glif
+++ b/source/Hack-Italic.ufo/glyphs/quotesingle.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotesingle" format="1">
+<glyph name="quotesingle" format="2">
   <advance width="1233"/>
   <unicode hex="0027"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/r.glif b/source/Hack-Italic.ufo/glyphs/r.glif
index 1fc8e384e..ce1c96717 100644
--- a/source/Hack-Italic.ufo/glyphs/r.glif
+++ b/source/Hack-Italic.ufo/glyphs/r.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="r" format="1">
+<glyph name="r" format="2">
   <advance width="1233"/>
   <unicode hex="0072"/>
   <outline>
@@ -25,9 +25,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/racute.glif b/source/Hack-Italic.ufo/glyphs/racute.glif
index 756cb1563..8cba8315e 100644
--- a/source/Hack-Italic.ufo/glyphs/racute.glif
+++ b/source/Hack-Italic.ufo/glyphs/racute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="racute" format="1">
+<glyph name="racute" format="2">
   <advance width="1233"/>
   <unicode hex="0155"/>
   <outline>
@@ -15,14 +15,14 @@
       <point x="578" y="901" type="line" name="iv02"/>
       <point x="667" y="1062"/>
       <point x="812" y="1147"/>
-      <point x="992" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="992" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1089" y="1147"/>
       <point x="1165" y="1123"/>
       <point x="1219" y="1075" type="curve" name="hr01"/>
       <point x="1184" y="889" type="line" name="iv03"/>
       <point x="1124" y="949"/>
       <point x="1044" y="977"/>
-      <point x="948" y="977" type="curve" name="sv01" smooth="yes"/>
+      <point x="948" y="977" type="curve" smooth="yes" name="sv01"/>
       <point x="721" y="977"/>
       <point x="558" y="812"/>
       <point x="508" y="549" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/radical.glif b/source/Hack-Italic.ufo/glyphs/radical.glif
index 57cfb03dc..11b800389 100644
--- a/source/Hack-Italic.ufo/glyphs/radical.glif
+++ b/source/Hack-Italic.ufo/glyphs/radical.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="radical" format="1">
+<glyph name="radical" format="2">
   <advance width="1233"/>
   <unicode hex="221A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/rcaron.glif b/source/Hack-Italic.ufo/glyphs/rcaron.glif
index e5351e9ac..c7d9e46f8 100644
--- a/source/Hack-Italic.ufo/glyphs/rcaron.glif
+++ b/source/Hack-Italic.ufo/glyphs/rcaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="rcaron" format="1">
+<glyph name="rcaron" format="2">
   <advance width="1233"/>
   <unicode hex="0159"/>
   <outline>
@@ -18,14 +18,14 @@
       <point x="578" y="901" type="line" name="iv02"/>
       <point x="667" y="1062"/>
       <point x="812" y="1147"/>
-      <point x="992" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="992" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1089" y="1147"/>
       <point x="1165" y="1123"/>
       <point x="1219" y="1075" type="curve"/>
       <point x="1184" y="889" type="line" name="iv03"/>
       <point x="1124" y="949"/>
       <point x="1044" y="977"/>
-      <point x="948" y="977" type="curve" name="sv01" smooth="yes"/>
+      <point x="948" y="977" type="curve" smooth="yes" name="sv01"/>
       <point x="721" y="977"/>
       <point x="558" y="812"/>
       <point x="508" y="549" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/reflexsubset.glif b/source/Hack-Italic.ufo/glyphs/reflexsubset.glif
index 94df8e7ca..35ce6b628 100644
--- a/source/Hack-Italic.ufo/glyphs/reflexsubset.glif
+++ b/source/Hack-Italic.ufo/glyphs/reflexsubset.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="reflexsubset" format="1">
+<glyph name="reflexsubset" format="2">
   <advance width="1233"/>
   <unicode hex="2286"/>
   <outline>
     <contour>
-      <point x="566" y="324" type="line" name="hr00" smooth="yes"/>
+      <point x="566" y="324" type="line" smooth="yes" name="hr00"/>
       <point x="298" y="324"/>
       <point x="88" y="536"/>
-      <point x="88" y="802" type="curve" name="dh01" smooth="yes"/>
+      <point x="88" y="802" type="curve" smooth="yes" name="dh01"/>
       <point x="88" y="1067"/>
       <point x="298" y="1280"/>
       <point x="565" y="1280" type="curve" smooth="yes"/>
@@ -16,10 +16,10 @@
       <point x="565" y="1130" type="line" smooth="yes"/>
       <point x="382" y="1130"/>
       <point x="238" y="982"/>
-      <point x="238" y="801" type="curve" name="dh02" smooth="yes"/>
+      <point x="238" y="801" type="curve" smooth="yes" name="dh02"/>
       <point x="238" y="618"/>
       <point x="384" y="474"/>
-      <point x="565" y="474" type="curve" name="dv03" smooth="yes"/>
+      <point x="565" y="474" type="curve" smooth="yes" name="dv03"/>
       <point x="1145" y="474" type="line"/>
       <point x="1145" y="324" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/reflexsuperset.glif b/source/Hack-Italic.ufo/glyphs/reflexsuperset.glif
index 6659c78ec..3fd28e63a 100644
--- a/source/Hack-Italic.ufo/glyphs/reflexsuperset.glif
+++ b/source/Hack-Italic.ufo/glyphs/reflexsuperset.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="reflexsuperset" format="1">
+<glyph name="reflexsuperset" format="2">
   <advance width="1233"/>
   <unicode hex="2287"/>
   <outline>
     <contour>
       <point x="88" y="474" type="line" name="hr00"/>
-      <point x="668" y="474" type="line" name="dv04" smooth="yes"/>
+      <point x="668" y="474" type="line" smooth="yes" name="dv04"/>
       <point x="849" y="474"/>
       <point x="995" y="618"/>
-      <point x="995" y="801" type="curve" name="dh01" smooth="yes"/>
+      <point x="995" y="801" type="curve" smooth="yes" name="dh01"/>
       <point x="995" y="982"/>
       <point x="851" y="1130"/>
-      <point x="668" y="1130" type="curve" name="dv01" smooth="yes"/>
+      <point x="668" y="1130" type="curve" smooth="yes" name="dv01"/>
       <point x="88" y="1130" type="line"/>
       <point x="88" y="1280" type="line"/>
-      <point x="668" y="1280" type="line" name="dv02" smooth="yes"/>
+      <point x="668" y="1280" type="line" smooth="yes" name="dv02"/>
       <point x="935" y="1280"/>
       <point x="1145" y="1067"/>
-      <point x="1145" y="802" type="curve" name="dh02" smooth="yes"/>
+      <point x="1145" y="802" type="curve" smooth="yes" name="dh02"/>
       <point x="1145" y="536"/>
       <point x="935" y="324"/>
-      <point x="667" y="324" type="curve" name="dv03" smooth="yes"/>
+      <point x="667" y="324" type="curve" smooth="yes" name="dv03"/>
       <point x="88" y="324" type="line"/>
     </contour>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/registered.glif b/source/Hack-Italic.ufo/glyphs/registered.glif
index f667cacb5..3b2b6f6c5 100644
--- a/source/Hack-Italic.ufo/glyphs/registered.glif
+++ b/source/Hack-Italic.ufo/glyphs/registered.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="registered" format="1">
+<glyph name="registered" format="2">
   <advance width="1233"/>
   <unicode hex="00AE"/>
   <outline>
     <contour>
-      <point x="616" y="125" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="125" type="curve" smooth="yes" name="hr00"/>
       <point x="448" y="125"/>
       <point x="302" y="186"/>
       <point x="181" y="307" type="curve" smooth="yes"/>
@@ -13,7 +13,7 @@
       <point x="46" y="507" type="curve" smooth="yes"/>
       <point x="15" y="579"/>
       <point x="0" y="653"/>
-      <point x="0" y="741" type="curve" name="dh01" smooth="yes"/>
+      <point x="0" y="741" type="curve" smooth="yes" name="dh01"/>
       <point x="0" y="826"/>
       <point x="15" y="905"/>
       <point x="46" y="977" type="curve" smooth="yes"/>
@@ -25,7 +25,7 @@
       <point x="381" y="1313" type="curve" smooth="yes"/>
       <point x="454" y="1343"/>
       <point x="532" y="1358"/>
-      <point x="616" y="1358" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1358" type="curve" smooth="yes" name="dv03"/>
       <point x="700" y="1358"/>
       <point x="779" y="1343"/>
       <point x="852" y="1313" type="curve" smooth="yes"/>
@@ -37,7 +37,7 @@
       <point x="1187" y="977" type="curve" smooth="yes"/>
       <point x="1218" y="905"/>
       <point x="1233" y="827"/>
-      <point x="1233" y="742" type="curve" name="dh08" smooth="yes"/>
+      <point x="1233" y="742" type="curve" smooth="yes" name="dh08"/>
       <point x="1233" y="657"/>
       <point x="1218" y="579"/>
       <point x="1188" y="508" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="701" y="125"/>
     </contour>
     <contour>
-      <point x="617" y="227" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="227" type="curve" smooth="yes" name="dv01"/>
       <point x="686" y="227"/>
       <point x="751" y="240"/>
       <point x="812" y="265" type="curve" smooth="yes"/>
@@ -63,7 +63,7 @@
       <point x="1093" y="546" type="curve" smooth="yes"/>
       <point x="1118" y="605"/>
       <point x="1130" y="670"/>
-      <point x="1130" y="741" type="curve" name="dh07" smooth="yes"/>
+      <point x="1130" y="741" type="curve" smooth="yes" name="dh07"/>
       <point x="1130" y="813"/>
       <point x="1117" y="878"/>
       <point x="1092" y="939" type="curve" smooth="yes"/>
@@ -75,7 +75,7 @@
       <point x="814" y="1218" type="curve" smooth="yes"/>
       <point x="754" y="1243"/>
       <point x="688" y="1255"/>
-      <point x="616" y="1255" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1255" type="curve" smooth="yes" name="dv02"/>
       <point x="545" y="1255"/>
       <point x="479" y="1243"/>
       <point x="420" y="1218" type="curve" smooth="yes"/>
@@ -87,7 +87,7 @@
       <point x="141" y="939" type="curve" smooth="yes"/>
       <point x="115" y="877"/>
       <point x="102" y="811"/>
-      <point x="102" y="742" type="curve" name="dh02" smooth="yes"/>
+      <point x="102" y="742" type="curve" smooth="yes" name="dh02"/>
       <point x="102" y="670"/>
       <point x="114" y="609"/>
       <point x="141" y="546" type="curve" smooth="yes"/>
@@ -102,13 +102,13 @@
     </contour>
     <contour>
       <point x="362" y="1100" type="line" name="dh03"/>
-      <point x="600" y="1100" type="line" name="dv05" smooth="yes"/>
+      <point x="600" y="1100" type="line" smooth="yes" name="dv05"/>
       <point x="699" y="1100"/>
       <point x="772" y="1084"/>
       <point x="819" y="1051" type="curve" smooth="yes"/>
       <point x="867" y="1018"/>
       <point x="891" y="968"/>
-      <point x="891" y="903" type="curve" name="dh06" smooth="yes"/>
+      <point x="891" y="903" type="curve" smooth="yes" name="dh06"/>
       <point x="891" y="852"/>
       <point x="876" y="815"/>
       <point x="847" y="784" type="curve" smooth="yes"/>
@@ -141,13 +141,13 @@
       <point x="721" y="811" type="curve" smooth="yes"/>
       <point x="746" y="829"/>
       <point x="758" y="859"/>
-      <point x="758" y="900" type="curve" name="dh05" smooth="yes"/>
+      <point x="758" y="900" type="curve" smooth="yes" name="dh05"/>
       <point x="758" y="939"/>
       <point x="748" y="971"/>
       <point x="721" y="990" type="curve" smooth="yes"/>
       <point x="696" y="1007"/>
       <point x="653" y="1016"/>
-      <point x="594" y="1016" type="curve" name="dv04" smooth="yes"/>
+      <point x="594" y="1016" type="curve" smooth="yes" name="dv04"/>
       <point x="492" y="1016" type="line" name="dh04"/>
       <point x="492" y="784" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/revlogicalnot.glif b/source/Hack-Italic.ufo/glyphs/revlogicalnot.glif
index f4b23ea54..05d28b867 100644
--- a/source/Hack-Italic.ufo/glyphs/revlogicalnot.glif
+++ b/source/Hack-Italic.ufo/glyphs/revlogicalnot.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="revlogicalnot" format="1">
+<glyph name="revlogicalnot" format="2">
   <advance width="1233"/>
   <unicode hex="2310"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/rho.glif b/source/Hack-Italic.ufo/glyphs/rho.glif
index 35577af2d..9296616fc 100644
--- a/source/Hack-Italic.ufo/glyphs/rho.glif
+++ b/source/Hack-Italic.ufo/glyphs/rho.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="rho" format="1">
+<glyph name="rho" format="2">
   <advance width="1233"/>
   <unicode hex="03C1"/>
   <outline>
     <contour>
-      <point x="185" y="540" type="line" name="hr00" smooth="yes"/>
+      <point x="185" y="540" type="line" smooth="yes" name="hr00"/>
       <point x="268" y="967"/>
       <point x="478" y="1147"/>
-      <point x="755" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="755" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1004" y="1147"/>
       <point x="1128" y="1003"/>
-      <point x="1128" y="754" type="curve" name="dh02" smooth="yes"/>
+      <point x="1128" y="754" type="curve" smooth="yes" name="dh02"/>
       <point x="1128" y="694"/>
       <point x="1121" y="627"/>
       <point x="1106" y="555" type="curve" smooth="yes"/>
       <point x="1028" y="181"/>
       <point x="825" y="-29"/>
-      <point x="560" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="560" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="420" y="-29"/>
       <point x="329" y="29"/>
       <point x="292" y="141" type="curve" name="iv01"/>
@@ -24,19 +24,19 @@
       <point x="-3" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="562" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="562" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="657" y="127"/>
       <point x="729" y="168"/>
       <point x="784" y="236" type="curve" smooth="yes"/>
       <point x="872" y="345"/>
       <point x="932" y="566"/>
-      <point x="932" y="733" type="curve" name="dh01" smooth="yes"/>
+      <point x="932" y="733" type="curve" smooth="yes" name="dh01"/>
       <point x="932" y="792"/>
       <point x="925" y="843"/>
       <point x="909" y="882" type="curve" smooth="yes"/>
       <point x="878" y="957"/>
       <point x="817" y="991"/>
-      <point x="729" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="729" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="554" y="991"/>
       <point x="431" y="850"/>
       <point x="374" y="559" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/ring.glif b/source/Hack-Italic.ufo/glyphs/ring.glif
index c5152f2b3..95d61947a 100644
--- a/source/Hack-Italic.ufo/glyphs/ring.glif
+++ b/source/Hack-Italic.ufo/glyphs/ring.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ring" format="1">
+<glyph name="ring" format="2">
   <advance width="1233"/>
   <unicode hex="02DA"/>
   <outline>
     <contour>
-      <point x="778" y="1321" type="curve" name="hr00" smooth="yes"/>
+      <point x="778" y="1321" type="curve" smooth="yes" name="hr00"/>
       <point x="702" y="1321"/>
       <point x="637" y="1348"/>
       <point x="584" y="1401" type="curve" smooth="yes"/>
       <point x="531" y="1454"/>
       <point x="504" y="1519"/>
-      <point x="504" y="1595" type="curve" name="sh01" smooth="yes"/>
+      <point x="504" y="1595" type="curve" smooth="yes" name="sh01"/>
       <point x="504" y="1672"/>
       <point x="531" y="1738"/>
       <point x="584" y="1791" type="curve" smooth="yes"/>
       <point x="637" y="1844"/>
       <point x="701" y="1870"/>
-      <point x="778" y="1870" type="curve" name="dv03" smooth="yes"/>
+      <point x="778" y="1870" type="curve" smooth="yes" name="dv03"/>
       <point x="855" y="1870"/>
       <point x="920" y="1844"/>
       <point x="973" y="1791" type="curve" smooth="yes"/>
       <point x="1026" y="1738"/>
       <point x="1053" y="1672"/>
-      <point x="1053" y="1595" type="curve" name="sh02" smooth="yes"/>
+      <point x="1053" y="1595" type="curve" smooth="yes" name="sh02"/>
       <point x="1053" y="1519"/>
       <point x="1026" y="1454"/>
       <point x="973" y="1401" type="curve" smooth="yes"/>
@@ -30,19 +30,19 @@
       <point x="855" y="1321"/>
     </contour>
     <contour>
-      <point x="778" y="1444" type="curve" name="dv01" smooth="yes"/>
+      <point x="778" y="1444" type="curve" smooth="yes" name="dv01"/>
       <point x="863" y="1444"/>
       <point x="930" y="1511"/>
-      <point x="930" y="1595" type="curve" name="ah01" smooth="yes"/>
+      <point x="930" y="1595" type="curve" smooth="yes" name="ah01"/>
       <point x="930" y="1680"/>
       <point x="863" y="1747"/>
-      <point x="778" y="1747" type="curve" name="dv02" smooth="yes"/>
+      <point x="778" y="1747" type="curve" smooth="yes" name="dv02"/>
       <point x="735" y="1747"/>
       <point x="700" y="1733"/>
       <point x="671" y="1704" type="curve" smooth="yes"/>
       <point x="642" y="1675"/>
       <point x="627" y="1638"/>
-      <point x="627" y="1595" type="curve" name="sh03" smooth="yes"/>
+      <point x="627" y="1595" type="curve" smooth="yes" name="sh03"/>
       <point x="627" y="1511"/>
       <point x="694" y="1444"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/rtblock.glif b/source/Hack-Italic.ufo/glyphs/rtblock.glif
index 847a9fd1a..d12eaad05 100644
--- a/source/Hack-Italic.ufo/glyphs/rtblock.glif
+++ b/source/Hack-Italic.ufo/glyphs/rtblock.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="rtblock" format="1">
+<glyph name="rtblock" format="2">
   <advance width="1233"/>
   <unicode hex="2590"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/ruble.glif b/source/Hack-Italic.ufo/glyphs/ruble.glif
new file mode 100644
index 000000000..8945db4df
--- /dev/null
+++ b/source/Hack-Italic.ufo/glyphs/ruble.glif
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="ruble" format="2">
+  <advance width="1233"/>
+  <unicode hex="20BD"/>
+  <outline>
+    <contour>
+      <point x="168" y="600" type="line"/>
+      <point x="50" y="600" type="line"/>
+      <point x="81" y="766" type="line"/>
+      <point x="200" y="766" type="line"/>
+      <point x="342" y="1493" type="line" name="hr00"/>
+      <point x="782" y="1493" type="line" smooth="yes"/>
+      <point x="1055" y="1493"/>
+      <point x="1204" y="1374"/>
+      <point x="1204" y="1122" type="curve" smooth="yes" name="dh02"/>
+      <point x="1204" y="810"/>
+      <point x="976" y="600"/>
+      <point x="604" y="600" type="curve" smooth="yes" name="dv01"/>
+      <point x="371" y="600" type="line"/>
+      <point x="343" y="455" type="line"/>
+      <point x="763" y="455" type="line"/>
+      <point x="733" y="289" type="line"/>
+      <point x="310" y="289" type="line"/>
+      <point x="254" y="0" type="line" name="ab01"/>
+      <point x="51" y="0" type="line"/>
+      <point x="107" y="289" type="line"/>
+      <point x="-11" y="289" type="line"/>
+      <point x="21" y="455" type="line"/>
+      <point x="140" y="455" type="line"/>
+    </contour>
+    <contour>
+      <point x="637" y="766" type="line" smooth="yes" name="dv02"/>
+      <point x="857" y="766"/>
+      <point x="999" y="906"/>
+      <point x="999" y="1110" type="curve" smooth="yes" name="dh01"/>
+      <point x="999" y="1259"/>
+      <point x="921" y="1327"/>
+      <point x="745" y="1327" type="curve" smooth="yes" name="sv01"/>
+      <point x="512" y="1327" type="line"/>
+      <point x="403" y="766" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2018-05-13 16:25:46 +0000</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/s.glif b/source/Hack-Italic.ufo/glyphs/s.glif
index 381fb1b02..7054b09d1 100644
--- a/source/Hack-Italic.ufo/glyphs/s.glif
+++ b/source/Hack-Italic.ufo/glyphs/s.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="s" format="1">
+<glyph name="s" format="2">
   <advance width="1233"/>
   <unicode hex="0073"/>
   <outline>
@@ -53,9 +53,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/sacute.glif b/source/Hack-Italic.ufo/glyphs/sacute.glif
index 1d406bc0f..c22d85448 100644
--- a/source/Hack-Italic.ufo/glyphs/sacute.glif
+++ b/source/Hack-Italic.ufo/glyphs/sacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="sacute" format="1">
+<glyph name="sacute" format="2">
   <advance width="1233"/>
   <unicode hex="015B"/>
   <outline>
@@ -10,17 +10,17 @@
       <point x="568" y="1304" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="476" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="476" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="360" y="-29"/>
       <point x="248" y="-6"/>
       <point x="115" y="41" type="curve"/>
       <point x="152" y="231" type="line"/>
       <point x="277" y="160"/>
       <point x="394" y="125"/>
-      <point x="505" y="125" type="curve" name="dv02" smooth="yes"/>
+      <point x="505" y="125" type="curve" smooth="yes" name="dv02"/>
       <point x="684" y="125"/>
       <point x="807" y="217"/>
-      <point x="807" y="325" type="curve" name="ah01" smooth="yes"/>
+      <point x="807" y="325" type="curve" smooth="yes" name="ah01"/>
       <point x="807" y="401"/>
       <point x="742" y="455"/>
       <point x="611" y="487" type="curve" smooth="yes"/>
@@ -28,20 +28,20 @@
       <point x="516" y="512" type="line" smooth="yes"/>
       <point x="345" y="557"/>
       <point x="266" y="634"/>
-      <point x="266" y="778" type="curve" name="sh01" smooth="yes"/>
+      <point x="266" y="778" type="curve" smooth="yes" name="sh01"/>
       <point x="266" y="1002"/>
       <point x="454" y="1147"/>
-      <point x="754" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="754" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="872" y="1147"/>
       <point x="980" y="1125"/>
       <point x="1077" y="1081" type="curve"/>
       <point x="1042" y="901" type="line"/>
       <point x="946" y="961"/>
       <point x="844" y="993"/>
-      <point x="731" y="993" type="curve" name="sv01" smooth="yes"/>
+      <point x="731" y="993" type="curve" smooth="yes" name="sv01"/>
       <point x="554" y="993"/>
       <point x="449" y="914"/>
-      <point x="449" y="810" type="curve" name="sh03" smooth="yes"/>
+      <point x="449" y="810" type="curve" smooth="yes" name="sh03"/>
       <point x="449" y="734"/>
       <point x="506" y="687"/>
       <point x="670" y="645" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="764" y="621" type="line" smooth="yes"/>
       <point x="924" y="581"/>
       <point x="997" y="498"/>
-      <point x="997" y="365" type="curve" name="sh02" smooth="yes"/>
+      <point x="997" y="365" type="curve" smooth="yes" name="sh02"/>
       <point x="997" y="141"/>
       <point x="788" y="-29"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/scaron.glif b/source/Hack-Italic.ufo/glyphs/scaron.glif
index 4aa29c40b..344cc08bb 100644
--- a/source/Hack-Italic.ufo/glyphs/scaron.glif
+++ b/source/Hack-Italic.ufo/glyphs/scaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="scaron" format="1">
+<glyph name="scaron" format="2">
   <advance width="1233"/>
   <unicode hex="0161"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="635" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="477" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="477" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="413" y="-29"/>
       <point x="353" y="-23"/>
       <point x="302" y="-12" type="curve" smooth="yes"/>
@@ -26,13 +26,13 @@
       <point x="335" y="152" type="curve"/>
       <point x="395" y="133"/>
       <point x="448" y="125"/>
-      <point x="507" y="125" type="curve" name="dv02" smooth="yes"/>
+      <point x="507" y="125" type="curve" smooth="yes" name="dv02"/>
       <point x="595" y="125"/>
       <point x="667" y="145"/>
       <point x="723" y="185" type="curve" smooth="yes"/>
       <point x="779" y="225"/>
       <point x="807" y="277"/>
-      <point x="807" y="329" type="curve" name="ah01" smooth="yes"/>
+      <point x="807" y="329" type="curve" smooth="yes" name="ah01"/>
       <point x="807" y="399"/>
       <point x="758" y="447"/>
       <point x="611" y="487" type="curve" smooth="yes"/>
@@ -43,13 +43,13 @@
       <point x="327" y="608" type="curve" smooth="yes"/>
       <point x="286" y="651"/>
       <point x="266" y="708"/>
-      <point x="266" y="780" type="curve" name="sh01" smooth="yes"/>
+      <point x="266" y="780" type="curve" smooth="yes" name="sh01"/>
       <point x="266" y="885"/>
       <point x="309" y="979"/>
       <point x="397" y="1047" type="curve" smooth="yes"/>
       <point x="480" y="1111"/>
       <point x="599" y="1147"/>
-      <point x="755" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="755" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="870" y="1147"/>
       <point x="980" y="1126"/>
       <point x="1077" y="1081" type="curve"/>
@@ -59,13 +59,13 @@
       <point x="893" y="970" type="curve" smooth="yes"/>
       <point x="842" y="985"/>
       <point x="788" y="993"/>
-      <point x="731" y="993" type="curve" name="sv01" smooth="yes"/>
+      <point x="731" y="993" type="curve" smooth="yes" name="sv01"/>
       <point x="648" y="993"/>
       <point x="576" y="977"/>
       <point x="525" y="942" type="curve" smooth="yes"/>
       <point x="472" y="906"/>
       <point x="449" y="855"/>
-      <point x="449" y="808" type="curve" name="sh03" smooth="yes"/>
+      <point x="449" y="808" type="curve" smooth="yes" name="sh03"/>
       <point x="449" y="713"/>
       <point x="548" y="679"/>
       <point x="670" y="645" type="curve"/>
@@ -78,7 +78,7 @@
       <point x="939" y="529" type="curve" smooth="yes"/>
       <point x="978" y="488"/>
       <point x="997" y="440"/>
-      <point x="997" y="369" type="curve" name="sh02" smooth="yes"/>
+      <point x="997" y="369" type="curve" smooth="yes" name="sh02"/>
       <point x="997" y="256"/>
       <point x="946" y="154"/>
       <point x="853" y="82" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/scedilla.glif b/source/Hack-Italic.ufo/glyphs/scedilla.glif
index aac2582d4..33d1fa860 100644
--- a/source/Hack-Italic.ufo/glyphs/scedilla.glif
+++ b/source/Hack-Italic.ufo/glyphs/scedilla.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="scedilla" format="1">
+<glyph name="scedilla" format="2">
   <advance width="1233"/>
   <unicode hex="015F"/>
   <outline>
     <contour>
-      <point x="525" y="942" type="curve" name="hr00" smooth="yes"/>
+      <point x="525" y="942" type="curve" smooth="yes" name="hr00"/>
       <point x="472" y="906"/>
       <point x="449" y="855"/>
-      <point x="449" y="808" type="curve" name="dh02" smooth="yes"/>
+      <point x="449" y="808" type="curve" smooth="yes" name="dh02"/>
       <point x="449" y="713"/>
       <point x="548" y="679"/>
       <point x="670" y="645" type="curve"/>
@@ -20,7 +20,7 @@
       <point x="939" y="529" type="curve" smooth="yes"/>
       <point x="978" y="488"/>
       <point x="997" y="440"/>
-      <point x="997" y="369" type="curve" name="dh06" smooth="yes"/>
+      <point x="997" y="369" type="curve" smooth="yes" name="dh06"/>
       <point x="997" y="256"/>
       <point x="946" y="154"/>
       <point x="853" y="82" type="curve" smooth="yes"/>
@@ -32,13 +32,13 @@
       <point x="610" y="-111" type="curve" smooth="yes"/>
       <point x="621" y="-141"/>
       <point x="627" y="-170"/>
-      <point x="627" y="-198" type="curve" name="dh04" smooth="yes"/>
+      <point x="627" y="-198" type="curve" smooth="yes" name="dh04"/>
       <point x="627" y="-254"/>
       <point x="604" y="-304"/>
       <point x="557" y="-341" type="curve" smooth="yes"/>
       <point x="511" y="-377"/>
       <point x="447" y="-395"/>
-      <point x="366" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="366" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="339" y="-395"/>
       <point x="307" y="-393"/>
       <point x="276" y="-388" type="curve" smooth="yes"/>
@@ -51,10 +51,10 @@
       <point x="284" y="-265" type="curve" smooth="yes"/>
       <point x="307" y="-271"/>
       <point x="330" y="-274"/>
-      <point x="353" y="-274" type="curve" name="dv02" smooth="yes"/>
+      <point x="353" y="-274" type="curve" smooth="yes" name="dv02"/>
       <point x="440" y="-274"/>
       <point x="494" y="-230"/>
-      <point x="494" y="-163" type="curve" name="dh03" smooth="yes"/>
+      <point x="494" y="-163" type="curve" smooth="yes" name="dh03"/>
       <point x="494" y="-140"/>
       <point x="488" y="-114"/>
       <point x="480" y="-93" type="curve" smooth="yes"/>
@@ -79,7 +79,7 @@
       <point x="723" y="185" type="curve" smooth="yes"/>
       <point x="779" y="225"/>
       <point x="807" y="277"/>
-      <point x="807" y="329" type="curve" name="dh05" smooth="yes"/>
+      <point x="807" y="329" type="curve" smooth="yes" name="dh05"/>
       <point x="807" y="399"/>
       <point x="758" y="447"/>
       <point x="611" y="487" type="curve" smooth="yes"/>
@@ -90,13 +90,13 @@
       <point x="327" y="608" type="curve" smooth="yes"/>
       <point x="286" y="651"/>
       <point x="266" y="708"/>
-      <point x="266" y="780" type="curve" name="dh01" smooth="yes"/>
+      <point x="266" y="780" type="curve" smooth="yes" name="dh01"/>
       <point x="266" y="885"/>
       <point x="309" y="979"/>
       <point x="397" y="1047" type="curve" smooth="yes"/>
       <point x="480" y="1111"/>
       <point x="599" y="1147"/>
-      <point x="755" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="755" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="870" y="1147"/>
       <point x="980" y="1126"/>
       <point x="1077" y="1081" type="curve"/>
@@ -106,7 +106,7 @@
       <point x="893" y="970" type="curve" smooth="yes"/>
       <point x="842" y="985"/>
       <point x="788" y="993"/>
-      <point x="731" y="993" type="curve" name="sv01" smooth="yes"/>
+      <point x="731" y="993" type="curve" smooth="yes" name="sv01"/>
       <point x="648" y="993"/>
       <point x="576" y="977"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/scircumflex.glif b/source/Hack-Italic.ufo/glyphs/scircumflex.glif
index 6a6b40123..6d8fb95f0 100644
--- a/source/Hack-Italic.ufo/glyphs/scircumflex.glif
+++ b/source/Hack-Italic.ufo/glyphs/scircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="scircumflex" format="1">
+<glyph name="scircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="015D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/second.glif b/source/Hack-Italic.ufo/glyphs/second.glif
index e1fa2baba..385e23d48 100644
--- a/source/Hack-Italic.ufo/glyphs/second.glif
+++ b/source/Hack-Italic.ufo/glyphs/second.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="second" format="1">
+<glyph name="second" format="2">
   <advance width="1233"/>
   <unicode hex="2033"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/section.glif b/source/Hack-Italic.ufo/glyphs/section.glif
index 17d7e7a09..da6fe852d 100644
--- a/source/Hack-Italic.ufo/glyphs/section.glif
+++ b/source/Hack-Italic.ufo/glyphs/section.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="section" format="1">
+<glyph name="section" format="2">
   <advance width="1233"/>
   <unicode hex="00A7"/>
   <outline>
     <contour>
-      <point x="411" y="-201" type="curve" name="hr00" smooth="yes"/>
+      <point x="411" y="-201" type="curve" smooth="yes" name="hr00"/>
       <point x="358" y="-201"/>
       <point x="303" y="-195"/>
       <point x="260" y="-187" type="curve" smooth="yes"/>
@@ -14,10 +14,10 @@
       <point x="133" y="18" type="line"/>
       <point x="232" y="-30"/>
       <point x="328" y="-57"/>
-      <point x="415" y="-57" type="curve" name="dv01" smooth="yes"/>
+      <point x="415" y="-57" type="curve" smooth="yes" name="dv01"/>
       <point x="559" y="-57"/>
       <point x="657" y="15"/>
-      <point x="657" y="110" type="curve" name="dh03" smooth="yes"/>
+      <point x="657" y="110" type="curve" smooth="yes" name="dh03"/>
       <point x="657" y="182"/>
       <point x="602" y="249"/>
       <point x="474" y="337" type="curve" smooth="yes"/>
@@ -27,7 +27,7 @@
       <point x="222" y="538" type="curve" smooth="yes"/>
       <point x="194" y="577"/>
       <point x="182" y="619"/>
-      <point x="182" y="667" type="curve" name="dh01" smooth="yes"/>
+      <point x="182" y="667" type="curve" smooth="yes" name="dh01"/>
       <point x="182" y="727"/>
       <point x="201" y="788"/>
       <point x="246" y="848" type="curve" smooth="yes"/>
@@ -39,26 +39,26 @@
       <point x="369" y="1074" type="curve" smooth="yes"/>
       <point x="356" y="1102"/>
       <point x="350" y="1130"/>
-      <point x="350" y="1167" type="curve" name="sh02" smooth="yes"/>
+      <point x="350" y="1167" type="curve" smooth="yes" name="sh02"/>
       <point x="350" y="1266"/>
       <point x="391" y="1351"/>
       <point x="470" y="1415" type="curve" smooth="yes"/>
       <point x="550" y="1479"/>
       <point x="658" y="1511"/>
-      <point x="779" y="1511" type="curve" name="at01" smooth="yes"/>
+      <point x="779" y="1511" type="curve" smooth="yes" name="at01"/>
       <point x="826" y="1511"/>
       <point x="872" y="1506"/>
-      <point x="921" y="1497" type="curve" name="at02" smooth="yes"/>
+      <point x="921" y="1497" type="curve" smooth="yes" name="at02"/>
       <point x="973" y="1486"/>
       <point x="1018" y="1473"/>
       <point x="1069" y="1454" type="curve"/>
       <point x="1036" y="1290" type="line"/>
       <point x="946" y="1338"/>
       <point x="844" y="1368"/>
-      <point x="767" y="1368" type="curve" name="sv01" smooth="yes"/>
+      <point x="767" y="1368" type="curve" smooth="yes" name="sv01"/>
       <point x="636" y="1368"/>
       <point x="535" y="1290"/>
-      <point x="535" y="1203" type="curve" name="sh01" smooth="yes"/>
+      <point x="535" y="1203" type="curve" smooth="yes" name="sh01"/>
       <point x="535" y="1146"/>
       <point x="577" y="1089"/>
       <point x="669" y="1029" type="curve" smooth="yes"/>
@@ -66,7 +66,7 @@
       <point x="803" y="938" type="line" smooth="yes"/>
       <point x="972" y="823"/>
       <point x="1012" y="761"/>
-      <point x="1012" y="663" type="curve" name="sh03" smooth="yes"/>
+      <point x="1012" y="663" type="curve" smooth="yes" name="sh03"/>
       <point x="1012" y="600"/>
       <point x="990" y="535"/>
       <point x="946" y="475" type="curve" smooth="yes"/>
@@ -78,7 +78,7 @@
       <point x="828" y="252" type="curve" smooth="yes"/>
       <point x="840" y="225"/>
       <point x="848" y="191"/>
-      <point x="848" y="148" type="curve" name="dh04" smooth="yes"/>
+      <point x="848" y="148" type="curve" smooth="yes" name="dh04"/>
       <point x="848" y="51"/>
       <point x="808" y="-38"/>
       <point x="728" y="-103" type="curve" smooth="yes"/>
@@ -89,7 +89,7 @@
       <point x="678" y="401" type="line"/>
       <point x="790" y="469"/>
       <point x="850" y="547"/>
-      <point x="850" y="616" type="curve" name="sh04" smooth="yes"/>
+      <point x="850" y="616" type="curve" smooth="yes" name="sh04"/>
       <point x="850" y="656"/>
       <point x="829" y="694"/>
       <point x="797" y="727" type="curve" smooth="yes"/>
@@ -102,7 +102,7 @@
       <point x="391" y="820" type="curve" smooth="yes"/>
       <point x="362" y="783"/>
       <point x="348" y="747"/>
-      <point x="348" y="711" type="curve" name="dh02" smooth="yes"/>
+      <point x="348" y="711" type="curve" smooth="yes" name="dh02"/>
       <point x="348" y="675"/>
       <point x="362" y="641"/>
       <point x="391" y="610" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/semicolon.glif b/source/Hack-Italic.ufo/glyphs/semicolon.glif
index f8791504a..06d3ab92a 100644
--- a/source/Hack-Italic.ufo/glyphs/semicolon.glif
+++ b/source/Hack-Italic.ufo/glyphs/semicolon.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="semicolon" format="1">
+<glyph name="semicolon" format="2">
   <advance width="1233"/>
   <unicode hex="003B"/>
   <outline>
     <contour>
-      <point x="723" y="713" type="curve" name="hr00" smooth="yes"/>
+      <point x="723" y="713" type="curve" smooth="yes" name="hr00"/>
       <point x="676" y="713"/>
       <point x="638" y="730"/>
       <point x="611" y="763" type="curve" smooth="yes"/>
@@ -19,7 +19,7 @@
       <point x="652" y="1019" type="curve" smooth="yes"/>
       <point x="687" y="1050"/>
       <point x="732" y="1068"/>
-      <point x="779" y="1068" type="curve" name="dv01" smooth="yes"/>
+      <point x="779" y="1068" type="curve" smooth="yes" name="dv01"/>
       <point x="826" y="1068"/>
       <point x="866" y="1051"/>
       <point x="893" y="1020" type="curve" smooth="yes"/>
@@ -42,7 +42,7 @@
       <point x="659" y="0" type="curve" name="ab01"/>
       <point x="640" y="-4"/>
       <point x="630" y="-5"/>
-      <point x="617" y="-5" type="curve" name="ab02" smooth="yes"/>
+      <point x="617" y="-5" type="curve" smooth="yes" name="ab02"/>
       <point x="573" y="-5"/>
       <point x="535" y="9"/>
       <point x="508" y="36" type="curve" smooth="yes"/>
@@ -55,7 +55,7 @@
       <point x="480" y="153" type="curve" smooth="yes"/>
       <point x="496" y="248"/>
       <point x="582" y="312"/>
-      <point x="672" y="312" type="curve" name="sv01" smooth="yes"/>
+      <point x="672" y="312" type="curve" smooth="yes" name="sv01"/>
       <point x="733" y="312"/>
       <point x="776" y="288"/>
       <point x="802" y="241" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/seven.glif b/source/Hack-Italic.ufo/glyphs/seven.glif
index cee653ddd..b9f99d13d 100644
--- a/source/Hack-Italic.ufo/glyphs/seven.glif
+++ b/source/Hack-Italic.ufo/glyphs/seven.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="seven" format="1">
+<glyph name="seven" format="2">
   <advance width="1233"/>
   <unicode hex="0037"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/seven.subs.glif b/source/Hack-Italic.ufo/glyphs/seven.subs.glif
index 6ba4c9569..80455774e 100644
--- a/source/Hack-Italic.ufo/glyphs/seven.subs.glif
+++ b/source/Hack-Italic.ufo/glyphs/seven.subs.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="seven.subs" format="1">
+<glyph name="seven.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/seveneighths.glif b/source/Hack-Italic.ufo/glyphs/seveneighths.glif
index d1efd672b..6d643bc4e 100644
--- a/source/Hack-Italic.ufo/glyphs/seveneighths.glif
+++ b/source/Hack-Italic.ufo/glyphs/seveneighths.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="seveneighths" format="1">
+<glyph name="seveneighths" format="2">
   <advance width="1233"/>
   <unicode hex="215E"/>
   <outline>
@@ -19,56 +19,56 @@
       <point x="70" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="754" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="754" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="572" y="-285"/>
       <point x="458" y="-204"/>
-      <point x="458" y="-71" type="curve" name="dh01" smooth="yes"/>
+      <point x="458" y="-71" type="curve" smooth="yes" name="dh01"/>
       <point x="458" y="53"/>
       <point x="559" y="147"/>
       <point x="719" y="176" type="curve" name="hr02"/>
       <point x="619" y="205"/>
       <point x="574" y="261"/>
-      <point x="574" y="337" type="curve" name="ih01" smooth="yes"/>
+      <point x="574" y="337" type="curve" smooth="yes" name="ih01"/>
       <point x="574" y="473"/>
       <point x="725" y="582"/>
-      <point x="917" y="582" type="curve" name="dv07" smooth="yes"/>
+      <point x="917" y="582" type="curve" smooth="yes" name="dv07"/>
       <point x="1076" y="582"/>
       <point x="1187" y="507"/>
-      <point x="1187" y="398" type="curve" name="sh03" smooth="yes"/>
+      <point x="1187" y="398" type="curve" smooth="yes" name="sh03"/>
       <point x="1187" y="297"/>
       <point x="1093" y="201"/>
       <point x="949" y="169" type="curve" name="hr03"/>
       <point x="1066" y="146"/>
       <point x="1119" y="80"/>
-      <point x="1119" y="-15" type="curve" name="dh04" smooth="yes"/>
+      <point x="1119" y="-15" type="curve" smooth="yes" name="dh04"/>
       <point x="1119" y="-172"/>
       <point x="969" y="-285"/>
     </contour>
     <contour>
-      <point x="853" y="216" type="curve" name="dv05" smooth="yes"/>
+      <point x="853" y="216" type="curve" smooth="yes" name="dv05"/>
       <point x="965" y="216"/>
       <point x="1052" y="291"/>
-      <point x="1052" y="380" type="curve" name="sh02" smooth="yes"/>
+      <point x="1052" y="380" type="curve" smooth="yes" name="sh02"/>
       <point x="1052" y="453"/>
       <point x="994" y="495"/>
-      <point x="905" y="495" type="curve" name="dv06" smooth="yes"/>
+      <point x="905" y="495" type="curve" smooth="yes" name="dv06"/>
       <point x="792" y="495"/>
       <point x="710" y="428"/>
-      <point x="710" y="337" type="curve" name="sh01" smooth="yes"/>
+      <point x="710" y="337" type="curve" smooth="yes" name="sh01"/>
       <point x="710" y="261"/>
       <point x="765" y="216"/>
     </contour>
     <contour>
-      <point x="762" y="-198" type="curve" name="dv02" smooth="yes"/>
+      <point x="762" y="-198" type="curve" smooth="yes" name="dv02"/>
       <point x="893" y="-198"/>
       <point x="982" y="-122"/>
-      <point x="982" y="-14" type="curve" name="dh03" smooth="yes"/>
+      <point x="982" y="-14" type="curve" smooth="yes" name="dh03"/>
       <point x="982" y="77"/>
       <point x="920" y="128"/>
-      <point x="816" y="128" type="curve" name="dv04" smooth="yes"/>
+      <point x="816" y="128" type="curve" smooth="yes" name="dv04"/>
       <point x="685" y="128"/>
       <point x="595" y="44"/>
-      <point x="595" y="-62" type="curve" name="dh02" smooth="yes"/>
+      <point x="595" y="-62" type="curve" smooth="yes" name="dh02"/>
       <point x="595" y="-153"/>
       <point x="659" y="-198"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/shade.glif b/source/Hack-Italic.ufo/glyphs/shade.glif
index edf408aa9..9b35592e0 100644
--- a/source/Hack-Italic.ufo/glyphs/shade.glif
+++ b/source/Hack-Italic.ufo/glyphs/shade.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="shade" format="1">
+<glyph name="shade" format="2">
   <advance width="1233"/>
   <unicode hex="2592"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/sigma.glif b/source/Hack-Italic.ufo/glyphs/sigma.glif
index e5eef4645..9605b6c46 100644
--- a/source/Hack-Italic.ufo/glyphs/sigma.glif
+++ b/source/Hack-Italic.ufo/glyphs/sigma.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="sigma" format="1">
+<glyph name="sigma" format="2">
   <advance width="1233"/>
   <unicode hex="03C3"/>
   <outline>
     <contour>
-      <point x="491" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="491" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="238" y="-29"/>
       <point x="102" y="104"/>
-      <point x="102" y="364" type="curve" name="sh01" smooth="yes"/>
+      <point x="102" y="364" type="curve" smooth="yes" name="sh01"/>
       <point x="102" y="423"/>
       <point x="109" y="488"/>
       <point x="123" y="559" type="curve" smooth="yes"/>
       <point x="196" y="919"/>
       <point x="392" y="1120"/>
-      <point x="711" y="1120" type="curve" name="at01" smooth="yes"/>
+      <point x="711" y="1120" type="curve" smooth="yes" name="at01"/>
       <point x="1226" y="1120" type="line"/>
       <point x="1190" y="936" type="line" name="sv01"/>
       <point x="949" y="936" type="line" name="ih01"/>
       <point x="1045" y="857"/>
       <point x="1083" y="745"/>
-      <point x="1083" y="622" type="curve" name="sh02" smooth="yes"/>
+      <point x="1083" y="622" type="curve" smooth="yes" name="sh02"/>
       <point x="1083" y="442"/>
       <point x="996" y="241"/>
       <point x="874" y="122" type="curve" smooth="yes"/>
@@ -27,13 +27,13 @@
       <point x="644" y="-29"/>
     </contour>
     <contour>
-      <point x="514" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="514" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="707" y="127"/>
       <point x="847" y="297"/>
-      <point x="887" y="559" type="curve" name="sh03" smooth="yes"/>
+      <point x="887" y="559" type="curve" smooth="yes" name="sh03"/>
       <point x="891" y="586"/>
       <point x="894" y="610"/>
-      <point x="894" y="634" type="curve" name="ah01" smooth="yes"/>
+      <point x="894" y="634" type="curve" smooth="yes" name="ah01"/>
       <point x="894" y="716"/>
       <point x="861" y="788"/>
       <point x="749" y="868" type="curve" smooth="yes"/>
@@ -45,7 +45,7 @@
       <point x="318" y="559" type="curve" smooth="yes"/>
       <point x="306" y="496"/>
       <point x="300" y="439"/>
-      <point x="300" y="390" type="curve" name="sh04" smooth="yes"/>
+      <point x="300" y="390" type="curve" smooth="yes" name="sh04"/>
       <point x="300" y="215"/>
       <point x="371" y="127"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/similar.glif b/source/Hack-Italic.ufo/glyphs/similar.glif
index cc9a363a0..d981b64e4 100644
--- a/source/Hack-Italic.ufo/glyphs/similar.glif
+++ b/source/Hack-Italic.ufo/glyphs/similar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="similar" format="1">
+<glyph name="similar" format="2">
   <advance width="1233"/>
   <unicode hex="223C"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="88" y="671" type="line" name="hr00"/>
       <point x="192" y="751"/>
       <point x="284" y="786"/>
-      <point x="393" y="786" type="curve" name="hr01" smooth="yes"/>
+      <point x="393" y="786" type="curve" smooth="yes" name="hr01"/>
       <point x="453" y="786"/>
       <point x="527" y="776"/>
       <point x="623" y="732" type="curve" smooth="yes"/>
@@ -16,14 +16,14 @@
       <point x="655" y="717" type="curve"/>
       <point x="728" y="685"/>
       <point x="790" y="663"/>
-      <point x="862" y="663" type="curve" name="hr02" smooth="yes"/>
+      <point x="862" y="663" type="curve" smooth="yes" name="hr02"/>
       <point x="958" y="663"/>
       <point x="1045" y="702"/>
       <point x="1145" y="786" type="curve"/>
       <point x="1145" y="611" type="line" name="hr03"/>
       <point x="1045" y="531"/>
       <point x="952" y="497"/>
-      <point x="852" y="497" type="curve" name="hr04" smooth="yes"/>
+      <point x="852" y="497" type="curve" smooth="yes" name="hr04"/>
       <point x="776" y="497"/>
       <point x="717" y="517"/>
       <point x="645" y="548" type="curve"/>
@@ -32,7 +32,7 @@
       <point x="612" y="562" type="curve"/>
       <point x="522" y="599"/>
       <point x="468" y="620"/>
-      <point x="385" y="620" type="curve" name="hr05" smooth="yes"/>
+      <point x="385" y="620" type="curve" smooth="yes" name="hr05"/>
       <point x="277" y="620"/>
       <point x="189" y="585"/>
       <point x="88" y="497" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/six.glif b/source/Hack-Italic.ufo/glyphs/six.glif
index 72e67aa3d..7e5207d87 100644
--- a/source/Hack-Italic.ufo/glyphs/six.glif
+++ b/source/Hack-Italic.ufo/glyphs/six.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="six" format="1">
+<glyph name="six" format="2">
   <advance width="1233"/>
   <unicode hex="0036"/>
   <outline>
     <contour>
-      <point x="515" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="515" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="391" y="-29"/>
       <point x="279" y="7"/>
       <point x="202" y="87" type="curve" smooth="yes"/>
       <point x="130" y="162"/>
       <point x="92" y="274"/>
-      <point x="92" y="433" type="curve" name="sh01" smooth="yes"/>
+      <point x="92" y="433" type="curve" smooth="yes" name="sh01"/>
       <point x="92" y="525"/>
       <point x="104" y="645"/>
       <point x="131" y="765" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="489" y="1413" type="curve" smooth="yes"/>
       <point x="590" y="1484"/>
       <point x="709" y="1520"/>
-      <point x="846" y="1520" type="curve" name="sh02" smooth="yes"/>
+      <point x="846" y="1520" type="curve" smooth="yes" name="sh02"/>
       <point x="897" y="1520"/>
       <point x="949" y="1516"/>
       <point x="994" y="1505" type="curve" smooth="yes"/>
@@ -35,7 +35,7 @@
       <point x="966" y="1331" type="curve" smooth="yes"/>
       <point x="921" y="1344"/>
       <point x="872" y="1350"/>
-      <point x="825" y="1350" type="curve" name="sv01" smooth="yes"/>
+      <point x="825" y="1350" type="curve" smooth="yes" name="sv01"/>
       <point x="692" y="1350"/>
       <point x="589" y="1303"/>
       <point x="505" y="1207" type="curve" smooth="yes"/>
@@ -44,13 +44,13 @@
       <point x="324" y="780" type="curve" name="ih01"/>
       <point x="417" y="919"/>
       <point x="538" y="987"/>
-      <point x="696" y="987" type="curve" name="dv03" smooth="yes"/>
+      <point x="696" y="987" type="curve" smooth="yes" name="dv03"/>
       <point x="813" y="987"/>
       <point x="906" y="952"/>
       <point x="967" y="888" type="curve" smooth="yes"/>
       <point x="1034" y="820"/>
       <point x="1063" y="723"/>
-      <point x="1063" y="603" type="curve" name="sh03" smooth="yes"/>
+      <point x="1063" y="603" type="curve" smooth="yes" name="sh03"/>
       <point x="1063" y="531"/>
       <point x="1052" y="453"/>
       <point x="1023" y="366" type="curve" smooth="yes"/>
@@ -64,25 +64,25 @@
       <point x="603" y="-29"/>
     </contour>
     <contour>
-      <point x="521" y="129" type="curve" name="dv01" smooth="yes"/>
+      <point x="521" y="129" type="curve" smooth="yes" name="dv01"/>
       <point x="610" y="129"/>
       <point x="697" y="171"/>
       <point x="764" y="263" type="curve" smooth="yes"/>
       <point x="827" y="351"/>
       <point x="860" y="466"/>
-      <point x="860" y="583" type="curve" name="ah01" smooth="yes"/>
+      <point x="860" y="583" type="curve" smooth="yes" name="ah01"/>
       <point x="860" y="666"/>
       <point x="843" y="726"/>
       <point x="802" y="769" type="curve" smooth="yes"/>
       <point x="763" y="809"/>
       <point x="704" y="829"/>
-      <point x="639" y="829" type="curve" name="dv02" smooth="yes"/>
+      <point x="639" y="829" type="curve" smooth="yes" name="dv02"/>
       <point x="539" y="829"/>
       <point x="454" y="783"/>
       <point x="391" y="703" type="curve" smooth="yes"/>
       <point x="326" y="619"/>
       <point x="293" y="507"/>
-      <point x="293" y="394" type="curve" name="sh04" smooth="yes"/>
+      <point x="293" y="394" type="curve" smooth="yes" name="sh04"/>
       <point x="293" y="306"/>
       <point x="313" y="243"/>
       <point x="353" y="198" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/six.subs.glif b/source/Hack-Italic.ufo/glyphs/six.subs.glif
index 45c258716..b02da9080 100644
--- a/source/Hack-Italic.ufo/glyphs/six.subs.glif
+++ b/source/Hack-Italic.ufo/glyphs/six.subs.glif
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="six.subs" format="1">
+<glyph name="six.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="634" y="-415" type="curve" name="hr00" smooth="yes"/>
+      <point x="634" y="-415" type="curve" smooth="yes" name="hr00"/>
       <point x="455" y="-415"/>
       <point x="354" y="-329"/>
-      <point x="354" y="-153" type="curve" name="sh01" smooth="yes"/>
+      <point x="354" y="-153" type="curve" smooth="yes" name="sh01"/>
       <point x="354" y="-46"/>
       <point x="391" y="103"/>
       <point x="452" y="212" type="curve"/>
       <point x="540" y="373"/>
       <point x="677" y="452"/>
-      <point x="860" y="452" type="curve" name="sh02" smooth="yes"/>
+      <point x="860" y="452" type="curve" smooth="yes" name="sh02"/>
       <point x="931" y="452"/>
       <point x="994" y="440"/>
       <point x="1050" y="419" type="curve"/>
       <point x="1026" y="315" type="line"/>
       <point x="974" y="342"/>
       <point x="912" y="357"/>
-      <point x="847" y="357" type="curve" name="dv02" smooth="yes"/>
+      <point x="847" y="357" type="curve" smooth="yes" name="dv02"/>
       <point x="672" y="357"/>
       <point x="559" y="250"/>
       <point x="510" y="37" type="curve" name="ih01"/>
       <point x="575" y="118"/>
       <point x="655" y="154"/>
-      <point x="760" y="154" type="curve" name="dv04" smooth="yes"/>
+      <point x="760" y="154" type="curve" smooth="yes" name="dv04"/>
       <point x="913" y="154"/>
       <point x="1006" y="79"/>
-      <point x="1006" y="-61" type="curve" name="sh03" smooth="yes"/>
+      <point x="1006" y="-61" type="curve" smooth="yes" name="sh03"/>
       <point x="1006" y="-146"/>
       <point x="971" y="-239"/>
       <point x="907" y="-307" type="curve" smooth="yes"/>
@@ -36,16 +36,16 @@
       <point x="738" y="-415"/>
     </contour>
     <contour>
-      <point x="639" y="-327" type="curve" name="dv01" smooth="yes"/>
+      <point x="639" y="-327" type="curve" smooth="yes" name="dv01"/>
       <point x="781" y="-327"/>
       <point x="870" y="-201"/>
-      <point x="870" y="-77" type="curve" name="ah01" smooth="yes"/>
+      <point x="870" y="-77" type="curve" smooth="yes" name="ah01"/>
       <point x="870" y="20"/>
       <point x="817" y="65"/>
-      <point x="725" y="65" type="curve" name="dv03" smooth="yes"/>
+      <point x="725" y="65" type="curve" smooth="yes" name="dv03"/>
       <point x="580" y="65"/>
       <point x="489" y="-51"/>
-      <point x="489" y="-175" type="curve" name="sh04" smooth="yes"/>
+      <point x="489" y="-175" type="curve" smooth="yes" name="sh04"/>
       <point x="489" y="-275"/>
       <point x="547" y="-327"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/slash.glif b/source/Hack-Italic.ufo/glyphs/slash.glif
index f90c20da3..ef3439934 100644
--- a/source/Hack-Italic.ufo/glyphs/slash.glif
+++ b/source/Hack-Italic.ufo/glyphs/slash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="slash" format="1">
+<glyph name="slash" format="2">
   <advance width="1233"/>
   <unicode hex="002F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/space.glif b/source/Hack-Italic.ufo/glyphs/space.glif
index 6b1fa9261..13665e890 100644
--- a/source/Hack-Italic.ufo/glyphs/space.glif
+++ b/source/Hack-Italic.ufo/glyphs/space.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="space" format="1">
+<glyph name="space" format="2">
   <advance width="1233"/>
   <unicode hex="0020"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/sterling.glif b/source/Hack-Italic.ufo/glyphs/sterling.glif
index 5c323d428..72fbb32a1 100644
--- a/source/Hack-Italic.ufo/glyphs/sterling.glif
+++ b/source/Hack-Italic.ufo/glyphs/sterling.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="sterling" format="1">
+<glyph name="sterling" format="2">
   <advance width="1233"/>
   <unicode hex="00A3"/>
   <outline>
@@ -16,10 +16,10 @@
       <point x="608" y="1397" type="curve" smooth="yes"/>
       <point x="692" y="1476"/>
       <point x="808" y="1520"/>
-      <point x="957" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="957" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1006" y="1520"/>
       <point x="1051" y="1515"/>
-      <point x="1092" y="1506" type="curve" name="at02" smooth="yes"/>
+      <point x="1092" y="1506" type="curve" smooth="yes" name="at02"/>
       <point x="1119" y="1499"/>
       <point x="1176" y="1483"/>
       <point x="1229" y="1462" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/suchthat.glif b/source/Hack-Italic.ufo/glyphs/suchthat.glif
index 65a31a0dc..e53517a81 100644
--- a/source/Hack-Italic.ufo/glyphs/suchthat.glif
+++ b/source/Hack-Italic.ufo/glyphs/suchthat.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="suchthat" format="1">
+<glyph name="suchthat" format="2">
   <advance width="1233"/>
   <unicode hex="220B"/>
   <outline>
@@ -20,10 +20,10 @@
       <point x="768" y="1219" type="curve" smooth="yes"/>
       <point x="717" y="1269"/>
       <point x="661" y="1294"/>
-      <point x="602" y="1294" type="curve" name="dv01" smooth="yes"/>
+      <point x="602" y="1294" type="curve" smooth="yes" name="dv01"/>
       <point x="130" y="1294" type="line"/>
       <point x="130" y="1464" type="line"/>
-      <point x="602" y="1464" type="line" name="dv02" smooth="yes"/>
+      <point x="602" y="1464" type="line" smooth="yes" name="dv02"/>
       <point x="783" y="1464"/>
       <point x="949" y="1324"/>
       <point x="1037" y="1100" type="curve" smooth="yes"/>
@@ -35,7 +35,7 @@
       <point x="855" y="98" type="curve" smooth="yes"/>
       <point x="779" y="34"/>
       <point x="694" y="0"/>
-      <point x="602" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="602" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="130" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/summation.glif b/source/Hack-Italic.ufo/glyphs/summation.glif
index c8abb7c0c..80c2d4267 100644
--- a/source/Hack-Italic.ufo/glyphs/summation.glif
+++ b/source/Hack-Italic.ufo/glyphs/summation.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="summation" format="1">
+<glyph name="summation" format="2">
   <advance width="1233"/>
   <unicode hex="2211"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/t.glif b/source/Hack-Italic.ufo/glyphs/t.glif
index 8f1f0a60a..9b48618ca 100644
--- a/source/Hack-Italic.ufo/glyphs/t.glif
+++ b/source/Hack-Italic.ufo/glyphs/t.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="t" format="1">
+<glyph name="t" format="2">
   <advance width="1233"/>
   <unicode hex="0074"/>
   <outline>
@@ -33,9 +33,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/tau.glif b/source/Hack-Italic.ufo/glyphs/tau.glif
index 17ac100a7..bf556e4f1 100644
--- a/source/Hack-Italic.ufo/glyphs/tau.glif
+++ b/source/Hack-Italic.ufo/glyphs/tau.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="tau" format="1">
+<glyph name="tau" format="2">
   <advance width="1233"/>
   <unicode hex="03C4"/>
   <outline>
     <contour>
-      <point x="726" y="0" type="line" name="hr00" smooth="yes"/>
+      <point x="726" y="0" type="line" smooth="yes" name="hr00"/>
       <point x="533" y="0"/>
       <point x="444" y="79"/>
-      <point x="444" y="254" type="curve" name="dh01" smooth="yes"/>
+      <point x="444" y="254" type="curve" smooth="yes" name="dh01"/>
       <point x="444" y="299"/>
       <point x="450" y="349"/>
       <point x="461" y="406" type="curve" smooth="yes"/>
@@ -20,13 +20,13 @@
       <point x="646" y="395" type="line" smooth="yes"/>
       <point x="636" y="344"/>
       <point x="631" y="302"/>
-      <point x="631" y="270" type="curve" name="dh02" smooth="yes"/>
+      <point x="631" y="270" type="curve" smooth="yes" name="dh02"/>
       <point x="631" y="241"/>
       <point x="635" y="219"/>
       <point x="643" y="204" type="curve" smooth="yes"/>
       <point x="661" y="172"/>
       <point x="706" y="156"/>
-      <point x="778" y="156" type="curve" name="sv04" smooth="yes"/>
+      <point x="778" y="156" type="curve" smooth="yes" name="sv04"/>
       <point x="866" y="156" type="line" name="sv05"/>
       <point x="836" y="0" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/tbar.glif b/source/Hack-Italic.ufo/glyphs/tbar.glif
index 97b866120..94e5560b3 100644
--- a/source/Hack-Italic.ufo/glyphs/tbar.glif
+++ b/source/Hack-Italic.ufo/glyphs/tbar.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="tbar" format="1">
+<glyph name="tbar" format="2">
   <advance width="1233"/>
   <unicode hex="0167"/>
   <outline>
     <contour>
-      <point x="667" y="-4" type="line" name="ab01" smooth="yes"/>
+      <point x="667" y="-4" type="line" smooth="yes" name="ab01"/>
       <point x="530" y="-4"/>
       <point x="440" y="22"/>
       <point x="392" y="79" type="curve" smooth="yes"/>
       <point x="360" y="118"/>
       <point x="348" y="168"/>
-      <point x="348" y="232" type="curve" name="dh01" smooth="yes"/>
+      <point x="348" y="232" type="curve" smooth="yes" name="dh01"/>
       <point x="348" y="275"/>
       <point x="353" y="316"/>
       <point x="362" y="365" type="curve" smooth="yes"/>
@@ -35,13 +35,13 @@
       <point x="546" y="365" type="line" smooth="yes"/>
       <point x="540" y="332"/>
       <point x="537" y="303"/>
-      <point x="537" y="279" type="curve" name="dh02" smooth="yes"/>
+      <point x="537" y="279" type="curve" smooth="yes" name="dh02"/>
       <point x="537" y="240"/>
       <point x="544" y="211"/>
       <point x="559" y="192" type="curve" smooth="yes"/>
       <point x="584" y="159"/>
       <point x="635" y="143"/>
-      <point x="714" y="143" type="curve" name="sv07" smooth="yes"/>
+      <point x="714" y="143" type="curve" smooth="yes" name="sv07"/>
       <point x="921" y="143" type="line" name="sv08"/>
       <point x="892" y="-4" type="line" name="ab02"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/tcaron.glif b/source/Hack-Italic.ufo/glyphs/tcaron.glif
index 5e9c287a7..9a505f3af 100644
--- a/source/Hack-Italic.ufo/glyphs/tcaron.glif
+++ b/source/Hack-Italic.ufo/glyphs/tcaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="tcaron" format="1">
+<glyph name="tcaron" format="2">
   <advance width="1233"/>
   <unicode hex="0165"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="918" y="1304" type="line"/>
     </contour>
     <contour>
-      <point x="682" y="-4" type="line" name="ab01" smooth="yes"/>
+      <point x="682" y="-4" type="line" smooth="yes" name="ab01"/>
       <point x="563" y="-4"/>
       <point x="488" y="17"/>
       <point x="437" y="52" type="curve" smooth="yes"/>
       <point x="384" y="89"/>
       <point x="358" y="142"/>
-      <point x="358" y="222" type="curve" name="dh01" smooth="yes"/>
+      <point x="358" y="222" type="curve" smooth="yes" name="dh01"/>
       <point x="358" y="238"/>
       <point x="359" y="261"/>
       <point x="362" y="284" type="curve" smooth="yes"/>
@@ -39,13 +39,13 @@
       <point x="550" y="310" type="curve" name="sh01"/>
       <point x="548" y="293"/>
       <point x="547" y="277"/>
-      <point x="547" y="263" type="curve" name="dh02" smooth="yes"/>
+      <point x="547" y="263" type="curve" smooth="yes" name="dh02"/>
       <point x="547" y="218"/>
       <point x="560" y="187"/>
       <point x="586" y="170" type="curve" smooth="yes"/>
       <point x="612" y="152"/>
       <point x="659" y="143"/>
-      <point x="727" y="143" type="curve" name="sv05" smooth="yes"/>
+      <point x="727" y="143" type="curve" smooth="yes" name="sv05"/>
       <point x="934" y="143" type="line"/>
       <point x="905" y="-4" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/therefore.glif b/source/Hack-Italic.ufo/glyphs/therefore.glif
index d8f51a54e..06ef15899 100644
--- a/source/Hack-Italic.ufo/glyphs/therefore.glif
+++ b/source/Hack-Italic.ufo/glyphs/therefore.glif
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="therefore" format="1">
+<glyph name="therefore" format="2">
   <advance width="1233"/>
   <unicode hex="2234"/>
   <outline>
     <contour>
-      <point x="518" y="851" type="line" name="hr00" smooth="yes"/>
+      <point x="518" y="851" type="line" smooth="yes" name="hr00"/>
       <point x="498" y="851"/>
       <point x="488" y="861"/>
-      <point x="488" y="881" type="curve" name="dh03" smooth="yes"/>
+      <point x="488" y="881" type="curve" smooth="yes" name="dh03"/>
       <point x="488" y="1126" type="line" smooth="yes"/>
       <point x="488" y="1146"/>
       <point x="498" y="1156"/>
-      <point x="518" y="1156" type="curve" name="dv03" smooth="yes"/>
+      <point x="518" y="1156" type="curve" smooth="yes" name="dv03"/>
       <point x="710" y="1156" type="line" smooth="yes"/>
       <point x="730" y="1156"/>
       <point x="740" y="1146"/>
       <point x="740" y="1126" type="curve" smooth="yes"/>
-      <point x="740" y="881" type="line" name="dh04" smooth="yes"/>
+      <point x="740" y="881" type="line" smooth="yes" name="dh04"/>
       <point x="740" y="861"/>
       <point x="730" y="851"/>
       <point x="710" y="851" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="217" y="134" type="line" name="dv01" smooth="yes"/>
+      <point x="217" y="134" type="line" smooth="yes" name="dv01"/>
       <point x="197" y="134"/>
       <point x="187" y="144"/>
-      <point x="187" y="164" type="curve" name="dh01" smooth="yes"/>
+      <point x="187" y="164" type="curve" smooth="yes" name="dh01"/>
       <point x="187" y="409" type="line" smooth="yes"/>
       <point x="187" y="429"/>
       <point x="197" y="439"/>
-      <point x="217" y="439" type="curve" name="dv02" smooth="yes"/>
+      <point x="217" y="439" type="curve" smooth="yes" name="dv02"/>
       <point x="409" y="439" type="line" smooth="yes"/>
       <point x="429" y="439"/>
       <point x="439" y="429"/>
       <point x="439" y="409" type="curve" smooth="yes"/>
-      <point x="439" y="164" type="line" name="dh02" smooth="yes"/>
+      <point x="439" y="164" type="line" smooth="yes" name="dh02"/>
       <point x="439" y="144"/>
       <point x="429" y="134"/>
       <point x="409" y="134" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="827" y="134" type="line" name="sv01" smooth="yes"/>
+      <point x="827" y="134" type="line" smooth="yes" name="sv01"/>
       <point x="807" y="134"/>
       <point x="797" y="144"/>
-      <point x="797" y="164" type="curve" name="dh05" smooth="yes"/>
+      <point x="797" y="164" type="curve" smooth="yes" name="dh05"/>
       <point x="797" y="409" type="line" smooth="yes"/>
       <point x="797" y="429"/>
       <point x="807" y="439"/>
-      <point x="827" y="439" type="curve" name="sv02" smooth="yes"/>
+      <point x="827" y="439" type="curve" smooth="yes" name="sv02"/>
       <point x="1019" y="439" type="line" smooth="yes"/>
       <point x="1039" y="439"/>
       <point x="1049" y="429"/>
       <point x="1049" y="409" type="curve" smooth="yes"/>
-      <point x="1049" y="164" type="line" name="dh06" smooth="yes"/>
+      <point x="1049" y="164" type="line" smooth="yes" name="dh06"/>
       <point x="1049" y="144"/>
       <point x="1039" y="134"/>
       <point x="1019" y="134" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/theta.glif b/source/Hack-Italic.ufo/glyphs/theta.glif
index 8122a854c..d2ac161e3 100644
--- a/source/Hack-Italic.ufo/glyphs/theta.glif
+++ b/source/Hack-Italic.ufo/glyphs/theta.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="theta" format="1">
+<glyph name="theta" format="2">
   <advance width="1233"/>
   <unicode hex="03B8"/>
   <outline>
     <contour>
-      <point x="497" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="497" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="257" y="-29"/>
       <point x="134" y="128"/>
-      <point x="134" y="429" type="curve" name="sh01" smooth="yes"/>
+      <point x="134" y="429" type="curve" smooth="yes" name="sh01"/>
       <point x="134" y="518"/>
       <point x="145" y="621"/>
       <point x="167" y="736" type="curve" smooth="yes"/>
@@ -16,10 +16,10 @@
       <point x="401" y="1304" type="curve" smooth="yes"/>
       <point x="508" y="1435"/>
       <point x="639" y="1500"/>
-      <point x="793" y="1500" type="curve" name="at01" smooth="yes"/>
+      <point x="793" y="1500" type="curve" smooth="yes" name="at01"/>
       <point x="1037" y="1500"/>
       <point x="1159" y="1341"/>
-      <point x="1159" y="1040" type="curve" name="sh02" smooth="yes"/>
+      <point x="1159" y="1040" type="curve" smooth="yes" name="sh02"/>
       <point x="1159" y="950"/>
       <point x="1148" y="849"/>
       <point x="1126" y="736" type="curve" smooth="yes"/>
@@ -30,23 +30,23 @@
       <point x="947" y="828" type="line" name="dv03"/>
       <point x="959" y="903"/>
       <point x="966" y="970"/>
-      <point x="966" y="1033" type="curve" name="ah01" smooth="yes"/>
+      <point x="966" y="1033" type="curve" smooth="yes" name="ah01"/>
       <point x="966" y="1221"/>
       <point x="906" y="1342"/>
-      <point x="764" y="1342" type="curve" name="sv01" smooth="yes"/>
+      <point x="764" y="1342" type="curve" smooth="yes" name="sv01"/>
       <point x="577" y="1342"/>
       <point x="449" y="1129"/>
       <point x="382" y="828" type="curve"/>
     </contour>
     <contour>
-      <point x="528" y="129" type="curve" name="dv01" smooth="yes"/>
+      <point x="528" y="129" type="curve" smooth="yes" name="dv01"/>
       <point x="716" y="129"/>
       <point x="847" y="345"/>
       <point x="911" y="644" type="curve" name="dv02"/>
       <point x="346" y="644" type="line"/>
       <point x="334" y="569"/>
       <point x="327" y="501"/>
-      <point x="327" y="440" type="curve" name="sh03" smooth="yes"/>
+      <point x="327" y="440" type="curve" smooth="yes" name="sh03"/>
       <point x="327" y="251"/>
       <point x="387" y="129"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/thorn.glif b/source/Hack-Italic.ufo/glyphs/thorn.glif
index 032824ab0..8628b8d5c 100644
--- a/source/Hack-Italic.ufo/glyphs/thorn.glif
+++ b/source/Hack-Italic.ufo/glyphs/thorn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="thorn" format="1">
+<glyph name="thorn" format="2">
   <advance width="1233"/>
   <unicode hex="00FE"/>
   <outline>
@@ -9,13 +9,13 @@
       <point x="455" y="977" type="line" name="iv01"/>
       <point x="536" y="1086"/>
       <point x="655" y="1147"/>
-      <point x="788" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="788" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="889" y="1147"/>
       <point x="979" y="1115"/>
       <point x="1040" y="1043" type="curve" smooth="yes"/>
       <point x="1100" y="974"/>
       <point x="1128" y="873"/>
-      <point x="1128" y="744" type="curve" name="dh02" smooth="yes"/>
+      <point x="1128" y="744" type="curve" smooth="yes" name="dh02"/>
       <point x="1128" y="659"/>
       <point x="1116" y="561"/>
       <point x="1089" y="465" type="curve" smooth="yes"/>
@@ -27,7 +27,7 @@
       <point x="802" y="32" type="curve" smooth="yes"/>
       <point x="735" y="-9"/>
       <point x="660" y="-29"/>
-      <point x="578" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="578" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="511" y="-29"/>
       <point x="455" y="-15"/>
       <point x="408" y="13" type="curve" smooth="yes"/>
@@ -38,7 +38,7 @@
       <point x="-2" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="567" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="567" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="624" y="127"/>
       <point x="675" y="144"/>
       <point x="718" y="172" type="curve" smooth="yes"/>
@@ -50,13 +50,13 @@
       <point x="906" y="509" type="curve" smooth="yes"/>
       <point x="925" y="586"/>
       <point x="934" y="664"/>
-      <point x="934" y="731" type="curve" name="dh01" smooth="yes"/>
+      <point x="934" y="731" type="curve" smooth="yes" name="dh01"/>
       <point x="934" y="828"/>
       <point x="915" y="889"/>
       <point x="883" y="928" type="curve" smooth="yes"/>
       <point x="847" y="972"/>
       <point x="793" y="991"/>
-      <point x="728" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="728" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="673" y="991"/>
       <point x="622" y="976"/>
       <point x="576" y="946" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/three.glif b/source/Hack-Italic.ufo/glyphs/three.glif
index 1f7c77369..d642782e6 100644
--- a/source/Hack-Italic.ufo/glyphs/three.glif
+++ b/source/Hack-Italic.ufo/glyphs/three.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="three" format="1">
+<glyph name="three" format="2">
   <advance width="1233"/>
   <unicode hex="0033"/>
   <outline>
     <contour>
-      <point x="383" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="383" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="307" y="-29"/>
       <point x="247" y="-22"/>
       <point x="179" y="-10" type="curve" smooth="yes"/>
@@ -14,31 +14,31 @@
       <point x="20" y="246" type="line"/>
       <point x="142" y="176"/>
       <point x="268" y="141"/>
-      <point x="398" y="141" type="curve" name="dv02" smooth="yes"/>
+      <point x="398" y="141" type="curve" smooth="yes" name="dv02"/>
       <point x="644" y="141"/>
       <point x="805" y="280"/>
-      <point x="805" y="475" type="curve" name="dh01" smooth="yes"/>
+      <point x="805" y="475" type="curve" smooth="yes" name="dh01"/>
       <point x="805" y="558"/>
       <point x="779" y="616"/>
       <point x="734" y="655" type="curve" smooth="yes"/>
       <point x="687" y="695"/>
       <point x="617" y="715"/>
-      <point x="524" y="715" type="curve" name="dv03" smooth="yes"/>
+      <point x="524" y="715" type="curve" smooth="yes" name="dv03"/>
       <point x="371" y="715" type="line"/>
       <point x="403" y="881" type="line"/>
-      <point x="557" y="881" type="line" name="dv04" smooth="yes"/>
+      <point x="557" y="881" type="line" smooth="yes" name="dv04"/>
       <point x="658" y="881"/>
       <point x="745" y="906"/>
       <point x="808" y="955" type="curve" smooth="yes"/>
       <point x="868" y="1002"/>
       <point x="901" y="1070"/>
-      <point x="901" y="1157" type="curve" name="ih01" smooth="yes"/>
+      <point x="901" y="1157" type="curve" smooth="yes" name="ih01"/>
       <point x="901" y="1228"/>
       <point x="878" y="1274"/>
       <point x="839" y="1303" type="curve" smooth="yes"/>
       <point x="798" y="1334"/>
       <point x="735" y="1350"/>
-      <point x="650" y="1350" type="curve" name="sv01" smooth="yes"/>
+      <point x="650" y="1350" type="curve" smooth="yes" name="sv01"/>
       <point x="593" y="1350"/>
       <point x="535" y="1343"/>
       <point x="470" y="1330" type="curve" smooth="yes"/>
@@ -51,13 +51,13 @@
       <point x="517" y="1505" type="curve"/>
       <point x="573" y="1514"/>
       <point x="641" y="1520"/>
-      <point x="697" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="697" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="821" y="1520"/>
       <point x="922" y="1492"/>
-      <point x="994" y="1433" type="curve" name="hr02" smooth="yes"/>
+      <point x="994" y="1433" type="curve" smooth="yes" name="hr02"/>
       <point x="1063" y="1377"/>
       <point x="1102" y="1295"/>
-      <point x="1102" y="1187" type="curve" name="sh01" smooth="yes"/>
+      <point x="1102" y="1187" type="curve" smooth="yes" name="sh01"/>
       <point x="1102" y="1091"/>
       <point x="1073" y="1005"/>
       <point x="1013" y="936" type="curve" smooth="yes"/>
@@ -69,7 +69,7 @@
       <point x="940" y="697" type="curve" smooth="yes"/>
       <point x="983" y="641"/>
       <point x="1004" y="576"/>
-      <point x="1004" y="484" type="curve" name="dh02" smooth="yes"/>
+      <point x="1004" y="484" type="curve" smooth="yes" name="dh02"/>
       <point x="1004" y="335"/>
       <point x="949" y="209"/>
       <point x="837" y="113" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/three.subs.glif b/source/Hack-Italic.ufo/glyphs/three.subs.glif
index 2e4376543..be2ef00b7 100644
--- a/source/Hack-Italic.ufo/glyphs/three.subs.glif
+++ b/source/Hack-Italic.ufo/glyphs/three.subs.glif
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="three.subs" format="1">
+<glyph name="three.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="536" y="-425" type="curve" name="dv01" smooth="yes"/>
+      <point x="536" y="-425" type="curve" smooth="yes" name="dv01"/>
       <point x="452" y="-425"/>
       <point x="367" y="-411"/>
       <point x="287" y="-384" type="curve"/>
       <point x="311" y="-263" type="line"/>
       <point x="400" y="-302"/>
       <point x="464" y="-318"/>
-      <point x="536" y="-318" type="curve" name="hr01" smooth="yes"/>
+      <point x="536" y="-318" type="curve" smooth="yes" name="hr01"/>
       <point x="680" y="-318"/>
       <point x="774" y="-252"/>
-      <point x="774" y="-144" type="curve" name="dh01" smooth="yes"/>
+      <point x="774" y="-144" type="curve" smooth="yes" name="dh01"/>
       <point x="774" y="-59"/>
       <point x="716" y="-17"/>
-      <point x="600" y="-17" type="curve" name="ab01" smooth="yes"/>
+      <point x="600" y="-17" type="curve" smooth="yes" name="ab01"/>
       <point x="528" y="-17" type="line"/>
       <point x="549" y="89" type="line" name="sv01"/>
       <point x="621" y="89" type="line" smooth="yes"/>
       <point x="751" y="89"/>
       <point x="836" y="148"/>
-      <point x="836" y="232" type="curve" name="sh01" smooth="yes"/>
+      <point x="836" y="232" type="curve" smooth="yes" name="sh01"/>
       <point x="836" y="301"/>
       <point x="778" y="335"/>
-      <point x="671" y="335" type="curve" name="dv02" smooth="yes"/>
+      <point x="671" y="335" type="curve" smooth="yes" name="dv02"/>
       <point x="604" y="335"/>
       <point x="545" y="323"/>
       <point x="461" y="292" type="curve"/>
       <point x="483" y="407" type="line"/>
       <point x="580" y="430"/>
       <point x="661" y="442"/>
-      <point x="728" y="442" type="curve" name="hr02" smooth="yes"/>
+      <point x="728" y="442" type="curve" smooth="yes" name="hr02"/>
       <point x="895" y="442"/>
       <point x="983" y="372"/>
-      <point x="983" y="255" type="curve" name="sh02" smooth="yes"/>
+      <point x="983" y="255" type="curve" smooth="yes" name="sh02"/>
       <point x="983" y="144"/>
       <point x="904" y="63"/>
       <point x="772" y="38" type="curve" name="iv01"/>
       <point x="871" y="21"/>
       <point x="922" y="-40"/>
-      <point x="922" y="-140" type="curve" name="dh02" smooth="yes"/>
+      <point x="922" y="-140" type="curve" smooth="yes" name="dh02"/>
       <point x="922" y="-311"/>
       <point x="772" y="-425"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/threeeighths.glif b/source/Hack-Italic.ufo/glyphs/threeeighths.glif
index c080dd694..fc67f96e1 100644
--- a/source/Hack-Italic.ufo/glyphs/threeeighths.glif
+++ b/source/Hack-Italic.ufo/glyphs/threeeighths.glif
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="threeeighths" format="1">
+<glyph name="threeeighths" format="2">
   <advance width="1233"/>
   <unicode hex="215C"/>
   <outline>
     <contour>
-      <point x="308" y="809" type="curve" name="dv09" smooth="yes"/>
+      <point x="308" y="809" type="curve" smooth="yes" name="dv09"/>
       <point x="224" y="809"/>
       <point x="139" y="823"/>
       <point x="59" y="850" type="curve"/>
       <point x="83" y="971" type="line"/>
       <point x="172" y="932"/>
       <point x="236" y="916"/>
-      <point x="308" y="916" type="curve" name="dv10" smooth="yes"/>
+      <point x="308" y="916" type="curve" smooth="yes" name="dv10"/>
       <point x="452" y="916"/>
       <point x="546" y="982"/>
-      <point x="546" y="1090" type="curve" name="ih01" smooth="yes"/>
+      <point x="546" y="1090" type="curve" smooth="yes" name="ih01"/>
       <point x="546" y="1175"/>
       <point x="488" y="1217"/>
-      <point x="372" y="1217" type="curve" name="dv06" smooth="yes"/>
+      <point x="372" y="1217" type="curve" smooth="yes" name="dv06"/>
       <point x="300" y="1217" type="line"/>
       <point x="321" y="1323" type="line"/>
-      <point x="393" y="1323" type="line" name="hr01" smooth="yes"/>
+      <point x="393" y="1323" type="line" smooth="yes" name="hr01"/>
       <point x="523" y="1323"/>
       <point x="608" y="1382"/>
-      <point x="608" y="1466" type="curve" name="sh01" smooth="yes"/>
+      <point x="608" y="1466" type="curve" smooth="yes" name="sh01"/>
       <point x="608" y="1535"/>
       <point x="550" y="1569"/>
-      <point x="443" y="1569" type="curve" name="dv03" smooth="yes"/>
+      <point x="443" y="1569" type="curve" smooth="yes" name="dv03"/>
       <point x="376" y="1569"/>
       <point x="317" y="1557"/>
       <point x="233" y="1526" type="curve"/>
       <point x="255" y="1641" type="line"/>
       <point x="352" y="1664"/>
       <point x="433" y="1676"/>
-      <point x="500" y="1676" type="curve" name="hr02" smooth="yes"/>
+      <point x="500" y="1676" type="curve" smooth="yes" name="hr02"/>
       <point x="667" y="1676"/>
       <point x="755" y="1606"/>
-      <point x="755" y="1489" type="curve" name="sh02" smooth="yes"/>
+      <point x="755" y="1489" type="curve" smooth="yes" name="sh02"/>
       <point x="755" y="1378"/>
       <point x="676" y="1297"/>
       <point x="544" y="1272" type="curve" name="ih02"/>
       <point x="643" y="1255"/>
       <point x="694" y="1194"/>
-      <point x="694" y="1094" type="curve" name="sh03" smooth="yes"/>
+      <point x="694" y="1094" type="curve" smooth="yes" name="sh03"/>
       <point x="694" y="923"/>
       <point x="544" y="809"/>
     </contour>
@@ -53,39 +53,39 @@
       <point x="70" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="754" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="754" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="572" y="-285"/>
       <point x="458" y="-204"/>
-      <point x="458" y="-71" type="curve" name="dh01" smooth="yes"/>
+      <point x="458" y="-71" type="curve" smooth="yes" name="dh01"/>
       <point x="458" y="53"/>
       <point x="559" y="147"/>
       <point x="719" y="176" type="curve" name="ih03"/>
       <point x="619" y="205"/>
       <point x="574" y="261"/>
-      <point x="574" y="337" type="curve" name="hr04" smooth="yes"/>
+      <point x="574" y="337" type="curve" smooth="yes" name="hr04"/>
       <point x="574" y="473"/>
       <point x="725" y="582"/>
-      <point x="917" y="582" type="curve" name="dv08" smooth="yes"/>
+      <point x="917" y="582" type="curve" smooth="yes" name="dv08"/>
       <point x="1076" y="582"/>
       <point x="1187" y="507"/>
-      <point x="1187" y="398" type="curve" name="hr05" smooth="yes"/>
+      <point x="1187" y="398" type="curve" smooth="yes" name="hr05"/>
       <point x="1187" y="297"/>
       <point x="1093" y="201"/>
       <point x="949" y="169" type="curve" name="ih04"/>
       <point x="1066" y="146"/>
       <point x="1119" y="80"/>
-      <point x="1119" y="-15" type="curve" name="dh03" smooth="yes"/>
+      <point x="1119" y="-15" type="curve" smooth="yes" name="dh03"/>
       <point x="1119" y="-172"/>
       <point x="969" y="-285"/>
     </contour>
     <contour>
-      <point x="853" y="216" type="curve" name="dv05" smooth="yes"/>
+      <point x="853" y="216" type="curve" smooth="yes" name="dv05"/>
       <point x="965" y="216"/>
       <point x="1052" y="291"/>
-      <point x="1052" y="380" type="curve" name="sh04" smooth="yes"/>
+      <point x="1052" y="380" type="curve" smooth="yes" name="sh04"/>
       <point x="1052" y="453"/>
       <point x="994" y="495"/>
-      <point x="905" y="495" type="curve" name="dv07" smooth="yes"/>
+      <point x="905" y="495" type="curve" smooth="yes" name="dv07"/>
       <point x="792" y="495"/>
       <point x="710" y="428"/>
       <point x="710" y="337" type="curve" smooth="yes"/>
@@ -93,16 +93,16 @@
       <point x="765" y="216"/>
     </contour>
     <contour>
-      <point x="762" y="-198" type="curve" name="dv02" smooth="yes"/>
+      <point x="762" y="-198" type="curve" smooth="yes" name="dv02"/>
       <point x="893" y="-198"/>
       <point x="982" y="-122"/>
-      <point x="982" y="-14" type="curve" name="dh02" smooth="yes"/>
+      <point x="982" y="-14" type="curve" smooth="yes" name="dh02"/>
       <point x="982" y="77"/>
       <point x="920" y="128"/>
-      <point x="816" y="128" type="curve" name="dv04" smooth="yes"/>
+      <point x="816" y="128" type="curve" smooth="yes" name="dv04"/>
       <point x="685" y="128"/>
       <point x="595" y="44"/>
-      <point x="595" y="-62" type="curve" name="hr06" smooth="yes"/>
+      <point x="595" y="-62" type="curve" smooth="yes" name="hr06"/>
       <point x="595" y="-153"/>
       <point x="659" y="-198"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/threequarters.glif b/source/Hack-Italic.ufo/glyphs/threequarters.glif
index e72b7525b..51e2c3d9f 100644
--- a/source/Hack-Italic.ufo/glyphs/threequarters.glif
+++ b/source/Hack-Italic.ufo/glyphs/threequarters.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="threequarters" format="1">
+<glyph name="threequarters" format="2">
   <advance width="1233"/>
   <unicode hex="00BE"/>
   <outline>
     <contour>
-      <point x="313" y="809" type="curve" name="dv06" smooth="yes"/>
+      <point x="313" y="809" type="curve" smooth="yes" name="dv06"/>
       <point x="223" y="809"/>
       <point x="141" y="822"/>
       <point x="60" y="850" type="curve"/>
@@ -14,34 +14,34 @@
       <point x="203" y="929" type="curve" smooth="yes"/>
       <point x="237" y="920"/>
       <point x="272" y="916"/>
-      <point x="308" y="916" type="curve" name="hr01" smooth="yes"/>
+      <point x="308" y="916" type="curve" smooth="yes" name="hr01"/>
       <point x="380" y="916"/>
       <point x="439" y="931"/>
       <point x="482" y="962" type="curve" smooth="yes"/>
       <point x="527" y="994"/>
       <point x="547" y="1036"/>
-      <point x="547" y="1087" type="curve" name="dh01" smooth="yes"/>
+      <point x="547" y="1087" type="curve" smooth="yes" name="dh01"/>
       <point x="547" y="1131"/>
       <point x="533" y="1164"/>
       <point x="505" y="1185" type="curve" smooth="yes"/>
       <point x="476" y="1206"/>
       <point x="432" y="1217"/>
-      <point x="373" y="1217" type="curve" name="dv05" smooth="yes"/>
+      <point x="373" y="1217" type="curve" smooth="yes" name="dv05"/>
       <point x="301" y="1217" type="line"/>
       <point x="322" y="1323" type="line"/>
-      <point x="394" y="1323" type="line" name="hr02" smooth="yes"/>
+      <point x="394" y="1323" type="line" smooth="yes" name="hr02"/>
       <point x="459" y="1323"/>
       <point x="511" y="1336"/>
       <point x="550" y="1363" type="curve" smooth="yes"/>
       <point x="589" y="1390"/>
       <point x="609" y="1425"/>
-      <point x="609" y="1466" type="curve" name="ih01" smooth="yes"/>
+      <point x="609" y="1466" type="curve" smooth="yes" name="ih01"/>
       <point x="609" y="1501"/>
       <point x="595" y="1527"/>
       <point x="566" y="1544" type="curve" smooth="yes"/>
       <point x="537" y="1561"/>
       <point x="493" y="1569"/>
-      <point x="440" y="1569" type="curve" name="dv03" smooth="yes"/>
+      <point x="440" y="1569" type="curve" smooth="yes" name="dv03"/>
       <point x="408" y="1569"/>
       <point x="376" y="1566"/>
       <point x="345" y="1559" type="curve" smooth="yes"/>
@@ -51,19 +51,19 @@
       <point x="256" y="1641" type="line"/>
       <point x="303" y="1652"/>
       <point x="347" y="1660"/>
-      <point x="388" y="1667" type="curve" name="sv01" smooth="yes"/>
+      <point x="388" y="1667" type="curve" smooth="yes" name="sv01"/>
       <point x="429" y="1673"/>
       <point x="467" y="1676"/>
-      <point x="503" y="1676" type="curve" name="dv04" smooth="yes"/>
+      <point x="503" y="1676" type="curve" smooth="yes" name="dv04"/>
       <point x="580" y="1676"/>
       <point x="644" y="1661"/>
       <point x="691" y="1626" type="curve" smooth="yes"/>
       <point x="734" y="1593"/>
       <point x="756" y="1546"/>
-      <point x="756" y="1486" type="curve" name="sh01" smooth="yes"/>
+      <point x="756" y="1486" type="curve" smooth="yes" name="sh01"/>
       <point x="756" y="1433"/>
       <point x="737" y="1387"/>
-      <point x="699" y="1348" type="curve" name="hr03" smooth="yes"/>
+      <point x="699" y="1348" type="curve" smooth="yes" name="hr03"/>
       <point x="663" y="1311"/>
       <point x="613" y="1284"/>
       <point x="545" y="1272" type="curve" name="iv01"/>
@@ -72,7 +72,7 @@
       <point x="656" y="1215" type="curve" smooth="yes"/>
       <point x="681" y="1186"/>
       <point x="695" y="1147"/>
-      <point x="695" y="1095" type="curve" name="dh02" smooth="yes"/>
+      <point x="695" y="1095" type="curve" smooth="yes" name="dh02"/>
       <point x="695" y="1010"/>
       <point x="660" y="941"/>
       <point x="591" y="888" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/tilde.glif b/source/Hack-Italic.ufo/glyphs/tilde.glif
index ebf20cbe3..3da541f13 100644
--- a/source/Hack-Italic.ufo/glyphs/tilde.glif
+++ b/source/Hack-Italic.ufo/glyphs/tilde.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="tilde" format="1">
+<glyph name="tilde" format="2">
   <advance width="1233"/>
   <unicode hex="02DC"/>
   <outline>
     <contour>
-      <point x="890" y="1307" type="curve" name="av01" smooth="yes"/>
+      <point x="890" y="1307" type="curve" smooth="yes" name="av01"/>
       <point x="861" y="1307"/>
       <point x="836" y="1312"/>
       <point x="814" y="1322" type="curve" smooth="yes"/>
       <point x="794" y="1331"/>
       <point x="769" y="1347"/>
-      <point x="741" y="1376" type="curve" name="hr01" smooth="yes"/>
+      <point x="741" y="1376" type="curve" smooth="yes" name="hr01"/>
       <point x="694" y="1425" type="line" smooth="yes"/>
       <point x="687" y="1432"/>
       <point x="671" y="1446"/>
@@ -30,7 +30,7 @@
       <point x="475" y="1518" type="curve" smooth="yes"/>
       <point x="513" y="1567"/>
       <point x="562" y="1591"/>
-      <point x="622" y="1591" type="curve" name="sv01" smooth="yes"/>
+      <point x="622" y="1591" type="curve" smooth="yes" name="sv01"/>
       <point x="651" y="1591"/>
       <point x="676" y="1586"/>
       <point x="698" y="1576" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/tildecomb.glif b/source/Hack-Italic.ufo/glyphs/tildecomb.glif
index 43d86c739..84518062d 100644
--- a/source/Hack-Italic.ufo/glyphs/tildecomb.glif
+++ b/source/Hack-Italic.ufo/glyphs/tildecomb.glif
@@ -1,31 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="tildecomb" format="1">
-  <advance width="0"/>
+<glyph name="tildecomb" format="2">
   <unicode hex="0303"/>
   <outline>
     <contour>
-      <point x="-347" y="1307" type="curve" name="hr00" smooth="yes"/>
+      <point x="-347" y="1307" type="curve" smooth="yes" name="hr00"/>
       <point x="-392" y="1307"/>
       <point x="-437" y="1320"/>
       <point x="-492" y="1376" type="curve" smooth="yes"/>
       <point x="-539" y="1425" type="line" smooth="yes"/>
       <point x="-563" y="1450"/>
       <point x="-588" y="1462"/>
-      <point x="-613" y="1462" type="curve" name="dv02" smooth="yes"/>
+      <point x="-613" y="1462" type="curve" smooth="yes" name="dv02"/>
       <point x="-669" y="1462"/>
       <point x="-696" y="1406"/>
       <point x="-707" y="1309" type="curve" name="sv01"/>
       <point x="-832" y="1309" type="line"/>
       <point x="-809" y="1488"/>
       <point x="-736" y="1591"/>
-      <point x="-609" y="1591" type="curve" name="dv03" smooth="yes"/>
+      <point x="-609" y="1591" type="curve" smooth="yes" name="dv03"/>
       <point x="-556" y="1591"/>
       <point x="-514" y="1573"/>
       <point x="-463" y="1522" type="curve" smooth="yes"/>
       <point x="-416" y="1475" type="line" smooth="yes"/>
       <point x="-389" y="1448"/>
       <point x="-373" y="1436"/>
-      <point x="-346" y="1436" type="curve" name="dv01" smooth="yes"/>
+      <point x="-346" y="1436" type="curve" smooth="yes" name="dv01"/>
       <point x="-292" y="1436"/>
       <point x="-259" y="1488"/>
       <point x="-248" y="1591" type="curve" name="sv02"/>
diff --git a/source/Hack-Italic.ufo/glyphs/tonos.glif b/source/Hack-Italic.ufo/glyphs/tonos.glif
index a2bde65b0..9cf37a211 100644
--- a/source/Hack-Italic.ufo/glyphs/tonos.glif
+++ b/source/Hack-Italic.ufo/glyphs/tonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="tonos" format="1">
+<glyph name="tonos" format="2">
   <advance width="1233"/>
   <unicode hex="0384"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/trademark.glif b/source/Hack-Italic.ufo/glyphs/trademark.glif
index 4f4f3e77c..e8a9895d9 100644
--- a/source/Hack-Italic.ufo/glyphs/trademark.glif
+++ b/source/Hack-Italic.ufo/glyphs/trademark.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="trademark" format="1">
+<glyph name="trademark" format="2">
   <advance width="1233"/>
   <unicode hex="2122"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/triagdn.glif b/source/Hack-Italic.ufo/glyphs/triagdn.glif
index ae62ad357..4964145af 100644
--- a/source/Hack-Italic.ufo/glyphs/triagdn.glif
+++ b/source/Hack-Italic.ufo/glyphs/triagdn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="triagdn" format="1">
+<glyph name="triagdn" format="2">
   <advance width="1233"/>
   <unicode hex="25BC"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/triaglf.glif b/source/Hack-Italic.ufo/glyphs/triaglf.glif
index 5b464644c..a9eecf67b 100644
--- a/source/Hack-Italic.ufo/glyphs/triaglf.glif
+++ b/source/Hack-Italic.ufo/glyphs/triaglf.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="triaglf" format="1">
+<glyph name="triaglf" format="2">
   <advance width="1233"/>
   <unicode hex="25C4"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/triagrt.glif b/source/Hack-Italic.ufo/glyphs/triagrt.glif
index 4fa9ebf0a..76cd2a61c 100644
--- a/source/Hack-Italic.ufo/glyphs/triagrt.glif
+++ b/source/Hack-Italic.ufo/glyphs/triagrt.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="triagrt" format="1">
+<glyph name="triagrt" format="2">
   <advance width="1233"/>
   <unicode hex="25BA"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/triagup.glif b/source/Hack-Italic.ufo/glyphs/triagup.glif
index 8b827d704..6a5b3fba1 100644
--- a/source/Hack-Italic.ufo/glyphs/triagup.glif
+++ b/source/Hack-Italic.ufo/glyphs/triagup.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="triagup" format="1">
+<glyph name="triagup" format="2">
   <advance width="1233"/>
   <unicode hex="25B2"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/two.glif b/source/Hack-Italic.ufo/glyphs/two.glif
index 931306ff6..68b636b26 100644
--- a/source/Hack-Italic.ufo/glyphs/two.glif
+++ b/source/Hack-Italic.ufo/glyphs/two.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="two" format="1">
+<glyph name="two" format="2">
   <advance width="1233"/>
   <unicode hex="0032"/>
   <outline>
     <contour>
-      <point x="32" y="136" type="line" name="hr00" smooth="yes"/>
+      <point x="32" y="136" type="line" smooth="yes" name="hr00"/>
       <point x="37" y="163"/>
       <point x="48" y="178"/>
       <point x="65" y="193" type="curve" smooth="yes"/>
@@ -12,10 +12,10 @@
       <point x="389" y="479" type="line" smooth="yes"/>
       <point x="738" y="791"/>
       <point x="926" y="1002"/>
-      <point x="926" y="1160" type="curve" name="dh01" smooth="yes"/>
+      <point x="926" y="1160" type="curve" smooth="yes" name="dh01"/>
       <point x="926" y="1274"/>
       <point x="837" y="1352"/>
-      <point x="684" y="1352" type="curve" name="sv01" smooth="yes"/>
+      <point x="684" y="1352" type="curve" smooth="yes" name="sv01"/>
       <point x="620" y="1352"/>
       <point x="550" y="1339"/>
       <point x="486" y="1319" type="curve" smooth="yes"/>
@@ -28,10 +28,10 @@
       <point x="512" y="1495" type="curve" smooth="yes"/>
       <point x="588" y="1514"/>
       <point x="652" y="1520"/>
-      <point x="709" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="709" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="965" y="1520"/>
       <point x="1126" y="1384"/>
-      <point x="1126" y="1163" type="curve" name="dh02" smooth="yes"/>
+      <point x="1126" y="1163" type="curve" smooth="yes" name="dh02"/>
       <point x="1126" y="1107"/>
       <point x="1117" y="1053"/>
       <point x="1090" y="989" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/two.subs.glif b/source/Hack-Italic.ufo/glyphs/two.subs.glif
index b322de7ef..bb5b0c581 100644
--- a/source/Hack-Italic.ufo/glyphs/two.subs.glif
+++ b/source/Hack-Italic.ufo/glyphs/two.subs.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="two.subs" format="1">
+<glyph name="two.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
@@ -7,20 +7,20 @@
       <point x="531" y="-133" type="line" smooth="yes"/>
       <point x="740" y="38"/>
       <point x="844" y="149"/>
-      <point x="844" y="230" type="curve" name="dh01" smooth="yes"/>
+      <point x="844" y="230" type="curve" smooth="yes" name="dh01"/>
       <point x="844" y="278"/>
       <point x="805" y="337"/>
-      <point x="704" y="337" type="curve" name="dv03" smooth="yes"/>
+      <point x="704" y="337" type="curve" smooth="yes" name="dv03"/>
       <point x="640" y="337"/>
       <point x="562" y="314"/>
       <point x="451" y="259" type="curve"/>
       <point x="475" y="386" type="line"/>
       <point x="588" y="425"/>
       <point x="665" y="442"/>
-      <point x="737" y="442" type="curve" name="dv04" smooth="yes"/>
+      <point x="737" y="442" type="curve" smooth="yes" name="dv04"/>
       <point x="905" y="442"/>
       <point x="991" y="346"/>
-      <point x="991" y="251" type="curve" name="dh02" smooth="yes"/>
+      <point x="991" y="251" type="curve" smooth="yes" name="dh02"/>
       <point x="991" y="144"/>
       <point x="885" y="7"/>
       <point x="682" y="-145" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/twodotenleader.glif b/source/Hack-Italic.ufo/glyphs/twodotenleader.glif
index d0c75119d..c4d837d93 100644
--- a/source/Hack-Italic.ufo/glyphs/twodotenleader.glif
+++ b/source/Hack-Italic.ufo/glyphs/twodotenleader.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="twodotenleader" format="1">
+<glyph name="twodotenleader" format="2">
   <advance width="1233"/>
   <unicode hex="2025"/>
   <outline>
     <contour>
-      <point x="142" y="0" type="line" name="hr00" smooth="yes"/>
+      <point x="142" y="0" type="line" smooth="yes" name="hr00"/>
       <point x="123" y="0"/>
       <point x="114" y="8"/>
       <point x="114" y="25" type="curve" smooth="yes"/>
@@ -14,8 +14,8 @@
       <point x="164" y="276" type="line" smooth="yes"/>
       <point x="168" y="294"/>
       <point x="179" y="303"/>
-      <point x="196" y="303" type="curve" name="sv01" smooth="yes"/>
-      <point x="388" y="303" type="line" name="sv02" smooth="yes"/>
+      <point x="196" y="303" type="curve" smooth="yes" name="sv01"/>
+      <point x="388" y="303" type="line" smooth="yes" name="sv02"/>
       <point x="407" y="303"/>
       <point x="416" y="295"/>
       <point x="416" y="278" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="334" y="0" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="612" y="0" type="line" name="ab01" smooth="yes"/>
+      <point x="612" y="0" type="line" smooth="yes" name="ab01"/>
       <point x="593" y="0"/>
       <point x="584" y="8"/>
       <point x="584" y="25" type="curve" smooth="yes"/>
@@ -38,8 +38,8 @@
       <point x="633" y="276" type="line"/>
       <point x="636" y="294"/>
       <point x="646" y="303"/>
-      <point x="665" y="303" type="curve" name="sv03" smooth="yes"/>
-      <point x="857" y="303" type="line" name="sv04" smooth="yes"/>
+      <point x="665" y="303" type="curve" smooth="yes" name="sv03"/>
+      <point x="857" y="303" type="line" smooth="yes" name="sv04"/>
       <point x="876" y="303"/>
       <point x="885" y="295"/>
       <point x="885" y="278" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/u.glif b/source/Hack-Italic.ufo/glyphs/u.glif
index a809c24e6..15bff1a8f 100644
--- a/source/Hack-Italic.ufo/glyphs/u.glif
+++ b/source/Hack-Italic.ufo/glyphs/u.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="u" format="1">
+<glyph name="u" format="2">
   <advance width="1233"/>
   <unicode hex="0075"/>
   <outline>
@@ -33,9 +33,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/uacute.glif b/source/Hack-Italic.ufo/glyphs/uacute.glif
index 23b4b6326..4ba5eaca7 100644
--- a/source/Hack-Italic.ufo/glyphs/uacute.glif
+++ b/source/Hack-Italic.ufo/glyphs/uacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uacute" format="1">
+<glyph name="uacute" format="2">
   <advance width="1233"/>
   <unicode hex="00FA"/>
   <outline>
@@ -10,16 +10,16 @@
       <point x="571" y="1272" type="line" name="hr01"/>
     </contour>
     <contour>
-      <point x="409" y="-27" type="curve" name="ab02" smooth="yes"/>
+      <point x="409" y="-27" type="curve" smooth="yes" name="ab02"/>
       <point x="322" y="-27"/>
       <point x="252" y="-3"/>
       <point x="201" y="46" type="curve" smooth="yes"/>
       <point x="149" y="97"/>
       <point x="125" y="167"/>
-      <point x="125" y="248" type="curve" name="dh01" smooth="yes"/>
+      <point x="125" y="248" type="curve" smooth="yes" name="dh01"/>
       <point x="125" y="272"/>
       <point x="127" y="301"/>
-      <point x="130" y="332" type="curve" name="sh01" smooth="yes"/>
+      <point x="130" y="332" type="curve" smooth="yes" name="sh01"/>
       <point x="134" y="372"/>
       <point x="136" y="393"/>
       <point x="143" y="426" type="curve" smooth="yes"/>
@@ -31,13 +31,13 @@
       <point x="315" y="355" type="curve" smooth="yes"/>
       <point x="312" y="332"/>
       <point x="311" y="311"/>
-      <point x="311" y="298" type="curve" name="dh02" smooth="yes"/>
+      <point x="311" y="298" type="curve" smooth="yes" name="dh02"/>
       <point x="311" y="249"/>
       <point x="325" y="206"/>
       <point x="358" y="175" type="curve" smooth="yes"/>
       <point x="389" y="147"/>
       <point x="434" y="133"/>
-      <point x="489" y="133" type="curve" name="sv01" smooth="yes"/>
+      <point x="489" y="133" type="curve" smooth="yes" name="sv01"/>
       <point x="569" y="133"/>
       <point x="644" y="162"/>
       <point x="704" y="225" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/ubreve.glif b/source/Hack-Italic.ufo/glyphs/ubreve.glif
index 66ec4b46a..436aa2b3d 100644
--- a/source/Hack-Italic.ufo/glyphs/ubreve.glif
+++ b/source/Hack-Italic.ufo/glyphs/ubreve.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ubreve" format="1">
+<glyph name="ubreve" format="2">
   <advance width="1233"/>
   <unicode hex="016D"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="979" y="1584" type="line"/>
       <point x="942" y="1483"/>
       <point x="873" y="1434"/>
-      <point x="762" y="1434" type="curve" name="hr01" smooth="yes"/>
+      <point x="762" y="1434" type="curve" smooth="yes" name="hr01"/>
       <point x="651" y="1434"/>
       <point x="592" y="1482"/>
       <point x="592" y="1567" type="curve" smooth="yes"/>
@@ -40,7 +40,7 @@
       <point x="489" y="133" type="curve" smooth="yes"/>
       <point x="377" y="133"/>
       <point x="311" y="193"/>
-      <point x="311" y="298" type="curve" name="hr03" smooth="yes"/>
+      <point x="311" y="298" type="curve" smooth="yes" name="hr03"/>
       <point x="311" y="319"/>
       <point x="312" y="338"/>
       <point x="315" y="355" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/ucircumflex.glif b/source/Hack-Italic.ufo/glyphs/ucircumflex.glif
index 62451c387..43d0840eb 100644
--- a/source/Hack-Italic.ufo/glyphs/ucircumflex.glif
+++ b/source/Hack-Italic.ufo/glyphs/ucircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ucircumflex" format="1">
+<glyph name="ucircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00FB"/>
   <outline>
@@ -13,16 +13,16 @@
       <point x="393" y="1272" type="line" name="iv03"/>
     </contour>
     <contour>
-      <point x="409" y="-27" type="curve" name="ab02" smooth="yes"/>
+      <point x="409" y="-27" type="curve" smooth="yes" name="ab02"/>
       <point x="322" y="-27"/>
       <point x="252" y="-3"/>
       <point x="201" y="46" type="curve" smooth="yes"/>
       <point x="149" y="97"/>
       <point x="125" y="167"/>
-      <point x="125" y="248" type="curve" name="hr02" smooth="yes"/>
+      <point x="125" y="248" type="curve" smooth="yes" name="hr02"/>
       <point x="125" y="272"/>
       <point x="127" y="301"/>
-      <point x="130" y="332" type="curve" name="sh01" smooth="yes"/>
+      <point x="130" y="332" type="curve" smooth="yes" name="sh01"/>
       <point x="134" y="372"/>
       <point x="136" y="393"/>
       <point x="143" y="426" type="curve" smooth="yes"/>
@@ -34,13 +34,13 @@
       <point x="315" y="355" type="curve" smooth="yes"/>
       <point x="312" y="332"/>
       <point x="311" y="311"/>
-      <point x="311" y="298" type="curve" name="dh01" smooth="yes"/>
+      <point x="311" y="298" type="curve" smooth="yes" name="dh01"/>
       <point x="311" y="249"/>
       <point x="325" y="206"/>
       <point x="358" y="175" type="curve" smooth="yes"/>
       <point x="389" y="147"/>
       <point x="434" y="133"/>
-      <point x="489" y="133" type="curve" name="sv01" smooth="yes"/>
+      <point x="489" y="133" type="curve" smooth="yes" name="sv01"/>
       <point x="569" y="133"/>
       <point x="644" y="162"/>
       <point x="704" y="225" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/udieresis.glif b/source/Hack-Italic.ufo/glyphs/udieresis.glif
index f5016296a..e32549ce4 100644
--- a/source/Hack-Italic.ufo/glyphs/udieresis.glif
+++ b/source/Hack-Italic.ufo/glyphs/udieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="udieresis" format="1">
+<glyph name="udieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00FC"/>
   <outline>
     <contour>
-      <point x="465" y="1350" type="line" name="dv01" smooth="yes"/>
+      <point x="465" y="1350" type="line" smooth="yes" name="dv01"/>
       <point x="445" y="1350"/>
       <point x="434" y="1363"/>
       <point x="438" y="1383" type="curve" smooth="yes"/>
       <point x="466" y="1525" type="line"/>
       <point x="469" y="1543"/>
       <point x="479" y="1552"/>
-      <point x="498" y="1552" type="curve" name="hr01" smooth="yes"/>
+      <point x="498" y="1552" type="curve" smooth="yes" name="hr01"/>
       <point x="641" y="1552" type="line" smooth="yes"/>
       <point x="661" y="1552"/>
       <point x="672" y="1539"/>
@@ -22,14 +22,14 @@
       <point x="608" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="856" y="1350" type="line" name="sv01" smooth="yes"/>
+      <point x="856" y="1350" type="line" smooth="yes" name="sv01"/>
       <point x="836" y="1350"/>
       <point x="825" y="1363"/>
-      <point x="829" y="1383" type="curve" name="hr02" smooth="yes"/>
+      <point x="829" y="1383" type="curve" smooth="yes" name="hr02"/>
       <point x="857" y="1525" type="line"/>
       <point x="860" y="1543"/>
       <point x="870" y="1552"/>
-      <point x="889" y="1552" type="curve" name="sv02" smooth="yes"/>
+      <point x="889" y="1552" type="curve" smooth="yes" name="sv02"/>
       <point x="1032" y="1552" type="line" smooth="yes"/>
       <point x="1052" y="1552"/>
       <point x="1063" y="1539"/>
@@ -40,16 +40,16 @@
       <point x="999" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="409" y="-27" type="curve" name="ab02" smooth="yes"/>
+      <point x="409" y="-27" type="curve" smooth="yes" name="ab02"/>
       <point x="322" y="-27"/>
       <point x="252" y="-3"/>
       <point x="201" y="46" type="curve" smooth="yes"/>
       <point x="149" y="97"/>
       <point x="125" y="167"/>
-      <point x="125" y="248" type="curve" name="dh01" smooth="yes"/>
+      <point x="125" y="248" type="curve" smooth="yes" name="dh01"/>
       <point x="125" y="272"/>
       <point x="127" y="301"/>
-      <point x="130" y="332" type="curve" name="sh01" smooth="yes"/>
+      <point x="130" y="332" type="curve" smooth="yes" name="sh01"/>
       <point x="134" y="372"/>
       <point x="136" y="393"/>
       <point x="143" y="426" type="curve" smooth="yes"/>
@@ -61,13 +61,13 @@
       <point x="315" y="355" type="curve" smooth="yes"/>
       <point x="312" y="332"/>
       <point x="311" y="311"/>
-      <point x="311" y="298" type="curve" name="dh02" smooth="yes"/>
+      <point x="311" y="298" type="curve" smooth="yes" name="dh02"/>
       <point x="311" y="249"/>
       <point x="325" y="206"/>
       <point x="358" y="175" type="curve" smooth="yes"/>
       <point x="389" y="147"/>
       <point x="434" y="133"/>
-      <point x="489" y="133" type="curve" name="sv03" smooth="yes"/>
+      <point x="489" y="133" type="curve" smooth="yes" name="sv03"/>
       <point x="569" y="133"/>
       <point x="644" y="162"/>
       <point x="704" y="225" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/ugrave.glif b/source/Hack-Italic.ufo/glyphs/ugrave.glif
index 1aea20ab1..5354ef287 100644
--- a/source/Hack-Italic.ufo/glyphs/ugrave.glif
+++ b/source/Hack-Italic.ufo/glyphs/ugrave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ugrave" format="1">
+<glyph name="ugrave" format="2">
   <advance width="1233"/>
   <unicode hex="00F9"/>
   <outline>
@@ -10,16 +10,16 @@
       <point x="701" y="1272" type="line" name="hr01"/>
     </contour>
     <contour>
-      <point x="409" y="-27" type="curve" name="ab02" smooth="yes"/>
+      <point x="409" y="-27" type="curve" smooth="yes" name="ab02"/>
       <point x="322" y="-27"/>
       <point x="252" y="-3"/>
       <point x="201" y="46" type="curve" smooth="yes"/>
       <point x="149" y="97"/>
       <point x="125" y="167"/>
-      <point x="125" y="248" type="curve" name="dh01" smooth="yes"/>
+      <point x="125" y="248" type="curve" smooth="yes" name="dh01"/>
       <point x="125" y="272"/>
       <point x="127" y="301"/>
-      <point x="130" y="332" type="curve" name="sh01" smooth="yes"/>
+      <point x="130" y="332" type="curve" smooth="yes" name="sh01"/>
       <point x="134" y="372"/>
       <point x="136" y="393"/>
       <point x="143" y="426" type="curve" smooth="yes"/>
@@ -31,13 +31,13 @@
       <point x="315" y="355" type="curve" smooth="yes"/>
       <point x="312" y="332"/>
       <point x="311" y="311"/>
-      <point x="311" y="298" type="curve" name="dh02" smooth="yes"/>
+      <point x="311" y="298" type="curve" smooth="yes" name="dh02"/>
       <point x="311" y="249"/>
       <point x="325" y="206"/>
       <point x="358" y="175" type="curve" smooth="yes"/>
       <point x="389" y="147"/>
       <point x="434" y="133"/>
-      <point x="489" y="133" type="curve" name="sv01" smooth="yes"/>
+      <point x="489" y="133" type="curve" smooth="yes" name="sv01"/>
       <point x="569" y="133"/>
       <point x="644" y="162"/>
       <point x="704" y="225" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uhorn.glif b/source/Hack-Italic.ufo/glyphs/uhorn.glif
index 09f0dda39..3cf323dfe 100644
--- a/source/Hack-Italic.ufo/glyphs/uhorn.glif
+++ b/source/Hack-Italic.ufo/glyphs/uhorn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uhorn" format="1">
+<glyph name="uhorn" format="2">
   <advance width="1233"/>
   <unicode hex="01B0"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="1254" y="1001" type="curve" smooth="yes"/>
       <point x="1226" y="849"/>
       <point x="1156" y="764"/>
-      <point x="1035" y="764" type="curve" name="sv01" smooth="yes"/>
+      <point x="1035" y="764" type="curve" smooth="yes" name="sv01"/>
       <point x="1008" y="764"/>
       <point x="983" y="768"/>
       <point x="960" y="777" type="curve"/>
@@ -22,10 +22,10 @@
       <point x="658" y="168" type="line" name="iv01"/>
       <point x="562" y="38"/>
       <point x="444" y="-27"/>
-      <point x="303" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="303" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="127" y="-27"/>
       <point x="19" y="74"/>
-      <point x="19" y="253" type="curve" name="dh01" smooth="yes"/>
+      <point x="19" y="253" type="curve" smooth="yes" name="dh01"/>
       <point x="19" y="296"/>
       <point x="25" y="362"/>
       <point x="37" y="426" type="curve" smooth="yes"/>
@@ -34,10 +34,10 @@
       <point x="220" y="426" type="line" smooth="yes"/>
       <point x="212" y="383"/>
       <point x="205" y="331"/>
-      <point x="205" y="296" type="curve" name="dh02" smooth="yes"/>
+      <point x="205" y="296" type="curve" smooth="yes" name="dh02"/>
       <point x="205" y="192"/>
       <point x="270" y="133"/>
-      <point x="383" y="133" type="curve" name="sv02" smooth="yes"/>
+      <point x="383" y="133" type="curve" smooth="yes" name="sv02"/>
       <point x="548" y="133"/>
       <point x="674" y="256"/>
       <point x="719" y="487" type="curve" smooth="yes"/>
@@ -46,7 +46,7 @@
       <point x="986" y="909" type="line"/>
       <point x="999" y="905"/>
       <point x="1011" y="903"/>
-      <point x="1024" y="903" type="curve" name="sv03" smooth="yes"/>
+      <point x="1024" y="903" type="curve" smooth="yes" name="sv03"/>
       <point x="1080" y="903"/>
       <point x="1118" y="940"/>
       <point x="1133" y="1012" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uhungarumlaut.glif b/source/Hack-Italic.ufo/glyphs/uhungarumlaut.glif
index 9808c6610..3a24f4984 100644
--- a/source/Hack-Italic.ufo/glyphs/uhungarumlaut.glif
+++ b/source/Hack-Italic.ufo/glyphs/uhungarumlaut.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uhungarumlaut" format="1">
+<glyph name="uhungarumlaut" format="2">
   <advance width="1233"/>
   <unicode hex="0171"/>
   <outline>
@@ -16,10 +16,10 @@
       <point x="766" y="1272" type="line" name="dv01"/>
     </contour>
     <contour>
-      <point x="409" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="409" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="233" y="-27"/>
       <point x="125" y="74"/>
-      <point x="125" y="253" type="curve" name="dh01" smooth="yes"/>
+      <point x="125" y="253" type="curve" smooth="yes" name="dh01"/>
       <point x="125" y="296"/>
       <point x="131" y="362"/>
       <point x="143" y="426" type="curve" smooth="yes"/>
@@ -28,10 +28,10 @@
       <point x="326" y="426" type="line" smooth="yes"/>
       <point x="318" y="383"/>
       <point x="311" y="331"/>
-      <point x="311" y="296" type="curve" name="hr02" smooth="yes"/>
+      <point x="311" y="296" type="curve" smooth="yes" name="hr02"/>
       <point x="311" y="192"/>
       <point x="376" y="133"/>
-      <point x="489" y="133" type="curve" name="sv02" smooth="yes"/>
+      <point x="489" y="133" type="curve" smooth="yes" name="sv02"/>
       <point x="654" y="133"/>
       <point x="780" y="256"/>
       <point x="825" y="487" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/umacron.glif b/source/Hack-Italic.ufo/glyphs/umacron.glif
index c4ade421c..9ee9477f5 100644
--- a/source/Hack-Italic.ufo/glyphs/umacron.glif
+++ b/source/Hack-Italic.ufo/glyphs/umacron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="umacron" format="1">
+<glyph name="umacron" format="2">
   <advance width="1233"/>
   <unicode hex="016B"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="440" y="1321" type="line"/>
     </contour>
     <contour>
-      <point x="409" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="409" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="233" y="-27"/>
       <point x="125" y="74"/>
-      <point x="125" y="253" type="curve" name="dh01" smooth="yes"/>
+      <point x="125" y="253" type="curve" smooth="yes" name="dh01"/>
       <point x="125" y="296"/>
       <point x="131" y="362"/>
       <point x="143" y="426" type="curve" smooth="yes"/>
@@ -22,10 +22,10 @@
       <point x="326" y="426" type="line" smooth="yes"/>
       <point x="318" y="383"/>
       <point x="311" y="331"/>
-      <point x="311" y="296" type="curve" name="dh02" smooth="yes"/>
+      <point x="311" y="296" type="curve" smooth="yes" name="dh02"/>
       <point x="311" y="192"/>
       <point x="376" y="133"/>
-      <point x="489" y="133" type="curve" name="sv01" smooth="yes"/>
+      <point x="489" y="133" type="curve" smooth="yes" name="sv01"/>
       <point x="654" y="133"/>
       <point x="780" y="256"/>
       <point x="825" y="487" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/underscore.glif b/source/Hack-Italic.ufo/glyphs/underscore.glif
index 3697b67d1..878258799 100644
--- a/source/Hack-Italic.ufo/glyphs/underscore.glif
+++ b/source/Hack-Italic.ufo/glyphs/underscore.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="underscore" format="1">
+<glyph name="underscore" format="2">
   <advance width="1233"/>
   <unicode hex="005F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/underscoredbl.glif b/source/Hack-Italic.ufo/glyphs/underscoredbl.glif
index 63850617e..afc94109a 100644
--- a/source/Hack-Italic.ufo/glyphs/underscoredbl.glif
+++ b/source/Hack-Italic.ufo/glyphs/underscoredbl.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="underscoredbl" format="1">
+<glyph name="underscoredbl" format="2">
   <advance width="1233"/>
   <unicode hex="2017"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni00A_0.glif b/source/Hack-Italic.ufo/glyphs/uni00A_0.glif
index c0979d094..a4b993919 100644
--- a/source/Hack-Italic.ufo/glyphs/uni00A_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni00A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni00A0" format="1">
+<glyph name="uni00A0" format="2">
   <advance width="1233"/>
   <unicode hex="00A0"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni00A_D_.glif b/source/Hack-Italic.ufo/glyphs/uni00A_D_.glif
index 57bc7c00d..511311c1c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni00A_D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni00A_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni00AD" format="1">
+<glyph name="uni00AD" format="2">
   <advance width="1233"/>
   <unicode hex="00AD"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni00B_2.glif b/source/Hack-Italic.ufo/glyphs/uni00B_2.glif
index 41344a70d..581906d5d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni00B_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni00B_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni00B2" format="1">
+<glyph name="uni00B2" format="2">
   <advance width="1233"/>
   <unicode hex="00B2"/>
   <outline>
@@ -8,20 +8,20 @@
       <point x="531" y="1397" type="line" smooth="yes"/>
       <point x="740" y="1568"/>
       <point x="844" y="1679"/>
-      <point x="844" y="1760" type="curve" name="dh01" smooth="yes"/>
+      <point x="844" y="1760" type="curve" smooth="yes" name="dh01"/>
       <point x="844" y="1808"/>
       <point x="805" y="1867"/>
-      <point x="704" y="1867" type="curve" name="dv03" smooth="yes"/>
+      <point x="704" y="1867" type="curve" smooth="yes" name="dv03"/>
       <point x="640" y="1867"/>
       <point x="562" y="1844"/>
       <point x="451" y="1789" type="curve"/>
       <point x="475" y="1916" type="line"/>
       <point x="588" y="1955"/>
       <point x="665" y="1972"/>
-      <point x="737" y="1972" type="curve" name="dv04" smooth="yes"/>
+      <point x="737" y="1972" type="curve" smooth="yes" name="dv04"/>
       <point x="905" y="1972"/>
       <point x="991" y="1876"/>
-      <point x="991" y="1781" type="curve" name="dh02" smooth="yes"/>
+      <point x="991" y="1781" type="curve" smooth="yes" name="dh02"/>
       <point x="991" y="1674"/>
       <point x="885" y="1537"/>
       <point x="682" y="1385" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni00B_3.glif b/source/Hack-Italic.ufo/glyphs/uni00B_3.glif
index e03149cd7..6bb134fb3 100644
--- a/source/Hack-Italic.ufo/glyphs/uni00B_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni00B_3.glif
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni00B3" format="1">
+<glyph name="uni00B3" format="2">
   <advance width="1233"/>
   <unicode hex="00B3"/>
   <outline>
     <contour>
-      <point x="536" y="1103" type="curve" name="dv01" smooth="yes"/>
+      <point x="536" y="1103" type="curve" smooth="yes" name="dv01"/>
       <point x="452" y="1103"/>
       <point x="367" y="1117"/>
       <point x="287" y="1144" type="curve"/>
       <point x="311" y="1265" type="line"/>
       <point x="400" y="1226"/>
       <point x="464" y="1210"/>
-      <point x="536" y="1210" type="curve" name="hr01" smooth="yes"/>
+      <point x="536" y="1210" type="curve" smooth="yes" name="hr01"/>
       <point x="680" y="1210"/>
       <point x="774" y="1276"/>
-      <point x="774" y="1384" type="curve" name="dh01" smooth="yes"/>
+      <point x="774" y="1384" type="curve" smooth="yes" name="dh01"/>
       <point x="774" y="1469"/>
       <point x="716" y="1511"/>
-      <point x="600" y="1511" type="curve" name="dv03" smooth="yes"/>
+      <point x="600" y="1511" type="curve" smooth="yes" name="dv03"/>
       <point x="528" y="1511" type="line"/>
       <point x="549" y="1617" type="line"/>
-      <point x="621" y="1617" type="line" name="dv04" smooth="yes"/>
+      <point x="621" y="1617" type="line" smooth="yes" name="dv04"/>
       <point x="751" y="1617"/>
       <point x="836" y="1676"/>
-      <point x="836" y="1760" type="curve" name="sh01" smooth="yes"/>
+      <point x="836" y="1760" type="curve" smooth="yes" name="sh01"/>
       <point x="836" y="1829"/>
       <point x="778" y="1863"/>
-      <point x="671" y="1863" type="curve" name="dv02" smooth="yes"/>
+      <point x="671" y="1863" type="curve" smooth="yes" name="dv02"/>
       <point x="604" y="1863"/>
       <point x="545" y="1851"/>
       <point x="461" y="1820" type="curve"/>
       <point x="483" y="1935" type="line"/>
       <point x="580" y="1958"/>
       <point x="661" y="1970"/>
-      <point x="728" y="1970" type="curve" name="hr02" smooth="yes"/>
+      <point x="728" y="1970" type="curve" smooth="yes" name="hr02"/>
       <point x="895" y="1970"/>
       <point x="983" y="1900"/>
-      <point x="983" y="1783" type="curve" name="sh02" smooth="yes"/>
+      <point x="983" y="1783" type="curve" smooth="yes" name="sh02"/>
       <point x="983" y="1672"/>
       <point x="904" y="1591"/>
       <point x="772" y="1566" type="curve" name="iv01"/>
       <point x="871" y="1549"/>
       <point x="922" y="1488"/>
-      <point x="922" y="1388" type="curve" name="dh02" smooth="yes"/>
+      <point x="922" y="1388" type="curve" smooth="yes" name="dh02"/>
       <point x="922" y="1217"/>
       <point x="772" y="1103"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni00B_5.glif b/source/Hack-Italic.ufo/glyphs/uni00B_5.glif
index b7564eb00..0388fdbd8 100644
--- a/source/Hack-Italic.ufo/glyphs/uni00B_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni00B_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni00B5" format="1">
+<glyph name="uni00B5" format="2">
   <advance width="1233"/>
   <unicode hex="00B5"/>
   <outline>
@@ -18,7 +18,7 @@
       <point x="345" y="180" type="curve" smooth="yes"/>
       <point x="385" y="144"/>
       <point x="443" y="131"/>
-      <point x="503" y="131" type="curve" name="dv02" smooth="yes"/>
+      <point x="503" y="131" type="curve" smooth="yes" name="dv02"/>
       <point x="593" y="131"/>
       <point x="666" y="159"/>
       <point x="721" y="214" type="curve" smooth="yes"/>
@@ -39,7 +39,7 @@
       <point x="988" y="157" type="curve" smooth="yes"/>
       <point x="995" y="148"/>
       <point x="1006" y="141"/>
-      <point x="1022" y="141" type="curve" name="sv01" smooth="yes"/>
+      <point x="1022" y="141" type="curve" smooth="yes" name="sv01"/>
       <point x="1029" y="141"/>
       <point x="1038" y="143"/>
       <point x="1049" y="146" type="curve" smooth="yes"/>
@@ -52,7 +52,7 @@
       <point x="990" y="-18" type="curve" smooth="yes"/>
       <point x="966" y="-25"/>
       <point x="942" y="-29"/>
-      <point x="917" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="917" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="876" y="-29"/>
       <point x="842" y="-17"/>
       <point x="814" y="14" type="curve" smooth="yes"/>
@@ -64,7 +64,7 @@
       <point x="652" y="9" type="curve" smooth="yes"/>
       <point x="605" y="-16"/>
       <point x="549" y="-29"/>
-      <point x="486" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="486" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="423" y="-29"/>
       <point x="371" y="-15"/>
       <point x="330" y="13" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni00B_9.glif b/source/Hack-Italic.ufo/glyphs/uni00B_9.glif
index af05bc75b..3a8fe242f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni00B_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni00B_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni00B9" format="1">
+<glyph name="uni00B9" format="2">
   <advance width="1233"/>
   <unicode hex="00B9"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0122.glif b/source/Hack-Italic.ufo/glyphs/uni0122.glif
index 4ba23bec7..97b4f54fe 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0122.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0122.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0122" format="1">
+<glyph name="uni0122" format="2">
   <advance width="1233"/>
   <unicode hex="0122"/>
   <outline>
     <contour>
-      <point x="563" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="563" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="248" y="-29"/>
       <point x="78" y="156"/>
-      <point x="78" y="487" type="curve" name="dh01" smooth="yes"/>
+      <point x="78" y="487" type="curve" smooth="yes" name="dh01"/>
       <point x="78" y="612"/>
       <point x="102" y="754"/>
       <point x="143" y="893" type="curve" smooth="yes"/>
@@ -16,14 +16,14 @@
       <point x="328" y="1266" type="curve" smooth="yes"/>
       <point x="465" y="1435"/>
       <point x="640" y="1520"/>
-      <point x="852" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="852" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="965" y="1520"/>
       <point x="1064" y="1495"/>
       <point x="1176" y="1438" type="curve"/>
       <point x="1135" y="1231" type="line" name="iv01"/>
       <point x="1049" y="1314"/>
       <point x="952" y="1356"/>
-      <point x="845" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="845" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="716" y="1356"/>
       <point x="599" y="1300"/>
       <point x="508" y="1192" type="curve" smooth="yes"/>
@@ -32,10 +32,10 @@
       <point x="356" y="887" type="curve"/>
       <point x="311" y="738"/>
       <point x="287" y="589"/>
-      <point x="287" y="487" type="curve" name="dh02" smooth="yes"/>
+      <point x="287" y="487" type="curve" smooth="yes" name="dh02"/>
       <point x="287" y="263"/>
       <point x="396" y="135"/>
-      <point x="593" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="593" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="681" y="135"/>
       <point x="754" y="160"/>
       <point x="803" y="207" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0123.glif b/source/Hack-Italic.ufo/glyphs/uni0123.glif
index 7ea5d97b1..ba77a9a4e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0123.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0123.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0123" format="1">
+<glyph name="uni0123" format="2">
   <advance width="1233"/>
   <unicode hex="0123"/>
   <outline>
@@ -10,30 +10,30 @@
       <point x="550" y="1269" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="378" y="-440" type="curve" name="dv01" smooth="yes"/>
+      <point x="378" y="-440" type="curve" smooth="yes" name="dv01"/>
       <point x="263" y="-440"/>
       <point x="159" y="-421"/>
       <point x="59" y="-385" type="curve"/>
       <point x="96" y="-203" type="line" name="sh01"/>
       <point x="193" y="-263"/>
       <point x="297" y="-293"/>
-      <point x="409" y="-293" type="curve" name="dv02" smooth="yes"/>
+      <point x="409" y="-293" type="curve" smooth="yes" name="dv02"/>
       <point x="612" y="-293"/>
       <point x="705" y="-190"/>
       <point x="756" y="53" type="curve" smooth="yes"/>
       <point x="780" y="170" type="line" name="iv02"/>
       <point x="701" y="50"/>
       <point x="578" y="-8"/>
-      <point x="443" y="-8" type="curve" name="ab01" smooth="yes"/>
+      <point x="443" y="-8" type="curve" smooth="yes" name="ab01"/>
       <point x="232" y="-8"/>
       <point x="102" y="138"/>
-      <point x="102" y="401" type="curve" name="dh01" smooth="yes"/>
+      <point x="102" y="401" type="curve" smooth="yes" name="dh01"/>
       <point x="102" y="574"/>
       <point x="158" y="770"/>
       <point x="254" y="911" type="curve" smooth="yes"/>
       <point x="353" y="1058"/>
       <point x="495" y="1147"/>
-      <point x="648" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="648" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="783" y="1147"/>
       <point x="889" y="1078"/>
       <point x="934" y="965" type="curve" name="iv03"/>
@@ -44,7 +44,7 @@
       <point x="709" y="-440"/>
     </contour>
     <contour>
-      <point x="507" y="145" type="curve" name="sv01" smooth="yes"/>
+      <point x="507" y="145" type="curve" smooth="yes" name="sv01"/>
       <point x="618" y="145"/>
       <point x="705" y="203"/>
       <point x="770" y="319" type="curve" smooth="yes"/>
@@ -53,10 +53,10 @@
       <point x="874" y="728" type="curve" smooth="yes"/>
       <point x="874" y="901"/>
       <point x="796" y="991"/>
-      <point x="667" y="991" type="curve" name="sv02" smooth="yes"/>
+      <point x="667" y="991" type="curve" smooth="yes" name="sv02"/>
       <point x="438" y="991"/>
       <point x="297" y="697"/>
-      <point x="297" y="429" type="curve" name="dh02" smooth="yes"/>
+      <point x="297" y="429" type="curve" smooth="yes" name="dh02"/>
       <point x="297" y="227"/>
       <point x="376" y="145"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0136.glif b/source/Hack-Italic.ufo/glyphs/uni0136.glif
index b76b32527..e082def81 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0136.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0136.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0136" format="1">
+<glyph name="uni0136" format="2">
   <advance width="1233"/>
   <unicode hex="0136"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0137.glif b/source/Hack-Italic.ufo/glyphs/uni0137.glif
index 9c1894a0f..4023558c0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0137.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0137.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0137" format="1">
+<glyph name="uni0137" format="2">
   <advance width="1233"/>
   <unicode hex="0137"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni013B_.glif b/source/Hack-Italic.ufo/glyphs/uni013B_.glif
index a8c5a5119..17384c44f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni013B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni013B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni013B" format="1">
+<glyph name="uni013B" format="2">
   <advance width="1233"/>
   <unicode hex="013B"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni013C_.glif b/source/Hack-Italic.ufo/glyphs/uni013C_.glif
index ca9ceae4f..6088bed40 100644
--- a/source/Hack-Italic.ufo/glyphs/uni013C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni013C_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni013C" format="1">
+<glyph name="uni013C" format="2">
   <advance width="1233"/>
   <unicode hex="013C"/>
   <outline>
     <contour>
-      <point x="739" y="-8" type="line" name="hr00" smooth="yes"/>
+      <point x="739" y="-8" type="line" smooth="yes" name="hr00"/>
       <point x="511" y="-8"/>
       <point x="397" y="76"/>
-      <point x="397" y="245" type="curve" name="dh01" smooth="yes"/>
+      <point x="397" y="245" type="curve" smooth="yes" name="dh01"/>
       <point x="397" y="290"/>
       <point x="405" y="349"/>
       <point x="416" y="404" type="curve"/>
@@ -18,10 +18,10 @@
       <point x="600" y="400" type="line" smooth="yes"/>
       <point x="591" y="353"/>
       <point x="586" y="316"/>
-      <point x="586" y="289" type="curve" name="dh02" smooth="yes"/>
+      <point x="586" y="289" type="curve" smooth="yes" name="dh02"/>
       <point x="586" y="197"/>
       <point x="645" y="148"/>
-      <point x="766" y="148" type="curve" name="sv02" smooth="yes"/>
+      <point x="766" y="148" type="curve" smooth="yes" name="sv02"/>
       <point x="977" y="148" type="line"/>
       <point x="946" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0145.glif b/source/Hack-Italic.ufo/glyphs/uni0145.glif
index 0b5b8ba95..b4a5992eb 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0145.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0145.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0145" format="1">
+<glyph name="uni0145" format="2">
   <advance width="1233"/>
   <unicode hex="0145"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0146.glif b/source/Hack-Italic.ufo/glyphs/uni0146.glif
index 291e205a5..08bd78515 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0146.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0146.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0146" format="1">
+<glyph name="uni0146" format="2">
   <advance width="1233"/>
   <unicode hex="0146"/>
   <outline>
@@ -9,10 +9,10 @@
       <point x="455" y="952" type="line" name="iv01"/>
       <point x="559" y="1085"/>
       <point x="672" y="1147"/>
-      <point x="809" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="809" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="985" y="1147"/>
       <point x="1096" y="1045"/>
-      <point x="1096" y="874" type="curve" name="dh02" smooth="yes"/>
+      <point x="1096" y="874" type="curve" smooth="yes" name="dh02"/>
       <point x="1096" y="827"/>
       <point x="1088" y="763"/>
       <point x="1075" y="694" type="curve" smooth="yes"/>
@@ -24,10 +24,10 @@
       <point x="894" y="709" type="curve" smooth="yes"/>
       <point x="904" y="756"/>
       <point x="909" y="793"/>
-      <point x="909" y="821" type="curve" name="dh01" smooth="yes"/>
+      <point x="909" y="821" type="curve" smooth="yes" name="dh01"/>
       <point x="909" y="926"/>
       <point x="846" y="987"/>
-      <point x="729" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="729" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="562" y="987"/>
       <point x="434" y="857"/>
       <point x="391" y="633" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0156.glif b/source/Hack-Italic.ufo/glyphs/uni0156.glif
index 3b003e83f..001b344eb 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0156.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0156.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0156" format="1">
+<glyph name="uni0156" format="2">
   <advance width="1233"/>
   <unicode hex="0156"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="697" y="1493" type="line" smooth="yes"/>
       <point x="973" y="1493"/>
       <point x="1131" y="1373"/>
-      <point x="1131" y="1140" type="curve" name="dh02" smooth="yes"/>
+      <point x="1131" y="1140" type="curve" smooth="yes" name="dh02"/>
       <point x="1131" y="913"/>
       <point x="982" y="734"/>
       <point x="746" y="705" type="curve" name="iv01"/>
@@ -23,19 +23,19 @@
       <point x="773" y="377" type="line" smooth="yes"/>
       <point x="714" y="585"/>
       <point x="656" y="631"/>
-      <point x="510" y="631" type="curve" name="dv01" smooth="yes"/>
+      <point x="510" y="631" type="curve" smooth="yes" name="dv01"/>
       <point x="318" y="631" type="line"/>
       <point x="195" y="0" type="line" name="ab01"/>
       <point x="-8" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="570" y="797" type="line" name="dv02" smooth="yes"/>
+      <point x="570" y="797" type="line" smooth="yes" name="dv02"/>
       <point x="787" y="797"/>
       <point x="928" y="920"/>
-      <point x="928" y="1112" type="curve" name="dh01" smooth="yes"/>
+      <point x="928" y="1112" type="curve" smooth="yes" name="dh01"/>
       <point x="928" y="1260"/>
       <point x="847" y="1327"/>
-      <point x="666" y="1327" type="curve" name="sv01" smooth="yes"/>
+      <point x="666" y="1327" type="curve" smooth="yes" name="sv01"/>
       <point x="453" y="1327" type="line"/>
       <point x="351" y="797" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0157.glif b/source/Hack-Italic.ufo/glyphs/uni0157.glif
index ba2670d5a..70a109e8d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0157.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0157.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0157" format="1">
+<glyph name="uni0157" format="2">
   <advance width="1233"/>
   <unicode hex="0157"/>
   <outline>
@@ -9,14 +9,14 @@
       <point x="578" y="901" type="line" name="iv01"/>
       <point x="667" y="1062"/>
       <point x="812" y="1147"/>
-      <point x="992" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="992" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1089" y="1147"/>
       <point x="1165" y="1123"/>
       <point x="1219" y="1075" type="curve"/>
       <point x="1184" y="889" type="line" name="iv02"/>
       <point x="1124" y="949"/>
       <point x="1044" y="977"/>
-      <point x="948" y="977" type="curve" name="sv01" smooth="yes"/>
+      <point x="948" y="977" type="curve" smooth="yes" name="sv01"/>
       <point x="721" y="977"/>
       <point x="558" y="812"/>
       <point x="508" y="549" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0162.glif b/source/Hack-Italic.ufo/glyphs/uni0162.glif
index e279a7a89..000cf9d81 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0162.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0162.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0162" format="1">
+<glyph name="uni0162" format="2">
   <advance width="1233"/>
   <unicode hex="0162"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0163.glif b/source/Hack-Italic.ufo/glyphs/uni0163.glif
index 501d082c4..2f7664a08 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0163.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0163.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0163" format="1">
+<glyph name="uni0163" format="2">
   <advance width="1233"/>
   <unicode hex="0163"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni01A_4.glif b/source/Hack-Italic.ufo/glyphs/uni01A_4.glif
index 0faa1aa1b..1855f1aea 100644
--- a/source/Hack-Italic.ufo/glyphs/uni01A_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni01A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni01A4" format="1">
+<glyph name="uni01A4" format="2">
   <advance width="1233"/>
   <unicode hex="01A4"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0218.glif b/source/Hack-Italic.ufo/glyphs/uni0218.glif
index 5e4c7829f..58d099402 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0218.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0218.glif
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0218" format="1">
+<glyph name="uni0218" format="2">
   <advance width="1233"/>
   <unicode hex="0218"/>
   <outline>
     <contour>
-      <point x="435" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="435" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="288" y="-29"/>
       <point x="158" y="1"/>
       <point x="25" y="61" type="curve"/>
       <point x="66" y="270" type="line" name="iv01"/>
       <point x="201" y="174"/>
       <point x="338" y="135"/>
-      <point x="469" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="469" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="705" y="135"/>
       <point x="848" y="266"/>
-      <point x="848" y="452" type="curve" name="ah01" smooth="yes"/>
+      <point x="848" y="452" type="curve" smooth="yes" name="ah01"/>
       <point x="848" y="559"/>
       <point x="800" y="603"/>
       <point x="627" y="659" type="curve" smooth="yes"/>
       <point x="526" y="692" type="line" smooth="yes"/>
       <point x="277" y="772"/>
       <point x="195" y="855"/>
-      <point x="195" y="1022" type="curve" name="sh01" smooth="yes"/>
+      <point x="195" y="1022" type="curve" smooth="yes" name="sh01"/>
       <point x="195" y="1313"/>
       <point x="443" y="1520"/>
-      <point x="782" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="782" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="898" y="1520"/>
       <point x="1011" y="1495"/>
       <point x="1147" y="1442" type="curve"/>
       <point x="1108" y="1237" type="line" name="iv02"/>
       <point x="999" y="1316"/>
       <point x="883" y="1356"/>
-      <point x="759" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="759" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="539" y="1356"/>
       <point x="387" y="1233"/>
-      <point x="387" y="1066" type="curve" name="sh02" smooth="yes"/>
+      <point x="387" y="1066" type="curve" smooth="yes" name="sh02"/>
       <point x="387" y="966"/>
       <point x="441" y="922"/>
       <point x="614" y="866" type="curve" smooth="yes"/>
       <point x="735" y="827" type="line" smooth="yes"/>
       <point x="965" y="752"/>
       <point x="1049" y="652"/>
-      <point x="1049" y="472" type="curve" name="sh03" smooth="yes"/>
+      <point x="1049" y="472" type="curve" smooth="yes" name="sh03"/>
       <point x="1049" y="174"/>
       <point x="813" y="-29"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0219.glif b/source/Hack-Italic.ufo/glyphs/uni0219.glif
index d8ba12e0d..e704f9060 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0219.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0219.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0219" format="1">
+<glyph name="uni0219" format="2">
   <advance width="1233"/>
   <unicode hex="0219"/>
   <outline>
     <contour>
-      <point x="476" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="476" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="360" y="-29"/>
       <point x="248" y="-6"/>
       <point x="115" y="41" type="curve"/>
       <point x="152" y="231" type="line" name="iv01"/>
       <point x="277" y="160"/>
       <point x="394" y="125"/>
-      <point x="505" y="125" type="curve" name="dv01" smooth="yes"/>
+      <point x="505" y="125" type="curve" smooth="yes" name="dv01"/>
       <point x="684" y="125"/>
       <point x="807" y="217"/>
-      <point x="807" y="325" type="curve" name="ah01" smooth="yes"/>
+      <point x="807" y="325" type="curve" smooth="yes" name="ah01"/>
       <point x="807" y="401"/>
       <point x="742" y="455"/>
       <point x="611" y="487" type="curve" smooth="yes"/>
@@ -22,20 +22,20 @@
       <point x="516" y="512" type="line" smooth="yes"/>
       <point x="345" y="557"/>
       <point x="266" y="634"/>
-      <point x="266" y="778" type="curve" name="sh01" smooth="yes"/>
+      <point x="266" y="778" type="curve" smooth="yes" name="sh01"/>
       <point x="266" y="1002"/>
       <point x="454" y="1147"/>
-      <point x="754" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="754" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="872" y="1147"/>
       <point x="980" y="1125"/>
       <point x="1077" y="1081" type="curve"/>
       <point x="1042" y="901" type="line" name="iv02"/>
       <point x="946" y="961"/>
       <point x="844" y="993"/>
-      <point x="731" y="993" type="curve" name="sv01" smooth="yes"/>
+      <point x="731" y="993" type="curve" smooth="yes" name="sv01"/>
       <point x="554" y="993"/>
       <point x="449" y="914"/>
-      <point x="449" y="810" type="curve" name="sh02" smooth="yes"/>
+      <point x="449" y="810" type="curve" smooth="yes" name="sh02"/>
       <point x="449" y="734"/>
       <point x="506" y="687"/>
       <point x="670" y="645" type="curve" smooth="yes"/>
@@ -45,7 +45,7 @@
       <point x="764" y="621" type="line" smooth="yes"/>
       <point x="924" y="581"/>
       <point x="997" y="498"/>
-      <point x="997" y="365" type="curve" name="sh03" smooth="yes"/>
+      <point x="997" y="365" type="curve" smooth="yes" name="sh03"/>
       <point x="997" y="141"/>
       <point x="788" y="-29"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni021A_.glif b/source/Hack-Italic.ufo/glyphs/uni021A_.glif
index ac0f21b5a..cb74d7f56 100644
--- a/source/Hack-Italic.ufo/glyphs/uni021A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni021A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni021A" format="1">
+<glyph name="uni021A" format="2">
   <advance width="1233"/>
   <unicode hex="021A"/>
   <outline>
@@ -11,20 +11,20 @@
       <point x="555" y="0" type="line" name="ih01"/>
       <point x="606" y="-89"/>
       <point x="627" y="-143"/>
-      <point x="627" y="-198" type="curve" name="dh02" smooth="yes"/>
+      <point x="627" y="-198" type="curve" smooth="yes" name="dh02"/>
       <point x="627" y="-314"/>
       <point x="526" y="-395"/>
-      <point x="366" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="366" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="309" y="-395"/>
       <point x="246" y="-385"/>
       <point x="182" y="-365" type="curve"/>
       <point x="207" y="-236" type="line"/>
       <point x="260" y="-261"/>
       <point x="308" y="-274"/>
-      <point x="355" y="-274" type="curve" name="dv02" smooth="yes"/>
+      <point x="355" y="-274" type="curve" smooth="yes" name="dv02"/>
       <point x="442" y="-274"/>
       <point x="494" y="-230"/>
-      <point x="494" y="-162" type="curve" name="dh01" smooth="yes"/>
+      <point x="494" y="-162" type="curve" smooth="yes" name="dh01"/>
       <point x="494" y="-122"/>
       <point x="475" y="-72"/>
       <point x="436" y="0" type="curve" name="ab02"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni021B_.glif b/source/Hack-Italic.ufo/glyphs/uni021B_.glif
index 808233c6a..57801a6e5 100644
--- a/source/Hack-Italic.ufo/glyphs/uni021B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni021B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni021B" format="1">
+<glyph name="uni021B" format="2">
   <advance width="1233"/>
   <unicode hex="021B"/>
   <outline>
@@ -10,32 +10,32 @@
       <point x="550" y="310" type="curve" name="sh04"/>
       <point x="548" y="293"/>
       <point x="547" y="277"/>
-      <point x="547" y="263" type="curve" name="sh02" smooth="yes"/>
+      <point x="547" y="263" type="curve" smooth="yes" name="sh02"/>
       <point x="547" y="218"/>
       <point x="560" y="187"/>
       <point x="586" y="170" type="curve" smooth="yes"/>
       <point x="612" y="152"/>
       <point x="659" y="143"/>
-      <point x="727" y="143" type="curve" name="hr01" smooth="yes"/>
+      <point x="727" y="143" type="curve" smooth="yes" name="hr01"/>
       <point x="934" y="143" type="line" name="sv01"/>
       <point x="905" y="-4" type="line" name="hr02"/>
       <point x="702" y="-4" type="line" name="ih01"/>
       <point x="747" y="-84"/>
       <point x="768" y="-139"/>
-      <point x="768" y="-186" type="curve" name="sh05" smooth="yes"/>
+      <point x="768" y="-186" type="curve" smooth="yes" name="sh05"/>
       <point x="768" y="-310"/>
       <point x="667" y="-388"/>
-      <point x="508" y="-388" type="curve" name="dv01" smooth="yes"/>
+      <point x="508" y="-388" type="curve" smooth="yes" name="dv01"/>
       <point x="447" y="-388"/>
       <point x="386" y="-378"/>
       <point x="323" y="-358" type="curve"/>
       <point x="348" y="-229" type="line" name="sh06"/>
       <point x="402" y="-254"/>
       <point x="450" y="-267"/>
-      <point x="493" y="-267" type="curve" name="dv02" smooth="yes"/>
+      <point x="493" y="-267" type="curve" smooth="yes" name="dv02"/>
       <point x="582" y="-267"/>
       <point x="635" y="-225"/>
-      <point x="635" y="-153" type="curve" name="ah01" smooth="yes"/>
+      <point x="635" y="-153" type="curve" smooth="yes" name="ah01"/>
       <point x="635" y="-118"/>
       <point x="616" y="-66"/>
       <point x="579" y="2" type="curve" name="ab01"/>
@@ -44,10 +44,10 @@
       <point x="437" y="52" type="curve" smooth="yes"/>
       <point x="384" y="89"/>
       <point x="358" y="142"/>
-      <point x="358" y="222" type="curve" name="sh01" smooth="yes"/>
+      <point x="358" y="222" type="curve" smooth="yes" name="sh01"/>
       <point x="358" y="238"/>
       <point x="359" y="261"/>
-      <point x="362" y="284" type="curve" name="sh07" smooth="yes"/>
+      <point x="362" y="284" type="curve" smooth="yes" name="sh07"/>
       <point x="365" y="301"/>
       <point x="368" y="330"/>
       <point x="375" y="365" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni02B_9.glif b/source/Hack-Italic.ufo/glyphs/uni02B_9.glif
index 5b268f301..4d15d4b6d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni02B_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni02B_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02B9" format="1">
+<glyph name="uni02B9" format="2">
   <advance width="1233"/>
   <unicode hex="02B9"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni02B_B_.glif b/source/Hack-Italic.ufo/glyphs/uni02B_B_.glif
index ec0db8452..673649c4d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni02B_B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni02B_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02BB" format="1">
+<glyph name="uni02BB" format="2">
   <advance width="1233"/>
   <unicode hex="02BB"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni02B_C_.glif b/source/Hack-Italic.ufo/glyphs/uni02B_C_.glif
index a08e090d4..4eb9ac477 100644
--- a/source/Hack-Italic.ufo/glyphs/uni02B_C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni02B_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02BC" format="1">
+<glyph name="uni02BC" format="2">
   <advance width="1233"/>
   <unicode hex="02BC"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni02B_D_.glif b/source/Hack-Italic.ufo/glyphs/uni02B_D_.glif
index c629e6158..53d55566b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni02B_D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni02B_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02BD" format="1">
+<glyph name="uni02BD" format="2">
   <advance width="1233"/>
   <unicode hex="02BD"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="688" y="1218" type="line" name="hr00"/>
       <point x="555" y="1218"/>
       <point x="488" y="1277"/>
-      <point x="488" y="1395" type="curve" name="dh01" smooth="yes"/>
+      <point x="488" y="1395" type="curve" smooth="yes" name="dh01"/>
       <point x="488" y="1419"/>
       <point x="489" y="1446"/>
       <point x="496" y="1475" type="curve"/>
@@ -17,7 +17,7 @@
       <point x="626" y="1475" type="line"/>
       <point x="622" y="1458"/>
       <point x="621" y="1443"/>
-      <point x="621" y="1428" type="curve" name="dh02" smooth="yes"/>
+      <point x="621" y="1428" type="curve" smooth="yes" name="dh02"/>
       <point x="621" y="1370"/>
       <point x="651" y="1341"/>
       <point x="711" y="1341" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni02B_E_.glif b/source/Hack-Italic.ufo/glyphs/uni02B_E_.glif
index 1cceeda73..c76070495 100644
--- a/source/Hack-Italic.ufo/glyphs/uni02B_E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni02B_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02BE" format="1">
+<glyph name="uni02BE" format="2">
   <advance width="1233"/>
   <unicode hex="02BE"/>
   <outline>
@@ -10,14 +10,14 @@
       <point x="638" y="1130" type="curve" name="at02"/>
       <point x="733" y="1130"/>
       <point x="823" y="1212"/>
-      <point x="823" y="1311" type="curve" name="dh01" smooth="yes"/>
+      <point x="823" y="1311" type="curve" smooth="yes" name="dh01"/>
       <point x="823" y="1382"/>
       <point x="773" y="1433"/>
       <point x="697" y="1433" type="curve"/>
       <point x="721" y="1556" type="line" name="at01"/>
       <point x="856" y="1556"/>
       <point x="947" y="1463"/>
-      <point x="947" y="1335" type="curve" name="dh02" smooth="yes"/>
+      <point x="947" y="1335" type="curve" smooth="yes" name="dh02"/>
       <point x="947" y="1318"/>
       <point x="945" y="1301"/>
       <point x="942" y="1282" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni02B_F_.glif b/source/Hack-Italic.ufo/glyphs/uni02B_F_.glif
index c16a78956..4dce33d34 100644
--- a/source/Hack-Italic.ufo/glyphs/uni02B_F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni02B_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02BF" format="1">
+<glyph name="uni02BF" format="2">
   <advance width="1233"/>
   <unicode hex="02BF"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="819" y="1007" type="curve" name="hr00"/>
       <point x="684" y="1007"/>
       <point x="593" y="1102"/>
-      <point x="593" y="1229" type="curve" name="dh01" smooth="yes"/>
+      <point x="593" y="1229" type="curve" smooth="yes" name="dh01"/>
       <point x="593" y="1246"/>
       <point x="595" y="1263"/>
       <point x="598" y="1282" type="curve"/>
@@ -17,7 +17,7 @@
       <point x="901" y="1433" type="line" name="sv01"/>
       <point x="806" y="1433"/>
       <point x="717" y="1349"/>
-      <point x="717" y="1252" type="curve" name="dh02" smooth="yes"/>
+      <point x="717" y="1252" type="curve" smooth="yes" name="dh02"/>
       <point x="717" y="1181"/>
       <point x="766" y="1130"/>
       <point x="842" y="1130" type="curve" name="at01"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni02C_0.glif b/source/Hack-Italic.ufo/glyphs/uni02C_0.glif
index 90439da52..abaa5ea11 100644
--- a/source/Hack-Italic.ufo/glyphs/uni02C_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni02C_0.glif
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02C0" format="1">
+<glyph name="uni02C0" format="2">
   <advance width="1233"/>
   <unicode hex="02C0"/>
   <outline>
     <contour>
       <point x="511" y="1341" type="line" name="hr00"/>
-      <point x="551" y="1341" type="line" name="dv02" smooth="yes"/>
+      <point x="551" y="1341" type="line" smooth="yes" name="dv02"/>
       <point x="639" y="1341"/>
       <point x="699" y="1366"/>
       <point x="739" y="1405" type="curve" smooth="yes"/>
       <point x="776" y="1441"/>
       <point x="799" y="1494"/>
-      <point x="799" y="1543" type="curve" name="dh01" smooth="yes"/>
+      <point x="799" y="1543" type="curve" smooth="yes" name="dh01"/>
       <point x="799" y="1622"/>
       <point x="739" y="1677"/>
-      <point x="614" y="1677" type="curve" name="dv03" smooth="yes"/>
+      <point x="614" y="1677" type="curve" smooth="yes" name="dv03"/>
       <point x="550" y="1677"/>
       <point x="481" y="1661"/>
       <point x="409" y="1629" type="curve"/>
       <point x="427" y="1725" type="line"/>
       <point x="496" y="1752"/>
       <point x="566" y="1764"/>
-      <point x="638" y="1764" type="curve" name="dv04" smooth="yes"/>
+      <point x="638" y="1764" type="curve" smooth="yes" name="dv04"/>
       <point x="839" y="1764"/>
       <point x="922" y="1670"/>
-      <point x="922" y="1557" type="curve" name="dh02" smooth="yes"/>
+      <point x="922" y="1557" type="curve" smooth="yes" name="dh02"/>
       <point x="922" y="1538"/>
       <point x="920" y="1520"/>
       <point x="916" y="1502" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni02C_1.glif b/source/Hack-Italic.ufo/glyphs/uni02C_1.glif
index 8d931ac6b..711959f53 100644
--- a/source/Hack-Italic.ufo/glyphs/uni02C_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni02C_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02C1" format="1">
+<glyph name="uni02C1" format="2">
   <advance width="1233"/>
   <unicode hex="02C1"/>
   <outline>
@@ -13,14 +13,14 @@
       <point x="384" y="1502" type="curve" smooth="yes"/>
       <point x="408" y="1638"/>
       <point x="533" y="1764"/>
-      <point x="764" y="1764" type="curve" name="dv02" smooth="yes"/>
+      <point x="764" y="1764" type="curve" smooth="yes" name="dv02"/>
       <point x="836" y="1764"/>
       <point x="900" y="1752"/>
       <point x="960" y="1725" type="curve"/>
       <point x="941" y="1629" type="line"/>
       <point x="881" y="1661"/>
       <point x="818" y="1677"/>
-      <point x="752" y="1677" type="curve" name="dv01" smooth="yes"/>
+      <point x="752" y="1677" type="curve" smooth="yes" name="dv01"/>
       <point x="605" y="1677"/>
       <point x="522" y="1601"/>
       <point x="506" y="1502" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni02C_8.glif b/source/Hack-Italic.ufo/glyphs/uni02C_8.glif
index d823d8a27..af4b0ac22 100644
--- a/source/Hack-Italic.ufo/glyphs/uni02C_8.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni02C_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02C8" format="1">
+<glyph name="uni02C8" format="2">
   <advance width="1233"/>
   <unicode hex="02C8"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni02C_9.glif b/source/Hack-Italic.ufo/glyphs/uni02C_9.glif
index 76cfa8069..381131c16 100644
--- a/source/Hack-Italic.ufo/glyphs/uni02C_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni02C_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02C9" format="1">
+<glyph name="uni02C9" format="2">
   <advance width="1233"/>
   <unicode hex="02C9"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni02C_C_.glif b/source/Hack-Italic.ufo/glyphs/uni02C_C_.glif
index f3c69f055..c9d49816a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni02C_C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni02C_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02CC" format="1">
+<glyph name="uni02CC" format="2">
   <advance width="1233"/>
   <unicode hex="02CC"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni02C_D_.glif b/source/Hack-Italic.ufo/glyphs/uni02C_D_.glif
index b174715c1..2eb24e220 100644
--- a/source/Hack-Italic.ufo/glyphs/uni02C_D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni02C_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02CD" format="1">
+<glyph name="uni02CD" format="2">
   <advance width="1233"/>
   <unicode hex="02CD"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni02C_E_.glif b/source/Hack-Italic.ufo/glyphs/uni02C_E_.glif
index a3af01a5f..2fc2ba77d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni02C_E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni02C_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02CE" format="1">
+<glyph name="uni02CE" format="2">
   <advance width="1233"/>
   <unicode hex="02CE"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni02C_F_.glif b/source/Hack-Italic.ufo/glyphs/uni02C_F_.glif
index 533f0047a..15d25e444 100644
--- a/source/Hack-Italic.ufo/glyphs/uni02C_F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni02C_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02CF" format="1">
+<glyph name="uni02CF" format="2">
   <advance width="1233"/>
   <unicode hex="02CF"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni02D_0.glif b/source/Hack-Italic.ufo/glyphs/uni02D_0.glif
index d145963e0..135033c9a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni02D_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni02D_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02D0" format="1">
+<glyph name="uni02D0" format="2">
   <advance width="1233"/>
   <unicode hex="02D0"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni02D_1.glif b/source/Hack-Italic.ufo/glyphs/uni02D_1.glif
index 1fddb40ce..3858b7eb1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni02D_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni02D_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni02D1" format="1">
+<glyph name="uni02D1" format="2">
   <advance width="1233"/>
   <unicode hex="02D1"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0302.glif b/source/Hack-Italic.ufo/glyphs/uni0302.glif
index 3c2454761..32ea17f8e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0302.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0302.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0302" format="1">
-  <advance width="0"/>
+<glyph name="uni0302" format="2">
   <unicode hex="0302"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0304.case.glif b/source/Hack-Italic.ufo/glyphs/uni0304.case.glif
index 5269de85a..50a632b84 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0304.case.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0304.case.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0304.case" format="1">
-  <advance width="0"/>
+<glyph name="uni0304.case" format="2">
   <outline>
     <contour>
       <point x="-702" y="1840" type="line" name="hr00"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0304.glif b/source/Hack-Italic.ufo/glyphs/uni0304.glif
index 0b4c4946b..aa12d1799 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0304.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0304.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0304" format="1">
-  <advance width="0"/>
+<glyph name="uni0304" format="2">
   <unicode hex="0304"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0305.glif b/source/Hack-Italic.ufo/glyphs/uni0305.glif
index 8f4b441ec..8fdeffa78 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0305.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0305.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0305" format="1">
-  <advance width="0"/>
+<glyph name="uni0305" format="2">
   <unicode hex="0305"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0306.case.glif b/source/Hack-Italic.ufo/glyphs/uni0306.case.glif
index c0b66b136..98318b564 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0306.case.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0306.case.glif
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0306.case" format="1">
-  <advance width="0"/>
+<glyph name="uni0306.case" format="2">
   <outline>
     <contour>
-      <point x="-439" y="1659" type="curve" name="dv01" smooth="yes"/>
+      <point x="-439" y="1659" type="curve" smooth="yes" name="dv01"/>
       <point x="-617" y="1659"/>
       <point x="-706" y="1727"/>
-      <point x="-706" y="1864" type="curve" name="dh01" smooth="yes"/>
+      <point x="-706" y="1864" type="curve" smooth="yes" name="dh01"/>
       <point x="-706" y="1876"/>
       <point x="-705" y="1888"/>
       <point x="-704" y="1901" type="curve"/>
       <point x="-585" y="1901" type="line" name="hr01"/>
       <point x="-584" y="1829"/>
       <point x="-524" y="1790"/>
-      <point x="-411" y="1790" type="curve" name="hr02" smooth="yes"/>
+      <point x="-411" y="1790" type="curve" smooth="yes" name="hr02"/>
       <point x="-302" y="1790"/>
       <point x="-231" y="1827"/>
       <point x="-196" y="1901" type="curve" name="sv01"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0306.glif b/source/Hack-Italic.ufo/glyphs/uni0306.glif
index 59b651260..ddf8bbd40 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0306.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0306.glif
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0306" format="1">
-  <advance width="0"/>
+<glyph name="uni0306" format="2">
   <unicode hex="0306"/>
   <outline>
     <contour>
-      <point x="-486" y="1321" type="curve" name="dv01" smooth="yes"/>
+      <point x="-486" y="1321" type="curve" smooth="yes" name="dv01"/>
       <point x="-665" y="1321"/>
       <point x="-764" y="1410"/>
-      <point x="-764" y="1567" type="curve" name="dh01" smooth="yes"/>
+      <point x="-764" y="1567" type="curve" smooth="yes" name="dh01"/>
       <point x="-764" y="1590"/>
       <point x="-764" y="1597"/>
       <point x="-761" y="1608" type="curve"/>
       <point x="-641" y="1608" type="line" name="hr01"/>
-      <point x="-641" y="1591" type="line" name="dh02" smooth="yes"/>
+      <point x="-641" y="1591" type="line" smooth="yes" name="dh02"/>
       <point x="-641" y="1503"/>
       <point x="-581" y="1458"/>
-      <point x="-472" y="1458" type="curve" name="hr02" smooth="yes"/>
+      <point x="-472" y="1458" type="curve" smooth="yes" name="hr02"/>
       <point x="-359" y="1458"/>
       <point x="-293" y="1508"/>
       <point x="-254" y="1608" type="curve" name="sv01"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0307.case.glif b/source/Hack-Italic.ufo/glyphs/uni0307.case.glif
index 7d81a98dc..ab416f097 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0307.case.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0307.case.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0307.case" format="1">
-  <advance width="0"/>
+<glyph name="uni0307.case" format="2">
   <outline>
     <contour>
       <point x="-500" y="1872" type="line" name="hr00"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0307.glif b/source/Hack-Italic.ufo/glyphs/uni0307.glif
index 9787f85a7..ace04ea9c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0307.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0307.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0307" format="1">
-  <advance width="0"/>
+<glyph name="uni0307" format="2">
   <unicode hex="0307"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0308.glif b/source/Hack-Italic.ufo/glyphs/uni0308.glif
index 290fd0e1d..d30c47aee 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0308.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0308.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0308" format="1">
-  <advance width="0"/>
+<glyph name="uni0308" format="2">
   <unicode hex="0308"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni030A_.glif b/source/Hack-Italic.ufo/glyphs/uni030A_.glif
index 8c2d7ae77..c31952495 100644
--- a/source/Hack-Italic.ufo/glyphs/uni030A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni030A_.glif
@@ -1,33 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni030A" format="1">
-  <advance width="0"/>
+<glyph name="uni030A" format="2">
   <unicode hex="030A"/>
   <outline>
     <contour>
-      <point x="-455" y="1321" type="curve" name="hr00" smooth="yes"/>
+      <point x="-455" y="1321" type="curve" smooth="yes" name="hr00"/>
       <point x="-607" y="1321"/>
       <point x="-729" y="1442"/>
-      <point x="-729" y="1596" type="curve" name="sh01" smooth="yes"/>
+      <point x="-729" y="1596" type="curve" smooth="yes" name="sh01"/>
       <point x="-729" y="1751"/>
       <point x="-607" y="1870"/>
-      <point x="-455" y="1870" type="curve" name="dv03" smooth="yes"/>
+      <point x="-455" y="1870" type="curve" smooth="yes" name="dv03"/>
       <point x="-302" y="1870"/>
       <point x="-180" y="1751"/>
-      <point x="-180" y="1596" type="curve" name="sh02" smooth="yes"/>
+      <point x="-180" y="1596" type="curve" smooth="yes" name="sh02"/>
       <point x="-180" y="1442"/>
       <point x="-302" y="1321"/>
     </contour>
     <contour>
-      <point x="-455" y="1444" type="curve" name="dv01" smooth="yes"/>
+      <point x="-455" y="1444" type="curve" smooth="yes" name="dv01"/>
       <point x="-371" y="1444"/>
       <point x="-303" y="1511"/>
-      <point x="-303" y="1595" type="curve" name="ah01" smooth="yes"/>
+      <point x="-303" y="1595" type="curve" smooth="yes" name="ah01"/>
       <point x="-303" y="1679"/>
       <point x="-371" y="1747"/>
-      <point x="-455" y="1747" type="curve" name="dv02" smooth="yes"/>
+      <point x="-455" y="1747" type="curve" smooth="yes" name="dv02"/>
       <point x="-540" y="1747"/>
       <point x="-606" y="1681"/>
-      <point x="-606" y="1596" type="curve" name="sh03" smooth="yes"/>
+      <point x="-606" y="1596" type="curve" smooth="yes" name="sh03"/>
       <point x="-606" y="1510"/>
       <point x="-540" y="1444"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni030B_.case.glif b/source/Hack-Italic.ufo/glyphs/uni030B_.case.glif
index 0332fa15d..885bb85df 100644
--- a/source/Hack-Italic.ufo/glyphs/uni030B_.case.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni030B_.case.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni030B.case" format="1">
-  <advance width="0"/>
+<glyph name="uni030B.case" format="2">
   <outline>
     <contour>
       <point x="-467" y="1899" type="line" name="hr00"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni030B_.glif b/source/Hack-Italic.ufo/glyphs/uni030B_.glif
index cacdbd300..2598f6b29 100644
--- a/source/Hack-Italic.ufo/glyphs/uni030B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni030B_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni030B" format="1">
-  <advance width="0"/>
+<glyph name="uni030B" format="2">
   <unicode hex="030B"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni030C_.glif b/source/Hack-Italic.ufo/glyphs/uni030C_.glif
index c08beb376..a1e4da1d1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni030C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni030C_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni030C" format="1">
-  <advance width="0"/>
+<glyph name="uni030C" format="2">
   <unicode hex="030C"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni030D_.glif b/source/Hack-Italic.ufo/glyphs/uni030D_.glif
index b91d1ee10..9b78ff354 100644
--- a/source/Hack-Italic.ufo/glyphs/uni030D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni030D_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni030D" format="1">
-  <advance width="0"/>
+<glyph name="uni030D" format="2">
   <unicode hex="030D"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni030E_.glif b/source/Hack-Italic.ufo/glyphs/uni030E_.glif
index 23eacf4e1..106acdc56 100644
--- a/source/Hack-Italic.ufo/glyphs/uni030E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni030E_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni030E" format="1">
-  <advance width="0"/>
+<glyph name="uni030E" format="2">
   <unicode hex="030E"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni030F_.case.glif b/source/Hack-Italic.ufo/glyphs/uni030F_.case.glif
index 6fbfca0a0..2217ed98c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni030F_.case.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni030F_.case.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni030F.case" format="1">
-  <advance width="0"/>
+<glyph name="uni030F.case" format="2">
   <outline>
     <contour>
       <point x="-821" y="1899" type="line" name="hr00"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni030F_.glif b/source/Hack-Italic.ufo/glyphs/uni030F_.glif
index 867b930b7..db92b6c27 100644
--- a/source/Hack-Italic.ufo/glyphs/uni030F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni030F_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni030F" format="1">
-  <advance width="0"/>
+<glyph name="uni030F" format="2">
   <unicode hex="030F"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0310.glif b/source/Hack-Italic.ufo/glyphs/uni0310.glif
index f873919e1..aa4f8e47e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0310.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0310.glif
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0310" format="1">
-  <advance width="0"/>
+<glyph name="uni0310" format="2">
   <unicode hex="0310"/>
   <outline>
     <contour>
       <point x="-87" y="1812" type="line" name="sv02"/>
       <point x="-131" y="1620"/>
       <point x="-253" y="1525"/>
-      <point x="-438" y="1525" type="curve" name="dv01" smooth="yes"/>
+      <point x="-438" y="1525" type="curve" smooth="yes" name="dv01"/>
       <point x="-617" y="1525"/>
       <point x="-716" y="1614"/>
-      <point x="-716" y="1771" type="curve" name="hr01" smooth="yes"/>
+      <point x="-716" y="1771" type="curve" smooth="yes" name="hr01"/>
       <point x="-716" y="1794"/>
       <point x="-716" y="1801"/>
       <point x="-713" y="1812" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0311.case.glif b/source/Hack-Italic.ufo/glyphs/uni0311.case.glif
index d77366182..b68997015 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0311.case.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0311.case.glif
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0311.case" format="1">
-  <advance width="0"/>
+<glyph name="uni0311.case" format="2">
   <outline>
     <contour>
       <point x="-752" y="1659" type="line" name="sv01"/>
       <point x="-705" y="1820"/>
       <point x="-585" y="1901"/>
-      <point x="-392" y="1901" type="curve" name="hr01" smooth="yes"/>
+      <point x="-392" y="1901" type="curve" smooth="yes" name="hr01"/>
       <point x="-200" y="1901"/>
       <point x="-123" y="1818"/>
-      <point x="-123" y="1696" type="curve" name="hr02" smooth="yes"/>
+      <point x="-123" y="1696" type="curve" smooth="yes" name="hr02"/>
       <point x="-123" y="1681"/>
       <point x="-124" y="1671"/>
       <point x="-125" y="1659" type="curve"/>
       <point x="-244" y="1659" type="line" name="dh01"/>
       <point x="-249" y="1733"/>
       <point x="-306" y="1770"/>
-      <point x="-415" y="1770" type="curve" name="sv02" smooth="yes"/>
+      <point x="-415" y="1770" type="curve" smooth="yes" name="sv02"/>
       <point x="-528" y="1770"/>
       <point x="-602" y="1731"/>
       <point x="-633" y="1659" type="curve" name="sv03"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0311.glif b/source/Hack-Italic.ufo/glyphs/uni0311.glif
index 5a7a90056..e41fb5202 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0311.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0311.glif
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0311" format="1">
-  <advance width="0"/>
+<glyph name="uni0311" format="2">
   <unicode hex="0311"/>
   <outline>
     <contour>
       <point x="-817" y="1321" type="line" name="sv01"/>
       <point x="-765" y="1512"/>
       <point x="-642" y="1608"/>
-      <point x="-447" y="1608" type="curve" name="hr01" smooth="yes"/>
+      <point x="-447" y="1608" type="curve" smooth="yes" name="hr01"/>
       <point x="-255" y="1608"/>
       <point x="-187" y="1513"/>
-      <point x="-187" y="1376" type="curve" name="hr02" smooth="yes"/>
+      <point x="-187" y="1376" type="curve" smooth="yes" name="hr02"/>
       <point x="-187" y="1358"/>
       <point x="-188" y="1340"/>
       <point x="-190" y="1321" type="curve"/>
       <point x="-309" y="1321" type="line" name="dh01"/>
       <point x="-308" y="1426"/>
       <point x="-365" y="1471"/>
-      <point x="-476" y="1471" type="curve" name="sv02" smooth="yes"/>
+      <point x="-476" y="1471" type="curve" smooth="yes" name="sv02"/>
       <point x="-595" y="1471"/>
       <point x="-663" y="1420"/>
       <point x="-698" y="1321" type="curve" name="sv03"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0312.glif b/source/Hack-Italic.ufo/glyphs/uni0312.glif
index 561bb9208..bb8b0bd08 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0312.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0312.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0312" format="1">
-  <advance width="0"/>
+<glyph name="uni0312" format="2">
   <unicode hex="0312"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0313.glif b/source/Hack-Italic.ufo/glyphs/uni0313.glif
index de4a3bcb0..0c68591ef 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0313.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0313.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0313" format="1">
-  <advance width="0"/>
+<glyph name="uni0313" format="2">
   <unicode hex="0313"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0314.glif b/source/Hack-Italic.ufo/glyphs/uni0314.glif
index c46c04402..cc15c5f82 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0314.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0314.glif
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0314" format="1">
-  <advance width="0"/>
+<glyph name="uni0314" format="2">
   <unicode hex="0314"/>
   <outline>
     <contour>
       <point x="-545" y="1218" type="line" name="hr00"/>
       <point x="-678" y="1218"/>
       <point x="-745" y="1277"/>
-      <point x="-745" y="1395" type="curve" name="dh01" smooth="yes"/>
+      <point x="-745" y="1395" type="curve" smooth="yes" name="dh01"/>
       <point x="-745" y="1419"/>
       <point x="-744" y="1446"/>
       <point x="-737" y="1475" type="curve"/>
@@ -17,7 +16,7 @@
       <point x="-607" y="1475" type="line"/>
       <point x="-611" y="1458"/>
       <point x="-612" y="1443"/>
-      <point x="-612" y="1428" type="curve" name="dh02" smooth="yes"/>
+      <point x="-612" y="1428" type="curve" smooth="yes" name="dh02"/>
       <point x="-612" y="1370"/>
       <point x="-582" y="1341"/>
       <point x="-522" y="1341" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0315.glif b/source/Hack-Italic.ufo/glyphs/uni0315.glif
index e07db379d..2e146ec9f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0315.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0315.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0315" format="1">
-  <advance width="0"/>
+<glyph name="uni0315" format="2">
   <unicode hex="0315"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0316.glif b/source/Hack-Italic.ufo/glyphs/uni0316.glif
index 27733a472..79b895e20 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0316.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0316.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0316" format="1">
-  <advance width="0"/>
+<glyph name="uni0316" format="2">
   <unicode hex="0316"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0317.glif b/source/Hack-Italic.ufo/glyphs/uni0317.glif
index 0f83d988b..ba0953185 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0317.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0317.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0317" format="1">
-  <advance width="0"/>
+<glyph name="uni0317" format="2">
   <unicode hex="0317"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0318.glif b/source/Hack-Italic.ufo/glyphs/uni0318.glif
index bd8bd74ed..54267d1d2 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0318.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0318.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0318" format="1">
-  <advance width="0"/>
+<glyph name="uni0318" format="2">
   <unicode hex="0318"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0319.glif b/source/Hack-Italic.ufo/glyphs/uni0319.glif
index 41f126501..1e38d58a5 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0319.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0319.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0319" format="1">
-  <advance width="0"/>
+<glyph name="uni0319" format="2">
   <unicode hex="0319"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni031A_.glif b/source/Hack-Italic.ufo/glyphs/uni031A_.glif
index bc5aa3c22..001e1ba48 100644
--- a/source/Hack-Italic.ufo/glyphs/uni031A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni031A_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni031A" format="1">
-  <advance width="0"/>
+<glyph name="uni031A" format="2">
   <unicode hex="031A"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni031B_.glif b/source/Hack-Italic.ufo/glyphs/uni031B_.glif
index cf076a97f..f4ee94f6f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni031B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni031B_.glif
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni031B" format="1">
-  <advance width="0"/>
+<glyph name="uni031B" format="2">
   <unicode hex="031B"/>
   <outline>
     <contour>
-      <point x="-628" y="764" type="curve" name="sv01" smooth="yes"/>
+      <point x="-628" y="764" type="curve" smooth="yes" name="sv01"/>
       <point x="-703" y="764"/>
       <point x="-760" y="797"/>
       <point x="-829" y="872" type="curve"/>
       <point x="-806" y="991" type="line" name="iv01"/>
       <point x="-733" y="927"/>
       <point x="-684" y="903"/>
-      <point x="-639" y="903" type="curve" name="sv02" smooth="yes"/>
+      <point x="-639" y="903" type="curve" smooth="yes" name="sv02"/>
       <point x="-583" y="903"/>
       <point x="-545" y="940"/>
       <point x="-530" y="1012" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni031C_.glif b/source/Hack-Italic.ufo/glyphs/uni031C_.glif
index fa9c59c1d..b105441c2 100644
--- a/source/Hack-Italic.ufo/glyphs/uni031C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni031C_.glif
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni031C" format="1">
-  <advance width="0"/>
+<glyph name="uni031C" format="2">
   <unicode hex="031C"/>
   <outline>
     <contour>
       <point x="-749" y="-502" type="line" name="ab01"/>
       <point x="-873" y="-502"/>
       <point x="-930" y="-415"/>
-      <point x="-930" y="-321" type="curve" name="dh01" smooth="yes"/>
+      <point x="-930" y="-321" type="curve" smooth="yes" name="dh01"/>
       <point x="-930" y="-173"/>
       <point x="-787" y="-63"/>
       <point x="-663" y="-63" type="curve" name="sv01"/>
       <point x="-682" y="-161" type="line" name="sv02"/>
       <point x="-750" y="-161"/>
       <point x="-830" y="-222"/>
-      <point x="-830" y="-304" type="curve" name="dh02" smooth="yes"/>
+      <point x="-830" y="-304" type="curve" smooth="yes" name="dh02"/>
       <point x="-830" y="-356"/>
       <point x="-798" y="-404"/>
       <point x="-730" y="-404" type="curve" name="hr01"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni031D_.glif b/source/Hack-Italic.ufo/glyphs/uni031D_.glif
index 9c4dde424..a677a8b07 100644
--- a/source/Hack-Italic.ufo/glyphs/uni031D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni031D_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni031D" format="1">
-  <advance width="0"/>
+<glyph name="uni031D" format="2">
   <unicode hex="031D"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni031E_.glif b/source/Hack-Italic.ufo/glyphs/uni031E_.glif
index a122672a2..801fecf67 100644
--- a/source/Hack-Italic.ufo/glyphs/uni031E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni031E_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni031E" format="1">
-  <advance width="0"/>
+<glyph name="uni031E" format="2">
   <unicode hex="031E"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni031F_.glif b/source/Hack-Italic.ufo/glyphs/uni031F_.glif
index 284815bc7..6d4fb891e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni031F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni031F_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni031F" format="1">
-  <advance width="0"/>
+<glyph name="uni031F" format="2">
   <unicode hex="031F"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0320.glif b/source/Hack-Italic.ufo/glyphs/uni0320.glif
index 71c451f30..f517b2688 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0320.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0320.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0320" format="1">
-  <advance width="0"/>
+<glyph name="uni0320" format="2">
   <unicode hex="0320"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0321.glif b/source/Hack-Italic.ufo/glyphs/uni0321.glif
index dca0af865..8eb2b9762 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0321.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0321.glif
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0321" format="1">
-  <advance width="0"/>
+<glyph name="uni0321" format="2">
   <unicode hex="0321"/>
   <outline>
     <contour>
       <point x="-893" y="-270" type="line" name="hr00"/>
-      <point x="-708" y="-270" type="line" name="dv02" smooth="yes"/>
+      <point x="-708" y="-270" type="line" smooth="yes" name="dv02"/>
       <point x="-583" y="-270"/>
       <point x="-513" y="-185"/>
       <point x="-481" y="-20" type="curve" smooth="yes"/>
@@ -14,7 +13,7 @@
       <point x="-296" y="-20" type="line" smooth="yes"/>
       <point x="-346" y="-280"/>
       <point x="-499" y="-426"/>
-      <point x="-719" y="-426" type="curve" name="dv01" smooth="yes"/>
+      <point x="-719" y="-426" type="curve" smooth="yes" name="dv01"/>
       <point x="-924" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0322.glif b/source/Hack-Italic.ufo/glyphs/uni0322.glif
index 70dae5057..d5fddd0b5 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0322.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0322.glif
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0322" format="1">
-  <advance width="0"/>
+<glyph name="uni0322" format="2">
   <unicode hex="0322"/>
   <outline>
     <contour>
-      <point x="-888" y="-426" type="line" name="hr00" smooth="yes"/>
+      <point x="-888" y="-426" type="line" smooth="yes" name="hr00"/>
       <point x="-1071" y="-426"/>
       <point x="-1166" y="-329"/>
-      <point x="-1166" y="-146" type="curve" name="dh01" smooth="yes"/>
+      <point x="-1166" y="-146" type="curve" smooth="yes" name="dh01"/>
       <point x="-1166" y="-107"/>
       <point x="-1162" y="-67"/>
       <point x="-1153" y="-20" type="curve" smooth="yes"/>
@@ -16,10 +15,10 @@
       <point x="-968" y="-20" type="line" smooth="yes"/>
       <point x="-975" y="-56"/>
       <point x="-978" y="-87"/>
-      <point x="-978" y="-115" type="curve" name="dh02" smooth="yes"/>
+      <point x="-978" y="-115" type="curve" smooth="yes" name="dh02"/>
       <point x="-978" y="-218"/>
       <point x="-931" y="-270"/>
-      <point x="-837" y="-270" type="curve" name="dv01" smooth="yes"/>
+      <point x="-837" y="-270" type="curve" smooth="yes" name="dv01"/>
       <point x="-652" y="-270" type="line"/>
       <point x="-683" y="-426" type="line" name="sv01"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0324.glif b/source/Hack-Italic.ufo/glyphs/uni0324.glif
index 6c96669df..59190d599 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0324.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0324.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0324" format="1">
-  <advance width="0"/>
+<glyph name="uni0324" format="2">
   <unicode hex="0324"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0325.glif b/source/Hack-Italic.ufo/glyphs/uni0325.glif
index 86571b6ed..9cb1af2f7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0325.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0325.glif
@@ -1,33 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0325" format="1">
-  <advance width="0"/>
+<glyph name="uni0325" format="2">
   <unicode hex="0325"/>
   <outline>
     <contour>
-      <point x="-863" y="-502" type="curve" name="hr00" smooth="yes"/>
+      <point x="-863" y="-502" type="curve" smooth="yes" name="hr00"/>
       <point x="-971" y="-502"/>
       <point x="-1039" y="-426"/>
-      <point x="-1039" y="-322" type="curve" name="sh01" smooth="yes"/>
+      <point x="-1039" y="-322" type="curve" smooth="yes" name="sh01"/>
       <point x="-1039" y="-173"/>
       <point x="-897" y="-63"/>
-      <point x="-768" y="-63" type="curve" name="dv02" smooth="yes"/>
+      <point x="-768" y="-63" type="curve" smooth="yes" name="dv02"/>
       <point x="-661" y="-63"/>
       <point x="-591" y="-139"/>
-      <point x="-591" y="-243" type="curve" name="sh02" smooth="yes"/>
+      <point x="-591" y="-243" type="curve" smooth="yes" name="sh02"/>
       <point x="-591" y="-391"/>
       <point x="-732" y="-502"/>
     </contour>
     <contour>
-      <point x="-843" y="-404" type="curve" name="sv01" smooth="yes"/>
+      <point x="-843" y="-404" type="curve" smooth="yes" name="sv01"/>
       <point x="-771" y="-404"/>
       <point x="-691" y="-343"/>
-      <point x="-691" y="-261" type="curve" name="ah01" smooth="yes"/>
+      <point x="-691" y="-261" type="curve" smooth="yes" name="ah01"/>
       <point x="-691" y="-204"/>
       <point x="-730" y="-161"/>
-      <point x="-790" y="-161" type="curve" name="dv01" smooth="yes"/>
+      <point x="-790" y="-161" type="curve" smooth="yes" name="dv01"/>
       <point x="-859" y="-161"/>
       <point x="-939" y="-221"/>
-      <point x="-939" y="-305" type="curve" name="sh03" smooth="yes"/>
+      <point x="-939" y="-305" type="curve" smooth="yes" name="sh03"/>
       <point x="-939" y="-362"/>
       <point x="-903" y="-404"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0326.glif b/source/Hack-Italic.ufo/glyphs/uni0326.glif
index ec3347fd7..640230477 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0326.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0326.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0326" format="1">
-  <advance width="0"/>
+<glyph name="uni0326" format="2">
   <unicode hex="0326"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0327.glif b/source/Hack-Italic.ufo/glyphs/uni0327.glif
index 824cdd4cd..00228dd09 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0327.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0327.glif
@@ -1,27 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0327" format="1">
-  <advance width="0"/>
+<glyph name="uni0327" format="2">
   <unicode hex="0327"/>
   <outline>
     <contour>
-      <point x="-867" y="-395" type="curve" name="hr00" smooth="yes"/>
+      <point x="-867" y="-395" type="curve" smooth="yes" name="hr00"/>
       <point x="-924" y="-395"/>
       <point x="-987" y="-385"/>
       <point x="-1051" y="-365" type="curve"/>
       <point x="-1026" y="-236" type="line"/>
       <point x="-973" y="-261"/>
       <point x="-925" y="-274"/>
-      <point x="-878" y="-274" type="curve" name="dv01" smooth="yes"/>
+      <point x="-878" y="-274" type="curve" smooth="yes" name="dv01"/>
       <point x="-791" y="-274"/>
       <point x="-739" y="-230"/>
-      <point x="-739" y="-162" type="curve" name="dh01" smooth="yes"/>
+      <point x="-739" y="-162" type="curve" smooth="yes" name="dh01"/>
       <point x="-739" y="-122"/>
       <point x="-758" y="-72"/>
       <point x="-797" y="0" type="curve" name="ab01"/>
       <point x="-678" y="0" type="line"/>
       <point x="-627" y="-89"/>
       <point x="-606" y="-143"/>
-      <point x="-606" y="-198" type="curve" name="dh02" smooth="yes"/>
+      <point x="-606" y="-198" type="curve" smooth="yes" name="dh02"/>
       <point x="-606" y="-314"/>
       <point x="-707" y="-395"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0328.glif b/source/Hack-Italic.ufo/glyphs/uni0328.glif
index f320d352b..8571357b6 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0328.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0328.glif
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0328" format="1">
-  <advance width="0"/>
+<glyph name="uni0328" format="2">
   <unicode hex="0328"/>
   <outline>
     <contour>
-      <point x="-787" y="-395" type="curve" name="hr00" smooth="yes"/>
+      <point x="-787" y="-395" type="curve" smooth="yes" name="hr00"/>
       <point x="-918" y="-395"/>
       <point x="-992" y="-338"/>
-      <point x="-992" y="-245" type="curve" name="dh01" smooth="yes"/>
+      <point x="-992" y="-245" type="curve" smooth="yes" name="dh01"/>
       <point x="-992" y="-170"/>
       <point x="-944" y="-93"/>
       <point x="-840" y="0" type="curve" name="ab01"/>
       <point x="-721" y="0" type="line"/>
       <point x="-802" y="-77"/>
       <point x="-846" y="-144"/>
-      <point x="-846" y="-200" type="curve" name="dh02" smooth="yes"/>
+      <point x="-846" y="-200" type="curve" smooth="yes" name="dh02"/>
       <point x="-846" y="-247"/>
       <point x="-814" y="-272"/>
-      <point x="-750" y="-272" type="curve" name="dv01" smooth="yes"/>
+      <point x="-750" y="-272" type="curve" smooth="yes" name="dv01"/>
       <point x="-711" y="-272"/>
       <point x="-666" y="-262"/>
       <point x="-623" y="-242" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0329.glif b/source/Hack-Italic.ufo/glyphs/uni0329.glif
index abc2fda7e..be07d0dc8 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0329.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0329.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0329" format="1">
-  <advance width="0"/>
+<glyph name="uni0329" format="2">
   <unicode hex="0329"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni032A_.glif b/source/Hack-Italic.ufo/glyphs/uni032A_.glif
index 594101b16..d9d21ebc9 100644
--- a/source/Hack-Italic.ufo/glyphs/uni032A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni032A_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni032A" format="1">
-  <advance width="0"/>
+<glyph name="uni032A" format="2">
   <unicode hex="032A"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni032B_.glif b/source/Hack-Italic.ufo/glyphs/uni032B_.glif
index ba851c227..36f073897 100644
--- a/source/Hack-Italic.ufo/glyphs/uni032B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni032B_.glif
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni032B" format="1">
-  <advance width="0"/>
+<glyph name="uni032B" format="2">
   <unicode hex="032B"/>
   <outline>
     <contour>
-      <point x="-820" y="-455" type="curve" name="dv01" smooth="yes"/>
+      <point x="-820" y="-455" type="curve" smooth="yes" name="dv01"/>
       <point x="-944" y="-455"/>
       <point x="-1006" y="-387"/>
-      <point x="-1006" y="-250" type="curve" name="dh01" smooth="yes"/>
+      <point x="-1006" y="-250" type="curve" smooth="yes" name="dh01"/>
       <point x="-1006" y="-227"/>
       <point x="-1004" y="-201"/>
       <point x="-1000" y="-173" type="curve" name="sh01"/>
@@ -17,27 +16,27 @@
       <point x="-882" y="-168" type="line" name="sv01"/>
       <point x="-883" y="-181"/>
       <point x="-884" y="-194"/>
-      <point x="-884" y="-206" type="curve" name="hr01" smooth="yes"/>
+      <point x="-884" y="-206" type="curve" smooth="yes" name="hr01"/>
       <point x="-884" y="-281"/>
       <point x="-854" y="-318"/>
-      <point x="-794" y="-318" type="curve" name="dv02" smooth="yes"/>
+      <point x="-794" y="-318" type="curve" smooth="yes" name="dv02"/>
       <point x="-726" y="-318"/>
       <point x="-677" y="-268"/>
       <point x="-648" y="-168" type="curve" name="hr02"/>
       <point x="-530" y="-168" type="line"/>
       <point x="-531" y="-179"/>
       <point x="-532" y="-188"/>
-      <point x="-532" y="-199" type="curve" name="hr03" smooth="yes"/>
+      <point x="-532" y="-199" type="curve" smooth="yes" name="hr03"/>
       <point x="-532" y="-279"/>
       <point x="-492" y="-318"/>
-      <point x="-444" y="-318" type="curve" name="sv02" smooth="yes"/>
+      <point x="-444" y="-318" type="curve" smooth="yes" name="sv02"/>
       <point x="-389" y="-318"/>
       <point x="-327" y="-268"/>
       <point x="-296" y="-168" type="curve" name="hr04"/>
       <point x="-178" y="-168" type="line"/>
       <point x="-226" y="-365"/>
       <point x="-329" y="-455"/>
-      <point x="-469" y="-455" type="curve" name="sv03" smooth="yes"/>
+      <point x="-469" y="-455" type="curve" smooth="yes" name="sv03"/>
       <point x="-546" y="-455"/>
       <point x="-599" y="-428"/>
       <point x="-628" y="-373" type="curve" name="ih01"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni032C_.glif b/source/Hack-Italic.ufo/glyphs/uni032C_.glif
index f025c3a42..a817e19cb 100644
--- a/source/Hack-Italic.ufo/glyphs/uni032C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni032C_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni032C" format="1">
-  <advance width="0"/>
+<glyph name="uni032C" format="2">
   <unicode hex="032C"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni032D_.glif b/source/Hack-Italic.ufo/glyphs/uni032D_.glif
index 6991b40e0..5fb3f6f19 100644
--- a/source/Hack-Italic.ufo/glyphs/uni032D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni032D_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni032D" format="1">
-  <advance width="0"/>
+<glyph name="uni032D" format="2">
   <unicode hex="032D"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni032E_.glif b/source/Hack-Italic.ufo/glyphs/uni032E_.glif
index a2058c334..069509cd2 100644
--- a/source/Hack-Italic.ufo/glyphs/uni032E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni032E_.glif
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni032E" format="1">
-  <advance width="0"/>
+<glyph name="uni032E" format="2">
   <unicode hex="032E"/>
   <outline>
     <contour>
-      <point x="-838" y="-487" type="curve" name="dv01" smooth="yes"/>
+      <point x="-838" y="-487" type="curve" smooth="yes" name="dv01"/>
       <point x="-1017" y="-487"/>
       <point x="-1116" y="-398"/>
-      <point x="-1116" y="-241" type="curve" name="dh01" smooth="yes"/>
+      <point x="-1116" y="-241" type="curve" smooth="yes" name="dh01"/>
       <point x="-1116" y="-218"/>
       <point x="-1116" y="-211"/>
       <point x="-1113" y="-200" type="curve"/>
       <point x="-993" y="-200" type="line" name="hr01"/>
-      <point x="-993" y="-217" type="line" name="dh02" smooth="yes"/>
+      <point x="-993" y="-217" type="line" smooth="yes" name="dh02"/>
       <point x="-993" y="-305"/>
       <point x="-933" y="-350"/>
-      <point x="-824" y="-350" type="curve" name="hr02" smooth="yes"/>
+      <point x="-824" y="-350" type="curve" smooth="yes" name="hr02"/>
       <point x="-711" y="-350"/>
       <point x="-645" y="-300"/>
       <point x="-606" y="-200" type="curve" name="sv01"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni032F_.glif b/source/Hack-Italic.ufo/glyphs/uni032F_.glif
index 314212e57..2900dad09 100644
--- a/source/Hack-Italic.ufo/glyphs/uni032F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni032F_.glif
@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni032F" format="1">
-  <advance width="0"/>
+<glyph name="uni032F" format="2">
   <unicode hex="032F"/>
   <outline>
     <contour>
       <point x="-1168" y="-485" type="line" name="sv01"/>
       <point x="-1116" y="-294"/>
       <point x="-993" y="-198"/>
-      <point x="-798" y="-198" type="curve" name="hr01" smooth="yes"/>
+      <point x="-798" y="-198" type="curve" smooth="yes" name="hr01"/>
       <point x="-606" y="-198"/>
       <point x="-538" y="-293"/>
-      <point x="-538" y="-430" type="curve" name="dh02" smooth="yes"/>
+      <point x="-538" y="-430" type="curve" smooth="yes" name="dh02"/>
       <point x="-538" y="-448"/>
       <point x="-539" y="-466"/>
       <point x="-541" y="-485" type="curve" name="hr02"/>
       <point x="-660" y="-485" type="line" name="dv01"/>
-      <point x="-660" y="-472" type="line" name="dh01" smooth="yes"/>
+      <point x="-660" y="-472" type="line" smooth="yes" name="dh01"/>
       <point x="-660" y="-384"/>
       <point x="-708" y="-335"/>
-      <point x="-824" y="-335" type="curve" name="sv02" smooth="yes"/>
+      <point x="-824" y="-335" type="curve" smooth="yes" name="sv02"/>
       <point x="-943" y="-335"/>
       <point x="-1013" y="-386"/>
       <point x="-1049" y="-485" type="curve" name="sv03"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0330.glif b/source/Hack-Italic.ufo/glyphs/uni0330.glif
index 8ed89caf2..0f8a48616 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0330.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0330.glif
@@ -1,31 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0330" format="1">
-  <advance width="0"/>
+<glyph name="uni0330" format="2">
   <unicode hex="0330"/>
   <outline>
     <contour>
-      <point x="-699" y="-487" type="curve" name="av01" smooth="yes"/>
+      <point x="-699" y="-487" type="curve" smooth="yes" name="av01"/>
       <point x="-744" y="-487"/>
       <point x="-789" y="-474"/>
       <point x="-844" y="-418" type="curve" smooth="yes"/>
       <point x="-891" y="-369" type="line" smooth="yes"/>
       <point x="-915" y="-344"/>
       <point x="-940" y="-332"/>
-      <point x="-965" y="-332" type="curve" name="dv01" smooth="yes"/>
+      <point x="-965" y="-332" type="curve" smooth="yes" name="dv01"/>
       <point x="-1021" y="-332"/>
       <point x="-1048" y="-388"/>
       <point x="-1059" y="-485" type="curve" name="av02"/>
       <point x="-1184" y="-485" type="line" name="sv01"/>
       <point x="-1161" y="-306"/>
       <point x="-1088" y="-203"/>
-      <point x="-961" y="-203" type="curve" name="dv02" smooth="yes"/>
+      <point x="-961" y="-203" type="curve" smooth="yes" name="dv02"/>
       <point x="-908" y="-203"/>
       <point x="-866" y="-221"/>
-      <point x="-815" y="-272" type="curve" name="hr01" smooth="yes"/>
+      <point x="-815" y="-272" type="curve" smooth="yes" name="hr01"/>
       <point x="-768" y="-319" type="line" smooth="yes"/>
       <point x="-741" y="-346"/>
       <point x="-725" y="-358"/>
-      <point x="-698" y="-358" type="curve" name="sv02" smooth="yes"/>
+      <point x="-698" y="-358" type="curve" smooth="yes" name="sv02"/>
       <point x="-644" y="-358"/>
       <point x="-611" y="-306"/>
       <point x="-600" y="-203" type="curve" name="sv03"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0331.glif b/source/Hack-Italic.ufo/glyphs/uni0331.glif
index 40feb34cc..3f903a78f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0331.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0331.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0331" format="1">
-  <advance width="0"/>
+<glyph name="uni0331" format="2">
   <unicode hex="0331"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0332.glif b/source/Hack-Italic.ufo/glyphs/uni0332.glif
index 7af509e89..c82503474 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0332.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0332.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0332" format="1">
-  <advance width="0"/>
+<glyph name="uni0332" format="2">
   <unicode hex="0332"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0333.glif b/source/Hack-Italic.ufo/glyphs/uni0333.glif
index ba20905e0..08c846c7c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0333.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0333.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0333" format="1">
-  <advance width="0"/>
+<glyph name="uni0333" format="2">
   <unicode hex="0333"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0334.glif b/source/Hack-Italic.ufo/glyphs/uni0334.glif
index 9c1aabaf7..986ca906c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0334.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0334.glif
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0334" format="1">
-  <advance width="0"/>
+<glyph name="uni0334" format="2">
   <unicode hex="0334"/>
   <outline>
     <contour>
       <point x="-1139" y="666" type="line" name="hr00"/>
       <point x="-1019" y="746"/>
       <point x="-922" y="780"/>
-      <point x="-808" y="780" type="curve" name="hr01" smooth="yes"/>
+      <point x="-808" y="780" type="curve" smooth="yes" name="hr01"/>
       <point x="-741" y="780"/>
       <point x="-685" y="767"/>
       <point x="-593" y="727" type="curve"/>
@@ -16,14 +15,14 @@
       <point x="-563" y="712" type="curve"/>
       <point x="-488" y="675"/>
       <point x="-432" y="657"/>
-      <point x="-367" y="657" type="curve" name="hr02" smooth="yes"/>
+      <point x="-367" y="657" type="curve" smooth="yes" name="hr02"/>
       <point x="-271" y="657"/>
       <point x="-176" y="696"/>
       <point x="-60" y="780" type="curve"/>
       <point x="-94" y="606" type="line" name="hr03"/>
       <point x="-204" y="530"/>
       <point x="-309" y="492"/>
-      <point x="-408" y="492" type="curve" name="hr04" smooth="yes"/>
+      <point x="-408" y="492" type="curve" smooth="yes" name="hr04"/>
       <point x="-476" y="492"/>
       <point x="-537" y="508"/>
       <point x="-606" y="543" type="curve"/>
@@ -32,7 +31,7 @@
       <point x="-636" y="557" type="curve" smooth="yes"/>
       <point x="-731" y="599"/>
       <point x="-780" y="614"/>
-      <point x="-851" y="614" type="curve" name="hr05" smooth="yes"/>
+      <point x="-851" y="614" type="curve" smooth="yes" name="hr05"/>
       <point x="-959" y="614"/>
       <point x="-1054" y="580"/>
       <point x="-1173" y="492" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0335.glif b/source/Hack-Italic.ufo/glyphs/uni0335.glif
index a0d8fa62f..ec9d4e26b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0335.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0335.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0335" format="1">
-  <advance width="0"/>
+<glyph name="uni0335" format="2">
   <unicode hex="0335"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0336.glif b/source/Hack-Italic.ufo/glyphs/uni0336.glif
index 834139656..66a0d530f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0336.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0336.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0336" format="1">
-  <advance width="0"/>
+<glyph name="uni0336" format="2">
   <unicode hex="0336"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0337.glif b/source/Hack-Italic.ufo/glyphs/uni0337.glif
index 908c4dd15..4cae4e8f7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0337.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0337.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0337" format="1">
-  <advance width="0"/>
+<glyph name="uni0337" format="2">
   <unicode hex="0337"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0338.glif b/source/Hack-Italic.ufo/glyphs/uni0338.glif
index a50c37731..f18c701aa 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0338.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0338.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0338" format="1">
-  <advance width="0"/>
+<glyph name="uni0338" format="2">
   <unicode hex="0338"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0339.glif b/source/Hack-Italic.ufo/glyphs/uni0339.glif
index 96a02fd82..96309a5bb 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0339.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0339.glif
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0339" format="1">
-  <advance width="0"/>
+<glyph name="uni0339" format="2">
   <unicode hex="0339"/>
   <outline>
     <contour>
       <point x="-950" y="-404" type="line" name="sv01"/>
       <point x="-882" y="-404"/>
       <point x="-801" y="-343"/>
-      <point x="-801" y="-261" type="curve" name="dh01" smooth="yes"/>
+      <point x="-801" y="-261" type="curve" smooth="yes" name="dh01"/>
       <point x="-801" y="-209"/>
       <point x="-834" y="-161"/>
       <point x="-902" y="-161" type="curve"/>
       <point x="-883" y="-63" type="line" name="sv02"/>
       <point x="-759" y="-63"/>
       <point x="-701" y="-150"/>
-      <point x="-701" y="-243" type="curve" name="dh02" smooth="yes"/>
+      <point x="-701" y="-243" type="curve" smooth="yes" name="dh02"/>
       <point x="-701" y="-391"/>
       <point x="-845" y="-502"/>
       <point x="-969" y="-502" type="curve" name="hr01"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni033A_.glif b/source/Hack-Italic.ufo/glyphs/uni033A_.glif
index bf7257e04..1aba50c03 100644
--- a/source/Hack-Italic.ufo/glyphs/uni033A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni033A_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni033A" format="1">
-  <advance width="0"/>
+<glyph name="uni033A" format="2">
   <unicode hex="033A"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni033B_.glif b/source/Hack-Italic.ufo/glyphs/uni033B_.glif
index 16726aef4..e7c422c23 100644
--- a/source/Hack-Italic.ufo/glyphs/uni033B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni033B_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni033B" format="1">
-  <advance width="0"/>
+<glyph name="uni033B" format="2">
   <unicode hex="033B"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni033C_.glif b/source/Hack-Italic.ufo/glyphs/uni033C_.glif
index d18c3bb6f..ffacf7916 100644
--- a/source/Hack-Italic.ufo/glyphs/uni033C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni033C_.glif
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni033C" format="1">
-  <advance width="0"/>
+<glyph name="uni033C" format="2">
   <unicode hex="033C"/>
   <outline>
     <contour>
       <point x="-1055" y="-455" type="line" name="sv01"/>
       <point x="-1007" y="-258"/>
       <point x="-904" y="-168"/>
-      <point x="-764" y="-168" type="curve" name="hr01" smooth="yes"/>
+      <point x="-764" y="-168" type="curve" smooth="yes" name="hr01"/>
       <point x="-687" y="-168"/>
       <point x="-634" y="-195"/>
       <point x="-605" y="-250" type="curve" name="ih01"/>
       <point x="-554" y="-195"/>
       <point x="-490" y="-168"/>
-      <point x="-413" y="-168" type="curve" name="hr02" smooth="yes"/>
+      <point x="-413" y="-168" type="curve" smooth="yes" name="hr02"/>
       <point x="-289" y="-168"/>
       <point x="-227" y="-236"/>
-      <point x="-227" y="-373" type="curve" name="dh02" smooth="yes"/>
+      <point x="-227" y="-373" type="curve" smooth="yes" name="dh02"/>
       <point x="-227" y="-396"/>
       <point x="-229" y="-422"/>
       <point x="-233" y="-450" type="curve" name="hr03"/>
@@ -26,20 +25,20 @@
       <point x="-351" y="-455" type="line" name="hr04"/>
       <point x="-350" y="-442"/>
       <point x="-349" y="-429"/>
-      <point x="-349" y="-417" type="curve" name="sh02" smooth="yes"/>
+      <point x="-349" y="-417" type="curve" smooth="yes" name="sh02"/>
       <point x="-349" y="-342"/>
       <point x="-379" y="-305"/>
-      <point x="-439" y="-305" type="curve" name="sv02" smooth="yes"/>
+      <point x="-439" y="-305" type="curve" smooth="yes" name="sv02"/>
       <point x="-508" y="-305"/>
       <point x="-556" y="-355"/>
       <point x="-585" y="-455" type="curve"/>
       <point x="-703" y="-455" type="line" name="dv01"/>
       <point x="-702" y="-444"/>
       <point x="-701" y="-435"/>
-      <point x="-701" y="-424" type="curve" name="dh01" smooth="yes"/>
+      <point x="-701" y="-424" type="curve" smooth="yes" name="dh01"/>
       <point x="-701" y="-344"/>
       <point x="-741" y="-305"/>
-      <point x="-789" y="-305" type="curve" name="sv03" smooth="yes"/>
+      <point x="-789" y="-305" type="curve" smooth="yes" name="sv03"/>
       <point x="-844" y="-305"/>
       <point x="-906" y="-355"/>
       <point x="-937" y="-455" type="curve" name="sv04"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni033D_.glif b/source/Hack-Italic.ufo/glyphs/uni033D_.glif
index 8a6984626..82d48f6fc 100644
--- a/source/Hack-Italic.ufo/glyphs/uni033D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni033D_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni033D" format="1">
-  <advance width="0"/>
+<glyph name="uni033D" format="2">
   <unicode hex="033D"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni033E_.glif b/source/Hack-Italic.ufo/glyphs/uni033E_.glif
index 90b9f505b..3f3199dea 100644
--- a/source/Hack-Italic.ufo/glyphs/uni033E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni033E_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni033E" format="1">
-  <advance width="0"/>
+<glyph name="uni033E" format="2">
   <unicode hex="033E"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni033F_.glif b/source/Hack-Italic.ufo/glyphs/uni033F_.glif
index 3f199ec70..4d5c89cf5 100644
--- a/source/Hack-Italic.ufo/glyphs/uni033F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni033F_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni033F" format="1">
-  <advance width="0"/>
+<glyph name="uni033F" format="2">
   <unicode hex="033F"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0358.glif b/source/Hack-Italic.ufo/glyphs/uni0358.glif
index b08bfe304..6a6a0b129 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0358.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0358.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0358" format="1">
-  <advance width="0"/>
+<glyph name="uni0358" format="2">
   <unicode hex="0358"/>
   <outline>
     <contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0361.glif b/source/Hack-Italic.ufo/glyphs/uni0361.glif
index b4c5deb93..77b3cb6a6 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0361.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0361.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0361" format="1">
-  <advance width="0"/>
+<glyph name="uni0361" format="2">
   <unicode hex="0361"/>
   <outline>
     <contour>
@@ -10,7 +9,7 @@
       <point x="-934" y="1820" type="curve" smooth="yes"/>
       <point x="-778" y="1838"/>
       <point x="-661" y="1847"/>
-      <point x="-583" y="1847" type="curve" name="dv02" smooth="yes"/>
+      <point x="-583" y="1847" type="curve" smooth="yes" name="dv02"/>
       <point x="-434" y="1847"/>
       <point x="210" y="1841"/>
       <point x="210" y="1559" type="curve" smooth="yes"/>
@@ -23,7 +22,7 @@
       <point x="-275" y="1685" type="curve" smooth="yes"/>
       <point x="-463" y="1702"/>
       <point x="-573" y="1710"/>
-      <point x="-610" y="1710" type="curve" name="dv01" smooth="yes"/>
+      <point x="-610" y="1710" type="curve" smooth="yes" name="dv01"/>
       <point x="-682" y="1710"/>
       <point x="-1178" y="1708"/>
       <point x="-1382" y="1520" type="curve" name="at02"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0394.glif b/source/Hack-Italic.ufo/glyphs/uni0394.glif
index f7dae25e5..c0546804d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0394.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0394.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0394" format="1">
+<glyph name="uni0394" format="2">
   <advance width="1233"/>
   <unicode hex="0394"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni03A_9.glif b/source/Hack-Italic.ufo/glyphs/uni03A_9.glif
index 20fff27ad..16a4b0106 100644
--- a/source/Hack-Italic.ufo/glyphs/uni03A_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni03A_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni03A9" format="1">
+<glyph name="uni03A9" format="2">
   <advance width="1233"/>
   <unicode hex="03A9"/>
   <outline>
@@ -11,19 +11,19 @@
       <point x="141" y="450" type="curve" smooth="yes"/>
       <point x="104" y="545"/>
       <point x="86" y="656"/>
-      <point x="86" y="783" type="curve" name="dh01" smooth="yes"/>
+      <point x="86" y="783" type="curve" smooth="yes" name="dh01"/>
       <point x="86" y="989"/>
       <point x="134" y="1154"/>
-      <point x="230" y="1277" type="curve" name="hr01" smooth="yes"/>
+      <point x="230" y="1277" type="curve" smooth="yes" name="hr01"/>
       <point x="325" y="1398"/>
       <point x="451" y="1460"/>
-      <point x="614" y="1460" type="curve" name="dv02" smooth="yes"/>
+      <point x="614" y="1460" type="curve" smooth="yes" name="dv02"/>
       <point x="781" y="1460"/>
       <point x="908" y="1396"/>
       <point x="1001" y="1277" type="curve" smooth="yes"/>
       <point x="1097" y="1155"/>
       <point x="1145" y="990"/>
-      <point x="1145" y="783" type="curve" name="dh04" smooth="yes"/>
+      <point x="1145" y="783" type="curve" smooth="yes" name="dh04"/>
       <point x="1145" y="656"/>
       <point x="1127" y="545"/>
       <point x="1090" y="450" type="curve" smooth="yes"/>
@@ -39,19 +39,19 @@
       <point x="883" y="413" type="curve" smooth="yes"/>
       <point x="927" y="521"/>
       <point x="950" y="649"/>
-      <point x="950" y="790" type="curve" name="sh02" smooth="yes"/>
+      <point x="950" y="790" type="curve" smooth="yes" name="sh02"/>
       <point x="950" y="945"/>
       <point x="922" y="1071"/>
       <point x="861" y="1162" type="curve" smooth="yes"/>
       <point x="804" y="1246"/>
       <point x="720" y="1294"/>
-      <point x="616" y="1294" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1294" type="curve" smooth="yes" name="dv01"/>
       <point x="507" y="1294"/>
       <point x="427" y="1242"/>
       <point x="372" y="1162" type="curve" smooth="yes"/>
       <point x="313" y="1075"/>
       <point x="283" y="954"/>
-      <point x="283" y="790" type="curve" name="dh02" smooth="yes"/>
+      <point x="283" y="790" type="curve" smooth="yes" name="dh02"/>
       <point x="283" y="649"/>
       <point x="306" y="521"/>
       <point x="350" y="413" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni03B_C_.glif b/source/Hack-Italic.ufo/glyphs/uni03B_C_.glif
index 3993af677..df103276a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni03B_C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni03B_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni03BC" format="1">
+<glyph name="uni03BC" format="2">
   <advance width="1233"/>
   <unicode hex="03BC"/>
   <outline>
@@ -9,10 +9,10 @@
       <point x="313" y="424" type="line" smooth="yes"/>
       <point x="305" y="383"/>
       <point x="301" y="348"/>
-      <point x="301" y="319" type="curve" name="dh01" smooth="yes"/>
+      <point x="301" y="319" type="curve" smooth="yes" name="dh01"/>
       <point x="301" y="198"/>
       <point x="375" y="131"/>
-      <point x="512" y="131" type="curve" name="dv01" smooth="yes"/>
+      <point x="512" y="131" type="curve" smooth="yes" name="dv01"/>
       <point x="696" y="131"/>
       <point x="802" y="239"/>
       <point x="846" y="467" type="curve" smooth="yes"/>
@@ -21,10 +21,10 @@
       <point x="991" y="258" type="line"/>
       <point x="987" y="234"/>
       <point x="985" y="218"/>
-      <point x="985" y="203" type="curve" name="sh01" smooth="yes"/>
+      <point x="985" y="203" type="curve" smooth="yes" name="sh01"/>
       <point x="985" y="162"/>
       <point x="1001" y="141"/>
-      <point x="1034" y="141" type="curve" name="sv01" smooth="yes"/>
+      <point x="1034" y="141" type="curve" smooth="yes" name="sv01"/>
       <point x="1039" y="141"/>
       <point x="1047" y="143"/>
       <point x="1059" y="146" type="curve" smooth="yes"/>
@@ -34,13 +34,13 @@
       <point x="1077" y="16" type="line"/>
       <point x="1024" y="-13"/>
       <point x="974" y="-29"/>
-      <point x="930" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="930" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="841" y="-29"/>
       <point x="784" y="32"/>
       <point x="784" y="129" type="curve" name="dh02"/>
       <point x="712" y="20"/>
       <point x="626" y="-29"/>
-      <point x="494" y="-29" type="curve" name="hr01" smooth="yes"/>
+      <point x="494" y="-29" type="curve" smooth="yes" name="hr01"/>
       <point x="371" y="-29"/>
       <point x="289" y="26"/>
       <point x="246" y="137" type="curve" name="iv02"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni03C_2.glif b/source/Hack-Italic.ufo/glyphs/uni03C_2.glif
index ca972cb77..bbe1a71b3 100644
--- a/source/Hack-Italic.ufo/glyphs/uni03C_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni03C_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni03C2" format="1">
+<glyph name="uni03C2" format="2">
   <advance width="1233"/>
   <unicode hex="03C2"/>
   <outline>
@@ -10,44 +10,44 @@
       <point x="552" y="-279" type="curve"/>
       <point x="643" y="-287"/>
       <point x="706" y="-216"/>
-      <point x="717" y="-168" type="curve" name="sh01" smooth="yes"/>
+      <point x="717" y="-168" type="curve" smooth="yes" name="sh01"/>
       <point x="719" y="-156"/>
       <point x="720" y="-144"/>
-      <point x="720" y="-132" type="curve" name="ah01" smooth="yes"/>
+      <point x="720" y="-132" type="curve" smooth="yes" name="ah01"/>
       <point x="720" y="-79"/>
       <point x="696" y="-37"/>
       <point x="623" y="-29" type="curve" smooth="yes"/>
       <point x="467" y="-13"/>
       <point x="164" y="25"/>
-      <point x="164" y="383" type="curve" name="sh02" smooth="yes"/>
+      <point x="164" y="383" type="curve" smooth="yes" name="sh02"/>
       <point x="164" y="435"/>
       <point x="169" y="492"/>
       <point x="184" y="559" type="curve" smooth="yes"/>
       <point x="264" y="938"/>
       <point x="508" y="1147"/>
-      <point x="844" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="844" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="965" y="1147"/>
       <point x="1054" y="1120"/>
       <point x="1148" y="1061" type="curve"/>
       <point x="1110" y="868" type="line" name="iv01"/>
       <point x="1034" y="951"/>
       <point x="950" y="991"/>
-      <point x="826" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="826" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="582" y="991"/>
       <point x="432" y="832"/>
       <point x="378" y="559" type="curve" smooth="yes"/>
       <point x="368" y="507"/>
       <point x="363" y="461"/>
-      <point x="363" y="421" type="curve" name="sh03" smooth="yes"/>
+      <point x="363" y="421" type="curve" smooth="yes" name="sh03"/>
       <point x="363" y="115"/>
       <point x="625" y="131"/>
       <point x="653" y="127" type="curve" smooth="yes"/>
       <point x="832" y="100"/>
       <point x="905" y="36"/>
-      <point x="905" y="-73" type="curve" name="sh04" smooth="yes"/>
+      <point x="905" y="-73" type="curve" smooth="yes" name="sh04"/>
       <point x="905" y="-96"/>
       <point x="902" y="-121"/>
-      <point x="895" y="-148" type="curve" name="sh05" smooth="yes"/>
+      <point x="895" y="-148" type="curve" smooth="yes" name="sh05"/>
       <point x="858" y="-310"/>
       <point x="736" y="-430"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni03F_4.glif b/source/Hack-Italic.ufo/glyphs/uni03F_4.glif
index 7315a9361..9a578739d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni03F_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni03F_4.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni03F4" format="1">
+<glyph name="uni03F4" format="2">
   <advance width="1233"/>
   <unicode hex="03F4"/>
   <outline>
     <contour>
-      <point x="465" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="465" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="205" y="-29"/>
       <point x="81" y="116"/>
-      <point x="81" y="420" type="curve" name="sh01" smooth="yes"/>
+      <point x="81" y="420" type="curve" smooth="yes" name="sh01"/>
       <point x="81" y="513"/>
       <point x="93" y="622"/>
       <point x="117" y="745" type="curve" smooth="yes"/>
       <point x="218" y="1266"/>
       <point x="431" y="1520"/>
-      <point x="767" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="767" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1024" y="1520"/>
       <point x="1152" y="1369"/>
-      <point x="1152" y="1068" type="curve" name="sh02" smooth="yes"/>
+      <point x="1152" y="1068" type="curve" smooth="yes" name="sh02"/>
       <point x="1152" y="975"/>
       <point x="1140" y="867"/>
       <point x="1116" y="745" type="curve" smooth="yes"/>
@@ -27,23 +27,23 @@
       <point x="928" y="881" type="line" name="dv03"/>
       <point x="939" y="956"/>
       <point x="945" y="1021"/>
-      <point x="945" y="1080" type="curve" name="ah01" smooth="yes"/>
+      <point x="945" y="1080" type="curve" smooth="yes" name="ah01"/>
       <point x="945" y="1256"/>
       <point x="890" y="1356"/>
-      <point x="735" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="735" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="530" y="1356"/>
       <point x="429" y="1177"/>
       <point x="357" y="881" type="curve"/>
     </contour>
     <contour>
-      <point x="497" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="497" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="702" y="135"/>
       <point x="818" y="310"/>
       <point x="898" y="711" type="curve" name="dv02"/>
       <point x="321" y="711" type="line"/>
       <point x="298" y="594"/>
       <point x="289" y="496"/>
-      <point x="289" y="416" type="curve" name="sh03" smooth="yes"/>
+      <point x="289" y="416" type="curve" smooth="yes" name="sh03"/>
       <point x="289" y="359"/>
       <point x="294" y="313"/>
       <point x="304" y="276" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0400.glif b/source/Hack-Italic.ufo/glyphs/uni0400.glif
index 088ef49b8..35315b280 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0400.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0400.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0400" format="1">
+<glyph name="uni0400" format="2">
   <advance width="1233"/>
   <unicode hex="0400"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0401.glif b/source/Hack-Italic.ufo/glyphs/uni0401.glif
index ea74350bd..a028eeaff 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0401.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0401.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0401" format="1">
+<glyph name="uni0401" format="2">
   <advance width="1233"/>
   <unicode hex="0401"/>
   <outline>
     <contour>
-      <point x="556" y="1648" type="line" name="hr00" smooth="yes"/>
+      <point x="556" y="1648" type="line" smooth="yes" name="hr00"/>
       <point x="536" y="1648"/>
       <point x="525" y="1661"/>
       <point x="529" y="1681" type="curve" smooth="yes"/>
       <point x="557" y="1823" type="line"/>
       <point x="560" y="1841"/>
       <point x="570" y="1850"/>
-      <point x="589" y="1850" type="curve" name="dv01" smooth="yes"/>
+      <point x="589" y="1850" type="curve" smooth="yes" name="dv01"/>
       <point x="732" y="1850" type="line" smooth="yes"/>
       <point x="751" y="1850"/>
       <point x="760" y="1842"/>
@@ -25,14 +25,14 @@
       <point x="699" y="1648" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="947" y="1648" type="line" name="sv01" smooth="yes"/>
+      <point x="947" y="1648" type="line" smooth="yes" name="sv01"/>
       <point x="927" y="1648"/>
       <point x="916" y="1661"/>
       <point x="920" y="1681" type="curve" smooth="yes"/>
       <point x="948" y="1823" type="line"/>
       <point x="951" y="1841"/>
       <point x="961" y="1850"/>
-      <point x="980" y="1850" type="curve" name="sv02" smooth="yes"/>
+      <point x="980" y="1850" type="curve" smooth="yes" name="sv02"/>
       <point x="1123" y="1850" type="line" smooth="yes"/>
       <point x="1142" y="1850"/>
       <point x="1151" y="1842"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0402.glif b/source/Hack-Italic.ufo/glyphs/uni0402.glif
index 73f45117c..38eeb263f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0402.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0402.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0402" format="1">
+<glyph name="uni0402" format="2">
   <advance width="1233"/>
   <unicode hex="0402"/>
   <outline>
     <contour>
-      <point x="467" y="-470" type="curve" name="dv01" smooth="yes"/>
+      <point x="467" y="-470" type="curve" smooth="yes" name="dv01"/>
       <point x="437" y="-470"/>
       <point x="395" y="-468"/>
       <point x="385" y="-468" type="curve" name="sv01"/>
@@ -14,17 +14,17 @@
       <point x="493" y="-304" type="line" smooth="yes"/>
       <point x="501" y="-305"/>
       <point x="506" y="-306"/>
-      <point x="526" y="-306" type="curve" name="dv02" smooth="yes"/>
+      <point x="526" y="-306" type="curve" smooth="yes" name="dv02"/>
       <point x="711" y="-306"/>
       <point x="788" y="-221"/>
       <point x="841" y="46" type="curve"/>
       <point x="922" y="462" type="line" smooth="yes"/>
       <point x="931" y="505"/>
       <point x="935" y="544"/>
-      <point x="935" y="579" type="curve" name="dh01" smooth="yes"/>
+      <point x="935" y="579" type="curve" smooth="yes" name="dh01"/>
       <point x="935" y="704"/>
       <point x="877" y="755"/>
-      <point x="753" y="755" type="curve" name="dv03" smooth="yes"/>
+      <point x="753" y="755" type="curve" smooth="yes" name="dv03"/>
       <point x="692" y="755"/>
       <point x="627" y="742"/>
       <point x="559" y="713" type="curve" smooth="yes"/>
@@ -51,10 +51,10 @@
       <point x="590" y="892" type="curve" smooth="yes"/>
       <point x="637" y="916"/>
       <point x="695" y="931"/>
-      <point x="812" y="939" type="curve" name="sv05" smooth="yes"/>
+      <point x="812" y="939" type="curve" smooth="yes" name="sv05"/>
       <point x="829" y="940"/>
       <point x="841" y="941"/>
-      <point x="861" y="941" type="curve" name="dv04" smooth="yes"/>
+      <point x="861" y="941" type="curve" smooth="yes" name="dv04"/>
       <point x="964" y="941"/>
       <point x="1040" y="916"/>
       <point x="1092" y="857" type="curve" smooth="yes"/>
@@ -63,11 +63,11 @@
       <point x="1112" y="828" type="curve" smooth="yes"/>
       <point x="1137" y="785"/>
       <point x="1149" y="728"/>
-      <point x="1149" y="659" type="curve" name="dh02" smooth="yes"/>
+      <point x="1149" y="659" type="curve" smooth="yes" name="dh02"/>
       <point x="1149" y="608"/>
       <point x="1142" y="552"/>
       <point x="1130" y="488" type="curve" smooth="yes"/>
-      <point x="1044" y="46" type="line" name="hr01" smooth="yes"/>
+      <point x="1044" y="46" type="line" smooth="yes" name="hr01"/>
       <point x="969" y="-335"/>
       <point x="812" y="-470"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0403.glif b/source/Hack-Italic.ufo/glyphs/uni0403.glif
index d6f42fc9e..1e6a776ad 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0403.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0403.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0403" format="1">
+<glyph name="uni0403" format="2">
   <advance width="1233"/>
   <unicode hex="0403"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0404.glif b/source/Hack-Italic.ufo/glyphs/uni0404.glif
index aa59e15ce..082ee9c49 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0404.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0404.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0404" format="1">
+<glyph name="uni0404" format="2">
   <advance width="1233"/>
   <unicode hex="0404"/>
   <outline>
     <contour>
-      <point x="589" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="589" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="210" y="-29"/>
       <point x="112" y="237"/>
-      <point x="112" y="491" type="curve" name="dh01" smooth="yes"/>
+      <point x="112" y="491" type="curve" smooth="yes" name="dh01"/>
       <point x="112" y="568"/>
       <point x="121" y="652"/>
       <point x="139" y="744" type="curve" smooth="yes"/>
       <point x="238" y="1240"/>
       <point x="517" y="1520"/>
-      <point x="894" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="894" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1012" y="1520"/>
       <point x="1117" y="1493"/>
       <point x="1208" y="1438" type="curve"/>
       <point x="1167" y="1231" type="line"/>
       <point x="1082" y="1314"/>
       <point x="977" y="1356"/>
-      <point x="852" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="852" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="601" y="1356"/>
       <point x="471" y="1181"/>
       <point x="372" y="831" type="curve"/>
@@ -29,10 +29,10 @@
       <point x="334" y="661" type="line"/>
       <point x="323" y="602"/>
       <point x="318" y="537"/>
-      <point x="318" y="486" type="curve" name="dh02" smooth="yes"/>
+      <point x="318" y="486" type="curve" smooth="yes" name="dh02"/>
       <point x="318" y="342"/>
       <point x="359" y="135"/>
-      <point x="621" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="621" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="744" y="135"/>
       <point x="867" y="180"/>
       <point x="979" y="260" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0405.glif b/source/Hack-Italic.ufo/glyphs/uni0405.glif
index 60ea2fcd2..9fd3f0438 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0405.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0405.glif
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0405" format="1">
+<glyph name="uni0405" format="2">
   <advance width="1233"/>
   <unicode hex="0405"/>
   <outline>
     <contour>
-      <point x="435" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="435" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="288" y="-29"/>
       <point x="158" y="1"/>
       <point x="25" y="61" type="curve"/>
       <point x="66" y="270" type="line"/>
       <point x="201" y="174"/>
       <point x="338" y="135"/>
-      <point x="469" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="469" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="705" y="135"/>
       <point x="848" y="266"/>
-      <point x="848" y="452" type="curve" name="ah01" smooth="yes"/>
+      <point x="848" y="452" type="curve" smooth="yes" name="ah01"/>
       <point x="848" y="559"/>
       <point x="800" y="603"/>
       <point x="627" y="659" type="curve" smooth="yes"/>
       <point x="526" y="692" type="line" smooth="yes"/>
       <point x="277" y="772"/>
       <point x="195" y="855"/>
-      <point x="195" y="1022" type="curve" name="sh01" smooth="yes"/>
+      <point x="195" y="1022" type="curve" smooth="yes" name="sh01"/>
       <point x="195" y="1313"/>
       <point x="443" y="1520"/>
-      <point x="782" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="782" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="898" y="1520"/>
       <point x="1011" y="1495"/>
       <point x="1147" y="1442" type="curve"/>
       <point x="1108" y="1237" type="line"/>
       <point x="999" y="1316"/>
       <point x="883" y="1356"/>
-      <point x="759" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="759" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="539" y="1356"/>
       <point x="387" y="1233"/>
-      <point x="387" y="1066" type="curve" name="sh02" smooth="yes"/>
+      <point x="387" y="1066" type="curve" smooth="yes" name="sh02"/>
       <point x="387" y="966"/>
       <point x="441" y="922"/>
       <point x="614" y="866" type="curve" smooth="yes"/>
       <point x="735" y="827" type="line" smooth="yes"/>
       <point x="965" y="752"/>
       <point x="1049" y="652"/>
-      <point x="1049" y="472" type="curve" name="sh03" smooth="yes"/>
+      <point x="1049" y="472" type="curve" smooth="yes" name="sh03"/>
       <point x="1049" y="174"/>
       <point x="813" y="-29"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0406.glif b/source/Hack-Italic.ufo/glyphs/uni0406.glif
index 5b3e8777e..c6731d1e0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0406.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0406.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0406" format="1">
+<glyph name="uni0406" format="2">
   <advance width="1233"/>
   <unicode hex="0406"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0407.glif b/source/Hack-Italic.ufo/glyphs/uni0407.glif
index ebcc36c69..ba6603ac7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0407.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0407.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0407" format="1">
+<glyph name="uni0407" format="2">
   <advance width="1233"/>
   <unicode hex="0407"/>
   <outline>
     <contour>
-      <point x="523" y="1648" type="line" name="hr00" smooth="yes"/>
+      <point x="523" y="1648" type="line" smooth="yes" name="hr00"/>
       <point x="503" y="1648"/>
       <point x="492" y="1661"/>
       <point x="496" y="1681" type="curve" smooth="yes"/>
       <point x="524" y="1823" type="line"/>
       <point x="527" y="1841"/>
       <point x="537" y="1850"/>
-      <point x="556" y="1850" type="curve" name="dv01" smooth="yes"/>
+      <point x="556" y="1850" type="curve" smooth="yes" name="dv01"/>
       <point x="699" y="1850" type="line" smooth="yes"/>
       <point x="718" y="1850"/>
       <point x="727" y="1842"/>
@@ -25,14 +25,14 @@
       <point x="666" y="1648" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="914" y="1648" type="line" name="sv01" smooth="yes"/>
+      <point x="914" y="1648" type="line" smooth="yes" name="sv01"/>
       <point x="894" y="1648"/>
       <point x="883" y="1661"/>
       <point x="887" y="1681" type="curve" smooth="yes"/>
       <point x="915" y="1823" type="line"/>
       <point x="918" y="1841"/>
       <point x="928" y="1850"/>
-      <point x="947" y="1850" type="curve" name="sv02" smooth="yes"/>
+      <point x="947" y="1850" type="curve" smooth="yes" name="sv02"/>
       <point x="1090" y="1850" type="line" smooth="yes"/>
       <point x="1109" y="1850"/>
       <point x="1118" y="1842"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0408.glif b/source/Hack-Italic.ufo/glyphs/uni0408.glif
index 8e4bac185..4ca13d248 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0408.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0408.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0408" format="1">
+<glyph name="uni0408" format="2">
   <advance width="1233"/>
   <unicode hex="0408"/>
   <outline>
     <contour>
-      <point x="381" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="381" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="234" y="-29"/>
       <point x="108" y="2"/>
       <point x="-25" y="61" type="curve"/>
       <point x="20" y="297" type="line"/>
       <point x="124" y="184"/>
       <point x="245" y="135"/>
-      <point x="386" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="386" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="574" y="135"/>
       <point x="649" y="223"/>
       <point x="702" y="487" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0409.glif b/source/Hack-Italic.ufo/glyphs/uni0409.glif
index 53c97008e..7c1e32203 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0409.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0409.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0409" format="1">
+<glyph name="uni0409" format="2">
   <advance width="1233"/>
   <unicode hex="0409"/>
   <outline>
@@ -17,13 +17,13 @@
       <point x="828" y="893" type="line" smooth="yes"/>
       <point x="985" y="893"/>
       <point x="1155" y="792"/>
-      <point x="1155" y="540" type="curve" name="dh02" smooth="yes"/>
+      <point x="1155" y="540" type="curve" smooth="yes" name="dh02"/>
       <point x="1155" y="470"/>
       <point x="1142" y="267"/>
       <point x="949" y="114" type="curve" smooth="yes"/>
       <point x="852" y="38"/>
       <point x="744" y="0"/>
-      <point x="655" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="655" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="448" y="0" type="line"/>
       <point x="705" y="1323" type="line" name="sv01"/>
       <point x="533" y="1323" type="line"/>
@@ -36,16 +36,16 @@
       <point x="-129" y="0" type="curve" name="ab02"/>
     </contour>
     <contour>
-      <point x="687" y="166" type="line" name="sv02" smooth="yes"/>
+      <point x="687" y="166" type="line" smooth="yes" name="sv02"/>
       <point x="807" y="166"/>
       <point x="923" y="265"/>
       <point x="955" y="438" type="curve" smooth="yes"/>
       <point x="962" y="473"/>
       <point x="965" y="516"/>
-      <point x="965" y="540" type="curve" name="dh01" smooth="yes"/>
+      <point x="965" y="540" type="curve" smooth="yes" name="dh01"/>
       <point x="965" y="633"/>
       <point x="919" y="727"/>
-      <point x="796" y="727" type="curve" name="dv01" smooth="yes"/>
+      <point x="796" y="727" type="curve" smooth="yes" name="dv01"/>
       <point x="775" y="727" type="line"/>
       <point x="666" y="166" type="line" name="sv03"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni040A_.glif b/source/Hack-Italic.ufo/glyphs/uni040A_.glif
index b1bd1c694..3f12f1fca 100644
--- a/source/Hack-Italic.ufo/glyphs/uni040A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni040A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni040A" format="1">
+<glyph name="uni040A" format="2">
   <advance width="1233"/>
   <unicode hex="040A"/>
   <outline>
@@ -14,13 +14,13 @@
       <point x="882" y="893" type="line" smooth="yes"/>
       <point x="1121" y="893"/>
       <point x="1213" y="756"/>
-      <point x="1213" y="591" type="curve" name="dh02" smooth="yes"/>
+      <point x="1213" y="591" type="curve" smooth="yes" name="dh02"/>
       <point x="1213" y="552"/>
       <point x="1208" y="500"/>
       <point x="1197" y="448" type="curve" smooth="yes"/>
       <point x="1133" y="146"/>
       <point x="900" y="0"/>
-      <point x="709" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="709" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="502" y="0" type="line"/>
       <point x="640" y="711" type="line" name="dv01"/>
       <point x="245" y="711" type="line"/>
@@ -28,13 +28,13 @@
       <point x="-79" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="741" y="166" type="line" name="sv02" smooth="yes"/>
+      <point x="741" y="166" type="line" smooth="yes" name="sv02"/>
       <point x="861" y="166"/>
       <point x="977" y="265"/>
       <point x="1009" y="438" type="curve" smooth="yes"/>
       <point x="1016" y="473"/>
       <point x="1019" y="514"/>
-      <point x="1019" y="538" type="curve" name="dh01" smooth="yes"/>
+      <point x="1019" y="538" type="curve" smooth="yes" name="dh01"/>
       <point x="1019" y="630"/>
       <point x="977" y="727"/>
       <point x="850" y="727" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni040B_.glif b/source/Hack-Italic.ufo/glyphs/uni040B_.glif
index 375bdac28..07b4ea94a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni040B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni040B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni040B" format="1">
+<glyph name="uni040B" format="2">
   <advance width="1233"/>
   <unicode hex="040B"/>
   <outline>
@@ -19,10 +19,10 @@
       <point x="544" y="892" type="curve" smooth="yes"/>
       <point x="595" y="917"/>
       <point x="659" y="932"/>
-      <point x="766" y="939" type="curve" name="sv03" smooth="yes"/>
+      <point x="766" y="939" type="curve" smooth="yes" name="sv03"/>
       <point x="785" y="940"/>
       <point x="796" y="941"/>
-      <point x="816" y="941" type="curve" name="dv02" smooth="yes"/>
+      <point x="816" y="941" type="curve" smooth="yes" name="dv02"/>
       <point x="917" y="941"/>
       <point x="994" y="916"/>
       <point x="1046" y="857" type="curve" smooth="yes"/>
@@ -31,7 +31,7 @@
       <point x="1066" y="828" type="curve" smooth="yes"/>
       <point x="1091" y="785"/>
       <point x="1103" y="727"/>
-      <point x="1103" y="655" type="curve" name="dh02" smooth="yes"/>
+      <point x="1103" y="655" type="curve" smooth="yes" name="dh02"/>
       <point x="1103" y="604"/>
       <point x="1097" y="549"/>
       <point x="1085" y="488" type="curve" smooth="yes"/>
@@ -40,10 +40,10 @@
       <point x="877" y="462" type="line" smooth="yes"/>
       <point x="885" y="506"/>
       <point x="890" y="543"/>
-      <point x="890" y="578" type="curve" name="dh01" smooth="yes"/>
+      <point x="890" y="578" type="curve" smooth="yes" name="dh01"/>
       <point x="890" y="699"/>
       <point x="833" y="755"/>
-      <point x="708" y="755" type="curve" name="dv01" smooth="yes"/>
+      <point x="708" y="755" type="curve" smooth="yes" name="dv01"/>
       <point x="643" y="755"/>
       <point x="577" y="740"/>
       <point x="513" y="713" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni040C_.glif b/source/Hack-Italic.ufo/glyphs/uni040C_.glif
index 706ea3a2f..44b1f2afb 100644
--- a/source/Hack-Italic.ufo/glyphs/uni040C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni040C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni040C" format="1">
+<glyph name="uni040C" format="2">
   <advance width="1233"/>
   <unicode hex="040C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni040D_.glif b/source/Hack-Italic.ufo/glyphs/uni040D_.glif
index 85a4115d3..2a2443b57 100644
--- a/source/Hack-Italic.ufo/glyphs/uni040D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni040D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni040D" format="1">
+<glyph name="uni040D" format="2">
   <advance width="1233"/>
   <unicode hex="040D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni040E_.glif b/source/Hack-Italic.ufo/glyphs/uni040E_.glif
index 0c75801f7..828918859 100644
--- a/source/Hack-Italic.ufo/glyphs/uni040E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni040E_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni040E" format="1">
+<glyph name="uni040E" format="2">
   <advance width="1233"/>
   <unicode hex="040E"/>
   <outline>
     <contour>
-      <point x="814" y="1613" type="curve" name="dv01" smooth="yes"/>
+      <point x="814" y="1613" type="curve" smooth="yes" name="dv01"/>
       <point x="636" y="1613"/>
       <point x="547" y="1681"/>
-      <point x="547" y="1818" type="curve" name="dh01" smooth="yes"/>
+      <point x="547" y="1818" type="curve" smooth="yes" name="dh01"/>
       <point x="547" y="1830"/>
       <point x="548" y="1842"/>
       <point x="549" y="1855" type="curve"/>
       <point x="668" y="1855" type="line" name="dh02"/>
       <point x="669" y="1783"/>
       <point x="729" y="1744"/>
-      <point x="842" y="1744" type="curve" name="dv02" smooth="yes"/>
+      <point x="842" y="1744" type="curve" smooth="yes" name="dv02"/>
       <point x="951" y="1744"/>
       <point x="1022" y="1781"/>
       <point x="1057" y="1855" type="curve" name="sv01"/>
@@ -36,13 +36,13 @@
       <point x="636" y="663" type="line" name="ih01"/>
       <point x="1105" y="1493" type="line" name="at02"/>
       <point x="1318" y="1493" type="line"/>
-      <point x="699" y="425" type="line" name="hr01" smooth="yes"/>
+      <point x="699" y="425" type="line" smooth="yes" name="hr01"/>
       <point x="638" y="318"/>
       <point x="574" y="221"/>
-      <point x="518" y="156" type="curve" name="hr02" smooth="yes"/>
+      <point x="518" y="156" type="curve" smooth="yes" name="hr02"/>
       <point x="455" y="82"/>
       <point x="364" y="0"/>
-      <point x="207" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="207" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="59" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni040F_.glif b/source/Hack-Italic.ufo/glyphs/uni040F_.glif
index 5613ebb1e..a3cf530c1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni040F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni040F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni040F" format="1">
+<glyph name="uni040F" format="2">
   <advance width="1233"/>
   <unicode hex="040F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0410.glif b/source/Hack-Italic.ufo/glyphs/uni0410.glif
index ed8707383..acafeabcd 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0410.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0410.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0410" format="1">
+<glyph name="uni0410" format="2">
   <advance width="1233"/>
   <unicode hex="0410"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0411.glif b/source/Hack-Italic.ufo/glyphs/uni0411.glif
index 2c33d0aa9..1ae6bc277 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0411.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0411.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0411" format="1">
+<glyph name="uni0411" format="2">
   <advance width="1233"/>
   <unicode hex="0411"/>
   <outline>
@@ -15,26 +15,26 @@
       <point x="1069" y="671" type="curve" smooth="yes"/>
       <point x="1081" y="636"/>
       <point x="1087" y="593"/>
-      <point x="1087" y="542" type="curve" name="dh02" smooth="yes"/>
+      <point x="1087" y="542" type="curve" smooth="yes" name="dh02"/>
       <point x="1087" y="398"/>
       <point x="1031" y="208"/>
       <point x="879" y="104" type="curve" smooth="yes"/>
       <point x="779" y="35"/>
       <point x="636" y="0"/>
-      <point x="463" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="463" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="21" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="495" y="166" type="line" name="sv02" smooth="yes"/>
+      <point x="495" y="166" type="line" smooth="yes" name="sv02"/>
       <point x="731" y="166"/>
       <point x="835" y="242"/>
       <point x="872" y="430" type="curve" smooth="yes"/>
       <point x="878" y="460"/>
       <point x="881" y="488"/>
-      <point x="881" y="513" type="curve" name="dh01" smooth="yes"/>
+      <point x="881" y="513" type="curve" smooth="yes" name="dh01"/>
       <point x="881" y="653"/>
       <point x="792" y="713"/>
-      <point x="601" y="713" type="curve" name="dv01" smooth="yes"/>
+      <point x="601" y="713" type="curve" smooth="yes" name="dv01"/>
       <point x="362" y="713" type="line"/>
       <point x="256" y="166" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0412.glif b/source/Hack-Italic.ufo/glyphs/uni0412.glif
index bb7979752..ad29e9520 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0412.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0412.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0412" format="1">
+<glyph name="uni0412" format="2">
   <advance width="1233"/>
   <unicode hex="0412"/>
   <outline>
@@ -8,37 +8,37 @@
       <point x="756" y="1493" type="line" smooth="yes"/>
       <point x="1028" y="1493"/>
       <point x="1167" y="1387"/>
-      <point x="1167" y="1178" type="curve" name="sh01" smooth="yes"/>
+      <point x="1167" y="1178" type="curve" smooth="yes" name="sh01"/>
       <point x="1167" y="975"/>
       <point x="1035" y="826"/>
       <point x="827" y="799" type="curve" name="iv01"/>
       <point x="1008" y="763"/>
       <point x="1085" y="653"/>
-      <point x="1085" y="482" type="curve" name="dh02" smooth="yes"/>
+      <point x="1085" y="482" type="curve" smooth="yes" name="dh02"/>
       <point x="1085" y="189"/>
       <point x="862" y="0"/>
-      <point x="475" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="475" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="23" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="639" y="877" type="line" name="dv01" smooth="yes"/>
+      <point x="639" y="877" type="line" smooth="yes" name="dv01"/>
       <point x="839" y="877"/>
       <point x="963" y="980"/>
-      <point x="963" y="1148" type="curve" name="hr01" smooth="yes"/>
+      <point x="963" y="1148" type="curve" smooth="yes" name="hr01"/>
       <point x="963" y="1273"/>
       <point x="894" y="1327"/>
-      <point x="727" y="1327" type="curve" name="sv01" smooth="yes"/>
+      <point x="727" y="1327" type="curve" smooth="yes" name="sv01"/>
       <point x="483" y="1327" type="line"/>
       <point x="395" y="877" type="line"/>
     </contour>
     <contour>
-      <point x="506" y="166" type="line" name="sv02" smooth="yes"/>
+      <point x="506" y="166" type="line" smooth="yes" name="sv02"/>
       <point x="750" y="166"/>
       <point x="885" y="291"/>
-      <point x="885" y="492" type="curve" name="dh01" smooth="yes"/>
+      <point x="885" y="492" type="curve" smooth="yes" name="dh01"/>
       <point x="885" y="647"/>
       <point x="805" y="713"/>
-      <point x="606" y="713" type="curve" name="hr02" smooth="yes"/>
+      <point x="606" y="713" type="curve" smooth="yes" name="hr02"/>
       <point x="365" y="713" type="line"/>
       <point x="258" y="166" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0413.glif b/source/Hack-Italic.ufo/glyphs/uni0413.glif
index 323d6794c..cb8d06753 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0413.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0413.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0413" format="1">
+<glyph name="uni0413" format="2">
   <advance width="1233"/>
   <unicode hex="0413"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0414.glif b/source/Hack-Italic.ufo/glyphs/uni0414.glif
index e39d6e3f7..34e6d56dd 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0414.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0414.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0414" format="1">
+<glyph name="uni0414" format="2">
   <advance width="1233"/>
   <unicode hex="0414"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="3" y="-322" type="line" name="sv03"/>
       <point x="-167" y="-322" type="line"/>
       <point x="-72" y="170" type="line" name="sv04"/>
-      <point x="5" y="170" type="line" name="sv05" smooth="yes"/>
+      <point x="5" y="170" type="line" smooth="yes" name="sv05"/>
       <point x="36" y="170"/>
       <point x="83" y="268"/>
       <point x="145" y="464" type="curve"/>
@@ -29,13 +29,13 @@
       <point x="492" y="1026" type="line" smooth="yes"/>
       <point x="465" y="883"/>
       <point x="416" y="695"/>
-      <point x="356" y="484" type="curve" name="hr02" smooth="yes"/>
+      <point x="356" y="484" type="curve" smooth="yes" name="hr02"/>
       <point x="299" y="287"/>
       <point x="263" y="176"/>
-      <point x="263" y="188" type="curve" name="iv01" smooth="yes"/>
+      <point x="263" y="188" type="curve" smooth="yes" name="iv01"/>
       <point x="263" y="176"/>
       <point x="277" y="170"/>
-      <point x="306" y="170" type="curve" name="sv07" smooth="yes"/>
+      <point x="306" y="170" type="curve" smooth="yes" name="sv07"/>
       <point x="771" y="170" type="line" name="sv08"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0415.glif b/source/Hack-Italic.ufo/glyphs/uni0415.glif
index 8f5c31a11..355b25ef6 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0415.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0415.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0415" format="1">
+<glyph name="uni0415" format="2">
   <advance width="1233"/>
   <unicode hex="0415"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0416.glif b/source/Hack-Italic.ufo/glyphs/uni0416.glif
index 1fd38a255..75859707f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0416.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0416.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0416" format="1">
+<glyph name="uni0416" format="2">
   <advance width="1233"/>
   <unicode hex="0416"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0417.glif b/source/Hack-Italic.ufo/glyphs/uni0417.glif
index 64d11709f..b0238f449 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0417.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0417.glif
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0417" format="1">
+<glyph name="uni0417" format="2">
   <advance width="1233"/>
   <unicode hex="0417"/>
   <outline>
     <contour>
-      <point x="412" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="412" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="285" y="-29"/>
       <point x="141" y="-6"/>
       <point x="12" y="45" type="curve"/>
       <point x="50" y="246" type="line"/>
       <point x="171" y="177"/>
       <point x="298" y="141"/>
-      <point x="426" y="141" type="curve" name="hr01" smooth="yes"/>
+      <point x="426" y="141" type="curve" smooth="yes" name="hr01"/>
       <point x="674" y="141"/>
       <point x="835" y="278"/>
-      <point x="835" y="478" type="curve" name="dh01" smooth="yes"/>
+      <point x="835" y="478" type="curve" smooth="yes" name="dh01"/>
       <point x="835" y="634"/>
       <point x="739" y="715"/>
-      <point x="554" y="715" type="curve" name="dv02" smooth="yes"/>
+      <point x="554" y="715" type="curve" smooth="yes" name="dv02"/>
       <point x="401" y="715" type="line"/>
       <point x="433" y="881" type="line"/>
-      <point x="587" y="881" type="line" name="dv03" smooth="yes"/>
+      <point x="587" y="881" type="line" smooth="yes" name="dv03"/>
       <point x="798" y="881"/>
       <point x="931" y="989"/>
-      <point x="931" y="1156" type="curve" name="sh01" smooth="yes"/>
+      <point x="931" y="1156" type="curve" smooth="yes" name="sh01"/>
       <point x="931" y="1289"/>
       <point x="851" y="1350"/>
-      <point x="680" y="1350" type="curve" name="sv01" smooth="yes"/>
+      <point x="680" y="1350" type="curve" smooth="yes" name="sv01"/>
       <point x="568" y="1350"/>
       <point x="442" y="1323"/>
       <point x="290" y="1270" type="curve"/>
       <point x="327" y="1456" type="line"/>
       <point x="492" y="1500"/>
       <point x="618" y="1520"/>
-      <point x="723" y="1520" type="curve" name="hr02" smooth="yes"/>
+      <point x="723" y="1520" type="curve" smooth="yes" name="hr02"/>
       <point x="979" y="1520"/>
       <point x="1132" y="1400"/>
-      <point x="1132" y="1186" type="curve" name="sh02" smooth="yes"/>
+      <point x="1132" y="1186" type="curve" smooth="yes" name="sh02"/>
       <point x="1132" y="989"/>
       <point x="1003" y="842"/>
       <point x="792" y="799" type="curve" name="iv01"/>
       <point x="941" y="771"/>
       <point x="1034" y="667"/>
-      <point x="1034" y="480" type="curve" name="dh02" smooth="yes"/>
+      <point x="1034" y="480" type="curve" smooth="yes" name="dh02"/>
       <point x="1034" y="179"/>
       <point x="791" y="-29"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0418.glif b/source/Hack-Italic.ufo/glyphs/uni0418.glif
index fb27b1d70..80883b255 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0418.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0418.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0418" format="1">
+<glyph name="uni0418" format="2">
   <advance width="1233"/>
   <unicode hex="0418"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0419.glif b/source/Hack-Italic.ufo/glyphs/uni0419.glif
index bd72dc249..0ab132d0c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0419.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0419.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0419" format="1">
+<glyph name="uni0419" format="2">
   <advance width="1233"/>
   <unicode hex="0419"/>
   <outline>
     <contour>
-      <point x="795" y="1608" type="curve" name="dv01" smooth="yes"/>
+      <point x="795" y="1608" type="curve" smooth="yes" name="dv01"/>
       <point x="617" y="1608"/>
       <point x="528" y="1676"/>
-      <point x="528" y="1813" type="curve" name="dh01" smooth="yes"/>
+      <point x="528" y="1813" type="curve" smooth="yes" name="dh01"/>
       <point x="528" y="1825"/>
       <point x="529" y="1837"/>
       <point x="530" y="1850" type="curve"/>
       <point x="649" y="1850" type="line" name="dh02"/>
       <point x="650" y="1778"/>
       <point x="710" y="1739"/>
-      <point x="823" y="1739" type="curve" name="dv02" smooth="yes"/>
+      <point x="823" y="1739" type="curve" smooth="yes" name="dv02"/>
       <point x="932" y="1739"/>
       <point x="1003" y="1776"/>
       <point x="1038" y="1850" type="curve" name="sv01"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni041A_.glif b/source/Hack-Italic.ufo/glyphs/uni041A_.glif
index 4beee61ce..4ed7049ce 100644
--- a/source/Hack-Italic.ufo/glyphs/uni041A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni041A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni041A" format="1">
+<glyph name="uni041A" format="2">
   <advance width="1233"/>
   <unicode hex="041A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni041B_.glif b/source/Hack-Italic.ufo/glyphs/uni041B_.glif
index 103fe5866..637d80798 100644
--- a/source/Hack-Italic.ufo/glyphs/uni041B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni041B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni041B" format="1">
+<glyph name="uni041B" format="2">
   <advance width="1233"/>
   <unicode hex="041B"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni041C_.glif b/source/Hack-Italic.ufo/glyphs/uni041C_.glif
index 32c5f4960..0f36131e9 100644
--- a/source/Hack-Italic.ufo/glyphs/uni041C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni041C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni041C" format="1">
+<glyph name="uni041C" format="2">
   <advance width="1233"/>
   <unicode hex="041C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni041D_.glif b/source/Hack-Italic.ufo/glyphs/uni041D_.glif
index 5cbb70e5d..859797026 100644
--- a/source/Hack-Italic.ufo/glyphs/uni041D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni041D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni041D" format="1">
+<glyph name="uni041D" format="2">
   <advance width="1233"/>
   <unicode hex="041D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni041E_.glif b/source/Hack-Italic.ufo/glyphs/uni041E_.glif
index f0c81c50d..68721cd91 100644
--- a/source/Hack-Italic.ufo/glyphs/uni041E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni041E_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni041E" format="1">
+<glyph name="uni041E" format="2">
   <advance width="1233"/>
   <unicode hex="041E"/>
   <outline>
     <contour>
-      <point x="490" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="490" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="225" y="-29"/>
       <point x="92" y="134"/>
-      <point x="92" y="459" type="curve" name="sh01" smooth="yes"/>
+      <point x="92" y="459" type="curve" smooth="yes" name="sh01"/>
       <point x="92" y="630"/>
       <point x="126" y="818"/>
       <point x="177" y="975" type="curve" smooth="yes"/>
@@ -16,10 +16,10 @@
       <point x="314" y="1272" type="curve" smooth="yes"/>
       <point x="426" y="1439"/>
       <point x="570" y="1520"/>
-      <point x="761" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="761" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1029" y="1520"/>
       <point x="1161" y="1362"/>
-      <point x="1161" y="1037" type="curve" name="sh02" smooth="yes"/>
+      <point x="1161" y="1037" type="curve" smooth="yes" name="sh02"/>
       <point x="1161" y="877"/>
       <point x="1127" y="683"/>
       <point x="1074" y="516" type="curve" smooth="yes"/>
@@ -30,22 +30,22 @@
       <point x="677" y="-29"/>
     </contour>
     <contour>
-      <point x="507" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="507" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="670" y="135"/>
       <point x="762" y="249"/>
       <point x="835" y="437" type="curve" smooth="yes"/>
       <point x="907" y="625"/>
       <point x="954" y="877"/>
-      <point x="954" y="1060" type="curve" name="ah01" smooth="yes"/>
+      <point x="954" y="1060" type="curve" smooth="yes" name="ah01"/>
       <point x="954" y="1236"/>
       <point x="911" y="1356"/>
-      <point x="744" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="744" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="613" y="1356"/>
       <point x="532" y="1283"/>
       <point x="465" y="1159" type="curve" smooth="yes"/>
       <point x="365" y="972"/>
       <point x="297" y="651"/>
-      <point x="297" y="432" type="curve" name="sh03" smooth="yes"/>
+      <point x="297" y="432" type="curve" smooth="yes" name="sh03"/>
       <point x="297" y="247"/>
       <point x="344" y="135"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni041F_.glif b/source/Hack-Italic.ufo/glyphs/uni041F_.glif
index 7a6f157ee..6f51b7e1a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni041F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni041F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni041F" format="1">
+<glyph name="uni041F" format="2">
   <advance width="1233"/>
   <unicode hex="041F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0420.glif b/source/Hack-Italic.ufo/glyphs/uni0420.glif
index 2366935fd..5b6b18b30 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0420.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0420.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0420" format="1">
+<glyph name="uni0420" format="2">
   <advance width="1233"/>
   <unicode hex="0420"/>
   <outline>
@@ -8,22 +8,22 @@
       <point x="782" y="1493" type="line" smooth="yes"/>
       <point x="1055" y="1493"/>
       <point x="1204" y="1374"/>
-      <point x="1204" y="1122" type="curve" name="dh02" smooth="yes"/>
+      <point x="1204" y="1122" type="curve" smooth="yes" name="dh02"/>
       <point x="1204" y="810"/>
       <point x="976" y="600"/>
-      <point x="604" y="600" type="curve" name="dv01" smooth="yes"/>
+      <point x="604" y="600" type="curve" smooth="yes" name="dv01"/>
       <point x="371" y="600" type="line"/>
       <point x="254" y="0" type="line" name="ab01"/>
       <point x="51" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="637" y="766" type="line" name="dv02" smooth="yes"/>
+      <point x="637" y="766" type="line" smooth="yes" name="dv02"/>
       <point x="857" y="766"/>
       <point x="999" y="906"/>
-      <point x="999" y="1110" type="curve" name="dh01" smooth="yes"/>
+      <point x="999" y="1110" type="curve" smooth="yes" name="dh01"/>
       <point x="999" y="1259"/>
       <point x="921" y="1327"/>
-      <point x="745" y="1327" type="curve" name="sv01" smooth="yes"/>
+      <point x="745" y="1327" type="curve" smooth="yes" name="sv01"/>
       <point x="512" y="1327" type="line"/>
       <point x="403" y="766" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0421.glif b/source/Hack-Italic.ufo/glyphs/uni0421.glif
index f25c81de6..0c92b23f0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0421.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0421.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0421" format="1">
+<glyph name="uni0421" format="2">
   <advance width="1233"/>
   <unicode hex="0421"/>
   <outline>
     <contour>
-      <point x="597" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="597" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="440" y="-29"/>
       <point x="321" y="20"/>
       <point x="241" y="103" type="curve" smooth="yes"/>
@@ -47,7 +47,7 @@
       <point x="326" y="503" type="curve" smooth="yes"/>
       <point x="326" y="378"/>
       <point x="352" y="286"/>
-      <point x="404" y="226" type="curve" name="hr01" smooth="yes"/>
+      <point x="404" y="226" type="curve" smooth="yes" name="hr01"/>
       <point x="449" y="174"/>
       <point x="521" y="135"/>
       <point x="628" y="135" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0422.glif b/source/Hack-Italic.ufo/glyphs/uni0422.glif
index 077ce0d61..359779147 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0422.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0422.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0422" format="1">
+<glyph name="uni0422" format="2">
   <advance width="1233"/>
   <unicode hex="0422"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0423.glif b/source/Hack-Italic.ufo/glyphs/uni0423.glif
index 2825f5398..829b2a482 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0423.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0423.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0423" format="1">
+<glyph name="uni0423" format="2">
   <advance width="1233"/>
   <unicode hex="0423"/>
   <outline>
@@ -23,7 +23,7 @@
       <point x="518" y="156" type="curve" smooth="yes"/>
       <point x="455" y="82"/>
       <point x="364" y="0"/>
-      <point x="207" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="207" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="59" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0424.glif b/source/Hack-Italic.ufo/glyphs/uni0424.glif
index 078484732..b3cedc312 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0424.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0424.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0424" format="1">
+<glyph name="uni0424" format="2">
   <advance width="1233"/>
   <unicode hex="0424"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="107" y="297" type="curve" smooth="yes"/>
       <point x="75" y="366"/>
       <point x="55" y="471"/>
-      <point x="55" y="559" type="curve" name="sh01" smooth="yes"/>
+      <point x="55" y="559" type="curve" smooth="yes" name="sh01"/>
       <point x="55" y="616"/>
       <point x="63" y="689"/>
       <point x="76" y="762" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="846" y="1371" type="line"/>
       <point x="1199" y="1359"/>
       <point x="1200" y="1133"/>
-      <point x="1200" y="990" type="curve" name="sh02" smooth="yes"/>
+      <point x="1200" y="990" type="curve" smooth="yes" name="sh02"/>
       <point x="1200" y="919"/>
       <point x="1192" y="843"/>
       <point x="1177" y="762" type="curve" smooth="yes"/>
@@ -39,10 +39,10 @@
       <point x="293" y="790" type="curve" smooth="yes"/>
       <point x="264" y="638"/>
       <point x="262" y="600"/>
-      <point x="259" y="551" type="curve" name="sh04" smooth="yes"/>
+      <point x="259" y="551" type="curve" smooth="yes" name="sh04"/>
       <point x="258" y="530"/>
       <point x="257" y="510"/>
-      <point x="257" y="491" type="curve" name="sh03" smooth="yes"/>
+      <point x="257" y="491" type="curve" smooth="yes" name="sh03"/>
       <point x="257" y="408"/>
       <point x="279" y="343"/>
       <point x="438" y="316" type="curve"/>
@@ -54,10 +54,10 @@
       <point x="963" y="733" type="curve" smooth="yes"/>
       <point x="985" y="849"/>
       <point x="991" y="946"/>
-      <point x="994" y="973" type="curve" name="sh05" smooth="yes"/>
+      <point x="994" y="973" type="curve" smooth="yes" name="sh05"/>
       <point x="995" y="992"/>
       <point x="996" y="1010"/>
-      <point x="996" y="1026" type="curve" name="ah01" smooth="yes"/>
+      <point x="996" y="1026" type="curve" smooth="yes" name="ah01"/>
       <point x="996" y="1125"/>
       <point x="963" y="1183"/>
       <point x="815" y="1207" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0425.glif b/source/Hack-Italic.ufo/glyphs/uni0425.glif
index 58d8f76de..e5907dcc0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0425.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0425.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0425" format="1">
+<glyph name="uni0425" format="2">
   <advance width="1233"/>
   <unicode hex="0425"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0426.glif b/source/Hack-Italic.ufo/glyphs/uni0426.glif
index 60d93cb13..f3efd51b9 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0426.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0426.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0426" format="1">
+<glyph name="uni0426" format="2">
   <advance width="1233"/>
   <unicode hex="0426"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0427.glif b/source/Hack-Italic.ufo/glyphs/uni0427.glif
index 3d31fd28f..a8a320679 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0427.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0427.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0427" format="1">
+<glyph name="uni0427" format="2">
   <advance width="1233"/>
   <unicode hex="0427"/>
   <outline>
@@ -7,13 +7,13 @@
       <point x="872" y="658" type="line" name="hr00"/>
       <point x="715" y="586"/>
       <point x="621" y="577"/>
-      <point x="512" y="577" type="curve" name="dv01" smooth="yes"/>
+      <point x="512" y="577" type="curve" smooth="yes" name="dv01"/>
       <point x="334" y="577"/>
       <point x="264" y="601"/>
       <point x="211" y="675" type="curve" smooth="yes"/>
       <point x="182" y="716"/>
       <point x="167" y="759"/>
-      <point x="167" y="830" type="curve" name="dh01" smooth="yes"/>
+      <point x="167" y="830" type="curve" smooth="yes" name="dh01"/>
       <point x="167" y="870"/>
       <point x="171" y="929"/>
       <point x="182" y="980" type="curve"/>
@@ -22,13 +22,13 @@
       <point x="390" y="1006" type="line" smooth="yes"/>
       <point x="382" y="963"/>
       <point x="378" y="920"/>
-      <point x="378" y="889" type="curve" name="dh02" smooth="yes"/>
+      <point x="378" y="889" type="curve" smooth="yes" name="dh02"/>
       <point x="378" y="836"/>
       <point x="390" y="818"/>
       <point x="406" y="803" type="curve" smooth="yes"/>
       <point x="441" y="771"/>
       <point x="493" y="763"/>
-      <point x="593" y="763" type="curve" name="dv02" smooth="yes"/>
+      <point x="593" y="763" type="curve" smooth="yes" name="dv02"/>
       <point x="716" y="763"/>
       <point x="782" y="775"/>
       <point x="911" y="861" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0428.glif b/source/Hack-Italic.ufo/glyphs/uni0428.glif
index 63cf8ece2..c207824a8 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0428.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0428.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0428" format="1">
+<glyph name="uni0428" format="2">
   <advance width="1233"/>
   <unicode hex="0428"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0429.glif b/source/Hack-Italic.ufo/glyphs/uni0429.glif
index 933792661..cdc5b4602 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0429.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0429.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0429" format="1">
+<glyph name="uni0429" format="2">
   <advance width="1233"/>
   <unicode hex="0429"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni042A_.glif b/source/Hack-Italic.ufo/glyphs/uni042A_.glif
index db9d8f58e..e91a8a542 100644
--- a/source/Hack-Italic.ufo/glyphs/uni042A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni042A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni042A" format="1">
+<glyph name="uni042A" format="2">
   <advance width="1233"/>
   <unicode hex="042A"/>
   <outline>
@@ -9,29 +9,29 @@
       <point x="186" y="1493" type="line" name="at01"/>
       <point x="649" y="1493" type="line"/>
       <point x="532" y="893" type="line"/>
-      <point x="670" y="893" type="line" name="dv02" smooth="yes"/>
+      <point x="670" y="893" type="line" smooth="yes" name="dv02"/>
       <point x="961" y="893"/>
       <point x="1104" y="778"/>
-      <point x="1104" y="563" type="curve" name="dh02" smooth="yes"/>
+      <point x="1104" y="563" type="curve" smooth="yes" name="dh02"/>
       <point x="1104" y="527"/>
       <point x="1100" y="488"/>
       <point x="1092" y="446" type="curve" smooth="yes"/>
       <point x="1033" y="146"/>
       <point x="823" y="0"/>
-      <point x="497" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="497" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="157" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="529" y="166" type="line" name="sv01" smooth="yes"/>
+      <point x="529" y="166" type="line" smooth="yes" name="sv01"/>
       <point x="718" y="166"/>
       <point x="846" y="267"/>
       <point x="881" y="446" type="curve" smooth="yes"/>
       <point x="886" y="469"/>
       <point x="888" y="493"/>
-      <point x="888" y="516" type="curve" name="dh01" smooth="yes"/>
+      <point x="888" y="516" type="curve" smooth="yes" name="dh01"/>
       <point x="888" y="651"/>
       <point x="799" y="727"/>
-      <point x="638" y="727" type="curve" name="dv01" smooth="yes"/>
+      <point x="638" y="727" type="curve" smooth="yes" name="dv01"/>
       <point x="500" y="727" type="line"/>
       <point x="391" y="166" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni042B_.glif b/source/Hack-Italic.ufo/glyphs/uni042B_.glif
index fcb8bba68..64128fc8b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni042B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni042B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni042B" format="1">
+<glyph name="uni042B" format="2">
   <advance width="1233"/>
   <unicode hex="042B"/>
   <outline>
@@ -7,16 +7,16 @@
       <point x="211" y="1493" type="line" name="hr00"/>
       <point x="413" y="1493" type="line"/>
       <point x="296" y="893" type="line"/>
-      <point x="387" y="893" type="line" name="dv02" smooth="yes"/>
+      <point x="387" y="893" type="line" smooth="yes" name="dv02"/>
       <point x="618" y="893"/>
       <point x="763" y="773"/>
-      <point x="763" y="557" type="curve" name="dh02" smooth="yes"/>
+      <point x="763" y="557" type="curve" smooth="yes" name="dh02"/>
       <point x="763" y="522"/>
       <point x="760" y="485"/>
       <point x="752" y="446" type="curve" smooth="yes"/>
       <point x="693" y="150"/>
       <point x="467" y="0"/>
-      <point x="214" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="214" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="-79" y="0" type="line"/>
     </contour>
     <contour>
@@ -26,16 +26,16 @@
       <point x="787" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="246" y="166" type="line" name="sv01" smooth="yes"/>
+      <point x="246" y="166" type="line" smooth="yes" name="sv01"/>
       <point x="383" y="166"/>
       <point x="504" y="250"/>
       <point x="541" y="446" type="curve" smooth="yes"/>
       <point x="547" y="477"/>
       <point x="550" y="506"/>
-      <point x="550" y="533" type="curve" name="dh01" smooth="yes"/>
+      <point x="550" y="533" type="curve" smooth="yes" name="dh01"/>
       <point x="550" y="657"/>
       <point x="486" y="727"/>
-      <point x="355" y="727" type="curve" name="dv01" smooth="yes"/>
+      <point x="355" y="727" type="curve" smooth="yes" name="dv01"/>
       <point x="264" y="727" type="line"/>
       <point x="155" y="166" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni042C_.glif b/source/Hack-Italic.ufo/glyphs/uni042C_.glif
index 471a49c21..ace7de5ec 100644
--- a/source/Hack-Italic.ufo/glyphs/uni042C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni042C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni042C" format="1">
+<glyph name="uni042C" format="2">
   <advance width="1233"/>
   <unicode hex="042C"/>
   <outline>
@@ -7,29 +7,29 @@
       <point x="342" y="1493" type="line" name="hr00"/>
       <point x="544" y="1493" type="line"/>
       <point x="427" y="893" type="line"/>
-      <point x="661" y="893" type="line" name="dv02" smooth="yes"/>
+      <point x="661" y="893" type="line" smooth="yes" name="dv02"/>
       <point x="952" y="893"/>
       <point x="1095" y="778"/>
-      <point x="1095" y="563" type="curve" name="dh02" smooth="yes"/>
+      <point x="1095" y="563" type="curve" smooth="yes" name="dh02"/>
       <point x="1095" y="527"/>
       <point x="1091" y="488"/>
       <point x="1083" y="446" type="curve" smooth="yes"/>
       <point x="1024" y="146"/>
       <point x="814" y="0"/>
-      <point x="488" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="488" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="52" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="520" y="166" type="line" name="sv01" smooth="yes"/>
+      <point x="520" y="166" type="line" smooth="yes" name="sv01"/>
       <point x="709" y="166"/>
       <point x="837" y="267"/>
       <point x="872" y="446" type="curve" smooth="yes"/>
       <point x="877" y="469"/>
       <point x="879" y="493"/>
-      <point x="879" y="516" type="curve" name="dh01" smooth="yes"/>
+      <point x="879" y="516" type="curve" smooth="yes" name="dh01"/>
       <point x="879" y="651"/>
       <point x="790" y="727"/>
-      <point x="629" y="727" type="curve" name="dv01" smooth="yes"/>
+      <point x="629" y="727" type="curve" smooth="yes" name="dv01"/>
       <point x="395" y="727" type="line"/>
       <point x="286" y="166" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni042D_.glif b/source/Hack-Italic.ufo/glyphs/uni042D_.glif
index 5ae1208dd..38963fe5a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni042D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni042D_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni042D" format="1">
+<glyph name="uni042D" format="2">
   <advance width="1233"/>
   <unicode hex="042D"/>
   <outline>
     <contour>
-      <point x="336" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="336" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="217" y="-29"/>
       <point x="112" y="-2"/>
       <point x="21" y="53" type="curve"/>
       <point x="62" y="260" type="line"/>
       <point x="146" y="176"/>
       <point x="255" y="135"/>
-      <point x="370" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="370" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="634" y="135"/>
       <point x="797" y="358"/>
       <point x="863" y="661" type="curve" name="dv02"/>
@@ -20,20 +20,20 @@
       <point x="891" y="831" type="line" name="sh01"/>
       <point x="896" y="895"/>
       <point x="899" y="967"/>
-      <point x="899" y="1018" type="curve" name="dh01" smooth="yes"/>
+      <point x="899" y="1018" type="curve" smooth="yes" name="dh01"/>
       <point x="899" y="1175"/>
       <point x="869" y="1356"/>
-      <point x="614" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="614" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="490" y="1356"/>
       <point x="369" y="1314"/>
       <point x="250" y="1231" type="curve"/>
       <point x="291" y="1438" type="line"/>
       <point x="403" y="1493"/>
       <point x="519" y="1520"/>
-      <point x="639" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="639" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1016" y="1520"/>
       <point x="1117" y="1252"/>
-      <point x="1117" y="996" type="curve" name="dh02" smooth="yes"/>
+      <point x="1117" y="996" type="curve" smooth="yes" name="dh02"/>
       <point x="1117" y="919"/>
       <point x="1108" y="835"/>
       <point x="1090" y="744" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni042E_.glif b/source/Hack-Italic.ufo/glyphs/uni042E_.glif
index c7f74fdf9..990b8b24e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni042E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni042E_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni042E" format="1">
+<glyph name="uni042E" format="2">
   <advance width="1233"/>
   <unicode hex="042E"/>
   <outline>
     <contour>
-      <point x="661" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="661" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="461" y="-29"/>
       <point x="372" y="113"/>
-      <point x="372" y="372" type="curve" name="sh01" smooth="yes"/>
+      <point x="372" y="372" type="curve" smooth="yes" name="sh01"/>
       <point x="372" y="459"/>
       <point x="381" y="555"/>
       <point x="400" y="666" type="curve"/>
@@ -20,13 +20,13 @@
       <point x="433" y="836" type="line"/>
       <point x="529" y="1259"/>
       <point x="693" y="1520"/>
-      <point x="963" y="1520" type="curve" name="at02" smooth="yes"/>
+      <point x="963" y="1520" type="curve" smooth="yes" name="at02"/>
       <point x="1104" y="1520"/>
       <point x="1191" y="1451"/>
       <point x="1228" y="1328" type="curve" smooth="yes"/>
       <point x="1245" y="1271"/>
       <point x="1253" y="1197"/>
-      <point x="1253" y="1113" type="curve" name="sh02" smooth="yes"/>
+      <point x="1253" y="1113" type="curve" smooth="yes" name="sh02"/>
       <point x="1253" y="807"/>
       <point x="1146" y="371"/>
       <point x="1002" y="163" type="curve" smooth="yes"/>
@@ -34,28 +34,28 @@
       <point x="804" y="-29"/>
     </contour>
     <contour>
-      <point x="695" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="695" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="767" y="135"/>
       <point x="831" y="184"/>
       <point x="878" y="276" type="curve" smooth="yes"/>
       <point x="966" y="448"/>
       <point x="1064" y="906"/>
-      <point x="1064" y="1144" type="curve" name="hr01" smooth="yes"/>
+      <point x="1064" y="1144" type="curve" smooth="yes" name="hr01"/>
       <point x="1064" y="1171"/>
       <point x="1063" y="1195"/>
-      <point x="1060" y="1215" type="curve" name="sh03" smooth="yes"/>
+      <point x="1060" y="1215" type="curve" smooth="yes" name="sh03"/>
       <point x="1049" y="1303"/>
       <point x="1008" y="1356"/>
-      <point x="932" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="932" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="864" y="1356"/>
       <point x="802" y="1312"/>
       <point x="751" y="1215" type="curve" smooth="yes"/>
       <point x="658" y="1033"/>
       <point x="564" y="579"/>
-      <point x="564" y="346" type="curve" name="sh04" smooth="yes"/>
+      <point x="564" y="346" type="curve" smooth="yes" name="sh04"/>
       <point x="564" y="319"/>
       <point x="565" y="296"/>
-      <point x="568" y="276" type="curve" name="sh05" smooth="yes"/>
+      <point x="568" y="276" type="curve" smooth="yes" name="sh05"/>
       <point x="579" y="188"/>
       <point x="620" y="135"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni042F_.glif b/source/Hack-Italic.ufo/glyphs/uni042F_.glif
index 061409bad..61a1bf1ec 100644
--- a/source/Hack-Italic.ufo/glyphs/uni042F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni042F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni042F" format="1">
+<glyph name="uni042F" format="2">
   <advance width="1233"/>
   <unicode hex="042F"/>
   <outline>
@@ -7,13 +7,13 @@
       <point x="399" y="666" type="line" name="hr00"/>
       <point x="266" y="718"/>
       <point x="179" y="820"/>
-      <point x="179" y="959" type="curve" name="dh01" smooth="yes"/>
+      <point x="179" y="959" type="curve" smooth="yes" name="dh01"/>
       <point x="179" y="986"/>
       <point x="183" y="1020"/>
       <point x="190" y="1061" type="curve" smooth="yes"/>
       <point x="243" y="1343"/>
       <point x="460" y="1493"/>
-      <point x="782" y="1493" type="curve" name="at01" smooth="yes"/>
+      <point x="782" y="1493" type="curve" smooth="yes" name="at01"/>
       <point x="1248" y="1493" type="line"/>
       <point x="958" y="0" type="line" name="ab01"/>
       <point x="755" y="0" type="line"/>
@@ -31,7 +31,7 @@
       <point x="403" y="1061" type="curve" smooth="yes"/>
       <point x="398" y="1034"/>
       <point x="395" y="1009"/>
-      <point x="395" y="985" type="curve" name="dh02" smooth="yes"/>
+      <point x="395" y="985" type="curve" smooth="yes" name="dh02"/>
       <point x="395" y="860"/>
       <point x="476" y="797"/>
       <point x="639" y="797" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0430.glif b/source/Hack-Italic.ufo/glyphs/uni0430.glif
index e6bf12f81..4711163cd 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0430.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0430.glif
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0430" format="1">
+<glyph name="uni0430" format="2">
   <advance width="1233"/>
   <unicode hex="0430"/>
   <outline>
     <contour>
-      <point x="404" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="404" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="203" y="-29"/>
       <point x="72" y="90"/>
-      <point x="72" y="283" type="curve" name="sh01" smooth="yes"/>
+      <point x="72" y="283" type="curve" smooth="yes" name="sh01"/>
       <point x="72" y="534"/>
       <point x="293" y="707"/>
       <point x="645" y="707" type="curve" smooth="yes"/>
       <point x="891" y="707" type="line" name="dv02"/>
-      <point x="903" y="768" type="line" name="sh02" smooth="yes"/>
+      <point x="903" y="768" type="line" smooth="yes" name="sh02"/>
       <point x="906" y="780"/>
       <point x="907" y="794"/>
-      <point x="907" y="807" type="curve" name="ah01" smooth="yes"/>
+      <point x="907" y="807" type="curve" smooth="yes" name="ah01"/>
       <point x="907" y="932"/>
       <point x="821" y="991"/>
-      <point x="665" y="991" type="curve" name="sv03" smooth="yes"/>
+      <point x="665" y="991" type="curve" smooth="yes" name="sv03"/>
       <point x="548" y="991"/>
       <point x="416" y="957"/>
       <point x="268" y="889" type="curve" name="sh04"/>
       <point x="303" y="1069" type="line"/>
       <point x="448" y="1121"/>
       <point x="574" y="1147"/>
-      <point x="693" y="1147" type="curve" name="hr01" smooth="yes"/>
+      <point x="693" y="1147" type="curve" smooth="yes" name="hr01"/>
       <point x="942" y="1147"/>
       <point x="1087" y="1030"/>
-      <point x="1087" y="839" type="curve" name="sh05" smooth="yes"/>
+      <point x="1087" y="839" type="curve" smooth="yes" name="sh05"/>
       <point x="1087" y="794"/>
       <point x="1079" y="723"/>
       <point x="1063" y="639" type="curve" smooth="yes"/>
@@ -39,7 +39,7 @@
       <point x="561" y="-29"/>
     </contour>
     <contour>
-      <point x="461" y="125" type="curve" name="sv01" smooth="yes"/>
+      <point x="461" y="125" type="curve" smooth="yes" name="sv01"/>
       <point x="640" y="125"/>
       <point x="805" y="269"/>
       <point x="856" y="522" type="curve" smooth="yes"/>
@@ -50,7 +50,7 @@
       <point x="414" y="530" type="curve" smooth="yes"/>
       <point x="323" y="491"/>
       <point x="264" y="411"/>
-      <point x="264" y="307" type="curve" name="sh03" smooth="yes"/>
+      <point x="264" y="307" type="curve" smooth="yes" name="sh03"/>
       <point x="264" y="195"/>
       <point x="334" y="125"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0431.glif b/source/Hack-Italic.ufo/glyphs/uni0431.glif
index 2644d8ab4..ed0d10706 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0431.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0431.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0431" format="1">
+<glyph name="uni0431" format="2">
   <advance width="1233"/>
   <unicode hex="0431"/>
   <outline>
     <contour>
-      <point x="504" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="504" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="196" y="-29"/>
       <point x="119" y="172"/>
-      <point x="119" y="369" type="curve" name="sh01" smooth="yes"/>
+      <point x="119" y="369" type="curve" smooth="yes" name="sh01"/>
       <point x="119" y="420"/>
       <point x="124" y="477"/>
       <point x="135" y="528" type="curve" smooth="yes"/>
@@ -17,7 +17,7 @@
       <point x="179" y="788" type="line" smooth="yes"/>
       <point x="211" y="999"/>
       <point x="249" y="1124"/>
-      <point x="313" y="1228" type="curve" name="sh03" smooth="yes"/>
+      <point x="313" y="1228" type="curve" smooth="yes" name="sh03"/>
       <point x="502" y="1538"/>
       <point x="862" y="1561"/>
       <point x="1055" y="1573" type="curve" smooth="yes"/>
@@ -38,10 +38,10 @@
       <point x="380" y="1024" type="line" name="ih01"/>
       <point x="475" y="1105"/>
       <point x="599" y="1147"/>
-      <point x="740" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="740" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1044" y="1147"/>
       <point x="1121" y="951"/>
-      <point x="1121" y="754" type="curve" name="sh04" smooth="yes"/>
+      <point x="1121" y="754" type="curve" smooth="yes" name="sh04"/>
       <point x="1121" y="690"/>
       <point x="1113" y="622"/>
       <point x="1101" y="558" type="curve" smooth="yes"/>
@@ -49,22 +49,22 @@
       <point x="821" y="-29"/>
     </contour>
     <contour>
-      <point x="534" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="534" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="716" y="127"/>
       <point x="854" y="267"/>
       <point x="907" y="559" type="curve" smooth="yes"/>
       <point x="919" y="624"/>
       <point x="925" y="693"/>
-      <point x="925" y="740" type="curve" name="ah01" smooth="yes"/>
+      <point x="925" y="740" type="curve" smooth="yes" name="ah01"/>
       <point x="925" y="901"/>
       <point x="854" y="991"/>
-      <point x="707" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="707" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="524" y="991"/>
       <point x="388" y="847"/>
       <point x="336" y="559" type="curve" smooth="yes"/>
       <point x="325" y="498"/>
       <point x="318" y="431"/>
-      <point x="318" y="380" type="curve" name="sh02" smooth="yes"/>
+      <point x="318" y="380" type="curve" smooth="yes" name="sh02"/>
       <point x="318" y="268"/>
       <point x="352" y="127"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0432.glif b/source/Hack-Italic.ufo/glyphs/uni0432.glif
index ad5cc62ee..4fe884065 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0432.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0432.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0432" format="1">
+<glyph name="uni0432" format="2">
   <advance width="1233"/>
   <unicode hex="0432"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="735" y="1120" type="line" smooth="yes"/>
       <point x="962" y="1120"/>
       <point x="1058" y="1010"/>
-      <point x="1058" y="901" type="curve" name="sh02" smooth="yes"/>
+      <point x="1058" y="901" type="curve" smooth="yes" name="sh02"/>
       <point x="1058" y="885"/>
       <point x="1056" y="869"/>
       <point x="1053" y="853" type="curve" smooth="yes"/>
@@ -17,37 +17,37 @@
       <point x="810" y="600" type="curve" name="iv01"/>
       <point x="983" y="565"/>
       <point x="1005" y="486"/>
-      <point x="1005" y="399" type="curve" name="dh01" smooth="yes"/>
+      <point x="1005" y="399" type="curve" smooth="yes" name="dh01"/>
       <point x="1005" y="127"/>
       <point x="790" y="0"/>
-      <point x="533" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="533" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="120" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="661" y="665" type="line" name="dv01" smooth="yes"/>
+      <point x="661" y="665" type="line" smooth="yes" name="dv01"/>
       <point x="773" y="665"/>
       <point x="864" y="736"/>
-      <point x="864" y="848" type="curve" name="sh01" smooth="yes"/>
+      <point x="864" y="848" type="curve" smooth="yes" name="sh01"/>
       <point x="864" y="909"/>
       <point x="837" y="970"/>
-      <point x="720" y="970" type="curve" name="hr01" smooth="yes"/>
+      <point x="720" y="970" type="curve" smooth="yes" name="hr01"/>
       <point x="493" y="970" type="line"/>
       <point x="433" y="665" type="line"/>
     </contour>
     <contour>
-      <point x="572" y="150" type="line" name="sv01" smooth="yes"/>
+      <point x="572" y="150" type="line" smooth="yes" name="sv01"/>
       <point x="664" y="150"/>
       <point x="761" y="195"/>
       <point x="798" y="315" type="curve" smooth="yes"/>
       <point x="806" y="342"/>
       <point x="810" y="366"/>
-      <point x="810" y="389" type="curve" name="hr02" smooth="yes"/>
+      <point x="810" y="389" type="curve" smooth="yes" name="hr02"/>
       <point x="810" y="424"/>
       <point x="801" y="453"/>
       <point x="782" y="476" type="curve" smooth="yes"/>
       <point x="763" y="497"/>
       <point x="732" y="515"/>
-      <point x="647" y="515" type="curve" name="hr03" smooth="yes"/>
+      <point x="647" y="515" type="curve" smooth="yes" name="hr03"/>
       <point x="404" y="515" type="line"/>
       <point x="333" y="150" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0433.glif b/source/Hack-Italic.ufo/glyphs/uni0433.glif
index 2d08f657c..8885af6bb 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0433.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0433.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0433" format="1">
+<glyph name="uni0433" format="2">
   <advance width="1233"/>
   <unicode hex="0433"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0434.glif b/source/Hack-Italic.ufo/glyphs/uni0434.glif
index 2276dcf43..7703bee1e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0434.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0434.glif
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0434" format="1">
+<glyph name="uni0434" format="2">
   <advance width="1233"/>
   <unicode hex="0434"/>
   <outline>
     <contour>
       <point x="44" y="150" type="line" name="sv01"/>
-      <point x="111" y="150" type="line" name="sv03" smooth="yes"/>
+      <point x="111" y="150" type="line" smooth="yes" name="sv03"/>
       <point x="183" y="150"/>
       <point x="282" y="578"/>
       <point x="306" y="704" type="curve"/>
@@ -36,7 +36,7 @@
       <point x="341" y="162" type="curve" smooth="yes"/>
       <point x="341" y="154"/>
       <point x="352" y="150"/>
-      <point x="373" y="150" type="curve" name="sv09" smooth="yes"/>
+      <point x="373" y="150" type="curve" smooth="yes" name="sv09"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0435.glif b/source/Hack-Italic.ufo/glyphs/uni0435.glif
index a0deb4f8a..c707c1006 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0435.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0435.glif
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0435" format="1">
+<glyph name="uni0435" format="2">
   <advance width="1233"/>
   <unicode hex="0435"/>
   <outline>
     <contour>
-      <point x="556" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="556" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="253" y="-29"/>
       <point x="98" y="122"/>
-      <point x="98" y="407" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="407" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="615"/>
       <point x="183" y="829"/>
       <point x="324" y="973" type="curve"/>
       <point x="436" y="1089"/>
       <point x="570" y="1149"/>
-      <point x="719" y="1149" type="curve" name="dv03" smooth="yes"/>
+      <point x="719" y="1149" type="curve" smooth="yes" name="dv03"/>
       <point x="964" y="1149"/>
       <point x="1126" y="983"/>
-      <point x="1126" y="731" type="curve" name="sh02" smooth="yes"/>
+      <point x="1126" y="731" type="curve" smooth="yes" name="sh02"/>
       <point x="1126" y="683"/>
       <point x="1120" y="620"/>
       <point x="1104" y="516" type="curve" name="dv04"/>
       <point x="297" y="516" type="line" name="sh04"/>
       <point x="289" y="473"/>
       <point x="285" y="441"/>
-      <point x="285" y="406" type="curve" name="sh03" smooth="yes"/>
+      <point x="285" y="406" type="curve" smooth="yes" name="sh03"/>
       <point x="285" y="229"/>
       <point x="388" y="127"/>
-      <point x="584" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="584" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="704" y="127"/>
       <point x="844" y="164"/>
       <point x="997" y="240" type="curve" name="ih01"/>
@@ -38,10 +38,10 @@
       <point x="938" y="659" type="line" name="sh06"/>
       <point x="946" y="695"/>
       <point x="948" y="716"/>
-      <point x="948" y="739" type="curve" name="ah01" smooth="yes"/>
+      <point x="948" y="739" type="curve" smooth="yes" name="ah01"/>
       <point x="948" y="897"/>
       <point x="854" y="991"/>
-      <point x="707" y="991" type="curve" name="dv02" smooth="yes"/>
+      <point x="707" y="991" type="curve" smooth="yes" name="dv02"/>
       <point x="533" y="991"/>
       <point x="391" y="860"/>
       <point x="332" y="659" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0436.glif b/source/Hack-Italic.ufo/glyphs/uni0436.glif
index 0d93a4d8b..0a6e41e7f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0436.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0436.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0436" format="1">
+<glyph name="uni0436" format="2">
   <advance width="1233"/>
   <unicode hex="0436"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0437.glif b/source/Hack-Italic.ufo/glyphs/uni0437.glif
index 1ad4c4648..edc441279 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0437.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0437.glif
@@ -1,54 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0437" format="1">
+<glyph name="uni0437" format="2">
   <advance width="1233"/>
   <unicode hex="0437"/>
   <outline>
     <contour>
-      <point x="426" y="-22" type="curve" name="ab01" smooth="yes"/>
+      <point x="426" y="-22" type="curve" smooth="yes" name="ab01"/>
       <point x="301" y="-22"/>
       <point x="187" y="-3"/>
       <point x="66" y="34" type="curve"/>
       <point x="100" y="207" type="line" name="iv01"/>
       <point x="192" y="162"/>
       <point x="311" y="138"/>
-      <point x="442" y="138" type="curve" name="sv01" smooth="yes"/>
+      <point x="442" y="138" type="curve" smooth="yes" name="sv01"/>
       <point x="695" y="138"/>
       <point x="840" y="228"/>
-      <point x="840" y="364" type="curve" name="dh01" smooth="yes"/>
+      <point x="840" y="364" type="curve" smooth="yes" name="dh01"/>
       <point x="840" y="465"/>
       <point x="743" y="532"/>
-      <point x="556" y="532" type="curve" name="hr01" smooth="yes"/>
+      <point x="556" y="532" type="curve" smooth="yes" name="hr01"/>
       <point x="398" y="532" type="line"/>
       <point x="426" y="676" type="line"/>
-      <point x="591" y="676" type="line" name="dv01" smooth="yes"/>
+      <point x="591" y="676" type="line" smooth="yes" name="dv01"/>
       <point x="775" y="676"/>
       <point x="879" y="741"/>
       <point x="900" y="824" type="curve" smooth="yes"/>
       <point x="903" y="833"/>
       <point x="904" y="842"/>
-      <point x="904" y="852" type="curve" name="ih01" smooth="yes"/>
+      <point x="904" y="852" type="curve" smooth="yes" name="ih01"/>
       <point x="904" y="931"/>
       <point x="815" y="984"/>
-      <point x="640" y="984" type="curve" name="sv02" smooth="yes"/>
+      <point x="640" y="984" type="curve" smooth="yes" name="sv02"/>
       <point x="545" y="984"/>
       <point x="427" y="968"/>
       <point x="282" y="932" type="curve" name="iv02"/>
       <point x="314" y="1099" type="line"/>
       <point x="461" y="1131"/>
       <point x="586" y="1147"/>
-      <point x="690" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="690" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="941" y="1147"/>
       <point x="1094" y="1057"/>
-      <point x="1094" y="905" type="curve" name="sh01" smooth="yes"/>
+      <point x="1094" y="905" type="curve" smooth="yes" name="sh01"/>
       <point x="1094" y="890"/>
       <point x="1092" y="874"/>
-      <point x="1089" y="855" type="curve" name="hr02" smooth="yes"/>
+      <point x="1089" y="855" type="curve" smooth="yes" name="hr02"/>
       <point x="1062" y="726"/>
       <point x="956" y="640"/>
       <point x="792" y="607" type="curve" name="iv03"/>
       <point x="941" y="579"/>
       <point x="1023" y="502"/>
-      <point x="1023" y="379" type="curve" name="dh02" smooth="yes"/>
+      <point x="1023" y="379" type="curve" smooth="yes" name="dh02"/>
       <point x="1023" y="363"/>
       <point x="1021" y="346"/>
       <point x="1018" y="327" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0438.glif b/source/Hack-Italic.ufo/glyphs/uni0438.glif
index 8e87751f0..87d296789 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0438.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0438.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0438" format="1">
+<glyph name="uni0438" format="2">
   <advance width="1233"/>
   <unicode hex="0438"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0439.glif b/source/Hack-Italic.ufo/glyphs/uni0439.glif
index 1f1c81b51..b2376f1a3 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0439.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0439.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0439" format="1">
+<glyph name="uni0439" format="2">
   <advance width="1233"/>
   <unicode hex="0439"/>
   <outline>
     <contour>
-      <point x="747" y="1261" type="curve" name="dv01" smooth="yes"/>
+      <point x="747" y="1261" type="curve" smooth="yes" name="dv01"/>
       <point x="568" y="1261"/>
       <point x="469" y="1350"/>
-      <point x="469" y="1507" type="curve" name="dh01" smooth="yes"/>
+      <point x="469" y="1507" type="curve" smooth="yes" name="dh01"/>
       <point x="469" y="1530"/>
       <point x="469" y="1537"/>
       <point x="472" y="1548" type="curve"/>
       <point x="592" y="1548" type="line" name="sv01"/>
-      <point x="592" y="1531" type="line" name="dh02" smooth="yes"/>
+      <point x="592" y="1531" type="line" smooth="yes" name="dh02"/>
       <point x="592" y="1443"/>
       <point x="652" y="1398"/>
-      <point x="761" y="1398" type="curve" name="dv02" smooth="yes"/>
+      <point x="761" y="1398" type="curve" smooth="yes" name="dv02"/>
       <point x="874" y="1398"/>
       <point x="940" y="1448"/>
       <point x="979" y="1548" type="curve" name="sv02"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni043A_.glif b/source/Hack-Italic.ufo/glyphs/uni043A_.glif
index ad6dab812..dc0470f84 100644
--- a/source/Hack-Italic.ufo/glyphs/uni043A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni043A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni043A" format="1">
+<glyph name="uni043A" format="2">
   <advance width="1233"/>
   <unicode hex="043A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni043B_.glif b/source/Hack-Italic.ufo/glyphs/uni043B_.glif
index 35371cc46..b1e2f86bb 100644
--- a/source/Hack-Italic.ufo/glyphs/uni043B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni043B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni043B" format="1">
+<glyph name="uni043B" format="2">
   <advance width="1233"/>
   <unicode hex="043B"/>
   <outline>
@@ -24,7 +24,7 @@
       <point x="263" y="106" type="curve" smooth="yes"/>
       <point x="197" y="35"/>
       <point x="120" y="0"/>
-      <point x="-13" y="0" type="curve" name="ab02" smooth="yes"/>
+      <point x="-13" y="0" type="curve" smooth="yes" name="ab02"/>
       <point x="-68" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni043C_.glif b/source/Hack-Italic.ufo/glyphs/uni043C_.glif
index 54c1c15c5..6878959c8 100644
--- a/source/Hack-Italic.ufo/glyphs/uni043C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni043C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni043C" format="1">
+<glyph name="uni043C" format="2">
   <advance width="1233"/>
   <unicode hex="043C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni043D_.glif b/source/Hack-Italic.ufo/glyphs/uni043D_.glif
index 75422a603..afd17b781 100644
--- a/source/Hack-Italic.ufo/glyphs/uni043D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni043D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni043D" format="1">
+<glyph name="uni043D" format="2">
   <advance width="1233"/>
   <unicode hex="043D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni043E_.glif b/source/Hack-Italic.ufo/glyphs/uni043E_.glif
index b5f015d20..ea46bb660 100644
--- a/source/Hack-Italic.ufo/glyphs/uni043E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni043E_.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni043E" format="1">
+<glyph name="uni043E" format="2">
   <advance width="1233"/>
   <unicode hex="043E"/>
   <outline>
     <contour>
-      <point x="514" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="514" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="253" y="-29"/>
       <point x="117" y="121"/>
-      <point x="117" y="392" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="392" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="571"/>
       <point x="177" y="769"/>
       <point x="274" y="911" type="curve" smooth="yes"/>
       <point x="382" y="1068"/>
       <point x="526" y="1147"/>
-      <point x="717" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="717" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="974" y="1147"/>
       <point x="1114" y="1004"/>
-      <point x="1114" y="724" type="curve" name="sh02" smooth="yes"/>
+      <point x="1114" y="724" type="curve" smooth="yes" name="sh02"/>
       <point x="1114" y="550"/>
       <point x="1060" y="354"/>
       <point x="958" y="207" type="curve" smooth="yes"/>
@@ -24,16 +24,16 @@
       <point x="707" y="-29"/>
     </contour>
     <contour>
-      <point x="524" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="524" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="792" y="127"/>
       <point x="920" y="442"/>
-      <point x="920" y="707" type="curve" name="ah01" smooth="yes"/>
+      <point x="920" y="707" type="curve" smooth="yes" name="ah01"/>
       <point x="920" y="906"/>
       <point x="850" y="991"/>
-      <point x="709" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="709" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="441" y="991"/>
       <point x="313" y="676"/>
-      <point x="313" y="411" type="curve" name="sh03" smooth="yes"/>
+      <point x="313" y="411" type="curve" smooth="yes" name="sh03"/>
       <point x="313" y="212"/>
       <point x="383" y="127"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni043F_.glif b/source/Hack-Italic.ufo/glyphs/uni043F_.glif
index 3e3eaf0b6..77583ed54 100644
--- a/source/Hack-Italic.ufo/glyphs/uni043F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni043F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni043F" format="1">
+<glyph name="uni043F" format="2">
   <advance width="1233"/>
   <unicode hex="043F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0440.glif b/source/Hack-Italic.ufo/glyphs/uni0440.glif
index ff084c80e..aeed09990 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0440.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0440.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0440" format="1">
+<glyph name="uni0440" format="2">
   <advance width="1233"/>
   <unicode hex="0440"/>
   <outline>
@@ -9,16 +9,16 @@
       <point x="455" y="977" type="line" name="iv01"/>
       <point x="539" y="1089"/>
       <point x="654" y="1147"/>
-      <point x="791" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="791" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1004" y="1147"/>
       <point x="1128" y="1003"/>
-      <point x="1128" y="742" type="curve" name="sh02" smooth="yes"/>
+      <point x="1128" y="742" type="curve" smooth="yes" name="sh02"/>
       <point x="1128" y="566"/>
       <point x="1072" y="357"/>
       <point x="979" y="211" type="curve" smooth="yes"/>
       <point x="883" y="58"/>
       <point x="746" y="-29"/>
-      <point x="578" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="578" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="445" y="-29"/>
       <point x="353" y="25"/>
       <point x="293" y="141" type="curve" name="iv02"/>
@@ -26,22 +26,22 @@
       <point x="-2" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="568" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="568" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="683" y="127"/>
       <point x="765" y="186"/>
       <point x="829" y="302" type="curve"/>
       <point x="893" y="422"/>
       <point x="934" y="591"/>
-      <point x="934" y="730" type="curve" name="hr01" smooth="yes"/>
+      <point x="934" y="730" type="curve" smooth="yes" name="hr01"/>
       <point x="934" y="909"/>
       <point x="868" y="991"/>
-      <point x="729" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="729" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="606" y="991"/>
       <point x="523" y="925"/>
       <point x="459" y="812" type="curve" name="dh01"/>
       <point x="395" y="695"/>
       <point x="354" y="530"/>
-      <point x="354" y="397" type="curve" name="hr02" smooth="yes"/>
+      <point x="354" y="397" type="curve" smooth="yes" name="hr02"/>
       <point x="354" y="212"/>
       <point x="431" y="127"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0441.glif b/source/Hack-Italic.ufo/glyphs/uni0441.glif
index 4e8217538..1beea1a3c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0441.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0441.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0441" format="1">
+<glyph name="uni0441" format="2">
   <advance width="1233"/>
   <unicode hex="0441"/>
   <outline>
     <contour>
-      <point x="597" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="597" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="444" y="-29"/>
       <point x="334" y="12"/>
       <point x="261" y="84" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="340" y="418" type="curve" smooth="yes"/>
       <point x="340" y="326"/>
       <point x="361" y="251"/>
-      <point x="408" y="200" type="curve" name="hr01" smooth="yes"/>
+      <point x="408" y="200" type="curve" smooth="yes" name="hr01"/>
       <point x="451" y="153"/>
       <point x="516" y="127"/>
       <point x="615" y="127" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0442.glif b/source/Hack-Italic.ufo/glyphs/uni0442.glif
index 96206ab93..fee3205fd 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0442.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0442.glif
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0442" format="1">
+<glyph name="uni0442" format="2">
   <advance width="1233"/>
   <unicode hex="0442"/>
   <outline>
     <contour>
       <point x="607" y="970" type="line" name="hr00"/>
-      <point x="296" y="970" type="line"/>
-      <point x="325" y="1120" type="line" name="at01"/>
-      <point x="1131" y="1120" type="line"/>
-      <point x="1102" y="970" type="line" name="sv01"/>
+      <point x="216" y="970" type="line"/>
+      <point x="245" y="1120" type="line" name="at01"/>
+      <point x="1231" y="1120" type="line"/>
+      <point x="1202" y="970" type="line" name="sv01"/>
       <point x="791" y="970" type="line" name="sv02"/>
       <point x="602" y="0" type="line" name="ab01"/>
       <point x="418" y="0" type="line"/>
@@ -17,7 +17,7 @@
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
+      <string>2018-05-31 15:07:29 +0000</string>
     </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0443.glif b/source/Hack-Italic.ufo/glyphs/uni0443.glif
index 5d664af2b..71d056a70 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0443.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0443.glif
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0443" format="1">
+<glyph name="uni0443" format="2">
   <advance width="1233"/>
   <unicode hex="0443"/>
   <outline>
     <contour>
       <point x="20" y="-272" type="line" name="hr00"/>
-      <point x="128" y="-272" type="line" name="dv02" smooth="yes"/>
+      <point x="128" y="-272" type="line" smooth="yes" name="dv02"/>
       <point x="239" y="-272"/>
       <point x="313" y="-208"/>
       <point x="386" y="-66" type="curve" smooth="yes"/>
@@ -24,7 +24,7 @@
       <point x="442" y="-276" type="curve" smooth="yes"/>
       <point x="362" y="-381"/>
       <point x="260" y="-426"/>
-      <point x="139" y="-426" type="curve" name="dv01" smooth="yes"/>
+      <point x="139" y="-426" type="curve" smooth="yes" name="dv01"/>
       <point x="-9" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0444.glif b/source/Hack-Italic.ufo/glyphs/uni0444.glif
index bb263dee2..8f507d0dd 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0444.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0444.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0444" format="1">
+<glyph name="uni0444" format="2">
   <advance width="1233"/>
   <unicode hex="0444"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="405" y="-29" type="line" name="hr00"/>
       <point x="117" y="0"/>
       <point x="73" y="162"/>
-      <point x="73" y="319" type="curve" name="sh01" smooth="yes"/>
+      <point x="73" y="319" type="curve" smooth="yes" name="sh01"/>
       <point x="73" y="472"/>
       <point x="115" y="817"/>
       <point x="282" y="992" type="curve"/>
@@ -19,7 +19,7 @@
       <point x="817" y="1147" type="line"/>
       <point x="1108" y="1118"/>
       <point x="1150" y="956"/>
-      <point x="1150" y="804" type="curve" name="sh02" smooth="yes"/>
+      <point x="1150" y="804" type="curve" smooth="yes" name="sh02"/>
       <point x="1150" y="654"/>
       <point x="1109" y="304"/>
       <point x="940" y="127" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="303" y="613" type="curve" smooth="yes"/>
       <point x="280" y="504"/>
       <point x="266" y="398"/>
-      <point x="266" y="330" type="curve" name="sh03" smooth="yes"/>
+      <point x="266" y="330" type="curve" smooth="yes" name="sh03"/>
       <point x="266" y="243"/>
       <point x="290" y="157"/>
       <point x="435" y="127" type="curve"/>
@@ -48,7 +48,7 @@
       <point x="918" y="505" type="curve" smooth="yes"/>
       <point x="945" y="629"/>
       <point x="955" y="729"/>
-      <point x="955" y="786" type="curve" name="ah01" smooth="yes"/>
+      <point x="955" y="786" type="curve" smooth="yes" name="ah01"/>
       <point x="955" y="873"/>
       <point x="930" y="952"/>
       <point x="785" y="982" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0445.glif b/source/Hack-Italic.ufo/glyphs/uni0445.glif
index b69971152..c4c6590ea 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0445.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0445.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0445" format="1">
+<glyph name="uni0445" format="2">
   <advance width="1233"/>
   <unicode hex="0445"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0446.glif b/source/Hack-Italic.ufo/glyphs/uni0446.glif
index 34adf1b2d..9f2fdb60c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0446.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0446.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0446" format="1">
+<glyph name="uni0446" format="2">
   <advance width="1233"/>
   <unicode hex="0446"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0447.glif b/source/Hack-Italic.ufo/glyphs/uni0447.glif
index 4b87eb1ba..f6ea199b6 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0447.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0447.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0447" format="1">
+<glyph name="uni0447" format="2">
   <advance width="1233"/>
   <unicode hex="0447"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="811" y="466" type="line" name="hr00"/>
       <point x="789" y="458"/>
       <point x="659" y="402"/>
-      <point x="492" y="402" type="curve" name="dv01" smooth="yes"/>
+      <point x="492" y="402" type="curve" smooth="yes" name="dv01"/>
       <point x="265" y="402"/>
       <point x="183" y="503"/>
-      <point x="183" y="647" type="curve" name="dh01" smooth="yes"/>
+      <point x="183" y="647" type="curve" smooth="yes" name="dh01"/>
       <point x="183" y="680"/>
       <point x="187" y="716"/>
       <point x="195" y="755" type="curve" smooth="yes"/>
@@ -19,10 +19,10 @@
       <point x="379" y="755" type="line" smooth="yes"/>
       <point x="375" y="735"/>
       <point x="373" y="716"/>
-      <point x="373" y="699" type="curve" name="dh02" smooth="yes"/>
+      <point x="373" y="699" type="curve" smooth="yes" name="dh02"/>
       <point x="373" y="595"/>
       <point x="440" y="562"/>
-      <point x="587" y="562" type="curve" name="dv02" smooth="yes"/>
+      <point x="587" y="562" type="curve" smooth="yes" name="dv02"/>
       <point x="667" y="562"/>
       <point x="746" y="572"/>
       <point x="841" y="621" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0448.glif b/source/Hack-Italic.ufo/glyphs/uni0448.glif
index b5228c9e6..b07a91afd 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0448.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0448.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0448" format="1">
+<glyph name="uni0448" format="2">
   <advance width="1233"/>
   <unicode hex="0448"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0449.glif b/source/Hack-Italic.ufo/glyphs/uni0449.glif
index 62802709b..76a2a7348 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0449.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0449.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0449" format="1">
+<glyph name="uni0449" format="2">
   <advance width="1233"/>
   <unicode hex="0449"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni044A_.glif b/source/Hack-Italic.ufo/glyphs/uni044A_.glif
index 97e241777..b7a5e3475 100644
--- a/source/Hack-Italic.ufo/glyphs/uni044A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni044A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni044A" format="1">
+<glyph name="uni044A" format="2">
   <advance width="1233"/>
   <unicode hex="044A"/>
   <outline>
@@ -9,29 +9,29 @@
       <point x="139" y="1120" type="line" name="at01"/>
       <point x="571" y="1120" type="line"/>
       <point x="483" y="667" type="line"/>
-      <point x="739" y="667" type="line" name="dv02" smooth="yes"/>
+      <point x="739" y="667" type="line" smooth="yes" name="dv02"/>
       <point x="1044" y="667"/>
       <point x="1127" y="544"/>
-      <point x="1127" y="392" type="curve" name="dh02" smooth="yes"/>
+      <point x="1127" y="392" type="curve" smooth="yes" name="dh02"/>
       <point x="1127" y="312"/>
       <point x="1104" y="175"/>
       <point x="955" y="82" type="curve" smooth="yes"/>
       <point x="868" y="27"/>
       <point x="752" y="0"/>
-      <point x="609" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="609" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="169" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="631" y="153" type="line" name="sv01" smooth="yes"/>
+      <point x="631" y="153" type="line" smooth="yes" name="sv01"/>
       <point x="804" y="153"/>
       <point x="901" y="213"/>
       <point x="924" y="334" type="curve" smooth="yes"/>
       <point x="927" y="349"/>
       <point x="928" y="363"/>
-      <point x="928" y="374" type="curve" name="dh01" smooth="yes"/>
+      <point x="928" y="374" type="curve" smooth="yes" name="dh01"/>
       <point x="928" y="467"/>
       <point x="852" y="514"/>
-      <point x="701" y="514" type="curve" name="dv01" smooth="yes"/>
+      <point x="701" y="514" type="curve" smooth="yes" name="dv01"/>
       <point x="453" y="514" type="line"/>
       <point x="383" y="153" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni044B_.glif b/source/Hack-Italic.ufo/glyphs/uni044B_.glif
index 62e65572a..4c42b666d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni044B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni044B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni044B" format="1">
+<glyph name="uni044B" format="2">
   <advance width="1233"/>
   <unicode hex="044B"/>
   <outline>
@@ -7,16 +7,16 @@
       <point x="213" y="1120" type="line" name="hr00"/>
       <point x="395" y="1120" type="line"/>
       <point x="307" y="667" type="line"/>
-      <point x="398" y="667" type="line" name="dv02" smooth="yes"/>
+      <point x="398" y="667" type="line" smooth="yes" name="dv02"/>
       <point x="677" y="667"/>
       <point x="786" y="555"/>
-      <point x="786" y="408" type="curve" name="dh02" smooth="yes"/>
+      <point x="786" y="408" type="curve" smooth="yes" name="dh02"/>
       <point x="786" y="383"/>
       <point x="783" y="359"/>
       <point x="778" y="332" type="curve" smooth="yes"/>
       <point x="735" y="108"/>
       <point x="553" y="0"/>
-      <point x="268" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="268" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="-5" y="0" type="line"/>
     </contour>
     <contour>
@@ -26,16 +26,16 @@
       <point x="836" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="290" y="153" type="line" name="sv01" smooth="yes"/>
+      <point x="290" y="153" type="line" smooth="yes" name="sv01"/>
       <point x="463" y="153"/>
       <point x="560" y="213"/>
       <point x="583" y="334" type="curve" smooth="yes"/>
       <point x="586" y="349"/>
       <point x="587" y="363"/>
-      <point x="587" y="374" type="curve" name="dh01" smooth="yes"/>
+      <point x="587" y="374" type="curve" smooth="yes" name="dh01"/>
       <point x="587" y="467"/>
       <point x="511" y="514"/>
-      <point x="360" y="514" type="curve" name="dv01" smooth="yes"/>
+      <point x="360" y="514" type="curve" smooth="yes" name="dv01"/>
       <point x="277" y="514" type="line"/>
       <point x="207" y="153" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni044C_.glif b/source/Hack-Italic.ufo/glyphs/uni044C_.glif
index 433538b18..34a1833df 100644
--- a/source/Hack-Italic.ufo/glyphs/uni044C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni044C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni044C" format="1">
+<glyph name="uni044C" format="2">
   <advance width="1233"/>
   <unicode hex="044C"/>
   <outline>
@@ -7,29 +7,29 @@
       <point x="335" y="1120" type="line" name="hr00"/>
       <point x="519" y="1120" type="line"/>
       <point x="431" y="667" type="line"/>
-      <point x="687" y="667" type="line" name="dv02" smooth="yes"/>
+      <point x="687" y="667" type="line" smooth="yes" name="dv02"/>
       <point x="935" y="667"/>
       <point x="1075" y="581"/>
-      <point x="1075" y="406" type="curve" name="dh02" smooth="yes"/>
+      <point x="1075" y="406" type="curve" smooth="yes" name="dh02"/>
       <point x="1075" y="383"/>
       <point x="1073" y="359"/>
       <point x="1068" y="332" type="curve" smooth="yes"/>
       <point x="1027" y="113"/>
       <point x="851" y="0"/>
-      <point x="558" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="558" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="118" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="579" y="153" type="line" name="sv01" smooth="yes"/>
+      <point x="579" y="153" type="line" smooth="yes" name="sv01"/>
       <point x="751" y="153"/>
       <point x="847" y="209"/>
       <point x="871" y="332" type="curve" smooth="yes"/>
       <point x="874" y="347"/>
       <point x="876" y="360"/>
-      <point x="876" y="375" type="curve" name="dh01" smooth="yes"/>
+      <point x="876" y="375" type="curve" smooth="yes" name="dh01"/>
       <point x="876" y="474"/>
       <point x="791" y="514"/>
-      <point x="650" y="514" type="curve" name="dv01" smooth="yes"/>
+      <point x="650" y="514" type="curve" smooth="yes" name="dv01"/>
       <point x="402" y="514" type="line"/>
       <point x="331" y="153" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni044D_.glif b/source/Hack-Italic.ufo/glyphs/uni044D_.glif
index 1432f38f8..9a8c1cd10 100644
--- a/source/Hack-Italic.ufo/glyphs/uni044D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni044D_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni044D" format="1">
+<glyph name="uni044D" format="2">
   <advance width="1233"/>
   <unicode hex="044D"/>
   <outline>
     <contour>
-      <point x="421" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="421" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="298" y="-29"/>
       <point x="206" y="0"/>
       <point x="117" y="57" type="curve"/>
       <point x="155" y="248" type="line"/>
       <point x="224" y="167"/>
       <point x="318" y="127"/>
-      <point x="438" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="438" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="673" y="127"/>
       <point x="817" y="276"/>
       <point x="878" y="516" type="curve" name="dv02"/>
@@ -20,20 +20,20 @@
       <point x="901" y="660" type="line" name="dv03"/>
       <point x="902" y="673"/>
       <point x="902" y="685"/>
-      <point x="902" y="697" type="curve" name="dh01" smooth="yes"/>
+      <point x="902" y="697" type="curve" smooth="yes" name="dh01"/>
       <point x="902" y="845"/>
       <point x="841" y="991"/>
-      <point x="614" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="614" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="493" y="991"/>
       <point x="383" y="951"/>
       <point x="275" y="868" type="curve"/>
       <point x="313" y="1061" type="line"/>
       <point x="425" y="1117"/>
       <point x="527" y="1147"/>
-      <point x="652" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="652" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="984" y="1147"/>
       <point x="1098" y="938"/>
-      <point x="1098" y="721" type="curve" name="dh02" smooth="yes"/>
+      <point x="1098" y="721" type="curve" smooth="yes" name="dh02"/>
       <point x="1098" y="670"/>
       <point x="1092" y="618"/>
       <point x="1081" y="559" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni044E_.glif b/source/Hack-Italic.ufo/glyphs/uni044E_.glif
index 36aca4c02..6ff11cdcc 100644
--- a/source/Hack-Italic.ufo/glyphs/uni044E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni044E_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni044E" format="1">
+<glyph name="uni044E" format="2">
   <advance width="1233"/>
   <unicode hex="044E"/>
   <outline>
     <contour>
-      <point x="700" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="700" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="500" y="-29"/>
       <point x="413" y="158"/>
-      <point x="413" y="362" type="curve" name="sh01" smooth="yes"/>
+      <point x="413" y="362" type="curve" smooth="yes" name="sh01"/>
       <point x="413" y="401"/>
       <point x="416" y="441"/>
       <point x="421" y="484" type="curve" name="sh02"/>
@@ -20,10 +20,10 @@
       <point x="451" y="634" type="line" name="dv02"/>
       <point x="539" y="976"/>
       <point x="726" y="1147"/>
-      <point x="932" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="932" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1135" y="1147"/>
       <point x="1223" y="982"/>
-      <point x="1223" y="769" type="curve" name="sh04" smooth="yes"/>
+      <point x="1223" y="769" type="curve" smooth="yes" name="sh04"/>
       <point x="1223" y="631"/>
       <point x="1186" y="308"/>
       <point x="998" y="112" type="curve" smooth="yes"/>
@@ -31,22 +31,22 @@
       <point x="805" y="-29"/>
     </contour>
     <contour>
-      <point x="731" y="127" type="curve" name="hr01" smooth="yes"/>
+      <point x="731" y="127" type="curve" smooth="yes" name="hr01"/>
       <point x="847" y="127"/>
       <point x="952" y="295"/>
       <point x="1008" y="575" type="curve" smooth="yes"/>
       <point x="1022" y="644"/>
       <point x="1029" y="703"/>
-      <point x="1029" y="754" type="curve" name="ah01" smooth="yes"/>
+      <point x="1029" y="754" type="curve" smooth="yes" name="ah01"/>
       <point x="1029" y="855"/>
       <point x="1000" y="990"/>
-      <point x="905" y="990" type="curve" name="sv01" smooth="yes"/>
+      <point x="905" y="990" type="curve" smooth="yes" name="sv01"/>
       <point x="800" y="990"/>
       <point x="683" y="826"/>
       <point x="627" y="553" type="curve" smooth="yes"/>
       <point x="612" y="478"/>
       <point x="606" y="417"/>
-      <point x="606" y="365" type="curve" name="sh05" smooth="yes"/>
+      <point x="606" y="365" type="curve" smooth="yes" name="sh05"/>
       <point x="606" y="279"/>
       <point x="622" y="127"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni044F_.glif b/source/Hack-Italic.ufo/glyphs/uni044F_.glif
index aabf6ed72..4fa02b04d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni044F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni044F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni044F" format="1">
+<glyph name="uni044F" format="2">
   <advance width="1233"/>
   <unicode hex="044F"/>
   <outline>
@@ -7,13 +7,13 @@
       <point x="429" y="479" type="line" name="hr00"/>
       <point x="362" y="511"/>
       <point x="258" y="579"/>
-      <point x="258" y="708" type="curve" name="dh01" smooth="yes"/>
+      <point x="258" y="708" type="curve" smooth="yes" name="dh01"/>
       <point x="258" y="731"/>
       <point x="261" y="763"/>
       <point x="268" y="798" type="curve" smooth="yes"/>
       <point x="316" y="1027"/>
       <point x="504" y="1120"/>
-      <point x="701" y="1120" type="curve" name="at01" smooth="yes"/>
+      <point x="701" y="1120" type="curve" smooth="yes" name="at01"/>
       <point x="1098" y="1120" type="line"/>
       <point x="880" y="0" type="line" name="ab01"/>
       <point x="696" y="0" type="line"/>
@@ -31,7 +31,7 @@
       <point x="452" y="787" type="curve"/>
       <point x="449" y="768"/>
       <point x="447" y="753"/>
-      <point x="447" y="738" type="curve" name="dh02" smooth="yes"/>
+      <point x="447" y="738" type="curve" smooth="yes" name="dh02"/>
       <point x="447" y="658"/>
       <point x="514" y="605"/>
       <point x="586" y="605" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0450.glif b/source/Hack-Italic.ufo/glyphs/uni0450.glif
index 22e7dc3ba..13287676f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0450.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0450.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0450" format="1">
+<glyph name="uni0450" format="2">
   <advance width="1233"/>
   <unicode hex="0450"/>
   <outline>
@@ -10,29 +10,29 @@
       <point x="705" y="1299" type="line"/>
     </contour>
     <contour>
-      <point x="556" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="556" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="253" y="-29"/>
       <point x="98" y="122"/>
-      <point x="98" y="407" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="407" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="615"/>
       <point x="183" y="829"/>
       <point x="324" y="973" type="curve"/>
       <point x="436" y="1089"/>
       <point x="570" y="1149"/>
-      <point x="719" y="1149" type="curve" name="dv05" smooth="yes"/>
+      <point x="719" y="1149" type="curve" smooth="yes" name="dv05"/>
       <point x="964" y="1149"/>
       <point x="1126" y="983"/>
-      <point x="1126" y="731" type="curve" name="sh02" smooth="yes"/>
+      <point x="1126" y="731" type="curve" smooth="yes" name="sh02"/>
       <point x="1126" y="683"/>
       <point x="1120" y="620"/>
       <point x="1104" y="516" type="curve" name="dv03"/>
       <point x="297" y="516" type="line" name="sh04"/>
       <point x="289" y="473"/>
       <point x="285" y="441"/>
-      <point x="285" y="406" type="curve" name="sh03" smooth="yes"/>
+      <point x="285" y="406" type="curve" smooth="yes" name="sh03"/>
       <point x="285" y="229"/>
       <point x="388" y="127"/>
-      <point x="584" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="584" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="704" y="127"/>
       <point x="844" y="164"/>
       <point x="997" y="240" type="curve" name="ih02"/>
@@ -44,10 +44,10 @@
       <point x="938" y="659" type="line" name="sh06"/>
       <point x="946" y="695"/>
       <point x="948" y="716"/>
-      <point x="948" y="739" type="curve" name="ah01" smooth="yes"/>
+      <point x="948" y="739" type="curve" smooth="yes" name="ah01"/>
       <point x="948" y="897"/>
       <point x="854" y="991"/>
-      <point x="707" y="991" type="curve" name="dv04" smooth="yes"/>
+      <point x="707" y="991" type="curve" smooth="yes" name="dv04"/>
       <point x="533" y="991"/>
       <point x="391" y="860"/>
       <point x="332" y="659" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0451.glif b/source/Hack-Italic.ufo/glyphs/uni0451.glif
index 670a7d2c6..8fdf787f7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0451.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0451.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0451" format="1">
+<glyph name="uni0451" format="2">
   <advance width="1233"/>
   <unicode hex="0451"/>
   <outline>
     <contour>
-      <point x="494" y="1349" type="line" name="hr00" smooth="yes"/>
+      <point x="494" y="1349" type="line" smooth="yes" name="hr00"/>
       <point x="474" y="1349"/>
       <point x="463" y="1362"/>
       <point x="467" y="1382" type="curve" smooth="yes"/>
       <point x="495" y="1524" type="line"/>
       <point x="498" y="1542"/>
       <point x="508" y="1551"/>
-      <point x="527" y="1551" type="curve" name="dv03" smooth="yes"/>
+      <point x="527" y="1551" type="curve" smooth="yes" name="dv03"/>
       <point x="670" y="1551" type="line" smooth="yes"/>
       <point x="689" y="1551"/>
       <point x="698" y="1543"/>
@@ -25,14 +25,14 @@
       <point x="637" y="1349" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="885" y="1349" type="line" name="sv01" smooth="yes"/>
+      <point x="885" y="1349" type="line" smooth="yes" name="sv01"/>
       <point x="865" y="1349"/>
       <point x="854" y="1362"/>
       <point x="858" y="1382" type="curve" smooth="yes"/>
       <point x="886" y="1524" type="line"/>
       <point x="889" y="1542"/>
       <point x="899" y="1551"/>
-      <point x="918" y="1551" type="curve" name="sv02" smooth="yes"/>
+      <point x="918" y="1551" type="curve" smooth="yes" name="sv02"/>
       <point x="1061" y="1551" type="line" smooth="yes"/>
       <point x="1080" y="1551"/>
       <point x="1089" y="1543"/>
@@ -46,29 +46,29 @@
       <point x="1028" y="1349" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="556" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="556" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="253" y="-29"/>
       <point x="98" y="122"/>
-      <point x="98" y="407" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="407" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="615"/>
       <point x="183" y="829"/>
       <point x="324" y="973" type="curve"/>
       <point x="436" y="1089"/>
       <point x="570" y="1149"/>
-      <point x="719" y="1149" type="curve" name="dv06" smooth="yes"/>
+      <point x="719" y="1149" type="curve" smooth="yes" name="dv06"/>
       <point x="964" y="1149"/>
       <point x="1126" y="983"/>
-      <point x="1126" y="731" type="curve" name="sh02" smooth="yes"/>
+      <point x="1126" y="731" type="curve" smooth="yes" name="sh02"/>
       <point x="1126" y="683"/>
       <point x="1120" y="620"/>
       <point x="1104" y="516" type="curve" name="dv04"/>
       <point x="297" y="516" type="line" name="sh04"/>
       <point x="289" y="473"/>
       <point x="285" y="441"/>
-      <point x="285" y="406" type="curve" name="sh03" smooth="yes"/>
+      <point x="285" y="406" type="curve" smooth="yes" name="sh03"/>
       <point x="285" y="229"/>
       <point x="388" y="127"/>
-      <point x="584" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="584" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="704" y="127"/>
       <point x="844" y="164"/>
       <point x="997" y="240" type="curve" name="ih01"/>
@@ -80,10 +80,10 @@
       <point x="938" y="659" type="line" name="sh06"/>
       <point x="946" y="695"/>
       <point x="948" y="716"/>
-      <point x="948" y="739" type="curve" name="ah01" smooth="yes"/>
+      <point x="948" y="739" type="curve" smooth="yes" name="ah01"/>
       <point x="948" y="897"/>
       <point x="854" y="991"/>
-      <point x="707" y="991" type="curve" name="dv05" smooth="yes"/>
+      <point x="707" y="991" type="curve" smooth="yes" name="dv05"/>
       <point x="533" y="991"/>
       <point x="391" y="860"/>
       <point x="332" y="659" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0452.glif b/source/Hack-Italic.ufo/glyphs/uni0452.glif
index 719c7fda6..212a4b542 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0452.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0452.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0452" format="1">
+<glyph name="uni0452" format="2">
   <advance width="1233"/>
   <unicode hex="0452"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="888" y="322" type="curve" smooth="yes"/>
       <point x="895" y="362"/>
       <point x="900" y="403"/>
-      <point x="900" y="438" type="curve" name="dh01" smooth="yes"/>
+      <point x="900" y="438" type="curve" smooth="yes" name="dh01"/>
       <point x="900" y="559"/>
       <point x="842" y="615"/>
-      <point x="717" y="615" type="curve" name="dv01" smooth="yes"/>
+      <point x="717" y="615" type="curve" smooth="yes" name="dv01"/>
       <point x="529" y="615"/>
       <point x="414" y="486"/>
       <point x="370" y="261" type="curve" smooth="yes"/>
@@ -32,10 +32,10 @@
       <point x="432" y="580" type="line" name="iv01"/>
       <point x="520" y="707"/>
       <point x="647" y="775"/>
-      <point x="808" y="775" type="curve" name="dv02" smooth="yes"/>
+      <point x="808" y="775" type="curve" smooth="yes" name="dv02"/>
       <point x="1003" y="775"/>
       <point x="1098" y="676"/>
-      <point x="1098" y="488" type="curve" name="dh02" smooth="yes"/>
+      <point x="1098" y="488" type="curve" smooth="yes" name="dh02"/>
       <point x="1098" y="441"/>
       <point x="1093" y="379"/>
       <point x="1082" y="322" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0453.glif b/source/Hack-Italic.ufo/glyphs/uni0453.glif
index f2bf1c700..706785383 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0453.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0453.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0453" format="1">
+<glyph name="uni0453" format="2">
   <advance width="1233"/>
   <unicode hex="0453"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0454.glif b/source/Hack-Italic.ufo/glyphs/uni0454.glif
index 5fc5ddd9d..c07d92870 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0454.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0454.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0454" format="1">
+<glyph name="uni0454" format="2">
   <advance width="1233"/>
   <unicode hex="0454"/>
   <outline>
     <contour>
-      <point x="586" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="586" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="309" y="-29"/>
       <point x="139" y="123"/>
-      <point x="139" y="400" type="curve" name="dh01" smooth="yes"/>
+      <point x="139" y="400" type="curve" smooth="yes" name="dh01"/>
       <point x="139" y="451"/>
       <point x="144" y="504"/>
       <point x="155" y="559" type="curve" smooth="yes"/>
       <point x="227" y="935"/>
       <point x="486" y="1147"/>
-      <point x="817" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="817" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="926" y="1147"/>
       <point x="1019" y="1125"/>
       <point x="1119" y="1061" type="curve"/>
       <point x="1081" y="868" type="line"/>
       <point x="1000" y="957"/>
       <point x="911" y="991"/>
-      <point x="796" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="796" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="553" y="991"/>
       <point x="433" y="837"/>
       <point x="375" y="659" type="curve" name="dv03"/>
@@ -29,10 +29,10 @@
       <point x="342" y="516" type="line" name="dv02"/>
       <point x="337" y="483"/>
       <point x="335" y="452"/>
-      <point x="335" y="421" type="curve" name="dh02" smooth="yes"/>
+      <point x="335" y="421" type="curve" smooth="yes" name="dh02"/>
       <point x="335" y="241"/>
       <point x="424" y="127"/>
-      <point x="629" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="629" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="749" y="127"/>
       <point x="858" y="164"/>
       <point x="961" y="248" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0455.glif b/source/Hack-Italic.ufo/glyphs/uni0455.glif
index cc499ae4e..ee2eaf5e3 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0455.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0455.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0455" format="1">
+<glyph name="uni0455" format="2">
   <advance width="1233"/>
   <unicode hex="0455"/>
   <outline>
     <contour>
-      <point x="476" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="476" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="360" y="-29"/>
       <point x="248" y="-6"/>
       <point x="115" y="41" type="curve"/>
       <point x="152" y="231" type="line"/>
       <point x="277" y="160"/>
       <point x="394" y="125"/>
-      <point x="505" y="125" type="curve" name="dv01" smooth="yes"/>
+      <point x="505" y="125" type="curve" smooth="yes" name="dv01"/>
       <point x="684" y="125"/>
       <point x="807" y="217"/>
-      <point x="807" y="325" type="curve" name="ah01" smooth="yes"/>
+      <point x="807" y="325" type="curve" smooth="yes" name="ah01"/>
       <point x="807" y="401"/>
       <point x="742" y="455"/>
       <point x="611" y="487" type="curve" smooth="yes"/>
@@ -22,20 +22,20 @@
       <point x="516" y="512" type="line" smooth="yes"/>
       <point x="345" y="557"/>
       <point x="266" y="634"/>
-      <point x="266" y="778" type="curve" name="sh01" smooth="yes"/>
+      <point x="266" y="778" type="curve" smooth="yes" name="sh01"/>
       <point x="266" y="1002"/>
       <point x="454" y="1147"/>
-      <point x="754" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="754" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="872" y="1147"/>
       <point x="980" y="1125"/>
       <point x="1077" y="1081" type="curve"/>
       <point x="1042" y="901" type="line"/>
       <point x="946" y="961"/>
       <point x="844" y="993"/>
-      <point x="731" y="993" type="curve" name="sv01" smooth="yes"/>
+      <point x="731" y="993" type="curve" smooth="yes" name="sv01"/>
       <point x="554" y="993"/>
       <point x="449" y="914"/>
-      <point x="449" y="810" type="curve" name="sh02" smooth="yes"/>
+      <point x="449" y="810" type="curve" smooth="yes" name="sh02"/>
       <point x="449" y="734"/>
       <point x="506" y="687"/>
       <point x="670" y="645" type="curve" smooth="yes"/>
@@ -45,7 +45,7 @@
       <point x="764" y="621" type="line" smooth="yes"/>
       <point x="924" y="581"/>
       <point x="997" y="498"/>
-      <point x="997" y="365" type="curve" name="sh03" smooth="yes"/>
+      <point x="997" y="365" type="curve" smooth="yes" name="sh03"/>
       <point x="997" y="141"/>
       <point x="788" y="-29"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0456.glif b/source/Hack-Italic.ufo/glyphs/uni0456.glif
index 9819363a4..463b18562 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0456.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0456.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0456" format="1">
+<glyph name="uni0456" format="2">
   <advance width="1233"/>
   <unicode hex="0456"/>
   <outline>
     <contour>
-      <point x="627" y="1323" type="line" name="hr00" smooth="yes"/>
+      <point x="627" y="1323" type="line" smooth="yes" name="hr00"/>
       <point x="607" y="1323"/>
       <point x="596" y="1336"/>
       <point x="600" y="1356" type="curve" smooth="yes"/>
       <point x="634" y="1529" type="line"/>
       <point x="637" y="1547"/>
       <point x="647" y="1556"/>
-      <point x="666" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="666" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="790" y="1556" type="line" smooth="yes"/>
       <point x="810" y="1556"/>
       <point x="821" y="1543"/>
@@ -22,13 +22,13 @@
       <point x="751" y="1323" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="749" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="749" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="633" y="-8"/>
       <point x="547" y="13"/>
       <point x="492" y="56" type="curve" smooth="yes"/>
       <point x="435" y="99"/>
       <point x="407" y="163"/>
-      <point x="407" y="248" type="curve" name="dh01" smooth="yes"/>
+      <point x="407" y="248" type="curve" smooth="yes" name="dh01"/>
       <point x="407" y="289"/>
       <point x="412" y="344"/>
       <point x="426" y="404" type="curve" smooth="yes"/>
@@ -42,13 +42,13 @@
       <point x="600" y="338" type="curve" smooth="yes"/>
       <point x="597" y="317"/>
       <point x="596" y="306"/>
-      <point x="596" y="293" type="curve" name="dh02" smooth="yes"/>
+      <point x="596" y="293" type="curve" smooth="yes" name="dh02"/>
       <point x="596" y="244"/>
       <point x="611" y="207"/>
       <point x="640" y="184" type="curve" smooth="yes"/>
       <point x="670" y="160"/>
       <point x="715" y="148"/>
-      <point x="776" y="148" type="curve" name="sv02" smooth="yes"/>
+      <point x="776" y="148" type="curve" smooth="yes" name="sv02"/>
       <point x="987" y="148" type="line"/>
       <point x="956" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0457.glif b/source/Hack-Italic.ufo/glyphs/uni0457.glif
index e1ed00bfc..7885fc4b4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0457.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0457.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0457" format="1">
+<glyph name="uni0457" format="2">
   <advance width="1233"/>
   <unicode hex="0457"/>
   <outline>
     <contour>
-      <point x="360" y="1350" type="line" name="hr00" smooth="yes"/>
+      <point x="360" y="1350" type="line" smooth="yes" name="hr00"/>
       <point x="340" y="1350"/>
       <point x="329" y="1363"/>
       <point x="333" y="1383" type="curve" smooth="yes"/>
       <point x="361" y="1525" type="line"/>
       <point x="364" y="1543"/>
       <point x="374" y="1552"/>
-      <point x="393" y="1552" type="curve" name="dv01" smooth="yes"/>
+      <point x="393" y="1552" type="curve" smooth="yes" name="dv01"/>
       <point x="536" y="1552" type="line" smooth="yes"/>
       <point x="556" y="1552"/>
       <point x="567" y="1539"/>
@@ -22,14 +22,14 @@
       <point x="503" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="751" y="1350" type="line" name="sv01" smooth="yes"/>
+      <point x="751" y="1350" type="line" smooth="yes" name="sv01"/>
       <point x="731" y="1350"/>
       <point x="720" y="1363"/>
       <point x="724" y="1383" type="curve" smooth="yes"/>
       <point x="752" y="1525" type="line"/>
       <point x="755" y="1543"/>
       <point x="765" y="1552"/>
-      <point x="784" y="1552" type="curve" name="sv02" smooth="yes"/>
+      <point x="784" y="1552" type="curve" smooth="yes" name="sv02"/>
       <point x="927" y="1552" type="line" smooth="yes"/>
       <point x="947" y="1552"/>
       <point x="958" y="1539"/>
@@ -40,13 +40,13 @@
       <point x="894" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="749" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="749" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="633" y="-8"/>
       <point x="547" y="13"/>
       <point x="492" y="56" type="curve" smooth="yes"/>
       <point x="435" y="99"/>
       <point x="407" y="163"/>
-      <point x="407" y="248" type="curve" name="dh01" smooth="yes"/>
+      <point x="407" y="248" type="curve" smooth="yes" name="dh01"/>
       <point x="407" y="289"/>
       <point x="412" y="344"/>
       <point x="426" y="404" type="curve" smooth="yes"/>
@@ -60,13 +60,13 @@
       <point x="600" y="338" type="curve" smooth="yes"/>
       <point x="597" y="317"/>
       <point x="596" y="306"/>
-      <point x="596" y="293" type="curve" name="dh02" smooth="yes"/>
+      <point x="596" y="293" type="curve" smooth="yes" name="dh02"/>
       <point x="596" y="244"/>
       <point x="611" y="207"/>
       <point x="640" y="184" type="curve" smooth="yes"/>
       <point x="670" y="160"/>
       <point x="715" y="148"/>
-      <point x="776" y="148" type="curve" name="sv04" smooth="yes"/>
+      <point x="776" y="148" type="curve" smooth="yes" name="sv04"/>
       <point x="987" y="148" type="line"/>
       <point x="956" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0458.glif b/source/Hack-Italic.ufo/glyphs/uni0458.glif
index 756259570..5f7c50c41 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0458.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0458.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0458" format="1">
+<glyph name="uni0458" format="2">
   <advance width="1233"/>
   <unicode hex="0458"/>
   <outline>
@@ -11,7 +11,7 @@
     </contour>
     <contour>
       <point x="55" y="-270" type="line"/>
-      <point x="288" y="-270" type="line" name="dv02" smooth="yes"/>
+      <point x="288" y="-270" type="line" smooth="yes" name="dv02"/>
       <point x="417" y="-270"/>
       <point x="485" y="-192"/>
       <point x="518" y="-20" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="702" y="-20" type="line" smooth="yes"/>
       <point x="646" y="-304"/>
       <point x="519" y="-426"/>
-      <point x="278" y="-426" type="curve" name="dv01" smooth="yes"/>
+      <point x="278" y="-426" type="curve" smooth="yes" name="dv01"/>
       <point x="24" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0459.glif b/source/Hack-Italic.ufo/glyphs/uni0459.glif
index 925ab11fc..73c042bf4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0459.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0459.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0459" format="1">
+<glyph name="uni0459" format="2">
   <advance width="1233"/>
   <unicode hex="0459"/>
   <outline>
@@ -18,13 +18,13 @@
       <point x="851" y="667" type="line" smooth="yes"/>
       <point x="1071" y="667"/>
       <point x="1191" y="560"/>
-      <point x="1191" y="389" type="curve" name="dh02" smooth="yes"/>
+      <point x="1191" y="389" type="curve" smooth="yes" name="dh02"/>
       <point x="1191" y="321"/>
       <point x="1172" y="181"/>
       <point x="1017" y="82" type="curve" smooth="yes"/>
       <point x="930" y="26"/>
       <point x="828" y="0"/>
-      <point x="721" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="721" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="532" y="0" type="line"/>
       <point x="721" y="970" type="line" name="sv01"/>
       <point x="492" y="970" type="line"/>
@@ -34,20 +34,20 @@
       <point x="215" y="105" type="curve" smooth="yes"/>
       <point x="150" y="35"/>
       <point x="73" y="0"/>
-      <point x="-61" y="0" type="curve" name="ab02" smooth="yes"/>
+      <point x="-61" y="0" type="curve" smooth="yes" name="ab02"/>
       <point x="-100" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="743" y="153" type="line" name="sv02" smooth="yes"/>
+      <point x="743" y="153" type="line" smooth="yes" name="sv02"/>
       <point x="882" y="153"/>
       <point x="958" y="188"/>
       <point x="971" y="257" type="curve" smooth="yes"/>
       <point x="984" y="326"/>
       <point x="991" y="363"/>
-      <point x="991" y="390" type="curve" name="dh01" smooth="yes"/>
+      <point x="991" y="390" type="curve" smooth="yes" name="dh01"/>
       <point x="991" y="467"/>
       <point x="933" y="514"/>
-      <point x="813" y="514" type="curve" name="dv01" smooth="yes"/>
+      <point x="813" y="514" type="curve" smooth="yes" name="dv01"/>
       <point x="800" y="514" type="line"/>
       <point x="730" y="153" type="line" name="sv03"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni045A_.glif b/source/Hack-Italic.ufo/glyphs/uni045A_.glif
index 5f9a14e05..05c6841ba 100644
--- a/source/Hack-Italic.ufo/glyphs/uni045A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni045A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni045A" format="1">
+<glyph name="uni045A" format="2">
   <advance width="1233"/>
   <unicode hex="045A"/>
   <outline>
@@ -14,13 +14,13 @@
       <point x="850" y="667" type="line" smooth="yes"/>
       <point x="1071" y="667"/>
       <point x="1189" y="559"/>
-      <point x="1189" y="388" type="curve" name="dh02" smooth="yes"/>
+      <point x="1189" y="388" type="curve" smooth="yes" name="dh02"/>
       <point x="1189" y="322"/>
       <point x="1170" y="180"/>
       <point x="1016" y="82" type="curve" smooth="yes"/>
       <point x="929" y="26"/>
       <point x="827" y="0"/>
-      <point x="720" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="720" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="531" y="0" type="line"/>
       <point x="631" y="515" type="line" name="dv01"/>
       <point x="267" y="515" type="line"/>
@@ -28,16 +28,16 @@
       <point x="-1" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="742" y="153" type="line" name="sv02" smooth="yes"/>
+      <point x="742" y="153" type="line" smooth="yes" name="sv02"/>
       <point x="879" y="153"/>
       <point x="962" y="210"/>
       <point x="985" y="334" type="curve" smooth="yes"/>
       <point x="988" y="351"/>
       <point x="990" y="366"/>
-      <point x="990" y="382" type="curve" name="dh01" smooth="yes"/>
+      <point x="990" y="382" type="curve" smooth="yes" name="dh01"/>
       <point x="990" y="470"/>
       <point x="931" y="514"/>
-      <point x="812" y="514" type="curve" name="sv03" smooth="yes"/>
+      <point x="812" y="514" type="curve" smooth="yes" name="sv03"/>
       <point x="799" y="514" type="line"/>
       <point x="729" y="153" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni045B_.glif b/source/Hack-Italic.ufo/glyphs/uni045B_.glif
index 6b3757c9c..8d8e6ec65 100644
--- a/source/Hack-Italic.ufo/glyphs/uni045B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni045B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni045B" format="1">
+<glyph name="uni045B" format="2">
   <advance width="1233"/>
   <unicode hex="045B"/>
   <outline>
@@ -17,10 +17,10 @@
       <point x="412" y="580" type="line" name="iv01"/>
       <point x="503" y="710"/>
       <point x="625" y="775"/>
-      <point x="780" y="775" type="curve" name="dv02" smooth="yes"/>
+      <point x="780" y="775" type="curve" smooth="yes" name="dv02"/>
       <point x="965" y="775"/>
       <point x="1052" y="681"/>
-      <point x="1052" y="488" type="curve" name="dh02" smooth="yes"/>
+      <point x="1052" y="488" type="curve" smooth="yes" name="dh02"/>
       <point x="1052" y="433"/>
       <point x="1045" y="383"/>
       <point x="1033" y="322" type="curve" smooth="yes"/>
@@ -29,10 +29,10 @@
       <point x="848" y="322" type="line" smooth="yes"/>
       <point x="857" y="365"/>
       <point x="861" y="403"/>
-      <point x="861" y="434" type="curve" name="dh01" smooth="yes"/>
+      <point x="861" y="434" type="curve" smooth="yes" name="dh01"/>
       <point x="861" y="555"/>
       <point x="803" y="615"/>
-      <point x="686" y="615" type="curve" name="dv01" smooth="yes"/>
+      <point x="686" y="615" type="curve" smooth="yes" name="dv01"/>
       <point x="511" y="615"/>
       <point x="394" y="489"/>
       <point x="350" y="261" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni045C_.glif b/source/Hack-Italic.ufo/glyphs/uni045C_.glif
index c3dc85056..a314de5a6 100644
--- a/source/Hack-Italic.ufo/glyphs/uni045C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni045C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni045C" format="1">
+<glyph name="uni045C" format="2">
   <advance width="1233"/>
   <unicode hex="045C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni045D_.glif b/source/Hack-Italic.ufo/glyphs/uni045D_.glif
index d14952240..8b22899d2 100644
--- a/source/Hack-Italic.ufo/glyphs/uni045D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni045D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni045D" format="1">
+<glyph name="uni045D" format="2">
   <advance width="1233"/>
   <unicode hex="045D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni045E_.glif b/source/Hack-Italic.ufo/glyphs/uni045E_.glif
index fff9b3ce7..2549baec0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni045E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni045E_.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni045E" format="1">
+<glyph name="uni045E" format="2">
   <advance width="1233"/>
   <unicode hex="045E"/>
   <outline>
     <contour>
-      <point x="777" y="1261" type="curve" name="dv03" smooth="yes"/>
+      <point x="777" y="1261" type="curve" smooth="yes" name="dv03"/>
       <point x="598" y="1261"/>
       <point x="499" y="1350"/>
-      <point x="499" y="1507" type="curve" name="dh01" smooth="yes"/>
+      <point x="499" y="1507" type="curve" smooth="yes" name="dh01"/>
       <point x="499" y="1530"/>
       <point x="499" y="1537"/>
       <point x="502" y="1548" type="curve"/>
       <point x="622" y="1548" type="line" name="sv01"/>
-      <point x="622" y="1531" type="line" name="dh02" smooth="yes"/>
+      <point x="622" y="1531" type="line" smooth="yes" name="dh02"/>
       <point x="622" y="1443"/>
       <point x="682" y="1398"/>
-      <point x="791" y="1398" type="curve" name="dv04" smooth="yes"/>
+      <point x="791" y="1398" type="curve" smooth="yes" name="dv04"/>
       <point x="904" y="1398"/>
       <point x="970" y="1448"/>
       <point x="1009" y="1548" type="curve" name="sv02"/>
@@ -25,7 +25,7 @@
     </contour>
     <contour>
       <point x="20" y="-272" type="line"/>
-      <point x="128" y="-272" type="line" name="dv02" smooth="yes"/>
+      <point x="128" y="-272" type="line" smooth="yes" name="dv02"/>
       <point x="239" y="-272"/>
       <point x="313" y="-208"/>
       <point x="386" y="-66" type="curve" smooth="yes"/>
@@ -35,16 +35,16 @@
       <point x="567" y="258" type="line" name="ih01"/>
       <point x="1050" y="1120" type="line" name="at02"/>
       <point x="1255" y="1120" type="line"/>
-      <point x="816" y="360" type="line" name="hr01" smooth="yes"/>
+      <point x="816" y="360" type="line" smooth="yes" name="hr01"/>
       <point x="750" y="246"/>
       <point x="681" y="123"/>
       <point x="651" y="72" type="curve" smooth="yes"/>
       <point x="546" y="-112"/>
       <point x="483" y="-220"/>
-      <point x="442" y="-276" type="curve" name="hr02" smooth="yes"/>
+      <point x="442" y="-276" type="curve" smooth="yes" name="hr02"/>
       <point x="362" y="-381"/>
       <point x="260" y="-426"/>
-      <point x="139" y="-426" type="curve" name="dv01" smooth="yes"/>
+      <point x="139" y="-426" type="curve" smooth="yes" name="dv01"/>
       <point x="-9" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni045F_.glif b/source/Hack-Italic.ufo/glyphs/uni045F_.glif
index 285372988..c400f35f3 100644
--- a/source/Hack-Italic.ufo/glyphs/uni045F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni045F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni045F" format="1">
+<glyph name="uni045F" format="2">
   <advance width="1233"/>
   <unicode hex="045F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0462.glif b/source/Hack-Italic.ufo/glyphs/uni0462.glif
index 72966fa22..9b94c2dd2 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0462.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0462.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0462" format="1">
+<glyph name="uni0462" format="2">
   <advance width="1233"/>
   <unicode hex="0462"/>
   <outline>
@@ -15,29 +15,29 @@
       <point x="934" y="1105" type="line" name="sv04"/>
       <point x="565" y="1105" type="line" name="sv05"/>
       <point x="523" y="893" type="line"/>
-      <point x="661" y="893" type="line" name="dv02" smooth="yes"/>
+      <point x="661" y="893" type="line" smooth="yes" name="dv02"/>
       <point x="952" y="893"/>
       <point x="1095" y="778"/>
-      <point x="1095" y="563" type="curve" name="dh01" smooth="yes"/>
+      <point x="1095" y="563" type="curve" smooth="yes" name="dh01"/>
       <point x="1095" y="527"/>
       <point x="1091" y="488"/>
       <point x="1083" y="446" type="curve" smooth="yes"/>
       <point x="1024" y="146"/>
       <point x="814" y="0"/>
-      <point x="488" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="488" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="148" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="520" y="166" type="line" name="hr01" smooth="yes"/>
+      <point x="520" y="166" type="line" smooth="yes" name="hr01"/>
       <point x="703" y="166"/>
       <point x="838" y="266"/>
       <point x="872" y="446" type="curve" smooth="yes"/>
       <point x="877" y="469"/>
       <point x="879" y="492"/>
-      <point x="879" y="515" type="curve" name="hr02" smooth="yes"/>
+      <point x="879" y="515" type="curve" smooth="yes" name="hr02"/>
       <point x="879" y="652"/>
       <point x="789" y="727"/>
-      <point x="629" y="727" type="curve" name="dv01" smooth="yes"/>
+      <point x="629" y="727" type="curve" smooth="yes" name="dv01"/>
       <point x="491" y="727" type="line"/>
       <point x="382" y="166" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0463.glif b/source/Hack-Italic.ufo/glyphs/uni0463.glif
index 8a9762fd5..67288512f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0463.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0463.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0463" format="1">
+<glyph name="uni0463" format="2">
   <advance width="1233"/>
   <unicode hex="0463"/>
   <outline>
@@ -15,29 +15,29 @@
       <point x="962" y="973" type="line" name="sv02"/>
       <point x="537" y="973" type="line" name="sv03"/>
       <point x="478" y="667" type="line"/>
-      <point x="734" y="667" type="line" name="dv02" smooth="yes"/>
+      <point x="734" y="667" type="line" smooth="yes" name="dv02"/>
       <point x="982" y="667"/>
       <point x="1122" y="581"/>
-      <point x="1122" y="406" type="curve" name="dh02" smooth="yes"/>
+      <point x="1122" y="406" type="curve" smooth="yes" name="dh02"/>
       <point x="1122" y="383"/>
       <point x="1120" y="359"/>
       <point x="1115" y="332" type="curve" smooth="yes"/>
       <point x="1072" y="111"/>
       <point x="891" y="0"/>
-      <point x="604" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="604" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="164" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="626" y="156" type="line" name="sv04" smooth="yes"/>
+      <point x="626" y="156" type="line" smooth="yes" name="sv04"/>
       <point x="797" y="156"/>
       <point x="896" y="217"/>
       <point x="919" y="334" type="curve" smooth="yes"/>
       <point x="922" y="347"/>
       <point x="923" y="359"/>
-      <point x="923" y="371" type="curve" name="dh01" smooth="yes"/>
+      <point x="923" y="371" type="curve" smooth="yes" name="dh01"/>
       <point x="923" y="467"/>
       <point x="841" y="514"/>
-      <point x="696" y="514" type="curve" name="dv01" smooth="yes"/>
+      <point x="696" y="514" type="curve" smooth="yes" name="dv01"/>
       <point x="448" y="514" type="line"/>
       <point x="378" y="156" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0472.glif b/source/Hack-Italic.ufo/glyphs/uni0472.glif
index 272169c83..411075395 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0472.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0472.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0472" format="1">
+<glyph name="uni0472" format="2">
   <advance width="1233"/>
   <unicode hex="0472"/>
   <outline>
     <contour>
-      <point x="465" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="465" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="210" y="-29"/>
       <point x="81" y="116"/>
-      <point x="81" y="421" type="curve" name="sh01" smooth="yes"/>
+      <point x="81" y="421" type="curve" smooth="yes" name="sh01"/>
       <point x="81" y="514"/>
       <point x="93" y="622"/>
       <point x="117" y="745" type="curve" smooth="yes"/>
       <point x="217" y="1258"/>
       <point x="424" y="1520"/>
-      <point x="767" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="767" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1028" y="1520"/>
       <point x="1152" y="1369"/>
-      <point x="1152" y="1068" type="curve" name="sh02" smooth="yes"/>
+      <point x="1152" y="1068" type="curve" smooth="yes" name="sh02"/>
       <point x="1152" y="975"/>
       <point x="1140" y="867"/>
       <point x="1116" y="745" type="curve" smooth="yes"/>
@@ -27,23 +27,23 @@
       <point x="920" y="828" type="line" name="dv03"/>
       <point x="936" y="925"/>
       <point x="945" y="1007"/>
-      <point x="945" y="1078" type="curve" name="ah01" smooth="yes"/>
+      <point x="945" y="1078" type="curve" smooth="yes" name="ah01"/>
       <point x="945" y="1265"/>
       <point x="884" y="1356"/>
-      <point x="735" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="735" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="531" y="1356"/>
       <point x="425" y="1180"/>
       <point x="345" y="828" type="curve"/>
     </contour>
     <contour>
-      <point x="498" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="498" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="702" y="135"/>
       <point x="807" y="309"/>
       <point x="884" y="644" type="curve" name="dv02"/>
       <point x="310" y="644" type="line"/>
       <point x="295" y="556"/>
       <point x="288" y="479"/>
-      <point x="288" y="412" type="curve" name="sh03" smooth="yes"/>
+      <point x="288" y="412" type="curve" smooth="yes" name="sh03"/>
       <point x="288" y="232"/>
       <point x="346" y="135"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0473.glif b/source/Hack-Italic.ufo/glyphs/uni0473.glif
index 1289b82a6..702bdd399 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0473.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0473.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0473" format="1">
+<glyph name="uni0473" format="2">
   <advance width="1233"/>
   <unicode hex="0473"/>
   <outline>
     <contour>
-      <point x="502" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="502" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="246" y="-29"/>
       <point x="116" y="108"/>
-      <point x="116" y="364" type="curve" name="sh01" smooth="yes"/>
+      <point x="116" y="364" type="curve" smooth="yes" name="sh01"/>
       <point x="116" y="423"/>
       <point x="123" y="488"/>
       <point x="137" y="559" type="curve" smooth="yes"/>
@@ -16,10 +16,10 @@
       <point x="345" y="996" type="curve" smooth="yes"/>
       <point x="452" y="1101"/>
       <point x="580" y="1147"/>
-      <point x="729" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="729" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="986" y="1147"/>
       <point x="1117" y="1012"/>
-      <point x="1117" y="753" type="curve" name="sh02" smooth="yes"/>
+      <point x="1117" y="753" type="curve" smooth="yes" name="sh02"/>
       <point x="1117" y="694"/>
       <point x="1110" y="630"/>
       <point x="1096" y="559" type="curve" smooth="yes"/>
@@ -30,23 +30,23 @@
       <point x="910" y="611" type="line" name="sh03"/>
       <point x="917" y="654"/>
       <point x="920" y="694"/>
-      <point x="920" y="731" type="curve" name="ah01" smooth="yes"/>
+      <point x="920" y="731" type="curve" smooth="yes" name="ah01"/>
       <point x="920" y="894"/>
       <point x="853" y="991"/>
-      <point x="700" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="700" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="513" y="991"/>
       <point x="399" y="846"/>
       <point x="343" y="611" type="curve"/>
     </contour>
     <contour>
-      <point x="532" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="532" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="720" y="127"/>
       <point x="819" y="270"/>
       <point x="873" y="447" type="curve" name="dv02"/>
       <point x="316" y="447" type="line" name="sh05"/>
       <point x="314" y="426"/>
       <point x="313" y="406"/>
-      <point x="313" y="387" type="curve" name="sh04" smooth="yes"/>
+      <point x="313" y="387" type="curve" smooth="yes" name="sh04"/>
       <point x="313" y="239"/>
       <point x="367" y="127"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0490.glif b/source/Hack-Italic.ufo/glyphs/uni0490.glif
index f70f9a0cd..8fd6d6a8e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0490.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0490.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0490" format="1">
+<glyph name="uni0490" format="2">
   <advance width="1233"/>
   <unicode hex="0490"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0491.glif b/source/Hack-Italic.ufo/glyphs/uni0491.glif
index 556420791..689cccb39 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0491.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0491.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0491" format="1">
+<glyph name="uni0491" format="2">
   <advance width="1233"/>
   <unicode hex="0491"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0492.glif b/source/Hack-Italic.ufo/glyphs/uni0492.glif
index a9d23b6c4..e12aec26f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0492.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0492.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0492" format="1">
+<glyph name="uni0492" format="2">
   <advance width="1233"/>
   <unicode hex="0492"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0493.glif b/source/Hack-Italic.ufo/glyphs/uni0493.glif
index 3cda583ce..5f0356ded 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0493.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0493.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0493" format="1">
+<glyph name="uni0493" format="2">
   <advance width="1233"/>
   <unicode hex="0493"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0494.glif b/source/Hack-Italic.ufo/glyphs/uni0494.glif
index e82c6d81d..39f4703a4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0494.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0494.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0494" format="1">
+<glyph name="uni0494" format="2">
   <advance width="1233"/>
   <unicode hex="0494"/>
   <outline>
     <contour>
       <point x="402" y="-240" type="line" name="hr00"/>
-      <point x="464" y="-240" type="line" name="dv02" smooth="yes"/>
+      <point x="464" y="-240" type="line" smooth="yes" name="dv02"/>
       <point x="638" y="-240"/>
       <point x="725" y="-160"/>
       <point x="776" y="104" type="curve" smooth="yes"/>
       <point x="832" y="394" type="line" smooth="yes"/>
       <point x="840" y="436"/>
       <point x="844" y="474"/>
-      <point x="844" y="508" type="curve" name="dh01" smooth="yes"/>
+      <point x="844" y="508" type="curve" smooth="yes" name="dh01"/>
       <point x="844" y="643"/>
       <point x="778" y="711"/>
-      <point x="646" y="711" type="curve" name="dv03" smooth="yes"/>
+      <point x="646" y="711" type="curve" smooth="yes" name="dv03"/>
       <point x="376" y="711" type="line"/>
       <point x="238" y="0" type="line" name="ab01"/>
       <point x="35" y="0" type="line"/>
@@ -24,20 +24,20 @@
       <point x="1216" y="1323" type="line" name="sv01"/>
       <point x="495" y="1323" type="line"/>
       <point x="409" y="881" type="line"/>
-      <point x="720" y="881" type="line" name="dv04" smooth="yes"/>
+      <point x="720" y="881" type="line" smooth="yes" name="dv04"/>
       <point x="845" y="881"/>
       <point x="939" y="839"/>
       <point x="996" y="762" type="curve" smooth="yes"/>
       <point x="1035" y="709"/>
       <point x="1055" y="640"/>
-      <point x="1055" y="557" type="curve" name="dh02" smooth="yes"/>
+      <point x="1055" y="557" type="curve" smooth="yes" name="dh02"/>
       <point x="1055" y="512"/>
       <point x="1050" y="463"/>
       <point x="1039" y="410" type="curve" smooth="yes"/>
       <point x="979" y="104" type="line" smooth="yes"/>
       <point x="907" y="-260"/>
       <point x="744" y="-410"/>
-      <point x="445" y="-410" type="curve" name="dv01" smooth="yes"/>
+      <point x="445" y="-410" type="curve" smooth="yes" name="dv01"/>
       <point x="369" y="-410" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0495.glif b/source/Hack-Italic.ufo/glyphs/uni0495.glif
index c81afbfed..9df2948dc 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0495.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0495.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0495" format="1">
+<glyph name="uni0495" format="2">
   <advance width="1233"/>
   <unicode hex="0495"/>
   <outline>
     <contour>
       <point x="378" y="-270" type="line" name="hr00"/>
-      <point x="550" y="-270" type="line" name="dv02" smooth="yes"/>
+      <point x="550" y="-270" type="line" smooth="yes" name="dv02"/>
       <point x="703" y="-270"/>
       <point x="742" y="-212"/>
       <point x="779" y="-20" type="curve" smooth="yes"/>
       <point x="831" y="244" type="line" smooth="yes"/>
       <point x="842" y="300"/>
       <point x="848" y="341"/>
-      <point x="848" y="376" type="curve" name="dh01" smooth="yes"/>
+      <point x="848" y="376" type="curve" smooth="yes" name="dh01"/>
       <point x="848" y="477"/>
       <point x="792" y="487"/>
-      <point x="657" y="487" type="curve" name="dv03" smooth="yes"/>
+      <point x="657" y="487" type="curve" smooth="yes" name="dv03"/>
       <point x="397" y="487" type="line"/>
       <point x="302" y="0" type="line" name="ab01"/>
       <point x="118" y="0" type="line"/>
@@ -24,17 +24,17 @@
       <point x="1052" y="936" type="line" name="sv01"/>
       <point x="484" y="936" type="line"/>
       <point x="425" y="631" type="line"/>
-      <point x="675" y="631" type="line" name="dv04" smooth="yes"/>
+      <point x="675" y="631" type="line" smooth="yes" name="dv04"/>
       <point x="946" y="631"/>
       <point x="1037" y="583"/>
-      <point x="1037" y="423" type="curve" name="dh02" smooth="yes"/>
+      <point x="1037" y="423" type="curve" smooth="yes" name="dh02"/>
       <point x="1037" y="375"/>
       <point x="1029" y="318"/>
       <point x="1016" y="250" type="curve" smooth="yes"/>
       <point x="963" y="-20" type="line"/>
       <point x="907" y="-313"/>
       <point x="775" y="-426"/>
-      <point x="540" y="-426" type="curve" name="dv01" smooth="yes"/>
+      <point x="540" y="-426" type="curve" smooth="yes" name="dv01"/>
       <point x="347" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0496.glif b/source/Hack-Italic.ufo/glyphs/uni0496.glif
index 1e7fc5e18..d70e99b2b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0496.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0496.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0496" format="1">
+<glyph name="uni0496" format="2">
   <advance width="1233"/>
   <unicode hex="0496"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0497.glif b/source/Hack-Italic.ufo/glyphs/uni0497.glif
index 70874e4fd..a6398aa88 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0497.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0497.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0497" format="1">
+<glyph name="uni0497" format="2">
   <advance width="1233"/>
   <unicode hex="0497"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0498.glif b/source/Hack-Italic.ufo/glyphs/uni0498.glif
index f8fb889a9..179a5e24d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0498.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0498.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0498" format="1">
+<glyph name="uni0498" format="2">
   <advance width="1233"/>
   <unicode hex="0498"/>
   <outline>
@@ -7,26 +7,26 @@
       <point x="762" y="799" type="curve" name="ih01"/>
       <point x="911" y="771"/>
       <point x="1004" y="667"/>
-      <point x="1004" y="480" type="curve" name="dh04" smooth="yes"/>
+      <point x="1004" y="480" type="curve" smooth="yes" name="dh04"/>
       <point x="1004" y="211"/>
       <point x="809" y="14"/>
       <point x="495" y="-23" type="curve" name="ih02"/>
       <point x="538" y="-99"/>
       <point x="554" y="-149"/>
-      <point x="554" y="-198" type="curve" name="dh02" smooth="yes"/>
+      <point x="554" y="-198" type="curve" smooth="yes" name="dh02"/>
       <point x="554" y="-314"/>
       <point x="453" y="-395"/>
-      <point x="293" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="293" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="236" y="-395"/>
       <point x="173" y="-385"/>
       <point x="109" y="-365" type="curve"/>
       <point x="134" y="-236" type="line"/>
       <point x="187" y="-261"/>
       <point x="235" y="-274"/>
-      <point x="282" y="-274" type="curve" name="dv02" smooth="yes"/>
+      <point x="282" y="-274" type="curve" smooth="yes" name="dv02"/>
       <point x="369" y="-274"/>
       <point x="421" y="-230"/>
-      <point x="421" y="-162" type="curve" name="dh01" smooth="yes"/>
+      <point x="421" y="-162" type="curve" smooth="yes" name="dh01"/>
       <point x="421" y="-127"/>
       <point x="407" y="-86"/>
       <point x="378" y="-29" type="curve" name="dv03"/>
@@ -36,32 +36,32 @@
       <point x="20" y="246" type="line" name="hr01"/>
       <point x="141" y="177"/>
       <point x="268" y="141"/>
-      <point x="396" y="141" type="curve" name="dv04" smooth="yes"/>
+      <point x="396" y="141" type="curve" smooth="yes" name="dv04"/>
       <point x="644" y="141"/>
       <point x="805" y="278"/>
-      <point x="805" y="478" type="curve" name="dh03" smooth="yes"/>
+      <point x="805" y="478" type="curve" smooth="yes" name="dh03"/>
       <point x="805" y="634"/>
       <point x="709" y="715"/>
-      <point x="524" y="715" type="curve" name="dv05" smooth="yes"/>
+      <point x="524" y="715" type="curve" smooth="yes" name="dv05"/>
       <point x="371" y="715" type="line"/>
       <point x="403" y="881" type="line"/>
-      <point x="557" y="881" type="line" name="dv06" smooth="yes"/>
+      <point x="557" y="881" type="line" smooth="yes" name="dv06"/>
       <point x="768" y="881"/>
       <point x="901" y="989"/>
-      <point x="901" y="1156" type="curve" name="sh01" smooth="yes"/>
+      <point x="901" y="1156" type="curve" smooth="yes" name="sh01"/>
       <point x="901" y="1289"/>
       <point x="821" y="1350"/>
-      <point x="650" y="1350" type="curve" name="sv01" smooth="yes"/>
+      <point x="650" y="1350" type="curve" smooth="yes" name="sv01"/>
       <point x="538" y="1350"/>
       <point x="412" y="1323"/>
       <point x="260" y="1270" type="curve"/>
       <point x="297" y="1456" type="line"/>
       <point x="462" y="1500"/>
       <point x="588" y="1520"/>
-      <point x="693" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="693" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="949" y="1520"/>
       <point x="1102" y="1400"/>
-      <point x="1102" y="1186" type="curve" name="sh02" smooth="yes"/>
+      <point x="1102" y="1186" type="curve" smooth="yes" name="sh02"/>
       <point x="1102" y="989"/>
       <point x="973" y="842"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0499.glif b/source/Hack-Italic.ufo/glyphs/uni0499.glif
index a9f7940d6..d64846a7a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0499.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0499.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0499" format="1">
+<glyph name="uni0499" format="2">
   <advance width="1233"/>
   <unicode hex="0499"/>
   <outline>
     <contour>
-      <point x="1089" y="855" type="curve" name="hr00" smooth="yes"/>
+      <point x="1089" y="855" type="curve" smooth="yes" name="hr00"/>
       <point x="1062" y="726"/>
       <point x="956" y="640"/>
       <point x="792" y="607" type="curve" name="ih02"/>
       <point x="941" y="579"/>
       <point x="1023" y="502"/>
-      <point x="1023" y="379" type="curve" name="dh04" smooth="yes"/>
+      <point x="1023" y="379" type="curve" smooth="yes" name="dh04"/>
       <point x="1023" y="363"/>
       <point x="1021" y="346"/>
       <point x="1018" y="327" type="curve" smooth="yes"/>
@@ -19,20 +19,20 @@
       <point x="499" y="-20" type="curve" name="ih03"/>
       <point x="542" y="-97"/>
       <point x="560" y="-147"/>
-      <point x="560" y="-198" type="curve" name="dh02" smooth="yes"/>
+      <point x="560" y="-198" type="curve" smooth="yes" name="dh02"/>
       <point x="560" y="-314"/>
       <point x="459" y="-395"/>
-      <point x="299" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="299" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="242" y="-395"/>
       <point x="179" y="-385"/>
       <point x="115" y="-365" type="curve"/>
       <point x="140" y="-236" type="line"/>
       <point x="193" y="-261"/>
       <point x="241" y="-274"/>
-      <point x="288" y="-274" type="curve" name="dv02" smooth="yes"/>
+      <point x="288" y="-274" type="curve" smooth="yes" name="dv02"/>
       <point x="375" y="-274"/>
       <point x="427" y="-230"/>
-      <point x="427" y="-162" type="curve" name="dh01" smooth="yes"/>
+      <point x="427" y="-162" type="curve" smooth="yes" name="dh01"/>
       <point x="427" y="-126"/>
       <point x="412" y="-82"/>
       <point x="380" y="-21" type="curve" name="ab01"/>
@@ -42,35 +42,35 @@
       <point x="100" y="207" type="line" name="iv01"/>
       <point x="192" y="162"/>
       <point x="311" y="138"/>
-      <point x="442" y="138" type="curve" name="sv01" smooth="yes"/>
+      <point x="442" y="138" type="curve" smooth="yes" name="sv01"/>
       <point x="695" y="138"/>
       <point x="840" y="228"/>
-      <point x="840" y="364" type="curve" name="dh03" smooth="yes"/>
+      <point x="840" y="364" type="curve" smooth="yes" name="dh03"/>
       <point x="840" y="465"/>
       <point x="743" y="532"/>
-      <point x="556" y="532" type="curve" name="dv03" smooth="yes"/>
+      <point x="556" y="532" type="curve" smooth="yes" name="dv03"/>
       <point x="398" y="532" type="line"/>
       <point x="426" y="676" type="line" name="sh01"/>
-      <point x="591" y="676" type="line" name="dv04" smooth="yes"/>
+      <point x="591" y="676" type="line" smooth="yes" name="dv04"/>
       <point x="775" y="676"/>
       <point x="879" y="741"/>
       <point x="900" y="824" type="curve" smooth="yes"/>
       <point x="903" y="833"/>
       <point x="904" y="842"/>
-      <point x="904" y="852" type="curve" name="ih01" smooth="yes"/>
+      <point x="904" y="852" type="curve" smooth="yes" name="ih01"/>
       <point x="904" y="931"/>
       <point x="815" y="984"/>
-      <point x="640" y="984" type="curve" name="sv02" smooth="yes"/>
+      <point x="640" y="984" type="curve" smooth="yes" name="sv02"/>
       <point x="545" y="984"/>
       <point x="427" y="968"/>
       <point x="282" y="932" type="curve" name="iv02"/>
       <point x="314" y="1099" type="line"/>
       <point x="461" y="1131"/>
       <point x="586" y="1147"/>
-      <point x="690" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="690" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="941" y="1147"/>
       <point x="1094" y="1057"/>
-      <point x="1094" y="905" type="curve" name="sh02" smooth="yes"/>
+      <point x="1094" y="905" type="curve" smooth="yes" name="sh02"/>
       <point x="1094" y="890"/>
       <point x="1092" y="874"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni049A_.glif b/source/Hack-Italic.ufo/glyphs/uni049A_.glif
index 1dea61bd5..95912e86f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni049A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni049A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni049A" format="1">
+<glyph name="uni049A" format="2">
   <advance width="1233"/>
   <unicode hex="049A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni049B_.glif b/source/Hack-Italic.ufo/glyphs/uni049B_.glif
index ea81dcf34..fa91ab654 100644
--- a/source/Hack-Italic.ufo/glyphs/uni049B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni049B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni049B" format="1">
+<glyph name="uni049B" format="2">
   <advance width="1233"/>
   <unicode hex="049B"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04A_2.glif b/source/Hack-Italic.ufo/glyphs/uni04A_2.glif
index 57354444e..b53357395 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04A_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04A_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04A2" format="1">
+<glyph name="uni04A2" format="2">
   <advance width="1233"/>
   <unicode hex="04A2"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04A_3.glif b/source/Hack-Italic.ufo/glyphs/uni04A_3.glif
index c1b21f677..143a88f95 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04A_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04A_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04A3" format="1">
+<glyph name="uni04A3" format="2">
   <advance width="1233"/>
   <unicode hex="04A3"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04A_4.glif b/source/Hack-Italic.ufo/glyphs/uni04A_4.glif
index f23ba53a0..37e8b5a7e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04A_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04A4" format="1">
+<glyph name="uni04A4" format="2">
   <advance width="1233"/>
   <unicode hex="04A4"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04A_5.glif b/source/Hack-Italic.ufo/glyphs/uni04A_5.glif
index f048d7fa4..d47b9f1f0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04A_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04A_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04A5" format="1">
+<glyph name="uni04A5" format="2">
   <advance width="1233"/>
   <unicode hex="04A5"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04A_A_.glif b/source/Hack-Italic.ufo/glyphs/uni04A_A_.glif
index d8190a223..773e0a850 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04A_A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04A_A_.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04AA" format="1">
+<glyph name="uni04AA" format="2">
   <advance width="1233"/>
   <unicode hex="04AA"/>
   <outline>
     <contour>
-      <point x="866" y="1356" type="curve" name="hr00" smooth="yes"/>
+      <point x="866" y="1356" type="curve" smooth="yes" name="hr00"/>
       <point x="737" y="1356"/>
       <point x="630" y="1300"/>
       <point x="539" y="1192" type="curve" smooth="yes"/>
       <point x="403" y="1030"/>
       <point x="308" y="749"/>
-      <point x="308" y="508" type="curve" name="dh02" smooth="yes"/>
+      <point x="308" y="508" type="curve" smooth="yes" name="dh02"/>
       <point x="308" y="253"/>
       <point x="415" y="135"/>
-      <point x="608" y="135" type="curve" name="dv04" smooth="yes"/>
+      <point x="608" y="135" type="curve" smooth="yes" name="dv04"/>
       <point x="725" y="135"/>
       <point x="848" y="179"/>
       <point x="965" y="260" type="curve"/>
@@ -23,32 +23,32 @@
       <point x="651" y="-26" type="curve" name="ih01"/>
       <point x="692" y="-101"/>
       <point x="709" y="-149"/>
-      <point x="709" y="-198" type="curve" name="dh04" smooth="yes"/>
+      <point x="709" y="-198" type="curve" smooth="yes" name="dh04"/>
       <point x="709" y="-314"/>
       <point x="608" y="-395"/>
-      <point x="448" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="448" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="391" y="-395"/>
       <point x="328" y="-385"/>
       <point x="264" y="-365" type="curve"/>
       <point x="289" y="-236" type="line"/>
       <point x="342" y="-261"/>
       <point x="390" y="-274"/>
-      <point x="437" y="-274" type="curve" name="dv02" smooth="yes"/>
+      <point x="437" y="-274" type="curve" smooth="yes" name="dv02"/>
       <point x="524" y="-274"/>
       <point x="576" y="-230"/>
-      <point x="576" y="-162" type="curve" name="dh03" smooth="yes"/>
+      <point x="576" y="-162" type="curve" smooth="yes" name="dh03"/>
       <point x="576" y="-129"/>
       <point x="561" y="-84"/>
       <point x="532" y="-28" type="curve" name="dv03"/>
       <point x="255" y="-11"/>
       <point x="97" y="164"/>
-      <point x="97" y="499" type="curve" name="dh01" smooth="yes"/>
+      <point x="97" y="499" type="curve" smooth="yes" name="dh01"/>
       <point x="97" y="773"/>
       <point x="201" y="1076"/>
       <point x="351" y="1266" type="curve" smooth="yes"/>
       <point x="487" y="1437"/>
       <point x="666" y="1520"/>
-      <point x="874" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="874" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="989" y="1520"/>
       <point x="1086" y="1494"/>
       <point x="1194" y="1438" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04A_B_.glif b/source/Hack-Italic.ufo/glyphs/uni04A_B_.glif
index 0b31afb5b..40a273742 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04A_B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04A_B_.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04AB" format="1">
+<glyph name="uni04AB" format="2">
   <advance width="1233"/>
   <unicode hex="04AB"/>
   <outline>
     <contour>
-      <point x="790" y="991" type="curve" name="hr00" smooth="yes"/>
+      <point x="790" y="991" type="curve" smooth="yes" name="hr00"/>
       <point x="637" y="991"/>
       <point x="531" y="929"/>
       <point x="451" y="813" type="curve" smooth="yes"/>
       <point x="377" y="704"/>
       <point x="332" y="555"/>
-      <point x="332" y="418" type="curve" name="sh02" smooth="yes"/>
+      <point x="332" y="418" type="curve" smooth="yes" name="sh02"/>
       <point x="332" y="219"/>
       <point x="422" y="127"/>
-      <point x="609" y="127" type="curve" name="sv01" smooth="yes"/>
+      <point x="609" y="127" type="curve" smooth="yes" name="sv01"/>
       <point x="732" y="127"/>
       <point x="849" y="168"/>
       <point x="961" y="252" type="curve" name="iv01"/>
@@ -23,32 +23,32 @@
       <point x="656" y="-26" type="curve" name="ih01"/>
       <point x="696" y="-101"/>
       <point x="713" y="-150"/>
-      <point x="713" y="-198" type="curve" name="sh03" smooth="yes"/>
+      <point x="713" y="-198" type="curve" smooth="yes" name="sh03"/>
       <point x="713" y="-314"/>
       <point x="612" y="-395"/>
-      <point x="452" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="452" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="395" y="-395"/>
       <point x="332" y="-385"/>
       <point x="268" y="-365" type="curve"/>
       <point x="293" y="-236" type="line"/>
       <point x="346" y="-261"/>
       <point x="394" y="-274"/>
-      <point x="441" y="-274" type="curve" name="dv02" smooth="yes"/>
+      <point x="441" y="-274" type="curve" smooth="yes" name="dv02"/>
       <point x="528" y="-274"/>
       <point x="580" y="-230"/>
-      <point x="580" y="-162" type="curve" name="ah01" smooth="yes"/>
+      <point x="580" y="-162" type="curve" smooth="yes" name="ah01"/>
       <point x="580" y="-129"/>
       <point x="565" y="-84"/>
       <point x="536" y="-27" type="curve" name="ab01"/>
       <point x="276" y="-10"/>
       <point x="138" y="139"/>
-      <point x="138" y="414" type="curve" name="sh01" smooth="yes"/>
+      <point x="138" y="414" type="curve" smooth="yes" name="sh01"/>
       <point x="138" y="613"/>
       <point x="211" y="812"/>
-      <point x="336" y="950" type="curve" name="sh04" smooth="yes"/>
+      <point x="336" y="950" type="curve" smooth="yes" name="sh04"/>
       <point x="453" y="1079"/>
       <point x="607" y="1147"/>
-      <point x="787" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="787" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="903" y="1147"/>
       <point x="1014" y="1118"/>
       <point x="1119" y="1061" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04A_C_.glif b/source/Hack-Italic.ufo/glyphs/uni04A_C_.glif
index b41f56bb6..dd920e1d3 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04A_C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04A_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04AC" format="1">
+<glyph name="uni04AC" format="2">
   <advance width="1233"/>
   <unicode hex="04AC"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04A_D_.glif b/source/Hack-Italic.ufo/glyphs/uni04A_D_.glif
index 3f0d210b6..35a4d42f6 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04A_D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04A_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04AD" format="1">
+<glyph name="uni04AD" format="2">
   <advance width="1233"/>
   <unicode hex="04AD"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04A_E_.glif b/source/Hack-Italic.ufo/glyphs/uni04A_E_.glif
index 26d533ddf..b3dc4fe64 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04A_E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04A_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04AE" format="1">
+<glyph name="uni04AE" format="2">
   <advance width="1233"/>
   <unicode hex="04AE"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04A_F_.glif b/source/Hack-Italic.ufo/glyphs/uni04A_F_.glif
index 4c1473dc9..30154c5d2 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04A_F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04A_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04AF" format="1">
+<glyph name="uni04AF" format="2">
   <advance width="1233"/>
   <unicode hex="04AF"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04B_0.glif b/source/Hack-Italic.ufo/glyphs/uni04B_0.glif
index f57415b31..7a3017e20 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04B_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04B_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04B0" format="1">
+<glyph name="uni04B0" format="2">
   <advance width="1233"/>
   <unicode hex="04B0"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04B_1.glif b/source/Hack-Italic.ufo/glyphs/uni04B_1.glif
index 7b66790ee..1225e56f0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04B_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04B_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04B1" format="1">
+<glyph name="uni04B1" format="2">
   <advance width="1233"/>
   <unicode hex="04B1"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04B_2.glif b/source/Hack-Italic.ufo/glyphs/uni04B_2.glif
index 1e53f4d2a..ac3e47d67 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04B_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04B_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04B2" format="1">
+<glyph name="uni04B2" format="2">
   <advance width="1233"/>
   <unicode hex="04B2"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04B_3.glif b/source/Hack-Italic.ufo/glyphs/uni04B_3.glif
index 9a79f5711..b88a8715a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04B_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04B3" format="1">
+<glyph name="uni04B3" format="2">
   <advance width="1233"/>
   <unicode hex="04B3"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04B_A_.glif b/source/Hack-Italic.ufo/glyphs/uni04B_A_.glif
index 3893c4d43..16348a40d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04B_A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04B_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04BA" format="1">
+<glyph name="uni04BA" format="2">
   <advance width="1233"/>
   <unicode hex="04BA"/>
   <outline>
@@ -23,7 +23,7 @@
       <point x="1057" y="840" type="curve" smooth="yes"/>
       <point x="1080" y="799"/>
       <point x="1093" y="741"/>
-      <point x="1093" y="668" type="curve" name="dh02" smooth="yes"/>
+      <point x="1093" y="668" type="curve" smooth="yes" name="dh02"/>
       <point x="1093" y="619"/>
       <point x="1087" y="563"/>
       <point x="1075" y="500" type="curve" smooth="yes"/>
@@ -32,10 +32,10 @@
       <point x="867" y="474" type="line" smooth="yes"/>
       <point x="876" y="517"/>
       <point x="880" y="556"/>
-      <point x="880" y="591" type="curve" name="dh01" smooth="yes"/>
+      <point x="880" y="591" type="curve" smooth="yes" name="dh01"/>
       <point x="880" y="712"/>
       <point x="824" y="767"/>
-      <point x="699" y="767" type="curve" name="dv01" smooth="yes"/>
+      <point x="699" y="767" type="curve" smooth="yes" name="dv01"/>
       <point x="635" y="767"/>
       <point x="568" y="753"/>
       <point x="503" y="725" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04B_B_.glif b/source/Hack-Italic.ufo/glyphs/uni04B_B_.glif
index 9c4ce430c..798cf3886 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04B_B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04B_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04BB" format="1">
+<glyph name="uni04BB" format="2">
   <advance width="1233"/>
   <unicode hex="04BB"/>
   <outline>
@@ -9,10 +9,10 @@
       <point x="455" y="952" type="line" name="iv01"/>
       <point x="559" y="1085"/>
       <point x="672" y="1147"/>
-      <point x="809" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="809" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="985" y="1147"/>
       <point x="1096" y="1045"/>
-      <point x="1096" y="874" type="curve" name="dh02" smooth="yes"/>
+      <point x="1096" y="874" type="curve" smooth="yes" name="dh02"/>
       <point x="1096" y="827"/>
       <point x="1088" y="763"/>
       <point x="1075" y="694" type="curve" smooth="yes"/>
@@ -24,10 +24,10 @@
       <point x="894" y="709" type="curve" smooth="yes"/>
       <point x="904" y="756"/>
       <point x="909" y="793"/>
-      <point x="909" y="821" type="curve" name="dh01" smooth="yes"/>
+      <point x="909" y="821" type="curve" smooth="yes" name="dh01"/>
       <point x="909" y="926"/>
       <point x="846" y="987"/>
-      <point x="729" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="729" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="562" y="987"/>
       <point x="434" y="857"/>
       <point x="391" y="633" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04C_0.glif b/source/Hack-Italic.ufo/glyphs/uni04C_0.glif
index 510dfec8c..ce6c1c62e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04C_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04C_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C0" format="1">
+<glyph name="uni04C0" format="2">
   <advance width="1233"/>
   <unicode hex="04C0"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04C_1.glif b/source/Hack-Italic.ufo/glyphs/uni04C_1.glif
index 89d7bbfaa..dfe03261b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04C_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04C_1.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C1" format="1">
+<glyph name="uni04C1" format="2">
   <advance width="1233"/>
   <unicode hex="04C1"/>
   <outline>
     <contour>
-      <point x="782" y="1619" type="curve" name="dv01" smooth="yes"/>
+      <point x="782" y="1619" type="curve" smooth="yes" name="dv01"/>
       <point x="604" y="1619"/>
       <point x="515" y="1687"/>
-      <point x="515" y="1824" type="curve" name="dh01" smooth="yes"/>
+      <point x="515" y="1824" type="curve" smooth="yes" name="dh01"/>
       <point x="515" y="1836"/>
       <point x="516" y="1848"/>
       <point x="517" y="1861" type="curve"/>
       <point x="636" y="1861" type="line" name="dh02"/>
       <point x="637" y="1789"/>
       <point x="697" y="1750"/>
-      <point x="810" y="1750" type="curve" name="dv02" smooth="yes"/>
+      <point x="810" y="1750" type="curve" smooth="yes" name="dv02"/>
       <point x="919" y="1750"/>
       <point x="990" y="1787"/>
       <point x="1025" y="1861" type="curve" name="sv01"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04C_2.glif b/source/Hack-Italic.ufo/glyphs/uni04C_2.glif
index b85ee82cd..5459e0bc0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04C_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04C_2.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C2" format="1">
+<glyph name="uni04C2" format="2">
   <advance width="1233"/>
   <unicode hex="04C2"/>
   <outline>
     <contour>
-      <point x="737" y="1271" type="curve" name="sv01" smooth="yes"/>
+      <point x="737" y="1271" type="curve" smooth="yes" name="sv01"/>
       <point x="558" y="1271"/>
       <point x="459" y="1360"/>
-      <point x="459" y="1517" type="curve" name="dh01" smooth="yes"/>
+      <point x="459" y="1517" type="curve" smooth="yes" name="dh01"/>
       <point x="459" y="1540"/>
       <point x="459" y="1547"/>
       <point x="462" y="1558" type="curve" name="at04"/>
       <point x="582" y="1558" type="line"/>
-      <point x="582" y="1541" type="line" name="dh02" smooth="yes"/>
+      <point x="582" y="1541" type="line" smooth="yes" name="dh02"/>
       <point x="582" y="1453"/>
       <point x="642" y="1408"/>
-      <point x="751" y="1408" type="curve" name="sv02" smooth="yes"/>
+      <point x="751" y="1408" type="curve" smooth="yes" name="sv02"/>
       <point x="864" y="1408"/>
       <point x="930" y="1458"/>
       <point x="969" y="1558" type="curve" name="at05"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04C_3.glif b/source/Hack-Italic.ufo/glyphs/uni04C_3.glif
index 8bdd3bf30..d22a75ac0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04C_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04C_3.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C3" format="1">
+<glyph name="uni04C3" format="2">
   <advance width="1233"/>
   <unicode hex="04C3"/>
   <outline>
     <contour>
       <point x="375" y="-240" type="line" name="hr00"/>
-      <point x="437" y="-240" type="line" name="dv02" smooth="yes"/>
+      <point x="437" y="-240" type="line" smooth="yes" name="dv02"/>
       <point x="620" y="-240"/>
       <point x="699" y="-154"/>
       <point x="749" y="104" type="curve" smooth="yes"/>
       <point x="806" y="394" type="line" smooth="yes"/>
       <point x="814" y="435"/>
       <point x="818" y="472"/>
-      <point x="818" y="506" type="curve" name="dh01" smooth="yes"/>
+      <point x="818" y="506" type="curve" smooth="yes" name="dh01"/>
       <point x="818" y="643"/>
       <point x="752" y="711"/>
-      <point x="619" y="711" type="curve" name="dv03" smooth="yes"/>
+      <point x="619" y="711" type="curve" smooth="yes" name="dv03"/>
       <point x="468" y="711" type="line"/>
       <point x="325" y="584" type="line"/>
       <point x="211" y="0" type="line" name="ab01"/>
@@ -29,14 +29,14 @@
       <point x="693" y="881" type="line" smooth="yes"/>
       <point x="897" y="881"/>
       <point x="1027" y="773"/>
-      <point x="1027" y="550" type="curve" name="dh02" smooth="yes"/>
+      <point x="1027" y="550" type="curve" smooth="yes" name="dh02"/>
       <point x="1027" y="507"/>
       <point x="1022" y="461"/>
       <point x="1012" y="410" type="curve" smooth="yes"/>
       <point x="952" y="104" type="line" smooth="yes"/>
       <point x="880" y="-260"/>
       <point x="717" y="-410"/>
-      <point x="418" y="-410" type="curve" name="dv01" smooth="yes"/>
+      <point x="418" y="-410" type="curve" smooth="yes" name="dv01"/>
       <point x="342" y="-410" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04C_4.glif b/source/Hack-Italic.ufo/glyphs/uni04C_4.glif
index 306666ed8..fc2b19bac 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04C_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04C_4.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C4" format="1">
+<glyph name="uni04C4" format="2">
   <advance width="1233"/>
   <unicode hex="04C4"/>
   <outline>
     <contour>
       <point x="363" y="-270" type="line" name="hr00"/>
-      <point x="535" y="-270" type="line" name="dv02" smooth="yes"/>
+      <point x="535" y="-270" type="line" smooth="yes" name="dv02"/>
       <point x="688" y="-270"/>
       <point x="727" y="-212"/>
       <point x="764" y="-20" type="curve" smooth="yes"/>
       <point x="816" y="244" type="line" smooth="yes"/>
       <point x="827" y="300"/>
       <point x="833" y="341"/>
-      <point x="833" y="376" type="curve" name="dh01" smooth="yes"/>
+      <point x="833" y="376" type="curve" smooth="yes" name="dh01"/>
       <point x="833" y="477"/>
       <point x="777" y="487"/>
-      <point x="642" y="487" type="curve" name="dv03" smooth="yes"/>
+      <point x="642" y="487" type="curve" smooth="yes" name="dv03"/>
       <point x="421" y="487" type="line"/>
       <point x="374" y="449" type="line"/>
       <point x="287" y="0" type="line" name="ab01"/>
@@ -26,17 +26,17 @@
       <point x="988" y="1120" type="line" name="at02"/>
       <point x="1212" y="1120" type="line"/>
       <point x="602" y="631" type="line"/>
-      <point x="660" y="631" type="line" name="dv04" smooth="yes"/>
+      <point x="660" y="631" type="line" smooth="yes" name="dv04"/>
       <point x="931" y="631"/>
       <point x="1022" y="583"/>
-      <point x="1022" y="423" type="curve" name="dh02" smooth="yes"/>
+      <point x="1022" y="423" type="curve" smooth="yes" name="dh02"/>
       <point x="1022" y="375"/>
       <point x="1014" y="318"/>
       <point x="1001" y="250" type="curve" smooth="yes"/>
       <point x="948" y="-20" type="line"/>
       <point x="892" y="-313"/>
       <point x="760" y="-426"/>
-      <point x="525" y="-426" type="curve" name="dv01" smooth="yes"/>
+      <point x="525" y="-426" type="curve" smooth="yes" name="dv01"/>
       <point x="332" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04C_7.glif b/source/Hack-Italic.ufo/glyphs/uni04C_7.glif
index 72d7ec98f..f53636c85 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04C_7.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04C_7.glif
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C7" format="1">
+<glyph name="uni04C7" format="2">
   <advance width="1233"/>
   <unicode hex="04C7"/>
   <outline>
     <contour>
       <point x="394" y="-240" type="line" name="hr00"/>
-      <point x="456" y="-240" type="line" name="dv02" smooth="yes"/>
+      <point x="456" y="-240" type="line" smooth="yes" name="dv02"/>
       <point x="642" y="-240"/>
       <point x="720" y="-149"/>
       <point x="768" y="104" type="curve"/>
@@ -22,7 +22,7 @@
       <point x="971" y="104" type="line" smooth="yes"/>
       <point x="899" y="-264"/>
       <point x="737" y="-410"/>
-      <point x="437" y="-410" type="curve" name="dv01" smooth="yes"/>
+      <point x="437" y="-410" type="curve" smooth="yes" name="dv01"/>
       <point x="361" y="-410" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04C_8.glif b/source/Hack-Italic.ufo/glyphs/uni04C_8.glif
index 22ff1e3af..510413321 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04C_8.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04C_8.glif
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C8" format="1">
+<glyph name="uni04C8" format="2">
   <advance width="1233"/>
   <unicode hex="04C8"/>
   <outline>
     <contour>
       <point x="352" y="-270" type="line" name="hr00"/>
-      <point x="524" y="-270" type="line" name="dv02" smooth="yes"/>
+      <point x="524" y="-270" type="line" smooth="yes" name="dv02"/>
       <point x="671" y="-270"/>
       <point x="716" y="-216"/>
       <point x="753" y="-20" type="curve"/>
@@ -22,7 +22,7 @@
       <point x="937" y="-20" type="line" smooth="yes"/>
       <point x="881" y="-304"/>
       <point x="756" y="-426"/>
-      <point x="514" y="-426" type="curve" name="dv01" smooth="yes"/>
+      <point x="514" y="-426" type="curve" smooth="yes" name="dv01"/>
       <point x="321" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04C_B_.glif b/source/Hack-Italic.ufo/glyphs/uni04C_B_.glif
index c94062321..5fc8450d2 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04C_B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04C_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04CB" format="1">
+<glyph name="uni04CB" format="2">
   <advance width="1233"/>
   <unicode hex="04CB"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04C_C_.glif b/source/Hack-Italic.ufo/glyphs/uni04C_C_.glif
index 6481cf2c6..667e2426f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04C_C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04C_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04CC" format="1">
+<glyph name="uni04CC" format="2">
   <advance width="1233"/>
   <unicode hex="04CC"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04C_F_.glif b/source/Hack-Italic.ufo/glyphs/uni04C_F_.glif
index c46ebe589..56a8b2e3e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04C_F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04C_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04CF" format="1">
+<glyph name="uni04CF" format="2">
   <advance width="1233"/>
   <unicode hex="04CF"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04D_0.glif b/source/Hack-Italic.ufo/glyphs/uni04D_0.glif
index b44700004..d6498747e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04D_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04D_0.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D0" format="1">
+<glyph name="uni04D0" format="2">
   <advance width="1233"/>
   <unicode hex="04D0"/>
   <outline>
     <contour>
-      <point x="800" y="1613" type="curve" name="dv01" smooth="yes"/>
+      <point x="800" y="1613" type="curve" smooth="yes" name="dv01"/>
       <point x="622" y="1613"/>
       <point x="533" y="1681"/>
-      <point x="533" y="1818" type="curve" name="dh01" smooth="yes"/>
+      <point x="533" y="1818" type="curve" smooth="yes" name="dh01"/>
       <point x="533" y="1830"/>
       <point x="534" y="1842"/>
       <point x="535" y="1855" type="curve"/>
       <point x="654" y="1855" type="line" name="dh02"/>
       <point x="655" y="1783"/>
       <point x="715" y="1744"/>
-      <point x="828" y="1744" type="curve" name="dv02" smooth="yes"/>
+      <point x="828" y="1744" type="curve" smooth="yes" name="dv02"/>
       <point x="937" y="1744"/>
       <point x="1008" y="1781"/>
       <point x="1043" y="1855" type="curve" name="sv01"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04D_1.glif b/source/Hack-Italic.ufo/glyphs/uni04D_1.glif
index 770b9cb79..034296410 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04D_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04D_1.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D1" format="1">
+<glyph name="uni04D1" format="2">
   <advance width="1233"/>
   <unicode hex="04D1"/>
   <outline>
     <contour>
-      <point x="747" y="1297" type="curve" name="dv01" smooth="yes"/>
+      <point x="747" y="1297" type="curve" smooth="yes" name="dv01"/>
       <point x="568" y="1297"/>
       <point x="469" y="1386"/>
-      <point x="469" y="1543" type="curve" name="dh01" smooth="yes"/>
+      <point x="469" y="1543" type="curve" smooth="yes" name="dh01"/>
       <point x="469" y="1566"/>
       <point x="469" y="1573"/>
       <point x="472" y="1584" type="curve"/>
       <point x="592" y="1584" type="line" name="sv01"/>
-      <point x="592" y="1567" type="line" name="dh02" smooth="yes"/>
+      <point x="592" y="1567" type="line" smooth="yes" name="dh02"/>
       <point x="592" y="1479"/>
       <point x="652" y="1434"/>
-      <point x="761" y="1434" type="curve" name="dv02" smooth="yes"/>
+      <point x="761" y="1434" type="curve" smooth="yes" name="dv02"/>
       <point x="874" y="1434"/>
       <point x="940" y="1484"/>
       <point x="979" y="1584" type="curve" name="sv02"/>
@@ -24,10 +24,10 @@
       <point x="932" y="1297"/>
     </contour>
     <contour>
-      <point x="404" y="-29" type="curve" name="sv04" smooth="yes"/>
+      <point x="404" y="-29" type="curve" smooth="yes" name="sv04"/>
       <point x="203" y="-29"/>
       <point x="72" y="90"/>
-      <point x="72" y="283" type="curve" name="hr01" smooth="yes"/>
+      <point x="72" y="283" type="curve" smooth="yes" name="hr01"/>
       <point x="72" y="534"/>
       <point x="293" y="707"/>
       <point x="645" y="707" type="curve" smooth="yes"/>
@@ -35,20 +35,20 @@
       <point x="903" y="768" type="line" smooth="yes"/>
       <point x="906" y="780"/>
       <point x="907" y="794"/>
-      <point x="907" y="807" type="curve" name="dh03" smooth="yes"/>
+      <point x="907" y="807" type="curve" smooth="yes" name="dh03"/>
       <point x="907" y="932"/>
       <point x="821" y="991"/>
-      <point x="665" y="991" type="curve" name="sv05" smooth="yes"/>
+      <point x="665" y="991" type="curve" smooth="yes" name="sv05"/>
       <point x="548" y="991"/>
       <point x="416" y="957"/>
       <point x="268" y="889" type="curve" name="sh02"/>
       <point x="303" y="1069" type="line"/>
       <point x="448" y="1121"/>
       <point x="574" y="1147"/>
-      <point x="693" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="693" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="942" y="1147"/>
       <point x="1087" y="1030"/>
-      <point x="1087" y="839" type="curve" name="dh04" smooth="yes"/>
+      <point x="1087" y="839" type="curve" smooth="yes" name="dh04"/>
       <point x="1087" y="794"/>
       <point x="1079" y="723"/>
       <point x="1063" y="639" type="curve" smooth="yes"/>
@@ -59,18 +59,18 @@
       <point x="561" y="-29"/>
     </contour>
     <contour>
-      <point x="461" y="125" type="curve" name="sv03" smooth="yes"/>
+      <point x="461" y="125" type="curve" smooth="yes" name="sv03"/>
       <point x="640" y="125"/>
       <point x="805" y="269"/>
       <point x="856" y="522" type="curve" smooth="yes"/>
       <point x="864" y="563" type="line" name="dv03"/>
-      <point x="692" y="563" type="line" name="hr03" smooth="yes"/>
+      <point x="692" y="563" type="line" smooth="yes" name="hr03"/>
       <point x="542" y="563"/>
       <point x="472" y="555"/>
       <point x="414" y="530" type="curve" smooth="yes"/>
       <point x="323" y="491"/>
       <point x="264" y="411"/>
-      <point x="264" y="307" type="curve" name="hr04" smooth="yes"/>
+      <point x="264" y="307" type="curve" smooth="yes" name="hr04"/>
       <point x="264" y="195"/>
       <point x="334" y="125"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04D_2.glif b/source/Hack-Italic.ufo/glyphs/uni04D_2.glif
index 9d96572a8..11c79d03d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04D_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04D_2.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D2" format="1">
+<glyph name="uni04D2" format="2">
   <advance width="1233"/>
   <unicode hex="04D2"/>
   <outline>
     <contour>
-      <point x="506" y="1647" type="line" name="hr00" smooth="yes"/>
+      <point x="506" y="1647" type="line" smooth="yes" name="hr00"/>
       <point x="486" y="1647"/>
       <point x="475" y="1660"/>
       <point x="479" y="1680" type="curve" smooth="yes"/>
       <point x="507" y="1823" type="line"/>
       <point x="510" y="1841"/>
       <point x="520" y="1850"/>
-      <point x="539" y="1850" type="curve" name="dv01" smooth="yes"/>
+      <point x="539" y="1850" type="curve" smooth="yes" name="dv01"/>
       <point x="683" y="1850" type="line" smooth="yes"/>
       <point x="701" y="1850"/>
       <point x="710" y="1842"/>
@@ -25,14 +25,14 @@
       <point x="648" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="897" y="1647" type="line" name="sv01" smooth="yes"/>
+      <point x="897" y="1647" type="line" smooth="yes" name="sv01"/>
       <point x="877" y="1647"/>
       <point x="866" y="1660"/>
       <point x="870" y="1680" type="curve" smooth="yes"/>
       <point x="898" y="1823" type="line"/>
       <point x="901" y="1841"/>
       <point x="911" y="1850"/>
-      <point x="930" y="1850" type="curve" name="sv02" smooth="yes"/>
+      <point x="930" y="1850" type="curve" smooth="yes" name="sv02"/>
       <point x="1073" y="1850" type="line" smooth="yes"/>
       <point x="1093" y="1850"/>
       <point x="1104" y="1837"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04D_3.glif b/source/Hack-Italic.ufo/glyphs/uni04D_3.glif
index a4c1b7f01..3a278fc6d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04D_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04D_3.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D3" format="1">
+<glyph name="uni04D3" format="2">
   <advance width="1233"/>
   <unicode hex="04D3"/>
   <outline>
     <contour>
-      <point x="473" y="1350" type="line" name="dv01" smooth="yes"/>
+      <point x="473" y="1350" type="line" smooth="yes" name="dv01"/>
       <point x="453" y="1350"/>
       <point x="442" y="1363"/>
       <point x="446" y="1383" type="curve" smooth="yes"/>
       <point x="474" y="1525" type="line"/>
       <point x="477" y="1543"/>
       <point x="487" y="1552"/>
-      <point x="506" y="1552" type="curve" name="dv02" smooth="yes"/>
+      <point x="506" y="1552" type="curve" smooth="yes" name="dv02"/>
       <point x="649" y="1552" type="line" smooth="yes"/>
       <point x="668" y="1552"/>
       <point x="677" y="1544"/>
@@ -25,14 +25,14 @@
       <point x="616" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="864" y="1350" type="line" name="hr01" smooth="yes"/>
+      <point x="864" y="1350" type="line" smooth="yes" name="hr01"/>
       <point x="844" y="1350"/>
       <point x="833" y="1363"/>
       <point x="837" y="1383" type="curve" smooth="yes"/>
       <point x="865" y="1525" type="line"/>
       <point x="868" y="1543"/>
       <point x="878" y="1552"/>
-      <point x="897" y="1552" type="curve" name="sh01" smooth="yes"/>
+      <point x="897" y="1552" type="curve" smooth="yes" name="sh01"/>
       <point x="1040" y="1552" type="line" smooth="yes"/>
       <point x="1059" y="1552"/>
       <point x="1068" y="1544"/>
@@ -46,31 +46,31 @@
       <point x="1007" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="404" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="404" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="203" y="-29"/>
       <point x="72" y="90"/>
-      <point x="72" y="283" type="curve" name="sh02" smooth="yes"/>
+      <point x="72" y="283" type="curve" smooth="yes" name="sh02"/>
       <point x="72" y="534"/>
       <point x="293" y="707"/>
       <point x="645" y="707" type="curve" smooth="yes"/>
       <point x="891" y="707" type="line" name="dv04"/>
-      <point x="903" y="768" type="line" name="hr02" smooth="yes"/>
+      <point x="903" y="768" type="line" smooth="yes" name="hr02"/>
       <point x="906" y="780"/>
       <point x="907" y="794"/>
-      <point x="907" y="807" type="curve" name="ah01" smooth="yes"/>
+      <point x="907" y="807" type="curve" smooth="yes" name="ah01"/>
       <point x="907" y="932"/>
       <point x="821" y="991"/>
-      <point x="665" y="991" type="curve" name="sv03" smooth="yes"/>
+      <point x="665" y="991" type="curve" smooth="yes" name="sv03"/>
       <point x="548" y="991"/>
       <point x="416" y="957"/>
       <point x="268" y="889" type="curve" name="sh04"/>
       <point x="303" y="1069" type="line"/>
       <point x="448" y="1121"/>
       <point x="574" y="1147"/>
-      <point x="693" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="693" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="942" y="1147"/>
       <point x="1087" y="1030"/>
-      <point x="1087" y="839" type="curve" name="sh05" smooth="yes"/>
+      <point x="1087" y="839" type="curve" smooth="yes" name="sh05"/>
       <point x="1087" y="794"/>
       <point x="1079" y="723"/>
       <point x="1063" y="639" type="curve" smooth="yes"/>
@@ -81,7 +81,7 @@
       <point x="561" y="-29"/>
     </contour>
     <contour>
-      <point x="461" y="125" type="curve" name="sv01" smooth="yes"/>
+      <point x="461" y="125" type="curve" smooth="yes" name="sv01"/>
       <point x="640" y="125"/>
       <point x="805" y="269"/>
       <point x="856" y="522" type="curve" smooth="yes"/>
@@ -92,7 +92,7 @@
       <point x="414" y="530" type="curve" smooth="yes"/>
       <point x="323" y="491"/>
       <point x="264" y="411"/>
-      <point x="264" y="307" type="curve" name="sh03" smooth="yes"/>
+      <point x="264" y="307" type="curve" smooth="yes" name="sh03"/>
       <point x="264" y="195"/>
       <point x="334" y="125"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04D_4.glif b/source/Hack-Italic.ufo/glyphs/uni04D_4.glif
index ec3b56ee2..38b92f618 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04D_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04D_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D4" format="1">
+<glyph name="uni04D4" format="2">
   <advance width="1233"/>
   <unicode hex="04D4"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04D_5.glif b/source/Hack-Italic.ufo/glyphs/uni04D_5.glif
index c2ca8a3e8..d8351e7c4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04D_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04D_5.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D5" format="1">
+<glyph name="uni04D5" format="2">
   <advance width="1233"/>
   <unicode hex="04D5"/>
   <outline>
     <contour>
-      <point x="233" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="233" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="61" y="-29"/>
       <point x="-47" y="76"/>
-      <point x="-47" y="240" type="curve" name="sh01" smooth="yes"/>
+      <point x="-47" y="240" type="curve" smooth="yes" name="sh01"/>
       <point x="-47" y="507"/>
       <point x="119" y="657"/>
-      <point x="418" y="657" type="curve" name="sv01" smooth="yes"/>
+      <point x="418" y="657" type="curve" smooth="yes" name="sv01"/>
       <point x="535" y="657" type="line"/>
       <point x="553" y="745" type="line" smooth="yes"/>
       <point x="558" y="772"/>
@@ -18,23 +18,23 @@
       <point x="561" y="834" type="curve" smooth="yes"/>
       <point x="561" y="935"/>
       <point x="503" y="995"/>
-      <point x="399" y="995" type="curve" name="sv02" smooth="yes"/>
+      <point x="399" y="995" type="curve" smooth="yes" name="sv02"/>
       <point x="334" y="995"/>
       <point x="242" y="967"/>
       <point x="141" y="911" type="curve" name="ih01"/>
       <point x="176" y="1079" type="line"/>
       <point x="282" y="1124"/>
       <point x="373" y="1147"/>
-      <point x="449" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="449" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="558" y="1147"/>
       <point x="639" y="1102"/>
       <point x="680" y="1018" type="curve" name="ih02"/>
       <point x="748" y="1102"/>
       <point x="842" y="1147"/>
-      <point x="950" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="950" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1111" y="1147"/>
       <point x="1214" y="1037"/>
-      <point x="1214" y="862" type="curve" name="sh02" smooth="yes"/>
+      <point x="1214" y="862" type="curve" smooth="yes" name="sh02"/>
       <point x="1214" y="811"/>
       <point x="1203" y="725"/>
       <point x="1180" y="604" type="curve" smooth="yes"/>
@@ -48,14 +48,14 @@
       <point x="633" y="285" type="curve" smooth="yes"/>
       <point x="633" y="181"/>
       <point x="702" y="119"/>
-      <point x="815" y="119" type="curve" name="dv02" smooth="yes"/>
+      <point x="815" y="119" type="curve" smooth="yes" name="dv02"/>
       <point x="908" y="119"/>
       <point x="1009" y="159"/>
       <point x="1081" y="227" type="curve" name="ih03"/>
       <point x="1047" y="55" type="line" name="sh03"/>
       <point x="967" y="-1"/>
       <point x="880" y="-29"/>
-      <point x="784" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="784" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="643" y="-29"/>
       <point x="547" y="27"/>
       <point x="514" y="131" type="curve" name="ih04"/>
@@ -64,20 +64,20 @@
     </contour>
     <contour>
       <point x="1024" y="657" type="line" name="dv04"/>
-      <point x="1040" y="731" type="line" name="sh04" smooth="yes"/>
+      <point x="1040" y="731" type="line" smooth="yes" name="sh04"/>
       <point x="1048" y="767"/>
       <point x="1051" y="803"/>
-      <point x="1051" y="846" type="curve" name="ah01" smooth="yes"/>
+      <point x="1051" y="846" type="curve" smooth="yes" name="ah01"/>
       <point x="1051" y="939"/>
       <point x="1004" y="995"/>
-      <point x="924" y="995" type="curve" name="sv03" smooth="yes"/>
+      <point x="924" y="995" type="curve" smooth="yes" name="sv03"/>
       <point x="814" y="995"/>
       <point x="743" y="910"/>
       <point x="711" y="739" type="curve"/>
       <point x="694" y="657" type="line"/>
     </contour>
     <contour>
-      <point x="260" y="123" type="curve" name="sv04" smooth="yes"/>
+      <point x="260" y="123" type="curve" smooth="yes" name="sv04"/>
       <point x="380" y="123"/>
       <point x="439" y="195"/>
       <point x="487" y="442" type="curve"/>
@@ -88,7 +88,7 @@
       <point x="188" y="444" type="curve" smooth="yes"/>
       <point x="148" y="400"/>
       <point x="123" y="330"/>
-      <point x="123" y="262" type="curve" name="sh05" smooth="yes"/>
+      <point x="123" y="262" type="curve" smooth="yes" name="sh05"/>
       <point x="123" y="182"/>
       <point x="181" y="123"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04D_6.glif b/source/Hack-Italic.ufo/glyphs/uni04D_6.glif
index b08cad5a2..084cfe353 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04D_6.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04D_6.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D6" format="1">
+<glyph name="uni04D6" format="2">
   <advance width="1233"/>
   <unicode hex="04D6"/>
   <outline>
     <contour>
-      <point x="792" y="1612" type="curve" name="dv01" smooth="yes"/>
+      <point x="792" y="1612" type="curve" smooth="yes" name="dv01"/>
       <point x="614" y="1612"/>
       <point x="525" y="1680"/>
-      <point x="525" y="1817" type="curve" name="dh01" smooth="yes"/>
+      <point x="525" y="1817" type="curve" smooth="yes" name="dh01"/>
       <point x="525" y="1829"/>
       <point x="526" y="1841"/>
       <point x="527" y="1854" type="curve"/>
       <point x="646" y="1854" type="line" name="dh02"/>
       <point x="647" y="1782"/>
       <point x="707" y="1743"/>
-      <point x="820" y="1743" type="curve" name="dv02" smooth="yes"/>
+      <point x="820" y="1743" type="curve" smooth="yes" name="dv02"/>
       <point x="929" y="1743"/>
       <point x="1000" y="1780"/>
       <point x="1035" y="1854" type="curve" name="sv01"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04D_7.glif b/source/Hack-Italic.ufo/glyphs/uni04D_7.glif
index 2d113aa50..5560dd5ab 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04D_7.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04D_7.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D7" format="1">
+<glyph name="uni04D7" format="2">
   <advance width="1233"/>
   <unicode hex="04D7"/>
   <outline>
     <contour>
-      <point x="761" y="1299" type="curve" name="dv03" smooth="yes"/>
+      <point x="761" y="1299" type="curve" smooth="yes" name="dv03"/>
       <point x="582" y="1299"/>
       <point x="483" y="1388"/>
-      <point x="483" y="1545" type="curve" name="dh03" smooth="yes"/>
+      <point x="483" y="1545" type="curve" smooth="yes" name="dh03"/>
       <point x="483" y="1568"/>
       <point x="483" y="1575"/>
       <point x="486" y="1586" type="curve"/>
       <point x="606" y="1586" type="line" name="sv01"/>
-      <point x="606" y="1569" type="line" name="dh04" smooth="yes"/>
+      <point x="606" y="1569" type="line" smooth="yes" name="dh04"/>
       <point x="606" y="1481"/>
       <point x="666" y="1436"/>
-      <point x="775" y="1436" type="curve" name="dv04" smooth="yes"/>
+      <point x="775" y="1436" type="curve" smooth="yes" name="dv04"/>
       <point x="888" y="1436"/>
       <point x="954" y="1486"/>
       <point x="993" y="1586" type="curve" name="sv02"/>
@@ -24,29 +24,29 @@
       <point x="946" y="1299"/>
     </contour>
     <contour>
-      <point x="556" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="556" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="253" y="-29"/>
       <point x="98" y="122"/>
-      <point x="98" y="407" type="curve" name="dh01" smooth="yes"/>
+      <point x="98" y="407" type="curve" smooth="yes" name="dh01"/>
       <point x="98" y="615"/>
       <point x="183" y="829"/>
       <point x="324" y="973" type="curve"/>
       <point x="436" y="1089"/>
       <point x="570" y="1149"/>
-      <point x="719" y="1149" type="curve" name="dv06" smooth="yes"/>
+      <point x="719" y="1149" type="curve" smooth="yes" name="dv06"/>
       <point x="964" y="1149"/>
       <point x="1126" y="983"/>
-      <point x="1126" y="731" type="curve" name="dh06" smooth="yes"/>
+      <point x="1126" y="731" type="curve" smooth="yes" name="dh06"/>
       <point x="1126" y="683"/>
       <point x="1120" y="620"/>
       <point x="1104" y="516" type="curve" name="dv05"/>
       <point x="297" y="516" type="line"/>
       <point x="289" y="473"/>
       <point x="285" y="441"/>
-      <point x="285" y="406" type="curve" name="dh02" smooth="yes"/>
+      <point x="285" y="406" type="curve" smooth="yes" name="dh02"/>
       <point x="285" y="229"/>
       <point x="388" y="127"/>
-      <point x="584" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="584" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="704" y="127"/>
       <point x="844" y="164"/>
       <point x="997" y="240" type="curve" name="ih01"/>
@@ -58,10 +58,10 @@
       <point x="938" y="659" type="line" name="hr01"/>
       <point x="946" y="695"/>
       <point x="948" y="716"/>
-      <point x="948" y="739" type="curve" name="dh05" smooth="yes"/>
+      <point x="948" y="739" type="curve" smooth="yes" name="dh05"/>
       <point x="948" y="897"/>
       <point x="854" y="991"/>
-      <point x="707" y="991" type="curve" name="hr02" smooth="yes"/>
+      <point x="707" y="991" type="curve" smooth="yes" name="hr02"/>
       <point x="533" y="991"/>
       <point x="391" y="860"/>
       <point x="332" y="659" type="curve" name="ih02"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04D_8.glif b/source/Hack-Italic.ufo/glyphs/uni04D_8.glif
index 6080790ac..de1c9f957 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04D_8.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04D_8.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D8" format="1">
+<glyph name="uni04D8" format="2">
   <advance width="1233"/>
   <unicode hex="04D8"/>
   <outline>
     <contour>
-      <point x="465" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="465" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="205" y="-29"/>
       <point x="81" y="116"/>
-      <point x="81" y="420" type="curve" name="sh01" smooth="yes"/>
+      <point x="81" y="420" type="curve" smooth="yes" name="sh01"/>
       <point x="81" y="513"/>
       <point x="93" y="622"/>
       <point x="117" y="745" type="curve" smooth="yes"/>
@@ -15,20 +15,20 @@
       <point x="920" y="828" type="line" name="dv03"/>
       <point x="936" y="927"/>
       <point x="945" y="1009"/>
-      <point x="945" y="1080" type="curve" name="ah01" smooth="yes"/>
+      <point x="945" y="1080" type="curve" smooth="yes" name="ah01"/>
       <point x="945" y="1265"/>
       <point x="885" y="1356"/>
-      <point x="730" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="730" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="623" y="1356"/>
       <point x="495" y="1312"/>
       <point x="380" y="1231" type="curve" name="ih01"/>
       <point x="421" y="1438" type="line"/>
       <point x="534" y="1494"/>
       <point x="649" y="1520"/>
-      <point x="762" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="762" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1027" y="1520"/>
       <point x="1152" y="1372"/>
-      <point x="1152" y="1069" type="curve" name="sh02" smooth="yes"/>
+      <point x="1152" y="1069" type="curve" smooth="yes" name="sh02"/>
       <point x="1152" y="975"/>
       <point x="1140" y="867"/>
       <point x="1116" y="745" type="curve" smooth="yes"/>
@@ -36,14 +36,14 @@
       <point x="805" y="-29"/>
     </contour>
     <contour>
-      <point x="498" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="498" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="702" y="135"/>
       <point x="807" y="309"/>
       <point x="884" y="644" type="curve" name="dv02"/>
       <point x="310" y="644" type="line"/>
       <point x="295" y="556"/>
       <point x="288" y="479"/>
-      <point x="288" y="412" type="curve" name="sh03" smooth="yes"/>
+      <point x="288" y="412" type="curve" smooth="yes" name="sh03"/>
       <point x="288" y="232"/>
       <point x="346" y="135"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04D_9.glif b/source/Hack-Italic.ufo/glyphs/uni04D_9.glif
index 09754aab1..5f9a4ab9e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04D_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04D_9.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D9" format="1">
+<glyph name="uni04D9" format="2">
   <advance width="1233"/>
   <unicode hex="04D9"/>
   <outline>
     <contour>
-      <point x="475" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="475" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="230" y="-29"/>
       <point x="97" y="112"/>
-      <point x="97" y="355" type="curve" name="sh01" smooth="yes"/>
+      <point x="97" y="355" type="curve" smooth="yes" name="sh01"/>
       <point x="97" y="404"/>
       <point x="102" y="456"/>
       <point x="113" y="512" type="curve" smooth="yes"/>
@@ -16,20 +16,20 @@
       <point x="929" y="608" type="line"/>
       <point x="936" y="647"/>
       <point x="940" y="682"/>
-      <point x="940" y="714" type="curve" name="ah01" smooth="yes"/>
+      <point x="940" y="714" type="curve" smooth="yes" name="ah01"/>
       <point x="940" y="897"/>
       <point x="831" y="991"/>
-      <point x="639" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="639" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="519" y="991"/>
       <point x="388" y="954"/>
       <point x="227" y="878" type="curve" name="ih01"/>
       <point x="263" y="1061" type="line" name="sh04"/>
       <point x="415" y="1118"/>
       <point x="547" y="1147"/>
-      <point x="672" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="672" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="965" y="1147"/>
       <point x="1128" y="985"/>
-      <point x="1128" y="717" type="curve" name="sh05" smooth="yes"/>
+      <point x="1128" y="717" type="curve" smooth="yes" name="sh05"/>
       <point x="1128" y="668"/>
       <point x="1122" y="615"/>
       <point x="1111" y="559" type="curve"/>
@@ -37,14 +37,14 @@
       <point x="792" y="-29"/>
     </contour>
     <contour>
-      <point x="504" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="504" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="688" y="127"/>
       <point x="829" y="252"/>
       <point x="893" y="459" type="curve"/>
       <point x="286" y="458" type="line" name="sh06"/>
       <point x="280" y="424"/>
       <point x="277" y="392"/>
-      <point x="277" y="362" type="curve" name="sh03" smooth="yes"/>
+      <point x="277" y="362" type="curve" smooth="yes" name="sh03"/>
       <point x="277" y="209"/>
       <point x="355" y="127"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04D_A_.glif b/source/Hack-Italic.ufo/glyphs/uni04D_A_.glif
index 916bbd0e5..f69177767 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04D_A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04D_A_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04DA" format="1">
+<glyph name="uni04DA" format="2">
   <advance width="1233"/>
   <unicode hex="04DA"/>
   <outline>
     <contour>
-      <point x="492" y="1647" type="line" name="hr00" smooth="yes"/>
+      <point x="492" y="1647" type="line" smooth="yes" name="hr00"/>
       <point x="472" y="1647"/>
       <point x="461" y="1660"/>
       <point x="465" y="1680" type="curve" smooth="yes"/>
       <point x="493" y="1823" type="line"/>
       <point x="496" y="1841"/>
       <point x="506" y="1850"/>
-      <point x="525" y="1850" type="curve" name="dv03" smooth="yes"/>
+      <point x="525" y="1850" type="curve" smooth="yes" name="dv03"/>
       <point x="669" y="1850" type="line" smooth="yes"/>
       <point x="687" y="1850"/>
       <point x="696" y="1842"/>
@@ -25,14 +25,14 @@
       <point x="634" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="883" y="1647" type="line" name="sv01" smooth="yes"/>
+      <point x="883" y="1647" type="line" smooth="yes" name="sv01"/>
       <point x="863" y="1647"/>
       <point x="852" y="1660"/>
       <point x="856" y="1680" type="curve" smooth="yes"/>
       <point x="884" y="1823" type="line"/>
       <point x="887" y="1841"/>
       <point x="897" y="1850"/>
-      <point x="916" y="1850" type="curve" name="sv02" smooth="yes"/>
+      <point x="916" y="1850" type="curve" smooth="yes" name="sv02"/>
       <point x="1059" y="1850" type="line" smooth="yes"/>
       <point x="1079" y="1850"/>
       <point x="1090" y="1837"/>
@@ -43,10 +43,10 @@
       <point x="1026" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="465" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="465" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="205" y="-29"/>
       <point x="81" y="116"/>
-      <point x="81" y="420" type="curve" name="sh01" smooth="yes"/>
+      <point x="81" y="420" type="curve" smooth="yes" name="sh01"/>
       <point x="81" y="513"/>
       <point x="93" y="622"/>
       <point x="117" y="745" type="curve" smooth="yes"/>
@@ -54,20 +54,20 @@
       <point x="920" y="828" type="line" name="dv05"/>
       <point x="936" y="927"/>
       <point x="945" y="1009"/>
-      <point x="945" y="1080" type="curve" name="ah01" smooth="yes"/>
+      <point x="945" y="1080" type="curve" smooth="yes" name="ah01"/>
       <point x="945" y="1265"/>
       <point x="885" y="1356"/>
-      <point x="730" y="1356" type="curve" name="sv03" smooth="yes"/>
+      <point x="730" y="1356" type="curve" smooth="yes" name="sv03"/>
       <point x="623" y="1356"/>
       <point x="495" y="1312"/>
       <point x="380" y="1231" type="curve" name="ih01"/>
       <point x="421" y="1438" type="line"/>
       <point x="534" y="1494"/>
       <point x="649" y="1520"/>
-      <point x="762" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="762" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1027" y="1520"/>
       <point x="1152" y="1372"/>
-      <point x="1152" y="1069" type="curve" name="sh02" smooth="yes"/>
+      <point x="1152" y="1069" type="curve" smooth="yes" name="sh02"/>
       <point x="1152" y="975"/>
       <point x="1140" y="867"/>
       <point x="1116" y="745" type="curve" smooth="yes"/>
@@ -75,14 +75,14 @@
       <point x="805" y="-29"/>
     </contour>
     <contour>
-      <point x="498" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="498" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="702" y="135"/>
       <point x="807" y="309"/>
       <point x="884" y="644" type="curve" name="dv04"/>
       <point x="310" y="644" type="line"/>
       <point x="295" y="556"/>
       <point x="288" y="479"/>
-      <point x="288" y="412" type="curve" name="sh03" smooth="yes"/>
+      <point x="288" y="412" type="curve" smooth="yes" name="sh03"/>
       <point x="288" y="232"/>
       <point x="346" y="135"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04D_B_.glif b/source/Hack-Italic.ufo/glyphs/uni04D_B_.glif
index 9a865761a..2aa548751 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04D_B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04D_B_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04DB" format="1">
+<glyph name="uni04DB" format="2">
   <advance width="1233"/>
   <unicode hex="04DB"/>
   <outline>
     <contour>
-      <point x="469" y="1350" type="line" name="hr00" smooth="yes"/>
+      <point x="469" y="1350" type="line" smooth="yes" name="hr00"/>
       <point x="449" y="1350"/>
       <point x="438" y="1363"/>
       <point x="442" y="1383" type="curve" smooth="yes"/>
       <point x="470" y="1525" type="line"/>
       <point x="473" y="1543"/>
       <point x="483" y="1552"/>
-      <point x="502" y="1552" type="curve" name="dv03" smooth="yes"/>
+      <point x="502" y="1552" type="curve" smooth="yes" name="dv03"/>
       <point x="645" y="1552" type="line" smooth="yes"/>
       <point x="664" y="1552"/>
       <point x="673" y="1544"/>
@@ -25,14 +25,14 @@
       <point x="612" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="860" y="1350" type="line" name="sv01" smooth="yes"/>
+      <point x="860" y="1350" type="line" smooth="yes" name="sv01"/>
       <point x="840" y="1350"/>
       <point x="829" y="1363"/>
       <point x="833" y="1383" type="curve" smooth="yes"/>
       <point x="861" y="1525" type="line"/>
       <point x="864" y="1543"/>
       <point x="874" y="1552"/>
-      <point x="893" y="1552" type="curve" name="sv02" smooth="yes"/>
+      <point x="893" y="1552" type="curve" smooth="yes" name="sv02"/>
       <point x="1036" y="1552" type="line" smooth="yes"/>
       <point x="1055" y="1552"/>
       <point x="1064" y="1544"/>
@@ -46,10 +46,10 @@
       <point x="1003" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="475" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="475" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="230" y="-29"/>
       <point x="97" y="112"/>
-      <point x="97" y="355" type="curve" name="sh01" smooth="yes"/>
+      <point x="97" y="355" type="curve" smooth="yes" name="sh01"/>
       <point x="97" y="404"/>
       <point x="102" y="456"/>
       <point x="113" y="512" type="curve" smooth="yes"/>
@@ -58,20 +58,20 @@
       <point x="929" y="608" type="line"/>
       <point x="936" y="647"/>
       <point x="940" y="682"/>
-      <point x="940" y="714" type="curve" name="ah01" smooth="yes"/>
+      <point x="940" y="714" type="curve" smooth="yes" name="ah01"/>
       <point x="940" y="897"/>
       <point x="831" y="991"/>
-      <point x="639" y="991" type="curve" name="sv03" smooth="yes"/>
+      <point x="639" y="991" type="curve" smooth="yes" name="sv03"/>
       <point x="519" y="991"/>
       <point x="388" y="954"/>
       <point x="227" y="878" type="curve" name="ih01"/>
       <point x="263" y="1061" type="line" name="sh04"/>
       <point x="415" y="1118"/>
       <point x="547" y="1147"/>
-      <point x="672" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="672" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="965" y="1147"/>
       <point x="1128" y="985"/>
-      <point x="1128" y="717" type="curve" name="sh05" smooth="yes"/>
+      <point x="1128" y="717" type="curve" smooth="yes" name="sh05"/>
       <point x="1128" y="668"/>
       <point x="1122" y="615"/>
       <point x="1111" y="559" type="curve"/>
@@ -79,14 +79,14 @@
       <point x="792" y="-29"/>
     </contour>
     <contour>
-      <point x="504" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="504" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="688" y="127"/>
       <point x="829" y="252"/>
       <point x="893" y="459" type="curve"/>
       <point x="286" y="458" type="line" name="sh06"/>
       <point x="280" y="424"/>
       <point x="277" y="392"/>
-      <point x="277" y="362" type="curve" name="sh03" smooth="yes"/>
+      <point x="277" y="362" type="curve" smooth="yes" name="sh03"/>
       <point x="277" y="209"/>
       <point x="355" y="127"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04D_C_.glif b/source/Hack-Italic.ufo/glyphs/uni04D_C_.glif
index e7daef4a2..ef6deb148 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04D_C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04D_C_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04DC" format="1">
+<glyph name="uni04DC" format="2">
   <advance width="1233"/>
   <unicode hex="04DC"/>
   <outline>
     <contour>
-      <point x="526" y="1647" type="line" name="hr00" smooth="yes"/>
+      <point x="526" y="1647" type="line" smooth="yes" name="hr00"/>
       <point x="506" y="1647"/>
       <point x="495" y="1660"/>
       <point x="499" y="1680" type="curve" smooth="yes"/>
       <point x="527" y="1823" type="line"/>
       <point x="530" y="1841"/>
       <point x="540" y="1850"/>
-      <point x="559" y="1850" type="curve" name="dv01" smooth="yes"/>
+      <point x="559" y="1850" type="curve" smooth="yes" name="dv01"/>
       <point x="703" y="1850" type="line" smooth="yes"/>
       <point x="721" y="1850"/>
       <point x="730" y="1842"/>
@@ -25,14 +25,14 @@
       <point x="668" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="917" y="1647" type="line" name="sv01" smooth="yes"/>
+      <point x="917" y="1647" type="line" smooth="yes" name="sv01"/>
       <point x="897" y="1647"/>
       <point x="886" y="1660"/>
       <point x="890" y="1680" type="curve" smooth="yes"/>
       <point x="918" y="1823" type="line"/>
       <point x="921" y="1841"/>
       <point x="931" y="1850"/>
-      <point x="950" y="1850" type="curve" name="sv02" smooth="yes"/>
+      <point x="950" y="1850" type="curve" smooth="yes" name="sv02"/>
       <point x="1093" y="1850" type="line" smooth="yes"/>
       <point x="1113" y="1850"/>
       <point x="1124" y="1837"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04D_D_.glif b/source/Hack-Italic.ufo/glyphs/uni04D_D_.glif
index cae049c26..4c59ff251 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04D_D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04D_D_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04DD" format="1">
+<glyph name="uni04DD" format="2">
   <advance width="1233"/>
   <unicode hex="04DD"/>
   <outline>
     <contour>
-      <point x="492" y="1310" type="line" name="hr00" smooth="yes"/>
+      <point x="492" y="1310" type="line" smooth="yes" name="hr00"/>
       <point x="472" y="1310"/>
       <point x="461" y="1323"/>
       <point x="465" y="1343" type="curve" smooth="yes"/>
       <point x="493" y="1485" type="line"/>
       <point x="496" y="1503"/>
       <point x="506" y="1512"/>
-      <point x="525" y="1512" type="curve" name="at04" smooth="yes"/>
+      <point x="525" y="1512" type="curve" smooth="yes" name="at04"/>
       <point x="668" y="1512" type="line" smooth="yes"/>
       <point x="687" y="1512"/>
       <point x="696" y="1504"/>
@@ -25,14 +25,14 @@
       <point x="635" y="1310" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="883" y="1310" type="line" name="sv01" smooth="yes"/>
+      <point x="883" y="1310" type="line" smooth="yes" name="sv01"/>
       <point x="863" y="1310"/>
       <point x="852" y="1323"/>
       <point x="856" y="1343" type="curve" smooth="yes"/>
       <point x="884" y="1485" type="line"/>
       <point x="887" y="1503"/>
       <point x="897" y="1512"/>
-      <point x="916" y="1512" type="curve" name="at05" smooth="yes"/>
+      <point x="916" y="1512" type="curve" smooth="yes" name="at05"/>
       <point x="1059" y="1512" type="line" smooth="yes"/>
       <point x="1078" y="1512"/>
       <point x="1087" y="1504"/>
@@ -43,7 +43,7 @@
       <point x="1058" y="1337" type="line" smooth="yes"/>
       <point x="1055" y="1319"/>
       <point x="1044" y="1310"/>
-      <point x="1026" y="1310" type="curve" name="sv02" smooth="yes"/>
+      <point x="1026" y="1310" type="curve" smooth="yes" name="sv02"/>
     </contour>
     <contour>
       <point x="348" y="716" type="line"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04D_E_.glif b/source/Hack-Italic.ufo/glyphs/uni04D_E_.glif
index 31492bdce..13577b9c8 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04D_E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04D_E_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04DE" format="1">
+<glyph name="uni04DE" format="2">
   <advance width="1233"/>
   <unicode hex="04DE"/>
   <outline>
     <contour>
-      <point x="485" y="1647" type="line" name="dv03" smooth="yes"/>
+      <point x="485" y="1647" type="line" smooth="yes" name="dv03"/>
       <point x="465" y="1647"/>
       <point x="454" y="1660"/>
       <point x="458" y="1680" type="curve" smooth="yes"/>
       <point x="486" y="1823" type="line"/>
       <point x="489" y="1841"/>
       <point x="499" y="1850"/>
-      <point x="518" y="1850" type="curve" name="hr01" smooth="yes"/>
+      <point x="518" y="1850" type="curve" smooth="yes" name="hr01"/>
       <point x="662" y="1850" type="line" smooth="yes"/>
       <point x="680" y="1850"/>
       <point x="689" y="1842"/>
@@ -25,15 +25,15 @@
       <point x="627" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="876" y="1647" type="line" name="sv01" smooth="yes"/>
+      <point x="876" y="1647" type="line" smooth="yes" name="sv01"/>
       <point x="856" y="1647"/>
       <point x="845" y="1660"/>
       <point x="849" y="1680" type="curve" smooth="yes"/>
       <point x="877" y="1823" type="line"/>
       <point x="880" y="1841"/>
       <point x="890" y="1850"/>
-      <point x="909" y="1850" type="curve" name="sv02" smooth="yes"/>
-      <point x="1052" y="1850" type="line" name="hr02" smooth="yes"/>
+      <point x="909" y="1850" type="curve" smooth="yes" name="sv02"/>
+      <point x="1052" y="1850" type="line" smooth="yes" name="hr02"/>
       <point x="1072" y="1850"/>
       <point x="1083" y="1837"/>
       <point x="1079" y="1817" type="curve" smooth="yes"/>
@@ -43,45 +43,45 @@
       <point x="1019" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="382" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="382" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="255" y="-29"/>
       <point x="111" y="-6"/>
       <point x="-18" y="45" type="curve"/>
       <point x="20" y="246" type="line"/>
       <point x="141" y="177"/>
       <point x="268" y="141"/>
-      <point x="396" y="141" type="curve" name="dv02" smooth="yes"/>
+      <point x="396" y="141" type="curve" smooth="yes" name="dv02"/>
       <point x="644" y="141"/>
       <point x="805" y="278"/>
-      <point x="805" y="478" type="curve" name="dh01" smooth="yes"/>
+      <point x="805" y="478" type="curve" smooth="yes" name="dh01"/>
       <point x="805" y="634"/>
       <point x="709" y="715"/>
-      <point x="524" y="715" type="curve" name="dv04" smooth="yes"/>
+      <point x="524" y="715" type="curve" smooth="yes" name="dv04"/>
       <point x="371" y="715" type="line"/>
       <point x="403" y="881" type="line"/>
-      <point x="557" y="881" type="line" name="dv05" smooth="yes"/>
+      <point x="557" y="881" type="line" smooth="yes" name="dv05"/>
       <point x="768" y="881"/>
       <point x="901" y="989"/>
-      <point x="901" y="1156" type="curve" name="sh01" smooth="yes"/>
+      <point x="901" y="1156" type="curve" smooth="yes" name="sh01"/>
       <point x="901" y="1289"/>
       <point x="821" y="1350"/>
-      <point x="650" y="1350" type="curve" name="sv03" smooth="yes"/>
+      <point x="650" y="1350" type="curve" smooth="yes" name="sv03"/>
       <point x="538" y="1350"/>
       <point x="412" y="1323"/>
       <point x="260" y="1270" type="curve"/>
       <point x="297" y="1456" type="line"/>
       <point x="462" y="1500"/>
       <point x="588" y="1520"/>
-      <point x="693" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="693" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="949" y="1520"/>
       <point x="1102" y="1400"/>
-      <point x="1102" y="1186" type="curve" name="sh02" smooth="yes"/>
+      <point x="1102" y="1186" type="curve" smooth="yes" name="sh02"/>
       <point x="1102" y="989"/>
       <point x="973" y="842"/>
       <point x="762" y="799" type="curve" name="iv01"/>
       <point x="911" y="771"/>
       <point x="1004" y="667"/>
-      <point x="1004" y="480" type="curve" name="dh02" smooth="yes"/>
+      <point x="1004" y="480" type="curve" smooth="yes" name="dh02"/>
       <point x="1004" y="179"/>
       <point x="761" y="-29"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04D_F_.glif b/source/Hack-Italic.ufo/glyphs/uni04D_F_.glif
index df3271bad..50fd2815a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04D_F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04D_F_.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04DF" format="1">
+<glyph name="uni04DF" format="2">
   <advance width="1233"/>
   <unicode hex="04DF"/>
   <outline>
     <contour>
-      <point x="457" y="1350" type="line" name="dv01" smooth="yes"/>
+      <point x="457" y="1350" type="line" smooth="yes" name="dv01"/>
       <point x="437" y="1350"/>
       <point x="426" y="1363"/>
       <point x="430" y="1383" type="curve" smooth="yes"/>
       <point x="458" y="1525" type="line"/>
       <point x="461" y="1543"/>
       <point x="471" y="1552"/>
-      <point x="490" y="1552" type="curve" name="dv02" smooth="yes"/>
+      <point x="490" y="1552" type="curve" smooth="yes" name="dv02"/>
       <point x="633" y="1552" type="line" smooth="yes"/>
       <point x="652" y="1552"/>
       <point x="661" y="1544"/>
-      <point x="661" y="1527" type="curve" name="hr01" smooth="yes"/>
+      <point x="661" y="1527" type="curve" smooth="yes" name="hr01"/>
       <point x="661" y="1524"/>
       <point x="661" y="1521"/>
       <point x="660" y="1519" type="curve" smooth="yes"/>
@@ -25,14 +25,14 @@
       <point x="600" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="848" y="1350" type="line" name="sv01" smooth="yes"/>
+      <point x="848" y="1350" type="line" smooth="yes" name="sv01"/>
       <point x="828" y="1350"/>
       <point x="817" y="1363"/>
       <point x="821" y="1383" type="curve" smooth="yes"/>
       <point x="849" y="1525" type="line"/>
       <point x="852" y="1543"/>
       <point x="862" y="1552"/>
-      <point x="881" y="1552" type="curve" name="sv02" smooth="yes"/>
+      <point x="881" y="1552" type="curve" smooth="yes" name="sv02"/>
       <point x="1024" y="1552" type="line" smooth="yes"/>
       <point x="1043" y="1552"/>
       <point x="1052" y="1544"/>
@@ -40,48 +40,48 @@
       <point x="1052" y="1524"/>
       <point x="1052" y="1521"/>
       <point x="1051" y="1519" type="curve" smooth="yes"/>
-      <point x="1023" y="1377" type="line" name="hr02" smooth="yes"/>
+      <point x="1023" y="1377" type="line" smooth="yes" name="hr02"/>
       <point x="1020" y="1359"/>
       <point x="1009" y="1350"/>
       <point x="991" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="426" y="-22" type="curve" name="ab01" smooth="yes"/>
+      <point x="426" y="-22" type="curve" smooth="yes" name="ab01"/>
       <point x="301" y="-22"/>
       <point x="187" y="-3"/>
       <point x="66" y="34" type="curve"/>
       <point x="100" y="207" type="line" name="iv01"/>
       <point x="192" y="162"/>
       <point x="311" y="138"/>
-      <point x="442" y="138" type="curve" name="sv03" smooth="yes"/>
+      <point x="442" y="138" type="curve" smooth="yes" name="sv03"/>
       <point x="695" y="138"/>
       <point x="840" y="228"/>
-      <point x="840" y="364" type="curve" name="dh01" smooth="yes"/>
+      <point x="840" y="364" type="curve" smooth="yes" name="dh01"/>
       <point x="840" y="465"/>
       <point x="743" y="532"/>
-      <point x="556" y="532" type="curve" name="dv03" smooth="yes"/>
+      <point x="556" y="532" type="curve" smooth="yes" name="dv03"/>
       <point x="398" y="532" type="line"/>
       <point x="426" y="676" type="line"/>
-      <point x="591" y="676" type="line" name="dv04" smooth="yes"/>
+      <point x="591" y="676" type="line" smooth="yes" name="dv04"/>
       <point x="775" y="676"/>
       <point x="879" y="741"/>
       <point x="900" y="824" type="curve" smooth="yes"/>
       <point x="903" y="833"/>
       <point x="904" y="842"/>
-      <point x="904" y="852" type="curve" name="ih01" smooth="yes"/>
+      <point x="904" y="852" type="curve" smooth="yes" name="ih01"/>
       <point x="904" y="931"/>
       <point x="815" y="984"/>
-      <point x="640" y="984" type="curve" name="sv04" smooth="yes"/>
+      <point x="640" y="984" type="curve" smooth="yes" name="sv04"/>
       <point x="545" y="984"/>
       <point x="427" y="968"/>
       <point x="282" y="932" type="curve" name="iv02"/>
       <point x="314" y="1099" type="line"/>
       <point x="461" y="1131"/>
       <point x="586" y="1147"/>
-      <point x="690" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="690" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="941" y="1147"/>
       <point x="1094" y="1057"/>
-      <point x="1094" y="905" type="curve" name="sh01" smooth="yes"/>
+      <point x="1094" y="905" type="curve" smooth="yes" name="sh01"/>
       <point x="1094" y="890"/>
       <point x="1092" y="874"/>
       <point x="1089" y="855" type="curve" smooth="yes"/>
@@ -90,7 +90,7 @@
       <point x="792" y="607" type="curve" name="iv03"/>
       <point x="941" y="579"/>
       <point x="1023" y="502"/>
-      <point x="1023" y="379" type="curve" name="dh02" smooth="yes"/>
+      <point x="1023" y="379" type="curve" smooth="yes" name="dh02"/>
       <point x="1023" y="363"/>
       <point x="1021" y="346"/>
       <point x="1018" y="327" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04E_0.glif b/source/Hack-Italic.ufo/glyphs/uni04E_0.glif
index 816af736a..f1e9fb866 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04E_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04E_0.glif
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E0" format="1">
+<glyph name="uni04E0" format="2">
   <advance width="1233"/>
   <unicode hex="04E0"/>
   <outline>
     <contour>
-      <point x="474" y="-28" type="curve" name="dv01" smooth="yes"/>
+      <point x="474" y="-28" type="curve" smooth="yes" name="dv01"/>
       <point x="141" y="-28"/>
       <point x="-41" y="96"/>
-      <point x="-41" y="331" type="curve" name="sh01" smooth="yes"/>
+      <point x="-41" y="331" type="curve" smooth="yes" name="sh01"/>
       <point x="-41" y="364"/>
       <point x="-37" y="398"/>
       <point x="-30" y="435" type="curve" name="sh02"/>
       <point x="171" y="435" type="line" name="sh04"/>
       <point x="167" y="412"/>
       <point x="164" y="390"/>
-      <point x="164" y="369" type="curve" name="sh03" smooth="yes"/>
+      <point x="164" y="369" type="curve" smooth="yes" name="sh03"/>
       <point x="164" y="224"/>
       <point x="274" y="142"/>
-      <point x="502" y="142" type="curve" name="dv02" smooth="yes"/>
+      <point x="502" y="142" type="curve" smooth="yes" name="dv02"/>
       <point x="750" y="142"/>
       <point x="912" y="240"/>
-      <point x="949" y="435" type="curve" name="sh05" smooth="yes"/>
+      <point x="949" y="435" type="curve" smooth="yes" name="sh05"/>
       <point x="953" y="456"/>
       <point x="955" y="476"/>
-      <point x="955" y="496" type="curve" name="ah01" smooth="yes"/>
+      <point x="955" y="496" type="curve" smooth="yes" name="ah01"/>
       <point x="955" y="637"/>
       <point x="852" y="716"/>
-      <point x="653" y="716" type="curve" name="dv03" smooth="yes"/>
+      <point x="653" y="716" type="curve" smooth="yes" name="dv03"/>
       <point x="479" y="716" type="line"/>
       <point x="512" y="882" type="line"/>
       <point x="967" y="1323" type="line" name="sh06"/>
@@ -37,10 +37,10 @@
       <point x="738" y="884" type="line" name="ih01"/>
       <point x="892" y="884"/>
       <point x="1052" y="800"/>
-      <point x="1116" y="677" type="curve" name="hr02" smooth="yes"/>
+      <point x="1116" y="677" type="curve" smooth="yes" name="hr02"/>
       <point x="1143" y="628"/>
       <point x="1156" y="570"/>
-      <point x="1156" y="503" type="curve" name="sh07" smooth="yes"/>
+      <point x="1156" y="503" type="curve" smooth="yes" name="sh07"/>
       <point x="1156" y="363"/>
       <point x="1092" y="202"/>
       <point x="932" y="93" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04E_1.glif b/source/Hack-Italic.ufo/glyphs/uni04E_1.glif
index fbf8f55f7..65467e5ec 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04E_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04E_1.glif
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E1" format="1">
+<glyph name="uni04E1" format="2">
   <advance width="1233"/>
   <unicode hex="04E1"/>
   <outline>
     <contour>
-      <point x="342" y="-436" type="curve" name="hr00" smooth="yes"/>
+      <point x="342" y="-436" type="curve" smooth="yes" name="hr00"/>
       <point x="214" y="-436"/>
       <point x="93" y="-415"/>
       <point x="-51" y="-362" type="curve"/>
       <point x="-13" y="-167" type="line"/>
       <point x="87" y="-232"/>
       <point x="216" y="-266"/>
-      <point x="361" y="-266" type="curve" name="dv01" smooth="yes"/>
+      <point x="361" y="-266" type="curve" smooth="yes" name="dv01"/>
       <point x="621" y="-266"/>
       <point x="772" y="-160"/>
       <point x="807" y="27" type="curve" smooth="yes"/>
       <point x="811" y="48"/>
       <point x="813" y="68"/>
-      <point x="813" y="88" type="curve" name="dh01" smooth="yes"/>
+      <point x="813" y="88" type="curve" smooth="yes" name="dh01"/>
       <point x="813" y="149"/>
       <point x="794" y="197"/>
       <point x="755" y="234" type="curve" smooth="yes"/>
       <point x="702" y="285"/>
       <point x="618" y="308"/>
-      <point x="511" y="308" type="curve" name="dv02" smooth="yes"/>
+      <point x="511" y="308" type="curve" smooth="yes" name="dv02"/>
       <point x="337" y="308" type="line"/>
       <point x="370" y="474" type="line"/>
       <point x="897" y="973" type="line" name="ih01"/>
@@ -37,7 +37,7 @@
       <point x="974" y="269" type="curve" smooth="yes"/>
       <point x="999" y="221"/>
       <point x="1014" y="162"/>
-      <point x="1014" y="95" type="curve" name="dh02" smooth="yes"/>
+      <point x="1014" y="95" type="curve" smooth="yes" name="dh02"/>
       <point x="1014" y="-45"/>
       <point x="950" y="-206"/>
       <point x="790" y="-315" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04E_2.glif b/source/Hack-Italic.ufo/glyphs/uni04E_2.glif
index 72eae1271..9a3072501 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04E_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04E_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E2" format="1">
+<glyph name="uni04E2" format="2">
   <advance width="1233"/>
   <unicode hex="04E2"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04E_3.glif b/source/Hack-Italic.ufo/glyphs/uni04E_3.glif
index ba0f33f7d..a319db43e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04E_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04E_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E3" format="1">
+<glyph name="uni04E3" format="2">
   <advance width="1233"/>
   <unicode hex="04E3"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04E_4.glif b/source/Hack-Italic.ufo/glyphs/uni04E_4.glif
index 722bd4600..d603e9684 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04E_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04E_4.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E4" format="1">
+<glyph name="uni04E4" format="2">
   <advance width="1233"/>
   <unicode hex="04E4"/>
   <outline>
     <contour>
-      <point x="513" y="1647" type="line" name="hr00" smooth="yes"/>
+      <point x="513" y="1647" type="line" smooth="yes" name="hr00"/>
       <point x="493" y="1647"/>
       <point x="482" y="1660"/>
       <point x="486" y="1680" type="curve" smooth="yes"/>
       <point x="514" y="1823" type="line"/>
       <point x="517" y="1841"/>
       <point x="527" y="1850"/>
-      <point x="546" y="1850" type="curve" name="dv01" smooth="yes"/>
+      <point x="546" y="1850" type="curve" smooth="yes" name="dv01"/>
       <point x="690" y="1850" type="line" smooth="yes"/>
       <point x="708" y="1850"/>
       <point x="717" y="1842"/>
@@ -25,14 +25,14 @@
       <point x="655" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="904" y="1647" type="line" name="sv01" smooth="yes"/>
+      <point x="904" y="1647" type="line" smooth="yes" name="sv01"/>
       <point x="884" y="1647"/>
       <point x="873" y="1660"/>
       <point x="877" y="1680" type="curve" smooth="yes"/>
       <point x="905" y="1823" type="line"/>
       <point x="908" y="1841"/>
       <point x="918" y="1850"/>
-      <point x="937" y="1850" type="curve" name="sv02" smooth="yes"/>
+      <point x="937" y="1850" type="curve" smooth="yes" name="sv02"/>
       <point x="1080" y="1850" type="line" smooth="yes"/>
       <point x="1100" y="1850"/>
       <point x="1111" y="1837"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04E_5.glif b/source/Hack-Italic.ufo/glyphs/uni04E_5.glif
index 2145c5c8e..ed9bb1683 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04E_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04E_5.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E5" format="1">
+<glyph name="uni04E5" format="2">
   <advance width="1233"/>
   <unicode hex="04E5"/>
   <outline>
     <contour>
-      <point x="469" y="1310" type="line" name="hr00" smooth="yes"/>
+      <point x="469" y="1310" type="line" smooth="yes" name="hr00"/>
       <point x="449" y="1310"/>
       <point x="438" y="1323"/>
       <point x="442" y="1343" type="curve" smooth="yes"/>
       <point x="470" y="1485" type="line"/>
       <point x="473" y="1503"/>
       <point x="483" y="1512"/>
-      <point x="502" y="1512" type="curve" name="at03" smooth="yes"/>
+      <point x="502" y="1512" type="curve" smooth="yes" name="at03"/>
       <point x="645" y="1512" type="line" smooth="yes"/>
       <point x="664" y="1512"/>
       <point x="673" y="1504"/>
@@ -25,14 +25,14 @@
       <point x="612" y="1310" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="860" y="1310" type="line" name="sv01" smooth="yes"/>
+      <point x="860" y="1310" type="line" smooth="yes" name="sv01"/>
       <point x="840" y="1310"/>
       <point x="829" y="1323"/>
       <point x="833" y="1343" type="curve" smooth="yes"/>
       <point x="861" y="1485" type="line"/>
       <point x="864" y="1503"/>
       <point x="874" y="1512"/>
-      <point x="893" y="1512" type="curve" name="at04" smooth="yes"/>
+      <point x="893" y="1512" type="curve" smooth="yes" name="at04"/>
       <point x="1036" y="1512" type="line" smooth="yes"/>
       <point x="1055" y="1512"/>
       <point x="1064" y="1504"/>
@@ -43,7 +43,7 @@
       <point x="1035" y="1337" type="line" smooth="yes"/>
       <point x="1032" y="1319"/>
       <point x="1021" y="1310"/>
-      <point x="1003" y="1310" type="curve" name="sv02" smooth="yes"/>
+      <point x="1003" y="1310" type="curve" smooth="yes" name="sv02"/>
     </contour>
     <contour>
       <point x="304" y="1120" type="line" name="at01"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04E_6.glif b/source/Hack-Italic.ufo/glyphs/uni04E_6.glif
index 9419b6e8c..857f67e8e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04E_6.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04E_6.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E6" format="1">
+<glyph name="uni04E6" format="2">
   <advance width="1233"/>
   <unicode hex="04E6"/>
   <outline>
     <contour>
-      <point x="492" y="1647" type="line" name="hr00" smooth="yes"/>
+      <point x="492" y="1647" type="line" smooth="yes" name="hr00"/>
       <point x="472" y="1647"/>
       <point x="461" y="1660"/>
       <point x="465" y="1680" type="curve" smooth="yes"/>
       <point x="493" y="1823" type="line"/>
       <point x="496" y="1841"/>
       <point x="506" y="1850"/>
-      <point x="525" y="1850" type="curve" name="dv03" smooth="yes"/>
+      <point x="525" y="1850" type="curve" smooth="yes" name="dv03"/>
       <point x="669" y="1850" type="line" smooth="yes"/>
       <point x="687" y="1850"/>
       <point x="696" y="1842"/>
@@ -25,14 +25,14 @@
       <point x="634" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="883" y="1647" type="line" name="sv01" smooth="yes"/>
+      <point x="883" y="1647" type="line" smooth="yes" name="sv01"/>
       <point x="863" y="1647"/>
       <point x="852" y="1660"/>
       <point x="856" y="1680" type="curve" smooth="yes"/>
       <point x="884" y="1823" type="line"/>
       <point x="887" y="1841"/>
       <point x="897" y="1850"/>
-      <point x="916" y="1850" type="curve" name="sv02" smooth="yes"/>
+      <point x="916" y="1850" type="curve" smooth="yes" name="sv02"/>
       <point x="1059" y="1850" type="line" smooth="yes"/>
       <point x="1079" y="1850"/>
       <point x="1090" y="1837"/>
@@ -43,10 +43,10 @@
       <point x="1026" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="480" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="480" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="215" y="-29"/>
       <point x="82" y="134"/>
-      <point x="82" y="459" type="curve" name="sh01" smooth="yes"/>
+      <point x="82" y="459" type="curve" smooth="yes" name="sh01"/>
       <point x="82" y="630"/>
       <point x="116" y="818"/>
       <point x="167" y="975" type="curve" smooth="yes"/>
@@ -55,10 +55,10 @@
       <point x="304" y="1272" type="curve" smooth="yes"/>
       <point x="416" y="1439"/>
       <point x="560" y="1520"/>
-      <point x="751" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="751" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1019" y="1520"/>
       <point x="1151" y="1362"/>
-      <point x="1151" y="1037" type="curve" name="sh02" smooth="yes"/>
+      <point x="1151" y="1037" type="curve" smooth="yes" name="sh02"/>
       <point x="1151" y="877"/>
       <point x="1117" y="683"/>
       <point x="1064" y="516" type="curve" smooth="yes"/>
@@ -69,22 +69,22 @@
       <point x="667" y="-29"/>
     </contour>
     <contour>
-      <point x="497" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="497" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="660" y="135"/>
       <point x="752" y="249"/>
       <point x="825" y="437" type="curve" smooth="yes"/>
       <point x="897" y="625"/>
       <point x="944" y="877"/>
-      <point x="944" y="1060" type="curve" name="ah01" smooth="yes"/>
+      <point x="944" y="1060" type="curve" smooth="yes" name="ah01"/>
       <point x="944" y="1236"/>
       <point x="901" y="1356"/>
-      <point x="734" y="1356" type="curve" name="sv03" smooth="yes"/>
+      <point x="734" y="1356" type="curve" smooth="yes" name="sv03"/>
       <point x="603" y="1356"/>
       <point x="522" y="1283"/>
       <point x="455" y="1159" type="curve" smooth="yes"/>
       <point x="355" y="972"/>
       <point x="287" y="651"/>
-      <point x="287" y="432" type="curve" name="sh03" smooth="yes"/>
+      <point x="287" y="432" type="curve" smooth="yes" name="sh03"/>
       <point x="287" y="247"/>
       <point x="334" y="135"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04E_7.glif b/source/Hack-Italic.ufo/glyphs/uni04E_7.glif
index 2077cf7b5..fde470751 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04E_7.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04E_7.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E7" format="1">
+<glyph name="uni04E7" format="2">
   <advance width="1233"/>
   <unicode hex="04E7"/>
   <outline>
     <contour>
-      <point x="469" y="1350" type="line" name="hr00" smooth="yes"/>
+      <point x="469" y="1350" type="line" smooth="yes" name="hr00"/>
       <point x="449" y="1350"/>
       <point x="438" y="1363"/>
       <point x="442" y="1383" type="curve" smooth="yes"/>
       <point x="470" y="1525" type="line"/>
       <point x="473" y="1543"/>
       <point x="483" y="1552"/>
-      <point x="502" y="1552" type="curve" name="dv03" smooth="yes"/>
+      <point x="502" y="1552" type="curve" smooth="yes" name="dv03"/>
       <point x="645" y="1552" type="line" smooth="yes"/>
       <point x="664" y="1552"/>
       <point x="673" y="1544"/>
@@ -25,14 +25,14 @@
       <point x="612" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="860" y="1350" type="line" name="sv01" smooth="yes"/>
+      <point x="860" y="1350" type="line" smooth="yes" name="sv01"/>
       <point x="840" y="1350"/>
       <point x="829" y="1363"/>
       <point x="833" y="1383" type="curve" smooth="yes"/>
       <point x="861" y="1525" type="line"/>
       <point x="864" y="1543"/>
       <point x="874" y="1552"/>
-      <point x="893" y="1552" type="curve" name="sv02" smooth="yes"/>
+      <point x="893" y="1552" type="curve" smooth="yes" name="sv02"/>
       <point x="1036" y="1552" type="line" smooth="yes"/>
       <point x="1055" y="1552"/>
       <point x="1064" y="1544"/>
@@ -46,19 +46,19 @@
       <point x="1003" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="514" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="514" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="253" y="-29"/>
       <point x="117" y="121"/>
-      <point x="117" y="392" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="392" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="571"/>
       <point x="177" y="769"/>
       <point x="274" y="911" type="curve" smooth="yes"/>
       <point x="382" y="1068"/>
       <point x="526" y="1147"/>
-      <point x="717" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="717" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="974" y="1147"/>
       <point x="1114" y="1004"/>
-      <point x="1114" y="724" type="curve" name="sh02" smooth="yes"/>
+      <point x="1114" y="724" type="curve" smooth="yes" name="sh02"/>
       <point x="1114" y="550"/>
       <point x="1060" y="354"/>
       <point x="958" y="207" type="curve" smooth="yes"/>
@@ -66,16 +66,16 @@
       <point x="707" y="-29"/>
     </contour>
     <contour>
-      <point x="524" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="524" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="792" y="127"/>
       <point x="920" y="442"/>
-      <point x="920" y="707" type="curve" name="ah01" smooth="yes"/>
+      <point x="920" y="707" type="curve" smooth="yes" name="ah01"/>
       <point x="920" y="906"/>
       <point x="850" y="991"/>
-      <point x="709" y="991" type="curve" name="sv03" smooth="yes"/>
+      <point x="709" y="991" type="curve" smooth="yes" name="sv03"/>
       <point x="441" y="991"/>
       <point x="313" y="676"/>
-      <point x="313" y="411" type="curve" name="sh03" smooth="yes"/>
+      <point x="313" y="411" type="curve" smooth="yes" name="sh03"/>
       <point x="313" y="212"/>
       <point x="383" y="127"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04E_8.glif b/source/Hack-Italic.ufo/glyphs/uni04E_8.glif
index a88a74259..17c725160 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04E_8.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04E_8.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E8" format="1">
+<glyph name="uni04E8" format="2">
   <advance width="1233"/>
   <unicode hex="04E8"/>
   <outline>
     <contour>
-      <point x="465" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="465" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="210" y="-29"/>
       <point x="81" y="116"/>
-      <point x="81" y="421" type="curve" name="sh01" smooth="yes"/>
+      <point x="81" y="421" type="curve" smooth="yes" name="sh01"/>
       <point x="81" y="514"/>
       <point x="93" y="622"/>
       <point x="117" y="745" type="curve" smooth="yes"/>
       <point x="217" y="1258"/>
       <point x="424" y="1520"/>
-      <point x="767" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="767" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1028" y="1520"/>
       <point x="1152" y="1369"/>
-      <point x="1152" y="1068" type="curve" name="sh02" smooth="yes"/>
+      <point x="1152" y="1068" type="curve" smooth="yes" name="sh02"/>
       <point x="1152" y="975"/>
       <point x="1140" y="867"/>
       <point x="1116" y="745" type="curve" smooth="yes"/>
@@ -27,23 +27,23 @@
       <point x="928" y="881" type="line" name="dv03"/>
       <point x="939" y="956"/>
       <point x="945" y="1021"/>
-      <point x="945" y="1080" type="curve" name="ah01" smooth="yes"/>
+      <point x="945" y="1080" type="curve" smooth="yes" name="ah01"/>
       <point x="945" y="1256"/>
       <point x="890" y="1356"/>
-      <point x="735" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="735" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="530" y="1356"/>
       <point x="429" y="1177"/>
       <point x="357" y="881" type="curve"/>
     </contour>
     <contour>
-      <point x="499" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="499" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="705" y="135"/>
       <point x="818" y="319"/>
       <point x="898" y="711" type="curve" name="dv02"/>
       <point x="321" y="711" type="line"/>
       <point x="298" y="594"/>
       <point x="289" y="495"/>
-      <point x="289" y="415" type="curve" name="sh03" smooth="yes"/>
+      <point x="289" y="415" type="curve" smooth="yes" name="sh03"/>
       <point x="289" y="359"/>
       <point x="294" y="313"/>
       <point x="304" y="276" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04E_9.glif b/source/Hack-Italic.ufo/glyphs/uni04E_9.glif
index 8284e348f..f9b118fd3 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04E_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04E_9.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E9" format="1">
+<glyph name="uni04E9" format="2">
   <advance width="1233"/>
   <unicode hex="04E9"/>
   <outline>
     <contour>
-      <point x="502" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="502" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="246" y="-29"/>
       <point x="116" y="108"/>
-      <point x="116" y="364" type="curve" name="sh01" smooth="yes"/>
+      <point x="116" y="364" type="curve" smooth="yes" name="sh01"/>
       <point x="116" y="423"/>
       <point x="123" y="488"/>
       <point x="137" y="559" type="curve" smooth="yes"/>
@@ -16,10 +16,10 @@
       <point x="345" y="996" type="curve" smooth="yes"/>
       <point x="452" y="1101"/>
       <point x="580" y="1147"/>
-      <point x="729" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="729" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="986" y="1147"/>
       <point x="1117" y="1012"/>
-      <point x="1117" y="753" type="curve" name="sh02" smooth="yes"/>
+      <point x="1117" y="753" type="curve" smooth="yes" name="sh02"/>
       <point x="1117" y="694"/>
       <point x="1110" y="630"/>
       <point x="1096" y="559" type="curve" smooth="yes"/>
@@ -30,23 +30,23 @@
       <point x="910" y="611" type="line" name="sh03"/>
       <point x="917" y="654"/>
       <point x="920" y="694"/>
-      <point x="920" y="731" type="curve" name="ah01" smooth="yes"/>
+      <point x="920" y="731" type="curve" smooth="yes" name="ah01"/>
       <point x="920" y="894"/>
       <point x="853" y="991"/>
-      <point x="700" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="700" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="513" y="991"/>
       <point x="399" y="846"/>
       <point x="343" y="611" type="curve"/>
     </contour>
     <contour>
-      <point x="532" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="532" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="720" y="127"/>
       <point x="819" y="270"/>
       <point x="873" y="447" type="curve" name="dv02"/>
       <point x="316" y="447" type="line" name="sh05"/>
       <point x="314" y="426"/>
       <point x="313" y="406"/>
-      <point x="313" y="387" type="curve" name="sh04" smooth="yes"/>
+      <point x="313" y="387" type="curve" smooth="yes" name="sh04"/>
       <point x="313" y="239"/>
       <point x="367" y="127"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04E_A_.glif b/source/Hack-Italic.ufo/glyphs/uni04E_A_.glif
index dffcaba63..bb0f803db 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04E_A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04E_A_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04EA" format="1">
+<glyph name="uni04EA" format="2">
   <advance width="1233"/>
   <unicode hex="04EA"/>
   <outline>
     <contour>
-      <point x="492" y="1647" type="line" name="hr00" smooth="yes"/>
+      <point x="492" y="1647" type="line" smooth="yes" name="hr00"/>
       <point x="472" y="1647"/>
       <point x="461" y="1660"/>
       <point x="465" y="1680" type="curve" smooth="yes"/>
       <point x="493" y="1823" type="line"/>
       <point x="496" y="1841"/>
       <point x="506" y="1850"/>
-      <point x="525" y="1850" type="curve" name="dv03" smooth="yes"/>
+      <point x="525" y="1850" type="curve" smooth="yes" name="dv03"/>
       <point x="669" y="1850" type="line" smooth="yes"/>
       <point x="687" y="1850"/>
       <point x="696" y="1842"/>
@@ -25,14 +25,14 @@
       <point x="634" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="883" y="1647" type="line" name="sv01" smooth="yes"/>
+      <point x="883" y="1647" type="line" smooth="yes" name="sv01"/>
       <point x="863" y="1647"/>
       <point x="852" y="1660"/>
       <point x="856" y="1680" type="curve" smooth="yes"/>
       <point x="884" y="1823" type="line"/>
       <point x="887" y="1841"/>
       <point x="897" y="1850"/>
-      <point x="916" y="1850" type="curve" name="sv02" smooth="yes"/>
+      <point x="916" y="1850" type="curve" smooth="yes" name="sv02"/>
       <point x="1059" y="1850" type="line" smooth="yes"/>
       <point x="1079" y="1850"/>
       <point x="1090" y="1837"/>
@@ -43,19 +43,19 @@
       <point x="1026" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="465" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="465" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="210" y="-29"/>
       <point x="81" y="116"/>
-      <point x="81" y="421" type="curve" name="sh01" smooth="yes"/>
+      <point x="81" y="421" type="curve" smooth="yes" name="sh01"/>
       <point x="81" y="514"/>
       <point x="93" y="622"/>
       <point x="117" y="745" type="curve" smooth="yes"/>
       <point x="217" y="1258"/>
       <point x="424" y="1520"/>
-      <point x="767" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="767" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1028" y="1520"/>
       <point x="1152" y="1369"/>
-      <point x="1152" y="1068" type="curve" name="sh02" smooth="yes"/>
+      <point x="1152" y="1068" type="curve" smooth="yes" name="sh02"/>
       <point x="1152" y="975"/>
       <point x="1140" y="867"/>
       <point x="1116" y="745" type="curve" smooth="yes"/>
@@ -66,23 +66,23 @@
       <point x="928" y="881" type="line" name="dv05"/>
       <point x="939" y="956"/>
       <point x="945" y="1021"/>
-      <point x="945" y="1080" type="curve" name="ah01" smooth="yes"/>
+      <point x="945" y="1080" type="curve" smooth="yes" name="ah01"/>
       <point x="945" y="1256"/>
       <point x="890" y="1356"/>
-      <point x="735" y="1356" type="curve" name="sv03" smooth="yes"/>
+      <point x="735" y="1356" type="curve" smooth="yes" name="sv03"/>
       <point x="530" y="1356"/>
       <point x="429" y="1177"/>
       <point x="357" y="881" type="curve"/>
     </contour>
     <contour>
-      <point x="499" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="499" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="705" y="135"/>
       <point x="818" y="319"/>
       <point x="898" y="711" type="curve" name="dv04"/>
       <point x="321" y="711" type="line"/>
       <point x="298" y="594"/>
       <point x="289" y="495"/>
-      <point x="289" y="415" type="curve" name="sh03" smooth="yes"/>
+      <point x="289" y="415" type="curve" smooth="yes" name="sh03"/>
       <point x="289" y="359"/>
       <point x="294" y="313"/>
       <point x="304" y="276" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04E_B_.glif b/source/Hack-Italic.ufo/glyphs/uni04E_B_.glif
index 9d6c487e5..667fe5a73 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04E_B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04E_B_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04EB" format="1">
+<glyph name="uni04EB" format="2">
   <advance width="1233"/>
   <unicode hex="04EB"/>
   <outline>
     <contour>
-      <point x="469" y="1350" type="line" name="hr00" smooth="yes"/>
+      <point x="469" y="1350" type="line" smooth="yes" name="hr00"/>
       <point x="449" y="1350"/>
       <point x="438" y="1363"/>
       <point x="442" y="1383" type="curve" smooth="yes"/>
       <point x="470" y="1525" type="line"/>
       <point x="473" y="1543"/>
       <point x="483" y="1552"/>
-      <point x="502" y="1552" type="curve" name="dv03" smooth="yes"/>
+      <point x="502" y="1552" type="curve" smooth="yes" name="dv03"/>
       <point x="645" y="1552" type="line" smooth="yes"/>
       <point x="664" y="1552"/>
       <point x="673" y="1544"/>
@@ -25,14 +25,14 @@
       <point x="612" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="860" y="1350" type="line" name="sv01" smooth="yes"/>
+      <point x="860" y="1350" type="line" smooth="yes" name="sv01"/>
       <point x="840" y="1350"/>
       <point x="829" y="1363"/>
       <point x="833" y="1383" type="curve" smooth="yes"/>
       <point x="861" y="1525" type="line"/>
       <point x="864" y="1543"/>
       <point x="874" y="1552"/>
-      <point x="893" y="1552" type="curve" name="sv02" smooth="yes"/>
+      <point x="893" y="1552" type="curve" smooth="yes" name="sv02"/>
       <point x="1036" y="1552" type="line" smooth="yes"/>
       <point x="1055" y="1552"/>
       <point x="1064" y="1544"/>
@@ -46,10 +46,10 @@
       <point x="1003" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="502" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="502" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="246" y="-29"/>
       <point x="116" y="108"/>
-      <point x="116" y="364" type="curve" name="sh01" smooth="yes"/>
+      <point x="116" y="364" type="curve" smooth="yes" name="sh01"/>
       <point x="116" y="423"/>
       <point x="123" y="488"/>
       <point x="137" y="559" type="curve" smooth="yes"/>
@@ -58,10 +58,10 @@
       <point x="345" y="996" type="curve" smooth="yes"/>
       <point x="452" y="1101"/>
       <point x="580" y="1147"/>
-      <point x="729" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="729" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="986" y="1147"/>
       <point x="1117" y="1012"/>
-      <point x="1117" y="753" type="curve" name="sh02" smooth="yes"/>
+      <point x="1117" y="753" type="curve" smooth="yes" name="sh02"/>
       <point x="1117" y="694"/>
       <point x="1110" y="630"/>
       <point x="1096" y="559" type="curve" smooth="yes"/>
@@ -72,23 +72,23 @@
       <point x="910" y="611" type="line" name="sh03"/>
       <point x="917" y="654"/>
       <point x="920" y="694"/>
-      <point x="920" y="731" type="curve" name="ah01" smooth="yes"/>
+      <point x="920" y="731" type="curve" smooth="yes" name="ah01"/>
       <point x="920" y="894"/>
       <point x="853" y="991"/>
-      <point x="700" y="991" type="curve" name="sv03" smooth="yes"/>
+      <point x="700" y="991" type="curve" smooth="yes" name="sv03"/>
       <point x="513" y="991"/>
       <point x="399" y="846"/>
       <point x="343" y="611" type="curve"/>
     </contour>
     <contour>
-      <point x="532" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="532" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="720" y="127"/>
       <point x="819" y="270"/>
       <point x="873" y="447" type="curve" name="dv04"/>
       <point x="316" y="447" type="line" name="sh05"/>
       <point x="314" y="426"/>
       <point x="313" y="406"/>
-      <point x="313" y="387" type="curve" name="sh04" smooth="yes"/>
+      <point x="313" y="387" type="curve" smooth="yes" name="sh04"/>
       <point x="313" y="239"/>
       <point x="367" y="127"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04E_C_.glif b/source/Hack-Italic.ufo/glyphs/uni04E_C_.glif
index d6ca06e62..59de803d6 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04E_C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04E_C_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04EC" format="1">
+<glyph name="uni04EC" format="2">
   <advance width="1233"/>
   <unicode hex="04EC"/>
   <outline>
     <contour>
-      <point x="442" y="1647" type="line" name="hr00" smooth="yes"/>
+      <point x="442" y="1647" type="line" smooth="yes" name="hr00"/>
       <point x="422" y="1647"/>
       <point x="411" y="1660"/>
       <point x="415" y="1680" type="curve" smooth="yes"/>
       <point x="443" y="1823" type="line"/>
       <point x="446" y="1841"/>
       <point x="456" y="1850"/>
-      <point x="475" y="1850" type="curve" name="dv03" smooth="yes"/>
+      <point x="475" y="1850" type="curve" smooth="yes" name="dv03"/>
       <point x="619" y="1850" type="line" smooth="yes"/>
       <point x="637" y="1850"/>
       <point x="646" y="1842"/>
@@ -25,14 +25,14 @@
       <point x="584" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="833" y="1647" type="line" name="sv01" smooth="yes"/>
+      <point x="833" y="1647" type="line" smooth="yes" name="sv01"/>
       <point x="813" y="1647"/>
       <point x="802" y="1660"/>
       <point x="806" y="1680" type="curve" smooth="yes"/>
       <point x="834" y="1823" type="line"/>
       <point x="837" y="1841"/>
       <point x="847" y="1850"/>
-      <point x="866" y="1850" type="curve" name="sv02" smooth="yes"/>
+      <point x="866" y="1850" type="curve" smooth="yes" name="sv02"/>
       <point x="1009" y="1850" type="line" smooth="yes"/>
       <point x="1029" y="1850"/>
       <point x="1040" y="1837"/>
@@ -43,14 +43,14 @@
       <point x="976" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="319" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="319" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="200" y="-29"/>
       <point x="95" y="-2"/>
       <point x="4" y="53" type="curve"/>
       <point x="45" y="260" type="line"/>
       <point x="129" y="176"/>
       <point x="238" y="135"/>
-      <point x="353" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="353" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="617" y="135"/>
       <point x="780" y="358"/>
       <point x="846" y="661" type="curve" name="dv04"/>
@@ -59,20 +59,20 @@
       <point x="874" y="831" type="line" name="sh01"/>
       <point x="879" y="895"/>
       <point x="882" y="967"/>
-      <point x="882" y="1018" type="curve" name="dh01" smooth="yes"/>
+      <point x="882" y="1018" type="curve" smooth="yes" name="dh01"/>
       <point x="882" y="1175"/>
       <point x="852" y="1356"/>
-      <point x="597" y="1356" type="curve" name="sv03" smooth="yes"/>
+      <point x="597" y="1356" type="curve" smooth="yes" name="sv03"/>
       <point x="473" y="1356"/>
       <point x="352" y="1314"/>
       <point x="233" y="1231" type="curve"/>
       <point x="274" y="1438" type="line"/>
       <point x="386" y="1493"/>
       <point x="502" y="1520"/>
-      <point x="622" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="622" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="999" y="1520"/>
       <point x="1100" y="1252"/>
-      <point x="1100" y="996" type="curve" name="dh02" smooth="yes"/>
+      <point x="1100" y="996" type="curve" smooth="yes" name="dh02"/>
       <point x="1100" y="919"/>
       <point x="1091" y="835"/>
       <point x="1073" y="744" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04E_D_.glif b/source/Hack-Italic.ufo/glyphs/uni04E_D_.glif
index 0b8ff86cf..eb7fe617c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04E_D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04E_D_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04ED" format="1">
+<glyph name="uni04ED" format="2">
   <advance width="1233"/>
   <unicode hex="04ED"/>
   <outline>
     <contour>
-      <point x="469" y="1350" type="line" name="hr00" smooth="yes"/>
+      <point x="469" y="1350" type="line" smooth="yes" name="hr00"/>
       <point x="449" y="1350"/>
       <point x="438" y="1363"/>
       <point x="442" y="1383" type="curve" smooth="yes"/>
       <point x="470" y="1525" type="line"/>
       <point x="473" y="1543"/>
       <point x="483" y="1552"/>
-      <point x="502" y="1552" type="curve" name="dv03" smooth="yes"/>
+      <point x="502" y="1552" type="curve" smooth="yes" name="dv03"/>
       <point x="645" y="1552" type="line" smooth="yes"/>
       <point x="664" y="1552"/>
       <point x="673" y="1544"/>
@@ -25,14 +25,14 @@
       <point x="612" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="860" y="1350" type="line" name="sv01" smooth="yes"/>
+      <point x="860" y="1350" type="line" smooth="yes" name="sv01"/>
       <point x="840" y="1350"/>
       <point x="829" y="1363"/>
       <point x="833" y="1383" type="curve" smooth="yes"/>
       <point x="861" y="1525" type="line"/>
       <point x="864" y="1543"/>
       <point x="874" y="1552"/>
-      <point x="893" y="1552" type="curve" name="sv02" smooth="yes"/>
+      <point x="893" y="1552" type="curve" smooth="yes" name="sv02"/>
       <point x="1036" y="1552" type="line" smooth="yes"/>
       <point x="1055" y="1552"/>
       <point x="1064" y="1544"/>
@@ -46,14 +46,14 @@
       <point x="1003" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="416" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="416" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="293" y="-29"/>
       <point x="201" y="0"/>
       <point x="112" y="57" type="curve"/>
       <point x="150" y="248" type="line"/>
       <point x="219" y="167"/>
       <point x="313" y="127"/>
-      <point x="433" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="433" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="668" y="127"/>
       <point x="812" y="276"/>
       <point x="873" y="516" type="curve" name="dv04"/>
@@ -62,20 +62,20 @@
       <point x="896" y="660" type="line" name="dv05"/>
       <point x="897" y="673"/>
       <point x="897" y="685"/>
-      <point x="897" y="697" type="curve" name="dh01" smooth="yes"/>
+      <point x="897" y="697" type="curve" smooth="yes" name="dh01"/>
       <point x="897" y="845"/>
       <point x="836" y="991"/>
-      <point x="609" y="991" type="curve" name="sv03" smooth="yes"/>
+      <point x="609" y="991" type="curve" smooth="yes" name="sv03"/>
       <point x="488" y="991"/>
       <point x="378" y="951"/>
       <point x="270" y="868" type="curve"/>
       <point x="308" y="1061" type="line"/>
       <point x="420" y="1117"/>
       <point x="522" y="1147"/>
-      <point x="647" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="647" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="979" y="1147"/>
       <point x="1093" y="938"/>
-      <point x="1093" y="721" type="curve" name="dh02" smooth="yes"/>
+      <point x="1093" y="721" type="curve" smooth="yes" name="dh02"/>
       <point x="1093" y="670"/>
       <point x="1087" y="618"/>
       <point x="1076" y="559" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04E_E_.glif b/source/Hack-Italic.ufo/glyphs/uni04E_E_.glif
index 04d15fc7a..4335dd880 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04E_E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04E_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04EE" format="1">
+<glyph name="uni04EE" format="2">
   <advance width="1233"/>
   <unicode hex="04EE"/>
   <outline>
@@ -29,7 +29,7 @@
       <point x="513" y="156" type="curve" smooth="yes"/>
       <point x="450" y="82"/>
       <point x="359" y="0"/>
-      <point x="202" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="202" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="54" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04E_F_.glif b/source/Hack-Italic.ufo/glyphs/uni04E_F_.glif
index 6ef3453d9..805223515 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04E_F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04E_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04EF" format="1">
+<glyph name="uni04EF" format="2">
   <advance width="1233"/>
   <unicode hex="04EF"/>
   <outline>
@@ -11,7 +11,7 @@
     </contour>
     <contour>
       <point x="10" y="-272" type="line"/>
-      <point x="118" y="-272" type="line" name="dv02" smooth="yes"/>
+      <point x="118" y="-272" type="line" smooth="yes" name="dv02"/>
       <point x="229" y="-272"/>
       <point x="303" y="-208"/>
       <point x="376" y="-66" type="curve" smooth="yes"/>
@@ -30,7 +30,7 @@
       <point x="432" y="-276" type="curve" smooth="yes"/>
       <point x="352" y="-381"/>
       <point x="250" y="-426"/>
-      <point x="129" y="-426" type="curve" name="dv01" smooth="yes"/>
+      <point x="129" y="-426" type="curve" smooth="yes" name="dv01"/>
       <point x="-19" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04F_0.glif b/source/Hack-Italic.ufo/glyphs/uni04F_0.glif
index 7ea9863a8..d782d005b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04F_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04F_0.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F0" format="1">
+<glyph name="uni04F0" format="2">
   <advance width="1233"/>
   <unicode hex="04F0"/>
   <outline>
     <contour>
-      <point x="517" y="1647" type="line" name="hr00" smooth="yes"/>
+      <point x="517" y="1647" type="line" smooth="yes" name="hr00"/>
       <point x="497" y="1647"/>
       <point x="486" y="1660"/>
       <point x="490" y="1680" type="curve" smooth="yes"/>
       <point x="518" y="1823" type="line"/>
       <point x="521" y="1841"/>
       <point x="531" y="1850"/>
-      <point x="550" y="1850" type="curve" name="dv01" smooth="yes"/>
+      <point x="550" y="1850" type="curve" smooth="yes" name="dv01"/>
       <point x="694" y="1850" type="line" smooth="yes"/>
       <point x="712" y="1850"/>
       <point x="721" y="1842"/>
@@ -25,14 +25,14 @@
       <point x="659" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="908" y="1647" type="line" name="sv01" smooth="yes"/>
+      <point x="908" y="1647" type="line" smooth="yes" name="sv01"/>
       <point x="888" y="1647"/>
       <point x="877" y="1660"/>
       <point x="881" y="1680" type="curve" smooth="yes"/>
       <point x="909" y="1823" type="line"/>
       <point x="912" y="1841"/>
       <point x="922" y="1850"/>
-      <point x="941" y="1850" type="curve" name="sv02" smooth="yes"/>
+      <point x="941" y="1850" type="curve" smooth="yes" name="sv02"/>
       <point x="1084" y="1850" type="line" smooth="yes"/>
       <point x="1104" y="1850"/>
       <point x="1115" y="1837"/>
@@ -62,7 +62,7 @@
       <point x="513" y="156" type="curve" smooth="yes"/>
       <point x="450" y="82"/>
       <point x="359" y="0"/>
-      <point x="202" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="202" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="54" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04F_1.glif b/source/Hack-Italic.ufo/glyphs/uni04F_1.glif
index 9678c812a..f3296de01 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04F_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04F_1.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F1" format="1">
+<glyph name="uni04F1" format="2">
   <advance width="1233"/>
   <unicode hex="04F1"/>
   <outline>
     <contour>
-      <point x="489" y="1320" type="line" name="hr00" smooth="yes"/>
+      <point x="489" y="1320" type="line" smooth="yes" name="hr00"/>
       <point x="469" y="1320"/>
       <point x="458" y="1333"/>
       <point x="462" y="1353" type="curve" smooth="yes"/>
       <point x="490" y="1495" type="line"/>
       <point x="493" y="1513"/>
       <point x="503" y="1522"/>
-      <point x="522" y="1522" type="curve" name="dv03" smooth="yes"/>
+      <point x="522" y="1522" type="curve" smooth="yes" name="dv03"/>
       <point x="665" y="1522" type="line" smooth="yes"/>
       <point x="684" y="1522"/>
       <point x="693" y="1514"/>
@@ -25,14 +25,14 @@
       <point x="632" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="880" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="880" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="860" y="1320"/>
       <point x="849" y="1333"/>
       <point x="853" y="1353" type="curve" smooth="yes"/>
       <point x="881" y="1495" type="line"/>
       <point x="884" y="1513"/>
       <point x="894" y="1522"/>
-      <point x="913" y="1522" type="curve" name="sv02" smooth="yes"/>
+      <point x="913" y="1522" type="curve" smooth="yes" name="sv02"/>
       <point x="1056" y="1522" type="line" smooth="yes"/>
       <point x="1075" y="1522"/>
       <point x="1084" y="1514"/>
@@ -47,7 +47,7 @@
     </contour>
     <contour>
       <point x="10" y="-272" type="line"/>
-      <point x="118" y="-272" type="line" name="dv02" smooth="yes"/>
+      <point x="118" y="-272" type="line" smooth="yes" name="dv02"/>
       <point x="229" y="-272"/>
       <point x="303" y="-208"/>
       <point x="376" y="-66" type="curve" smooth="yes"/>
@@ -66,7 +66,7 @@
       <point x="432" y="-276" type="curve" smooth="yes"/>
       <point x="352" y="-381"/>
       <point x="250" y="-426"/>
-      <point x="129" y="-426" type="curve" name="dv01" smooth="yes"/>
+      <point x="129" y="-426" type="curve" smooth="yes" name="dv01"/>
       <point x="-19" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04F_2.glif b/source/Hack-Italic.ufo/glyphs/uni04F_2.glif
index 5fee6849f..06c10178f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04F_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04F_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F2" format="1">
+<glyph name="uni04F2" format="2">
   <advance width="1233"/>
   <unicode hex="04F2"/>
   <outline>
@@ -35,7 +35,7 @@
       <point x="513" y="156" type="curve" smooth="yes"/>
       <point x="450" y="82"/>
       <point x="359" y="0"/>
-      <point x="202" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="202" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="54" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04F_3.glif b/source/Hack-Italic.ufo/glyphs/uni04F_3.glif
index 91752865b..f9f774bb1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04F_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04F_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F3" format="1">
+<glyph name="uni04F3" format="2">
   <advance width="1233"/>
   <unicode hex="04F3"/>
   <outline>
@@ -17,7 +17,7 @@
     </contour>
     <contour>
       <point x="5" y="-272" type="line"/>
-      <point x="113" y="-272" type="line" name="dv02" smooth="yes"/>
+      <point x="113" y="-272" type="line" smooth="yes" name="dv02"/>
       <point x="224" y="-272"/>
       <point x="298" y="-208"/>
       <point x="371" y="-66" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="427" y="-276" type="curve" smooth="yes"/>
       <point x="347" y="-381"/>
       <point x="245" y="-426"/>
-      <point x="124" y="-426" type="curve" name="dv01" smooth="yes"/>
+      <point x="124" y="-426" type="curve" smooth="yes" name="dv01"/>
       <point x="-24" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04F_4.glif b/source/Hack-Italic.ufo/glyphs/uni04F_4.glif
index 127115b98..1cfa1b6fd 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04F_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04F_4.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F4" format="1">
+<glyph name="uni04F4" format="2">
   <advance width="1233"/>
   <unicode hex="04F4"/>
   <outline>
     <contour>
-      <point x="486" y="1647" type="line" name="hr00" smooth="yes"/>
+      <point x="486" y="1647" type="line" smooth="yes" name="hr00"/>
       <point x="466" y="1647"/>
       <point x="455" y="1660"/>
       <point x="459" y="1680" type="curve" smooth="yes"/>
       <point x="487" y="1823" type="line"/>
       <point x="490" y="1841"/>
       <point x="500" y="1850"/>
-      <point x="519" y="1850" type="curve" name="dv01" smooth="yes"/>
+      <point x="519" y="1850" type="curve" smooth="yes" name="dv01"/>
       <point x="663" y="1850" type="line" smooth="yes"/>
       <point x="681" y="1850"/>
       <point x="690" y="1842"/>
@@ -25,14 +25,14 @@
       <point x="628" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="877" y="1647" type="line" name="sv01" smooth="yes"/>
+      <point x="877" y="1647" type="line" smooth="yes" name="sv01"/>
       <point x="857" y="1647"/>
       <point x="846" y="1660"/>
       <point x="850" y="1680" type="curve" smooth="yes"/>
       <point x="878" y="1823" type="line"/>
       <point x="881" y="1841"/>
       <point x="891" y="1850"/>
-      <point x="910" y="1850" type="curve" name="sv02" smooth="yes"/>
+      <point x="910" y="1850" type="curve" smooth="yes" name="sv02"/>
       <point x="1053" y="1850" type="line" smooth="yes"/>
       <point x="1073" y="1850"/>
       <point x="1084" y="1837"/>
@@ -46,13 +46,13 @@
       <point x="866" y="658" type="line" name="iv01"/>
       <point x="709" y="586"/>
       <point x="615" y="577"/>
-      <point x="506" y="577" type="curve" name="dv02" smooth="yes"/>
+      <point x="506" y="577" type="curve" smooth="yes" name="dv02"/>
       <point x="328" y="577"/>
       <point x="258" y="601"/>
       <point x="205" y="675" type="curve" smooth="yes"/>
       <point x="176" y="716"/>
       <point x="161" y="759"/>
-      <point x="161" y="830" type="curve" name="dh01" smooth="yes"/>
+      <point x="161" y="830" type="curve" smooth="yes" name="dh01"/>
       <point x="161" y="870"/>
       <point x="165" y="929"/>
       <point x="176" y="980" type="curve"/>
@@ -61,13 +61,13 @@
       <point x="384" y="1006" type="line" smooth="yes"/>
       <point x="376" y="963"/>
       <point x="372" y="920"/>
-      <point x="372" y="889" type="curve" name="dh02" smooth="yes"/>
+      <point x="372" y="889" type="curve" smooth="yes" name="dh02"/>
       <point x="372" y="836"/>
       <point x="384" y="818"/>
       <point x="400" y="803" type="curve" smooth="yes"/>
       <point x="435" y="771"/>
       <point x="487" y="763"/>
-      <point x="587" y="763" type="curve" name="dv03" smooth="yes"/>
+      <point x="587" y="763" type="curve" smooth="yes" name="dv03"/>
       <point x="710" y="763"/>
       <point x="776" y="775"/>
       <point x="905" y="861" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04F_5.glif b/source/Hack-Italic.ufo/glyphs/uni04F_5.glif
index 2f1155465..99ebbd50b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04F_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04F_5.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F5" format="1">
+<glyph name="uni04F5" format="2">
   <advance width="1233"/>
   <unicode hex="04F5"/>
   <outline>
     <contour>
-      <point x="469" y="1322" type="line" name="hr00" smooth="yes"/>
+      <point x="469" y="1322" type="line" smooth="yes" name="hr00"/>
       <point x="449" y="1322"/>
       <point x="438" y="1335"/>
       <point x="442" y="1355" type="curve" smooth="yes"/>
       <point x="470" y="1497" type="line"/>
       <point x="473" y="1515"/>
       <point x="483" y="1524"/>
-      <point x="502" y="1524" type="curve" name="dv01" smooth="yes"/>
+      <point x="502" y="1524" type="curve" smooth="yes" name="dv01"/>
       <point x="645" y="1524" type="line" smooth="yes"/>
       <point x="664" y="1524"/>
       <point x="673" y="1516"/>
@@ -25,14 +25,14 @@
       <point x="612" y="1322" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="860" y="1322" type="line" name="sv01" smooth="yes"/>
+      <point x="860" y="1322" type="line" smooth="yes" name="sv01"/>
       <point x="840" y="1322"/>
       <point x="829" y="1335"/>
       <point x="833" y="1355" type="curve" smooth="yes"/>
       <point x="861" y="1497" type="line"/>
       <point x="864" y="1515"/>
       <point x="874" y="1524"/>
-      <point x="893" y="1524" type="curve" name="sv02" smooth="yes"/>
+      <point x="893" y="1524" type="curve" smooth="yes" name="sv02"/>
       <point x="1036" y="1524" type="line" smooth="yes"/>
       <point x="1055" y="1524"/>
       <point x="1064" y="1516"/>
@@ -49,10 +49,10 @@
       <point x="829" y="466" type="line" name="iv01"/>
       <point x="807" y="458"/>
       <point x="677" y="402"/>
-      <point x="510" y="402" type="curve" name="dv02" smooth="yes"/>
+      <point x="510" y="402" type="curve" smooth="yes" name="dv02"/>
       <point x="283" y="402"/>
       <point x="201" y="503"/>
-      <point x="201" y="647" type="curve" name="dh01" smooth="yes"/>
+      <point x="201" y="647" type="curve" smooth="yes" name="dh01"/>
       <point x="201" y="680"/>
       <point x="205" y="716"/>
       <point x="213" y="755" type="curve" smooth="yes"/>
@@ -61,10 +61,10 @@
       <point x="397" y="755" type="line" smooth="yes"/>
       <point x="393" y="735"/>
       <point x="391" y="716"/>
-      <point x="391" y="699" type="curve" name="dh02" smooth="yes"/>
+      <point x="391" y="699" type="curve" smooth="yes" name="dh02"/>
       <point x="391" y="595"/>
       <point x="458" y="562"/>
-      <point x="605" y="562" type="curve" name="dv03" smooth="yes"/>
+      <point x="605" y="562" type="curve" smooth="yes" name="dv03"/>
       <point x="685" y="562"/>
       <point x="764" y="572"/>
       <point x="859" y="621" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04F_6.glif b/source/Hack-Italic.ufo/glyphs/uni04F_6.glif
index 948ad72e7..8b51d4b0b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04F_6.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04F_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F6" format="1">
+<glyph name="uni04F6" format="2">
   <advance width="1233"/>
   <unicode hex="04F6"/>
   <outline>
@@ -23,7 +23,7 @@
       <point x="205" y="690" type="curve" smooth="yes"/>
       <point x="182" y="731"/>
       <point x="169" y="789"/>
-      <point x="169" y="862" type="curve" name="dh01" smooth="yes"/>
+      <point x="169" y="862" type="curve" smooth="yes" name="dh01"/>
       <point x="169" y="911"/>
       <point x="175" y="967"/>
       <point x="187" y="1030" type="curve" smooth="yes"/>
@@ -32,10 +32,10 @@
       <point x="395" y="1056" type="line" smooth="yes"/>
       <point x="386" y="1013"/>
       <point x="382" y="974"/>
-      <point x="382" y="939" type="curve" name="dh02" smooth="yes"/>
+      <point x="382" y="939" type="curve" smooth="yes" name="dh02"/>
       <point x="382" y="818"/>
       <point x="437" y="763"/>
-      <point x="564" y="763" type="curve" name="dv03" smooth="yes"/>
+      <point x="564" y="763" type="curve" smooth="yes" name="dv03"/>
       <point x="631" y="763"/>
       <point x="694" y="778"/>
       <point x="758" y="805" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04F_7.glif b/source/Hack-Italic.ufo/glyphs/uni04F_7.glif
index ebb05919a..18d02d6e5 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04F_7.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04F_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F7" format="1">
+<glyph name="uni04F7" format="2">
   <advance width="1233"/>
   <unicode hex="04F7"/>
   <outline>
@@ -13,10 +13,10 @@
       <point x="688" y="452" type="line" smooth="yes"/>
       <point x="625" y="419"/>
       <point x="555" y="402"/>
-      <point x="479" y="402" type="curve" name="dv02" smooth="yes"/>
+      <point x="479" y="402" type="curve" smooth="yes" name="dv02"/>
       <point x="295" y="402"/>
       <point x="209" y="498"/>
-      <point x="209" y="686" type="curve" name="dh01" smooth="yes"/>
+      <point x="209" y="686" type="curve" smooth="yes" name="dh01"/>
       <point x="209" y="735"/>
       <point x="215" y="792"/>
       <point x="227" y="855" type="curve" smooth="yes"/>
@@ -25,10 +25,10 @@
       <point x="412" y="855" type="line" smooth="yes"/>
       <point x="404" y="812"/>
       <point x="399" y="775"/>
-      <point x="399" y="740" type="curve" name="dh02" smooth="yes"/>
+      <point x="399" y="740" type="curve" smooth="yes" name="dh02"/>
       <point x="399" y="616"/>
       <point x="457" y="562"/>
-      <point x="573" y="562" type="curve" name="dv03" smooth="yes"/>
+      <point x="573" y="562" type="curve" smooth="yes" name="dv03"/>
       <point x="746" y="562"/>
       <point x="866" y="684"/>
       <point x="911" y="916" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04F_8.glif b/source/Hack-Italic.ufo/glyphs/uni04F_8.glif
index 1c9e55ba4..d2b900634 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04F_8.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04F_8.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F8" format="1">
+<glyph name="uni04F8" format="2">
   <advance width="1233"/>
   <unicode hex="04F8"/>
   <outline>
     <contour>
-      <point x="493" y="1647" type="line" name="hr00" smooth="yes"/>
+      <point x="493" y="1647" type="line" smooth="yes" name="hr00"/>
       <point x="473" y="1647"/>
       <point x="462" y="1660"/>
       <point x="466" y="1680" type="curve" smooth="yes"/>
       <point x="494" y="1823" type="line"/>
       <point x="497" y="1841"/>
       <point x="507" y="1850"/>
-      <point x="526" y="1850" type="curve" name="dv01" smooth="yes"/>
+      <point x="526" y="1850" type="curve" smooth="yes" name="dv01"/>
       <point x="670" y="1850" type="line" smooth="yes"/>
       <point x="688" y="1850"/>
       <point x="697" y="1842"/>
@@ -25,14 +25,14 @@
       <point x="635" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="884" y="1647" type="line" name="sv01" smooth="yes"/>
+      <point x="884" y="1647" type="line" smooth="yes" name="sv01"/>
       <point x="864" y="1647"/>
       <point x="853" y="1660"/>
       <point x="857" y="1680" type="curve" smooth="yes"/>
       <point x="885" y="1823" type="line"/>
       <point x="888" y="1841"/>
       <point x="898" y="1850"/>
-      <point x="917" y="1850" type="curve" name="sv02" smooth="yes"/>
+      <point x="917" y="1850" type="curve" smooth="yes" name="sv02"/>
       <point x="1060" y="1850" type="line" smooth="yes"/>
       <point x="1080" y="1850"/>
       <point x="1091" y="1837"/>
@@ -46,16 +46,16 @@
       <point x="211" y="1493" type="line" name="at01"/>
       <point x="413" y="1493" type="line"/>
       <point x="296" y="893" type="line"/>
-      <point x="387" y="893" type="line" name="dv03" smooth="yes"/>
+      <point x="387" y="893" type="line" smooth="yes" name="dv03"/>
       <point x="618" y="893"/>
       <point x="763" y="773"/>
-      <point x="763" y="557" type="curve" name="dh02" smooth="yes"/>
+      <point x="763" y="557" type="curve" smooth="yes" name="dh02"/>
       <point x="763" y="522"/>
       <point x="760" y="485"/>
       <point x="752" y="446" type="curve" smooth="yes"/>
       <point x="693" y="150"/>
       <point x="467" y="0"/>
-      <point x="214" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="214" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="-79" y="0" type="line"/>
     </contour>
     <contour>
@@ -65,16 +65,16 @@
       <point x="787" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="246" y="166" type="line" name="sv03" smooth="yes"/>
+      <point x="246" y="166" type="line" smooth="yes" name="sv03"/>
       <point x="383" y="166"/>
       <point x="504" y="250"/>
       <point x="541" y="446" type="curve" smooth="yes"/>
       <point x="547" y="477"/>
       <point x="550" y="506"/>
-      <point x="550" y="533" type="curve" name="dh01" smooth="yes"/>
+      <point x="550" y="533" type="curve" smooth="yes" name="dh01"/>
       <point x="550" y="657"/>
       <point x="486" y="727"/>
-      <point x="355" y="727" type="curve" name="dv02" smooth="yes"/>
+      <point x="355" y="727" type="curve" smooth="yes" name="dv02"/>
       <point x="264" y="727" type="line"/>
       <point x="155" y="166" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni04F_9.glif b/source/Hack-Italic.ufo/glyphs/uni04F_9.glif
index 8a0191f25..b4f40db49 100644
--- a/source/Hack-Italic.ufo/glyphs/uni04F_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni04F_9.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F9" format="1">
+<glyph name="uni04F9" format="2">
   <advance width="1233"/>
   <unicode hex="04F9"/>
   <outline>
     <contour>
-      <point x="469" y="1320" type="line" name="hr00" smooth="yes"/>
+      <point x="469" y="1320" type="line" smooth="yes" name="hr00"/>
       <point x="449" y="1320"/>
       <point x="438" y="1333"/>
       <point x="442" y="1353" type="curve" smooth="yes"/>
       <point x="470" y="1495" type="line"/>
       <point x="473" y="1513"/>
       <point x="483" y="1522"/>
-      <point x="502" y="1522" type="curve" name="dv01" smooth="yes"/>
+      <point x="502" y="1522" type="curve" smooth="yes" name="dv01"/>
       <point x="645" y="1522" type="line" smooth="yes"/>
       <point x="664" y="1522"/>
       <point x="673" y="1514"/>
@@ -25,14 +25,14 @@
       <point x="612" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="860" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="860" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="840" y="1320"/>
       <point x="829" y="1333"/>
       <point x="833" y="1353" type="curve" smooth="yes"/>
       <point x="861" y="1495" type="line"/>
       <point x="864" y="1513"/>
       <point x="874" y="1522"/>
-      <point x="893" y="1522" type="curve" name="sv02" smooth="yes"/>
+      <point x="893" y="1522" type="curve" smooth="yes" name="sv02"/>
       <point x="1036" y="1522" type="line" smooth="yes"/>
       <point x="1055" y="1522"/>
       <point x="1064" y="1514"/>
@@ -49,16 +49,16 @@
       <point x="213" y="1120" type="line" name="at01"/>
       <point x="395" y="1120" type="line"/>
       <point x="307" y="667" type="line"/>
-      <point x="398" y="667" type="line" name="dv03" smooth="yes"/>
+      <point x="398" y="667" type="line" smooth="yes" name="dv03"/>
       <point x="677" y="667"/>
       <point x="786" y="555"/>
-      <point x="786" y="408" type="curve" name="dh02" smooth="yes"/>
+      <point x="786" y="408" type="curve" smooth="yes" name="dh02"/>
       <point x="786" y="383"/>
       <point x="783" y="359"/>
       <point x="778" y="332" type="curve" smooth="yes"/>
       <point x="735" y="108"/>
       <point x="553" y="0"/>
-      <point x="268" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="268" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="-5" y="0" type="line"/>
     </contour>
     <contour>
@@ -68,16 +68,16 @@
       <point x="836" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="290" y="153" type="line" name="sv03" smooth="yes"/>
+      <point x="290" y="153" type="line" smooth="yes" name="sv03"/>
       <point x="463" y="153"/>
       <point x="560" y="213"/>
       <point x="583" y="334" type="curve" smooth="yes"/>
       <point x="586" y="349"/>
       <point x="587" y="363"/>
-      <point x="587" y="374" type="curve" name="dh01" smooth="yes"/>
+      <point x="587" y="374" type="curve" smooth="yes" name="dh01"/>
       <point x="587" y="467"/>
       <point x="511" y="514"/>
-      <point x="360" y="514" type="curve" name="dv02" smooth="yes"/>
+      <point x="360" y="514" type="curve" smooth="yes" name="dv02"/>
       <point x="277" y="514" type="line"/>
       <point x="207" y="153" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0510.glif b/source/Hack-Italic.ufo/glyphs/uni0510.glif
index 13c1fe08a..05adb1470 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0510.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0510.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0510" format="1">
+<glyph name="uni0510" format="2">
   <advance width="1233"/>
   <unicode hex="0510"/>
   <outline>
     <contour>
-      <point x="512" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="512" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="224" y="-29"/>
       <point x="62" y="97"/>
-      <point x="62" y="313" type="curve" name="dh01" smooth="yes"/>
+      <point x="62" y="313" type="curve" smooth="yes" name="dh01"/>
       <point x="62" y="346"/>
       <point x="65" y="379"/>
       <point x="72" y="412" type="curve" smooth="yes"/>
@@ -16,26 +16,26 @@
       <point x="450" y="799" type="curve" name="iv01"/>
       <point x="309" y="838"/>
       <point x="238" y="922"/>
-      <point x="238" y="1047" type="curve" name="ih01" smooth="yes"/>
+      <point x="238" y="1047" type="curve" smooth="yes" name="ih01"/>
       <point x="238" y="1070"/>
       <point x="240" y="1095"/>
       <point x="245" y="1120" type="curve" smooth="yes"/>
       <point x="290" y="1362"/>
       <point x="516" y="1520"/>
-      <point x="798" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="798" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="902" y="1520"/>
       <point x="1019" y="1499"/>
       <point x="1172" y="1456" type="curve"/>
       <point x="1136" y="1270" type="line"/>
       <point x="1007" y="1325"/>
       <point x="881" y="1350"/>
-      <point x="778" y="1350" type="curve" name="sv01" smooth="yes"/>
+      <point x="778" y="1350" type="curve" smooth="yes" name="sv01"/>
       <point x="586" y="1350"/>
       <point x="468" y="1261"/>
-      <point x="443" y="1112" type="curve" name="hr01" smooth="yes"/>
+      <point x="443" y="1112" type="curve" smooth="yes" name="hr01"/>
       <point x="440" y="1097"/>
       <point x="439" y="1081"/>
-      <point x="439" y="1065" type="curve" name="sh01" smooth="yes"/>
+      <point x="439" y="1065" type="curve" smooth="yes" name="sh01"/>
       <point x="439" y="941"/>
       <point x="532" y="881"/>
       <point x="693" y="881" type="curve" smooth="yes"/>
@@ -47,10 +47,10 @@
       <point x="276" y="432" type="curve" smooth="yes"/>
       <point x="271" y="405"/>
       <point x="268" y="382"/>
-      <point x="268" y="361" type="curve" name="dh02" smooth="yes"/>
+      <point x="268" y="361" type="curve" smooth="yes" name="dh02"/>
       <point x="268" y="224"/>
       <point x="367" y="141"/>
-      <point x="566" y="141" type="curve" name="dv02" smooth="yes"/>
+      <point x="566" y="141" type="curve" smooth="yes" name="dv02"/>
       <point x="694" y="141"/>
       <point x="833" y="174"/>
       <point x="982" y="246" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0511.glif b/source/Hack-Italic.ufo/glyphs/uni0511.glif
index 45a9fb0e7..fb5ea4ce4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0511.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0511.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0511" format="1">
+<glyph name="uni0511" format="2">
   <advance width="1233"/>
   <unicode hex="0511"/>
   <outline>
     <contour>
-      <point x="544" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="544" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="399" y="-29"/>
       <point x="284" y="-2"/>
       <point x="211" y="59" type="curve" smooth="yes"/>
@@ -29,14 +29,14 @@
       <point x="268" y="832" type="curve" smooth="yes"/>
       <point x="298" y="1009"/>
       <point x="498" y="1132"/>
-      <point x="757" y="1132" type="curve" name="at01" smooth="yes"/>
+      <point x="757" y="1132" type="curve" smooth="yes" name="at01"/>
       <point x="850" y="1132"/>
       <point x="956" y="1116"/>
       <point x="1097" y="1084" type="curve"/>
       <point x="1062" y="905" type="line"/>
       <point x="936" y="948"/>
       <point x="803" y="968"/>
-      <point x="727" y="965" type="curve" name="sv01" smooth="yes"/>
+      <point x="727" y="965" type="curve" smooth="yes" name="sv01"/>
       <point x="696" y="964" type="line" smooth="yes"/>
       <point x="645" y="961"/>
       <point x="590" y="942"/>
@@ -74,7 +74,7 @@
       <point x="407" y="169" type="curve"/>
       <point x="450" y="138"/>
       <point x="512" y="124"/>
-      <point x="584" y="124" type="curve" name="dv01" smooth="yes"/>
+      <point x="584" y="124" type="curve" smooth="yes" name="dv01"/>
       <point x="611" y="124"/>
       <point x="627" y="126"/>
       <point x="648" y="129" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni051A_.glif b/source/Hack-Italic.ufo/glyphs/uni051A_.glif
index e4e3e09c4..86fd4d788 100644
--- a/source/Hack-Italic.ufo/glyphs/uni051A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni051A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni051A" format="1">
+<glyph name="uni051A" format="2">
   <advance width="1233"/>
   <unicode hex="051A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni051B_.glif b/source/Hack-Italic.ufo/glyphs/uni051B_.glif
index 20ee0fbea..10c07f002 100644
--- a/source/Hack-Italic.ufo/glyphs/uni051B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni051B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni051B" format="1">
+<glyph name="uni051B" format="2">
   <advance width="1233"/>
   <unicode hex="051B"/>
   <outline>
@@ -7,16 +7,16 @@
       <point x="774" y="141" type="line" name="iv01"/>
       <point x="692" y="28"/>
       <point x="582" y="-29"/>
-      <point x="444" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="444" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="227" y="-29"/>
       <point x="98" y="114"/>
-      <point x="98" y="374" type="curve" name="dh01" smooth="yes"/>
+      <point x="98" y="374" type="curve" smooth="yes" name="dh01"/>
       <point x="98" y="549"/>
       <point x="156" y="760"/>
       <point x="252" y="909" type="curve" smooth="yes"/>
       <point x="351" y="1062"/>
       <point x="486" y="1147"/>
-      <point x="661" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="661" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="805" y="1147"/>
       <point x="889" y="1088"/>
       <point x="936" y="977" type="curve" name="iv02"/>
@@ -26,22 +26,22 @@
       <point x="664" y="-426" type="line" name="hr01"/>
     </contour>
     <contour>
-      <point x="494" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="494" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="603" y="127"/>
       <point x="700" y="184"/>
       <point x="768" y="305" type="curve" smooth="yes"/>
       <point x="832" y="417"/>
       <point x="874" y="593"/>
-      <point x="874" y="728" type="curve" name="hr02" smooth="yes"/>
+      <point x="874" y="728" type="curve" smooth="yes" name="hr02"/>
       <point x="874" y="908"/>
       <point x="801" y="991"/>
-      <point x="666" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="666" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="553" y="991"/>
       <point x="464" y="933"/>
       <point x="401" y="817" type="curve" smooth="yes"/>
       <point x="337" y="697"/>
       <point x="295" y="519"/>
-      <point x="295" y="384" type="curve" name="dh02" smooth="yes"/>
+      <point x="295" y="384" type="curve" smooth="yes" name="dh02"/>
       <point x="295" y="213"/>
       <point x="361" y="127"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni051C_.glif b/source/Hack-Italic.ufo/glyphs/uni051C_.glif
index 835276cb5..aa2782236 100644
--- a/source/Hack-Italic.ufo/glyphs/uni051C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni051C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni051C" format="1">
+<glyph name="uni051C" format="2">
   <advance width="1233"/>
   <unicode hex="051C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni051D_.glif b/source/Hack-Italic.ufo/glyphs/uni051D_.glif
index a8667ec28..66eb80f76 100644
--- a/source/Hack-Italic.ufo/glyphs/uni051D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni051D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni051D" format="1">
+<glyph name="uni051D" format="2">
   <advance width="1233"/>
   <unicode hex="051D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0531.glif b/source/Hack-Italic.ufo/glyphs/uni0531.glif
index f937ee210..f7429b4ad 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0531.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0531.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0531" format="1">
+<glyph name="uni0531" format="2">
   <advance width="1233"/>
   <unicode hex="0531"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="736" y="39" type="curve"/>
       <point x="653" y="-6"/>
       <point x="555" y="-29"/>
-      <point x="443" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="443" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="295" y="-29"/>
       <point x="186" y="10"/>
       <point x="121" y="90" type="curve" smooth="yes"/>
       <point x="76" y="145"/>
       <point x="53" y="220"/>
-      <point x="53" y="314" type="curve" name="dh01" smooth="yes"/>
+      <point x="53" y="314" type="curve" smooth="yes" name="dh01"/>
       <point x="53" y="357"/>
       <point x="58" y="405"/>
       <point x="68" y="457" type="curve" smooth="yes"/>
@@ -25,13 +25,13 @@
       <point x="258" y="395" type="line" smooth="yes"/>
       <point x="253" y="368"/>
       <point x="250" y="343"/>
-      <point x="250" y="319" type="curve" name="dh02" smooth="yes"/>
+      <point x="250" y="319" type="curve" smooth="yes" name="dh02"/>
       <point x="250" y="284"/>
       <point x="256" y="250"/>
       <point x="272" y="221" type="curve" smooth="yes"/>
       <point x="300" y="170"/>
       <point x="359" y="135"/>
-      <point x="474" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="474" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="524" y="135"/>
       <point x="568" y="142"/>
       <point x="606" y="155" type="curve" name="iv01"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0532.glif b/source/Hack-Italic.ufo/glyphs/uni0532.glif
index 7df95a937..7530adbdd 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0532.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0532.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0532" format="1">
+<glyph name="uni0532" format="2">
   <advance width="1233"/>
   <unicode hex="0532"/>
   <outline>
     <contour>
-      <point x="181" y="1036" type="line" name="hr00" smooth="yes"/>
+      <point x="181" y="1036" type="line" smooth="yes" name="hr00"/>
       <point x="245" y="1367"/>
       <point x="449" y="1520"/>
-      <point x="744" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="744" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="892" y="1520"/>
       <point x="1001" y="1482"/>
       <point x="1066" y="1402" type="curve" smooth="yes"/>
       <point x="1111" y="1345"/>
       <point x="1134" y="1271"/>
-      <point x="1134" y="1178" type="curve" name="dh02" smooth="yes"/>
+      <point x="1134" y="1178" type="curve" smooth="yes" name="dh02"/>
       <point x="1134" y="1134"/>
       <point x="1129" y="1087"/>
       <point x="1119" y="1036" type="curve" smooth="yes"/>
@@ -22,13 +22,13 @@
       <point x="929" y="1098" type="line" smooth="yes"/>
       <point x="934" y="1125"/>
       <point x="937" y="1150"/>
-      <point x="937" y="1175" type="curve" name="dh01" smooth="yes"/>
+      <point x="937" y="1175" type="curve" smooth="yes" name="dh01"/>
       <point x="937" y="1210"/>
       <point x="931" y="1243"/>
       <point x="915" y="1271" type="curve" smooth="yes"/>
       <point x="886" y="1322"/>
       <point x="826" y="1356"/>
-      <point x="711" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="711" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="596" y="1356"/>
       <point x="525" y="1322"/>
       <point x="477" y="1271" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0533.glif b/source/Hack-Italic.ufo/glyphs/uni0533.glif
index 40a596839..587279ab5 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0533.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0533.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0533" format="1">
+<glyph name="uni0533" format="2">
   <advance width="1233"/>
   <unicode hex="0533"/>
   <outline>
@@ -11,19 +11,19 @@
       <point x="177" y="579" type="curve" smooth="yes"/>
       <point x="134" y="636"/>
       <point x="111" y="712"/>
-      <point x="111" y="816" type="curve" name="sh01" smooth="yes"/>
+      <point x="111" y="816" type="curve" smooth="yes" name="sh01"/>
       <point x="111" y="867"/>
       <point x="117" y="924"/>
       <point x="129" y="988" type="curve" smooth="yes"/>
       <point x="201" y="1370"/>
       <point x="404" y="1520"/>
-      <point x="699" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="699" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="847" y="1520"/>
       <point x="957" y="1482"/>
       <point x="1021" y="1397" type="curve" smooth="yes"/>
       <point x="1064" y="1341"/>
       <point x="1086" y="1263"/>
-      <point x="1086" y="1163" type="curve" name="sh02" smooth="yes"/>
+      <point x="1086" y="1163" type="curve" smooth="yes" name="sh02"/>
       <point x="1086" y="1110"/>
       <point x="1080" y="1051"/>
       <point x="1067" y="988" type="curve" smooth="yes"/>
@@ -36,16 +36,16 @@
     </contour>
     <contour>
       <point x="793" y="621" type="line" name="dv01"/>
-      <point x="878" y="1058" type="line" name="sh04" smooth="yes"/>
+      <point x="878" y="1058" type="line" smooth="yes" name="sh04"/>
       <point x="885" y="1094"/>
       <point x="890" y="1129"/>
-      <point x="890" y="1161" type="curve" name="ah01" smooth="yes"/>
+      <point x="890" y="1161" type="curve" smooth="yes" name="ah01"/>
       <point x="890" y="1198"/>
       <point x="884" y="1231"/>
       <point x="869" y="1262" type="curve" smooth="yes"/>
       <point x="841" y="1318"/>
       <point x="781" y="1356"/>
-      <point x="664" y="1356" type="curve" name="sv02" smooth="yes"/>
+      <point x="664" y="1356" type="curve" smooth="yes" name="sv02"/>
       <point x="547" y="1356"/>
       <point x="480" y="1319"/>
       <point x="431" y="1251" type="curve" smooth="yes"/>
@@ -54,10 +54,10 @@
       <point x="328" y="988" type="curve" smooth="yes"/>
       <point x="317" y="932"/>
       <point x="312" y="879"/>
-      <point x="312" y="832" type="curve" name="sh05" smooth="yes"/>
+      <point x="312" y="832" type="curve" smooth="yes" name="sh05"/>
       <point x="312" y="787"/>
       <point x="317" y="751"/>
-      <point x="326" y="724" type="curve" name="sh06" smooth="yes"/>
+      <point x="326" y="724" type="curve" smooth="yes" name="sh06"/>
       <point x="347" y="663"/>
       <point x="407" y="621"/>
       <point x="524" y="621" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0534.glif b/source/Hack-Italic.ufo/glyphs/uni0534.glif
index 801036cf1..73a1165b9 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0534.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0534.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0534" format="1">
+<glyph name="uni0534" format="2">
   <advance width="1233"/>
   <unicode hex="0534"/>
   <outline>
     <contour>
-      <point x="855" y="1098" type="line" name="hr00" smooth="yes"/>
+      <point x="855" y="1098" type="line" smooth="yes" name="hr00"/>
       <point x="860" y="1125"/>
       <point x="863" y="1149"/>
-      <point x="863" y="1176" type="curve" name="dh01" smooth="yes"/>
+      <point x="863" y="1176" type="curve" smooth="yes" name="dh01"/>
       <point x="863" y="1211"/>
       <point x="857" y="1243"/>
       <point x="841" y="1271" type="curve" smooth="yes"/>
       <point x="812" y="1322"/>
       <point x="752" y="1356"/>
-      <point x="637" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="637" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="522" y="1356"/>
       <point x="451" y="1322"/>
       <point x="403" y="1271" type="curve" smooth="yes"/>
@@ -25,13 +25,13 @@
       <point x="107" y="1036" type="line" smooth="yes"/>
       <point x="171" y="1367"/>
       <point x="375" y="1520"/>
-      <point x="670" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="670" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="818" y="1520"/>
       <point x="927" y="1482"/>
       <point x="992" y="1402" type="curve"/>
       <point x="1036" y="1346"/>
       <point x="1060" y="1273"/>
-      <point x="1060" y="1177" type="curve" name="dh02" smooth="yes"/>
+      <point x="1060" y="1177" type="curve" smooth="yes" name="dh02"/>
       <point x="1060" y="1134"/>
       <point x="1055" y="1087"/>
       <point x="1045" y="1036" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0535.glif b/source/Hack-Italic.ufo/glyphs/uni0535.glif
index f68542490..c6fa2e7af 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0535.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0535.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0535" format="1">
+<glyph name="uni0535" format="2">
   <advance width="1233"/>
   <unicode hex="0535"/>
   <outline>
     <contour>
-      <point x="449" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="449" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="301" y="-29"/>
       <point x="192" y="10"/>
       <point x="127" y="90" type="curve" smooth="yes"/>
       <point x="82" y="145"/>
       <point x="59" y="220"/>
-      <point x="59" y="314" type="curve" name="dh01" smooth="yes"/>
+      <point x="59" y="314" type="curve" smooth="yes" name="dh01"/>
       <point x="59" y="357"/>
       <point x="64" y="405"/>
       <point x="74" y="457" type="curve" smooth="yes"/>
@@ -23,13 +23,13 @@
       <point x="264" y="395" type="line" smooth="yes"/>
       <point x="259" y="368"/>
       <point x="256" y="343"/>
-      <point x="256" y="319" type="curve" name="dh02" smooth="yes"/>
+      <point x="256" y="319" type="curve" smooth="yes" name="dh02"/>
       <point x="256" y="284"/>
       <point x="262" y="250"/>
       <point x="278" y="221" type="curve" smooth="yes"/>
       <point x="306" y="170"/>
       <point x="363" y="135"/>
-      <point x="479" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="479" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="594" y="135"/>
       <point x="668" y="170"/>
       <point x="716" y="221" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0536.glif b/source/Hack-Italic.ufo/glyphs/uni0536.glif
index 4ed018b70..406aa825f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0536.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0536.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0536" format="1">
+<glyph name="uni0536" format="2">
   <advance width="1233"/>
   <unicode hex="0536"/>
   <outline>
@@ -16,13 +16,13 @@
       <point x="952" y="895" type="curve" smooth="yes"/>
       <point x="968" y="968"/>
       <point x="975" y="1034"/>
-      <point x="975" y="1091" type="curve" name="dh01" smooth="yes"/>
+      <point x="975" y="1091" type="curve" smooth="yes" name="dh01"/>
       <point x="975" y="1160"/>
       <point x="965" y="1214"/>
       <point x="946" y="1253" type="curve" smooth="yes"/>
       <point x="910" y="1326"/>
       <point x="835" y="1356"/>
-      <point x="727" y="1356" type="curve" name="sv03" smooth="yes"/>
+      <point x="727" y="1356" type="curve" smooth="yes" name="sv03"/>
       <point x="612" y="1356"/>
       <point x="533" y="1322"/>
       <point x="470" y="1253" type="curve" smooth="yes"/>
@@ -37,13 +37,13 @@
       <point x="364" y="1380" type="curve" smooth="yes"/>
       <point x="476" y="1479"/>
       <point x="614" y="1520"/>
-      <point x="757" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="757" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="895" y="1520"/>
       <point x="1027" y="1480"/>
       <point x="1102" y="1380" type="curve" smooth="yes"/>
       <point x="1153" y="1312"/>
       <point x="1184" y="1207"/>
-      <point x="1184" y="1079" type="curve" name="dh02" smooth="yes"/>
+      <point x="1184" y="1079" type="curve" smooth="yes" name="dh02"/>
       <point x="1184" y="1020"/>
       <point x="1179" y="959"/>
       <point x="1164" y="894" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0537.glif b/source/Hack-Italic.ufo/glyphs/uni0537.glif
index 6d65f86e9..c12560a1d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0537.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0537.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0537" format="1">
+<glyph name="uni0537" format="2">
   <advance width="1233"/>
   <unicode hex="0537"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0538.glif b/source/Hack-Italic.ufo/glyphs/uni0538.glif
index 5d1c9ea36..831c5bf10 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0538.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0538.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0538" format="1">
+<glyph name="uni0538" format="2">
   <advance width="1233"/>
   <unicode hex="0538"/>
   <outline>
     <contour>
-      <point x="181" y="1036" type="line" name="hr00" smooth="yes"/>
+      <point x="181" y="1036" type="line" smooth="yes" name="hr00"/>
       <point x="245" y="1367"/>
       <point x="449" y="1522"/>
-      <point x="744" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="744" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="892" y="1522"/>
       <point x="1001" y="1483"/>
       <point x="1066" y="1403" type="curve"/>
       <point x="1110" y="1347"/>
       <point x="1134" y="1274"/>
-      <point x="1134" y="1178" type="curve" name="dh02" smooth="yes"/>
+      <point x="1134" y="1178" type="curve" smooth="yes" name="dh02"/>
       <point x="1134" y="1135"/>
       <point x="1129" y="1088"/>
       <point x="1119" y="1036" type="curve" smooth="yes"/>
@@ -22,13 +22,13 @@
       <point x="929" y="1098" type="line" smooth="yes"/>
       <point x="934" y="1125"/>
       <point x="937" y="1150"/>
-      <point x="937" y="1175" type="curve" name="dh01" smooth="yes"/>
+      <point x="937" y="1175" type="curve" smooth="yes" name="dh01"/>
       <point x="937" y="1210"/>
       <point x="931" y="1243"/>
       <point x="915" y="1272" type="curve" smooth="yes"/>
       <point x="888" y="1320"/>
       <point x="832" y="1358"/>
-      <point x="713" y="1358" type="curve" name="dv01" smooth="yes"/>
+      <point x="713" y="1358" type="curve" smooth="yes" name="dv01"/>
       <point x="597" y="1358"/>
       <point x="525" y="1323"/>
       <point x="477" y="1272" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0539.glif b/source/Hack-Italic.ufo/glyphs/uni0539.glif
index 4342a74f8..1c075435e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0539.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0539.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0539" format="1">
+<glyph name="uni0539" format="2">
   <advance width="1233"/>
   <unicode hex="0539"/>
   <outline>
     <contour>
-      <point x="570" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="570" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="475" y="-29"/>
       <point x="400" y="4"/>
       <point x="355" y="76" type="curve" smooth="yes"/>
       <point x="326" y="123"/>
       <point x="310" y="184"/>
-      <point x="310" y="264" type="curve" name="sh01" smooth="yes"/>
+      <point x="310" y="264" type="curve" smooth="yes" name="sh01"/>
       <point x="310" y="308"/>
       <point x="315" y="359"/>
       <point x="326" y="415" type="curve" smooth="yes"/>
       <point x="387" y="728"/>
       <point x="558" y="875"/>
-      <point x="749" y="875" type="curve" name="sv01" smooth="yes"/>
+      <point x="749" y="875" type="curve" smooth="yes" name="sv01"/>
       <point x="887" y="875" type="line"/>
       <point x="891" y="899" type="line" smooth="yes"/>
       <point x="906" y="987"/>
       <point x="919" y="1065"/>
-      <point x="919" y="1133" type="curve" name="ah01" smooth="yes"/>
+      <point x="919" y="1133" type="curve" smooth="yes" name="ah01"/>
       <point x="919" y="1178"/>
       <point x="913" y="1217"/>
       <point x="898" y="1250" type="curve" smooth="yes"/>
       <point x="863" y="1325"/>
       <point x="795" y="1356"/>
-      <point x="670" y="1356" type="curve" name="sv02" smooth="yes"/>
+      <point x="670" y="1356" type="curve" smooth="yes" name="sv02"/>
       <point x="547" y="1356"/>
       <point x="463" y="1326"/>
       <point x="402" y="1254" type="curve" smooth="yes"/>
@@ -39,16 +39,16 @@
       <point x="79" y="934" type="line" smooth="yes"/>
       <point x="118" y="1137"/>
       <point x="196" y="1278"/>
-      <point x="300" y="1374" type="curve" name="sh02" smooth="yes"/>
+      <point x="300" y="1374" type="curve" smooth="yes" name="sh02"/>
       <point x="407" y="1471"/>
       <point x="542" y="1520"/>
-      <point x="701" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="701" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="860" y="1520"/>
       <point x="977" y="1471"/>
       <point x="1045" y="1371" type="curve" smooth="yes"/>
       <point x="1090" y="1304"/>
       <point x="1113" y="1217"/>
-      <point x="1113" y="1110" type="curve" name="sh03" smooth="yes"/>
+      <point x="1113" y="1110" type="curve" smooth="yes" name="sh03"/>
       <point x="1113" y="1054"/>
       <point x="1107" y="994"/>
       <point x="1094" y="927" type="curve" smooth="yes"/>
@@ -64,7 +64,7 @@
       <point x="671" y="-29"/>
     </contour>
     <contour>
-      <point x="605" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="605" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="650" y="135"/>
       <point x="689" y="152"/>
       <point x="721" y="196" type="curve" smooth="yes"/>
@@ -81,7 +81,7 @@
       <point x="559" y="554" type="curve" smooth="yes"/>
       <point x="532" y="473"/>
       <point x="505" y="333"/>
-      <point x="505" y="254" type="curve" name="sh04" smooth="yes"/>
+      <point x="505" y="254" type="curve" smooth="yes" name="sh04"/>
       <point x="505" y="189"/>
       <point x="522" y="162"/>
       <point x="547" y="147" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni053A_.glif b/source/Hack-Italic.ufo/glyphs/uni053A_.glif
index d3ec4fed2..65ed1259d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni053A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni053A_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni053A" format="1">
+<glyph name="uni053A" format="2">
   <advance width="1233"/>
   <unicode hex="053A"/>
   <outline>
     <contour>
-      <point x="411" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="411" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="258" y="-29"/>
       <point x="147" y="18"/>
       <point x="88" y="115" type="curve" smooth="yes"/>
       <point x="49" y="180"/>
       <point x="29" y="274"/>
-      <point x="29" y="382" type="curve" name="dh01" smooth="yes"/>
+      <point x="29" y="382" type="curve" smooth="yes" name="dh01"/>
       <point x="29" y="435"/>
       <point x="34" y="489"/>
       <point x="44" y="544" type="curve" smooth="yes"/>
@@ -19,7 +19,7 @@
       <point x="260" y="971" type="curve" smooth="yes"/>
       <point x="359" y="1070"/>
       <point x="482" y="1120"/>
-      <point x="627" y="1120" type="curve" name="at02" smooth="yes"/>
+      <point x="627" y="1120" type="curve" smooth="yes" name="at02"/>
       <point x="896" y="1120" type="line"/>
       <point x="968" y="1493" type="line" name="at01"/>
       <point x="1170" y="1493" type="line"/>
@@ -35,7 +35,7 @@
       <point x="548" y="-29"/>
     </contour>
     <contour>
-      <point x="441" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="441" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="540" y="135"/>
       <point x="618" y="167"/>
       <point x="674" y="230" type="curve" smooth="yes"/>
@@ -43,7 +43,7 @@
       <point x="746" y="352"/>
       <point x="762" y="433" type="curve" smooth="yes"/>
       <point x="863" y="950" type="line" name="sv02"/>
-      <point x="594" y="950" type="line" name="sv03" smooth="yes"/>
+      <point x="594" y="950" type="line" smooth="yes" name="sv03"/>
       <point x="475" y="950"/>
       <point x="405" y="904"/>
       <point x="353" y="827" type="curve" smooth="yes"/>
@@ -52,7 +52,7 @@
       <point x="248" y="543" type="curve" smooth="yes"/>
       <point x="237" y="487"/>
       <point x="229" y="422"/>
-      <point x="229" y="362" type="curve" name="dh02" smooth="yes"/>
+      <point x="229" y="362" type="curve" smooth="yes" name="dh02"/>
       <point x="229" y="321"/>
       <point x="233" y="287"/>
       <point x="241" y="258" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni053B_.glif b/source/Hack-Italic.ufo/glyphs/uni053B_.glif
index 18f1ef9fb..c4b97f903 100644
--- a/source/Hack-Italic.ufo/glyphs/uni053B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni053B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni053B" format="1">
+<glyph name="uni053B" format="2">
   <advance width="1233"/>
   <unicode hex="053B"/>
   <outline>
@@ -9,13 +9,13 @@
       <point x="410" y="1061" type="line" name="iv01"/>
       <point x="501" y="1117"/>
       <point x="591" y="1141"/>
-      <point x="699" y="1141" type="curve" name="at01" smooth="yes"/>
+      <point x="699" y="1141" type="curve" smooth="yes" name="at01"/>
       <point x="836" y="1141"/>
       <point x="949" y="1102"/>
       <point x="1014" y="1022" type="curve"/>
       <point x="1058" y="966"/>
       <point x="1082" y="891"/>
-      <point x="1082" y="795" type="curve" name="dh02" smooth="yes"/>
+      <point x="1082" y="795" type="curve" smooth="yes" name="dh02"/>
       <point x="1082" y="752"/>
       <point x="1077" y="705"/>
       <point x="1067" y="655" type="curve" smooth="yes"/>
@@ -24,13 +24,13 @@
       <point x="877" y="717" type="line" smooth="yes"/>
       <point x="882" y="742"/>
       <point x="885" y="768"/>
-      <point x="885" y="794" type="curve" name="dh01" smooth="yes"/>
+      <point x="885" y="794" type="curve" smooth="yes" name="dh01"/>
       <point x="885" y="829"/>
       <point x="879" y="862"/>
       <point x="863" y="891" type="curve" smooth="yes"/>
       <point x="834" y="942"/>
       <point x="774" y="977"/>
-      <point x="659" y="977" type="curve" name="sv01" smooth="yes"/>
+      <point x="659" y="977" type="curve" smooth="yes" name="sv01"/>
       <point x="544" y="977"/>
       <point x="473" y="942"/>
       <point x="425" y="891" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni053C_.glif b/source/Hack-Italic.ufo/glyphs/uni053C_.glif
index 074640743..09435d216 100644
--- a/source/Hack-Italic.ufo/glyphs/uni053C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni053C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni053C" format="1">
+<glyph name="uni053C" format="2">
   <advance width="1233"/>
   <unicode hex="053C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni053D_.glif b/source/Hack-Italic.ufo/glyphs/uni053D_.glif
index 40c29e921..afa42bcdf 100644
--- a/source/Hack-Italic.ufo/glyphs/uni053D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni053D_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni053D" format="1">
+<glyph name="uni053D" format="2">
   <advance width="1233"/>
   <unicode hex="053D"/>
   <outline>
     <contour>
-      <point x="658" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="658" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="517" y="-29"/>
       <point x="439" y="5"/>
       <point x="402" y="80" type="curve" smooth="yes"/>
       <point x="385" y="114"/>
       <point x="376" y="158"/>
-      <point x="376" y="212" type="curve" name="dh01" smooth="yes"/>
+      <point x="376" y="212" type="curve" smooth="yes" name="dh01"/>
       <point x="376" y="272"/>
       <point x="386" y="341"/>
       <point x="402" y="425" type="curve" smooth="yes"/>
@@ -25,13 +25,13 @@
       <point x="583" y="401" type="line" smooth="yes"/>
       <point x="571" y="341"/>
       <point x="564" y="295"/>
-      <point x="564" y="256" type="curve" name="dh02" smooth="yes"/>
+      <point x="564" y="256" type="curve" smooth="yes" name="dh02"/>
       <point x="564" y="233"/>
       <point x="567" y="212"/>
       <point x="574" y="193" type="curve" smooth="yes"/>
       <point x="590" y="150"/>
       <point x="625" y="135"/>
-      <point x="689" y="135" type="curve" name="hr01" smooth="yes"/>
+      <point x="689" y="135" type="curve" smooth="yes" name="hr01"/>
       <point x="753" y="135"/>
       <point x="793" y="152"/>
       <point x="822" y="193" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni053E_.glif b/source/Hack-Italic.ufo/glyphs/uni053E_.glif
index 91a1967d5..31e44141f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni053E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni053E_.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni053E" format="1">
+<glyph name="uni053E" format="2">
   <advance width="1233"/>
   <unicode hex="053E"/>
   <outline>
     <contour>
-      <point x="474" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="474" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="338" y="-29"/>
       <point x="241" y="1"/>
       <point x="170" y="58" type="curve" smooth="yes"/>
       <point x="97" y="118"/>
       <point x="67" y="195"/>
-      <point x="55" y="290" type="curve" name="sh02" smooth="yes"/>
+      <point x="55" y="290" type="curve" smooth="yes" name="sh02"/>
       <point x="51" y="323"/>
       <point x="49" y="356"/>
-      <point x="49" y="391" type="curve" name="sh01" smooth="yes"/>
+      <point x="49" y="391" type="curve" smooth="yes" name="sh01"/>
       <point x="49" y="466"/>
       <point x="58" y="542"/>
       <point x="74" y="621" type="curve" smooth="yes"/>
@@ -30,14 +30,14 @@
       <point x="654" y="1448" type="curve" smooth="yes"/>
       <point x="755" y="1497"/>
       <point x="858" y="1520"/>
-      <point x="979" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="979" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1116" y="1520"/>
       <point x="1203" y="1494"/>
       <point x="1310" y="1448" type="curve"/>
       <point x="1268" y="1233" type="line" name="iv01"/>
       <point x="1144" y="1326"/>
       <point x="1027" y="1357"/>
-      <point x="918" y="1357" type="curve" name="sv04" smooth="yes"/>
+      <point x="918" y="1357" type="curve" smooth="yes" name="sv04"/>
       <point x="793" y="1357"/>
       <point x="687" y="1316"/>
       <point x="599" y="1247" type="curve" name="ih01"/>
@@ -46,7 +46,7 @@
       <point x="1065" y="1079" type="curve" smooth="yes"/>
       <point x="1132" y="1003"/>
       <point x="1167" y="895"/>
-      <point x="1167" y="762" type="curve" name="sh05" smooth="yes"/>
+      <point x="1167" y="762" type="curve" smooth="yes" name="sh05"/>
       <point x="1167" y="711"/>
       <point x="1162" y="658"/>
       <point x="1151" y="601" type="curve" smooth="yes"/>
@@ -54,7 +54,7 @@
       <point x="903" y="-29"/>
     </contour>
     <contour>
-      <point x="512" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="512" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="624" y="135"/>
       <point x="701" y="159"/>
       <point x="761" y="202" type="curve" smooth="yes"/>
@@ -66,23 +66,23 @@
       <point x="943" y="600" type="curve" smooth="yes"/>
       <point x="954" y="660"/>
       <point x="961" y="716"/>
-      <point x="961" y="767" type="curve" name="ah01" smooth="yes"/>
+      <point x="961" y="767" type="curve" smooth="yes" name="ah01"/>
       <point x="961" y="794"/>
       <point x="960" y="817"/>
-      <point x="956" y="840" type="curve" name="hr01" smooth="yes"/>
+      <point x="956" y="840" type="curve" smooth="yes" name="hr01"/>
       <point x="944" y="916"/>
       <point x="912" y="972"/>
       <point x="837" y="1013" type="curve" smooth="yes"/>
       <point x="758" y="1056"/>
       <point x="640" y="1081"/>
-      <point x="464" y="1081" type="curve" name="sv01" smooth="yes"/>
+      <point x="464" y="1081" type="curve" smooth="yes" name="sv01"/>
       <point x="452" y="1081" type="line" name="sv05"/>
       <point x="371" y="956"/>
       <point x="316" y="793"/>
       <point x="281" y="622" type="curve" smooth="yes"/>
       <point x="257" y="502"/>
       <point x="246" y="395"/>
-      <point x="246" y="354" type="curve" name="sh03" smooth="yes"/>
+      <point x="246" y="354" type="curve" smooth="yes" name="sh03"/>
       <point x="246" y="297"/>
       <point x="257" y="245"/>
       <point x="294" y="205" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni053F_.glif b/source/Hack-Italic.ufo/glyphs/uni053F_.glif
index eb2c26bb7..6fbd1a414 100644
--- a/source/Hack-Italic.ufo/glyphs/uni053F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni053F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni053F" format="1">
+<glyph name="uni053F" format="2">
   <advance width="1233"/>
   <unicode hex="053F"/>
   <outline>
@@ -7,13 +7,13 @@
       <point x="821" y="431" type="line" name="hr00"/>
       <point x="737" y="380"/>
       <point x="648" y="352"/>
-      <point x="531" y="352" type="curve" name="dv01" smooth="yes"/>
+      <point x="531" y="352" type="curve" smooth="yes" name="dv01"/>
       <point x="395" y="352"/>
       <point x="282" y="391"/>
       <point x="217" y="471" type="curve" smooth="yes"/>
       <point x="172" y="526"/>
       <point x="149" y="601"/>
-      <point x="149" y="696" type="curve" name="dh01" smooth="yes"/>
+      <point x="149" y="696" type="curve" smooth="yes" name="dh01"/>
       <point x="149" y="739"/>
       <point x="154" y="786"/>
       <point x="164" y="838" type="curve" smooth="yes"/>
@@ -22,13 +22,13 @@
       <point x="354" y="776" type="line" smooth="yes"/>
       <point x="349" y="749"/>
       <point x="346" y="724"/>
-      <point x="346" y="701" type="curve" name="dh02" smooth="yes"/>
+      <point x="346" y="701" type="curve" smooth="yes" name="dh02"/>
       <point x="346" y="666"/>
       <point x="352" y="633"/>
       <point x="369" y="602" type="curve" smooth="yes"/>
       <point x="398" y="551"/>
       <point x="454" y="516"/>
-      <point x="570" y="516" type="curve" name="dv02" smooth="yes"/>
+      <point x="570" y="516" type="curve" smooth="yes" name="dv02"/>
       <point x="686" y="516"/>
       <point x="758" y="551"/>
       <point x="806" y="602" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0540.glif b/source/Hack-Italic.ufo/glyphs/uni0540.glif
index 00c8b2ee3..d300627b5 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0540.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0540.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0540" format="1">
+<glyph name="uni0540" format="2">
   <advance width="1233"/>
   <unicode hex="0540"/>
   <outline>
     <contour>
-      <point x="251" y="266" type="line" name="hr00" smooth="yes"/>
+      <point x="251" y="266" type="line" smooth="yes" name="hr00"/>
       <point x="187" y="294"/>
       <point x="132" y="323"/>
       <point x="93" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0541.glif b/source/Hack-Italic.ufo/glyphs/uni0541.glif
index ab8b7e275..262daf1e8 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0541.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0541.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0541" format="1">
+<glyph name="uni0541" format="2">
   <advance width="1233"/>
   <unicode hex="0541"/>
   <outline>
@@ -10,22 +10,22 @@
       <point x="724" y="148" type="curve"/>
       <point x="587" y="36"/>
       <point x="436" y="-29"/>
-      <point x="284" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="284" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="189" y="-29"/>
       <point x="113" y="-3"/>
       <point x="66" y="46" type="curve"/>
       <point x="29" y="83"/>
       <point x="11" y="132"/>
-      <point x="11" y="195" type="curve" name="sh01" smooth="yes"/>
+      <point x="11" y="195" type="curve" smooth="yes" name="sh01"/>
       <point x="11" y="218"/>
       <point x="13" y="242"/>
-      <point x="18" y="265" type="curve" name="sh02" smooth="yes"/>
+      <point x="18" y="265" type="curve" smooth="yes" name="sh02"/>
       <point x="37" y="362"/>
       <point x="86" y="439"/>
       <point x="151" y="490" type="curve" smooth="yes"/>
       <point x="219" y="542"/>
       <point x="305" y="570"/>
-      <point x="402" y="570" type="curve" name="dv04" smooth="yes"/>
+      <point x="402" y="570" type="curve" smooth="yes" name="dv04"/>
       <point x="537" y="570"/>
       <point x="655" y="516"/>
       <point x="756" y="427" type="curve"/>
@@ -34,13 +34,13 @@
       <point x="954" y="887" type="curve" smooth="yes"/>
       <point x="970" y="964"/>
       <point x="978" y="1032"/>
-      <point x="978" y="1091" type="curve" name="ah01" smooth="yes"/>
+      <point x="978" y="1091" type="curve" smooth="yes" name="ah01"/>
       <point x="978" y="1160"/>
       <point x="968" y="1213"/>
       <point x="949" y="1252" type="curve" smooth="yes"/>
       <point x="912" y="1328"/>
       <point x="834" y="1356"/>
-      <point x="731" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="731" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="628" y="1356"/>
       <point x="542" y="1329"/>
       <point x="474" y="1253" type="curve" smooth="yes"/>
@@ -55,13 +55,13 @@
       <point x="369" y="1379" type="curve" smooth="yes"/>
       <point x="481" y="1479"/>
       <point x="615" y="1520"/>
-      <point x="760" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="760" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="907" y="1520"/>
       <point x="1033" y="1478"/>
       <point x="1106" y="1382" type="curve" smooth="yes"/>
       <point x="1159" y="1311"/>
       <point x="1188" y="1212"/>
-      <point x="1188" y="1087" type="curve" name="sh03" smooth="yes"/>
+      <point x="1188" y="1087" type="curve" smooth="yes" name="sh03"/>
       <point x="1188" y="1027"/>
       <point x="1181" y="963"/>
       <point x="1167" y="894" type="curve" smooth="yes"/>
@@ -76,19 +76,19 @@
       <point x="1005" y="54" type="curve"/>
     </contour>
     <contour>
-      <point x="320" y="133" type="curve" name="dv02" smooth="yes"/>
+      <point x="320" y="133" type="curve" smooth="yes" name="dv02"/>
       <point x="411" y="133"/>
       <point x="522" y="183"/>
       <point x="626" y="279" type="curve"/>
       <point x="554" y="356"/>
       <point x="468" y="408"/>
-      <point x="376" y="408" type="curve" name="dv03" smooth="yes"/>
+      <point x="376" y="408" type="curve" smooth="yes" name="dv03"/>
       <point x="285" y="408"/>
       <point x="226" y="358"/>
-      <point x="209" y="270" type="curve" name="sh05" smooth="yes"/>
+      <point x="209" y="270" type="curve" smooth="yes" name="sh05"/>
       <point x="206" y="257"/>
       <point x="205" y="245"/>
-      <point x="205" y="232" type="curve" name="sh04" smooth="yes"/>
+      <point x="205" y="232" type="curve" smooth="yes" name="sh04"/>
       <point x="205" y="168"/>
       <point x="244" y="133"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0542.glif b/source/Hack-Italic.ufo/glyphs/uni0542.glif
index ca0209cb9..f43d09950 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0542.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0542.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0542" format="1">
+<glyph name="uni0542" format="2">
   <advance width="1233"/>
   <unicode hex="0542"/>
   <outline>
     <contour>
-      <point x="855" y="1098" type="line" name="hr00" smooth="yes"/>
+      <point x="855" y="1098" type="line" smooth="yes" name="hr00"/>
       <point x="860" y="1125"/>
       <point x="863" y="1149"/>
-      <point x="863" y="1176" type="curve" name="dh01" smooth="yes"/>
+      <point x="863" y="1176" type="curve" smooth="yes" name="dh01"/>
       <point x="863" y="1211"/>
       <point x="857" y="1243"/>
       <point x="841" y="1271" type="curve" smooth="yes"/>
       <point x="812" y="1322"/>
       <point x="752" y="1356"/>
-      <point x="637" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="637" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="522" y="1356"/>
       <point x="451" y="1322"/>
       <point x="403" y="1271" type="curve" smooth="yes"/>
@@ -25,13 +25,13 @@
       <point x="107" y="1036" type="line" smooth="yes"/>
       <point x="171" y="1367"/>
       <point x="375" y="1520"/>
-      <point x="670" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="670" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="818" y="1520"/>
       <point x="927" y="1482"/>
       <point x="992" y="1402" type="curve"/>
       <point x="1036" y="1346"/>
       <point x="1060" y="1273"/>
-      <point x="1060" y="1177" type="curve" name="dh02" smooth="yes"/>
+      <point x="1060" y="1177" type="curve" smooth="yes" name="dh02"/>
       <point x="1060" y="1134"/>
       <point x="1055" y="1087"/>
       <point x="1045" y="1036" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0543.glif b/source/Hack-Italic.ufo/glyphs/uni0543.glif
index 984a51bcd..1cf34be42 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0543.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0543.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0543" format="1">
+<glyph name="uni0543" format="2">
   <advance width="1233"/>
   <unicode hex="0543"/>
   <outline>
     <contour>
-      <point x="215" y="0" type="line" name="ab01" smooth="yes"/>
+      <point x="215" y="0" type="line" smooth="yes" name="ab01"/>
       <point x="134" y="0"/>
       <point x="68" y="18"/>
       <point x="28" y="54" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0544.glif b/source/Hack-Italic.ufo/glyphs/uni0544.glif
index 30babfe78..945d690f6 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0544.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0544.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0544" format="1">
+<glyph name="uni0544" format="2">
   <advance width="1233"/>
   <unicode hex="0544"/>
   <outline>
     <contour>
-      <point x="376" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="376" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="235" y="-29"/>
       <point x="123" y="6"/>
       <point x="55" y="90" type="curve" smooth="yes"/>
       <point x="9" y="146"/>
       <point x="-14" y="221"/>
-      <point x="-14" y="316" type="curve" name="dh01" smooth="yes"/>
+      <point x="-14" y="316" type="curve" smooth="yes" name="dh01"/>
       <point x="-14" y="359"/>
       <point x="-9" y="406"/>
       <point x="1" y="457" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="191" y="395" type="line" smooth="yes"/>
       <point x="186" y="368"/>
       <point x="183" y="343"/>
-      <point x="183" y="319" type="curve" name="dh02" smooth="yes"/>
+      <point x="183" y="319" type="curve" smooth="yes" name="dh02"/>
       <point x="183" y="284"/>
       <point x="189" y="250"/>
       <point x="205" y="221" type="curve" smooth="yes"/>
       <point x="233" y="170"/>
       <point x="290" y="135"/>
-      <point x="406" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="406" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="521" y="135"/>
       <point x="595" y="170"/>
       <point x="643" y="221" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0545.glif b/source/Hack-Italic.ufo/glyphs/uni0545.glif
index 183059dff..b025ba814 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0545.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0545.glif
@@ -1,72 +1,72 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0545" format="1">
+<glyph name="uni0545" format="2">
   <advance width="1233"/>
   <unicode hex="0545"/>
   <outline>
     <contour>
-      <point x="505" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="505" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="325" y="-29"/>
       <point x="212" y="26"/>
       <point x="145" y="114" type="curve" smooth="yes"/>
       <point x="98" y="175"/>
       <point x="77" y="252"/>
-      <point x="77" y="337" type="curve" name="dh01" smooth="yes"/>
+      <point x="77" y="337" type="curve" smooth="yes" name="dh01"/>
       <point x="77" y="373"/>
       <point x="81" y="408"/>
       <point x="88" y="447" type="curve" name="sh01"/>
       <point x="298" y="447" type="line" name="sv01"/>
       <point x="293" y="416"/>
       <point x="290" y="388"/>
-      <point x="290" y="361" type="curve" name="dh02" smooth="yes"/>
+      <point x="290" y="361" type="curve" smooth="yes" name="dh02"/>
       <point x="290" y="310"/>
       <point x="300" y="266"/>
       <point x="325" y="227" type="curve" smooth="yes"/>
       <point x="362" y="170"/>
       <point x="430" y="135"/>
-      <point x="539" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="539" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="644" y="135"/>
       <point x="726" y="167"/>
-      <point x="786" y="222" type="curve" name="hr01" smooth="yes"/>
+      <point x="786" y="222" type="curve" smooth="yes" name="hr01"/>
       <point x="849" y="278"/>
       <point x="883" y="356"/>
       <point x="898" y="432" type="curve" smooth="yes"/>
       <point x="902" y="455"/>
       <point x="904" y="476"/>
-      <point x="904" y="496" type="curve" name="dh03" smooth="yes"/>
+      <point x="904" y="496" type="curve" smooth="yes" name="dh03"/>
       <point x="904" y="553"/>
       <point x="889" y="599"/>
       <point x="858" y="632" type="curve" smooth="yes"/>
       <point x="815" y="679"/>
       <point x="745" y="705"/>
-      <point x="648" y="705" type="curve" name="dv03" smooth="yes"/>
+      <point x="648" y="705" type="curve" smooth="yes" name="dv03"/>
       <point x="56" y="705" type="line"/>
       <point x="89" y="875" type="line" name="sh02"/>
-      <point x="681" y="875" type="line" name="dv04" smooth="yes"/>
+      <point x="681" y="875" type="line" smooth="yes" name="dv04"/>
       <point x="769" y="875"/>
       <point x="833" y="904"/>
       <point x="884" y="953" type="curve" smooth="yes"/>
       <point x="936" y="1004"/>
       <point x="961" y="1066"/>
-      <point x="973" y="1126" type="curve" name="at01" smooth="yes"/>
+      <point x="973" y="1126" type="curve" smooth="yes" name="at01"/>
       <point x="978" y="1149"/>
       <point x="980" y="1171"/>
-      <point x="980" y="1192" type="curve" name="ih01" smooth="yes"/>
+      <point x="980" y="1192" type="curve" smooth="yes" name="ih01"/>
       <point x="980" y="1304"/>
       <point x="909" y="1356"/>
-      <point x="774" y="1356" type="curve" name="sv02" smooth="yes"/>
+      <point x="774" y="1356" type="curve" smooth="yes" name="sv02"/>
       <point x="617" y="1356"/>
       <point x="521" y="1285"/>
       <point x="489" y="1120" type="curve" name="at02"/>
       <point x="279" y="1120" type="line"/>
       <point x="327" y="1364"/>
       <point x="538" y="1520"/>
-      <point x="805" y="1520" type="curve" name="hr02" smooth="yes"/>
+      <point x="805" y="1520" type="curve" smooth="yes" name="hr02"/>
       <point x="941" y="1520"/>
       <point x="1045" y="1481"/>
       <point x="1113" y="1413" type="curve" smooth="yes"/>
       <point x="1164" y="1362"/>
       <point x="1191" y="1296"/>
-      <point x="1191" y="1209" type="curve" name="sh03" smooth="yes"/>
+      <point x="1191" y="1209" type="curve" smooth="yes" name="sh03"/>
       <point x="1191" y="1182"/>
       <point x="1190" y="1155"/>
       <point x="1183" y="1126" type="curve" name="at03"/>
@@ -75,10 +75,10 @@
       <point x="918" y="805" type="curve" name="ih02"/>
       <point x="1003" y="782"/>
       <point x="1060" y="734"/>
-      <point x="1091" y="669" type="curve" name="hr03" smooth="yes"/>
+      <point x="1091" y="669" type="curve" smooth="yes" name="hr03"/>
       <point x="1110" y="630"/>
       <point x="1119" y="585"/>
-      <point x="1119" y="534" type="curve" name="dh04" smooth="yes"/>
+      <point x="1119" y="534" type="curve" smooth="yes" name="dh04"/>
       <point x="1119" y="506"/>
       <point x="1116" y="476"/>
       <point x="1110" y="444" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0546.glif b/source/Hack-Italic.ufo/glyphs/uni0546.glif
index 9aff4e3f5..6155e88eb 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0546.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0546.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0546" format="1">
+<glyph name="uni0546" format="2">
   <advance width="1233"/>
   <unicode hex="0546"/>
   <outline>
     <contour>
-      <point x="562" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="562" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="414" y="-29"/>
       <point x="305" y="10"/>
       <point x="240" y="90" type="curve" smooth="yes"/>
       <point x="195" y="145"/>
       <point x="172" y="220"/>
-      <point x="172" y="314" type="curve" name="dh01" smooth="yes"/>
+      <point x="172" y="314" type="curve" smooth="yes" name="dh01"/>
       <point x="172" y="357"/>
       <point x="177" y="405"/>
       <point x="187" y="457" type="curve" smooth="yes"/>
@@ -21,13 +21,13 @@
       <point x="377" y="395" type="line" smooth="yes"/>
       <point x="372" y="368"/>
       <point x="369" y="343"/>
-      <point x="369" y="319" type="curve" name="dh02" smooth="yes"/>
+      <point x="369" y="319" type="curve" smooth="yes" name="dh02"/>
       <point x="369" y="284"/>
       <point x="375" y="250"/>
       <point x="391" y="221" type="curve" smooth="yes"/>
       <point x="419" y="170"/>
       <point x="476" y="135"/>
-      <point x="592" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="592" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="707" y="135"/>
       <point x="781" y="170"/>
       <point x="829" y="221" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0547.glif b/source/Hack-Italic.ufo/glyphs/uni0547.glif
index a6a5ec327..db6b78c7e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0547.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0547.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0547" format="1">
+<glyph name="uni0547" format="2">
   <advance width="1233"/>
   <unicode hex="0547"/>
   <outline>
     <contour>
-      <point x="480" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="480" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="335" y="-29"/>
       <point x="207" y="14"/>
       <point x="132" y="115" type="curve" smooth="yes"/>
       <point x="79" y="188"/>
       <point x="49" y="299"/>
-      <point x="49" y="428" type="curve" name="dh01" smooth="yes"/>
+      <point x="49" y="428" type="curve" smooth="yes" name="dh01"/>
       <point x="49" y="483"/>
       <point x="54" y="538"/>
       <point x="65" y="597" type="curve" smooth="yes"/>
@@ -38,7 +38,7 @@
       <point x="792" y="1137" type="curve" smooth="yes"/>
       <point x="763" y="1144"/>
       <point x="731" y="1147"/>
-      <point x="704" y="1147" type="curve" name="sv01" smooth="yes"/>
+      <point x="704" y="1147" type="curve" smooth="yes" name="sv01"/>
       <point x="601" y="1147"/>
       <point x="512" y="1086"/>
       <point x="444" y="998" type="curve" smooth="yes"/>
@@ -47,13 +47,13 @@
       <point x="347" y="824" type="curve" smooth="yes"/>
       <point x="292" y="692"/>
       <point x="259" y="530"/>
-      <point x="259" y="399" type="curve" name="dh02" smooth="yes"/>
+      <point x="259" y="399" type="curve" smooth="yes" name="dh02"/>
       <point x="259" y="274"/>
       <point x="287" y="199"/>
       <point x="370" y="160" type="curve" smooth="yes"/>
       <point x="406" y="143"/>
       <point x="452" y="135"/>
-      <point x="508" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="508" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="620" y="135"/>
       <point x="698" y="166"/>
       <point x="762" y="238" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0548.glif b/source/Hack-Italic.ufo/glyphs/uni0548.glif
index cedcc20b6..68488d07d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0548.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0548.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0548" format="1">
+<glyph name="uni0548" format="2">
   <advance width="1233"/>
   <unicode hex="0548"/>
   <outline>
     <contour>
-      <point x="200" y="1036" type="line" name="hr00" smooth="yes"/>
+      <point x="200" y="1036" type="line" smooth="yes" name="hr00"/>
       <point x="264" y="1367"/>
       <point x="468" y="1522"/>
-      <point x="763" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="763" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="911" y="1522"/>
       <point x="1020" y="1483"/>
       <point x="1085" y="1403" type="curve"/>
       <point x="1129" y="1347"/>
       <point x="1153" y="1274"/>
-      <point x="1153" y="1178" type="curve" name="dh02" smooth="yes"/>
+      <point x="1153" y="1178" type="curve" smooth="yes" name="dh02"/>
       <point x="1153" y="1134"/>
       <point x="1148" y="1087"/>
       <point x="1138" y="1036" type="curve" smooth="yes"/>
@@ -22,13 +22,13 @@
       <point x="948" y="1098" type="line" smooth="yes"/>
       <point x="953" y="1125"/>
       <point x="956" y="1150"/>
-      <point x="956" y="1175" type="curve" name="dh01" smooth="yes"/>
+      <point x="956" y="1175" type="curve" smooth="yes" name="dh01"/>
       <point x="956" y="1210"/>
       <point x="950" y="1243"/>
       <point x="934" y="1272" type="curve" smooth="yes"/>
       <point x="907" y="1320"/>
       <point x="851" y="1358"/>
-      <point x="732" y="1358" type="curve" name="dv01" smooth="yes"/>
+      <point x="732" y="1358" type="curve" smooth="yes" name="dv01"/>
       <point x="616" y="1358"/>
       <point x="544" y="1323"/>
       <point x="496" y="1272" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0549.glif b/source/Hack-Italic.ufo/glyphs/uni0549.glif
index b98ca6e99..641bded48 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0549.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0549.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0549" format="1">
+<glyph name="uni0549" format="2">
   <advance width="1233"/>
   <unicode hex="0549"/>
   <outline>
@@ -18,13 +18,13 @@
       <point x="891" y="668" type="curve" smooth="yes"/>
       <point x="950" y="809"/>
       <point x="979" y="979"/>
-      <point x="979" y="1098" type="curve" name="dh01" smooth="yes"/>
+      <point x="979" y="1098" type="curve" smooth="yes" name="dh01"/>
       <point x="979" y="1227"/>
       <point x="942" y="1296"/>
       <point x="867" y="1331" type="curve" smooth="yes"/>
       <point x="831" y="1348"/>
       <point x="785" y="1356"/>
-      <point x="729" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="729" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="621" y="1356"/>
       <point x="539" y="1327"/>
       <point x="474" y="1252" type="curve" smooth="yes"/>
@@ -39,13 +39,13 @@
       <point x="371" y="1379" type="curve" smooth="yes"/>
       <point x="484" y="1479"/>
       <point x="618" y="1520"/>
-      <point x="759" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="759" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="907" y="1520"/>
       <point x="1034" y="1476"/>
       <point x="1107" y="1376" type="curve" smooth="yes"/>
       <point x="1158" y="1307"/>
       <point x="1189" y="1201"/>
-      <point x="1189" y="1072" type="curve" name="dh02" smooth="yes"/>
+      <point x="1189" y="1072" type="curve" smooth="yes" name="dh02"/>
       <point x="1189" y="1016"/>
       <point x="1183" y="957"/>
       <point x="1171" y="895" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni054A_.glif b/source/Hack-Italic.ufo/glyphs/uni054A_.glif
index fbfe538c9..b4f73e0ef 100644
--- a/source/Hack-Italic.ufo/glyphs/uni054A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni054A_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni054A" format="1">
+<glyph name="uni054A" format="2">
   <advance width="1233"/>
   <unicode hex="054A"/>
   <outline>
     <contour>
-      <point x="1008" y="917" type="line" name="hr00" smooth="yes"/>
+      <point x="1008" y="917" type="line" smooth="yes" name="hr00"/>
       <point x="1020" y="981"/>
       <point x="1030" y="1044"/>
-      <point x="1030" y="1103" type="curve" name="dh01" smooth="yes"/>
+      <point x="1030" y="1103" type="curve" smooth="yes" name="dh01"/>
       <point x="1030" y="1140"/>
       <point x="1026" y="1174"/>
       <point x="1017" y="1204" type="curve" smooth="yes"/>
@@ -28,13 +28,13 @@
       <point x="98" y="932" type="line" smooth="yes"/>
       <point x="164" y="1279"/>
       <point x="368" y="1520"/>
-      <point x="768" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="768" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="971" y="1520"/>
       <point x="1099" y="1460"/>
       <point x="1164" y="1356" type="curve" smooth="yes"/>
       <point x="1204" y="1292"/>
       <point x="1221" y="1212"/>
-      <point x="1221" y="1120" type="curve" name="dh02" smooth="yes"/>
+      <point x="1221" y="1120" type="curve" smooth="yes" name="dh02"/>
       <point x="1221" y="1061"/>
       <point x="1214" y="999"/>
       <point x="1201" y="932" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni054B_.glif b/source/Hack-Italic.ufo/glyphs/uni054B_.glif
index 630f8db6f..861b2f2ec 100644
--- a/source/Hack-Italic.ufo/glyphs/uni054B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni054B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni054B" format="1">
+<glyph name="uni054B" format="2">
   <advance width="1233"/>
   <unicode hex="054B"/>
   <outline>
@@ -13,16 +13,16 @@
       <point x="522" y="259" type="curve"/>
       <point x="551" y="323"/>
       <point x="574" y="390"/>
-      <point x="585" y="447" type="curve" name="sh02" smooth="yes"/>
+      <point x="585" y="447" type="curve" smooth="yes" name="sh02"/>
       <point x="590" y="470"/>
       <point x="592" y="493"/>
-      <point x="592" y="516" type="curve" name="sh01" smooth="yes"/>
+      <point x="592" y="516" type="curve" smooth="yes" name="sh01"/>
       <point x="592" y="553"/>
       <point x="584" y="584"/>
       <point x="569" y="608" type="curve" smooth="yes"/>
       <point x="541" y="651"/>
       <point x="498" y="664"/>
-      <point x="423" y="667" type="curve" name="dv01" smooth="yes"/>
+      <point x="423" y="667" type="curve" smooth="yes" name="dv01"/>
       <point x="350" y="670"/>
       <point x="254" y="673"/>
       <point x="191" y="721" type="curve" smooth="yes"/>
@@ -40,13 +40,13 @@
       <point x="430" y="1432" type="curve" smooth="yes"/>
       <point x="518" y="1487"/>
       <point x="622" y="1520"/>
-      <point x="757" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="757" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="961" y="1520"/>
       <point x="1076" y="1440"/>
       <point x="1132" y="1333" type="curve" smooth="yes"/>
       <point x="1167" y="1265"/>
       <point x="1183" y="1179"/>
-      <point x="1183" y="1087" type="curve" name="sh03" smooth="yes"/>
+      <point x="1183" y="1087" type="curve" smooth="yes" name="sh03"/>
       <point x="1183" y="1023"/>
       <point x="1175" y="959"/>
       <point x="1162" y="895" type="curve" smooth="yes"/>
@@ -67,13 +67,13 @@
       <point x="951" y="895" type="curve"/>
       <point x="966" y="960"/>
       <point x="974" y="1031"/>
-      <point x="974" y="1095" type="curve" name="ah01" smooth="yes"/>
+      <point x="974" y="1095" type="curve" smooth="yes" name="ah01"/>
       <point x="974" y="1144"/>
       <point x="968" y="1190"/>
       <point x="955" y="1226" type="curve" smooth="yes"/>
       <point x="924" y="1310"/>
       <point x="850" y="1356"/>
-      <point x="729" y="1356" type="curve" name="sh06" smooth="yes"/>
+      <point x="729" y="1356" type="curve" smooth="yes" name="sh06"/>
       <point x="605" y="1356"/>
       <point x="519" y="1308"/>
       <point x="456" y="1235" type="curve" smooth="yes"/>
@@ -88,16 +88,16 @@
       <point x="354" y="882" type="curve" smooth="yes"/>
       <point x="377" y="847"/>
       <point x="423" y="845"/>
-      <point x="498" y="842" type="curve" name="dv02" smooth="yes"/>
+      <point x="498" y="842" type="curve" smooth="yes" name="dv02"/>
       <point x="561" y="839"/>
       <point x="652" y="831"/>
       <point x="705" y="745" type="curve" smooth="yes"/>
       <point x="730" y="706"/>
       <point x="742" y="657"/>
-      <point x="742" y="600" type="curve" name="sh04" smooth="yes"/>
+      <point x="742" y="600" type="curve" smooth="yes" name="sh04"/>
       <point x="742" y="569"/>
       <point x="739" y="538"/>
-      <point x="732" y="505" type="curve" name="hr01" smooth="yes"/>
+      <point x="732" y="505" type="curve" smooth="yes" name="hr01"/>
       <point x="727" y="478"/>
       <point x="719" y="451"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni054C_.glif b/source/Hack-Italic.ufo/glyphs/uni054C_.glif
index 07ef8e3a6..1ca9e54a0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni054C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni054C_.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni054C" format="1">
+<glyph name="uni054C" format="2">
   <advance width="1233"/>
   <unicode hex="054C"/>
   <outline>
     <contour>
-      <point x="107" y="1036" type="line" name="hr00" smooth="yes"/>
+      <point x="107" y="1036" type="line" smooth="yes" name="hr00"/>
       <point x="171" y="1367"/>
       <point x="375" y="1520"/>
-      <point x="670" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="670" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="818" y="1520"/>
       <point x="927" y="1482"/>
       <point x="992" y="1402" type="curve"/>
       <point x="1036" y="1346"/>
       <point x="1060" y="1273"/>
-      <point x="1060" y="1177" type="curve" name="dh02" smooth="yes"/>
+      <point x="1060" y="1177" type="curve" smooth="yes" name="dh02"/>
       <point x="1060" y="1134"/>
       <point x="1055" y="1087"/>
       <point x="1045" y="1036" type="curve" smooth="yes"/>
@@ -26,13 +26,13 @@
       <point x="855" y="1098" type="line" smooth="yes"/>
       <point x="860" y="1125"/>
       <point x="863" y="1149"/>
-      <point x="863" y="1176" type="curve" name="dh01" smooth="yes"/>
+      <point x="863" y="1176" type="curve" smooth="yes" name="dh01"/>
       <point x="863" y="1211"/>
       <point x="857" y="1243"/>
       <point x="841" y="1271" type="curve" smooth="yes"/>
       <point x="812" y="1322"/>
       <point x="752" y="1356"/>
-      <point x="637" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="637" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="522" y="1356"/>
       <point x="451" y="1322"/>
       <point x="403" y="1271" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni054D_.glif b/source/Hack-Italic.ufo/glyphs/uni054D_.glif
index 33070d2d7..d71778269 100644
--- a/source/Hack-Italic.ufo/glyphs/uni054D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni054D_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni054D" format="1">
+<glyph name="uni054D" format="2">
   <advance width="1233"/>
   <unicode hex="054D"/>
   <outline>
     <contour>
-      <point x="468" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="468" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="320" y="-29"/>
       <point x="211" y="10"/>
       <point x="146" y="90" type="curve" smooth="yes"/>
       <point x="101" y="145"/>
       <point x="78" y="220"/>
-      <point x="78" y="314" type="curve" name="dh01" smooth="yes"/>
+      <point x="78" y="314" type="curve" smooth="yes" name="dh01"/>
       <point x="78" y="357"/>
       <point x="83" y="405"/>
       <point x="93" y="457" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="283" y="395" type="line" smooth="yes"/>
       <point x="278" y="368"/>
       <point x="275" y="343"/>
-      <point x="275" y="319" type="curve" name="dh02" smooth="yes"/>
+      <point x="275" y="319" type="curve" smooth="yes" name="dh02"/>
       <point x="275" y="284"/>
       <point x="281" y="250"/>
       <point x="297" y="221" type="curve" smooth="yes"/>
       <point x="325" y="170"/>
       <point x="382" y="135"/>
-      <point x="498" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="498" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="613" y="135"/>
       <point x="687" y="170"/>
       <point x="735" y="221" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni054E_.glif b/source/Hack-Italic.ufo/glyphs/uni054E_.glif
index 688c83aec..65eef8312 100644
--- a/source/Hack-Italic.ufo/glyphs/uni054E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni054E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni054E" format="1">
+<glyph name="uni054E" format="2">
   <advance width="1233"/>
   <unicode hex="054E"/>
   <outline>
@@ -7,13 +7,13 @@
       <point x="707" y="431" type="line" name="hr00"/>
       <point x="615" y="375"/>
       <point x="525" y="352"/>
-      <point x="417" y="352" type="curve" name="dv01" smooth="yes"/>
+      <point x="417" y="352" type="curve" smooth="yes" name="dv01"/>
       <point x="281" y="352"/>
       <point x="171" y="390"/>
       <point x="104" y="471" type="curve" smooth="yes"/>
       <point x="58" y="527"/>
       <point x="35" y="602"/>
-      <point x="35" y="697" type="curve" name="dh01" smooth="yes"/>
+      <point x="35" y="697" type="curve" smooth="yes" name="dh01"/>
       <point x="35" y="740"/>
       <point x="40" y="787"/>
       <point x="50" y="838" type="curve" smooth="yes"/>
@@ -22,13 +22,13 @@
       <point x="240" y="776" type="line" smooth="yes"/>
       <point x="235" y="749"/>
       <point x="232" y="724"/>
-      <point x="232" y="701" type="curve" name="dh02" smooth="yes"/>
+      <point x="232" y="701" type="curve" smooth="yes" name="dh02"/>
       <point x="232" y="666"/>
       <point x="238" y="633"/>
       <point x="255" y="602" type="curve" smooth="yes"/>
       <point x="284" y="551"/>
       <point x="340" y="516"/>
-      <point x="456" y="516" type="curve" name="dv02" smooth="yes"/>
+      <point x="456" y="516" type="curve" smooth="yes" name="dv02"/>
       <point x="572" y="516"/>
       <point x="644" y="551"/>
       <point x="692" y="602" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni054F_.glif b/source/Hack-Italic.ufo/glyphs/uni054F_.glif
index d071aa929..f51e3ac05 100644
--- a/source/Hack-Italic.ufo/glyphs/uni054F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni054F_.glif
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni054F" format="1">
+<glyph name="uni054F" format="2">
   <advance width="1233"/>
   <unicode hex="054F"/>
   <outline>
     <contour>
-      <point x="481" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="481" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="316" y="-29"/>
       <point x="196" y="19"/>
       <point x="120" y="103" type="curve" smooth="yes"/>
       <point x="64" y="165"/>
       <point x="36" y="244"/>
-      <point x="36" y="341" type="curve" name="dh01" smooth="yes"/>
+      <point x="36" y="341" type="curve" smooth="yes" name="dh01"/>
       <point x="36" y="374"/>
       <point x="39" y="410"/>
       <point x="46" y="447" type="curve" name="sh01"/>
       <point x="256" y="447" type="line" name="sv01"/>
       <point x="251" y="420"/>
       <point x="248" y="396"/>
-      <point x="248" y="373" type="curve" name="dh02" smooth="yes"/>
+      <point x="248" y="373" type="curve" smooth="yes" name="dh02"/>
       <point x="248" y="309"/>
       <point x="266" y="257"/>
       <point x="302" y="216" type="curve" smooth="yes"/>
       <point x="349" y="163"/>
       <point x="421" y="135"/>
-      <point x="513" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="513" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="602" y="135"/>
       <point x="678" y="160"/>
       <point x="741" y="210" type="curve" smooth="yes"/>
@@ -32,7 +32,7 @@
       <point x="864" y="421" type="curve" smooth="yes"/>
       <point x="867" y="436"/>
       <point x="868" y="452"/>
-      <point x="868" y="469" type="curve" name="dh03" smooth="yes"/>
+      <point x="868" y="469" type="curve" smooth="yes" name="dh03"/>
       <point x="868" y="524"/>
       <point x="850" y="562"/>
       <point x="819" y="593" type="curve" smooth="yes"/>
@@ -41,7 +41,7 @@
       <point x="647" y="688" type="curve" smooth="yes"/>
       <point x="600" y="706"/>
       <point x="551" y="722"/>
-      <point x="542" y="725" type="curve" name="hr01" smooth="yes"/>
+      <point x="542" y="725" type="curve" smooth="yes" name="hr01"/>
       <point x="466" y="750"/>
       <point x="398" y="780"/>
       <point x="343" y="819" type="curve" smooth="yes"/>
@@ -50,7 +50,7 @@
       <point x="233" y="988" type="curve" smooth="yes"/>
       <point x="230" y="1003"/>
       <point x="229" y="1021"/>
-      <point x="229" y="1042" type="curve" name="ih01" smooth="yes"/>
+      <point x="229" y="1042" type="curve" smooth="yes" name="ih01"/>
       <point x="229" y="1114"/>
       <point x="249" y="1197"/>
       <point x="293" y="1274" type="curve" smooth="yes"/>
@@ -59,35 +59,35 @@
       <point x="556" y="1488" type="curve" smooth="yes"/>
       <point x="618" y="1509"/>
       <point x="686" y="1520"/>
-      <point x="761" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="761" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="918" y="1520"/>
       <point x="1021" y="1474"/>
       <point x="1082" y="1401" type="curve" smooth="yes"/>
       <point x="1127" y="1346"/>
       <point x="1148" y="1280"/>
-      <point x="1148" y="1204" type="curve" name="sh02" smooth="yes"/>
+      <point x="1148" y="1204" type="curve" smooth="yes" name="sh02"/>
       <point x="1148" y="1177"/>
       <point x="1147" y="1149"/>
       <point x="1140" y="1120" type="curve" name="sv02"/>
       <point x="930" y="1120" type="line"/>
       <point x="934" y="1142"/>
       <point x="936" y="1163"/>
-      <point x="936" y="1184" type="curve" name="ih02" smooth="yes"/>
+      <point x="936" y="1184" type="curve" smooth="yes" name="ih02"/>
       <point x="936" y="1227"/>
       <point x="927" y="1262"/>
       <point x="906" y="1290" type="curve" smooth="yes"/>
       <point x="873" y="1333"/>
       <point x="814" y="1355"/>
-      <point x="729" y="1355" type="curve" name="sv03" smooth="yes"/>
+      <point x="729" y="1355" type="curve" smooth="yes" name="sv03"/>
       <point x="649" y="1355"/>
       <point x="584" y="1336"/>
-      <point x="531" y="1293" type="curve" name="hr02" smooth="yes"/>
+      <point x="531" y="1293" type="curve" smooth="yes" name="hr02"/>
       <point x="479" y="1250"/>
       <point x="449" y="1191"/>
       <point x="438" y="1130" type="curve" smooth="yes"/>
       <point x="435" y="1117"/>
       <point x="434" y="1103"/>
-      <point x="434" y="1089" type="curve" name="sh03" smooth="yes"/>
+      <point x="434" y="1089" type="curve" smooth="yes" name="sh03"/>
       <point x="434" y="1028"/>
       <point x="462" y="985"/>
       <point x="522" y="948" type="curve" smooth="yes"/>
@@ -99,10 +99,10 @@
       <point x="895" y="792" type="curve" smooth="yes"/>
       <point x="979" y="747"/>
       <point x="1041" y="690"/>
-      <point x="1064" y="594" type="curve" name="hr03" smooth="yes"/>
+      <point x="1064" y="594" type="curve" smooth="yes" name="hr03"/>
       <point x="1070" y="569"/>
       <point x="1073" y="542"/>
-      <point x="1073" y="514" type="curve" name="dh04" smooth="yes"/>
+      <point x="1073" y="514" type="curve" smooth="yes" name="dh04"/>
       <point x="1073" y="426"/>
       <point x="1046" y="330"/>
       <point x="995" y="243" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0550.glif b/source/Hack-Italic.ufo/glyphs/uni0550.glif
index d6e1eeb50..4290ae087 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0550.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0550.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0550" format="1">
+<glyph name="uni0550" format="2">
   <advance width="1233"/>
   <unicode hex="0550"/>
   <outline>
     <contour>
-      <point x="200" y="1036" type="line" name="hr00" smooth="yes"/>
+      <point x="200" y="1036" type="line" smooth="yes" name="hr00"/>
       <point x="264" y="1367"/>
       <point x="468" y="1522"/>
-      <point x="763" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="763" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="911" y="1522"/>
       <point x="1020" y="1483"/>
       <point x="1085" y="1403" type="curve"/>
       <point x="1129" y="1347"/>
       <point x="1153" y="1274"/>
-      <point x="1153" y="1178" type="curve" name="dh02" smooth="yes"/>
+      <point x="1153" y="1178" type="curve" smooth="yes" name="dh02"/>
       <point x="1153" y="1135"/>
       <point x="1148" y="1088"/>
       <point x="1138" y="1036" type="curve" smooth="yes"/>
@@ -22,13 +22,13 @@
       <point x="948" y="1098" type="line" smooth="yes"/>
       <point x="953" y="1125"/>
       <point x="956" y="1150"/>
-      <point x="956" y="1175" type="curve" name="dh01" smooth="yes"/>
+      <point x="956" y="1175" type="curve" smooth="yes" name="dh01"/>
       <point x="956" y="1210"/>
       <point x="950" y="1243"/>
       <point x="934" y="1272" type="curve" smooth="yes"/>
       <point x="907" y="1320"/>
       <point x="851" y="1358"/>
-      <point x="732" y="1358" type="curve" name="dv01" smooth="yes"/>
+      <point x="732" y="1358" type="curve" smooth="yes" name="dv01"/>
       <point x="616" y="1358"/>
       <point x="544" y="1323"/>
       <point x="496" y="1272" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0551.glif b/source/Hack-Italic.ufo/glyphs/uni0551.glif
index 48702dc27..1c2cd4090 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0551.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0551.glif
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0551" format="1">
+<glyph name="uni0551" format="2">
   <advance width="1233"/>
   <unicode hex="0551"/>
   <outline>
     <contour>
-      <point x="506" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="506" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="330" y="-29"/>
       <point x="214" y="23"/>
       <point x="146" y="114" type="curve" smooth="yes"/>
       <point x="99" y="177"/>
       <point x="77" y="252"/>
-      <point x="77" y="339" type="curve" name="dh01" smooth="yes"/>
+      <point x="77" y="339" type="curve" smooth="yes" name="dh01"/>
       <point x="77" y="372"/>
       <point x="81" y="408"/>
       <point x="88" y="447" type="curve" name="sh01"/>
       <point x="298" y="447" type="line" name="sv01"/>
       <point x="292" y="417"/>
       <point x="289" y="388"/>
-      <point x="289" y="360" type="curve" name="dh02" smooth="yes"/>
+      <point x="289" y="360" type="curve" smooth="yes" name="dh02"/>
       <point x="289" y="307"/>
       <point x="301" y="263"/>
       <point x="324" y="227" type="curve" smooth="yes"/>
       <point x="359" y="172"/>
       <point x="422" y="135"/>
-      <point x="537" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="537" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="758" y="135"/>
       <point x="870" y="283"/>
       <point x="900" y="447" type="curve" smooth="yes"/>
       <point x="904" y="468"/>
       <point x="906" y="487"/>
-      <point x="906" y="506" type="curve" name="dh03" smooth="yes"/>
+      <point x="906" y="506" type="curve" smooth="yes" name="dh03"/>
       <point x="906" y="558"/>
       <point x="890" y="601"/>
       <point x="859" y="634" type="curve" smooth="yes"/>
       <point x="816" y="679"/>
       <point x="747" y="705"/>
-      <point x="650" y="705" type="curve" name="dv03" smooth="yes"/>
+      <point x="650" y="705" type="curve" smooth="yes" name="dv03"/>
       <point x="56" y="705" type="line"/>
       <point x="89" y="875" type="line" name="sh02"/>
       <point x="362" y="875" type="line" name="hr01"/>
@@ -50,13 +50,13 @@
       <point x="278" y="1120" type="curve" smooth="yes"/>
       <point x="317" y="1354"/>
       <point x="529" y="1520"/>
-      <point x="807" y="1520" type="curve" name="hr02" smooth="yes"/>
+      <point x="807" y="1520" type="curve" smooth="yes" name="hr02"/>
       <point x="950" y="1520"/>
       <point x="1055" y="1481"/>
       <point x="1119" y="1410" type="curve" smooth="yes"/>
       <point x="1167" y="1358"/>
       <point x="1191" y="1291"/>
-      <point x="1191" y="1210" type="curve" name="sh03" smooth="yes"/>
+      <point x="1191" y="1210" type="curve" smooth="yes" name="sh03"/>
       <point x="1191" y="1182"/>
       <point x="1188" y="1152"/>
       <point x="1182" y="1120" type="curve" smooth="yes"/>
@@ -71,7 +71,7 @@
       <point x="1090" y="666" type="curve" smooth="yes"/>
       <point x="1110" y="623"/>
       <point x="1118" y="579"/>
-      <point x="1118" y="532" type="curve" name="dh04" smooth="yes"/>
+      <point x="1118" y="532" type="curve" smooth="yes" name="dh04"/>
       <point x="1118" y="504"/>
       <point x="1115" y="476"/>
       <point x="1110" y="447" type="curve" smooth="yes"/>
@@ -79,31 +79,31 @@
       <point x="862" y="-29"/>
     </contour>
     <contour>
-      <point x="680" y="875" type="curve" name="dv04" smooth="yes"/>
+      <point x="680" y="875" type="curve" smooth="yes" name="dv04"/>
       <point x="775" y="875"/>
       <point x="839" y="906"/>
       <point x="884" y="950" type="curve" smooth="yes"/>
       <point x="931" y="994"/>
       <point x="962" y="1059"/>
-      <point x="974" y="1120" type="curve" name="hr03" smooth="yes"/>
+      <point x="974" y="1120" type="curve" smooth="yes" name="hr03"/>
       <point x="978" y="1139"/>
       <point x="980" y="1159"/>
-      <point x="980" y="1180" type="curve" name="ih01" smooth="yes"/>
+      <point x="980" y="1180" type="curve" smooth="yes" name="ih01"/>
       <point x="980" y="1219"/>
       <point x="973" y="1254"/>
       <point x="954" y="1285" type="curve" smooth="yes"/>
       <point x="941" y="1306"/>
       <point x="923" y="1324"/>
-      <point x="892" y="1337" type="curve" name="hr04" smooth="yes"/>
+      <point x="892" y="1337" type="curve" smooth="yes" name="hr04"/>
       <point x="863" y="1350"/>
       <point x="824" y="1356"/>
-      <point x="775" y="1356" type="curve" name="sv02" smooth="yes"/>
+      <point x="775" y="1356" type="curve" smooth="yes" name="sv02"/>
       <point x="679" y="1356"/>
       <point x="618" y="1331"/>
       <point x="571" y="1286" type="curve" smooth="yes"/>
       <point x="528" y="1244"/>
       <point x="500" y="1189"/>
-      <point x="487" y="1120" type="curve" name="hr05" smooth="yes"/>
+      <point x="487" y="1120" type="curve" smooth="yes" name="hr05"/>
       <point x="483" y="1097"/>
       <point x="480" y="1075"/>
       <point x="480" y="1052" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0552.glif b/source/Hack-Italic.ufo/glyphs/uni0552.glif
index b0f7663a1..bee8a82e4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0552.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0552.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0552" format="1">
+<glyph name="uni0552" format="2">
   <advance width="1233"/>
   <unicode hex="0552"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0553.glif b/source/Hack-Italic.ufo/glyphs/uni0553.glif
index 05d8ae6bd..a7a40408d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0553.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0553.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0553" format="1">
+<glyph name="uni0553" format="2">
   <advance width="1233"/>
   <unicode hex="0553"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="77" y="329" type="curve" smooth="yes"/>
       <point x="56" y="381"/>
       <point x="46" y="453"/>
-      <point x="46" y="533" type="curve" name="sh01" smooth="yes"/>
+      <point x="46" y="533" type="curve" smooth="yes" name="sh01"/>
       <point x="46" y="608"/>
       <point x="54" y="685"/>
       <point x="69" y="766" type="curve" smooth="yes"/>
       <point x="105" y="955"/>
       <point x="173" y="1105"/>
-      <point x="250" y="1201" type="curve" name="sh03" smooth="yes"/>
+      <point x="250" y="1201" type="curve" smooth="yes" name="sh03"/>
       <point x="334" y="1306"/>
       <point x="449" y="1363"/>
       <point x="639" y="1371" type="curve" name="sv05"/>
@@ -28,7 +28,7 @@
       <point x="1160" y="1202" type="curve" smooth="yes"/>
       <point x="1183" y="1151"/>
       <point x="1194" y="1088"/>
-      <point x="1194" y="1015" type="curve" name="sh04" smooth="yes"/>
+      <point x="1194" y="1015" type="curve" smooth="yes" name="sh04"/>
       <point x="1194" y="942"/>
       <point x="1184" y="858"/>
       <point x="1165" y="765" type="curve" smooth="yes"/>
@@ -48,10 +48,10 @@
       <point x="268" y="765" type="curve" smooth="yes"/>
       <point x="249" y="672"/>
       <point x="240" y="597"/>
-      <point x="240" y="534" type="curve" name="sh02" smooth="yes"/>
+      <point x="240" y="534" type="curve" smooth="yes" name="sh02"/>
       <point x="240" y="489"/>
       <point x="245" y="452"/>
-      <point x="256" y="423" type="curve" name="hr02" smooth="yes"/>
+      <point x="256" y="423" type="curve" smooth="yes" name="hr02"/>
       <point x="281" y="351"/>
       <point x="338" y="320"/>
       <point x="434" y="316" type="curve" name="sv01"/>
@@ -66,10 +66,10 @@
       <point x="946" y="655" type="curve" smooth="yes"/>
       <point x="977" y="760"/>
       <point x="991" y="885"/>
-      <point x="991" y="968" type="curve" name="ah01" smooth="yes"/>
+      <point x="991" y="968" type="curve" smooth="yes" name="ah01"/>
       <point x="991" y="1033"/>
       <point x="986" y="1081"/>
-      <point x="979" y="1102" type="curve" name="sh06" smooth="yes"/>
+      <point x="979" y="1102" type="curve" smooth="yes" name="sh06"/>
       <point x="960" y="1169"/>
       <point x="886" y="1200"/>
       <point x="799" y="1203" type="curve" name="sv07"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0554.glif b/source/Hack-Italic.ufo/glyphs/uni0554.glif
index 9262b74d8..31ace0369 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0554.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0554.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0554" format="1">
+<glyph name="uni0554" format="2">
   <advance width="1233"/>
   <unicode hex="0554"/>
   <outline>
@@ -14,13 +14,13 @@
       <point x="477" y="1395" type="curve" smooth="yes"/>
       <point x="570" y="1475"/>
       <point x="696" y="1520"/>
-      <point x="857" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="857" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1025" y="1520"/>
       <point x="1134" y="1472"/>
       <point x="1193" y="1393" type="curve" smooth="yes"/>
       <point x="1236" y="1337"/>
       <point x="1254" y="1260"/>
-      <point x="1254" y="1180" type="curve" name="dh02" smooth="yes"/>
+      <point x="1254" y="1180" type="curve" smooth="yes" name="dh02"/>
       <point x="1254" y="1145"/>
       <point x="1251" y="1112"/>
       <point x="1244" y="1077" type="curve" smooth="yes"/>
@@ -29,7 +29,7 @@
       <point x="1069" y="763" type="curve" smooth="yes"/>
       <point x="971" y="677"/>
       <point x="850" y="634"/>
-      <point x="706" y="634" type="curve" name="dv03" smooth="yes"/>
+      <point x="706" y="634" type="curve" smooth="yes" name="dv03"/>
       <point x="645" y="634"/>
       <point x="596" y="642"/>
       <point x="549" y="661" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="94" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="733" y="798" type="curve" name="dv04" smooth="yes"/>
+      <point x="733" y="798" type="curve" smooth="yes" name="dv04"/>
       <point x="833" y="798"/>
       <point x="895" y="823"/>
       <point x="944" y="875" type="curve" smooth="yes"/>
@@ -53,7 +53,7 @@
       <point x="1044" y="1077" type="curve" smooth="yes"/>
       <point x="1048" y="1101"/>
       <point x="1050" y="1124"/>
-      <point x="1050" y="1147" type="curve" name="dh01" smooth="yes"/>
+      <point x="1050" y="1147" type="curve" smooth="yes" name="dh01"/>
       <point x="1050" y="1202"/>
       <point x="1038" y="1247"/>
       <point x="1022" y="1278" type="curve"/>
@@ -62,7 +62,7 @@
       <point x="954" y="1337" type="curve" smooth="yes"/>
       <point x="922" y="1349"/>
       <point x="875" y="1356"/>
-      <point x="823" y="1356" type="curve" name="sv04" smooth="yes"/>
+      <point x="823" y="1356" type="curve" smooth="yes" name="sv04"/>
       <point x="715" y="1356"/>
       <point x="650" y="1326"/>
       <point x="603" y="1279" type="curve" smooth="yes"/>
@@ -74,7 +74,7 @@
       <point x="498" y="1004" type="curve" smooth="yes"/>
       <point x="498" y="955"/>
       <point x="507" y="911"/>
-      <point x="528" y="878" type="curve" name="hr02" smooth="yes"/>
+      <point x="528" y="878" type="curve" smooth="yes" name="hr02"/>
       <point x="561" y="826"/>
       <point x="626" y="798"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0555.glif b/source/Hack-Italic.ufo/glyphs/uni0555.glif
index f092441fc..daae19bbf 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0555.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0555.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0555" format="1">
+<glyph name="uni0555" format="2">
   <advance width="1233"/>
   <unicode hex="0555"/>
   <outline>
     <contour>
-      <point x="480" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="480" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="215" y="-29"/>
       <point x="82" y="134"/>
-      <point x="82" y="459" type="curve" name="sh01" smooth="yes"/>
+      <point x="82" y="459" type="curve" smooth="yes" name="sh01"/>
       <point x="82" y="630"/>
       <point x="116" y="818"/>
       <point x="167" y="975" type="curve" smooth="yes"/>
@@ -16,10 +16,10 @@
       <point x="304" y="1272" type="curve" smooth="yes"/>
       <point x="416" y="1439"/>
       <point x="560" y="1520"/>
-      <point x="751" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="751" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1019" y="1520"/>
       <point x="1151" y="1362"/>
-      <point x="1151" y="1037" type="curve" name="sh02" smooth="yes"/>
+      <point x="1151" y="1037" type="curve" smooth="yes" name="sh02"/>
       <point x="1151" y="877"/>
       <point x="1117" y="683"/>
       <point x="1064" y="516" type="curve" smooth="yes"/>
@@ -30,22 +30,22 @@
       <point x="667" y="-29"/>
     </contour>
     <contour>
-      <point x="497" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="497" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="660" y="135"/>
       <point x="752" y="249"/>
       <point x="825" y="437" type="curve" smooth="yes"/>
       <point x="897" y="625"/>
       <point x="944" y="877"/>
-      <point x="944" y="1060" type="curve" name="ah01" smooth="yes"/>
+      <point x="944" y="1060" type="curve" smooth="yes" name="ah01"/>
       <point x="944" y="1236"/>
       <point x="901" y="1356"/>
-      <point x="734" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="734" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="603" y="1356"/>
       <point x="522" y="1283"/>
       <point x="455" y="1159" type="curve" smooth="yes"/>
       <point x="355" y="972"/>
       <point x="287" y="651"/>
-      <point x="287" y="432" type="curve" name="sh03" smooth="yes"/>
+      <point x="287" y="432" type="curve" smooth="yes" name="sh03"/>
       <point x="287" y="247"/>
       <point x="334" y="135"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0556.glif b/source/Hack-Italic.ufo/glyphs/uni0556.glif
index 629d762eb..72493d9bd 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0556.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0556.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0556" format="1">
+<glyph name="uni0556" format="2">
   <advance width="1233"/>
   <unicode hex="0556"/>
   <outline>
     <contour>
-      <point x="479" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="479" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="310" y="-29"/>
       <point x="213" y="-13"/>
       <point x="141" y="24" type="curve" smooth="yes"/>
       <point x="60" y="67"/>
       <point x="23" y="137"/>
-      <point x="10" y="229" type="curve" name="sh02" smooth="yes"/>
+      <point x="10" y="229" type="curve" smooth="yes" name="sh02"/>
       <point x="6" y="254"/>
       <point x="5" y="279"/>
-      <point x="5" y="304" type="curve" name="sh01" smooth="yes"/>
+      <point x="5" y="304" type="curve" smooth="yes" name="sh01"/>
       <point x="5" y="384"/>
       <point x="21" y="460"/>
       <point x="33" y="537" type="curve" smooth="yes"/>
@@ -22,10 +22,10 @@
       <point x="227" y="537" type="line" smooth="yes"/>
       <point x="211" y="454"/>
       <point x="200" y="386"/>
-      <point x="200" y="327" type="curve" name="sh03" smooth="yes"/>
+      <point x="200" y="327" type="curve" smooth="yes" name="sh03"/>
       <point x="200" y="295"/>
       <point x="203" y="266"/>
-      <point x="211" y="241" type="curve" name="sh04" smooth="yes"/>
+      <point x="211" y="241" type="curve" smooth="yes" name="sh04"/>
       <point x="234" y="172"/>
       <point x="288" y="133"/>
       <point x="401" y="133" type="curve" name="dv01"/>
@@ -41,7 +41,7 @@
       <point x="367" y="1428" type="curve" smooth="yes"/>
       <point x="437" y="1471"/>
       <point x="540" y="1493"/>
-      <point x="676" y="1493" type="curve" name="at01" smooth="yes"/>
+      <point x="676" y="1493" type="curve" smooth="yes" name="at01"/>
       <point x="858" y="1493" type="line"/>
       <point x="786" y="1120" type="line" name="at02"/>
       <point x="947" y="1113"/>
@@ -49,7 +49,7 @@
       <point x="1109" y="980" type="curve"/>
       <point x="1136" y="929"/>
       <point x="1151" y="855"/>
-      <point x="1151" y="763" type="curve" name="sh05" smooth="yes"/>
+      <point x="1151" y="763" type="curve" smooth="yes" name="sh05"/>
       <point x="1151" y="695"/>
       <point x="1143" y="619"/>
       <point x="1126" y="536" type="curve" smooth="yes"/>
@@ -61,7 +61,7 @@
       <point x="818" y="24" type="curve" smooth="yes"/>
       <point x="777" y="5"/>
       <point x="724" y="-11"/>
-      <point x="668" y="-19" type="curve" name="sv02" smooth="yes"/>
+      <point x="668" y="-19" type="curve" smooth="yes" name="sv02"/>
       <point x="611" y="-27"/>
       <point x="542" y="-29"/>
     </contour>
@@ -93,10 +93,10 @@
       <point x="926" y="537" type="curve" smooth="yes"/>
       <point x="945" y="629"/>
       <point x="955" y="703"/>
-      <point x="955" y="763" type="curve" name="ah01" smooth="yes"/>
+      <point x="955" y="763" type="curve" smooth="yes" name="ah01"/>
       <point x="955" y="798"/>
       <point x="951" y="828"/>
-      <point x="943" y="852" type="curve" name="sh06" smooth="yes"/>
+      <point x="943" y="852" type="curve" smooth="yes" name="sh06"/>
       <point x="919" y="924"/>
       <point x="853" y="949"/>
       <point x="753" y="949" type="curve" name="sv04"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0559.glif b/source/Hack-Italic.ufo/glyphs/uni0559.glif
index dc28d77f1..6cf7f0907 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0559.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0559.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0559" format="1">
+<glyph name="uni0559" format="2">
   <advance width="1233"/>
   <unicode hex="0559"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="819" y="1007" type="curve" name="hr00"/>
       <point x="684" y="1007"/>
       <point x="593" y="1102"/>
-      <point x="593" y="1229" type="curve" name="dh01" smooth="yes"/>
+      <point x="593" y="1229" type="curve" smooth="yes" name="dh01"/>
       <point x="593" y="1246"/>
       <point x="595" y="1263"/>
       <point x="598" y="1282" type="curve"/>
@@ -17,7 +17,7 @@
       <point x="901" y="1433" type="line" name="sv01"/>
       <point x="806" y="1433"/>
       <point x="717" y="1349"/>
-      <point x="717" y="1252" type="curve" name="dh02" smooth="yes"/>
+      <point x="717" y="1252" type="curve" smooth="yes" name="dh02"/>
       <point x="717" y="1181"/>
       <point x="766" y="1130"/>
       <point x="842" y="1130" type="curve" name="at01"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni055A_.glif b/source/Hack-Italic.ufo/glyphs/uni055A_.glif
index 1f528bb6b..c29ad87ab 100644
--- a/source/Hack-Italic.ufo/glyphs/uni055A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni055A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni055A" format="1">
+<glyph name="uni055A" format="2">
   <advance width="1233"/>
   <unicode hex="055A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni055B_.glif b/source/Hack-Italic.ufo/glyphs/uni055B_.glif
index c06e02236..83f72be92 100644
--- a/source/Hack-Italic.ufo/glyphs/uni055B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni055B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni055B" format="1">
+<glyph name="uni055B" format="2">
   <advance width="1233"/>
   <unicode hex="055B"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni055C_.glif b/source/Hack-Italic.ufo/glyphs/uni055C_.glif
index 08aec36b5..583293260 100644
--- a/source/Hack-Italic.ufo/glyphs/uni055C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni055C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni055C" format="1">
+<glyph name="uni055C" format="2">
   <advance width="1233"/>
   <unicode hex="055C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni055D_.glif b/source/Hack-Italic.ufo/glyphs/uni055D_.glif
index 532a1bc31..ea50b58b8 100644
--- a/source/Hack-Italic.ufo/glyphs/uni055D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni055D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni055D" format="1">
+<glyph name="uni055D" format="2">
   <advance width="1233"/>
   <unicode hex="055D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni055E_.glif b/source/Hack-Italic.ufo/glyphs/uni055E_.glif
index e74fdb04d..f96d93c4c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni055E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni055E_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni055E" format="1">
+<glyph name="uni055E" format="2">
   <advance width="1233"/>
   <unicode hex="055E"/>
   <outline>
     <contour>
-      <point x="737" y="1256" type="curve" name="av01" smooth="yes"/>
+      <point x="737" y="1256" type="curve" smooth="yes" name="av01"/>
       <point x="672" y="1256"/>
       <point x="624" y="1272"/>
       <point x="587" y="1301" type="curve" smooth="yes"/>
@@ -14,7 +14,7 @@
       <point x="680" y="1454" type="line"/>
       <point x="679" y="1411"/>
       <point x="716" y="1393"/>
-      <point x="759" y="1393" type="curve" name="sv02" smooth="yes"/>
+      <point x="759" y="1393" type="curve" smooth="yes" name="sv02"/>
       <point x="794" y="1393"/>
       <point x="823" y="1405"/>
       <point x="842" y="1424" type="curve" smooth="yes"/>
@@ -26,14 +26,14 @@
       <point x="881" y="1532" type="curve" smooth="yes"/>
       <point x="881" y="1571"/>
       <point x="868" y="1598"/>
-      <point x="845" y="1621" type="curve" name="hr01" smooth="yes"/>
+      <point x="845" y="1621" type="curve" smooth="yes" name="hr01"/>
       <point x="816" y="1649"/>
       <point x="772" y="1663"/>
-      <point x="714" y="1663" type="curve" name="dv01" smooth="yes"/>
+      <point x="714" y="1663" type="curve" smooth="yes" name="dv01"/>
       <point x="683" y="1663"/>
       <point x="650" y="1659"/>
       <point x="615" y="1650" type="curve" smooth="yes"/>
-      <point x="613" y="1649" type="line" name="sv03" smooth="yes"/>
+      <point x="613" y="1649" type="line" smooth="yes" name="sv03"/>
       <point x="429" y="1606"/>
       <point x="324" y="1476"/>
       <point x="283" y="1265" type="curve" name="av02"/>
@@ -46,13 +46,13 @@
       <point x="611" y="1798" type="curve" smooth="yes"/>
       <point x="654" y="1808"/>
       <point x="697" y="1813"/>
-      <point x="740" y="1813" type="curve" name="dv02" smooth="yes"/>
+      <point x="740" y="1813" type="curve" smooth="yes" name="dv02"/>
       <point x="836" y="1813"/>
       <point x="922" y="1787"/>
       <point x="978" y="1739" type="curve" smooth="yes"/>
       <point x="1026" y="1698"/>
       <point x="1054" y="1637"/>
-      <point x="1054" y="1564" type="curve" name="hr02" smooth="yes"/>
+      <point x="1054" y="1564" type="curve" smooth="yes" name="hr02"/>
       <point x="1054" y="1542"/>
       <point x="1052" y="1521"/>
       <point x="1047" y="1500" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni055F_.glif b/source/Hack-Italic.ufo/glyphs/uni055F_.glif
index 885cc11c7..8fc9df951 100644
--- a/source/Hack-Italic.ufo/glyphs/uni055F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni055F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni055F" format="1">
+<glyph name="uni055F" format="2">
   <advance width="1233"/>
   <unicode hex="055F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0561.glif b/source/Hack-Italic.ufo/glyphs/uni0561.glif
index e959b498d..53240b1a1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0561.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0561.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0561" format="1">
+<glyph name="uni0561" format="2">
   <advance width="1233"/>
   <unicode hex="0561"/>
   <outline>
     <contour>
-      <point x="231" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="231" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="148" y="-27"/>
       <point x="94" y="-3"/>
       <point x="67" y="76" type="curve" smooth="yes"/>
       <point x="57" y="106"/>
       <point x="52" y="143"/>
-      <point x="52" y="187" type="curve" name="dh01" smooth="yes"/>
+      <point x="52" y="187" type="curve" smooth="yes" name="dh01"/>
       <point x="52" y="259"/>
       <point x="65" y="350"/>
       <point x="88" y="471" type="curve"/>
@@ -19,13 +19,13 @@
       <point x="257" y="479" type="line"/>
       <point x="242" y="400"/>
       <point x="233" y="348"/>
-      <point x="226" y="287" type="curve" name="sh01" smooth="yes"/>
+      <point x="226" y="287" type="curve" smooth="yes" name="sh01"/>
       <point x="223" y="263"/>
       <point x="221" y="242"/>
-      <point x="221" y="223" type="curve" name="dh02" smooth="yes"/>
+      <point x="221" y="223" type="curve" smooth="yes" name="dh02"/>
       <point x="221" y="163"/>
       <point x="240" y="127"/>
-      <point x="311" y="127" type="curve" name="sv01" smooth="yes"/>
+      <point x="311" y="127" type="curve" smooth="yes" name="sv01"/>
       <point x="367" y="127"/>
       <point x="406" y="149"/>
       <point x="433" y="188" type="curve" smooth="yes"/>
@@ -43,7 +43,7 @@
       <point x="658" y="183" type="curve" smooth="yes"/>
       <point x="667" y="151"/>
       <point x="695" y="127"/>
-      <point x="751" y="127" type="curve" name="sv02" smooth="yes"/>
+      <point x="751" y="127" type="curve" smooth="yes" name="sv02"/>
       <point x="845" y="127"/>
       <point x="879" y="199"/>
       <point x="905" y="291" type="curve" smooth="yes"/>
@@ -57,7 +57,7 @@
       <point x="874" y="96" type="line" name="iv01"/>
       <point x="809" y="9"/>
       <point x="736" y="-27"/>
-      <point x="652" y="-27" type="curve" name="ab02" smooth="yes"/>
+      <point x="652" y="-27" type="curve" smooth="yes" name="ab02"/>
       <point x="560" y="-27"/>
       <point x="496" y="17"/>
       <point x="477" y="114" type="curve" name="iv02"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0562.glif b/source/Hack-Italic.ufo/glyphs/uni0562.glif
index fca7f1797..bd740f903 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0562.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0562.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0562" format="1">
+<glyph name="uni0562" format="2">
   <advance width="1233"/>
   <unicode hex="0562"/>
   <outline>
@@ -9,10 +9,10 @@
       <point x="481" y="952" type="line" name="iv01"/>
       <point x="573" y="1082"/>
       <point x="696" y="1147"/>
-      <point x="851" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="851" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1036" y="1147"/>
       <point x="1122" y="1053"/>
-      <point x="1122" y="865" type="curve" name="dh02" smooth="yes"/>
+      <point x="1122" y="865" type="curve" smooth="yes" name="dh02"/>
       <point x="1122" y="814"/>
       <point x="1115" y="758"/>
       <point x="1103" y="694" type="curve" smooth="yes"/>
@@ -21,10 +21,10 @@
       <point x="918" y="694" type="line" smooth="yes"/>
       <point x="926" y="737"/>
       <point x="931" y="776"/>
-      <point x="931" y="809" type="curve" name="dh01" smooth="yes"/>
+      <point x="931" y="809" type="curve" smooth="yes" name="dh01"/>
       <point x="931" y="932"/>
       <point x="874" y="987"/>
-      <point x="757" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="757" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="578" y="987"/>
       <point x="462" y="855"/>
       <point x="419" y="633" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0563.glif b/source/Hack-Italic.ufo/glyphs/uni0563.glif
index dbbd84bc9..5119a3a21 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0563.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0563.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0563" format="1">
+<glyph name="uni0563" format="2">
   <advance width="1233"/>
   <unicode hex="0563"/>
   <outline>
@@ -7,13 +7,13 @@
       <point x="763" y="139" type="line" name="iv01"/>
       <point x="679" y="26"/>
       <point x="568" y="-33"/>
-      <point x="429" y="-33" type="curve" name="sv02" smooth="yes"/>
+      <point x="429" y="-33" type="curve" smooth="yes" name="sv02"/>
       <point x="292" y="-33"/>
       <point x="198" y="24"/>
       <point x="143" y="124" type="curve" smooth="yes"/>
       <point x="108" y="188"/>
       <point x="91" y="268"/>
-      <point x="91" y="363" type="curve" name="dh01" smooth="yes"/>
+      <point x="91" y="363" type="curve" smooth="yes" name="dh01"/>
       <point x="91" y="420"/>
       <point x="97" y="483"/>
       <point x="110" y="551" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="310" y="985" type="curve" smooth="yes"/>
       <point x="406" y="1088"/>
       <point x="525" y="1143"/>
-      <point x="658" y="1143" type="curve" name="at02" smooth="yes"/>
+      <point x="658" y="1143" type="curve" smooth="yes" name="at02"/>
       <point x="794" y="1143"/>
       <point x="886" y="1086"/>
       <point x="925" y="973" type="curve" name="iv02"/>
@@ -36,22 +36,22 @@
       <point x="653" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="491" y="123" type="curve" name="sv01" smooth="yes"/>
+      <point x="491" y="123" type="curve" smooth="yes" name="sv01"/>
       <point x="674" y="123"/>
       <point x="789" y="276"/>
-      <point x="844" y="555" type="curve" name="hr02" smooth="yes"/>
+      <point x="844" y="555" type="curve" smooth="yes" name="hr02"/>
       <point x="857" y="624"/>
       <point x="864" y="683"/>
       <point x="864" y="734" type="curve" smooth="yes"/>
       <point x="864" y="901"/>
       <point x="796" y="987"/>
-      <point x="659" y="987" type="curve" name="sv03" smooth="yes"/>
+      <point x="659" y="987" type="curve" smooth="yes" name="sv03"/>
       <point x="566" y="987"/>
       <point x="491" y="947"/>
       <point x="436" y="879" type="curve" smooth="yes"/>
       <point x="348" y="770"/>
       <point x="287" y="546"/>
-      <point x="287" y="378" type="curve" name="dh02" smooth="yes"/>
+      <point x="287" y="378" type="curve" smooth="yes" name="dh02"/>
       <point x="287" y="319"/>
       <point x="295" y="271"/>
       <point x="310" y="232" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0564.glif b/source/Hack-Italic.ufo/glyphs/uni0564.glif
index 1d0f581ec..27ef913d3 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0564.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0564.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0564" format="1">
+<glyph name="uni0564" format="2">
   <advance width="1233"/>
   <unicode hex="0564"/>
   <outline>
     <contour>
-      <point x="849" y="694" type="line" name="hr00" smooth="yes"/>
+      <point x="849" y="694" type="line" smooth="yes" name="hr00"/>
       <point x="857" y="737"/>
       <point x="862" y="776"/>
-      <point x="862" y="809" type="curve" name="dh01" smooth="yes"/>
+      <point x="862" y="809" type="curve" smooth="yes" name="dh01"/>
       <point x="862" y="932"/>
       <point x="805" y="987"/>
-      <point x="688" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="688" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="509" y="987"/>
       <point x="393" y="855"/>
       <point x="350" y="633" type="curve" smooth="yes"/>
@@ -21,10 +21,10 @@
       <point x="412" y="952" type="line" name="iv01"/>
       <point x="504" y="1082"/>
       <point x="627" y="1147"/>
-      <point x="782" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="782" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="969" y="1147"/>
       <point x="1053" y="1052"/>
-      <point x="1053" y="865" type="curve" name="hr01" smooth="yes"/>
+      <point x="1053" y="865" type="curve" smooth="yes" name="hr01"/>
       <point x="1053" y="814"/>
       <point x="1046" y="758"/>
       <point x="1034" y="694" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0565.glif b/source/Hack-Italic.ufo/glyphs/uni0565.glif
index a592d8b61..aaf05e5d1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0565.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0565.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0565" format="1">
+<glyph name="uni0565" format="2">
   <advance width="1233"/>
   <unicode hex="0565"/>
   <outline>
     <contour>
-      <point x="347" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="347" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="164" y="-29"/>
       <point x="79" y="63"/>
-      <point x="79" y="251" type="curve" name="dh01" smooth="yes"/>
+      <point x="79" y="251" type="curve" smooth="yes" name="dh01"/>
       <point x="79" y="303"/>
       <point x="85" y="361"/>
-      <point x="98" y="424" type="curve" name="hr01" smooth="yes"/>
+      <point x="98" y="424" type="curve" smooth="yes" name="hr01"/>
       <point x="318" y="1556" type="line" name="at01"/>
       <point x="502" y="1556" type="line"/>
       <point x="417" y="1120" type="line" name="at02"/>
@@ -20,10 +20,10 @@
       <point x="282" y="424" type="line" smooth="yes"/>
       <point x="274" y="381"/>
       <point x="269" y="344"/>
-      <point x="269" y="309" type="curve" name="dh02" smooth="yes"/>
+      <point x="269" y="309" type="curve" smooth="yes" name="dh02"/>
       <point x="269" y="188"/>
       <point x="325" y="131"/>
-      <point x="444" y="131" type="curve" name="sv01" smooth="yes"/>
+      <point x="444" y="131" type="curve" smooth="yes" name="sv01"/>
       <point x="623" y="131"/>
       <point x="736" y="257"/>
       <point x="780" y="485" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0566.glif b/source/Hack-Italic.ufo/glyphs/uni0566.glif
index ff72dd2f8..9dbd635a7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0566.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0566.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0566" format="1">
+<glyph name="uni0566" format="2">
   <advance width="1233"/>
   <unicode hex="0566"/>
   <outline>
@@ -7,13 +7,13 @@
       <point x="763" y="139" type="line" name="hr00"/>
       <point x="679" y="26"/>
       <point x="568" y="-33"/>
-      <point x="429" y="-33" type="curve" name="dv02" smooth="yes"/>
+      <point x="429" y="-33" type="curve" smooth="yes" name="dv02"/>
       <point x="292" y="-33"/>
       <point x="198" y="24"/>
       <point x="143" y="124" type="curve" smooth="yes"/>
       <point x="108" y="188"/>
       <point x="91" y="268"/>
-      <point x="91" y="363" type="curve" name="dh01" smooth="yes"/>
+      <point x="91" y="363" type="curve" smooth="yes" name="dh01"/>
       <point x="91" y="420"/>
       <point x="97" y="483"/>
       <point x="110" y="551" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="310" y="985" type="curve" smooth="yes"/>
       <point x="406" y="1088"/>
       <point x="525" y="1143"/>
-      <point x="658" y="1143" type="curve" name="at02" smooth="yes"/>
+      <point x="658" y="1143" type="curve" smooth="yes" name="at02"/>
       <point x="794" y="1143"/>
       <point x="886" y="1086"/>
       <point x="925" y="973" type="curve"/>
@@ -34,22 +34,22 @@
       <point x="653" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="491" y="123" type="curve" name="dv03" smooth="yes"/>
+      <point x="491" y="123" type="curve" smooth="yes" name="dv03"/>
       <point x="674" y="123"/>
       <point x="789" y="276"/>
-      <point x="844" y="555" type="curve" name="hr02" smooth="yes"/>
+      <point x="844" y="555" type="curve" smooth="yes" name="hr02"/>
       <point x="857" y="624"/>
       <point x="864" y="683"/>
       <point x="864" y="734" type="curve" smooth="yes"/>
       <point x="864" y="901"/>
       <point x="796" y="987"/>
-      <point x="659" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="659" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="566" y="987"/>
       <point x="491" y="947"/>
       <point x="436" y="879" type="curve" smooth="yes"/>
       <point x="348" y="770"/>
       <point x="287" y="546"/>
-      <point x="287" y="378" type="curve" name="dh02" smooth="yes"/>
+      <point x="287" y="378" type="curve" smooth="yes" name="dh02"/>
       <point x="287" y="319"/>
       <point x="295" y="271"/>
       <point x="310" y="232" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0567.glif b/source/Hack-Italic.ufo/glyphs/uni0567.glif
index 1f5b29d6e..3ce9ef888 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0567.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0567.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0567" format="1">
+<glyph name="uni0567" format="2">
   <advance width="1233"/>
   <unicode hex="0567"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0568.glif b/source/Hack-Italic.ufo/glyphs/uni0568.glif
index b748bda2c..b13025b49 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0568.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0568.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0568" format="1">
+<glyph name="uni0568" format="2">
   <advance width="1233"/>
   <unicode hex="0568"/>
   <outline>
@@ -9,10 +9,10 @@
       <point x="481" y="952" type="line" name="iv01"/>
       <point x="573" y="1082"/>
       <point x="696" y="1147"/>
-      <point x="851" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="851" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1034" y="1147"/>
       <point x="1122" y="1056"/>
-      <point x="1122" y="865" type="curve" name="dh02" smooth="yes"/>
+      <point x="1122" y="865" type="curve" smooth="yes" name="dh02"/>
       <point x="1122" y="814"/>
       <point x="1115" y="758"/>
       <point x="1103" y="694" type="curve" smooth="yes"/>
@@ -21,10 +21,10 @@
       <point x="918" y="694" type="line" smooth="yes"/>
       <point x="926" y="737"/>
       <point x="931" y="774"/>
-      <point x="931" y="809" type="curve" name="dh01" smooth="yes"/>
+      <point x="931" y="809" type="curve" smooth="yes" name="dh01"/>
       <point x="931" y="930"/>
       <point x="876" y="987"/>
-      <point x="757" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="757" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="580" y="987"/>
       <point x="463" y="861"/>
       <point x="419" y="633" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0569.glif b/source/Hack-Italic.ufo/glyphs/uni0569.glif
index a0ba3e340..5c292db03 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0569.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0569.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0569" format="1">
+<glyph name="uni0569" format="2">
   <advance width="1233"/>
   <unicode hex="0569"/>
   <outline>
@@ -9,13 +9,13 @@
       <point x="364" y="950" type="line" name="iv01"/>
       <point x="483" y="1103"/>
       <point x="603" y="1147"/>
-      <point x="744" y="1147" type="curve" name="at03" smooth="yes"/>
+      <point x="744" y="1147" type="curve" smooth="yes" name="at03"/>
       <point x="893" y="1147"/>
       <point x="992" y="1093"/>
       <point x="1053" y="988" type="curve" smooth="yes"/>
       <point x="1093" y="917"/>
       <point x="1116" y="829"/>
-      <point x="1116" y="716" type="curve" name="dh02" smooth="yes"/>
+      <point x="1116" y="716" type="curve" smooth="yes" name="dh02"/>
       <point x="1116" y="668"/>
       <point x="1112" y="615"/>
       <point x="1103" y="559" type="curve" name="sh01"/>
@@ -24,7 +24,7 @@
       <point x="1072" y="416" type="line"/>
       <point x="977" y="67"/>
       <point x="785" y="-29"/>
-      <point x="615" y="-29" type="curve" name="av02" smooth="yes"/>
+      <point x="615" y="-29" type="curve" smooth="yes" name="av02"/>
       <point x="522" y="-29"/>
       <point x="450" y="-2"/>
       <point x="405" y="47" type="curve" smooth="yes"/>
@@ -43,13 +43,13 @@
       <point x="933" y="559" type="line"/>
       <point x="942" y="610"/>
       <point x="946" y="656"/>
-      <point x="946" y="699" type="curve" name="dh01" smooth="yes"/>
+      <point x="946" y="699" type="curve" smooth="yes" name="dh01"/>
       <point x="946" y="771"/>
       <point x="933" y="831"/>
       <point x="907" y="879" type="curve" smooth="yes"/>
       <point x="866" y="954"/>
       <point x="794" y="995"/>
-      <point x="675" y="995" type="curve" name="sv01" smooth="yes"/>
+      <point x="675" y="995" type="curve" smooth="yes" name="sv01"/>
       <point x="579" y="995"/>
       <point x="497" y="968"/>
       <point x="433" y="908" type="curve" smooth="yes"/>
@@ -76,7 +76,7 @@
       <point x="528" y="214" type="curve" smooth="yes"/>
       <point x="528" y="189"/>
       <point x="533" y="168"/>
-      <point x="544" y="151" type="curve" name="hr01" smooth="yes"/>
+      <point x="544" y="151" type="curve" smooth="yes" name="hr01"/>
       <point x="561" y="124"/>
       <point x="592" y="107"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni056A_.glif b/source/Hack-Italic.ufo/glyphs/uni056A_.glif
index 2388ce4b6..91aac4263 100644
--- a/source/Hack-Italic.ufo/glyphs/uni056A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni056A_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni056A" format="1">
+<glyph name="uni056A" format="2">
   <advance width="1233"/>
   <unicode hex="056A"/>
   <outline>
     <contour>
-      <point x="377" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="377" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="212" y="-29"/>
       <point x="111" y="34"/>
       <point x="59" y="138" type="curve" smooth="yes"/>
       <point x="28" y="201"/>
       <point x="13" y="279"/>
-      <point x="13" y="368" type="curve" name="dh01" smooth="yes"/>
+      <point x="13" y="368" type="curve" smooth="yes" name="dh01"/>
       <point x="13" y="427"/>
       <point x="20" y="490"/>
       <point x="33" y="559" type="curve" smooth="yes"/>
@@ -19,7 +19,7 @@
       <point x="214" y="952" type="curve" smooth="yes"/>
       <point x="307" y="1056"/>
       <point x="433" y="1120"/>
-      <point x="598" y="1120" type="curve" name="at02" smooth="yes"/>
+      <point x="598" y="1120" type="curve" smooth="yes" name="at02"/>
       <point x="875" y="1120" type="line"/>
       <point x="960" y="1556" type="line" name="at01"/>
       <point x="1145" y="1556" type="line"/>
@@ -35,12 +35,12 @@
       <point x="534" y="-29"/>
     </contour>
     <contour>
-      <point x="411" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="411" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="599" y="127"/>
       <point x="714" y="288"/>
       <point x="766" y="559" type="curve" smooth="yes"/>
       <point x="847" y="977" type="line" name="sv02"/>
-      <point x="572" y="977" type="line" name="sv03" smooth="yes"/>
+      <point x="572" y="977" type="line" smooth="yes" name="sv03"/>
       <point x="492" y="977"/>
       <point x="420" y="937"/>
       <point x="360" y="865" type="curve" smooth="yes"/>
@@ -49,7 +49,7 @@
       <point x="281" y="735" type="curve" smooth="yes"/>
       <point x="237" y="634"/>
       <point x="208" y="484"/>
-      <point x="208" y="383" type="curve" name="dh02" smooth="yes"/>
+      <point x="208" y="383" type="curve" smooth="yes" name="dh02"/>
       <point x="208" y="328"/>
       <point x="216" y="281"/>
       <point x="231" y="242" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni056B_.glif b/source/Hack-Italic.ufo/glyphs/uni056B_.glif
index 0e78944e7..a8c6f29ed 100644
--- a/source/Hack-Italic.ufo/glyphs/uni056B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni056B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni056B" format="1">
+<glyph name="uni056B" format="2">
   <advance width="1233"/>
   <unicode hex="056B"/>
   <outline>
@@ -9,10 +9,10 @@
       <point x="447" y="952" type="line" name="iv01"/>
       <point x="539" y="1082"/>
       <point x="662" y="1147"/>
-      <point x="817" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="817" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1000" y="1147"/>
       <point x="1088" y="1056"/>
-      <point x="1088" y="865" type="curve" name="dh02" smooth="yes"/>
+      <point x="1088" y="865" type="curve" smooth="yes" name="dh02"/>
       <point x="1088" y="814"/>
       <point x="1081" y="758"/>
       <point x="1069" y="694" type="curve" smooth="yes"/>
@@ -21,10 +21,10 @@
       <point x="884" y="694" type="line" smooth="yes"/>
       <point x="892" y="737"/>
       <point x="897" y="776"/>
-      <point x="897" y="809" type="curve" name="dh01" smooth="yes"/>
+      <point x="897" y="809" type="curve" smooth="yes" name="dh01"/>
       <point x="897" y="930"/>
       <point x="842" y="987"/>
-      <point x="723" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="723" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="552" y="987"/>
       <point x="432" y="872"/>
       <point x="385" y="633" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni056C_.glif b/source/Hack-Italic.ufo/glyphs/uni056C_.glif
index ae4369b78..9664faafe 100644
--- a/source/Hack-Italic.ufo/glyphs/uni056C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni056C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni056C" format="1">
+<glyph name="uni056C" format="2">
   <advance width="1233"/>
   <unicode hex="056C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni056D_.glif b/source/Hack-Italic.ufo/glyphs/uni056D_.glif
index 6f5cb3be2..643670931 100644
--- a/source/Hack-Italic.ufo/glyphs/uni056D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni056D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni056D" format="1">
+<glyph name="uni056D" format="2">
   <advance width="1233"/>
   <unicode hex="056D"/>
   <outline>
@@ -9,23 +9,23 @@
       <point x="360" y="1024" type="line" name="iv01"/>
       <point x="424" y="1108"/>
       <point x="495" y="1147"/>
-      <point x="584" y="1147" type="curve" name="at03" smooth="yes"/>
+      <point x="584" y="1147" type="curve" smooth="yes" name="at03"/>
       <point x="672" y="1147"/>
       <point x="726" y="1111"/>
       <point x="747" y="1038" type="curve" smooth="yes"/>
       <point x="754" y="1012"/>
       <point x="758" y="981"/>
-      <point x="758" y="946" type="curve" name="sh02" smooth="yes"/>
+      <point x="758" y="946" type="curve" smooth="yes" name="sh02"/>
       <point x="758" y="890"/>
       <point x="749" y="819"/>
       <point x="732" y="731" type="curve" smooth="yes"/>
       <point x="683" y="479" type="line" smooth="yes"/>
       <point x="667" y="398"/>
       <point x="656" y="321"/>
-      <point x="652" y="285" type="curve" name="sh03" smooth="yes"/>
+      <point x="652" y="285" type="curve" smooth="yes" name="sh03"/>
       <point x="649" y="264"/>
       <point x="648" y="244"/>
-      <point x="648" y="227" type="curve" name="hr01" smooth="yes"/>
+      <point x="648" y="227" type="curve" smooth="yes" name="hr01"/>
       <point x="648" y="163"/>
       <point x="668" y="127"/>
       <point x="740" y="127" type="curve" smooth="yes"/>
@@ -42,26 +42,26 @@
       <point x="869" y="96" type="line" name="iv02"/>
       <point x="805" y="12"/>
       <point x="734" y="-27"/>
-      <point x="645" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="645" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="557" y="-27"/>
       <point x="503" y="9"/>
       <point x="482" y="82" type="curve" smooth="yes"/>
       <point x="475" y="108"/>
       <point x="471" y="139"/>
-      <point x="471" y="174" type="curve" name="dh01" smooth="yes"/>
+      <point x="471" y="174" type="curve" smooth="yes" name="dh01"/>
       <point x="471" y="230"/>
       <point x="480" y="301"/>
       <point x="497" y="389" type="curve" smooth="yes"/>
       <point x="546" y="641" type="line" smooth="yes"/>
       <point x="563" y="729"/>
       <point x="573" y="801"/>
-      <point x="577" y="836" type="curve" name="sh04" smooth="yes"/>
+      <point x="577" y="836" type="curve" smooth="yes" name="sh04"/>
       <point x="580" y="857"/>
       <point x="581" y="875"/>
-      <point x="581" y="894" type="curve" name="hr02" smooth="yes"/>
+      <point x="581" y="894" type="curve" smooth="yes" name="hr02"/>
       <point x="581" y="957"/>
       <point x="561" y="993"/>
-      <point x="489" y="993" type="curve" name="sv01" smooth="yes"/>
+      <point x="489" y="993" type="curve" smooth="yes" name="sv01"/>
       <point x="433" y="993"/>
       <point x="395" y="971"/>
       <point x="371" y="932" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni056E_.glif b/source/Hack-Italic.ufo/glyphs/uni056E_.glif
index c820902a7..319b6c379 100644
--- a/source/Hack-Italic.ufo/glyphs/uni056E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni056E_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni056E" format="1">
+<glyph name="uni056E" format="2">
   <advance width="1233"/>
   <unicode hex="056E"/>
   <outline>
     <contour>
-      <point x="459" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="459" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="290" y="-29"/>
       <point x="185" y="33"/>
       <point x="128" y="132" type="curve" smooth="yes"/>
       <point x="89" y="197"/>
       <point x="72" y="276"/>
-      <point x="72" y="365" type="curve" name="sh01" smooth="yes"/>
+      <point x="72" y="365" type="curve" smooth="yes" name="sh01"/>
       <point x="72" y="418"/>
       <point x="78" y="475"/>
       <point x="90" y="535" type="curve" smooth="yes"/>
@@ -27,7 +27,7 @@
       <point x="1037" y="950" type="line" name="ih02"/>
       <point x="1065" y="889"/>
       <point x="1075" y="820"/>
-      <point x="1075" y="753" type="curve" name="sh02" smooth="yes"/>
+      <point x="1075" y="753" type="curve" smooth="yes" name="sh02"/>
       <point x="1075" y="677"/>
       <point x="1060" y="586"/>
       <point x="1049" y="535" type="curve" smooth="yes"/>
@@ -38,7 +38,7 @@
       <point x="624" y="-29"/>
     </contour>
     <contour>
-      <point x="489" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="489" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="596" y="127"/>
       <point x="676" y="173"/>
       <point x="736" y="248" type="curve" smooth="yes"/>
@@ -47,11 +47,11 @@
       <point x="854" y="535" type="curve" smooth="yes"/>
       <point x="866" y="594"/>
       <point x="877" y="668"/>
-      <point x="877" y="732" type="curve" name="ah01" smooth="yes"/>
+      <point x="877" y="732" type="curve" smooth="yes" name="ah01"/>
       <point x="877" y="807"/>
       <point x="859" y="890"/>
       <point x="803" y="950" type="curve" name="sv02"/>
-      <point x="650" y="950" type="line" name="sv03" smooth="yes"/>
+      <point x="650" y="950" type="line" smooth="yes" name="sv03"/>
       <point x="546" y="950"/>
       <point x="465" y="904"/>
       <point x="405" y="828" type="curve" smooth="yes"/>
@@ -60,7 +60,7 @@
       <point x="283" y="535" type="curve" smooth="yes"/>
       <point x="272" y="484"/>
       <point x="267" y="434"/>
-      <point x="267" y="387" type="curve" name="sh04" smooth="yes"/>
+      <point x="267" y="387" type="curve" smooth="yes" name="sh04"/>
       <point x="267" y="334"/>
       <point x="275" y="288"/>
       <point x="291" y="248" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni056F_.glif b/source/Hack-Italic.ufo/glyphs/uni056F_.glif
index b40626fd5..8738cc7be 100644
--- a/source/Hack-Italic.ufo/glyphs/uni056F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni056F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni056F" format="1">
+<glyph name="uni056F" format="2">
   <advance width="1233"/>
   <unicode hex="056F"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="781" y="168" type="line" name="hr00"/>
       <point x="689" y="39"/>
       <point x="566" y="-29"/>
-      <point x="410" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="410" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="227" y="-29"/>
       <point x="141" y="64"/>
-      <point x="141" y="252" type="curve" name="dh01" smooth="yes"/>
+      <point x="141" y="252" type="curve" smooth="yes" name="dh01"/>
       <point x="141" y="303"/>
       <point x="147" y="360"/>
       <point x="160" y="424" type="curve"/>
@@ -19,10 +19,10 @@
       <point x="344" y="424" type="line" smooth="yes"/>
       <point x="336" y="381"/>
       <point x="331" y="343"/>
-      <point x="331" y="310" type="curve" name="dh02" smooth="yes"/>
+      <point x="331" y="310" type="curve" smooth="yes" name="dh02"/>
       <point x="331" y="189"/>
       <point x="386" y="131"/>
-      <point x="507" y="131" type="curve" name="dv02" smooth="yes"/>
+      <point x="507" y="131" type="curve" smooth="yes" name="dv02"/>
       <point x="679" y="131"/>
       <point x="798" y="250"/>
       <point x="843" y="485" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0570.glif b/source/Hack-Italic.ufo/glyphs/uni0570.glif
index 2bc241044..155401c18 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0570.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0570.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0570" format="1">
+<glyph name="uni0570" format="2">
   <advance width="1233"/>
   <unicode hex="0570"/>
   <outline>
@@ -9,10 +9,10 @@
       <point x="449" y="952" type="line" name="iv01"/>
       <point x="553" y="1085"/>
       <point x="666" y="1147"/>
-      <point x="803" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="803" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="979" y="1147"/>
       <point x="1090" y="1045"/>
-      <point x="1090" y="874" type="curve" name="dh02" smooth="yes"/>
+      <point x="1090" y="874" type="curve" smooth="yes" name="dh02"/>
       <point x="1090" y="827"/>
       <point x="1082" y="763"/>
       <point x="1069" y="694" type="curve" smooth="yes"/>
@@ -24,10 +24,10 @@
       <point x="888" y="709" type="curve" smooth="yes"/>
       <point x="898" y="756"/>
       <point x="903" y="793"/>
-      <point x="903" y="821" type="curve" name="dh01" smooth="yes"/>
+      <point x="903" y="821" type="curve" smooth="yes" name="dh01"/>
       <point x="903" y="926"/>
       <point x="840" y="987"/>
-      <point x="723" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="723" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="556" y="987"/>
       <point x="428" y="857"/>
       <point x="385" y="633" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0571.glif b/source/Hack-Italic.ufo/glyphs/uni0571.glif
index be4ec92e9..ca5a11510 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0571.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0571.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0571" format="1">
+<glyph name="uni0571" format="2">
   <advance width="1233"/>
   <unicode hex="0571"/>
   <outline>
     <contour>
-      <point x="390" y="-30" type="curve" name="dv01" smooth="yes"/>
+      <point x="390" y="-30" type="curve" smooth="yes" name="dv01"/>
       <point x="275" y="-30"/>
       <point x="191" y="12"/>
       <point x="140" y="95" type="curve" smooth="yes"/>
       <point x="108" y="148"/>
       <point x="90" y="218"/>
-      <point x="90" y="298" type="curve" name="sh01" smooth="yes"/>
+      <point x="90" y="298" type="curve" smooth="yes" name="sh01"/>
       <point x="90" y="339"/>
       <point x="94" y="380"/>
-      <point x="103" y="421" type="curve" name="sh02" smooth="yes"/>
+      <point x="103" y="421" type="curve" smooth="yes" name="sh02"/>
       <point x="127" y="542"/>
       <point x="185" y="674"/>
-      <point x="276" y="799" type="curve" name="sh04" smooth="yes"/>
+      <point x="276" y="799" type="curve" smooth="yes" name="sh04"/>
       <point x="364" y="920"/>
       <point x="477" y="1029"/>
       <point x="618" y="1121" type="curve" name="ih01"/>
@@ -43,7 +43,7 @@
       <point x="636" y="1347" type="curve" smooth="yes"/>
       <point x="636" y="1322"/>
       <point x="644" y="1300"/>
-      <point x="659" y="1281" type="curve" name="hr01" smooth="yes"/>
+      <point x="659" y="1281" type="curve" smooth="yes" name="hr01"/>
       <point x="679" y="1257"/>
       <point x="707" y="1242"/>
       <point x="754" y="1242" type="curve" smooth="yes"/>
@@ -54,7 +54,7 @@
       <point x="910" y="1147" type="line"/>
       <point x="880" y="1131"/>
       <point x="906" y="1144"/>
-      <point x="858" y="1118" type="curve" name="sh06" smooth="yes"/>
+      <point x="858" y="1118" type="curve" smooth="yes" name="sh06"/>
       <point x="840" y="1108"/>
       <point x="836" y="1106"/>
       <point x="805" y="1088" type="curve" name="ih04"/>
@@ -63,7 +63,7 @@
       <point x="1006" y="845" type="curve" smooth="yes"/>
       <point x="1022" y="794"/>
       <point x="1030" y="739"/>
-      <point x="1030" y="681" type="curve" name="sh05" smooth="yes"/>
+      <point x="1030" y="681" type="curve" smooth="yes" name="sh05"/>
       <point x="1030" y="628"/>
       <point x="1023" y="573"/>
       <point x="1012" y="513" type="curve"/>
@@ -77,20 +77,20 @@
       <point x="471" y="-30"/>
     </contour>
     <contour>
-      <point x="477" y="131" type="curve" name="dv02" smooth="yes"/>
+      <point x="477" y="131" type="curve" smooth="yes" name="dv02"/>
       <point x="569" y="131"/>
       <point x="648" y="166"/>
       <point x="709" y="234" type="curve" smooth="yes"/>
       <point x="769" y="299"/>
       <point x="804" y="385"/>
       <point x="820" y="470" type="curve" smooth="yes"/>
-      <point x="836" y="556" type="line" name="sh07" smooth="yes"/>
+      <point x="836" y="556" type="line" smooth="yes" name="sh07"/>
       <point x="843" y="595"/>
       <point x="848" y="635"/>
-      <point x="848" y="678" type="curve" name="ah01" smooth="yes"/>
+      <point x="848" y="678" type="curve" smooth="yes" name="ah01"/>
       <point x="848" y="717"/>
       <point x="844" y="753"/>
-      <point x="835" y="788" type="curve" name="sh08" smooth="yes"/>
+      <point x="835" y="788" type="curve" smooth="yes" name="sh08"/>
       <point x="814" y="868"/>
       <point x="766" y="942"/>
       <point x="677" y="994" type="curve"/>
@@ -99,10 +99,10 @@
       <point x="437" y="750" type="curve" smooth="yes"/>
       <point x="376" y="666"/>
       <point x="323" y="562"/>
-      <point x="300" y="453" type="curve" name="sh09" smooth="yes"/>
+      <point x="300" y="453" type="curve" smooth="yes" name="sh09"/>
       <point x="293" y="416"/>
       <point x="289" y="381"/>
-      <point x="289" y="348" type="curve" name="sh03" smooth="yes"/>
+      <point x="289" y="348" type="curve" smooth="yes" name="sh03"/>
       <point x="289" y="301"/>
       <point x="296" y="258"/>
       <point x="312" y="223" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0572.glif b/source/Hack-Italic.ufo/glyphs/uni0572.glif
index ff5256121..dc7f0744b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0572.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0572.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0572" format="1">
+<glyph name="uni0572" format="2">
   <advance width="1233"/>
   <unicode hex="0572"/>
   <outline>
     <contour>
-      <point x="849" y="694" type="line" name="hr00" smooth="yes"/>
+      <point x="849" y="694" type="line" smooth="yes" name="hr00"/>
       <point x="857" y="737"/>
       <point x="862" y="776"/>
-      <point x="862" y="809" type="curve" name="dh01" smooth="yes"/>
+      <point x="862" y="809" type="curve" smooth="yes" name="dh01"/>
       <point x="862" y="932"/>
       <point x="805" y="987"/>
-      <point x="688" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="688" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="509" y="987"/>
       <point x="393" y="855"/>
       <point x="350" y="633" type="curve" smooth="yes"/>
@@ -21,10 +21,10 @@
       <point x="412" y="952" type="line" name="hr01"/>
       <point x="504" y="1082"/>
       <point x="627" y="1147"/>
-      <point x="782" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="782" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="965" y="1147"/>
       <point x="1053" y="1056"/>
-      <point x="1053" y="865" type="curve" name="dh02" smooth="yes"/>
+      <point x="1053" y="865" type="curve" smooth="yes" name="dh02"/>
       <point x="1053" y="814"/>
       <point x="1046" y="758"/>
       <point x="1034" y="694" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0573.glif b/source/Hack-Italic.ufo/glyphs/uni0573.glif
index 21a1d7d8f..5d939be25 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0573.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0573.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0573" format="1">
+<glyph name="uni0573" format="2">
   <advance width="1233"/>
   <unicode hex="0573"/>
   <outline>
     <contour>
-      <point x="404" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="404" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="279" y="-29"/>
       <point x="201" y="16"/>
       <point x="154" y="92" type="curve" smooth="yes"/>
       <point x="122" y="144"/>
       <point x="109" y="205"/>
-      <point x="109" y="272" type="curve" name="sh01" smooth="yes"/>
+      <point x="109" y="272" type="curve" smooth="yes" name="sh01"/>
       <point x="109" y="311"/>
       <point x="114" y="351"/>
-      <point x="121" y="392" type="curve" name="sh02" smooth="yes"/>
+      <point x="121" y="392" type="curve" smooth="yes" name="sh02"/>
       <point x="148" y="548"/>
       <point x="234" y="786"/>
       <point x="345" y="977" type="curve" name="ih01"/>
@@ -25,14 +25,14 @@
       <point x="749" y="1433" type="curve" smooth="yes"/>
       <point x="865" y="1512"/>
       <point x="990" y="1556"/>
-      <point x="1113" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="1113" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="1150" y="1556"/>
       <point x="1187" y="1552"/>
       <point x="1200" y="1545" type="curve" name="at02"/>
       <point x="1171" y="1394" type="line"/>
       <point x="1146" y="1406"/>
       <point x="1108" y="1413"/>
-      <point x="1073" y="1413" type="curve" name="sv01" smooth="yes"/>
+      <point x="1073" y="1413" type="curve" smooth="yes" name="sv01"/>
       <point x="1000" y="1413"/>
       <point x="920" y="1382"/>
       <point x="847" y="1333" type="curve" smooth="yes"/>
@@ -44,10 +44,10 @@
       <point x="972" y="960" type="curve" smooth="yes"/>
       <point x="1026" y="894"/>
       <point x="1053" y="811"/>
-      <point x="1053" y="712" type="curve" name="sh03" smooth="yes"/>
+      <point x="1053" y="712" type="curve" smooth="yes" name="sh03"/>
       <point x="1053" y="675"/>
       <point x="1049" y="636"/>
-      <point x="1041" y="596" type="curve" name="sh04" smooth="yes"/>
+      <point x="1041" y="596" type="curve" smooth="yes" name="sh04"/>
       <point x="925" y="0" type="line" name="ab01"/>
       <point x="761" y="0" type="line"/>
       <point x="774" y="168" type="line" name="ih02"/>
@@ -58,17 +58,17 @@
       <point x="487" y="-29"/>
     </contour>
     <contour>
-      <point x="496" y="131" type="curve" name="dv02" smooth="yes"/>
+      <point x="496" y="131" type="curve" smooth="yes" name="dv02"/>
       <point x="600" y="131"/>
       <point x="673" y="175"/>
       <point x="729" y="240" type="curve" smooth="yes"/>
       <point x="786" y="308"/>
       <point x="817" y="393"/>
       <point x="832" y="470" type="curve" smooth="yes"/>
-      <point x="859" y="609" type="line" name="sh05" smooth="yes"/>
+      <point x="859" y="609" type="line" smooth="yes" name="sh05"/>
       <point x="865" y="639"/>
       <point x="868" y="668"/>
-      <point x="868" y="697" type="curve" name="ah01" smooth="yes"/>
+      <point x="868" y="697" type="curve" smooth="yes" name="ah01"/>
       <point x="868" y="761"/>
       <point x="851" y="818"/>
       <point x="815" y="862" type="curve" smooth="yes"/>
@@ -77,10 +77,10 @@
       <point x="525" y="975" type="curve" name="sv02"/>
       <point x="426" y="818"/>
       <point x="344" y="602"/>
-      <point x="315" y="435" type="curve" name="sh07" smooth="yes"/>
+      <point x="315" y="435" type="curve" smooth="yes" name="sh07"/>
       <point x="308" y="392"/>
       <point x="304" y="356"/>
-      <point x="304" y="325" type="curve" name="sh06" smooth="yes"/>
+      <point x="304" y="325" type="curve" smooth="yes" name="sh06"/>
       <point x="304" y="270"/>
       <point x="314" y="228"/>
       <point x="341" y="195" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0574.glif b/source/Hack-Italic.ufo/glyphs/uni0574.glif
index 1c677a20c..824855418 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0574.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0574.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0574" format="1">
+<glyph name="uni0574" format="2">
   <advance width="1233"/>
   <unicode hex="0574"/>
   <outline>
     <contour>
-      <point x="287" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="287" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="103" y="-29"/>
       <point x="19" y="64"/>
-      <point x="19" y="251" type="curve" name="dh01" smooth="yes"/>
+      <point x="19" y="251" type="curve" smooth="yes" name="dh01"/>
       <point x="19" y="304"/>
       <point x="25" y="361"/>
-      <point x="38" y="424" type="curve" name="hr01" smooth="yes"/>
+      <point x="38" y="424" type="curve" smooth="yes" name="hr01"/>
       <point x="173" y="1120" type="line" name="at01"/>
       <point x="357" y="1120" type="line"/>
       <point x="222" y="424" type="line" smooth="yes"/>
       <point x="214" y="381"/>
       <point x="209" y="344"/>
-      <point x="209" y="309" type="curve" name="dh02" smooth="yes"/>
+      <point x="209" y="309" type="curve" smooth="yes" name="dh02"/>
       <point x="209" y="188"/>
       <point x="265" y="131"/>
-      <point x="384" y="131" type="curve" name="sv01" smooth="yes"/>
+      <point x="384" y="131" type="curve" smooth="yes" name="sv01"/>
       <point x="563" y="131"/>
       <point x="676" y="257"/>
       <point x="720" y="485" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0575.glif b/source/Hack-Italic.ufo/glyphs/uni0575.glif
index b60cd8330..9608897fe 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0575.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0575.glif
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0575" format="1">
+<glyph name="uni0575" format="2">
   <advance width="1233"/>
   <unicode hex="0575"/>
   <outline>
     <contour>
       <point x="197" y="-270" type="line" name="hr00"/>
-      <point x="431" y="-270" type="line" name="dv02" smooth="yes"/>
+      <point x="431" y="-270" type="line" smooth="yes" name="dv02"/>
       <point x="554" y="-270"/>
       <point x="627" y="-187"/>
       <point x="659" y="-20" type="curve" smooth="yes"/>
@@ -14,7 +14,7 @@
       <point x="843" y="-20" type="line" smooth="yes"/>
       <point x="792" y="-281"/>
       <point x="641" y="-426"/>
-      <point x="420" y="-426" type="curve" name="dv01" smooth="yes"/>
+      <point x="420" y="-426" type="curve" smooth="yes" name="dv01"/>
       <point x="166" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0576.glif b/source/Hack-Italic.ufo/glyphs/uni0576.glif
index 303496c34..2329b7f2b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0576.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0576.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0576" format="1">
+<glyph name="uni0576" format="2">
   <advance width="1233"/>
   <unicode hex="0576"/>
   <outline>
     <contour>
-      <point x="455" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="455" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="271" y="-29"/>
       <point x="187" y="64"/>
-      <point x="187" y="251" type="curve" name="dh01" smooth="yes"/>
+      <point x="187" y="251" type="curve" smooth="yes" name="dh01"/>
       <point x="187" y="304"/>
       <point x="193" y="361"/>
-      <point x="206" y="424" type="curve" name="hr01" smooth="yes"/>
+      <point x="206" y="424" type="curve" smooth="yes" name="hr01"/>
       <point x="398" y="1413" type="line" name="sv03"/>
       <point x="230" y="1413" type="line"/>
       <point x="258" y="1556" type="line" name="at02"/>
@@ -18,10 +18,10 @@
       <point x="390" y="424" type="line" smooth="yes"/>
       <point x="382" y="381"/>
       <point x="377" y="344"/>
-      <point x="377" y="309" type="curve" name="dh02" smooth="yes"/>
+      <point x="377" y="309" type="curve" smooth="yes" name="dh02"/>
       <point x="377" y="188"/>
       <point x="433" y="131"/>
-      <point x="552" y="131" type="curve" name="sv01" smooth="yes"/>
+      <point x="552" y="131" type="curve" smooth="yes" name="sv01"/>
       <point x="731" y="131"/>
       <point x="844" y="257"/>
       <point x="888" y="485" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0577.glif b/source/Hack-Italic.ufo/glyphs/uni0577.glif
index a3722a8d5..5a7af88f2 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0577.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0577.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0577" format="1">
+<glyph name="uni0577" format="2">
   <advance width="1233"/>
   <unicode hex="0577"/>
   <outline>
     <contour>
-      <point x="204" y="-426" type="line" name="hr00" smooth="yes"/>
+      <point x="204" y="-426" type="line" smooth="yes" name="hr00"/>
       <point x="148" y="-426"/>
       <point x="107" y="-407"/>
       <point x="80" y="-375" type="curve" smooth="yes"/>
@@ -28,13 +28,13 @@
       <point x="947" y="736" type="curve" smooth="yes"/>
       <point x="951" y="757"/>
       <point x="953" y="777"/>
-      <point x="953" y="796" type="curve" name="dh01" smooth="yes"/>
+      <point x="953" y="796" type="curve" smooth="yes" name="dh01"/>
       <point x="953" y="847"/>
       <point x="939" y="892"/>
       <point x="908" y="925" type="curve" smooth="yes"/>
       <point x="867" y="969"/>
       <point x="794" y="994"/>
-      <point x="713" y="994" type="curve" name="dv02" smooth="yes"/>
+      <point x="713" y="994" type="curve" smooth="yes" name="dv02"/>
       <point x="661" y="994"/>
       <point x="610" y="984"/>
       <point x="554" y="957" type="curve" smooth="yes"/>
@@ -47,13 +47,13 @@
       <point x="499" y="1094" type="curve" smooth="yes"/>
       <point x="575" y="1129"/>
       <point x="651" y="1148"/>
-      <point x="746" y="1148" type="curve" name="dv03" smooth="yes"/>
+      <point x="746" y="1148" type="curve" smooth="yes" name="dv03"/>
       <point x="878" y="1148"/>
       <point x="994" y="1112"/>
       <point x="1062" y="1041" type="curve" smooth="yes"/>
       <point x="1113" y="988"/>
       <point x="1141" y="910"/>
-      <point x="1141" y="822" type="curve" name="dh02" smooth="yes"/>
+      <point x="1141" y="822" type="curve" smooth="yes" name="dh02"/>
       <point x="1141" y="793"/>
       <point x="1138" y="765"/>
       <point x="1132" y="736" type="curve" smooth="yes"/>
@@ -80,7 +80,7 @@
       <point x="282" y="-253" type="curve" smooth="yes"/>
       <point x="291" y="-269"/>
       <point x="309" y="-283"/>
-      <point x="344" y="-283" type="curve" name="dv01" smooth="yes"/>
+      <point x="344" y="-283" type="curve" smooth="yes" name="dv01"/>
       <point x="883" y="-283" type="line"/>
       <point x="856" y="-426" type="line" name="sv01"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0578.glif b/source/Hack-Italic.ufo/glyphs/uni0578.glif
index a3a3841dc..1027ab346 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0578.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0578.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0578" format="1">
+<glyph name="uni0578" format="2">
   <advance width="1233"/>
   <unicode hex="0578"/>
   <outline>
@@ -9,10 +9,10 @@
       <point x="449" y="952" type="line" name="iv01"/>
       <point x="553" y="1085"/>
       <point x="666" y="1147"/>
-      <point x="803" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="803" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="979" y="1147"/>
       <point x="1090" y="1045"/>
-      <point x="1090" y="874" type="curve" name="dh02" smooth="yes"/>
+      <point x="1090" y="874" type="curve" smooth="yes" name="dh02"/>
       <point x="1090" y="827"/>
       <point x="1082" y="763"/>
       <point x="1069" y="694" type="curve" smooth="yes"/>
@@ -24,10 +24,10 @@
       <point x="888" y="709" type="curve" smooth="yes"/>
       <point x="898" y="756"/>
       <point x="903" y="793"/>
-      <point x="903" y="821" type="curve" name="dh01" smooth="yes"/>
+      <point x="903" y="821" type="curve" smooth="yes" name="dh01"/>
       <point x="903" y="926"/>
       <point x="840" y="987"/>
-      <point x="723" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="723" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="556" y="987"/>
       <point x="428" y="857"/>
       <point x="385" y="633" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0579.glif b/source/Hack-Italic.ufo/glyphs/uni0579.glif
index c886aa3b6..337223ff4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0579.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0579.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0579" format="1">
+<glyph name="uni0579" format="2">
   <advance width="1233"/>
   <unicode hex="0579"/>
   <outline>
     <contour>
-      <point x="256" y="-426" type="line" name="hr00" smooth="yes"/>
+      <point x="256" y="-426" type="line" smooth="yes" name="hr00"/>
       <point x="207" y="-426"/>
       <point x="170" y="-412"/>
       <point x="145" y="-383" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="520" y="618" type="curve" smooth="yes"/>
       <point x="477" y="654"/>
       <point x="444" y="705"/>
-      <point x="444" y="780" type="curve" name="dh01" smooth="yes"/>
+      <point x="444" y="780" type="curve" smooth="yes" name="dh01"/>
       <point x="444" y="797"/>
       <point x="446" y="816"/>
       <point x="450" y="836" type="curve" smooth="yes"/>
@@ -40,7 +40,7 @@
       <point x="778" y="1027" type="line" smooth="yes"/>
       <point x="701" y="966"/>
       <point x="632" y="887"/>
-      <point x="632" y="815" type="curve" name="dh02" smooth="yes"/>
+      <point x="632" y="815" type="curve" smooth="yes" name="dh02"/>
       <point x="632" y="774"/>
       <point x="657" y="746"/>
       <point x="688" y="727" type="curve" smooth="yes"/>
@@ -65,7 +65,7 @@
       <point x="339" y="-248" type="curve" smooth="yes"/>
       <point x="350" y="-269"/>
       <point x="368" y="-283"/>
-      <point x="399" y="-283" type="curve" name="dv01" smooth="yes"/>
+      <point x="399" y="-283" type="curve" smooth="yes" name="dv01"/>
       <point x="862" y="-283" type="line"/>
       <point x="834" y="-426" type="line" name="sv01"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni057A_.glif b/source/Hack-Italic.ufo/glyphs/uni057A_.glif
index f0eab4520..ce27f2a65 100644
--- a/source/Hack-Italic.ufo/glyphs/uni057A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni057A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni057A" format="1">
+<glyph name="uni057A" format="2">
   <advance width="1233"/>
   <unicode hex="057A"/>
   <outline>
@@ -7,19 +7,19 @@
       <point x="913" y="96" type="line" name="hr00"/>
       <point x="848" y="9"/>
       <point x="775" y="-27"/>
-      <point x="691" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="691" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="599" y="-27"/>
       <point x="535" y="17"/>
       <point x="516" y="114" type="curve" name="iv01"/>
       <point x="451" y="18"/>
       <point x="381" y="-27"/>
-      <point x="270" y="-27" type="curve" name="ab02" smooth="yes"/>
+      <point x="270" y="-27" type="curve" smooth="yes" name="ab02"/>
       <point x="187" y="-27"/>
       <point x="133" y="-3"/>
       <point x="106" y="76" type="curve" smooth="yes"/>
       <point x="96" y="106"/>
       <point x="91" y="143"/>
-      <point x="91" y="187" type="curve" name="dh01" smooth="yes"/>
+      <point x="91" y="187" type="curve" smooth="yes" name="dh01"/>
       <point x="91" y="259"/>
       <point x="104" y="350"/>
       <point x="127" y="471" type="curve"/>
@@ -28,13 +28,13 @@
       <point x="296" y="479" type="line" smooth="yes"/>
       <point x="280" y="394"/>
       <point x="273" y="346"/>
-      <point x="265" y="287" type="curve" name="sh01" smooth="yes"/>
+      <point x="265" y="287" type="curve" smooth="yes" name="sh01"/>
       <point x="262" y="263"/>
       <point x="260" y="240"/>
-      <point x="260" y="221" type="curve" name="dh02" smooth="yes"/>
+      <point x="260" y="221" type="curve" smooth="yes" name="dh02"/>
       <point x="260" y="162"/>
       <point x="278" y="127"/>
-      <point x="350" y="127" type="curve" name="sv01" smooth="yes"/>
+      <point x="350" y="127" type="curve" smooth="yes" name="sv01"/>
       <point x="407" y="127"/>
       <point x="447" y="149"/>
       <point x="472" y="188" type="curve" smooth="yes"/>
@@ -52,7 +52,7 @@
       <point x="697" y="183" type="curve" smooth="yes"/>
       <point x="708" y="144"/>
       <point x="742" y="127"/>
-      <point x="789" y="127" type="curve" name="sv02" smooth="yes"/>
+      <point x="789" y="127" type="curve" smooth="yes" name="sv02"/>
       <point x="845" y="127"/>
       <point x="877" y="151"/>
       <point x="901" y="188" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni057B_.glif b/source/Hack-Italic.ufo/glyphs/uni057B_.glif
index ecb8a6c75..ccb606749 100644
--- a/source/Hack-Italic.ufo/glyphs/uni057B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni057B_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni057B" format="1">
+<glyph name="uni057B" format="2">
   <advance width="1233"/>
   <unicode hex="057B"/>
   <outline>
     <contour>
-      <point x="210" y="-426" type="line" name="hr00" smooth="yes"/>
+      <point x="210" y="-426" type="line" smooth="yes" name="hr00"/>
       <point x="159" y="-426"/>
       <point x="117" y="-408"/>
       <point x="90" y="-379" type="curve" smooth="yes"/>
@@ -34,31 +34,31 @@
       <point x="323" y="525" type="curve" smooth="yes"/>
       <point x="290" y="580"/>
       <point x="261" y="628"/>
-      <point x="250" y="689" type="curve" name="sh02" smooth="yes"/>
+      <point x="250" y="689" type="curve" smooth="yes" name="sh02"/>
       <point x="247" y="704"/>
       <point x="246" y="721"/>
-      <point x="246" y="738" type="curve" name="sh01" smooth="yes"/>
+      <point x="246" y="738" type="curve" smooth="yes" name="sh01"/>
       <point x="246" y="787"/>
       <point x="259" y="837"/>
       <point x="286" y="886" type="curve" smooth="yes"/>
       <point x="320" y="948"/>
       <point x="369" y="1001"/>
-      <point x="434" y="1046" type="curve" name="sh04" smooth="yes"/>
+      <point x="434" y="1046" type="curve" smooth="yes" name="sh04"/>
       <point x="498" y="1090"/>
       <point x="567" y="1120"/>
       <point x="639" y="1136" type="curve" smooth="yes"/>
       <point x="675" y="1144"/>
       <point x="709" y="1148"/>
-      <point x="752" y="1148" type="curve" name="dv03" smooth="yes"/>
+      <point x="752" y="1148" type="curve" smooth="yes" name="dv03"/>
       <point x="883" y="1148"/>
       <point x="997" y="1112"/>
       <point x="1065" y="1044" type="curve" smooth="yes"/>
       <point x="1118" y="991"/>
       <point x="1149" y="914"/>
-      <point x="1149" y="826" type="curve" name="sh05" smooth="yes"/>
+      <point x="1149" y="826" type="curve" smooth="yes" name="sh05"/>
       <point x="1149" y="799"/>
       <point x="1146" y="774"/>
-      <point x="1141" y="747" type="curve" name="sh06" smooth="yes"/>
+      <point x="1141" y="747" type="curve" smooth="yes" name="sh06"/>
       <point x="1120" y="642"/>
       <point x="1057" y="538"/>
       <point x="976" y="442" type="curve" smooth="yes"/>
@@ -82,7 +82,7 @@
       <point x="301" y="-267" type="curve" smooth="yes"/>
       <point x="316" y="-279"/>
       <point x="335" y="-283"/>
-      <point x="350" y="-283" type="curve" name="dv01" smooth="yes"/>
+      <point x="350" y="-283" type="curve" smooth="yes" name="dv01"/>
       <point x="889" y="-283" type="line"/>
       <point x="862" y="-426" type="line"/>
     </contour>
@@ -93,22 +93,22 @@
       <point x="776" y="448" type="curve" smooth="yes"/>
       <point x="865" y="540"/>
       <point x="932" y="632"/>
-      <point x="953" y="736" type="curve" name="sh07" smooth="yes"/>
+      <point x="953" y="736" type="curve" smooth="yes" name="sh07"/>
       <point x="957" y="757"/>
       <point x="959" y="777"/>
-      <point x="959" y="797" type="curve" name="ah01" smooth="yes"/>
+      <point x="959" y="797" type="curve" smooth="yes" name="ah01"/>
       <point x="959" y="849"/>
       <point x="944" y="895"/>
       <point x="913" y="928" type="curve" smooth="yes"/>
       <point x="872" y="972"/>
       <point x="801" y="994"/>
-      <point x="724" y="994" type="curve" name="dv02" smooth="yes"/>
+      <point x="724" y="994" type="curve" smooth="yes" name="dv02"/>
       <point x="657" y="994"/>
       <point x="597" y="976"/>
       <point x="546" y="941" type="curve" smooth="yes"/>
       <point x="483" y="898"/>
       <point x="436" y="839"/>
-      <point x="436" y="760" type="curve" name="sh03" smooth="yes"/>
+      <point x="436" y="760" type="curve" smooth="yes" name="sh03"/>
       <point x="436" y="725"/>
       <point x="447" y="694"/>
       <point x="466" y="654" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni057C_.glif b/source/Hack-Italic.ufo/glyphs/uni057C_.glif
index 132813c21..f9831eaf4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni057C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni057C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni057C" format="1">
+<glyph name="uni057C" format="2">
   <advance width="1233"/>
   <unicode hex="057C"/>
   <outline>
@@ -9,13 +9,13 @@
       <point x="388" y="948" type="line" name="iv01"/>
       <point x="481" y="1084"/>
       <point x="601" y="1147"/>
-      <point x="757" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="757" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="893" y="1147"/>
       <point x="975" y="1099"/>
       <point x="1019" y="1015" type="curve" smooth="yes"/>
       <point x="1045" y="965"/>
       <point x="1058" y="904"/>
-      <point x="1058" y="832" type="curve" name="dh02" smooth="yes"/>
+      <point x="1058" y="832" type="curve" smooth="yes" name="dh02"/>
       <point x="1058" y="784"/>
       <point x="1052" y="732"/>
       <point x="1041" y="675" type="curve" smooth="yes"/>
@@ -37,13 +37,13 @@
       <point x="841" y="632" type="curve" smooth="yes"/>
       <point x="850" y="677"/>
       <point x="855" y="720"/>
-      <point x="855" y="760" type="curve" name="dh01" smooth="yes"/>
+      <point x="855" y="760" type="curve" smooth="yes" name="dh01"/>
       <point x="855" y="807"/>
       <point x="848" y="848"/>
       <point x="833" y="883" type="curve" smooth="yes"/>
       <point x="805" y="947"/>
       <point x="746" y="987"/>
-      <point x="654" y="987" type="curve" name="sv02" smooth="yes"/>
+      <point x="654" y="987" type="curve" smooth="yes" name="sv02"/>
       <point x="566" y="987"/>
       <point x="498" y="950"/>
       <point x="442" y="890" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni057D_.glif b/source/Hack-Italic.ufo/glyphs/uni057D_.glif
index 5f401aff7..74237b29e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni057D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni057D_.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni057D" format="1">
+<glyph name="uni057D" format="2">
   <advance width="1233"/>
   <unicode hex="057D"/>
   <outline>
     <contour>
-      <point x="403" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="403" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="227" y="-27"/>
       <point x="119" y="74"/>
-      <point x="119" y="253" type="curve" name="dh01" smooth="yes"/>
+      <point x="119" y="253" type="curve" smooth="yes" name="dh01"/>
       <point x="119" y="296"/>
       <point x="125" y="362"/>
-      <point x="137" y="426" type="curve" name="hr01" smooth="yes"/>
+      <point x="137" y="426" type="curve" smooth="yes" name="hr01"/>
       <point x="270" y="1120" type="line" name="at01"/>
       <point x="455" y="1120" type="line"/>
       <point x="320" y="426" type="line" smooth="yes"/>
       <point x="312" y="383"/>
       <point x="305" y="331"/>
-      <point x="305" y="296" type="curve" name="dh02" smooth="yes"/>
+      <point x="305" y="296" type="curve" smooth="yes" name="dh02"/>
       <point x="305" y="192"/>
       <point x="370" y="133"/>
-      <point x="483" y="133" type="curve" name="sv01" smooth="yes"/>
+      <point x="483" y="133" type="curve" smooth="yes" name="sv01"/>
       <point x="648" y="133"/>
       <point x="774" y="256"/>
       <point x="819" y="487" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni057E_.glif b/source/Hack-Italic.ufo/glyphs/uni057E_.glif
index a964af289..31e4d60e4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni057E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni057E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni057E" format="1">
+<glyph name="uni057E" format="2">
   <advance width="1233"/>
   <unicode hex="057E"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="695" y="168" type="line" name="hr00"/>
       <point x="603" y="39"/>
       <point x="480" y="-29"/>
-      <point x="324" y="-29" type="curve" name="dv03" smooth="yes"/>
+      <point x="324" y="-29" type="curve" smooth="yes" name="dv03"/>
       <point x="145" y="-29"/>
       <point x="55" y="65"/>
-      <point x="55" y="252" type="curve" name="dh01" smooth="yes"/>
+      <point x="55" y="252" type="curve" smooth="yes" name="dh01"/>
       <point x="55" y="303"/>
       <point x="62" y="360"/>
       <point x="74" y="424" type="curve" smooth="yes"/>
@@ -19,10 +19,10 @@
       <point x="258" y="424" type="line" smooth="yes"/>
       <point x="250" y="381"/>
       <point x="246" y="343"/>
-      <point x="246" y="310" type="curve" name="dh02" smooth="yes"/>
+      <point x="246" y="310" type="curve" smooth="yes" name="dh02"/>
       <point x="246" y="187"/>
       <point x="302" y="131"/>
-      <point x="421" y="131" type="curve" name="dv04" smooth="yes"/>
+      <point x="421" y="131" type="curve" smooth="yes" name="dv04"/>
       <point x="594" y="131"/>
       <point x="712" y="252"/>
       <point x="757" y="485" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni057F_.glif b/source/Hack-Italic.ufo/glyphs/uni057F_.glif
index ed50426d5..5644384e9 100644
--- a/source/Hack-Italic.ufo/glyphs/uni057F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni057F_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni057F" format="1">
+<glyph name="uni057F" format="2">
   <advance width="1233"/>
   <unicode hex="057F"/>
   <outline>
     <contour>
-      <point x="217" y="-27" type="curve" name="sh02" smooth="yes"/>
+      <point x="217" y="-27" type="curve" smooth="yes" name="sh02"/>
       <point x="128" y="-27"/>
       <point x="77" y="11"/>
-      <point x="56" y="80" type="curve" name="sh03" smooth="yes"/>
+      <point x="56" y="80" type="curve" smooth="yes" name="sh03"/>
       <point x="48" y="106"/>
       <point x="44" y="137"/>
-      <point x="44" y="174" type="curve" name="hr01" smooth="yes"/>
+      <point x="44" y="174" type="curve" smooth="yes" name="hr01"/>
       <point x="44" y="231"/>
       <point x="52" y="301"/>
       <point x="71" y="393" type="curve"/>
@@ -19,13 +19,13 @@
       <point x="256" y="479" type="line" smooth="yes"/>
       <point x="240" y="395"/>
       <point x="230" y="329"/>
-      <point x="225" y="285" type="curve" name="sh05" smooth="yes"/>
+      <point x="225" y="285" type="curve" smooth="yes" name="sh05"/>
       <point x="222" y="264"/>
       <point x="221" y="244"/>
-      <point x="221" y="227" type="curve" name="sh01" smooth="yes"/>
+      <point x="221" y="227" type="curve" smooth="yes" name="sh01"/>
       <point x="221" y="163"/>
       <point x="241" y="127"/>
-      <point x="313" y="127" type="curve" name="sv01" smooth="yes"/>
+      <point x="313" y="127" type="curve" smooth="yes" name="sv01"/>
       <point x="369" y="127"/>
       <point x="407" y="149"/>
       <point x="431" y="188" type="curve" smooth="yes"/>
@@ -37,13 +37,13 @@
       <point x="790" y="1024" type="line" name="ih01"/>
       <point x="854" y="1108"/>
       <point x="924" y="1147"/>
-      <point x="1015" y="1147" type="curve" name="sh06" smooth="yes"/>
+      <point x="1015" y="1147" type="curve" smooth="yes" name="sh06"/>
       <point x="1101" y="1147"/>
       <point x="1155" y="1111"/>
-      <point x="1176" y="1040" type="curve" name="sh07" smooth="yes"/>
+      <point x="1176" y="1040" type="curve" smooth="yes" name="sh07"/>
       <point x="1184" y="1013"/>
       <point x="1187" y="982"/>
-      <point x="1187" y="946" type="curve" name="hr02" smooth="yes"/>
+      <point x="1187" y="946" type="curve" smooth="yes" name="hr02"/>
       <point x="1187" y="885"/>
       <point x="1177" y="811"/>
       <point x="1161" y="727" type="curve" smooth="yes"/>
@@ -52,13 +52,13 @@
       <point x="976" y="641" type="line" smooth="yes"/>
       <point x="991" y="714"/>
       <point x="1000" y="783"/>
-      <point x="1007" y="836" type="curve" name="sh09" smooth="yes"/>
+      <point x="1007" y="836" type="curve" smooth="yes" name="sh09"/>
       <point x="1010" y="857"/>
       <point x="1011" y="877"/>
-      <point x="1011" y="894" type="curve" name="ah01" smooth="yes"/>
+      <point x="1011" y="894" type="curve" smooth="yes" name="ah01"/>
       <point x="1011" y="957"/>
       <point x="990" y="993"/>
-      <point x="917" y="993" type="curve" name="sv02" smooth="yes"/>
+      <point x="917" y="993" type="curve" smooth="yes" name="sv02"/>
       <point x="821" y="993"/>
       <point x="788" y="929"/>
       <point x="762" y="839" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0580.glif b/source/Hack-Italic.ufo/glyphs/uni0580.glif
index 65b525777..6d2b76738 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0580.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0580.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0580" format="1">
+<glyph name="uni0580" format="2">
   <advance width="1233"/>
   <unicode hex="0580"/>
   <outline>
@@ -9,10 +9,10 @@
       <point x="486" y="952" type="line" name="iv01"/>
       <point x="578" y="1082"/>
       <point x="701" y="1147"/>
-      <point x="856" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="856" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="1039" y="1147"/>
       <point x="1127" y="1056"/>
-      <point x="1127" y="865" type="curve" name="dh02" smooth="yes"/>
+      <point x="1127" y="865" type="curve" smooth="yes" name="dh02"/>
       <point x="1127" y="814"/>
       <point x="1120" y="758"/>
       <point x="1108" y="694" type="curve" smooth="yes"/>
@@ -21,10 +21,10 @@
       <point x="923" y="694" type="line" smooth="yes"/>
       <point x="931" y="737"/>
       <point x="936" y="774"/>
-      <point x="936" y="809" type="curve" name="dh01" smooth="yes"/>
+      <point x="936" y="809" type="curve" smooth="yes" name="dh01"/>
       <point x="936" y="933"/>
       <point x="878" y="987"/>
-      <point x="762" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="762" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="583" y="987"/>
       <point x="467" y="855"/>
       <point x="424" y="633" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0581.glif b/source/Hack-Italic.ufo/glyphs/uni0581.glif
index 576d54f5d..0c5652e6c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0581.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0581.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0581" format="1">
+<glyph name="uni0581" format="2">
   <advance width="1233"/>
   <unicode hex="0581"/>
   <outline>
     <contour>
-      <point x="412" y="-440" type="curve" name="hr00" smooth="yes"/>
+      <point x="412" y="-440" type="curve" smooth="yes" name="hr00"/>
       <point x="297" y="-440"/>
       <point x="193" y="-421"/>
       <point x="93" y="-385" type="curve"/>
       <point x="130" y="-203" type="line" name="sh01"/>
       <point x="227" y="-263"/>
       <point x="331" y="-293"/>
-      <point x="443" y="-293" type="curve" name="dv01" smooth="yes"/>
+      <point x="443" y="-293" type="curve" smooth="yes" name="dv01"/>
       <point x="646" y="-293"/>
       <point x="739" y="-190"/>
       <point x="790" y="53" type="curve" smooth="yes"/>
       <point x="814" y="170" type="line" name="iv01"/>
       <point x="735" y="50"/>
       <point x="612" y="-8"/>
-      <point x="477" y="-8" type="curve" name="ab01" smooth="yes"/>
+      <point x="477" y="-8" type="curve" smooth="yes" name="ab01"/>
       <point x="266" y="-8"/>
       <point x="136" y="138"/>
-      <point x="136" y="401" type="curve" name="dh01" smooth="yes"/>
+      <point x="136" y="401" type="curve" smooth="yes" name="dh01"/>
       <point x="136" y="574"/>
       <point x="192" y="770"/>
       <point x="288" y="911" type="curve" smooth="yes"/>
       <point x="387" y="1058"/>
       <point x="529" y="1147"/>
-      <point x="682" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="682" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="817" y="1147"/>
       <point x="923" y="1078"/>
       <point x="968" y="965" type="curve" name="iv02"/>
@@ -38,7 +38,7 @@
       <point x="743" y="-440"/>
     </contour>
     <contour>
-      <point x="541" y="145" type="curve" name="sv01" smooth="yes"/>
+      <point x="541" y="145" type="curve" smooth="yes" name="sv01"/>
       <point x="652" y="145"/>
       <point x="739" y="203"/>
       <point x="804" y="319" type="curve" smooth="yes"/>
@@ -47,10 +47,10 @@
       <point x="908" y="728" type="curve" smooth="yes"/>
       <point x="908" y="901"/>
       <point x="830" y="991"/>
-      <point x="701" y="991" type="curve" name="sv02" smooth="yes"/>
+      <point x="701" y="991" type="curve" smooth="yes" name="sv02"/>
       <point x="472" y="991"/>
       <point x="331" y="697"/>
-      <point x="331" y="429" type="curve" name="dh02" smooth="yes"/>
+      <point x="331" y="429" type="curve" smooth="yes" name="dh02"/>
       <point x="331" y="227"/>
       <point x="410" y="145"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0582.glif b/source/Hack-Italic.ufo/glyphs/uni0582.glif
index 3698aeefb..f8b30c320 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0582.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0582.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0582" format="1">
+<glyph name="uni0582" format="2">
   <advance width="1233"/>
   <unicode hex="0582"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0583.glif b/source/Hack-Italic.ufo/glyphs/uni0583.glif
index ee32bbfa1..56c2a900f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0583.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0583.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0583" format="1">
+<glyph name="uni0583" format="2">
   <advance width="1233"/>
   <unicode hex="0583"/>
   <outline>
@@ -7,13 +7,13 @@
       <point x="441" y="96" type="line" name="ih01"/>
       <point x="373" y="8"/>
       <point x="303" y="-27"/>
-      <point x="216" y="-27" type="curve" name="sh04" smooth="yes"/>
+      <point x="216" y="-27" type="curve" smooth="yes" name="sh04"/>
       <point x="127" y="-27"/>
       <point x="76" y="11"/>
-      <point x="55" y="80" type="curve" name="sh05" smooth="yes"/>
+      <point x="55" y="80" type="curve" smooth="yes" name="sh05"/>
       <point x="47" y="106"/>
       <point x="43" y="137"/>
-      <point x="43" y="174" type="curve" name="sh01" smooth="yes"/>
+      <point x="43" y="174" type="curve" smooth="yes" name="sh01"/>
       <point x="43" y="231"/>
       <point x="51" y="301"/>
       <point x="70" y="393" type="curve"/>
@@ -22,13 +22,13 @@
       <point x="255" y="479" type="line" smooth="yes"/>
       <point x="239" y="395"/>
       <point x="229" y="329"/>
-      <point x="224" y="285" type="curve" name="sh07" smooth="yes"/>
+      <point x="224" y="285" type="curve" smooth="yes" name="sh07"/>
       <point x="221" y="264"/>
       <point x="220" y="244"/>
-      <point x="220" y="227" type="curve" name="sh03" smooth="yes"/>
+      <point x="220" y="227" type="curve" smooth="yes" name="sh03"/>
       <point x="220" y="163"/>
       <point x="240" y="127"/>
-      <point x="312" y="127" type="curve" name="sv01" smooth="yes"/>
+      <point x="312" y="127" type="curve" smooth="yes" name="sv01"/>
       <point x="368" y="127"/>
       <point x="406" y="149"/>
       <point x="430" y="188" type="curve" smooth="yes"/>
@@ -40,28 +40,28 @@
       <point x="789" y="1024" type="line" name="ih02"/>
       <point x="853" y="1108"/>
       <point x="923" y="1147"/>
-      <point x="1014" y="1147" type="curve" name="sh08" smooth="yes"/>
+      <point x="1014" y="1147" type="curve" smooth="yes" name="sh08"/>
       <point x="1100" y="1147"/>
       <point x="1154" y="1111"/>
-      <point x="1175" y="1040" type="curve" name="sh09" smooth="yes"/>
+      <point x="1175" y="1040" type="curve" smooth="yes" name="sh09"/>
       <point x="1183" y="1013"/>
       <point x="1186" y="982"/>
-      <point x="1186" y="946" type="curve" name="sh02" smooth="yes"/>
+      <point x="1186" y="946" type="curve" smooth="yes" name="sh02"/>
       <point x="1186" y="885"/>
       <point x="1176" y="811"/>
-      <point x="1160" y="727" type="curve" name="hr01" smooth="yes"/>
+      <point x="1160" y="727" type="curve" smooth="yes" name="hr01"/>
       <point x="1019" y="0" type="line" name="sh10"/>
       <point x="851" y="0" type="line"/>
       <point x="975" y="641" type="line" smooth="yes"/>
       <point x="990" y="714"/>
       <point x="999" y="783"/>
-      <point x="1006" y="836" type="curve" name="sh11" smooth="yes"/>
+      <point x="1006" y="836" type="curve" smooth="yes" name="sh11"/>
       <point x="1009" y="857"/>
       <point x="1010" y="877"/>
-      <point x="1010" y="894" type="curve" name="ah01" smooth="yes"/>
+      <point x="1010" y="894" type="curve" smooth="yes" name="ah01"/>
       <point x="1010" y="957"/>
       <point x="989" y="993"/>
-      <point x="916" y="993" type="curve" name="sv02" smooth="yes"/>
+      <point x="916" y="993" type="curve" smooth="yes" name="sv02"/>
       <point x="820" y="993"/>
       <point x="787" y="929"/>
       <point x="761" y="839" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0584.glif b/source/Hack-Italic.ufo/glyphs/uni0584.glif
index a856c5e8f..70758b274 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0584.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0584.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0584" format="1">
+<glyph name="uni0584" format="2">
   <advance width="1233"/>
   <unicode hex="0584"/>
   <outline>
@@ -13,22 +13,22 @@
       <point x="511" y="977" type="line"/>
       <point x="595" y="1090"/>
       <point x="708" y="1147"/>
-      <point x="844" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="844" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="981" y="1147"/>
       <point x="1078" y="1088"/>
       <point x="1131" y="989" type="curve" smooth="yes"/>
       <point x="1166" y="925"/>
       <point x="1183" y="845"/>
-      <point x="1183" y="750" type="curve" name="dh01" smooth="yes"/>
+      <point x="1183" y="750" type="curve" smooth="yes" name="dh01"/>
       <point x="1183" y="690"/>
       <point x="1176" y="625"/>
-      <point x="1162" y="555" type="curve" name="hr01" smooth="yes"/>
+      <point x="1162" y="555" type="curve" smooth="yes" name="hr01"/>
       <point x="1127" y="374"/>
       <point x="1060" y="231"/>
       <point x="964" y="128" type="curve" smooth="yes"/>
       <point x="869" y="27"/>
       <point x="752" y="-29"/>
-      <point x="616" y="-29" type="curve" name="dv05" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv05"/>
       <point x="477" y="-29"/>
       <point x="386" y="28"/>
       <point x="349" y="141" type="curve"/>
@@ -40,25 +40,25 @@
       <point x="54" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="617" y="127" type="curve" name="dv06" smooth="yes"/>
+      <point x="617" y="127" type="curve" smooth="yes" name="dv06"/>
       <point x="708" y="127"/>
       <point x="783" y="163"/>
       <point x="840" y="236" type="curve"/>
       <point x="930" y="348"/>
       <point x="988" y="571"/>
-      <point x="988" y="737" type="curve" name="hr02" smooth="yes"/>
+      <point x="988" y="737" type="curve" smooth="yes" name="hr02"/>
       <point x="988" y="794"/>
       <point x="981" y="844"/>
       <point x="966" y="883" type="curve" smooth="yes"/>
       <point x="939" y="951"/>
       <point x="880" y="991"/>
-      <point x="785" y="991" type="curve" name="sv03" smooth="yes"/>
+      <point x="785" y="991" type="curve" smooth="yes" name="sv03"/>
       <point x="604" y="991"/>
       <point x="486" y="843"/>
       <point x="430" y="559" type="curve" smooth="yes"/>
       <point x="417" y="490"/>
       <point x="410" y="431"/>
-      <point x="410" y="382" type="curve" name="hr03" smooth="yes"/>
+      <point x="410" y="382" type="curve" smooth="yes" name="hr03"/>
       <point x="410" y="214"/>
       <point x="478" y="127"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0585.glif b/source/Hack-Italic.ufo/glyphs/uni0585.glif
index 253a2e386..93d0aebd0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0585.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0585.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0585" format="1">
+<glyph name="uni0585" format="2">
   <advance width="1233"/>
   <unicode hex="0585"/>
   <outline>
     <contour>
-      <point x="514" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="514" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="253" y="-29"/>
       <point x="117" y="121"/>
-      <point x="117" y="392" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="392" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="571"/>
       <point x="177" y="769"/>
       <point x="274" y="911" type="curve" smooth="yes"/>
       <point x="382" y="1068"/>
       <point x="526" y="1147"/>
-      <point x="717" y="1147" type="curve" name="at01" smooth="yes"/>
+      <point x="717" y="1147" type="curve" smooth="yes" name="at01"/>
       <point x="974" y="1147"/>
       <point x="1114" y="1004"/>
-      <point x="1114" y="724" type="curve" name="sh02" smooth="yes"/>
+      <point x="1114" y="724" type="curve" smooth="yes" name="sh02"/>
       <point x="1114" y="550"/>
       <point x="1060" y="354"/>
       <point x="958" y="207" type="curve" smooth="yes"/>
@@ -24,16 +24,16 @@
       <point x="707" y="-29"/>
     </contour>
     <contour>
-      <point x="524" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="524" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="792" y="127"/>
       <point x="920" y="442"/>
-      <point x="920" y="707" type="curve" name="ah01" smooth="yes"/>
+      <point x="920" y="707" type="curve" smooth="yes" name="ah01"/>
       <point x="920" y="906"/>
       <point x="850" y="991"/>
-      <point x="709" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="709" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="441" y="991"/>
       <point x="313" y="676"/>
-      <point x="313" y="411" type="curve" name="sh03" smooth="yes"/>
+      <point x="313" y="411" type="curve" smooth="yes" name="sh03"/>
       <point x="313" y="212"/>
       <point x="383" y="127"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0586.glif b/source/Hack-Italic.ufo/glyphs/uni0586.glif
index bc633e1ee..2d9adab65 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0586.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0586.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0586" format="1">
+<glyph name="uni0586" format="2">
   <advance width="1233"/>
   <unicode hex="0586"/>
   <outline>
@@ -24,7 +24,7 @@
       <point x="280" y="1037" type="curve" smooth="yes"/>
       <point x="229" y="1080"/>
       <point x="204" y="1135"/>
-      <point x="204" y="1203" type="curve" name="sh01" smooth="yes"/>
+      <point x="204" y="1203" type="curve" smooth="yes" name="sh01"/>
       <point x="204" y="1220"/>
       <point x="206" y="1237"/>
       <point x="209" y="1256" type="curve" name="sh03"/>
@@ -33,7 +33,7 @@
       <point x="366" y="1479" type="curve" smooth="yes"/>
       <point x="449" y="1530"/>
       <point x="560" y="1556"/>
-      <point x="697" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="697" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="872" y="1556" type="line"/>
       <point x="786" y="1115" type="line" name="sv02"/>
       <point x="971" y="1115"/>
@@ -41,7 +41,7 @@
       <point x="1153" y="975" type="curve" smooth="yes"/>
       <point x="1196" y="915"/>
       <point x="1212" y="840"/>
-      <point x="1212" y="752" type="curve" name="sh04" smooth="yes"/>
+      <point x="1212" y="752" type="curve" smooth="yes" name="sh04"/>
       <point x="1212" y="699"/>
       <point x="1206" y="641"/>
       <point x="1194" y="579" type="curve" smooth="yes"/>
@@ -55,10 +55,10 @@
       <point x="661" y="1414" type="line" name="sv03"/>
       <point x="497" y="1414"/>
       <point x="405" y="1359"/>
-      <point x="390" y="1263" type="curve" name="sh05" smooth="yes"/>
+      <point x="390" y="1263" type="curve" smooth="yes" name="sh05"/>
       <point x="389" y="1255"/>
       <point x="388" y="1248"/>
-      <point x="388" y="1241" type="curve" name="sh02" smooth="yes"/>
+      <point x="388" y="1241" type="curve" smooth="yes" name="sh02"/>
       <point x="388" y="1164"/>
       <point x="455" y="1115"/>
       <point x="602" y="1115" type="curve" name="dv02"/>
@@ -70,10 +70,10 @@
       <point x="879" y="264" type="curve" smooth="yes"/>
       <point x="947" y="345"/>
       <point x="992" y="459"/>
-      <point x="1015" y="576" type="curve" name="sh06" smooth="yes"/>
+      <point x="1015" y="576" type="curve" smooth="yes" name="sh06"/>
       <point x="1024" y="625"/>
       <point x="1029" y="670"/>
-      <point x="1029" y="711" type="curve" name="ah01" smooth="yes"/>
+      <point x="1029" y="711" type="curve" smooth="yes" name="ah01"/>
       <point x="1029" y="768"/>
       <point x="1020" y="819"/>
       <point x="1000" y="854" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0587.glif b/source/Hack-Italic.ufo/glyphs/uni0587.glif
index 29f324d67..f085e6cd1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0587.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0587.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0587" format="1">
+<glyph name="uni0587" format="2">
   <advance width="1233"/>
   <unicode hex="0587"/>
   <outline>
     <contour>
-      <point x="255" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="255" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="72" y="-29"/>
       <point x="-13" y="63"/>
-      <point x="-13" y="251" type="curve" name="dh01" smooth="yes"/>
+      <point x="-13" y="251" type="curve" smooth="yes" name="dh01"/>
       <point x="-13" y="303"/>
       <point x="-7" y="361"/>
-      <point x="6" y="424" type="curve" name="hr01" smooth="yes"/>
+      <point x="6" y="424" type="curve" smooth="yes" name="hr01"/>
       <point x="226" y="1556" type="line" name="at01"/>
       <point x="410" y="1556" type="line"/>
       <point x="190" y="424" type="line" smooth="yes"/>
       <point x="182" y="381"/>
       <point x="177" y="344"/>
-      <point x="177" y="309" type="curve" name="dh02" smooth="yes"/>
+      <point x="177" y="309" type="curve" smooth="yes" name="dh02"/>
       <point x="177" y="188"/>
       <point x="233" y="131"/>
-      <point x="352" y="131" type="curve" name="sv01" smooth="yes"/>
+      <point x="352" y="131" type="curve" smooth="yes" name="sv01"/>
       <point x="531" y="131"/>
       <point x="644" y="257"/>
       <point x="688" y="485" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0589.glif b/source/Hack-Italic.ufo/glyphs/uni0589.glif
index 43b2f81e9..14f7f4933 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0589.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0589.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0589" format="1">
+<glyph name="uni0589" format="2">
   <advance width="1233"/>
   <unicode hex="0589"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni058A_.glif b/source/Hack-Italic.ufo/glyphs/uni058A_.glif
index 5cfd3d419..8af929019 100644
--- a/source/Hack-Italic.ufo/glyphs/uni058A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni058A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni058A" format="1">
+<glyph name="uni058A" format="2">
   <advance width="1233"/>
   <unicode hex="058A"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="379" y="643" type="line" name="hr00"/>
       <point x="456" y="602"/>
       <point x="536" y="583"/>
-      <point x="620" y="583" type="curve" name="dv02" smooth="yes"/>
+      <point x="620" y="583" type="curve" smooth="yes" name="dv02"/>
       <point x="709" y="583"/>
       <point x="801" y="604"/>
       <point x="900" y="643" type="curve" name="av01"/>
       <point x="869" y="479" type="line"/>
       <point x="770" y="440"/>
       <point x="679" y="419"/>
-      <point x="590" y="419" type="curve" name="dv01" smooth="yes"/>
+      <point x="590" y="419" type="curve" smooth="yes" name="dv01"/>
       <point x="505" y="419"/>
       <point x="425" y="438"/>
       <point x="348" y="479" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni0E_3F_.glif b/source/Hack-Italic.ufo/glyphs/uni0E_3F_.glif
index 58914f644..52aa6b02d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni0E_3F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni0E_3F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0E3F" format="1">
+<glyph name="uni0E3F" format="2">
   <advance width="1233"/>
   <unicode hex="0E3F"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="792" y="1305" type="line" name="dv02"/>
       <point x="1002" y="1294"/>
       <point x="1143" y="1214"/>
-      <point x="1143" y="1043" type="curve" name="sh01" smooth="yes"/>
+      <point x="1143" y="1043" type="curve" smooth="yes" name="sh01"/>
       <point x="1143" y="1020"/>
       <point x="1141" y="997"/>
       <point x="1136" y="974" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="831" y="699" type="curve" name="hr01"/>
       <point x="991" y="676"/>
       <point x="1076" y="582"/>
-      <point x="1076" y="437" type="curve" name="dh02" smooth="yes"/>
+      <point x="1076" y="437" type="curve" smooth="yes" name="dh02"/>
       <point x="1076" y="414"/>
       <point x="1073" y="388"/>
       <point x="1068" y="359" type="curve" smooth="yes"/>
@@ -45,7 +45,7 @@
       <point x="940" y="974" type="curve" name="hr02"/>
       <point x="943" y="993"/>
       <point x="945" y="1009"/>
-      <point x="945" y="1024" type="curve" name="ih01" smooth="yes"/>
+      <point x="945" y="1024" type="curve" smooth="yes" name="ih01"/>
       <point x="945" y="1115"/>
       <point x="884" y="1150"/>
       <point x="763" y="1159" type="curve" name="sv03"/>
@@ -63,7 +63,7 @@
       <point x="875" y="376" type="curve"/>
       <point x="880" y="400"/>
       <point x="882" y="423"/>
-      <point x="882" y="443" type="curve" name="dh01" smooth="yes"/>
+      <point x="882" y="443" type="curve" smooth="yes" name="dh01"/>
       <point x="882" y="564"/>
       <point x="800" y="613"/>
       <point x="659" y="622" type="curve" name="dv03"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10D_0.glif b/source/Hack-Italic.ufo/glyphs/uni10D_0.glif
index e814d9eb3..e29493c48 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10D_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10D_0.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D0" format="1">
+<glyph name="uni10D0" format="2">
   <advance width="1233"/>
   <unicode hex="10D0"/>
   <outline>
     <contour>
-      <point x="493" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="493" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="242" y="0"/>
       <point x="123" y="106"/>
-      <point x="123" y="338" type="curve" name="dh01" smooth="yes"/>
+      <point x="123" y="338" type="curve" smooth="yes" name="dh01"/>
       <point x="123" y="511"/>
       <point x="190" y="585"/>
       <point x="257" y="660" type="curve"/>
@@ -17,35 +17,35 @@
       <point x="326" y="473" type="curve" smooth="yes"/>
       <point x="319" y="442"/>
       <point x="314" y="394"/>
-      <point x="314" y="358" type="curve" name="dh02" smooth="yes"/>
+      <point x="314" y="358" type="curve" smooth="yes" name="dh02"/>
       <point x="314" y="218"/>
       <point x="388" y="145"/>
-      <point x="528" y="145" type="curve" name="sv01" smooth="yes"/>
+      <point x="528" y="145" type="curve" smooth="yes" name="sv01"/>
       <point x="701" y="145"/>
       <point x="840" y="261"/>
-      <point x="872" y="480" type="curve" name="sh01" smooth="yes"/>
+      <point x="872" y="480" type="curve" smooth="yes" name="sh01"/>
       <point x="876" y="507"/>
       <point x="879" y="542"/>
-      <point x="879" y="565" type="curve" name="dh05" smooth="yes"/>
+      <point x="879" y="565" type="curve" smooth="yes" name="dh05"/>
       <point x="879" y="657"/>
       <point x="829" y="731"/>
       <point x="738" y="768" type="curve"/>
       <point x="585" y="825"/>
       <point x="509" y="923"/>
-      <point x="509" y="1062" type="curve" name="dh03" smooth="yes"/>
+      <point x="509" y="1062" type="curve" smooth="yes" name="dh03"/>
       <point x="509" y="1087"/>
       <point x="512" y="1115"/>
       <point x="517" y="1146" type="curve" name="sh02"/>
       <point x="698" y="1146" type="line"/>
       <point x="694" y="1124"/>
       <point x="692" y="1103"/>
-      <point x="692" y="1084" type="curve" name="dh04" smooth="yes"/>
+      <point x="692" y="1084" type="curve" smooth="yes" name="dh04"/>
       <point x="692" y="1011"/>
       <point x="723" y="961"/>
       <point x="784" y="934" type="curve"/>
       <point x="974" y="861"/>
       <point x="1069" y="744"/>
-      <point x="1069" y="583" type="curve" name="dh06" smooth="yes"/>
+      <point x="1069" y="583" type="curve" smooth="yes" name="dh06"/>
       <point x="1069" y="554"/>
       <point x="1067" y="528"/>
       <point x="1060" y="495" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10D_1.glif b/source/Hack-Italic.ufo/glyphs/uni10D_1.glif
index ece8f93d7..f61832a2a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10D_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10D_1.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D1" format="1">
+<glyph name="uni10D1" format="2">
   <advance width="1233"/>
   <unicode hex="10D1"/>
   <outline>
     <contour>
-      <point x="465" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="465" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="222" y="0"/>
       <point x="94" y="121"/>
-      <point x="94" y="366" type="curve" name="dh01" smooth="yes"/>
+      <point x="94" y="366" type="curve" smooth="yes" name="dh01"/>
       <point x="94" y="419"/>
       <point x="100" y="478"/>
       <point x="113" y="545" type="curve" smooth="yes"/>
@@ -17,33 +17,33 @@
       <point x="629" y="1194" type="line" smooth="yes"/>
       <point x="631" y="1205"/>
       <point x="632" y="1215"/>
-      <point x="632" y="1224" type="curve" name="dh05" smooth="yes"/>
+      <point x="632" y="1224" type="curve" smooth="yes" name="dh05"/>
       <point x="632" y="1312"/>
       <point x="547" y="1331"/>
       <point x="495" y="1342" type="curve" smooth="yes"/>
       <point x="428" y="1357"/>
       <point x="389" y="1395"/>
-      <point x="389" y="1487" type="curve" name="dh03" smooth="yes"/>
+      <point x="389" y="1487" type="curve" smooth="yes" name="dh03"/>
       <point x="389" y="1507"/>
       <point x="391" y="1531"/>
       <point x="396" y="1558" type="curve" name="sh01"/>
       <point x="577" y="1558" type="line"/>
       <point x="576" y="1551"/>
       <point x="575" y="1544"/>
-      <point x="575" y="1536" type="curve" name="dh04" smooth="yes"/>
+      <point x="575" y="1536" type="curve" smooth="yes" name="dh04"/>
       <point x="575" y="1489"/>
       <point x="610" y="1458"/>
       <point x="681" y="1442" type="curve"/>
       <point x="760" y="1411"/>
       <point x="802" y="1359"/>
-      <point x="802" y="1268" type="curve" name="dh06" smooth="yes"/>
+      <point x="802" y="1268" type="curve" smooth="yes" name="dh06"/>
       <point x="802" y="1248"/>
       <point x="800" y="1224"/>
       <point x="795" y="1200" type="curve" smooth="yes"/>
       <point x="767" y="1056" type="line"/>
       <point x="948" y="995"/>
       <point x="1044" y="868"/>
-      <point x="1044" y="688" type="curve" name="dh08" smooth="yes"/>
+      <point x="1044" y="688" type="curve" smooth="yes" name="dh08"/>
       <point x="1044" y="647"/>
       <point x="1039" y="592"/>
       <point x="1031" y="544" type="curve" smooth="yes"/>
@@ -51,13 +51,13 @@
       <point x="765" y="0"/>
     </contour>
     <contour>
-      <point x="494" y="145" type="curve" name="sv01" smooth="yes"/>
+      <point x="494" y="145" type="curve" smooth="yes" name="sv01"/>
       <point x="674" y="145"/>
       <point x="800" y="285"/>
       <point x="844" y="545" type="curve" smooth="yes"/>
       <point x="853" y="597"/>
       <point x="858" y="653"/>
-      <point x="858" y="692" type="curve" name="dh07" smooth="yes"/>
+      <point x="858" y="692" type="curve" smooth="yes" name="dh07"/>
       <point x="858" y="837"/>
       <point x="787" y="916"/>
       <point x="643" y="916" type="curve" smooth="yes"/>
@@ -66,7 +66,7 @@
       <point x="300" y="550" type="curve" smooth="yes"/>
       <point x="289" y="493"/>
       <point x="283" y="437"/>
-      <point x="283" y="390" type="curve" name="dh02" smooth="yes"/>
+      <point x="283" y="390" type="curve" smooth="yes" name="dh02"/>
       <point x="283" y="227"/>
       <point x="357" y="145"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10D_2.glif b/source/Hack-Italic.ufo/glyphs/uni10D_2.glif
index 78f311367..127d8c129 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10D_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10D_2.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D2" format="1">
+<glyph name="uni10D2" format="2">
   <advance width="1233"/>
   <unicode hex="10D2"/>
   <outline>
     <contour>
-      <point x="470" y="-425" type="curve" name="dv01" smooth="yes"/>
+      <point x="470" y="-425" type="curve" smooth="yes" name="dv01"/>
       <point x="189" y="-425"/>
       <point x="44" y="-312"/>
-      <point x="44" y="-87" type="curve" name="dh01" smooth="yes"/>
+      <point x="44" y="-87" type="curve" smooth="yes" name="dh01"/>
       <point x="44" y="-46"/>
       <point x="49" y="-4"/>
       <point x="58" y="43" type="curve" smooth="yes"/>
@@ -19,10 +19,10 @@
       <point x="849" y="761" type="curve" smooth="yes"/>
       <point x="851" y="772"/>
       <point x="852" y="782"/>
-      <point x="852" y="791" type="curve" name="sh01" smooth="yes"/>
+      <point x="852" y="791" type="curve" smooth="yes" name="sh01"/>
       <point x="852" y="867"/>
       <point x="788" y="903"/>
-      <point x="669" y="903" type="curve" name="dv03" smooth="yes"/>
+      <point x="669" y="903" type="curve" smooth="yes" name="dv03"/>
       <point x="537" y="903"/>
       <point x="471" y="857"/>
       <point x="454" y="764" type="curve" smooth="yes"/>
@@ -41,10 +41,10 @@
       <point x="289" y="780" type="curve" smooth="yes"/>
       <point x="320" y="955"/>
       <point x="452" y="1045"/>
-      <point x="699" y="1045" type="curve" name="hr01" smooth="yes"/>
+      <point x="699" y="1045" type="curve" smooth="yes" name="hr01"/>
       <point x="922" y="1045"/>
       <point x="1036" y="971"/>
-      <point x="1036" y="822" type="curve" name="ih01" smooth="yes"/>
+      <point x="1036" y="822" type="curve" smooth="yes" name="ih01"/>
       <point x="1036" y="802"/>
       <point x="1034" y="777"/>
       <point x="1029" y="752" type="curve" smooth="yes"/>
@@ -54,7 +54,7 @@
       <point x="855" y="484" type="line" name="sh02"/>
       <point x="1011" y="424"/>
       <point x="1081" y="307"/>
-      <point x="1081" y="167" type="curve" name="dh04" smooth="yes"/>
+      <point x="1081" y="167" type="curve" smooth="yes" name="dh04"/>
       <point x="1081" y="134"/>
       <point x="1077" y="86"/>
       <point x="1070" y="43" type="curve" smooth="yes"/>
@@ -68,19 +68,19 @@
       <point x="891" y="43" type="curve" smooth="yes"/>
       <point x="898" y="78"/>
       <point x="901" y="112"/>
-      <point x="901" y="135" type="curve" name="dh03" smooth="yes"/>
+      <point x="901" y="135" type="curve" smooth="yes" name="dh03"/>
       <point x="901" y="283"/>
       <point x="769" y="367"/>
-      <point x="622" y="367" type="curve" name="dv04" smooth="yes"/>
+      <point x="622" y="367" type="curve" smooth="yes" name="dv04"/>
       <point x="463" y="367"/>
       <point x="283" y="268"/>
       <point x="237" y="43" type="curve" smooth="yes"/>
       <point x="230" y="10"/>
       <point x="227" y="-21"/>
-      <point x="227" y="-50" type="curve" name="dh02" smooth="yes"/>
+      <point x="227" y="-50" type="curve" smooth="yes" name="dh02"/>
       <point x="227" y="-201"/>
       <point x="318" y="-276"/>
-      <point x="499" y="-276" type="curve" name="dv02" smooth="yes"/>
+      <point x="499" y="-276" type="curve" smooth="yes" name="dv02"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10D_3.glif b/source/Hack-Italic.ufo/glyphs/uni10D_3.glif
index f9df702ab..761b391d6 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10D_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10D_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D3" format="1">
+<glyph name="uni10D3" format="2">
   <advance width="1233"/>
   <unicode hex="10D3"/>
   <outline>
@@ -21,7 +21,7 @@
       <point x="256" y="-152" type="line"/>
       <point x="142" y="-17"/>
       <point x="85" y="149"/>
-      <point x="85" y="346" type="curve" name="dh01" smooth="yes"/>
+      <point x="85" y="346" type="curve" smooth="yes" name="dh01"/>
       <point x="85" y="420"/>
       <point x="93" y="499"/>
       <point x="109" y="582" type="curve" smooth="yes"/>
@@ -35,20 +35,20 @@
       <point x="713" y="937" type="line"/>
       <point x="766" y="1002"/>
       <point x="849" y="1035"/>
-      <point x="961" y="1035" type="curve" name="sv01" smooth="yes"/>
+      <point x="961" y="1035" type="curve" smooth="yes" name="sv01"/>
       <point x="1152" y="1035"/>
       <point x="1247" y="936"/>
-      <point x="1247" y="739" type="curve" name="dh06" smooth="yes"/>
+      <point x="1247" y="739" type="curve" smooth="yes" name="dh06"/>
       <point x="1247" y="684"/>
       <point x="1240" y="622"/>
       <point x="1229" y="566" type="curve" smooth="yes"/>
       <point x="1225" y="546" type="line" smooth="yes"/>
       <point x="1157" y="209"/>
       <point x="1015" y="40"/>
-      <point x="783" y="40" type="curve" name="dv03" smooth="yes"/>
+      <point x="783" y="40" type="curve" smooth="yes" name="dv03"/>
       <point x="606" y="40"/>
       <point x="517" y="143"/>
-      <point x="517" y="350" type="curve" name="dh03" smooth="yes"/>
+      <point x="517" y="350" type="curve" smooth="yes" name="dh03"/>
       <point x="517" y="413"/>
       <point x="525" y="486"/>
       <point x="541" y="567" type="curve" smooth="yes"/>
@@ -58,7 +58,7 @@
       <point x="590" y="833" type="curve" smooth="yes"/>
       <point x="590" y="874"/>
       <point x="570" y="894"/>
-      <point x="531" y="894" type="curve" name="dv01" smooth="yes"/>
+      <point x="531" y="894" type="curve" smooth="yes" name="dv01"/>
       <point x="488" y="894" type="line" smooth="yes"/>
       <point x="402" y="894"/>
       <point x="339" y="789"/>
@@ -66,7 +66,7 @@
       <point x="277" y="469" type="line" smooth="yes"/>
       <point x="264" y="404"/>
       <point x="258" y="345"/>
-      <point x="258" y="292" type="curve" name="dh02" smooth="yes"/>
+      <point x="258" y="292" type="curve" smooth="yes" name="dh02"/>
       <point x="258" y="23"/>
       <point x="415" y="-59"/>
       <point x="517" y="-110" type="curve" smooth="yes"/>
@@ -75,17 +75,17 @@
       <point x="840" y="-424" type="curve" name="ih02"/>
     </contour>
     <contour>
-      <point x="808" y="185" type="curve" name="dv04" smooth="yes"/>
+      <point x="808" y="185" type="curve" smooth="yes" name="dv04"/>
       <point x="915" y="185"/>
       <point x="980" y="262"/>
       <point x="1015" y="441" type="curve" smooth="yes"/>
       <point x="1057" y="653" type="line" smooth="yes"/>
       <point x="1064" y="684"/>
       <point x="1068" y="725"/>
-      <point x="1068" y="757" type="curve" name="dh05" smooth="yes"/>
+      <point x="1068" y="757" type="curve" smooth="yes" name="dh05"/>
       <point x="1068" y="848"/>
       <point x="1030" y="894"/>
-      <point x="954" y="894" type="curve" name="sv02" smooth="yes"/>
+      <point x="954" y="894" type="curve" smooth="yes" name="sv02"/>
       <point x="883" y="894" type="line" smooth="yes"/>
       <point x="802" y="894"/>
       <point x="752" y="832"/>
@@ -93,7 +93,7 @@
       <point x="681" y="465" type="line" smooth="yes"/>
       <point x="673" y="423"/>
       <point x="669" y="386"/>
-      <point x="669" y="354" type="curve" name="dh04" smooth="yes"/>
+      <point x="669" y="354" type="curve" smooth="yes" name="dh04"/>
       <point x="669" y="241"/>
       <point x="719" y="185"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10D_4.glif b/source/Hack-Italic.ufo/glyphs/uni10D_4.glif
index 6479435c5..3bd60b76e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10D_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10D_4.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D4" format="1">
+<glyph name="uni10D4" format="2">
   <advance width="1233"/>
   <unicode hex="10D4"/>
   <outline>
     <contour>
-      <point x="486" y="-425" type="curve" name="hr00" smooth="yes"/>
+      <point x="486" y="-425" type="curve" smooth="yes" name="hr00"/>
       <point x="223" y="-425"/>
       <point x="84" y="-328"/>
-      <point x="84" y="-133" type="curve" name="dh01" smooth="yes"/>
+      <point x="84" y="-133" type="curve" smooth="yes" name="dh01"/>
       <point x="84" y="-100"/>
       <point x="88" y="-58"/>
       <point x="95" y="-23" type="curve" smooth="yes"/>
@@ -20,33 +20,33 @@
       <point x="280" y="-22" type="curve" smooth="yes"/>
       <point x="275" y="-49"/>
       <point x="273" y="-72"/>
-      <point x="273" y="-92" type="curve" name="dh02" smooth="yes"/>
+      <point x="273" y="-92" type="curve" smooth="yes" name="dh02"/>
       <point x="273" y="-221"/>
       <point x="357" y="-283"/>
-      <point x="518" y="-283" type="curve" name="dv01" smooth="yes"/>
+      <point x="518" y="-283" type="curve" smooth="yes" name="dv01"/>
       <point x="701" y="-283"/>
       <point x="800" y="-203"/>
       <point x="831" y="-42" type="curve" smooth="yes"/>
       <point x="962" y="634" type="line" smooth="yes"/>
       <point x="968" y="667"/>
       <point x="971" y="696"/>
-      <point x="971" y="722" type="curve" name="dh05" smooth="yes"/>
+      <point x="971" y="722" type="curve" smooth="yes" name="dh05"/>
       <point x="971" y="846"/>
       <point x="907" y="903"/>
-      <point x="772" y="903" type="curve" name="dv02" smooth="yes"/>
+      <point x="772" y="903" type="curve" smooth="yes" name="dv02"/>
       <point x="620" y="903"/>
       <point x="526" y="830"/>
       <point x="497" y="681" type="curve" smooth="yes"/>
       <point x="492" y="656"/>
       <point x="490" y="631"/>
-      <point x="490" y="608" type="curve" name="dh04" smooth="yes"/>
+      <point x="490" y="608" type="curve" smooth="yes" name="dh04"/>
       <point x="490" y="559"/>
       <point x="499" y="513"/>
       <point x="518" y="469" type="curve" name="ih02"/>
       <point x="342" y="468" type="line"/>
       <point x="325" y="499"/>
       <point x="316" y="538"/>
-      <point x="316" y="578" type="curve" name="dh03" smooth="yes"/>
+      <point x="316" y="578" type="curve" smooth="yes" name="dh03"/>
       <point x="316" y="601"/>
       <point x="318" y="640"/>
       <point x="325" y="676" type="curve" smooth="yes"/>
@@ -56,7 +56,7 @@
       <point x="804" y="1045" type="line"/>
       <point x="1035" y="1045"/>
       <point x="1150" y="948"/>
-      <point x="1150" y="755" type="curve" name="dh06" smooth="yes"/>
+      <point x="1150" y="755" type="curve" smooth="yes" name="dh06"/>
       <point x="1150" y="715"/>
       <point x="1145" y="670"/>
       <point x="1138" y="633" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10D_5.glif b/source/Hack-Italic.ufo/glyphs/uni10D_5.glif
index d781ebae0..0ed929dd6 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10D_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10D_5.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D5" format="1">
+<glyph name="uni10D5" format="2">
   <advance width="1233"/>
   <unicode hex="10D5"/>
   <outline>
     <contour>
-      <point x="475" y="-425" type="curve" name="dv01" smooth="yes"/>
+      <point x="475" y="-425" type="curve" smooth="yes" name="dv01"/>
       <point x="214" y="-425"/>
       <point x="83" y="-326"/>
-      <point x="83" y="-128" type="curve" name="dh01" smooth="yes"/>
+      <point x="83" y="-128" type="curve" smooth="yes" name="dh01"/>
       <point x="83" y="-95"/>
       <point x="87" y="-58"/>
       <point x="94" y="-17" type="curve"/>
@@ -20,54 +20,54 @@
       <point x="281" y="-17" type="curve" smooth="yes"/>
       <point x="277" y="-36"/>
       <point x="273" y="-72"/>
-      <point x="273" y="-100" type="curve" name="dh02" smooth="yes"/>
+      <point x="273" y="-100" type="curve" smooth="yes" name="dh02"/>
       <point x="273" y="-223"/>
       <point x="347" y="-283"/>
-      <point x="506" y="-283" type="curve" name="hr01" smooth="yes"/>
+      <point x="506" y="-283" type="curve" smooth="yes" name="hr01"/>
       <point x="685" y="-283"/>
       <point x="790" y="-205"/>
       <point x="818" y="-60" type="curve" smooth="yes"/>
       <point x="837" y="38" type="line" smooth="yes"/>
       <point x="842" y="65"/>
       <point x="845" y="88"/>
-      <point x="845" y="112" type="curve" name="dh03" smooth="yes"/>
+      <point x="845" y="112" type="curve" smooth="yes" name="dh03"/>
       <point x="845" y="225"/>
       <point x="779" y="281"/>
-      <point x="647" y="281" type="curve" name="dv04" smooth="yes"/>
+      <point x="647" y="281" type="curve" smooth="yes" name="dv04"/>
       <point x="574" y="281" type="line"/>
       <point x="602" y="421" type="line"/>
-      <point x="676" y="421" type="line" name="dv05" smooth="yes"/>
+      <point x="676" y="421" type="line" smooth="yes" name="dv05"/>
       <point x="829" y="421"/>
       <point x="919" y="504"/>
       <point x="948" y="660" type="curve" smooth="yes"/>
       <point x="953" y="688"/>
       <point x="956" y="712"/>
-      <point x="956" y="737" type="curve" name="ih02" smooth="yes"/>
+      <point x="956" y="737" type="curve" smooth="yes" name="ih02"/>
       <point x="956" y="853"/>
       <point x="894" y="903"/>
-      <point x="758" y="903" type="curve" name="dv02" smooth="yes"/>
+      <point x="758" y="903" type="curve" smooth="yes" name="dv02"/>
       <point x="603" y="903"/>
       <point x="497" y="836"/>
       <point x="470" y="701" type="curve" smooth="yes"/>
       <point x="465" y="676"/>
       <point x="463" y="649"/>
-      <point x="463" y="621" type="curve" name="sh01" smooth="yes"/>
+      <point x="463" y="621" type="curve" smooth="yes" name="sh01"/>
       <point x="463" y="581"/>
       <point x="467" y="540"/>
       <point x="476" y="493" type="curve" name="sh02"/>
       <point x="315" y="493" type="line"/>
       <point x="296" y="528"/>
       <point x="286" y="570"/>
-      <point x="286" y="617" type="curve" name="hr02" smooth="yes"/>
+      <point x="286" y="617" type="curve" smooth="yes" name="hr02"/>
       <point x="286" y="643"/>
       <point x="289" y="671"/>
       <point x="295" y="701" type="curve" smooth="yes"/>
       <point x="339" y="922"/>
       <point x="502" y="1045"/>
-      <point x="785" y="1045" type="curve" name="dv03" smooth="yes"/>
+      <point x="785" y="1045" type="curve" smooth="yes" name="dv03"/>
       <point x="1029" y="1045"/>
       <point x="1145" y="956"/>
-      <point x="1145" y="769" type="curve" name="sh03" smooth="yes"/>
+      <point x="1145" y="769" type="curve" smooth="yes" name="sh03"/>
       <point x="1145" y="734"/>
       <point x="1141" y="695"/>
       <point x="1133" y="656" type="curve" smooth="yes"/>
@@ -77,7 +77,7 @@
       <point x="842" y="335" type="line" name="sh04"/>
       <point x="967" y="312"/>
       <point x="1029" y="241"/>
-      <point x="1029" y="120" type="curve" name="dh04" smooth="yes"/>
+      <point x="1029" y="120" type="curve" smooth="yes" name="dh04"/>
       <point x="1029" y="93"/>
       <point x="1026" y="65"/>
       <point x="1020" y="34" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10D_6.glif b/source/Hack-Italic.ufo/glyphs/uni10D_6.glif
index 87c704823..808e80593 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10D_6.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10D_6.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D6" format="1">
+<glyph name="uni10D6" format="2">
   <advance width="1233"/>
   <unicode hex="10D6"/>
   <outline>
     <contour>
-      <point x="460" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="460" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="212" y="0"/>
       <point x="88" y="114"/>
-      <point x="88" y="342" type="curve" name="dh01" smooth="yes"/>
+      <point x="88" y="342" type="curve" smooth="yes" name="dh01"/>
       <point x="88" y="393"/>
       <point x="94" y="445"/>
       <point x="105" y="505" type="curve" smooth="yes"/>
@@ -17,26 +17,26 @@
       <point x="387" y="928" type="line" name="sh02"/>
       <point x="283" y="959"/>
       <point x="236" y="1035"/>
-      <point x="236" y="1127" type="curve" name="ih01" smooth="yes"/>
+      <point x="236" y="1127" type="curve" smooth="yes" name="ih01"/>
       <point x="236" y="1150"/>
       <point x="239" y="1188"/>
       <point x="244" y="1219" type="curve" smooth="yes"/>
       <point x="279" y="1440"/>
       <point x="428" y="1556"/>
-      <point x="655" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="655" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="842" y="1556"/>
       <point x="939" y="1479"/>
-      <point x="939" y="1326" type="curve" name="dh04" smooth="yes"/>
+      <point x="939" y="1326" type="curve" smooth="yes" name="dh04"/>
       <point x="939" y="1299"/>
       <point x="936" y="1266"/>
-      <point x="929" y="1233" type="curve" name="hr01" smooth="yes"/>
+      <point x="929" y="1233" type="curve" smooth="yes" name="hr01"/>
       <point x="908" y="1130"/>
       <point x="861" y="1050"/>
       <point x="790" y="993" type="curve"/>
       <point x="786" y="973" type="line" name="sh03"/>
       <point x="951" y="950"/>
       <point x="1038" y="845"/>
-      <point x="1038" y="669" type="curve" name="sh04" smooth="yes"/>
+      <point x="1038" y="669" type="curve" smooth="yes" name="sh04"/>
       <point x="1038" y="622"/>
       <point x="1033" y="563"/>
       <point x="1022" y="504" type="curve" smooth="yes"/>
@@ -44,43 +44,43 @@
       <point x="768" y="0"/>
     </contour>
     <contour>
-      <point x="549" y="983" type="curve" name="dv02" smooth="yes"/>
+      <point x="549" y="983" type="curve" smooth="yes" name="dv02"/>
       <point x="673" y="983"/>
       <point x="739" y="1061"/>
       <point x="766" y="1201" type="curve" smooth="yes"/>
       <point x="771" y="1228"/>
       <point x="774" y="1251"/>
-      <point x="774" y="1272" type="curve" name="dh03" smooth="yes"/>
+      <point x="774" y="1272" type="curve" smooth="yes" name="dh03"/>
       <point x="774" y="1367"/>
       <point x="717" y="1416"/>
-      <point x="621" y="1416" type="curve" name="hr02" smooth="yes"/>
+      <point x="621" y="1416" type="curve" smooth="yes" name="hr02"/>
       <point x="501" y="1416"/>
       <point x="435" y="1341"/>
       <point x="408" y="1202" type="curve" smooth="yes"/>
       <point x="403" y="1173"/>
       <point x="400" y="1148"/>
-      <point x="400" y="1127" type="curve" name="sh01" smooth="yes"/>
+      <point x="400" y="1127" type="curve" smooth="yes" name="sh01"/>
       <point x="400" y="1031"/>
       <point x="453" y="983"/>
     </contour>
     <contour>
-      <point x="494" y="145" type="curve" name="sv01" smooth="yes"/>
+      <point x="494" y="145" type="curve" smooth="yes" name="sv01"/>
       <point x="684" y="145"/>
       <point x="795" y="282"/>
-      <point x="837" y="508" type="curve" name="hr03" smooth="yes"/>
+      <point x="837" y="508" type="curve" smooth="yes" name="hr03"/>
       <point x="846" y="559"/>
       <point x="851" y="601"/>
-      <point x="851" y="641" type="curve" name="ih02" smooth="yes"/>
+      <point x="851" y="641" type="curve" smooth="yes" name="ih02"/>
       <point x="851" y="796"/>
       <point x="779" y="874"/>
       <point x="634" y="874" type="curve" smooth="yes"/>
-      <point x="631" y="874" type="line" name="dv01" smooth="yes"/>
+      <point x="631" y="874" type="line" smooth="yes" name="dv01"/>
       <point x="458" y="874"/>
       <point x="335" y="745"/>
       <point x="292" y="505" type="curve" smooth="yes"/>
       <point x="283" y="454"/>
       <point x="278" y="401"/>
-      <point x="278" y="364" type="curve" name="dh02" smooth="yes"/>
+      <point x="278" y="364" type="curve" smooth="yes" name="dh02"/>
       <point x="278" y="223"/>
       <point x="350" y="145"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10D_7.glif b/source/Hack-Italic.ufo/glyphs/uni10D_7.glif
index b065377f2..6286d9f7a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10D_7.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10D_7.glif
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D7" format="1">
+<glyph name="uni10D7" format="2">
   <advance width="1233"/>
   <unicode hex="10D7"/>
   <outline>
     <contour>
-      <point x="320" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="320" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="139" y="0"/>
       <point x="34" y="108"/>
-      <point x="34" y="321" type="curve" name="sh01" smooth="yes"/>
+      <point x="34" y="321" type="curve" smooth="yes" name="sh01"/>
       <point x="34" y="377"/>
       <point x="40" y="448"/>
       <point x="55" y="519" type="curve" smooth="yes"/>
       <point x="61" y="549" type="line" smooth="yes"/>
       <point x="125" y="872"/>
       <point x="281" y="1035"/>
-      <point x="529" y="1035" type="curve" name="sv01" smooth="yes"/>
+      <point x="529" y="1035" type="curve" smooth="yes" name="sv01"/>
       <point x="633" y="1035"/>
       <point x="697" y="1007"/>
       <point x="734" y="936" type="curve"/>
       <point x="748" y="936" type="line"/>
       <point x="817" y="1008"/>
       <point x="880" y="1035"/>
-      <point x="967" y="1035" type="curve" name="dv02" smooth="yes"/>
+      <point x="967" y="1035" type="curve" smooth="yes" name="dv02"/>
       <point x="1124" y="1035"/>
       <point x="1210" y="944"/>
-      <point x="1210" y="757" type="curve" name="sh02" smooth="yes"/>
+      <point x="1210" y="757" type="curve" smooth="yes" name="sh02"/>
       <point x="1210" y="708"/>
       <point x="1204" y="649"/>
       <point x="1191" y="584" type="curve" smooth="yes"/>
@@ -39,10 +39,10 @@
       <point x="1008" y="613" type="line" smooth="yes"/>
       <point x="1019" y="669"/>
       <point x="1024" y="714"/>
-      <point x="1024" y="753" type="curve" name="ah01" smooth="yes"/>
+      <point x="1024" y="753" type="curve" smooth="yes" name="ah01"/>
       <point x="1024" y="847"/>
       <point x="993" y="894"/>
-      <point x="930" y="894" type="curve" name="dv01" smooth="yes"/>
+      <point x="930" y="894" type="curve" smooth="yes" name="dv01"/>
       <point x="897" y="894" type="line" smooth="yes"/>
       <point x="842" y="894"/>
       <point x="803" y="833"/>
@@ -52,7 +52,7 @@
       <point x="537" y="0"/>
     </contour>
     <contour>
-      <point x="342" y="145" type="curve" name="sv02" smooth="yes"/>
+      <point x="342" y="145" type="curve" smooth="yes" name="sv02"/>
       <point x="450" y="145"/>
       <point x="523" y="220"/>
       <point x="555" y="388" type="curve" smooth="yes"/>
@@ -68,10 +68,10 @@
       <point x="378" y="893"/>
       <point x="300" y="802"/>
       <point x="265" y="621" type="curve" smooth="yes"/>
-      <point x="228" y="432" type="line" name="sh04" smooth="yes"/>
+      <point x="228" y="432" type="line" smooth="yes" name="sh04"/>
       <point x="219" y="383"/>
       <point x="214" y="340"/>
-      <point x="214" y="302" type="curve" name="sh03" smooth="yes"/>
+      <point x="214" y="302" type="curve" smooth="yes" name="sh03"/>
       <point x="214" y="197"/>
       <point x="257" y="145"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10D_8.glif b/source/Hack-Italic.ufo/glyphs/uni10D_8.glif
index 4a03af85e..ac3868516 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10D_8.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10D_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D8" format="1">
+<glyph name="uni10D8" format="2">
   <advance width="1233"/>
   <unicode hex="10D8"/>
   <outline>
@@ -7,16 +7,16 @@
       <point x="294" y="0" type="line" name="hr00"/>
       <point x="197" y="103"/>
       <point x="148" y="230"/>
-      <point x="148" y="383" type="curve" name="sh01" smooth="yes"/>
+      <point x="148" y="383" type="curve" smooth="yes" name="sh01"/>
       <point x="148" y="436"/>
       <point x="154" y="493"/>
       <point x="166" y="553" type="curve" smooth="yes"/>
       <point x="231" y="885"/>
       <point x="418" y="1045"/>
-      <point x="721" y="1045" type="curve" name="dv02" smooth="yes"/>
+      <point x="721" y="1045" type="curve" smooth="yes" name="dv02"/>
       <point x="974" y="1045"/>
       <point x="1096" y="935"/>
-      <point x="1096" y="711" type="curve" name="sh02" smooth="yes"/>
+      <point x="1096" y="711" type="curve" smooth="yes" name="sh02"/>
       <point x="1096" y="660"/>
       <point x="1090" y="606"/>
       <point x="1079" y="547" type="curve" smooth="yes"/>
@@ -26,19 +26,19 @@
       <point x="586" y="0" type="line" name="ih01"/>
       <point x="755" y="175"/>
       <point x="857" y="356"/>
-      <point x="893" y="547" type="curve" name="sh03" smooth="yes"/>
+      <point x="893" y="547" type="curve" smooth="yes" name="sh03"/>
       <point x="901" y="590"/>
       <point x="907" y="638"/>
-      <point x="907" y="682" type="curve" name="ah01" smooth="yes"/>
+      <point x="907" y="682" type="curve" smooth="yes" name="ah01"/>
       <point x="907" y="830"/>
       <point x="840" y="902"/>
-      <point x="697" y="902" type="curve" name="dv01" smooth="yes"/>
+      <point x="697" y="902" type="curve" smooth="yes" name="dv01"/>
       <point x="507" y="902"/>
       <point x="394" y="769"/>
       <point x="351" y="551" type="curve" smooth="yes"/>
       <point x="341" y="499"/>
       <point x="336" y="447"/>
-      <point x="336" y="396" type="curve" name="sh04" smooth="yes"/>
+      <point x="336" y="396" type="curve" smooth="yes" name="sh04"/>
       <point x="336" y="261"/>
       <point x="371" y="129"/>
       <point x="442" y="0" type="curve" name="ih02"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10D_9.glif b/source/Hack-Italic.ufo/glyphs/uni10D_9.glif
index 3ce9b05e7..470534195 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10D_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10D_9.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D9" format="1">
+<glyph name="uni10D9" format="2">
   <advance width="1233"/>
   <unicode hex="10D9"/>
   <outline>
     <contour>
-      <point x="485" y="-423" type="curve" name="dv01" smooth="yes"/>
+      <point x="485" y="-423" type="curve" smooth="yes" name="dv01"/>
       <point x="221" y="-423"/>
       <point x="87" y="-320"/>
-      <point x="87" y="-119" type="curve" name="dh01" smooth="yes"/>
+      <point x="87" y="-119" type="curve" smooth="yes" name="dh01"/>
       <point x="87" y="-84"/>
       <point x="91" y="-39"/>
       <point x="99" y="0" type="curve" smooth="yes"/>
@@ -20,36 +20,36 @@
       <point x="286" y="0" type="curve" smooth="yes"/>
       <point x="282" y="-21"/>
       <point x="278" y="-57"/>
-      <point x="278" y="-86" type="curve" name="dh02" smooth="yes"/>
+      <point x="278" y="-86" type="curve" smooth="yes" name="dh02"/>
       <point x="278" y="-217"/>
       <point x="360" y="-282"/>
-      <point x="513" y="-282" type="curve" name="hr01" smooth="yes"/>
+      <point x="513" y="-282" type="curve" smooth="yes" name="hr01"/>
       <point x="682" y="-282"/>
       <point x="793" y="-202"/>
       <point x="824" y="-30" type="curve" smooth="yes"/>
       <point x="833" y="20" type="line" smooth="yes"/>
       <point x="840" y="52"/>
       <point x="843" y="75"/>
-      <point x="843" y="106" type="curve" name="dh03" smooth="yes"/>
+      <point x="843" y="106" type="curve" smooth="yes" name="dh03"/>
       <point x="843" y="231"/>
       <point x="781" y="292"/>
-      <point x="648" y="292" type="curve" name="dv04" smooth="yes"/>
+      <point x="648" y="292" type="curve" smooth="yes" name="dv04"/>
       <point x="583" y="292" type="line"/>
       <point x="613" y="444" type="line"/>
-      <point x="678" y="444" type="line" name="dv05" smooth="yes"/>
+      <point x="678" y="444" type="line" smooth="yes" name="dv05"/>
       <point x="827" y="444"/>
       <point x="919" y="507"/>
       <point x="944" y="642" type="curve" smooth="yes"/>
       <point x="947" y="657"/>
       <point x="948" y="672"/>
-      <point x="948" y="683" type="curve" name="hr02" smooth="yes"/>
+      <point x="948" y="683" type="curve" smooth="yes" name="hr02"/>
       <point x="948" y="810"/>
       <point x="826" y="872"/>
       <point x="567" y="872" type="curve" name="dv02"/>
       <point x="597" y="1026" type="line" name="dv03"/>
       <point x="954" y="1026"/>
       <point x="1132" y="926"/>
-      <point x="1132" y="725" type="curve" name="sh01" smooth="yes"/>
+      <point x="1132" y="725" type="curve" smooth="yes" name="sh01"/>
       <point x="1132" y="698"/>
       <point x="1129" y="669"/>
       <point x="1124" y="642" type="curve" smooth="yes"/>
@@ -59,7 +59,7 @@
       <point x="804" y="365" type="line"/>
       <point x="964" y="336"/>
       <point x="1031" y="250"/>
-      <point x="1031" y="110" type="curve" name="dh04" smooth="yes"/>
+      <point x="1031" y="110" type="curve" smooth="yes" name="dh04"/>
       <point x="1031" y="75"/>
       <point x="1028" y="52"/>
       <point x="1021" y="20" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10D_A_.glif b/source/Hack-Italic.ufo/glyphs/uni10D_A_.glif
index 215603c0b..2786bd611 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10D_A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10D_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10DA" format="1">
+<glyph name="uni10DA" format="2">
   <advance width="1233"/>
   <unicode hex="10DA"/>
   <outline>
@@ -18,16 +18,16 @@
       <point x="337" y="-61" type="line"/>
       <point x="241" y="65"/>
       <point x="193" y="213"/>
-      <point x="193" y="382" type="curve" name="dh01" smooth="yes"/>
+      <point x="193" y="382" type="curve" smooth="yes" name="dh01"/>
       <point x="193" y="450"/>
       <point x="201" y="522"/>
       <point x="214" y="586" type="curve" smooth="yes"/>
       <point x="275" y="891"/>
       <point x="451" y="1045"/>
-      <point x="762" y="1045" type="curve" name="dv02" smooth="yes"/>
+      <point x="762" y="1045" type="curve" smooth="yes" name="dv02"/>
       <point x="1023" y="1045"/>
       <point x="1141" y="936"/>
-      <point x="1141" y="703" type="curve" name="dh05" smooth="yes"/>
+      <point x="1141" y="703" type="curve" smooth="yes" name="dh05"/>
       <point x="1141" y="526"/>
       <point x="1072" y="439"/>
       <point x="1030" y="383" type="curve" smooth="yes"/>
@@ -43,22 +43,22 @@
       <point x="941" y="577" type="curve" smooth="yes"/>
       <point x="949" y="618"/>
       <point x="953" y="655"/>
-      <point x="953" y="690" type="curve" name="dh04" smooth="yes"/>
+      <point x="953" y="690" type="curve" smooth="yes" name="dh04"/>
       <point x="953" y="833"/>
       <point x="880" y="904"/>
-      <point x="733" y="904" type="curve" name="dv01" smooth="yes"/>
+      <point x="733" y="904" type="curve" smooth="yes" name="dv01"/>
       <point x="550" y="904"/>
       <point x="442" y="801"/>
       <point x="398" y="581" type="curve" smooth="yes"/>
       <point x="386" y="521"/>
       <point x="378" y="450"/>
-      <point x="378" y="383" type="curve" name="dh02" smooth="yes"/>
+      <point x="378" y="383" type="curve" smooth="yes" name="dh02"/>
       <point x="378" y="177"/>
       <point x="456" y="39"/>
       <point x="595" y="-92" type="curve"/>
       <point x="700" y="-194"/>
       <point x="811" y="-298"/>
-      <point x="811" y="-402" type="curve" name="dh03" smooth="yes"/>
+      <point x="811" y="-402" type="curve" smooth="yes" name="dh03"/>
       <point x="811" y="-413"/>
       <point x="810" y="-418"/>
       <point x="809" y="-425" type="curve" name="av01"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10D_B_.glif b/source/Hack-Italic.ufo/glyphs/uni10D_B_.glif
index c06973bcd..8566ca615 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10D_B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10D_B_.glif
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10DB" format="1">
+<glyph name="uni10DB" format="2">
   <advance width="1233"/>
   <unicode hex="10DB"/>
   <outline>
     <contour>
-      <point x="480" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="480" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="221" y="0"/>
       <point x="91" y="121"/>
-      <point x="91" y="349" type="curve" name="sh01" smooth="yes"/>
+      <point x="91" y="349" type="curve" smooth="yes" name="sh01"/>
       <point x="91" y="398"/>
       <point x="97" y="462"/>
       <point x="108" y="525" type="curve" smooth="yes"/>
       <point x="169" y="872"/>
       <point x="377" y="1046"/>
-      <point x="664" y="1046" type="curve" name="dv02" smooth="yes"/>
+      <point x="664" y="1046" type="curve" smooth="yes" name="dv02"/>
       <point x="804" y="1046"/>
       <point x="878" y="1005"/>
       <point x="909" y="921" type="curve"/>
       <point x="929" y="921" type="line"/>
-      <point x="979" y="1179" type="line" name="sh02" smooth="yes"/>
+      <point x="979" y="1179" type="line" smooth="yes" name="sh02"/>
       <point x="983" y="1201"/>
       <point x="985" y="1220"/>
-      <point x="985" y="1237" type="curve" name="ah01" smooth="yes"/>
+      <point x="985" y="1237" type="curve" smooth="yes" name="ah01"/>
       <point x="985" y="1357"/>
       <point x="863" y="1415"/>
-      <point x="739" y="1415" type="curve" name="sv01" smooth="yes"/>
+      <point x="739" y="1415" type="curve" smooth="yes" name="sv01"/>
       <point x="620" y="1415"/>
       <point x="498" y="1362"/>
       <point x="479" y="1263" type="curve" smooth="yes"/>
@@ -33,19 +33,19 @@
       <point x="292" y="1263" type="line" smooth="yes"/>
       <point x="331" y="1460"/>
       <point x="488" y="1557"/>
-      <point x="765" y="1557" type="curve" name="at01" smooth="yes"/>
+      <point x="765" y="1557" type="curve" smooth="yes" name="at01"/>
       <point x="1031" y="1557"/>
       <point x="1164" y="1463"/>
-      <point x="1164" y="1276" type="curve" name="sh05" smooth="yes"/>
+      <point x="1164" y="1276" type="curve" smooth="yes" name="sh05"/>
       <point x="1164" y="1247"/>
       <point x="1161" y="1214"/>
-      <point x="1154" y="1179" type="curve" name="sh06" smooth="yes"/>
-      <point x="1021" y="495" type="line" name="hr01" smooth="yes"/>
+      <point x="1154" y="1179" type="curve" smooth="yes" name="sh06"/>
+      <point x="1021" y="495" type="line" smooth="yes" name="hr01"/>
       <point x="957" y="165"/>
       <point x="777" y="0"/>
     </contour>
     <contour>
-      <point x="506" y="145" type="curve" name="sv03" smooth="yes"/>
+      <point x="506" y="145" type="curve" smooth="yes" name="sv03"/>
       <point x="682" y="145"/>
       <point x="786" y="259"/>
       <point x="833" y="495" type="curve" smooth="yes"/>
@@ -54,13 +54,13 @@
       <point x="851" y="657" type="curve" smooth="yes"/>
       <point x="851" y="824"/>
       <point x="780" y="902"/>
-      <point x="641" y="902" type="curve" name="dv01" smooth="yes"/>
+      <point x="641" y="902" type="curve" smooth="yes" name="dv01"/>
       <point x="455" y="902"/>
       <point x="338" y="758"/>
       <point x="296" y="527" type="curve" smooth="yes"/>
       <point x="285" y="471"/>
       <point x="281" y="418"/>
-      <point x="281" y="379" type="curve" name="sh03" smooth="yes"/>
+      <point x="281" y="379" type="curve" smooth="yes" name="sh03"/>
       <point x="281" y="226"/>
       <point x="357" y="145"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10D_C_.glif b/source/Hack-Italic.ufo/glyphs/uni10D_C_.glif
index cda554fd1..0392c1e72 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10D_C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10D_C_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10DC" format="1">
+<glyph name="uni10DC" format="2">
   <advance width="1233"/>
   <unicode hex="10DC"/>
   <outline>
     <contour>
-      <point x="459" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="459" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="215" y="0"/>
       <point x="89" y="111"/>
-      <point x="89" y="336" type="curve" name="sh01" smooth="yes"/>
+      <point x="89" y="336" type="curve" smooth="yes" name="sh01"/>
       <point x="89" y="381"/>
       <point x="94" y="433"/>
       <point x="105" y="490" type="curve" smooth="yes"/>
@@ -25,10 +25,10 @@
       <point x="395" y="918" type="line"/>
       <point x="448" y="993"/>
       <point x="580" y="1049"/>
-      <point x="712" y="1049" type="curve" name="dv04" smooth="yes"/>
+      <point x="712" y="1049" type="curve" smooth="yes" name="dv04"/>
       <point x="881" y="1049"/>
       <point x="1048" y="958"/>
-      <point x="1048" y="701" type="curve" name="sh02" smooth="yes"/>
+      <point x="1048" y="701" type="curve" smooth="yes" name="sh02"/>
       <point x="1048" y="656"/>
       <point x="1043" y="605"/>
       <point x="1032" y="548" type="curve" smooth="yes"/>
@@ -36,22 +36,22 @@
       <point x="772" y="0"/>
     </contour>
     <contour>
-      <point x="492" y="146" type="line" name="sv02" smooth="yes"/>
+      <point x="492" y="146" type="line" smooth="yes" name="sv02"/>
       <point x="669" y="146"/>
       <point x="802" y="284"/>
-      <point x="847" y="545" type="curve" name="sh03" smooth="yes"/>
+      <point x="847" y="545" type="curve" smooth="yes" name="sh03"/>
       <point x="855" y="593"/>
       <point x="860" y="645"/>
-      <point x="860" y="682" type="curve" name="ah01" smooth="yes"/>
+      <point x="860" y="682" type="curve" smooth="yes" name="ah01"/>
       <point x="860" y="826"/>
       <point x="785" y="904"/>
-      <point x="640" y="904" type="curve" name="dv03" smooth="yes"/>
+      <point x="640" y="904" type="curve" smooth="yes" name="dv03"/>
       <point x="455" y="904"/>
       <point x="338" y="778"/>
       <point x="291" y="525" type="curve" smooth="yes"/>
       <point x="281" y="471"/>
       <point x="276" y="423"/>
-      <point x="276" y="381" type="curve" name="sh04" smooth="yes"/>
+      <point x="276" y="381" type="curve" smooth="yes" name="sh04"/>
       <point x="276" y="224"/>
       <point x="347" y="146"/>
       <point x="489" y="146" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10D_D_.glif b/source/Hack-Italic.ufo/glyphs/uni10D_D_.glif
index 3c67f40a6..721ff0a6b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10D_D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10D_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10DD" format="1">
+<glyph name="uni10DD" format="2">
   <advance width="1233"/>
   <unicode hex="10DD"/>
   <outline>
@@ -7,24 +7,24 @@
       <point x="153" y="0" type="line" name="hr00"/>
       <point x="74" y="117"/>
       <point x="34" y="235"/>
-      <point x="34" y="356" type="curve" name="sh01" smooth="yes"/>
+      <point x="34" y="356" type="curve" smooth="yes" name="sh01"/>
       <point x="34" y="389"/>
       <point x="37" y="425"/>
-      <point x="44" y="461" type="curve" name="sh02" smooth="yes"/>
+      <point x="44" y="461" type="curve" smooth="yes" name="sh02"/>
       <point x="64" y="563" type="line" smooth="yes"/>
       <point x="124" y="871"/>
       <point x="282" y="1035"/>
-      <point x="518" y="1035" type="curve" name="sv01" smooth="yes"/>
+      <point x="518" y="1035" type="curve" smooth="yes" name="sv01"/>
       <point x="599" y="1035"/>
       <point x="645" y="1014"/>
       <point x="691" y="931" type="curve"/>
       <point x="708" y="931" type="line"/>
       <point x="780" y="1011"/>
       <point x="828" y="1035"/>
-      <point x="915" y="1035" type="curve" name="dv02" smooth="yes"/>
+      <point x="915" y="1035" type="curve" smooth="yes" name="dv02"/>
       <point x="1094" y="1035"/>
       <point x="1204" y="932"/>
-      <point x="1204" y="724" type="curve" name="sh03" smooth="yes"/>
+      <point x="1204" y="724" type="curve" smooth="yes" name="sh03"/>
       <point x="1204" y="672"/>
       <point x="1197" y="620"/>
       <point x="1186" y="561" type="curve" smooth="yes"/>
@@ -36,13 +36,13 @@
       <point x="854" y="127"/>
       <point x="940" y="260"/>
       <point x="967" y="399" type="curve" smooth="yes"/>
-      <point x="1022" y="680" type="line" name="sh04" smooth="yes"/>
+      <point x="1022" y="680" type="line" smooth="yes" name="sh04"/>
       <point x="1028" y="711"/>
       <point x="1031" y="738"/>
-      <point x="1031" y="762" type="curve" name="ah01" smooth="yes"/>
+      <point x="1031" y="762" type="curve" smooth="yes" name="ah01"/>
       <point x="1031" y="850"/>
       <point x="991" y="894"/>
-      <point x="912" y="894" type="curve" name="dv01" smooth="yes"/>
+      <point x="912" y="894" type="curve" smooth="yes" name="dv01"/>
       <point x="835" y="894" type="line" smooth="yes"/>
       <point x="792" y="894"/>
       <point x="758" y="825"/>
@@ -55,15 +55,15 @@
       <point x="586" y="813" type="curve" smooth="yes"/>
       <point x="586" y="867"/>
       <point x="572" y="894"/>
-      <point x="545" y="894" type="curve" name="sv02" smooth="yes"/>
+      <point x="545" y="894" type="curve" smooth="yes" name="sv02"/>
       <point x="468" y="894" type="line" smooth="yes"/>
       <point x="365" y="894"/>
       <point x="305" y="815"/>
       <point x="276" y="666" type="curve" smooth="yes"/>
-      <point x="225" y="406" type="line" name="sh06" smooth="yes"/>
+      <point x="225" y="406" type="line" smooth="yes" name="sh06"/>
       <point x="219" y="376"/>
       <point x="216" y="347"/>
-      <point x="216" y="318" type="curve" name="sh05" smooth="yes"/>
+      <point x="216" y="318" type="curve" smooth="yes" name="sh05"/>
       <point x="216" y="207"/>
       <point x="260" y="101"/>
       <point x="347" y="0" type="curve" name="ih02"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10D_E_.glif b/source/Hack-Italic.ufo/glyphs/uni10D_E_.glif
index c337e361e..daf116a79 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10D_E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10D_E_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10DE" format="1">
+<glyph name="uni10DE" format="2">
   <advance width="1233"/>
   <unicode hex="10DE"/>
   <outline>
     <contour>
-      <point x="464" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="464" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="220" y="0"/>
       <point x="81" y="104"/>
-      <point x="81" y="312" type="curve" name="dh01" smooth="yes"/>
+      <point x="81" y="312" type="curve" smooth="yes" name="dh01"/>
       <point x="81" y="347"/>
       <point x="85" y="390"/>
       <point x="94" y="434" type="curve" smooth="yes"/>
@@ -20,16 +20,16 @@
       <point x="279" y="435" type="curve" smooth="yes"/>
       <point x="272" y="402"/>
       <point x="269" y="374"/>
-      <point x="269" y="349" type="curve" name="hr01" smooth="yes"/>
+      <point x="269" y="349" type="curve" smooth="yes" name="hr01"/>
       <point x="269" y="212"/>
       <point x="354" y="145"/>
-      <point x="495" y="145" type="curve" name="sv01" smooth="yes"/>
+      <point x="495" y="145" type="curve" smooth="yes" name="sv01"/>
       <point x="674" y="145"/>
       <point x="793" y="253"/>
       <point x="830" y="474" type="curve" smooth="yes"/>
       <point x="837" y="515"/>
       <point x="841" y="563"/>
-      <point x="841" y="594" type="curve" name="dh02" smooth="yes"/>
+      <point x="841" y="594" type="curve" smooth="yes" name="dh02"/>
       <point x="841" y="730"/>
       <point x="767" y="804"/>
       <point x="618" y="804" type="curve" smooth="yes"/>
@@ -41,7 +41,7 @@
       <point x="918" y="1139" type="curve" smooth="yes"/>
       <point x="919" y="1148"/>
       <point x="920" y="1158"/>
-      <point x="920" y="1167" type="curve" name="ih01" smooth="yes"/>
+      <point x="920" y="1167" type="curve" smooth="yes" name="ih01"/>
       <point x="920" y="1250"/>
       <point x="838" y="1301"/>
       <point x="674" y="1321" type="curve"/>
@@ -54,13 +54,13 @@
       <point x="599" y="1551" type="line" name="hr02"/>
       <point x="598" y="1549"/>
       <point x="598" y="1546"/>
-      <point x="598" y="1543" type="curve" name="av02" smooth="yes"/>
+      <point x="598" y="1543" type="curve" smooth="yes" name="av02"/>
       <point x="598" y="1500"/>
       <point x="671" y="1465"/>
       <point x="816" y="1439" type="curve"/>
       <point x="1010" y="1415"/>
       <point x="1107" y="1336"/>
-      <point x="1107" y="1203" type="curve" name="sh01" smooth="yes"/>
+      <point x="1107" y="1203" type="curve" smooth="yes" name="sh01"/>
       <point x="1107" y="1184"/>
       <point x="1105" y="1160"/>
       <point x="1100" y="1136" type="curve" smooth="yes"/>
@@ -70,7 +70,7 @@
       <point x="859" y="853" type="line"/>
       <point x="964" y="802"/>
       <point x="1028" y="710"/>
-      <point x="1028" y="586" type="curve" name="dh03" smooth="yes"/>
+      <point x="1028" y="586" type="curve" smooth="yes" name="dh03"/>
       <point x="1028" y="555"/>
       <point x="1025" y="511"/>
       <point x="1018" y="474" type="curve" name="sh02"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10D_F_.glif b/source/Hack-Italic.ufo/glyphs/uni10D_F_.glif
index 9cf1dbf00..8975229a6 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10D_F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10D_F_.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10DF" format="1">
+<glyph name="uni10DF" format="2">
   <advance width="1233"/>
   <unicode hex="10DF"/>
   <outline>
     <contour>
-      <point x="462" y="-423" type="curve" name="dv01" smooth="yes"/>
+      <point x="462" y="-423" type="curve" smooth="yes" name="dv01"/>
       <point x="205" y="-423"/>
       <point x="75" y="-333"/>
-      <point x="75" y="-148" type="curve" name="sh01" smooth="yes"/>
+      <point x="75" y="-148" type="curve" smooth="yes" name="sh01"/>
       <point x="75" y="-120"/>
       <point x="78" y="-89"/>
       <point x="85" y="-56" type="curve" name="sh02"/>
       <point x="272" y="-56" type="line" name="sh04"/>
       <point x="267" y="-77"/>
       <point x="265" y="-98"/>
-      <point x="265" y="-118" type="curve" name="sh03" smooth="yes"/>
+      <point x="265" y="-118" type="curve" smooth="yes" name="sh03"/>
       <point x="265" y="-228"/>
       <point x="340" y="-283"/>
-      <point x="490" y="-283" type="curve" name="dv02" smooth="yes"/>
+      <point x="490" y="-283" type="curve" smooth="yes" name="dv02"/>
       <point x="684" y="-283"/>
       <point x="799" y="-194"/>
       <point x="834" y="-16" type="curve"/>
@@ -26,20 +26,20 @@
       <point x="559" y="808" type="line" name="sh05"/>
       <point x="676" y="757"/>
       <point x="725" y="672"/>
-      <point x="725" y="564" type="curve" name="sh06" smooth="yes"/>
+      <point x="725" y="564" type="curve" smooth="yes" name="sh06"/>
       <point x="725" y="537"/>
       <point x="722" y="510"/>
-      <point x="716" y="481" type="curve" name="sh07" smooth="yes"/>
+      <point x="716" y="481" type="curve" smooth="yes" name="sh07"/>
       <point x="673" y="276"/>
       <point x="487" y="175"/>
       <point x="130" y="174" type="curve" name="dv03"/>
       <point x="162" y="341" type="line" name="dv04"/>
       <point x="423" y="341"/>
       <point x="527" y="393"/>
-      <point x="548" y="481" type="curve" name="sh08" smooth="yes"/>
+      <point x="548" y="481" type="curve" smooth="yes" name="sh08"/>
       <point x="552" y="497"/>
       <point x="555" y="523"/>
-      <point x="555" y="546" type="curve" name="ah01" smooth="yes"/>
+      <point x="555" y="546" type="curve" smooth="yes" name="ah01"/>
       <point x="555" y="683"/>
       <point x="455" y="772"/>
       <point x="254" y="815" type="curve" name="sh09"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10E_0.glif b/source/Hack-Italic.ufo/glyphs/uni10E_0.glif
index 881a39e20..414fe3cb6 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10E_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10E_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E0" format="1">
+<glyph name="uni10E0" format="2">
   <advance width="1233"/>
   <unicode hex="10E0"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="114" y="0" type="line" name="hr00"/>
       <point x="29" y="107"/>
       <point x="-14" y="223"/>
-      <point x="-14" y="359" type="curve" name="sh01" smooth="yes"/>
+      <point x="-14" y="359" type="curve" smooth="yes" name="sh01"/>
       <point x="-14" y="400"/>
       <point x="-10" y="445"/>
-      <point x="-1" y="490" type="curve" name="sh02" smooth="yes"/>
+      <point x="-1" y="490" type="curve" smooth="yes" name="sh02"/>
       <point x="19" y="593" type="line" smooth="yes"/>
       <point x="83" y="928"/>
       <point x="380" y="1393"/>
@@ -27,10 +27,10 @@
       <point x="662" y="937" type="line"/>
       <point x="723" y="1002"/>
       <point x="806" y="1035"/>
-      <point x="911" y="1035" type="curve" name="dv02" smooth="yes"/>
+      <point x="911" y="1035" type="curve" smooth="yes" name="dv02"/>
       <point x="1078" y="1035"/>
       <point x="1161" y="944"/>
-      <point x="1161" y="762" type="curve" name="sh04" smooth="yes"/>
+      <point x="1161" y="762" type="curve" smooth="yes" name="sh04"/>
       <point x="1161" y="714"/>
       <point x="1155" y="659"/>
       <point x="1143" y="596" type="curve" smooth="yes"/>
@@ -45,10 +45,10 @@
       <point x="954" y="596" type="line"/>
       <point x="965" y="655"/>
       <point x="971" y="711"/>
-      <point x="971" y="752" type="curve" name="ah01" smooth="yes"/>
+      <point x="971" y="752" type="curve" smooth="yes" name="ah01"/>
       <point x="971" y="847"/>
       <point x="940" y="894"/>
-      <point x="879" y="894" type="curve" name="dv01" smooth="yes"/>
+      <point x="879" y="894" type="curve" smooth="yes" name="dv01"/>
       <point x="791" y="894" type="line" smooth="yes"/>
       <point x="746" y="894"/>
       <point x="715" y="835"/>
@@ -61,15 +61,15 @@
       <point x="545" y="814" type="curve" smooth="yes"/>
       <point x="545" y="867"/>
       <point x="528" y="894"/>
-      <point x="494" y="894" type="curve" name="sv02" smooth="yes"/>
+      <point x="494" y="894" type="curve" smooth="yes" name="sv02"/>
       <point x="370" y="894" type="line" smooth="yes"/>
       <point x="301" y="894"/>
       <point x="248" y="796"/>
       <point x="210" y="601" type="curve" smooth="yes"/>
-      <point x="178" y="436" type="line" name="sh06" smooth="yes"/>
+      <point x="178" y="436" type="line" smooth="yes" name="sh06"/>
       <point x="171" y="404"/>
       <point x="169" y="367"/>
-      <point x="169" y="336" type="curve" name="sh05" smooth="yes"/>
+      <point x="169" y="336" type="curve" smooth="yes" name="sh05"/>
       <point x="169" y="210"/>
       <point x="221" y="98"/>
       <point x="324" y="0" type="curve" name="ih03"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10E_1.glif b/source/Hack-Italic.ufo/glyphs/uni10E_1.glif
index 55ffda0a8..4aadd3077 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10E_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10E_1.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E1" format="1">
+<glyph name="uni10E1" format="2">
   <advance width="1233"/>
   <unicode hex="10E1"/>
   <outline>
     <contour>
-      <point x="467" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="467" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="226" y="0"/>
       <point x="94" y="115"/>
-      <point x="94" y="346" type="curve" name="dh01" smooth="yes"/>
+      <point x="94" y="346" type="curve" smooth="yes" name="dh01"/>
       <point x="94" y="397"/>
       <point x="100" y="456"/>
       <point x="111" y="515" type="curve"/>
@@ -16,22 +16,22 @@
       <point x="293" y="515" type="line" smooth="yes"/>
       <point x="284" y="467"/>
       <point x="279" y="418"/>
-      <point x="279" y="379" type="curve" name="dh02" smooth="yes"/>
+      <point x="279" y="379" type="curve" smooth="yes" name="dh02"/>
       <point x="279" y="222"/>
       <point x="359" y="145"/>
-      <point x="496" y="145" type="curve" name="sv01" smooth="yes"/>
+      <point x="496" y="145" type="curve" smooth="yes" name="sv01"/>
       <point x="685" y="145"/>
       <point x="810" y="295"/>
-      <point x="842" y="515" type="curve" name="sh02" smooth="yes"/>
+      <point x="842" y="515" type="curve" smooth="yes" name="sh02"/>
       <point x="846" y="542"/>
       <point x="849" y="574"/>
-      <point x="849" y="597" type="curve" name="sh01" smooth="yes"/>
+      <point x="849" y="597" type="curve" smooth="yes" name="sh01"/>
       <point x="849" y="680"/>
       <point x="808" y="731"/>
       <point x="751" y="774" type="curve" smooth="yes"/>
       <point x="714" y="801"/>
       <point x="653" y="844"/>
-      <point x="653" y="924" type="curve" name="hr01" smooth="yes"/>
+      <point x="653" y="924" type="curve" smooth="yes" name="hr01"/>
       <point x="653" y="934"/>
       <point x="654" y="944"/>
       <point x="656" y="954" type="curve" smooth="yes"/>
@@ -50,10 +50,10 @@
       <point x="925" y="834" type="curve" smooth="yes"/>
       <point x="992" y="781"/>
       <point x="1037" y="724"/>
-      <point x="1037" y="617" type="curve" name="dh03" smooth="yes"/>
+      <point x="1037" y="617" type="curve" smooth="yes" name="dh03"/>
       <point x="1037" y="585"/>
       <point x="1033" y="547"/>
-      <point x="1028" y="515" type="curve" name="sh03" smooth="yes"/>
+      <point x="1028" y="515" type="curve" smooth="yes" name="sh03"/>
       <point x="977" y="192"/>
       <point x="777" y="0"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10E_2.glif b/source/Hack-Italic.ufo/glyphs/uni10E_2.glif
index 376c67c2b..65bf8c173 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10E_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10E_2.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E2" format="1">
+<glyph name="uni10E2" format="2">
   <advance width="1233"/>
   <unicode hex="10E2"/>
   <outline>
     <contour>
-      <point x="452" y="-423" type="curve" name="hr00" smooth="yes"/>
+      <point x="452" y="-423" type="curve" smooth="yes" name="hr00"/>
       <point x="147" y="-423"/>
       <point x="-7" y="-267"/>
-      <point x="-7" y="33" type="curve" name="sh01" smooth="yes"/>
+      <point x="-7" y="33" type="curve" smooth="yes" name="sh01"/>
       <point x="-7" y="105"/>
       <point x="2" y="198"/>
       <point x="19" y="290" type="curve" smooth="yes"/>
@@ -19,7 +19,7 @@
       <point x="800" y="997" type="line"/>
       <point x="1059" y="957"/>
       <point x="1187" y="795"/>
-      <point x="1187" y="523" type="curve" name="sh02" smooth="yes"/>
+      <point x="1187" y="523" type="curve" smooth="yes" name="sh02"/>
       <point x="1187" y="455"/>
       <point x="1179" y="372"/>
       <point x="1163" y="284" type="curve" smooth="yes"/>
@@ -27,13 +27,13 @@
       <point x="831" y="-423"/>
     </contour>
     <contour>
-      <point x="479" y="-283" type="curve" name="dv01" smooth="yes"/>
+      <point x="479" y="-283" type="curve" smooth="yes" name="dv01"/>
       <point x="732" y="-283"/>
       <point x="913" y="-89"/>
       <point x="982" y="290" type="curve" smooth="yes"/>
       <point x="997" y="370"/>
       <point x="1004" y="447"/>
-      <point x="1004" y="510" type="curve" name="ah01" smooth="yes"/>
+      <point x="1004" y="510" type="curve" smooth="yes" name="ah01"/>
       <point x="1004" y="694"/>
       <point x="931" y="832"/>
       <point x="778" y="888" type="curve"/>
@@ -45,7 +45,7 @@
       <point x="207" y="290" type="curve" smooth="yes"/>
       <point x="191" y="203"/>
       <point x="183" y="119"/>
-      <point x="183" y="55" type="curve" name="sh03" smooth="yes"/>
+      <point x="183" y="55" type="curve" smooth="yes" name="sh03"/>
       <point x="183" y="-166"/>
       <point x="280" y="-283"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10E_3.glif b/source/Hack-Italic.ufo/glyphs/uni10E_3.glif
index 3ea781d8e..324709a36 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10E_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10E_3.glif
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E3" format="1">
+<glyph name="uni10E3" format="2">
   <advance width="1233"/>
   <unicode hex="10E3"/>
   <outline>
     <contour>
-      <point x="515" y="-423" type="curve" name="dv01" smooth="yes"/>
+      <point x="515" y="-423" type="curve" smooth="yes" name="dv01"/>
       <point x="247" y="-423"/>
       <point x="108" y="-322"/>
-      <point x="108" y="-118" type="curve" name="sh01" smooth="yes"/>
+      <point x="108" y="-118" type="curve" smooth="yes" name="sh01"/>
       <point x="108" y="-79"/>
       <point x="113" y="-36"/>
-      <point x="120" y="-3" type="curve" name="sh02" smooth="yes"/>
+      <point x="120" y="-3" type="curve" smooth="yes" name="sh02"/>
       <point x="141" y="98"/>
       <point x="197" y="181"/>
       <point x="313" y="246" type="curve"/>
       <point x="492" y="246" type="line" name="ih01"/>
       <point x="380" y="159"/>
       <point x="325" y="85"/>
-      <point x="306" y="-3" type="curve" name="sh05" smooth="yes"/>
+      <point x="306" y="-3" type="curve" smooth="yes" name="sh05"/>
       <point x="300" y="-32"/>
       <point x="297" y="-59"/>
-      <point x="297" y="-82" type="curve" name="sh04" smooth="yes"/>
+      <point x="297" y="-82" type="curve" smooth="yes" name="sh04"/>
       <point x="297" y="-214"/>
       <point x="377" y="-283"/>
-      <point x="544" y="-283" type="curve" name="dv02" smooth="yes"/>
+      <point x="544" y="-283" type="curve" smooth="yes" name="dv02"/>
       <point x="721" y="-283"/>
       <point x="821" y="-204"/>
-      <point x="852" y="-43" type="curve" name="hr01" smooth="yes"/>
-      <point x="997" y="703" type="line" name="sh06" smooth="yes"/>
+      <point x="852" y="-43" type="curve" smooth="yes" name="hr01"/>
+      <point x="997" y="703" type="line" smooth="yes" name="sh06"/>
       <point x="1002" y="731"/>
       <point x="1005" y="753"/>
-      <point x="1005" y="776" type="curve" name="ah01" smooth="yes"/>
+      <point x="1005" y="776" type="curve" smooth="yes" name="ah01"/>
       <point x="1005" y="855"/>
       <point x="969" y="894"/>
-      <point x="908" y="894" type="curve" name="hr02" smooth="yes"/>
+      <point x="908" y="894" type="curve" smooth="yes" name="hr02"/>
       <point x="816" y="894"/>
       <point x="756" y="807"/>
       <point x="720" y="623" type="curve"/>
@@ -51,31 +51,31 @@
       <point x="404" y="826" type="curve"/>
       <point x="388" y="802"/>
       <point x="357" y="759"/>
-      <point x="299" y="759" type="curve" name="sh07" smooth="yes"/>
+      <point x="299" y="759" type="curve" smooth="yes" name="sh07"/>
       <point x="250" y="759"/>
       <point x="204" y="791"/>
       <point x="161" y="854" type="curve"/>
       <point x="247" y="1035" type="line" name="ih02"/>
       <point x="279" y="966"/>
       <point x="300" y="937"/>
-      <point x="339" y="937" type="curve" name="dv03" smooth="yes"/>
+      <point x="339" y="937" type="curve" smooth="yes" name="dv03"/>
       <point x="411" y="937"/>
       <point x="428" y="1036"/>
-      <point x="529" y="1036" type="curve" name="av01" smooth="yes"/>
+      <point x="529" y="1036" type="curve" smooth="yes" name="av01"/>
       <point x="614" y="1036"/>
       <point x="651" y="977"/>
       <point x="675" y="852" type="curve"/>
       <point x="695" y="852" type="line"/>
       <point x="766" y="974"/>
       <point x="847" y="1035"/>
-      <point x="938" y="1035" type="curve" name="av02" smooth="yes"/>
+      <point x="938" y="1035" type="curve" smooth="yes" name="av02"/>
       <point x="941" y="1035" type="line" smooth="yes"/>
       <point x="1104" y="1035"/>
       <point x="1186" y="961"/>
-      <point x="1186" y="812" type="curve" name="sh03" smooth="yes"/>
+      <point x="1186" y="812" type="curve" smooth="yes" name="sh03"/>
       <point x="1186" y="778"/>
       <point x="1182" y="742"/>
-      <point x="1175" y="703" type="curve" name="sh08" smooth="yes"/>
+      <point x="1175" y="703" type="curve" smooth="yes" name="sh08"/>
       <point x="1029" y="-43" type="line"/>
       <point x="978" y="-296"/>
       <point x="812" y="-423"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10E_4.glif b/source/Hack-Italic.ufo/glyphs/uni10E_4.glif
index ad7309a61..7b26b40c3 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10E_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10E_4.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E4" format="1">
+<glyph name="uni10E4" format="2">
   <advance width="1233"/>
   <unicode hex="10E4"/>
   <outline>
     <contour>
-      <point x="523" y="-425" type="line" name="hr00" smooth="yes"/>
+      <point x="523" y="-425" type="line" smooth="yes" name="hr00"/>
       <point x="279" y="-425"/>
       <point x="157" y="-331"/>
-      <point x="157" y="-144" type="curve" name="ih01" smooth="yes"/>
+      <point x="157" y="-144" type="curve" smooth="yes" name="ih01"/>
       <point x="157" y="-111"/>
       <point x="161" y="-75"/>
       <point x="169" y="-36" type="curve" name="sh01"/>
       <point x="352" y="-36" type="line" name="sv01"/>
       <point x="347" y="-63"/>
       <point x="344" y="-87"/>
-      <point x="344" y="-111" type="curve" name="sh02" smooth="yes"/>
+      <point x="344" y="-111" type="curve" smooth="yes" name="sh02"/>
       <point x="344" y="-226"/>
       <point x="414" y="-283"/>
-      <point x="553" y="-283" type="curve" name="dv02" smooth="yes"/>
+      <point x="553" y="-283" type="curve" smooth="yes" name="dv02"/>
       <point x="600" y="-283" type="line" smooth="yes"/>
       <point x="786" y="-283"/>
       <point x="893" y="-209"/>
@@ -25,7 +25,7 @@
       <point x="940" y="40" type="line" smooth="yes"/>
       <point x="947" y="77"/>
       <point x="952" y="107"/>
-      <point x="952" y="138" type="curve" name="dh03" smooth="yes"/>
+      <point x="952" y="138" type="curve" smooth="yes" name="dh03"/>
       <point x="952" y="190"/>
       <point x="937" y="207"/>
       <point x="916" y="208" type="curve" name="sv02"/>
@@ -38,10 +38,10 @@
       <point x="1064" y="690" type="line" smooth="yes"/>
       <point x="1071" y="721"/>
       <point x="1075" y="760"/>
-      <point x="1075" y="791" type="curve" name="ih02" smooth="yes"/>
+      <point x="1075" y="791" type="curve" smooth="yes" name="ih02"/>
       <point x="1075" y="860"/>
       <point x="1051" y="894"/>
-      <point x="1003" y="894" type="curve" name="hr01" smooth="yes"/>
+      <point x="1003" y="894" type="curve" smooth="yes" name="hr01"/>
       <point x="920" y="894" type="line" smooth="yes"/>
       <point x="877" y="894"/>
       <point x="853" y="850"/>
@@ -53,24 +53,24 @@
       <point x="381" y="89" type="line"/>
       <point x="179" y="89"/>
       <point x="78" y="181"/>
-      <point x="78" y="365" type="curve" name="dh01" smooth="yes"/>
+      <point x="78" y="365" type="curve" smooth="yes" name="dh01"/>
       <point x="78" y="406"/>
       <point x="83" y="449"/>
       <point x="92" y="497" type="curve" smooth="yes"/>
       <point x="117" y="625" type="line" smooth="yes"/>
       <point x="170" y="900"/>
       <point x="327" y="1035"/>
-      <point x="560" y="1035" type="curve" name="sv03" smooth="yes"/>
+      <point x="560" y="1035" type="curve" smooth="yes" name="sv03"/>
       <point x="667" y="1035"/>
       <point x="722" y="1005"/>
       <point x="758" y="936" type="curve"/>
       <point x="775" y="936" type="line"/>
       <point x="852" y="1002"/>
       <point x="937" y="1035"/>
-      <point x="1030" y="1035" type="curve" name="dv03" smooth="yes"/>
+      <point x="1030" y="1035" type="curve" smooth="yes" name="dv03"/>
       <point x="1182" y="1035"/>
       <point x="1258" y="951"/>
-      <point x="1258" y="782" type="curve" name="sh03" smooth="yes"/>
+      <point x="1258" y="782" type="curve" smooth="yes" name="sh03"/>
       <point x="1258" y="737"/>
       <point x="1253" y="687"/>
       <point x="1242" y="632" type="curve" smooth="yes"/>
@@ -80,17 +80,17 @@
       <point x="1015" y="277" type="line"/>
       <point x="1095" y="226"/>
       <point x="1135" y="163"/>
-      <point x="1135" y="90" type="curve" name="dh04" smooth="yes"/>
+      <point x="1135" y="90" type="curve" smooth="yes" name="dh04"/>
       <point x="1135" y="74"/>
       <point x="1133" y="59"/>
       <point x="1130" y="44" type="curve" smooth="yes"/>
       <point x="1110" y="-61" type="line" smooth="yes"/>
       <point x="1064" y="-304"/>
       <point x="887" y="-425"/>
-      <point x="579" y="-425" type="curve" name="dv01" smooth="yes"/>
+      <point x="579" y="-425" type="curve" smooth="yes" name="dv01"/>
     </contour>
     <contour>
-      <point x="403" y="215" type="curve" name="hr02" smooth="yes"/>
+      <point x="403" y="215" type="curve" smooth="yes" name="hr02"/>
       <point x="514" y="215"/>
       <point x="578" y="305"/>
       <point x="611" y="476" type="curve" smooth="yes"/>
@@ -100,15 +100,15 @@
       <point x="668" y="804" type="curve" smooth="yes"/>
       <point x="668" y="863"/>
       <point x="645" y="894"/>
-      <point x="598" y="894" type="curve" name="sv04" smooth="yes"/>
+      <point x="598" y="894" type="curve" smooth="yes" name="sv04"/>
       <point x="521" y="894" type="line" smooth="yes"/>
       <point x="408" y="894"/>
       <point x="344" y="804"/>
-      <point x="309" y="632" type="curve" name="hr03" smooth="yes"/>
+      <point x="309" y="632" type="curve" smooth="yes" name="hr03"/>
       <point x="285" y="512" type="line" smooth="yes"/>
       <point x="277" y="471"/>
       <point x="271" y="421"/>
-      <point x="271" y="381" type="curve" name="dh02" smooth="yes"/>
+      <point x="271" y="381" type="curve" smooth="yes" name="dh02"/>
       <point x="271" y="273"/>
       <point x="315" y="215"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10E_5.glif b/source/Hack-Italic.ufo/glyphs/uni10E_5.glif
index ccbc76384..7622b73f9 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10E_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10E_5.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E5" format="1">
+<glyph name="uni10E5" format="2">
   <advance width="1233"/>
   <unicode hex="10E5"/>
   <outline>
     <contour>
-      <point x="438" y="-425" type="curve" name="dv01" smooth="yes"/>
+      <point x="438" y="-425" type="curve" smooth="yes" name="dv01"/>
       <point x="190" y="-425"/>
       <point x="41" y="-321"/>
-      <point x="41" y="-117" type="curve" name="dh01" smooth="yes"/>
+      <point x="41" y="-117" type="curve" smooth="yes" name="dh01"/>
       <point x="41" y="-78"/>
       <point x="46" y="-33"/>
       <point x="53" y="0" type="curve" smooth="yes"/>
@@ -20,41 +20,41 @@
       <point x="238" y="-3" type="curve" smooth="yes"/>
       <point x="233" y="-26"/>
       <point x="229" y="-57"/>
-      <point x="229" y="-85" type="curve" name="dh02" smooth="yes"/>
+      <point x="229" y="-85" type="curve" smooth="yes" name="dh02"/>
       <point x="229" y="-217"/>
       <point x="319" y="-283"/>
-      <point x="467" y="-283" type="curve" name="dv02" smooth="yes"/>
+      <point x="467" y="-283" type="curve" smooth="yes" name="dv02"/>
       <point x="648" y="-283"/>
       <point x="756" y="-180"/>
       <point x="805" y="67" type="curve" smooth="yes"/>
       <point x="864" y="363" type="line" smooth="yes"/>
       <point x="883" y="458"/>
       <point x="892" y="542"/>
-      <point x="892" y="613" type="curve" name="sh01" smooth="yes"/>
+      <point x="892" y="613" type="curve" smooth="yes" name="sh01"/>
       <point x="892" y="806"/>
       <point x="822" y="902"/>
-      <point x="683" y="902" type="curve" name="dv03" smooth="yes"/>
+      <point x="683" y="902" type="curve" smooth="yes" name="dv03"/>
       <point x="680" y="902" type="line"/>
-      <point x="673" y="902" type="line" name="sv01" smooth="yes"/>
+      <point x="673" y="902" type="line" smooth="yes" name="sv01"/>
       <point x="548" y="902"/>
       <point x="479" y="856"/>
       <point x="452" y="741" type="curve" smooth="yes"/>
       <point x="443" y="701"/>
       <point x="439" y="655"/>
-      <point x="439" y="622" type="curve" name="dh04" smooth="yes"/>
+      <point x="439" y="622" type="curve" smooth="yes" name="dh04"/>
       <point x="439" y="559"/>
       <point x="453" y="509"/>
       <point x="481" y="470" type="curve" name="hr01"/>
       <point x="302" y="470" type="line"/>
       <point x="282" y="515"/>
       <point x="272" y="566"/>
-      <point x="272" y="623" type="curve" name="dh03" smooth="yes"/>
+      <point x="272" y="623" type="curve" smooth="yes" name="dh03"/>
       <point x="272" y="661"/>
       <point x="276" y="700"/>
       <point x="285" y="741" type="curve" smooth="yes"/>
       <point x="328" y="940"/>
       <point x="466" y="1046"/>
-      <point x="682" y="1046" type="curve" name="dv04" smooth="yes"/>
+      <point x="682" y="1046" type="curve" smooth="yes" name="dv04"/>
       <point x="796" y="1046"/>
       <point x="865" y="1015"/>
       <point x="942" y="856" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10E_6.glif b/source/Hack-Italic.ufo/glyphs/uni10E_6.glif
index 5af5530d9..e5385a5d5 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10E_6.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10E_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E6" format="1">
+<glyph name="uni10E6" format="2">
   <advance width="1233"/>
   <unicode hex="10E6"/>
   <outline>
@@ -18,24 +18,24 @@
       <point x="281" y="-94" type="line"/>
       <point x="144" y="49"/>
       <point x="75" y="198"/>
-      <point x="75" y="353" type="curve" name="sh01" smooth="yes"/>
+      <point x="75" y="353" type="curve" smooth="yes" name="sh01"/>
       <point x="75" y="390"/>
       <point x="79" y="426"/>
-      <point x="86" y="462" type="curve" name="sh04" smooth="yes"/>
+      <point x="86" y="462" type="curve" smooth="yes" name="sh04"/>
       <point x="101" y="542" type="line" smooth="yes"/>
       <point x="162" y="870"/>
       <point x="319" y="1036"/>
-      <point x="539" y="1036" type="curve" name="sv01" smooth="yes"/>
+      <point x="539" y="1036" type="curve" smooth="yes" name="sv01"/>
       <point x="636" y="1036"/>
       <point x="694" y="1004"/>
       <point x="733" y="932" type="curve"/>
       <point x="749" y="932" type="line"/>
       <point x="809" y="1001"/>
       <point x="890" y="1036"/>
-      <point x="992" y="1036" type="curve" name="dv02" smooth="yes"/>
+      <point x="992" y="1036" type="curve" smooth="yes" name="dv02"/>
       <point x="1160" y="1036"/>
       <point x="1251" y="942"/>
-      <point x="1251" y="754" type="curve" name="sh05" smooth="yes"/>
+      <point x="1251" y="754" type="curve" smooth="yes" name="sh05"/>
       <point x="1251" y="703"/>
       <point x="1244" y="642"/>
       <point x="1233" y="586" type="curve" smooth="yes"/>
@@ -47,13 +47,13 @@
       <point x="929" y="205"/>
       <point x="991" y="319"/>
       <point x="1014" y="435" type="curve" smooth="yes"/>
-      <point x="1057" y="654" type="line" name="sh06" smooth="yes"/>
+      <point x="1057" y="654" type="line" smooth="yes" name="sh06"/>
       <point x="1065" y="695"/>
       <point x="1069" y="731"/>
-      <point x="1069" y="762" type="curve" name="ah01" smooth="yes"/>
+      <point x="1069" y="762" type="curve" smooth="yes" name="ah01"/>
       <point x="1069" y="850"/>
       <point x="1036" y="894"/>
-      <point x="969" y="894" type="curve" name="dv01" smooth="yes"/>
+      <point x="969" y="894" type="curve" smooth="yes" name="dv01"/>
       <point x="869" y="894" type="line" smooth="yes"/>
       <point x="830" y="894"/>
       <point x="800" y="836"/>
@@ -66,15 +66,15 @@
       <point x="629" y="819" type="curve" smooth="yes"/>
       <point x="629" y="869"/>
       <point x="615" y="894"/>
-      <point x="586" y="894" type="curve" name="sv02" smooth="yes"/>
+      <point x="586" y="894" type="curve" smooth="yes" name="sv02"/>
       <point x="510" y="894" type="line" smooth="yes"/>
       <point x="403" y="894"/>
       <point x="342" y="803"/>
       <point x="309" y="632" type="curve" smooth="yes"/>
-      <point x="282" y="494" type="line" name="sh07" smooth="yes"/>
+      <point x="282" y="494" type="line" smooth="yes" name="sh07"/>
       <point x="273" y="446"/>
       <point x="268" y="400"/>
-      <point x="268" y="357" type="curve" name="sh02" smooth="yes"/>
+      <point x="268" y="357" type="curve" smooth="yes" name="sh02"/>
       <point x="268" y="104"/>
       <point x="445" y="0"/>
       <point x="538" y="-59" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10E_7.glif b/source/Hack-Italic.ufo/glyphs/uni10E_7.glif
index 8e3cb539c..0ffb18452 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10E_7.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10E_7.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E7" format="1">
+<glyph name="uni10E7" format="2">
   <advance width="1233"/>
   <unicode hex="10E7"/>
   <outline>
     <contour>
-      <point x="489" y="-423" type="curve" name="dv01" smooth="yes"/>
+      <point x="489" y="-423" type="curve" smooth="yes" name="dv01"/>
       <point x="221" y="-423"/>
       <point x="85" y="-327"/>
-      <point x="85" y="-128" type="curve" name="dh01" smooth="yes"/>
+      <point x="85" y="-128" type="curve" smooth="yes" name="dh01"/>
       <point x="85" y="-97"/>
       <point x="89" y="-62"/>
       <point x="96" y="-23" type="curve" name="sh01"/>
       <point x="284" y="-23" type="line" name="sv01"/>
       <point x="279" y="-50"/>
       <point x="276" y="-73"/>
-      <point x="276" y="-96" type="curve" name="dh02" smooth="yes"/>
+      <point x="276" y="-96" type="curve" smooth="yes" name="dh02"/>
       <point x="276" y="-221"/>
       <point x="360" y="-284"/>
-      <point x="517" y="-284" type="curve" name="dv02" smooth="yes"/>
+      <point x="517" y="-284" type="curve" smooth="yes" name="dv02"/>
       <point x="694" y="-284"/>
       <point x="798" y="-204"/>
       <point x="829" y="-43" type="curve" smooth="yes"/>
@@ -25,10 +25,10 @@
       <point x="857" y="201" type="line"/>
       <point x="784" y="136"/>
       <point x="697" y="103"/>
-      <point x="566" y="103" type="curve" name="dv03" smooth="yes"/>
+      <point x="566" y="103" type="curve" smooth="yes" name="dv03"/>
       <point x="327" y="103"/>
       <point x="199" y="213"/>
-      <point x="199" y="436" type="curve" name="sh02" smooth="yes"/>
+      <point x="199" y="436" type="curve" smooth="yes" name="sh02"/>
       <point x="199" y="484"/>
       <point x="204" y="540"/>
       <point x="215" y="588" type="curve"/>
@@ -41,13 +41,13 @@
       <point x="402" y="588" type="curve" smooth="yes"/>
       <point x="394" y="552"/>
       <point x="389" y="505"/>
-      <point x="389" y="466" type="curve" name="sh03" smooth="yes"/>
+      <point x="389" y="466" type="curve" smooth="yes" name="sh03"/>
       <point x="389" y="317"/>
       <point x="459" y="251"/>
-      <point x="616" y="251" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="251" type="curve" smooth="yes" name="dv04"/>
       <point x="779" y="251"/>
       <point x="900" y="323"/>
-      <point x="932" y="486" type="curve" name="hr01" smooth="yes"/>
+      <point x="932" y="486" type="curve" smooth="yes" name="hr01"/>
       <point x="1033" y="1007" type="line" name="av02"/>
       <point x="1212" y="1007" type="line"/>
       <point x="1007" y="-47" type="line" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10E_8.glif b/source/Hack-Italic.ufo/glyphs/uni10E_8.glif
index 018d33e34..8c0a791d3 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10E_8.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10E_8.glif
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E8" format="1">
+<glyph name="uni10E8" format="2">
   <advance width="1233"/>
   <unicode hex="10E8"/>
   <outline>
     <contour>
-      <point x="493" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="493" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="234" y="0"/>
       <point x="92" y="121"/>
-      <point x="92" y="362" type="curve" name="sh01" smooth="yes"/>
+      <point x="92" y="362" type="curve" smooth="yes" name="sh01"/>
       <point x="92" y="410"/>
       <point x="98" y="464"/>
       <point x="109" y="525" type="curve" smooth="yes"/>
       <point x="173" y="865"/>
       <point x="363" y="1046"/>
-      <point x="654" y="1046" type="curve" name="dv02" smooth="yes"/>
+      <point x="654" y="1046" type="curve" smooth="yes" name="dv02"/>
       <point x="797" y="1046"/>
       <point x="871" y="1001"/>
       <point x="902" y="916" type="curve" name="sv01"/>
       <point x="922" y="916" type="line"/>
-      <point x="978" y="1205" type="line" name="sh02" smooth="yes"/>
+      <point x="978" y="1205" type="line" smooth="yes" name="sh02"/>
       <point x="984" y="1237"/>
       <point x="987" y="1265"/>
-      <point x="987" y="1290" type="curve" name="ah01" smooth="yes"/>
+      <point x="987" y="1290" type="curve" smooth="yes" name="ah01"/>
       <point x="987" y="1375"/>
       <point x="950" y="1418"/>
-      <point x="876" y="1418" type="curve" name="sv02" smooth="yes"/>
+      <point x="876" y="1418" type="curve" smooth="yes" name="sv02"/>
       <point x="780" y="1418"/>
       <point x="727" y="1351"/>
       <point x="696" y="1208" type="curve" smooth="yes"/>
@@ -36,33 +36,33 @@
       <point x="547" y="1286" type="curve" smooth="yes"/>
       <point x="547" y="1374"/>
       <point x="497" y="1418"/>
-      <point x="432" y="1418" type="curve" name="sv05" smooth="yes"/>
+      <point x="432" y="1418" type="curve" smooth="yes" name="sv05"/>
       <point x="365" y="1418"/>
       <point x="325" y="1372"/>
       <point x="290" y="1192" type="curve" name="sh04"/>
       <point x="135" y="1192" type="line"/>
       <point x="184" y="1445"/>
       <point x="281" y="1556"/>
-      <point x="432" y="1556" type="curve" name="hr01" smooth="yes"/>
+      <point x="432" y="1556" type="curve" smooth="yes" name="hr01"/>
       <point x="548" y="1556"/>
       <point x="622" y="1492"/>
       <point x="638" y="1363" type="curve"/>
       <point x="658" y="1363" type="line"/>
       <point x="730" y="1505"/>
       <point x="813" y="1556"/>
-      <point x="937" y="1556" type="curve" name="hr02" smooth="yes"/>
+      <point x="937" y="1556" type="curve" smooth="yes" name="hr02"/>
       <point x="1086" y="1556"/>
       <point x="1174" y="1483"/>
-      <point x="1174" y="1338" type="curve" name="sh05" smooth="yes"/>
+      <point x="1174" y="1338" type="curve" smooth="yes" name="sh05"/>
       <point x="1174" y="1309"/>
       <point x="1170" y="1275"/>
-      <point x="1163" y="1236" type="curve" name="sh06" smooth="yes"/>
-      <point x="1017" y="477" type="line" name="hr03" smooth="yes"/>
+      <point x="1163" y="1236" type="curve" smooth="yes" name="sh06"/>
+      <point x="1017" y="477" type="line" smooth="yes" name="hr03"/>
       <point x="956" y="158"/>
       <point x="789" y="0"/>
     </contour>
     <contour>
-      <point x="516" y="145" type="curve" name="sv06" smooth="yes"/>
+      <point x="516" y="145" type="curve" smooth="yes" name="sv06"/>
       <point x="680" y="145"/>
       <point x="795" y="259"/>
       <point x="840" y="515" type="curve" smooth="yes"/>
@@ -71,13 +71,13 @@
       <point x="855" y="666" type="curve" smooth="yes"/>
       <point x="855" y="819"/>
       <point x="782" y="904"/>
-      <point x="637" y="904" type="curve" name="dv01" smooth="yes"/>
+      <point x="637" y="904" type="curve" smooth="yes" name="dv01"/>
       <point x="452" y="904"/>
       <point x="339" y="762"/>
-      <point x="296" y="525" type="curve" name="sh07" smooth="yes"/>
+      <point x="296" y="525" type="curve" smooth="yes" name="sh07"/>
       <point x="287" y="474"/>
       <point x="282" y="423"/>
-      <point x="282" y="387" type="curve" name="sh03" smooth="yes"/>
+      <point x="282" y="387" type="curve" smooth="yes" name="sh03"/>
       <point x="282" y="231"/>
       <point x="373" y="145"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10E_9.glif b/source/Hack-Italic.ufo/glyphs/uni10E_9.glif
index 332ffdd68..980867c19 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10E_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10E_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E9" format="1">
+<glyph name="uni10E9" format="2">
   <advance width="1233"/>
   <unicode hex="10E9"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="245" y="1214" type="line" name="hr00"/>
       <point x="290" y="1451"/>
       <point x="439" y="1556"/>
-      <point x="686" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="686" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="914" y="1556"/>
       <point x="1034" y="1468"/>
-      <point x="1034" y="1289" type="curve" name="sh01" smooth="yes"/>
+      <point x="1034" y="1289" type="curve" smooth="yes" name="sh01"/>
       <point x="1034" y="1273"/>
       <point x="1033" y="1258"/>
       <point x="1031" y="1243" type="curve" smooth="yes"/>
@@ -19,7 +19,7 @@
       <point x="885" y="986" type="curve"/>
       <point x="990" y="934"/>
       <point x="1043" y="834"/>
-      <point x="1043" y="685" type="curve" name="dh02" smooth="yes"/>
+      <point x="1043" y="685" type="curve" smooth="yes" name="dh02"/>
       <point x="1043" y="630"/>
       <point x="1036" y="571"/>
       <point x="1025" y="516" type="curve" smooth="yes"/>
@@ -32,13 +32,13 @@
       <point x="839" y="520" type="curve" smooth="yes"/>
       <point x="849" y="571"/>
       <point x="854" y="616"/>
-      <point x="854" y="655" type="curve" name="dh01" smooth="yes"/>
+      <point x="854" y="655" type="curve" smooth="yes" name="dh01"/>
       <point x="854" y="802"/>
       <point x="790" y="882"/>
       <point x="647" y="883" type="curve" name="sv01"/>
       <point x="636" y="884"/>
       <point x="626" y="884"/>
-      <point x="615" y="884" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="884" type="curve" smooth="yes" name="dv01"/>
       <point x="440" y="884"/>
       <point x="338" y="783"/>
       <point x="299" y="587" type="curve" smooth="yes"/>
@@ -49,7 +49,7 @@
       <point x="393" y="917" type="line"/>
       <point x="440" y="986"/>
       <point x="531" y="1021"/>
-      <point x="666" y="1021" type="curve" name="dv02" smooth="yes"/>
+      <point x="666" y="1021" type="curve" smooth="yes" name="dv02"/>
       <point x="698" y="1021"/>
       <point x="732" y="1019"/>
       <point x="768" y="1015" type="curve" name="sv02"/>
@@ -59,7 +59,7 @@
       <point x="865" y="1236" type="line" smooth="yes"/>
       <point x="865" y="1356"/>
       <point x="791" y="1415"/>
-      <point x="662" y="1415" type="curve" name="sv03" smooth="yes"/>
+      <point x="662" y="1415" type="curve" smooth="yes" name="sv03"/>
       <point x="521" y="1415"/>
       <point x="446" y="1345"/>
       <point x="418" y="1201" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10E_A_.glif b/source/Hack-Italic.ufo/glyphs/uni10E_A_.glif
index 330398316..e81def590 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10E_A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10E_A_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10EA" format="1">
+<glyph name="uni10EA" format="2">
   <advance width="1233"/>
   <unicode hex="10EA"/>
   <outline>
     <contour>
-      <point x="484" y="-423" type="curve" name="dv01" smooth="yes"/>
+      <point x="484" y="-423" type="curve" smooth="yes" name="dv01"/>
       <point x="193" y="-423"/>
       <point x="51" y="-278"/>
-      <point x="51" y="25" type="curve" name="dh01" smooth="yes"/>
+      <point x="51" y="25" type="curve" smooth="yes" name="dh01"/>
       <point x="51" y="101"/>
       <point x="60" y="188"/>
       <point x="79" y="284" type="curve" smooth="yes"/>
@@ -18,51 +18,51 @@
       <point x="569" y="985" type="line"/>
       <point x="428" y="818"/>
       <point x="338" y="637"/>
-      <point x="299" y="442" type="curve" name="hr01" smooth="yes"/>
+      <point x="299" y="442" type="curve" smooth="yes" name="hr01"/>
       <point x="268" y="284" type="line" smooth="yes"/>
       <point x="252" y="201"/>
       <point x="242" y="117"/>
-      <point x="242" y="42" type="curve" name="dh02" smooth="yes"/>
+      <point x="242" y="42" type="curve" smooth="yes" name="dh02"/>
       <point x="242" y="-179"/>
       <point x="329" y="-283"/>
-      <point x="517" y="-283" type="curve" name="dv02" smooth="yes"/>
+      <point x="517" y="-283" type="curve" smooth="yes" name="dv02"/>
       <point x="726" y="-283"/>
       <point x="880" y="-151"/>
       <point x="925" y="102" type="curve" smooth="yes"/>
       <point x="930" y="133"/>
       <point x="933" y="159"/>
-      <point x="933" y="180" type="curve" name="ih01" smooth="yes"/>
+      <point x="933" y="180" type="curve" smooth="yes" name="ih01"/>
       <point x="933" y="274"/>
       <point x="884" y="321"/>
-      <point x="785" y="321" type="curve" name="dv03" smooth="yes"/>
+      <point x="785" y="321" type="curve" smooth="yes" name="dv03"/>
       <point x="601" y="321" type="line"/>
       <point x="628" y="457" type="line"/>
-      <point x="804" y="457" type="line" name="dv04" smooth="yes"/>
+      <point x="804" y="457" type="line" smooth="yes" name="dv04"/>
       <point x="909" y="457"/>
       <point x="980" y="516"/>
       <point x="1003" y="641" type="curve" smooth="yes"/>
       <point x="1005" y="652"/>
       <point x="1006" y="662"/>
-      <point x="1006" y="672" type="curve" name="dh04" smooth="yes"/>
+      <point x="1006" y="672" type="curve" smooth="yes" name="dh04"/>
       <point x="1006" y="744"/>
       <point x="955" y="779"/>
       <point x="875" y="808" type="curve" smooth="yes"/>
       <point x="837" y="822"/>
       <point x="767" y="851"/>
-      <point x="767" y="963" type="curve" name="hr02" smooth="yes"/>
+      <point x="767" y="963" type="curve" smooth="yes" name="hr02"/>
       <point x="767" y="982"/>
       <point x="769" y="1003"/>
       <point x="773" y="1026" type="curve" name="sh01"/>
       <point x="956" y="1026" type="line"/>
       <point x="953" y="1013"/>
       <point x="952" y="1000"/>
-      <point x="952" y="987" type="curve" name="dh03" smooth="yes"/>
+      <point x="952" y="987" type="curve" smooth="yes" name="dh03"/>
       <point x="952" y="924"/>
       <point x="980" y="886"/>
       <point x="1053" y="855" type="curve" smooth="yes"/>
       <point x="1097" y="836"/>
       <point x="1184" y="801"/>
-      <point x="1184" y="691" type="curve" name="dh05" smooth="yes"/>
+      <point x="1184" y="691" type="curve" smooth="yes" name="dh05"/>
       <point x="1184" y="675"/>
       <point x="1182" y="662"/>
       <point x="1179" y="645" type="curve"/>
@@ -72,10 +72,10 @@
       <point x="958" y="384" type="line" name="sh02"/>
       <point x="1051" y="320"/>
       <point x="1104" y="233"/>
-      <point x="1104" y="140" type="curve" name="sh03" smooth="yes"/>
+      <point x="1104" y="140" type="curve" smooth="yes" name="sh03"/>
       <point x="1104" y="121"/>
       <point x="1102" y="95"/>
-      <point x="1099" y="70" type="curve" name="sh04" smooth="yes"/>
+      <point x="1099" y="70" type="curve" smooth="yes" name="sh04"/>
       <point x="1062" y="-226"/>
       <point x="821" y="-423"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10E_B_.glif b/source/Hack-Italic.ufo/glyphs/uni10E_B_.glif
index 873a09710..a31a7515b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10E_B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10E_B_.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10EB" format="1">
+<glyph name="uni10EB" format="2">
   <advance width="1233"/>
   <unicode hex="10EB"/>
   <outline>
     <contour>
-      <point x="466" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="466" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="213" y="0"/>
       <point x="91" y="115"/>
-      <point x="91" y="336" type="curve" name="dh01" smooth="yes"/>
+      <point x="91" y="336" type="curve" smooth="yes" name="dh01"/>
       <point x="91" y="384"/>
       <point x="97" y="448"/>
       <point x="108" y="509" type="curve" smooth="yes"/>
       <point x="172" y="864"/>
       <point x="367" y="1046"/>
-      <point x="671" y="1046" type="curve" name="dv02" smooth="yes"/>
+      <point x="671" y="1046" type="curve" smooth="yes" name="dv02"/>
       <point x="808" y="1046"/>
       <point x="891" y="1008"/>
       <point x="910" y="931" type="curve"/>
@@ -25,7 +25,7 @@
       <point x="777" y="0"/>
     </contour>
     <contour>
-      <point x="490" y="145" type="curve" name="sv01" smooth="yes"/>
+      <point x="490" y="145" type="curve" smooth="yes" name="sv01"/>
       <point x="670" y="145"/>
       <point x="798" y="271"/>
       <point x="843" y="519" type="curve" smooth="yes"/>
@@ -34,13 +34,13 @@
       <point x="858" y="671" type="curve" smooth="yes"/>
       <point x="858" y="820"/>
       <point x="785" y="903"/>
-      <point x="645" y="903" type="curve" name="dv01" smooth="yes"/>
+      <point x="645" y="903" type="curve" smooth="yes" name="dv01"/>
       <point x="466" y="903"/>
       <point x="340" y="769"/>
       <point x="295" y="509" type="curve" smooth="yes"/>
       <point x="286" y="458"/>
       <point x="281" y="403"/>
-      <point x="281" y="364" type="curve" name="dh02" smooth="yes"/>
+      <point x="281" y="364" type="curve" smooth="yes" name="dh02"/>
       <point x="281" y="223"/>
       <point x="350" y="145"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10E_C_.glif b/source/Hack-Italic.ufo/glyphs/uni10E_C_.glif
index 025376ec7..8120259dc 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10E_C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10E_C_.glif
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10EC" format="1">
+<glyph name="uni10EC" format="2">
   <advance width="1233"/>
   <unicode hex="10EC"/>
   <outline>
     <contour>
-      <point x="93" y="355" type="curve" name="dh01" smooth="yes"/>
+      <point x="93" y="355" type="curve" smooth="yes" name="dh01"/>
       <point x="93" y="398"/>
       <point x="99" y="460"/>
       <point x="112" y="527" type="curve" smooth="yes"/>
       <point x="250" y="1236" type="line" smooth="yes"/>
       <point x="290" y="1445"/>
       <point x="411" y="1556"/>
-      <point x="599" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="599" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="733" y="1556"/>
       <point x="791" y="1499"/>
       <point x="807" y="1363" type="curve"/>
       <point x="827" y="1363" type="line"/>
       <point x="894" y="1492"/>
       <point x="992" y="1556"/>
-      <point x="1107" y="1556" type="curve" name="at02" smooth="yes"/>
+      <point x="1107" y="1556" type="curve" smooth="yes" name="at02"/>
       <point x="1224" y="1556"/>
       <point x="1278" y="1491"/>
-      <point x="1278" y="1350" type="curve" name="dh05" smooth="yes"/>
+      <point x="1278" y="1350" type="curve" smooth="yes" name="dh05"/>
       <point x="1278" y="1303"/>
       <point x="1272" y="1251"/>
       <point x="1260" y="1192" type="curve"/>
       <point x="1107" y="1192" type="line"/>
       <point x="1117" y="1243"/>
       <point x="1122" y="1286"/>
-      <point x="1122" y="1322" type="curve" name="dh04" smooth="yes"/>
+      <point x="1122" y="1322" type="curve" smooth="yes" name="dh04"/>
       <point x="1122" y="1394"/>
       <point x="1103" y="1418"/>
-      <point x="1052" y="1418" type="curve" name="sv01" smooth="yes"/>
+      <point x="1052" y="1418" type="curve" smooth="yes" name="sv01"/>
       <point x="963" y="1418"/>
       <point x="893" y="1347"/>
       <point x="866" y="1210" type="curve" smooth="yes"/>
@@ -40,10 +40,10 @@
       <point x="709" y="1208" type="line" smooth="yes"/>
       <point x="714" y="1232"/>
       <point x="718" y="1265"/>
-      <point x="718" y="1292" type="curve" name="dh03" smooth="yes"/>
+      <point x="718" y="1292" type="curve" smooth="yes" name="dh03"/>
       <point x="718" y="1376"/>
       <point x="681" y="1418"/>
-      <point x="608" y="1418" type="curve" name="hr01" smooth="yes"/>
+      <point x="608" y="1418" type="curve" smooth="yes" name="hr01"/>
       <point x="513" y="1418"/>
       <point x="452" y="1347"/>
       <point x="425" y="1205" type="curve" smooth="yes"/>
@@ -51,30 +51,30 @@
       <point x="389" y="916" type="line"/>
       <point x="446" y="991"/>
       <point x="577" y="1048"/>
-      <point x="709" y="1048" type="curve" name="dv02" smooth="yes"/>
+      <point x="709" y="1048" type="curve" smooth="yes" name="dv02"/>
       <point x="877" y="1048"/>
       <point x="1042" y="955"/>
-      <point x="1042" y="694" type="curve" name="hr02" smooth="yes"/>
+      <point x="1042" y="694" type="curve" smooth="yes" name="hr02"/>
       <point x="1042" y="639"/>
       <point x="1035" y="576"/>
       <point x="1023" y="516" type="curve" smooth="yes"/>
       <point x="951" y="156"/>
       <point x="697" y="-3"/>
-      <point x="475" y="-3" type="curve" name="ab01" smooth="yes"/>
+      <point x="475" y="-3" type="curve" smooth="yes" name="ab01"/>
       <point x="271" y="-3"/>
       <point x="93" y="128"/>
     </contour>
     <contour>
-      <point x="286" y="390" type="curve" name="dh02" smooth="yes"/>
+      <point x="286" y="390" type="curve" smooth="yes" name="dh02"/>
       <point x="286" y="234"/>
       <point x="389" y="144"/>
-      <point x="506" y="144" type="curve" name="sv04" smooth="yes"/>
+      <point x="506" y="144" type="curve" smooth="yes" name="sv04"/>
       <point x="637" y="144"/>
       <point x="785" y="256"/>
       <point x="838" y="516" type="curve"/>
       <point x="849" y="572"/>
       <point x="855" y="630"/>
-      <point x="855" y="675" type="curve" name="sh01" smooth="yes"/>
+      <point x="855" y="675" type="curve" smooth="yes" name="sh01"/>
       <point x="855" y="826"/>
       <point x="789" y="904"/>
       <point x="653" y="904" type="curve" name="dv01"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10E_D_.glif b/source/Hack-Italic.ufo/glyphs/uni10E_D_.glif
index c9669ca66..c36964583 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10E_D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10E_D_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10ED" format="1">
+<glyph name="uni10ED" format="2">
   <advance width="1233"/>
   <unicode hex="10ED"/>
   <outline>
     <contour>
-      <point x="428" y="-423" type="curve" name="dv01" smooth="yes"/>
+      <point x="428" y="-423" type="curve" smooth="yes" name="dv01"/>
       <point x="167" y="-423"/>
       <point x="38" y="-325"/>
-      <point x="38" y="-133" type="curve" name="dh01" smooth="yes"/>
+      <point x="38" y="-133" type="curve" smooth="yes" name="dh01"/>
       <point x="38" y="-94"/>
       <point x="43" y="-51"/>
       <point x="50" y="-18" type="curve" smooth="yes"/>
@@ -20,16 +20,16 @@
       <point x="233" y="-33" type="curve" smooth="yes"/>
       <point x="228" y="-60"/>
       <point x="225" y="-83"/>
-      <point x="225" y="-102" type="curve" name="dh02" smooth="yes"/>
+      <point x="225" y="-102" type="curve" smooth="yes" name="dh02"/>
       <point x="225" y="-217"/>
       <point x="335" y="-284"/>
-      <point x="458" y="-284" type="curve" name="dv02" smooth="yes"/>
+      <point x="458" y="-284" type="curve" smooth="yes" name="dv02"/>
       <point x="593" y="-284"/>
       <point x="742" y="-204"/>
       <point x="777" y="-20" type="curve"/>
       <point x="781" y="-3"/>
       <point x="783" y="14"/>
-      <point x="783" y="31" type="curve" name="dh03" smooth="yes"/>
+      <point x="783" y="31" type="curve" smooth="yes" name="dh03"/>
       <point x="783" y="114"/>
       <point x="739" y="184"/>
       <point x="652" y="239" type="curve" name="hr01"/>
@@ -42,7 +42,7 @@
       <point x="484" y="433" type="line" name="dv07"/>
       <point x="313" y="433"/>
       <point x="228" y="508"/>
-      <point x="228" y="658" type="curve" name="sh01" smooth="yes"/>
+      <point x="228" y="658" type="curve" smooth="yes" name="sh01"/>
       <point x="228" y="690"/>
       <point x="232" y="724"/>
       <point x="239" y="761" type="curve" smooth="yes"/>
@@ -55,7 +55,7 @@
       <point x="843" y="1010" type="line"/>
       <point x="887" y="978"/>
       <point x="909" y="936"/>
-      <point x="909" y="884" type="curve" name="ih02" smooth="yes"/>
+      <point x="909" y="884" type="curve" smooth="yes" name="ih02"/>
       <point x="909" y="871"/>
       <point x="908" y="859"/>
       <point x="906" y="846" type="curve" name="sh02"/>
@@ -65,19 +65,19 @@
       <point x="856" y="615"/>
       <point x="819" y="561"/>
       <point x="756" y="524" type="curve"/>
-      <point x="741" y="452" type="line" name="sh04" smooth="yes"/>
+      <point x="741" y="452" type="line" smooth="yes" name="sh04"/>
       <point x="740" y="450"/>
       <point x="740" y="447"/>
-      <point x="740" y="443" type="curve" name="sh05" smooth="yes"/>
+      <point x="740" y="443" type="curve" smooth="yes" name="sh05"/>
       <point x="740" y="400"/>
       <point x="787" y="347"/>
       <point x="881" y="282" type="curve"/>
       <point x="943" y="233"/>
       <point x="974" y="162"/>
-      <point x="974" y="70" type="curve" name="dh04" smooth="yes"/>
+      <point x="974" y="70" type="curve" smooth="yes" name="dh04"/>
       <point x="974" y="42"/>
       <point x="971" y="12"/>
-      <point x="965" y="-20" type="curve" name="hr03" smooth="yes"/>
+      <point x="965" y="-20" type="curve" smooth="yes" name="hr03"/>
       <point x="917" y="-281"/>
       <point x="739" y="-423"/>
     </contour>
@@ -88,7 +88,7 @@
       <point x="747" y="763" type="curve" smooth="yes"/>
       <point x="752" y="788"/>
       <point x="754" y="810"/>
-      <point x="754" y="829" type="curve" name="sh03" smooth="yes"/>
+      <point x="754" y="829" type="curve" smooth="yes" name="sh03"/>
       <point x="754" y="914"/>
       <point x="710" y="956"/>
       <point x="623" y="956" type="curve" name="dv03"/>
@@ -98,10 +98,10 @@
       <point x="414" y="763" type="curve" smooth="yes"/>
       <point x="409" y="736"/>
       <point x="406" y="717"/>
-      <point x="406" y="694" type="curve" name="sh06" smooth="yes"/>
+      <point x="406" y="694" type="curve" smooth="yes" name="sh06"/>
       <point x="406" y="606"/>
       <point x="450" y="562"/>
-      <point x="538" y="562" type="curve" name="dv08" smooth="yes"/>
+      <point x="538" y="562" type="curve" smooth="yes" name="dv08"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10E_E_.glif b/source/Hack-Italic.ufo/glyphs/uni10E_E_.glif
index a511be5b2..e69ada6e7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10E_E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10E_E_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10EE" format="1">
+<glyph name="uni10EE" format="2">
   <advance width="1233"/>
   <unicode hex="10EE"/>
   <outline>
     <contour>
-      <point x="468" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="468" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="221" y="0"/>
       <point x="95" y="116"/>
-      <point x="95" y="353" type="curve" name="sh01" smooth="yes"/>
+      <point x="95" y="353" type="curve" smooth="yes" name="sh01"/>
       <point x="95" y="404"/>
       <point x="101" y="462"/>
       <point x="113" y="525" type="curve" smooth="yes"/>
@@ -17,10 +17,10 @@
       <point x="401" y="914" type="line"/>
       <point x="460" y="992"/>
       <point x="591" y="1049"/>
-      <point x="722" y="1049" type="curve" name="dv02" smooth="yes"/>
+      <point x="722" y="1049" type="curve" smooth="yes" name="dv02"/>
       <point x="887" y="1049"/>
       <point x="1049" y="957"/>
-      <point x="1049" y="702" type="curve" name="sh02" smooth="yes"/>
+      <point x="1049" y="702" type="curve" smooth="yes" name="sh02"/>
       <point x="1049" y="649"/>
       <point x="1042" y="585"/>
       <point x="1031" y="525" type="curve" smooth="yes"/>
@@ -28,22 +28,22 @@
       <point x="771" y="0"/>
     </contour>
     <contour>
-      <point x="498" y="145" type="curve" name="sv02" smooth="yes"/>
+      <point x="498" y="145" type="curve" smooth="yes" name="sv02"/>
       <point x="683" y="145"/>
       <point x="801" y="286"/>
       <point x="844" y="525" type="curve"/>
       <point x="855" y="580"/>
       <point x="859" y="638"/>
-      <point x="859" y="677" type="curve" name="ah01" smooth="yes"/>
+      <point x="859" y="677" type="curve" smooth="yes" name="ah01"/>
       <point x="859" y="825"/>
       <point x="789" y="904"/>
-      <point x="648" y="904" type="curve" name="dv01" smooth="yes"/>
+      <point x="648" y="904" type="curve" smooth="yes" name="dv01"/>
       <point x="461" y="904"/>
       <point x="342" y="764"/>
       <point x="298" y="523" type="curve" smooth="yes"/>
       <point x="287" y="467"/>
       <point x="283" y="415"/>
-      <point x="283" y="376" type="curve" name="sh03" smooth="yes"/>
+      <point x="283" y="376" type="curve" smooth="yes" name="sh03"/>
       <point x="283" y="227"/>
       <point x="355" y="145"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10E_F_.glif b/source/Hack-Italic.ufo/glyphs/uni10E_F_.glif
index fe2bd1031..7c740fadc 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10E_F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10E_F_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10EF" format="1">
+<glyph name="uni10EF" format="2">
   <advance width="1233"/>
   <unicode hex="10EF"/>
   <outline>
     <contour>
-      <point x="443" y="-423" type="curve" name="hr00" smooth="yes"/>
+      <point x="443" y="-423" type="curve" smooth="yes" name="hr00"/>
       <point x="198" y="-423"/>
       <point x="72" y="-316"/>
-      <point x="72" y="-104" type="curve" name="sh01" smooth="yes"/>
+      <point x="72" y="-104" type="curve" smooth="yes" name="sh01"/>
       <point x="72" y="-57"/>
       <point x="78" y="-1"/>
       <point x="87" y="39" type="curve" smooth="yes"/>
@@ -17,19 +17,19 @@
       <point x="373" y="216" type="line"/>
       <point x="309" y="137"/>
       <point x="283" y="85"/>
-      <point x="274" y="40" type="curve" name="sh03" smooth="yes"/>
+      <point x="274" y="40" type="curve" smooth="yes" name="sh03"/>
       <point x="269" y="13"/>
       <point x="262" y="-37"/>
-      <point x="262" y="-70" type="curve" name="sh02" smooth="yes"/>
+      <point x="262" y="-70" type="curve" smooth="yes" name="sh02"/>
       <point x="262" y="-203"/>
       <point x="369" y="-283"/>
-      <point x="490" y="-283" type="curve" name="dv01" smooth="yes"/>
+      <point x="490" y="-283" type="curve" smooth="yes" name="dv01"/>
       <point x="624" y="-283"/>
       <point x="773" y="-188"/>
-      <point x="816" y="39" type="curve" name="sh04" smooth="yes"/>
+      <point x="816" y="39" type="curve" smooth="yes" name="sh04"/>
       <point x="820" y="59"/>
       <point x="822" y="80"/>
-      <point x="822" y="101" type="curve" name="ah01" smooth="yes"/>
+      <point x="822" y="101" type="curve" smooth="yes" name="ah01"/>
       <point x="822" y="192"/>
       <point x="777" y="282"/>
       <point x="687" y="369" type="curve"/>
@@ -58,10 +58,10 @@
       <point x="887" y="417" type="curve"/>
       <point x="967" y="322"/>
       <point x="1012" y="216"/>
-      <point x="1012" y="120" type="curve" name="sh06" smooth="yes"/>
+      <point x="1012" y="120" type="curve" smooth="yes" name="sh06"/>
       <point x="1012" y="100"/>
       <point x="1010" y="68"/>
-      <point x="1006" y="41" type="curve" name="sh07" smooth="yes"/>
+      <point x="1006" y="41" type="curve" smooth="yes" name="sh07"/>
       <point x="969" y="-235"/>
       <point x="766" y="-423"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10F_0.glif b/source/Hack-Italic.ufo/glyphs/uni10F_0.glif
index b88b91164..11faa9b23 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10F_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10F_0.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F0" format="1">
+<glyph name="uni10F0" format="2">
   <advance width="1233"/>
   <unicode hex="10F0"/>
   <outline>
     <contour>
-      <point x="464" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="464" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="208" y="0"/>
       <point x="76" y="97"/>
-      <point x="76" y="301" type="curve" name="dh01" smooth="yes"/>
+      <point x="76" y="301" type="curve" smooth="yes" name="dh01"/>
       <point x="76" y="336"/>
       <point x="80" y="375"/>
       <point x="88" y="416" type="curve" smooth="yes"/>
@@ -16,34 +16,34 @@
       <point x="276" y="416" type="line"/>
       <point x="269" y="385"/>
       <point x="266" y="357"/>
-      <point x="266" y="330" type="curve" name="dh02" smooth="yes"/>
+      <point x="266" y="330" type="curve" smooth="yes" name="dh02"/>
       <point x="266" y="198"/>
       <point x="339" y="140"/>
-      <point x="498" y="140" type="curve" name="sv02" smooth="yes"/>
+      <point x="498" y="140" type="curve" smooth="yes" name="sv02"/>
       <point x="678" y="140"/>
       <point x="778" y="215"/>
       <point x="805" y="352" type="curve" smooth="yes"/>
       <point x="809" y="372"/>
       <point x="813" y="403"/>
-      <point x="813" y="427" type="curve" name="dh05" smooth="yes"/>
+      <point x="813" y="427" type="curve" smooth="yes" name="dh05"/>
       <point x="813" y="494"/>
       <point x="786" y="527"/>
-      <point x="731" y="527" type="curve" name="dv01" smooth="yes"/>
+      <point x="731" y="527" type="curve" smooth="yes" name="dv01"/>
       <point x="480" y="527" type="line"/>
       <point x="509" y="677" type="line"/>
-      <point x="760" y="677" type="line" name="dv02" smooth="yes"/>
+      <point x="760" y="677" type="line" smooth="yes" name="dv02"/>
       <point x="828" y="677"/>
       <point x="869" y="719"/>
       <point x="884" y="799" type="curve" smooth="yes"/>
       <point x="887" y="814"/>
       <point x="888" y="827"/>
-      <point x="888" y="838" type="curve" name="ih01" smooth="yes"/>
+      <point x="888" y="838" type="curve" smooth="yes" name="ih01"/>
       <point x="888" y="889"/>
       <point x="861" y="914"/>
-      <point x="806" y="914" type="curve" name="dv03" smooth="yes"/>
+      <point x="806" y="914" type="curve" smooth="yes" name="dv03"/>
       <point x="555" y="914" type="line"/>
       <point x="585" y="1066" type="line"/>
-      <point x="834" y="1066" type="line" name="dv04" smooth="yes"/>
+      <point x="834" y="1066" type="line" smooth="yes" name="dv04"/>
       <point x="895" y="1066"/>
       <point x="934" y="1110"/>
       <point x="952" y="1198" type="curve" smooth="yes"/>
@@ -55,14 +55,14 @@
       <point x="718" y="1316" type="curve" smooth="yes"/>
       <point x="657" y="1327"/>
       <point x="526" y="1347"/>
-      <point x="526" y="1497" type="curve" name="dh03" smooth="yes"/>
+      <point x="526" y="1497" type="curve" smooth="yes" name="dh03"/>
       <point x="526" y="1515"/>
       <point x="528" y="1535"/>
       <point x="532" y="1556" type="curve" name="sh01"/>
       <point x="698" y="1556" type="line"/>
       <point x="697" y="1549"/>
       <point x="696" y="1544"/>
-      <point x="696" y="1536" type="curve" name="dh04" smooth="yes"/>
+      <point x="696" y="1536" type="curve" smooth="yes" name="dh04"/>
       <point x="696" y="1447"/>
       <point x="834" y="1425"/>
       <point x="946" y="1409" type="curve" smooth="yes"/>
@@ -78,7 +78,7 @@
       <point x="953" y="987" type="line"/>
       <point x="1040" y="954"/>
       <point x="1074" y="904"/>
-      <point x="1074" y="836" type="curve" name="sh02" smooth="yes"/>
+      <point x="1074" y="836" type="curve" smooth="yes" name="sh02"/>
       <point x="1074" y="825"/>
       <point x="1073" y="811"/>
       <point x="1070" y="796" type="curve" smooth="yes"/>
@@ -88,7 +88,7 @@
       <point x="882" y="592" type="line" name="sh03"/>
       <point x="967" y="535"/>
       <point x="999" y="467"/>
-      <point x="999" y="412" type="curve" name="dh06" smooth="yes"/>
+      <point x="999" y="412" type="curve" smooth="yes" name="dh06"/>
       <point x="999" y="401"/>
       <point x="999" y="377"/>
       <point x="996" y="360" type="curve" name="sh04"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10F_1.glif b/source/Hack-Italic.ufo/glyphs/uni10F_1.glif
index 46ed98f0e..92368485d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10F_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10F_1.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F1" format="1">
+<glyph name="uni10F1" format="2">
   <advance width="1233"/>
   <unicode hex="10F1"/>
   <outline>
     <contour>
-      <point x="456" y="-423" type="curve" name="dv01" smooth="yes"/>
+      <point x="456" y="-423" type="curve" smooth="yes" name="dv01"/>
       <point x="151" y="-423"/>
       <point x="4" y="-305"/>
-      <point x="4" y="-84" type="curve" name="dh01" smooth="yes"/>
+      <point x="4" y="-84" type="curve" smooth="yes" name="dh01"/>
       <point x="4" y="-47"/>
       <point x="8" y="-2"/>
       <point x="16" y="49" type="curve" smooth="yes"/>
@@ -16,14 +16,14 @@
       <point x="184" y="617" type="curve" smooth="yes"/>
       <point x="224" y="720"/>
       <point x="252" y="818"/>
-      <point x="252" y="979" type="curve" name="dh02" smooth="yes"/>
+      <point x="252" y="979" type="curve" smooth="yes" name="dh02"/>
       <point x="252" y="1039"/>
       <point x="248" y="1099"/>
       <point x="239" y="1163" type="curve" name="sh01"/>
       <point x="424" y="1163" type="line" name="hr01"/>
       <point x="430" y="1117"/>
       <point x="433" y="1070"/>
-      <point x="433" y="1023" type="curve" name="dh03" smooth="yes"/>
+      <point x="433" y="1023" type="curve" smooth="yes" name="dh03"/>
       <point x="433" y="892"/>
       <point x="410" y="757"/>
       <point x="365" y="617" type="curve"/>
@@ -32,10 +32,10 @@
       <point x="204" y="49" type="curve" smooth="yes"/>
       <point x="197" y="16"/>
       <point x="194" y="-12"/>
-      <point x="194" y="-45" type="curve" name="hr02" smooth="yes"/>
+      <point x="194" y="-45" type="curve" smooth="yes" name="hr02"/>
       <point x="194" y="-210"/>
       <point x="290" y="-284"/>
-      <point x="489" y="-284" type="curve" name="dv02" smooth="yes"/>
+      <point x="489" y="-284" type="curve" smooth="yes" name="dv02"/>
       <point x="659" y="-284"/>
       <point x="733" y="-231"/>
       <point x="760" y="-124" type="curve" smooth="yes"/>
@@ -44,59 +44,59 @@
       <point x="769" y="-49" type="curve" smooth="yes"/>
       <point x="769" y="34"/>
       <point x="735" y="76"/>
-      <point x="666" y="76" type="curve" name="hr03" smooth="yes"/>
+      <point x="666" y="76" type="curve" smooth="yes" name="hr03"/>
       <point x="530" y="76" type="line"/>
       <point x="557" y="218" type="line"/>
-      <point x="693" y="218" type="line" name="dv03" smooth="yes"/>
+      <point x="693" y="218" type="line" smooth="yes" name="dv03"/>
       <point x="780" y="218"/>
       <point x="835" y="262"/>
       <point x="854" y="353" type="curve" smooth="yes"/>
       <point x="858" y="374"/>
       <point x="860" y="393"/>
-      <point x="860" y="411" type="curve" name="ih01" smooth="yes"/>
+      <point x="860" y="411" type="curve" smooth="yes" name="ih01"/>
       <point x="860" y="482"/>
       <point x="824" y="517"/>
-      <point x="753" y="517" type="curve" name="hr04" smooth="yes"/>
+      <point x="753" y="517" type="curve" smooth="yes" name="hr04"/>
       <point x="615" y="517" type="line"/>
       <point x="642" y="655" type="line"/>
-      <point x="780" y="655" type="line" name="dv06" smooth="yes"/>
+      <point x="780" y="655" type="line" smooth="yes" name="dv06"/>
       <point x="872" y="655"/>
       <point x="924" y="711"/>
       <point x="943" y="811" type="curve" smooth="yes"/>
       <point x="946" y="826"/>
       <point x="947" y="839"/>
-      <point x="947" y="850" type="curve" name="sh02" smooth="yes"/>
+      <point x="947" y="850" type="curve" smooth="yes" name="sh02"/>
       <point x="947" y="911"/>
       <point x="912" y="942"/>
-      <point x="836" y="942" type="curve" name="dv04" smooth="yes"/>
+      <point x="836" y="942" type="curve" smooth="yes" name="dv04"/>
       <point x="698" y="942" type="line" name="hr05"/>
       <point x="726" y="1087" type="line"/>
-      <point x="862" y="1087" type="line" name="dv05" smooth="yes"/>
+      <point x="862" y="1087" type="line" smooth="yes" name="dv05"/>
       <point x="951" y="1087"/>
       <point x="1005" y="1134"/>
       <point x="1024" y="1229" type="curve" smooth="yes"/>
       <point x="1025" y="1232"/>
       <point x="1025" y="1236"/>
-      <point x="1025" y="1241" type="curve" name="sh04" smooth="yes"/>
+      <point x="1025" y="1241" type="curve" smooth="yes" name="sh04"/>
       <point x="1025" y="1290"/>
       <point x="970" y="1324"/>
       <point x="860" y="1344" type="curve"/>
       <point x="786" y="1362"/>
       <point x="749" y="1411"/>
-      <point x="749" y="1492" type="curve" name="hr06" smooth="yes"/>
+      <point x="749" y="1492" type="curve" smooth="yes" name="hr06"/>
       <point x="749" y="1511"/>
       <point x="751" y="1533"/>
       <point x="755" y="1556" type="curve" name="sh05"/>
       <point x="921" y="1556" type="line"/>
       <point x="920" y="1554"/>
       <point x="920" y="1551"/>
-      <point x="920" y="1546" type="curve" name="at01" smooth="yes"/>
+      <point x="920" y="1546" type="curve" smooth="yes" name="at01"/>
       <point x="920" y="1490"/>
       <point x="1001" y="1458"/>
       <point x="1086" y="1429" type="curve" smooth="yes"/>
       <point x="1131" y="1413"/>
       <point x="1208" y="1383"/>
-      <point x="1208" y="1274" type="curve" name="sh06" smooth="yes"/>
+      <point x="1208" y="1274" type="curve" smooth="yes" name="sh06"/>
       <point x="1208" y="1262"/>
       <point x="1207" y="1246"/>
       <point x="1204" y="1229" type="curve" smooth="yes"/>
@@ -106,7 +106,7 @@
       <point x="982" y="1010" type="line"/>
       <point x="1086" y="985"/>
       <point x="1127" y="932"/>
-      <point x="1127" y="855" type="curve" name="sh07" smooth="yes"/>
+      <point x="1127" y="855" type="curve" smooth="yes" name="sh07"/>
       <point x="1127" y="843"/>
       <point x="1126" y="827"/>
       <point x="1123" y="811" type="curve" smooth="yes"/>
@@ -116,7 +116,7 @@
       <point x="897" y="574" type="line"/>
       <point x="992" y="553"/>
       <point x="1039" y="499"/>
-      <point x="1039" y="411" type="curve" name="sh03" smooth="yes"/>
+      <point x="1039" y="411" type="curve" smooth="yes" name="sh03"/>
       <point x="1039" y="392"/>
       <point x="1037" y="374"/>
       <point x="1034" y="353" type="curve"/>
@@ -126,7 +126,7 @@
       <point x="813" y="139" type="line"/>
       <point x="905" y="107"/>
       <point x="948" y="44"/>
-      <point x="948" y="-52" type="curve" name="dh04" smooth="yes"/>
+      <point x="948" y="-52" type="curve" smooth="yes" name="dh04"/>
       <point x="948" y="-73"/>
       <point x="946" y="-97"/>
       <point x="941" y="-124" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10F_2.glif b/source/Hack-Italic.ufo/glyphs/uni10F_2.glif
index 0b17b3cba..787656acd 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10F_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10F_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F2" format="1">
+<glyph name="uni10F2" format="2">
   <advance width="1233"/>
   <unicode hex="10F2"/>
   <outline>
@@ -10,16 +10,16 @@
       <point x="360" y="29" type="curve" name="sh03"/>
       <point x="235" y="119"/>
       <point x="172" y="240"/>
-      <point x="172" y="391" type="curve" name="sh01" smooth="yes"/>
+      <point x="172" y="391" type="curve" smooth="yes" name="sh01"/>
       <point x="172" y="430"/>
       <point x="176" y="474"/>
-      <point x="185" y="519" type="curve" name="sh04" smooth="yes"/>
+      <point x="185" y="519" type="curve" smooth="yes" name="sh04"/>
       <point x="257" y="886"/>
       <point x="509" y="1045"/>
-      <point x="734" y="1045" type="curve" name="dv02" smooth="yes"/>
+      <point x="734" y="1045" type="curve" smooth="yes" name="dv02"/>
       <point x="938" y="1045"/>
       <point x="1120" y="913"/>
-      <point x="1120" y="685" type="curve" name="sh05" smooth="yes"/>
+      <point x="1120" y="685" type="curve" smooth="yes" name="sh05"/>
       <point x="1120" y="642"/>
       <point x="1114" y="583"/>
       <point x="1101" y="519" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="725" y="29" type="curve"/>
       <point x="772" y="-30"/>
       <point x="840" y="-60"/>
-      <point x="928" y="-60" type="curve" name="sh06" smooth="yes"/>
+      <point x="928" y="-60" type="curve" smooth="yes" name="sh06"/>
       <point x="943" y="-60" type="line" name="sh07"/>
       <point x="902" y="-269" type="line" name="av01"/>
       <point x="735" y="-223"/>
@@ -45,16 +45,16 @@
       <point x="914" y="519" type="curve" smooth="yes"/>
       <point x="925" y="572"/>
       <point x="930" y="620"/>
-      <point x="930" y="663" type="curve" name="ah01" smooth="yes"/>
+      <point x="930" y="663" type="curve" smooth="yes" name="ah01"/>
       <point x="930" y="824"/>
       <point x="854" y="902"/>
-      <point x="718" y="902" type="curve" name="dv01" smooth="yes"/>
+      <point x="718" y="902" type="curve" smooth="yes" name="dv01"/>
       <point x="532" y="902"/>
       <point x="409" y="756"/>
-      <point x="369" y="519" type="curve" name="sh08" smooth="yes"/>
+      <point x="369" y="519" type="curve" smooth="yes" name="sh08"/>
       <point x="362" y="478"/>
       <point x="358" y="430"/>
-      <point x="358" y="397" type="curve" name="sh02" smooth="yes"/>
+      <point x="358" y="397" type="curve" smooth="yes" name="sh02"/>
       <point x="358" y="260"/>
       <point x="428" y="161"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10F_3.glif b/source/Hack-Italic.ufo/glyphs/uni10F_3.glif
index 707ec671c..4a6c4f94b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10F_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10F_3.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F3" format="1">
+<glyph name="uni10F3" format="2">
   <advance width="1233"/>
   <unicode hex="10F3"/>
   <outline>
     <contour>
-      <point x="501" y="-283" type="curve" name="dv02" smooth="yes"/>
+      <point x="501" y="-283" type="curve" smooth="yes" name="dv02"/>
       <point x="680" y="-283"/>
       <point x="789" y="-197"/>
       <point x="822" y="-20" type="curve" smooth="yes"/>
-      <point x="828" y="12" type="line" name="sh01" smooth="yes"/>
+      <point x="828" y="12" type="line" smooth="yes" name="sh01"/>
       <point x="834" y="43"/>
       <point x="837" y="71"/>
-      <point x="837" y="97" type="curve" name="ah01" smooth="yes"/>
+      <point x="837" y="97" type="curve" smooth="yes" name="ah01"/>
       <point x="837" y="239"/>
       <point x="748" y="310"/>
-      <point x="570" y="310" type="curve" name="dv03" smooth="yes"/>
+      <point x="570" y="310" type="curve" smooth="yes" name="dv03"/>
       <point x="454" y="310" type="line"/>
       <point x="485" y="470" type="line"/>
-      <point x="599" y="470" type="line" name="dv04" smooth="yes"/>
+      <point x="599" y="470" type="line" smooth="yes" name="dv04"/>
       <point x="798" y="470"/>
       <point x="918" y="611"/>
       <point x="955" y="827" type="curve" smooth="yes"/>
@@ -32,17 +32,17 @@
       <point x="817" y="396" type="curve" name="ih01"/>
       <point x="957" y="333"/>
       <point x="1027" y="234"/>
-      <point x="1027" y="100" type="curve" name="sh04" smooth="yes"/>
+      <point x="1027" y="100" type="curve" smooth="yes" name="sh04"/>
       <point x="1027" y="72"/>
       <point x="1024" y="43"/>
-      <point x="1018" y="12" type="curve" name="sh05" smooth="yes"/>
+      <point x="1018" y="12" type="curve" smooth="yes" name="sh05"/>
       <point x="1012" y="-20" type="line" smooth="yes"/>
       <point x="959" y="-299"/>
       <point x="710" y="-424"/>
-      <point x="483" y="-424" type="curve" name="dv01" smooth="yes"/>
+      <point x="483" y="-424" type="curve" smooth="yes" name="dv01"/>
       <point x="274" y="-424"/>
       <point x="83" y="-318"/>
-      <point x="83" y="-127" type="curve" name="sh02" smooth="yes"/>
+      <point x="83" y="-127" type="curve" smooth="yes" name="sh02"/>
       <point x="83" y="-99"/>
       <point x="87" y="-60"/>
       <point x="95" y="-20" type="curve" name="sh06"/>
@@ -51,7 +51,7 @@
       <point x="285" y="-20" type="line" name="sh07"/>
       <point x="280" y="-48"/>
       <point x="277" y="-74"/>
-      <point x="277" y="-99" type="curve" name="sh03" smooth="yes"/>
+      <point x="277" y="-99" type="curve" smooth="yes" name="sh03"/>
       <point x="277" y="-222"/>
       <point x="352" y="-283"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10F_4.glif b/source/Hack-Italic.ufo/glyphs/uni10F_4.glif
index fecad4f2b..7e5f371f0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10F_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10F_4.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F4" format="1">
+<glyph name="uni10F4" format="2">
   <advance width="1233"/>
   <unicode hex="10F4"/>
   <outline>
     <contour>
-      <point x="425" y="-425" type="curve" name="dv01" smooth="yes"/>
+      <point x="425" y="-425" type="curve" smooth="yes" name="dv01"/>
       <point x="164" y="-425"/>
       <point x="34" y="-327"/>
-      <point x="34" y="-131" type="curve" name="dh01" smooth="yes"/>
+      <point x="34" y="-131" type="curve" smooth="yes" name="dh01"/>
       <point x="34" y="-96"/>
       <point x="38" y="-60"/>
       <point x="45" y="-20" type="curve" name="sh01"/>
       <point x="235" y="-20" type="line" name="sv01"/>
       <point x="230" y="-49"/>
       <point x="227" y="-75"/>
-      <point x="227" y="-100" type="curve" name="dh02" smooth="yes"/>
+      <point x="227" y="-100" type="curve" smooth="yes" name="dh02"/>
       <point x="227" y="-223"/>
       <point x="302" y="-284"/>
-      <point x="452" y="-284" type="curve" name="dv02" smooth="yes"/>
+      <point x="452" y="-284" type="curve" smooth="yes" name="dv02"/>
       <point x="629" y="-284"/>
       <point x="736" y="-196"/>
       <point x="771" y="-20" type="curve" smooth="yes"/>
       <point x="782" y="35" type="line" smooth="yes"/>
       <point x="786" y="56"/>
       <point x="788" y="80"/>
-      <point x="788" y="99" type="curve" name="dh05" smooth="yes"/>
+      <point x="788" y="99" type="curve" smooth="yes" name="dh05"/>
       <point x="788" y="214"/>
       <point x="710" y="271"/>
-      <point x="553" y="271" type="curve" name="dv03" smooth="yes"/>
+      <point x="553" y="271" type="curve" smooth="yes" name="dv03"/>
       <point x="397" y="271" type="line"/>
       <point x="427" y="428" type="line" name="sh02"/>
       <point x="583" y="428" type="line" name="dv04"/>
@@ -36,17 +36,17 @@
       <point x="942" y="853" type="curve" name="ih01"/>
       <point x="855" y="828"/>
       <point x="764" y="816"/>
-      <point x="667" y="816" type="curve" name="dv05" smooth="yes"/>
+      <point x="667" y="816" type="curve" smooth="yes" name="dv05"/>
       <point x="659" y="816" type="line" smooth="yes"/>
       <point x="398" y="816"/>
       <point x="267" y="904"/>
-      <point x="267" y="1081" type="curve" name="dh03" smooth="yes"/>
+      <point x="267" y="1081" type="curve" smooth="yes" name="dh03"/>
       <point x="267" y="1108"/>
       <point x="270" y="1138"/>
       <point x="276" y="1170" type="curve" smooth="yes"/>
       <point x="323" y="1426"/>
       <point x="503" y="1557"/>
-      <point x="808" y="1557" type="curve" name="at01" smooth="yes"/>
+      <point x="808" y="1557" type="curve" smooth="yes" name="at01"/>
       <point x="811" y="1557" type="line"/>
       <point x="783" y="1415" type="line" name="sh03"/>
       <point x="571" y="1415"/>
@@ -54,10 +54,10 @@
       <point x="423" y="1169" type="curve" smooth="yes"/>
       <point x="420" y="1153"/>
       <point x="418" y="1138"/>
-      <point x="418" y="1122" type="curve" name="dh04" smooth="yes"/>
+      <point x="418" y="1122" type="curve" smooth="yes" name="dh04"/>
       <point x="418" y="1014"/>
       <point x="512" y="959"/>
-      <point x="685" y="959" type="curve" name="dv06" smooth="yes"/>
+      <point x="685" y="959" type="curve" smooth="yes" name="dv06"/>
       <point x="853" y="959"/>
       <point x="1009" y="1012"/>
       <point x="1184" y="1127" type="curve"/>
@@ -68,7 +68,7 @@
       <point x="724" y="343" type="line"/>
       <point x="891" y="308"/>
       <point x="979" y="229"/>
-      <point x="979" y="100" type="curve" name="hr02" smooth="yes"/>
+      <point x="979" y="100" type="curve" smooth="yes" name="hr02"/>
       <point x="979" y="81"/>
       <point x="977" y="56"/>
       <point x="973" y="35" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10F_5.glif b/source/Hack-Italic.ufo/glyphs/uni10F_5.glif
index 743150908..f6fc92e9c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10F_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10F_5.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F5" format="1">
+<glyph name="uni10F5" format="2">
   <advance width="1233"/>
   <unicode hex="10F5"/>
   <outline>
     <contour>
-      <point x="442" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="442" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="181" y="0"/>
       <point x="45" y="85"/>
-      <point x="45" y="258" type="curve" name="dh01" smooth="yes"/>
+      <point x="45" y="258" type="curve" smooth="yes" name="dh01"/>
       <point x="45" y="283"/>
       <point x="48" y="307"/>
       <point x="53" y="335" type="curve" smooth="yes"/>
@@ -19,16 +19,16 @@
       <point x="606" y="856" type="line" smooth="yes"/>
       <point x="345" y="856"/>
       <point x="215" y="947"/>
-      <point x="215" y="1130" type="curve" name="ih01" smooth="yes"/>
+      <point x="215" y="1130" type="curve" smooth="yes" name="ih01"/>
       <point x="215" y="1159"/>
       <point x="218" y="1189"/>
-      <point x="225" y="1220" type="curve" name="hr01" smooth="yes"/>
+      <point x="225" y="1220" type="curve" smooth="yes" name="hr01"/>
       <point x="270" y="1439"/>
       <point x="433" y="1557"/>
-      <point x="742" y="1557" type="curve" name="at01" smooth="yes"/>
+      <point x="742" y="1557" type="curve" smooth="yes" name="at01"/>
       <point x="1005" y="1557"/>
       <point x="1128" y="1474"/>
-      <point x="1128" y="1305" type="curve" name="dh04" smooth="yes"/>
+      <point x="1128" y="1305" type="curve" smooth="yes" name="dh04"/>
       <point x="1128" y="1278"/>
       <point x="1125" y="1247"/>
       <point x="1120" y="1220" type="curve" smooth="yes"/>
@@ -49,22 +49,22 @@
       <point x="950" y="1220" type="line" smooth="yes"/>
       <point x="953" y="1236"/>
       <point x="955" y="1251"/>
-      <point x="955" y="1267" type="curve" name="dh03" smooth="yes"/>
+      <point x="955" y="1267" type="curve" smooth="yes" name="dh03"/>
       <point x="955" y="1366"/>
       <point x="877" y="1415"/>
-      <point x="722" y="1415" type="curve" name="sv04" smooth="yes"/>
+      <point x="722" y="1415" type="curve" smooth="yes" name="sv04"/>
       <point x="543" y="1415"/>
       <point x="441" y="1351"/>
       <point x="414" y="1218" type="curve"/>
       <point x="411" y="1199"/>
       <point x="409" y="1180"/>
-      <point x="409" y="1163" type="curve" name="sh02" smooth="yes"/>
+      <point x="409" y="1163" type="curve" smooth="yes" name="sh02"/>
       <point x="409" y="1057"/>
       <point x="484" y="1004"/>
       <point x="635" y="1004" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="473" y="140" type="curve" name="sv05" smooth="yes"/>
+      <point x="473" y="140" type="curve" smooth="yes" name="sv05"/>
       <point x="652" y="140"/>
       <point x="754" y="210"/>
       <point x="781" y="351" type="curve" smooth="yes"/>
@@ -75,7 +75,7 @@
       <point x="244" y="341" type="curve" smooth="yes"/>
       <point x="241" y="324"/>
       <point x="239" y="309"/>
-      <point x="239" y="293" type="curve" name="dh02" smooth="yes"/>
+      <point x="239" y="293" type="curve" smooth="yes" name="dh02"/>
       <point x="239" y="191"/>
       <point x="317" y="140"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10F_6.glif b/source/Hack-Italic.ufo/glyphs/uni10F_6.glif
index 4db78a88f..dddf7370b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10F_6.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10F_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F6" format="1">
+<glyph name="uni10F6" format="2">
   <advance width="1233"/>
   <unicode hex="10F6"/>
   <outline>
@@ -20,41 +20,41 @@
       <point x="398" y="903"/>
       <point x="348" y="840"/>
       <point x="324" y="715" type="curve" smooth="yes"/>
-      <point x="262" y="396" type="line" name="sh03" smooth="yes"/>
+      <point x="262" y="396" type="line" smooth="yes" name="sh03"/>
       <point x="255" y="360"/>
       <point x="251" y="329"/>
-      <point x="251" y="301" type="curve" name="sh02" smooth="yes"/>
+      <point x="251" y="301" type="curve" smooth="yes" name="sh02"/>
       <point x="251" y="220"/>
       <point x="283" y="179"/>
       <point x="347" y="179" type="curve"/>
       <point x="319" y="31" type="line"/>
       <point x="147" y="32"/>
       <point x="61" y="116"/>
-      <point x="61" y="284" type="curve" name="sh01" smooth="yes"/>
+      <point x="61" y="284" type="curve" smooth="yes" name="sh01"/>
       <point x="61" y="320"/>
       <point x="65" y="363"/>
-      <point x="74" y="410" type="curve" name="sh04" smooth="yes"/>
+      <point x="74" y="410" type="curve" smooth="yes" name="sh04"/>
       <point x="121" y="650" type="line" smooth="yes"/>
       <point x="172" y="913"/>
       <point x="296" y="1046"/>
-      <point x="503" y="1046" type="curve" name="dv03" smooth="yes"/>
+      <point x="503" y="1046" type="curve" smooth="yes" name="dv03"/>
       <point x="625" y="1046"/>
       <point x="699" y="998"/>
       <point x="726" y="901" type="curve" name="sv01"/>
       <point x="742" y="901" type="line"/>
       <point x="799" y="990"/>
       <point x="911" y="1046"/>
-      <point x="1020" y="1046" type="curve" name="sv02" smooth="yes"/>
+      <point x="1020" y="1046" type="curve" smooth="yes" name="sv02"/>
       <point x="1144" y="1046"/>
       <point x="1259" y="971"/>
-      <point x="1259" y="788" type="curve" name="sh05" smooth="yes"/>
+      <point x="1259" y="788" type="curve" smooth="yes" name="sh05"/>
       <point x="1259" y="749"/>
       <point x="1254" y="703"/>
       <point x="1244" y="650" type="curve" smooth="yes"/>
       <point x="1196" y="406" type="line" smooth="yes"/>
       <point x="1144" y="138"/>
       <point x="1017" y="0"/>
-      <point x="821" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="821" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="725" y="0"/>
       <point x="686" y="33"/>
       <point x="681" y="116" type="curve"/>
@@ -65,17 +65,17 @@
       <point x="217" y="-424" type="curve" name="dv01"/>
     </contour>
     <contour>
-      <point x="833" y="145" type="curve" name="sv03" smooth="yes"/>
+      <point x="833" y="145" type="curve" smooth="yes" name="sv03"/>
       <point x="921" y="145"/>
       <point x="968" y="200"/>
       <point x="989" y="312" type="curve" smooth="yes"/>
       <point x="1070" y="729" type="line" name="sh06"/>
       <point x="1075" y="752"/>
       <point x="1077" y="774"/>
-      <point x="1077" y="793" type="curve" name="ah01" smooth="yes"/>
+      <point x="1077" y="793" type="curve" smooth="yes" name="ah01"/>
       <point x="1077" y="868"/>
       <point x="1044" y="904"/>
-      <point x="968" y="904" type="curve" name="sv04" smooth="yes"/>
+      <point x="968" y="904" type="curve" smooth="yes" name="sv04"/>
       <point x="892" y="904" type="line" smooth="yes"/>
       <point x="843" y="904"/>
       <point x="808" y="848"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10F_7.glif b/source/Hack-Italic.ufo/glyphs/uni10F_7.glif
index 93b05b1a5..3038993f0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10F_7.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10F_7.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F7" format="1">
+<glyph name="uni10F7" format="2">
   <advance width="1233"/>
   <unicode hex="10F7"/>
   <outline>
     <contour>
-      <point x="461" y="-423" type="curve" name="dv01" smooth="yes"/>
+      <point x="461" y="-423" type="curve" smooth="yes" name="dv01"/>
       <point x="177" y="-423"/>
       <point x="35" y="-319"/>
-      <point x="35" y="-111" type="curve" name="dh01" smooth="yes"/>
+      <point x="35" y="-111" type="curve" smooth="yes" name="dh01"/>
       <point x="35" y="-76"/>
       <point x="39" y="-40"/>
       <point x="46" y="0" type="curve"/>
@@ -19,10 +19,10 @@
       <point x="835" y="715" type="curve" smooth="yes"/>
       <point x="842" y="739"/>
       <point x="844" y="761"/>
-      <point x="844" y="780" type="curve" name="dh03" smooth="yes"/>
+      <point x="844" y="780" type="curve" smooth="yes" name="dh03"/>
       <point x="844" y="864"/>
       <point x="805" y="903"/>
-      <point x="713" y="903" type="curve" name="dv03" smooth="yes"/>
+      <point x="713" y="903" type="curve" smooth="yes" name="dv03"/>
       <point x="600" y="903"/>
       <point x="527" y="847"/>
       <point x="508" y="744" type="curve"/>
@@ -31,10 +31,10 @@
       <point x="336" y="732" type="line"/>
       <point x="377" y="947"/>
       <point x="523" y="1046"/>
-      <point x="744" y="1046" type="curve" name="dv04" smooth="yes"/>
+      <point x="744" y="1046" type="curve" smooth="yes" name="dv04"/>
       <point x="937" y="1046"/>
       <point x="1034" y="967"/>
-      <point x="1034" y="810" type="curve" name="hr01" smooth="yes"/>
+      <point x="1034" y="810" type="curve" smooth="yes" name="hr01"/>
       <point x="1034" y="778"/>
       <point x="1030" y="735"/>
       <point x="1023" y="702" type="curve" smooth="yes"/>
@@ -46,23 +46,23 @@
       <point x="238" y="8" type="curve" smooth="yes"/>
       <point x="232" y="-23"/>
       <point x="229" y="-52"/>
-      <point x="229" y="-77" type="curve" name="dh02" smooth="yes"/>
+      <point x="229" y="-77" type="curve" smooth="yes" name="dh02"/>
       <point x="229" y="-215"/>
       <point x="317" y="-284"/>
-      <point x="493" y="-284" type="curve" name="dv02" smooth="yes"/>
+      <point x="493" y="-284" type="curve" smooth="yes" name="dv02"/>
       <point x="708" y="-284"/>
       <point x="839" y="-186"/>
       <point x="878" y="13" type="curve" smooth="yes"/>
       <point x="883" y="38"/>
       <point x="885" y="62"/>
-      <point x="885" y="82" type="curve" name="ih01" smooth="yes"/>
+      <point x="885" y="82" type="curve" smooth="yes" name="ih01"/>
       <point x="885" y="129"/>
       <point x="873" y="165"/>
       <point x="848" y="190" type="curve" name="ih02"/>
       <point x="1020" y="282" type="line"/>
       <point x="1057" y="231"/>
       <point x="1075" y="167"/>
-      <point x="1075" y="102" type="curve" name="sh01" smooth="yes"/>
+      <point x="1075" y="102" type="curve" smooth="yes" name="sh01"/>
       <point x="1075" y="75"/>
       <point x="1073" y="36"/>
       <point x="1066" y="0" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10F_8.glif b/source/Hack-Italic.ufo/glyphs/uni10F_8.glif
index d13e023c6..2fe1519e0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10F_8.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10F_8.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F8" format="1">
+<glyph name="uni10F8" format="2">
   <advance width="1233"/>
   <unicode hex="10F8"/>
   <outline>
     <contour>
-      <point x="476" y="-423" type="curve" name="dv01" smooth="yes"/>
+      <point x="476" y="-423" type="curve" smooth="yes" name="dv01"/>
       <point x="212" y="-423"/>
       <point x="82" y="-325"/>
-      <point x="82" y="-132" type="curve" name="sh01" smooth="yes"/>
+      <point x="82" y="-132" type="curve" smooth="yes" name="sh01"/>
       <point x="82" y="-97"/>
       <point x="86" y="-66"/>
       <point x="93" y="-27" type="curve" name="sh02"/>
@@ -16,41 +16,41 @@
       <point x="361" y="458" type="line" smooth="yes"/>
       <point x="358" y="443"/>
       <point x="357" y="430"/>
-      <point x="357" y="419" type="curve" name="hr02" smooth="yes"/>
+      <point x="357" y="419" type="curve" smooth="yes" name="hr02"/>
       <point x="357" y="318"/>
       <point x="452" y="267"/>
-      <point x="593" y="267" type="curve" name="dv04" smooth="yes"/>
+      <point x="593" y="267" type="curve" smooth="yes" name="dv04"/>
       <point x="803" y="267"/>
       <point x="906" y="376"/>
-      <point x="938" y="571" type="curve" name="sh03" smooth="yes"/>
+      <point x="938" y="571" type="curve" smooth="yes" name="sh03"/>
       <point x="943" y="602"/>
       <point x="946" y="630"/>
-      <point x="946" y="658" type="curve" name="ah01" smooth="yes"/>
+      <point x="946" y="658" type="curve" smooth="yes" name="ah01"/>
       <point x="946" y="789"/>
       <point x="883" y="904"/>
       <point x="758" y="1001" type="curve"/>
       <point x="942" y="1064" type="line" name="sh04"/>
       <point x="1067" y="944"/>
       <point x="1134" y="809"/>
-      <point x="1134" y="672" type="curve" name="sh05" smooth="yes"/>
+      <point x="1134" y="672" type="curve" smooth="yes" name="sh05"/>
       <point x="1134" y="644"/>
       <point x="1131" y="606"/>
-      <point x="1126" y="571" type="curve" name="sh06" smooth="yes"/>
+      <point x="1126" y="571" type="curve" smooth="yes" name="sh06"/>
       <point x="1086" y="296"/>
       <point x="893" y="115"/>
-      <point x="588" y="115" type="curve" name="dv03" smooth="yes"/>
+      <point x="588" y="115" type="curve" smooth="yes" name="dv03"/>
       <point x="584" y="115" type="line" smooth="yes"/>
       <point x="461" y="115"/>
       <point x="376" y="145"/>
       <point x="331" y="204" type="curve"/>
       <point x="311" y="204" type="line"/>
-      <point x="267" y="-23" type="line" name="sh08" smooth="yes"/>
+      <point x="267" y="-23" type="line" smooth="yes" name="sh08"/>
       <point x="262" y="-50"/>
       <point x="259" y="-73"/>
-      <point x="259" y="-97" type="curve" name="sh07" smooth="yes"/>
+      <point x="259" y="-97" type="curve" smooth="yes" name="sh07"/>
       <point x="259" y="-221"/>
       <point x="341" y="-283"/>
-      <point x="506" y="-283" type="curve" name="dv02" smooth="yes"/>
+      <point x="506" y="-283" type="curve" smooth="yes" name="dv02"/>
       <point x="509" y="-283" type="line" smooth="yes"/>
       <point x="684" y="-283"/>
       <point x="789" y="-196"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10F_9.glif b/source/Hack-Italic.ufo/glyphs/uni10F_9.glif
index 382c6a3a4..d1cfc8d0d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10F_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10F_9.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F9" format="1">
+<glyph name="uni10F9" format="2">
   <advance width="1233"/>
   <unicode hex="10F9"/>
   <outline>
     <contour>
-      <point x="490" y="-425" type="curve" name="dv01" smooth="yes"/>
+      <point x="490" y="-425" type="curve" smooth="yes" name="dv01"/>
       <point x="285" y="-425"/>
       <point x="190" y="-353"/>
-      <point x="190" y="-200" type="curve" name="ih01" smooth="yes"/>
+      <point x="190" y="-200" type="curve" smooth="yes" name="ih01"/>
       <point x="190" y="-173"/>
       <point x="193" y="-144"/>
       <point x="199" y="-113" type="curve" smooth="yes"/>
@@ -16,16 +16,16 @@
       <point x="500" y="202" type="curve" name="ih02"/>
       <point x="273" y="252"/>
       <point x="160" y="362"/>
-      <point x="160" y="532" type="curve" name="dh01" smooth="yes"/>
+      <point x="160" y="532" type="curve" smooth="yes" name="dh01"/>
       <point x="160" y="559"/>
       <point x="163" y="588"/>
       <point x="169" y="619" type="curve" smooth="yes"/>
       <point x="228" y="924"/>
       <point x="503" y="1061"/>
-      <point x="753" y="1061" type="curve" name="dv02" smooth="yes"/>
+      <point x="753" y="1061" type="curve" smooth="yes" name="dv02"/>
       <point x="984" y="1061"/>
       <point x="1194" y="944"/>
-      <point x="1194" y="735" type="curve" name="dh04" smooth="yes"/>
+      <point x="1194" y="735" type="curve" smooth="yes" name="dh04"/>
       <point x="1194" y="706"/>
       <point x="1190" y="660"/>
       <point x="1182" y="619" type="curve" smooth="yes"/>
@@ -37,10 +37,10 @@
       <point x="385" y="-102" type="curve" smooth="yes"/>
       <point x="381" y="-122"/>
       <point x="379" y="-145"/>
-      <point x="379" y="-164" type="curve" name="sh01" smooth="yes"/>
+      <point x="379" y="-164" type="curve" smooth="yes" name="sh01"/>
       <point x="379" y="-247"/>
       <point x="421" y="-284"/>
-      <point x="520" y="-284" type="curve" name="hr01" smooth="yes"/>
+      <point x="520" y="-284" type="curve" smooth="yes" name="hr01"/>
       <point x="631" y="-284"/>
       <point x="711" y="-236"/>
       <point x="730" y="-143" type="curve" smooth="yes"/>
@@ -57,16 +57,16 @@
       <point x="995" y="619" type="curve" smooth="yes"/>
       <point x="1001" y="650"/>
       <point x="1004" y="677"/>
-      <point x="1004" y="702" type="curve" name="dh03" smooth="yes"/>
+      <point x="1004" y="702" type="curve" smooth="yes" name="dh03"/>
       <point x="1004" y="847"/>
       <point x="913" y="917"/>
-      <point x="741" y="917" type="curve" name="hr02" smooth="yes"/>
+      <point x="741" y="917" type="curve" smooth="yes" name="hr02"/>
       <point x="529" y="917"/>
       <point x="390" y="811"/>
-      <point x="359" y="619" type="curve" name="sh02" smooth="yes"/>
+      <point x="359" y="619" type="curve" smooth="yes" name="sh02"/>
       <point x="355" y="592"/>
       <point x="353" y="568"/>
-      <point x="353" y="549" type="curve" name="dh02" smooth="yes"/>
+      <point x="353" y="549" type="curve" smooth="yes" name="dh02"/>
       <point x="353" y="430"/>
       <point x="438" y="347"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10F_A_.glif b/source/Hack-Italic.ufo/glyphs/uni10F_A_.glif
index c119fbcf3..2301a8519 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10F_A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10F_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10FA" format="1">
+<glyph name="uni10FA" format="2">
   <advance width="1233"/>
   <unicode hex="10FA"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="591" y="-68" type="curve" smooth="yes"/>
       <point x="559" y="-28"/>
       <point x="512" y="-8"/>
-      <point x="451" y="-8" type="curve" name="ab01" smooth="yes"/>
+      <point x="451" y="-8" type="curve" smooth="yes" name="ab01"/>
       <point x="364" y="-8"/>
       <point x="290" y="-47"/>
       <point x="230" y="-124" type="curve" name="av01"/>
@@ -21,7 +21,7 @@
       <point x="328" y="106" type="line"/>
       <point x="225" y="193"/>
       <point x="174" y="311"/>
-      <point x="174" y="460" type="curve" name="sh01" smooth="yes"/>
+      <point x="174" y="460" type="curve" smooth="yes" name="sh01"/>
       <point x="174" y="507"/>
       <point x="179" y="557"/>
       <point x="190" y="608" type="curve" smooth="yes"/>
@@ -30,23 +30,23 @@
       <point x="759" y="1046" type="curve" name="dv02"/>
       <point x="1005" y="1025"/>
       <point x="1128" y="932"/>
-      <point x="1128" y="768" type="curve" name="sh02" smooth="yes"/>
+      <point x="1128" y="768" type="curve" smooth="yes" name="sh02"/>
       <point x="1128" y="634"/>
       <point x="1048" y="454"/>
       <point x="888" y="227" type="curve"/>
       <point x="754" y="288" type="line"/>
       <point x="881" y="483"/>
       <point x="944" y="631"/>
-      <point x="944" y="734" type="curve" name="ah01" smooth="yes"/>
+      <point x="944" y="734" type="curve" smooth="yes" name="ah01"/>
       <point x="944" y="843"/>
       <point x="870" y="903"/>
-      <point x="725" y="903" type="curve" name="dv01" smooth="yes"/>
+      <point x="725" y="903" type="curve" smooth="yes" name="dv01"/>
       <point x="538" y="903"/>
       <point x="420" y="806"/>
       <point x="381" y="610" type="curve" smooth="yes"/>
       <point x="372" y="565"/>
       <point x="366" y="507"/>
-      <point x="366" y="452" type="curve" name="sh03" smooth="yes"/>
+      <point x="366" y="452" type="curve" smooth="yes" name="sh03"/>
       <point x="366" y="375"/>
       <point x="378" y="275"/>
       <point x="501" y="147" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10F_B_.glif b/source/Hack-Italic.ufo/glyphs/uni10F_B_.glif
index fa538ced6..b957aafa2 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10F_B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10F_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10FB" format="1">
+<glyph name="uni10FB" format="2">
   <advance width="1233"/>
   <unicode hex="10FB"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni10F_C_.glif b/source/Hack-Italic.ufo/glyphs/uni10F_C_.glif
index 36c8f14ad..621ec8532 100644
--- a/source/Hack-Italic.ufo/glyphs/uni10F_C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni10F_C_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10FC" format="1">
+<glyph name="uni10FC" format="2">
   <advance width="1233"/>
   <unicode hex="10FC"/>
   <outline>
     <contour>
-      <point x="371" y="938" type="curve" name="hr00" smooth="yes"/>
+      <point x="371" y="938" type="curve" smooth="yes" name="hr00"/>
       <point x="371" y="965"/>
       <point x="375" y="1003"/>
-      <point x="383" y="1043" type="curve" name="sh01" smooth="yes"/>
+      <point x="383" y="1043" type="curve" smooth="yes" name="sh01"/>
       <point x="447" y="1375" type="line" smooth="yes"/>
       <point x="471" y="1500"/>
       <point x="548" y="1556"/>
-      <point x="668" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="668" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="903" y="1556" type="line"/>
       <point x="887" y="1474" type="line" name="sv01"/>
       <point x="629" y="1476" type="line"/>
@@ -22,33 +22,33 @@
       <point x="651" y="1316" type="line" name="dv04"/>
       <point x="761" y="1316"/>
       <point x="816" y="1259"/>
-      <point x="816" y="1144" type="curve" name="sh02" smooth="yes"/>
+      <point x="816" y="1144" type="curve" smooth="yes" name="sh02"/>
       <point x="816" y="1113"/>
       <point x="812" y="1080"/>
-      <point x="805" y="1043" type="curve" name="sh03" smooth="yes"/>
+      <point x="805" y="1043" type="curve" smooth="yes" name="sh03"/>
       <point x="765" y="840"/>
       <point x="646" y="755"/>
-      <point x="542" y="755" type="curve" name="dv01" smooth="yes"/>
+      <point x="542" y="755" type="curve" smooth="yes" name="dv01"/>
       <point x="450" y="755"/>
       <point x="371" y="823"/>
     </contour>
     <contour>
-      <point x="552" y="836" type="curve" name="dv02" smooth="yes"/>
+      <point x="552" y="836" type="curve" smooth="yes" name="dv02"/>
       <point x="637" y="836"/>
       <point x="688" y="915"/>
-      <point x="712" y="1043" type="curve" name="sh04" smooth="yes"/>
+      <point x="712" y="1043" type="curve" smooth="yes" name="sh04"/>
       <point x="717" y="1070"/>
       <point x="720" y="1092"/>
-      <point x="720" y="1115" type="curve" name="ah01" smooth="yes"/>
+      <point x="720" y="1115" type="curve" smooth="yes" name="ah01"/>
       <point x="720" y="1187"/>
       <point x="686" y="1223"/>
-      <point x="625" y="1223" type="curve" name="dv03" smooth="yes"/>
+      <point x="625" y="1223" type="curve" smooth="yes" name="dv03"/>
       <point x="548" y="1223"/>
       <point x="501" y="1165"/>
-      <point x="474" y="1037" type="curve" name="sh06" smooth="yes"/>
+      <point x="474" y="1037" type="curve" smooth="yes" name="sh06"/>
       <point x="467" y="1004"/>
       <point x="464" y="972"/>
-      <point x="464" y="948" type="curve" name="sh05" smooth="yes"/>
+      <point x="464" y="948" type="curve" smooth="yes" name="sh05"/>
       <point x="464" y="873"/>
       <point x="493" y="836"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni1E_B_C_.glif b/source/Hack-Italic.ufo/glyphs/uni1E_B_C_.glif
index 7f6999f81..02fba4f9b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni1E_B_C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni1E_B_C_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni1EBC" format="1">
+<glyph name="uni1EBC" format="2">
   <advance width="1233"/>
   <unicode hex="1EBC"/>
   <outline>
     <contour>
-      <point x="700" y="1728" type="curve" name="hr00" smooth="yes"/>
+      <point x="700" y="1728" type="curve" smooth="yes" name="hr00"/>
       <point x="724" y="1728"/>
       <point x="751" y="1717"/>
       <point x="780" y="1696" type="curve" smooth="yes"/>
@@ -12,21 +12,21 @@
       <point x="816" y="1670" type="line" smooth="yes"/>
       <point x="859" y="1638"/>
       <point x="894" y="1627"/>
-      <point x="938" y="1627" type="curve" name="hr01" smooth="yes"/>
+      <point x="938" y="1627" type="curve" smooth="yes" name="hr01"/>
       <point x="1051" y="1627"/>
       <point x="1140" y="1702"/>
       <point x="1183" y="1846" type="curve" name="hr02"/>
       <point x="1058" y="1846" type="line"/>
       <point x="1042" y="1783"/>
       <point x="1005" y="1746"/>
-      <point x="950" y="1746" type="curve" name="hr03" smooth="yes"/>
+      <point x="950" y="1746" type="curve" smooth="yes" name="hr03"/>
       <point x="926" y="1746"/>
       <point x="902" y="1755"/>
       <point x="878" y="1773" type="curve" smooth="yes"/>
       <point x="843" y="1799" type="line" smooth="yes"/>
       <point x="801" y="1830"/>
       <point x="756" y="1846"/>
-      <point x="708" y="1846" type="curve" name="hr04" smooth="yes"/>
+      <point x="708" y="1846" type="curve" smooth="yes" name="hr04"/>
       <point x="599" y="1846"/>
       <point x="515" y="1771"/>
       <point x="468" y="1627" type="curve" name="hr05"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni1E_B_D_.glif b/source/Hack-Italic.ufo/glyphs/uni1E_B_D_.glif
index 76e635cb8..b80f548e1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni1E_B_D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni1E_B_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni1EBD" format="1">
+<glyph name="uni1EBD" format="2">
   <advance width="1233"/>
   <unicode hex="1EBD"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni1E_F_8.glif b/source/Hack-Italic.ufo/glyphs/uni1E_F_8.glif
index 2736d0bbe..c5034b3ab 100644
--- a/source/Hack-Italic.ufo/glyphs/uni1E_F_8.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni1E_F_8.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni1EF8" format="1">
+<glyph name="uni1EF8" format="2">
   <advance width="1233"/>
   <unicode hex="1EF8"/>
   <outline>
     <contour>
-      <point x="690" y="1728" type="curve" name="hr00" smooth="yes"/>
+      <point x="690" y="1728" type="curve" smooth="yes" name="hr00"/>
       <point x="714" y="1728"/>
       <point x="741" y="1717"/>
       <point x="770" y="1696" type="curve" smooth="yes"/>
@@ -12,21 +12,21 @@
       <point x="806" y="1670" type="line" smooth="yes"/>
       <point x="849" y="1638"/>
       <point x="884" y="1627"/>
-      <point x="928" y="1627" type="curve" name="hr01" smooth="yes"/>
+      <point x="928" y="1627" type="curve" smooth="yes" name="hr01"/>
       <point x="1041" y="1627"/>
       <point x="1130" y="1702"/>
       <point x="1173" y="1846" type="curve" name="hr02"/>
       <point x="1048" y="1846" type="line"/>
       <point x="1032" y="1783"/>
       <point x="995" y="1746"/>
-      <point x="940" y="1746" type="curve" name="hr03" smooth="yes"/>
+      <point x="940" y="1746" type="curve" smooth="yes" name="hr03"/>
       <point x="916" y="1746"/>
       <point x="892" y="1755"/>
       <point x="868" y="1773" type="curve" smooth="yes"/>
       <point x="833" y="1799" type="line" smooth="yes"/>
       <point x="791" y="1830"/>
       <point x="746" y="1846"/>
-      <point x="698" y="1846" type="curve" name="hr04" smooth="yes"/>
+      <point x="698" y="1846" type="curve" smooth="yes" name="hr04"/>
       <point x="589" y="1846"/>
       <point x="505" y="1771"/>
       <point x="458" y="1627" type="curve" name="hr05"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni1E_F_9.glif b/source/Hack-Italic.ufo/glyphs/uni1E_F_9.glif
index 6ee567e07..8a58a4ad6 100644
--- a/source/Hack-Italic.ufo/glyphs/uni1E_F_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni1E_F_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni1EF9" format="1">
+<glyph name="uni1EF9" format="2">
   <advance width="1233"/>
   <unicode hex="1EF9"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2000.glif b/source/Hack-Italic.ufo/glyphs/uni2000.glif
index d0ebf1f93..fcf33b66d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2000.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2000.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2000" format="1">
+<glyph name="uni2000" format="2">
   <advance width="1233"/>
   <unicode hex="2000"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2001.glif b/source/Hack-Italic.ufo/glyphs/uni2001.glif
index 2d9044ed7..52cc3eb33 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2001.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2001.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2001" format="1">
+<glyph name="uni2001" format="2">
   <advance width="1233"/>
   <unicode hex="2001"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2002.glif b/source/Hack-Italic.ufo/glyphs/uni2002.glif
index 118881251..d3ed2c892 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2002.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2002.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2002" format="1">
+<glyph name="uni2002" format="2">
   <advance width="1233"/>
   <unicode hex="2002"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2003.glif b/source/Hack-Italic.ufo/glyphs/uni2003.glif
index ed1727198..6c33cbbb4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2003.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2003.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2003" format="1">
+<glyph name="uni2003" format="2">
   <advance width="1233"/>
   <unicode hex="2003"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2004.glif b/source/Hack-Italic.ufo/glyphs/uni2004.glif
index 7760d1614..832cf5e86 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2004.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2004.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2004" format="1">
+<glyph name="uni2004" format="2">
   <advance width="1233"/>
   <unicode hex="2004"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2005.glif b/source/Hack-Italic.ufo/glyphs/uni2005.glif
index c74724fd0..d3890d22c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2005.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2005.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2005" format="1">
+<glyph name="uni2005" format="2">
   <advance width="1233"/>
   <unicode hex="2005"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2006.glif b/source/Hack-Italic.ufo/glyphs/uni2006.glif
index 8ebfe7b0f..38d77599d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2006.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2006.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2006" format="1">
+<glyph name="uni2006" format="2">
   <advance width="1233"/>
   <unicode hex="2006"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2007.glif b/source/Hack-Italic.ufo/glyphs/uni2007.glif
index 9feeb6e4e..efb323052 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2007.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2007.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2007" format="1">
+<glyph name="uni2007" format="2">
   <advance width="1233"/>
   <unicode hex="2007"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2008.glif b/source/Hack-Italic.ufo/glyphs/uni2008.glif
index ead1bfbab..98b293250 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2008.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2008.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2008" format="1">
+<glyph name="uni2008" format="2">
   <advance width="1233"/>
   <unicode hex="2008"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2009.glif b/source/Hack-Italic.ufo/glyphs/uni2009.glif
index 6bcafac01..ccc5dddc7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2009.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2009.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2009" format="1">
+<glyph name="uni2009" format="2">
   <advance width="1233"/>
   <unicode hex="2009"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni200A_.glif b/source/Hack-Italic.ufo/glyphs/uni200A_.glif
index 7f7754a85..e24c197d9 100644
--- a/source/Hack-Italic.ufo/glyphs/uni200A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni200A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni200A" format="1">
+<glyph name="uni200A" format="2">
   <advance width="1233"/>
   <unicode hex="200A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2010.glif b/source/Hack-Italic.ufo/glyphs/uni2010.glif
index 578e14a4d..b31fcebfa 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2010.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2010.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2010" format="1">
+<glyph name="uni2010" format="2">
   <advance width="1233"/>
   <unicode hex="2010"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2011.glif b/source/Hack-Italic.ufo/glyphs/uni2011.glif
index 4815e8fc8..31b6e23b8 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2011.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2011.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2011" format="1">
+<glyph name="uni2011" format="2">
   <advance width="1233"/>
   <unicode hex="2011"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2015.glif b/source/Hack-Italic.ufo/glyphs/uni2015.glif
index 3eaed1611..9493f4781 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2015.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2015.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2015" format="1">
+<glyph name="uni2015" format="2">
   <advance width="1233"/>
   <unicode hex="2015"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2016.glif b/source/Hack-Italic.ufo/glyphs/uni2016.glif
index 0eaa88bdf..2ea9e0cde 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2016.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2016.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2016" format="1">
+<glyph name="uni2016" format="2">
   <advance width="1233"/>
   <unicode hex="2016"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni201F_.glif b/source/Hack-Italic.ufo/glyphs/uni201F_.glif
index aff2f7385..7134826dd 100644
--- a/source/Hack-Italic.ufo/glyphs/uni201F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni201F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni201F" format="1">
+<glyph name="uni201F" format="2">
   <advance width="1233"/>
   <unicode hex="201F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2023.glif b/source/Hack-Italic.ufo/glyphs/uni2023.glif
index 3c0fa939c..f6eb9eae6 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2023.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2023.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2023" format="1">
+<glyph name="uni2023" format="2">
   <advance width="1233"/>
   <unicode hex="2023"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni202F_.glif b/source/Hack-Italic.ufo/glyphs/uni202F_.glif
index 33cb9cc4c..ce697df98 100644
--- a/source/Hack-Italic.ufo/glyphs/uni202F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni202F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni202F" format="1">
+<glyph name="uni202F" format="2">
   <advance width="1233"/>
   <unicode hex="202F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2031.glif b/source/Hack-Italic.ufo/glyphs/uni2031.glif
index 9a3f7b566..582ac4049 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2031.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2031.glif
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2031" format="1">
+<glyph name="uni2031" format="2">
   <advance width="1233"/>
   <unicode hex="2031"/>
   <outline>
     <contour>
-      <point x="286" y="856" type="curve" name="dv05" smooth="yes"/>
+      <point x="286" y="856" type="curve" smooth="yes" name="dv05"/>
       <point x="126" y="856"/>
       <point x="0" y="984"/>
-      <point x="0" y="1144" type="curve" name="dh01" smooth="yes"/>
+      <point x="0" y="1144" type="curve" smooth="yes" name="dh01"/>
       <point x="0" y="1304"/>
       <point x="126" y="1432"/>
-      <point x="287" y="1432" type="curve" name="dv02" smooth="yes"/>
+      <point x="287" y="1432" type="curve" smooth="yes" name="dv02"/>
       <point x="447" y="1432"/>
       <point x="573" y="1305"/>
-      <point x="573" y="1145" type="curve" name="sh01" smooth="yes"/>
+      <point x="573" y="1145" type="curve" smooth="yes" name="sh01"/>
       <point x="573" y="984"/>
       <point x="447" y="856"/>
     </contour>
     <contour>
-      <point x="287" y="979" type="curve" name="dv06" smooth="yes"/>
+      <point x="287" y="979" type="curve" smooth="yes" name="dv06"/>
       <point x="379" y="979"/>
       <point x="453" y="1053"/>
-      <point x="453" y="1144" type="curve" name="ih01" smooth="yes"/>
+      <point x="453" y="1144" type="curve" smooth="yes" name="ih01"/>
       <point x="453" y="1234"/>
       <point x="378" y="1311"/>
-      <point x="285" y="1311" type="curve" name="dv01" smooth="yes"/>
+      <point x="285" y="1311" type="curve" smooth="yes" name="dv01"/>
       <point x="240" y="1311"/>
       <point x="202" y="1295"/>
       <point x="170" y="1263" type="curve" smooth="yes"/>
       <point x="137" y="1230"/>
       <point x="121" y="1191"/>
-      <point x="121" y="1146" type="curve" name="dh02" smooth="yes"/>
+      <point x="121" y="1146" type="curve" smooth="yes" name="dh02"/>
       <point x="121" y="1053"/>
       <point x="195" y="979"/>
     </contour>
@@ -41,13 +41,13 @@
       <point x="72" y="567" type="line"/>
     </contour>
     <contour>
-      <point x="239" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="239" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="103" y="0"/>
       <point x="0" y="124"/>
-      <point x="0" y="287" type="curve" name="sh02" smooth="yes"/>
+      <point x="0" y="287" type="curve" smooth="yes" name="sh02"/>
       <point x="0" y="450"/>
       <point x="103" y="575"/>
-      <point x="240" y="575" type="curve" name="dv04" smooth="yes"/>
+      <point x="240" y="575" type="curve" smooth="yes" name="dv04"/>
       <point x="300" y="575"/>
       <point x="356" y="552"/>
       <point x="407" y="492" type="curve" smooth="yes"/>
@@ -59,7 +59,7 @@
       <point x="445" y="492" type="curve"/>
       <point x="491" y="547"/>
       <point x="548" y="575"/>
-      <point x="617" y="575" type="curve" name="sv01" smooth="yes"/>
+      <point x="617" y="575" type="curve" smooth="yes" name="sv01"/>
       <point x="680" y="575"/>
       <point x="733" y="552"/>
       <point x="785" y="492" type="curve" smooth="yes"/>
@@ -71,13 +71,13 @@
       <point x="823" y="492" type="curve" smooth="yes"/>
       <point x="868" y="545"/>
       <point x="923" y="575"/>
-      <point x="991" y="575" type="curve" name="sv02" smooth="yes"/>
+      <point x="991" y="575" type="curve" smooth="yes" name="sv02"/>
       <point x="1129" y="575"/>
       <point x="1233" y="449"/>
-      <point x="1233" y="289" type="curve" name="dh07" smooth="yes"/>
+      <point x="1233" y="289" type="curve" smooth="yes" name="dh07"/>
       <point x="1233" y="128"/>
       <point x="1128" y="0"/>
-      <point x="991" y="0" type="curve" name="ab02" smooth="yes"/>
+      <point x="991" y="0" type="curve" smooth="yes" name="ab02"/>
       <point x="922" y="0"/>
       <point x="868" y="32"/>
       <point x="823" y="84" type="curve" smooth="yes"/>
@@ -89,7 +89,7 @@
       <point x="785" y="84" type="curve" smooth="yes"/>
       <point x="737" y="28"/>
       <point x="681" y="0"/>
-      <point x="616" y="0" type="curve" name="ab03" smooth="yes"/>
+      <point x="616" y="0" type="curve" smooth="yes" name="ab03"/>
       <point x="549" y="0"/>
       <point x="492" y="28"/>
       <point x="445" y="84" type="curve"/>
@@ -103,13 +103,13 @@
       <point x="304" y="0"/>
     </contour>
     <contour>
-      <point x="237" y="121" type="curve" name="sv03" smooth="yes"/>
+      <point x="237" y="121" type="curve" smooth="yes" name="sv03"/>
       <point x="314" y="121"/>
       <point x="376" y="197"/>
-      <point x="376" y="288" type="curve" name="dh03" smooth="yes"/>
+      <point x="376" y="288" type="curve" smooth="yes" name="dh03"/>
       <point x="376" y="378"/>
       <point x="314" y="455"/>
-      <point x="237" y="455" type="curve" name="dv03" smooth="yes"/>
+      <point x="237" y="455" type="curve" smooth="yes" name="dv03"/>
       <point x="161" y="455"/>
       <point x="101" y="381"/>
       <point x="101" y="288" type="curve" smooth="yes"/>
@@ -117,30 +117,30 @@
       <point x="161" y="121"/>
     </contour>
     <contour>
-      <point x="616" y="121" type="curve" name="sv04" smooth="yes"/>
+      <point x="616" y="121" type="curve" smooth="yes" name="sv04"/>
       <point x="693" y="121"/>
       <point x="754" y="195"/>
-      <point x="754" y="287" type="curve" name="dh05" smooth="yes"/>
+      <point x="754" y="287" type="curve" smooth="yes" name="dh05"/>
       <point x="754" y="380"/>
       <point x="691" y="455"/>
-      <point x="615" y="455" type="curve" name="sv05" smooth="yes"/>
+      <point x="615" y="455" type="curve" smooth="yes" name="sv05"/>
       <point x="539" y="455"/>
       <point x="477" y="381"/>
-      <point x="477" y="288" type="curve" name="dh04" smooth="yes"/>
+      <point x="477" y="288" type="curve" smooth="yes" name="dh04"/>
       <point x="477" y="195"/>
       <point x="539" y="121"/>
     </contour>
     <contour>
-      <point x="994" y="121" type="curve" name="sv06" smooth="yes"/>
+      <point x="994" y="121" type="curve" smooth="yes" name="sv06"/>
       <point x="1071" y="121"/>
       <point x="1132" y="195"/>
-      <point x="1132" y="287" type="curve" name="dh06" smooth="yes"/>
+      <point x="1132" y="287" type="curve" smooth="yes" name="dh06"/>
       <point x="1132" y="380"/>
       <point x="1069" y="455"/>
-      <point x="993" y="455" type="curve" name="sv07" smooth="yes"/>
+      <point x="993" y="455" type="curve" smooth="yes" name="sv07"/>
       <point x="917" y="455"/>
       <point x="855" y="381"/>
-      <point x="855" y="288" type="curve" name="hr01" smooth="yes"/>
+      <point x="855" y="288" type="curve" smooth="yes" name="hr01"/>
       <point x="855" y="195"/>
       <point x="917" y="121"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2035.glif b/source/Hack-Italic.ufo/glyphs/uni2035.glif
index ca82f564a..cc08f1a59 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2035.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2035.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2035" format="1">
+<glyph name="uni2035" format="2">
   <advance width="1233"/>
   <unicode hex="2035"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2036.glif b/source/Hack-Italic.ufo/glyphs/uni2036.glif
index 58e82e5fd..853cf6c17 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2036.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2036.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2036" format="1">
+<glyph name="uni2036" format="2">
   <advance width="1233"/>
   <unicode hex="2036"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2037.glif b/source/Hack-Italic.ufo/glyphs/uni2037.glif
index 3bc152c97..96cab8562 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2037.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2037.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2037" format="1">
+<glyph name="uni2037" format="2">
   <advance width="1233"/>
   <unicode hex="2037"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni203D_.glif b/source/Hack-Italic.ufo/glyphs/uni203D_.glif
index 3a0515075..6d562e943 100644
--- a/source/Hack-Italic.ufo/glyphs/uni203D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni203D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni203D" format="1">
+<glyph name="uni203D" format="2">
   <advance width="1233"/>
   <unicode hex="203D"/>
   <outline>
@@ -14,13 +14,13 @@
       <point x="370" y="1407" type="line"/>
       <point x="501" y="1479"/>
       <point x="636" y="1520"/>
-      <point x="777" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="777" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1003" y="1520"/>
       <point x="1127" y="1410"/>
-      <point x="1127" y="1243" type="curve" name="sh04" smooth="yes"/>
+      <point x="1127" y="1243" type="curve" smooth="yes" name="sh04"/>
       <point x="1127" y="1219"/>
       <point x="1124" y="1194"/>
-      <point x="1119" y="1167" type="curve" name="sh05" smooth="yes"/>
+      <point x="1119" y="1167" type="curve" smooth="yes" name="sh05"/>
       <point x="1098" y="1065"/>
       <point x="1045" y="986"/>
       <point x="900" y="868" type="curve" smooth="yes"/>
@@ -35,32 +35,32 @@
       <point x="768" y="961" type="line" smooth="yes"/>
       <point x="864" y="1041"/>
       <point x="902" y="1084"/>
-      <point x="915" y="1157" type="curve" name="sh07" smooth="yes"/>
+      <point x="915" y="1157" type="curve" smooth="yes" name="sh07"/>
       <point x="918" y="1172"/>
       <point x="919" y="1186"/>
-      <point x="919" y="1198" type="curve" name="ah01" smooth="yes"/>
+      <point x="919" y="1198" type="curve" smooth="yes" name="ah01"/>
       <point x="919" y="1286"/>
       <point x="860" y="1327"/>
       <point x="798" y="1346" type="curve"/>
       <point x="714" y="916" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="440" y="-40" type="curve" name="dv01" smooth="yes"/>
+      <point x="440" y="-40" type="curve" smooth="yes" name="dv01"/>
       <point x="405" y="-40"/>
       <point x="376" y="-30"/>
       <point x="352" y="-3" type="curve" smooth="yes"/>
       <point x="327" y="26"/>
       <point x="319" y="58"/>
-      <point x="319" y="93" type="curve" name="sh01" smooth="yes"/>
+      <point x="319" y="93" type="curve" smooth="yes" name="sh01"/>
       <point x="319" y="195"/>
       <point x="407" y="264"/>
-      <point x="494" y="264" type="curve" name="dv02" smooth="yes"/>
+      <point x="494" y="264" type="curve" smooth="yes" name="dv02"/>
       <point x="525" y="264"/>
       <point x="561" y="254"/>
       <point x="585" y="227" type="curve" smooth="yes"/>
       <point x="605" y="204"/>
       <point x="616" y="171"/>
-      <point x="616" y="134" type="curve" name="sh02" smooth="yes"/>
+      <point x="616" y="134" type="curve" smooth="yes" name="sh02"/>
       <point x="616" y="89"/>
       <point x="599" y="44"/>
       <point x="562" y="9" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni203E_.glif b/source/Hack-Italic.ufo/glyphs/uni203E_.glif
index 6d2082d0e..192075e4b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni203E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni203E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni203E" format="1">
+<glyph name="uni203E" format="2">
   <advance width="1233"/>
   <unicode hex="203E"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni203F_.glif b/source/Hack-Italic.ufo/glyphs/uni203F_.glif
index 5180e098a..861d3fa83 100644
--- a/source/Hack-Italic.ufo/glyphs/uni203F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni203F_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni203F" format="1">
+<glyph name="uni203F" format="2">
   <advance width="1233"/>
   <unicode hex="203F"/>
   <outline>
     <contour>
-      <point x="614" y="-485" type="curve" name="hr00" smooth="yes"/>
+      <point x="614" y="-485" type="curve" smooth="yes" name="hr00"/>
       <point x="390" y="-485"/>
       <point x="169" y="-409"/>
       <point x="-68" y="-249" type="curve"/>
       <point x="-68" y="-123" type="line" name="av01"/>
       <point x="167" y="-265"/>
       <point x="379" y="-331"/>
-      <point x="613" y="-331" type="curve" name="dv01" smooth="yes"/>
+      <point x="613" y="-331" type="curve" smooth="yes" name="dv01"/>
       <point x="849" y="-331"/>
       <point x="1069" y="-263"/>
       <point x="1300" y="-123" type="curve" name="av02"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2045.glif b/source/Hack-Italic.ufo/glyphs/uni2045.glif
index 3b97e6ebf..b388bdfe5 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2045.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2045.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2045" format="1">
+<glyph name="uni2045" format="2">
   <advance width="1233"/>
   <unicode hex="2045"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2046.glif b/source/Hack-Italic.ufo/glyphs/uni2046.glif
index 00c25e1b2..2b9dea882 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2046.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2046.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2046" format="1">
+<glyph name="uni2046" format="2">
   <advance width="1233"/>
   <unicode hex="2046"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2047.glif b/source/Hack-Italic.ufo/glyphs/uni2047.glif
index 9227ba2fa..131255426 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2047.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2047.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2047" format="1">
+<glyph name="uni2047" format="2">
   <advance width="1233"/>
   <unicode hex="2047"/>
   <outline>
     <contour>
-      <point x="157" y="555" type="line" name="hr00" smooth="yes"/>
+      <point x="157" y="555" type="line" smooth="yes" name="hr00"/>
       <point x="183" y="695"/>
       <point x="221" y="764"/>
       <point x="313" y="872" type="curve" smooth="yes"/>
@@ -14,7 +14,7 @@
       <point x="497" y="1157" type="curve" smooth="yes"/>
       <point x="500" y="1172"/>
       <point x="501" y="1187"/>
-      <point x="501" y="1198" type="curve" name="dh03" smooth="yes"/>
+      <point x="501" y="1198" type="curve" smooth="yes" name="dh03"/>
       <point x="501" y="1262"/>
       <point x="466" y="1308"/>
       <point x="386" y="1313" type="curve" name="sv01"/>
@@ -28,13 +28,13 @@
       <point x="189" y="1407" type="line"/>
       <point x="294" y="1490"/>
       <point x="377" y="1521"/>
-      <point x="479" y="1521" type="curve" name="av01" smooth="yes"/>
+      <point x="479" y="1521" type="curve" smooth="yes" name="av01"/>
       <point x="488" y="1521"/>
       <point x="497" y="1521"/>
       <point x="506" y="1520" type="curve" name="av02"/>
       <point x="671" y="1512"/>
       <point x="713" y="1391"/>
-      <point x="713" y="1281" type="curve" name="dh04" smooth="yes"/>
+      <point x="713" y="1281" type="curve" smooth="yes" name="dh04"/>
       <point x="713" y="1211"/>
       <point x="696" y="1112"/>
       <point x="653" y="1026" type="curve"/>
@@ -59,27 +59,27 @@
       <point x="1113" y="1157" type="curve" smooth="yes"/>
       <point x="1116" y="1172"/>
       <point x="1117" y="1187"/>
-      <point x="1117" y="1198" type="curve" name="dh05" smooth="yes"/>
+      <point x="1117" y="1198" type="curve" smooth="yes" name="dh05"/>
       <point x="1117" y="1262"/>
       <point x="1082" y="1308"/>
       <point x="1002" y="1313" type="curve" name="sv02"/>
-      <point x="993" y="1313" type="line" name="sv03" smooth="yes"/>
+      <point x="993" y="1313" type="line" smooth="yes" name="sv03"/>
       <point x="960" y="1313"/>
       <point x="931" y="1306"/>
-      <point x="904" y="1293" type="curve" name="hr01" smooth="yes"/>
+      <point x="904" y="1293" type="curve" smooth="yes" name="hr01"/>
       <point x="873" y="1278"/>
       <point x="819" y="1239"/>
       <point x="763" y="1190" type="curve" name="ih03"/>
       <point x="805" y="1407" type="line"/>
       <point x="910" y="1490"/>
       <point x="993" y="1521"/>
-      <point x="1095" y="1521" type="curve" name="av03" smooth="yes"/>
+      <point x="1095" y="1521" type="curve" smooth="yes" name="av03"/>
       <point x="1104" y="1521"/>
       <point x="1113" y="1521"/>
       <point x="1122" y="1520" type="curve" name="hr02"/>
       <point x="1287" y="1512"/>
       <point x="1329" y="1391"/>
-      <point x="1329" y="1281" type="curve" name="dh06" smooth="yes"/>
+      <point x="1329" y="1281" type="curve" smooth="yes" name="dh06"/>
       <point x="1329" y="1211"/>
       <point x="1312" y="1112"/>
       <point x="1269" y="1026" type="curve"/>
@@ -94,45 +94,45 @@
       <point x="743" y="401" type="line"/>
     </contour>
     <contour>
-      <point x="162" y="-40" type="curve" name="dv01" smooth="yes"/>
+      <point x="162" y="-40" type="curve" smooth="yes" name="dv01"/>
       <point x="127" y="-40"/>
       <point x="98" y="-30"/>
       <point x="74" y="-3" type="curve" smooth="yes"/>
       <point x="49" y="26"/>
       <point x="41" y="58"/>
-      <point x="41" y="93" type="curve" name="dh01" smooth="yes"/>
+      <point x="41" y="93" type="curve" smooth="yes" name="dh01"/>
       <point x="41" y="195"/>
       <point x="129" y="264"/>
-      <point x="216" y="264" type="curve" name="dv02" smooth="yes"/>
+      <point x="216" y="264" type="curve" smooth="yes" name="dv02"/>
       <point x="247" y="264"/>
       <point x="283" y="254"/>
       <point x="307" y="227" type="curve" smooth="yes"/>
       <point x="327" y="204"/>
       <point x="338" y="171"/>
-      <point x="338" y="134" type="curve" name="dh02" smooth="yes"/>
+      <point x="338" y="134" type="curve" smooth="yes" name="dh02"/>
       <point x="338" y="89"/>
       <point x="321" y="44"/>
-      <point x="284" y="9" type="curve" name="hr03" smooth="yes"/>
+      <point x="284" y="9" type="curve" smooth="yes" name="hr03"/>
       <point x="253" y="-19"/>
       <point x="210" y="-40"/>
     </contour>
     <contour>
-      <point x="782" y="-40" type="curve" name="sv04" smooth="yes"/>
+      <point x="782" y="-40" type="curve" smooth="yes" name="sv04"/>
       <point x="747" y="-40"/>
       <point x="718" y="-30"/>
       <point x="694" y="-3" type="curve" smooth="yes"/>
       <point x="669" y="26"/>
       <point x="661" y="58"/>
-      <point x="661" y="93" type="curve" name="ih02" smooth="yes"/>
+      <point x="661" y="93" type="curve" smooth="yes" name="ih02"/>
       <point x="661" y="195"/>
       <point x="749" y="264"/>
-      <point x="836" y="264" type="curve" name="sv05" smooth="yes"/>
+      <point x="836" y="264" type="curve" smooth="yes" name="sv05"/>
       <point x="867" y="264"/>
       <point x="903" y="254"/>
       <point x="927" y="227" type="curve" smooth="yes"/>
       <point x="947" y="204"/>
       <point x="958" y="171"/>
-      <point x="958" y="134" type="curve" name="sh01" smooth="yes"/>
+      <point x="958" y="134" type="curve" smooth="yes" name="sh01"/>
       <point x="958" y="89"/>
       <point x="941" y="44"/>
       <point x="904" y="9" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2048.glif b/source/Hack-Italic.ufo/glyphs/uni2048.glif
index 5751a7ed5..b21e6c761 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2048.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2048.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2048" format="1">
+<glyph name="uni2048" format="2">
   <advance width="1233"/>
   <unicode hex="2048"/>
   <outline>
     <contour>
-      <point x="233" y="555" type="line" name="hr00" smooth="yes"/>
+      <point x="233" y="555" type="line" smooth="yes" name="hr00"/>
       <point x="259" y="695"/>
       <point x="297" y="764"/>
       <point x="389" y="872" type="curve" smooth="yes"/>
@@ -14,7 +14,7 @@
       <point x="573" y="1157" type="curve" smooth="yes"/>
       <point x="576" y="1172"/>
       <point x="577" y="1187"/>
-      <point x="577" y="1198" type="curve" name="dh03" smooth="yes"/>
+      <point x="577" y="1198" type="curve" smooth="yes" name="dh03"/>
       <point x="577" y="1262"/>
       <point x="542" y="1308"/>
       <point x="462" y="1313" type="curve" name="sv01"/>
@@ -28,13 +28,13 @@
       <point x="265" y="1407" type="line"/>
       <point x="370" y="1490"/>
       <point x="453" y="1521"/>
-      <point x="555" y="1521" type="curve" name="av01" smooth="yes"/>
+      <point x="555" y="1521" type="curve" smooth="yes" name="av01"/>
       <point x="564" y="1521"/>
       <point x="573" y="1521"/>
       <point x="582" y="1520" type="curve" name="av02"/>
       <point x="747" y="1512"/>
       <point x="789" y="1391"/>
-      <point x="789" y="1281" type="curve" name="dh04" smooth="yes"/>
+      <point x="789" y="1281" type="curve" smooth="yes" name="dh04"/>
       <point x="789" y="1211"/>
       <point x="772" y="1112"/>
       <point x="729" y="1026" type="curve"/>
@@ -57,45 +57,45 @@
       <point x="914" y="486" type="line"/>
     </contour>
     <contour>
-      <point x="232" y="-40" type="curve" name="dv01" smooth="yes"/>
+      <point x="232" y="-40" type="curve" smooth="yes" name="dv01"/>
       <point x="197" y="-40"/>
       <point x="168" y="-30"/>
       <point x="144" y="-3" type="curve" smooth="yes"/>
       <point x="119" y="26"/>
       <point x="111" y="58"/>
-      <point x="111" y="93" type="curve" name="dh01" smooth="yes"/>
+      <point x="111" y="93" type="curve" smooth="yes" name="dh01"/>
       <point x="111" y="195"/>
       <point x="199" y="264"/>
-      <point x="286" y="264" type="curve" name="dv02" smooth="yes"/>
+      <point x="286" y="264" type="curve" smooth="yes" name="dv02"/>
       <point x="317" y="264"/>
       <point x="353" y="254"/>
-      <point x="377" y="227" type="curve" name="hr01" smooth="yes"/>
+      <point x="377" y="227" type="curve" smooth="yes" name="hr01"/>
       <point x="397" y="204"/>
       <point x="408" y="171"/>
-      <point x="408" y="134" type="curve" name="dh02" smooth="yes"/>
+      <point x="408" y="134" type="curve" smooth="yes" name="dh02"/>
       <point x="408" y="89"/>
       <point x="391" y="44"/>
-      <point x="354" y="9" type="curve" name="hr02" smooth="yes"/>
+      <point x="354" y="9" type="curve" smooth="yes" name="hr02"/>
       <point x="323" y="-19"/>
       <point x="280" y="-40"/>
     </contour>
     <contour>
-      <point x="895" y="-40" type="curve" name="sv02" smooth="yes"/>
+      <point x="895" y="-40" type="curve" smooth="yes" name="sv02"/>
       <point x="860" y="-40"/>
       <point x="831" y="-30"/>
       <point x="807" y="-3" type="curve" smooth="yes"/>
       <point x="782" y="26"/>
       <point x="774" y="58"/>
-      <point x="774" y="93" type="curve" name="ih02" smooth="yes"/>
+      <point x="774" y="93" type="curve" smooth="yes" name="ih02"/>
       <point x="774" y="195"/>
       <point x="862" y="264"/>
-      <point x="949" y="264" type="curve" name="sv03" smooth="yes"/>
+      <point x="949" y="264" type="curve" smooth="yes" name="sv03"/>
       <point x="980" y="264"/>
       <point x="1016" y="254"/>
       <point x="1040" y="227" type="curve" smooth="yes"/>
       <point x="1060" y="204"/>
       <point x="1071" y="171"/>
-      <point x="1071" y="134" type="curve" name="sh02" smooth="yes"/>
+      <point x="1071" y="134" type="curve" smooth="yes" name="sh02"/>
       <point x="1071" y="89"/>
       <point x="1054" y="44"/>
       <point x="1017" y="9" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2049.glif b/source/Hack-Italic.ufo/glyphs/uni2049.glif
index 554091207..325f19525 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2049.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2049.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2049" format="1">
+<glyph name="uni2049" format="2">
   <advance width="1233"/>
   <unicode hex="2049"/>
   <outline>
     <contour>
-      <point x="743" y="555" type="line" name="hr00" smooth="yes"/>
+      <point x="743" y="555" type="line" smooth="yes" name="hr00"/>
       <point x="769" y="695"/>
       <point x="807" y="764"/>
       <point x="899" y="872" type="curve" smooth="yes"/>
@@ -14,7 +14,7 @@
       <point x="1083" y="1157" type="curve" smooth="yes"/>
       <point x="1086" y="1172"/>
       <point x="1087" y="1187"/>
-      <point x="1087" y="1198" type="curve" name="dh02" smooth="yes"/>
+      <point x="1087" y="1198" type="curve" smooth="yes" name="dh02"/>
       <point x="1087" y="1262"/>
       <point x="1052" y="1308"/>
       <point x="972" y="1313" type="curve" name="sv01"/>
@@ -28,13 +28,13 @@
       <point x="775" y="1407" type="line"/>
       <point x="880" y="1490"/>
       <point x="963" y="1521"/>
-      <point x="1065" y="1521" type="curve" name="av01" smooth="yes"/>
+      <point x="1065" y="1521" type="curve" smooth="yes" name="av01"/>
       <point x="1074" y="1521"/>
       <point x="1083" y="1521"/>
       <point x="1092" y="1520" type="curve" name="av02"/>
       <point x="1257" y="1512"/>
       <point x="1299" y="1391"/>
-      <point x="1299" y="1281" type="curve" name="dh03" smooth="yes"/>
+      <point x="1299" y="1281" type="curve" smooth="yes" name="dh03"/>
       <point x="1299" y="1211"/>
       <point x="1282" y="1112"/>
       <point x="1239" y="1026" type="curve"/>
@@ -57,45 +57,45 @@
       <point x="244" y="486" type="line"/>
     </contour>
     <contour>
-      <point x="225" y="-40" type="curve" name="dv01" smooth="yes"/>
+      <point x="225" y="-40" type="curve" smooth="yes" name="dv01"/>
       <point x="190" y="-40"/>
       <point x="161" y="-30"/>
       <point x="137" y="-3" type="curve" smooth="yes"/>
       <point x="112" y="26"/>
       <point x="104" y="58"/>
-      <point x="104" y="93" type="curve" name="dh01" smooth="yes"/>
+      <point x="104" y="93" type="curve" smooth="yes" name="dh01"/>
       <point x="104" y="195"/>
       <point x="192" y="264"/>
-      <point x="279" y="264" type="curve" name="dv02" smooth="yes"/>
+      <point x="279" y="264" type="curve" smooth="yes" name="dv02"/>
       <point x="310" y="264"/>
       <point x="346" y="254"/>
       <point x="370" y="227" type="curve" smooth="yes"/>
       <point x="390" y="204"/>
       <point x="401" y="171"/>
-      <point x="401" y="134" type="curve" name="hr01" smooth="yes"/>
+      <point x="401" y="134" type="curve" smooth="yes" name="hr01"/>
       <point x="401" y="89"/>
       <point x="384" y="44"/>
-      <point x="347" y="9" type="curve" name="hr02" smooth="yes"/>
+      <point x="347" y="9" type="curve" smooth="yes" name="hr02"/>
       <point x="316" y="-19"/>
       <point x="273" y="-40"/>
     </contour>
     <contour>
-      <point x="742" y="-40" type="curve" name="sv02" smooth="yes"/>
+      <point x="742" y="-40" type="curve" smooth="yes" name="sv02"/>
       <point x="707" y="-40"/>
       <point x="678" y="-30"/>
       <point x="654" y="-3" type="curve" smooth="yes"/>
       <point x="629" y="26"/>
       <point x="621" y="58"/>
-      <point x="621" y="93" type="curve" name="dh04" smooth="yes"/>
+      <point x="621" y="93" type="curve" smooth="yes" name="dh04"/>
       <point x="621" y="195"/>
       <point x="709" y="264"/>
-      <point x="796" y="264" type="curve" name="sv03" smooth="yes"/>
+      <point x="796" y="264" type="curve" smooth="yes" name="sv03"/>
       <point x="827" y="264"/>
       <point x="863" y="254"/>
       <point x="887" y="227" type="curve" smooth="yes"/>
       <point x="907" y="204"/>
       <point x="918" y="171"/>
-      <point x="918" y="134" type="curve" name="dh05" smooth="yes"/>
+      <point x="918" y="134" type="curve" smooth="yes" name="dh05"/>
       <point x="918" y="89"/>
       <point x="901" y="44"/>
       <point x="864" y="9" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni204B_.glif b/source/Hack-Italic.ufo/glyphs/uni204B_.glif
index 9bbf3b0ec..7c5bc0e56 100644
--- a/source/Hack-Italic.ufo/glyphs/uni204B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni204B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni204B" format="1">
+<glyph name="uni204B" format="2">
   <advance width="1233"/>
   <unicode hex="204B"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni205F_.glif b/source/Hack-Italic.ufo/glyphs/uni205F_.glif
index 94f3ccd11..5eac8ab7f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni205F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni205F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni205F" format="1">
+<glyph name="uni205F" format="2">
   <advance width="1233"/>
   <unicode hex="205F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2070.glif b/source/Hack-Italic.ufo/glyphs/uni2070.glif
index 164cccf89..dfbcad189 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2070.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2070.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2070" format="1">
+<glyph name="uni2070" format="2">
   <advance width="1233"/>
   <unicode hex="2070"/>
   <outline>
     <contour>
-      <point x="611" y="653" type="curve" name="hr00" smooth="yes"/>
+      <point x="611" y="653" type="curve" smooth="yes" name="hr00"/>
       <point x="436" y="653"/>
       <point x="353" y="741"/>
-      <point x="353" y="929" type="curve" name="dh01" smooth="yes"/>
+      <point x="353" y="929" type="curve" smooth="yes" name="dh01"/>
       <point x="353" y="1079"/>
       <point x="407" y="1257"/>
       <point x="487" y="1366" type="curve" smooth="yes"/>
       <point x="566" y="1475"/>
       <point x="665" y="1520"/>
-      <point x="790" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="790" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="965" y="1520"/>
       <point x="1050" y="1433"/>
-      <point x="1050" y="1246" type="curve" name="dh06" smooth="yes"/>
+      <point x="1050" y="1246" type="curve" smooth="yes" name="dh06"/>
       <point x="1050" y="1100"/>
       <point x="996" y="920"/>
       <point x="916" y="808" type="curve" smooth="yes"/>
@@ -24,36 +24,36 @@
       <point x="741" y="653"/>
     </contour>
     <contour>
-      <point x="625" y="745" type="curve" name="dv01" smooth="yes"/>
+      <point x="625" y="745" type="curve" smooth="yes" name="dv01"/>
       <point x="701" y="745"/>
       <point x="757" y="779"/>
       <point x="804" y="856" type="curve" smooth="yes"/>
       <point x="865" y="957"/>
       <point x="913" y="1134"/>
-      <point x="913" y="1260" type="curve" name="dh05" smooth="yes"/>
+      <point x="913" y="1260" type="curve" smooth="yes" name="dh05"/>
       <point x="913" y="1380"/>
       <point x="871" y="1428"/>
-      <point x="779" y="1428" type="curve" name="sv01" smooth="yes"/>
+      <point x="779" y="1428" type="curve" smooth="yes" name="sv01"/>
       <point x="703" y="1428"/>
       <point x="645" y="1397"/>
       <point x="597" y="1318" type="curve" smooth="yes"/>
       <point x="536" y="1217"/>
       <point x="488" y="1036"/>
-      <point x="488" y="913" type="curve" name="dh02" smooth="yes"/>
+      <point x="488" y="913" type="curve" smooth="yes" name="dh02"/>
       <point x="488" y="796"/>
       <point x="530" y="745"/>
     </contour>
     <contour>
-      <point x="702" y="1014" type="curve" name="dv02" smooth="yes"/>
+      <point x="702" y="1014" type="curve" smooth="yes" name="dv02"/>
       <point x="651" y="1014"/>
       <point x="610" y="1046"/>
-      <point x="610" y="1089" type="curve" name="dh03" smooth="yes"/>
+      <point x="610" y="1089" type="curve" smooth="yes" name="dh03"/>
       <point x="610" y="1131"/>
       <point x="653" y="1165"/>
-      <point x="701" y="1165" type="curve" name="dv03" smooth="yes"/>
+      <point x="701" y="1165" type="curve" smooth="yes" name="dv03"/>
       <point x="750" y="1165"/>
       <point x="791" y="1131"/>
-      <point x="791" y="1088" type="curve" name="dh04" smooth="yes"/>
+      <point x="791" y="1088" type="curve" smooth="yes" name="dh04"/>
       <point x="791" y="1047"/>
       <point x="753" y="1014"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2074.glif b/source/Hack-Italic.ufo/glyphs/uni2074.glif
index 9a0febdd2..613b53571 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2074.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2074.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2074" format="1">
+<glyph name="uni2074" format="2">
   <advance width="1233"/>
   <unicode hex="2074"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2075.glif b/source/Hack-Italic.ufo/glyphs/uni2075.glif
index a018dffa9..04c5bf094 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2075.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2075.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2075" format="1">
+<glyph name="uni2075" format="2">
   <advance width="1233"/>
   <unicode hex="2075"/>
   <outline>
     <contour>
-      <point x="548" y="1113" type="curve" name="hr00" smooth="yes"/>
+      <point x="548" y="1113" type="curve" smooth="yes" name="hr00"/>
       <point x="460" y="1113"/>
       <point x="372" y="1125"/>
       <point x="308" y="1149" type="curve"/>
       <point x="335" y="1263" type="line"/>
       <point x="411" y="1226"/>
       <point x="493" y="1207"/>
-      <point x="569" y="1207" type="curve" name="dv01" smooth="yes"/>
+      <point x="569" y="1207" type="curve" smooth="yes" name="dv01"/>
       <point x="741" y="1207"/>
       <point x="862" y="1306"/>
-      <point x="862" y="1433" type="curve" name="dh01" smooth="yes"/>
+      <point x="862" y="1433" type="curve" smooth="yes" name="dh01"/>
       <point x="862" y="1533"/>
       <point x="787" y="1588"/>
-      <point x="656" y="1588" type="curve" name="dv04" smooth="yes"/>
+      <point x="656" y="1588" type="curve" smooth="yes" name="dv04"/>
       <point x="588" y="1588"/>
       <point x="512" y="1573"/>
       <point x="444" y="1545" type="curve"/>
@@ -28,10 +28,10 @@
       <point x="595" y="1664" type="line" name="iv01"/>
       <point x="638" y="1676"/>
       <point x="677" y="1681"/>
-      <point x="716" y="1681" type="curve" name="dv05" smooth="yes"/>
+      <point x="716" y="1681" type="curve" smooth="yes" name="dv05"/>
       <point x="885" y="1681"/>
       <point x="997" y="1589"/>
-      <point x="997" y="1449" type="curve" name="dh02" smooth="yes"/>
+      <point x="997" y="1449" type="curve" smooth="yes" name="dh02"/>
       <point x="997" y="1353"/>
       <point x="946" y="1266"/>
       <point x="862" y="1202" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2076.glif b/source/Hack-Italic.ufo/glyphs/uni2076.glif
index 285f91239..8870a998c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2076.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2076.glif
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2076" format="1">
+<glyph name="uni2076" format="2">
   <advance width="1233"/>
   <unicode hex="2076"/>
   <outline>
     <contour>
-      <point x="634" y="1113" type="curve" name="hr00" smooth="yes"/>
+      <point x="634" y="1113" type="curve" smooth="yes" name="hr00"/>
       <point x="455" y="1113"/>
       <point x="354" y="1199"/>
-      <point x="354" y="1375" type="curve" name="sh01" smooth="yes"/>
+      <point x="354" y="1375" type="curve" smooth="yes" name="sh01"/>
       <point x="354" y="1482"/>
       <point x="391" y="1632"/>
       <point x="452" y="1740" type="curve"/>
       <point x="540" y="1901"/>
       <point x="677" y="1980"/>
-      <point x="860" y="1980" type="curve" name="sh02" smooth="yes"/>
+      <point x="860" y="1980" type="curve" smooth="yes" name="sh02"/>
       <point x="931" y="1980"/>
       <point x="994" y="1968"/>
       <point x="1050" y="1947" type="curve"/>
       <point x="1026" y="1843" type="line"/>
       <point x="974" y="1870"/>
       <point x="912" y="1885"/>
-      <point x="847" y="1885" type="curve" name="dv02" smooth="yes"/>
+      <point x="847" y="1885" type="curve" smooth="yes" name="dv02"/>
       <point x="672" y="1885"/>
       <point x="559" y="1778"/>
       <point x="510" y="1565" type="curve" name="ih01"/>
       <point x="575" y="1646"/>
       <point x="655" y="1682"/>
-      <point x="760" y="1682" type="curve" name="dv04" smooth="yes"/>
+      <point x="760" y="1682" type="curve" smooth="yes" name="dv04"/>
       <point x="913" y="1682"/>
       <point x="1006" y="1607"/>
-      <point x="1006" y="1467" type="curve" name="sh03" smooth="yes"/>
+      <point x="1006" y="1467" type="curve" smooth="yes" name="sh03"/>
       <point x="1006" y="1382"/>
       <point x="971" y="1289"/>
       <point x="907" y="1221" type="curve" smooth="yes"/>
@@ -37,16 +37,16 @@
       <point x="738" y="1113"/>
     </contour>
     <contour>
-      <point x="639" y="1201" type="curve" name="dv01" smooth="yes"/>
+      <point x="639" y="1201" type="curve" smooth="yes" name="dv01"/>
       <point x="781" y="1201"/>
       <point x="870" y="1327"/>
-      <point x="870" y="1451" type="curve" name="ah01" smooth="yes"/>
+      <point x="870" y="1451" type="curve" smooth="yes" name="ah01"/>
       <point x="870" y="1548"/>
       <point x="817" y="1593"/>
-      <point x="725" y="1593" type="curve" name="dv03" smooth="yes"/>
+      <point x="725" y="1593" type="curve" smooth="yes" name="dv03"/>
       <point x="580" y="1593"/>
       <point x="489" y="1477"/>
-      <point x="489" y="1353" type="curve" name="sh04" smooth="yes"/>
+      <point x="489" y="1353" type="curve" smooth="yes" name="sh04"/>
       <point x="489" y="1253"/>
       <point x="547" y="1201"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2077.glif b/source/Hack-Italic.ufo/glyphs/uni2077.glif
index 76cefc5d1..d665a4a26 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2077.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2077.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2077" format="1">
+<glyph name="uni2077" format="2">
   <advance width="1233"/>
   <unicode hex="2077"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2078.glif b/source/Hack-Italic.ufo/glyphs/uni2078.glif
index 5cc612f31..3ad39f62d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2078.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2078.glif
@@ -1,59 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2078" format="1">
+<glyph name="uni2078" format="2">
   <advance width="1233"/>
   <unicode hex="2078"/>
   <outline>
     <contour>
-      <point x="617" y="1113" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="1113" type="curve" smooth="yes" name="dv01"/>
       <point x="435" y="1113"/>
       <point x="321" y="1194"/>
-      <point x="321" y="1327" type="curve" name="dh01" smooth="yes"/>
+      <point x="321" y="1327" type="curve" smooth="yes" name="dh01"/>
       <point x="321" y="1451"/>
       <point x="422" y="1545"/>
       <point x="582" y="1574" type="curve" name="ih01"/>
       <point x="482" y="1603"/>
       <point x="437" y="1659"/>
-      <point x="437" y="1735" type="curve" name="ih02" smooth="yes"/>
+      <point x="437" y="1735" type="curve" smooth="yes" name="ih02"/>
       <point x="437" y="1871"/>
       <point x="588" y="1980"/>
-      <point x="780" y="1980" type="curve" name="dv04" smooth="yes"/>
+      <point x="780" y="1980" type="curve" smooth="yes" name="dv04"/>
       <point x="939" y="1980"/>
       <point x="1050" y="1905"/>
-      <point x="1050" y="1796" type="curve" name="sh02" smooth="yes"/>
+      <point x="1050" y="1796" type="curve" smooth="yes" name="sh02"/>
       <point x="1050" y="1695"/>
       <point x="956" y="1599"/>
       <point x="812" y="1567" type="curve" name="hr01"/>
       <point x="929" y="1544"/>
       <point x="982" y="1478"/>
-      <point x="982" y="1383" type="curve" name="dh03" smooth="yes"/>
+      <point x="982" y="1383" type="curve" smooth="yes" name="dh03"/>
       <point x="982" y="1226"/>
       <point x="832" y="1113"/>
     </contour>
     <contour>
-      <point x="716" y="1614" type="curve" name="dv06" smooth="yes"/>
+      <point x="716" y="1614" type="curve" smooth="yes" name="dv06"/>
       <point x="828" y="1614"/>
       <point x="915" y="1689"/>
-      <point x="915" y="1778" type="curve" name="sh01" smooth="yes"/>
+      <point x="915" y="1778" type="curve" smooth="yes" name="sh01"/>
       <point x="915" y="1851"/>
       <point x="857" y="1893"/>
-      <point x="768" y="1893" type="curve" name="dv03" smooth="yes"/>
+      <point x="768" y="1893" type="curve" smooth="yes" name="dv03"/>
       <point x="655" y="1893"/>
       <point x="573" y="1826"/>
-      <point x="573" y="1735" type="curve" name="sh03" smooth="yes"/>
+      <point x="573" y="1735" type="curve" smooth="yes" name="sh03"/>
       <point x="573" y="1659"/>
       <point x="628" y="1614"/>
     </contour>
     <contour>
-      <point x="625" y="1200" type="curve" name="dv02" smooth="yes"/>
+      <point x="625" y="1200" type="curve" smooth="yes" name="dv02"/>
       <point x="756" y="1200"/>
       <point x="845" y="1276"/>
-      <point x="845" y="1384" type="curve" name="hr02" smooth="yes"/>
+      <point x="845" y="1384" type="curve" smooth="yes" name="hr02"/>
       <point x="845" y="1475"/>
       <point x="783" y="1526"/>
-      <point x="679" y="1526" type="curve" name="dv05" smooth="yes"/>
+      <point x="679" y="1526" type="curve" smooth="yes" name="dv05"/>
       <point x="548" y="1526"/>
       <point x="458" y="1442"/>
-      <point x="458" y="1336" type="curve" name="dh02" smooth="yes"/>
+      <point x="458" y="1336" type="curve" smooth="yes" name="dh02"/>
       <point x="458" y="1245"/>
       <point x="522" y="1200"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2079.glif b/source/Hack-Italic.ufo/glyphs/uni2079.glif
index 09c18cbaa..83868852a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2079.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2079.glif
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2079" format="1">
+<glyph name="uni2079" format="2">
   <advance width="1233"/>
   <unicode hex="2079"/>
   <outline>
     <contour>
-      <point x="543" y="1113" type="curve" name="hr00" smooth="yes"/>
+      <point x="543" y="1113" type="curve" smooth="yes" name="hr00"/>
       <point x="471" y="1113"/>
       <point x="410" y="1125"/>
       <point x="353" y="1146" type="curve"/>
       <point x="377" y="1250" type="line"/>
       <point x="429" y="1223"/>
       <point x="491" y="1208"/>
-      <point x="556" y="1208" type="curve" name="dv01" smooth="yes"/>
+      <point x="556" y="1208" type="curve" smooth="yes" name="dv01"/>
       <point x="736" y="1208"/>
       <point x="845" y="1319"/>
       <point x="893" y="1527" type="curve" name="ih01"/>
       <point x="832" y="1451"/>
       <point x="753" y="1411"/>
-      <point x="641" y="1411" type="curve" name="sv01" smooth="yes"/>
+      <point x="641" y="1411" type="curve" smooth="yes" name="sv01"/>
       <point x="488" y="1411"/>
       <point x="396" y="1488"/>
-      <point x="396" y="1627" type="curve" name="sh01" smooth="yes"/>
+      <point x="396" y="1627" type="curve" smooth="yes" name="sh01"/>
       <point x="396" y="1711"/>
       <point x="430" y="1803"/>
       <point x="495" y="1872" type="curve" smooth="yes"/>
       <point x="563" y="1944"/>
       <point x="655" y="1980"/>
-      <point x="770" y="1980" type="curve" name="dv03" smooth="yes"/>
+      <point x="770" y="1980" type="curve" smooth="yes" name="dv03"/>
       <point x="945" y="1980"/>
       <point x="1050" y="1894"/>
-      <point x="1050" y="1715" type="curve" name="sh03" smooth="yes"/>
+      <point x="1050" y="1715" type="curve" smooth="yes" name="sh03"/>
       <point x="1050" y="1608"/>
       <point x="1012" y="1461"/>
       <point x="952" y="1353" type="curve" smooth="yes"/>
@@ -37,16 +37,16 @@
       <point x="727" y="1113"/>
     </contour>
     <contour>
-      <point x="677" y="1499" type="curve" name="at01" smooth="yes"/>
+      <point x="677" y="1499" type="curve" smooth="yes" name="at01"/>
       <point x="820" y="1499"/>
       <point x="914" y="1613"/>
-      <point x="914" y="1741" type="curve" name="ah01" smooth="yes"/>
+      <point x="914" y="1741" type="curve" smooth="yes" name="ah01"/>
       <point x="914" y="1841"/>
       <point x="857" y="1892"/>
-      <point x="765" y="1892" type="curve" name="dv02" smooth="yes"/>
+      <point x="765" y="1892" type="curve" smooth="yes" name="dv02"/>
       <point x="624" y="1892"/>
       <point x="533" y="1766"/>
-      <point x="533" y="1641" type="curve" name="sh02" smooth="yes"/>
+      <point x="533" y="1641" type="curve" smooth="yes" name="sh02"/>
       <point x="533" y="1544"/>
       <point x="586" y="1499"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni207A_.glif b/source/Hack-Italic.ufo/glyphs/uni207A_.glif
index 514c23ae1..efd7cca98 100644
--- a/source/Hack-Italic.ufo/glyphs/uni207A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni207A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni207A" format="1">
+<glyph name="uni207A" format="2">
   <advance width="1233"/>
   <unicode hex="207A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni207B_.glif b/source/Hack-Italic.ufo/glyphs/uni207B_.glif
index 9f2cf7f98..1c049cd17 100644
--- a/source/Hack-Italic.ufo/glyphs/uni207B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni207B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni207B" format="1">
+<glyph name="uni207B" format="2">
   <advance width="1233"/>
   <unicode hex="207B"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni207C_.glif b/source/Hack-Italic.ufo/glyphs/uni207C_.glif
index 81a6b744e..35f9f7665 100644
--- a/source/Hack-Italic.ufo/glyphs/uni207C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni207C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni207C" format="1">
+<glyph name="uni207C" format="2">
   <advance width="1233"/>
   <unicode hex="207C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni207D_.glif b/source/Hack-Italic.ufo/glyphs/uni207D_.glif
index a12d46621..498c81967 100644
--- a/source/Hack-Italic.ufo/glyphs/uni207D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni207D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni207D" format="1">
+<glyph name="uni207D" format="2">
   <advance width="1233"/>
   <unicode hex="207D"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="502" y="517" type="line" name="hr00"/>
       <point x="435" y="661"/>
       <point x="406" y="769"/>
-      <point x="406" y="883" type="curve" name="dh01" smooth="yes"/>
+      <point x="406" y="883" type="curve" smooth="yes" name="dh01"/>
       <point x="406" y="1102"/>
       <point x="514" y="1330"/>
       <point x="727" y="1538" type="curve" name="av01"/>
       <point x="827" y="1538" type="line"/>
       <point x="628" y="1313"/>
       <point x="528" y="1087"/>
-      <point x="528" y="859" type="curve" name="dh02" smooth="yes"/>
+      <point x="528" y="859" type="curve" smooth="yes" name="dh02"/>
       <point x="528" y="750"/>
       <point x="552" y="638"/>
       <point x="603" y="517" type="curve" name="av02"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni207E_.glif b/source/Hack-Italic.ufo/glyphs/uni207E_.glif
index ee415949c..2e9b03923 100644
--- a/source/Hack-Italic.ufo/glyphs/uni207E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni207E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni207E" format="1">
+<glyph name="uni207E" format="2">
   <advance width="1233"/>
   <unicode hex="207E"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="406" y="517" type="line" name="hr00"/>
       <point x="605" y="742"/>
       <point x="706" y="970"/>
-      <point x="706" y="1195" type="curve" name="dh01" smooth="yes"/>
+      <point x="706" y="1195" type="curve" smooth="yes" name="dh01"/>
       <point x="706" y="1304"/>
       <point x="681" y="1419"/>
       <point x="630" y="1538" type="curve" name="av01"/>
       <point x="732" y="1538" type="line"/>
       <point x="796" y="1397"/>
       <point x="828" y="1288"/>
-      <point x="828" y="1171" type="curve" name="dh02" smooth="yes"/>
+      <point x="828" y="1171" type="curve" smooth="yes" name="dh02"/>
       <point x="828" y="947"/>
       <point x="713" y="720"/>
       <point x="506" y="517" type="curve" name="av02"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni208A_.glif b/source/Hack-Italic.ufo/glyphs/uni208A_.glif
index ff429d917..f1853f4f1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni208A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni208A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni208A" format="1">
+<glyph name="uni208A" format="2">
   <advance width="1233"/>
   <unicode hex="208A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni208B_.glif b/source/Hack-Italic.ufo/glyphs/uni208B_.glif
index 156a38d0e..acc31efe9 100644
--- a/source/Hack-Italic.ufo/glyphs/uni208B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni208B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni208B" format="1">
+<glyph name="uni208B" format="2">
   <advance width="1233"/>
   <unicode hex="208B"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni208C_.glif b/source/Hack-Italic.ufo/glyphs/uni208C_.glif
index e4ff3f621..f20c70c76 100644
--- a/source/Hack-Italic.ufo/glyphs/uni208C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni208C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni208C" format="1">
+<glyph name="uni208C" format="2">
   <advance width="1233"/>
   <unicode hex="208C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni208D_.glif b/source/Hack-Italic.ufo/glyphs/uni208D_.glif
index 1219fd9cf..1b4b24aac 100644
--- a/source/Hack-Italic.ufo/glyphs/uni208D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni208D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni208D" format="1">
+<glyph name="uni208D" format="2">
   <advance width="1233"/>
   <unicode hex="208D"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="502" y="-151" type="line" name="hr00"/>
       <point x="435" y="-7"/>
       <point x="406" y="101"/>
-      <point x="406" y="215" type="curve" name="dh01" smooth="yes"/>
+      <point x="406" y="215" type="curve" smooth="yes" name="dh01"/>
       <point x="406" y="434"/>
       <point x="514" y="662"/>
       <point x="727" y="870" type="curve" name="av01"/>
       <point x="827" y="870" type="line"/>
       <point x="628" y="645"/>
       <point x="528" y="419"/>
-      <point x="528" y="191" type="curve" name="dh02" smooth="yes"/>
+      <point x="528" y="191" type="curve" smooth="yes" name="dh02"/>
       <point x="528" y="82"/>
       <point x="552" y="-30"/>
       <point x="603" y="-151" type="curve" name="av02"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni208E_.glif b/source/Hack-Italic.ufo/glyphs/uni208E_.glif
index 9e6ecea1c..728d404db 100644
--- a/source/Hack-Italic.ufo/glyphs/uni208E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni208E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni208E" format="1">
+<glyph name="uni208E" format="2">
   <advance width="1233"/>
   <unicode hex="208E"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="406" y="-151" type="line" name="hr00"/>
       <point x="605" y="74"/>
       <point x="706" y="302"/>
-      <point x="706" y="527" type="curve" name="dh01" smooth="yes"/>
+      <point x="706" y="527" type="curve" smooth="yes" name="dh01"/>
       <point x="706" y="636"/>
       <point x="681" y="751"/>
       <point x="630" y="870" type="curve" name="av01"/>
       <point x="732" y="870" type="line"/>
       <point x="796" y="729"/>
       <point x="828" y="620"/>
-      <point x="828" y="503" type="curve" name="dh02" smooth="yes"/>
+      <point x="828" y="503" type="curve" smooth="yes" name="dh02"/>
       <point x="828" y="279"/>
       <point x="713" y="52"/>
       <point x="506" y="-151" type="curve" name="av02"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni20A_0.glif b/source/Hack-Italic.ufo/glyphs/uni20A_0.glif
index f55a7a6ee..ded3d0afd 100644
--- a/source/Hack-Italic.ufo/glyphs/uni20A_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni20A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20A0" format="1">
+<glyph name="uni20A0" format="2">
   <advance width="1233"/>
   <unicode hex="20A0"/>
   <outline>
@@ -7,32 +7,32 @@
       <point x="639" y="440" type="line" name="hr00"/>
       <point x="555" y="368"/>
       <point x="472" y="332"/>
-      <point x="379" y="332" type="curve" name="dv01" smooth="yes"/>
+      <point x="379" y="332" type="curve" smooth="yes" name="dv01"/>
       <point x="183" y="332"/>
       <point x="70" y="491"/>
-      <point x="70" y="760" type="curve" name="dh01" smooth="yes"/>
+      <point x="70" y="760" type="curve" smooth="yes" name="dh01"/>
       <point x="70" y="808"/>
       <point x="74" y="858"/>
-      <point x="81" y="913" type="curve" name="sh01" smooth="yes"/>
+      <point x="81" y="913" type="curve" smooth="yes" name="sh01"/>
       <point x="129" y="1273"/>
       <point x="302" y="1494"/>
-      <point x="535" y="1494" type="curve" name="at01" smooth="yes"/>
+      <point x="535" y="1494" type="curve" smooth="yes" name="at01"/>
       <point x="628" y="1494"/>
       <point x="704" y="1458"/>
       <point x="765" y="1387" type="curve"/>
       <point x="744" y="1228" type="line" name="iv01"/>
       <point x="684" y="1327"/>
       <point x="614" y="1369"/>
-      <point x="523" y="1369" type="curve" name="sv01" smooth="yes"/>
+      <point x="523" y="1369" type="curve" smooth="yes" name="sv01"/>
       <point x="346" y="1369"/>
       <point x="231" y="1209"/>
-      <point x="192" y="913" type="curve" name="sh02" smooth="yes"/>
+      <point x="192" y="913" type="curve" smooth="yes" name="sh02"/>
       <point x="185" y="861"/>
       <point x="182" y="813"/>
-      <point x="182" y="770" type="curve" name="dh02" smooth="yes"/>
+      <point x="182" y="770" type="curve" smooth="yes" name="dh02"/>
       <point x="182" y="562"/>
       <point x="259" y="457"/>
-      <point x="400" y="457" type="curve" name="dv02" smooth="yes"/>
+      <point x="400" y="457" type="curve" smooth="yes" name="dv02"/>
       <point x="491" y="457"/>
       <point x="578" y="504"/>
       <point x="660" y="598" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni20A_2.glif b/source/Hack-Italic.ufo/glyphs/uni20A_2.glif
index f1512ba03..9f3321046 100644
--- a/source/Hack-Italic.ufo/glyphs/uni20A_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni20A_2.glif
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20A2" format="1">
+<glyph name="uni20A2" format="2">
   <advance width="1233"/>
   <unicode hex="20A2"/>
   <outline>
     <contour>
-      <point x="587" y="-29" type="curve" name="av01" smooth="yes"/>
+      <point x="587" y="-29" type="curve" smooth="yes" name="av01"/>
       <point x="264" y="-29"/>
       <point x="78" y="192"/>
-      <point x="78" y="562" type="curve" name="dh01" smooth="yes"/>
+      <point x="78" y="562" type="curve" smooth="yes" name="dh01"/>
       <point x="78" y="801"/>
       <point x="154" y="1047"/>
       <point x="274" y="1226" type="curve" smooth="yes"/>
       <point x="411" y="1429"/>
       <point x="587" y="1520"/>
-      <point x="802" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="802" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="955" y="1520"/>
       <point x="1074" y="1474"/>
       <point x="1185" y="1378" type="curve"/>
       <point x="1151" y="1165" type="line" name="iv01"/>
       <point x="1043" y="1294"/>
       <point x="930" y="1356"/>
-      <point x="789" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="789" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="600" y="1356"/>
       <point x="460" y="1248"/>
       <point x="357" y="1024" type="curve" smooth="yes"/>
       <point x="289" y="875"/>
       <point x="255" y="713"/>
-      <point x="255" y="560" type="curve" name="dh02" smooth="yes"/>
+      <point x="255" y="560" type="curve" smooth="yes" name="dh02"/>
       <point x="255" y="273"/>
       <point x="374" y="163"/>
       <point x="533" y="139" type="curve"/>
@@ -35,14 +35,14 @@
       <point x="785" y="851" type="line"/>
       <point x="858" y="968"/>
       <point x="960" y="1032"/>
-      <point x="1077" y="1032" type="curve" name="sv02" smooth="yes"/>
+      <point x="1077" y="1032" type="curve" smooth="yes" name="sv02"/>
       <point x="1105" y="1032"/>
       <point x="1135" y="1028"/>
       <point x="1163" y="1019" type="curve"/>
       <point x="1138" y="855" type="line" name="iv02"/>
       <point x="1110" y="874"/>
       <point x="1072" y="883"/>
-      <point x="1035" y="883" type="curve" name="dv01" smooth="yes"/>
+      <point x="1035" y="883" type="curve" smooth="yes" name="dv01"/>
       <point x="889" y="883"/>
       <point x="770" y="743"/>
       <point x="733" y="514" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni20A_5.glif b/source/Hack-Italic.ufo/glyphs/uni20A_5.glif
index b3b8569a8..99b666913 100644
--- a/source/Hack-Italic.ufo/glyphs/uni20A_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni20A_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20A5" format="1">
+<glyph name="uni20A5" format="2">
   <advance width="1233"/>
   <unicode hex="20A5"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="563" y="793" type="curve" smooth="yes"/>
       <point x="563" y="921"/>
       <point x="532" y="987"/>
-      <point x="453" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="453" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="342" y="987"/>
       <point x="253" y="849"/>
       <point x="229" y="633" type="curve"/>
@@ -21,7 +21,7 @@
       <point x="265" y="946" type="line" name="iv01"/>
       <point x="328" y="1080"/>
       <point x="407" y="1147"/>
-      <point x="501" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="501" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="600" y="1147"/>
       <point x="641" y="1069"/>
       <point x="662" y="985" type="curve" name="iv02"/>
@@ -30,28 +30,28 @@
       <point x="802" y="1096" type="line" name="iv03"/>
       <point x="843" y="1130"/>
       <point x="886" y="1147"/>
-      <point x="933" y="1147" type="curve" name="at03" smooth="yes"/>
+      <point x="933" y="1147" type="curve" smooth="yes" name="at03"/>
       <point x="1001" y="1147"/>
       <point x="1052" y="1108"/>
       <point x="1081" y="1024" type="curve" smooth="yes"/>
       <point x="1098" y="972"/>
       <point x="1107" y="908"/>
-      <point x="1107" y="833" type="curve" name="dh02" smooth="yes"/>
+      <point x="1107" y="833" type="curve" smooth="yes" name="dh02"/>
       <point x="1107" y="785"/>
       <point x="1104" y="733"/>
-      <point x="1097" y="676" type="curve" name="sh01" smooth="yes"/>
+      <point x="1097" y="676" type="curve" smooth="yes" name="sh01"/>
       <point x="1019" y="0" type="line" name="ab02"/>
       <point x="909" y="0" type="line"/>
       <point x="986" y="670" type="line" name="sh02"/>
       <point x="993" y="718"/>
       <point x="994" y="759"/>
-      <point x="994" y="795" type="curve" name="dh01" smooth="yes"/>
+      <point x="994" y="795" type="curve" smooth="yes" name="dh01"/>
       <point x="994" y="842"/>
       <point x="991" y="878"/>
-      <point x="980" y="909" type="curve" name="hr01" smooth="yes"/>
+      <point x="980" y="909" type="curve" smooth="yes" name="hr01"/>
       <point x="963" y="961"/>
       <point x="933" y="987"/>
-      <point x="884" y="987" type="curve" name="sv02" smooth="yes"/>
+      <point x="884" y="987" type="curve" smooth="yes" name="sv02"/>
       <point x="773" y="987"/>
       <point x="684" y="852"/>
       <point x="660" y="633" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni20A_6.glif b/source/Hack-Italic.ufo/glyphs/uni20A_6.glif
index aed757591..f1defec13 100644
--- a/source/Hack-Italic.ufo/glyphs/uni20A_6.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni20A_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20A6" format="1">
+<glyph name="uni20A6" format="2">
   <advance width="1233"/>
   <unicode hex="20A6"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni20A_8.glif b/source/Hack-Italic.ufo/glyphs/uni20A_8.glif
index 3bc7b23d0..343591131 100644
--- a/source/Hack-Italic.ufo/glyphs/uni20A_8.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni20A_8.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20A8" format="1">
+<glyph name="uni20A8" format="2">
   <advance width="1233"/>
   <unicode hex="20A8"/>
   <outline>
     <contour>
-      <point x="831" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="831" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="795" y="-29"/>
       <point x="760" y="-23"/>
-      <point x="725" y="-11" type="curve" name="ab01" smooth="yes"/>
+      <point x="725" y="-11" type="curve" smooth="yes" name="ab01"/>
       <point x="709" y="-6"/>
       <point x="693" y="0"/>
       <point x="676" y="7" type="curve" name="ih01"/>
@@ -19,7 +19,7 @@
       <point x="426" y="582" type="curve" smooth="yes"/>
       <point x="403" y="615"/>
       <point x="369" y="631"/>
-      <point x="322" y="631" type="curve" name="dv03" smooth="yes"/>
+      <point x="322" y="631" type="curve" smooth="yes" name="dv03"/>
       <point x="195" y="631" type="line"/>
       <point x="125" y="0" type="line" name="ab03"/>
       <point x="9" y="0" type="line"/>
@@ -27,10 +27,10 @@
       <point x="438" y="1493" type="line" smooth="yes"/>
       <point x="610" y="1493"/>
       <point x="688" y="1384"/>
-      <point x="688" y="1180" type="curve" name="dh02" smooth="yes"/>
+      <point x="688" y="1180" type="curve" smooth="yes" name="dh02"/>
       <point x="688" y="1144"/>
       <point x="686" y="1106"/>
-      <point x="681" y="1063" type="curve" name="sh02" smooth="yes"/>
+      <point x="681" y="1063" type="curve" smooth="yes" name="sh02"/>
       <point x="658" y="870"/>
       <point x="601" y="753"/>
       <point x="494" y="700" type="curve" name="iv01"/>
@@ -43,63 +43,63 @@
       <point x="637" y="228" type="line"/>
       <point x="705" y="160"/>
       <point x="775" y="125"/>
-      <point x="851" y="125" type="curve" name="dv02" smooth="yes"/>
+      <point x="851" y="125" type="curve" smooth="yes" name="dv02"/>
       <point x="951" y="125"/>
       <point x="1008" y="183"/>
-      <point x="1024" y="295" type="curve" name="sh03" smooth="yes"/>
+      <point x="1024" y="295" type="curve" smooth="yes" name="sh03"/>
       <point x="1026" y="310"/>
       <point x="1027" y="324"/>
-      <point x="1027" y="337" type="curve" name="dh03" smooth="yes"/>
+      <point x="1027" y="337" type="curve" smooth="yes" name="dh03"/>
       <point x="1027" y="418"/>
       <point x="982" y="447"/>
       <point x="889" y="487" type="curve" smooth="yes"/>
       <point x="854" y="502" type="line"/>
       <point x="746" y="543"/>
       <point x="699" y="621"/>
-      <point x="699" y="746" type="curve" name="sh04" smooth="yes"/>
+      <point x="699" y="746" type="curve" smooth="yes" name="sh04"/>
       <point x="699" y="769"/>
       <point x="700" y="792"/>
-      <point x="703" y="817" type="curve" name="sh05" smooth="yes"/>
+      <point x="703" y="817" type="curve" smooth="yes" name="sh05"/>
       <point x="727" y="1029"/>
       <point x="826" y="1147"/>
-      <point x="993" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="993" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="1065" y="1147"/>
       <point x="1137" y="1126"/>
       <point x="1186" y="1087" type="curve"/>
       <point x="1167" y="913" type="line" name="iv02"/>
       <point x="1114" y="966"/>
       <point x="1051" y="993"/>
-      <point x="980" y="993" type="curve" name="sv01" smooth="yes"/>
+      <point x="980" y="993" type="curve" smooth="yes" name="sv01"/>
       <point x="881" y="993"/>
       <point x="822" y="942"/>
-      <point x="807" y="825" type="curve" name="sh07" smooth="yes"/>
+      <point x="807" y="825" type="curve" smooth="yes" name="sh07"/>
       <point x="806" y="813"/>
       <point x="805" y="804"/>
-      <point x="805" y="793" type="curve" name="sh06" smooth="yes"/>
+      <point x="805" y="793" type="curve" smooth="yes" name="sh06"/>
       <point x="805" y="730"/>
       <point x="834" y="692"/>
-      <point x="929" y="655" type="curve" name="hr01" smooth="yes"/>
+      <point x="929" y="655" type="curve" smooth="yes" name="hr01"/>
       <point x="964" y="641" type="line" smooth="yes"/>
       <point x="1080" y="594"/>
       <point x="1139" y="520"/>
-      <point x="1139" y="384" type="curve" name="dh04" smooth="yes"/>
+      <point x="1139" y="384" type="curve" smooth="yes" name="dh04"/>
       <point x="1139" y="361"/>
       <point x="1138" y="336"/>
-      <point x="1134" y="309" type="curve" name="sh08" smooth="yes"/>
+      <point x="1134" y="309" type="curve" smooth="yes" name="sh08"/>
       <point x="1107" y="101"/>
       <point x="999" y="-29"/>
     </contour>
     <contour>
-      <point x="360" y="797" type="line" name="dv04" smooth="yes"/>
+      <point x="360" y="797" type="line" smooth="yes" name="dv04"/>
       <point x="473" y="797"/>
       <point x="539" y="887"/>
-      <point x="559" y="1063" type="curve" name="sh09" smooth="yes"/>
+      <point x="559" y="1063" type="curve" smooth="yes" name="sh09"/>
       <point x="562" y="1090"/>
       <point x="563" y="1112"/>
-      <point x="563" y="1135" type="curve" name="dh01" smooth="yes"/>
+      <point x="563" y="1135" type="curve" smooth="yes" name="dh01"/>
       <point x="563" y="1263"/>
       <point x="515" y="1327"/>
-      <point x="419" y="1327" type="curve" name="sv02" smooth="yes"/>
+      <point x="419" y="1327" type="curve" smooth="yes" name="sv02"/>
       <point x="273" y="1327" type="line"/>
       <point x="214" y="797" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni20A_9.glif b/source/Hack-Italic.ufo/glyphs/uni20A_9.glif
index d395bc6ac..1ce3ce1e4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni20A_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni20A_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20A9" format="1">
+<glyph name="uni20A9" format="2">
   <advance width="1233"/>
   <unicode hex="20A9"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni20A_A_.glif b/source/Hack-Italic.ufo/glyphs/uni20A_A_.glif
index 1929e7ebe..5279620c7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni20A_A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni20A_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20AA" format="1">
+<glyph name="uni20AA" format="2">
   <advance width="1233"/>
   <unicode hex="20AA"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="645" y="1493" type="line" smooth="yes"/>
       <point x="854" y="1494"/>
       <point x="960" y="1362"/>
-      <point x="960" y="1121" type="curve" name="sh01" smooth="yes"/>
+      <point x="960" y="1121" type="curve" smooth="yes" name="sh01"/>
       <point x="960" y="1056"/>
       <point x="952" y="983"/>
       <point x="937" y="903" type="curve" smooth="yes"/>
@@ -17,19 +17,19 @@
       <point x="789" y="878" type="line"/>
       <point x="804" y="962"/>
       <point x="812" y="1030"/>
-      <point x="812" y="1090" type="curve" name="ah01" smooth="yes"/>
+      <point x="812" y="1090" type="curve" smooth="yes" name="ah01"/>
       <point x="812" y="1258"/>
       <point x="750" y="1329"/>
-      <point x="614" y="1329" type="curve" name="sv01" smooth="yes"/>
+      <point x="614" y="1329" type="curve" smooth="yes" name="sv01"/>
       <point x="355" y="1329" type="line" name="sh03"/>
       <point x="102" y="-29" type="line" name="sv02"/>
       <point x="-39" y="-29" type="line"/>
     </contour>
     <contour>
-      <point x="664" y="-29" type="line" name="dv01" smooth="yes"/>
+      <point x="664" y="-29" type="line" smooth="yes" name="dv01"/>
       <point x="455" y="-29"/>
       <point x="349" y="94"/>
-      <point x="349" y="341" type="curve" name="sh02" smooth="yes"/>
+      <point x="349" y="341" type="curve" smooth="yes" name="sh02"/>
       <point x="349" y="406"/>
       <point x="357" y="478"/>
       <point x="372" y="561" type="curve" smooth="yes"/>
@@ -38,10 +38,10 @@
       <point x="519" y="586" type="line"/>
       <point x="504" y="502"/>
       <point x="496" y="434"/>
-      <point x="496" y="374" type="curve" name="sh04" smooth="yes"/>
+      <point x="496" y="374" type="curve" smooth="yes" name="sh04"/>
       <point x="496" y="206"/>
       <point x="559" y="135"/>
-      <point x="695" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="695" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="956" y="135" type="line" name="sh05"/>
       <point x="1206" y="1493" type="line" name="at01"/>
       <point x="1349" y="1493" type="line"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni20B_0.glif b/source/Hack-Italic.ufo/glyphs/uni20B_0.glif
index 94be5723e..c8b306ba6 100644
--- a/source/Hack-Italic.ufo/glyphs/uni20B_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni20B_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B0" format="1">
+<glyph name="uni20B0" format="2">
   <advance width="1233"/>
   <unicode hex="20B0"/>
   <outline>
@@ -10,47 +10,47 @@
       <point x="832" y="414" type="curve" smooth="yes"/>
       <point x="833" y="423"/>
       <point x="834" y="431"/>
-      <point x="834" y="442" type="curve" name="dh03" smooth="yes"/>
+      <point x="834" y="442" type="curve" smooth="yes" name="dh03"/>
       <point x="834" y="493"/>
       <point x="809" y="551"/>
       <point x="760" y="616" type="curve"/>
       <point x="657" y="529"/>
       <point x="581" y="490"/>
-      <point x="509" y="490" type="curve" name="dv03" smooth="yes"/>
+      <point x="509" y="490" type="curve" smooth="yes" name="dv03"/>
       <point x="419" y="490"/>
       <point x="382" y="555"/>
       <point x="361" y="594" type="curve" smooth="yes"/>
       <point x="341" y="631"/>
       <point x="321" y="664"/>
-      <point x="286" y="664" type="curve" name="sv01" smooth="yes"/>
+      <point x="286" y="664" type="curve" smooth="yes" name="sv01"/>
       <point x="246" y="664"/>
       <point x="202" y="620"/>
       <point x="126" y="516" type="curve"/>
       <point x="17" y="612" type="line"/>
       <point x="152" y="795"/>
       <point x="228" y="852"/>
-      <point x="310" y="852" type="curve" name="hr01" smooth="yes"/>
+      <point x="310" y="852" type="curve" smooth="yes" name="hr01"/>
       <point x="365" y="852"/>
       <point x="418" y="829"/>
       <point x="451" y="774" type="curve" smooth="yes"/>
       <point x="495" y="702"/>
       <point x="516" y="667"/>
-      <point x="547" y="667" type="curve" name="dv04" smooth="yes"/>
+      <point x="547" y="667" type="curve" smooth="yes" name="dv04"/>
       <point x="570" y="667"/>
       <point x="608" y="689"/>
       <point x="649" y="733" type="curve" name="hr02"/>
       <point x="556" y="826"/>
       <point x="510" y="937"/>
-      <point x="510" y="1064" type="curve" name="dh01" smooth="yes"/>
+      <point x="510" y="1064" type="curve" smooth="yes" name="dh01"/>
       <point x="510" y="1095"/>
       <point x="513" y="1129"/>
       <point x="519" y="1164" type="curve" smooth="yes"/>
       <point x="559" y="1396"/>
       <point x="699" y="1520"/>
-      <point x="854" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="854" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1003" y="1520"/>
       <point x="1077" y="1402"/>
-      <point x="1077" y="1270" type="curve" name="sh01" smooth="yes"/>
+      <point x="1077" y="1270" type="curve" smooth="yes" name="sh01"/>
       <point x="1077" y="1243"/>
       <point x="1074" y="1204"/>
       <point x="1067" y="1164" type="curve" smooth="yes"/>
@@ -59,10 +59,10 @@
       <point x="899" y="766" type="curve"/>
       <point x="971" y="678"/>
       <point x="1007" y="588"/>
-      <point x="1007" y="488" type="curve" name="hr03" smooth="yes"/>
+      <point x="1007" y="488" type="curve" smooth="yes" name="hr03"/>
       <point x="1007" y="464"/>
       <point x="1005" y="437"/>
-      <point x="1001" y="412" type="curve" name="sh02" smooth="yes"/>
+      <point x="1001" y="412" type="curve" smooth="yes" name="sh02"/>
       <point x="963" y="163"/>
       <point x="788" y="-29"/>
       <point x="482" y="-29" type="curve" name="dv01"/>
@@ -74,16 +74,16 @@
       <point x="894" y="1164" type="curve" smooth="yes"/>
       <point x="899" y="1192"/>
       <point x="901" y="1218"/>
-      <point x="901" y="1237" type="curve" name="hr04" smooth="yes"/>
+      <point x="901" y="1237" type="curve" smooth="yes" name="hr04"/>
       <point x="901" y="1287"/>
       <point x="888" y="1362"/>
-      <point x="827" y="1362" type="curve" name="sv02" smooth="yes"/>
+      <point x="827" y="1362" type="curve" smooth="yes" name="sv02"/>
       <point x="765" y="1362"/>
       <point x="711" y="1280"/>
       <point x="692" y="1164" type="curve" smooth="yes"/>
       <point x="688" y="1142"/>
       <point x="686" y="1121"/>
-      <point x="686" y="1100" type="curve" name="dh02" smooth="yes"/>
+      <point x="686" y="1100" type="curve" smooth="yes" name="dh02"/>
       <point x="686" y="1017"/>
       <point x="718" y="944"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni20B_1.glif b/source/Hack-Italic.ufo/glyphs/uni20B_1.glif
index 8437ea826..33bf8d462 100644
--- a/source/Hack-Italic.ufo/glyphs/uni20B_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni20B_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B1" format="1">
+<glyph name="uni20B1" format="2">
   <advance width="1233"/>
   <unicode hex="20B1"/>
   <outline>
@@ -31,7 +31,7 @@
       <point x="1044" y="743" type="curve" smooth="yes"/>
       <point x="937" y="648"/>
       <point x="790" y="600"/>
-      <point x="604" y="600" type="curve" name="dv04" smooth="yes"/>
+      <point x="604" y="600" type="curve" smooth="yes" name="dv04"/>
       <point x="371" y="600" type="line"/>
       <point x="254" y="0" type="line" name="ab01"/>
       <point x="51" y="0" type="line"/>
@@ -40,7 +40,7 @@
       <point x="991" y="1188" type="line" name="sv05"/>
       <point x="966" y="1281"/>
       <point x="884" y="1327"/>
-      <point x="745" y="1327" type="curve" name="sv06" smooth="yes"/>
+      <point x="745" y="1327" type="curve" smooth="yes" name="sv06"/>
       <point x="512" y="1327" type="line"/>
       <point x="485" y="1188" type="line"/>
     </contour>
@@ -53,7 +53,7 @@
       <point x="450" y="1009" type="line"/>
     </contour>
     <contour>
-      <point x="637" y="766" type="line" name="dv05" smooth="yes"/>
+      <point x="637" y="766" type="line" smooth="yes" name="dv05"/>
       <point x="780" y="766"/>
       <point x="883" y="817"/>
       <point x="947" y="919" type="curve" name="sv09"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni20B_2.glif b/source/Hack-Italic.ufo/glyphs/uni20B_2.glif
index 238ba5591..09340ed7f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni20B_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni20B_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B2" format="1">
+<glyph name="uni20B2" format="2">
   <advance width="1233"/>
   <unicode hex="20B2"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="429" y="-22" type="line" name="hr00"/>
       <point x="169" y="18"/>
       <point x="60" y="238"/>
-      <point x="60" y="498" type="curve" name="dh01" smooth="yes"/>
+      <point x="60" y="498" type="curve" smooth="yes" name="dh01"/>
       <point x="60" y="569"/>
       <point x="68" y="657"/>
       <point x="83" y="745" type="curve" smooth="yes"/>
@@ -49,7 +49,7 @@
       <point x="270" y="745" type="curve" smooth="yes"/>
       <point x="255" y="662"/>
       <point x="248" y="586"/>
-      <point x="248" y="519" type="curve" name="dh02" smooth="yes"/>
+      <point x="248" y="519" type="curve" smooth="yes" name="dh02"/>
       <point x="248" y="326"/>
       <point x="307" y="193"/>
       <point x="459" y="150" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni20B_3.glif b/source/Hack-Italic.ufo/glyphs/uni20B_3.glif
index 2113a973f..66a720607 100644
--- a/source/Hack-Italic.ufo/glyphs/uni20B_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni20B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B3" format="1">
+<glyph name="uni20B3" format="2">
   <advance width="1233"/>
   <unicode hex="20B3"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni20B_4.glif b/source/Hack-Italic.ufo/glyphs/uni20B_4.glif
index f70186b79..eb452fe90 100644
--- a/source/Hack-Italic.ufo/glyphs/uni20B_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni20B_4.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B4" format="1">
+<glyph name="uni20B4" format="2">
   <advance width="1233"/>
   <unicode hex="20B4"/>
   <outline>
     <contour>
-      <point x="501" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="501" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="221" y="-29"/>
       <point x="62" y="84"/>
-      <point x="62" y="299" type="curve" name="sh01" smooth="yes"/>
+      <point x="62" y="299" type="curve" smooth="yes" name="sh01"/>
       <point x="62" y="332"/>
       <point x="66" y="369"/>
-      <point x="74" y="408" type="curve" name="sh02" smooth="yes"/>
+      <point x="74" y="408" type="curve" smooth="yes" name="sh02"/>
       <point x="85" y="456"/>
       <point x="100" y="507"/>
       <point x="120" y="550" type="curve" name="ih01"/>
@@ -29,26 +29,26 @@
       <point x="893" y="959" type="curve" smooth="yes"/>
       <point x="947" y="1002"/>
       <point x="982" y="1081"/>
-      <point x="982" y="1156" type="curve" name="ah01" smooth="yes"/>
+      <point x="982" y="1156" type="curve" smooth="yes" name="ah01"/>
       <point x="982" y="1207"/>
       <point x="966" y="1254"/>
       <point x="929" y="1290" type="curve" smooth="yes"/>
       <point x="888" y="1330"/>
       <point x="817" y="1356"/>
-      <point x="716" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="716" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="591" y="1356"/>
       <point x="459" y="1316"/>
       <point x="322" y="1237" type="curve" name="ih03"/>
       <point x="361" y="1442" type="line"/>
       <point x="512" y="1494"/>
       <point x="644" y="1520"/>
-      <point x="758" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="758" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1018" y="1520"/>
       <point x="1174" y="1384"/>
-      <point x="1174" y="1175" type="curve" name="sh04" smooth="yes"/>
+      <point x="1174" y="1175" type="curve" smooth="yes" name="sh04"/>
       <point x="1174" y="1144"/>
       <point x="1171" y="1112"/>
-      <point x="1164" y="1079" type="curve" name="sh05" smooth="yes"/>
+      <point x="1164" y="1079" type="curve" smooth="yes" name="sh05"/>
       <point x="1154" y="1030"/>
       <point x="1138" y="985"/>
       <point x="1117" y="943" type="curve" name="ih04"/>
@@ -64,13 +64,13 @@
       <point x="339" y="550" type="line"/>
       <point x="294" y="502"/>
       <point x="259" y="422"/>
-      <point x="259" y="343" type="curve" name="sh03" smooth="yes"/>
+      <point x="259" y="343" type="curve" smooth="yes" name="sh03"/>
       <point x="259" y="292"/>
       <point x="274" y="243"/>
       <point x="313" y="204" type="curve" smooth="yes"/>
       <point x="360" y="158"/>
       <point x="434" y="135"/>
-      <point x="536" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="536" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="676" y="135"/>
       <point x="817" y="179"/>
       <point x="989" y="276" type="curve" name="sh06"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni20B_5.glif b/source/Hack-Italic.ufo/glyphs/uni20B_5.glif
index f42525708..3b72e4256 100644
--- a/source/Hack-Italic.ufo/glyphs/uni20B_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni20B_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B5" format="1">
+<glyph name="uni20B5" format="2">
   <advance width="1233"/>
   <unicode hex="20B5"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="242" y="116" type="curve" smooth="yes"/>
       <point x="155" y="219"/>
       <point x="118" y="342"/>
-      <point x="118" y="483" type="curve" name="dh01" smooth="yes"/>
+      <point x="118" y="483" type="curve" smooth="yes" name="dh01"/>
       <point x="118" y="534"/>
       <point x="123" y="588"/>
       <point x="133" y="643" type="curve" smooth="yes"/>
@@ -49,7 +49,7 @@
       <point x="329" y="520" type="curve" name="dh02"/>
       <point x="328" y="508"/>
       <point x="328" y="496"/>
-      <point x="328" y="485" type="curve" name="sh01" smooth="yes"/>
+      <point x="328" y="485" type="curve" smooth="yes" name="sh01"/>
       <point x="328" y="377"/>
       <point x="354" y="296"/>
       <point x="406" y="232" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni20B_7.glif b/source/Hack-Italic.ufo/glyphs/uni20B_7.glif
index 4ac782bfb..ad900f70d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni20B_7.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni20B_7.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B7" format="1">
+<glyph name="uni20B7" format="2">
   <advance width="1233"/>
   <unicode hex="20B7"/>
   <outline>
     <contour>
-      <point x="473" y="1068" type="curve" name="hr00" smooth="yes"/>
+      <point x="473" y="1068" type="curve" smooth="yes" name="hr00"/>
       <point x="473" y="1016"/>
       <point x="489" y="979"/>
       <point x="522" y="950" type="curve" smooth="yes"/>
@@ -114,13 +114,13 @@
       <point x="518" y="136" type="curve"/>
       <point x="531" y="204" type="line"/>
       <point x="540" y="248" type="line" name="hr01"/>
-      <point x="546" y="283" type="line" name="hr02" smooth="yes"/>
+      <point x="546" y="283" type="line" smooth="yes" name="hr02"/>
       <point x="549" y="296"/>
       <point x="550" y="311"/>
       <point x="550" y="329" type="curve" smooth="yes"/>
       <point x="550" y="350"/>
       <point x="546" y="364"/>
-      <point x="538" y="373" type="curve" name="hr03" smooth="yes"/>
+      <point x="538" y="373" type="curve" smooth="yes" name="hr03"/>
       <point x="531" y="383"/>
       <point x="518" y="388"/>
       <point x="500" y="388" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni20B_8.glif b/source/Hack-Italic.ufo/glyphs/uni20B_8.glif
index 37212056c..df79f8251 100644
--- a/source/Hack-Italic.ufo/glyphs/uni20B_8.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni20B_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B8" format="1">
+<glyph name="uni20B8" format="2">
   <advance width="1233"/>
   <unicode hex="20B8"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni20B_9.glif b/source/Hack-Italic.ufo/glyphs/uni20B_9.glif
index 6a8702da7..38d861018 100644
--- a/source/Hack-Italic.ufo/glyphs/uni20B_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni20B_9.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B9" format="1">
+<glyph name="uni20B9" format="2">
   <advance width="1233"/>
   <unicode hex="20B9"/>
   <outline>
     <contour>
-      <point x="554" y="377" type="line" name="hr00" smooth="yes"/>
+      <point x="554" y="377" type="line" smooth="yes" name="hr00"/>
       <point x="495" y="588"/>
       <point x="439" y="631"/>
-      <point x="305" y="631" type="curve" name="dv03" smooth="yes"/>
+      <point x="305" y="631" type="curve" smooth="yes" name="dv03"/>
       <point x="112" y="631" type="line"/>
       <point x="144" y="797" type="line"/>
-      <point x="365" y="797" type="line" name="dv04" smooth="yes"/>
+      <point x="365" y="797" type="line" smooth="yes" name="dv04"/>
       <point x="558" y="797"/>
       <point x="657" y="904"/>
       <point x="697" y="1040" type="curve" name="dv01"/>
@@ -19,7 +19,7 @@
       <point x="715" y="1163" type="line" name="dv02"/>
       <point x="712" y="1264"/>
       <point x="661" y="1370"/>
-      <point x="468" y="1370" type="curve" name="sv01" smooth="yes"/>
+      <point x="468" y="1370" type="curve" smooth="yes" name="sv01"/>
       <point x="225" y="1370" type="line"/>
       <point x="304" y="1493" type="line" name="at01"/>
       <point x="1282" y="1493" type="line"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2116.glif b/source/Hack-Italic.ufo/glyphs/uni2116.glif
index 2560e8d4d..150756cd9 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2116.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2116.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2116" format="1">
+<glyph name="uni2116" format="2">
   <advance width="1233"/>
   <unicode hex="2116"/>
   <outline>
@@ -28,7 +28,7 @@
       <point x="1289" y="1379" type="curve"/>
       <point x="1262" y="1454"/>
       <point x="1210" y="1492"/>
-      <point x="1134" y="1492" type="curve" name="hr01" smooth="yes"/>
+      <point x="1134" y="1492" type="curve" smooth="yes" name="hr01"/>
       <point x="1061" y="1492"/>
       <point x="994" y="1455"/>
       <point x="935" y="1380" type="curve"/>
@@ -63,7 +63,7 @@
       <point x="1111" y="1375" type="curve" smooth="yes"/>
       <point x="1156" y="1375"/>
       <point x="1185" y="1349"/>
-      <point x="1200" y="1297" type="curve" name="hr02" smooth="yes"/>
+      <point x="1200" y="1297" type="curve" smooth="yes" name="hr02"/>
       <point x="1207" y="1274"/>
       <point x="1210" y="1246"/>
       <point x="1210" y="1212" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2126.glif b/source/Hack-Italic.ufo/glyphs/uni2126.glif
index 9b13b18ae..4239dc10c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2126.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2126.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2126" format="1">
+<glyph name="uni2126" format="2">
   <advance width="1233"/>
   <unicode hex="2126"/>
   <outline>
@@ -8,16 +8,16 @@
       <point x="212" y="172" type="line" name="ih01"/>
       <point x="120" y="297"/>
       <point x="76" y="428"/>
-      <point x="76" y="585" type="curve" name="sh01" smooth="yes"/>
+      <point x="76" y="585" type="curve" smooth="yes" name="sh01"/>
       <point x="76" y="646"/>
       <point x="83" y="712"/>
       <point x="97" y="782" type="curve" smooth="yes"/>
       <point x="177" y="1194"/>
       <point x="433" y="1460"/>
-      <point x="759" y="1460" type="curve" name="dv02" smooth="yes"/>
+      <point x="759" y="1460" type="curve" smooth="yes" name="dv02"/>
       <point x="1028" y="1460"/>
       <point x="1177" y="1278"/>
-      <point x="1177" y="985" type="curve" name="sh03" smooth="yes"/>
+      <point x="1177" y="985" type="curve" smooth="yes" name="sh03"/>
       <point x="1177" y="922"/>
       <point x="1170" y="854"/>
       <point x="1156" y="782" type="curve" smooth="yes"/>
@@ -33,16 +33,16 @@
       <point x="964" y="799" type="curve"/>
       <point x="975" y="862"/>
       <point x="981" y="919"/>
-      <point x="981" y="971" type="curve" name="ah01" smooth="yes"/>
+      <point x="981" y="971" type="curve" smooth="yes" name="ah01"/>
       <point x="981" y="1175"/>
       <point x="896" y="1294"/>
-      <point x="728" y="1294" type="curve" name="dv01" smooth="yes"/>
+      <point x="728" y="1294" type="curve" smooth="yes" name="dv01"/>
       <point x="525" y="1294"/>
       <point x="361" y="1117"/>
       <point x="297" y="799" type="curve" smooth="yes"/>
       <point x="281" y="721"/>
       <point x="273" y="647"/>
-      <point x="273" y="577" type="curve" name="sh02" smooth="yes"/>
+      <point x="273" y="577" type="curve" smooth="yes" name="sh02"/>
       <point x="273" y="390"/>
       <point x="327" y="244"/>
       <point x="430" y="172" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2150.glif b/source/Hack-Italic.ufo/glyphs/uni2150.glif
index d2f5d19e2..1ffb73965 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2150.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2150.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2150" format="1">
+<glyph name="uni2150" format="2">
   <advance width="1233"/>
   <unicode hex="2150"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2151.glif b/source/Hack-Italic.ufo/glyphs/uni2151.glif
index a9078e928..424584e57 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2151.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2151.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2151" format="1">
+<glyph name="uni2151" format="2">
   <advance width="1233"/>
   <unicode hex="2151"/>
   <outline>
@@ -23,32 +23,32 @@
       <point x="70" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="680" y="-275" type="curve" name="sh04" smooth="yes"/>
+      <point x="680" y="-275" type="curve" smooth="yes" name="sh04"/>
       <point x="608" y="-275"/>
       <point x="547" y="-263"/>
       <point x="490" y="-242" type="curve"/>
       <point x="514" y="-138" type="line"/>
       <point x="566" y="-165"/>
       <point x="628" y="-180"/>
-      <point x="693" y="-180" type="curve" name="dv01" smooth="yes"/>
+      <point x="693" y="-180" type="curve" smooth="yes" name="dv01"/>
       <point x="873" y="-180"/>
       <point x="982" y="-69"/>
       <point x="1030" y="139" type="curve" name="ih01"/>
       <point x="969" y="63"/>
       <point x="890" y="23"/>
-      <point x="778" y="23" type="curve" name="dv02" smooth="yes"/>
+      <point x="778" y="23" type="curve" smooth="yes" name="dv02"/>
       <point x="625" y="23"/>
       <point x="533" y="100"/>
-      <point x="533" y="239" type="curve" name="sh01" smooth="yes"/>
+      <point x="533" y="239" type="curve" smooth="yes" name="sh01"/>
       <point x="533" y="323"/>
       <point x="567" y="415"/>
       <point x="632" y="484" type="curve" smooth="yes"/>
       <point x="700" y="556"/>
       <point x="792" y="592"/>
-      <point x="907" y="592" type="curve" name="dv05" smooth="yes"/>
+      <point x="907" y="592" type="curve" smooth="yes" name="dv05"/>
       <point x="1082" y="592"/>
       <point x="1187" y="506"/>
-      <point x="1187" y="327" type="curve" name="sh05" smooth="yes"/>
+      <point x="1187" y="327" type="curve" smooth="yes" name="sh05"/>
       <point x="1187" y="220"/>
       <point x="1149" y="73"/>
       <point x="1089" y="-35" type="curve" smooth="yes"/>
@@ -56,16 +56,16 @@
       <point x="864" y="-275"/>
     </contour>
     <contour>
-      <point x="814" y="111" type="curve" name="dv03" smooth="yes"/>
+      <point x="814" y="111" type="curve" smooth="yes" name="dv03"/>
       <point x="957" y="111"/>
       <point x="1051" y="225"/>
-      <point x="1051" y="353" type="curve" name="ah01" smooth="yes"/>
+      <point x="1051" y="353" type="curve" smooth="yes" name="ah01"/>
       <point x="1051" y="453"/>
       <point x="994" y="504"/>
-      <point x="902" y="504" type="curve" name="dv04" smooth="yes"/>
+      <point x="902" y="504" type="curve" smooth="yes" name="dv04"/>
       <point x="761" y="504"/>
       <point x="670" y="378"/>
-      <point x="670" y="253" type="curve" name="sh02" smooth="yes"/>
+      <point x="670" y="253" type="curve" smooth="yes" name="sh02"/>
       <point x="670" y="156"/>
       <point x="723" y="111"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2153.glif b/source/Hack-Italic.ufo/glyphs/uni2153.glif
index 09e6ab613..ca79a9abe 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2153.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2153.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2153" format="1">
+<glyph name="uni2153" format="2">
   <advance width="1233"/>
   <unicode hex="2153"/>
   <outline>
@@ -23,45 +23,45 @@
       <point x="70" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="673" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="673" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="589" y="-285"/>
       <point x="504" y="-271"/>
       <point x="424" y="-244" type="curve"/>
       <point x="448" y="-123" type="line"/>
       <point x="537" y="-162"/>
       <point x="601" y="-178"/>
-      <point x="673" y="-178" type="curve" name="dv02" smooth="yes"/>
+      <point x="673" y="-178" type="curve" smooth="yes" name="dv02"/>
       <point x="817" y="-178"/>
       <point x="911" y="-112"/>
-      <point x="911" y="-4" type="curve" name="dh01" smooth="yes"/>
+      <point x="911" y="-4" type="curve" smooth="yes" name="dh01"/>
       <point x="911" y="81"/>
       <point x="853" y="123"/>
-      <point x="737" y="123" type="curve" name="dv03" smooth="yes"/>
+      <point x="737" y="123" type="curve" smooth="yes" name="dv03"/>
       <point x="665" y="123" type="line"/>
       <point x="686" y="229" type="line"/>
-      <point x="758" y="229" type="line" name="dv04" smooth="yes"/>
+      <point x="758" y="229" type="line" smooth="yes" name="dv04"/>
       <point x="888" y="229"/>
       <point x="973" y="288"/>
-      <point x="973" y="372" type="curve" name="sh01" smooth="yes"/>
+      <point x="973" y="372" type="curve" smooth="yes" name="sh01"/>
       <point x="973" y="441"/>
       <point x="915" y="475"/>
-      <point x="808" y="475" type="curve" name="dv05" smooth="yes"/>
+      <point x="808" y="475" type="curve" smooth="yes" name="dv05"/>
       <point x="741" y="475"/>
       <point x="682" y="463"/>
       <point x="598" y="432" type="curve"/>
       <point x="620" y="547" type="line"/>
       <point x="717" y="570"/>
       <point x="798" y="582"/>
-      <point x="865" y="582" type="curve" name="dv06" smooth="yes"/>
+      <point x="865" y="582" type="curve" smooth="yes" name="dv06"/>
       <point x="1032" y="582"/>
       <point x="1120" y="512"/>
-      <point x="1120" y="395" type="curve" name="sh02" smooth="yes"/>
+      <point x="1120" y="395" type="curve" smooth="yes" name="sh02"/>
       <point x="1120" y="284"/>
       <point x="1041" y="203"/>
       <point x="909" y="178" type="curve" name="iv01"/>
       <point x="1008" y="161"/>
       <point x="1059" y="100"/>
-      <point x="1059" y="0" type="curve" name="dh02" smooth="yes"/>
+      <point x="1059" y="0" type="curve" smooth="yes" name="dh02"/>
       <point x="1059" y="-171"/>
       <point x="909" y="-285"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2154.glif b/source/Hack-Italic.ufo/glyphs/uni2154.glif
index 3ab9ca23e..a4dae64c3 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2154.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2154.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2154" format="1">
+<glyph name="uni2154" format="2">
   <advance width="1233"/>
   <unicode hex="2154"/>
   <outline>
@@ -8,20 +8,20 @@
       <point x="273" y="1101" type="line" smooth="yes"/>
       <point x="482" y="1272"/>
       <point x="586" y="1383"/>
-      <point x="586" y="1464" type="curve" name="dh01" smooth="yes"/>
+      <point x="586" y="1464" type="curve" smooth="yes" name="dh01"/>
       <point x="586" y="1512"/>
       <point x="547" y="1571"/>
-      <point x="446" y="1571" type="curve" name="hr01" smooth="yes"/>
+      <point x="446" y="1571" type="curve" smooth="yes" name="hr01"/>
       <point x="382" y="1571"/>
       <point x="304" y="1548"/>
       <point x="193" y="1493" type="curve"/>
       <point x="217" y="1620" type="line"/>
       <point x="330" y="1659"/>
       <point x="407" y="1676"/>
-      <point x="479" y="1676" type="curve" name="dv03" smooth="yes"/>
+      <point x="479" y="1676" type="curve" smooth="yes" name="dv03"/>
       <point x="647" y="1676"/>
       <point x="733" y="1580"/>
-      <point x="733" y="1485" type="curve" name="dh02" smooth="yes"/>
+      <point x="733" y="1485" type="curve" smooth="yes" name="dh02"/>
       <point x="733" y="1378"/>
       <point x="627" y="1241"/>
       <point x="424" y="1089" type="curve" smooth="yes"/>
@@ -38,45 +38,45 @@
       <point x="70" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="673" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="673" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="589" y="-285"/>
       <point x="504" y="-271"/>
       <point x="424" y="-244" type="curve"/>
       <point x="448" y="-123" type="line"/>
       <point x="537" y="-162"/>
       <point x="601" y="-178"/>
-      <point x="673" y="-178" type="curve" name="dv02" smooth="yes"/>
+      <point x="673" y="-178" type="curve" smooth="yes" name="dv02"/>
       <point x="817" y="-178"/>
       <point x="911" y="-112"/>
-      <point x="911" y="-4" type="curve" name="dh03" smooth="yes"/>
+      <point x="911" y="-4" type="curve" smooth="yes" name="dh03"/>
       <point x="911" y="81"/>
       <point x="853" y="123"/>
-      <point x="737" y="123" type="curve" name="dv04" smooth="yes"/>
+      <point x="737" y="123" type="curve" smooth="yes" name="dv04"/>
       <point x="665" y="123" type="line"/>
       <point x="686" y="229" type="line"/>
-      <point x="758" y="229" type="line" name="dv05" smooth="yes"/>
+      <point x="758" y="229" type="line" smooth="yes" name="dv05"/>
       <point x="888" y="229"/>
       <point x="973" y="288"/>
-      <point x="973" y="372" type="curve" name="sh01" smooth="yes"/>
+      <point x="973" y="372" type="curve" smooth="yes" name="sh01"/>
       <point x="973" y="441"/>
       <point x="915" y="475"/>
-      <point x="808" y="475" type="curve" name="dv06" smooth="yes"/>
+      <point x="808" y="475" type="curve" smooth="yes" name="dv06"/>
       <point x="741" y="475"/>
       <point x="682" y="463"/>
       <point x="598" y="432" type="curve" name="sh02"/>
       <point x="620" y="547" type="line"/>
       <point x="717" y="570"/>
       <point x="798" y="582"/>
-      <point x="865" y="582" type="curve" name="dv07" smooth="yes"/>
+      <point x="865" y="582" type="curve" smooth="yes" name="dv07"/>
       <point x="1032" y="582"/>
       <point x="1120" y="512"/>
-      <point x="1120" y="395" type="curve" name="sh03" smooth="yes"/>
+      <point x="1120" y="395" type="curve" smooth="yes" name="sh03"/>
       <point x="1120" y="284"/>
       <point x="1041" y="203"/>
       <point x="909" y="178" type="curve" name="ih01"/>
       <point x="1008" y="161"/>
       <point x="1059" y="100"/>
-      <point x="1059" y="0" type="curve" name="dh04" smooth="yes"/>
+      <point x="1059" y="0" type="curve" smooth="yes" name="dh04"/>
       <point x="1059" y="-171"/>
       <point x="909" y="-285"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2155.glif b/source/Hack-Italic.ufo/glyphs/uni2155.glif
index adfa035f3..86749497c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2155.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2155.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2155" format="1">
+<glyph name="uni2155" format="2">
   <advance width="1233"/>
   <unicode hex="2155"/>
   <outline>
@@ -23,20 +23,20 @@
       <point x="70" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="685" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="685" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="597" y="-285"/>
       <point x="509" y="-273"/>
       <point x="445" y="-249" type="curve"/>
       <point x="472" y="-135" type="line"/>
       <point x="548" y="-172"/>
       <point x="630" y="-191"/>
-      <point x="706" y="-191" type="curve" name="dv02" smooth="yes"/>
+      <point x="706" y="-191" type="curve" smooth="yes" name="dv02"/>
       <point x="878" y="-191"/>
       <point x="999" y="-92"/>
-      <point x="999" y="35" type="curve" name="dh01" smooth="yes"/>
+      <point x="999" y="35" type="curve" smooth="yes" name="dh01"/>
       <point x="999" y="135"/>
       <point x="924" y="190"/>
-      <point x="793" y="190" type="curve" name="dv03" smooth="yes"/>
+      <point x="793" y="190" type="curve" smooth="yes" name="dv03"/>
       <point x="725" y="190"/>
       <point x="649" y="175"/>
       <point x="581" y="147" type="curve"/>
@@ -47,10 +47,10 @@
       <point x="732" y="266" type="line" name="iv01"/>
       <point x="775" y="278"/>
       <point x="814" y="283"/>
-      <point x="853" y="283" type="curve" name="dv04" smooth="yes"/>
+      <point x="853" y="283" type="curve" smooth="yes" name="dv04"/>
       <point x="1022" y="283"/>
       <point x="1134" y="191"/>
-      <point x="1134" y="51" type="curve" name="dh02" smooth="yes"/>
+      <point x="1134" y="51" type="curve" smooth="yes" name="dh02"/>
       <point x="1134" y="-45"/>
       <point x="1083" y="-132"/>
       <point x="999" y="-196" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2156.glif b/source/Hack-Italic.ufo/glyphs/uni2156.glif
index 8b745625b..a6189a084 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2156.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2156.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2156" format="1">
+<glyph name="uni2156" format="2">
   <advance width="1233"/>
   <unicode hex="2156"/>
   <outline>
@@ -8,20 +8,20 @@
       <point x="273" y="1101" type="line" smooth="yes"/>
       <point x="482" y="1272"/>
       <point x="586" y="1383"/>
-      <point x="586" y="1464" type="curve" name="sh01" smooth="yes"/>
+      <point x="586" y="1464" type="curve" smooth="yes" name="sh01"/>
       <point x="586" y="1512"/>
       <point x="547" y="1571"/>
-      <point x="446" y="1571" type="curve" name="dv03" smooth="yes"/>
+      <point x="446" y="1571" type="curve" smooth="yes" name="dv03"/>
       <point x="382" y="1571"/>
       <point x="304" y="1548"/>
       <point x="193" y="1493" type="curve"/>
       <point x="217" y="1620" type="line"/>
       <point x="330" y="1659"/>
       <point x="407" y="1676"/>
-      <point x="479" y="1676" type="curve" name="dv04" smooth="yes"/>
+      <point x="479" y="1676" type="curve" smooth="yes" name="dv04"/>
       <point x="647" y="1676"/>
       <point x="733" y="1580"/>
-      <point x="733" y="1485" type="curve" name="sh02" smooth="yes"/>
+      <point x="733" y="1485" type="curve" smooth="yes" name="sh02"/>
       <point x="733" y="1378"/>
       <point x="627" y="1241"/>
       <point x="424" y="1089" type="curve" smooth="yes"/>
@@ -38,20 +38,20 @@
       <point x="70" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="685" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="685" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="597" y="-285"/>
       <point x="509" y="-273"/>
       <point x="445" y="-249" type="curve"/>
       <point x="472" y="-135" type="line"/>
       <point x="548" y="-172"/>
       <point x="630" y="-191"/>
-      <point x="706" y="-191" type="curve" name="dv02" smooth="yes"/>
+      <point x="706" y="-191" type="curve" smooth="yes" name="dv02"/>
       <point x="878" y="-191"/>
       <point x="999" y="-92"/>
-      <point x="999" y="35" type="curve" name="ah01" smooth="yes"/>
+      <point x="999" y="35" type="curve" smooth="yes" name="ah01"/>
       <point x="999" y="135"/>
       <point x="924" y="190"/>
-      <point x="793" y="190" type="curve" name="dv05" smooth="yes"/>
+      <point x="793" y="190" type="curve" smooth="yes" name="dv05"/>
       <point x="725" y="190"/>
       <point x="649" y="175"/>
       <point x="581" y="147" type="curve" name="sh05"/>
@@ -62,13 +62,13 @@
       <point x="732" y="266" type="line" name="sh06"/>
       <point x="775" y="278"/>
       <point x="814" y="283"/>
-      <point x="853" y="283" type="curve" name="dv06" smooth="yes"/>
+      <point x="853" y="283" type="curve" smooth="yes" name="dv06"/>
       <point x="1022" y="283"/>
       <point x="1134" y="191"/>
-      <point x="1134" y="51" type="curve" name="sh03" smooth="yes"/>
+      <point x="1134" y="51" type="curve" smooth="yes" name="sh03"/>
       <point x="1134" y="-45"/>
       <point x="1083" y="-132"/>
-      <point x="999" y="-196" type="curve" name="sh07" smooth="yes"/>
+      <point x="999" y="-196" type="curve" smooth="yes" name="sh07"/>
       <point x="919" y="-256"/>
       <point x="822" y="-285"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2157.glif b/source/Hack-Italic.ufo/glyphs/uni2157.glif
index 31dd963c6..b8fe474d0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2157.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2157.glif
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2157" format="1">
+<glyph name="uni2157" format="2">
   <advance width="1233"/>
   <unicode hex="2157"/>
   <outline>
     <contour>
-      <point x="308" y="809" type="curve" name="dv10" smooth="yes"/>
+      <point x="308" y="809" type="curve" smooth="yes" name="dv10"/>
       <point x="224" y="809"/>
       <point x="139" y="823"/>
       <point x="59" y="850" type="curve"/>
       <point x="83" y="971" type="line"/>
       <point x="172" y="932"/>
       <point x="236" y="916"/>
-      <point x="308" y="916" type="curve" name="dv11" smooth="yes"/>
+      <point x="308" y="916" type="curve" smooth="yes" name="dv11"/>
       <point x="452" y="916"/>
       <point x="546" y="982"/>
-      <point x="546" y="1090" type="curve" name="dh01" smooth="yes"/>
+      <point x="546" y="1090" type="curve" smooth="yes" name="dh01"/>
       <point x="546" y="1175"/>
       <point x="488" y="1217"/>
-      <point x="372" y="1217" type="curve" name="dv05" smooth="yes"/>
+      <point x="372" y="1217" type="curve" smooth="yes" name="dv05"/>
       <point x="300" y="1217" type="line"/>
       <point x="321" y="1323" type="line"/>
-      <point x="393" y="1323" type="line" name="dv06" smooth="yes"/>
+      <point x="393" y="1323" type="line" smooth="yes" name="dv06"/>
       <point x="523" y="1323"/>
       <point x="608" y="1382"/>
-      <point x="608" y="1466" type="curve" name="sh01" smooth="yes"/>
+      <point x="608" y="1466" type="curve" smooth="yes" name="sh01"/>
       <point x="608" y="1535"/>
       <point x="550" y="1569"/>
-      <point x="443" y="1569" type="curve" name="dv03" smooth="yes"/>
+      <point x="443" y="1569" type="curve" smooth="yes" name="dv03"/>
       <point x="376" y="1569"/>
       <point x="317" y="1557"/>
       <point x="233" y="1526" type="curve"/>
       <point x="255" y="1641" type="line"/>
       <point x="352" y="1664"/>
       <point x="433" y="1676"/>
-      <point x="500" y="1676" type="curve" name="dv04" smooth="yes"/>
+      <point x="500" y="1676" type="curve" smooth="yes" name="dv04"/>
       <point x="667" y="1676"/>
       <point x="755" y="1606"/>
-      <point x="755" y="1489" type="curve" name="sh02" smooth="yes"/>
+      <point x="755" y="1489" type="curve" smooth="yes" name="sh02"/>
       <point x="755" y="1378"/>
       <point x="676" y="1297"/>
       <point x="544" y="1272" type="curve" name="iv01"/>
       <point x="643" y="1255"/>
       <point x="694" y="1194"/>
-      <point x="694" y="1094" type="curve" name="dh02" smooth="yes"/>
+      <point x="694" y="1094" type="curve" smooth="yes" name="dh02"/>
       <point x="694" y="923"/>
       <point x="544" y="809"/>
     </contour>
@@ -53,20 +53,20 @@
       <point x="70" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="685" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="685" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="597" y="-285"/>
       <point x="509" y="-273"/>
       <point x="445" y="-249" type="curve"/>
       <point x="472" y="-135" type="line" name="hr01"/>
       <point x="548" y="-172"/>
       <point x="630" y="-191"/>
-      <point x="706" y="-191" type="curve" name="dv02" smooth="yes"/>
+      <point x="706" y="-191" type="curve" smooth="yes" name="dv02"/>
       <point x="878" y="-191"/>
       <point x="999" y="-92"/>
-      <point x="999" y="35" type="curve" name="dh03" smooth="yes"/>
+      <point x="999" y="35" type="curve" smooth="yes" name="dh03"/>
       <point x="999" y="135"/>
       <point x="924" y="190"/>
-      <point x="793" y="190" type="curve" name="dv07" smooth="yes"/>
+      <point x="793" y="190" type="curve" smooth="yes" name="dv07"/>
       <point x="725" y="190"/>
       <point x="649" y="175"/>
       <point x="581" y="147" type="curve" name="ih01"/>
@@ -77,10 +77,10 @@
       <point x="732" y="266" type="line" name="ih02"/>
       <point x="775" y="278"/>
       <point x="814" y="283"/>
-      <point x="853" y="283" type="curve" name="hr02" smooth="yes"/>
+      <point x="853" y="283" type="curve" smooth="yes" name="hr02"/>
       <point x="1022" y="283"/>
       <point x="1134" y="191"/>
-      <point x="1134" y="51" type="curve" name="dh04" smooth="yes"/>
+      <point x="1134" y="51" type="curve" smooth="yes" name="dh04"/>
       <point x="1134" y="-45"/>
       <point x="1083" y="-132"/>
       <point x="999" y="-196" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2158.glif b/source/Hack-Italic.ufo/glyphs/uni2158.glif
index 7b93316d6..a03e1c9bf 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2158.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2158.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2158" format="1">
+<glyph name="uni2158" format="2">
   <advance width="1233"/>
   <unicode hex="2158"/>
   <outline>
@@ -28,20 +28,20 @@
       <point x="70" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="685" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="685" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="597" y="-285"/>
       <point x="509" y="-273"/>
       <point x="445" y="-249" type="curve"/>
       <point x="472" y="-135" type="line"/>
       <point x="548" y="-172"/>
       <point x="630" y="-191"/>
-      <point x="706" y="-191" type="curve" name="dv02" smooth="yes"/>
+      <point x="706" y="-191" type="curve" smooth="yes" name="dv02"/>
       <point x="878" y="-191"/>
       <point x="999" y="-92"/>
-      <point x="999" y="35" type="curve" name="dh01" smooth="yes"/>
+      <point x="999" y="35" type="curve" smooth="yes" name="dh01"/>
       <point x="999" y="135"/>
       <point x="924" y="190"/>
-      <point x="793" y="190" type="curve" name="dv03" smooth="yes"/>
+      <point x="793" y="190" type="curve" smooth="yes" name="dv03"/>
       <point x="725" y="190"/>
       <point x="649" y="175"/>
       <point x="581" y="147" type="curve"/>
@@ -52,13 +52,13 @@
       <point x="732" y="266" type="line" name="iv01"/>
       <point x="775" y="278"/>
       <point x="814" y="283"/>
-      <point x="853" y="283" type="curve" name="dv04" smooth="yes"/>
+      <point x="853" y="283" type="curve" smooth="yes" name="dv04"/>
       <point x="1022" y="283"/>
       <point x="1134" y="191"/>
-      <point x="1134" y="51" type="curve" name="dh02" smooth="yes"/>
+      <point x="1134" y="51" type="curve" smooth="yes" name="dh02"/>
       <point x="1134" y="-45"/>
       <point x="1083" y="-132"/>
-      <point x="999" y="-196" type="curve" name="hr02" smooth="yes"/>
+      <point x="999" y="-196" type="curve" smooth="yes" name="hr02"/>
       <point x="919" y="-256"/>
       <point x="822" y="-285"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2159.glif b/source/Hack-Italic.ufo/glyphs/uni2159.glif
index 6e6bf0da9..96cba994a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2159.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2159.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2159" format="1">
+<glyph name="uni2159" format="2">
   <advance width="1233"/>
   <unicode hex="2159"/>
   <outline>
@@ -23,32 +23,32 @@
       <point x="70" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="771" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="771" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="592" y="-285"/>
       <point x="491" y="-199"/>
-      <point x="491" y="-23" type="curve" name="sh03" smooth="yes"/>
+      <point x="491" y="-23" type="curve" smooth="yes" name="sh03"/>
       <point x="491" y="84"/>
       <point x="528" y="233"/>
       <point x="589" y="342" type="curve"/>
       <point x="677" y="503"/>
       <point x="814" y="582"/>
-      <point x="997" y="582" type="curve" name="sh04" smooth="yes"/>
+      <point x="997" y="582" type="curve" smooth="yes" name="sh04"/>
       <point x="1068" y="582"/>
       <point x="1131" y="570"/>
       <point x="1187" y="549" type="curve"/>
       <point x="1163" y="445" type="line"/>
       <point x="1111" y="472"/>
       <point x="1049" y="487"/>
-      <point x="984" y="487" type="curve" name="dv05" smooth="yes"/>
+      <point x="984" y="487" type="curve" smooth="yes" name="dv05"/>
       <point x="809" y="487"/>
       <point x="696" y="380"/>
       <point x="647" y="167" type="curve" name="ih01"/>
       <point x="712" y="248"/>
       <point x="792" y="284"/>
-      <point x="897" y="284" type="curve" name="dv04" smooth="yes"/>
+      <point x="897" y="284" type="curve" smooth="yes" name="dv04"/>
       <point x="1050" y="284"/>
       <point x="1143" y="209"/>
-      <point x="1143" y="69" type="curve" name="sh01" smooth="yes"/>
+      <point x="1143" y="69" type="curve" smooth="yes" name="sh01"/>
       <point x="1143" y="-16"/>
       <point x="1108" y="-109"/>
       <point x="1044" y="-177" type="curve" smooth="yes"/>
@@ -56,16 +56,16 @@
       <point x="875" y="-285"/>
     </contour>
     <contour>
-      <point x="776" y="-197" type="curve" name="dv02" smooth="yes"/>
+      <point x="776" y="-197" type="curve" smooth="yes" name="dv02"/>
       <point x="918" y="-197"/>
       <point x="1007" y="-71"/>
-      <point x="1007" y="53" type="curve" name="ah01" smooth="yes"/>
+      <point x="1007" y="53" type="curve" smooth="yes" name="ah01"/>
       <point x="1007" y="150"/>
       <point x="954" y="195"/>
-      <point x="862" y="195" type="curve" name="dv03" smooth="yes"/>
+      <point x="862" y="195" type="curve" smooth="yes" name="dv03"/>
       <point x="717" y="195"/>
       <point x="626" y="79"/>
-      <point x="626" y="-45" type="curve" name="sh05" smooth="yes"/>
+      <point x="626" y="-45" type="curve" smooth="yes" name="sh05"/>
       <point x="626" y="-145"/>
       <point x="684" y="-197"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni215A_.glif b/source/Hack-Italic.ufo/glyphs/uni215A_.glif
index 4de1b88b4..93263ef5a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni215A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni215A_.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni215A" format="1">
+<glyph name="uni215A" format="2">
   <advance width="1233"/>
   <unicode hex="215A"/>
   <outline>
     <contour>
-      <point x="320" y="809" type="curve" name="hr00" smooth="yes"/>
+      <point x="320" y="809" type="curve" smooth="yes" name="hr00"/>
       <point x="232" y="809"/>
       <point x="144" y="821"/>
       <point x="80" y="845" type="curve"/>
       <point x="107" y="959" type="line"/>
       <point x="183" y="922"/>
       <point x="265" y="903"/>
-      <point x="341" y="903" type="curve" name="dv11" smooth="yes"/>
+      <point x="341" y="903" type="curve" smooth="yes" name="dv11"/>
       <point x="513" y="903"/>
       <point x="634" y="1002"/>
-      <point x="634" y="1129" type="curve" name="sh01" smooth="yes"/>
+      <point x="634" y="1129" type="curve" smooth="yes" name="sh01"/>
       <point x="634" y="1229"/>
       <point x="559" y="1284"/>
-      <point x="428" y="1284" type="curve" name="dv05" smooth="yes"/>
+      <point x="428" y="1284" type="curve" smooth="yes" name="dv05"/>
       <point x="360" y="1284"/>
       <point x="284" y="1269"/>
       <point x="216" y="1241" type="curve"/>
@@ -28,10 +28,10 @@
       <point x="367" y="1360" type="line" name="iv01"/>
       <point x="410" y="1372"/>
       <point x="449" y="1377"/>
-      <point x="488" y="1377" type="curve" name="dv06" smooth="yes"/>
+      <point x="488" y="1377" type="curve" smooth="yes" name="dv06"/>
       <point x="657" y="1377"/>
       <point x="769" y="1285"/>
-      <point x="769" y="1145" type="curve" name="sh02" smooth="yes"/>
+      <point x="769" y="1145" type="curve" smooth="yes" name="sh02"/>
       <point x="769" y="1049"/>
       <point x="718" y="962"/>
       <point x="634" y="898" type="curve" smooth="yes"/>
@@ -45,32 +45,32 @@
       <point x="70" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="771" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="771" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="592" y="-285"/>
       <point x="491" y="-199"/>
-      <point x="491" y="-23" type="curve" name="dh01" smooth="yes"/>
+      <point x="491" y="-23" type="curve" smooth="yes" name="dh01"/>
       <point x="491" y="84"/>
       <point x="528" y="233"/>
       <point x="589" y="342" type="curve"/>
       <point x="677" y="503"/>
       <point x="814" y="582"/>
-      <point x="997" y="582" type="curve" name="dv10" smooth="yes"/>
+      <point x="997" y="582" type="curve" smooth="yes" name="dv10"/>
       <point x="1068" y="582"/>
       <point x="1131" y="570"/>
       <point x="1187" y="549" type="curve"/>
       <point x="1163" y="445" type="line"/>
       <point x="1111" y="472"/>
       <point x="1049" y="487"/>
-      <point x="984" y="487" type="curve" name="dv09" smooth="yes"/>
+      <point x="984" y="487" type="curve" smooth="yes" name="dv09"/>
       <point x="809" y="487"/>
       <point x="696" y="380"/>
       <point x="647" y="167" type="curve" name="ih01"/>
       <point x="712" y="248"/>
       <point x="792" y="284"/>
-      <point x="897" y="284" type="curve" name="dv08" smooth="yes"/>
+      <point x="897" y="284" type="curve" smooth="yes" name="dv08"/>
       <point x="1050" y="284"/>
       <point x="1143" y="209"/>
-      <point x="1143" y="69" type="curve" name="dh04" smooth="yes"/>
+      <point x="1143" y="69" type="curve" smooth="yes" name="dh04"/>
       <point x="1143" y="-16"/>
       <point x="1108" y="-109"/>
       <point x="1044" y="-177" type="curve" smooth="yes"/>
@@ -78,16 +78,16 @@
       <point x="875" y="-285"/>
     </contour>
     <contour>
-      <point x="776" y="-197" type="curve" name="dv02" smooth="yes"/>
+      <point x="776" y="-197" type="curve" smooth="yes" name="dv02"/>
       <point x="918" y="-197"/>
       <point x="1007" y="-71"/>
-      <point x="1007" y="53" type="curve" name="dh03" smooth="yes"/>
+      <point x="1007" y="53" type="curve" smooth="yes" name="dh03"/>
       <point x="1007" y="150"/>
       <point x="954" y="195"/>
-      <point x="862" y="195" type="curve" name="dv07" smooth="yes"/>
+      <point x="862" y="195" type="curve" smooth="yes" name="dv07"/>
       <point x="717" y="195"/>
       <point x="626" y="79"/>
-      <point x="626" y="-45" type="curve" name="dh02" smooth="yes"/>
+      <point x="626" y="-45" type="curve" smooth="yes" name="dh02"/>
       <point x="626" y="-145"/>
       <point x="684" y="-197"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni215F_.glif b/source/Hack-Italic.ufo/glyphs/uni215F_.glif
index fafbdac37..d12ba4864 100644
--- a/source/Hack-Italic.ufo/glyphs/uni215F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni215F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni215F" format="1">
+<glyph name="uni215F" format="2">
   <advance width="1233"/>
   <unicode hex="215F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2189.glif b/source/Hack-Italic.ufo/glyphs/uni2189.glif
index 4574bbb12..274c6dd94 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2189.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2189.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2189" format="1">
+<glyph name="uni2189" format="2">
   <advance width="1233"/>
   <unicode hex="2189"/>
   <outline>
     <contour>
-      <point x="353" y="809" type="curve" name="dv10" smooth="yes"/>
+      <point x="353" y="809" type="curve" smooth="yes" name="dv10"/>
       <point x="178" y="809"/>
       <point x="95" y="897"/>
-      <point x="95" y="1085" type="curve" name="dh01" smooth="yes"/>
+      <point x="95" y="1085" type="curve" smooth="yes" name="dh01"/>
       <point x="95" y="1235"/>
       <point x="149" y="1413"/>
       <point x="229" y="1522" type="curve" smooth="yes"/>
       <point x="308" y="1631"/>
       <point x="407" y="1676"/>
-      <point x="532" y="1676" type="curve" name="hr01" smooth="yes"/>
+      <point x="532" y="1676" type="curve" smooth="yes" name="hr01"/>
       <point x="707" y="1676"/>
       <point x="792" y="1589"/>
-      <point x="792" y="1402" type="curve" name="dh05" smooth="yes"/>
+      <point x="792" y="1402" type="curve" smooth="yes" name="dh05"/>
       <point x="792" y="1256"/>
       <point x="738" y="1076"/>
       <point x="658" y="964" type="curve" smooth="yes"/>
@@ -24,36 +24,36 @@
       <point x="483" y="809"/>
     </contour>
     <contour>
-      <point x="367" y="901" type="curve" name="dv11" smooth="yes"/>
+      <point x="367" y="901" type="curve" smooth="yes" name="dv11"/>
       <point x="443" y="901"/>
       <point x="499" y="935"/>
       <point x="546" y="1012" type="curve" smooth="yes"/>
       <point x="607" y="1113"/>
       <point x="655" y="1290"/>
-      <point x="655" y="1416" type="curve" name="dh04" smooth="yes"/>
+      <point x="655" y="1416" type="curve" smooth="yes" name="dh04"/>
       <point x="655" y="1536"/>
       <point x="613" y="1584"/>
-      <point x="521" y="1584" type="curve" name="dv03" smooth="yes"/>
+      <point x="521" y="1584" type="curve" smooth="yes" name="dv03"/>
       <point x="445" y="1584"/>
       <point x="387" y="1553"/>
       <point x="339" y="1474" type="curve" smooth="yes"/>
       <point x="278" y="1373"/>
       <point x="230" y="1192"/>
-      <point x="230" y="1069" type="curve" name="dh02" smooth="yes"/>
+      <point x="230" y="1069" type="curve" smooth="yes" name="dh02"/>
       <point x="230" y="952"/>
       <point x="272" y="901"/>
     </contour>
     <contour>
-      <point x="444" y="1170" type="curve" name="dv06" smooth="yes"/>
+      <point x="444" y="1170" type="curve" smooth="yes" name="dv06"/>
       <point x="393" y="1170"/>
       <point x="352" y="1202"/>
-      <point x="352" y="1245" type="curve" name="hr02" smooth="yes"/>
+      <point x="352" y="1245" type="curve" smooth="yes" name="hr02"/>
       <point x="352" y="1287"/>
       <point x="395" y="1321"/>
-      <point x="443" y="1321" type="curve" name="dv07" smooth="yes"/>
+      <point x="443" y="1321" type="curve" smooth="yes" name="dv07"/>
       <point x="492" y="1321"/>
       <point x="533" y="1287"/>
-      <point x="533" y="1244" type="curve" name="dh03" smooth="yes"/>
+      <point x="533" y="1244" type="curve" smooth="yes" name="dh03"/>
       <point x="533" y="1203"/>
       <point x="495" y="1170"/>
     </contour>
@@ -64,45 +64,45 @@
       <point x="70" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="673" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="673" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="589" y="-285"/>
       <point x="504" y="-271"/>
       <point x="424" y="-244" type="curve"/>
       <point x="448" y="-123" type="line"/>
       <point x="537" y="-162"/>
       <point x="601" y="-178"/>
-      <point x="673" y="-178" type="curve" name="dv02" smooth="yes"/>
+      <point x="673" y="-178" type="curve" smooth="yes" name="dv02"/>
       <point x="817" y="-178"/>
       <point x="911" y="-112"/>
-      <point x="911" y="-4" type="curve" name="dh06" smooth="yes"/>
+      <point x="911" y="-4" type="curve" smooth="yes" name="dh06"/>
       <point x="911" y="81"/>
       <point x="853" y="123"/>
-      <point x="737" y="123" type="curve" name="dv04" smooth="yes"/>
+      <point x="737" y="123" type="curve" smooth="yes" name="dv04"/>
       <point x="665" y="123" type="line" name="sh01"/>
       <point x="686" y="229" type="line"/>
-      <point x="758" y="229" type="line" name="dv05" smooth="yes"/>
+      <point x="758" y="229" type="line" smooth="yes" name="dv05"/>
       <point x="888" y="229"/>
       <point x="973" y="288"/>
-      <point x="973" y="372" type="curve" name="sh02" smooth="yes"/>
+      <point x="973" y="372" type="curve" smooth="yes" name="sh02"/>
       <point x="973" y="441"/>
       <point x="915" y="475"/>
-      <point x="808" y="475" type="curve" name="dv08" smooth="yes"/>
+      <point x="808" y="475" type="curve" smooth="yes" name="dv08"/>
       <point x="741" y="475"/>
       <point x="682" y="463"/>
       <point x="598" y="432" type="curve" name="ih01"/>
       <point x="620" y="547" type="line"/>
       <point x="717" y="570"/>
       <point x="798" y="582"/>
-      <point x="865" y="582" type="curve" name="dv09" smooth="yes"/>
+      <point x="865" y="582" type="curve" smooth="yes" name="dv09"/>
       <point x="1032" y="582"/>
       <point x="1120" y="512"/>
-      <point x="1120" y="395" type="curve" name="sh03" smooth="yes"/>
+      <point x="1120" y="395" type="curve" smooth="yes" name="sh03"/>
       <point x="1120" y="284"/>
       <point x="1041" y="203"/>
       <point x="909" y="178" type="curve" name="ih02"/>
       <point x="1008" y="161"/>
       <point x="1059" y="100"/>
-      <point x="1059" y="0" type="curve" name="dh07" smooth="yes"/>
+      <point x="1059" y="0" type="curve" smooth="yes" name="dh07"/>
       <point x="1059" y="-171"/>
       <point x="909" y="-285"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2196.glif b/source/Hack-Italic.ufo/glyphs/uni2196.glif
index e3c0bce37..efce5435c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2196.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2196.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2196" format="1">
+<glyph name="uni2196" format="2">
   <advance width="1233"/>
   <unicode hex="2196"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2197.glif b/source/Hack-Italic.ufo/glyphs/uni2197.glif
index 84cd4a6a6..7fb368325 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2197.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2197.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2197" format="1">
+<glyph name="uni2197" format="2">
   <advance width="1233"/>
   <unicode hex="2197"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2198.glif b/source/Hack-Italic.ufo/glyphs/uni2198.glif
index 1fd0685a6..a62305074 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2198.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2198.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2198" format="1">
+<glyph name="uni2198" format="2">
   <advance width="1233"/>
   <unicode hex="2198"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2199.glif b/source/Hack-Italic.ufo/glyphs/uni2199.glif
index 739cc5ba7..bf0cff064 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2199.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2199.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2199" format="1">
+<glyph name="uni2199" format="2">
   <advance width="1233"/>
   <unicode hex="2199"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni219A_.glif b/source/Hack-Italic.ufo/glyphs/uni219A_.glif
index ee6852fcb..6d22997e0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni219A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni219A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni219A" format="1">
+<glyph name="uni219A" format="2">
   <advance width="1233"/>
   <unicode hex="219A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni219B_.glif b/source/Hack-Italic.ufo/glyphs/uni219B_.glif
index 34c6fea04..5d0edae15 100644
--- a/source/Hack-Italic.ufo/glyphs/uni219B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni219B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni219B" format="1">
+<glyph name="uni219B" format="2">
   <advance width="1233"/>
   <unicode hex="219B"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni219C_.glif b/source/Hack-Italic.ufo/glyphs/uni219C_.glif
index 18b613a2e..d4863acb8 100644
--- a/source/Hack-Italic.ufo/glyphs/uni219C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni219C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni219C" format="1">
+<glyph name="uni219C" format="2">
   <advance width="1233"/>
   <unicode hex="219C"/>
   <outline>
@@ -14,7 +14,7 @@
       <point x="401" y="607" type="curve" smooth="yes"/>
       <point x="425" y="579"/>
       <point x="466" y="553"/>
-      <point x="505" y="553" type="curve" name="sv01" smooth="yes"/>
+      <point x="505" y="553" type="curve" smooth="yes" name="sv01"/>
       <point x="529" y="553"/>
       <point x="580" y="564"/>
       <point x="617" y="608" type="curve"/>
@@ -26,7 +26,7 @@
       <point x="794" y="841" type="curve" smooth="yes"/>
       <point x="825" y="856"/>
       <point x="858" y="864"/>
-      <point x="893" y="864" type="curve" name="av03" smooth="yes"/>
+      <point x="893" y="864" type="curve" smooth="yes" name="av03"/>
       <point x="962" y="864"/>
       <point x="1023" y="833"/>
       <point x="1076" y="772" type="curve" smooth="yes"/>
@@ -39,7 +39,7 @@
       <point x="950" y="695" type="curve" smooth="yes"/>
       <point x="933" y="704"/>
       <point x="915" y="709"/>
-      <point x="894" y="709" type="curve" name="sv02" smooth="yes"/>
+      <point x="894" y="709" type="curve" smooth="yes" name="sv02"/>
       <point x="855" y="709"/>
       <point x="817" y="690"/>
       <point x="786" y="654" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="607" y="422" type="curve" smooth="yes"/>
       <point x="575" y="407"/>
       <point x="542" y="399"/>
-      <point x="509" y="399" type="curve" name="hr03" smooth="yes"/>
+      <point x="509" y="399" type="curve" smooth="yes" name="hr03"/>
       <point x="433" y="399"/>
       <point x="370" y="438"/>
       <point x="325" y="491" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni219D_.glif b/source/Hack-Italic.ufo/glyphs/uni219D_.glif
index 4fe3f1bda..3bdbf5c10 100644
--- a/source/Hack-Italic.ufo/glyphs/uni219D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni219D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni219D" format="1">
+<glyph name="uni219D" format="2">
   <advance width="1233"/>
   <unicode hex="219D"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="908" y="491" type="line" smooth="yes"/>
       <point x="860" y="434"/>
       <point x="797" y="399"/>
-      <point x="725" y="399" type="curve" name="av01" smooth="yes"/>
+      <point x="725" y="399" type="curve" smooth="yes" name="av01"/>
       <point x="653" y="399"/>
       <point x="589" y="434"/>
       <point x="541" y="491" type="curve" smooth="yes"/>
@@ -17,20 +17,20 @@
       <point x="482" y="593" type="curve" smooth="yes"/>
       <point x="459" y="644"/>
       <point x="439" y="674"/>
-      <point x="396" y="695" type="curve" name="hr01" smooth="yes"/>
+      <point x="396" y="695" type="curve" smooth="yes" name="hr01"/>
       <point x="377" y="704"/>
       <point x="360" y="709"/>
-      <point x="339" y="709" type="curve" name="sv01" smooth="yes"/>
+      <point x="339" y="709" type="curve" smooth="yes" name="sv01"/>
       <point x="244" y="709"/>
       <point x="197" y="601"/>
       <point x="195" y="593" type="curve"/>
       <point x="89" y="660" type="line"/>
       <point x="141" y="791"/>
       <point x="240" y="864"/>
-      <point x="338" y="864" type="curve" name="av02" smooth="yes"/>
+      <point x="338" y="864" type="curve" smooth="yes" name="av02"/>
       <point x="414" y="864"/>
       <point x="480" y="826"/>
-      <point x="523" y="774" type="curve" name="hr02" smooth="yes"/>
+      <point x="523" y="774" type="curve" smooth="yes" name="hr02"/>
       <point x="554" y="738"/>
       <point x="571" y="698"/>
       <point x="583" y="670" type="curve" smooth="yes"/>
@@ -39,7 +39,7 @@
       <point x="667" y="568" type="curve" smooth="yes"/>
       <point x="684" y="558"/>
       <point x="702" y="553"/>
-      <point x="723" y="553" type="curve" name="sv02" smooth="yes"/>
+      <point x="723" y="553" type="curve" smooth="yes" name="sv02"/>
       <point x="768" y="553"/>
       <point x="808" y="579"/>
       <point x="832" y="607" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni219E_.glif b/source/Hack-Italic.ufo/glyphs/uni219E_.glif
index d57316d28..cdf491191 100644
--- a/source/Hack-Italic.ufo/glyphs/uni219E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni219E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni219E" format="1">
+<glyph name="uni219E" format="2">
   <advance width="1233"/>
   <unicode hex="219E"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni219F_.glif b/source/Hack-Italic.ufo/glyphs/uni219F_.glif
index 33fdc95ca..248026654 100644
--- a/source/Hack-Italic.ufo/glyphs/uni219F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni219F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni219F" format="1">
+<glyph name="uni219F" format="2">
   <advance width="1233"/>
   <unicode hex="219F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21A_0.glif b/source/Hack-Italic.ufo/glyphs/uni21A_0.glif
index 35723ac32..c40648995 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21A_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A0" format="1">
+<glyph name="uni21A0" format="2">
   <advance width="1233"/>
   <unicode hex="21A0"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21A_1.glif b/source/Hack-Italic.ufo/glyphs/uni21A_1.glif
index 5cf2c00a6..d4cca99fc 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21A_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21A_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A1" format="1">
+<glyph name="uni21A1" format="2">
   <advance width="1233"/>
   <unicode hex="21A1"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21A_2.glif b/source/Hack-Italic.ufo/glyphs/uni21A_2.glif
index af39b074a..238daa375 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21A_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21A_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A2" format="1">
+<glyph name="uni21A2" format="2">
   <advance width="1233"/>
   <unicode hex="21A2"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21A_3.glif b/source/Hack-Italic.ufo/glyphs/uni21A_3.glif
index 8c7a57e84..61cccae7b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21A_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21A_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A3" format="1">
+<glyph name="uni21A3" format="2">
   <advance width="1233"/>
   <unicode hex="21A3"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21A_4.glif b/source/Hack-Italic.ufo/glyphs/uni21A_4.glif
index acffdde08..8d2de8f9b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21A_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A4" format="1">
+<glyph name="uni21A4" format="2">
   <advance width="1233"/>
   <unicode hex="21A4"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21A_5.glif b/source/Hack-Italic.ufo/glyphs/uni21A_5.glif
index 4f598ad1d..3d504cfd2 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21A_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21A_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A5" format="1">
+<glyph name="uni21A5" format="2">
   <advance width="1233"/>
   <unicode hex="21A5"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21A_6.glif b/source/Hack-Italic.ufo/glyphs/uni21A_6.glif
index 7d9937a65..e5df636dd 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21A_6.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21A_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A6" format="1">
+<glyph name="uni21A6" format="2">
   <advance width="1233"/>
   <unicode hex="21A6"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21A_7.glif b/source/Hack-Italic.ufo/glyphs/uni21A_7.glif
index 2a5a32c8c..e7b2af8e0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21A_7.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21A_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A7" format="1">
+<glyph name="uni21A7" format="2">
   <advance width="1233"/>
   <unicode hex="21A7"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21A_9.glif b/source/Hack-Italic.ufo/glyphs/uni21A_9.glif
index 7a24a723b..406eeeb72 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21A_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21A_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A9" format="1">
+<glyph name="uni21A9" format="2">
   <advance width="1233"/>
   <unicode hex="21A9"/>
   <outline>
@@ -9,13 +9,13 @@
       <point x="357" y="893" type="line"/>
       <point x="447" y="803" type="line"/>
       <point x="287" y="643" type="line"/>
-      <point x="868" y="643" type="line" name="dv02" smooth="yes"/>
+      <point x="868" y="643" type="line" smooth="yes" name="dv02"/>
       <point x="911" y="643"/>
       <point x="945" y="659"/>
       <point x="966" y="680" type="curve" smooth="yes"/>
       <point x="989" y="703"/>
       <point x="1003" y="735"/>
-      <point x="1003" y="770" type="curve" name="sh01" smooth="yes"/>
+      <point x="1003" y="770" type="curve" smooth="yes" name="sh01"/>
       <point x="1003" y="809"/>
       <point x="986" y="839"/>
       <point x="966" y="858" type="curve" smooth="yes"/>
@@ -28,13 +28,13 @@
       <point x="1082" y="975" type="curve" smooth="yes"/>
       <point x="1133" y="926"/>
       <point x="1167" y="852"/>
-      <point x="1167" y="768" type="curve" name="dh02" smooth="yes"/>
+      <point x="1167" y="768" type="curve" smooth="yes" name="dh02"/>
       <point x="1167" y="704"/>
       <point x="1148" y="629"/>
       <point x="1081" y="564" type="curve" smooth="yes"/>
       <point x="1025" y="508"/>
       <point x="950" y="479"/>
-      <point x="908" y="479" type="curve" name="dv01" smooth="yes"/>
+      <point x="908" y="479" type="curve" smooth="yes" name="dv01"/>
       <point x="287" y="479" type="line"/>
       <point x="447" y="319" type="line"/>
       <point x="357" y="229" type="line" name="av01"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21A_A_.glif b/source/Hack-Italic.ufo/glyphs/uni21A_A_.glif
index 937bc2355..67b4efa52 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21A_A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21A_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21AA" format="1">
+<glyph name="uni21AA" format="2">
   <advance width="1233"/>
   <unicode hex="21AA"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="151" y="564" type="curve"/>
       <point x="91" y="624"/>
       <point x="66" y="699"/>
-      <point x="66" y="771" type="curve" name="dh01" smooth="yes"/>
+      <point x="66" y="771" type="curve" smooth="yes" name="dh01"/>
       <point x="66" y="850"/>
       <point x="95" y="917"/>
       <point x="152" y="974" type="curve" smooth="yes"/>
@@ -25,10 +25,10 @@
       <point x="267" y="858" type="curve" smooth="yes"/>
       <point x="247" y="839"/>
       <point x="230" y="809"/>
-      <point x="230" y="770" type="curve" name="dh02" smooth="yes"/>
+      <point x="230" y="770" type="curve" smooth="yes" name="dh02"/>
       <point x="230" y="735"/>
       <point x="244" y="703"/>
-      <point x="267" y="680" type="curve" name="hr01" smooth="yes"/>
+      <point x="267" y="680" type="curve" smooth="yes" name="hr01"/>
       <point x="288" y="659"/>
       <point x="322" y="643"/>
       <point x="365" y="643" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21A_B_.glif b/source/Hack-Italic.ufo/glyphs/uni21A_B_.glif
index 7c3eec4da..5389348f4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21A_B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21A_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21AB" format="1">
+<glyph name="uni21AB" format="2">
   <advance width="1233"/>
   <unicode hex="21AB"/>
   <outline>
@@ -16,19 +16,19 @@
       <point x="676" y="974" type="curve" smooth="yes"/>
       <point x="723" y="1021"/>
       <point x="796" y="1059"/>
-      <point x="880" y="1059" type="curve" name="dv02" smooth="yes"/>
+      <point x="880" y="1059" type="curve" smooth="yes" name="dv02"/>
       <point x="961" y="1059"/>
       <point x="1032" y="1023"/>
       <point x="1081" y="975" type="curve" smooth="yes"/>
       <point x="1138" y="919"/>
       <point x="1167" y="848"/>
-      <point x="1167" y="769" type="curve" name="sh02" smooth="yes"/>
+      <point x="1167" y="769" type="curve" smooth="yes" name="sh02"/>
       <point x="1167" y="694"/>
       <point x="1142" y="624"/>
       <point x="1082" y="565" type="curve" smooth="yes"/>
       <point x="1021" y="504"/>
       <point x="946" y="479"/>
-      <point x="908" y="479" type="curve" name="dv03" smooth="yes"/>
+      <point x="908" y="479" type="curve" smooth="yes" name="dv03"/>
       <point x="757" y="479" type="line" name="sh04"/>
       <point x="757" y="266" type="line"/>
       <point x="593" y="266" type="line" name="sh05"/>
@@ -38,19 +38,19 @@
       <point x="357" y="229" type="line" name="av01"/>
     </contour>
     <contour>
-      <point x="868" y="643" type="line" name="dv04" smooth="yes"/>
+      <point x="868" y="643" type="line" smooth="yes" name="dv04"/>
       <point x="907" y="643"/>
       <point x="940" y="655"/>
       <point x="966" y="680" type="curve" smooth="yes"/>
       <point x="989" y="703"/>
       <point x="1003" y="735"/>
-      <point x="1003" y="770" type="curve" name="ah01" smooth="yes"/>
+      <point x="1003" y="770" type="curve" smooth="yes" name="ah01"/>
       <point x="1003" y="803"/>
       <point x="990" y="835"/>
       <point x="966" y="858" type="curve" smooth="yes"/>
       <point x="945" y="878"/>
       <point x="911" y="895"/>
-      <point x="880" y="895" type="curve" name="dv01" smooth="yes"/>
+      <point x="880" y="895" type="curve" smooth="yes" name="dv01"/>
       <point x="813" y="895"/>
       <point x="757" y="839"/>
       <point x="757" y="768" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21A_C_.glif b/source/Hack-Italic.ufo/glyphs/uni21A_C_.glif
index 5ebd18e3b..e0073752c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21A_C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21A_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21AC" format="1">
+<glyph name="uni21AC" format="2">
   <advance width="1233"/>
   <unicode hex="21AC"/>
   <outline>
@@ -16,19 +16,19 @@
       <point x="151" y="565" type="curve" smooth="yes"/>
       <point x="91" y="624"/>
       <point x="66" y="694"/>
-      <point x="66" y="769" type="curve" name="sh02" smooth="yes"/>
+      <point x="66" y="769" type="curve" smooth="yes" name="sh02"/>
       <point x="66" y="848"/>
       <point x="95" y="919"/>
       <point x="152" y="975" type="curve" smooth="yes"/>
       <point x="201" y="1023"/>
       <point x="272" y="1059"/>
-      <point x="353" y="1059" type="curve" name="dv02" smooth="yes"/>
+      <point x="353" y="1059" type="curve" smooth="yes" name="dv02"/>
       <point x="437" y="1059"/>
       <point x="510" y="1021"/>
       <point x="557" y="974" type="curve" smooth="yes"/>
       <point x="614" y="917"/>
       <point x="640" y="841"/>
-      <point x="640" y="768" type="curve" name="sh03" smooth="yes"/>
+      <point x="640" y="768" type="curve" smooth="yes" name="sh03"/>
       <point x="640" y="643" type="line"/>
       <point x="946" y="643" type="line" name="dv04"/>
       <point x="786" y="803" type="line"/>
@@ -42,13 +42,13 @@
       <point x="476" y="768" type="line" smooth="yes"/>
       <point x="476" y="839"/>
       <point x="420" y="895"/>
-      <point x="354" y="895" type="curve" name="dv01" smooth="yes"/>
+      <point x="354" y="895" type="curve" smooth="yes" name="dv01"/>
       <point x="323" y="895"/>
       <point x="288" y="878"/>
       <point x="267" y="858" type="curve" smooth="yes"/>
       <point x="243" y="835"/>
       <point x="230" y="803"/>
-      <point x="230" y="770" type="curve" name="sh05" smooth="yes"/>
+      <point x="230" y="770" type="curve" smooth="yes" name="sh05"/>
       <point x="230" y="735"/>
       <point x="244" y="703"/>
       <point x="267" y="680" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21A_D_.glif b/source/Hack-Italic.ufo/glyphs/uni21A_D_.glif
index 6de954cde..05b3e3147 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21A_D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21A_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21AD" format="1">
+<glyph name="uni21AD" format="2">
   <advance width="1233"/>
   <unicode hex="21AD"/>
   <outline>
@@ -27,7 +27,7 @@
       <point x="559" y="723" type="curve" smooth="yes"/>
       <point x="578" y="734"/>
       <point x="597" y="740"/>
-      <point x="617" y="740" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="740" type="curve" smooth="yes" name="dv02"/>
       <point x="664" y="740"/>
       <point x="701" y="708"/>
       <point x="724" y="673" type="curve" smooth="yes"/>
@@ -60,7 +60,7 @@
       <point x="906" y="460" type="curve" smooth="yes"/>
       <point x="871" y="416"/>
       <point x="846" y="393"/>
-      <point x="802" y="393" type="curve" name="sv01" smooth="yes"/>
+      <point x="802" y="393" type="curve" smooth="yes" name="sv01"/>
       <point x="758" y="393"/>
       <point x="722" y="417"/>
       <point x="693" y="460" type="curve" smooth="yes"/>
@@ -84,7 +84,7 @@
       <point x="491" y="410" type="curve" smooth="yes"/>
       <point x="474" y="399"/>
       <point x="454" y="393"/>
-      <point x="433" y="393" type="curve" name="dv01" smooth="yes"/>
+      <point x="433" y="393" type="curve" smooth="yes" name="dv01"/>
       <point x="386" y="393"/>
       <point x="358" y="420"/>
       <point x="327" y="460" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21A_E_.glif b/source/Hack-Italic.ufo/glyphs/uni21A_E_.glif
index 40332f532..088238c34 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21A_E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21A_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21AE" format="1">
+<glyph name="uni21AE" format="2">
   <advance width="1233"/>
   <unicode hex="21AE"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21A_F_.glif b/source/Hack-Italic.ufo/glyphs/uni21A_F_.glif
index 27b480124..a49543160 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21A_F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21A_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21AF" format="1">
+<glyph name="uni21AF" format="2">
   <advance width="1233"/>
   <unicode hex="21AF"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21B_0.glif b/source/Hack-Italic.ufo/glyphs/uni21B_0.glif
index a3ffd8175..324054615 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21B_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21B_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B0" format="1">
+<glyph name="uni21B0" format="2">
   <advance width="1233"/>
   <unicode hex="21B0"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21B_1.glif b/source/Hack-Italic.ufo/glyphs/uni21B_1.glif
index 417564780..b4e5448bd 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21B_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21B_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B1" format="1">
+<glyph name="uni21B1" format="2">
   <advance width="1233"/>
   <unicode hex="21B1"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21B_2.glif b/source/Hack-Italic.ufo/glyphs/uni21B_2.glif
index 844fd2d4c..f7e470221 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21B_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21B_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B2" format="1">
+<glyph name="uni21B2" format="2">
   <advance width="1233"/>
   <unicode hex="21B2"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21B_3.glif b/source/Hack-Italic.ufo/glyphs/uni21B_3.glif
index 514d96bf5..b086d1277 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21B_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B3" format="1">
+<glyph name="uni21B3" format="2">
   <advance width="1233"/>
   <unicode hex="21B3"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21B_4.glif b/source/Hack-Italic.ufo/glyphs/uni21B_4.glif
index 761b1acec..f6568700d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21B_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21B_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B4" format="1">
+<glyph name="uni21B4" format="2">
   <advance width="1233"/>
   <unicode hex="21B4"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21B_6.glif b/source/Hack-Italic.ufo/glyphs/uni21B_6.glif
index 3b245a4b0..2ce313bd9 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21B_6.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21B_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B6" format="1">
+<glyph name="uni21B6" format="2">
   <advance width="1233"/>
   <unicode hex="21B6"/>
   <outline>
@@ -13,17 +13,17 @@
       <point x="459" y="882" type="curve" smooth="yes"/>
       <point x="536" y="958"/>
       <point x="633" y="997"/>
-      <point x="745" y="997" type="curve" name="dv02" smooth="yes"/>
+      <point x="745" y="997" type="curve" smooth="yes" name="dv02"/>
       <point x="971" y="997"/>
       <point x="1149" y="823"/>
       <point x="1152" y="596" type="curve"/>
       <point x="1000" y="596" type="line" name="sv01"/>
       <point x="1000" y="673"/>
       <point x="968" y="741"/>
-      <point x="925" y="786" type="curve" name="hr01" smooth="yes"/>
+      <point x="925" y="786" type="curve" smooth="yes" name="hr01"/>
       <point x="876" y="837"/>
       <point x="813" y="862"/>
-      <point x="748" y="862" type="curve" name="dv01" smooth="yes"/>
+      <point x="748" y="862" type="curve" smooth="yes" name="dv01"/>
       <point x="676" y="862"/>
       <point x="612" y="832"/>
       <point x="565" y="787" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21B_7.glif b/source/Hack-Italic.ufo/glyphs/uni21B_7.glif
index b5b417d4e..d5de1f055 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21B_7.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21B_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B7" format="1">
+<glyph name="uni21B7" format="2">
   <advance width="1233"/>
   <unicode hex="21B7"/>
   <outline>
@@ -7,13 +7,13 @@
       <point x="488" y="635" type="line" name="hr00"/>
       <point x="578" y="725" type="line"/>
       <point x="738" y="565" type="line"/>
-      <point x="738" y="588" type="line" name="dh01" smooth="yes"/>
+      <point x="738" y="588" type="line" smooth="yes" name="dh01"/>
       <point x="738" y="690"/>
       <point x="718" y="734"/>
       <point x="667" y="785" type="curve" smooth="yes"/>
       <point x="622" y="830"/>
       <point x="570" y="862"/>
-      <point x="490" y="862" type="curve" name="dv01" smooth="yes"/>
+      <point x="490" y="862" type="curve" smooth="yes" name="dv01"/>
       <point x="417" y="862"/>
       <point x="359" y="838"/>
       <point x="308" y="785" type="curve" smooth="yes"/>
@@ -26,13 +26,13 @@
       <point x="202" y="881" type="curve" smooth="yes"/>
       <point x="275" y="953"/>
       <point x="371" y="997"/>
-      <point x="488" y="997" type="curve" name="dv02" smooth="yes"/>
+      <point x="488" y="997" type="curve" smooth="yes" name="dv02"/>
       <point x="600" y="997"/>
       <point x="697" y="958"/>
       <point x="774" y="882" type="curve" smooth="yes"/>
       <point x="850" y="806"/>
       <point x="896" y="706"/>
-      <point x="901" y="589" type="curve" name="hr01" smooth="yes"/>
+      <point x="901" y="589" type="curve" smooth="yes" name="hr01"/>
       <point x="902" y="565" type="line"/>
       <point x="1062" y="725" type="line"/>
       <point x="1152" y="635" type="line"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21B_8.glif b/source/Hack-Italic.ufo/glyphs/uni21B_8.glif
index e1661fe03..b84171324 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21B_8.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21B_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B8" format="1">
+<glyph name="uni21B8" format="2">
   <advance width="1233"/>
   <unicode hex="21B8"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21B_9.glif b/source/Hack-Italic.ufo/glyphs/uni21B_9.glif
index 79122d8c4..09587b96c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21B_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21B_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B9" format="1">
+<glyph name="uni21B9" format="2">
   <advance width="1233"/>
   <unicode hex="21B9"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21B_A_.glif b/source/Hack-Italic.ufo/glyphs/uni21B_A_.glif
index 10321428d..65bcc17bd 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21B_A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21B_A_.glif
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21BA" format="1">
+<glyph name="uni21BA" format="2">
   <advance width="1233"/>
   <unicode hex="21BA"/>
   <outline>
     <contour>
-      <point x="591" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="591" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="448" y="0"/>
       <point x="324" y="59"/>
       <point x="236" y="147" type="curve" smooth="yes"/>
       <point x="136" y="247"/>
       <point x="89" y="373"/>
-      <point x="89" y="505" type="curve" name="dh01" smooth="yes"/>
+      <point x="89" y="505" type="curve" smooth="yes" name="dh01"/>
       <point x="89" y="640"/>
       <point x="138" y="758"/>
       <point x="237" y="861" type="curve"/>
       <point x="356" y="746" type="line"/>
       <point x="287" y="678"/>
       <point x="255" y="596"/>
-      <point x="255" y="505" type="curve" name="hr01" smooth="yes"/>
+      <point x="255" y="505" type="curve" smooth="yes" name="hr01"/>
       <point x="255" y="409"/>
       <point x="290" y="326"/>
       <point x="355" y="262" type="curve" smooth="yes"/>
       <point x="415" y="202"/>
       <point x="497" y="163"/>
-      <point x="594" y="163" type="curve" name="sv01" smooth="yes"/>
+      <point x="594" y="163" type="curve" smooth="yes" name="sv01"/>
       <point x="687" y="163"/>
       <point x="772" y="199"/>
       <point x="835" y="262" type="curve" smooth="yes"/>
       <point x="896" y="323"/>
       <point x="934" y="410"/>
-      <point x="934" y="502" type="curve" name="hr02" smooth="yes"/>
+      <point x="934" y="502" type="curve" smooth="yes" name="hr02"/>
       <point x="934" y="596"/>
       <point x="892" y="699"/>
       <point x="834" y="746" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="946" y="861" type="line" smooth="yes"/>
       <point x="1046" y="761"/>
       <point x="1094" y="638"/>
-      <point x="1094" y="505" type="curve" name="dh04" smooth="yes"/>
+      <point x="1094" y="505" type="curve" smooth="yes" name="dh04"/>
       <point x="1094" y="364"/>
       <point x="1041" y="239"/>
       <point x="946" y="146" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21B_B_.glif b/source/Hack-Italic.ufo/glyphs/uni21B_B_.glif
index fcc534a76..6f161e7b0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21B_B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21B_B_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21BB" format="1">
+<glyph name="uni21BB" format="2">
   <advance width="1233"/>
   <unicode hex="21BB"/>
   <outline>
     <contour>
-      <point x="642" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="642" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="505" y="0"/>
       <point x="379" y="55"/>
       <point x="286" y="147" type="curve" smooth="yes"/>
       <point x="194" y="239"/>
       <point x="138" y="361"/>
-      <point x="138" y="504" type="curve" name="ih01" smooth="yes"/>
+      <point x="138" y="504" type="curve" smooth="yes" name="ih01"/>
       <point x="138" y="640"/>
       <point x="190" y="764"/>
       <point x="287" y="861" type="curve" smooth="yes"/>
@@ -25,26 +25,26 @@
       <point x="399" y="746" type="line" smooth="yes"/>
       <point x="341" y="699"/>
       <point x="299" y="596"/>
-      <point x="299" y="502" type="curve" name="sh02" smooth="yes"/>
+      <point x="299" y="502" type="curve" smooth="yes" name="sh02"/>
       <point x="299" y="410"/>
       <point x="337" y="323"/>
       <point x="398" y="262" type="curve" smooth="yes"/>
       <point x="461" y="199"/>
       <point x="546" y="163"/>
-      <point x="639" y="163" type="curve" name="sv02" smooth="yes"/>
+      <point x="639" y="163" type="curve" smooth="yes" name="sv02"/>
       <point x="736" y="163"/>
       <point x="818" y="202"/>
-      <point x="878" y="262" type="curve" name="hr01" smooth="yes"/>
+      <point x="878" y="262" type="curve" smooth="yes" name="hr01"/>
       <point x="943" y="326"/>
       <point x="978" y="409"/>
-      <point x="978" y="505" type="curve" name="dh03" smooth="yes"/>
+      <point x="978" y="505" type="curve" smooth="yes" name="dh03"/>
       <point x="978" y="596"/>
       <point x="946" y="678"/>
       <point x="877" y="746" type="curve"/>
       <point x="996" y="861" type="line"/>
       <point x="1095" y="758"/>
       <point x="1144" y="640"/>
-      <point x="1144" y="505" type="curve" name="hr02" smooth="yes"/>
+      <point x="1144" y="505" type="curve" smooth="yes" name="hr02"/>
       <point x="1144" y="368"/>
       <point x="1092" y="242"/>
       <point x="996" y="146" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21B_C_.glif b/source/Hack-Italic.ufo/glyphs/uni21B_C_.glif
index 8b11354f7..f81e2faa0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21B_C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21B_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21BC" format="1">
+<glyph name="uni21BC" format="2">
   <advance width="1233"/>
   <unicode hex="21BC"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21B_D_.glif b/source/Hack-Italic.ufo/glyphs/uni21B_D_.glif
index d66298e53..a8694f030 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21B_D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21B_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21BD" format="1">
+<glyph name="uni21BD" format="2">
   <advance width="1233"/>
   <unicode hex="21BD"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21B_E_.glif b/source/Hack-Italic.ufo/glyphs/uni21B_E_.glif
index caf0fafb9..6639222a7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21B_E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21B_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21BE" format="1">
+<glyph name="uni21BE" format="2">
   <advance width="1233"/>
   <unicode hex="21BE"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21B_F_.glif b/source/Hack-Italic.ufo/glyphs/uni21B_F_.glif
index 1359c7c03..5af991b12 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21B_F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21B_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21BF" format="1">
+<glyph name="uni21BF" format="2">
   <advance width="1233"/>
   <unicode hex="21BF"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21C_0.glif b/source/Hack-Italic.ufo/glyphs/uni21C_0.glif
index 67b552fe8..72066a27b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21C_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21C_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C0" format="1">
+<glyph name="uni21C0" format="2">
   <advance width="1233"/>
   <unicode hex="21C0"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21C_1.glif b/source/Hack-Italic.ufo/glyphs/uni21C_1.glif
index ecb2927bf..bc14d5975 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21C_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21C_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C1" format="1">
+<glyph name="uni21C1" format="2">
   <advance width="1233"/>
   <unicode hex="21C1"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21C_2.glif b/source/Hack-Italic.ufo/glyphs/uni21C_2.glif
index 66b9f7054..f1c7ef5e5 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21C_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21C_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C2" format="1">
+<glyph name="uni21C2" format="2">
   <advance width="1233"/>
   <unicode hex="21C2"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21C_3.glif b/source/Hack-Italic.ufo/glyphs/uni21C_3.glif
index bcffd68f5..f73e7a2db 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21C_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21C_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C3" format="1">
+<glyph name="uni21C3" format="2">
   <advance width="1233"/>
   <unicode hex="21C3"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21C_4.glif b/source/Hack-Italic.ufo/glyphs/uni21C_4.glif
index 86d543d9d..0238aa456 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21C_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21C_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C4" format="1">
+<glyph name="uni21C4" format="2">
   <advance width="1233"/>
   <unicode hex="21C4"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21C_5.glif b/source/Hack-Italic.ufo/glyphs/uni21C_5.glif
index db1da371f..1cc6a3aa2 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21C_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21C_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C5" format="1">
+<glyph name="uni21C5" format="2">
   <advance width="1233"/>
   <unicode hex="21C5"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21C_6.glif b/source/Hack-Italic.ufo/glyphs/uni21C_6.glif
index ef997610f..b884c70e7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21C_6.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21C_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C6" format="1">
+<glyph name="uni21C6" format="2">
   <advance width="1233"/>
   <unicode hex="21C6"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21C_7.glif b/source/Hack-Italic.ufo/glyphs/uni21C_7.glif
index b58130c14..0f5912d8a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21C_7.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21C_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C7" format="1">
+<glyph name="uni21C7" format="2">
   <advance width="1233"/>
   <unicode hex="21C7"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21C_8.glif b/source/Hack-Italic.ufo/glyphs/uni21C_8.glif
index c558dc36f..ac9e7c6cd 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21C_8.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21C_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C8" format="1">
+<glyph name="uni21C8" format="2">
   <advance width="1233"/>
   <unicode hex="21C8"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21C_9.glif b/source/Hack-Italic.ufo/glyphs/uni21C_9.glif
index 29f9940b0..f902b1ad5 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21C_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21C_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C9" format="1">
+<glyph name="uni21C9" format="2">
   <advance width="1233"/>
   <unicode hex="21C9"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21C_A_.glif b/source/Hack-Italic.ufo/glyphs/uni21C_A_.glif
index 1be45211f..94c249ba1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21C_A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21C_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21CA" format="1">
+<glyph name="uni21CA" format="2">
   <advance width="1233"/>
   <unicode hex="21CA"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21C_B_.glif b/source/Hack-Italic.ufo/glyphs/uni21C_B_.glif
index cbf6e465e..e2e6cb513 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21C_B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21C_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21CB" format="1">
+<glyph name="uni21CB" format="2">
   <advance width="1233"/>
   <unicode hex="21CB"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21C_C_.glif b/source/Hack-Italic.ufo/glyphs/uni21C_C_.glif
index 57e70d3db..916507062 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21C_C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21C_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21CC" format="1">
+<glyph name="uni21CC" format="2">
   <advance width="1233"/>
   <unicode hex="21CC"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21C_D_.glif b/source/Hack-Italic.ufo/glyphs/uni21C_D_.glif
index 081509671..6c2918ce9 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21C_D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21C_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21CD" format="1">
+<glyph name="uni21CD" format="2">
   <advance width="1233"/>
   <unicode hex="21CD"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21C_E_.glif b/source/Hack-Italic.ufo/glyphs/uni21C_E_.glif
index 8e4d73448..a1e36f66a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21C_E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21C_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21CE" format="1">
+<glyph name="uni21CE" format="2">
   <advance width="1233"/>
   <unicode hex="21CE"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21C_F_.glif b/source/Hack-Italic.ufo/glyphs/uni21C_F_.glif
index 56a57c79f..aafdf1ec2 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21C_F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21C_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21CF" format="1">
+<glyph name="uni21CF" format="2">
   <advance width="1233"/>
   <unicode hex="21CF"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21D_5.glif b/source/Hack-Italic.ufo/glyphs/uni21D_5.glif
index 4fffc9ddf..443b14c69 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21D_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21D_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21D5" format="1">
+<glyph name="uni21D5" format="2">
   <advance width="1233"/>
   <unicode hex="21D5"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21D_6.glif b/source/Hack-Italic.ufo/glyphs/uni21D_6.glif
index 35787241a..93451825c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21D_6.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21D_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21D6" format="1">
+<glyph name="uni21D6" format="2">
   <advance width="1233"/>
   <unicode hex="21D6"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21D_7.glif b/source/Hack-Italic.ufo/glyphs/uni21D_7.glif
index 9a862170a..c553b699c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21D_7.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21D_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21D7" format="1">
+<glyph name="uni21D7" format="2">
   <advance width="1233"/>
   <unicode hex="21D7"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21D_8.glif b/source/Hack-Italic.ufo/glyphs/uni21D_8.glif
index aa91d159c..aa424758f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21D_8.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21D_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21D8" format="1">
+<glyph name="uni21D8" format="2">
   <advance width="1233"/>
   <unicode hex="21D8"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21D_9.glif b/source/Hack-Italic.ufo/glyphs/uni21D_9.glif
index 29fb9ad61..a4dd8d565 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21D_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21D_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21D9" format="1">
+<glyph name="uni21D9" format="2">
   <advance width="1233"/>
   <unicode hex="21D9"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21D_A_.glif b/source/Hack-Italic.ufo/glyphs/uni21D_A_.glif
index 937389035..784ccdc25 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21D_A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21D_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21DA" format="1">
+<glyph name="uni21DA" format="2">
   <advance width="1233"/>
   <unicode hex="21DA"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21D_B_.glif b/source/Hack-Italic.ufo/glyphs/uni21D_B_.glif
index 30701043d..953c00066 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21D_B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21D_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21DB" format="1">
+<glyph name="uni21DB" format="2">
   <advance width="1233"/>
   <unicode hex="21DB"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21D_C_.glif b/source/Hack-Italic.ufo/glyphs/uni21D_C_.glif
index 8ea9a402a..c3775f439 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21D_C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21D_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21DC" format="1">
+<glyph name="uni21DC" format="2">
   <advance width="1233"/>
   <unicode hex="21DC"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21D_D_.glif b/source/Hack-Italic.ufo/glyphs/uni21D_D_.glif
index 5e7dd8e7f..08eb408e0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21D_D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21D_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21DD" format="1">
+<glyph name="uni21DD" format="2">
   <advance width="1233"/>
   <unicode hex="21DD"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21E_0.glif b/source/Hack-Italic.ufo/glyphs/uni21E_0.glif
index 93aacbac3..2d057ff75 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21E_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21E_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E0" format="1">
+<glyph name="uni21E0" format="2">
   <advance width="1233"/>
   <unicode hex="21E0"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21E_1.glif b/source/Hack-Italic.ufo/glyphs/uni21E_1.glif
index fdffc1d3b..73fdc55e6 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21E_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21E_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E1" format="1">
+<glyph name="uni21E1" format="2">
   <advance width="1233"/>
   <unicode hex="21E1"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21E_2.glif b/source/Hack-Italic.ufo/glyphs/uni21E_2.glif
index 360825c25..5a47839ca 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21E_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21E_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E2" format="1">
+<glyph name="uni21E2" format="2">
   <advance width="1233"/>
   <unicode hex="21E2"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21E_3.glif b/source/Hack-Italic.ufo/glyphs/uni21E_3.glif
index ab43c96e8..a6a50d08f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21E_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21E_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E3" format="1">
+<glyph name="uni21E3" format="2">
   <advance width="1233"/>
   <unicode hex="21E3"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21E_4.glif b/source/Hack-Italic.ufo/glyphs/uni21E_4.glif
index 1fbef41cd..5989538b9 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21E_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21E_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E4" format="1">
+<glyph name="uni21E4" format="2">
   <advance width="1233"/>
   <unicode hex="21E4"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21E_5.glif b/source/Hack-Italic.ufo/glyphs/uni21E_5.glif
index 80148190b..8a4f2c7f2 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21E_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21E_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E5" format="1">
+<glyph name="uni21E5" format="2">
   <advance width="1233"/>
   <unicode hex="21E5"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21E_6.glif b/source/Hack-Italic.ufo/glyphs/uni21E_6.glif
index 159fbec84..b3c7a9a47 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21E_6.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21E_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E6" format="1">
+<glyph name="uni21E6" format="2">
   <advance width="1233"/>
   <unicode hex="21E6"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21E_7.glif b/source/Hack-Italic.ufo/glyphs/uni21E_7.glif
index f6bff6515..90c1a99ea 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21E_7.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21E_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E7" format="1">
+<glyph name="uni21E7" format="2">
   <advance width="1233"/>
   <unicode hex="21E7"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21E_8.glif b/source/Hack-Italic.ufo/glyphs/uni21E_8.glif
index 9fbb15657..71d53b152 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21E_8.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21E_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E8" format="1">
+<glyph name="uni21E8" format="2">
   <advance width="1233"/>
   <unicode hex="21E8"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21E_9.glif b/source/Hack-Italic.ufo/glyphs/uni21E_9.glif
index 7bda8bb54..fcad226a7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21E_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21E_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E9" format="1">
+<glyph name="uni21E9" format="2">
   <advance width="1233"/>
   <unicode hex="21E9"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21E_B_.glif b/source/Hack-Italic.ufo/glyphs/uni21E_B_.glif
index 28ef11294..3863f8e21 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21E_B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21E_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21EB" format="1">
+<glyph name="uni21EB" format="2">
   <advance width="1233"/>
   <unicode hex="21EB"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21E_C_.glif b/source/Hack-Italic.ufo/glyphs/uni21E_C_.glif
index a2c0e762b..340799a35 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21E_C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21E_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21EC" format="1">
+<glyph name="uni21EC" format="2">
   <advance width="1233"/>
   <unicode hex="21EC"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21E_D_.glif b/source/Hack-Italic.ufo/glyphs/uni21E_D_.glif
index 29c469f48..d43de6d58 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21E_D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21E_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21ED" format="1">
+<glyph name="uni21ED" format="2">
   <advance width="1233"/>
   <unicode hex="21ED"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21E_E_.glif b/source/Hack-Italic.ufo/glyphs/uni21E_E_.glif
index 9fc2a8caf..028a8094d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21E_E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21E_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21EE" format="1">
+<glyph name="uni21EE" format="2">
   <advance width="1233"/>
   <unicode hex="21EE"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21E_F_.glif b/source/Hack-Italic.ufo/glyphs/uni21E_F_.glif
index ddb3f2adf..79d79df20 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21E_F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21E_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21EF" format="1">
+<glyph name="uni21EF" format="2">
   <advance width="1233"/>
   <unicode hex="21EF"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21F_0.glif b/source/Hack-Italic.ufo/glyphs/uni21F_0.glif
index bb47a7abe..14b3ef90f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21F_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21F_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F0" format="1">
+<glyph name="uni21F0" format="2">
   <advance width="1233"/>
   <unicode hex="21F0"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21F_1.glif b/source/Hack-Italic.ufo/glyphs/uni21F_1.glif
index ee214643b..7f9417370 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21F_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21F_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F1" format="1">
+<glyph name="uni21F1" format="2">
   <advance width="1233"/>
   <unicode hex="21F1"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21F_2.glif b/source/Hack-Italic.ufo/glyphs/uni21F_2.glif
index b5e39bac3..36dad6924 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21F_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21F_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F2" format="1">
+<glyph name="uni21F2" format="2">
   <advance width="1233"/>
   <unicode hex="21F2"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21F_3.glif b/source/Hack-Italic.ufo/glyphs/uni21F_3.glif
index 1ee0cd5ff..51350f93d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21F_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21F_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F3" format="1">
+<glyph name="uni21F3" format="2">
   <advance width="1233"/>
   <unicode hex="21F3"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21F_4.glif b/source/Hack-Italic.ufo/glyphs/uni21F_4.glif
index a9a5cfc2a..8496e047f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21F_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21F_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F4" format="1">
+<glyph name="uni21F4" format="2">
   <advance width="1233"/>
   <unicode hex="21F4"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="709" y="479" type="line"/>
       <point x="685" y="394"/>
       <point x="595" y="284"/>
-      <point x="436" y="284" type="curve" name="dv01" smooth="yes"/>
+      <point x="436" y="284" type="curve" smooth="yes" name="dv01"/>
       <point x="279" y="284"/>
       <point x="197" y="391"/>
       <point x="173" y="479" type="curve" name="sv01"/>
@@ -18,7 +18,7 @@
       <point x="173" y="643" type="line"/>
       <point x="197" y="732"/>
       <point x="283" y="843"/>
-      <point x="439" y="843" type="curve" name="dv04" smooth="yes"/>
+      <point x="439" y="843" type="curve" smooth="yes" name="dv04"/>
       <point x="511" y="843"/>
       <point x="579" y="819"/>
       <point x="639" y="758" type="curve" smooth="yes"/>
@@ -42,7 +42,7 @@
       <point x="559" y="680" type="curve" smooth="yes"/>
       <point x="528" y="711"/>
       <point x="492" y="729"/>
-      <point x="441" y="729" type="curve" name="dv03" smooth="yes"/>
+      <point x="441" y="729" type="curve" smooth="yes" name="dv03"/>
       <point x="394" y="729"/>
       <point x="355" y="713"/>
       <point x="322" y="680" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="293" y="643" type="curve" name="iv01"/>
     </contour>
     <contour>
-      <point x="437" y="396" type="curve" name="dv02" smooth="yes"/>
+      <point x="437" y="396" type="curve" smooth="yes" name="dv02"/>
       <point x="483" y="396"/>
       <point x="524" y="412"/>
       <point x="559" y="444" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21F_5.glif b/source/Hack-Italic.ufo/glyphs/uni21F_5.glif
index 11f4c6ffe..ce55b3310 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21F_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21F_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F5" format="1">
+<glyph name="uni21F5" format="2">
   <advance width="1233"/>
   <unicode hex="21F5"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21F_6.glif b/source/Hack-Italic.ufo/glyphs/uni21F_6.glif
index 48eba6398..9b10e3144 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21F_6.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21F_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F6" format="1">
+<glyph name="uni21F6" format="2">
   <advance width="1233"/>
   <unicode hex="21F6"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21F_7.glif b/source/Hack-Italic.ufo/glyphs/uni21F_7.glif
index 92574d1e4..7215dd41b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21F_7.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21F_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F7" format="1">
+<glyph name="uni21F7" format="2">
   <advance width="1233"/>
   <unicode hex="21F7"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21F_8.glif b/source/Hack-Italic.ufo/glyphs/uni21F_8.glif
index fda52b84f..f8925624b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21F_8.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21F_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F8" format="1">
+<glyph name="uni21F8" format="2">
   <advance width="1233"/>
   <unicode hex="21F8"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21F_9.glif b/source/Hack-Italic.ufo/glyphs/uni21F_9.glif
index 08b6d4ac5..16879693a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21F_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21F_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F9" format="1">
+<glyph name="uni21F9" format="2">
   <advance width="1233"/>
   <unicode hex="21F9"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21F_A_.glif b/source/Hack-Italic.ufo/glyphs/uni21F_A_.glif
index 6b4e40ca2..8a0406589 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21F_A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21F_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21FA" format="1">
+<glyph name="uni21FA" format="2">
   <advance width="1233"/>
   <unicode hex="21FA"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21F_B_.glif b/source/Hack-Italic.ufo/glyphs/uni21F_B_.glif
index 3cb924cb9..480cdafb5 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21F_B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21F_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21FB" format="1">
+<glyph name="uni21FB" format="2">
   <advance width="1233"/>
   <unicode hex="21FB"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21F_C_.glif b/source/Hack-Italic.ufo/glyphs/uni21F_C_.glif
index a951ad082..1a767efd2 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21F_C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21F_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21FC" format="1">
+<glyph name="uni21FC" format="2">
   <advance width="1233"/>
   <unicode hex="21FC"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21F_D_.glif b/source/Hack-Italic.ufo/glyphs/uni21F_D_.glif
index dc986956b..2c6a2e10d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21F_D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21F_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21FD" format="1">
+<glyph name="uni21FD" format="2">
   <advance width="1233"/>
   <unicode hex="21FD"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21F_E_.glif b/source/Hack-Italic.ufo/glyphs/uni21F_E_.glif
index 170c7252f..3d16930dc 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21F_E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21F_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21FE" format="1">
+<glyph name="uni21FE" format="2">
   <advance width="1233"/>
   <unicode hex="21FE"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni21F_F_.glif b/source/Hack-Italic.ufo/glyphs/uni21F_F_.glif
index e571b1b2a..12187d47e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni21F_F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni21F_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21FF" format="1">
+<glyph name="uni21FF" format="2">
   <advance width="1233"/>
   <unicode hex="21FF"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2201.glif b/source/Hack-Italic.ufo/glyphs/uni2201.glif
index b4a02ef45..ca2ba1900 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2201.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2201.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2201" format="1">
+<glyph name="uni2201" format="2">
   <advance width="1233"/>
   <unicode hex="2201"/>
   <outline>
     <contour>
-      <point x="636" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="636" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="467" y="-29"/>
       <point x="338" y="37"/>
       <point x="250" y="169" type="curve" smooth="yes"/>
       <point x="158" y="306"/>
       <point x="117" y="496"/>
-      <point x="117" y="743" type="curve" name="dh01" smooth="yes"/>
+      <point x="117" y="743" type="curve" smooth="yes" name="dh01"/>
       <point x="117" y="1248"/>
       <point x="294" y="1520"/>
-      <point x="637" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="637" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="970" y="1520"/>
       <point x="1076" y="1260"/>
       <point x="1116" y="1079" type="curve" name="hr01"/>
@@ -23,13 +23,13 @@
       <point x="869" y="1207" type="curve" smooth="yes"/>
       <point x="822" y="1303"/>
       <point x="743" y="1360"/>
-      <point x="632" y="1360" type="curve" name="sv01" smooth="yes"/>
+      <point x="632" y="1360" type="curve" smooth="yes" name="sv01"/>
       <point x="425" y="1360"/>
       <point x="320" y="1157"/>
-      <point x="320" y="745" type="curve" name="hr02" smooth="yes"/>
+      <point x="320" y="745" type="curve" smooth="yes" name="hr02"/>
       <point x="320" y="333"/>
       <point x="425" y="130"/>
-      <point x="632" y="130" type="curve" name="dv02" smooth="yes"/>
+      <point x="632" y="130" type="curve" smooth="yes" name="dv02"/>
       <point x="743" y="130"/>
       <point x="822" y="187"/>
       <point x="869" y="283" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2204.glif b/source/Hack-Italic.ufo/glyphs/uni2204.glif
index 802024750..618da55b1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2204.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2204.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2204" format="1">
+<glyph name="uni2204" format="2">
   <advance width="1233"/>
   <unicode hex="2204"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2206.glif b/source/Hack-Italic.ufo/glyphs/uni2206.glif
index 1aea224fd..6fda8b139 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2206.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2206.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2206" format="1">
+<glyph name="uni2206" format="2">
   <advance width="1233"/>
   <unicode hex="2206"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni220A_.glif b/source/Hack-Italic.ufo/glyphs/uni220A_.glif
index c92bd3627..b9e29326c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni220A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni220A_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni220A" format="1">
+<glyph name="uni220A" format="2">
   <advance width="1233"/>
   <unicode hex="220A"/>
   <outline>
     <contour>
-      <point x="630" y="165" type="line" name="hr00" smooth="yes"/>
+      <point x="630" y="165" type="line" smooth="yes" name="hr00"/>
       <point x="448" y="165"/>
       <point x="285" y="255"/>
       <point x="197" y="402" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="315" y="556" type="line"/>
       <point x="345" y="459"/>
       <point x="453" y="335"/>
-      <point x="630" y="335" type="curve" name="dv01" smooth="yes"/>
+      <point x="630" y="335" type="curve" smooth="yes" name="dv01"/>
       <point x="1102" y="335" type="line"/>
       <point x="1102" y="165" type="line" name="sv01"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni220C_.glif b/source/Hack-Italic.ufo/glyphs/uni220C_.glif
index 7508c4eb4..5d7ee4d1e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni220C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni220C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni220C" format="1">
+<glyph name="uni220C" format="2">
   <advance width="1233"/>
   <unicode hex="220C"/>
   <outline>
@@ -16,10 +16,10 @@
       <point x="645" y="1290" type="line"/>
       <point x="632" y="1293"/>
       <point x="618" y="1294"/>
-      <point x="602" y="1294" type="curve" name="dv01" smooth="yes"/>
+      <point x="602" y="1294" type="curve" smooth="yes" name="dv01"/>
       <point x="130" y="1294" type="line"/>
       <point x="130" y="1464" type="line"/>
-      <point x="602" y="1464" type="line" name="dv02" smooth="yes"/>
+      <point x="602" y="1464" type="line" smooth="yes" name="dv02"/>
       <point x="633" y="1464"/>
       <point x="664" y="1460"/>
       <point x="694" y="1452" type="curve"/>
@@ -34,7 +34,7 @@
       <point x="854" y="98" type="curve" smooth="yes"/>
       <point x="777" y="33"/>
       <point x="693" y="0"/>
-      <point x="602" y="0" type="curve" name="ab02" smooth="yes"/>
+      <point x="602" y="0" type="curve" smooth="yes" name="ab02"/>
       <point x="431" y="0" type="line"/>
       <point x="377" y="-177" type="line" name="av01"/>
     </contour>
@@ -46,7 +46,7 @@
       <point x="679" y="817" type="line" name="iv02"/>
     </contour>
     <contour>
-      <point x="602" y="170" type="line" name="sv03" smooth="yes"/>
+      <point x="602" y="170" type="line" smooth="yes" name="sv03"/>
       <point x="723" y="170"/>
       <point x="829" y="278"/>
       <point x="888" y="450" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni220D_.glif b/source/Hack-Italic.ufo/glyphs/uni220D_.glif
index 340d68b6e..b88e277c9 100644
--- a/source/Hack-Italic.ufo/glyphs/uni220D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni220D_.glif
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni220D" format="1">
+<glyph name="uni220D" format="2">
   <advance width="1233"/>
   <unicode hex="220D"/>
   <outline>
     <contour>
       <point x="130" y="335" type="line" name="hr00"/>
-      <point x="602" y="335" type="line" name="dv02" smooth="yes"/>
+      <point x="602" y="335" type="line" smooth="yes" name="dv02"/>
       <point x="781" y="335"/>
       <point x="888" y="459"/>
       <point x="918" y="556" type="curve" name="dv05"/>
@@ -14,10 +14,10 @@
       <point x="918" y="726" type="line" name="dv06"/>
       <point x="888" y="823"/>
       <point x="781" y="947"/>
-      <point x="602" y="947" type="curve" name="dv03" smooth="yes"/>
+      <point x="602" y="947" type="curve" smooth="yes" name="dv03"/>
       <point x="130" y="947" type="line"/>
       <point x="130" y="1117" type="line"/>
-      <point x="602" y="1117" type="line" name="dv04" smooth="yes"/>
+      <point x="602" y="1117" type="line" smooth="yes" name="dv04"/>
       <point x="784" y="1117"/>
       <point x="947" y="1026"/>
       <point x="1035" y="880" type="curve" smooth="yes"/>
@@ -29,7 +29,7 @@
       <point x="853" y="229" type="curve" smooth="yes"/>
       <point x="776" y="186"/>
       <point x="693" y="165"/>
-      <point x="602" y="165" type="curve" name="dv01" smooth="yes"/>
+      <point x="602" y="165" type="curve" smooth="yes" name="dv01"/>
       <point x="130" y="165" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni220E_.glif b/source/Hack-Italic.ufo/glyphs/uni220E_.glif
index 6daf54592..eeaff1bf1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni220E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni220E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni220E" format="1">
+<glyph name="uni220E" format="2">
   <advance width="1233"/>
   <unicode hex="220E"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2210.glif b/source/Hack-Italic.ufo/glyphs/uni2210.glif
index 71be89b75..d8d7c6b0f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2210.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2210.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2210" format="1">
+<glyph name="uni2210" format="2">
   <advance width="1233"/>
   <unicode hex="2210"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2213.glif b/source/Hack-Italic.ufo/glyphs/uni2213.glif
index 2497f804e..c389ac106 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2213.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2213.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2213" format="1">
+<glyph name="uni2213" format="2">
   <advance width="1233"/>
   <unicode hex="2213"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2215.glif b/source/Hack-Italic.ufo/glyphs/uni2215.glif
index e18195203..80695aa19 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2215.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2215.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2215" format="1">
+<glyph name="uni2215" format="2">
   <advance width="1233"/>
   <unicode hex="2215"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2218.glif b/source/Hack-Italic.ufo/glyphs/uni2218.glif
index 9a2136b9d..3fcb738fb 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2218.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2218.glif
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2218" format="1">
+<glyph name="uni2218" format="2">
   <advance width="1233"/>
   <unicode hex="2218"/>
   <outline>
     <contour>
-      <point x="613" y="327" type="curve" name="hr00" smooth="yes"/>
+      <point x="613" y="327" type="curve" smooth="yes" name="hr00"/>
       <point x="434" y="327"/>
       <point x="299" y="462"/>
-      <point x="299" y="641" type="curve" name="sh01" smooth="yes"/>
+      <point x="299" y="641" type="curve" smooth="yes" name="sh01"/>
       <point x="299" y="822"/>
       <point x="438" y="962"/>
-      <point x="617" y="962" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="962" type="curve" smooth="yes" name="dv03"/>
       <point x="705" y="962"/>
       <point x="782" y="928"/>
       <point x="842" y="867" type="curve" smooth="yes"/>
       <point x="906" y="803"/>
       <point x="934" y="727"/>
-      <point x="934" y="644" type="curve" name="sh02" smooth="yes"/>
+      <point x="934" y="644" type="curve" smooth="yes" name="sh02"/>
       <point x="934" y="464"/>
       <point x="793" y="327"/>
     </contour>
     <contour>
-      <point x="614" y="454" type="curve" name="dv01" smooth="yes"/>
+      <point x="614" y="454" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="454"/>
       <point x="807" y="537"/>
-      <point x="807" y="642" type="curve" name="ah01" smooth="yes"/>
+      <point x="807" y="642" type="curve" smooth="yes" name="ah01"/>
       <point x="807" y="747"/>
       <point x="722" y="833"/>
-      <point x="615" y="833" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="833" type="curve" smooth="yes" name="dv02"/>
       <point x="511" y="833"/>
       <point x="426" y="749"/>
-      <point x="426" y="641" type="curve" name="sh03" smooth="yes"/>
+      <point x="426" y="641" type="curve" smooth="yes" name="sh03"/>
       <point x="426" y="535"/>
       <point x="509" y="454"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2219.glif b/source/Hack-Italic.ufo/glyphs/uni2219.glif
index 358d4f931..0d2ea298b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2219.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2219.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2219" format="1">
+<glyph name="uni2219" format="2">
   <advance width="1233"/>
   <unicode hex="2219"/>
   <outline>
     <contour>
-      <point x="488" y="559" type="line" name="hr00" smooth="yes"/>
+      <point x="488" y="559" type="line" smooth="yes" name="hr00"/>
       <point x="469" y="559"/>
       <point x="460" y="567"/>
       <point x="460" y="584" type="curve" smooth="yes"/>
@@ -14,7 +14,7 @@
       <point x="507" y="837" type="line"/>
       <point x="510" y="855"/>
       <point x="520" y="864"/>
-      <point x="539" y="864" type="curve" name="dv01" smooth="yes"/>
+      <point x="539" y="864" type="curve" smooth="yes" name="dv01"/>
       <point x="733" y="864" type="line" smooth="yes"/>
       <point x="753" y="864"/>
       <point x="764" y="851"/>
@@ -22,7 +22,7 @@
       <point x="712" y="586" type="line" smooth="yes"/>
       <point x="709" y="568"/>
       <point x="698" y="559"/>
-      <point x="680" y="559" type="curve" name="sv01" smooth="yes"/>
+      <point x="680" y="559" type="curve" smooth="yes" name="sv01"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Italic.ufo/glyphs/uni221B_.glif b/source/Hack-Italic.ufo/glyphs/uni221B_.glif
index abacb623d..5e8b0f7c0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni221B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni221B_.glif
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni221B" format="1">
+<glyph name="uni221B" format="2">
   <advance width="1233"/>
   <unicode hex="221B"/>
   <outline>
     <contour>
-      <point x="409" y="1043" type="curve" name="hr00" smooth="yes"/>
+      <point x="409" y="1043" type="curve" smooth="yes" name="hr00"/>
       <point x="321" y="1043"/>
       <point x="251" y="1057"/>
       <point x="171" y="1084" type="curve"/>
       <point x="171" y="1205" type="line" name="iv01"/>
       <point x="264" y="1169"/>
       <point x="333" y="1152"/>
-      <point x="404" y="1152" type="curve" name="dv03" smooth="yes"/>
+      <point x="404" y="1152" type="curve" smooth="yes" name="dv03"/>
       <point x="528" y="1152"/>
       <point x="617" y="1206"/>
       <point x="617" y="1306" type="curve" smooth="yes"/>
       <point x="617" y="1398"/>
       <point x="545" y="1451"/>
-      <point x="398" y="1451" type="curve" name="sv01" smooth="yes"/>
+      <point x="398" y="1451" type="curve" smooth="yes" name="sv01"/>
       <point x="332" y="1451" type="line"/>
       <point x="332" y="1559" type="line" name="at01"/>
       <point x="406" y="1559" type="line" smooth="yes"/>
       <point x="531" y="1559"/>
       <point x="597" y="1603"/>
-      <point x="597" y="1680" type="curve" name="dh01" smooth="yes"/>
+      <point x="597" y="1680" type="curve" smooth="yes" name="dh01"/>
       <point x="597" y="1757"/>
       <point x="530" y="1801"/>
-      <point x="419" y="1801" type="curve" name="dv01" smooth="yes"/>
+      <point x="419" y="1801" type="curve" smooth="yes" name="dv01"/>
       <point x="352" y="1801"/>
       <point x="279" y="1785"/>
       <point x="199" y="1754" type="curve"/>
       <point x="199" y="1875" type="line"/>
       <point x="291" y="1898"/>
       <point x="366" y="1910"/>
-      <point x="438" y="1910" type="curve" name="dv02" smooth="yes"/>
+      <point x="438" y="1910" type="curve" smooth="yes" name="dv02"/>
       <point x="626" y="1910"/>
       <point x="748" y="1824"/>
       <point x="748" y="1692" type="curve" smooth="yes"/>
@@ -42,7 +42,7 @@
       <point x="576" y="1510" type="curve" name="iv02"/>
       <point x="705" y="1481"/>
       <point x="769" y="1410"/>
-      <point x="769" y="1297" type="curve" name="dh02" smooth="yes"/>
+      <point x="769" y="1297" type="curve" smooth="yes" name="dh02"/>
       <point x="769" y="1137"/>
       <point x="634" y="1043"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni221C_.glif b/source/Hack-Italic.ufo/glyphs/uni221C_.glif
index d2fb19210..1324b5da7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni221C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni221C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni221C" format="1">
+<glyph name="uni221C" format="2">
   <advance width="1233"/>
   <unicode hex="221C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2223.glif b/source/Hack-Italic.ufo/glyphs/uni2223.glif
index e5bcbd570..36daad4e2 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2223.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2223.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2223" format="1">
+<glyph name="uni2223" format="2">
   <advance width="1233"/>
   <unicode hex="2223"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni222C_.glif b/source/Hack-Italic.ufo/glyphs/uni222C_.glif
index 11cc121a1..7bf2452f7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni222C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni222C_.glif
@@ -1,61 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni222C" format="1">
+<glyph name="uni222C" format="2">
   <advance width="1233"/>
   <unicode hex="222C"/>
   <outline>
     <contour>
-      <point x="250" y="-388" type="curve" name="hr00" smooth="yes"/>
+      <point x="250" y="-388" type="curve" smooth="yes" name="hr00"/>
       <point x="197" y="-388"/>
       <point x="123" y="-370"/>
       <point x="63" y="-331" type="curve"/>
       <point x="130" y="-204" type="line"/>
       <point x="167" y="-224"/>
       <point x="200" y="-238"/>
-      <point x="227" y="-238" type="curve" name="dv01" smooth="yes"/>
+      <point x="227" y="-238" type="curve" smooth="yes" name="dv01"/>
       <point x="278" y="-238"/>
       <point x="308" y="-193"/>
       <point x="308" y="-68" type="curve" name="sh01"/>
       <point x="309" y="1502" type="line"/>
       <point x="309" y="1632"/>
       <point x="391" y="1797"/>
-      <point x="551" y="1797" type="curve" name="dv03" smooth="yes"/>
+      <point x="551" y="1797" type="curve" smooth="yes" name="dv03"/>
       <point x="604" y="1797"/>
       <point x="678" y="1779"/>
       <point x="738" y="1740" type="curve" name="sh02"/>
       <point x="671" y="1613" type="line"/>
       <point x="638" y="1632"/>
       <point x="604" y="1647"/>
-      <point x="575" y="1647" type="curve" name="dv02" smooth="yes"/>
+      <point x="575" y="1647" type="curve" smooth="yes" name="dv02"/>
       <point x="527" y="1647"/>
       <point x="492" y="1606"/>
       <point x="492" y="1477" type="curve" smooth="yes"/>
-      <point x="492" y="-93" type="line" name="sh03" smooth="yes"/>
+      <point x="492" y="-93" type="line" smooth="yes" name="sh03"/>
       <point x="492" y="-225"/>
       <point x="409" y="-388"/>
     </contour>
     <contour>
-      <point x="681" y="-388" type="curve" name="sv01" smooth="yes"/>
+      <point x="681" y="-388" type="curve" smooth="yes" name="sv01"/>
       <point x="628" y="-388"/>
       <point x="554" y="-370"/>
       <point x="494" y="-331" type="curve" name="sh04"/>
       <point x="561" y="-204" type="line"/>
       <point x="598" y="-224"/>
       <point x="631" y="-238"/>
-      <point x="659" y="-238" type="curve" name="sv02" smooth="yes"/>
+      <point x="659" y="-238" type="curve" smooth="yes" name="sv02"/>
       <point x="710" y="-238"/>
       <point x="740" y="-193"/>
-      <point x="740" y="-68" type="curve" name="ah01" smooth="yes"/>
+      <point x="740" y="-68" type="curve" smooth="yes" name="ah01"/>
       <point x="740" y="1502" type="line" smooth="yes"/>
       <point x="740" y="1634"/>
       <point x="823" y="1797"/>
-      <point x="982" y="1797" type="curve" name="sv03" smooth="yes"/>
+      <point x="982" y="1797" type="curve" smooth="yes" name="sv03"/>
       <point x="1035" y="1797"/>
       <point x="1109" y="1779"/>
       <point x="1169" y="1740" type="curve"/>
       <point x="1102" y="1613" type="line"/>
       <point x="1067" y="1633"/>
       <point x="1035" y="1647"/>
-      <point x="1007" y="1647" type="curve" name="sv04" smooth="yes"/>
+      <point x="1007" y="1647" type="curve" smooth="yes" name="sv04"/>
       <point x="958" y="1647"/>
       <point x="924" y="1605"/>
       <point x="924" y="1477" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni222D_.glif b/source/Hack-Italic.ufo/glyphs/uni222D_.glif
index ccaa414b0..c8ee0c5a4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni222D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni222D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni222D" format="1">
+<glyph name="uni222D" format="2">
   <advance width="1233"/>
   <unicode hex="222D"/>
   <outline>
@@ -7,34 +7,34 @@
       <point x="89" y="-191" type="line" name="hr00"/>
       <point x="110" y="-200"/>
       <point x="148" y="-205"/>
-      <point x="164" y="-205" type="curve" name="dv02" smooth="yes"/>
+      <point x="164" y="-205" type="curve" smooth="yes" name="dv02"/>
       <point x="191" y="-205"/>
       <point x="200" y="-190"/>
-      <point x="200" y="-127" type="curve" name="dh01" smooth="yes"/>
+      <point x="200" y="-127" type="curve" smooth="yes" name="dh01"/>
       <point x="200" y="1502" type="line" smooth="yes"/>
       <point x="200" y="1574"/>
       <point x="219" y="1646"/>
       <point x="250" y="1694" type="curve" smooth="yes"/>
       <point x="286" y="1750"/>
       <point x="338" y="1771"/>
-      <point x="397" y="1771" type="curve" name="dv04" smooth="yes"/>
+      <point x="397" y="1771" type="curve" smooth="yes" name="dv04"/>
       <point x="441" y="1771"/>
       <point x="487" y="1759"/>
       <point x="532" y="1742" type="curve"/>
       <point x="496" y="1600" type="line"/>
       <point x="472" y="1611"/>
       <point x="436" y="1614"/>
-      <point x="421" y="1614" type="curve" name="dv03" smooth="yes"/>
+      <point x="421" y="1614" type="curve" smooth="yes" name="dv03"/>
       <point x="393" y="1614"/>
       <point x="384" y="1599"/>
       <point x="384" y="1536" type="curve" smooth="yes"/>
-      <point x="384" y="-93" type="line" name="dh02" smooth="yes"/>
+      <point x="384" y="-93" type="line" smooth="yes" name="dh02"/>
       <point x="384" y="-169"/>
       <point x="366" y="-238"/>
       <point x="335" y="-285" type="curve" smooth="yes"/>
       <point x="298" y="-342"/>
       <point x="245" y="-362"/>
-      <point x="188" y="-362" type="curve" name="dv01" smooth="yes"/>
+      <point x="188" y="-362" type="curve" smooth="yes" name="dv01"/>
       <point x="143" y="-362"/>
       <point x="96" y="-349"/>
       <point x="53" y="-333" type="curve"/>
@@ -43,34 +43,34 @@
       <point x="414" y="-191" type="line"/>
       <point x="438" y="-202"/>
       <point x="474" y="-205"/>
-      <point x="489" y="-205" type="curve" name="sv01" smooth="yes"/>
+      <point x="489" y="-205" type="curve" smooth="yes" name="sv01"/>
       <point x="517" y="-205"/>
       <point x="526" y="-190"/>
-      <point x="526" y="-127" type="curve" name="dh03" smooth="yes"/>
+      <point x="526" y="-127" type="curve" smooth="yes" name="dh03"/>
       <point x="526" y="1502" type="line" smooth="yes"/>
       <point x="526" y="1574"/>
       <point x="544" y="1646"/>
       <point x="575" y="1694" type="curve" smooth="yes"/>
       <point x="612" y="1751"/>
       <point x="665" y="1771"/>
-      <point x="722" y="1771" type="curve" name="sv02" smooth="yes"/>
+      <point x="722" y="1771" type="curve" smooth="yes" name="sv02"/>
       <point x="766" y="1771"/>
       <point x="813" y="1759"/>
       <point x="857" y="1742" type="curve"/>
       <point x="821" y="1600" type="line"/>
       <point x="800" y="1609"/>
       <point x="762" y="1614"/>
-      <point x="746" y="1614" type="curve" name="sv03" smooth="yes"/>
+      <point x="746" y="1614" type="curve" smooth="yes" name="sv03"/>
       <point x="719" y="1614"/>
       <point x="710" y="1599"/>
       <point x="710" y="1536" type="curve" smooth="yes"/>
-      <point x="710" y="-93" type="line" name="dh04" smooth="yes"/>
+      <point x="710" y="-93" type="line" smooth="yes" name="dh04"/>
       <point x="710" y="-169"/>
       <point x="691" y="-238"/>
       <point x="660" y="-285" type="curve" smooth="yes"/>
       <point x="623" y="-341"/>
       <point x="573" y="-362"/>
-      <point x="514" y="-362" type="curve" name="sv04" smooth="yes"/>
+      <point x="514" y="-362" type="curve" smooth="yes" name="sv04"/>
       <point x="471" y="-362"/>
       <point x="425" y="-352"/>
       <point x="378" y="-333" type="curve"/>
@@ -79,34 +79,34 @@
       <point x="738" y="-191" type="line"/>
       <point x="762" y="-202"/>
       <point x="798" y="-205"/>
-      <point x="813" y="-205" type="curve" name="sv05" smooth="yes"/>
+      <point x="813" y="-205" type="curve" smooth="yes" name="sv05"/>
       <point x="841" y="-205"/>
       <point x="850" y="-190"/>
-      <point x="850" y="-127" type="curve" name="dh05" smooth="yes"/>
+      <point x="850" y="-127" type="curve" smooth="yes" name="dh05"/>
       <point x="850" y="1502" type="line" smooth="yes"/>
       <point x="850" y="1574"/>
       <point x="868" y="1646"/>
       <point x="899" y="1694" type="curve" smooth="yes"/>
       <point x="936" y="1751"/>
       <point x="989" y="1771"/>
-      <point x="1046" y="1771" type="curve" name="sv06" smooth="yes"/>
+      <point x="1046" y="1771" type="curve" smooth="yes" name="sv06"/>
       <point x="1090" y="1771"/>
       <point x="1137" y="1759"/>
       <point x="1181" y="1742" type="curve"/>
       <point x="1145" y="1600" type="line"/>
       <point x="1124" y="1609"/>
       <point x="1086" y="1614"/>
-      <point x="1070" y="1614" type="curve" name="sv07" smooth="yes"/>
+      <point x="1070" y="1614" type="curve" smooth="yes" name="sv07"/>
       <point x="1043" y="1614"/>
       <point x="1034" y="1599"/>
       <point x="1034" y="1536" type="curve" smooth="yes"/>
-      <point x="1034" y="-93" type="line" name="dh06" smooth="yes"/>
+      <point x="1034" y="-93" type="line" smooth="yes" name="dh06"/>
       <point x="1034" y="-169"/>
       <point x="1015" y="-238"/>
       <point x="984" y="-285" type="curve" smooth="yes"/>
       <point x="947" y="-341"/>
       <point x="897" y="-362"/>
-      <point x="838" y="-362" type="curve" name="sv08" smooth="yes"/>
+      <point x="838" y="-362" type="curve" smooth="yes" name="sv08"/>
       <point x="795" y="-362"/>
       <point x="749" y="-352"/>
       <point x="702" y="-333" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2235.glif b/source/Hack-Italic.ufo/glyphs/uni2235.glif
index 04d057827..a52c60c96 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2235.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2235.glif
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2235" format="1">
+<glyph name="uni2235" format="2">
   <advance width="1233"/>
   <unicode hex="2235"/>
   <outline>
     <contour>
-      <point x="218" y="851" type="line" name="hr00" smooth="yes"/>
+      <point x="218" y="851" type="line" smooth="yes" name="hr00"/>
       <point x="198" y="851"/>
       <point x="188" y="861"/>
-      <point x="188" y="881" type="curve" name="dh01" smooth="yes"/>
+      <point x="188" y="881" type="curve" smooth="yes" name="dh01"/>
       <point x="188" y="1126" type="line" smooth="yes"/>
       <point x="188" y="1146"/>
       <point x="198" y="1156"/>
-      <point x="218" y="1156" type="curve" name="dv03" smooth="yes"/>
+      <point x="218" y="1156" type="curve" smooth="yes" name="dv03"/>
       <point x="410" y="1156" type="line" smooth="yes"/>
       <point x="430" y="1156"/>
       <point x="440" y="1146"/>
       <point x="440" y="1126" type="curve" smooth="yes"/>
-      <point x="440" y="881" type="line" name="dh02" smooth="yes"/>
+      <point x="440" y="881" type="line" smooth="yes" name="dh02"/>
       <point x="440" y="861"/>
       <point x="430" y="851"/>
       <point x="410" y="851" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="823" y="851" type="line" name="sv01" smooth="yes"/>
+      <point x="823" y="851" type="line" smooth="yes" name="sv01"/>
       <point x="803" y="851"/>
       <point x="793" y="861"/>
-      <point x="793" y="881" type="curve" name="dh05" smooth="yes"/>
+      <point x="793" y="881" type="curve" smooth="yes" name="dh05"/>
       <point x="793" y="1126" type="line" smooth="yes"/>
       <point x="793" y="1146"/>
       <point x="803" y="1156"/>
-      <point x="823" y="1156" type="curve" name="sv02" smooth="yes"/>
+      <point x="823" y="1156" type="curve" smooth="yes" name="sv02"/>
       <point x="1015" y="1156" type="line" smooth="yes"/>
       <point x="1035" y="1156"/>
       <point x="1045" y="1146"/>
       <point x="1045" y="1126" type="curve" smooth="yes"/>
-      <point x="1045" y="881" type="line" name="dh06" smooth="yes"/>
+      <point x="1045" y="881" type="line" smooth="yes" name="dh06"/>
       <point x="1045" y="861"/>
       <point x="1035" y="851"/>
       <point x="1015" y="851" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="522" y="134" type="line" name="dv01" smooth="yes"/>
+      <point x="522" y="134" type="line" smooth="yes" name="dv01"/>
       <point x="502" y="134"/>
       <point x="492" y="144"/>
-      <point x="492" y="164" type="curve" name="dh03" smooth="yes"/>
+      <point x="492" y="164" type="curve" smooth="yes" name="dh03"/>
       <point x="492" y="409" type="line" smooth="yes"/>
       <point x="492" y="429"/>
       <point x="502" y="439"/>
-      <point x="522" y="439" type="curve" name="dv02" smooth="yes"/>
+      <point x="522" y="439" type="curve" smooth="yes" name="dv02"/>
       <point x="714" y="439" type="line" smooth="yes"/>
       <point x="734" y="439"/>
       <point x="744" y="429"/>
       <point x="744" y="409" type="curve" smooth="yes"/>
-      <point x="744" y="164" type="line" name="dh04" smooth="yes"/>
+      <point x="744" y="164" type="line" smooth="yes" name="dh04"/>
       <point x="744" y="144"/>
       <point x="734" y="134"/>
       <point x="714" y="134" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2236.glif b/source/Hack-Italic.ufo/glyphs/uni2236.glif
index a1235892d..12b8c243a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2236.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2236.glif
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2236" format="1">
+<glyph name="uni2236" format="2">
   <advance width="1233"/>
   <unicode hex="2236"/>
   <outline>
     <contour>
-      <point x="518" y="851" type="line" name="hr00" smooth="yes"/>
+      <point x="518" y="851" type="line" smooth="yes" name="hr00"/>
       <point x="498" y="851"/>
       <point x="488" y="861"/>
-      <point x="488" y="881" type="curve" name="dh01" smooth="yes"/>
+      <point x="488" y="881" type="curve" smooth="yes" name="dh01"/>
       <point x="488" y="1126" type="line" smooth="yes"/>
       <point x="488" y="1146"/>
       <point x="498" y="1156"/>
-      <point x="518" y="1156" type="curve" name="dv03" smooth="yes"/>
+      <point x="518" y="1156" type="curve" smooth="yes" name="dv03"/>
       <point x="710" y="1156" type="line" smooth="yes"/>
       <point x="730" y="1156"/>
       <point x="740" y="1146"/>
       <point x="740" y="1126" type="curve" smooth="yes"/>
-      <point x="740" y="881" type="line" name="dh02" smooth="yes"/>
+      <point x="740" y="881" type="line" smooth="yes" name="dh02"/>
       <point x="740" y="861"/>
       <point x="730" y="851"/>
       <point x="710" y="851" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="522" y="134" type="line" name="dv01" smooth="yes"/>
+      <point x="522" y="134" type="line" smooth="yes" name="dv01"/>
       <point x="502" y="134"/>
       <point x="492" y="144"/>
-      <point x="492" y="164" type="curve" name="sh01" smooth="yes"/>
+      <point x="492" y="164" type="curve" smooth="yes" name="sh01"/>
       <point x="492" y="409" type="line" smooth="yes"/>
       <point x="492" y="429"/>
       <point x="502" y="439"/>
-      <point x="522" y="439" type="curve" name="dv02" smooth="yes"/>
+      <point x="522" y="439" type="curve" smooth="yes" name="dv02"/>
       <point x="714" y="439" type="line" smooth="yes"/>
       <point x="734" y="439"/>
       <point x="744" y="429"/>
-      <point x="744" y="409" type="curve" name="sh02" smooth="yes"/>
+      <point x="744" y="409" type="curve" smooth="yes" name="sh02"/>
       <point x="744" y="164" type="line" smooth="yes"/>
       <point x="744" y="144"/>
       <point x="734" y="134"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2237.glif b/source/Hack-Italic.ufo/glyphs/uni2237.glif
index b592a7d9f..0dcb69299 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2237.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2237.glif
@@ -1,75 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2237" format="1">
+<glyph name="uni2237" format="2">
   <advance width="1233"/>
   <unicode hex="2237"/>
   <outline>
     <contour>
-      <point x="218" y="851" type="line" name="hr00" smooth="yes"/>
+      <point x="218" y="851" type="line" smooth="yes" name="hr00"/>
       <point x="198" y="851"/>
       <point x="188" y="861"/>
-      <point x="188" y="881" type="curve" name="sh01" smooth="yes"/>
+      <point x="188" y="881" type="curve" smooth="yes" name="sh01"/>
       <point x="188" y="1126" type="line" smooth="yes"/>
       <point x="188" y="1146"/>
       <point x="198" y="1156"/>
-      <point x="218" y="1156" type="curve" name="dv03" smooth="yes"/>
+      <point x="218" y="1156" type="curve" smooth="yes" name="dv03"/>
       <point x="410" y="1156" type="line" smooth="yes"/>
       <point x="430" y="1156"/>
       <point x="440" y="1146"/>
       <point x="440" y="1126" type="curve" smooth="yes"/>
-      <point x="440" y="881" type="line" name="sh02" smooth="yes"/>
+      <point x="440" y="881" type="line" smooth="yes" name="sh02"/>
       <point x="440" y="861"/>
       <point x="430" y="851"/>
       <point x="410" y="851" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="823" y="851" type="line" name="sv01" smooth="yes"/>
+      <point x="823" y="851" type="line" smooth="yes" name="sv01"/>
       <point x="803" y="851"/>
       <point x="793" y="861"/>
-      <point x="793" y="881" type="curve" name="ah01" smooth="yes"/>
+      <point x="793" y="881" type="curve" smooth="yes" name="ah01"/>
       <point x="793" y="1126" type="line" smooth="yes"/>
       <point x="793" y="1146"/>
       <point x="803" y="1156"/>
-      <point x="823" y="1156" type="curve" name="sv02" smooth="yes"/>
+      <point x="823" y="1156" type="curve" smooth="yes" name="sv02"/>
       <point x="1015" y="1156" type="line" smooth="yes"/>
       <point x="1035" y="1156"/>
       <point x="1045" y="1146"/>
       <point x="1045" y="1126" type="curve" smooth="yes"/>
-      <point x="1045" y="881" type="line" name="sh03" smooth="yes"/>
+      <point x="1045" y="881" type="line" smooth="yes" name="sh03"/>
       <point x="1045" y="861"/>
       <point x="1035" y="851"/>
       <point x="1015" y="851" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="217" y="134" type="line" name="dv01" smooth="yes"/>
+      <point x="217" y="134" type="line" smooth="yes" name="dv01"/>
       <point x="197" y="134"/>
       <point x="187" y="144"/>
-      <point x="187" y="164" type="curve" name="sh04" smooth="yes"/>
+      <point x="187" y="164" type="curve" smooth="yes" name="sh04"/>
       <point x="187" y="409" type="line" smooth="yes"/>
       <point x="187" y="429"/>
       <point x="197" y="439"/>
-      <point x="217" y="439" type="curve" name="dv02" smooth="yes"/>
+      <point x="217" y="439" type="curve" smooth="yes" name="dv02"/>
       <point x="409" y="439" type="line" smooth="yes"/>
       <point x="429" y="439"/>
       <point x="439" y="429"/>
-      <point x="439" y="409" type="curve" name="sh05" smooth="yes"/>
+      <point x="439" y="409" type="curve" smooth="yes" name="sh05"/>
       <point x="439" y="164" type="line" smooth="yes"/>
       <point x="439" y="144"/>
       <point x="429" y="134"/>
       <point x="409" y="134" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="827" y="134" type="line" name="sv03" smooth="yes"/>
+      <point x="827" y="134" type="line" smooth="yes" name="sv03"/>
       <point x="807" y="134"/>
       <point x="797" y="144"/>
-      <point x="797" y="164" type="curve" name="sh06" smooth="yes"/>
+      <point x="797" y="164" type="curve" smooth="yes" name="sh06"/>
       <point x="797" y="409" type="line" smooth="yes"/>
       <point x="797" y="429"/>
       <point x="807" y="439"/>
-      <point x="827" y="439" type="curve" name="sv04" smooth="yes"/>
+      <point x="827" y="439" type="curve" smooth="yes" name="sv04"/>
       <point x="1019" y="439" type="line" smooth="yes"/>
       <point x="1039" y="439"/>
       <point x="1049" y="429"/>
-      <point x="1049" y="409" type="curve" name="sh07" smooth="yes"/>
+      <point x="1049" y="409" type="curve" smooth="yes" name="sh07"/>
       <point x="1049" y="164" type="line" smooth="yes"/>
       <point x="1049" y="144"/>
       <point x="1039" y="134"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2238.glif b/source/Hack-Italic.ufo/glyphs/uni2238.glif
index 08b977aef..18bf2cfb5 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2238.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2238.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2238" format="1">
+<glyph name="uni2238" format="2">
   <advance width="1233"/>
   <unicode hex="2238"/>
   <outline>
     <contour>
-      <point x="521" y="851" type="line" name="hr00" smooth="yes"/>
+      <point x="521" y="851" type="line" smooth="yes" name="hr00"/>
       <point x="501" y="851"/>
       <point x="491" y="861"/>
-      <point x="491" y="881" type="curve" name="dh01" smooth="yes"/>
+      <point x="491" y="881" type="curve" smooth="yes" name="dh01"/>
       <point x="491" y="1126" type="line" smooth="yes"/>
       <point x="491" y="1146"/>
       <point x="501" y="1156"/>
-      <point x="521" y="1156" type="curve" name="dv03" smooth="yes"/>
+      <point x="521" y="1156" type="curve" smooth="yes" name="dv03"/>
       <point x="713" y="1156" type="line" smooth="yes"/>
       <point x="733" y="1156"/>
       <point x="743" y="1146"/>
       <point x="743" y="1126" type="curve" smooth="yes"/>
-      <point x="743" y="881" type="line" name="dh02" smooth="yes"/>
+      <point x="743" y="881" type="line" smooth="yes" name="dh02"/>
       <point x="743" y="861"/>
       <point x="733" y="851"/>
       <point x="713" y="851" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2239.glif b/source/Hack-Italic.ufo/glyphs/uni2239.glif
index 8415a3ff4..545ac0dfb 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2239.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2239.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2239" format="1">
+<glyph name="uni2239" format="2">
   <advance width="1233"/>
   <unicode hex="2239"/>
   <outline>
     <contour>
-      <point x="937" y="851" type="line" name="hr00" smooth="yes"/>
+      <point x="937" y="851" type="line" smooth="yes" name="hr00"/>
       <point x="917" y="851"/>
       <point x="907" y="861"/>
-      <point x="907" y="881" type="curve" name="dh01" smooth="yes"/>
+      <point x="907" y="881" type="curve" smooth="yes" name="dh01"/>
       <point x="907" y="1126" type="line" smooth="yes"/>
       <point x="907" y="1146"/>
       <point x="917" y="1156"/>
-      <point x="937" y="1156" type="curve" name="dv03" smooth="yes"/>
+      <point x="937" y="1156" type="curve" smooth="yes" name="dv03"/>
       <point x="1129" y="1156" type="line" smooth="yes"/>
       <point x="1149" y="1156"/>
       <point x="1159" y="1146"/>
       <point x="1159" y="1126" type="curve" smooth="yes"/>
-      <point x="1159" y="881" type="line" name="dh02" smooth="yes"/>
+      <point x="1159" y="881" type="line" smooth="yes" name="dh02"/>
       <point x="1159" y="861"/>
       <point x="1149" y="851"/>
       <point x="1129" y="851" type="curve" smooth="yes"/>
@@ -28,18 +28,18 @@
       <point x="74" y="557" type="line"/>
     </contour>
     <contour>
-      <point x="935" y="134" type="line" name="dv01" smooth="yes"/>
+      <point x="935" y="134" type="line" smooth="yes" name="dv01"/>
       <point x="915" y="134"/>
       <point x="905" y="144"/>
-      <point x="905" y="164" type="curve" name="sh01" smooth="yes"/>
+      <point x="905" y="164" type="curve" smooth="yes" name="sh01"/>
       <point x="905" y="409" type="line" smooth="yes"/>
       <point x="905" y="429"/>
       <point x="915" y="439"/>
-      <point x="935" y="439" type="curve" name="dv02" smooth="yes"/>
+      <point x="935" y="439" type="curve" smooth="yes" name="dv02"/>
       <point x="1127" y="439" type="line" smooth="yes"/>
       <point x="1147" y="439"/>
       <point x="1157" y="429"/>
-      <point x="1157" y="409" type="curve" name="sh02" smooth="yes"/>
+      <point x="1157" y="409" type="curve" smooth="yes" name="sh02"/>
       <point x="1157" y="164" type="line" smooth="yes"/>
       <point x="1157" y="144"/>
       <point x="1147" y="134"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni223A_.glif b/source/Hack-Italic.ufo/glyphs/uni223A_.glif
index 97d74463a..f8f6d0f04 100644
--- a/source/Hack-Italic.ufo/glyphs/uni223A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni223A_.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni223A" format="1">
+<glyph name="uni223A" format="2">
   <advance width="1233"/>
   <unicode hex="223A"/>
   <outline>
     <contour>
-      <point x="118" y="851" type="line" name="hr00" smooth="yes"/>
+      <point x="118" y="851" type="line" smooth="yes" name="hr00"/>
       <point x="98" y="851"/>
       <point x="88" y="861"/>
-      <point x="88" y="881" type="curve" name="sh01" smooth="yes"/>
+      <point x="88" y="881" type="curve" smooth="yes" name="sh01"/>
       <point x="88" y="1126" type="line" smooth="yes"/>
       <point x="88" y="1146"/>
       <point x="98" y="1156"/>
-      <point x="118" y="1156" type="curve" name="dv03" smooth="yes"/>
+      <point x="118" y="1156" type="curve" smooth="yes" name="dv03"/>
       <point x="310" y="1156" type="line" smooth="yes"/>
       <point x="330" y="1156"/>
       <point x="340" y="1146"/>
       <point x="340" y="1126" type="curve" smooth="yes"/>
-      <point x="340" y="881" type="line" name="sh02" smooth="yes"/>
+      <point x="340" y="881" type="line" smooth="yes" name="sh02"/>
       <point x="340" y="861"/>
       <point x="330" y="851"/>
       <point x="310" y="851" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="923" y="851" type="line" name="sv01" smooth="yes"/>
+      <point x="923" y="851" type="line" smooth="yes" name="sv01"/>
       <point x="903" y="851"/>
       <point x="893" y="861"/>
-      <point x="893" y="881" type="curve" name="ah01" smooth="yes"/>
+      <point x="893" y="881" type="curve" smooth="yes" name="ah01"/>
       <point x="893" y="1126" type="line" smooth="yes"/>
       <point x="893" y="1146"/>
       <point x="903" y="1156"/>
-      <point x="923" y="1156" type="curve" name="sv02" smooth="yes"/>
+      <point x="923" y="1156" type="curve" smooth="yes" name="sv02"/>
       <point x="1115" y="1156" type="line" smooth="yes"/>
       <point x="1135" y="1156"/>
       <point x="1145" y="1146"/>
       <point x="1145" y="1126" type="curve" smooth="yes"/>
-      <point x="1145" y="881" type="line" name="sh03" smooth="yes"/>
+      <point x="1145" y="881" type="line" smooth="yes" name="sh03"/>
       <point x="1145" y="861"/>
       <point x="1135" y="851"/>
       <point x="1115" y="851" type="curve" smooth="yes"/>
@@ -46,36 +46,36 @@
       <point x="88" y="557" type="line"/>
     </contour>
     <contour>
-      <point x="117" y="134" type="line" name="dv01" smooth="yes"/>
+      <point x="117" y="134" type="line" smooth="yes" name="dv01"/>
       <point x="97" y="134"/>
       <point x="87" y="144"/>
-      <point x="87" y="164" type="curve" name="sh06" smooth="yes"/>
+      <point x="87" y="164" type="curve" smooth="yes" name="sh06"/>
       <point x="87" y="409" type="line" smooth="yes"/>
       <point x="87" y="429"/>
       <point x="97" y="439"/>
-      <point x="117" y="439" type="curve" name="dv02" smooth="yes"/>
+      <point x="117" y="439" type="curve" smooth="yes" name="dv02"/>
       <point x="309" y="439" type="line" smooth="yes"/>
       <point x="329" y="439"/>
       <point x="339" y="429"/>
-      <point x="339" y="409" type="curve" name="sh07" smooth="yes"/>
+      <point x="339" y="409" type="curve" smooth="yes" name="sh07"/>
       <point x="339" y="164" type="line" smooth="yes"/>
       <point x="339" y="144"/>
       <point x="329" y="134"/>
       <point x="309" y="134" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="927" y="134" type="line" name="sv03" smooth="yes"/>
+      <point x="927" y="134" type="line" smooth="yes" name="sv03"/>
       <point x="907" y="134"/>
       <point x="897" y="144"/>
-      <point x="897" y="164" type="curve" name="sh08" smooth="yes"/>
+      <point x="897" y="164" type="curve" smooth="yes" name="sh08"/>
       <point x="897" y="409" type="line" smooth="yes"/>
       <point x="897" y="429"/>
       <point x="907" y="439"/>
-      <point x="927" y="439" type="curve" name="sv04" smooth="yes"/>
+      <point x="927" y="439" type="curve" smooth="yes" name="sv04"/>
       <point x="1119" y="439" type="line" smooth="yes"/>
       <point x="1139" y="439"/>
       <point x="1149" y="429"/>
-      <point x="1149" y="409" type="curve" name="sh09" smooth="yes"/>
+      <point x="1149" y="409" type="curve" smooth="yes" name="sh09"/>
       <point x="1149" y="164" type="line" smooth="yes"/>
       <point x="1149" y="144"/>
       <point x="1139" y="134"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni223B_.glif b/source/Hack-Italic.ufo/glyphs/uni223B_.glif
index 193e79347..43ef4e4b3 100644
--- a/source/Hack-Italic.ufo/glyphs/uni223B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni223B_.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni223B" format="1">
+<glyph name="uni223B" format="2">
   <advance width="1233"/>
   <unicode hex="223B"/>
   <outline>
     <contour>
-      <point x="521" y="851" type="line" name="dv03" smooth="yes"/>
+      <point x="521" y="851" type="line" smooth="yes" name="dv03"/>
       <point x="501" y="851"/>
       <point x="491" y="861"/>
-      <point x="491" y="881" type="curve" name="dh01" smooth="yes"/>
+      <point x="491" y="881" type="curve" smooth="yes" name="dh01"/>
       <point x="491" y="1126" type="line" smooth="yes"/>
       <point x="491" y="1146"/>
       <point x="501" y="1156"/>
-      <point x="521" y="1156" type="curve" name="dv04" smooth="yes"/>
+      <point x="521" y="1156" type="curve" smooth="yes" name="dv04"/>
       <point x="713" y="1156" type="line" smooth="yes"/>
       <point x="733" y="1156"/>
       <point x="743" y="1146"/>
       <point x="743" y="1126" type="curve" smooth="yes"/>
-      <point x="743" y="881" type="line" name="dh02" smooth="yes"/>
+      <point x="743" y="881" type="line" smooth="yes" name="dh02"/>
       <point x="743" y="861"/>
       <point x="733" y="851"/>
       <point x="713" y="851" type="curve" smooth="yes"/>
@@ -25,21 +25,21 @@
       <point x="88" y="671" type="line"/>
       <point x="192" y="751"/>
       <point x="285" y="786"/>
-      <point x="393" y="786" type="curve" name="hr01" smooth="yes"/>
+      <point x="393" y="786" type="curve" smooth="yes" name="hr01"/>
       <point x="457" y="786"/>
       <point x="532" y="775"/>
       <point x="623" y="732" type="curve" smooth="yes"/>
       <point x="655" y="717" type="line" smooth="yes"/>
       <point x="732" y="681"/>
       <point x="802" y="663"/>
-      <point x="865" y="663" type="curve" name="hr02" smooth="yes"/>
+      <point x="865" y="663" type="curve" smooth="yes" name="hr02"/>
       <point x="957" y="663"/>
       <point x="1045" y="702"/>
       <point x="1145" y="786" type="curve"/>
       <point x="1145" y="611" type="line" name="hr03"/>
       <point x="1045" y="531"/>
       <point x="952" y="497"/>
-      <point x="852" y="497" type="curve" name="hr04" smooth="yes"/>
+      <point x="852" y="497" type="curve" smooth="yes" name="hr04"/>
       <point x="776" y="497"/>
       <point x="717" y="517"/>
       <point x="645" y="548" type="curve"/>
@@ -48,24 +48,24 @@
       <point x="612" y="562" type="curve"/>
       <point x="522" y="599"/>
       <point x="468" y="620"/>
-      <point x="385" y="620" type="curve" name="hr05" smooth="yes"/>
+      <point x="385" y="620" type="curve" smooth="yes" name="hr05"/>
       <point x="277" y="620"/>
       <point x="189" y="585"/>
       <point x="88" y="497" type="curve"/>
     </contour>
     <contour>
-      <point x="520" y="134" type="line" name="dv01" smooth="yes"/>
+      <point x="520" y="134" type="line" smooth="yes" name="dv01"/>
       <point x="500" y="134"/>
       <point x="490" y="144"/>
-      <point x="490" y="164" type="curve" name="sh01" smooth="yes"/>
+      <point x="490" y="164" type="curve" smooth="yes" name="sh01"/>
       <point x="490" y="409" type="line" smooth="yes"/>
       <point x="490" y="429"/>
       <point x="500" y="439"/>
-      <point x="520" y="439" type="curve" name="dv02" smooth="yes"/>
+      <point x="520" y="439" type="curve" smooth="yes" name="dv02"/>
       <point x="712" y="439" type="line" smooth="yes"/>
       <point x="732" y="439"/>
       <point x="742" y="429"/>
-      <point x="742" y="409" type="curve" name="sh02" smooth="yes"/>
+      <point x="742" y="409" type="curve" smooth="yes" name="sh02"/>
       <point x="742" y="164" type="line" smooth="yes"/>
       <point x="742" y="144"/>
       <point x="732" y="134"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni223D_.glif b/source/Hack-Italic.ufo/glyphs/uni223D_.glif
index ecdbf3d27..b9d90c51a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni223D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni223D_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni223D" format="1">
+<glyph name="uni223D" format="2">
   <advance width="1233"/>
   <unicode hex="223D"/>
   <outline>
     <contour>
-      <point x="383" y="497" type="curve" name="dv01" smooth="yes"/>
+      <point x="383" y="497" type="curve" smooth="yes" name="dv01"/>
       <point x="274" y="497"/>
       <point x="180" y="538"/>
       <point x="88" y="611" type="curve"/>
       <point x="88" y="786" type="line"/>
       <point x="188" y="702"/>
       <point x="275" y="663"/>
-      <point x="371" y="663" type="curve" name="hr01" smooth="yes"/>
+      <point x="371" y="663" type="curve" smooth="yes" name="hr01"/>
       <point x="443" y="663"/>
       <point x="505" y="685"/>
       <point x="578" y="717" type="curve" name="hr02"/>
@@ -20,17 +20,17 @@
       <point x="610" y="732" type="curve" smooth="yes"/>
       <point x="706" y="776"/>
       <point x="780" y="786"/>
-      <point x="840" y="786" type="curve" name="hr03" smooth="yes"/>
+      <point x="840" y="786" type="curve" smooth="yes" name="hr03"/>
       <point x="949" y="786"/>
       <point x="1041" y="751"/>
       <point x="1145" y="671" type="curve"/>
       <point x="1145" y="497" type="line"/>
       <point x="1041" y="588"/>
       <point x="951" y="620"/>
-      <point x="848" y="620" type="curve" name="hr04" smooth="yes"/>
+      <point x="848" y="620" type="curve" smooth="yes" name="hr04"/>
       <point x="765" y="620"/>
       <point x="711" y="599"/>
-      <point x="621" y="562" type="curve" name="hr05" smooth="yes"/>
+      <point x="621" y="562" type="curve" smooth="yes" name="hr05"/>
       <point x="588" y="548" type="line" smooth="yes"/>
       <point x="507" y="513"/>
       <point x="455" y="497"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2241.glif b/source/Hack-Italic.ufo/glyphs/uni2241.glif
index ad4ca9a1e..9a75be091 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2241.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2241.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2241" format="1">
+<glyph name="uni2241" format="2">
   <advance width="1233"/>
   <unicode hex="2241"/>
   <outline>
@@ -11,14 +11,14 @@
       <point x="484" y="608" type="curve" smooth="yes"/>
       <point x="449" y="616"/>
       <point x="414" y="620"/>
-      <point x="381" y="620" type="curve" name="dv03" smooth="yes"/>
+      <point x="381" y="620" type="curve" smooth="yes" name="dv03"/>
       <point x="276" y="620"/>
       <point x="185" y="582"/>
       <point x="88" y="497" type="curve" name="hr01"/>
       <point x="88" y="671" type="line" name="hr02"/>
       <point x="192" y="751"/>
       <point x="284" y="786"/>
-      <point x="392" y="786" type="curve" name="dv04" smooth="yes"/>
+      <point x="392" y="786" type="curve" smooth="yes" name="dv04"/>
       <point x="468" y="786"/>
       <point x="533" y="768"/>
       <point x="572" y="752" type="curve"/>
@@ -27,14 +27,14 @@
       <point x="703" y="697" type="line" name="hr03"/>
       <point x="761" y="674"/>
       <point x="815" y="663"/>
-      <point x="864" y="663" type="curve" name="dv02" smooth="yes"/>
+      <point x="864" y="663" type="curve" smooth="yes" name="dv02"/>
       <point x="957" y="663"/>
       <point x="1045" y="702"/>
       <point x="1145" y="786" type="curve" name="hr04"/>
       <point x="1145" y="611" type="line" name="hr05"/>
       <point x="1053" y="538"/>
       <point x="958" y="497"/>
-      <point x="853" y="497" type="curve" name="dv01" smooth="yes"/>
+      <point x="853" y="497" type="curve" smooth="yes" name="dv01"/>
       <point x="792" y="497"/>
       <point x="735" y="511"/>
       <point x="667" y="538" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2242.glif b/source/Hack-Italic.ufo/glyphs/uni2242.glif
index 2bd78d6c5..dc60d7145 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2242.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2242.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2242" format="1">
+<glyph name="uni2242" format="2">
   <advance width="1233"/>
   <unicode hex="2242"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="88" y="479" type="line" name="hr02"/>
       <point x="192" y="562"/>
       <point x="287" y="596"/>
-      <point x="390" y="596" type="curve" name="dv04" smooth="yes"/>
+      <point x="390" y="596" type="curve" smooth="yes" name="dv04"/>
       <point x="463" y="596"/>
       <point x="533" y="578"/>
       <point x="621" y="541" type="curve" name="hr03"/>
@@ -21,21 +21,21 @@
       <point x="655" y="526" type="line" smooth="yes"/>
       <point x="736" y="489"/>
       <point x="797" y="471"/>
-      <point x="861" y="471" type="curve" name="dv02" smooth="yes"/>
+      <point x="861" y="471" type="curve" smooth="yes" name="dv02"/>
       <point x="957" y="471"/>
       <point x="1045" y="511"/>
       <point x="1145" y="596" type="curve"/>
       <point x="1145" y="420" type="line" name="hr05"/>
       <point x="1052" y="345"/>
       <point x="957" y="305"/>
-      <point x="853" y="305" type="curve" name="dv01" smooth="yes"/>
+      <point x="853" y="305" type="curve" smooth="yes" name="dv01"/>
       <point x="785" y="305"/>
       <point x="721" y="321"/>
       <point x="645" y="356" type="curve" smooth="yes"/>
       <point x="612" y="371" type="line" smooth="yes"/>
       <point x="504" y="420"/>
       <point x="435" y="430"/>
-      <point x="382" y="430" type="curve" name="dv03" smooth="yes"/>
+      <point x="382" y="430" type="curve" smooth="yes" name="dv03"/>
       <point x="274" y="430"/>
       <point x="187" y="392"/>
       <point x="88" y="305" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2243.glif b/source/Hack-Italic.ufo/glyphs/uni2243.glif
index 25c833943..a9475cb44 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2243.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2243.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2243" format="1">
+<glyph name="uni2243" format="2">
   <advance width="1233"/>
   <unicode hex="2243"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="88" y="848" type="line" name="hr00"/>
       <point x="192" y="928"/>
       <point x="284" y="963"/>
-      <point x="393" y="963" type="curve" name="dv02" smooth="yes"/>
+      <point x="393" y="963" type="curve" smooth="yes" name="dv02"/>
       <point x="453" y="963"/>
       <point x="527" y="953"/>
       <point x="623" y="909" type="curve" smooth="yes"/>
@@ -16,14 +16,14 @@
       <point x="655" y="894" type="curve"/>
       <point x="728" y="862"/>
       <point x="790" y="840"/>
-      <point x="862" y="840" type="curve" name="dv04" smooth="yes"/>
+      <point x="862" y="840" type="curve" smooth="yes" name="dv04"/>
       <point x="958" y="840"/>
       <point x="1045" y="879"/>
       <point x="1145" y="963" type="curve" name="hr01"/>
       <point x="1145" y="788" type="line"/>
       <point x="1045" y="708"/>
       <point x="952" y="674"/>
-      <point x="852" y="674" type="curve" name="dv03" smooth="yes"/>
+      <point x="852" y="674" type="curve" smooth="yes" name="dv03"/>
       <point x="776" y="674"/>
       <point x="717" y="694"/>
       <point x="645" y="725" type="curve" name="hr02"/>
@@ -32,7 +32,7 @@
       <point x="612" y="739" type="curve"/>
       <point x="522" y="776"/>
       <point x="468" y="797"/>
-      <point x="385" y="797" type="curve" name="hr03" smooth="yes"/>
+      <point x="385" y="797" type="curve" smooth="yes" name="hr03"/>
       <point x="277" y="797"/>
       <point x="189" y="762"/>
       <point x="88" y="674" type="curve" name="hr04"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2244.glif b/source/Hack-Italic.ufo/glyphs/uni2244.glif
index 6c3a53534..df29270ff 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2244.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2244.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2244" format="1">
+<glyph name="uni2244" format="2">
   <advance width="1233"/>
   <unicode hex="2244"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="571" y="755" type="line"/>
       <point x="515" y="780"/>
       <point x="454" y="798"/>
-      <point x="386" y="798" type="curve" name="dv03" smooth="yes"/>
+      <point x="386" y="798" type="curve" smooth="yes" name="dv03"/>
       <point x="339" y="798"/>
       <point x="291" y="789"/>
       <point x="240" y="769" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="88" y="845" type="line"/>
       <point x="204" y="945"/>
       <point x="321" y="964"/>
-      <point x="403" y="964" type="curve" name="dv04" smooth="yes"/>
+      <point x="403" y="964" type="curve" smooth="yes" name="dv04"/>
       <point x="469" y="964"/>
       <point x="518" y="951"/>
       <point x="614" y="914" type="curve" smooth="yes"/>
@@ -33,14 +33,14 @@
       <point x="800" y="849" type="line" name="hr01"/>
       <point x="823" y="845"/>
       <point x="845" y="843"/>
-      <point x="866" y="843" type="curve" name="dv06" smooth="yes"/>
+      <point x="866" y="843" type="curve" smooth="yes" name="dv06"/>
       <point x="974" y="843"/>
       <point x="1068" y="893"/>
       <point x="1145" y="966" type="curve" name="iv02"/>
       <point x="1145" y="788" type="line"/>
       <point x="1073" y="718"/>
       <point x="930" y="672"/>
-      <point x="840" y="672" type="curve" name="dv05" smooth="yes"/>
+      <point x="840" y="672" type="curve" smooth="yes" name="dv05"/>
       <point x="799" y="672"/>
       <point x="765" y="682"/>
       <point x="702" y="702" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2246.glif b/source/Hack-Italic.ufo/glyphs/uni2246.glif
index 7f9ffc9da..2fdbfb4a5 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2246.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2246.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2246" format="1">
+<glyph name="uni2246" format="2">
   <advance width="1233"/>
   <unicode hex="2246"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="88" y="1052" type="line" name="hr00"/>
       <point x="200" y="1137"/>
       <point x="289" y="1167"/>
-      <point x="402" y="1167" type="curve" name="dv03" smooth="yes"/>
+      <point x="402" y="1167" type="curve" smooth="yes" name="dv03"/>
       <point x="478" y="1167"/>
       <point x="513" y="1153"/>
       <point x="623" y="1113" type="curve" smooth="yes"/>
@@ -16,14 +16,14 @@
       <point x="655" y="1098" type="curve" smooth="yes"/>
       <point x="722" y="1066"/>
       <point x="798" y="1044"/>
-      <point x="866" y="1044" type="curve" name="dv05" smooth="yes"/>
+      <point x="866" y="1044" type="curve" smooth="yes" name="dv05"/>
       <point x="957" y="1044"/>
       <point x="1045" y="1083"/>
       <point x="1145" y="1167" type="curve"/>
       <point x="1145" y="992" type="line"/>
       <point x="1045" y="912"/>
       <point x="952" y="878"/>
-      <point x="852" y="878" type="curve" name="dv04" smooth="yes"/>
+      <point x="852" y="878" type="curve" smooth="yes" name="dv04"/>
       <point x="776" y="878"/>
       <point x="717" y="898"/>
       <point x="645" y="929" type="curve"/>
@@ -32,7 +32,7 @@
       <point x="612" y="943" type="curve"/>
       <point x="522" y="980"/>
       <point x="468" y="1001"/>
-      <point x="385" y="1001" type="curve" name="dv02" smooth="yes"/>
+      <point x="385" y="1001" type="curve" smooth="yes" name="dv02"/>
       <point x="277" y="1001"/>
       <point x="189" y="966"/>
       <point x="88" y="878" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2247.glif b/source/Hack-Italic.ufo/glyphs/uni2247.glif
index a0658a2fa..8133a53b1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2247.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2247.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2247" format="1">
+<glyph name="uni2247" format="2">
   <advance width="1233"/>
   <unicode hex="2247"/>
   <outline>
@@ -19,14 +19,14 @@
       <point x="612" y="943" type="curve" smooth="yes"/>
       <point x="508" y="988"/>
       <point x="448" y="1001"/>
-      <point x="384" y="1001" type="curve" name="dv03" smooth="yes"/>
+      <point x="384" y="1001" type="curve" smooth="yes" name="dv03"/>
       <point x="275" y="1001"/>
       <point x="185" y="963"/>
       <point x="88" y="878" type="curve" name="hr01"/>
       <point x="88" y="1052" type="line" name="hr02"/>
       <point x="192" y="1132"/>
       <point x="282" y="1167"/>
-      <point x="399" y="1167" type="curve" name="dv04" smooth="yes"/>
+      <point x="399" y="1167" type="curve" smooth="yes" name="dv04"/>
       <point x="464" y="1167"/>
       <point x="524" y="1156"/>
       <point x="623" y="1113" type="curve" smooth="yes"/>
@@ -36,14 +36,14 @@
       <point x="841" y="1045" type="line" name="hr03"/>
       <point x="848" y="1044"/>
       <point x="856" y="1044"/>
-      <point x="864" y="1044" type="curve" name="dv06" smooth="yes"/>
+      <point x="864" y="1044" type="curve" smooth="yes" name="dv06"/>
       <point x="957" y="1044"/>
       <point x="1045" y="1083"/>
       <point x="1145" y="1167" type="curve" name="hr04"/>
       <point x="1145" y="992" type="line" name="hr05"/>
       <point x="1045" y="912"/>
       <point x="953" y="878"/>
-      <point x="850" y="878" type="curve" name="dv05" smooth="yes"/>
+      <point x="850" y="878" type="curve" smooth="yes" name="dv05"/>
       <point x="826" y="878"/>
       <point x="807" y="880"/>
       <point x="784" y="884" type="curve" name="sv01"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2249.glif b/source/Hack-Italic.ufo/glyphs/uni2249.glif
index 2bff6c7f4..ac1885c90 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2249.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2249.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2249" format="1">
+<glyph name="uni2249" format="2">
   <advance width="1233"/>
   <unicode hex="2249"/>
   <outline>
@@ -8,28 +8,28 @@
       <point x="477" y="419" type="line"/>
       <point x="444" y="426"/>
       <point x="411" y="430"/>
-      <point x="380" y="430" type="curve" name="dv02" smooth="yes"/>
+      <point x="380" y="430" type="curve" smooth="yes" name="dv02"/>
       <point x="276" y="430"/>
       <point x="188" y="393"/>
       <point x="88" y="305" type="curve" name="iv01"/>
       <point x="88" y="479" type="line"/>
       <point x="191" y="560"/>
       <point x="286" y="596"/>
-      <point x="390" y="596" type="curve" name="hr01" smooth="yes"/>
+      <point x="390" y="596" type="curve" smooth="yes" name="hr01"/>
       <point x="437" y="596"/>
       <point x="477" y="589"/>
       <point x="524" y="576" type="curve" name="hr02"/>
       <point x="578" y="754" type="line"/>
       <point x="505" y="783"/>
       <point x="448" y="797"/>
-      <point x="383" y="797" type="curve" name="dv03" smooth="yes"/>
+      <point x="383" y="797" type="curve" smooth="yes" name="dv03"/>
       <point x="275" y="797"/>
       <point x="185" y="759"/>
       <point x="88" y="674" type="curve" name="iv02"/>
       <point x="88" y="848" type="line"/>
       <point x="189" y="925"/>
       <point x="279" y="963"/>
-      <point x="399" y="963" type="curve" name="hr03" smooth="yes"/>
+      <point x="399" y="963" type="curve" smooth="yes" name="hr03"/>
       <point x="466" y="963"/>
       <point x="519" y="951"/>
       <point x="624" y="908" type="curve" name="hr04"/>
@@ -38,31 +38,31 @@
       <point x="758" y="855" type="line"/>
       <point x="796" y="845"/>
       <point x="831" y="840"/>
-      <point x="864" y="840" type="curve" name="dv04" smooth="yes"/>
+      <point x="864" y="840" type="curve" smooth="yes" name="dv04"/>
       <point x="957" y="840"/>
       <point x="1045" y="879"/>
       <point x="1145" y="963" type="curve" name="hr05"/>
       <point x="1145" y="788" type="line"/>
       <point x="1049" y="712"/>
       <point x="955" y="674"/>
-      <point x="851" y="674" type="curve" name="hr06" smooth="yes"/>
+      <point x="851" y="674" type="curve" smooth="yes" name="hr06"/>
       <point x="806" y="674"/>
       <point x="759" y="682"/>
       <point x="711" y="699" type="curve" name="hr07"/>
       <point x="659" y="524" type="line"/>
       <point x="736" y="489"/>
       <point x="804" y="471"/>
-      <point x="864" y="471" type="curve" name="dv01" smooth="yes"/>
+      <point x="864" y="471" type="curve" smooth="yes" name="dv01"/>
       <point x="956" y="471"/>
       <point x="1045" y="511"/>
       <point x="1145" y="596" type="curve" name="iv03"/>
       <point x="1145" y="420" type="line"/>
       <point x="1048" y="343"/>
       <point x="953" y="305"/>
-      <point x="852" y="305" type="curve" name="hr08" smooth="yes"/>
+      <point x="852" y="305" type="curve" smooth="yes" name="hr08"/>
       <point x="785" y="305"/>
       <point x="713" y="321"/>
-      <point x="645" y="356" type="curve" name="hr09" smooth="yes"/>
+      <point x="645" y="356" type="curve" smooth="yes" name="hr09"/>
       <point x="614" y="372" type="line"/>
       <point x="516" y="48" type="line" name="av02"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni224A_.glif b/source/Hack-Italic.ufo/glyphs/uni224A_.glif
index 2df2161ba..ae657216c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni224A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni224A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni224A" format="1">
+<glyph name="uni224A" format="2">
   <advance width="1233"/>
   <unicode hex="224A"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="88" y="1056" type="line" name="hr00"/>
       <point x="192" y="1136"/>
       <point x="284" y="1171"/>
-      <point x="393" y="1171" type="curve" name="dv02" smooth="yes"/>
+      <point x="393" y="1171" type="curve" smooth="yes" name="dv02"/>
       <point x="453" y="1171"/>
       <point x="527" y="1161"/>
       <point x="623" y="1117" type="curve" smooth="yes"/>
@@ -16,14 +16,14 @@
       <point x="655" y="1102" type="curve"/>
       <point x="728" y="1070"/>
       <point x="790" y="1048"/>
-      <point x="862" y="1048" type="curve" name="dv04" smooth="yes"/>
+      <point x="862" y="1048" type="curve" smooth="yes" name="dv04"/>
       <point x="958" y="1048"/>
       <point x="1045" y="1087"/>
       <point x="1145" y="1171" type="curve" name="hr01"/>
       <point x="1145" y="996" type="line"/>
       <point x="1045" y="916"/>
       <point x="952" y="882"/>
-      <point x="852" y="882" type="curve" name="dv03" smooth="yes"/>
+      <point x="852" y="882" type="curve" smooth="yes" name="dv03"/>
       <point x="776" y="882"/>
       <point x="717" y="902"/>
       <point x="645" y="933" type="curve" name="hr02"/>
@@ -32,7 +32,7 @@
       <point x="612" y="947" type="curve"/>
       <point x="522" y="984"/>
       <point x="468" y="1005"/>
-      <point x="385" y="1005" type="curve" name="hr03" smooth="yes"/>
+      <point x="385" y="1005" type="curve" smooth="yes" name="hr03"/>
       <point x="277" y="1005"/>
       <point x="189" y="970"/>
       <point x="88" y="882" type="curve" name="hr04"/>
@@ -41,7 +41,7 @@
       <point x="88" y="687" type="line"/>
       <point x="192" y="770"/>
       <point x="287" y="804"/>
-      <point x="390" y="804" type="curve" name="dv07" smooth="yes"/>
+      <point x="390" y="804" type="curve" smooth="yes" name="dv07"/>
       <point x="463" y="804"/>
       <point x="533" y="786"/>
       <point x="621" y="749" type="curve"/>
@@ -51,23 +51,23 @@
       <point x="655" y="734" type="curve" smooth="yes"/>
       <point x="728" y="701"/>
       <point x="790" y="679"/>
-      <point x="862" y="679" type="curve" name="dv06" smooth="yes"/>
+      <point x="862" y="679" type="curve" smooth="yes" name="dv06"/>
       <point x="958" y="679"/>
       <point x="1045" y="719"/>
       <point x="1145" y="804" type="curve" name="hr07"/>
       <point x="1145" y="628" type="line"/>
       <point x="1052" y="553"/>
       <point x="955" y="513"/>
-      <point x="855" y="513" type="curve" name="dv05" smooth="yes"/>
+      <point x="855" y="513" type="curve" smooth="yes" name="dv05"/>
       <point x="784" y="513"/>
       <point x="710" y="533"/>
-      <point x="645" y="564" type="curve" name="hr08" smooth="yes"/>
+      <point x="645" y="564" type="curve" smooth="yes" name="hr08"/>
       <point x="642" y="565"/>
       <point x="641" y="566"/>
       <point x="612" y="579" type="curve" smooth="yes"/>
       <point x="506" y="624"/>
       <point x="448" y="638"/>
-      <point x="384" y="638" type="curve" name="hr09" smooth="yes"/>
+      <point x="384" y="638" type="curve" smooth="yes" name="hr09"/>
       <point x="280" y="638"/>
       <point x="192" y="604"/>
       <point x="88" y="513" type="curve" name="hr10"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni224B_.glif b/source/Hack-Italic.ufo/glyphs/uni224B_.glif
index a7fee4b70..0ec51fffc 100644
--- a/source/Hack-Italic.ufo/glyphs/uni224B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni224B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni224B" format="1">
+<glyph name="uni224B" format="2">
   <advance width="1233"/>
   <unicode hex="224B"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="88" y="1056" type="line" name="hr00"/>
       <point x="192" y="1136"/>
       <point x="284" y="1171"/>
-      <point x="393" y="1171" type="curve" name="hr01" smooth="yes"/>
+      <point x="393" y="1171" type="curve" smooth="yes" name="hr01"/>
       <point x="453" y="1171"/>
       <point x="527" y="1161"/>
       <point x="623" y="1117" type="curve" smooth="yes"/>
@@ -16,14 +16,14 @@
       <point x="655" y="1102" type="curve"/>
       <point x="728" y="1070"/>
       <point x="790" y="1048"/>
-      <point x="862" y="1048" type="curve" name="hr02" smooth="yes"/>
+      <point x="862" y="1048" type="curve" smooth="yes" name="hr02"/>
       <point x="958" y="1048"/>
       <point x="1045" y="1087"/>
       <point x="1145" y="1171" type="curve"/>
       <point x="1145" y="996" type="line" name="hr03"/>
       <point x="1045" y="916"/>
       <point x="952" y="882"/>
-      <point x="852" y="882" type="curve" name="hr04" smooth="yes"/>
+      <point x="852" y="882" type="curve" smooth="yes" name="hr04"/>
       <point x="776" y="882"/>
       <point x="717" y="902"/>
       <point x="645" y="933" type="curve"/>
@@ -32,7 +32,7 @@
       <point x="612" y="947" type="curve"/>
       <point x="522" y="984"/>
       <point x="468" y="1005"/>
-      <point x="385" y="1005" type="curve" name="dv02" smooth="yes"/>
+      <point x="385" y="1005" type="curve" smooth="yes" name="dv02"/>
       <point x="277" y="1005"/>
       <point x="189" y="970"/>
       <point x="88" y="882" type="curve" name="hr05"/>
@@ -41,7 +41,7 @@
       <point x="88" y="687" type="line"/>
       <point x="192" y="770"/>
       <point x="287" y="804"/>
-      <point x="390" y="804" type="curve" name="dv04" smooth="yes"/>
+      <point x="390" y="804" type="curve" smooth="yes" name="dv04"/>
       <point x="463" y="804"/>
       <point x="533" y="786"/>
       <point x="621" y="749" type="curve" name="hr07"/>
@@ -51,14 +51,14 @@
       <point x="655" y="734" type="curve" smooth="yes"/>
       <point x="728" y="701"/>
       <point x="790" y="679"/>
-      <point x="862" y="679" type="curve" name="hr08" smooth="yes"/>
+      <point x="862" y="679" type="curve" smooth="yes" name="hr08"/>
       <point x="958" y="679"/>
       <point x="1045" y="719"/>
       <point x="1145" y="804" type="curve"/>
       <point x="1145" y="628" type="line" name="hr09"/>
       <point x="1052" y="553"/>
       <point x="955" y="513"/>
-      <point x="855" y="513" type="curve" name="hr10" smooth="yes"/>
+      <point x="855" y="513" type="curve" smooth="yes" name="hr10"/>
       <point x="784" y="513"/>
       <point x="710" y="533"/>
       <point x="645" y="564" type="curve" smooth="yes"/>
@@ -67,7 +67,7 @@
       <point x="612" y="579" type="curve" smooth="yes"/>
       <point x="506" y="624"/>
       <point x="448" y="638"/>
-      <point x="384" y="638" type="curve" name="dv03" smooth="yes"/>
+      <point x="384" y="638" type="curve" smooth="yes" name="dv03"/>
       <point x="280" y="638"/>
       <point x="192" y="604"/>
       <point x="88" y="513" type="curve" name="hr11"/>
@@ -76,7 +76,7 @@
       <point x="88" y="323" type="line"/>
       <point x="192" y="406"/>
       <point x="287" y="440"/>
-      <point x="390" y="440" type="curve" name="dv01" smooth="yes"/>
+      <point x="390" y="440" type="curve" smooth="yes" name="dv01"/>
       <point x="463" y="440"/>
       <point x="533" y="422"/>
       <point x="621" y="385" type="curve" name="hr13"/>
@@ -84,14 +84,14 @@
       <point x="655" y="370" type="line" smooth="yes"/>
       <point x="728" y="337"/>
       <point x="790" y="315"/>
-      <point x="862" y="315" type="curve" name="hr14" smooth="yes"/>
+      <point x="862" y="315" type="curve" smooth="yes" name="hr14"/>
       <point x="958" y="315"/>
       <point x="1045" y="355"/>
       <point x="1145" y="440" type="curve"/>
       <point x="1145" y="264" type="line" name="hr15"/>
       <point x="1052" y="189"/>
       <point x="955" y="149"/>
-      <point x="855" y="149" type="curve" name="hr16" smooth="yes"/>
+      <point x="855" y="149" type="curve" smooth="yes" name="hr16"/>
       <point x="784" y="149"/>
       <point x="710" y="169"/>
       <point x="645" y="200" type="curve" smooth="yes"/>
@@ -100,7 +100,7 @@
       <point x="612" y="215" type="curve" smooth="yes"/>
       <point x="506" y="260"/>
       <point x="448" y="274"/>
-      <point x="384" y="274" type="curve" name="hr17" smooth="yes"/>
+      <point x="384" y="274" type="curve" smooth="yes" name="hr17"/>
       <point x="280" y="274"/>
       <point x="192" y="240"/>
       <point x="88" y="149" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni224C_.glif b/source/Hack-Italic.ufo/glyphs/uni224C_.glif
index 10d9f5647..81362028b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni224C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni224C_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni224C" format="1">
+<glyph name="uni224C" format="2">
   <advance width="1233"/>
   <unicode hex="224C"/>
   <outline>
     <contour>
-      <point x="383" y="878" type="curve" name="dv03" smooth="yes"/>
+      <point x="383" y="878" type="curve" smooth="yes" name="dv03"/>
       <point x="274" y="878"/>
       <point x="180" y="919"/>
       <point x="88" y="992" type="curve"/>
       <point x="88" y="1167" type="line"/>
       <point x="188" y="1083"/>
       <point x="276" y="1044"/>
-      <point x="367" y="1044" type="curve" name="dv04" smooth="yes"/>
+      <point x="367" y="1044" type="curve" smooth="yes" name="dv04"/>
       <point x="434" y="1044"/>
       <point x="510" y="1065"/>
       <point x="578" y="1098" type="curve" smooth="yes"/>
@@ -20,18 +20,18 @@
       <point x="609" y="1113" type="curve" smooth="yes"/>
       <point x="710" y="1161"/>
       <point x="805" y="1167"/>
-      <point x="847" y="1167" type="curve" name="dv02" smooth="yes"/>
+      <point x="847" y="1167" type="curve" smooth="yes" name="dv02"/>
       <point x="947" y="1167"/>
       <point x="1045" y="1131"/>
       <point x="1145" y="1052" type="curve"/>
       <point x="1145" y="878" type="line"/>
       <point x="1041" y="969"/>
       <point x="951" y="1001"/>
-      <point x="848" y="1001" type="curve" name="dv01" smooth="yes"/>
+      <point x="848" y="1001" type="curve" smooth="yes" name="dv01"/>
       <point x="765" y="1001"/>
       <point x="711" y="980"/>
       <point x="621" y="943" type="curve" smooth="yes"/>
-      <point x="588" y="929" type="line" name="hr01" smooth="yes"/>
+      <point x="588" y="929" type="line" smooth="yes" name="hr01"/>
       <point x="507" y="894"/>
       <point x="455" y="878"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni224D_.glif b/source/Hack-Italic.ufo/glyphs/uni224D_.glif
index 442427b0b..eb2d7e33a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni224D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni224D_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni224D" format="1">
+<glyph name="uni224D" format="2">
   <advance width="1233"/>
   <unicode hex="224D"/>
   <outline>
     <contour>
-      <point x="617" y="729" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="729" type="curve" smooth="yes" name="hr00"/>
       <point x="484" y="729"/>
       <point x="307" y="781"/>
       <point x="87" y="885" type="curve"/>
@@ -23,7 +23,7 @@
       <point x="88" y="399" type="line"/>
       <point x="307" y="503"/>
       <point x="483" y="555"/>
-      <point x="616" y="555" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="555" type="curve" smooth="yes" name="dv02"/>
       <point x="749" y="555"/>
       <point x="926" y="503"/>
       <point x="1145" y="399" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni224E_.glif b/source/Hack-Italic.ufo/glyphs/uni224E_.glif
index 4174e0bfb..deb5606d8 100644
--- a/source/Hack-Italic.ufo/glyphs/uni224E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni224E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni224E" format="1">
+<glyph name="uni224E" format="2">
   <advance width="1233"/>
   <unicode hex="224E"/>
   <outline>
@@ -11,7 +11,7 @@
       <point x="460" y="1164" type="curve" smooth="yes"/>
       <point x="505" y="1195"/>
       <point x="560" y="1214"/>
-      <point x="616" y="1214" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="1214" type="curve" smooth="yes" name="dv04"/>
       <point x="715" y="1214"/>
       <point x="830" y="1149"/>
       <point x="886" y="1037" type="curve" smooth="yes"/>
@@ -26,7 +26,7 @@
       <point x="709" y="1025" type="curve" smooth="yes"/>
       <point x="680" y="1052"/>
       <point x="649" y="1059"/>
-      <point x="622" y="1059" type="curve" name="dv03" smooth="yes"/>
+      <point x="622" y="1059" type="curve" smooth="yes" name="dv03"/>
       <point x="538" y="1059"/>
       <point x="483" y="994"/>
       <point x="456" y="914" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="88" y="762" type="line" name="sh02"/>
     </contour>
     <contour>
-      <point x="617" y="68" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="68" type="curve" smooth="yes" name="dv01"/>
       <point x="537" y="68"/>
       <point x="415" y="116"/>
       <point x="348" y="244" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="527" y="257" type="curve" smooth="yes"/>
       <point x="550" y="238"/>
       <point x="578" y="223"/>
-      <point x="617" y="223" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="223" type="curve" smooth="yes" name="dv02"/>
       <point x="681" y="223"/>
       <point x="743" y="267"/>
       <point x="778" y="368" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni224F_.glif b/source/Hack-Italic.ufo/glyphs/uni224F_.glif
index e024f733d..20e00b27f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni224F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni224F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni224F" format="1">
+<glyph name="uni224F" format="2">
   <advance width="1233"/>
   <unicode hex="224F"/>
   <outline>
@@ -11,7 +11,7 @@
       <point x="460" y="1164" type="curve" smooth="yes"/>
       <point x="505" y="1195"/>
       <point x="560" y="1214"/>
-      <point x="616" y="1214" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1214" type="curve" smooth="yes" name="dv03"/>
       <point x="715" y="1214"/>
       <point x="830" y="1149"/>
       <point x="886" y="1037" type="curve" smooth="yes"/>
@@ -26,7 +26,7 @@
       <point x="709" y="1025" type="curve" smooth="yes"/>
       <point x="680" y="1052"/>
       <point x="649" y="1059"/>
-      <point x="622" y="1059" type="curve" name="dv02" smooth="yes"/>
+      <point x="622" y="1059" type="curve" smooth="yes" name="dv02"/>
       <point x="538" y="1059"/>
       <point x="483" y="994"/>
       <point x="456" y="914" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2250.glif b/source/Hack-Italic.ufo/glyphs/uni2250.glif
index 4f1d635ce..d493b6c12 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2250.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2250.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2250" format="1">
+<glyph name="uni2250" format="2">
   <advance width="1233"/>
   <unicode hex="2250"/>
   <outline>
     <contour>
-      <point x="521" y="1000" type="line" name="hr00" smooth="yes"/>
+      <point x="521" y="1000" type="line" smooth="yes" name="hr00"/>
       <point x="501" y="1000"/>
       <point x="491" y="1010"/>
-      <point x="491" y="1030" type="curve" name="dh01" smooth="yes"/>
+      <point x="491" y="1030" type="curve" smooth="yes" name="dh01"/>
       <point x="491" y="1275" type="line" smooth="yes"/>
       <point x="491" y="1295"/>
       <point x="501" y="1305"/>
-      <point x="521" y="1305" type="curve" name="dv03" smooth="yes"/>
+      <point x="521" y="1305" type="curve" smooth="yes" name="dv03"/>
       <point x="713" y="1305" type="line" smooth="yes"/>
       <point x="733" y="1305"/>
       <point x="743" y="1295"/>
       <point x="743" y="1275" type="curve" smooth="yes"/>
-      <point x="743" y="1030" type="line" name="dh02" smooth="yes"/>
+      <point x="743" y="1030" type="line" smooth="yes" name="dh02"/>
       <point x="743" y="1010"/>
       <point x="733" y="1000"/>
       <point x="713" y="1000" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2251.glif b/source/Hack-Italic.ufo/glyphs/uni2251.glif
index 27a5ad640..92b1167be 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2251.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2251.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2251" format="1">
+<glyph name="uni2251" format="2">
   <advance width="1233"/>
   <unicode hex="2251"/>
   <outline>
     <contour>
-      <point x="521" y="1000" type="line" name="hr00" smooth="yes"/>
+      <point x="521" y="1000" type="line" smooth="yes" name="hr00"/>
       <point x="501" y="1000"/>
       <point x="491" y="1010"/>
-      <point x="491" y="1030" type="curve" name="dh01" smooth="yes"/>
+      <point x="491" y="1030" type="curve" smooth="yes" name="dh01"/>
       <point x="491" y="1275" type="line" smooth="yes"/>
       <point x="491" y="1295"/>
       <point x="501" y="1305"/>
-      <point x="521" y="1305" type="curve" name="dv01" smooth="yes"/>
+      <point x="521" y="1305" type="curve" smooth="yes" name="dv01"/>
       <point x="713" y="1305" type="line" smooth="yes"/>
       <point x="733" y="1305"/>
       <point x="743" y="1295"/>
       <point x="743" y="1275" type="curve" smooth="yes"/>
-      <point x="743" y="1030" type="line" name="dh02" smooth="yes"/>
+      <point x="743" y="1030" type="line" smooth="yes" name="dh02"/>
       <point x="743" y="1010"/>
       <point x="733" y="1000"/>
       <point x="713" y="1000" type="curve" smooth="yes"/>
@@ -34,18 +34,18 @@
       <point x="88" y="352" type="line"/>
     </contour>
     <contour>
-      <point x="520" y="-23" type="line" name="ab01" smooth="yes"/>
+      <point x="520" y="-23" type="line" smooth="yes" name="ab01"/>
       <point x="500" y="-23"/>
       <point x="490" y="-13"/>
-      <point x="490" y="7" type="curve" name="sh01" smooth="yes"/>
+      <point x="490" y="7" type="curve" smooth="yes" name="sh01"/>
       <point x="490" y="252" type="line" smooth="yes"/>
       <point x="490" y="272"/>
       <point x="500" y="282"/>
-      <point x="520" y="282" type="curve" name="sv01" smooth="yes"/>
+      <point x="520" y="282" type="curve" smooth="yes" name="sv01"/>
       <point x="712" y="282" type="line" smooth="yes"/>
       <point x="732" y="282"/>
       <point x="742" y="272"/>
-      <point x="742" y="252" type="curve" name="sh02" smooth="yes"/>
+      <point x="742" y="252" type="curve" smooth="yes" name="sh02"/>
       <point x="742" y="7" type="line" smooth="yes"/>
       <point x="742" y="-13"/>
       <point x="732" y="-23"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2252.glif b/source/Hack-Italic.ufo/glyphs/uni2252.glif
index 31056fb4a..bfbcf527d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2252.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2252.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2252" format="1">
+<glyph name="uni2252" format="2">
   <advance width="1233"/>
   <unicode hex="2252"/>
   <outline>
     <contour>
-      <point x="118" y="1000" type="line" name="hr00" smooth="yes"/>
+      <point x="118" y="1000" type="line" smooth="yes" name="hr00"/>
       <point x="98" y="1000"/>
       <point x="88" y="1010"/>
-      <point x="88" y="1030" type="curve" name="sh01" smooth="yes"/>
+      <point x="88" y="1030" type="curve" smooth="yes" name="sh01"/>
       <point x="88" y="1275" type="line" smooth="yes"/>
       <point x="88" y="1295"/>
       <point x="98" y="1305"/>
-      <point x="118" y="1305" type="curve" name="dv01" smooth="yes"/>
+      <point x="118" y="1305" type="curve" smooth="yes" name="dv01"/>
       <point x="310" y="1305" type="line" smooth="yes"/>
       <point x="330" y="1305"/>
       <point x="340" y="1295"/>
       <point x="340" y="1275" type="curve" smooth="yes"/>
-      <point x="340" y="1030" type="line" name="sh02" smooth="yes"/>
+      <point x="340" y="1030" type="line" smooth="yes" name="sh02"/>
       <point x="340" y="1010"/>
       <point x="330" y="1000"/>
       <point x="310" y="1000" type="curve" smooth="yes"/>
@@ -34,19 +34,19 @@
       <point x="88" y="352" type="line"/>
     </contour>
     <contour>
-      <point x="923" y="-20" type="line" name="ab01" smooth="yes"/>
+      <point x="923" y="-20" type="line" smooth="yes" name="ab01"/>
       <point x="903" y="-20"/>
       <point x="893" y="-10"/>
-      <point x="893" y="10" type="curve" name="ah01" smooth="yes"/>
+      <point x="893" y="10" type="curve" smooth="yes" name="ah01"/>
       <point x="893" y="255" type="line" smooth="yes"/>
       <point x="893" y="275"/>
       <point x="903" y="285"/>
-      <point x="923" y="285" type="curve" name="sv01" smooth="yes"/>
+      <point x="923" y="285" type="curve" smooth="yes" name="sv01"/>
       <point x="1115" y="285" type="line" smooth="yes"/>
       <point x="1135" y="285"/>
       <point x="1145" y="275"/>
       <point x="1145" y="255" type="curve" smooth="yes"/>
-      <point x="1145" y="10" type="line" name="sh04" smooth="yes"/>
+      <point x="1145" y="10" type="line" smooth="yes" name="sh04"/>
       <point x="1145" y="-10"/>
       <point x="1135" y="-20"/>
       <point x="1115" y="-20" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2253.glif b/source/Hack-Italic.ufo/glyphs/uni2253.glif
index 9ea56c1b1..750a3c33f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2253.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2253.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2253" format="1">
+<glyph name="uni2253" format="2">
   <advance width="1233"/>
   <unicode hex="2253"/>
   <outline>
     <contour>
-      <point x="923" y="1000" type="line" name="hr00" smooth="yes"/>
+      <point x="923" y="1000" type="line" smooth="yes" name="hr00"/>
       <point x="903" y="1000"/>
       <point x="893" y="1010"/>
-      <point x="893" y="1030" type="curve" name="ah01" smooth="yes"/>
+      <point x="893" y="1030" type="curve" smooth="yes" name="ah01"/>
       <point x="893" y="1275" type="line" smooth="yes"/>
       <point x="893" y="1295"/>
       <point x="903" y="1305"/>
-      <point x="923" y="1305" type="curve" name="dv01" smooth="yes"/>
+      <point x="923" y="1305" type="curve" smooth="yes" name="dv01"/>
       <point x="1115" y="1305" type="line" smooth="yes"/>
       <point x="1135" y="1305"/>
       <point x="1145" y="1295"/>
       <point x="1145" y="1275" type="curve" smooth="yes"/>
-      <point x="1145" y="1030" type="line" name="sh01" smooth="yes"/>
+      <point x="1145" y="1030" type="line" smooth="yes" name="sh01"/>
       <point x="1145" y="1010"/>
       <point x="1135" y="1000"/>
       <point x="1115" y="1000" type="curve" smooth="yes"/>
@@ -34,18 +34,18 @@
       <point x="88" y="352" type="line" name="sh02"/>
     </contour>
     <contour>
-      <point x="117" y="-20" type="line" name="ab01" smooth="yes"/>
+      <point x="117" y="-20" type="line" smooth="yes" name="ab01"/>
       <point x="97" y="-20"/>
       <point x="87" y="-10"/>
-      <point x="87" y="10" type="curve" name="sh06" smooth="yes"/>
+      <point x="87" y="10" type="curve" smooth="yes" name="sh06"/>
       <point x="87" y="255" type="line" smooth="yes"/>
       <point x="87" y="275"/>
       <point x="97" y="285"/>
-      <point x="117" y="285" type="curve" name="sv01" smooth="yes"/>
+      <point x="117" y="285" type="curve" smooth="yes" name="sv01"/>
       <point x="309" y="285" type="line" smooth="yes"/>
       <point x="329" y="285"/>
       <point x="339" y="275"/>
-      <point x="339" y="255" type="curve" name="sh07" smooth="yes"/>
+      <point x="339" y="255" type="curve" smooth="yes" name="sh07"/>
       <point x="339" y="10" type="line" smooth="yes"/>
       <point x="339" y="-10"/>
       <point x="329" y="-20"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2254.glif b/source/Hack-Italic.ufo/glyphs/uni2254.glif
index 48ea48cce..2167cdbdc 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2254.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2254.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2254" format="1">
+<glyph name="uni2254" format="2">
   <advance width="1233"/>
   <unicode hex="2254"/>
   <outline>
     <contour>
-      <point x="104" y="709" type="line" name="dv07" smooth="yes"/>
+      <point x="104" y="709" type="line" smooth="yes" name="dv07"/>
       <point x="84" y="709"/>
       <point x="74" y="719"/>
-      <point x="74" y="739" type="curve" name="dh01" smooth="yes"/>
+      <point x="74" y="739" type="curve" smooth="yes" name="dh01"/>
       <point x="74" y="951" type="line" smooth="yes"/>
       <point x="74" y="971"/>
       <point x="84" y="981"/>
-      <point x="104" y="981" type="curve" name="dv08" smooth="yes"/>
-      <point x="280" y="981" type="line" name="hr01" smooth="yes"/>
+      <point x="104" y="981" type="curve" smooth="yes" name="dv08"/>
+      <point x="280" y="981" type="line" smooth="yes" name="hr01"/>
       <point x="300" y="981"/>
       <point x="310" y="971"/>
       <point x="310" y="951" type="curve" smooth="yes"/>
-      <point x="310" y="739" type="line" name="dh02" smooth="yes"/>
+      <point x="310" y="739" type="line" smooth="yes" name="dh02"/>
       <point x="310" y="719"/>
       <point x="300" y="709"/>
       <point x="280" y="709" type="curve" smooth="yes"/>
@@ -28,18 +28,18 @@
       <point x="386" y="760" type="line"/>
     </contour>
     <contour>
-      <point x="104" y="302" type="line" name="dv01" smooth="yes"/>
+      <point x="104" y="302" type="line" smooth="yes" name="dv01"/>
       <point x="84" y="302"/>
       <point x="74" y="312"/>
-      <point x="74" y="332" type="curve" name="sh01" smooth="yes"/>
+      <point x="74" y="332" type="curve" smooth="yes" name="sh01"/>
       <point x="74" y="544" type="line" smooth="yes"/>
       <point x="74" y="564"/>
       <point x="84" y="574"/>
-      <point x="104" y="574" type="curve" name="dv02" smooth="yes"/>
-      <point x="280" y="574" type="line" name="hr02" smooth="yes"/>
+      <point x="104" y="574" type="curve" smooth="yes" name="dv02"/>
+      <point x="280" y="574" type="line" smooth="yes" name="hr02"/>
       <point x="300" y="574"/>
       <point x="310" y="564"/>
-      <point x="310" y="544" type="curve" name="sh02" smooth="yes"/>
+      <point x="310" y="544" type="curve" smooth="yes" name="sh02"/>
       <point x="310" y="332" type="line" smooth="yes"/>
       <point x="310" y="312"/>
       <point x="300" y="302"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2255.glif b/source/Hack-Italic.ufo/glyphs/uni2255.glif
index 50cfccbc8..1e211ffc4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2255.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2255.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2255" format="1">
+<glyph name="uni2255" format="2">
   <advance width="1233"/>
   <unicode hex="2255"/>
   <outline>
     <contour>
-      <point x="953" y="709" type="line" name="dv07" smooth="yes"/>
+      <point x="953" y="709" type="line" smooth="yes" name="dv07"/>
       <point x="933" y="709"/>
       <point x="923" y="719"/>
-      <point x="923" y="739" type="curve" name="dh01" smooth="yes"/>
+      <point x="923" y="739" type="curve" smooth="yes" name="dh01"/>
       <point x="923" y="951" type="line" smooth="yes"/>
       <point x="923" y="971"/>
       <point x="933" y="981"/>
-      <point x="953" y="981" type="curve" name="dv08" smooth="yes"/>
-      <point x="1129" y="981" type="line" name="hr01" smooth="yes"/>
+      <point x="953" y="981" type="curve" smooth="yes" name="dv08"/>
+      <point x="1129" y="981" type="line" smooth="yes" name="hr01"/>
       <point x="1149" y="981"/>
       <point x="1159" y="971"/>
       <point x="1159" y="951" type="curve" smooth="yes"/>
-      <point x="1159" y="739" type="line" name="dh02" smooth="yes"/>
+      <point x="1159" y="739" type="line" smooth="yes" name="dh02"/>
       <point x="1159" y="719"/>
       <point x="1149" y="709"/>
       <point x="1129" y="709" type="curve" smooth="yes"/>
@@ -28,18 +28,18 @@
       <point x="74" y="760" type="line"/>
     </contour>
     <contour>
-      <point x="953" y="302" type="line" name="dv01" smooth="yes"/>
+      <point x="953" y="302" type="line" smooth="yes" name="dv01"/>
       <point x="933" y="302"/>
       <point x="923" y="312"/>
-      <point x="923" y="332" type="curve" name="sh01" smooth="yes"/>
+      <point x="923" y="332" type="curve" smooth="yes" name="sh01"/>
       <point x="923" y="544" type="line" smooth="yes"/>
       <point x="923" y="564"/>
       <point x="933" y="574"/>
-      <point x="953" y="574" type="curve" name="dv02" smooth="yes"/>
-      <point x="1129" y="574" type="line" name="hr02" smooth="yes"/>
+      <point x="953" y="574" type="curve" smooth="yes" name="dv02"/>
+      <point x="1129" y="574" type="line" smooth="yes" name="hr02"/>
       <point x="1149" y="574"/>
       <point x="1159" y="564"/>
-      <point x="1159" y="544" type="curve" name="sh02" smooth="yes"/>
+      <point x="1159" y="544" type="curve" smooth="yes" name="sh02"/>
       <point x="1159" y="332" type="line" smooth="yes"/>
       <point x="1159" y="312"/>
       <point x="1149" y="302"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2256.glif b/source/Hack-Italic.ufo/glyphs/uni2256.glif
index 55906f45f..66a0c89a1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2256.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2256.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2256" format="1">
+<glyph name="uni2256" format="2">
   <advance width="1233"/>
   <unicode hex="2256"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="406" y="522" type="line" name="ih01"/>
       <point x="389" y="563"/>
       <point x="381" y="603"/>
-      <point x="381" y="642" type="curve" name="sh01" smooth="yes"/>
+      <point x="381" y="642" type="curve" smooth="yes" name="sh01"/>
       <point x="381" y="683"/>
       <point x="390" y="723"/>
       <point x="408" y="762" type="curve" name="ih02"/>
@@ -19,7 +19,7 @@
       <point x="834" y="762" type="line" name="ih03"/>
       <point x="851" y="746"/>
       <point x="860" y="699"/>
-      <point x="860" y="648" type="curve" name="sh03" smooth="yes"/>
+      <point x="860" y="648" type="curve" smooth="yes" name="sh03"/>
       <point x="860" y="605"/>
       <point x="854" y="573"/>
       <point x="833" y="522" type="curve" name="ih04"/>
@@ -31,14 +31,14 @@
       <point x="693" y="522" type="line" name="sv02"/>
       <point x="728" y="554"/>
       <point x="744" y="597"/>
-      <point x="744" y="640" type="curve" name="ah01" smooth="yes"/>
+      <point x="744" y="640" type="curve" smooth="yes" name="ah01"/>
       <point x="744" y="684"/>
       <point x="727" y="727"/>
       <point x="692" y="762" type="curve" name="sv03"/>
       <point x="549" y="762" type="line"/>
       <point x="514" y="730"/>
       <point x="497" y="690"/>
-      <point x="497" y="642" type="curve" name="sh02" smooth="yes"/>
+      <point x="497" y="642" type="curve" smooth="yes" name="sh02"/>
       <point x="497" y="594"/>
       <point x="514" y="554"/>
       <point x="548" y="522" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2257.glif b/source/Hack-Italic.ufo/glyphs/uni2257.glif
index 9cca58ee5..711eabb81 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2257.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2257.glif
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2257" format="1">
+<glyph name="uni2257" format="2">
   <advance width="1233"/>
   <unicode hex="2257"/>
   <outline>
     <contour>
-      <point x="614" y="1000" type="curve" name="hr00" smooth="yes"/>
+      <point x="614" y="1000" type="curve" smooth="yes" name="hr00"/>
       <point x="451" y="1000"/>
       <point x="328" y="1119"/>
-      <point x="328" y="1275" type="curve" name="sh01" smooth="yes"/>
+      <point x="328" y="1275" type="curve" smooth="yes" name="sh01"/>
       <point x="328" y="1432"/>
       <point x="456" y="1557"/>
-      <point x="616" y="1557" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1557" type="curve" smooth="yes" name="at01"/>
       <point x="696" y="1557"/>
       <point x="771" y="1526"/>
       <point x="822" y="1474" type="curve"/>
       <point x="878" y="1421"/>
       <point x="906" y="1353"/>
-      <point x="906" y="1278" type="curve" name="sh02" smooth="yes"/>
+      <point x="906" y="1278" type="curve" smooth="yes" name="sh02"/>
       <point x="906" y="1122"/>
       <point x="778" y="1000"/>
     </contour>
     <contour>
-      <point x="617" y="1111" type="curve" name="dv05" smooth="yes"/>
+      <point x="617" y="1111" type="curve" smooth="yes" name="dv05"/>
       <point x="714" y="1111"/>
       <point x="790" y="1184"/>
-      <point x="790" y="1276" type="curve" name="ah01" smooth="yes"/>
+      <point x="790" y="1276" type="curve" smooth="yes" name="ah01"/>
       <point x="790" y="1369"/>
       <point x="713" y="1444"/>
-      <point x="617" y="1444" type="curve" name="sv01" smooth="yes"/>
+      <point x="617" y="1444" type="curve" smooth="yes" name="sv01"/>
       <point x="520" y="1444"/>
       <point x="444" y="1369"/>
-      <point x="444" y="1276" type="curve" name="sh03" smooth="yes"/>
+      <point x="444" y="1276" type="curve" smooth="yes" name="sh03"/>
       <point x="444" y="1184"/>
       <point x="520" y="1111"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2258.glif b/source/Hack-Italic.ufo/glyphs/uni2258.glif
index 5f88f70c7..5ebfcf104 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2258.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2258.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2258" format="1">
+<glyph name="uni2258" format="2">
   <advance width="1233"/>
   <unicode hex="2258"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="182" y="1204" type="line" name="hr00"/>
       <point x="321" y="1305"/>
       <point x="467" y="1355"/>
-      <point x="619" y="1355" type="curve" name="dv04" smooth="yes"/>
+      <point x="619" y="1355" type="curve" smooth="yes" name="dv04"/>
       <point x="772" y="1355"/>
       <point x="916" y="1305"/>
       <point x="1051" y="1204" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2259.glif b/source/Hack-Italic.ufo/glyphs/uni2259.glif
index 63196c84c..7775137f3 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2259.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2259.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2259" format="1">
+<glyph name="uni2259" format="2">
   <advance width="1233"/>
   <unicode hex="2259"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni225A_.glif b/source/Hack-Italic.ufo/glyphs/uni225A_.glif
index c97815dcd..9e89adcb1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni225A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni225A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni225A" format="1">
+<glyph name="uni225A" format="2">
   <advance width="1233"/>
   <unicode hex="225A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni225B_.glif b/source/Hack-Italic.ufo/glyphs/uni225B_.glif
index 7179fa15d..61a9eea3b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni225B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni225B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni225B" format="1">
+<glyph name="uni225B" format="2">
   <advance width="1233"/>
   <unicode hex="225B"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni225C_.glif b/source/Hack-Italic.ufo/glyphs/uni225C_.glif
index e69041027..b249a3206 100644
--- a/source/Hack-Italic.ufo/glyphs/uni225C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni225C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni225C" format="1">
+<glyph name="uni225C" format="2">
   <advance width="1233"/>
   <unicode hex="225C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni225D_.glif b/source/Hack-Italic.ufo/glyphs/uni225D_.glif
index d482bb374..727b3c3bd 100644
--- a/source/Hack-Italic.ufo/glyphs/uni225D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni225D_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni225D" format="1">
+<glyph name="uni225D" format="2">
   <advance width="1233"/>
   <unicode hex="225D"/>
   <outline>
     <contour>
-      <point x="238" y="994" type="curve" name="sv01" smooth="yes"/>
+      <point x="238" y="994" type="curve" smooth="yes" name="sv01"/>
       <point x="135" y="994"/>
       <point x="69" y="1078"/>
-      <point x="69" y="1205" type="curve" name="dh01" smooth="yes"/>
+      <point x="69" y="1205" type="curve" smooth="yes" name="dh01"/>
       <point x="69" y="1332"/>
       <point x="135" y="1417"/>
-      <point x="238" y="1417" type="curve" name="sv02" smooth="yes"/>
+      <point x="238" y="1417" type="curve" smooth="yes" name="sv02"/>
       <point x="290" y="1417"/>
       <point x="335" y="1395"/>
       <point x="363" y="1346" type="curve"/>
@@ -27,16 +27,16 @@
       <point x="907" y="1356" type="line" name="dv02"/>
       <point x="907" y="1407" type="line"/>
       <point x="970" y="1407" type="line" name="sh04"/>
-      <point x="970" y="1435" type="line" name="sh06" smooth="yes"/>
+      <point x="970" y="1435" type="line" smooth="yes" name="sh06"/>
       <point x="970" y="1527"/>
       <point x="1009" y="1564"/>
-      <point x="1101" y="1564" type="curve" name="at01" smooth="yes"/>
+      <point x="1101" y="1564" type="curve" smooth="yes" name="at01"/>
       <point x="1164" y="1564" type="line"/>
       <point x="1164" y="1509" type="line" name="sv04"/>
       <point x="1100" y="1509" type="line" smooth="yes"/>
       <point x="1053" y="1509"/>
       <point x="1037" y="1492"/>
-      <point x="1037" y="1443" type="curve" name="sh07" smooth="yes"/>
+      <point x="1037" y="1443" type="curve" smooth="yes" name="sh07"/>
       <point x="1037" y="1407" type="line" name="sv05"/>
       <point x="1146" y="1407" type="line" name="sh03"/>
       <point x="1146" y="1356" type="line" name="sv06"/>
@@ -45,21 +45,21 @@
       <point x="970" y="1004" type="line" name="sh05"/>
     </contour>
     <contour>
-      <point x="701" y="994" type="curve" name="dv05" smooth="yes"/>
+      <point x="701" y="994" type="curve" smooth="yes" name="dv05"/>
       <point x="570" y="994"/>
       <point x="490" y="1071"/>
-      <point x="490" y="1204" type="curve" name="dh05" smooth="yes"/>
+      <point x="490" y="1204" type="curve" smooth="yes" name="dh05"/>
       <point x="490" y="1334"/>
       <point x="569" y="1417"/>
-      <point x="686" y="1417" type="curve" name="dv03" smooth="yes"/>
+      <point x="686" y="1417" type="curve" smooth="yes" name="dv03"/>
       <point x="798" y="1417"/>
       <point x="864" y="1343"/>
-      <point x="864" y="1222" type="curve" name="hr01" smooth="yes"/>
+      <point x="864" y="1222" type="curve" smooth="yes" name="hr01"/>
       <point x="864" y="1190" type="line"/>
       <point x="560" y="1190" type="line" name="dh06"/>
       <point x="565" y="1098"/>
       <point x="615" y="1050"/>
-      <point x="707" y="1050" type="curve" name="dv06" smooth="yes"/>
+      <point x="707" y="1050" type="curve" smooth="yes" name="dv06"/>
       <point x="752" y="1050"/>
       <point x="800" y="1062"/>
       <point x="849" y="1087" type="curve" name="ih02"/>
@@ -68,19 +68,19 @@
       <point x="750" y="994"/>
     </contour>
     <contour>
-      <point x="251" y="1049" type="curve" name="sv08" smooth="yes"/>
+      <point x="251" y="1049" type="curve" smooth="yes" name="sv08"/>
       <point x="322" y="1049"/>
       <point x="363" y="1107"/>
-      <point x="363" y="1206" type="curve" name="sh08" smooth="yes"/>
+      <point x="363" y="1206" type="curve" smooth="yes" name="sh08"/>
       <point x="363" y="1305"/>
       <point x="322" y="1362"/>
-      <point x="251" y="1362" type="curve" name="sv09" smooth="yes"/>
+      <point x="251" y="1362" type="curve" smooth="yes" name="sv09"/>
       <point x="216" y="1362"/>
       <point x="188" y="1348"/>
       <point x="168" y="1321" type="curve" smooth="yes"/>
       <point x="148" y="1293"/>
       <point x="138" y="1255"/>
-      <point x="138" y="1207" type="curve" name="dh02" smooth="yes"/>
+      <point x="138" y="1207" type="curve" smooth="yes" name="dh02"/>
       <point x="138" y="1107"/>
       <point x="180" y="1049"/>
     </contour>
@@ -88,7 +88,7 @@
       <point x="798" y="1242" type="line" name="dh07"/>
       <point x="795" y="1315"/>
       <point x="757" y="1361"/>
-      <point x="685" y="1361" type="curve" name="sv10" smooth="yes"/>
+      <point x="685" y="1361" type="curve" smooth="yes" name="sv10"/>
       <point x="613" y="1361"/>
       <point x="569" y="1314"/>
       <point x="562" y="1241" type="curve" name="sh09"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni225E_.glif b/source/Hack-Italic.ufo/glyphs/uni225E_.glif
index 7ca27dfa2..185a1ca8a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni225E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni225E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni225E" format="1">
+<glyph name="uni225E" format="2">
   <advance width="1233"/>
   <unicode hex="225E"/>
   <outline>
@@ -9,13 +9,13 @@
       <point x="310" y="1458" type="line"/>
       <point x="349" y="1522"/>
       <point x="403" y="1556"/>
-      <point x="482" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="482" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="559" y="1556"/>
       <point x="615" y="1521"/>
       <point x="646" y="1437" type="curve" name="ih01"/>
       <point x="689" y="1516"/>
       <point x="752" y="1556"/>
-      <point x="833" y="1556" type="curve" name="at02" smooth="yes"/>
+      <point x="833" y="1556" type="curve" smooth="yes" name="at02"/>
       <point x="950" y="1556"/>
       <point x="1012" y="1473"/>
       <point x="1012" y="1325" type="curve" smooth="yes"/>
@@ -24,7 +24,7 @@
       <point x="923" y="1322" type="line" smooth="yes"/>
       <point x="923" y="1429"/>
       <point x="886" y="1478"/>
-      <point x="809" y="1478" type="curve" name="sv01" smooth="yes"/>
+      <point x="809" y="1478" type="curve" smooth="yes" name="sv01"/>
       <point x="720" y="1478"/>
       <point x="661" y="1412"/>
       <point x="661" y="1304" type="curve" smooth="yes"/>
@@ -33,10 +33,10 @@
       <point x="572" y="1322" type="line" smooth="yes"/>
       <point x="572" y="1430"/>
       <point x="536" y="1478"/>
-      <point x="459" y="1478" type="curve" name="sv02" smooth="yes"/>
+      <point x="459" y="1478" type="curve" smooth="yes" name="sv02"/>
       <point x="367" y="1478"/>
       <point x="310" y="1412"/>
-      <point x="310" y="1304" type="curve" name="sh06" smooth="yes"/>
+      <point x="310" y="1304" type="curve" smooth="yes" name="sh06"/>
       <point x="310" y="994" type="line"/>
       <point x="221" y="994" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni225F_.glif b/source/Hack-Italic.ufo/glyphs/uni225F_.glif
index 281f64f0c..48bab3194 100644
--- a/source/Hack-Italic.ufo/glyphs/uni225F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni225F_.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni225F" format="1">
+<glyph name="uni225F" format="2">
   <advance width="1233"/>
   <unicode hex="225F"/>
   <outline>
     <contour>
-      <point x="542" y="1272" type="line" name="hr00" smooth="yes"/>
+      <point x="542" y="1272" type="line" smooth="yes" name="hr00"/>
       <point x="542" y="1346"/>
       <point x="558" y="1373"/>
       <point x="615" y="1430" type="curve" smooth="yes"/>
       <point x="660" y="1474" type="line" smooth="yes"/>
       <point x="695" y="1509"/>
       <point x="714" y="1533"/>
-      <point x="714" y="1572" type="curve" name="ah01" smooth="yes"/>
+      <point x="714" y="1572" type="curve" smooth="yes" name="ah01"/>
       <point x="714" y="1632"/>
       <point x="668" y="1672"/>
-      <point x="597" y="1672" type="curve" name="dv03" smooth="yes"/>
+      <point x="597" y="1672" type="curve" smooth="yes" name="dv03"/>
       <point x="541" y="1672"/>
       <point x="482" y="1648"/>
       <point x="417" y="1604" type="curve"/>
       <point x="417" y="1698" type="line"/>
       <point x="480" y="1735"/>
       <point x="545" y="1754"/>
-      <point x="610" y="1754" type="curve" name="dv04" smooth="yes"/>
+      <point x="610" y="1754" type="curve" smooth="yes" name="dv04"/>
       <point x="735" y="1754"/>
       <point x="816" y="1683"/>
-      <point x="816" y="1578" type="curve" name="sh01" smooth="yes"/>
+      <point x="816" y="1578" type="curve" smooth="yes" name="sh01"/>
       <point x="816" y="1523"/>
       <point x="794" y="1485"/>
       <point x="735" y="1428" type="curve" smooth="yes"/>
       <point x="691" y="1385" type="line" smooth="yes"/>
       <point x="659" y="1354"/>
       <point x="649" y="1339"/>
-      <point x="644" y="1322" type="curve" name="sh04" smooth="yes"/>
+      <point x="644" y="1322" type="curve" smooth="yes" name="sh04"/>
       <point x="640" y="1309"/>
       <point x="638" y="1291"/>
-      <point x="638" y="1256" type="curve" name="sh05" smooth="yes"/>
+      <point x="638" y="1256" type="curve" smooth="yes" name="sh05"/>
       <point x="638" y="1194" type="line"/>
       <point x="542" y="1194" type="line" name="sh02"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2262.glif b/source/Hack-Italic.ufo/glyphs/uni2262.glif
index c21302c2b..d7043ceda 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2262.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2262.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2262" format="1">
+<glyph name="uni2262" format="2">
   <advance width="1233"/>
   <unicode hex="2262"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2263.glif b/source/Hack-Italic.ufo/glyphs/uni2263.glif
index 8f87e263c..33027fd94 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2263.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2263.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2263" format="1">
+<glyph name="uni2263" format="2">
   <advance width="1233"/>
   <unicode hex="2263"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2266.glif b/source/Hack-Italic.ufo/glyphs/uni2266.glif
index ed9852f19..de279956d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2266.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2266.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2266" format="1">
+<glyph name="uni2266" format="2">
   <advance width="1233"/>
   <unicode hex="2266"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2267.glif b/source/Hack-Italic.ufo/glyphs/uni2267.glif
index f4c695c85..6b85f1573 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2267.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2267.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2267" format="1">
+<glyph name="uni2267" format="2">
   <advance width="1233"/>
   <unicode hex="2267"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2268.glif b/source/Hack-Italic.ufo/glyphs/uni2268.glif
index 6cdc5bbc5..801c8f16f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2268.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2268.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2268" format="1">
+<glyph name="uni2268" format="2">
   <advance width="1233"/>
   <unicode hex="2268"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2269.glif b/source/Hack-Italic.ufo/glyphs/uni2269.glif
index 22b7a3b0f..b1f8f9468 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2269.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2269.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2269" format="1">
+<glyph name="uni2269" format="2">
   <advance width="1233"/>
   <unicode hex="2269"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni226D_.glif b/source/Hack-Italic.ufo/glyphs/uni226D_.glif
index d9de97328..59d8ef725 100644
--- a/source/Hack-Italic.ufo/glyphs/uni226D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni226D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni226D" format="1">
+<glyph name="uni226D" format="2">
   <advance width="1233"/>
   <unicode hex="226D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni226E_.glif b/source/Hack-Italic.ufo/glyphs/uni226E_.glif
index d176e85a0..e102dc065 100644
--- a/source/Hack-Italic.ufo/glyphs/uni226E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni226E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni226E" format="1">
+<glyph name="uni226E" format="2">
   <advance width="1233"/>
   <unicode hex="226E"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni226F_.glif b/source/Hack-Italic.ufo/glyphs/uni226F_.glif
index 4c90f956a..25459cab1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni226F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni226F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni226F" format="1">
+<glyph name="uni226F" format="2">
   <advance width="1233"/>
   <unicode hex="226F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2270.glif b/source/Hack-Italic.ufo/glyphs/uni2270.glif
index 45dea8b29..460a3c475 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2270.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2270.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2270" format="1">
+<glyph name="uni2270" format="2">
   <advance width="1233"/>
   <unicode hex="2270"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2271.glif b/source/Hack-Italic.ufo/glyphs/uni2271.glif
index 0aafba116..766e172d0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2271.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2271.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2271" format="1">
+<glyph name="uni2271" format="2">
   <advance width="1233"/>
   <unicode hex="2271"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2272.glif b/source/Hack-Italic.ufo/glyphs/uni2272.glif
index b3961fb17..6c74ee822 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2272.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2272.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2272" format="1">
+<glyph name="uni2272" format="2">
   <advance width="1233"/>
   <unicode hex="2272"/>
   <outline>
@@ -16,23 +16,23 @@
       <point x="86" y="130" type="line" name="hr04"/>
       <point x="198" y="215"/>
       <point x="287" y="245"/>
-      <point x="400" y="245" type="curve" name="dv04" smooth="yes"/>
+      <point x="400" y="245" type="curve" smooth="yes" name="dv04"/>
       <point x="476" y="245"/>
       <point x="511" y="231"/>
       <point x="621" y="191" type="curve" smooth="yes"/>
       <point x="624" y="190"/>
       <point x="624" y="191"/>
-      <point x="653" y="176" type="curve" name="hr05" smooth="yes"/>
+      <point x="653" y="176" type="curve" smooth="yes" name="hr05"/>
       <point x="720" y="144"/>
       <point x="796" y="122"/>
-      <point x="864" y="122" type="curve" name="dv02" smooth="yes"/>
+      <point x="864" y="122" type="curve" smooth="yes" name="dv02"/>
       <point x="955" y="122"/>
       <point x="1043" y="161"/>
       <point x="1143" y="245" type="curve"/>
       <point x="1143" y="70" type="line"/>
       <point x="1043" y="-10"/>
       <point x="950" y="-44"/>
-      <point x="850" y="-44" type="curve" name="dv01" smooth="yes"/>
+      <point x="850" y="-44" type="curve" smooth="yes" name="dv01"/>
       <point x="774" y="-44"/>
       <point x="715" y="-24"/>
       <point x="643" y="7" type="curve"/>
@@ -41,7 +41,7 @@
       <point x="610" y="21" type="curve"/>
       <point x="520" y="58"/>
       <point x="466" y="79"/>
-      <point x="383" y="79" type="curve" name="dv03" smooth="yes"/>
+      <point x="383" y="79" type="curve" smooth="yes" name="dv03"/>
       <point x="275" y="79"/>
       <point x="187" y="44"/>
       <point x="86" y="-44" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2273.glif b/source/Hack-Italic.ufo/glyphs/uni2273.glif
index 0adbc4968..49d9086d7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2273.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2273.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2273" format="1">
+<glyph name="uni2273" format="2">
   <advance width="1233"/>
   <unicode hex="2273"/>
   <outline>
@@ -16,23 +16,23 @@
       <point x="86" y="130" type="line" name="hr04"/>
       <point x="198" y="215"/>
       <point x="287" y="245"/>
-      <point x="400" y="245" type="curve" name="dv04" smooth="yes"/>
+      <point x="400" y="245" type="curve" smooth="yes" name="dv04"/>
       <point x="476" y="245"/>
       <point x="511" y="231"/>
       <point x="621" y="191" type="curve" smooth="yes"/>
       <point x="624" y="190"/>
       <point x="624" y="191"/>
-      <point x="653" y="176" type="curve" name="hr05" smooth="yes"/>
+      <point x="653" y="176" type="curve" smooth="yes" name="hr05"/>
       <point x="720" y="144"/>
       <point x="796" y="122"/>
-      <point x="864" y="122" type="curve" name="dv02" smooth="yes"/>
+      <point x="864" y="122" type="curve" smooth="yes" name="dv02"/>
       <point x="955" y="122"/>
       <point x="1043" y="161"/>
       <point x="1143" y="245" type="curve"/>
       <point x="1143" y="70" type="line"/>
       <point x="1043" y="-10"/>
       <point x="950" y="-44"/>
-      <point x="850" y="-44" type="curve" name="dv01" smooth="yes"/>
+      <point x="850" y="-44" type="curve" smooth="yes" name="dv01"/>
       <point x="774" y="-44"/>
       <point x="715" y="-24"/>
       <point x="643" y="7" type="curve"/>
@@ -41,7 +41,7 @@
       <point x="610" y="21" type="curve"/>
       <point x="520" y="58"/>
       <point x="466" y="79"/>
-      <point x="383" y="79" type="curve" name="dv03" smooth="yes"/>
+      <point x="383" y="79" type="curve" smooth="yes" name="dv03"/>
       <point x="275" y="79"/>
       <point x="187" y="44"/>
       <point x="86" y="-44" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2274.glif b/source/Hack-Italic.ufo/glyphs/uni2274.glif
index a610406f0..5c7b964e4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2274.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2274.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2274" format="1">
+<glyph name="uni2274" format="2">
   <advance width="1233"/>
   <unicode hex="2274"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="86" y="130" type="line"/>
       <point x="190" y="210"/>
       <point x="282" y="245"/>
-      <point x="390" y="245" type="curve" name="dv04" smooth="yes"/>
+      <point x="390" y="245" type="curve" smooth="yes" name="dv04"/>
       <point x="409" y="245"/>
       <point x="420" y="244"/>
       <point x="435" y="243" type="curve" name="sv01"/>
@@ -36,14 +36,14 @@
       <point x="653" y="176" type="curve"/>
       <point x="730" y="140"/>
       <point x="799" y="122"/>
-      <point x="862" y="122" type="curve" name="dv02" smooth="yes"/>
+      <point x="862" y="122" type="curve" smooth="yes" name="dv02"/>
       <point x="955" y="122"/>
       <point x="1043" y="161"/>
       <point x="1143" y="245" type="curve" name="iv05"/>
       <point x="1143" y="70" type="line"/>
       <point x="1043" y="-10"/>
       <point x="951" y="-44"/>
-      <point x="848" y="-44" type="curve" name="dv01" smooth="yes"/>
+      <point x="848" y="-44" type="curve" smooth="yes" name="dv01"/>
       <point x="776" y="-44"/>
       <point x="724" y="-28"/>
       <point x="643" y="7" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2275.glif b/source/Hack-Italic.ufo/glyphs/uni2275.glif
index f948c91c1..59e803132 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2275.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2275.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2275" format="1">
+<glyph name="uni2275" format="2">
   <advance width="1233"/>
   <unicode hex="2275"/>
   <outline>
@@ -39,14 +39,14 @@
       <point x="653" y="176" type="curve" smooth="yes"/>
       <point x="726" y="141"/>
       <point x="799" y="122"/>
-      <point x="863" y="122" type="curve" name="dv02" smooth="yes"/>
+      <point x="863" y="122" type="curve" smooth="yes" name="dv02"/>
       <point x="955" y="122"/>
       <point x="1043" y="161"/>
       <point x="1143" y="245" type="curve" name="iv06"/>
       <point x="1143" y="70" type="line"/>
       <point x="1047" y="-6"/>
       <point x="951" y="-44"/>
-      <point x="847" y="-44" type="curve" name="dv01" smooth="yes"/>
+      <point x="847" y="-44" type="curve" smooth="yes" name="dv01"/>
       <point x="778" y="-44"/>
       <point x="723" y="-28"/>
       <point x="643" y="7" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2276.glif b/source/Hack-Italic.ufo/glyphs/uni2276.glif
index 2a52b5667..d63ec34b9 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2276.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2276.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2276" format="1">
+<glyph name="uni2276" format="2">
   <advance width="1233"/>
   <unicode hex="2276"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2277.glif b/source/Hack-Italic.ufo/glyphs/uni2277.glif
index 06cb06f97..60edbeae8 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2277.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2277.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2277" format="1">
+<glyph name="uni2277" format="2">
   <advance width="1233"/>
   <unicode hex="2277"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2278.glif b/source/Hack-Italic.ufo/glyphs/uni2278.glif
index 2c15eac55..d1d9ade44 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2278.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2278.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2278" format="1">
+<glyph name="uni2278" format="2">
   <advance width="1233"/>
   <unicode hex="2278"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2279.glif b/source/Hack-Italic.ufo/glyphs/uni2279.glif
index c37c8879c..6128c3444 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2279.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2279.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2279" format="1">
+<glyph name="uni2279" format="2">
   <advance width="1233"/>
   <unicode hex="2279"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni227A_.glif b/source/Hack-Italic.ufo/glyphs/uni227A_.glif
index ddf4bf5d7..cedcaddcc 100644
--- a/source/Hack-Italic.ufo/glyphs/uni227A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni227A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni227A" format="1">
+<glyph name="uni227A" format="2">
   <advance width="1233"/>
   <unicode hex="227A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni227B_.glif b/source/Hack-Italic.ufo/glyphs/uni227B_.glif
index a191bc3d6..d2daa1720 100644
--- a/source/Hack-Italic.ufo/glyphs/uni227B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni227B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni227B" format="1">
+<glyph name="uni227B" format="2">
   <advance width="1233"/>
   <unicode hex="227B"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni227C_.glif b/source/Hack-Italic.ufo/glyphs/uni227C_.glif
index 206c1090e..45760d6a8 100644
--- a/source/Hack-Italic.ufo/glyphs/uni227C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni227C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni227C" format="1">
+<glyph name="uni227C" format="2">
   <advance width="1233"/>
   <unicode hex="227C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni227D_.glif b/source/Hack-Italic.ufo/glyphs/uni227D_.glif
index 0e25f339b..8c498d15a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni227D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni227D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni227D" format="1">
+<glyph name="uni227D" format="2">
   <advance width="1233"/>
   <unicode hex="227D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni227E_.glif b/source/Hack-Italic.ufo/glyphs/uni227E_.glif
index 37e995453..ff6327870 100644
--- a/source/Hack-Italic.ufo/glyphs/uni227E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni227E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni227E" format="1">
+<glyph name="uni227E" format="2">
   <advance width="1233"/>
   <unicode hex="227E"/>
   <outline>
@@ -24,7 +24,7 @@
       <point x="86" y="60" type="line" name="hr04"/>
       <point x="190" y="140"/>
       <point x="282" y="175"/>
-      <point x="391" y="175" type="curve" name="dv04" smooth="yes"/>
+      <point x="391" y="175" type="curve" smooth="yes" name="dv04"/>
       <point x="451" y="175"/>
       <point x="525" y="165"/>
       <point x="621" y="121" type="curve" smooth="yes"/>
@@ -33,14 +33,14 @@
       <point x="653" y="106" type="curve" name="hr05"/>
       <point x="726" y="74"/>
       <point x="788" y="52"/>
-      <point x="860" y="52" type="curve" name="dv02" smooth="yes"/>
+      <point x="860" y="52" type="curve" smooth="yes" name="dv02"/>
       <point x="956" y="52"/>
       <point x="1043" y="91"/>
       <point x="1143" y="175" type="curve"/>
       <point x="1143" y="0" type="line"/>
       <point x="1043" y="-80"/>
       <point x="950" y="-114"/>
-      <point x="850" y="-114" type="curve" name="dv01" smooth="yes"/>
+      <point x="850" y="-114" type="curve" smooth="yes" name="dv01"/>
       <point x="774" y="-114"/>
       <point x="715" y="-94"/>
       <point x="643" y="-63" type="curve"/>
@@ -49,7 +49,7 @@
       <point x="610" y="-49" type="curve"/>
       <point x="520" y="-12"/>
       <point x="466" y="9"/>
-      <point x="383" y="9" type="curve" name="dv03" smooth="yes"/>
+      <point x="383" y="9" type="curve" smooth="yes" name="dv03"/>
       <point x="275" y="9"/>
       <point x="187" y="-26"/>
       <point x="86" y="-114" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni227F_.glif b/source/Hack-Italic.ufo/glyphs/uni227F_.glif
index e97590454..654082df9 100644
--- a/source/Hack-Italic.ufo/glyphs/uni227F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni227F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni227F" format="1">
+<glyph name="uni227F" format="2">
   <advance width="1233"/>
   <unicode hex="227F"/>
   <outline>
@@ -24,7 +24,7 @@
       <point x="86" y="60" type="line" name="hr04"/>
       <point x="190" y="140"/>
       <point x="282" y="175"/>
-      <point x="391" y="175" type="curve" name="dv04" smooth="yes"/>
+      <point x="391" y="175" type="curve" smooth="yes" name="dv04"/>
       <point x="451" y="175"/>
       <point x="525" y="165"/>
       <point x="621" y="121" type="curve" smooth="yes"/>
@@ -33,14 +33,14 @@
       <point x="653" y="106" type="curve" name="hr05"/>
       <point x="726" y="74"/>
       <point x="788" y="52"/>
-      <point x="860" y="52" type="curve" name="dv02" smooth="yes"/>
+      <point x="860" y="52" type="curve" smooth="yes" name="dv02"/>
       <point x="956" y="52"/>
       <point x="1043" y="91"/>
       <point x="1143" y="175" type="curve"/>
       <point x="1143" y="0" type="line"/>
       <point x="1043" y="-80"/>
       <point x="950" y="-114"/>
-      <point x="850" y="-114" type="curve" name="dv01" smooth="yes"/>
+      <point x="850" y="-114" type="curve" smooth="yes" name="dv01"/>
       <point x="774" y="-114"/>
       <point x="715" y="-94"/>
       <point x="643" y="-63" type="curve"/>
@@ -49,7 +49,7 @@
       <point x="610" y="-49" type="curve"/>
       <point x="520" y="-12"/>
       <point x="466" y="9"/>
-      <point x="383" y="9" type="curve" name="dv03" smooth="yes"/>
+      <point x="383" y="9" type="curve" smooth="yes" name="dv03"/>
       <point x="275" y="9"/>
       <point x="187" y="-26"/>
       <point x="86" y="-114" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2280.glif b/source/Hack-Italic.ufo/glyphs/uni2280.glif
index 38b9d6f34..13544a203 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2280.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2280.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2280" format="1">
+<glyph name="uni2280" format="2">
   <advance width="1233"/>
   <unicode hex="2280"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2281.glif b/source/Hack-Italic.ufo/glyphs/uni2281.glif
index 8f80108f7..fc2c669dd 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2281.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2281.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2281" format="1">
+<glyph name="uni2281" format="2">
   <advance width="1233"/>
   <unicode hex="2281"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2285.glif b/source/Hack-Italic.ufo/glyphs/uni2285.glif
index 21827108a..778861232 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2285.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2285.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2285" format="1">
+<glyph name="uni2285" format="2">
   <advance width="1233"/>
   <unicode hex="2285"/>
   <outline>
@@ -22,18 +22,18 @@
       <point x="1006" y="980" type="curve" smooth="yes"/>
       <point x="1097" y="888"/>
       <point x="1145" y="778"/>
-      <point x="1145" y="646" type="curve" name="dh02" smooth="yes"/>
+      <point x="1145" y="646" type="curve" smooth="yes" name="dh02"/>
       <point x="1145" y="374"/>
       <point x="935" y="163"/>
-      <point x="668" y="163" type="curve" name="sv03" smooth="yes"/>
+      <point x="668" y="163" type="curve" smooth="yes" name="sv03"/>
       <point x="542" y="163" type="line"/>
       <point x="467" y="-60" type="line" name="av01"/>
     </contour>
     <contour>
-      <point x="668" y="313" type="line" name="sv04" smooth="yes"/>
+      <point x="668" y="313" type="line" smooth="yes" name="sv04"/>
       <point x="851" y="313"/>
       <point x="995" y="457"/>
-      <point x="995" y="644" type="curve" name="dh01" smooth="yes"/>
+      <point x="995" y="644" type="curve" smooth="yes" name="dh01"/>
       <point x="995" y="732"/>
       <point x="964" y="809"/>
       <point x="900" y="873" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2288.glif b/source/Hack-Italic.ufo/glyphs/uni2288.glif
index fc1b64139..c3e7a8fb8 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2288.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2288.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2288" format="1">
+<glyph name="uni2288" format="2">
   <advance width="1233"/>
   <unicode hex="2288"/>
   <outline>
@@ -12,10 +12,10 @@
       <point x="429" y="342" type="line"/>
       <point x="278" y="384"/>
       <point x="88" y="539"/>
-      <point x="88" y="797" type="curve" name="dh01" smooth="yes"/>
+      <point x="88" y="797" type="curve" smooth="yes" name="dh01"/>
       <point x="88" y="1069"/>
       <point x="298" y="1280"/>
-      <point x="565" y="1280" type="curve" name="sv02" smooth="yes"/>
+      <point x="565" y="1280" type="curve" smooth="yes" name="sv02"/>
       <point x="743" y="1280" type="line"/>
       <point x="814" y="1494" type="line" name="at01"/>
       <point x="972" y="1441" type="line"/>
@@ -38,7 +38,7 @@
       <point x="565" y="1130" type="line" smooth="yes"/>
       <point x="382" y="1130"/>
       <point x="238" y="986"/>
-      <point x="238" y="799" type="curve" name="dh02" smooth="yes"/>
+      <point x="238" y="799" type="curve" smooth="yes" name="dh02"/>
       <point x="238" y="623"/>
       <point x="366" y="518"/>
       <point x="476" y="486" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2289.glif b/source/Hack-Italic.ufo/glyphs/uni2289.glif
index 75a995c07..300a5426e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2289.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2289.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2289" format="1">
+<glyph name="uni2289" format="2">
   <advance width="1233"/>
   <unicode hex="2289"/>
   <outline>
@@ -16,10 +16,10 @@
       <point x="692" y="1129" type="line"/>
       <point x="684" y="1130"/>
       <point x="676" y="1130"/>
-      <point x="668" y="1130" type="curve" name="dv01" smooth="yes"/>
+      <point x="668" y="1130" type="curve" smooth="yes" name="dv01"/>
       <point x="88" y="1130" type="line"/>
       <point x="88" y="1280" type="line"/>
-      <point x="668" y="1280" type="line" name="dv02" smooth="yes"/>
+      <point x="668" y="1280" type="line" smooth="yes" name="dv02"/>
       <point x="693" y="1280"/>
       <point x="718" y="1278"/>
       <point x="741" y="1275" type="curve" name="sv02"/>
@@ -31,10 +31,10 @@
       <point x="1006" y="1141" type="curve" smooth="yes"/>
       <point x="1097" y="1050"/>
       <point x="1145" y="937"/>
-      <point x="1145" y="805" type="curve" name="dh02" smooth="yes"/>
+      <point x="1145" y="805" type="curve" smooth="yes" name="dh02"/>
       <point x="1145" y="534"/>
       <point x="935" y="324"/>
-      <point x="667" y="324" type="curve" name="sv03" smooth="yes"/>
+      <point x="667" y="324" type="curve" smooth="yes" name="sv03"/>
       <point x="599" y="324" type="line"/>
       <point x="547" y="170" type="line" name="sv04"/>
       <point x="1145" y="170" type="line" name="sh01"/>
@@ -43,10 +43,10 @@
       <point x="420" y="-212" type="line" name="av01"/>
     </contour>
     <contour>
-      <point x="668" y="474" type="line" name="sv05" smooth="yes"/>
+      <point x="668" y="474" type="line" smooth="yes" name="sv05"/>
       <point x="849" y="474"/>
       <point x="995" y="617"/>
-      <point x="995" y="804" type="curve" name="dh01" smooth="yes"/>
+      <point x="995" y="804" type="curve" smooth="yes" name="dh01"/>
       <point x="995" y="896"/>
       <point x="960" y="974"/>
       <point x="900" y="1034" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni228A_.glif b/source/Hack-Italic.ufo/glyphs/uni228A_.glif
index 41876053e..0d23c268f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni228A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni228A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni228A" format="1">
+<glyph name="uni228A" format="2">
   <advance width="1233"/>
   <unicode hex="228A"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="88" y="170" type="line" name="sv01"/>
       <point x="576" y="170" type="line"/>
       <point x="700" y="324" type="line"/>
-      <point x="566" y="324" type="line" name="dv03" smooth="yes"/>
+      <point x="566" y="324" type="line" smooth="yes" name="dv03"/>
       <point x="298" y="324"/>
       <point x="88" y="537"/>
-      <point x="88" y="802" type="curve" name="dh01" smooth="yes"/>
+      <point x="88" y="802" type="curve" smooth="yes" name="dh01"/>
       <point x="88" y="1066"/>
       <point x="298" y="1280"/>
       <point x="565" y="1280" type="curve" smooth="yes"/>
@@ -22,10 +22,10 @@
       <point x="565" y="1130" type="line" smooth="yes"/>
       <point x="382" y="1130"/>
       <point x="238" y="982"/>
-      <point x="238" y="802" type="curve" name="dh02" smooth="yes"/>
+      <point x="238" y="802" type="curve" smooth="yes" name="dh02"/>
       <point x="238" y="618"/>
       <point x="385" y="474"/>
-      <point x="565" y="474" type="curve" name="dv04" smooth="yes"/>
+      <point x="565" y="474" type="curve" smooth="yes" name="dv04"/>
       <point x="1145" y="474" type="line"/>
       <point x="1145" y="324" type="line" name="sv02"/>
       <point x="810" y="324" type="line"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni228B_.glif b/source/Hack-Italic.ufo/glyphs/uni228B_.glif
index a81f4a1f7..39b8591d4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni228B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni228B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni228B" format="1">
+<glyph name="uni228B" format="2">
   <advance width="1233"/>
   <unicode hex="228B"/>
   <outline>
@@ -12,22 +12,22 @@
       <point x="700" y="325" type="line" name="iv01"/>
       <point x="689" y="324"/>
       <point x="678" y="324"/>
-      <point x="667" y="324" type="curve" name="dv03" smooth="yes"/>
+      <point x="667" y="324" type="curve" smooth="yes" name="dv03"/>
       <point x="88" y="324" type="line"/>
       <point x="88" y="474" type="line"/>
-      <point x="668" y="474" type="line" name="dv04" smooth="yes"/>
+      <point x="668" y="474" type="line" smooth="yes" name="dv04"/>
       <point x="848" y="474"/>
       <point x="995" y="618"/>
-      <point x="995" y="802" type="curve" name="dh01" smooth="yes"/>
+      <point x="995" y="802" type="curve" smooth="yes" name="dh01"/>
       <point x="995" y="982"/>
       <point x="851" y="1130"/>
-      <point x="668" y="1130" type="curve" name="dv01" smooth="yes"/>
+      <point x="668" y="1130" type="curve" smooth="yes" name="dv01"/>
       <point x="88" y="1130" type="line"/>
       <point x="88" y="1280" type="line"/>
-      <point x="668" y="1280" type="line" name="dv02" smooth="yes"/>
+      <point x="668" y="1280" type="line" smooth="yes" name="dv02"/>
       <point x="935" y="1280"/>
       <point x="1145" y="1067"/>
-      <point x="1145" y="798" type="curve" name="dh02" smooth="yes"/>
+      <point x="1145" y="798" type="curve" smooth="yes" name="dh02"/>
       <point x="1145" y="538"/>
       <point x="950" y="376"/>
       <point x="791" y="339" type="curve" name="iv02"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni228D_.glif b/source/Hack-Italic.ufo/glyphs/uni228D_.glif
index 2adae4c02..2b971af65 100644
--- a/source/Hack-Italic.ufo/glyphs/uni228D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni228D_.glif
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni228D" format="1">
+<glyph name="uni228D" format="2">
   <advance width="1233"/>
   <unicode hex="228D"/>
   <outline>
     <contour>
-      <point x="617" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="269" y="-29"/>
       <point x="131" y="100"/>
-      <point x="131" y="495" type="curve" name="dh01" smooth="yes"/>
+      <point x="131" y="495" type="curve" smooth="yes" name="dh01"/>
       <point x="131" y="1284" type="line" name="av01"/>
       <point x="303" y="1284" type="line"/>
-      <point x="303" y="540" type="line" name="dh02" smooth="yes"/>
+      <point x="303" y="540" type="line" smooth="yes" name="dh02"/>
       <point x="303" y="215"/>
       <point x="396" y="135"/>
-      <point x="617" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="837" y="135"/>
       <point x="930" y="215"/>
-      <point x="930" y="540" type="curve" name="dh05" smooth="yes"/>
+      <point x="930" y="540" type="curve" smooth="yes" name="dh05"/>
       <point x="930" y="1284" type="line" name="av02"/>
       <point x="1102" y="1284" type="line"/>
-      <point x="1102" y="495" type="line" name="dh06" smooth="yes"/>
+      <point x="1102" y="495" type="line" smooth="yes" name="dh06"/>
       <point x="1102" y="100"/>
       <point x="964" y="-29"/>
     </contour>
     <contour>
-      <point x="539" y="446" type="line" name="dv02" smooth="yes"/>
+      <point x="539" y="446" type="line" smooth="yes" name="dv02"/>
       <point x="519" y="446"/>
       <point x="509" y="456"/>
-      <point x="509" y="476" type="curve" name="dh03" smooth="yes"/>
+      <point x="509" y="476" type="curve" smooth="yes" name="dh03"/>
       <point x="509" y="642" type="line" smooth="yes"/>
       <point x="509" y="662"/>
       <point x="519" y="672"/>
-      <point x="539" y="672" type="curve" name="dv03" smooth="yes"/>
+      <point x="539" y="672" type="curve" smooth="yes" name="dv03"/>
       <point x="691" y="672" type="line" smooth="yes"/>
       <point x="711" y="672"/>
       <point x="721" y="662"/>
       <point x="721" y="642" type="curve" smooth="yes"/>
-      <point x="721" y="476" type="line" name="dh04" smooth="yes"/>
+      <point x="721" y="476" type="line" smooth="yes" name="dh04"/>
       <point x="721" y="456"/>
       <point x="711" y="446"/>
       <point x="691" y="446" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni228E_.glif b/source/Hack-Italic.ufo/glyphs/uni228E_.glif
index bd4de025b..d476a5790 100644
--- a/source/Hack-Italic.ufo/glyphs/uni228E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni228E_.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni228E" format="1">
+<glyph name="uni228E" format="2">
   <advance width="1233"/>
   <unicode hex="228E"/>
   <outline>
     <contour>
-      <point x="617" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="269" y="-29"/>
       <point x="131" y="100"/>
-      <point x="131" y="495" type="curve" name="sh01" smooth="yes"/>
+      <point x="131" y="495" type="curve" smooth="yes" name="sh01"/>
       <point x="131" y="1284" type="line" name="av01"/>
       <point x="303" y="1284" type="line"/>
-      <point x="303" y="540" type="line" name="sh02" smooth="yes"/>
+      <point x="303" y="540" type="line" smooth="yes" name="sh02"/>
       <point x="303" y="215"/>
       <point x="396" y="135"/>
-      <point x="617" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="837" y="135"/>
       <point x="930" y="215"/>
-      <point x="930" y="540" type="curve" name="sh04" smooth="yes"/>
+      <point x="930" y="540" type="curve" smooth="yes" name="sh04"/>
       <point x="930" y="1284" type="line" name="av02"/>
       <point x="1102" y="1284" type="line"/>
-      <point x="1102" y="495" type="line" name="sh05" smooth="yes"/>
+      <point x="1102" y="495" type="line" smooth="yes" name="sh05"/>
       <point x="1102" y="100"/>
       <point x="964" y="-29"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni228F_.glif b/source/Hack-Italic.ufo/glyphs/uni228F_.glif
index 4f92fb4b1..f7497da43 100644
--- a/source/Hack-Italic.ufo/glyphs/uni228F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni228F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni228F" format="1">
+<glyph name="uni228F" format="2">
   <advance width="1233"/>
   <unicode hex="228F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2290.glif b/source/Hack-Italic.ufo/glyphs/uni2290.glif
index 33bedbbc1..d74b6e4bc 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2290.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2290.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2290" format="1">
+<glyph name="uni2290" format="2">
   <advance width="1233"/>
   <unicode hex="2290"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2291.glif b/source/Hack-Italic.ufo/glyphs/uni2291.glif
index d502f1b74..12401ec8c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2291.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2291.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2291" format="1">
+<glyph name="uni2291" format="2">
   <advance width="1233"/>
   <unicode hex="2291"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2292.glif b/source/Hack-Italic.ufo/glyphs/uni2292.glif
index 052f0010d..aedb6a7a2 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2292.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2292.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2292" format="1">
+<glyph name="uni2292" format="2">
   <advance width="1233"/>
   <unicode hex="2292"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2293.glif b/source/Hack-Italic.ufo/glyphs/uni2293.glif
index b6c42bb21..ae2e1cfc9 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2293.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2293.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2293" format="1">
+<glyph name="uni2293" format="2">
   <advance width="1233"/>
   <unicode hex="2293"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2294.glif b/source/Hack-Italic.ufo/glyphs/uni2294.glif
index 9fde1ef65..ea5f786cf 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2294.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2294.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2294" format="1">
+<glyph name="uni2294" format="2">
   <advance width="1233"/>
   <unicode hex="2294"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2296.glif b/source/Hack-Italic.ufo/glyphs/uni2296.glif
index e7a30e7df..614946d68 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2296.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2296.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2296" format="1">
+<glyph name="uni2296" format="2">
   <advance width="1233"/>
   <unicode hex="2296"/>
   <outline>
     <contour>
-      <point x="617" y="106" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="106" type="curve" smooth="yes" name="hr00"/>
       <point x="465" y="106"/>
       <point x="331" y="168"/>
       <point x="236" y="263" type="curve" smooth="yes"/>
       <point x="132" y="367"/>
       <point x="80" y="503"/>
-      <point x="80" y="644" type="curve" name="sh01" smooth="yes"/>
+      <point x="80" y="644" type="curve" smooth="yes" name="sh01"/>
       <point x="80" y="793"/>
       <point x="137" y="925"/>
       <point x="237" y="1024" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="412" y="1142" type="curve" smooth="yes"/>
       <point x="479" y="1170"/>
       <point x="544" y="1182"/>
-      <point x="613" y="1182" type="curve" name="dv03" smooth="yes"/>
+      <point x="613" y="1182" type="curve" smooth="yes" name="dv03"/>
       <point x="770" y="1182"/>
       <point x="901" y="1120"/>
       <point x="997" y="1024" type="curve" smooth="yes"/>
       <point x="1101" y="920"/>
       <point x="1153" y="786"/>
-      <point x="1153" y="643" type="curve" name="sh02" smooth="yes"/>
+      <point x="1153" y="643" type="curve" smooth="yes" name="sh02"/>
       <point x="1153" y="504"/>
       <point x="1102" y="368"/>
       <point x="997" y="263" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="770" y="106"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="532"/>
-      <point x="1012" y="645" type="curve" name="ah01" smooth="yes"/>
+      <point x="1012" y="645" type="curve" smooth="yes" name="ah01"/>
       <point x="1012" y="745"/>
       <point x="979" y="843"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="413" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2298.glif b/source/Hack-Italic.ufo/glyphs/uni2298.glif
index 728142d5a..e84f27f0e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2298.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2298.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2298" format="1">
+<glyph name="uni2298" format="2">
   <advance width="1233"/>
   <unicode hex="2298"/>
   <outline>
     <contour>
-      <point x="617" y="106" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="106" type="curve" smooth="yes" name="hr00"/>
       <point x="465" y="106"/>
       <point x="331" y="168"/>
       <point x="236" y="263" type="curve" smooth="yes"/>
       <point x="132" y="367"/>
       <point x="80" y="503"/>
-      <point x="80" y="644" type="curve" name="sh01" smooth="yes"/>
+      <point x="80" y="644" type="curve" smooth="yes" name="sh01"/>
       <point x="80" y="793"/>
       <point x="137" y="925"/>
       <point x="237" y="1024" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="412" y="1142" type="curve" smooth="yes"/>
       <point x="479" y="1170"/>
       <point x="544" y="1182"/>
-      <point x="613" y="1182" type="curve" name="dv03" smooth="yes"/>
+      <point x="613" y="1182" type="curve" smooth="yes" name="dv03"/>
       <point x="770" y="1182"/>
       <point x="901" y="1120"/>
       <point x="997" y="1024" type="curve" smooth="yes"/>
       <point x="1101" y="920"/>
       <point x="1153" y="786"/>
-      <point x="1153" y="643" type="curve" name="sh02" smooth="yes"/>
+      <point x="1153" y="643" type="curve" smooth="yes" name="sh02"/>
       <point x="1153" y="504"/>
       <point x="1102" y="368"/>
       <point x="997" y="263" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="770" y="106"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="532"/>
-      <point x="1012" y="645" type="curve" name="ah01" smooth="yes"/>
+      <point x="1012" y="645" type="curve" smooth="yes" name="ah01"/>
       <point x="1012" y="745"/>
       <point x="979" y="843"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="413" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2299.glif b/source/Hack-Italic.ufo/glyphs/uni2299.glif
index 1f39d37e3..d74efa525 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2299.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2299.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2299" format="1">
+<glyph name="uni2299" format="2">
   <advance width="1233"/>
   <unicode hex="2299"/>
   <outline>
     <contour>
-      <point x="617" y="106" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="106" type="curve" smooth="yes" name="hr00"/>
       <point x="465" y="106"/>
       <point x="331" y="168"/>
       <point x="236" y="263" type="curve" smooth="yes"/>
       <point x="132" y="367"/>
       <point x="80" y="503"/>
-      <point x="80" y="644" type="curve" name="dh01" smooth="yes"/>
+      <point x="80" y="644" type="curve" smooth="yes" name="dh01"/>
       <point x="80" y="793"/>
       <point x="137" y="925"/>
       <point x="237" y="1024" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="412" y="1142" type="curve" smooth="yes"/>
       <point x="479" y="1170"/>
       <point x="544" y="1182"/>
-      <point x="613" y="1182" type="curve" name="dv03" smooth="yes"/>
+      <point x="613" y="1182" type="curve" smooth="yes" name="dv03"/>
       <point x="770" y="1182"/>
       <point x="901" y="1120"/>
       <point x="997" y="1024" type="curve" smooth="yes"/>
       <point x="1101" y="920"/>
       <point x="1153" y="786"/>
-      <point x="1153" y="643" type="curve" name="dh06" smooth="yes"/>
+      <point x="1153" y="643" type="curve" smooth="yes" name="dh06"/>
       <point x="1153" y="504"/>
       <point x="1102" y="368"/>
       <point x="997" y="263" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="770" y="106"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="532"/>
-      <point x="1012" y="645" type="curve" name="dh05" smooth="yes"/>
+      <point x="1012" y="645" type="curve" smooth="yes" name="dh05"/>
       <point x="1012" y="745"/>
       <point x="979" y="843"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="413" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="dh02" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="dh02"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni229A_.glif b/source/Hack-Italic.ufo/glyphs/uni229A_.glif
index 06e9b64ff..46fcc4691 100644
--- a/source/Hack-Italic.ufo/glyphs/uni229A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni229A_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni229A" format="1">
+<glyph name="uni229A" format="2">
   <advance width="1233"/>
   <unicode hex="229A"/>
   <outline>
     <contour>
-      <point x="617" y="106" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="106" type="curve" smooth="yes" name="hr00"/>
       <point x="465" y="106"/>
       <point x="331" y="168"/>
       <point x="236" y="263" type="curve" smooth="yes"/>
       <point x="132" y="367"/>
       <point x="80" y="503"/>
-      <point x="80" y="644" type="curve" name="dh01" smooth="yes"/>
+      <point x="80" y="644" type="curve" smooth="yes" name="dh01"/>
       <point x="80" y="793"/>
       <point x="137" y="925"/>
       <point x="237" y="1024" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="412" y="1142" type="curve" smooth="yes"/>
       <point x="479" y="1170"/>
       <point x="544" y="1182"/>
-      <point x="613" y="1182" type="curve" name="dv03" smooth="yes"/>
+      <point x="613" y="1182" type="curve" smooth="yes" name="dv03"/>
       <point x="770" y="1182"/>
       <point x="901" y="1120"/>
       <point x="997" y="1024" type="curve" smooth="yes"/>
       <point x="1101" y="920"/>
       <point x="1153" y="786"/>
-      <point x="1153" y="643" type="curve" name="dh08" smooth="yes"/>
+      <point x="1153" y="643" type="curve" smooth="yes" name="dh08"/>
       <point x="1153" y="504"/>
       <point x="1102" y="368"/>
       <point x="997" y="263" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="770" y="106"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="532"/>
-      <point x="1012" y="645" type="curve" name="dh07" smooth="yes"/>
+      <point x="1012" y="645" type="curve" smooth="yes" name="dh07"/>
       <point x="1012" y="745"/>
       <point x="979" y="843"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="413" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="dh02" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="dh02"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
@@ -62,36 +62,36 @@
       <point x="509" y="246"/>
     </contour>
     <contour>
-      <point x="614" y="378" type="curve" name="dv04" smooth="yes"/>
+      <point x="614" y="378" type="curve" smooth="yes" name="dv04"/>
       <point x="463" y="378"/>
       <point x="350" y="492"/>
-      <point x="350" y="641" type="curve" name="dh03" smooth="yes"/>
+      <point x="350" y="641" type="curve" smooth="yes" name="dh03"/>
       <point x="350" y="793"/>
       <point x="467" y="911"/>
-      <point x="616" y="911" type="curve" name="dv07" smooth="yes"/>
+      <point x="616" y="911" type="curve" smooth="yes" name="dv07"/>
       <point x="689" y="911"/>
       <point x="757" y="883"/>
       <point x="806" y="831" type="curve"/>
       <point x="857" y="782"/>
       <point x="883" y="717"/>
-      <point x="883" y="645" type="curve" name="dh06" smooth="yes"/>
+      <point x="883" y="645" type="curve" smooth="yes" name="dh06"/>
       <point x="883" y="493"/>
       <point x="765" y="378"/>
     </contour>
     <contour>
-      <point x="615" y="511" type="curve" name="dv05" smooth="yes"/>
+      <point x="615" y="511" type="curve" smooth="yes" name="dv05"/>
       <point x="690" y="511"/>
       <point x="750" y="568"/>
-      <point x="750" y="644" type="curve" name="dh05" smooth="yes"/>
+      <point x="750" y="644" type="curve" smooth="yes" name="dh05"/>
       <point x="750" y="680"/>
       <point x="737" y="711"/>
       <point x="711" y="737" type="curve" smooth="yes"/>
       <point x="687" y="761"/>
       <point x="655" y="776"/>
-      <point x="616" y="776" type="curve" name="dv06" smooth="yes"/>
+      <point x="616" y="776" type="curve" smooth="yes" name="dv06"/>
       <point x="542" y="776"/>
       <point x="483" y="717"/>
-      <point x="483" y="642" type="curve" name="dh04" smooth="yes"/>
+      <point x="483" y="642" type="curve" smooth="yes" name="dh04"/>
       <point x="483" y="567"/>
       <point x="540" y="511"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni229B_.glif b/source/Hack-Italic.ufo/glyphs/uni229B_.glif
index e90272839..12c1e9498 100644
--- a/source/Hack-Italic.ufo/glyphs/uni229B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni229B_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni229B" format="1">
+<glyph name="uni229B" format="2">
   <advance width="1233"/>
   <unicode hex="229B"/>
   <outline>
     <contour>
-      <point x="617" y="106" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="106" type="curve" smooth="yes" name="hr00"/>
       <point x="465" y="106"/>
       <point x="331" y="168"/>
       <point x="236" y="263" type="curve" smooth="yes"/>
       <point x="132" y="367"/>
       <point x="80" y="503"/>
-      <point x="80" y="644" type="curve" name="sh01" smooth="yes"/>
+      <point x="80" y="644" type="curve" smooth="yes" name="sh01"/>
       <point x="80" y="793"/>
       <point x="137" y="925"/>
       <point x="237" y="1024" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="412" y="1142" type="curve" smooth="yes"/>
       <point x="479" y="1170"/>
       <point x="544" y="1182"/>
-      <point x="613" y="1182" type="curve" name="av01" smooth="yes"/>
+      <point x="613" y="1182" type="curve" smooth="yes" name="av01"/>
       <point x="770" y="1182"/>
       <point x="901" y="1120"/>
       <point x="997" y="1024" type="curve" smooth="yes"/>
       <point x="1101" y="920"/>
       <point x="1153" y="786"/>
-      <point x="1153" y="643" type="curve" name="sh04" smooth="yes"/>
+      <point x="1153" y="643" type="curve" smooth="yes" name="sh04"/>
       <point x="1153" y="504"/>
       <point x="1102" y="368"/>
       <point x="997" y="263" type="curve" smooth="yes"/>
@@ -57,7 +57,7 @@
       <point x="248" y="792" type="line"/>
       <point x="230" y="746"/>
       <point x="221" y="696"/>
-      <point x="221" y="642" type="curve" name="sh06" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="sh06"/>
       <point x="221" y="588"/>
       <point x="230" y="538"/>
       <point x="249" y="492" type="curve"/>
@@ -66,7 +66,7 @@
       <point x="984" y="492" type="line"/>
       <point x="1003" y="538"/>
       <point x="1012" y="588"/>
-      <point x="1012" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="1012" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="1012" y="696"/>
       <point x="1003" y="746"/>
       <point x="985" y="792" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni229C_.glif b/source/Hack-Italic.ufo/glyphs/uni229C_.glif
index 691a86e3f..906a9c299 100644
--- a/source/Hack-Italic.ufo/glyphs/uni229C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni229C_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni229C" format="1">
+<glyph name="uni229C" format="2">
   <advance width="1233"/>
   <unicode hex="229C"/>
   <outline>
     <contour>
-      <point x="617" y="106" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="106" type="curve" smooth="yes" name="hr00"/>
       <point x="465" y="106"/>
       <point x="331" y="168"/>
       <point x="236" y="263" type="curve" smooth="yes"/>
       <point x="132" y="367"/>
       <point x="80" y="503"/>
-      <point x="80" y="644" type="curve" name="sh01" smooth="yes"/>
+      <point x="80" y="644" type="curve" smooth="yes" name="sh01"/>
       <point x="80" y="793"/>
       <point x="137" y="925"/>
       <point x="237" y="1024" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="412" y="1142" type="curve" smooth="yes"/>
       <point x="479" y="1170"/>
       <point x="544" y="1182"/>
-      <point x="613" y="1182" type="curve" name="dv03" smooth="yes"/>
+      <point x="613" y="1182" type="curve" smooth="yes" name="dv03"/>
       <point x="770" y="1182"/>
       <point x="901" y="1120"/>
       <point x="997" y="1024" type="curve" smooth="yes"/>
       <point x="1101" y="920"/>
       <point x="1153" y="786"/>
-      <point x="1153" y="643" type="curve" name="sh02" smooth="yes"/>
+      <point x="1153" y="643" type="curve" smooth="yes" name="sh02"/>
       <point x="1153" y="504"/>
       <point x="1102" y="368"/>
       <point x="997" y="263" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="770" y="106"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="532"/>
-      <point x="1012" y="645" type="curve" name="ah01" smooth="yes"/>
+      <point x="1012" y="645" type="curve" smooth="yes" name="ah01"/>
       <point x="1012" y="745"/>
       <point x="979" y="843"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="413" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni229D_.glif b/source/Hack-Italic.ufo/glyphs/uni229D_.glif
index 511b23f6f..a75479513 100644
--- a/source/Hack-Italic.ufo/glyphs/uni229D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni229D_.glif
@@ -1,51 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni229D" format="1">
+<glyph name="uni229D" format="2">
   <advance width="1233"/>
   <unicode hex="229D"/>
   <outline>
     <contour>
-      <point x="617" y="106" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="106" type="curve" smooth="yes" name="hr00"/>
       <point x="317" y="106"/>
       <point x="80" y="343"/>
-      <point x="80" y="645" type="curve" name="sh01" smooth="yes"/>
+      <point x="80" y="645" type="curve" smooth="yes" name="sh01"/>
       <point x="80" y="794"/>
       <point x="137" y="925"/>
       <point x="237" y="1024" type="curve" smooth="yes"/>
       <point x="289" y="1075"/>
       <point x="345" y="1114"/>
-      <point x="412" y="1142" type="curve" name="sh03" smooth="yes"/>
+      <point x="412" y="1142" type="curve" smooth="yes" name="sh03"/>
       <point x="475" y="1169"/>
       <point x="542" y="1182"/>
-      <point x="613" y="1182" type="curve" name="dv03" smooth="yes"/>
+      <point x="613" y="1182" type="curve" smooth="yes" name="dv03"/>
       <point x="770" y="1182"/>
       <point x="901" y="1120"/>
       <point x="997" y="1024" type="curve" smooth="yes"/>
       <point x="1101" y="920"/>
       <point x="1153" y="785"/>
-      <point x="1153" y="644" type="curve" name="sh05" smooth="yes"/>
+      <point x="1153" y="644" type="curve" smooth="yes" name="sh05"/>
       <point x="1153" y="348"/>
       <point x="913" y="106"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="717" y="246"/>
       <point x="820" y="286"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="976" y="441"/>
       <point x="1012" y="542"/>
-      <point x="1012" y="643" type="curve" name="sh04" smooth="yes"/>
+      <point x="1012" y="643" type="curve" smooth="yes" name="sh04"/>
       <point x="1012" y="747"/>
       <point x="973" y="849"/>
       <point x="897" y="925" type="curve" smooth="yes"/>
       <point x="828" y="994"/>
       <point x="728" y="1041"/>
-      <point x="616" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="505" y="1041"/>
       <point x="405" y="994"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="256" y="845"/>
       <point x="221" y="744"/>
-      <point x="221" y="644" type="curve" name="sh06" smooth="yes"/>
+      <point x="221" y="644" type="curve" smooth="yes" name="sh06"/>
       <point x="221" y="539"/>
       <point x="260" y="438"/>
       <point x="336" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni229E_.glif b/source/Hack-Italic.ufo/glyphs/uni229E_.glif
index 789907223..1e67e6c85 100644
--- a/source/Hack-Italic.ufo/glyphs/uni229E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni229E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni229E" format="1">
+<glyph name="uni229E" format="2">
   <advance width="1233"/>
   <unicode hex="229E"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni229F_.glif b/source/Hack-Italic.ufo/glyphs/uni229F_.glif
index 37baa426c..3e11b4e61 100644
--- a/source/Hack-Italic.ufo/glyphs/uni229F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni229F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni229F" format="1">
+<glyph name="uni229F" format="2">
   <advance width="1233"/>
   <unicode hex="229F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22A_0.glif b/source/Hack-Italic.ufo/glyphs/uni22A_0.glif
index 091c78727..d9d5b6ff9 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22A_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22A0" format="1">
+<glyph name="uni22A0" format="2">
   <advance width="1233"/>
   <unicode hex="22A0"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22A_1.glif b/source/Hack-Italic.ufo/glyphs/uni22A_1.glif
index 92956634d..bb6fb70d5 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22A_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22A_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22A1" format="1">
+<glyph name="uni22A1" format="2">
   <advance width="1233"/>
   <unicode hex="22A1"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22A_2.glif b/source/Hack-Italic.ufo/glyphs/uni22A_2.glif
index ff6f4772f..9e38ff04f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22A_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22A_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22A2" format="1">
+<glyph name="uni22A2" format="2">
   <advance width="1233"/>
   <unicode hex="22A2"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22A_3.glif b/source/Hack-Italic.ufo/glyphs/uni22A_3.glif
index f1ea1eb18..b942c2d55 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22A_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22A_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22A3" format="1">
+<glyph name="uni22A3" format="2">
   <advance width="1233"/>
   <unicode hex="22A3"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22A_4.glif b/source/Hack-Italic.ufo/glyphs/uni22A_4.glif
index 3976b0e9e..1974a9b0f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22A_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22A4" format="1">
+<glyph name="uni22A4" format="2">
   <advance width="1233"/>
   <unicode hex="22A4"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22B_2.glif b/source/Hack-Italic.ufo/glyphs/uni22B_2.glif
index aaa260d91..65e8332e5 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22B_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22B_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22B2" format="1">
+<glyph name="uni22B2" format="2">
   <advance width="1233"/>
   <unicode hex="22B2"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22B_3.glif b/source/Hack-Italic.ufo/glyphs/uni22B_3.glif
index 9babd93a9..61ae187df 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22B_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22B3" format="1">
+<glyph name="uni22B3" format="2">
   <advance width="1233"/>
   <unicode hex="22B3"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22B_4.glif b/source/Hack-Italic.ufo/glyphs/uni22B_4.glif
index 8444e673c..d0dab1a7d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22B_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22B_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22B4" format="1">
+<glyph name="uni22B4" format="2">
   <advance width="1233"/>
   <unicode hex="22B4"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22B_5.glif b/source/Hack-Italic.ufo/glyphs/uni22B_5.glif
index ca58abee0..362016c4a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22B_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22B_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22B5" format="1">
+<glyph name="uni22B5" format="2">
   <advance width="1233"/>
   <unicode hex="22B5"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22B_8.glif b/source/Hack-Italic.ufo/glyphs/uni22B_8.glif
index 80abd6c8c..3d6b3a27d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22B_8.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22B_8.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22B8" format="1">
+<glyph name="uni22B8" format="2">
   <advance width="1233"/>
   <unicode hex="22B8"/>
   <outline>
     <contour>
-      <point x="920" y="359" type="curve" name="hr00" smooth="yes"/>
+      <point x="920" y="359" type="curve" smooth="yes" name="hr00"/>
       <point x="759" y="359"/>
       <point x="671" y="474"/>
       <point x="647" y="558" type="curve" name="dv04"/>
@@ -13,21 +13,21 @@
       <point x="646" y="726" type="line" name="dv05"/>
       <point x="670" y="818"/>
       <point x="770" y="930"/>
-      <point x="920" y="930" type="curve" name="dv03" smooth="yes"/>
+      <point x="920" y="930" type="curve" smooth="yes" name="dv03"/>
       <point x="1081" y="930"/>
       <point x="1205" y="803"/>
-      <point x="1205" y="641" type="curve" name="dh02" smooth="yes"/>
+      <point x="1205" y="641" type="curve" smooth="yes" name="dh02"/>
       <point x="1205" y="481"/>
       <point x="1084" y="359"/>
     </contour>
     <contour>
-      <point x="920" y="507" type="curve" name="dv01" smooth="yes"/>
+      <point x="920" y="507" type="curve" smooth="yes" name="dv01"/>
       <point x="997" y="507"/>
       <point x="1057" y="567"/>
-      <point x="1057" y="643" type="curve" name="dh01" smooth="yes"/>
+      <point x="1057" y="643" type="curve" smooth="yes" name="dh01"/>
       <point x="1057" y="719"/>
       <point x="997" y="780"/>
-      <point x="921" y="780" type="curve" name="dv02" smooth="yes"/>
+      <point x="921" y="780" type="curve" smooth="yes" name="dv02"/>
       <point x="844" y="780"/>
       <point x="783" y="718"/>
       <point x="783" y="642" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22C_2.glif b/source/Hack-Italic.ufo/glyphs/uni22C_2.glif
index 27b252f75..7fa8538c0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22C_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22C_2.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22C2" format="1">
+<glyph name="uni22C2" format="2">
   <advance width="1233"/>
   <unicode hex="22C2"/>
   <outline>
     <contour>
-      <point x="131" y="1023" type="line" name="hr00" smooth="yes"/>
+      <point x="131" y="1023" type="line" smooth="yes" name="hr00"/>
       <point x="131" y="1418"/>
       <point x="269" y="1547"/>
-      <point x="616" y="1547" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1547" type="curve" smooth="yes" name="dv02"/>
       <point x="964" y="1547"/>
       <point x="1102" y="1418"/>
       <point x="1102" y="1023" type="curve" smooth="yes"/>
@@ -16,10 +16,10 @@
       <point x="930" y="978" type="line" smooth="yes"/>
       <point x="930" y="1303"/>
       <point x="837" y="1383"/>
-      <point x="616" y="1383" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1383" type="curve" smooth="yes" name="dv01"/>
       <point x="396" y="1383"/>
       <point x="303" y="1303"/>
-      <point x="303" y="978" type="curve" name="sh02" smooth="yes"/>
+      <point x="303" y="978" type="curve" smooth="yes" name="sh02"/>
       <point x="303" y="-436" type="line" name="av01"/>
       <point x="131" y="-436" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22C_3.glif b/source/Hack-Italic.ufo/glyphs/uni22C_3.glif
index 33b8b1523..4054e4cc1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22C_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22C_3.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22C3" format="1">
+<glyph name="uni22C3" format="2">
   <advance width="1233"/>
   <unicode hex="22C3"/>
   <outline>
     <contour>
-      <point x="617" y="-465" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-465" type="curve" smooth="yes" name="hr00"/>
       <point x="269" y="-465"/>
       <point x="131" y="-336"/>
-      <point x="131" y="59" type="curve" name="sh01" smooth="yes"/>
+      <point x="131" y="59" type="curve" smooth="yes" name="sh01"/>
       <point x="131" y="1518" type="line" name="at01"/>
       <point x="303" y="1518" type="line"/>
-      <point x="303" y="104" type="line" name="sh02" smooth="yes"/>
+      <point x="303" y="104" type="line" smooth="yes" name="sh02"/>
       <point x="303" y="-221"/>
       <point x="396" y="-301"/>
-      <point x="617" y="-301" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="-301" type="curve" smooth="yes" name="dv01"/>
       <point x="837" y="-301"/>
       <point x="930" y="-221"/>
-      <point x="930" y="104" type="curve" name="ah01" smooth="yes"/>
+      <point x="930" y="104" type="curve" smooth="yes" name="ah01"/>
       <point x="930" y="1518" type="line" name="at02"/>
       <point x="1102" y="1518" type="line"/>
-      <point x="1102" y="59" type="line" name="sh03" smooth="yes"/>
+      <point x="1102" y="59" type="line" smooth="yes" name="sh03"/>
       <point x="1102" y="-336"/>
       <point x="964" y="-465"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22C_4.glif b/source/Hack-Italic.ufo/glyphs/uni22C_4.glif
index 2c2cab31a..29294d33f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22C_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22C_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22C4" format="1">
+<glyph name="uni22C4" format="2">
   <advance width="1233"/>
   <unicode hex="22C4"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22C_6.glif b/source/Hack-Italic.ufo/glyphs/uni22C_6.glif
index 1d9dbbeb1..92117d79e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22C_6.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22C_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22C6" format="1">
+<glyph name="uni22C6" format="2">
   <advance width="1233"/>
   <unicode hex="22C6"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22C_D_.glif b/source/Hack-Italic.ufo/glyphs/uni22C_D_.glif
index afbac1685..791744329 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22C_D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22C_D_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22CD" format="1">
+<glyph name="uni22CD" format="2">
   <advance width="1233"/>
   <unicode hex="22CD"/>
   <outline>
     <contour>
-      <point x="383" y="674" type="curve" name="dv03" smooth="yes"/>
+      <point x="383" y="674" type="curve" smooth="yes" name="dv03"/>
       <point x="274" y="674"/>
       <point x="180" y="715"/>
       <point x="88" y="788" type="curve"/>
       <point x="88" y="963" type="line"/>
       <point x="188" y="879"/>
       <point x="275" y="840"/>
-      <point x="371" y="840" type="curve" name="dv04" smooth="yes"/>
+      <point x="371" y="840" type="curve" smooth="yes" name="dv04"/>
       <point x="443" y="840"/>
       <point x="505" y="862"/>
       <point x="578" y="894" type="curve"/>
@@ -20,17 +20,17 @@
       <point x="610" y="909" type="curve" smooth="yes"/>
       <point x="706" y="953"/>
       <point x="780" y="963"/>
-      <point x="840" y="963" type="curve" name="dv02" smooth="yes"/>
+      <point x="840" y="963" type="curve" smooth="yes" name="dv02"/>
       <point x="949" y="963"/>
       <point x="1041" y="928"/>
       <point x="1145" y="848" type="curve" name="hr01"/>
       <point x="1145" y="674" type="line" name="hr02"/>
       <point x="1041" y="765"/>
       <point x="951" y="797"/>
-      <point x="848" y="797" type="curve" name="dv01" smooth="yes"/>
+      <point x="848" y="797" type="curve" smooth="yes" name="dv01"/>
       <point x="765" y="797"/>
       <point x="711" y="776"/>
-      <point x="621" y="739" type="curve" name="hr03" smooth="yes"/>
+      <point x="621" y="739" type="curve" smooth="yes" name="hr03"/>
       <point x="588" y="725" type="line" smooth="yes"/>
       <point x="507" y="690"/>
       <point x="455" y="674"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22C_E_.glif b/source/Hack-Italic.ufo/glyphs/uni22C_E_.glif
index d0e793f63..150b7bba6 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22C_E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22C_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22CE" format="1">
+<glyph name="uni22CE" format="2">
   <advance width="1233"/>
   <unicode hex="22CE"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22C_F_.glif b/source/Hack-Italic.ufo/glyphs/uni22C_F_.glif
index 982defd88..d74dfb67e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22C_F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22C_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22CF" format="1">
+<glyph name="uni22CF" format="2">
   <advance width="1233"/>
   <unicode hex="22CF"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22D_0.glif b/source/Hack-Italic.ufo/glyphs/uni22D_0.glif
index f176dc061..f4f66a140 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22D_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22D_0.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22D0" format="1">
+<glyph name="uni22D0" format="2">
   <advance width="1233"/>
   <unicode hex="22D0"/>
   <outline>
     <contour>
-      <point x="738" y="-6" type="line" name="hr00" smooth="yes"/>
+      <point x="738" y="-6" type="line" smooth="yes" name="hr00"/>
       <point x="378" y="-6"/>
       <point x="90" y="282"/>
-      <point x="90" y="642" type="curve" name="sh01" smooth="yes"/>
+      <point x="90" y="642" type="curve" smooth="yes" name="sh01"/>
       <point x="90" y="1000"/>
       <point x="375" y="1290"/>
       <point x="736" y="1290" type="curve" smooth="yes"/>
@@ -16,18 +16,18 @@
       <point x="737" y="1120" type="line" smooth="yes"/>
       <point x="470" y="1120"/>
       <point x="260" y="907"/>
-      <point x="260" y="642" type="curve" name="sh02" smooth="yes"/>
+      <point x="260" y="642" type="curve" smooth="yes" name="sh02"/>
       <point x="260" y="376"/>
       <point x="470" y="164"/>
-      <point x="738" y="164" type="curve" name="sv01" smooth="yes"/>
+      <point x="738" y="164" type="curve" smooth="yes" name="sv01"/>
       <point x="1143" y="164" type="line"/>
       <point x="1143" y="-6" type="line"/>
     </contour>
     <contour>
-      <point x="737" y="334" type="line" name="dv03" smooth="yes"/>
+      <point x="737" y="334" type="line" smooth="yes" name="dv03"/>
       <point x="566" y="334"/>
       <point x="430" y="470"/>
-      <point x="430" y="642" type="curve" name="ah01" smooth="yes"/>
+      <point x="430" y="642" type="curve" smooth="yes" name="ah01"/>
       <point x="430" y="813"/>
       <point x="565" y="950"/>
       <point x="737" y="950" type="curve" smooth="yes"/>
@@ -36,10 +36,10 @@
       <point x="738" y="780" type="line" smooth="yes"/>
       <point x="661" y="780"/>
       <point x="600" y="718"/>
-      <point x="600" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="600" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="600" y="565"/>
       <point x="661" y="504"/>
-      <point x="738" y="504" type="curve" name="dv04" smooth="yes"/>
+      <point x="738" y="504" type="curve" smooth="yes" name="dv04"/>
       <point x="1143" y="504" type="line"/>
       <point x="1143" y="334" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22D_1.glif b/source/Hack-Italic.ufo/glyphs/uni22D_1.glif
index 56260615e..93eb45bb1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22D_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22D_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22D1" format="1">
+<glyph name="uni22D1" format="2">
   <advance width="1233"/>
   <unicode hex="22D1"/>
   <outline>
@@ -8,39 +8,39 @@
       <point x="496" y="164" type="line" smooth="yes"/>
       <point x="763" y="164"/>
       <point x="973" y="377"/>
-      <point x="973" y="643" type="curve" name="ah01" smooth="yes"/>
+      <point x="973" y="643" type="curve" smooth="yes" name="ah01"/>
       <point x="973" y="907"/>
       <point x="763" y="1120"/>
-      <point x="495" y="1120" type="curve" name="dv01" smooth="yes"/>
+      <point x="495" y="1120" type="curve" smooth="yes" name="dv01"/>
       <point x="90" y="1120" type="line"/>
       <point x="90" y="1290" type="line"/>
-      <point x="495" y="1290" type="line" name="dv02" smooth="yes"/>
+      <point x="495" y="1290" type="line" smooth="yes" name="dv02"/>
       <point x="855" y="1290"/>
       <point x="1143" y="1002"/>
-      <point x="1143" y="642" type="curve" name="sh01" smooth="yes"/>
+      <point x="1143" y="642" type="curve" smooth="yes" name="sh01"/>
       <point x="1143" y="284"/>
       <point x="858" y="-6"/>
-      <point x="497" y="-6" type="curve" name="ab01" smooth="yes"/>
+      <point x="497" y="-6" type="curve" smooth="yes" name="ab01"/>
       <point x="90" y="-6" type="line"/>
     </contour>
     <contour>
       <point x="90" y="504" type="line"/>
-      <point x="495" y="504" type="line" name="dv04" smooth="yes"/>
+      <point x="495" y="504" type="line" smooth="yes" name="dv04"/>
       <point x="572" y="504"/>
       <point x="633" y="566"/>
-      <point x="633" y="642" type="curve" name="sh02" smooth="yes"/>
+      <point x="633" y="642" type="curve" smooth="yes" name="sh02"/>
       <point x="633" y="719"/>
       <point x="572" y="780"/>
-      <point x="495" y="780" type="curve" name="dv05" smooth="yes"/>
+      <point x="495" y="780" type="curve" smooth="yes" name="dv05"/>
       <point x="90" y="780" type="line"/>
       <point x="90" y="950" type="line"/>
-      <point x="496" y="950" type="line" name="dv06" smooth="yes"/>
+      <point x="496" y="950" type="line" smooth="yes" name="dv06"/>
       <point x="667" y="950"/>
       <point x="803" y="814"/>
-      <point x="803" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="803" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="803" y="471"/>
       <point x="668" y="334"/>
-      <point x="496" y="334" type="curve" name="dv03" smooth="yes"/>
+      <point x="496" y="334" type="curve" smooth="yes" name="dv03"/>
       <point x="90" y="334" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22D_A_.glif b/source/Hack-Italic.ufo/glyphs/uni22D_A_.glif
index 85ddd7c53..240c71b1c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22D_A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22D_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22DA" format="1">
+<glyph name="uni22DA" format="2">
   <advance width="1233"/>
   <unicode hex="22DA"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22D_B_.glif b/source/Hack-Italic.ufo/glyphs/uni22D_B_.glif
index a213ab447..a029c0f6d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22D_B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22D_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22DB" format="1">
+<glyph name="uni22DB" format="2">
   <advance width="1233"/>
   <unicode hex="22DB"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22D_C_.glif b/source/Hack-Italic.ufo/glyphs/uni22D_C_.glif
index 037d47290..b7d7d0499 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22D_C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22D_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22DC" format="1">
+<glyph name="uni22DC" format="2">
   <advance width="1233"/>
   <unicode hex="22DC"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22D_D_.glif b/source/Hack-Italic.ufo/glyphs/uni22D_D_.glif
index c2ed23094..fb833a570 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22D_D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22D_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22DD" format="1">
+<glyph name="uni22DD" format="2">
   <advance width="1233"/>
   <unicode hex="22DD"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22D_E_.glif b/source/Hack-Italic.ufo/glyphs/uni22D_E_.glif
index faca91597..c5635df31 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22D_E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22D_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22DE" format="1">
+<glyph name="uni22DE" format="2">
   <advance width="1233"/>
   <unicode hex="22DE"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22D_F_.glif b/source/Hack-Italic.ufo/glyphs/uni22D_F_.glif
index 7f2b08de4..131cd13b5 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22D_F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22D_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22DF" format="1">
+<glyph name="uni22DF" format="2">
   <advance width="1233"/>
   <unicode hex="22DF"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22E_0.glif b/source/Hack-Italic.ufo/glyphs/uni22E_0.glif
index e795b31c1..bbf01eace 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22E_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22E_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E0" format="1">
+<glyph name="uni22E0" format="2">
   <advance width="1233"/>
   <unicode hex="22E0"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22E_1.glif b/source/Hack-Italic.ufo/glyphs/uni22E_1.glif
index 54335cff3..ba790182f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22E_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22E_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E1" format="1">
+<glyph name="uni22E1" format="2">
   <advance width="1233"/>
   <unicode hex="22E1"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22E_2.glif b/source/Hack-Italic.ufo/glyphs/uni22E_2.glif
index a8b1e8a74..2de8abb7d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22E_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22E_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E2" format="1">
+<glyph name="uni22E2" format="2">
   <advance width="1233"/>
   <unicode hex="22E2"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22E_3.glif b/source/Hack-Italic.ufo/glyphs/uni22E_3.glif
index 900ac83eb..b80d8c304 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22E_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22E_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E3" format="1">
+<glyph name="uni22E3" format="2">
   <advance width="1233"/>
   <unicode hex="22E3"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22E_4.glif b/source/Hack-Italic.ufo/glyphs/uni22E_4.glif
index 061d76e37..ba1c08b12 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22E_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22E_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E4" format="1">
+<glyph name="uni22E4" format="2">
   <advance width="1233"/>
   <unicode hex="22E4"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22E_5.glif b/source/Hack-Italic.ufo/glyphs/uni22E_5.glif
index ae32d8fd5..b7a5c5807 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22E_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22E_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E5" format="1">
+<glyph name="uni22E5" format="2">
   <advance width="1233"/>
   <unicode hex="22E5"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22E_6.glif b/source/Hack-Italic.ufo/glyphs/uni22E_6.glif
index b5e693239..5990c367c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22E_6.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22E_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E6" format="1">
+<glyph name="uni22E6" format="2">
   <advance width="1233"/>
   <unicode hex="22E6"/>
   <outline>
@@ -11,14 +11,14 @@
       <point x="482" y="67" type="curve" smooth="yes"/>
       <point x="447" y="75"/>
       <point x="412" y="79"/>
-      <point x="379" y="79" type="curve" name="dv03" smooth="yes"/>
+      <point x="379" y="79" type="curve" smooth="yes" name="dv03"/>
       <point x="274" y="79"/>
       <point x="183" y="41"/>
       <point x="86" y="-44" type="curve" name="hr01"/>
       <point x="86" y="130" type="line" name="hr02"/>
       <point x="190" y="210"/>
       <point x="282" y="245"/>
-      <point x="391" y="245" type="curve" name="dv04" smooth="yes"/>
+      <point x="391" y="245" type="curve" smooth="yes" name="dv04"/>
       <point x="471" y="245"/>
       <point x="531" y="227"/>
       <point x="570" y="211" type="curve"/>
@@ -34,14 +34,14 @@
       <point x="701" y="156" type="line" name="hr03"/>
       <point x="759" y="133"/>
       <point x="813" y="122"/>
-      <point x="862" y="122" type="curve" name="dv02" smooth="yes"/>
+      <point x="862" y="122" type="curve" smooth="yes" name="dv02"/>
       <point x="955" y="122"/>
       <point x="1043" y="161"/>
       <point x="1143" y="245" type="curve" name="hr04"/>
       <point x="1143" y="70" type="line" name="hr05"/>
       <point x="1051" y="-3"/>
       <point x="956" y="-44"/>
-      <point x="851" y="-44" type="curve" name="dv01" smooth="yes"/>
+      <point x="851" y="-44" type="curve" smooth="yes" name="dv01"/>
       <point x="790" y="-44"/>
       <point x="733" y="-30"/>
       <point x="665" y="-3" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22E_7.glif b/source/Hack-Italic.ufo/glyphs/uni22E_7.glif
index 15cac593b..5dd9a5016 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22E_7.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22E_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E7" format="1">
+<glyph name="uni22E7" format="2">
   <advance width="1233"/>
   <unicode hex="22E7"/>
   <outline>
@@ -11,14 +11,14 @@
       <point x="482" y="67" type="curve" smooth="yes"/>
       <point x="447" y="75"/>
       <point x="412" y="79"/>
-      <point x="379" y="79" type="curve" name="dv03" smooth="yes"/>
+      <point x="379" y="79" type="curve" smooth="yes" name="dv03"/>
       <point x="274" y="79"/>
       <point x="183" y="41"/>
       <point x="86" y="-44" type="curve" name="hr01"/>
       <point x="86" y="130" type="line" name="hr02"/>
       <point x="190" y="210"/>
       <point x="282" y="245"/>
-      <point x="391" y="245" type="curve" name="dv04" smooth="yes"/>
+      <point x="391" y="245" type="curve" smooth="yes" name="dv04"/>
       <point x="471" y="245"/>
       <point x="531" y="227"/>
       <point x="570" y="211" type="curve"/>
@@ -35,14 +35,14 @@
       <point x="701" y="156" type="line" name="hr03"/>
       <point x="759" y="133"/>
       <point x="813" y="122"/>
-      <point x="862" y="122" type="curve" name="dv02" smooth="yes"/>
+      <point x="862" y="122" type="curve" smooth="yes" name="dv02"/>
       <point x="955" y="122"/>
       <point x="1043" y="161"/>
       <point x="1143" y="245" type="curve" name="hr04"/>
       <point x="1143" y="70" type="line" name="hr05"/>
       <point x="1051" y="-3"/>
       <point x="956" y="-44"/>
-      <point x="851" y="-44" type="curve" name="dv01" smooth="yes"/>
+      <point x="851" y="-44" type="curve" smooth="yes" name="dv01"/>
       <point x="790" y="-44"/>
       <point x="733" y="-30"/>
       <point x="665" y="-3" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22E_8.glif b/source/Hack-Italic.ufo/glyphs/uni22E_8.glif
index 8504edb4d..065f71aa5 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22E_8.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22E_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E8" format="1">
+<glyph name="uni22E8" format="2">
   <advance width="1233"/>
   <unicode hex="22E8"/>
   <outline>
@@ -28,14 +28,14 @@
       <point x="482" y="-3" type="curve" smooth="yes"/>
       <point x="447" y="5"/>
       <point x="412" y="9"/>
-      <point x="379" y="9" type="curve" name="hr03" smooth="yes"/>
+      <point x="379" y="9" type="curve" smooth="yes" name="hr03"/>
       <point x="274" y="9"/>
       <point x="183" y="-29"/>
       <point x="86" y="-114" type="curve" name="iv02"/>
       <point x="86" y="60" type="line" name="hr04"/>
       <point x="190" y="140"/>
       <point x="282" y="175"/>
-      <point x="390" y="175" type="curve" name="hr05" smooth="yes"/>
+      <point x="390" y="175" type="curve" smooth="yes" name="hr05"/>
       <point x="466" y="175"/>
       <point x="531" y="157"/>
       <point x="570" y="141" type="curve"/>
@@ -44,14 +44,14 @@
       <point x="701" y="86" type="line"/>
       <point x="759" y="63"/>
       <point x="813" y="52"/>
-      <point x="862" y="52" type="curve" name="dv02" smooth="yes"/>
+      <point x="862" y="52" type="curve" smooth="yes" name="dv02"/>
       <point x="955" y="52"/>
       <point x="1043" y="91"/>
       <point x="1143" y="175" type="curve" name="iv03"/>
       <point x="1143" y="0" type="line"/>
       <point x="1051" y="-73"/>
       <point x="956" y="-114"/>
-      <point x="851" y="-114" type="curve" name="dv01" smooth="yes"/>
+      <point x="851" y="-114" type="curve" smooth="yes" name="dv01"/>
       <point x="790" y="-114"/>
       <point x="733" y="-100"/>
       <point x="665" y="-73" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22E_9.glif b/source/Hack-Italic.ufo/glyphs/uni22E_9.glif
index 79bbc18bd..160d1ab0f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22E_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22E_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E9" format="1">
+<glyph name="uni22E9" format="2">
   <advance width="1233"/>
   <unicode hex="22E9"/>
   <outline>
@@ -28,14 +28,14 @@
       <point x="482" y="-3" type="curve" smooth="yes"/>
       <point x="447" y="5"/>
       <point x="412" y="9"/>
-      <point x="379" y="9" type="curve" name="hr03" smooth="yes"/>
+      <point x="379" y="9" type="curve" smooth="yes" name="hr03"/>
       <point x="274" y="9"/>
       <point x="183" y="-29"/>
       <point x="86" y="-114" type="curve" name="iv03"/>
       <point x="86" y="60" type="line" name="hr04"/>
       <point x="190" y="140"/>
       <point x="282" y="175"/>
-      <point x="390" y="175" type="curve" name="hr05" smooth="yes"/>
+      <point x="390" y="175" type="curve" smooth="yes" name="hr05"/>
       <point x="466" y="175"/>
       <point x="531" y="157"/>
       <point x="570" y="141" type="curve"/>
@@ -44,14 +44,14 @@
       <point x="701" y="86" type="line"/>
       <point x="759" y="63"/>
       <point x="813" y="52"/>
-      <point x="862" y="52" type="curve" name="dv02" smooth="yes"/>
+      <point x="862" y="52" type="curve" smooth="yes" name="dv02"/>
       <point x="955" y="52"/>
       <point x="1043" y="91"/>
       <point x="1143" y="175" type="curve" name="iv04"/>
       <point x="1143" y="0" type="line"/>
       <point x="1051" y="-73"/>
       <point x="956" y="-114"/>
-      <point x="851" y="-114" type="curve" name="dv01" smooth="yes"/>
+      <point x="851" y="-114" type="curve" smooth="yes" name="dv01"/>
       <point x="790" y="-114"/>
       <point x="733" y="-100"/>
       <point x="665" y="-73" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni22E_F_.glif b/source/Hack-Italic.ufo/glyphs/uni22E_F_.glif
index bf3221374..546719ed4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni22E_F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni22E_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22EF" format="1">
+<glyph name="uni22EF" format="2">
   <advance width="1233"/>
   <unicode hex="22EF"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2304.glif b/source/Hack-Italic.ufo/glyphs/uni2304.glif
index 8f4b4c116..726565437 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2304.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2304.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2304" format="1">
+<glyph name="uni2304" format="2">
   <advance width="1233"/>
   <unicode hex="2304"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2308.glif b/source/Hack-Italic.ufo/glyphs/uni2308.glif
index 359c866be..536a2104c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2308.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2308.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2308" format="1">
+<glyph name="uni2308" format="2">
   <advance width="1233"/>
   <unicode hex="2308"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2309.glif b/source/Hack-Italic.ufo/glyphs/uni2309.glif
index 19fc71ff6..d3acf72df 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2309.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2309.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2309" format="1">
+<glyph name="uni2309" format="2">
   <advance width="1233"/>
   <unicode hex="2309"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni230A_.glif b/source/Hack-Italic.ufo/glyphs/uni230A_.glif
index 6f0ebbf6c..726c2cbd9 100644
--- a/source/Hack-Italic.ufo/glyphs/uni230A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni230A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni230A" format="1">
+<glyph name="uni230A" format="2">
   <advance width="1233"/>
   <unicode hex="230A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni230B_.glif b/source/Hack-Italic.ufo/glyphs/uni230B_.glif
index e1dd988be..17b80da00 100644
--- a/source/Hack-Italic.ufo/glyphs/uni230B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni230B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni230B" format="1">
+<glyph name="uni230B" format="2">
   <advance width="1233"/>
   <unicode hex="230B"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni239B_.glif b/source/Hack-Italic.ufo/glyphs/uni239B_.glif
index 8e7a286f5..92dd2709d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni239B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni239B_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni239B" format="1">
+<glyph name="uni239B" format="2">
   <advance width="1233"/>
   <unicode hex="239B"/>
   <outline>
     <contour>
-      <point x="280" y="-294" type="line" name="hr00" smooth="yes"/>
+      <point x="280" y="-294" type="line" smooth="yes" name="hr00"/>
       <point x="280" y="930"/>
       <point x="571" y="1581"/>
       <point x="792" y="1926" type="curve" name="av02"/>
       <point x="952" y="1926" type="line"/>
       <point x="604" y="1227"/>
       <point x="475" y="755"/>
-      <point x="475" y="-294" type="curve" name="dh01" smooth="yes"/>
+      <point x="475" y="-294" type="curve" smooth="yes" name="dh01"/>
       <point x="475" y="-528" type="line" name="av01"/>
       <point x="280" y="-528" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni239C_.glif b/source/Hack-Italic.ufo/glyphs/uni239C_.glif
index e0b7ac215..b7089d0e0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni239C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni239C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni239C" format="1">
+<glyph name="uni239C" format="2">
   <advance width="1233"/>
   <unicode hex="239C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni239D_.glif b/source/Hack-Italic.ufo/glyphs/uni239D_.glif
index 49f77229b..84c78c9eb 100644
--- a/source/Hack-Italic.ufo/glyphs/uni239D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni239D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni239D" format="1">
+<glyph name="uni239D" format="2">
   <advance width="1233"/>
   <unicode hex="239D"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="792" y="-492" type="line" name="hr00"/>
       <point x="515" y="-58"/>
       <point x="280" y="603"/>
-      <point x="280" y="1695" type="curve" name="dh01" smooth="yes"/>
+      <point x="280" y="1695" type="curve" smooth="yes" name="dh01"/>
       <point x="280" y="1929" type="line" name="av01"/>
       <point x="475" y="1929" type="line"/>
-      <point x="475" y="1695" type="line" name="dh02" smooth="yes"/>
+      <point x="475" y="1695" type="line" smooth="yes" name="dh02"/>
       <point x="475" y="551"/>
       <point x="680" y="56"/>
       <point x="952" y="-492" type="curve" name="ab01"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni239E_.glif b/source/Hack-Italic.ufo/glyphs/uni239E_.glif
index 02febe357..0238c93ef 100644
--- a/source/Hack-Italic.ufo/glyphs/uni239E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni239E_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni239E" format="1">
+<glyph name="uni239E" format="2">
   <advance width="1233"/>
   <unicode hex="239E"/>
   <outline>
     <contour>
-      <point x="758" y="-294" type="line" name="hr00" smooth="yes"/>
+      <point x="758" y="-294" type="line" smooth="yes" name="hr00"/>
       <point x="758" y="755"/>
       <point x="629" y="1227"/>
       <point x="281" y="1926" type="curve" name="av02"/>
       <point x="441" y="1926" type="line"/>
       <point x="662" y="1581"/>
       <point x="953" y="930"/>
-      <point x="953" y="-294" type="curve" name="dh01" smooth="yes"/>
+      <point x="953" y="-294" type="curve" smooth="yes" name="dh01"/>
       <point x="953" y="-528" type="line" name="av01"/>
       <point x="758" y="-528" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni239F_.glif b/source/Hack-Italic.ufo/glyphs/uni239F_.glif
index cea8d54c2..07510cfc1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni239F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni239F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni239F" format="1">
+<glyph name="uni239F" format="2">
   <advance width="1233"/>
   <unicode hex="239F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni23A_0.glif b/source/Hack-Italic.ufo/glyphs/uni23A_0.glif
index db90ae765..8a823ea5a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni23A_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni23A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A0" format="1">
+<glyph name="uni23A0" format="2">
   <advance width="1233"/>
   <unicode hex="23A0"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="281" y="-492" type="line" name="hr00"/>
       <point x="553" y="56"/>
       <point x="758" y="551"/>
-      <point x="758" y="1695" type="curve" name="dh01" smooth="yes"/>
+      <point x="758" y="1695" type="curve" smooth="yes" name="dh01"/>
       <point x="758" y="1929" type="line" name="av01"/>
       <point x="953" y="1929" type="line"/>
-      <point x="953" y="1695" type="line" name="dh02" smooth="yes"/>
+      <point x="953" y="1695" type="line" smooth="yes" name="dh02"/>
       <point x="953" y="603"/>
       <point x="718" y="-58"/>
       <point x="441" y="-492" type="curve" name="ab01"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni23A_1.glif b/source/Hack-Italic.ufo/glyphs/uni23A_1.glif
index 9e2770007..89c7ab99c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni23A_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni23A_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A1" format="1">
+<glyph name="uni23A1" format="2">
   <advance width="1233"/>
   <unicode hex="23A1"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni23A_2.glif b/source/Hack-Italic.ufo/glyphs/uni23A_2.glif
index cbc6807f3..0fa4ae110 100644
--- a/source/Hack-Italic.ufo/glyphs/uni23A_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni23A_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A2" format="1">
+<glyph name="uni23A2" format="2">
   <advance width="1233"/>
   <unicode hex="23A2"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni23A_3.glif b/source/Hack-Italic.ufo/glyphs/uni23A_3.glif
index 6de0a516e..df508981f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni23A_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni23A_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A3" format="1">
+<glyph name="uni23A3" format="2">
   <advance width="1233"/>
   <unicode hex="23A3"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni23A_4.glif b/source/Hack-Italic.ufo/glyphs/uni23A_4.glif
index 350891111..faf1762f0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni23A_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni23A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A4" format="1">
+<glyph name="uni23A4" format="2">
   <advance width="1233"/>
   <unicode hex="23A4"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni23A_5.glif b/source/Hack-Italic.ufo/glyphs/uni23A_5.glif
index a76e4b4de..f340d4859 100644
--- a/source/Hack-Italic.ufo/glyphs/uni23A_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni23A_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A5" format="1">
+<glyph name="uni23A5" format="2">
   <advance width="1233"/>
   <unicode hex="23A5"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni23A_6.glif b/source/Hack-Italic.ufo/glyphs/uni23A_6.glif
index fe1059209..7096df932 100644
--- a/source/Hack-Italic.ufo/glyphs/uni23A_6.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni23A_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A6" format="1">
+<glyph name="uni23A6" format="2">
   <advance width="1233"/>
   <unicode hex="23A6"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni23A_7.glif b/source/Hack-Italic.ufo/glyphs/uni23A_7.glif
index 50c46c41f..2d6f634bb 100644
--- a/source/Hack-Italic.ufo/glyphs/uni23A_7.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni23A_7.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A7" format="1">
+<glyph name="uni23A7" format="2">
   <advance width="1233"/>
   <unicode hex="23A7"/>
   <outline>
     <contour>
-      <point x="524" y="1375" type="line" name="hr00" smooth="yes"/>
+      <point x="524" y="1375" type="line" smooth="yes" name="hr00"/>
       <point x="524" y="1672"/>
       <point x="694" y="1901"/>
       <point x="942" y="1901" type="curve" smooth="yes"/>
@@ -13,7 +13,7 @@
       <point x="936" y="1725" type="line" smooth="yes"/>
       <point x="801" y="1725"/>
       <point x="710" y="1586"/>
-      <point x="710" y="1383" type="curve" name="dh01" smooth="yes"/>
+      <point x="710" y="1383" type="curve" smooth="yes" name="dh01"/>
       <point x="710" y="-534" type="line" name="av01"/>
       <point x="524" y="-534" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni23A_8.glif b/source/Hack-Italic.ufo/glyphs/uni23A_8.glif
index 1312d9637..95da4ea65 100644
--- a/source/Hack-Italic.ufo/glyphs/uni23A_8.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni23A_8.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A8" format="1">
+<glyph name="uni23A8" format="2">
   <advance width="1233"/>
   <unicode hex="23A8"/>
   <outline>
     <contour>
-      <point x="524" y="8" type="line" name="hr00" smooth="yes"/>
+      <point x="524" y="8" type="line" smooth="yes" name="hr00"/>
       <point x="524" y="598"/>
       <point x="425" y="603"/>
-      <point x="78" y="611" type="curve" name="dv01" smooth="yes"/>
+      <point x="78" y="611" type="curve" smooth="yes" name="dv01"/>
       <point x="17" y="612" type="line"/>
       <point x="17" y="799" type="line"/>
-      <point x="78" y="799" type="line" name="dv02" smooth="yes"/>
+      <point x="78" y="799" type="line" smooth="yes" name="dv02"/>
       <point x="423" y="799"/>
       <point x="524" y="822"/>
-      <point x="524" y="1402" type="curve" name="sh01" smooth="yes"/>
+      <point x="524" y="1402" type="curve" smooth="yes" name="sh01"/>
       <point x="524" y="1926" type="line" name="av02"/>
       <point x="710" y="1926" type="line" name="sh02"/>
       <point x="710" y="1390" type="line" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="609" y="612" type="curve" smooth="yes"/>
       <point x="674" y="513"/>
       <point x="710" y="325"/>
-      <point x="710" y="20" type="curve" name="dh01" smooth="yes"/>
+      <point x="710" y="20" type="curve" smooth="yes" name="dh01"/>
       <point x="710" y="-516" type="line" name="av01"/>
       <point x="524" y="-516" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni23A_9.glif b/source/Hack-Italic.ufo/glyphs/uni23A_9.glif
index 55509b4db..f767e574e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni23A_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni23A_9.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A9" format="1">
+<glyph name="uni23A9" format="2">
   <advance width="1233"/>
   <unicode hex="23A9"/>
   <outline>
     <contour>
-      <point x="942" y="-492" type="line" name="hr00" smooth="yes"/>
+      <point x="942" y="-492" type="line" smooth="yes" name="hr00"/>
       <point x="698" y="-492"/>
       <point x="524" y="-266"/>
-      <point x="524" y="34" type="curve" name="dh01" smooth="yes"/>
+      <point x="524" y="34" type="curve" smooth="yes" name="dh01"/>
       <point x="524" y="1926" type="line" name="av01"/>
       <point x="710" y="1926" type="line"/>
-      <point x="710" y="26" type="line" name="dh02" smooth="yes"/>
+      <point x="710" y="26" type="line" smooth="yes" name="dh02"/>
       <point x="710" y="-179"/>
       <point x="801" y="-316"/>
-      <point x="936" y="-316" type="curve" name="sv01" smooth="yes"/>
+      <point x="936" y="-316" type="curve" smooth="yes" name="sv01"/>
       <point x="1217" y="-316" type="line" name="sv02"/>
       <point x="1217" y="-492" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni23A_A_.glif b/source/Hack-Italic.ufo/glyphs/uni23A_A_.glif
index 7342b0790..27a6b3aac 100644
--- a/source/Hack-Italic.ufo/glyphs/uni23A_A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni23A_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23AA" format="1">
+<glyph name="uni23AA" format="2">
   <advance width="1233"/>
   <unicode hex="23AA"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni23A_B_.glif b/source/Hack-Italic.ufo/glyphs/uni23A_B_.glif
index c79ce929f..d37835bcc 100644
--- a/source/Hack-Italic.ufo/glyphs/uni23A_B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni23A_B_.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23AB" format="1">
+<glyph name="uni23AB" format="2">
   <advance width="1233"/>
   <unicode hex="23AB"/>
   <outline>
     <contour>
-      <point x="523" y="1383" type="line" name="hr00" smooth="yes"/>
+      <point x="523" y="1383" type="line" smooth="yes" name="hr00"/>
       <point x="523" y="1586"/>
       <point x="432" y="1725"/>
-      <point x="297" y="1725" type="curve" name="dv01" smooth="yes"/>
+      <point x="297" y="1725" type="curve" smooth="yes" name="dv01"/>
       <point x="16" y="1725" type="line"/>
       <point x="16" y="1901" type="line"/>
-      <point x="291" y="1901" type="line" name="dv02" smooth="yes"/>
+      <point x="291" y="1901" type="line" smooth="yes" name="dv02"/>
       <point x="539" y="1901"/>
       <point x="709" y="1672"/>
-      <point x="709" y="1375" type="curve" name="dh01" smooth="yes"/>
+      <point x="709" y="1375" type="curve" smooth="yes" name="dh01"/>
       <point x="709" y="-534" type="line" name="av01"/>
       <point x="523" y="-534" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni23A_C_.glif b/source/Hack-Italic.ufo/glyphs/uni23A_C_.glif
index 4e8489ef1..4d92070eb 100644
--- a/source/Hack-Italic.ufo/glyphs/uni23A_C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni23A_C_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23AC" format="1">
+<glyph name="uni23AC" format="2">
   <advance width="1233"/>
   <unicode hex="23AC"/>
   <outline>
     <contour>
-      <point x="523" y="20" type="line" name="hr00" smooth="yes"/>
+      <point x="523" y="20" type="line" smooth="yes" name="hr00"/>
       <point x="523" y="325"/>
       <point x="557" y="513"/>
       <point x="624" y="612" type="curve" smooth="yes"/>
@@ -16,19 +16,19 @@
       <point x="624" y="798" type="curve" smooth="yes"/>
       <point x="557" y="899"/>
       <point x="523" y="1097"/>
-      <point x="523" y="1390" type="curve" name="sh01" smooth="yes"/>
+      <point x="523" y="1390" type="curve" smooth="yes" name="sh01"/>
       <point x="523" y="1926" type="line" name="av02"/>
       <point x="709" y="1926" type="line" name="sh02"/>
       <point x="709" y="1402" type="line" smooth="yes"/>
       <point x="709" y="822"/>
       <point x="810" y="799"/>
-      <point x="1155" y="799" type="curve" name="dv02" smooth="yes"/>
+      <point x="1155" y="799" type="curve" smooth="yes" name="dv02"/>
       <point x="1216" y="799" type="line"/>
       <point x="1216" y="612" type="line"/>
-      <point x="1155" y="611" type="line" name="dv01" smooth="yes"/>
+      <point x="1155" y="611" type="line" smooth="yes" name="dv01"/>
       <point x="808" y="603"/>
       <point x="709" y="598"/>
-      <point x="709" y="8" type="curve" name="dh01" smooth="yes"/>
+      <point x="709" y="8" type="curve" smooth="yes" name="dh01"/>
       <point x="709" y="-516" type="line" name="av01"/>
       <point x="523" y="-516" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni23A_D_.glif b/source/Hack-Italic.ufo/glyphs/uni23A_D_.glif
index 6b59fb48a..1939a626a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni23A_D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni23A_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23AD" format="1">
+<glyph name="uni23AD" format="2">
   <advance width="1233"/>
   <unicode hex="23AD"/>
   <outline>
@@ -8,13 +8,13 @@
       <point x="297" y="-316" type="line" smooth="yes"/>
       <point x="432" y="-316"/>
       <point x="523" y="-179"/>
-      <point x="523" y="26" type="curve" name="dh01" smooth="yes"/>
+      <point x="523" y="26" type="curve" smooth="yes" name="dh01"/>
       <point x="523" y="1926" type="line" name="av01"/>
       <point x="709" y="1926" type="line"/>
-      <point x="709" y="34" type="line" name="dh02" smooth="yes"/>
+      <point x="709" y="34" type="line" smooth="yes" name="dh02"/>
       <point x="709" y="-266"/>
       <point x="535" y="-492"/>
-      <point x="291" y="-492" type="curve" name="ab01" smooth="yes"/>
+      <point x="291" y="-492" type="curve" smooth="yes" name="ab01"/>
       <point x="16" y="-492" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni23A_E_.glif b/source/Hack-Italic.ufo/glyphs/uni23A_E_.glif
index 73fada53a..832e4acef 100644
--- a/source/Hack-Italic.ufo/glyphs/uni23A_E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni23A_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23AE" format="1">
+<glyph name="uni23AE" format="2">
   <advance width="1233"/>
   <unicode hex="23AE"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2500.glif b/source/Hack-Italic.ufo/glyphs/uni2500.glif
index 73488f5b9..4c3c724bd 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2500.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2500.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2500" format="1">
+<glyph name="uni2500" format="2">
   <advance width="1233"/>
   <unicode hex="2500"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2501.glif b/source/Hack-Italic.ufo/glyphs/uni2501.glif
index 407b806a5..b4b7c57cb 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2501.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2501.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2501" format="1">
+<glyph name="uni2501" format="2">
   <advance width="1233"/>
   <unicode hex="2501"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2502.glif b/source/Hack-Italic.ufo/glyphs/uni2502.glif
index fa8872f18..13a2c6442 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2502.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2502.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2502" format="1">
+<glyph name="uni2502" format="2">
   <advance width="1233"/>
   <unicode hex="2502"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2503.glif b/source/Hack-Italic.ufo/glyphs/uni2503.glif
index 0e067d62b..1e6d150a4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2503.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2503.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2503" format="1">
+<glyph name="uni2503" format="2">
   <advance width="1233"/>
   <unicode hex="2503"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2504.glif b/source/Hack-Italic.ufo/glyphs/uni2504.glif
index d50a36d0e..5d4329be7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2504.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2504.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2504" format="1">
+<glyph name="uni2504" format="2">
   <advance width="1233"/>
   <unicode hex="2504"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2505.glif b/source/Hack-Italic.ufo/glyphs/uni2505.glif
index 5ba7c8463..754eec4a6 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2505.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2505.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2505" format="1">
+<glyph name="uni2505" format="2">
   <advance width="1233"/>
   <unicode hex="2505"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2506.glif b/source/Hack-Italic.ufo/glyphs/uni2506.glif
index 5efa3b8d6..f78770484 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2506.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2506.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2506" format="1">
+<glyph name="uni2506" format="2">
   <advance width="1233"/>
   <unicode hex="2506"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2507.glif b/source/Hack-Italic.ufo/glyphs/uni2507.glif
index 5708e0d89..b4eba2c2b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2507.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2507.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2507" format="1">
+<glyph name="uni2507" format="2">
   <advance width="1233"/>
   <unicode hex="2507"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2508.glif b/source/Hack-Italic.ufo/glyphs/uni2508.glif
index 36048e87f..24c5f527c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2508.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2508.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2508" format="1">
+<glyph name="uni2508" format="2">
   <advance width="1233"/>
   <unicode hex="2508"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2509.glif b/source/Hack-Italic.ufo/glyphs/uni2509.glif
index 72288fcc1..5ba4882de 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2509.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2509.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2509" format="1">
+<glyph name="uni2509" format="2">
   <advance width="1233"/>
   <unicode hex="2509"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni250A_.glif b/source/Hack-Italic.ufo/glyphs/uni250A_.glif
index 326419d4f..cc5657bf8 100644
--- a/source/Hack-Italic.ufo/glyphs/uni250A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni250A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni250A" format="1">
+<glyph name="uni250A" format="2">
   <advance width="1233"/>
   <unicode hex="250A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni250B_.glif b/source/Hack-Italic.ufo/glyphs/uni250B_.glif
index c3ee89732..62cafe2d5 100644
--- a/source/Hack-Italic.ufo/glyphs/uni250B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni250B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni250B" format="1">
+<glyph name="uni250B" format="2">
   <advance width="1233"/>
   <unicode hex="250B"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni250C_.glif b/source/Hack-Italic.ufo/glyphs/uni250C_.glif
index 3bb58457a..fc997d4f4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni250C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni250C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni250C" format="1">
+<glyph name="uni250C" format="2">
   <advance width="1233"/>
   <unicode hex="250C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni250D_.glif b/source/Hack-Italic.ufo/glyphs/uni250D_.glif
index c13da916a..e34115b1f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni250D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni250D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni250D" format="1">
+<glyph name="uni250D" format="2">
   <advance width="1233"/>
   <unicode hex="250D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni250E_.glif b/source/Hack-Italic.ufo/glyphs/uni250E_.glif
index 4c1a00c1f..7696eb5f3 100644
--- a/source/Hack-Italic.ufo/glyphs/uni250E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni250E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni250E" format="1">
+<glyph name="uni250E" format="2">
   <advance width="1233"/>
   <unicode hex="250E"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni250F_.glif b/source/Hack-Italic.ufo/glyphs/uni250F_.glif
index de7ebbd8c..8ce72f96a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni250F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni250F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni250F" format="1">
+<glyph name="uni250F" format="2">
   <advance width="1233"/>
   <unicode hex="250F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2510.glif b/source/Hack-Italic.ufo/glyphs/uni2510.glif
index ca6ae96b8..b619a2b32 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2510.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2510.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2510" format="1">
+<glyph name="uni2510" format="2">
   <advance width="1233"/>
   <unicode hex="2510"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2511.glif b/source/Hack-Italic.ufo/glyphs/uni2511.glif
index 730313a7f..49566b695 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2511.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2511.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2511" format="1">
+<glyph name="uni2511" format="2">
   <advance width="1233"/>
   <unicode hex="2511"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2512.glif b/source/Hack-Italic.ufo/glyphs/uni2512.glif
index 6ac0b73da..57d91c592 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2512.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2512.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2512" format="1">
+<glyph name="uni2512" format="2">
   <advance width="1233"/>
   <unicode hex="2512"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2513.glif b/source/Hack-Italic.ufo/glyphs/uni2513.glif
index 07da56005..939e456bd 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2513.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2513.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2513" format="1">
+<glyph name="uni2513" format="2">
   <advance width="1233"/>
   <unicode hex="2513"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2514.glif b/source/Hack-Italic.ufo/glyphs/uni2514.glif
index 6ea01e67e..cd4e6db7a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2514.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2514.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2514" format="1">
+<glyph name="uni2514" format="2">
   <advance width="1233"/>
   <unicode hex="2514"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2515.glif b/source/Hack-Italic.ufo/glyphs/uni2515.glif
index d80bfefe6..8a437d13f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2515.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2515.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2515" format="1">
+<glyph name="uni2515" format="2">
   <advance width="1233"/>
   <unicode hex="2515"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2516.glif b/source/Hack-Italic.ufo/glyphs/uni2516.glif
index a1e7786d8..a4d2007fb 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2516.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2516.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2516" format="1">
+<glyph name="uni2516" format="2">
   <advance width="1233"/>
   <unicode hex="2516"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2517.glif b/source/Hack-Italic.ufo/glyphs/uni2517.glif
index 80b5b9a16..e1218e29e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2517.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2517.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2517" format="1">
+<glyph name="uni2517" format="2">
   <advance width="1233"/>
   <unicode hex="2517"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2518.glif b/source/Hack-Italic.ufo/glyphs/uni2518.glif
index 017273e68..837c14e81 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2518.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2518.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2518" format="1">
+<glyph name="uni2518" format="2">
   <advance width="1233"/>
   <unicode hex="2518"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2519.glif b/source/Hack-Italic.ufo/glyphs/uni2519.glif
index 754033b48..16fd46687 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2519.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2519.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2519" format="1">
+<glyph name="uni2519" format="2">
   <advance width="1233"/>
   <unicode hex="2519"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni251A_.glif b/source/Hack-Italic.ufo/glyphs/uni251A_.glif
index 0079f5dcb..29771eed8 100644
--- a/source/Hack-Italic.ufo/glyphs/uni251A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni251A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni251A" format="1">
+<glyph name="uni251A" format="2">
   <advance width="1233"/>
   <unicode hex="251A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni251B_.glif b/source/Hack-Italic.ufo/glyphs/uni251B_.glif
index 0975ba76c..4d876080f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni251B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni251B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni251B" format="1">
+<glyph name="uni251B" format="2">
   <advance width="1233"/>
   <unicode hex="251B"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni251C_.glif b/source/Hack-Italic.ufo/glyphs/uni251C_.glif
index 317eef6ff..035384e8e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni251C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni251C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni251C" format="1">
+<glyph name="uni251C" format="2">
   <advance width="1233"/>
   <unicode hex="251C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni251D_.glif b/source/Hack-Italic.ufo/glyphs/uni251D_.glif
index 7917d89b5..82133e678 100644
--- a/source/Hack-Italic.ufo/glyphs/uni251D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni251D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni251D" format="1">
+<glyph name="uni251D" format="2">
   <advance width="1233"/>
   <unicode hex="251D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni251E_.glif b/source/Hack-Italic.ufo/glyphs/uni251E_.glif
index ec76929ee..6f8e608a6 100644
--- a/source/Hack-Italic.ufo/glyphs/uni251E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni251E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni251E" format="1">
+<glyph name="uni251E" format="2">
   <advance width="1233"/>
   <unicode hex="251E"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni251F_.glif b/source/Hack-Italic.ufo/glyphs/uni251F_.glif
index 7951311b3..0ba4a983e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni251F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni251F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni251F" format="1">
+<glyph name="uni251F" format="2">
   <advance width="1233"/>
   <unicode hex="251F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2520.glif b/source/Hack-Italic.ufo/glyphs/uni2520.glif
index 48b8d811d..d7db40b19 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2520.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2520.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2520" format="1">
+<glyph name="uni2520" format="2">
   <advance width="1233"/>
   <unicode hex="2520"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2521.glif b/source/Hack-Italic.ufo/glyphs/uni2521.glif
index 9a9189030..99d8e5651 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2521.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2521.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2521" format="1">
+<glyph name="uni2521" format="2">
   <advance width="1233"/>
   <unicode hex="2521"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2522.glif b/source/Hack-Italic.ufo/glyphs/uni2522.glif
index beec610ae..e46fe28b7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2522.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2522.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2522" format="1">
+<glyph name="uni2522" format="2">
   <advance width="1233"/>
   <unicode hex="2522"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2523.glif b/source/Hack-Italic.ufo/glyphs/uni2523.glif
index 64dbc41bc..f4dacb474 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2523.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2523.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2523" format="1">
+<glyph name="uni2523" format="2">
   <advance width="1233"/>
   <unicode hex="2523"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2524.glif b/source/Hack-Italic.ufo/glyphs/uni2524.glif
index e25dd4855..7c1c49f3b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2524.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2524.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2524" format="1">
+<glyph name="uni2524" format="2">
   <advance width="1233"/>
   <unicode hex="2524"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2525.glif b/source/Hack-Italic.ufo/glyphs/uni2525.glif
index 3a2ba11c6..ebd9cd8f1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2525.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2525.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2525" format="1">
+<glyph name="uni2525" format="2">
   <advance width="1233"/>
   <unicode hex="2525"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2526.glif b/source/Hack-Italic.ufo/glyphs/uni2526.glif
index b23927ce0..fd5234524 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2526.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2526.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2526" format="1">
+<glyph name="uni2526" format="2">
   <advance width="1233"/>
   <unicode hex="2526"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2527.glif b/source/Hack-Italic.ufo/glyphs/uni2527.glif
index f08eebe71..f746e9af2 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2527.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2527.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2527" format="1">
+<glyph name="uni2527" format="2">
   <advance width="1233"/>
   <unicode hex="2527"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2528.glif b/source/Hack-Italic.ufo/glyphs/uni2528.glif
index fc50e2952..dddc9bfb3 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2528.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2528.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2528" format="1">
+<glyph name="uni2528" format="2">
   <advance width="1233"/>
   <unicode hex="2528"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2529.glif b/source/Hack-Italic.ufo/glyphs/uni2529.glif
index 4c4a6320d..36019c98c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2529.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2529.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2529" format="1">
+<glyph name="uni2529" format="2">
   <advance width="1233"/>
   <unicode hex="2529"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni252A_.glif b/source/Hack-Italic.ufo/glyphs/uni252A_.glif
index de1e3f6ca..58ce526ba 100644
--- a/source/Hack-Italic.ufo/glyphs/uni252A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni252A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni252A" format="1">
+<glyph name="uni252A" format="2">
   <advance width="1233"/>
   <unicode hex="252A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni252B_.glif b/source/Hack-Italic.ufo/glyphs/uni252B_.glif
index 9af4bb7e3..1bb97939d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni252B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni252B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni252B" format="1">
+<glyph name="uni252B" format="2">
   <advance width="1233"/>
   <unicode hex="252B"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni252C_.glif b/source/Hack-Italic.ufo/glyphs/uni252C_.glif
index 71c9aebce..a5ceefa4a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni252C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni252C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni252C" format="1">
+<glyph name="uni252C" format="2">
   <advance width="1233"/>
   <unicode hex="252C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni252D_.glif b/source/Hack-Italic.ufo/glyphs/uni252D_.glif
index 7870a65dc..3adb19018 100644
--- a/source/Hack-Italic.ufo/glyphs/uni252D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni252D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni252D" format="1">
+<glyph name="uni252D" format="2">
   <advance width="1233"/>
   <unicode hex="252D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni252E_.glif b/source/Hack-Italic.ufo/glyphs/uni252E_.glif
index 3a5c6d74d..1d2a8974d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni252E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni252E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni252E" format="1">
+<glyph name="uni252E" format="2">
   <advance width="1233"/>
   <unicode hex="252E"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni252F_.glif b/source/Hack-Italic.ufo/glyphs/uni252F_.glif
index 3e6e9d1f0..b4b65ba37 100644
--- a/source/Hack-Italic.ufo/glyphs/uni252F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni252F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni252F" format="1">
+<glyph name="uni252F" format="2">
   <advance width="1233"/>
   <unicode hex="252F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2530.glif b/source/Hack-Italic.ufo/glyphs/uni2530.glif
index 50e93e19a..c37b0a903 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2530.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2530.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2530" format="1">
+<glyph name="uni2530" format="2">
   <advance width="1233"/>
   <unicode hex="2530"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2531.glif b/source/Hack-Italic.ufo/glyphs/uni2531.glif
index fe41525b6..ab1daaa5b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2531.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2531.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2531" format="1">
+<glyph name="uni2531" format="2">
   <advance width="1233"/>
   <unicode hex="2531"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2532.glif b/source/Hack-Italic.ufo/glyphs/uni2532.glif
index 2113c7f6e..d27193aee 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2532.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2532.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2532" format="1">
+<glyph name="uni2532" format="2">
   <advance width="1233"/>
   <unicode hex="2532"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2533.glif b/source/Hack-Italic.ufo/glyphs/uni2533.glif
index 7158447b9..b2340787d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2533.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2533.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2533" format="1">
+<glyph name="uni2533" format="2">
   <advance width="1233"/>
   <unicode hex="2533"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2534.glif b/source/Hack-Italic.ufo/glyphs/uni2534.glif
index fc64d96bd..44f1e90ec 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2534.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2534.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2534" format="1">
+<glyph name="uni2534" format="2">
   <advance width="1233"/>
   <unicode hex="2534"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2535.glif b/source/Hack-Italic.ufo/glyphs/uni2535.glif
index 86b705611..92b5d9fb4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2535.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2535.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2535" format="1">
+<glyph name="uni2535" format="2">
   <advance width="1233"/>
   <unicode hex="2535"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2536.glif b/source/Hack-Italic.ufo/glyphs/uni2536.glif
index 5ba854889..0bc16e000 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2536.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2536.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2536" format="1">
+<glyph name="uni2536" format="2">
   <advance width="1233"/>
   <unicode hex="2536"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2537.glif b/source/Hack-Italic.ufo/glyphs/uni2537.glif
index d06adad76..50634f1f0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2537.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2537.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2537" format="1">
+<glyph name="uni2537" format="2">
   <advance width="1233"/>
   <unicode hex="2537"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2538.glif b/source/Hack-Italic.ufo/glyphs/uni2538.glif
index 63679b811..3fbe88513 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2538.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2538.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2538" format="1">
+<glyph name="uni2538" format="2">
   <advance width="1233"/>
   <unicode hex="2538"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2539.glif b/source/Hack-Italic.ufo/glyphs/uni2539.glif
index 0aeb1ae5b..871292d9f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2539.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2539.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2539" format="1">
+<glyph name="uni2539" format="2">
   <advance width="1233"/>
   <unicode hex="2539"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni253A_.glif b/source/Hack-Italic.ufo/glyphs/uni253A_.glif
index d1f9403e1..6f14e3242 100644
--- a/source/Hack-Italic.ufo/glyphs/uni253A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni253A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni253A" format="1">
+<glyph name="uni253A" format="2">
   <advance width="1233"/>
   <unicode hex="253A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni253B_.glif b/source/Hack-Italic.ufo/glyphs/uni253B_.glif
index 6d1f8b5c9..14fe114d1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni253B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni253B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni253B" format="1">
+<glyph name="uni253B" format="2">
   <advance width="1233"/>
   <unicode hex="253B"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni253C_.glif b/source/Hack-Italic.ufo/glyphs/uni253C_.glif
index 581841704..74676cf9e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni253C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni253C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni253C" format="1">
+<glyph name="uni253C" format="2">
   <advance width="1233"/>
   <unicode hex="253C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni253D_.glif b/source/Hack-Italic.ufo/glyphs/uni253D_.glif
index f5841e09a..c4b47a679 100644
--- a/source/Hack-Italic.ufo/glyphs/uni253D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni253D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni253D" format="1">
+<glyph name="uni253D" format="2">
   <advance width="1233"/>
   <unicode hex="253D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni253E_.glif b/source/Hack-Italic.ufo/glyphs/uni253E_.glif
index 7ba89e7b1..5b551a63a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni253E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni253E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni253E" format="1">
+<glyph name="uni253E" format="2">
   <advance width="1233"/>
   <unicode hex="253E"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni253F_.glif b/source/Hack-Italic.ufo/glyphs/uni253F_.glif
index 1fcc62cbd..fefe01919 100644
--- a/source/Hack-Italic.ufo/glyphs/uni253F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni253F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni253F" format="1">
+<glyph name="uni253F" format="2">
   <advance width="1233"/>
   <unicode hex="253F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2540.glif b/source/Hack-Italic.ufo/glyphs/uni2540.glif
index 8734d3ccf..2ad2367f8 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2540.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2540.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2540" format="1">
+<glyph name="uni2540" format="2">
   <advance width="1233"/>
   <unicode hex="2540"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2541.glif b/source/Hack-Italic.ufo/glyphs/uni2541.glif
index 9bef0eee8..874c8ee08 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2541.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2541.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2541" format="1">
+<glyph name="uni2541" format="2">
   <advance width="1233"/>
   <unicode hex="2541"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2542.glif b/source/Hack-Italic.ufo/glyphs/uni2542.glif
index ad562119e..99e2e676f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2542.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2542.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2542" format="1">
+<glyph name="uni2542" format="2">
   <advance width="1233"/>
   <unicode hex="2542"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2543.glif b/source/Hack-Italic.ufo/glyphs/uni2543.glif
index 5166af2b6..0a2c4cf84 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2543.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2543.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2543" format="1">
+<glyph name="uni2543" format="2">
   <advance width="1233"/>
   <unicode hex="2543"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2544.glif b/source/Hack-Italic.ufo/glyphs/uni2544.glif
index 48e31de5c..58ec46752 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2544.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2544.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2544" format="1">
+<glyph name="uni2544" format="2">
   <advance width="1233"/>
   <unicode hex="2544"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2545.glif b/source/Hack-Italic.ufo/glyphs/uni2545.glif
index b9f2378bd..b005e36e2 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2545.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2545.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2545" format="1">
+<glyph name="uni2545" format="2">
   <advance width="1233"/>
   <unicode hex="2545"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2546.glif b/source/Hack-Italic.ufo/glyphs/uni2546.glif
index cdaaf29e8..6e0d525bd 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2546.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2546.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2546" format="1">
+<glyph name="uni2546" format="2">
   <advance width="1233"/>
   <unicode hex="2546"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2547.glif b/source/Hack-Italic.ufo/glyphs/uni2547.glif
index fbbbae3de..9dc7aeab4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2547.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2547.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2547" format="1">
+<glyph name="uni2547" format="2">
   <advance width="1233"/>
   <unicode hex="2547"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2548.glif b/source/Hack-Italic.ufo/glyphs/uni2548.glif
index 3c3e28a92..c34823556 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2548.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2548.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2548" format="1">
+<glyph name="uni2548" format="2">
   <advance width="1233"/>
   <unicode hex="2548"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2549.glif b/source/Hack-Italic.ufo/glyphs/uni2549.glif
index b3d0471df..5d6be817d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2549.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2549.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2549" format="1">
+<glyph name="uni2549" format="2">
   <advance width="1233"/>
   <unicode hex="2549"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni254A_.glif b/source/Hack-Italic.ufo/glyphs/uni254A_.glif
index f2328d0bc..01a40ee11 100644
--- a/source/Hack-Italic.ufo/glyphs/uni254A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni254A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni254A" format="1">
+<glyph name="uni254A" format="2">
   <advance width="1233"/>
   <unicode hex="254A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni254B_.glif b/source/Hack-Italic.ufo/glyphs/uni254B_.glif
index 89e3ecc7c..86d15e211 100644
--- a/source/Hack-Italic.ufo/glyphs/uni254B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni254B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni254B" format="1">
+<glyph name="uni254B" format="2">
   <advance width="1233"/>
   <unicode hex="254B"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni254C_.glif b/source/Hack-Italic.ufo/glyphs/uni254C_.glif
index bf16884c5..0d7049383 100644
--- a/source/Hack-Italic.ufo/glyphs/uni254C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni254C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni254C" format="1">
+<glyph name="uni254C" format="2">
   <advance width="1233"/>
   <unicode hex="254C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni254D_.glif b/source/Hack-Italic.ufo/glyphs/uni254D_.glif
index 79d4abc50..2f595fd35 100644
--- a/source/Hack-Italic.ufo/glyphs/uni254D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni254D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni254D" format="1">
+<glyph name="uni254D" format="2">
   <advance width="1233"/>
   <unicode hex="254D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni254E_.glif b/source/Hack-Italic.ufo/glyphs/uni254E_.glif
index 170dcfdd4..7fe74afe7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni254E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni254E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni254E" format="1">
+<glyph name="uni254E" format="2">
   <advance width="1233"/>
   <unicode hex="254E"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni254F_.glif b/source/Hack-Italic.ufo/glyphs/uni254F_.glif
index 7a00fdbf5..598352872 100644
--- a/source/Hack-Italic.ufo/glyphs/uni254F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni254F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni254F" format="1">
+<glyph name="uni254F" format="2">
   <advance width="1233"/>
   <unicode hex="254F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2550.glif b/source/Hack-Italic.ufo/glyphs/uni2550.glif
index b47e7f6cf..3a3127b08 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2550.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2550.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2550" format="1">
+<glyph name="uni2550" format="2">
   <advance width="1233"/>
   <unicode hex="2550"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2551.glif b/source/Hack-Italic.ufo/glyphs/uni2551.glif
index 261f33ce0..b86f5797d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2551.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2551.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2551" format="1">
+<glyph name="uni2551" format="2">
   <advance width="1233"/>
   <unicode hex="2551"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2552.glif b/source/Hack-Italic.ufo/glyphs/uni2552.glif
index 5e8a62bfd..5cf675e17 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2552.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2552.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2552" format="1">
+<glyph name="uni2552" format="2">
   <advance width="1233"/>
   <unicode hex="2552"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2553.glif b/source/Hack-Italic.ufo/glyphs/uni2553.glif
index 03e805d83..b79ca303d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2553.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2553.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2553" format="1">
+<glyph name="uni2553" format="2">
   <advance width="1233"/>
   <unicode hex="2553"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2554.glif b/source/Hack-Italic.ufo/glyphs/uni2554.glif
index 97badf786..2dd8ae161 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2554.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2554.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2554" format="1">
+<glyph name="uni2554" format="2">
   <advance width="1233"/>
   <unicode hex="2554"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2555.glif b/source/Hack-Italic.ufo/glyphs/uni2555.glif
index 94103017c..68866dfb1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2555.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2555.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2555" format="1">
+<glyph name="uni2555" format="2">
   <advance width="1233"/>
   <unicode hex="2555"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2556.glif b/source/Hack-Italic.ufo/glyphs/uni2556.glif
index b3208e323..cdab621c7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2556.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2556.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2556" format="1">
+<glyph name="uni2556" format="2">
   <advance width="1233"/>
   <unicode hex="2556"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2557.glif b/source/Hack-Italic.ufo/glyphs/uni2557.glif
index bb82a4b47..e2af7ab8d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2557.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2557.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2557" format="1">
+<glyph name="uni2557" format="2">
   <advance width="1233"/>
   <unicode hex="2557"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2558.glif b/source/Hack-Italic.ufo/glyphs/uni2558.glif
index 396f9de67..4e262549a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2558.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2558.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2558" format="1">
+<glyph name="uni2558" format="2">
   <advance width="1233"/>
   <unicode hex="2558"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2559.glif b/source/Hack-Italic.ufo/glyphs/uni2559.glif
index ba1eeeb4e..c122a93c1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2559.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2559.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2559" format="1">
+<glyph name="uni2559" format="2">
   <advance width="1233"/>
   <unicode hex="2559"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni255A_.glif b/source/Hack-Italic.ufo/glyphs/uni255A_.glif
index 1136c2a8e..f017411f2 100644
--- a/source/Hack-Italic.ufo/glyphs/uni255A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni255A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni255A" format="1">
+<glyph name="uni255A" format="2">
   <advance width="1233"/>
   <unicode hex="255A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni255B_.glif b/source/Hack-Italic.ufo/glyphs/uni255B_.glif
index 904566700..0d441cda2 100644
--- a/source/Hack-Italic.ufo/glyphs/uni255B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni255B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni255B" format="1">
+<glyph name="uni255B" format="2">
   <advance width="1233"/>
   <unicode hex="255B"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni255C_.glif b/source/Hack-Italic.ufo/glyphs/uni255C_.glif
index fc8692c05..8419d131f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni255C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni255C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni255C" format="1">
+<glyph name="uni255C" format="2">
   <advance width="1233"/>
   <unicode hex="255C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni255D_.glif b/source/Hack-Italic.ufo/glyphs/uni255D_.glif
index d1873f016..b093d68da 100644
--- a/source/Hack-Italic.ufo/glyphs/uni255D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni255D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni255D" format="1">
+<glyph name="uni255D" format="2">
   <advance width="1233"/>
   <unicode hex="255D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni255E_.glif b/source/Hack-Italic.ufo/glyphs/uni255E_.glif
index 18076afa2..b1469a4aa 100644
--- a/source/Hack-Italic.ufo/glyphs/uni255E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni255E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni255E" format="1">
+<glyph name="uni255E" format="2">
   <advance width="1233"/>
   <unicode hex="255E"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni255F_.glif b/source/Hack-Italic.ufo/glyphs/uni255F_.glif
index 40de34e6f..a1b53b07d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni255F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni255F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni255F" format="1">
+<glyph name="uni255F" format="2">
   <advance width="1233"/>
   <unicode hex="255F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2560.glif b/source/Hack-Italic.ufo/glyphs/uni2560.glif
index 256d00fbc..e06097e96 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2560.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2560.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2560" format="1">
+<glyph name="uni2560" format="2">
   <advance width="1233"/>
   <unicode hex="2560"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2561.glif b/source/Hack-Italic.ufo/glyphs/uni2561.glif
index 217236652..9da45f067 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2561.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2561.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2561" format="1">
+<glyph name="uni2561" format="2">
   <advance width="1233"/>
   <unicode hex="2561"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2562.glif b/source/Hack-Italic.ufo/glyphs/uni2562.glif
index 852242a73..be486e9ba 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2562.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2562.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2562" format="1">
+<glyph name="uni2562" format="2">
   <advance width="1233"/>
   <unicode hex="2562"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2563.glif b/source/Hack-Italic.ufo/glyphs/uni2563.glif
index 3135ce979..2f5b42d98 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2563.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2563.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2563" format="1">
+<glyph name="uni2563" format="2">
   <advance width="1233"/>
   <unicode hex="2563"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2564.glif b/source/Hack-Italic.ufo/glyphs/uni2564.glif
index f38dc6867..b3e049b39 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2564.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2564.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2564" format="1">
+<glyph name="uni2564" format="2">
   <advance width="1233"/>
   <unicode hex="2564"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2565.glif b/source/Hack-Italic.ufo/glyphs/uni2565.glif
index 32918026a..d73b072df 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2565.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2565.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2565" format="1">
+<glyph name="uni2565" format="2">
   <advance width="1233"/>
   <unicode hex="2565"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2566.glif b/source/Hack-Italic.ufo/glyphs/uni2566.glif
index 56e6dd721..a94f7d09c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2566.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2566.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2566" format="1">
+<glyph name="uni2566" format="2">
   <advance width="1233"/>
   <unicode hex="2566"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2567.glif b/source/Hack-Italic.ufo/glyphs/uni2567.glif
index 68b908f96..223af2028 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2567.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2567.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2567" format="1">
+<glyph name="uni2567" format="2">
   <advance width="1233"/>
   <unicode hex="2567"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2568.glif b/source/Hack-Italic.ufo/glyphs/uni2568.glif
index f549fa3bb..d38e8939e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2568.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2568.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2568" format="1">
+<glyph name="uni2568" format="2">
   <advance width="1233"/>
   <unicode hex="2568"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2569.glif b/source/Hack-Italic.ufo/glyphs/uni2569.glif
index 1a12528ef..b4e716f26 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2569.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2569.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2569" format="1">
+<glyph name="uni2569" format="2">
   <advance width="1233"/>
   <unicode hex="2569"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni256A_.glif b/source/Hack-Italic.ufo/glyphs/uni256A_.glif
index 04e260d1f..2ef579caa 100644
--- a/source/Hack-Italic.ufo/glyphs/uni256A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni256A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni256A" format="1">
+<glyph name="uni256A" format="2">
   <advance width="1233"/>
   <unicode hex="256A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni256B_.glif b/source/Hack-Italic.ufo/glyphs/uni256B_.glif
index 7333d3239..6d45122c3 100644
--- a/source/Hack-Italic.ufo/glyphs/uni256B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni256B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni256B" format="1">
+<glyph name="uni256B" format="2">
   <advance width="1233"/>
   <unicode hex="256B"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni256C_.glif b/source/Hack-Italic.ufo/glyphs/uni256C_.glif
index cd88ad20e..496a383b9 100644
--- a/source/Hack-Italic.ufo/glyphs/uni256C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni256C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni256C" format="1">
+<glyph name="uni256C" format="2">
   <advance width="1233"/>
   <unicode hex="256C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni256D_.glif b/source/Hack-Italic.ufo/glyphs/uni256D_.glif
index 8760acadf..d93b489d4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni256D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni256D_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni256D" format="1">
+<glyph name="uni256D" format="2">
   <advance width="1233"/>
   <unicode hex="256D"/>
   <outline>
     <contour>
-      <point x="536" y="368" type="line" name="hr00" smooth="yes"/>
+      <point x="536" y="368" type="line" smooth="yes" name="hr00"/>
       <point x="536" y="588"/>
       <point x="648" y="790"/>
       <point x="876" y="790" type="curve" smooth="yes"/>
@@ -13,7 +13,7 @@
       <point x="876" y="618" type="line" smooth="yes"/>
       <point x="756" y="618"/>
       <point x="696" y="535"/>
-      <point x="696" y="368" type="curve" name="dh01" smooth="yes"/>
+      <point x="696" y="368" type="curve" smooth="yes" name="dh01"/>
       <point x="696" y="-530" type="line" name="av01"/>
       <point x="536" y="-530" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni256E_.glif b/source/Hack-Italic.ufo/glyphs/uni256E_.glif
index 8e445e2ab..e58b7c33a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni256E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni256E_.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni256E" format="1">
+<glyph name="uni256E" format="2">
   <advance width="1233"/>
   <unicode hex="256E"/>
   <outline>
     <contour>
-      <point x="536" y="368" type="line" name="hr00" smooth="yes"/>
+      <point x="536" y="368" type="line" smooth="yes" name="hr00"/>
       <point x="536" y="535"/>
       <point x="476" y="618"/>
-      <point x="356" y="618" type="curve" name="dv01" smooth="yes"/>
+      <point x="356" y="618" type="curve" smooth="yes" name="dv01"/>
       <point x="-20" y="618" type="line"/>
       <point x="-20" y="790" type="line"/>
-      <point x="356" y="790" type="line" name="dv02" smooth="yes"/>
+      <point x="356" y="790" type="line" smooth="yes" name="dv02"/>
       <point x="580" y="790"/>
       <point x="696" y="592"/>
-      <point x="696" y="368" type="curve" name="dh01" smooth="yes"/>
+      <point x="696" y="368" type="curve" smooth="yes" name="dh01"/>
       <point x="696" y="-530" type="line" name="av01"/>
       <point x="536" y="-530" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni256F_.glif b/source/Hack-Italic.ufo/glyphs/uni256F_.glif
index 5351c8523..e21cf5a0a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni256F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni256F_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni256F" format="1">
+<glyph name="uni256F" format="2">
   <advance width="1233"/>
   <unicode hex="256F"/>
   <outline>
     <contour>
       <point x="-20" y="790" type="line" name="hr00"/>
-      <point x="356" y="790" type="line" name="dv02" smooth="yes"/>
+      <point x="356" y="790" type="line" smooth="yes" name="dv02"/>
       <point x="476" y="790"/>
       <point x="536" y="873"/>
-      <point x="536" y="1040" type="curve" name="dh01" smooth="yes"/>
+      <point x="536" y="1040" type="curve" smooth="yes" name="dh01"/>
       <point x="536" y="1950" type="line" name="av01"/>
       <point x="696" y="1950" type="line"/>
-      <point x="696" y="1040" type="line" name="dh02" smooth="yes"/>
+      <point x="696" y="1040" type="line" smooth="yes" name="dh02"/>
       <point x="696" y="816"/>
       <point x="580" y="618"/>
-      <point x="356" y="618" type="curve" name="dv01" smooth="yes"/>
+      <point x="356" y="618" type="curve" smooth="yes" name="dv01"/>
       <point x="-20" y="618" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2570.glif b/source/Hack-Italic.ufo/glyphs/uni2570.glif
index 4aa6427df..cd040d380 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2570.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2570.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2570" format="1">
+<glyph name="uni2570" format="2">
   <advance width="1233"/>
   <unicode hex="2570"/>
   <outline>
     <contour>
-      <point x="876" y="618" type="line" name="hr00" smooth="yes"/>
+      <point x="876" y="618" type="line" smooth="yes" name="hr00"/>
       <point x="652" y="618"/>
       <point x="536" y="816"/>
-      <point x="536" y="1040" type="curve" name="dh01" smooth="yes"/>
+      <point x="536" y="1040" type="curve" smooth="yes" name="dh01"/>
       <point x="536" y="1950" type="line" name="av01"/>
       <point x="696" y="1950" type="line"/>
-      <point x="696" y="1040" type="line" name="dh02" smooth="yes"/>
+      <point x="696" y="1040" type="line" smooth="yes" name="dh02"/>
       <point x="696" y="873"/>
       <point x="756" y="790"/>
-      <point x="876" y="790" type="curve" name="dv01" smooth="yes"/>
+      <point x="876" y="790" type="curve" smooth="yes" name="dv01"/>
       <point x="1253" y="790" type="line"/>
       <point x="1253" y="618" type="line" name="sv01"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2571.glif b/source/Hack-Italic.ufo/glyphs/uni2571.glif
index 44ff55c93..eef474427 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2571.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2571.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2571" format="1">
+<glyph name="uni2571" format="2">
   <advance width="1233"/>
   <unicode hex="2571"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2572.glif b/source/Hack-Italic.ufo/glyphs/uni2572.glif
index ca5e423c0..498ab0ee7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2572.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2572.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2572" format="1">
+<glyph name="uni2572" format="2">
   <advance width="1233"/>
   <unicode hex="2572"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2573.glif b/source/Hack-Italic.ufo/glyphs/uni2573.glif
index 159f35381..8fbf5b682 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2573.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2573.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2573" format="1">
+<glyph name="uni2573" format="2">
   <advance width="1233"/>
   <unicode hex="2573"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2574.glif b/source/Hack-Italic.ufo/glyphs/uni2574.glif
index e7c84c71f..0e09ba91f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2574.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2574.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2574" format="1">
+<glyph name="uni2574" format="2">
   <advance width="1233"/>
   <unicode hex="2574"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2575.glif b/source/Hack-Italic.ufo/glyphs/uni2575.glif
index 96e280131..ec944d0a4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2575.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2575.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2575" format="1">
+<glyph name="uni2575" format="2">
   <advance width="1233"/>
   <unicode hex="2575"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2576.glif b/source/Hack-Italic.ufo/glyphs/uni2576.glif
index 1b39e2a22..11ed02cb6 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2576.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2576.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2576" format="1">
+<glyph name="uni2576" format="2">
   <advance width="1233"/>
   <unicode hex="2576"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2577.glif b/source/Hack-Italic.ufo/glyphs/uni2577.glif
index aa48e51a7..53060389c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2577.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2577.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2577" format="1">
+<glyph name="uni2577" format="2">
   <advance width="1233"/>
   <unicode hex="2577"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2578.glif b/source/Hack-Italic.ufo/glyphs/uni2578.glif
index 00736562c..0945fca2e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2578.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2578.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2578" format="1">
+<glyph name="uni2578" format="2">
   <advance width="1233"/>
   <unicode hex="2578"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2579.glif b/source/Hack-Italic.ufo/glyphs/uni2579.glif
index 8c11f2f6e..128bd20e7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2579.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2579.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2579" format="1">
+<glyph name="uni2579" format="2">
   <advance width="1233"/>
   <unicode hex="2579"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni257A_.glif b/source/Hack-Italic.ufo/glyphs/uni257A_.glif
index b3693128a..a0d9bff9c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni257A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni257A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni257A" format="1">
+<glyph name="uni257A" format="2">
   <advance width="1233"/>
   <unicode hex="257A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni257B_.glif b/source/Hack-Italic.ufo/glyphs/uni257B_.glif
index 2393151f1..5912156b3 100644
--- a/source/Hack-Italic.ufo/glyphs/uni257B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni257B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni257B" format="1">
+<glyph name="uni257B" format="2">
   <advance width="1233"/>
   <unicode hex="257B"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni257C_.glif b/source/Hack-Italic.ufo/glyphs/uni257C_.glif
index 283219c78..b38ca326b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni257C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni257C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni257C" format="1">
+<glyph name="uni257C" format="2">
   <advance width="1233"/>
   <unicode hex="257C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni257D_.glif b/source/Hack-Italic.ufo/glyphs/uni257D_.glif
index 194dbdb46..3f8e9ceeb 100644
--- a/source/Hack-Italic.ufo/glyphs/uni257D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni257D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni257D" format="1">
+<glyph name="uni257D" format="2">
   <advance width="1233"/>
   <unicode hex="257D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni257E_.glif b/source/Hack-Italic.ufo/glyphs/uni257E_.glif
index 2aff928e0..7115d7f36 100644
--- a/source/Hack-Italic.ufo/glyphs/uni257E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni257E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni257E" format="1">
+<glyph name="uni257E" format="2">
   <advance width="1233"/>
   <unicode hex="257E"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni257F_.glif b/source/Hack-Italic.ufo/glyphs/uni257F_.glif
index d48717c62..4d3d7d4d6 100644
--- a/source/Hack-Italic.ufo/glyphs/uni257F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni257F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni257F" format="1">
+<glyph name="uni257F" format="2">
   <advance width="1233"/>
   <unicode hex="257F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2581.glif b/source/Hack-Italic.ufo/glyphs/uni2581.glif
index 8405625ca..079423173 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2581.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2581.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2581" format="1">
+<glyph name="uni2581" format="2">
   <advance width="1233"/>
   <unicode hex="2581"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2582.glif b/source/Hack-Italic.ufo/glyphs/uni2582.glif
index 7f765cf2a..f63f6933a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2582.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2582.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2582" format="1">
+<glyph name="uni2582" format="2">
   <advance width="1233"/>
   <unicode hex="2582"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2583.glif b/source/Hack-Italic.ufo/glyphs/uni2583.glif
index 6fbe0d6eb..120b07d2c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2583.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2583.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2583" format="1">
+<glyph name="uni2583" format="2">
   <advance width="1233"/>
   <unicode hex="2583"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2585.glif b/source/Hack-Italic.ufo/glyphs/uni2585.glif
index ed0ee82ae..bb0e93e9a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2585.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2585.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2585" format="1">
+<glyph name="uni2585" format="2">
   <advance width="1233"/>
   <unicode hex="2585"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2586.glif b/source/Hack-Italic.ufo/glyphs/uni2586.glif
index 5a8fa5b09..d263128b3 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2586.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2586.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2586" format="1">
+<glyph name="uni2586" format="2">
   <advance width="1233"/>
   <unicode hex="2586"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2587.glif b/source/Hack-Italic.ufo/glyphs/uni2587.glif
index e8035ccb0..56c99eafd 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2587.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2587.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2587" format="1">
+<glyph name="uni2587" format="2">
   <advance width="1233"/>
   <unicode hex="2587"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2589.glif b/source/Hack-Italic.ufo/glyphs/uni2589.glif
index 786359c88..8f262f1f7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2589.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2589.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2589" format="1">
+<glyph name="uni2589" format="2">
   <advance width="1233"/>
   <unicode hex="2589"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni258A_.glif b/source/Hack-Italic.ufo/glyphs/uni258A_.glif
index 0d4a83b45..93a17e9c0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni258A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni258A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni258A" format="1">
+<glyph name="uni258A" format="2">
   <advance width="1233"/>
   <unicode hex="258A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni258B_.glif b/source/Hack-Italic.ufo/glyphs/uni258B_.glif
index be5747641..5bae0499b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni258B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni258B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni258B" format="1">
+<glyph name="uni258B" format="2">
   <advance width="1233"/>
   <unicode hex="258B"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni258D_.glif b/source/Hack-Italic.ufo/glyphs/uni258D_.glif
index dbf54fe4e..869644627 100644
--- a/source/Hack-Italic.ufo/glyphs/uni258D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni258D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni258D" format="1">
+<glyph name="uni258D" format="2">
   <advance width="1233"/>
   <unicode hex="258D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni258E_.glif b/source/Hack-Italic.ufo/glyphs/uni258E_.glif
index b5dd2b7f4..1845ea7c8 100644
--- a/source/Hack-Italic.ufo/glyphs/uni258E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni258E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni258E" format="1">
+<glyph name="uni258E" format="2">
   <advance width="1233"/>
   <unicode hex="258E"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni258F_.glif b/source/Hack-Italic.ufo/glyphs/uni258F_.glif
index d02cd90c7..73576f872 100644
--- a/source/Hack-Italic.ufo/glyphs/uni258F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni258F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni258F" format="1">
+<glyph name="uni258F" format="2">
   <advance width="1233"/>
   <unicode hex="258F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2594.glif b/source/Hack-Italic.ufo/glyphs/uni2594.glif
index f2265c59a..ffe1c0bc6 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2594.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2594.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2594" format="1">
+<glyph name="uni2594" format="2">
   <advance width="1233"/>
   <unicode hex="2594"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2595.glif b/source/Hack-Italic.ufo/glyphs/uni2595.glif
index b10165576..e6e015d6a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2595.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2595.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2595" format="1">
+<glyph name="uni2595" format="2">
   <advance width="1233"/>
   <unicode hex="2595"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2596.glif b/source/Hack-Italic.ufo/glyphs/uni2596.glif
index 1f57b343a..b6179a5f7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2596.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2596.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2596" format="1">
+<glyph name="uni2596" format="2">
   <advance width="1233"/>
   <unicode hex="2596"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2597.glif b/source/Hack-Italic.ufo/glyphs/uni2597.glif
index d427aa9da..2c11348a4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2597.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2597.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2597" format="1">
+<glyph name="uni2597" format="2">
   <advance width="1233"/>
   <unicode hex="2597"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2598.glif b/source/Hack-Italic.ufo/glyphs/uni2598.glif
index 819a90323..b00f88201 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2598.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2598.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2598" format="1">
+<glyph name="uni2598" format="2">
   <advance width="1233"/>
   <unicode hex="2598"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2599.glif b/source/Hack-Italic.ufo/glyphs/uni2599.glif
index f90045b44..b5ba9b42e 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2599.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2599.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2599" format="1">
+<glyph name="uni2599" format="2">
   <advance width="1233"/>
   <unicode hex="2599"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni259A_.glif b/source/Hack-Italic.ufo/glyphs/uni259A_.glif
index 633681312..1a4e2ca22 100644
--- a/source/Hack-Italic.ufo/glyphs/uni259A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni259A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni259A" format="1">
+<glyph name="uni259A" format="2">
   <advance width="1233"/>
   <unicode hex="259A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni259B_.glif b/source/Hack-Italic.ufo/glyphs/uni259B_.glif
index 5baba3b40..e59de2ffa 100644
--- a/source/Hack-Italic.ufo/glyphs/uni259B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni259B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni259B" format="1">
+<glyph name="uni259B" format="2">
   <advance width="1233"/>
   <unicode hex="259B"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni259C_.glif b/source/Hack-Italic.ufo/glyphs/uni259C_.glif
index 7f2559138..2fd4f9fd3 100644
--- a/source/Hack-Italic.ufo/glyphs/uni259C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni259C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni259C" format="1">
+<glyph name="uni259C" format="2">
   <advance width="1233"/>
   <unicode hex="259C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni259D_.glif b/source/Hack-Italic.ufo/glyphs/uni259D_.glif
index 0fdf62a17..093f5d2c9 100644
--- a/source/Hack-Italic.ufo/glyphs/uni259D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni259D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni259D" format="1">
+<glyph name="uni259D" format="2">
   <advance width="1233"/>
   <unicode hex="259D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni259E_.glif b/source/Hack-Italic.ufo/glyphs/uni259E_.glif
index 95413af23..927d3fd52 100644
--- a/source/Hack-Italic.ufo/glyphs/uni259E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni259E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni259E" format="1">
+<glyph name="uni259E" format="2">
   <advance width="1233"/>
   <unicode hex="259E"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni259F_.glif b/source/Hack-Italic.ufo/glyphs/uni259F_.glif
index 051cb47ed..022450334 100644
--- a/source/Hack-Italic.ufo/glyphs/uni259F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni259F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni259F" format="1">
+<glyph name="uni259F" format="2">
   <advance width="1233"/>
   <unicode hex="259F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25A_1.glif b/source/Hack-Italic.ufo/glyphs/uni25A_1.glif
index c26194bf7..6315b4736 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25A_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25A_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A1" format="1">
+<glyph name="uni25A1" format="2">
   <advance width="1233"/>
   <unicode hex="25A1"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25A_2.glif b/source/Hack-Italic.ufo/glyphs/uni25A_2.glif
index f2127405e..858066667 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25A_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25A_2.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A2" format="1">
+<glyph name="uni25A2" format="2">
   <advance width="1233"/>
   <unicode hex="25A2"/>
   <outline>
     <contour>
-      <point x="348" y="-78" type="line" name="hr00" smooth="yes"/>
+      <point x="348" y="-78" type="line" smooth="yes" name="hr00"/>
       <point x="120" y="-78"/>
       <point x="6" y="36"/>
-      <point x="6" y="264" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="264" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="800" type="line" smooth="yes"/>
       <point x="6" y="1028"/>
       <point x="120" y="1142"/>
-      <point x="348" y="1142" type="curve" name="at01" smooth="yes"/>
+      <point x="348" y="1142" type="curve" smooth="yes" name="at01"/>
       <point x="885" y="1142" type="line" smooth="yes"/>
       <point x="1113" y="1142"/>
       <point x="1227" y="1028"/>
       <point x="1227" y="800" type="curve" smooth="yes"/>
-      <point x="1227" y="264" type="line" name="sh02" smooth="yes"/>
+      <point x="1227" y="264" type="line" smooth="yes" name="sh02"/>
       <point x="1227" y="36"/>
       <point x="1113" y="-78"/>
       <point x="885" y="-78" type="curve" smooth="yes"/>
@@ -25,19 +25,19 @@
       <point x="885" y="36" type="line" smooth="yes"/>
       <point x="1037" y="36"/>
       <point x="1113" y="112"/>
-      <point x="1113" y="264" type="curve" name="ah01" smooth="yes"/>
+      <point x="1113" y="264" type="curve" smooth="yes" name="ah01"/>
       <point x="1113" y="800" type="line" smooth="yes"/>
       <point x="1113" y="952"/>
       <point x="1037" y="1028"/>
-      <point x="885" y="1028" type="curve" name="sv01" smooth="yes"/>
+      <point x="885" y="1028" type="curve" smooth="yes" name="sv01"/>
       <point x="348" y="1028" type="line" smooth="yes"/>
       <point x="196" y="1028"/>
       <point x="120" y="952"/>
       <point x="120" y="800" type="curve" smooth="yes"/>
-      <point x="120" y="264" type="line" name="sh03" smooth="yes"/>
+      <point x="120" y="264" type="line" smooth="yes" name="sh03"/>
       <point x="120" y="112"/>
       <point x="196" y="36"/>
-      <point x="348" y="36" type="curve" name="dv01" smooth="yes"/>
+      <point x="348" y="36" type="curve" smooth="yes" name="dv01"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25A_3.glif b/source/Hack-Italic.ufo/glyphs/uni25A_3.glif
index 36c94bbfe..c042b6bc1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25A_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25A_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A3" format="1">
+<glyph name="uni25A3" format="2">
   <advance width="1233"/>
   <unicode hex="25A3"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25A_4.glif b/source/Hack-Italic.ufo/glyphs/uni25A_4.glif
index 5e3714ff2..21fdb7759 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25A_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A4" format="1">
+<glyph name="uni25A4" format="2">
   <advance width="1233"/>
   <unicode hex="25A4"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25A_5.glif b/source/Hack-Italic.ufo/glyphs/uni25A_5.glif
index 0fbe65d2c..812b2bcc5 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25A_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25A_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A5" format="1">
+<glyph name="uni25A5" format="2">
   <advance width="1233"/>
   <unicode hex="25A5"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25A_6.glif b/source/Hack-Italic.ufo/glyphs/uni25A_6.glif
index c26e2bbc0..6144835f6 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25A_6.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25A_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A6" format="1">
+<glyph name="uni25A6" format="2">
   <advance width="1233"/>
   <unicode hex="25A6"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25A_7.glif b/source/Hack-Italic.ufo/glyphs/uni25A_7.glif
index ab64b0c85..e6dce2a0d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25A_7.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25A_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A7" format="1">
+<glyph name="uni25A7" format="2">
   <advance width="1233"/>
   <unicode hex="25A7"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25A_8.glif b/source/Hack-Italic.ufo/glyphs/uni25A_8.glif
index 401d22e1b..5e76c45f1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25A_8.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25A_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A8" format="1">
+<glyph name="uni25A8" format="2">
   <advance width="1233"/>
   <unicode hex="25A8"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25A_9.glif b/source/Hack-Italic.ufo/glyphs/uni25A_9.glif
index 61797e14b..4ed18f324 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25A_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25A_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A9" format="1">
+<glyph name="uni25A9" format="2">
   <advance width="1233"/>
   <unicode hex="25A9"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25A_A_.glif b/source/Hack-Italic.ufo/glyphs/uni25A_A_.glif
index 959453953..16104d2c6 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25A_A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25A_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25AA" format="1">
+<glyph name="uni25AA" format="2">
   <advance width="1233"/>
   <unicode hex="25AA"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25A_B_.glif b/source/Hack-Italic.ufo/glyphs/uni25A_B_.glif
index 0b3cb50c9..638b2ab31 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25A_B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25A_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25AB" format="1">
+<glyph name="uni25AB" format="2">
   <advance width="1233"/>
   <unicode hex="25AB"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25A_D_.glif b/source/Hack-Italic.ufo/glyphs/uni25A_D_.glif
index b22543c04..2eb4c8ecb 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25A_D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25A_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25AD" format="1">
+<glyph name="uni25AD" format="2">
   <advance width="1233"/>
   <unicode hex="25AD"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25A_E_.glif b/source/Hack-Italic.ufo/glyphs/uni25A_E_.glif
index 813bd9b32..24040b324 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25A_E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25A_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25AE" format="1">
+<glyph name="uni25AE" format="2">
   <advance width="1233"/>
   <unicode hex="25AE"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25A_F_.glif b/source/Hack-Italic.ufo/glyphs/uni25A_F_.glif
index 7c8ab6805..fb0cb65b0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25A_F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25A_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25AF" format="1">
+<glyph name="uni25AF" format="2">
   <advance width="1233"/>
   <unicode hex="25AF"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25B_0.glif b/source/Hack-Italic.ufo/glyphs/uni25B_0.glif
index 32067171c..36e07ee33 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25B_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25B_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B0" format="1">
+<glyph name="uni25B0" format="2">
   <advance width="1233"/>
   <unicode hex="25B0"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25B_1.glif b/source/Hack-Italic.ufo/glyphs/uni25B_1.glif
index accea48ba..880415fd6 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25B_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25B_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B1" format="1">
+<glyph name="uni25B1" format="2">
   <advance width="1233"/>
   <unicode hex="25B1"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25B_3.glif b/source/Hack-Italic.ufo/glyphs/uni25B_3.glif
index fd52a7831..8eeebcbe8 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25B_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B3" format="1">
+<glyph name="uni25B3" format="2">
   <advance width="1233"/>
   <unicode hex="25B3"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25B_4.glif b/source/Hack-Italic.ufo/glyphs/uni25B_4.glif
index 2f4c8ad2d..a7300a0c1 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25B_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25B_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B4" format="1">
+<glyph name="uni25B4" format="2">
   <advance width="1233"/>
   <unicode hex="25B4"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25B_5.glif b/source/Hack-Italic.ufo/glyphs/uni25B_5.glif
index 3da52a099..3d8d86a09 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25B_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25B_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B5" format="1">
+<glyph name="uni25B5" format="2">
   <advance width="1233"/>
   <unicode hex="25B5"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25B_6.glif b/source/Hack-Italic.ufo/glyphs/uni25B_6.glif
index b24ca8021..a353e767f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25B_6.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25B_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B6" format="1">
+<glyph name="uni25B6" format="2">
   <advance width="1233"/>
   <unicode hex="25B6"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25B_7.glif b/source/Hack-Italic.ufo/glyphs/uni25B_7.glif
index 0e05e4231..efa8ffeea 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25B_7.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25B_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B7" format="1">
+<glyph name="uni25B7" format="2">
   <advance width="1233"/>
   <unicode hex="25B7"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25B_8.glif b/source/Hack-Italic.ufo/glyphs/uni25B_8.glif
index 283363ed9..d95e6bf41 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25B_8.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25B_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B8" format="1">
+<glyph name="uni25B8" format="2">
   <advance width="1233"/>
   <unicode hex="25B8"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25B_9.glif b/source/Hack-Italic.ufo/glyphs/uni25B_9.glif
index 6ee625376..385aca318 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25B_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25B_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B9" format="1">
+<glyph name="uni25B9" format="2">
   <advance width="1233"/>
   <unicode hex="25B9"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25B_B_.glif b/source/Hack-Italic.ufo/glyphs/uni25B_B_.glif
index 129f3d1dc..140725d5b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25B_B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25B_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25BB" format="1">
+<glyph name="uni25BB" format="2">
   <advance width="1233"/>
   <unicode hex="25BB"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25B_D_.glif b/source/Hack-Italic.ufo/glyphs/uni25B_D_.glif
index c31e03aff..dac5c1954 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25B_D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25B_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25BD" format="1">
+<glyph name="uni25BD" format="2">
   <advance width="1233"/>
   <unicode hex="25BD"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25B_E_.glif b/source/Hack-Italic.ufo/glyphs/uni25B_E_.glif
index ab81e1a04..c8b768042 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25B_E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25B_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25BE" format="1">
+<glyph name="uni25BE" format="2">
   <advance width="1233"/>
   <unicode hex="25BE"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25B_F_.glif b/source/Hack-Italic.ufo/glyphs/uni25B_F_.glif
index ad009b48a..79b3c7447 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25B_F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25B_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25BF" format="1">
+<glyph name="uni25BF" format="2">
   <advance width="1233"/>
   <unicode hex="25BF"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25C_0.glif b/source/Hack-Italic.ufo/glyphs/uni25C_0.glif
index fc2633cbd..f87fcba59 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25C_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25C_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C0" format="1">
+<glyph name="uni25C0" format="2">
   <advance width="1233"/>
   <unicode hex="25C0"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25C_1.glif b/source/Hack-Italic.ufo/glyphs/uni25C_1.glif
index 219fd6c09..fa5e5e82b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25C_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25C_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C1" format="1">
+<glyph name="uni25C1" format="2">
   <advance width="1233"/>
   <unicode hex="25C1"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25C_2.glif b/source/Hack-Italic.ufo/glyphs/uni25C_2.glif
index 93b5430fb..92d86f80b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25C_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25C_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C2" format="1">
+<glyph name="uni25C2" format="2">
   <advance width="1233"/>
   <unicode hex="25C2"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25C_3.glif b/source/Hack-Italic.ufo/glyphs/uni25C_3.glif
index 426dc11ea..ebc3ff8c4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25C_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25C_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C3" format="1">
+<glyph name="uni25C3" format="2">
   <advance width="1233"/>
   <unicode hex="25C3"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25C_5.glif b/source/Hack-Italic.ufo/glyphs/uni25C_5.glif
index 8f0472fdc..097675f8b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25C_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25C_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C5" format="1">
+<glyph name="uni25C5" format="2">
   <advance width="1233"/>
   <unicode hex="25C5"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25C_6.glif b/source/Hack-Italic.ufo/glyphs/uni25C_6.glif
index bbd364d75..0cc721da9 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25C_6.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25C_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C6" format="1">
+<glyph name="uni25C6" format="2">
   <advance width="1233"/>
   <unicode hex="25C6"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25C_7.glif b/source/Hack-Italic.ufo/glyphs/uni25C_7.glif
index 7dd66189b..aa413a176 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25C_7.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25C_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C7" format="1">
+<glyph name="uni25C7" format="2">
   <advance width="1233"/>
   <unicode hex="25C7"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25C_8.glif b/source/Hack-Italic.ufo/glyphs/uni25C_8.glif
index c7309c626..f5ee8c31b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25C_8.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25C_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C8" format="1">
+<glyph name="uni25C8" format="2">
   <advance width="1233"/>
   <unicode hex="25C8"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25C_9.glif b/source/Hack-Italic.ufo/glyphs/uni25C_9.glif
index 8fa8f4de4..d332acdad 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25C_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25C_9.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C9" format="1">
+<glyph name="uni25C9" format="2">
   <advance width="1233"/>
   <unicode hex="25C9"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv03"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="616" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="692" y="39"/>
       <point x="778" y="62"/>
       <point x="861" y="109" type="curve" smooth="yes"/>
       <point x="1021" y="200"/>
       <point x="1105" y="349"/>
-      <point x="1105" y="532" type="curve" name="ah01" smooth="yes"/>
+      <point x="1105" y="532" type="curve" smooth="yes" name="ah01"/>
       <point x="1105" y="715"/>
       <point x="1021" y="864"/>
       <point x="861" y="955" type="curve" smooth="yes"/>
       <point x="778" y="1002"/>
       <point x="692" y="1025"/>
-      <point x="616" y="1025" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1025" type="curve" smooth="yes" name="dv02"/>
       <point x="540" y="1025"/>
       <point x="454" y="1002"/>
       <point x="371" y="955" type="curve" smooth="yes"/>
       <point x="216" y="867"/>
       <point x="128" y="723"/>
-      <point x="128" y="532" type="curve" name="sh03" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="sh03"/>
       <point x="128" y="341"/>
       <point x="216" y="197"/>
       <point x="371" y="109" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25C_C_.glif b/source/Hack-Italic.ufo/glyphs/uni25C_C_.glif
index 969161cbf..df176d399 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25C_C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25C_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25CC" format="1">
+<glyph name="uni25CC" format="2">
   <advance width="1233"/>
   <unicode hex="25CC"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="466" y="1127" type="line" name="hr00"/>
       <point x="516" y="1141"/>
       <point x="566" y="1148"/>
-      <point x="616" y="1148" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="1148" type="curve" smooth="yes" name="dv04"/>
       <point x="666" y="1148"/>
       <point x="716" y="1141"/>
       <point x="766" y="1127" type="curve"/>
       <point x="736" y="1008" type="line"/>
       <point x="695" y="1019"/>
       <point x="655" y="1025"/>
-      <point x="616" y="1025" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1025" type="curve" smooth="yes" name="dv03"/>
       <point x="577" y="1025"/>
       <point x="537" y="1019"/>
       <point x="496" y="1008" type="curve"/>
@@ -43,14 +43,14 @@
       <point x="22" y="382" type="line"/>
       <point x="11" y="427"/>
       <point x="6" y="477"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="587"/>
       <point x="11" y="637"/>
       <point x="22" y="682" type="curve"/>
       <point x="141" y="652" type="line" name="sh03"/>
       <point x="132" y="615"/>
       <point x="128" y="575"/>
-      <point x="128" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="128" y="489"/>
       <point x="132" y="449"/>
       <point x="141" y="412" type="curve" name="sh04"/>
@@ -59,14 +59,14 @@
       <point x="1092" y="412" type="line" name="sh05"/>
       <point x="1101" y="449"/>
       <point x="1105" y="489"/>
-      <point x="1105" y="532" type="curve" name="ah01" smooth="yes"/>
+      <point x="1105" y="532" type="curve" smooth="yes" name="ah01"/>
       <point x="1105" y="575"/>
       <point x="1101" y="615"/>
       <point x="1092" y="652" type="curve" name="sh06"/>
       <point x="1211" y="682" type="line"/>
       <point x="1222" y="637"/>
       <point x="1227" y="587"/>
-      <point x="1227" y="532" type="curve" name="sh07" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh07"/>
       <point x="1227" y="477"/>
       <point x="1222" y="427"/>
       <point x="1211" y="382" type="curve"/>
@@ -92,14 +92,14 @@
       <point x="921" y="4" type="curve"/>
     </contour>
     <contour>
-      <point x="616" y="-84" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-84" type="curve" smooth="yes" name="dv01"/>
       <point x="566" y="-84"/>
       <point x="516" y="-77"/>
       <point x="466" y="-63" type="curve"/>
       <point x="496" y="56" type="line"/>
       <point x="537" y="45"/>
       <point x="577" y="39"/>
-      <point x="616" y="39" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv02"/>
       <point x="655" y="39"/>
       <point x="695" y="45"/>
       <point x="736" y="56" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25C_D_.glif b/source/Hack-Italic.ufo/glyphs/uni25C_D_.glif
index 79963b78c..3b92c8fff 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25C_D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25C_D_.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25CD" format="1">
+<glyph name="uni25CD" format="2">
   <advance width="1233"/>
   <unicode hex="25CD"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="dh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="dh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="dh12" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="dh12"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -81,7 +81,7 @@
       <point x="1002" y="226" type="line" name="dh10"/>
       <point x="1071" y="309"/>
       <point x="1105" y="411"/>
-      <point x="1105" y="532" type="curve" name="dh11" smooth="yes"/>
+      <point x="1105" y="532" type="curve" smooth="yes" name="dh11"/>
       <point x="1105" y="653"/>
       <point x="1071" y="755"/>
       <point x="1002" y="838" type="curve" name="iv03"/>
@@ -90,7 +90,7 @@
       <point x="226" y="832" type="line" name="dh03"/>
       <point x="161" y="751"/>
       <point x="128" y="651"/>
-      <point x="128" y="532" type="curve" name="dh02" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="dh02"/>
       <point x="128" y="413"/>
       <point x="161" y="313"/>
       <point x="226" y="232" type="curve" name="iv04"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25C_E_.glif b/source/Hack-Italic.ufo/glyphs/uni25C_E_.glif
index d6d6e56f1..bc936ddbb 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25C_E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25C_E_.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25CE" format="1">
+<glyph name="uni25CE" format="2">
   <advance width="1233"/>
   <unicode hex="25CE"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="dh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="dh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv03"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="dh08" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="dh08"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="616" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="692" y="39"/>
       <point x="778" y="62"/>
       <point x="861" y="109" type="curve" smooth="yes"/>
       <point x="1021" y="200"/>
       <point x="1105" y="349"/>
-      <point x="1105" y="532" type="curve" name="dh07" smooth="yes"/>
+      <point x="1105" y="532" type="curve" smooth="yes" name="dh07"/>
       <point x="1105" y="715"/>
       <point x="1021" y="864"/>
       <point x="861" y="955" type="curve" smooth="yes"/>
       <point x="778" y="1002"/>
       <point x="692" y="1025"/>
-      <point x="616" y="1025" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1025" type="curve" smooth="yes" name="dv02"/>
       <point x="540" y="1025"/>
       <point x="454" y="1002"/>
       <point x="371" y="955" type="curve" smooth="yes"/>
       <point x="216" y="867"/>
       <point x="128" y="723"/>
-      <point x="128" y="532" type="curve" name="dh02" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="dh02"/>
       <point x="128" y="341"/>
       <point x="216" y="197"/>
       <point x="371" y="109" type="curve" smooth="yes"/>
@@ -56,25 +56,25 @@
       <point x="540" y="39"/>
     </contour>
     <contour>
-      <point x="616" y="286" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="286" type="curve" smooth="yes" name="dv04"/>
       <point x="580" y="286"/>
       <point x="536" y="297"/>
       <point x="493" y="321" type="curve" smooth="yes"/>
       <point x="414" y="365"/>
       <point x="372" y="440"/>
-      <point x="372" y="532" type="curve" name="dh03" smooth="yes"/>
+      <point x="372" y="532" type="curve" smooth="yes" name="dh03"/>
       <point x="372" y="624"/>
       <point x="414" y="699"/>
       <point x="493" y="743" type="curve" smooth="yes"/>
       <point x="536" y="767"/>
       <point x="580" y="778"/>
-      <point x="616" y="778" type="curve" name="dv05" smooth="yes"/>
+      <point x="616" y="778" type="curve" smooth="yes" name="dv05"/>
       <point x="655" y="778"/>
       <point x="700" y="766"/>
       <point x="739" y="743" type="curve" smooth="yes"/>
       <point x="812" y="702"/>
       <point x="861" y="632"/>
-      <point x="861" y="532" type="curve" name="dh06" smooth="yes"/>
+      <point x="861" y="532" type="curve" smooth="yes" name="dh06"/>
       <point x="861" y="432"/>
       <point x="812" y="362"/>
       <point x="739" y="321" type="curve" smooth="yes"/>
@@ -88,7 +88,7 @@
       <point x="683" y="416" type="curve" smooth="yes"/>
       <point x="727" y="443"/>
       <point x="751" y="479"/>
-      <point x="751" y="532" type="curve" name="dh05" smooth="yes"/>
+      <point x="751" y="532" type="curve" smooth="yes" name="dh05"/>
       <point x="751" y="585"/>
       <point x="727" y="621"/>
       <point x="683" y="648" type="curve" smooth="yes"/>
@@ -100,7 +100,7 @@
       <point x="549" y="648" type="curve" smooth="yes"/>
       <point x="504" y="622"/>
       <point x="482" y="583"/>
-      <point x="482" y="532" type="curve" name="dh04" smooth="yes"/>
+      <point x="482" y="532" type="curve" smooth="yes" name="dh04"/>
       <point x="482" y="481"/>
       <point x="504" y="442"/>
       <point x="549" y="416" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25C_F_.glif b/source/Hack-Italic.ufo/glyphs/uni25C_F_.glif
index 46c39961b..309ec8c30 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25C_F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25C_F_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25CF" format="1">
+<glyph name="uni25CF" format="2">
   <advance width="1233"/>
   <unicode hex="25CF"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25D_0.glif b/source/Hack-Italic.ufo/glyphs/uni25D_0.glif
index 718c14e9a..b2dc1c3b4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25D_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25D_0.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D0" format="1">
+<glyph name="uni25D0" format="2">
   <advance width="1233"/>
   <unicode hex="25D0"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
@@ -16,13 +16,13 @@
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="dh02" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="dh02"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="861" y="109" type="curve" smooth="yes"/>
       <point x="1021" y="200"/>
       <point x="1105" y="349"/>
-      <point x="1105" y="532" type="curve" name="dh01" smooth="yes"/>
+      <point x="1105" y="532" type="curve" smooth="yes" name="dh01"/>
       <point x="1105" y="715"/>
       <point x="1021" y="864"/>
       <point x="861" y="955" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25D_1.glif b/source/Hack-Italic.ufo/glyphs/uni25D_1.glif
index bc2550c08..0b5101c8b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25D_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25D_1.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D1" format="1">
+<glyph name="uni25D1" format="2">
   <advance width="1233"/>
   <unicode hex="25D1"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="dh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="dh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="372" y="954" type="curve" smooth="yes"/>
       <point x="211" y="861"/>
       <point x="128" y="725"/>
-      <point x="128" y="532" type="curve" name="dh02" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="dh02"/>
       <point x="128" y="339"/>
       <point x="211" y="203"/>
       <point x="372" y="110" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25D_2.glif b/source/Hack-Italic.ufo/glyphs/uni25D_2.glif
index f1c8eb8f2..49134ee69 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25D_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25D_2.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D2" format="1">
+<glyph name="uni25D2" format="2">
   <advance width="1233"/>
   <unicode hex="25D2"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="861" y="955" type="curve" smooth="yes"/>
       <point x="778" y="1002"/>
       <point x="692" y="1025"/>
-      <point x="616" y="1025" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1025" type="curve" smooth="yes" name="dv01"/>
       <point x="540" y="1025"/>
       <point x="454" y="1002"/>
       <point x="371" y="955" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25D_3.glif b/source/Hack-Italic.ufo/glyphs/uni25D_3.glif
index 6a92a3dcb..d3db68331 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25D_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25D_3.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D3" format="1">
+<glyph name="uni25D3" format="2">
   <advance width="1233"/>
   <unicode hex="25D3"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -30,7 +30,7 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="616" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="697" y="39"/>
       <point x="779" y="63"/>
       <point x="860" y="110" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25D_4.glif b/source/Hack-Italic.ufo/glyphs/uni25D_4.glif
index 0cc033e00..edb500728 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25D_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25D_4.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D4" format="1">
+<glyph name="uni25D4" format="2">
   <advance width="1233"/>
   <unicode hex="25D4"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -30,7 +30,7 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="616" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="692" y="39"/>
       <point x="778" y="62"/>
       <point x="861" y="109" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="371" y="955" type="curve" smooth="yes"/>
       <point x="216" y="867"/>
       <point x="128" y="723"/>
-      <point x="128" y="532" type="curve" name="sh03" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="sh03"/>
       <point x="128" y="341"/>
       <point x="216" y="197"/>
       <point x="371" y="109" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25D_5.glif b/source/Hack-Italic.ufo/glyphs/uni25D_5.glif
index 9f56ce75e..06acd4559 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25D_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25D_5.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D5" format="1">
+<glyph name="uni25D5" format="2">
   <advance width="1233"/>
   <unicode hex="25D5"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="dh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="dh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25D_6.glif b/source/Hack-Italic.ufo/glyphs/uni25D_6.glif
index a98f8f614..4416ff83d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25D_6.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25D_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D6" format="1">
+<glyph name="uni25D6" format="2">
   <advance width="1233"/>
   <unicode hex="25D6"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25D_7.glif b/source/Hack-Italic.ufo/glyphs/uni25D_7.glif
index 61e4f5dc1..946edb7a2 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25D_7.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25D_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D7" format="1">
+<glyph name="uni25D7" format="2">
   <advance width="1233"/>
   <unicode hex="25D7"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25D_A_.glif b/source/Hack-Italic.ufo/glyphs/uni25D_A_.glif
index 441576e50..5827f6f13 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25D_A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25D_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25DA" format="1">
+<glyph name="uni25DA" format="2">
   <advance width="1233"/>
   <unicode hex="25DA"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="921" y="1060" type="curve" smooth="yes"/>
       <point x="820" y="1119"/>
       <point x="718" y="1148"/>
-      <point x="615" y="1148" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1148" type="curve" smooth="yes" name="dv03"/>
       <point x="516" y="1148"/>
       <point x="416" y="1121"/>
       <point x="311" y="1060" type="curve" smooth="yes"/>
@@ -29,7 +29,7 @@
       <point x="371" y="955" type="curve" smooth="yes"/>
       <point x="454" y="1002"/>
       <point x="540" y="1025"/>
-      <point x="616" y="1025" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1025" type="curve" smooth="yes" name="dv02"/>
       <point x="692" y="1025"/>
       <point x="778" y="1002"/>
       <point x="861" y="955" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25D_B_.glif b/source/Hack-Italic.ufo/glyphs/uni25D_B_.glif
index 564e0f3a7..8ca592979 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25D_B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25D_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25DB" format="1">
+<glyph name="uni25DB" format="2">
   <advance width="1233"/>
   <unicode hex="25DB"/>
   <outline>
@@ -11,7 +11,7 @@
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="413" y="-55"/>
       <point x="524" y="-84"/>
-      <point x="617" y="-84" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="-84"/>
       <point x="818" y="-56"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -23,7 +23,7 @@
       <point x="-20" y="-512" type="line"/>
     </contour>
     <contour>
-      <point x="616" y="39" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv03"/>
       <point x="540" y="39"/>
       <point x="454" y="62"/>
       <point x="371" y="109" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25D_C_.glif b/source/Hack-Italic.ufo/glyphs/uni25D_C_.glif
index ab269c712..5e74179ce 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25D_C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25D_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25DC" format="1">
+<glyph name="uni25DC" format="2">
   <advance width="1233"/>
   <unicode hex="25DC"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25D_D_.glif b/source/Hack-Italic.ufo/glyphs/uni25D_D_.glif
index d6dcd070b..e88d2ba58 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25D_D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25D_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25DD" format="1">
+<glyph name="uni25DD" format="2">
   <advance width="1233"/>
   <unicode hex="25DD"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25D_E_.glif b/source/Hack-Italic.ufo/glyphs/uni25D_E_.glif
index 740a2bcbf..3480c12da 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25D_E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25D_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25DE" format="1">
+<glyph name="uni25DE" format="2">
   <advance width="1233"/>
   <unicode hex="25DE"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25D_F_.glif b/source/Hack-Italic.ufo/glyphs/uni25D_F_.glif
index 10dbdd9ff..dbb34517f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25D_F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25D_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25DF" format="1">
+<glyph name="uni25DF" format="2">
   <advance width="1233"/>
   <unicode hex="25DF"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25E_0.glif b/source/Hack-Italic.ufo/glyphs/uni25E_0.glif
index 9b3f47d72..58e925140 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25E_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25E_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E0" format="1">
+<glyph name="uni25E0" format="2">
   <advance width="1233"/>
   <unicode hex="25E0"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
@@ -23,7 +23,7 @@
       <point x="861" y="955" type="curve" smooth="yes"/>
       <point x="778" y="1002"/>
       <point x="692" y="1025"/>
-      <point x="616" y="1025" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1025" type="curve" smooth="yes" name="dv01"/>
       <point x="540" y="1025"/>
       <point x="454" y="1002"/>
       <point x="371" y="955" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25E_1.glif b/source/Hack-Italic.ufo/glyphs/uni25E_1.glif
index fd719bca1..dec5db1f7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25E_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25E_1.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E1" format="1">
+<glyph name="uni25E1" format="2">
   <advance width="1233"/>
   <unicode hex="25E1"/>
   <outline>
     <contour>
-      <point x="615" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="615" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="516" y="-84"/>
       <point x="416" y="-57"/>
       <point x="311" y="4" type="curve" smooth="yes"/>
@@ -17,7 +17,7 @@
       <point x="372" y="110" type="curve" smooth="yes"/>
       <point x="453" y="63"/>
       <point x="535" y="39"/>
-      <point x="616" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="697" y="39"/>
       <point x="779" y="63"/>
       <point x="860" y="110" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25E_2.glif b/source/Hack-Italic.ufo/glyphs/uni25E_2.glif
index 9812325a2..2273a2640 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25E_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25E_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E2" format="1">
+<glyph name="uni25E2" format="2">
   <advance width="1233"/>
   <unicode hex="25E2"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25E_3.glif b/source/Hack-Italic.ufo/glyphs/uni25E_3.glif
index 2c0c2bed2..9395dfd74 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25E_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25E_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E3" format="1">
+<glyph name="uni25E3" format="2">
   <advance width="1233"/>
   <unicode hex="25E3"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25E_4.glif b/source/Hack-Italic.ufo/glyphs/uni25E_4.glif
index 3cdf55d01..d928816df 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25E_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25E_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E4" format="1">
+<glyph name="uni25E4" format="2">
   <advance width="1233"/>
   <unicode hex="25E4"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25E_5.glif b/source/Hack-Italic.ufo/glyphs/uni25E_5.glif
index cf4b9096d..36495ab5b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25E_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25E_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E5" format="1">
+<glyph name="uni25E5" format="2">
   <advance width="1233"/>
   <unicode hex="25E5"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25E_7.glif b/source/Hack-Italic.ufo/glyphs/uni25E_7.glif
index 34b659d78..09d1bd3b3 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25E_7.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25E_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E7" format="1">
+<glyph name="uni25E7" format="2">
   <advance width="1233"/>
   <unicode hex="25E7"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25E_8.glif b/source/Hack-Italic.ufo/glyphs/uni25E_8.glif
index ff7393846..be563b66d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25E_8.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25E_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E8" format="1">
+<glyph name="uni25E8" format="2">
   <advance width="1233"/>
   <unicode hex="25E8"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25E_9.glif b/source/Hack-Italic.ufo/glyphs/uni25E_9.glif
index a4a76e740..a3fe5337a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25E_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25E_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E9" format="1">
+<glyph name="uni25E9" format="2">
   <advance width="1233"/>
   <unicode hex="25E9"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25E_A_.glif b/source/Hack-Italic.ufo/glyphs/uni25E_A_.glif
index 5b8b31cce..89cb828c5 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25E_A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25E_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25EA" format="1">
+<glyph name="uni25EA" format="2">
   <advance width="1233"/>
   <unicode hex="25EA"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25E_B_.glif b/source/Hack-Italic.ufo/glyphs/uni25E_B_.glif
index da4f0b67f..9f6d2d523 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25E_B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25E_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25EB" format="1">
+<glyph name="uni25EB" format="2">
   <advance width="1233"/>
   <unicode hex="25EB"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25E_C_.glif b/source/Hack-Italic.ufo/glyphs/uni25E_C_.glif
index 6e64bb63c..16c28af2c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25E_C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25E_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25EC" format="1">
+<glyph name="uni25EC" format="2">
   <advance width="1233"/>
   <unicode hex="25EC"/>
   <outline>
@@ -14,16 +14,16 @@
       <point x="177" y="36" type="line"/>
     </contour>
     <contour>
-      <point x="615" y="229" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="229" type="curve" smooth="yes" name="dv03"/>
       <point x="539" y="229"/>
       <point x="482" y="286"/>
-      <point x="482" y="362" type="curve" name="dh01" smooth="yes"/>
+      <point x="482" y="362" type="curve" smooth="yes" name="dh01"/>
       <point x="482" y="438"/>
       <point x="541" y="495"/>
-      <point x="616" y="495" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="495" type="curve" smooth="yes" name="dv04"/>
       <point x="691" y="495"/>
       <point x="750" y="438"/>
-      <point x="750" y="362" type="curve" name="dh02" smooth="yes"/>
+      <point x="750" y="362" type="curve" smooth="yes" name="dh02"/>
       <point x="750" y="289"/>
       <point x="690" y="229"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25E_D_.glif b/source/Hack-Italic.ufo/glyphs/uni25E_D_.glif
index 023c62b95..718ea1d30 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25E_D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25E_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25ED" format="1">
+<glyph name="uni25ED" format="2">
   <advance width="1233"/>
   <unicode hex="25ED"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25E_E_.glif b/source/Hack-Italic.ufo/glyphs/uni25E_E_.glif
index 65a848776..08d9455fb 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25E_E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25E_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25EE" format="1">
+<glyph name="uni25EE" format="2">
   <advance width="1233"/>
   <unicode hex="25EE"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25E_F_.glif b/source/Hack-Italic.ufo/glyphs/uni25E_F_.glif
index 018ff748c..c63414932 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25E_F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25E_F_.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25EF" format="1">
+<glyph name="uni25EF" format="2">
   <advance width="1233"/>
   <unicode hex="25EF"/>
   <outline>
     <contour>
-      <point x="615" y="-110" type="curve" name="hr00" smooth="yes"/>
+      <point x="615" y="-110" type="curve" smooth="yes" name="hr00"/>
       <point x="511" y="-110"/>
       <point x="407" y="-83"/>
       <point x="298" y="-19" type="curve" smooth="yes"/>
       <point x="91" y="101"/>
       <point x="-20" y="280"/>
-      <point x="-20" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="-20" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="-20" y="784"/>
       <point x="91" y="963"/>
       <point x="298" y="1083" type="curve" smooth="yes"/>
       <point x="407" y="1147"/>
       <point x="511" y="1174"/>
-      <point x="615" y="1174" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1174" type="curve" smooth="yes" name="dv03"/>
       <point x="722" y="1174"/>
       <point x="829" y="1144"/>
       <point x="934" y="1083" type="curve" smooth="yes"/>
       <point x="1142" y="963"/>
       <point x="1253" y="784"/>
-      <point x="1253" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="1253" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="1253" y="280"/>
       <point x="1142" y="101"/>
       <point x="934" y="-19" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="722" y="-110"/>
     </contour>
     <contour>
-      <point x="616" y="18" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="18" type="curve" smooth="yes" name="dv01"/>
       <point x="700" y="18"/>
       <point x="792" y="45"/>
       <point x="872" y="90" type="curve" smooth="yes"/>
       <point x="1033" y="181"/>
       <point x="1126" y="333"/>
-      <point x="1126" y="532" type="curve" name="ah01" smooth="yes"/>
+      <point x="1126" y="532" type="curve" smooth="yes" name="ah01"/>
       <point x="1126" y="731"/>
       <point x="1033" y="883"/>
       <point x="872" y="974" type="curve" smooth="yes"/>
       <point x="792" y="1019"/>
       <point x="700" y="1046"/>
-      <point x="616" y="1046" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1046" type="curve" smooth="yes" name="dv02"/>
       <point x="540" y="1046"/>
       <point x="450" y="1025"/>
       <point x="361" y="974" type="curve" smooth="yes"/>
       <point x="204" y="886"/>
       <point x="107" y="734"/>
-      <point x="107" y="532" type="curve" name="sh03" smooth="yes"/>
+      <point x="107" y="532" type="curve" smooth="yes" name="sh03"/>
       <point x="107" y="329"/>
       <point x="205" y="178"/>
       <point x="361" y="90" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25F_0.glif b/source/Hack-Italic.ufo/glyphs/uni25F_0.glif
index 95a4712e3..dfa5bb855 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25F_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25F_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F0" format="1">
+<glyph name="uni25F0" format="2">
   <advance width="1233"/>
   <unicode hex="25F0"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25F_1.glif b/source/Hack-Italic.ufo/glyphs/uni25F_1.glif
index c3724eede..0930ad292 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25F_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25F_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F1" format="1">
+<glyph name="uni25F1" format="2">
   <advance width="1233"/>
   <unicode hex="25F1"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25F_2.glif b/source/Hack-Italic.ufo/glyphs/uni25F_2.glif
index fd3427be5..cfb1f711c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25F_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25F_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F2" format="1">
+<glyph name="uni25F2" format="2">
   <advance width="1233"/>
   <unicode hex="25F2"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25F_3.glif b/source/Hack-Italic.ufo/glyphs/uni25F_3.glif
index 333a31b57..8b36f1ebe 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25F_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25F_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F3" format="1">
+<glyph name="uni25F3" format="2">
   <advance width="1233"/>
   <unicode hex="25F3"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25F_4.glif b/source/Hack-Italic.ufo/glyphs/uni25F_4.glif
index 83c4d1350..6a0abeda3 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25F_4.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25F_4.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F4" format="1">
+<glyph name="uni25F4" format="2">
   <advance width="1233"/>
   <unicode hex="25F4"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
@@ -16,13 +16,13 @@
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -30,13 +30,13 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="616" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="691" y="39"/>
       <point x="778" y="62"/>
       <point x="861" y="109" type="curve" smooth="yes"/>
       <point x="1022" y="201"/>
       <point x="1105" y="351"/>
-      <point x="1105" y="534" type="curve" name="ah01" smooth="yes"/>
+      <point x="1105" y="534" type="curve" smooth="yes" name="ah01"/>
       <point x="1105" y="730"/>
       <point x="1008" y="871"/>
       <point x="861" y="954" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25F_5.glif b/source/Hack-Italic.ufo/glyphs/uni25F_5.glif
index 992d6e94e..36f5d1175 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25F_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25F_5.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F5" format="1">
+<glyph name="uni25F5" format="2">
   <advance width="1233"/>
   <unicode hex="25F5"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
@@ -16,13 +16,13 @@
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -36,13 +36,13 @@
       <point x="860" y="110" type="curve" smooth="yes"/>
       <point x="1023" y="204"/>
       <point x="1105" y="345"/>
-      <point x="1105" y="532" type="curve" name="ah01" smooth="yes"/>
+      <point x="1105" y="532" type="curve" smooth="yes" name="ah01"/>
       <point x="1105" y="719"/>
       <point x="1023" y="860"/>
       <point x="860" y="954" type="curve" smooth="yes"/>
       <point x="775" y="1003"/>
       <point x="692" y="1025"/>
-      <point x="619" y="1025" type="curve" name="dv01" smooth="yes"/>
+      <point x="619" y="1025" type="curve" smooth="yes" name="dv01"/>
       <point x="448" y="1025"/>
       <point x="159" y="905"/>
       <point x="131" y="588" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25F_6.glif b/source/Hack-Italic.ufo/glyphs/uni25F_6.glif
index a1e040444..bed8fc7bc 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25F_6.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25F_6.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F6" format="1">
+<glyph name="uni25F6" format="2">
   <advance width="1233"/>
   <unicode hex="25F6"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
@@ -34,13 +34,13 @@
       <point x="1102" y="588" type="line" name="dv04"/>
       <point x="1074" y="903"/>
       <point x="785" y="1025"/>
-      <point x="617" y="1025" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="1025" type="curve" smooth="yes" name="dv01"/>
       <point x="541" y="1025"/>
       <point x="454" y="1002"/>
       <point x="371" y="955" type="curve" smooth="yes"/>
       <point x="210" y="863"/>
       <point x="128" y="713"/>
-      <point x="128" y="530" type="curve" name="sh02" smooth="yes"/>
+      <point x="128" y="530" type="curve" smooth="yes" name="sh02"/>
       <point x="128" y="342"/>
       <point x="214" y="199"/>
       <point x="371" y="110" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25F_7.glif b/source/Hack-Italic.ufo/glyphs/uni25F_7.glif
index 871e713d9..95894fcf9 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25F_7.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25F_7.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F7" format="1">
+<glyph name="uni25F7" format="2">
   <advance width="1233"/>
   <unicode hex="25F7"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
@@ -30,7 +30,7 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="613" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="613" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="781" y="39"/>
       <point x="1070" y="156"/>
       <point x="1102" y="474" type="curve" name="dv02"/>
@@ -41,7 +41,7 @@
       <point x="372" y="954" type="curve" smooth="yes"/>
       <point x="209" y="860"/>
       <point x="128" y="719"/>
-      <point x="128" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="128" y="345"/>
       <point x="209" y="204"/>
       <point x="372" y="110" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25F_8.glif b/source/Hack-Italic.ufo/glyphs/uni25F_8.glif
index 9267c054b..a42fa75c0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25F_8.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25F_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F8" format="1">
+<glyph name="uni25F8" format="2">
   <advance width="1233"/>
   <unicode hex="25F8"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25F_9.glif b/source/Hack-Italic.ufo/glyphs/uni25F_9.glif
index 1f5a37479..cc8543602 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25F_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25F_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F9" format="1">
+<glyph name="uni25F9" format="2">
   <advance width="1233"/>
   <unicode hex="25F9"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25F_A_.glif b/source/Hack-Italic.ufo/glyphs/uni25F_A_.glif
index fc9bc6d69..3194c7f3f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25F_A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25F_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25FA" format="1">
+<glyph name="uni25FA" format="2">
   <advance width="1233"/>
   <unicode hex="25FA"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25F_B_.glif b/source/Hack-Italic.ufo/glyphs/uni25F_B_.glif
index 3b80d593c..d0c40cedb 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25F_B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25F_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25FB" format="1">
+<glyph name="uni25FB" format="2">
   <advance width="1233"/>
   <unicode hex="25FB"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25F_C_.glif b/source/Hack-Italic.ufo/glyphs/uni25F_C_.glif
index 3be0a387b..212ba910f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25F_C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25F_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25FC" format="1">
+<glyph name="uni25FC" format="2">
   <advance width="1233"/>
   <unicode hex="25FC"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25F_D_.glif b/source/Hack-Italic.ufo/glyphs/uni25F_D_.glif
index 8814150b8..ef2bba730 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25F_D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25F_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25FD" format="1">
+<glyph name="uni25FD" format="2">
   <advance width="1233"/>
   <unicode hex="25FD"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25F_E_.glif b/source/Hack-Italic.ufo/glyphs/uni25F_E_.glif
index 00ff683ce..5b20fe01a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25F_E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25F_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25FE" format="1">
+<glyph name="uni25FE" format="2">
   <advance width="1233"/>
   <unicode hex="25FE"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni25F_F_.glif b/source/Hack-Italic.ufo/glyphs/uni25F_F_.glif
index 32d916c21..1e6646d70 100644
--- a/source/Hack-Italic.ufo/glyphs/uni25F_F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni25F_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25FF" format="1">
+<glyph name="uni25FF" format="2">
   <advance width="1233"/>
   <unicode hex="25FF"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni27C_2.glif b/source/Hack-Italic.ufo/glyphs/uni27C_2.glif
index 8a2461629..a0f2a3e4b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni27C_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni27C_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27C2" format="1">
+<glyph name="uni27C2" format="2">
   <advance width="1233"/>
   <unicode hex="27C2"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni27C_5.glif b/source/Hack-Italic.ufo/glyphs/uni27C_5.glif
index d70db15dc..89655bcb2 100644
--- a/source/Hack-Italic.ufo/glyphs/uni27C_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni27C_5.glif
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27C5" format="1">
+<glyph name="uni27C5" format="2">
   <advance width="1233"/>
   <unicode hex="27C5"/>
   <outline>
     <contour>
-      <point x="675" y="-334" type="line" name="hr00" smooth="yes"/>
+      <point x="675" y="-334" type="line" smooth="yes" name="hr00"/>
       <point x="636" y="-334"/>
       <point x="607" y="-330"/>
-      <point x="570" y="-323" type="curve" name="av01" smooth="yes"/>
+      <point x="570" y="-323" type="curve" smooth="yes" name="av01"/>
       <point x="300" y="-272"/>
       <point x="192" y="-176"/>
-      <point x="192" y="-17" type="curve" name="sh01" smooth="yes"/>
+      <point x="192" y="-17" type="curve" smooth="yes" name="sh01"/>
       <point x="192" y="161"/>
       <point x="329" y="419"/>
       <point x="524" y="779" type="curve" smooth="yes"/>
       <point x="719" y="1142"/>
       <point x="818" y="1317"/>
-      <point x="818" y="1382" type="curve" name="ah01" smooth="yes"/>
+      <point x="818" y="1382" type="curve" smooth="yes" name="ah01"/>
       <point x="818" y="1427"/>
       <point x="784" y="1445"/>
-      <point x="745" y="1445" type="curve" name="dv01" smooth="yes"/>
+      <point x="745" y="1445" type="curve" smooth="yes" name="dv01"/>
       <point x="696" y="1445"/>
       <point x="664" y="1415"/>
       <point x="605" y="1308" type="curve"/>
       <point x="479" y="1357" type="line"/>
       <point x="543" y="1504"/>
       <point x="680" y="1575"/>
-      <point x="793" y="1575" type="curve" name="dv02" smooth="yes"/>
+      <point x="793" y="1575" type="curve" smooth="yes" name="dv02"/>
       <point x="890" y="1575"/>
       <point x="971" y="1521"/>
-      <point x="971" y="1413" type="curve" name="sh02" smooth="yes"/>
+      <point x="971" y="1413" type="curve" smooth="yes" name="sh02"/>
       <point x="971" y="1400"/>
       <point x="970" y="1386"/>
-      <point x="967" y="1371" type="curve" name="sh03" smooth="yes"/>
+      <point x="967" y="1371" type="curve" smooth="yes" name="sh03"/>
       <point x="948" y="1262"/>
       <point x="858" y="1076"/>
       <point x="676" y="736" type="curve" smooth="yes"/>
       <point x="503" y="411"/>
       <point x="408" y="235"/>
-      <point x="381" y="119" type="curve" name="sh05" smooth="yes"/>
+      <point x="381" y="119" type="curve" smooth="yes" name="sh05"/>
       <point x="375" y="93"/>
       <point x="372" y="69"/>
-      <point x="372" y="47" type="curve" name="sh04" smooth="yes"/>
+      <point x="372" y="47" type="curve" smooth="yes" name="sh04"/>
       <point x="372" y="-65"/>
       <point x="447" y="-132"/>
       <point x="596" y="-173" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni27C_6.glif b/source/Hack-Italic.ufo/glyphs/uni27C_6.glif
index bd0f98c50..209ae63e0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni27C_6.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni27C_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27C6" format="1">
+<glyph name="uni27C6" format="2">
   <advance width="1233"/>
   <unicode hex="27C6"/>
   <outline>
@@ -13,44 +13,44 @@
       <point x="328" y="-173" type="curve" smooth="yes"/>
       <point x="583" y="-109"/>
       <point x="665" y="-17"/>
-      <point x="665" y="207" type="curve" name="ih01" smooth="yes"/>
+      <point x="665" y="207" type="curve" smooth="yes" name="ih01"/>
       <point x="665" y="336"/>
       <point x="638" y="504"/>
       <point x="602" y="736" type="curve" smooth="yes"/>
       <point x="567" y="961"/>
       <point x="547" y="1132"/>
-      <point x="547" y="1253" type="curve" name="hr01" smooth="yes"/>
+      <point x="547" y="1253" type="curve" smooth="yes" name="hr01"/>
       <point x="547" y="1302"/>
       <point x="550" y="1342"/>
       <point x="557" y="1371" type="curve" smooth="yes"/>
       <point x="586" y="1506"/>
       <point x="701" y="1575"/>
-      <point x="811" y="1575" type="curve" name="dv02" smooth="yes"/>
+      <point x="811" y="1575" type="curve" smooth="yes" name="dv02"/>
       <point x="926" y="1575"/>
       <point x="1033" y="1504"/>
       <point x="1041" y="1357" type="curve"/>
       <point x="895" y="1308" type="line"/>
       <point x="879" y="1417"/>
       <point x="857" y="1445"/>
-      <point x="808" y="1445" type="curve" name="dv01" smooth="yes"/>
+      <point x="808" y="1445" type="curve" smooth="yes" name="dv01"/>
       <point x="761" y="1445"/>
       <point x="719" y="1419"/>
       <point x="707" y="1366" type="curve" smooth="yes"/>
       <point x="704" y="1351"/>
       <point x="702" y="1333"/>
-      <point x="702" y="1312" type="curve" name="dh01" smooth="yes"/>
+      <point x="702" y="1312" type="curve" smooth="yes" name="dh01"/>
       <point x="702" y="1221"/>
       <point x="728" y="1058"/>
       <point x="771" y="779" type="curve"/>
       <point x="806" y="560"/>
       <point x="831" y="382"/>
-      <point x="831" y="233" type="curve" name="hr02" smooth="yes"/>
+      <point x="831" y="233" type="curve" smooth="yes" name="hr02"/>
       <point x="831" y="-79"/>
       <point x="713" y="-251"/>
-      <point x="296" y="-323" type="curve" name="av01" smooth="yes"/>
+      <point x="296" y="-323" type="curve" smooth="yes" name="av01"/>
       <point x="256" y="-330"/>
       <point x="226" y="-334"/>
-      <point x="187" y="-334" type="curve" name="av02" smooth="yes"/>
+      <point x="187" y="-334" type="curve" smooth="yes" name="av02"/>
       <point x="126" y="-334" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni27D_C_.glif b/source/Hack-Italic.ufo/glyphs/uni27D_C_.glif
index d159f3854..5f363ba38 100644
--- a/source/Hack-Italic.ufo/glyphs/uni27D_C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni27D_C_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27DC" format="1">
+<glyph name="uni27DC" format="2">
   <advance width="1233"/>
   <unicode hex="27DC"/>
   <outline>
     <contour>
-      <point x="313" y="359" type="curve" name="hr00" smooth="yes"/>
+      <point x="313" y="359" type="curve" smooth="yes" name="hr00"/>
       <point x="152" y="359"/>
       <point x="28" y="486"/>
-      <point x="28" y="648" type="curve" name="dh01" smooth="yes"/>
+      <point x="28" y="648" type="curve" smooth="yes" name="dh01"/>
       <point x="28" y="808"/>
       <point x="149" y="930"/>
-      <point x="313" y="930" type="curve" name="dv03" smooth="yes"/>
+      <point x="313" y="930" type="curve" smooth="yes" name="dv03"/>
       <point x="474" y="930"/>
       <point x="562" y="815"/>
       <point x="586" y="731" type="curve"/>
@@ -21,16 +21,16 @@
       <point x="469" y="359"/>
     </contour>
     <contour>
-      <point x="312" y="509" type="curve" name="dv01" smooth="yes"/>
+      <point x="312" y="509" type="curve" smooth="yes" name="dv01"/>
       <point x="389" y="509"/>
       <point x="450" y="571"/>
       <point x="450" y="647" type="curve" smooth="yes"/>
       <point x="450" y="722"/>
       <point x="390" y="782"/>
-      <point x="313" y="782" type="curve" name="dv02" smooth="yes"/>
+      <point x="313" y="782" type="curve" smooth="yes" name="dv02"/>
       <point x="236" y="782"/>
       <point x="176" y="722"/>
-      <point x="176" y="646" type="curve" name="dh02" smooth="yes"/>
+      <point x="176" y="646" type="curve" smooth="yes" name="dh02"/>
       <point x="176" y="570"/>
       <point x="236" y="509"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni27E_0.glif b/source/Hack-Italic.ufo/glyphs/uni27E_0.glif
index 2485cb6d3..298a6d061 100644
--- a/source/Hack-Italic.ufo/glyphs/uni27E_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni27E_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27E0" format="1">
+<glyph name="uni27E0" format="2">
   <advance width="1233"/>
   <unicode hex="27E0"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni27E_6.glif b/source/Hack-Italic.ufo/glyphs/uni27E_6.glif
index d248b13e4..51f85ecf9 100644
--- a/source/Hack-Italic.ufo/glyphs/uni27E_6.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni27E_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27E6" format="1">
+<glyph name="uni27E6" format="2">
   <advance width="1233"/>
   <unicode hex="27E6"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni27E_7.glif b/source/Hack-Italic.ufo/glyphs/uni27E_7.glif
index 3a32ab088..d35d6a997 100644
--- a/source/Hack-Italic.ufo/glyphs/uni27E_7.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni27E_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27E7" format="1">
+<glyph name="uni27E7" format="2">
   <advance width="1233"/>
   <unicode hex="27E7"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni27E_8.glif b/source/Hack-Italic.ufo/glyphs/uni27E_8.glif
index d0e3d1657..df28a4733 100644
--- a/source/Hack-Italic.ufo/glyphs/uni27E_8.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni27E_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27E8" format="1">
+<glyph name="uni27E8" format="2">
   <advance width="1233"/>
   <unicode hex="27E8"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni27E_9.glif b/source/Hack-Italic.ufo/glyphs/uni27E_9.glif
index e399587c4..02fb39c38 100644
--- a/source/Hack-Italic.ufo/glyphs/uni27E_9.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni27E_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27E9" format="1">
+<glyph name="uni27E9" format="2">
   <advance width="1233"/>
   <unicode hex="27E9"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni27E_A_.glif b/source/Hack-Italic.ufo/glyphs/uni27E_A_.glif
index 9e0c13d61..7896b1b63 100644
--- a/source/Hack-Italic.ufo/glyphs/uni27E_A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni27E_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27EA" format="1">
+<glyph name="uni27EA" format="2">
   <advance width="1233"/>
   <unicode hex="27EA"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni27E_B_.glif b/source/Hack-Italic.ufo/glyphs/uni27E_B_.glif
index 09019e7a7..02f8f33a2 100644
--- a/source/Hack-Italic.ufo/glyphs/uni27E_B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni27E_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27EB" format="1">
+<glyph name="uni27EB" format="2">
   <advance width="1233"/>
   <unicode hex="27EB"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni27F_5.glif b/source/Hack-Italic.ufo/glyphs/uni27F_5.glif
index 494f82ff3..0b0f04fdd 100644
--- a/source/Hack-Italic.ufo/glyphs/uni27F_5.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni27F_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27F5" format="1">
+<glyph name="uni27F5" format="2">
   <advance width="1233"/>
   <unicode hex="27F5"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni27F_6.glif b/source/Hack-Italic.ufo/glyphs/uni27F_6.glif
index 4f5dcd4e1..72fe90acb 100644
--- a/source/Hack-Italic.ufo/glyphs/uni27F_6.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni27F_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27F6" format="1">
+<glyph name="uni27F6" format="2">
   <advance width="1233"/>
   <unicode hex="27F6"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni27F_7.glif b/source/Hack-Italic.ufo/glyphs/uni27F_7.glif
index 8851e19ec..68201ee66 100644
--- a/source/Hack-Italic.ufo/glyphs/uni27F_7.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni27F_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27F7" format="1">
+<glyph name="uni27F7" format="2">
   <advance width="1233"/>
   <unicode hex="27F7"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2987.glif b/source/Hack-Italic.ufo/glyphs/uni2987.glif
index af7a7a4e5..da17c062b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2987.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2987.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2987" format="1">
+<glyph name="uni2987" format="2">
   <advance width="1233"/>
   <unicode hex="2987"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="756" y="-270" type="line" name="hr00"/>
       <point x="413" y="-182"/>
       <point x="277" y="94"/>
-      <point x="277" y="409" type="curve" name="dh01" smooth="yes"/>
+      <point x="277" y="409" type="curve" smooth="yes" name="dh01"/>
       <point x="277" y="484"/>
       <point x="285" y="562"/>
       <point x="300" y="643" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="475" y="643" type="curve"/>
       <point x="460" y="571"/>
       <point x="455" y="502"/>
-      <point x="455" y="433" type="curve" name="dh02" smooth="yes"/>
+      <point x="455" y="433" type="curve" smooth="yes" name="dh02"/>
       <point x="455" y="176"/>
       <point x="546" y="-46"/>
       <point x="691" y="-89" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2988.glif b/source/Hack-Italic.ufo/glyphs/uni2988.glif
index 8b4677bd7..ef8f34a7c 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2988.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2988.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2988" format="1">
+<glyph name="uni2988" format="2">
   <advance width="1233"/>
   <unicode hex="2988"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="477" y="1554" type="line" name="hr00"/>
       <point x="820" y="1466"/>
       <point x="956" y="1190"/>
-      <point x="956" y="875" type="curve" name="dh02" smooth="yes"/>
+      <point x="956" y="875" type="curve" smooth="yes" name="dh02"/>
       <point x="956" y="800"/>
       <point x="948" y="722"/>
       <point x="933" y="641" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="758" y="641" type="curve"/>
       <point x="773" y="713"/>
       <point x="778" y="782"/>
-      <point x="778" y="851" type="curve" name="dh01" smooth="yes"/>
+      <point x="778" y="851" type="curve" smooth="yes" name="dh01"/>
       <point x="778" y="1108"/>
       <point x="687" y="1330"/>
       <point x="542" y="1373" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2997.glif b/source/Hack-Italic.ufo/glyphs/uni2997.glif
index 9763362e5..af566a880 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2997.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2997.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2997" format="1">
+<glyph name="uni2997" format="2">
   <advance width="1233"/>
   <unicode hex="2997"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2998.glif b/source/Hack-Italic.ufo/glyphs/uni2998.glif
index bb8f64d7a..8db8cdd52 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2998.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2998.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2998" format="1">
+<glyph name="uni2998" format="2">
   <advance width="1233"/>
   <unicode hex="2998"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni29E_B_.glif b/source/Hack-Italic.ufo/glyphs/uni29E_B_.glif
index dff97d656..419f61c0f 100644
--- a/source/Hack-Italic.ufo/glyphs/uni29E_B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni29E_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni29EB" format="1">
+<glyph name="uni29EB" format="2">
   <advance width="1233"/>
   <unicode hex="29EB"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni29F_A_.glif b/source/Hack-Italic.ufo/glyphs/uni29F_A_.glif
index cea9b6bd5..8feaab245 100644
--- a/source/Hack-Italic.ufo/glyphs/uni29F_A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni29F_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni29FA" format="1">
+<glyph name="uni29FA" format="2">
   <advance width="1233"/>
   <unicode hex="29FA"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni29F_B_.glif b/source/Hack-Italic.ufo/glyphs/uni29F_B_.glif
index 6fb527b22..d754bafa4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni29F_B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni29F_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni29FB" format="1">
+<glyph name="uni29FB" format="2">
   <advance width="1233"/>
   <unicode hex="29FB"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2A_00.glif b/source/Hack-Italic.ufo/glyphs/uni2A_00.glif
index 80ec25820..85eca2c39 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2A_00.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2A_00.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2A00" format="1">
+<glyph name="uni2A00" format="2">
   <advance width="1233"/>
   <unicode hex="2A00"/>
   <outline>
     <contour>
-      <point x="616" y="-465" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-465" type="curve" smooth="yes" name="hr00"/>
       <point x="259" y="-465"/>
       <point x="80" y="-130"/>
-      <point x="80" y="540" type="curve" name="dh01" smooth="yes"/>
+      <point x="80" y="540" type="curve" smooth="yes" name="dh01"/>
       <point x="80" y="1211"/>
       <point x="259" y="1547"/>
-      <point x="616" y="1547" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1547" type="curve" smooth="yes" name="dv03"/>
       <point x="974" y="1547"/>
       <point x="1153" y="1211"/>
-      <point x="1153" y="540" type="curve" name="dh06" smooth="yes"/>
+      <point x="1153" y="540" type="curve" smooth="yes" name="dh06"/>
       <point x="1153" y="-130"/>
       <point x="974" y="-465"/>
     </contour>
     <contour>
-      <point x="616" y="-325" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-325" type="curve" smooth="yes" name="dv01"/>
       <point x="881" y="-325"/>
       <point x="1013" y="-37"/>
-      <point x="1013" y="540" type="curve" name="dh05" smooth="yes"/>
+      <point x="1013" y="540" type="curve" smooth="yes" name="dh05"/>
       <point x="1013" y="1116"/>
       <point x="881" y="1407"/>
-      <point x="616" y="1407" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1407" type="curve" smooth="yes" name="dv02"/>
       <point x="352" y="1407"/>
       <point x="220" y="1118"/>
-      <point x="220" y="540" type="curve" name="dh02" smooth="yes"/>
+      <point x="220" y="540" type="curve" smooth="yes" name="dh02"/>
       <point x="220" y="-37"/>
       <point x="352" y="-325"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2A_2F_.glif b/source/Hack-Italic.ufo/glyphs/uni2A_2F_.glif
index 10019de02..95c9c9d81 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2A_2F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2A_2F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2A2F" format="1">
+<glyph name="uni2A2F" format="2">
   <advance width="1233"/>
   <unicode hex="2A2F"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2A_6A_.glif b/source/Hack-Italic.ufo/glyphs/uni2A_6A_.glif
index 2d2911cec..1b61ef1d3 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2A_6A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2A_6A_.glif
@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2A6A" format="1">
+<glyph name="uni2A6A" format="2">
   <advance width="1233"/>
   <unicode hex="2A6A"/>
   <outline>
     <contour>
-      <point x="521" y="851" type="line" name="dv05" smooth="yes"/>
+      <point x="521" y="851" type="line" smooth="yes" name="dv05"/>
       <point x="501" y="851"/>
       <point x="491" y="861"/>
-      <point x="491" y="881" type="curve" name="hr01" smooth="yes"/>
+      <point x="491" y="881" type="curve" smooth="yes" name="hr01"/>
       <point x="491" y="1126" type="line" smooth="yes"/>
       <point x="491" y="1146"/>
       <point x="501" y="1156"/>
-      <point x="521" y="1156" type="curve" name="dv06" smooth="yes"/>
-      <point x="713" y="1156" type="line" name="hr02" smooth="yes"/>
+      <point x="521" y="1156" type="curve" smooth="yes" name="dv06"/>
+      <point x="713" y="1156" type="line" smooth="yes" name="hr02"/>
       <point x="733" y="1156"/>
       <point x="743" y="1146"/>
       <point x="743" y="1126" type="curve" smooth="yes"/>
-      <point x="743" y="881" type="line" name="hr03" smooth="yes"/>
+      <point x="743" y="881" type="line" smooth="yes" name="hr03"/>
       <point x="743" y="861"/>
       <point x="733" y="851"/>
-      <point x="713" y="851" type="curve" name="hr04" smooth="yes"/>
+      <point x="713" y="851" type="curve" smooth="yes" name="hr04"/>
     </contour>
     <contour>
       <point x="88" y="671" type="line"/>
       <point x="192" y="751"/>
       <point x="285" y="786"/>
-      <point x="393" y="786" type="curve" name="dv04" smooth="yes"/>
+      <point x="393" y="786" type="curve" smooth="yes" name="dv04"/>
       <point x="457" y="786"/>
       <point x="532" y="775"/>
-      <point x="623" y="732" type="curve" name="hr05" smooth="yes"/>
+      <point x="623" y="732" type="curve" smooth="yes" name="hr05"/>
       <point x="655" y="717" type="line" smooth="yes"/>
       <point x="732" y="681"/>
       <point x="802" y="663"/>
-      <point x="865" y="663" type="curve" name="dv02" smooth="yes"/>
+      <point x="865" y="663" type="curve" smooth="yes" name="dv02"/>
       <point x="957" y="663"/>
       <point x="1045" y="702"/>
       <point x="1145" y="786" type="curve"/>
       <point x="1145" y="611" type="line"/>
       <point x="1045" y="531"/>
       <point x="952" y="497"/>
-      <point x="852" y="497" type="curve" name="dv01" smooth="yes"/>
+      <point x="852" y="497" type="curve" smooth="yes" name="dv01"/>
       <point x="776" y="497"/>
       <point x="717" y="517"/>
       <point x="645" y="548" type="curve"/>
@@ -48,7 +48,7 @@
       <point x="612" y="562" type="curve"/>
       <point x="522" y="599"/>
       <point x="468" y="620"/>
-      <point x="385" y="620" type="curve" name="dv03" smooth="yes"/>
+      <point x="385" y="620" type="curve" smooth="yes" name="dv03"/>
       <point x="277" y="620"/>
       <point x="189" y="585"/>
       <point x="88" y="497" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2A_6B_.glif b/source/Hack-Italic.ufo/glyphs/uni2A_6B_.glif
index 25e0da3aa..a9cbcb39a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2A_6B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2A_6B_.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2A6B" format="1">
+<glyph name="uni2A6B" format="2">
   <advance width="1233"/>
   <unicode hex="2A6B"/>
   <outline>
     <contour>
-      <point x="761" y="851" type="line" name="dv03" smooth="yes"/>
+      <point x="761" y="851" type="line" smooth="yes" name="dv03"/>
       <point x="741" y="851"/>
       <point x="731" y="861"/>
-      <point x="731" y="881" type="curve" name="ah01" smooth="yes"/>
+      <point x="731" y="881" type="curve" smooth="yes" name="ah01"/>
       <point x="731" y="1126" type="line" smooth="yes"/>
       <point x="731" y="1146"/>
       <point x="741" y="1156"/>
-      <point x="761" y="1156" type="curve" name="dv04" smooth="yes"/>
+      <point x="761" y="1156" type="curve" smooth="yes" name="dv04"/>
       <point x="953" y="1156" type="line" smooth="yes"/>
       <point x="973" y="1156"/>
       <point x="983" y="1146"/>
       <point x="983" y="1126" type="curve" smooth="yes"/>
-      <point x="983" y="881" type="line" name="sh01" smooth="yes"/>
+      <point x="983" y="881" type="line" smooth="yes" name="sh01"/>
       <point x="983" y="861"/>
       <point x="973" y="851"/>
       <point x="953" y="851" type="curve" smooth="yes"/>
@@ -25,21 +25,21 @@
       <point x="88" y="671" type="line"/>
       <point x="192" y="751"/>
       <point x="285" y="786"/>
-      <point x="393" y="786" type="curve" name="hr01" smooth="yes"/>
+      <point x="393" y="786" type="curve" smooth="yes" name="hr01"/>
       <point x="457" y="786"/>
       <point x="532" y="775"/>
       <point x="623" y="732" type="curve" smooth="yes"/>
       <point x="655" y="717" type="line" smooth="yes"/>
       <point x="732" y="681"/>
       <point x="802" y="663"/>
-      <point x="865" y="663" type="curve" name="hr02" smooth="yes"/>
+      <point x="865" y="663" type="curve" smooth="yes" name="hr02"/>
       <point x="957" y="663"/>
       <point x="1045" y="702"/>
       <point x="1145" y="786" type="curve"/>
       <point x="1145" y="611" type="line" name="hr03"/>
       <point x="1045" y="531"/>
       <point x="952" y="497"/>
-      <point x="852" y="497" type="curve" name="hr04" smooth="yes"/>
+      <point x="852" y="497" type="curve" smooth="yes" name="hr04"/>
       <point x="776" y="497"/>
       <point x="717" y="517"/>
       <point x="645" y="548" type="curve"/>
@@ -48,25 +48,25 @@
       <point x="612" y="562" type="curve"/>
       <point x="522" y="599"/>
       <point x="468" y="620"/>
-      <point x="385" y="620" type="curve" name="hr05" smooth="yes"/>
+      <point x="385" y="620" type="curve" smooth="yes" name="hr05"/>
       <point x="277" y="620"/>
       <point x="189" y="585"/>
       <point x="88" y="497" type="curve"/>
     </contour>
     <contour>
-      <point x="280" y="134" type="line" name="dv01" smooth="yes"/>
+      <point x="280" y="134" type="line" smooth="yes" name="dv01"/>
       <point x="260" y="134"/>
       <point x="250" y="144"/>
-      <point x="250" y="164" type="curve" name="sh02" smooth="yes"/>
+      <point x="250" y="164" type="curve" smooth="yes" name="sh02"/>
       <point x="250" y="409" type="line" smooth="yes"/>
       <point x="250" y="429"/>
       <point x="260" y="439"/>
-      <point x="280" y="439" type="curve" name="dv02" smooth="yes"/>
+      <point x="280" y="439" type="curve" smooth="yes" name="dv02"/>
       <point x="472" y="439" type="line" smooth="yes"/>
       <point x="492" y="439"/>
       <point x="502" y="429"/>
       <point x="502" y="409" type="curve" smooth="yes"/>
-      <point x="502" y="164" type="line" name="sh03" smooth="yes"/>
+      <point x="502" y="164" type="line" smooth="yes" name="sh03"/>
       <point x="502" y="144"/>
       <point x="492" y="134"/>
       <point x="472" y="134" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2B_05.glif b/source/Hack-Italic.ufo/glyphs/uni2B_05.glif
index aae2dafb0..1c57ffc1d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2B_05.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2B_05.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B05" format="1">
+<glyph name="uni2B05" format="2">
   <advance width="1233"/>
   <unicode hex="2B05"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2B_06.glif b/source/Hack-Italic.ufo/glyphs/uni2B_06.glif
index 8301a2c45..e781b0ca5 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2B_06.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2B_06.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B06" format="1">
+<glyph name="uni2B06" format="2">
   <advance width="1233"/>
   <unicode hex="2B06"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2B_07.glif b/source/Hack-Italic.ufo/glyphs/uni2B_07.glif
index 9b1a7e792..94c3f0bc7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2B_07.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2B_07.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B07" format="1">
+<glyph name="uni2B07" format="2">
   <advance width="1233"/>
   <unicode hex="2B07"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2B_08.glif b/source/Hack-Italic.ufo/glyphs/uni2B_08.glif
index a1663e612..bf05515aa 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2B_08.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2B_08.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B08" format="1">
+<glyph name="uni2B08" format="2">
   <advance width="1233"/>
   <unicode hex="2B08"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2B_09.glif b/source/Hack-Italic.ufo/glyphs/uni2B_09.glif
index 53bd2854b..443a0a27b 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2B_09.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2B_09.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B09" format="1">
+<glyph name="uni2B09" format="2">
   <advance width="1233"/>
   <unicode hex="2B09"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2B_0A_.glif b/source/Hack-Italic.ufo/glyphs/uni2B_0A_.glif
index 07d99088d..8d7b58520 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2B_0A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2B_0A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B0A" format="1">
+<glyph name="uni2B0A" format="2">
   <advance width="1233"/>
   <unicode hex="2B0A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2B_0B_.glif b/source/Hack-Italic.ufo/glyphs/uni2B_0B_.glif
index 1ff77d49c..40a643378 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2B_0B_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2B_0B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B0B" format="1">
+<glyph name="uni2B0B" format="2">
   <advance width="1233"/>
   <unicode hex="2B0B"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2B_0C_.glif b/source/Hack-Italic.ufo/glyphs/uni2B_0C_.glif
index 7464efd15..e77854f14 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2B_0C_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2B_0C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B0C" format="1">
+<glyph name="uni2B0C" format="2">
   <advance width="1233"/>
   <unicode hex="2B0C"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2B_0D_.glif b/source/Hack-Italic.ufo/glyphs/uni2B_0D_.glif
index 13acb4c41..bd4b267a7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2B_0D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2B_0D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B0D" format="1">
+<glyph name="uni2B0D" format="2">
   <advance width="1233"/>
   <unicode hex="2B0D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2B_16.glif b/source/Hack-Italic.ufo/glyphs/uni2B_16.glif
index 874df6ab1..5a1a56a23 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2B_16.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2B_16.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B16" format="1">
+<glyph name="uni2B16" format="2">
   <advance width="1233"/>
   <unicode hex="2B16"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2B_17.glif b/source/Hack-Italic.ufo/glyphs/uni2B_17.glif
index 074464fff..083909981 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2B_17.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2B_17.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B17" format="1">
+<glyph name="uni2B17" format="2">
   <advance width="1233"/>
   <unicode hex="2B17"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2B_18.glif b/source/Hack-Italic.ufo/glyphs/uni2B_18.glif
index 1834720d1..91a26a4d4 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2B_18.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2B_18.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B18" format="1">
+<glyph name="uni2B18" format="2">
   <advance width="1233"/>
   <unicode hex="2B18"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2B_19.glif b/source/Hack-Italic.ufo/glyphs/uni2B_19.glif
index d47b5b184..41eb9616d 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2B_19.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2B_19.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B19" format="1">
+<glyph name="uni2B19" format="2">
   <advance width="1233"/>
   <unicode hex="2B19"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2B_1A_.glif b/source/Hack-Italic.ufo/glyphs/uni2B_1A_.glif
index d926e42c8..492f88fb0 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2B_1A_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2B_1A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B1A" format="1">
+<glyph name="uni2B1A" format="2">
   <advance width="1233"/>
   <unicode hex="2B1A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2C_7D_.glif b/source/Hack-Italic.ufo/glyphs/uni2C_7D_.glif
index c5d6eff09..45f809259 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2C_7D_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2C_7D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2C7D" format="1">
+<glyph name="uni2C7D" format="2">
   <advance width="1233"/>
   <unicode hex="2C7D"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2E_18.case.glif b/source/Hack-Italic.ufo/glyphs/uni2E_18.case.glif
index 21e105cf5..c73a960c7 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2E_18.case.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2E_18.case.glif
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E18.case" format="1">
+<glyph name="uni2E18.case" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="768" y="1252" type="curve" name="hr00" smooth="yes"/>
+      <point x="768" y="1252" type="curve" smooth="yes" name="hr00"/>
       <point x="733" y="1252"/>
       <point x="704" y="1262"/>
       <point x="680" y="1289" type="curve" smooth="yes"/>
       <point x="655" y="1318"/>
       <point x="647" y="1350"/>
-      <point x="647" y="1385" type="curve" name="ah01" smooth="yes"/>
+      <point x="647" y="1385" type="curve" smooth="yes" name="ah01"/>
       <point x="647" y="1487"/>
       <point x="735" y="1556"/>
-      <point x="822" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="822" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="853" y="1556"/>
       <point x="889" y="1546"/>
       <point x="913" y="1519" type="curve" smooth="yes"/>
       <point x="933" y="1496"/>
       <point x="944" y="1463"/>
-      <point x="944" y="1426" type="curve" name="sh01" smooth="yes"/>
+      <point x="944" y="1426" type="curve" smooth="yes" name="sh01"/>
       <point x="944" y="1381"/>
       <point x="927" y="1336"/>
       <point x="890" y="1301" type="curve" smooth="yes"/>
@@ -26,13 +26,13 @@
       <point x="816" y="1252"/>
     </contour>
     <contour>
-      <point x="492" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="492" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="266" y="-27"/>
       <point x="142" y="83"/>
-      <point x="142" y="250" type="curve" name="sh02" smooth="yes"/>
+      <point x="142" y="250" type="curve" smooth="yes" name="sh02"/>
       <point x="142" y="274"/>
       <point x="145" y="299"/>
-      <point x="150" y="326" type="curve" name="sh03" smooth="yes"/>
+      <point x="150" y="326" type="curve" smooth="yes" name="sh03"/>
       <point x="169" y="427"/>
       <point x="226" y="508"/>
       <point x="369" y="625" type="curve" smooth="yes"/>
@@ -58,10 +58,10 @@
       <point x="501" y="532" type="line" smooth="yes"/>
       <point x="405" y="452"/>
       <point x="367" y="409"/>
-      <point x="354" y="336" type="curve" name="sh07" smooth="yes"/>
+      <point x="354" y="336" type="curve" smooth="yes" name="sh07"/>
       <point x="351" y="321"/>
       <point x="350" y="307"/>
-      <point x="350" y="295" type="curve" name="sh06" smooth="yes"/>
+      <point x="350" y="295" type="curve" smooth="yes" name="sh06"/>
       <point x="350" y="207"/>
       <point x="409" y="166"/>
       <point x="471" y="147" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2E_18.glif b/source/Hack-Italic.ufo/glyphs/uni2E_18.glif
index d6c0c0aa0..1c310bffd 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2E_18.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2E_18.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E18" format="1">
+<glyph name="uni2E18" format="2">
   <advance width="1233"/>
   <unicode hex="2E18"/>
   <outline>
     <contour>
-      <point x="785" y="950" type="curve" name="hr00" smooth="yes"/>
+      <point x="785" y="950" type="curve" smooth="yes" name="hr00"/>
       <point x="750" y="950"/>
       <point x="721" y="960"/>
       <point x="697" y="987" type="curve" smooth="yes"/>
       <point x="672" y="1016"/>
       <point x="664" y="1048"/>
-      <point x="664" y="1083" type="curve" name="ah01" smooth="yes"/>
+      <point x="664" y="1083" type="curve" smooth="yes" name="ah01"/>
       <point x="664" y="1185"/>
       <point x="752" y="1254"/>
-      <point x="839" y="1254" type="curve" name="dv01" smooth="yes"/>
+      <point x="839" y="1254" type="curve" smooth="yes" name="dv01"/>
       <point x="870" y="1254"/>
       <point x="906" y="1244"/>
       <point x="930" y="1217" type="curve" smooth="yes"/>
       <point x="950" y="1194"/>
       <point x="961" y="1161"/>
-      <point x="961" y="1124" type="curve" name="sh01" smooth="yes"/>
+      <point x="961" y="1124" type="curve" smooth="yes" name="sh01"/>
       <point x="961" y="1079"/>
       <point x="944" y="1034"/>
       <point x="907" y="999" type="curve" smooth="yes"/>
@@ -27,13 +27,13 @@
       <point x="833" y="950"/>
     </contour>
     <contour>
-      <point x="492" y="-400" type="curve" name="av01" smooth="yes"/>
+      <point x="492" y="-400" type="curve" smooth="yes" name="av01"/>
       <point x="266" y="-400"/>
       <point x="142" y="-290"/>
-      <point x="142" y="-123" type="curve" name="sh02" smooth="yes"/>
+      <point x="142" y="-123" type="curve" smooth="yes" name="sh02"/>
       <point x="142" y="-99"/>
       <point x="145" y="-74"/>
-      <point x="150" y="-47" type="curve" name="sh03" smooth="yes"/>
+      <point x="150" y="-47" type="curve" smooth="yes" name="sh03"/>
       <point x="169" y="54"/>
       <point x="226" y="135"/>
       <point x="369" y="252" type="curve" smooth="yes"/>
@@ -59,10 +59,10 @@
       <point x="501" y="159" type="line" smooth="yes"/>
       <point x="405" y="79"/>
       <point x="367" y="36"/>
-      <point x="354" y="-37" type="curve" name="sh07" smooth="yes"/>
+      <point x="354" y="-37" type="curve" smooth="yes" name="sh07"/>
       <point x="351" y="-52"/>
       <point x="350" y="-66"/>
-      <point x="350" y="-78" type="curve" name="sh06" smooth="yes"/>
+      <point x="350" y="-78" type="curve" smooth="yes" name="sh06"/>
       <point x="350" y="-166"/>
       <point x="409" y="-207"/>
       <point x="471" y="-226" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2E_1F_.glif b/source/Hack-Italic.ufo/glyphs/uni2E_1F_.glif
index 792be6441..a594c2fec 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2E_1F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2E_1F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E1F" format="1">
+<glyph name="uni2E1F" format="2">
   <advance width="1233"/>
   <unicode hex="2E1F"/>
   <outline>
@@ -7,21 +7,21 @@
       <point x="88" y="671" type="line" name="hr00"/>
       <point x="192" y="751"/>
       <point x="285" y="786"/>
-      <point x="393" y="786" type="curve" name="dv02" smooth="yes"/>
+      <point x="393" y="786" type="curve" smooth="yes" name="dv02"/>
       <point x="457" y="786"/>
       <point x="532" y="775"/>
       <point x="623" y="732" type="curve" smooth="yes"/>
       <point x="655" y="717" type="line" smooth="yes"/>
       <point x="732" y="681"/>
       <point x="802" y="663"/>
-      <point x="865" y="663" type="curve" name="dv04" smooth="yes"/>
+      <point x="865" y="663" type="curve" smooth="yes" name="dv04"/>
       <point x="957" y="663"/>
       <point x="1045" y="702"/>
       <point x="1145" y="786" type="curve"/>
       <point x="1145" y="611" type="line"/>
       <point x="1045" y="531"/>
       <point x="952" y="497"/>
-      <point x="852" y="497" type="curve" name="dv03" smooth="yes"/>
+      <point x="852" y="497" type="curve" smooth="yes" name="dv03"/>
       <point x="776" y="497"/>
       <point x="717" y="517"/>
       <point x="645" y="548" type="curve"/>
@@ -30,25 +30,25 @@
       <point x="612" y="562" type="curve" name="hr01"/>
       <point x="522" y="599"/>
       <point x="468" y="620"/>
-      <point x="385" y="620" type="curve" name="dv01" smooth="yes"/>
+      <point x="385" y="620" type="curve" smooth="yes" name="dv01"/>
       <point x="277" y="620"/>
       <point x="189" y="585"/>
       <point x="88" y="497" type="curve"/>
     </contour>
     <contour>
-      <point x="520" y="134" type="line" name="hr02" smooth="yes"/>
+      <point x="520" y="134" type="line" smooth="yes" name="hr02"/>
       <point x="500" y="134"/>
       <point x="490" y="144"/>
-      <point x="490" y="164" type="curve" name="dh01" smooth="yes"/>
-      <point x="490" y="409" type="line" name="hr03" smooth="yes"/>
+      <point x="490" y="164" type="curve" smooth="yes" name="dh01"/>
+      <point x="490" y="409" type="line" smooth="yes" name="hr03"/>
       <point x="490" y="429"/>
       <point x="500" y="439"/>
-      <point x="520" y="439" type="curve" name="hr04" smooth="yes"/>
+      <point x="520" y="439" type="curve" smooth="yes" name="hr04"/>
       <point x="712" y="439" type="line" smooth="yes"/>
       <point x="732" y="439"/>
       <point x="742" y="429"/>
       <point x="742" y="409" type="curve" smooth="yes"/>
-      <point x="742" y="164" type="line" name="hr05" smooth="yes"/>
+      <point x="742" y="164" type="line" smooth="yes" name="hr05"/>
       <point x="742" y="144"/>
       <point x="732" y="134"/>
       <point x="712" y="134" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2E_22.glif b/source/Hack-Italic.ufo/glyphs/uni2E_22.glif
index 7325ff5f5..e1b954264 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2E_22.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2E_22.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E22" format="1">
+<glyph name="uni2E22" format="2">
   <advance width="1233"/>
   <unicode hex="2E22"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2E_23.glif b/source/Hack-Italic.ufo/glyphs/uni2E_23.glif
index bb6a48352..c22e17518 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2E_23.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2E_23.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E23" format="1">
+<glyph name="uni2E23" format="2">
   <advance width="1233"/>
   <unicode hex="2E23"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2E_24.glif b/source/Hack-Italic.ufo/glyphs/uni2E_24.glif
index 7e08dcfc9..ed9047c57 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2E_24.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2E_24.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E24" format="1">
+<glyph name="uni2E24" format="2">
   <advance width="1233"/>
   <unicode hex="2E24"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2E_25.glif b/source/Hack-Italic.ufo/glyphs/uni2E_25.glif
index 21f0b7a0f..1ee632302 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2E_25.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2E_25.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E25" format="1">
+<glyph name="uni2E25" format="2">
   <advance width="1233"/>
   <unicode hex="2E25"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uni2E_2E_.glif b/source/Hack-Italic.ufo/glyphs/uni2E_2E_.glif
index 0361b5fd6..719fd4a7a 100644
--- a/source/Hack-Italic.ufo/glyphs/uni2E_2E_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uni2E_2E_.glif
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E2E" format="1">
+<glyph name="uni2E2E" format="2">
   <advance width="1233"/>
   <unicode hex="2E2E"/>
   <outline>
     <contour>
-      <point x="528" y="524" type="line" name="hr00" smooth="yes"/>
+      <point x="528" y="524" type="line" smooth="yes" name="hr00"/>
       <point x="539" y="580"/>
       <point x="543" y="612"/>
-      <point x="543" y="639" type="curve" name="dh03" smooth="yes"/>
+      <point x="543" y="639" type="curve" smooth="yes" name="dh03"/>
       <point x="543" y="672"/>
       <point x="541" y="697"/>
       <point x="472" y="782" type="curve" smooth="yes"/>
       <point x="401" y="868" type="line" smooth="yes"/>
       <point x="321" y="964"/>
       <point x="291" y="1032"/>
-      <point x="291" y="1106" type="curve" name="dh01" smooth="yes"/>
+      <point x="291" y="1106" type="curve" smooth="yes" name="dh01"/>
       <point x="291" y="1125"/>
       <point x="293" y="1146"/>
       <point x="297" y="1167" type="curve" smooth="yes"/>
       <point x="337" y="1382"/>
       <point x="531" y="1520"/>
-      <point x="778" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="778" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="907" y="1520"/>
       <point x="1030" y="1483"/>
       <point x="1141" y="1407" type="curve"/>
       <point x="1104" y="1219" type="line"/>
       <point x="991" y="1308"/>
       <point x="882" y="1356"/>
-      <point x="774" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="774" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="634" y="1356"/>
       <point x="519" y="1274"/>
       <point x="498" y="1157" type="curve" smooth="yes"/>
       <point x="496" y="1145"/>
       <point x="495" y="1133"/>
-      <point x="495" y="1121" type="curve" name="dh02" smooth="yes"/>
+      <point x="495" y="1121" type="curve" smooth="yes" name="dh02"/>
       <point x="495" y="1069"/>
       <point x="517" y="1020"/>
       <point x="568" y="961" type="curve" name="hr01"/>
       <point x="641" y="872" type="line" smooth="yes"/>
       <point x="708" y="788"/>
       <point x="737" y="736"/>
-      <point x="737" y="659" type="curve" name="dh04" smooth="yes"/>
+      <point x="737" y="659" type="curve" smooth="yes" name="dh04"/>
       <point x="737" y="630"/>
       <point x="733" y="595"/>
       <point x="725" y="555" type="curve" smooth="yes"/>
@@ -48,22 +48,22 @@
       <point x="504" y="401" type="line" name="sh03"/>
     </contour>
     <contour>
-      <point x="520" y="-40" type="curve" name="dv01" smooth="yes"/>
+      <point x="520" y="-40" type="curve" smooth="yes" name="dv01"/>
       <point x="485" y="-40"/>
       <point x="456" y="-30"/>
       <point x="432" y="-3" type="curve" smooth="yes"/>
       <point x="407" y="26"/>
       <point x="399" y="58"/>
-      <point x="399" y="93" type="curve" name="ih01" smooth="yes"/>
+      <point x="399" y="93" type="curve" smooth="yes" name="ih01"/>
       <point x="399" y="195"/>
       <point x="487" y="264"/>
-      <point x="574" y="264" type="curve" name="dv02" smooth="yes"/>
+      <point x="574" y="264" type="curve" smooth="yes" name="dv02"/>
       <point x="605" y="264"/>
       <point x="641" y="254"/>
       <point x="665" y="227" type="curve" smooth="yes"/>
       <point x="685" y="204"/>
       <point x="696" y="171"/>
-      <point x="696" y="134" type="curve" name="sh01" smooth="yes"/>
+      <point x="696" y="134" type="curve" smooth="yes" name="sh01"/>
       <point x="696" y="89"/>
       <point x="679" y="44"/>
       <point x="642" y="9" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uniE_0A_0.glif b/source/Hack-Italic.ufo/glyphs/uniE_0A_0.glif
index 4b063facc..33d485208 100644
--- a/source/Hack-Italic.ufo/glyphs/uniE_0A_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uniE_0A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0A0" format="1">
+<glyph name="uniE0A0" format="2">
   <advance width="1233"/>
   <unicode hex="E0A0"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="279" y="624" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="279" y="159" type="line" name="sh01" smooth="yes"/>
+      <point x="279" y="159" type="line" smooth="yes" name="sh01"/>
       <point x="279" y="266"/>
       <point x="302" y="352"/>
       <point x="349" y="419" type="curve" smooth="yes"/>
@@ -23,13 +23,13 @@
       <point x="747" y="765" type="curve" smooth="yes"/>
       <point x="770" y="811"/>
       <point x="781" y="873"/>
-      <point x="781" y="950" type="curve" name="dh02" smooth="yes"/>
+      <point x="781" y="950" type="curve" smooth="yes" name="dh02"/>
       <point x="781" y="1242" type="line"/>
       <point x="596" y="1242" type="line" name="ih01"/>
       <point x="856" y="1545" type="line"/>
       <point x="1113" y="1242" type="line" name="iv02"/>
       <point x="928" y="1242" type="line"/>
-      <point x="928" y="901" type="line" name="dh03" smooth="yes"/>
+      <point x="928" y="901" type="line" smooth="yes" name="dh03"/>
       <point x="928" y="793"/>
       <point x="916" y="708"/>
       <point x="881" y="640" type="curve" smooth="yes"/>
@@ -39,7 +39,7 @@
       <point x="672" y="442" type="line" smooth="yes"/>
       <point x="567" y="369"/>
       <point x="524" y="319"/>
-      <point x="524" y="159" type="curve" name="sh02" smooth="yes"/>
+      <point x="524" y="159" type="curve" smooth="yes" name="sh02"/>
       <point x="524" y="-267" type="line" name="ab01"/>
       <point x="279" y="-267" type="line"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/uniE_0A_1.glif b/source/Hack-Italic.ufo/glyphs/uniE_0A_1.glif
index 946a5d679..b19d5baaa 100644
--- a/source/Hack-Italic.ufo/glyphs/uniE_0A_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uniE_0A_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0A1" format="1">
+<glyph name="uniE0A1" format="2">
   <advance width="1233"/>
   <unicode hex="E0A1"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uniE_0A_2.glif b/source/Hack-Italic.ufo/glyphs/uniE_0A_2.glif
index 64091a334..5c402e4dc 100644
--- a/source/Hack-Italic.ufo/glyphs/uniE_0A_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uniE_0A_2.glif
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0A2" format="1">
+<glyph name="uniE0A2" format="2">
   <advance width="1233"/>
   <unicode hex="E0A2"/>
   <outline>
     <contour>
-      <point x="276" y="-267" type="line" name="ab01" smooth="yes"/>
+      <point x="276" y="-267" type="line" smooth="yes" name="ab01"/>
       <point x="157" y="-267"/>
       <point x="98" y="-207"/>
       <point x="98" y="-86" type="curve" smooth="yes"/>
-      <point x="98" y="795" type="line" name="dh01" smooth="yes"/>
+      <point x="98" y="795" type="line" smooth="yes" name="dh01"/>
       <point x="98" y="924"/>
       <point x="150" y="989"/>
       <point x="253" y="989" type="curve" name="hr01"/>
@@ -18,24 +18,24 @@
       <point x="360" y="1673" type="curve" smooth="yes"/>
       <point x="428" y="1746"/>
       <point x="514" y="1783"/>
-      <point x="617" y="1783" type="curve" name="at01" smooth="yes"/>
+      <point x="617" y="1783" type="curve" smooth="yes" name="at01"/>
       <point x="720" y="1783"/>
       <point x="806" y="1746"/>
       <point x="874" y="1673" type="curve" smooth="yes"/>
       <point x="939" y="1601"/>
       <point x="981" y="1504"/>
-      <point x="981" y="1379" type="curve" name="hr02" smooth="yes"/>
+      <point x="981" y="1379" type="curve" smooth="yes" name="hr02"/>
       <point x="981" y="989" type="line" name="sh01"/>
       <point x="1084" y="989"/>
       <point x="1136" y="924"/>
-      <point x="1136" y="795" type="curve" name="dh03" smooth="yes"/>
-      <point x="1136" y="-86" type="line" name="hr03" smooth="yes"/>
+      <point x="1136" y="795" type="curve" smooth="yes" name="dh03"/>
+      <point x="1136" y="-86" type="line" smooth="yes" name="hr03"/>
       <point x="1136" y="-207"/>
       <point x="1076" y="-267"/>
       <point x="955" y="-267" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="617" y="1618" type="curve" name="sv01" smooth="yes"/>
+      <point x="617" y="1618" type="curve" smooth="yes" name="sv01"/>
       <point x="558" y="1618"/>
       <point x="513" y="1595"/>
       <point x="478" y="1552" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="428" y="1379" type="curve" smooth="yes"/>
       <point x="428" y="989" type="line" name="sh02"/>
       <point x="806" y="989" type="line" name="ih01"/>
-      <point x="806" y="1379" type="line" name="hr04" smooth="yes"/>
+      <point x="806" y="1379" type="line" smooth="yes" name="hr04"/>
       <point x="806" y="1523"/>
       <point x="729" y="1618"/>
     </contour>
@@ -52,19 +52,19 @@
       <point x="688" y="449" type="line" name="hr05"/>
       <point x="745" y="478"/>
       <point x="774" y="525"/>
-      <point x="774" y="590" type="curve" name="sh03" smooth="yes"/>
+      <point x="774" y="590" type="curve" smooth="yes" name="sh03"/>
       <point x="774" y="635"/>
       <point x="761" y="671"/>
       <point x="730" y="703" type="curve"/>
       <point x="698" y="734"/>
       <point x="662" y="750"/>
-      <point x="617" y="750" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="750" type="curve" smooth="yes" name="dv01"/>
       <point x="572" y="750"/>
       <point x="536" y="734"/>
       <point x="504" y="703" type="curve"/>
       <point x="473" y="671"/>
       <point x="457" y="635"/>
-      <point x="457" y="588" type="curve" name="dh02" smooth="yes"/>
+      <point x="457" y="588" type="curve" smooth="yes" name="dh02"/>
       <point x="457" y="524"/>
       <point x="486" y="478"/>
       <point x="544" y="449" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uniE_0B_0.glif b/source/Hack-Italic.ufo/glyphs/uniE_0B_0.glif
index 0c37c5316..b6d912aac 100644
--- a/source/Hack-Italic.ufo/glyphs/uniE_0B_0.glif
+++ b/source/Hack-Italic.ufo/glyphs/uniE_0B_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0B0" format="1">
+<glyph name="uniE0B0" format="2">
   <advance width="1233"/>
   <unicode hex="E0B0"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uniE_0B_1.glif b/source/Hack-Italic.ufo/glyphs/uniE_0B_1.glif
index 8b0f5914b..4eb33e829 100644
--- a/source/Hack-Italic.ufo/glyphs/uniE_0B_1.glif
+++ b/source/Hack-Italic.ufo/glyphs/uniE_0B_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0B1" format="1">
+<glyph name="uniE0B1" format="2">
   <advance width="1233"/>
   <unicode hex="E0B1"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uniE_0B_2.glif b/source/Hack-Italic.ufo/glyphs/uniE_0B_2.glif
index c9c536151..3b9433769 100644
--- a/source/Hack-Italic.ufo/glyphs/uniE_0B_2.glif
+++ b/source/Hack-Italic.ufo/glyphs/uniE_0B_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0B2" format="1">
+<glyph name="uniE0B2" format="2">
   <advance width="1233"/>
   <unicode hex="E0B2"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uniE_0B_3.glif b/source/Hack-Italic.ufo/glyphs/uniE_0B_3.glif
index 244bd9d3a..d644e1e16 100644
--- a/source/Hack-Italic.ufo/glyphs/uniE_0B_3.glif
+++ b/source/Hack-Italic.ufo/glyphs/uniE_0B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0B3" format="1">
+<glyph name="uniE0B3" format="2">
   <advance width="1233"/>
   <unicode hex="E0B3"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uniF_E_F_F_.glif b/source/Hack-Italic.ufo/glyphs/uniF_E_F_F_.glif
index 3ca2362e7..f5d2cecac 100644
--- a/source/Hack-Italic.ufo/glyphs/uniF_E_F_F_.glif
+++ b/source/Hack-Italic.ufo/glyphs/uniF_E_F_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniFEFF" format="1">
+<glyph name="uniFEFF" format="2">
   <advance width="1233"/>
   <unicode hex="FEFF"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/union.glif b/source/Hack-Italic.ufo/glyphs/union.glif
index 4ef708ff2..3d4ee9a5b 100644
--- a/source/Hack-Italic.ufo/glyphs/union.glif
+++ b/source/Hack-Italic.ufo/glyphs/union.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="union" format="1">
+<glyph name="union" format="2">
   <advance width="1233"/>
   <unicode hex="222A"/>
   <outline>
     <contour>
-      <point x="616" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="484" y="0"/>
       <point x="351" y="40"/>
       <point x="274" y="117" type="curve" smooth="yes"/>
@@ -13,10 +13,10 @@
       <point x="189" y="278" type="curve" smooth="yes"/>
       <point x="172" y="347"/>
       <point x="164" y="446"/>
-      <point x="164" y="606" type="curve" name="sh01" smooth="yes"/>
+      <point x="164" y="606" type="curve" smooth="yes" name="sh01"/>
       <point x="164" y="1186" type="line" name="av01"/>
       <point x="337" y="1186" type="line"/>
-      <point x="337" y="514" type="line" name="sh02" smooth="yes"/>
+      <point x="337" y="514" type="line" smooth="yes" name="sh02"/>
       <point x="337" y="490"/>
       <point x="341" y="411"/>
       <point x="349" y="354" type="curve" name="sh03"/>
@@ -25,19 +25,19 @@
       <point x="367" y="283" type="curve" smooth="yes"/>
       <point x="404" y="207"/>
       <point x="512" y="164"/>
-      <point x="615" y="164" type="curve" name="sv01" smooth="yes"/>
+      <point x="615" y="164" type="curve" smooth="yes" name="sv01"/>
       <point x="723" y="164"/>
       <point x="834" y="212"/>
       <point x="866" y="284" type="curve" smooth="yes"/>
       <point x="870" y="295"/>
       <point x="878" y="318"/>
-      <point x="885" y="354" type="curve" name="sh04" smooth="yes"/>
+      <point x="885" y="354" type="curve" smooth="yes" name="sh04"/>
       <point x="893" y="402"/>
       <point x="896" y="478"/>
-      <point x="896" y="512" type="curve" name="ah01" smooth="yes"/>
+      <point x="896" y="512" type="curve" smooth="yes" name="ah01"/>
       <point x="896" y="1186" type="line" name="av02"/>
       <point x="1068" y="1186" type="line"/>
-      <point x="1068" y="606" type="line" name="sh05" smooth="yes"/>
+      <point x="1068" y="606" type="line" smooth="yes" name="sh05"/>
       <point x="1068" y="413"/>
       <point x="1059" y="332"/>
       <point x="1043" y="276" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/universal.glif b/source/Hack-Italic.ufo/glyphs/universal.glif
index e0d528b23..f31583690 100644
--- a/source/Hack-Italic.ufo/glyphs/universal.glif
+++ b/source/Hack-Italic.ufo/glyphs/universal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="universal" format="1">
+<glyph name="universal" format="2">
   <advance width="1233"/>
   <unicode hex="2200"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/uogonek.glif b/source/Hack-Italic.ufo/glyphs/uogonek.glif
index a1f45a847..d79e609d1 100644
--- a/source/Hack-Italic.ufo/glyphs/uogonek.glif
+++ b/source/Hack-Italic.ufo/glyphs/uogonek.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uogonek" format="1">
+<glyph name="uogonek" format="2">
   <advance width="1233"/>
   <unicode hex="0173"/>
   <outline>
     <contour>
-      <point x="409" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="409" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="233" y="-27"/>
       <point x="125" y="74"/>
-      <point x="125" y="253" type="curve" name="sh01" smooth="yes"/>
+      <point x="125" y="253" type="curve" smooth="yes" name="sh01"/>
       <point x="125" y="296"/>
       <point x="131" y="362"/>
       <point x="143" y="426" type="curve" smooth="yes"/>
@@ -16,10 +16,10 @@
       <point x="326" y="426" type="line" smooth="yes"/>
       <point x="318" y="383"/>
       <point x="311" y="331"/>
-      <point x="311" y="296" type="curve" name="sh02" smooth="yes"/>
+      <point x="311" y="296" type="curve" smooth="yes" name="sh02"/>
       <point x="311" y="192"/>
       <point x="376" y="133"/>
-      <point x="489" y="133" type="curve" name="sv01" smooth="yes"/>
+      <point x="489" y="133" type="curve" smooth="yes" name="sv01"/>
       <point x="654" y="133"/>
       <point x="780" y="256"/>
       <point x="825" y="487" type="curve" smooth="yes"/>
@@ -32,20 +32,20 @@
       <point x="550" y="-27"/>
     </contour>
     <contour>
-      <point x="850" y="-397" type="curve" name="dv01" smooth="yes"/>
+      <point x="850" y="-397" type="curve" smooth="yes" name="dv01"/>
       <point x="719" y="-397"/>
       <point x="645" y="-340"/>
-      <point x="645" y="-247" type="curve" name="ah01" smooth="yes"/>
+      <point x="645" y="-247" type="curve" smooth="yes" name="ah01"/>
       <point x="645" y="-172"/>
       <point x="693" y="-95"/>
       <point x="797" y="-2" type="curve" name="sh04"/>
       <point x="916" y="-2" type="line" name="iv01"/>
       <point x="835" y="-79"/>
       <point x="791" y="-146"/>
-      <point x="791" y="-202" type="curve" name="sh03" smooth="yes"/>
+      <point x="791" y="-202" type="curve" smooth="yes" name="sh03"/>
       <point x="791" y="-249"/>
       <point x="823" y="-274"/>
-      <point x="887" y="-274" type="curve" name="dv02" smooth="yes"/>
+      <point x="887" y="-274" type="curve" smooth="yes" name="dv02"/>
       <point x="926" y="-274"/>
       <point x="971" y="-264"/>
       <point x="1014" y="-244" type="curve"/>
diff --git a/source/Hack-Italic.ufo/glyphs/upblock.glif b/source/Hack-Italic.ufo/glyphs/upblock.glif
index 98203446b..d75b178db 100644
--- a/source/Hack-Italic.ufo/glyphs/upblock.glif
+++ b/source/Hack-Italic.ufo/glyphs/upblock.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="upblock" format="1">
+<glyph name="upblock" format="2">
   <advance width="1233"/>
   <unicode hex="2580"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/upsilon.glif b/source/Hack-Italic.ufo/glyphs/upsilon.glif
index 1b673258c..6b8752a67 100644
--- a/source/Hack-Italic.ufo/glyphs/upsilon.glif
+++ b/source/Hack-Italic.ufo/glyphs/upsilon.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="upsilon" format="1">
+<glyph name="upsilon" format="2">
   <advance width="1233"/>
   <unicode hex="03C5"/>
   <outline>
     <contour>
-      <point x="485" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="485" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="302" y="0"/>
       <point x="216" y="81"/>
-      <point x="216" y="257" type="curve" name="sh01" smooth="yes"/>
+      <point x="216" y="257" type="curve" smooth="yes" name="sh01"/>
       <point x="216" y="301"/>
       <point x="221" y="350"/>
       <point x="232" y="406" type="curve" smooth="yes"/>
@@ -18,23 +18,23 @@
       <point x="417" y="395" type="line" smooth="yes"/>
       <point x="408" y="347"/>
       <point x="402" y="307"/>
-      <point x="402" y="275" type="curve" name="sh02" smooth="yes"/>
+      <point x="402" y="275" type="curve" smooth="yes" name="sh02"/>
       <point x="402" y="190"/>
       <point x="437" y="156"/>
-      <point x="525" y="156" type="curve" name="sv02" smooth="yes"/>
+      <point x="525" y="156" type="curve" smooth="yes" name="sv02"/>
       <point x="750" y="156"/>
       <point x="894" y="387"/>
       <point x="958" y="640" type="curve" smooth="yes"/>
       <point x="973" y="697"/>
       <point x="982" y="756"/>
-      <point x="982" y="820" type="curve" name="ah01" smooth="yes"/>
+      <point x="982" y="820" type="curve" smooth="yes" name="ah01"/>
       <point x="982" y="913"/>
       <point x="960" y="1012"/>
       <point x="895" y="1120" type="curve" name="ih01"/>
       <point x="1081" y="1120" type="line"/>
       <point x="1129" y="1037"/>
       <point x="1161" y="932"/>
-      <point x="1161" y="803" type="curve" name="sh03" smooth="yes"/>
+      <point x="1161" y="803" type="curve" smooth="yes" name="sh03"/>
       <point x="1161" y="751"/>
       <point x="1156" y="697"/>
       <point x="1144" y="638" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/upsilondieresis.glif b/source/Hack-Italic.ufo/glyphs/upsilondieresis.glif
index 9408a3a6f..e1433986a 100644
--- a/source/Hack-Italic.ufo/glyphs/upsilondieresis.glif
+++ b/source/Hack-Italic.ufo/glyphs/upsilondieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="upsilondieresis" format="1">
+<glyph name="upsilondieresis" format="2">
   <advance width="1233"/>
   <unicode hex="03CB"/>
   <outline>
     <contour>
-      <point x="469" y="1320" type="line" name="hr00" smooth="yes"/>
+      <point x="469" y="1320" type="line" smooth="yes" name="hr00"/>
       <point x="449" y="1320"/>
       <point x="438" y="1333"/>
       <point x="442" y="1353" type="curve" smooth="yes"/>
       <point x="470" y="1495" type="line"/>
       <point x="473" y="1513"/>
       <point x="483" y="1522"/>
-      <point x="502" y="1522" type="curve" name="dv01" smooth="yes"/>
+      <point x="502" y="1522" type="curve" smooth="yes" name="dv01"/>
       <point x="645" y="1522" type="line" smooth="yes"/>
       <point x="665" y="1522"/>
       <point x="676" y="1509"/>
@@ -22,14 +22,14 @@
       <point x="612" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="860" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="860" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="840" y="1320"/>
       <point x="829" y="1333"/>
       <point x="833" y="1353" type="curve" smooth="yes"/>
       <point x="861" y="1495" type="line"/>
       <point x="864" y="1513"/>
       <point x="874" y="1522"/>
-      <point x="893" y="1522" type="curve" name="sv02" smooth="yes"/>
+      <point x="893" y="1522" type="curve" smooth="yes" name="sv02"/>
       <point x="1036" y="1522" type="line" smooth="yes"/>
       <point x="1056" y="1522"/>
       <point x="1067" y="1509"/>
@@ -40,10 +40,10 @@
       <point x="1003" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="485" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="485" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="302" y="0"/>
       <point x="216" y="81"/>
-      <point x="216" y="257" type="curve" name="sh01" smooth="yes"/>
+      <point x="216" y="257" type="curve" smooth="yes" name="sh01"/>
       <point x="216" y="301"/>
       <point x="221" y="350"/>
       <point x="232" y="406" type="curve" smooth="yes"/>
@@ -54,23 +54,23 @@
       <point x="417" y="395" type="line" smooth="yes"/>
       <point x="408" y="347"/>
       <point x="402" y="307"/>
-      <point x="402" y="275" type="curve" name="sh02" smooth="yes"/>
+      <point x="402" y="275" type="curve" smooth="yes" name="sh02"/>
       <point x="402" y="190"/>
       <point x="437" y="156"/>
-      <point x="525" y="156" type="curve" name="sv04" smooth="yes"/>
+      <point x="525" y="156" type="curve" smooth="yes" name="sv04"/>
       <point x="750" y="156"/>
       <point x="894" y="387"/>
       <point x="958" y="640" type="curve" smooth="yes"/>
       <point x="973" y="697"/>
       <point x="982" y="756"/>
-      <point x="982" y="820" type="curve" name="ah01" smooth="yes"/>
+      <point x="982" y="820" type="curve" smooth="yes" name="ah01"/>
       <point x="982" y="913"/>
       <point x="960" y="1012"/>
       <point x="895" y="1120" type="curve" name="ih01"/>
       <point x="1081" y="1120" type="line"/>
       <point x="1129" y="1037"/>
       <point x="1161" y="932"/>
-      <point x="1161" y="803" type="curve" name="sh03" smooth="yes"/>
+      <point x="1161" y="803" type="curve" smooth="yes" name="sh03"/>
       <point x="1161" y="751"/>
       <point x="1156" y="697"/>
       <point x="1144" y="638" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/upsilondieresistonos.glif b/source/Hack-Italic.ufo/glyphs/upsilondieresistonos.glif
index 24392851f..1a1ee3345 100644
--- a/source/Hack-Italic.ufo/glyphs/upsilondieresistonos.glif
+++ b/source/Hack-Italic.ufo/glyphs/upsilondieresistonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="upsilondieresistonos" format="1">
+<glyph name="upsilondieresistonos" format="2">
   <advance width="1233"/>
   <unicode hex="03B0"/>
   <outline>
@@ -10,14 +10,14 @@
       <point x="685" y="1512" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="449" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="449" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="429" y="1320"/>
       <point x="418" y="1333"/>
       <point x="422" y="1353" type="curve" smooth="yes"/>
       <point x="450" y="1495" type="line"/>
       <point x="453" y="1513"/>
       <point x="463" y="1522"/>
-      <point x="482" y="1522" type="curve" name="at02" smooth="yes"/>
+      <point x="482" y="1522" type="curve" smooth="yes" name="at02"/>
       <point x="625" y="1522" type="line" smooth="yes"/>
       <point x="645" y="1522"/>
       <point x="656" y="1509"/>
@@ -28,15 +28,15 @@
       <point x="592" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="885" y="1320" type="line" name="sv02" smooth="yes"/>
+      <point x="885" y="1320" type="line" smooth="yes" name="sv02"/>
       <point x="865" y="1320"/>
       <point x="854" y="1333"/>
       <point x="858" y="1353" type="curve" smooth="yes"/>
       <point x="886" y="1495" type="line"/>
       <point x="889" y="1513"/>
       <point x="899" y="1522"/>
-      <point x="918" y="1522" type="curve" name="at03" smooth="yes"/>
-      <point x="1061" y="1522" type="line" name="sv03" smooth="yes"/>
+      <point x="918" y="1522" type="curve" smooth="yes" name="at03"/>
+      <point x="1061" y="1522" type="line" smooth="yes" name="sv03"/>
       <point x="1081" y="1522"/>
       <point x="1092" y="1509"/>
       <point x="1088" y="1489" type="curve" smooth="yes"/>
@@ -46,10 +46,10 @@
       <point x="1028" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="485" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="485" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="302" y="0"/>
       <point x="216" y="81"/>
-      <point x="216" y="257" type="curve" name="sh01" smooth="yes"/>
+      <point x="216" y="257" type="curve" smooth="yes" name="sh01"/>
       <point x="216" y="301"/>
       <point x="221" y="350"/>
       <point x="232" y="406" type="curve" smooth="yes"/>
@@ -60,23 +60,23 @@
       <point x="417" y="395" type="line" smooth="yes"/>
       <point x="408" y="347"/>
       <point x="402" y="307"/>
-      <point x="402" y="275" type="curve" name="sh03" smooth="yes"/>
+      <point x="402" y="275" type="curve" smooth="yes" name="sh03"/>
       <point x="402" y="190"/>
       <point x="437" y="156"/>
-      <point x="525" y="156" type="curve" name="sv05" smooth="yes"/>
+      <point x="525" y="156" type="curve" smooth="yes" name="sv05"/>
       <point x="750" y="156"/>
       <point x="894" y="387"/>
       <point x="958" y="640" type="curve" smooth="yes"/>
       <point x="973" y="697"/>
       <point x="982" y="756"/>
-      <point x="982" y="820" type="curve" name="ah01" smooth="yes"/>
+      <point x="982" y="820" type="curve" smooth="yes" name="ah01"/>
       <point x="982" y="913"/>
       <point x="960" y="1012"/>
       <point x="895" y="1120" type="curve" name="ih02"/>
       <point x="1081" y="1120" type="line" name="hr01"/>
       <point x="1129" y="1037"/>
       <point x="1161" y="932"/>
-      <point x="1161" y="803" type="curve" name="sh02" smooth="yes"/>
+      <point x="1161" y="803" type="curve" smooth="yes" name="sh02"/>
       <point x="1161" y="751"/>
       <point x="1156" y="697"/>
       <point x="1144" y="638" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/upsilontonos.glif b/source/Hack-Italic.ufo/glyphs/upsilontonos.glif
index bde25f00d..9c72049b5 100644
--- a/source/Hack-Italic.ufo/glyphs/upsilontonos.glif
+++ b/source/Hack-Italic.ufo/glyphs/upsilontonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="upsilontonos" format="1">
+<glyph name="upsilontonos" format="2">
   <advance width="1233"/>
   <unicode hex="03CD"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="575" y="1272" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="485" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="485" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="302" y="0"/>
       <point x="216" y="81"/>
-      <point x="216" y="257" type="curve" name="sh02" smooth="yes"/>
+      <point x="216" y="257" type="curve" smooth="yes" name="sh02"/>
       <point x="216" y="301"/>
       <point x="221" y="350"/>
       <point x="232" y="406" type="curve" smooth="yes"/>
@@ -24,23 +24,23 @@
       <point x="417" y="395" type="line" smooth="yes"/>
       <point x="408" y="347"/>
       <point x="402" y="307"/>
-      <point x="402" y="275" type="curve" name="sh03" smooth="yes"/>
+      <point x="402" y="275" type="curve" smooth="yes" name="sh03"/>
       <point x="402" y="190"/>
       <point x="437" y="156"/>
-      <point x="525" y="156" type="curve" name="sv02" smooth="yes"/>
+      <point x="525" y="156" type="curve" smooth="yes" name="sv02"/>
       <point x="750" y="156"/>
       <point x="894" y="387"/>
       <point x="958" y="640" type="curve" smooth="yes"/>
       <point x="973" y="697"/>
       <point x="982" y="756"/>
-      <point x="982" y="820" type="curve" name="ah01" smooth="yes"/>
+      <point x="982" y="820" type="curve" smooth="yes" name="ah01"/>
       <point x="982" y="913"/>
       <point x="960" y="1012"/>
       <point x="895" y="1120" type="curve" name="ih03"/>
       <point x="1081" y="1120" type="line"/>
       <point x="1129" y="1037"/>
       <point x="1161" y="932"/>
-      <point x="1161" y="803" type="curve" name="sh01" smooth="yes"/>
+      <point x="1161" y="803" type="curve" smooth="yes" name="sh01"/>
       <point x="1161" y="751"/>
       <point x="1156" y="697"/>
       <point x="1144" y="638" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/uring.glif b/source/Hack-Italic.ufo/glyphs/uring.glif
index c500e848e..dcd7c8b4c 100644
--- a/source/Hack-Italic.ufo/glyphs/uring.glif
+++ b/source/Hack-Italic.ufo/glyphs/uring.glif
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uring" format="1">
+<glyph name="uring" format="2">
   <advance width="1233"/>
   <unicode hex="016F"/>
   <outline>
     <contour>
-      <point x="738" y="1186" type="curve" name="dv02" smooth="yes"/>
+      <point x="738" y="1186" type="curve" smooth="yes" name="dv02"/>
       <point x="586" y="1186"/>
       <point x="464" y="1307"/>
-      <point x="464" y="1461" type="curve" name="dh02" smooth="yes"/>
+      <point x="464" y="1461" type="curve" smooth="yes" name="dh02"/>
       <point x="464" y="1616"/>
       <point x="586" y="1735"/>
-      <point x="738" y="1735" type="curve" name="hr01" smooth="yes"/>
+      <point x="738" y="1735" type="curve" smooth="yes" name="hr01"/>
       <point x="891" y="1735"/>
       <point x="1013" y="1616"/>
-      <point x="1013" y="1461" type="curve" name="dh05" smooth="yes"/>
+      <point x="1013" y="1461" type="curve" smooth="yes" name="dh05"/>
       <point x="1013" y="1307"/>
       <point x="891" y="1186"/>
     </contour>
     <contour>
-      <point x="738" y="1309" type="curve" name="dv03" smooth="yes"/>
+      <point x="738" y="1309" type="curve" smooth="yes" name="dv03"/>
       <point x="822" y="1309"/>
       <point x="890" y="1376"/>
-      <point x="890" y="1460" type="curve" name="dh04" smooth="yes"/>
+      <point x="890" y="1460" type="curve" smooth="yes" name="dh04"/>
       <point x="890" y="1544"/>
       <point x="822" y="1612"/>
-      <point x="738" y="1612" type="curve" name="dv01" smooth="yes"/>
+      <point x="738" y="1612" type="curve" smooth="yes" name="dv01"/>
       <point x="653" y="1612"/>
       <point x="587" y="1546"/>
-      <point x="587" y="1461" type="curve" name="dh03" smooth="yes"/>
+      <point x="587" y="1461" type="curve" smooth="yes" name="dh03"/>
       <point x="587" y="1375"/>
       <point x="653" y="1309"/>
     </contour>
     <contour>
-      <point x="409" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="409" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="233" y="-27"/>
       <point x="125" y="74"/>
-      <point x="125" y="253" type="curve" name="dh01" smooth="yes"/>
+      <point x="125" y="253" type="curve" smooth="yes" name="dh01"/>
       <point x="125" y="296"/>
       <point x="131" y="362"/>
       <point x="143" y="426" type="curve" smooth="yes"/>
@@ -44,10 +44,10 @@
       <point x="326" y="426" type="line" smooth="yes"/>
       <point x="318" y="383"/>
       <point x="311" y="331"/>
-      <point x="311" y="296" type="curve" name="hr02" smooth="yes"/>
+      <point x="311" y="296" type="curve" smooth="yes" name="hr02"/>
       <point x="311" y="192"/>
       <point x="376" y="133"/>
-      <point x="489" y="133" type="curve" name="sv01" smooth="yes"/>
+      <point x="489" y="133" type="curve" smooth="yes" name="sv01"/>
       <point x="654" y="133"/>
       <point x="780" y="256"/>
       <point x="825" y="487" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/utilde.glif b/source/Hack-Italic.ufo/glyphs/utilde.glif
index 67e909645..fd98b78dd 100644
--- a/source/Hack-Italic.ufo/glyphs/utilde.glif
+++ b/source/Hack-Italic.ufo/glyphs/utilde.glif
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="utilde" format="1">
+<glyph name="utilde" format="2">
   <advance width="1233"/>
   <unicode hex="0169"/>
   <outline>
     <contour>
-      <point x="882" y="1270" type="curve" name="dv01" smooth="yes"/>
+      <point x="882" y="1270" type="curve" smooth="yes" name="dv01"/>
       <point x="837" y="1270"/>
       <point x="792" y="1283"/>
       <point x="737" y="1339" type="curve" smooth="yes"/>
-      <point x="690" y="1388" type="line" name="hr01" smooth="yes"/>
+      <point x="690" y="1388" type="line" smooth="yes" name="hr01"/>
       <point x="666" y="1413"/>
       <point x="641" y="1425"/>
-      <point x="616" y="1425" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1425" type="curve" smooth="yes" name="sv01"/>
       <point x="560" y="1425"/>
       <point x="533" y="1369"/>
       <point x="522" y="1272" type="curve" name="sv02"/>
       <point x="397" y="1272" type="line"/>
       <point x="420" y="1451"/>
       <point x="493" y="1554"/>
-      <point x="620" y="1554" type="curve" name="at03" smooth="yes"/>
+      <point x="620" y="1554" type="curve" smooth="yes" name="at03"/>
       <point x="673" y="1554"/>
       <point x="715" y="1536"/>
       <point x="766" y="1485" type="curve" smooth="yes"/>
       <point x="813" y="1438" type="line" smooth="yes"/>
       <point x="840" y="1411"/>
       <point x="856" y="1399"/>
-      <point x="883" y="1399" type="curve" name="dv02" smooth="yes"/>
+      <point x="883" y="1399" type="curve" smooth="yes" name="dv02"/>
       <point x="937" y="1399"/>
       <point x="970" y="1451"/>
       <point x="981" y="1554" type="curve" name="at04"/>
@@ -34,22 +34,22 @@
       <point x="1009" y="1270"/>
     </contour>
     <contour>
-      <point x="409" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="409" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="233" y="-27"/>
       <point x="125" y="74"/>
-      <point x="125" y="253" type="curve" name="dh01" smooth="yes"/>
+      <point x="125" y="253" type="curve" smooth="yes" name="dh01"/>
       <point x="125" y="296"/>
       <point x="131" y="362"/>
-      <point x="143" y="426" type="curve" name="hr02" smooth="yes"/>
+      <point x="143" y="426" type="curve" smooth="yes" name="hr02"/>
       <point x="276" y="1120" type="line" name="at01"/>
       <point x="461" y="1120" type="line"/>
       <point x="326" y="426" type="line" smooth="yes"/>
       <point x="318" y="383"/>
       <point x="311" y="331"/>
-      <point x="311" y="296" type="curve" name="dh02" smooth="yes"/>
+      <point x="311" y="296" type="curve" smooth="yes" name="dh02"/>
       <point x="311" y="192"/>
       <point x="376" y="133"/>
-      <point x="489" y="133" type="curve" name="sv03" smooth="yes"/>
+      <point x="489" y="133" type="curve" smooth="yes" name="sv03"/>
       <point x="654" y="133"/>
       <point x="780" y="256"/>
       <point x="825" y="487" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/v.glif b/source/Hack-Italic.ufo/glyphs/v.glif
index 81082a1ab..5d7bf0adb 100644
--- a/source/Hack-Italic.ufo/glyphs/v.glif
+++ b/source/Hack-Italic.ufo/glyphs/v.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="v" format="1">
+<glyph name="v" format="2">
   <advance width="1233"/>
   <unicode hex="0076"/>
   <outline>
@@ -14,9 +14,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/w.glif b/source/Hack-Italic.ufo/glyphs/w.glif
index f4f3f815a..8ca54e4bf 100644
--- a/source/Hack-Italic.ufo/glyphs/w.glif
+++ b/source/Hack-Italic.ufo/glyphs/w.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="w" format="1">
+<glyph name="w" format="2">
   <advance width="1233"/>
   <unicode hex="0077"/>
   <outline>
@@ -20,9 +20,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/wacute.glif b/source/Hack-Italic.ufo/glyphs/wacute.glif
index 457ae919a..9d62e743d 100644
--- a/source/Hack-Italic.ufo/glyphs/wacute.glif
+++ b/source/Hack-Italic.ufo/glyphs/wacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="wacute" format="1">
+<glyph name="wacute" format="2">
   <advance width="1233"/>
   <unicode hex="1E83"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/wcircumflex.glif b/source/Hack-Italic.ufo/glyphs/wcircumflex.glif
index eb30ad899..9c3ff8b73 100644
--- a/source/Hack-Italic.ufo/glyphs/wcircumflex.glif
+++ b/source/Hack-Italic.ufo/glyphs/wcircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="wcircumflex" format="1">
+<glyph name="wcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0175"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/wdieresis.glif b/source/Hack-Italic.ufo/glyphs/wdieresis.glif
index 4a6a104da..07e08306f 100644
--- a/source/Hack-Italic.ufo/glyphs/wdieresis.glif
+++ b/source/Hack-Italic.ufo/glyphs/wdieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="wdieresis" format="1">
+<glyph name="wdieresis" format="2">
   <advance width="1233"/>
   <unicode hex="1E85"/>
   <outline>
     <contour>
-      <point x="469" y="1320" type="line" name="hr00" smooth="yes"/>
+      <point x="469" y="1320" type="line" smooth="yes" name="hr00"/>
       <point x="449" y="1320"/>
       <point x="438" y="1333"/>
       <point x="442" y="1353" type="curve" smooth="yes"/>
       <point x="470" y="1495" type="line"/>
       <point x="473" y="1513"/>
       <point x="483" y="1522"/>
-      <point x="502" y="1522" type="curve" name="dv01" smooth="yes"/>
+      <point x="502" y="1522" type="curve" smooth="yes" name="dv01"/>
       <point x="645" y="1522" type="line" smooth="yes"/>
       <point x="664" y="1522"/>
       <point x="673" y="1514"/>
@@ -25,14 +25,14 @@
       <point x="612" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="860" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="860" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="840" y="1320"/>
       <point x="829" y="1333"/>
       <point x="833" y="1353" type="curve" smooth="yes"/>
       <point x="861" y="1495" type="line"/>
       <point x="864" y="1513"/>
       <point x="874" y="1522"/>
-      <point x="893" y="1522" type="curve" name="sv02" smooth="yes"/>
+      <point x="893" y="1522" type="curve" smooth="yes" name="sv02"/>
       <point x="1036" y="1522" type="line" smooth="yes"/>
       <point x="1055" y="1522"/>
       <point x="1064" y="1514"/>
diff --git a/source/Hack-Italic.ufo/glyphs/wgrave.glif b/source/Hack-Italic.ufo/glyphs/wgrave.glif
index 997157c29..6225549fc 100644
--- a/source/Hack-Italic.ufo/glyphs/wgrave.glif
+++ b/source/Hack-Italic.ufo/glyphs/wgrave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="wgrave" format="1">
+<glyph name="wgrave" format="2">
   <advance width="1233"/>
   <unicode hex="1E81"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/x.glif b/source/Hack-Italic.ufo/glyphs/x.glif
index f346cd998..5acdca09d 100644
--- a/source/Hack-Italic.ufo/glyphs/x.glif
+++ b/source/Hack-Italic.ufo/glyphs/x.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="x" format="1">
+<glyph name="x" format="2">
   <advance width="1233"/>
   <unicode hex="0078"/>
   <outline>
@@ -19,9 +19,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/xi.glif b/source/Hack-Italic.ufo/glyphs/xi.glif
index 7e458e8c5..74ba9965e 100644
--- a/source/Hack-Italic.ufo/glyphs/xi.glif
+++ b/source/Hack-Italic.ufo/glyphs/xi.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="xi" format="1">
+<glyph name="xi" format="2">
   <advance width="1233"/>
   <unicode hex="03BE"/>
   <outline>
@@ -13,19 +13,19 @@
       <point x="774" y="-168" type="curve" smooth="yes"/>
       <point x="776" y="-158"/>
       <point x="777" y="-148"/>
-      <point x="777" y="-137" type="curve" name="dh03" smooth="yes"/>
+      <point x="777" y="-137" type="curve" smooth="yes" name="dh03"/>
       <point x="777" y="-78"/>
       <point x="745" y="-29"/>
-      <point x="680" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="680" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="281" y="-29"/>
       <point x="126" y="128"/>
-      <point x="126" y="307" type="curve" name="dh01" smooth="yes"/>
+      <point x="126" y="307" type="curve" smooth="yes" name="dh01"/>
       <point x="126" y="500"/>
       <point x="306" y="719"/>
       <point x="550" y="796" type="curve" name="ih01"/>
       <point x="388" y="817"/>
       <point x="318" y="911"/>
-      <point x="318" y="1020" type="curve" name="hr01" smooth="yes"/>
+      <point x="318" y="1020" type="curve" smooth="yes" name="hr01"/>
       <point x="318" y="1156"/>
       <point x="427" y="1310"/>
       <point x="602" y="1371" type="curve" name="ih02"/>
@@ -35,20 +35,20 @@
       <point x="1183" y="1371" type="line" name="sv01"/>
       <point x="730" y="1371"/>
       <point x="503" y="1231"/>
-      <point x="503" y="1100" type="curve" name="sh01" smooth="yes"/>
+      <point x="503" y="1100" type="curve" smooth="yes" name="sh01"/>
       <point x="503" y="989"/>
       <point x="665" y="885"/>
       <point x="987" y="880" type="curve" name="dv03"/>
       <point x="954" y="710" type="line" name="hr02"/>
       <point x="527" y="681"/>
       <point x="320" y="507"/>
-      <point x="320" y="355" type="curve" name="dh02" smooth="yes"/>
+      <point x="320" y="355" type="curve" smooth="yes" name="dh02"/>
       <point x="320" y="234"/>
       <point x="451" y="130"/>
       <point x="710" y="127" type="curve" name="dv02"/>
       <point x="865" y="127"/>
       <point x="958" y="39"/>
-      <point x="958" y="-91" type="curve" name="dh04" smooth="yes"/>
+      <point x="958" y="-91" type="curve" smooth="yes" name="dh04"/>
       <point x="958" y="-109"/>
       <point x="956" y="-128"/>
       <point x="952" y="-148" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/y.glif b/source/Hack-Italic.ufo/glyphs/y.glif
index 81fe2a187..648ebdc55 100644
--- a/source/Hack-Italic.ufo/glyphs/y.glif
+++ b/source/Hack-Italic.ufo/glyphs/y.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="y" format="1">
+<glyph name="y" format="2">
   <advance width="1233"/>
   <unicode hex="0079"/>
   <outline>
@@ -36,9 +36,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/yacute.glif b/source/Hack-Italic.ufo/glyphs/yacute.glif
index 6f4edc1cc..0942c5851 100644
--- a/source/Hack-Italic.ufo/glyphs/yacute.glif
+++ b/source/Hack-Italic.ufo/glyphs/yacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="yacute" format="1">
+<glyph name="yacute" format="2">
   <advance width="1233"/>
   <unicode hex="00FD"/>
   <outline>
@@ -11,7 +11,7 @@
     </contour>
     <contour>
       <point x="20" y="-272" type="line"/>
-      <point x="128" y="-272" type="line" name="dv02" smooth="yes"/>
+      <point x="128" y="-272" type="line" smooth="yes" name="dv02"/>
       <point x="183" y="-272"/>
       <point x="230" y="-256"/>
       <point x="268" y="-225" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="310" y="-389" type="curve" smooth="yes"/>
       <point x="261" y="-414"/>
       <point x="204" y="-426"/>
-      <point x="139" y="-426" type="curve" name="dv01" smooth="yes"/>
+      <point x="139" y="-426" type="curve" smooth="yes" name="dv01"/>
       <point x="-9" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/ycircumflex.glif b/source/Hack-Italic.ufo/glyphs/ycircumflex.glif
index ab0ce0c72..f8f01f70b 100644
--- a/source/Hack-Italic.ufo/glyphs/ycircumflex.glif
+++ b/source/Hack-Italic.ufo/glyphs/ycircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ycircumflex" format="1">
+<glyph name="ycircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0177"/>
   <outline>
@@ -14,7 +14,7 @@
     </contour>
     <contour>
       <point x="20" y="-272" type="line"/>
-      <point x="128" y="-272" type="line" name="dv02" smooth="yes"/>
+      <point x="128" y="-272" type="line" smooth="yes" name="dv02"/>
       <point x="239" y="-272"/>
       <point x="313" y="-208"/>
       <point x="386" y="-66" type="curve" smooth="yes"/>
@@ -33,7 +33,7 @@
       <point x="442" y="-276" type="curve" smooth="yes"/>
       <point x="362" y="-381"/>
       <point x="260" y="-426"/>
-      <point x="139" y="-426" type="curve" name="dv01" smooth="yes"/>
+      <point x="139" y="-426" type="curve" smooth="yes" name="dv01"/>
       <point x="-9" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/ydieresis.glif b/source/Hack-Italic.ufo/glyphs/ydieresis.glif
index 2d2a08e10..a6b65f423 100644
--- a/source/Hack-Italic.ufo/glyphs/ydieresis.glif
+++ b/source/Hack-Italic.ufo/glyphs/ydieresis.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ydieresis" format="1">
+<glyph name="ydieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00FF"/>
   <outline>
     <contour>
-      <point x="509" y="1320" type="line" name="hr00" smooth="yes"/>
+      <point x="509" y="1320" type="line" smooth="yes" name="hr00"/>
       <point x="489" y="1320"/>
       <point x="478" y="1333"/>
       <point x="482" y="1353" type="curve" smooth="yes"/>
       <point x="510" y="1495" type="line"/>
       <point x="513" y="1513"/>
       <point x="523" y="1522"/>
-      <point x="542" y="1522" type="curve" name="dv03" smooth="yes"/>
+      <point x="542" y="1522" type="curve" smooth="yes" name="dv03"/>
       <point x="685" y="1522" type="line" smooth="yes"/>
       <point x="705" y="1522"/>
       <point x="716" y="1509"/>
@@ -22,14 +22,14 @@
       <point x="652" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="900" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="900" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="880" y="1320"/>
       <point x="869" y="1333"/>
       <point x="873" y="1353" type="curve" smooth="yes"/>
       <point x="901" y="1495" type="line"/>
       <point x="904" y="1513"/>
       <point x="914" y="1522"/>
-      <point x="933" y="1522" type="curve" name="sv02" smooth="yes"/>
+      <point x="933" y="1522" type="curve" smooth="yes" name="sv02"/>
       <point x="1076" y="1522" type="line" smooth="yes"/>
       <point x="1096" y="1522"/>
       <point x="1107" y="1509"/>
@@ -41,7 +41,7 @@
     </contour>
     <contour>
       <point x="20" y="-272" type="line"/>
-      <point x="128" y="-272" type="line" name="dv02" smooth="yes"/>
+      <point x="128" y="-272" type="line" smooth="yes" name="dv02"/>
       <point x="183" y="-272"/>
       <point x="230" y="-256"/>
       <point x="268" y="-225" type="curve" smooth="yes"/>
@@ -66,7 +66,7 @@
       <point x="310" y="-389" type="curve" smooth="yes"/>
       <point x="261" y="-414"/>
       <point x="204" y="-426"/>
-      <point x="139" y="-426" type="curve" name="dv01" smooth="yes"/>
+      <point x="139" y="-426" type="curve" smooth="yes" name="dv01"/>
       <point x="-9" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/yen.glif b/source/Hack-Italic.ufo/glyphs/yen.glif
index 8dbc562d5..647bab528 100644
--- a/source/Hack-Italic.ufo/glyphs/yen.glif
+++ b/source/Hack-Italic.ufo/glyphs/yen.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="yen" format="1">
+<glyph name="yen" format="2">
   <advance width="1233"/>
   <unicode hex="00A5"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/ygrave.glif b/source/Hack-Italic.ufo/glyphs/ygrave.glif
index 340ed16d3..dfcf646fb 100644
--- a/source/Hack-Italic.ufo/glyphs/ygrave.glif
+++ b/source/Hack-Italic.ufo/glyphs/ygrave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ygrave" format="1">
+<glyph name="ygrave" format="2">
   <advance width="1233"/>
   <unicode hex="1EF3"/>
   <outline>
@@ -11,7 +11,7 @@
     </contour>
     <contour>
       <point x="20" y="-272" type="line"/>
-      <point x="128" y="-272" type="line" name="dv02" smooth="yes"/>
+      <point x="128" y="-272" type="line" smooth="yes" name="dv02"/>
       <point x="239" y="-272"/>
       <point x="313" y="-208"/>
       <point x="386" y="-66" type="curve" smooth="yes"/>
@@ -30,7 +30,7 @@
       <point x="442" y="-276" type="curve" smooth="yes"/>
       <point x="362" y="-381"/>
       <point x="260" y="-426"/>
-      <point x="139" y="-426" type="curve" name="dv01" smooth="yes"/>
+      <point x="139" y="-426" type="curve" smooth="yes" name="dv01"/>
       <point x="-9" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Italic.ufo/glyphs/z.glif b/source/Hack-Italic.ufo/glyphs/z.glif
index 3b920ab67..3e7cb67fa 100644
--- a/source/Hack-Italic.ufo/glyphs/z.glif
+++ b/source/Hack-Italic.ufo/glyphs/z.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="z" format="1">
+<glyph name="z" format="2">
   <advance width="1233"/>
   <unicode hex="007A"/>
   <outline>
@@ -17,9 +17,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Italic.ufo/glyphs/zacute.glif b/source/Hack-Italic.ufo/glyphs/zacute.glif
index 0e048c6bb..7fcebc8e4 100644
--- a/source/Hack-Italic.ufo/glyphs/zacute.glif
+++ b/source/Hack-Italic.ufo/glyphs/zacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="zacute" format="1">
+<glyph name="zacute" format="2">
   <advance width="1233"/>
   <unicode hex="017A"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/zcaron.glif b/source/Hack-Italic.ufo/glyphs/zcaron.glif
index ac0f1224b..abee430e0 100644
--- a/source/Hack-Italic.ufo/glyphs/zcaron.glif
+++ b/source/Hack-Italic.ufo/glyphs/zcaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="zcaron" format="1">
+<glyph name="zcaron" format="2">
   <advance width="1233"/>
   <unicode hex="017E"/>
   <outline>
diff --git a/source/Hack-Italic.ufo/glyphs/zdotaccent.glif b/source/Hack-Italic.ufo/glyphs/zdotaccent.glif
index 75934dba0..365022518 100644
--- a/source/Hack-Italic.ufo/glyphs/zdotaccent.glif
+++ b/source/Hack-Italic.ufo/glyphs/zdotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="zdotaccent" format="1">
+<glyph name="zdotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="017C"/>
   <outline>
     <contour>
-      <point x="694" y="1320" type="line" name="hr00" smooth="yes"/>
+      <point x="694" y="1320" type="line" smooth="yes" name="hr00"/>
       <point x="676" y="1320"/>
       <point x="667" y="1328"/>
       <point x="667" y="1344" type="curve" smooth="yes"/>
@@ -14,7 +14,7 @@
       <point x="697" y="1497" type="line"/>
       <point x="700" y="1515"/>
       <point x="710" y="1524"/>
-      <point x="729" y="1524" type="curve" name="dv01" smooth="yes"/>
+      <point x="729" y="1524" type="curve" smooth="yes" name="dv01"/>
       <point x="874" y="1524" type="line" smooth="yes"/>
       <point x="892" y="1524"/>
       <point x="901" y="1516"/>
diff --git a/source/Hack-Italic.ufo/glyphs/zero.glif b/source/Hack-Italic.ufo/glyphs/zero.glif
index 7b83785fb..81122909c 100644
--- a/source/Hack-Italic.ufo/glyphs/zero.glif
+++ b/source/Hack-Italic.ufo/glyphs/zero.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="zero" format="1">
+<glyph name="zero" format="2">
   <advance width="1233"/>
   <unicode hex="0030"/>
   <outline>
     <contour>
-      <point x="480" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="480" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="221" y="-29"/>
       <point x="98" y="137"/>
-      <point x="98" y="464" type="curve" name="sh01" smooth="yes"/>
+      <point x="98" y="464" type="curve" smooth="yes" name="sh01"/>
       <point x="98" y="729"/>
       <point x="185" y="1060"/>
       <point x="297" y="1244" type="curve" name="sh03"/>
@@ -16,19 +16,19 @@
       <point x="493" y="1453" type="curve" smooth="yes"/>
       <point x="562" y="1496"/>
       <point x="645" y="1520"/>
-      <point x="749" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="749" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="884" y="1520"/>
       <point x="976" y="1480"/>
       <point x="1040" y="1396" type="curve" smooth="yes"/>
       <point x="1100" y="1316"/>
       <point x="1135" y="1199"/>
-      <point x="1135" y="1028" type="curve" name="sh04" smooth="yes"/>
+      <point x="1135" y="1028" type="curve" smooth="yes" name="sh04"/>
       <point x="1135" y="893"/>
       <point x="1114" y="740"/>
       <point x="1079" y="608" type="curve"/>
       <point x="1044" y="471"/>
       <point x="993" y="346"/>
-      <point x="936" y="249" type="curve" name="sh05" smooth="yes"/>
+      <point x="936" y="249" type="curve" smooth="yes" name="sh05"/>
       <point x="880" y="153"/>
       <point x="817" y="84"/>
       <point x="741" y="39" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="584" y="-29"/>
     </contour>
     <contour>
-      <point x="502" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="502" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="559" y="135"/>
       <point x="610" y="152"/>
       <point x="655" y="186" type="curve" smooth="yes"/>
@@ -48,10 +48,10 @@
       <point x="886" y="681" type="curve" smooth="yes"/>
       <point x="917" y="818"/>
       <point x="932" y="949"/>
-      <point x="932" y="1057" type="curve" name="ah01" smooth="yes"/>
+      <point x="932" y="1057" type="curve" smooth="yes" name="ah01"/>
       <point x="932" y="1274"/>
       <point x="866" y="1356"/>
-      <point x="732" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="732" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="676" y="1356"/>
       <point x="623" y="1339"/>
       <point x="578" y="1306" type="curve" smooth="yes"/>
@@ -63,7 +63,7 @@
       <point x="345" y="812" type="curve" smooth="yes"/>
       <point x="313" y="665"/>
       <point x="299" y="532"/>
-      <point x="299" y="429" type="curve" name="sh02" smooth="yes"/>
+      <point x="299" y="429" type="curve" smooth="yes" name="sh02"/>
       <point x="299" y="313"/>
       <point x="316" y="247"/>
       <point x="351" y="203" type="curve" smooth="yes"/>
diff --git a/source/Hack-Italic.ufo/glyphs/zero.subs.glif b/source/Hack-Italic.ufo/glyphs/zero.subs.glif
index 8b11113e6..9e81e5a0b 100644
--- a/source/Hack-Italic.ufo/glyphs/zero.subs.glif
+++ b/source/Hack-Italic.ufo/glyphs/zero.subs.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="zero.subs" format="1">
+<glyph name="zero.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="611" y="-425" type="curve" name="hr00" smooth="yes"/>
+      <point x="611" y="-425" type="curve" smooth="yes" name="hr00"/>
       <point x="436" y="-425"/>
       <point x="353" y="-337"/>
-      <point x="353" y="-149" type="curve" name="dh01" smooth="yes"/>
+      <point x="353" y="-149" type="curve" smooth="yes" name="dh01"/>
       <point x="353" y="1"/>
       <point x="407" y="179"/>
       <point x="487" y="288" type="curve" smooth="yes"/>
       <point x="566" y="397"/>
       <point x="665" y="442"/>
-      <point x="790" y="442" type="curve" name="dv03" smooth="yes"/>
+      <point x="790" y="442" type="curve" smooth="yes" name="dv03"/>
       <point x="965" y="442"/>
       <point x="1050" y="355"/>
-      <point x="1050" y="168" type="curve" name="dh06" smooth="yes"/>
+      <point x="1050" y="168" type="curve" smooth="yes" name="dh06"/>
       <point x="1050" y="22"/>
       <point x="996" y="-158"/>
       <point x="916" y="-270" type="curve" smooth="yes"/>
@@ -23,36 +23,36 @@
       <point x="741" y="-425"/>
     </contour>
     <contour>
-      <point x="625" y="-333" type="curve" name="dv01" smooth="yes"/>
+      <point x="625" y="-333" type="curve" smooth="yes" name="dv01"/>
       <point x="701" y="-333"/>
       <point x="757" y="-299"/>
       <point x="804" y="-222" type="curve" smooth="yes"/>
       <point x="865" y="-121"/>
       <point x="913" y="56"/>
-      <point x="913" y="182" type="curve" name="dh05" smooth="yes"/>
+      <point x="913" y="182" type="curve" smooth="yes" name="dh05"/>
       <point x="913" y="302"/>
       <point x="871" y="350"/>
-      <point x="779" y="350" type="curve" name="dv02" smooth="yes"/>
+      <point x="779" y="350" type="curve" smooth="yes" name="dv02"/>
       <point x="703" y="350"/>
       <point x="645" y="319"/>
       <point x="597" y="240" type="curve" smooth="yes"/>
       <point x="536" y="139"/>
       <point x="488" y="-42"/>
-      <point x="488" y="-165" type="curve" name="dh02" smooth="yes"/>
+      <point x="488" y="-165" type="curve" smooth="yes" name="dh02"/>
       <point x="488" y="-282"/>
       <point x="530" y="-333"/>
     </contour>
     <contour>
-      <point x="702" y="-64" type="curve" name="dv04" smooth="yes"/>
+      <point x="702" y="-64" type="curve" smooth="yes" name="dv04"/>
       <point x="651" y="-64"/>
       <point x="610" y="-32"/>
-      <point x="610" y="11" type="curve" name="dh03" smooth="yes"/>
+      <point x="610" y="11" type="curve" smooth="yes" name="dh03"/>
       <point x="610" y="53"/>
       <point x="653" y="87"/>
-      <point x="701" y="87" type="curve" name="dv05" smooth="yes"/>
+      <point x="701" y="87" type="curve" smooth="yes" name="dv05"/>
       <point x="750" y="87"/>
       <point x="791" y="53"/>
-      <point x="791" y="10" type="curve" name="dh04" smooth="yes"/>
+      <point x="791" y="10" type="curve" smooth="yes" name="dh04"/>
       <point x="791" y="-31"/>
       <point x="753" y="-64"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/glyphs/zeta.glif b/source/Hack-Italic.ufo/glyphs/zeta.glif
index 1e9b6cb68..157ce6efe 100644
--- a/source/Hack-Italic.ufo/glyphs/zeta.glif
+++ b/source/Hack-Italic.ufo/glyphs/zeta.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="zeta" format="1">
+<glyph name="zeta" format="2">
   <advance width="1233"/>
   <unicode hex="03B6"/>
   <outline>
@@ -10,16 +10,16 @@
       <point x="624" y="-279" type="curve"/>
       <point x="715" y="-287"/>
       <point x="781" y="-216"/>
-      <point x="789" y="-168" type="curve" name="sh01" smooth="yes"/>
+      <point x="789" y="-168" type="curve" smooth="yes" name="sh01"/>
       <point x="791" y="-158"/>
       <point x="792" y="-148"/>
-      <point x="792" y="-137" type="curve" name="ah01" smooth="yes"/>
+      <point x="792" y="-137" type="curve" smooth="yes" name="ah01"/>
       <point x="792" y="-78"/>
       <point x="760" y="-29"/>
-      <point x="695" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="695" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="347" y="-29"/>
       <point x="183" y="152"/>
-      <point x="183" y="396" type="curve" name="sh02" smooth="yes"/>
+      <point x="183" y="396" type="curve" smooth="yes" name="sh02"/>
       <point x="183" y="702"/>
       <point x="442" y="1106"/>
       <point x="931" y="1371" type="curve" name="ih01"/>
@@ -29,19 +29,19 @@
       <point x="1269" y="1371" type="line"/>
       <point x="703" y="1094"/>
       <point x="407" y="815"/>
-      <point x="382" y="534" type="curve" name="sh05" smooth="yes"/>
+      <point x="382" y="534" type="curve" smooth="yes" name="sh05"/>
       <point x="380" y="511"/>
       <point x="379" y="489"/>
-      <point x="379" y="469" type="curve" name="sh04" smooth="yes"/>
+      <point x="379" y="469" type="curve" smooth="yes" name="sh04"/>
       <point x="379" y="241"/>
       <point x="494" y="127"/>
-      <point x="725" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="725" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="880" y="127"/>
       <point x="973" y="39"/>
-      <point x="973" y="-91" type="curve" name="sh03" smooth="yes"/>
+      <point x="973" y="-91" type="curve" smooth="yes" name="sh03"/>
       <point x="973" y="-109"/>
       <point x="971" y="-128"/>
-      <point x="967" y="-148" type="curve" name="sh06" smooth="yes"/>
+      <point x="967" y="-148" type="curve" smooth="yes" name="sh06"/>
       <point x="935" y="-301"/>
       <point x="812" y="-430"/>
     </contour>
diff --git a/source/Hack-Italic.ufo/layercontents.plist b/source/Hack-Italic.ufo/layercontents.plist
new file mode 100644
index 000000000..cf95d3573
--- /dev/null
+++ b/source/Hack-Italic.ufo/layercontents.plist
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<array>
+		<string>public.default</string>
+		<string>glyphs</string>
+	</array>
+</array>
+</plist>
diff --git a/source/Hack-Italic.ufo/lib.plist b/source/Hack-Italic.ufo/lib.plist
index 23e3b8543..34013f86f 100644
--- a/source/Hack-Italic.ufo/lib.plist
+++ b/source/Hack-Italic.ufo/lib.plist
@@ -1558,6 +1558,7 @@
 		<string>uni2150</string>
 		<string>uni2151</string>
 		<string>uni2070</string>
+		<string>ruble</string>
 		<string>guillemotleft</string>
 		<string>guillemotright</string>
 		<string>uni00B5</string>
diff --git a/source/Hack-Italic.ufo/metainfo.plist b/source/Hack-Italic.ufo/metainfo.plist
index 12a792239..632695b5a 100644
--- a/source/Hack-Italic.ufo/metainfo.plist
+++ b/source/Hack-Italic.ufo/metainfo.plist
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>creator</key>
-	<string>com.schriftgestaltung.GlyphsUFOExport</string>
+	<string>org.robofab.ufoLib</string>
 	<key>formatVersion</key>
-	<integer>2</integer>
+	<integer>3</integer>
 </dict>
 </plist>
diff --git a/source/Hack-Regular.ufo/fontinfo.plist b/source/Hack-Regular.ufo/fontinfo.plist
index 4f6b4731e..31d31fe8e 100644
--- a/source/Hack-Regular.ufo/fontinfo.plist
+++ b/source/Hack-Regular.ufo/fontinfo.plist
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>ascender</key>
@@ -12,6 +12,8 @@
 	<integer>-492</integer>
 	<key>familyName</key>
 	<string>Hack</string>
+	<key>guidelines</key>
+	<array/>
 	<key>macintoshFONDFamilyID</key>
 	<integer>128</integer>
 	<key>macintoshFONDName</key>
@@ -21,8 +23,7 @@
 	<key>openTypeHeadCreated</key>
 	<string>2017/10/23 12:00:00</string>
 	<key>openTypeHeadFlags</key>
-	<array>
-	</array>
+	<array/>
 	<key>openTypeHheaAscender</key>
 	<integer>1901</integer>
 	<key>openTypeHheaDescender</key>
@@ -98,7 +99,7 @@ Except as contained in this notice, the names of Gnome, the Gnome Foundation, an
 	<key>openTypeNameUniqueID</key>
 	<string>SourceFoundry: Hack: 2018</string>
 	<key>openTypeNameVersion</key>
-	<string>Version 3.003</string>
+	<string>Version 4.000</string>
 	<key>openTypeOS2CodePageRanges</key>
 	<array>
 		<integer>0</integer>
@@ -142,8 +143,7 @@ Except as contained in this notice, the names of Gnome, the Gnome Foundation, an
 		<integer>4</integer>
 	</array>
 	<key>openTypeOS2Selection</key>
-	<array>
-	</array>
+	<array/>
 	<key>openTypeOS2StrikeoutPosition</key>
 	<integer>530</integer>
 	<key>openTypeOS2StrikeoutSize</key>
@@ -216,7 +216,7 @@ Except as contained in this notice, the names of Gnome, the Gnome Foundation, an
 	<key>postscriptBlueFuzz</key>
 	<integer>0</integer>
 	<key>postscriptBlueScale</key>
-	<real>0.036999999999999998</real>
+	<real>0.037</real>
 	<key>postscriptBlueShift</key>
 	<integer>14</integer>
 	<key>postscriptBlueValues</key>
@@ -228,6 +228,10 @@ Except as contained in this notice, the names of Gnome, the Gnome Foundation, an
 		<integer>1493</integer>
 		<integer>1520</integer>
 	</array>
+	<key>postscriptFamilyBlues</key>
+	<array/>
+	<key>postscriptFamilyOtherBlues</key>
+	<array/>
 	<key>postscriptFontName</key>
 	<string>Hack-Regular</string>
 	<key>postscriptForceBold</key>
@@ -270,9 +274,9 @@ Except as contained in this notice, the names of Gnome, the Gnome Foundation, an
 	<key>unitsPerEm</key>
 	<integer>2048</integer>
 	<key>versionMajor</key>
-	<integer>3</integer>
+	<integer>4</integer>
 	<key>versionMinor</key>
-	<integer>003</integer>
+	<integer>0</integer>
 	<key>xHeight</key>
 	<integer>1120</integer>
 </dict>
diff --git a/source/Hack-Regular.ufo/glyphs/A_.glif b/source/Hack-Regular.ufo/glyphs/A_.glif
index 7713bde9c..ee15f13de 100644
--- a/source/Hack-Regular.ufo/glyphs/A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/A_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="A" format="1">
+<glyph name="A" format="2">
   <advance width="1233"/>
   <unicode hex="0041"/>
   <outline>
     <contour>
-      <point x="494" y="1493" type="line" name="hr00"/>
+      <point x="494" y="1493" type="line"/>
       <point x="739" y="1493" type="line"/>
-      <point x="1196" y="0" type="line" name="ab01"/>
+      <point x="1196" y="0" type="line"/>
       <point x="987" y="0" type="line"/>
-      <point x="877" y="389" type="line" name="dv01"/>
+      <point x="877" y="389" type="line"/>
       <point x="354" y="389" type="line"/>
-      <point x="246" y="0" type="line" name="ab02"/>
+      <point x="246" y="0" type="line"/>
       <point x="37" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="829" y="551" type="line" name="dv02"/>
+      <point x="829" y="551" type="line"/>
       <point x="616" y="1315" type="line"/>
       <point x="403" y="551" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/A_E_.glif b/source/Hack-Regular.ufo/glyphs/A_E_.glif
index 07acc96db..24ffcbbef 100644
--- a/source/Hack-Regular.ufo/glyphs/A_E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/A_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="AE" format="1">
+<glyph name="AE" format="2">
   <advance width="1233"/>
   <unicode hex="00C6"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/A_acute.glif b/source/Hack-Regular.ufo/glyphs/A_acute.glif
index de4e9ce6c..dc91dc2c4 100644
--- a/source/Hack-Regular.ufo/glyphs/A_acute.glif
+++ b/source/Hack-Regular.ufo/glyphs/A_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Aacute" format="1">
+<glyph name="Aacute" format="2">
   <advance width="1233"/>
   <unicode hex="00C1"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/A_breve.glif b/source/Hack-Regular.ufo/glyphs/A_breve.glif
index 42c351f03..d65b95413 100644
--- a/source/Hack-Regular.ufo/glyphs/A_breve.glif
+++ b/source/Hack-Regular.ufo/glyphs/A_breve.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Abreve" format="1">
+<glyph name="Abreve" format="2">
   <advance width="1233"/>
   <unicode hex="0102"/>
   <outline>
     <contour>
-      <point x="616" y="1589" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1589" type="curve" smooth="yes" name="dv01"/>
       <point x="423" y="1589"/>
       <point x="318" y="1670"/>
       <point x="303" y="1831" type="curve"/>
       <point x="422" y="1831" type="line" name="dv02"/>
       <point x="438" y="1759"/>
       <point x="505" y="1720"/>
-      <point x="618" y="1720" type="curve" name="sv01" smooth="yes"/>
+      <point x="618" y="1720" type="curve" smooth="yes" name="sv01"/>
       <point x="727" y="1720"/>
       <point x="791" y="1757"/>
       <point x="811" y="1831" type="curve" name="sv02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/A_circumflex.glif b/source/Hack-Regular.ufo/glyphs/A_circumflex.glif
index b42a84429..b977ec778 100644
--- a/source/Hack-Regular.ufo/glyphs/A_circumflex.glif
+++ b/source/Hack-Regular.ufo/glyphs/A_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Acircumflex" format="1">
+<glyph name="Acircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00C2"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/A_dieresis.glif b/source/Hack-Regular.ufo/glyphs/A_dieresis.glif
index 40f72ffb3..77c2ee55b 100644
--- a/source/Hack-Regular.ufo/glyphs/A_dieresis.glif
+++ b/source/Hack-Regular.ufo/glyphs/A_dieresis.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Adieresis" format="1">
+<glyph name="Adieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00C4"/>
   <outline>
     <contour>
-      <point x="349" y="1647" type="line" name="hr00" smooth="yes"/>
+      <point x="349" y="1647" type="line" smooth="yes" name="hr00"/>
       <point x="329" y="1647"/>
       <point x="319" y="1657"/>
-      <point x="319" y="1677" type="curve" name="sh01" smooth="yes"/>
+      <point x="319" y="1677" type="curve" smooth="yes" name="sh01"/>
       <point x="319" y="1820" type="line" smooth="yes"/>
       <point x="319" y="1840"/>
       <point x="329" y="1850"/>
-      <point x="349" y="1850" type="curve" name="dv01" smooth="yes"/>
+      <point x="349" y="1850" type="curve" smooth="yes" name="dv01"/>
       <point x="492" y="1850" type="line" smooth="yes"/>
       <point x="512" y="1850"/>
       <point x="522" y="1840"/>
       <point x="522" y="1820" type="curve" smooth="yes"/>
-      <point x="522" y="1677" type="line" name="sh02" smooth="yes"/>
+      <point x="522" y="1677" type="line" smooth="yes" name="sh02"/>
       <point x="522" y="1657"/>
       <point x="512" y="1647"/>
       <point x="492" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1647" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1647" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1647"/>
       <point x="711" y="1657"/>
-      <point x="711" y="1677" type="curve" name="ah01" smooth="yes"/>
+      <point x="711" y="1677" type="curve" smooth="yes" name="ah01"/>
       <point x="711" y="1820" type="line" smooth="yes"/>
       <point x="711" y="1840"/>
       <point x="721" y="1850"/>
-      <point x="741" y="1850" type="curve" name="sv02" smooth="yes"/>
+      <point x="741" y="1850" type="curve" smooth="yes" name="sv02"/>
       <point x="883" y="1850" type="line" smooth="yes"/>
       <point x="903" y="1850"/>
       <point x="913" y="1840"/>
       <point x="913" y="1820" type="curve" smooth="yes"/>
-      <point x="913" y="1677" type="line" name="sh03" smooth="yes"/>
+      <point x="913" y="1677" type="line" smooth="yes" name="sh03"/>
       <point x="913" y="1657"/>
       <point x="903" y="1647"/>
       <point x="883" y="1647" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/A_grave.glif b/source/Hack-Regular.ufo/glyphs/A_grave.glif
index 8b7e949b3..695548e11 100644
--- a/source/Hack-Regular.ufo/glyphs/A_grave.glif
+++ b/source/Hack-Regular.ufo/glyphs/A_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Agrave" format="1">
+<glyph name="Agrave" format="2">
   <advance width="1233"/>
   <unicode hex="00C0"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/A_lpha.glif b/source/Hack-Regular.ufo/glyphs/A_lpha.glif
index b19dee97b..c851c3e01 100644
--- a/source/Hack-Regular.ufo/glyphs/A_lpha.glif
+++ b/source/Hack-Regular.ufo/glyphs/A_lpha.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Alpha" format="1">
+<glyph name="Alpha" format="2">
   <advance width="1233"/>
   <unicode hex="0391"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/A_lphatonos.glif b/source/Hack-Regular.ufo/glyphs/A_lphatonos.glif
index f229bed61..969381118 100644
--- a/source/Hack-Regular.ufo/glyphs/A_lphatonos.glif
+++ b/source/Hack-Regular.ufo/glyphs/A_lphatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Alphatonos" format="1">
+<glyph name="Alphatonos" format="2">
   <advance width="1233"/>
   <unicode hex="0386"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/A_macron.glif b/source/Hack-Regular.ufo/glyphs/A_macron.glif
index 1f918bc64..61e905c9e 100644
--- a/source/Hack-Regular.ufo/glyphs/A_macron.glif
+++ b/source/Hack-Regular.ufo/glyphs/A_macron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Amacron" format="1">
+<glyph name="Amacron" format="2">
   <advance width="1233"/>
   <unicode hex="0100"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/A_ogonek.glif b/source/Hack-Regular.ufo/glyphs/A_ogonek.glif
index f5c0e8840..23b031b7c 100644
--- a/source/Hack-Regular.ufo/glyphs/A_ogonek.glif
+++ b/source/Hack-Regular.ufo/glyphs/A_ogonek.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Aogonek" format="1">
+<glyph name="Aogonek" format="2">
   <advance width="1233"/>
   <unicode hex="0104"/>
   <outline>
     <contour>
-      <point x="1124" y="-272" type="curve" name="dv02" smooth="yes"/>
+      <point x="1124" y="-272" type="curve" smooth="yes" name="dv02"/>
       <point x="1165" y="-272"/>
       <point x="1192" y="-262"/>
       <point x="1233" y="-242" type="curve" name="sh01"/>
       <point x="1233" y="-375" type="line"/>
       <point x="1174" y="-391"/>
       <point x="1150" y="-395"/>
-      <point x="1106" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="1106" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="955" y="-395"/>
       <point x="875" y="-339"/>
-      <point x="875" y="-222" type="curve" name="dh01" smooth="yes"/>
+      <point x="875" y="-222" type="curve" smooth="yes" name="dh01"/>
       <point x="875" y="-157"/>
       <point x="901" y="-93"/>
       <point x="983" y="0" type="curve" name="ab01"/>
@@ -29,7 +29,7 @@
       <point x="1102" y="0" type="line"/>
       <point x="1038" y="-87"/>
       <point x="1014" y="-139"/>
-      <point x="1014" y="-184" type="curve" name="dh02" smooth="yes"/>
+      <point x="1014" y="-184" type="curve" smooth="yes" name="dh02"/>
       <point x="1014" y="-240"/>
       <point x="1052" y="-272"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/A_ring.glif b/source/Hack-Regular.ufo/glyphs/A_ring.glif
index e714b4f6b..a1cb3e853 100644
--- a/source/Hack-Regular.ufo/glyphs/A_ring.glif
+++ b/source/Hack-Regular.ufo/glyphs/A_ring.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Aring" format="1">
+<glyph name="Aring" format="2">
   <advance width="1233"/>
   <unicode hex="00C5"/>
   <outline>
@@ -10,16 +10,16 @@
       <point x="375" y="1492" type="curve" smooth="yes"/>
       <point x="352" y="1533"/>
       <point x="342" y="1578"/>
-      <point x="342" y="1625" type="curve" name="sh01" smooth="yes"/>
+      <point x="342" y="1625" type="curve" smooth="yes" name="sh01"/>
       <point x="342" y="1782"/>
       <point x="464" y="1901"/>
-      <point x="616" y="1901" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1901" type="curve" smooth="yes" name="dv02"/>
       <point x="693" y="1901"/>
       <point x="763" y="1870"/>
       <point x="812" y="1821" type="curve" smooth="yes"/>
       <point x="859" y="1774"/>
       <point x="891" y="1706"/>
-      <point x="891" y="1625" type="curve" name="sh03" smooth="yes"/>
+      <point x="891" y="1625" type="curve" smooth="yes" name="sh03"/>
       <point x="891" y="1577"/>
       <point x="880" y="1533"/>
       <point x="859" y="1494" type="curve" smooth="yes"/>
@@ -40,19 +40,19 @@
       <point x="724" y="1519" type="curve" smooth="yes"/>
       <point x="753" y="1548"/>
       <point x="768" y="1584"/>
-      <point x="768" y="1626" type="curve" name="ah01" smooth="yes"/>
+      <point x="768" y="1626" type="curve" smooth="yes" name="ah01"/>
       <point x="768" y="1671"/>
       <point x="751" y="1707"/>
       <point x="724" y="1734" type="curve" smooth="yes"/>
       <point x="693" y="1765"/>
       <point x="654" y="1778"/>
-      <point x="615" y="1778" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="1778" type="curve" smooth="yes" name="dv01"/>
       <point x="573" y="1778"/>
       <point x="538" y="1764"/>
       <point x="509" y="1735" type="curve" smooth="yes"/>
       <point x="480" y="1706"/>
       <point x="465" y="1669"/>
-      <point x="465" y="1626" type="curve" name="sh02" smooth="yes"/>
+      <point x="465" y="1626" type="curve" smooth="yes" name="sh02"/>
       <point x="465" y="1542"/>
       <point x="532" y="1475"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/A_tilde.glif b/source/Hack-Regular.ufo/glyphs/A_tilde.glif
index a2bd3757a..b644af7f9 100644
--- a/source/Hack-Regular.ufo/glyphs/A_tilde.glif
+++ b/source/Hack-Regular.ufo/glyphs/A_tilde.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Atilde" format="1">
+<glyph name="Atilde" format="2">
   <advance width="1233"/>
   <unicode hex="00C3"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="339" y="1747" type="curve" smooth="yes"/>
       <point x="373" y="1786"/>
       <point x="419" y="1806"/>
-      <point x="476" y="1806" type="curve" name="dv02" smooth="yes"/>
+      <point x="476" y="1806" type="curve" smooth="yes" name="dv02"/>
       <point x="497" y="1806"/>
       <point x="519" y="1803"/>
       <point x="542" y="1798" type="curve" smooth="yes"/>
@@ -34,7 +34,7 @@
       <point x="893" y="1647" type="curve" smooth="yes"/>
       <point x="859" y="1607"/>
       <point x="814" y="1587"/>
-      <point x="757" y="1587" type="curve" name="sv02" smooth="yes"/>
+      <point x="757" y="1587" type="curve" smooth="yes" name="sv02"/>
       <point x="736" y="1587"/>
       <point x="715" y="1590"/>
       <point x="694" y="1595" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/B_.glif b/source/Hack-Regular.ufo/glyphs/B_.glif
index a58281827..3c0649d68 100644
--- a/source/Hack-Regular.ufo/glyphs/B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/B_.glif
@@ -1,69 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="B" format="1">
+<glyph name="B" format="2">
   <advance width="1233"/>
   <unicode hex="0042"/>
   <outline>
     <contour>
-      <point x="166" y="1493" type="line" name="dh01"/>
+      <point x="166" y="1493" type="line"/>
       <point x="608" y="1493" type="line" smooth="yes"/>
-      <point x="760" y="1493"/>
-      <point x="878" y="1460"/>
-      <point x="961" y="1394" type="curve" smooth="yes"/>
-      <point x="1044" y="1328"/>
-      <point x="1085" y="1234"/>
-      <point x="1085" y="1113" type="curve" name="dh04" smooth="yes"/>
-      <point x="1085" y="1020"/>
-      <point x="1061" y="949"/>
-      <point x="1020" y="898" type="curve" smooth="yes"/>
-      <point x="977" y="847"/>
-      <point x="912" y="812"/>
-      <point x="823" y="799" type="curve" name="ih02"/>
-      <point x="922" y="784"/>
-      <point x="999" y="742"/>
-      <point x="1054" y="674" type="curve" smooth="yes"/>
-      <point x="1109" y="606"/>
-      <point x="1137" y="518"/>
-      <point x="1137" y="409" type="curve" name="sh01" smooth="yes"/>
-      <point x="1137" y="274"/>
-      <point x="1093" y="173"/>
-      <point x="1004" y="104" type="curve" smooth="yes"/>
-      <point x="915" y="35"/>
-      <point x="783" y="0"/>
-      <point x="608" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="911" y="1493"/>
+      <point x="1085" y="1354"/>
+      <point x="1085" y="1108" type="curve" smooth="yes"/>
+      <point x="1085" y="931"/>
+      <point x="996" y="824"/>
+      <point x="823" y="799" type="curve"/>
+      <point x="1021" y="769"/>
+      <point x="1137" y="625"/>
+      <point x="1137" y="411" type="curve" smooth="yes"/>
+      <point x="1137" y="142"/>
+      <point x="953" y="0"/>
+      <point x="608" y="0" type="curve" smooth="yes"/>
       <point x="166" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="604" y="877" type="line" name="hr01" smooth="yes"/>
-      <point x="705" y="877"/>
-      <point x="772" y="895"/>
-      <point x="816" y="934" type="curve" smooth="yes"/>
-      <point x="859" y="971"/>
-      <point x="881" y="1030"/>
-      <point x="881" y="1111" type="curve" name="dh03" smooth="yes"/>
-      <point x="881" y="1191"/>
-      <point x="860" y="1244"/>
-      <point x="817" y="1277" type="curve" smooth="yes"/>
-      <point x="774" y="1310"/>
-      <point x="703" y="1327"/>
-      <point x="604" y="1327" type="curve" name="sv01" smooth="yes"/>
-      <point x="369" y="1327" type="line" name="dh02"/>
-      <point x="369" y="877" type="line" name="hr02"/>
+      <point x="604" y="877" type="line" smooth="yes"/>
+      <point x="796" y="877"/>
+      <point x="881" y="949"/>
+      <point x="881" y="1108" type="curve" smooth="yes"/>
+      <point x="881" y="1264"/>
+      <point x="800" y="1327"/>
+      <point x="604" y="1327" type="curve" smooth="yes"/>
+      <point x="369" y="1327" type="line"/>
+      <point x="369" y="877" type="line"/>
     </contour>
     <contour>
-      <point x="608" y="166" type="line" name="sv02" smooth="yes"/>
-      <point x="725" y="166"/>
-      <point x="808" y="187"/>
-      <point x="859" y="228" type="curve" smooth="yes"/>
-      <point x="909" y="269"/>
-      <point x="934" y="336"/>
-      <point x="934" y="430" type="curve" name="ih01" smooth="yes"/>
-      <point x="934" y="527"/>
-      <point x="908" y="599"/>
-      <point x="855" y="645" type="curve" name="hr03" smooth="yes"/>
-      <point x="802" y="690"/>
-      <point x="719" y="713"/>
-      <point x="608" y="713" type="curve" name="dv01" smooth="yes"/>
-      <point x="369" y="713" type="line" name="sh02"/>
+      <point x="608" y="166" type="line" smooth="yes"/>
+      <point x="838" y="166"/>
+      <point x="934" y="244"/>
+      <point x="934" y="430" type="curve" smooth="yes"/>
+      <point x="934" y="624"/>
+      <point x="831" y="713"/>
+      <point x="608" y="713" type="curve" smooth="yes"/>
+      <point x="369" y="713" type="line"/>
       <point x="369" y="166" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/B_eta.glif b/source/Hack-Regular.ufo/glyphs/B_eta.glif
index adaadc70c..5ede95002 100644
--- a/source/Hack-Regular.ufo/glyphs/B_eta.glif
+++ b/source/Hack-Regular.ufo/glyphs/B_eta.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Beta" format="1">
+<glyph name="Beta" format="2">
   <advance width="1233"/>
   <unicode hex="0392"/>
   <outline>
@@ -8,37 +8,37 @@
       <point x="608" y="1493" type="line" smooth="yes"/>
       <point x="913" y="1493"/>
       <point x="1085" y="1357"/>
-      <point x="1085" y="1110" type="curve" name="dh03" smooth="yes"/>
+      <point x="1085" y="1110" type="curve" smooth="yes" name="dh03"/>
       <point x="1085" y="931"/>
       <point x="998" y="826"/>
       <point x="823" y="799" type="curve" name="ih01"/>
       <point x="1017" y="770"/>
       <point x="1137" y="626"/>
-      <point x="1137" y="407" type="curve" name="sh02" smooth="yes"/>
+      <point x="1137" y="407" type="curve" smooth="yes" name="sh02"/>
       <point x="1137" y="139"/>
       <point x="961" y="0"/>
-      <point x="608" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="608" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="166" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="604" y="877" type="line" name="dv01" smooth="yes"/>
+      <point x="604" y="877" type="line" smooth="yes" name="dv01"/>
       <point x="796" y="877"/>
       <point x="881" y="947"/>
-      <point x="881" y="1110" type="curve" name="hr01" smooth="yes"/>
+      <point x="881" y="1110" type="curve" smooth="yes" name="hr01"/>
       <point x="881" y="1265"/>
       <point x="804" y="1327"/>
-      <point x="604" y="1327" type="curve" name="sv01" smooth="yes"/>
+      <point x="604" y="1327" type="curve" smooth="yes" name="sv01"/>
       <point x="369" y="1327" type="line" name="dh02"/>
       <point x="369" y="877" type="line"/>
     </contour>
     <contour>
-      <point x="608" y="166" type="line" name="hr02" smooth="yes"/>
+      <point x="608" y="166" type="line" smooth="yes" name="hr02"/>
       <point x="843" y="166"/>
       <point x="934" y="242"/>
-      <point x="934" y="429" type="curve" name="sh01" smooth="yes"/>
+      <point x="934" y="429" type="curve" smooth="yes" name="sh01"/>
       <point x="934" y="625"/>
       <point x="833" y="713"/>
-      <point x="608" y="713" type="curve" name="hr03" smooth="yes"/>
+      <point x="608" y="713" type="curve" smooth="yes" name="hr03"/>
       <point x="369" y="713" type="line" name="sh03"/>
       <point x="369" y="166" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/C_.glif b/source/Hack-Regular.ufo/glyphs/C_.glif
index 5923825f4..facf6d148 100644
--- a/source/Hack-Regular.ufo/glyphs/C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/C_.glif
@@ -1,50 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="C" format="1">
+<glyph name="C" format="2">
   <advance width="1233"/>
   <unicode hex="0043"/>
   <outline>
     <contour>
-      <point x="742" y="-29" type="curve" name="hr00" smooth="yes"/>
-      <point x="555" y="-29"/>
-      <point x="404" y="37"/>
-      <point x="297" y="174" type="curve" smooth="yes"/>
-      <point x="192" y="310"/>
-      <point x="139" y="503"/>
-      <point x="139" y="744" type="curve" name="dh01" smooth="yes"/>
-      <point x="139" y="1231"/>
-      <point x="365" y="1520"/>
-      <point x="742" y="1520" type="curve" name="at01" smooth="yes"/>
-      <point x="871" y="1520"/>
-      <point x="967" y="1497"/>
+      <point x="749" y="-29" type="curve" smooth="yes"/>
+      <point x="365" y="-29"/>
+      <point x="139" y="257"/>
+      <point x="139" y="739" type="curve" smooth="yes"/>
+      <point x="139" y="1227"/>
+      <point x="370" y="1520"/>
+      <point x="759" y="1520" type="curve" smooth="yes"/>
+      <point x="873" y="1520"/>
+      <point x="972" y="1495"/>
       <point x="1073" y="1438" type="curve"/>
       <point x="1073" y="1231" type="line"/>
-      <point x="1024" y="1272"/>
-      <point x="971" y="1303"/>
-      <point x="914" y="1324" type="curve" smooth="yes"/>
-      <point x="857" y="1345"/>
-      <point x="801" y="1356"/>
-      <point x="741" y="1356" type="curve" name="sv01" smooth="yes"/>
-      <point x="612" y="1356"/>
-      <point x="513" y="1305"/>
-      <point x="448" y="1204" type="curve" smooth="yes"/>
-      <point x="383" y="1103"/>
-      <point x="350" y="950"/>
-      <point x="350" y="745" type="curve" name="dh02" smooth="yes"/>
-      <point x="350" y="337"/>
-      <point x="480" y="135"/>
-      <point x="743" y="135" type="curve" name="dv01" smooth="yes"/>
-      <point x="803" y="135"/>
-      <point x="859" y="146"/>
-      <point x="916" y="167" type="curve" smooth="yes"/>
-      <point x="971" y="188"/>
-      <point x="1024" y="219"/>
+      <point x="977" y="1312"/>
+      <point x="858" y="1356"/>
+      <point x="741" y="1356" type="curve" smooth="yes"/>
+      <point x="486" y="1356"/>
+      <point x="350" y="1142"/>
+      <point x="350" y="744" type="curve" smooth="yes"/>
+      <point x="350" y="347"/>
+      <point x="486" y="135"/>
+      <point x="743" y="135" type="curve" smooth="yes"/>
+      <point x="860" y="135"/>
+      <point x="976" y="179"/>
       <point x="1073" y="260" type="curve"/>
       <point x="1073" y="53" type="line"/>
-      <point x="1021" y="26"/>
-      <point x="968" y="5"/>
-      <point x="915" y="-9" type="curve" smooth="yes"/>
-      <point x="863" y="-22"/>
-      <point x="802" y="-29"/>
+      <point x="964" y="-4"/>
+      <point x="863" y="-29"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Regular.ufo/glyphs/C_R_.glif b/source/Hack-Regular.ufo/glyphs/C_R_.glif
index 8dd4ab034..9c88b2cdc 100644
--- a/source/Hack-Regular.ufo/glyphs/C_R_.glif
+++ b/source/Hack-Regular.ufo/glyphs/C_R_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="CR" format="1">
+<glyph name="CR" format="2">
   <advance width="1233"/>
   <unicode hex="000D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/C_acute.glif b/source/Hack-Regular.ufo/glyphs/C_acute.glif
index d3ebaf09c..bd1302a48 100644
--- a/source/Hack-Regular.ufo/glyphs/C_acute.glif
+++ b/source/Hack-Regular.ufo/glyphs/C_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Cacute" format="1">
+<glyph name="Cacute" format="2">
   <advance width="1233"/>
   <unicode hex="0106"/>
   <outline>
@@ -10,19 +10,19 @@
       <point x="565" y="1588" type="line"/>
     </contour>
     <contour>
-      <point x="742" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="742" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="551" y="-29"/>
       <point x="401" y="41"/>
       <point x="297" y="174" type="curve" smooth="yes"/>
       <point x="192" y="310"/>
       <point x="139" y="503"/>
-      <point x="139" y="744" type="curve" name="dh01" smooth="yes"/>
+      <point x="139" y="744" type="curve" smooth="yes" name="dh01"/>
       <point x="139" y="985"/>
       <point x="191" y="1179"/>
       <point x="298" y="1316" type="curve" smooth="yes"/>
       <point x="402" y="1449"/>
       <point x="551" y="1520"/>
-      <point x="742" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="742" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="802" y="1520"/>
       <point x="863" y="1513"/>
       <point x="915" y="1500" type="curve" smooth="yes"/>
@@ -35,19 +35,19 @@
       <point x="914" y="1324" type="curve" smooth="yes"/>
       <point x="857" y="1345"/>
       <point x="801" y="1356"/>
-      <point x="741" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="741" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="612" y="1356"/>
       <point x="513" y="1305"/>
       <point x="448" y="1204" type="curve" smooth="yes"/>
       <point x="383" y="1103"/>
       <point x="350" y="950"/>
-      <point x="350" y="745" type="curve" name="dh02" smooth="yes"/>
+      <point x="350" y="745" type="curve" smooth="yes" name="dh02"/>
       <point x="350" y="541"/>
       <point x="383" y="388"/>
       <point x="448" y="287" type="curve" smooth="yes"/>
       <point x="511" y="191"/>
       <point x="606" y="135"/>
-      <point x="742" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="742" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="801" y="135"/>
       <point x="859" y="146"/>
       <point x="916" y="167" type="curve" smooth="yes"/>
@@ -57,7 +57,7 @@
       <point x="1073" y="53" type="line"/>
       <point x="1021" y="26"/>
       <point x="968" y="5"/>
-      <point x="915" y="-9" type="curve" name="hr01" smooth="yes"/>
+      <point x="915" y="-9" type="curve" smooth="yes" name="hr01"/>
       <point x="863" y="-22"/>
       <point x="802" y="-29"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/C_caron.glif b/source/Hack-Regular.ufo/glyphs/C_caron.glif
index 59d9780e2..93ed5f777 100644
--- a/source/Hack-Regular.ufo/glyphs/C_caron.glif
+++ b/source/Hack-Regular.ufo/glyphs/C_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ccaron" format="1">
+<glyph name="Ccaron" format="2">
   <advance width="1233"/>
   <unicode hex="010C"/>
   <outline>
@@ -13,19 +13,19 @@
       <point x="612" y="1586" type="line"/>
     </contour>
     <contour>
-      <point x="742" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="742" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="551" y="-29"/>
       <point x="401" y="41"/>
       <point x="297" y="174" type="curve" smooth="yes"/>
       <point x="192" y="310"/>
       <point x="139" y="503"/>
-      <point x="139" y="744" type="curve" name="dh01" smooth="yes"/>
+      <point x="139" y="744" type="curve" smooth="yes" name="dh01"/>
       <point x="139" y="985"/>
       <point x="191" y="1179"/>
       <point x="298" y="1316" type="curve" smooth="yes"/>
       <point x="402" y="1449"/>
       <point x="551" y="1520"/>
-      <point x="742" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="742" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="802" y="1520"/>
       <point x="863" y="1513"/>
       <point x="915" y="1500" type="curve" smooth="yes"/>
@@ -38,22 +38,22 @@
       <point x="914" y="1324" type="curve" smooth="yes"/>
       <point x="857" y="1345"/>
       <point x="801" y="1356"/>
-      <point x="741" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="741" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="612" y="1356"/>
       <point x="513" y="1305"/>
       <point x="448" y="1204" type="curve" smooth="yes"/>
       <point x="383" y="1103"/>
       <point x="350" y="950"/>
-      <point x="350" y="745" type="curve" name="dh02" smooth="yes"/>
+      <point x="350" y="745" type="curve" smooth="yes" name="dh02"/>
       <point x="350" y="541"/>
       <point x="383" y="388"/>
       <point x="448" y="287" type="curve" smooth="yes"/>
       <point x="511" y="191"/>
       <point x="606" y="135"/>
-      <point x="742" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="742" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="801" y="135"/>
       <point x="859" y="146"/>
-      <point x="916" y="167" type="curve" name="hr01" smooth="yes"/>
+      <point x="916" y="167" type="curve" smooth="yes" name="hr01"/>
       <point x="971" y="188"/>
       <point x="1024" y="219"/>
       <point x="1073" y="260" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/C_cedilla.glif b/source/Hack-Regular.ufo/glyphs/C_cedilla.glif
index 3e8e4e1a7..6bde147fc 100644
--- a/source/Hack-Regular.ufo/glyphs/C_cedilla.glif
+++ b/source/Hack-Regular.ufo/glyphs/C_cedilla.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ccedilla" format="1">
+<glyph name="Ccedilla" format="2">
   <advance width="1233"/>
   <unicode hex="00C7"/>
   <outline>
     <contour>
-      <point x="741" y="1356" type="curve" name="hr00" smooth="yes"/>
+      <point x="741" y="1356" type="curve" smooth="yes" name="hr00"/>
       <point x="612" y="1356"/>
       <point x="513" y="1305"/>
       <point x="448" y="1204" type="curve" smooth="yes"/>
       <point x="383" y="1103"/>
       <point x="350" y="950"/>
-      <point x="350" y="745" type="curve" name="dh02" smooth="yes"/>
+      <point x="350" y="745" type="curve" smooth="yes" name="dh02"/>
       <point x="350" y="541"/>
       <point x="383" y="388"/>
       <point x="448" y="287" type="curve" smooth="yes"/>
       <point x="511" y="191"/>
       <point x="606" y="135"/>
-      <point x="742" y="135" type="curve" name="dv04" smooth="yes"/>
+      <point x="742" y="135" type="curve" smooth="yes" name="dv04"/>
       <point x="801" y="135"/>
       <point x="859" y="146"/>
       <point x="916" y="167" type="curve" smooth="yes"/>
@@ -35,23 +35,23 @@
       <point x="883" y="-115" type="curve" smooth="yes"/>
       <point x="898" y="-146"/>
       <point x="909" y="-179"/>
-      <point x="909" y="-219" type="curve" name="dh04" smooth="yes"/>
+      <point x="909" y="-219" type="curve" smooth="yes" name="dh04"/>
       <point x="909" y="-272"/>
       <point x="889" y="-319"/>
       <point x="849" y="-350" type="curve" smooth="yes"/>
       <point x="810" y="-379"/>
       <point x="753" y="-395"/>
-      <point x="670" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="670" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="641" y="-395"/>
       <point x="612" y="-393"/>
-      <point x="583" y="-389" type="curve" name="sv01" smooth="yes"/>
+      <point x="583" y="-389" type="curve" smooth="yes" name="sv01"/>
       <point x="552" y="-385"/>
       <point x="523" y="-379"/>
       <point x="495" y="-371" type="curve"/>
       <point x="495" y="-240" type="line" name="dh03"/>
       <point x="540" y="-261"/>
       <point x="594" y="-272"/>
-      <point x="646" y="-272" type="curve" name="dv02" smooth="yes"/>
+      <point x="646" y="-272" type="curve" smooth="yes" name="dv02"/>
       <point x="731" y="-272"/>
       <point x="770" y="-239"/>
       <point x="770" y="-180" type="curve" smooth="yes"/>
@@ -66,13 +66,13 @@
       <point x="297" y="174" type="curve" smooth="yes"/>
       <point x="192" y="310"/>
       <point x="139" y="503"/>
-      <point x="139" y="744" type="curve" name="dh01" smooth="yes"/>
+      <point x="139" y="744" type="curve" smooth="yes" name="dh01"/>
       <point x="139" y="985"/>
       <point x="191" y="1179"/>
       <point x="298" y="1316" type="curve" smooth="yes"/>
       <point x="402" y="1449"/>
       <point x="551" y="1520"/>
-      <point x="742" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="742" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="802" y="1520"/>
       <point x="863" y="1513"/>
       <point x="915" y="1500" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/C_circumflex.glif b/source/Hack-Regular.ufo/glyphs/C_circumflex.glif
index 24020d526..82a3e3070 100644
--- a/source/Hack-Regular.ufo/glyphs/C_circumflex.glif
+++ b/source/Hack-Regular.ufo/glyphs/C_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ccircumflex" format="1">
+<glyph name="Ccircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0108"/>
   <outline>
@@ -42,7 +42,7 @@
       <point x="1073" y="53" type="line"/>
       <point x="966" y="-3"/>
       <point x="865" y="-29"/>
-      <point x="742" y="-29" type="curve" name="hr01" smooth="yes"/>
+      <point x="742" y="-29" type="curve" smooth="yes" name="hr01"/>
       <point x="551" y="-29"/>
       <point x="401" y="41"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/C_dotaccent.glif b/source/Hack-Regular.ufo/glyphs/C_dotaccent.glif
index 3af1deef5..04f1a5710 100644
--- a/source/Hack-Regular.ufo/glyphs/C_dotaccent.glif
+++ b/source/Hack-Regular.ufo/glyphs/C_dotaccent.glif
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Cdotaccent" format="1">
+<glyph name="Cdotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="010A"/>
   <outline>
     <contour>
-      <point x="618" y="1647" type="line" name="hr00" smooth="yes"/>
+      <point x="618" y="1647" type="line" smooth="yes" name="hr00"/>
       <point x="598" y="1647"/>
       <point x="588" y="1657"/>
-      <point x="588" y="1677" type="curve" name="ah01" smooth="yes"/>
+      <point x="588" y="1677" type="curve" smooth="yes" name="ah01"/>
       <point x="588" y="1822" type="line" smooth="yes"/>
       <point x="588" y="1842"/>
       <point x="598" y="1852"/>
-      <point x="618" y="1852" type="curve" name="dv03" smooth="yes"/>
+      <point x="618" y="1852" type="curve" smooth="yes" name="dv03"/>
       <point x="763" y="1852" type="line" smooth="yes"/>
       <point x="783" y="1852"/>
       <point x="793" y="1842"/>
       <point x="793" y="1822" type="curve" smooth="yes"/>
-      <point x="793" y="1677" type="line" name="sh01" smooth="yes"/>
+      <point x="793" y="1677" type="line" smooth="yes" name="sh01"/>
       <point x="793" y="1657"/>
       <point x="783" y="1647"/>
       <point x="763" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="744" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="744" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="360" y="-29"/>
       <point x="139" y="255"/>
-      <point x="139" y="743" type="curve" name="sh02" smooth="yes"/>
+      <point x="139" y="743" type="curve" smooth="yes" name="sh02"/>
       <point x="139" y="1233"/>
       <point x="361" y="1520"/>
-      <point x="745" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="745" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="864" y="1520"/>
       <point x="969" y="1494"/>
       <point x="1073" y="1438" type="curve"/>
       <point x="1073" y="1231" type="line"/>
       <point x="976" y="1311"/>
       <point x="864" y="1356"/>
-      <point x="740" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="740" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="481" y="1356"/>
       <point x="350" y="1154"/>
-      <point x="350" y="745" type="curve" name="sh03" smooth="yes"/>
+      <point x="350" y="745" type="curve" smooth="yes" name="sh03"/>
       <point x="350" y="338"/>
       <point x="480" y="135"/>
-      <point x="740" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="740" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="861" y="135"/>
       <point x="976" y="179"/>
       <point x="1073" y="260" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/C_hi.glif b/source/Hack-Regular.ufo/glyphs/C_hi.glif
index 4ccd33d7c..279d31359 100644
--- a/source/Hack-Regular.ufo/glyphs/C_hi.glif
+++ b/source/Hack-Regular.ufo/glyphs/C_hi.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Chi" format="1">
+<glyph name="Chi" format="2">
   <advance width="1233"/>
   <unicode hex="03A7"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/D_.glif b/source/Hack-Regular.ufo/glyphs/D_.glif
index 8a5bbad46..3172fb704 100644
--- a/source/Hack-Regular.ufo/glyphs/D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/D_.glif
@@ -1,37 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="D" format="1">
+<glyph name="D" format="2">
   <advance width="1233"/>
   <unicode hex="0044"/>
   <outline>
     <contour>
-      <point x="137" y="1493" type="line" name="hr00"/>
+      <point x="137" y="1493" type="line"/>
       <point x="440" y="1493" type="line" smooth="yes"/>
-      <point x="896" y="1493"/>
-      <point x="1106" y="1257"/>
-      <point x="1106" y="745" type="curve" name="sh01" smooth="yes"/>
-      <point x="1106" y="490"/>
-      <point x="1052" y="303"/>
-      <point x="944" y="182" type="curve" smooth="yes"/>
-      <point x="836" y="61"/>
-      <point x="668" y="0"/>
-      <point x="440" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="895" y="1493"/>
+      <point x="1106" y="1256"/>
+      <point x="1106" y="748" type="curve" smooth="yes"/>
+      <point x="1106" y="238"/>
+      <point x="894" y="0"/>
+      <point x="440" y="0" type="curve" smooth="yes"/>
       <point x="137" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="436" y="166" type="line" name="sv01" smooth="yes"/>
-      <point x="606" y="166"/>
-      <point x="725" y="208"/>
-      <point x="792" y="292" type="curve" smooth="yes"/>
-      <point x="860" y="376"/>
-      <point x="893" y="523"/>
-      <point x="893" y="747" type="curve" name="ah01" smooth="yes"/>
-      <point x="893" y="967"/>
-      <point x="861" y="1118"/>
-      <point x="793" y="1202" type="curve" smooth="yes"/>
-      <point x="725" y="1287"/>
-      <point x="603" y="1327"/>
-      <point x="436" y="1327" type="curve" name="sv02" smooth="yes"/>
-      <point x="340" y="1327" type="line" name="sh02"/>
+      <point x="436" y="166" type="line" smooth="yes"/>
+      <point x="774" y="166"/>
+      <point x="893" y="318"/>
+      <point x="893" y="748" type="curve" smooth="yes"/>
+      <point x="893" y="1178"/>
+      <point x="775" y="1327"/>
+      <point x="436" y="1327" type="curve" smooth="yes"/>
+      <point x="340" y="1327" type="line"/>
       <point x="340" y="166" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/D_caron.glif b/source/Hack-Regular.ufo/glyphs/D_caron.glif
index e3cefad81..241b9be85 100644
--- a/source/Hack-Regular.ufo/glyphs/D_caron.glif
+++ b/source/Hack-Regular.ufo/glyphs/D_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Dcaron" format="1">
+<glyph name="Dcaron" format="2">
   <advance width="1233"/>
   <unicode hex="010E"/>
   <outline>
@@ -17,20 +17,20 @@
       <point x="440" y="1493" type="line" smooth="yes"/>
       <point x="896" y="1493"/>
       <point x="1106" y="1256"/>
-      <point x="1106" y="747" type="curve" name="sh03" smooth="yes"/>
+      <point x="1106" y="747" type="curve" smooth="yes" name="sh03"/>
       <point x="1106" y="236"/>
       <point x="896" y="0"/>
-      <point x="440" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="440" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="137" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="436" y="166" type="line" name="sv01" smooth="yes"/>
+      <point x="436" y="166" type="line" smooth="yes" name="sv01"/>
       <point x="777" y="166"/>
       <point x="893" y="308"/>
-      <point x="893" y="746" type="curve" name="ah01" smooth="yes"/>
+      <point x="893" y="746" type="curve" smooth="yes" name="ah01"/>
       <point x="893" y="1186"/>
       <point x="776" y="1327"/>
-      <point x="436" y="1327" type="curve" name="sv02" smooth="yes"/>
+      <point x="436" y="1327" type="curve" smooth="yes" name="sv02"/>
       <point x="340" y="1327" type="line" name="sh02"/>
       <point x="340" y="166" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/D_croat.glif b/source/Hack-Regular.ufo/glyphs/D_croat.glif
index 8b3f36050..c8500ae28 100644
--- a/source/Hack-Regular.ufo/glyphs/D_croat.glif
+++ b/source/Hack-Regular.ufo/glyphs/D_croat.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Dcroat" format="1">
+<glyph name="Dcroat" format="2">
   <advance width="1233"/>
   <unicode hex="0110"/>
   <outline>
@@ -12,20 +12,20 @@
       <point x="436" y="1493" type="line" smooth="yes"/>
       <point x="891" y="1493"/>
       <point x="1102" y="1257"/>
-      <point x="1102" y="746" type="curve" name="sh02" smooth="yes"/>
+      <point x="1102" y="746" type="curve" smooth="yes" name="sh02"/>
       <point x="1102" y="237"/>
       <point x="892" y="0"/>
-      <point x="436" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="436" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="133" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="436" y="166" type="line" name="sv01" smooth="yes"/>
+      <point x="436" y="166" type="line" smooth="yes" name="sv01"/>
       <point x="777" y="166"/>
       <point x="893" y="308"/>
-      <point x="893" y="746" type="curve" name="ah01" smooth="yes"/>
+      <point x="893" y="746" type="curve" smooth="yes" name="ah01"/>
       <point x="893" y="1186"/>
       <point x="776" y="1327"/>
-      <point x="436" y="1327" type="curve" name="sv02" smooth="yes"/>
+      <point x="436" y="1327" type="curve" smooth="yes" name="sv02"/>
       <point x="340" y="1327" type="line" name="sh04"/>
       <point x="340" y="858" type="line" name="sv03"/>
       <point x="604" y="858" type="line"/>
diff --git a/source/Hack-Regular.ufo/glyphs/E_.glif b/source/Hack-Regular.ufo/glyphs/E_.glif
index 64faf0402..8f87994e7 100644
--- a/source/Hack-Regular.ufo/glyphs/E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/E_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="E" format="1">
+<glyph name="E" format="2">
   <advance width="1233"/>
   <unicode hex="0045"/>
   <outline>
     <contour>
-      <point x="197" y="1493" type="line" name="hr00"/>
+      <point x="197" y="1493" type="line"/>
       <point x="1083" y="1493" type="line"/>
-      <point x="1083" y="1323" type="line" name="sv01"/>
-      <point x="399" y="1323" type="line" name="dh01"/>
+      <point x="1083" y="1323" type="line"/>
+      <point x="399" y="1323" type="line"/>
       <point x="399" y="881" type="line"/>
-      <point x="1053" y="881" type="line" name="dv02"/>
-      <point x="1053" y="711" type="line" name="dv01"/>
-      <point x="399" y="711" type="line" name="sh01"/>
-      <point x="399" y="170" type="line" name="sv02"/>
+      <point x="1053" y="881" type="line"/>
+      <point x="1053" y="711" type="line"/>
+      <point x="399" y="711" type="line"/>
+      <point x="399" y="170" type="line"/>
       <point x="1102" y="170" type="line"/>
-      <point x="1102" y="0" type="line" name="ab01"/>
+      <point x="1102" y="0" type="line"/>
       <point x="197" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/E_acute.glif b/source/Hack-Regular.ufo/glyphs/E_acute.glif
index 8e4a85d84..cc2668f19 100644
--- a/source/Hack-Regular.ufo/glyphs/E_acute.glif
+++ b/source/Hack-Regular.ufo/glyphs/E_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Eacute" format="1">
+<glyph name="Eacute" format="2">
   <advance width="1233"/>
   <unicode hex="00C9"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/E_breve.glif b/source/Hack-Regular.ufo/glyphs/E_breve.glif
index 771a4e74f..200c10aa6 100644
--- a/source/Hack-Regular.ufo/glyphs/E_breve.glif
+++ b/source/Hack-Regular.ufo/glyphs/E_breve.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ebreve" format="1">
+<glyph name="Ebreve" format="2">
   <advance width="1233"/>
   <unicode hex="0114"/>
   <outline>
@@ -18,14 +18,14 @@
       <point x="197" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="656" y="1619" type="curve" name="dv02" smooth="yes"/>
+      <point x="656" y="1619" type="curve" smooth="yes" name="dv02"/>
       <point x="463" y="1619"/>
       <point x="358" y="1700"/>
       <point x="343" y="1861" type="curve"/>
       <point x="462" y="1861" type="line" name="sv01"/>
       <point x="478" y="1789"/>
       <point x="545" y="1750"/>
-      <point x="658" y="1750" type="curve" name="dv03" smooth="yes"/>
+      <point x="658" y="1750" type="curve" smooth="yes" name="dv03"/>
       <point x="767" y="1750"/>
       <point x="831" y="1787"/>
       <point x="851" y="1861" type="curve" name="sv02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/E_caron.glif b/source/Hack-Regular.ufo/glyphs/E_caron.glif
index f8bdfeb70..efbe2d1fc 100644
--- a/source/Hack-Regular.ufo/glyphs/E_caron.glif
+++ b/source/Hack-Regular.ufo/glyphs/E_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ecaron" format="1">
+<glyph name="Ecaron" format="2">
   <advance width="1233"/>
   <unicode hex="011A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/E_circumflex.glif b/source/Hack-Regular.ufo/glyphs/E_circumflex.glif
index d2a993c50..8ff18ed52 100644
--- a/source/Hack-Regular.ufo/glyphs/E_circumflex.glif
+++ b/source/Hack-Regular.ufo/glyphs/E_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ecircumflex" format="1">
+<glyph name="Ecircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00CA"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/E_dieresis.glif b/source/Hack-Regular.ufo/glyphs/E_dieresis.glif
index 8d5f9bfc0..b2066e221 100644
--- a/source/Hack-Regular.ufo/glyphs/E_dieresis.glif
+++ b/source/Hack-Regular.ufo/glyphs/E_dieresis.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Edieresis" format="1">
+<glyph name="Edieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00CB"/>
   <outline>
     <contour>
-      <point x="367" y="1647" type="line" name="dv01" smooth="yes"/>
+      <point x="367" y="1647" type="line" smooth="yes" name="dv01"/>
       <point x="347" y="1647"/>
       <point x="337" y="1657"/>
-      <point x="337" y="1677" type="curve" name="ih01" smooth="yes"/>
+      <point x="337" y="1677" type="curve" smooth="yes" name="ih01"/>
       <point x="337" y="1820" type="line" smooth="yes"/>
       <point x="337" y="1840"/>
       <point x="347" y="1850"/>
-      <point x="367" y="1850" type="curve" name="dv02" smooth="yes"/>
+      <point x="367" y="1850" type="curve" smooth="yes" name="dv02"/>
       <point x="510" y="1850" type="line" smooth="yes"/>
       <point x="530" y="1850"/>
       <point x="540" y="1840"/>
       <point x="540" y="1820" type="curve" smooth="yes"/>
-      <point x="540" y="1677" type="line" name="sh01" smooth="yes"/>
+      <point x="540" y="1677" type="line" smooth="yes" name="sh01"/>
       <point x="540" y="1657"/>
       <point x="530" y="1647"/>
       <point x="510" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="759" y="1647" type="line" name="sv01" smooth="yes"/>
+      <point x="759" y="1647" type="line" smooth="yes" name="sv01"/>
       <point x="739" y="1647"/>
       <point x="729" y="1657"/>
-      <point x="729" y="1677" type="curve" name="dh03" smooth="yes"/>
+      <point x="729" y="1677" type="curve" smooth="yes" name="dh03"/>
       <point x="729" y="1820" type="line" smooth="yes"/>
       <point x="729" y="1840"/>
       <point x="739" y="1850"/>
-      <point x="759" y="1850" type="curve" name="sv02" smooth="yes"/>
+      <point x="759" y="1850" type="curve" smooth="yes" name="sv02"/>
       <point x="901" y="1850" type="line" smooth="yes"/>
       <point x="921" y="1850"/>
       <point x="931" y="1840"/>
       <point x="931" y="1820" type="curve" smooth="yes"/>
-      <point x="931" y="1677" type="line" name="dh04" smooth="yes"/>
+      <point x="931" y="1677" type="line" smooth="yes" name="dh04"/>
       <point x="931" y="1657"/>
       <point x="921" y="1647"/>
       <point x="901" y="1647" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/E_dotaccent.glif b/source/Hack-Regular.ufo/glyphs/E_dotaccent.glif
index e232885b2..649972457 100644
--- a/source/Hack-Regular.ufo/glyphs/E_dotaccent.glif
+++ b/source/Hack-Regular.ufo/glyphs/E_dotaccent.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Edotaccent" format="1">
+<glyph name="Edotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="0116"/>
   <outline>
     <contour>
-      <point x="561" y="1647" type="line" name="hr00" smooth="yes"/>
+      <point x="561" y="1647" type="line" smooth="yes" name="hr00"/>
       <point x="541" y="1647"/>
       <point x="531" y="1657"/>
-      <point x="531" y="1677" type="curve" name="ah01" smooth="yes"/>
+      <point x="531" y="1677" type="curve" smooth="yes" name="ah01"/>
       <point x="531" y="1822" type="line" smooth="yes"/>
       <point x="531" y="1842"/>
       <point x="541" y="1852"/>
-      <point x="561" y="1852" type="curve" name="dv01" smooth="yes"/>
+      <point x="561" y="1852" type="curve" smooth="yes" name="dv01"/>
       <point x="706" y="1852" type="line" smooth="yes"/>
       <point x="726" y="1852"/>
       <point x="736" y="1842"/>
       <point x="736" y="1822" type="curve" smooth="yes"/>
-      <point x="736" y="1677" type="line" name="sh01" smooth="yes"/>
+      <point x="736" y="1677" type="line" smooth="yes" name="sh01"/>
       <point x="736" y="1657"/>
       <point x="726" y="1647"/>
       <point x="706" y="1647" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/E_grave.glif b/source/Hack-Regular.ufo/glyphs/E_grave.glif
index 3ceb8d4c4..4def96f8c 100644
--- a/source/Hack-Regular.ufo/glyphs/E_grave.glif
+++ b/source/Hack-Regular.ufo/glyphs/E_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Egrave" format="1">
+<glyph name="Egrave" format="2">
   <advance width="1233"/>
   <unicode hex="00C8"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/E_macron.glif b/source/Hack-Regular.ufo/glyphs/E_macron.glif
index a85ad682a..c6d0f4877 100644
--- a/source/Hack-Regular.ufo/glyphs/E_macron.glif
+++ b/source/Hack-Regular.ufo/glyphs/E_macron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Emacron" format="1">
+<glyph name="Emacron" format="2">
   <advance width="1233"/>
   <unicode hex="0112"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/E_ng.glif b/source/Hack-Regular.ufo/glyphs/E_ng.glif
index e1fe4c8c5..78299825c 100644
--- a/source/Hack-Regular.ufo/glyphs/E_ng.glif
+++ b/source/Hack-Regular.ufo/glyphs/E_ng.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Eng" format="1">
+<glyph name="Eng" format="2">
   <advance width="1233"/>
   <unicode hex="014A"/>
   <outline>
@@ -8,11 +8,11 @@
       <point x="703" y="-270" type="line" smooth="yes"/>
       <point x="823" y="-270"/>
       <point x="882" y="-195"/>
-      <point x="882" y="0" type="curve" name="ah01" smooth="yes"/>
+      <point x="882" y="0" type="curve" smooth="yes" name="ah01"/>
       <point x="882" y="1009" type="line" smooth="yes"/>
       <point x="882" y="1249"/>
       <point x="807" y="1358"/>
-      <point x="642" y="1358" type="curve" name="sv02" smooth="yes"/>
+      <point x="642" y="1358" type="curve" smooth="yes" name="sv02"/>
       <point x="453" y="1358"/>
       <point x="349" y="1209"/>
       <point x="349" y="937" type="curve" smooth="yes"/>
@@ -23,14 +23,14 @@
       <point x="349" y="1295" type="line" name="sh02"/>
       <point x="421" y="1444"/>
       <point x="544" y="1522"/>
-      <point x="713" y="1522" type="curve" name="sv03" smooth="yes"/>
+      <point x="713" y="1522" type="curve" smooth="yes" name="sv03"/>
       <point x="961" y="1522"/>
       <point x="1085" y="1348"/>
       <point x="1085" y="999" type="curve" smooth="yes"/>
-      <point x="1085" y="-20" type="line" name="sh03" smooth="yes"/>
+      <point x="1085" y="-20" type="line" smooth="yes" name="sh03"/>
       <point x="1085" y="-281"/>
       <point x="962" y="-426"/>
-      <point x="741" y="-426" type="curve" name="ab01" smooth="yes"/>
+      <point x="741" y="-426" type="curve" smooth="yes" name="ab01"/>
       <point x="536" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/E_ogonek.glif b/source/Hack-Regular.ufo/glyphs/E_ogonek.glif
index 62d84ecab..2a289cce7 100644
--- a/source/Hack-Regular.ufo/glyphs/E_ogonek.glif
+++ b/source/Hack-Regular.ufo/glyphs/E_ogonek.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Eogonek" format="1">
+<glyph name="Eogonek" format="2">
   <advance width="1233"/>
   <unicode hex="0118"/>
   <outline>
@@ -7,20 +7,20 @@
       <point x="952" y="0" type="line" name="ab01"/>
       <point x="888" y="-87"/>
       <point x="864" y="-139"/>
-      <point x="864" y="-184" type="curve" name="dh04" smooth="yes"/>
+      <point x="864" y="-184" type="curve" smooth="yes" name="dh04"/>
       <point x="864" y="-240"/>
       <point x="902" y="-272"/>
-      <point x="974" y="-272" type="curve" name="dv02" smooth="yes"/>
+      <point x="974" y="-272" type="curve" smooth="yes" name="dv02"/>
       <point x="1015" y="-272"/>
       <point x="1057" y="-262"/>
       <point x="1098" y="-242" type="curve" name="sh02"/>
       <point x="1098" y="-375" type="line"/>
       <point x="1042" y="-390"/>
       <point x="1004" y="-395"/>
-      <point x="955" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="955" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="806" y="-395"/>
       <point x="725" y="-340"/>
-      <point x="725" y="-221" type="curve" name="dh03" smooth="yes"/>
+      <point x="725" y="-221" type="curve" smooth="yes" name="dh03"/>
       <point x="725" y="-155"/>
       <point x="751" y="-93"/>
       <point x="833" y="0" type="curve" name="ab02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/E_psilon.glif b/source/Hack-Regular.ufo/glyphs/E_psilon.glif
index bc9c5462a..9909ed8c0 100644
--- a/source/Hack-Regular.ufo/glyphs/E_psilon.glif
+++ b/source/Hack-Regular.ufo/glyphs/E_psilon.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Epsilon" format="1">
+<glyph name="Epsilon" format="2">
   <advance width="1233"/>
   <unicode hex="0395"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/E_psilontonos.glif b/source/Hack-Regular.ufo/glyphs/E_psilontonos.glif
index aa431fbd8..746f1aa40 100644
--- a/source/Hack-Regular.ufo/glyphs/E_psilontonos.glif
+++ b/source/Hack-Regular.ufo/glyphs/E_psilontonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Epsilontonos" format="1">
+<glyph name="Epsilontonos" format="2">
   <advance width="1233"/>
   <unicode hex="0388"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/E_ta.glif b/source/Hack-Regular.ufo/glyphs/E_ta.glif
index e61979941..659a175a3 100644
--- a/source/Hack-Regular.ufo/glyphs/E_ta.glif
+++ b/source/Hack-Regular.ufo/glyphs/E_ta.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Eta" format="1">
+<glyph name="Eta" format="2">
   <advance width="1233"/>
   <unicode hex="0397"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/E_tatonos.glif b/source/Hack-Regular.ufo/glyphs/E_tatonos.glif
index 9c5822dc9..e7c4151e3 100644
--- a/source/Hack-Regular.ufo/glyphs/E_tatonos.glif
+++ b/source/Hack-Regular.ufo/glyphs/E_tatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Etatonos" format="1">
+<glyph name="Etatonos" format="2">
   <advance width="1233"/>
   <unicode hex="0389"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/E_th.glif b/source/Hack-Regular.ufo/glyphs/E_th.glif
index 9e891dcdf..8617c6df0 100644
--- a/source/Hack-Regular.ufo/glyphs/E_th.glif
+++ b/source/Hack-Regular.ufo/glyphs/E_th.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Eth" format="1">
+<glyph name="Eth" format="2">
   <advance width="1233"/>
   <unicode hex="00D0"/>
   <outline>
@@ -12,29 +12,29 @@
       <point x="436" y="1493" type="line" smooth="yes"/>
       <point x="892" y="1493"/>
       <point x="1102" y="1257"/>
-      <point x="1102" y="746" type="curve" name="sh02" smooth="yes"/>
+      <point x="1102" y="746" type="curve" smooth="yes" name="sh02"/>
       <point x="1102" y="491"/>
       <point x="1048" y="303"/>
       <point x="940" y="182" type="curve" smooth="yes"/>
       <point x="829" y="58"/>
       <point x="660" y="0"/>
-      <point x="436" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="436" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="133" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="436" y="166" type="line" name="sv01" smooth="yes"/>
+      <point x="436" y="166" type="line" smooth="yes" name="sv01"/>
       <point x="620" y="166"/>
       <point x="725" y="211"/>
       <point x="791" y="293" type="curve" smooth="yes"/>
       <point x="860" y="380"/>
       <point x="893" y="521"/>
-      <point x="893" y="748" type="curve" name="ah01" smooth="yes"/>
+      <point x="893" y="748" type="curve" smooth="yes" name="ah01"/>
       <point x="893" y="982"/>
       <point x="858" y="1115"/>
       <point x="792" y="1200" type="curve" smooth="yes"/>
       <point x="721" y="1289"/>
       <point x="609" y="1327"/>
-      <point x="436" y="1327" type="curve" name="sv02" smooth="yes"/>
+      <point x="436" y="1327" type="curve" smooth="yes" name="sv02"/>
       <point x="340" y="1327" type="line" name="sh04"/>
       <point x="340" y="858" type="line" name="sv03"/>
       <point x="604" y="858" type="line"/>
diff --git a/source/Hack-Regular.ufo/glyphs/E_uro.glif b/source/Hack-Regular.ufo/glyphs/E_uro.glif
index 0305710e5..445590177 100644
--- a/source/Hack-Regular.ufo/glyphs/E_uro.glif
+++ b/source/Hack-Regular.ufo/glyphs/E_uro.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Euro" format="1">
+<glyph name="Euro" format="2">
   <advance width="1233"/>
   <unicode hex="20AC"/>
   <outline>
@@ -27,7 +27,7 @@
       <point x="396" y="1376" type="curve" smooth="yes"/>
       <point x="487" y="1472"/>
       <point x="606" y="1520"/>
-      <point x="755" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="755" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="811" y="1520"/>
       <point x="864" y="1513"/>
       <point x="914" y="1500" type="curve" smooth="yes"/>
@@ -40,7 +40,7 @@
       <point x="916" y="1326" type="curve" smooth="yes"/>
       <point x="864" y="1349"/>
       <point x="811" y="1360"/>
-      <point x="756" y="1360" type="curve" name="sv01" smooth="yes"/>
+      <point x="756" y="1360" type="curve" smooth="yes" name="sv01"/>
       <point x="660" y="1360"/>
       <point x="583" y="1325"/>
       <point x="525" y="1256" type="curve" smooth="yes"/>
@@ -52,13 +52,13 @@
       <point x="404" y="840" type="line"/>
       <point x="403" y="828"/>
       <point x="402" y="814"/>
-      <point x="402" y="798" type="curve" name="sh05" smooth="yes"/>
+      <point x="402" y="798" type="curve" smooth="yes" name="sh05"/>
       <point x="402" y="789"/>
       <point x="401" y="785"/>
-      <point x="401" y="742" type="curve" name="dh02" smooth="yes"/>
+      <point x="401" y="742" type="curve" smooth="yes" name="dh02"/>
       <point x="401" y="700"/>
       <point x="402" y="699"/>
-      <point x="402" y="695" type="curve" name="sh06" smooth="yes"/>
+      <point x="402" y="695" type="curve" smooth="yes" name="sh06"/>
       <point x="402" y="682"/>
       <point x="402" y="668"/>
       <point x="403" y="653" type="curve" name="sh07"/>
@@ -70,7 +70,7 @@
       <point x="524" y="236" type="curve" smooth="yes"/>
       <point x="582" y="166"/>
       <point x="660" y="131"/>
-      <point x="757" y="131" type="curve" name="dv01" smooth="yes"/>
+      <point x="757" y="131" type="curve" smooth="yes" name="dv01"/>
       <point x="811" y="131"/>
       <point x="864" y="142"/>
       <point x="916" y="165" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/F_.glif b/source/Hack-Regular.ufo/glyphs/F_.glif
index bceb9a8bf..cd7162650 100644
--- a/source/Hack-Regular.ufo/glyphs/F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/F_.glif
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="F" format="1">
+<glyph name="F" format="2">
   <advance width="1233"/>
   <unicode hex="0046"/>
   <outline>
     <contour>
-      <point x="233" y="1493" type="line" name="hr00"/>
+      <point x="233" y="1493" type="line"/>
       <point x="1112" y="1493" type="line"/>
-      <point x="1112" y="1323" type="line" name="sv01"/>
-      <point x="436" y="1323" type="line" name="dh01"/>
+      <point x="1112" y="1323" type="line"/>
+      <point x="436" y="1323" type="line"/>
       <point x="436" y="863" type="line"/>
-      <point x="1049" y="863" type="line" name="dv02"/>
-      <point x="1049" y="693" type="line" name="dv01"/>
-      <point x="436" y="693" type="line" name="sh01"/>
-      <point x="436" y="0" type="line" name="ab01"/>
+      <point x="1049" y="863" type="line"/>
+      <point x="1049" y="693" type="line"/>
+      <point x="436" y="693" type="line"/>
+      <point x="436" y="0" type="line"/>
       <point x="233" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/G_.glif b/source/Hack-Regular.ufo/glyphs/G_.glif
index e75ae5c1b..b7565ea67 100644
--- a/source/Hack-Regular.ufo/glyphs/G_.glif
+++ b/source/Hack-Regular.ufo/glyphs/G_.glif
@@ -1,60 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="G" format="1">
+<glyph name="G" format="2">
   <advance width="1233"/>
   <unicode hex="0047"/>
   <outline>
     <contour>
-      <point x="700" y="-29" type="curve" name="dv01" smooth="yes"/>
-      <point x="509" y="-29"/>
-      <point x="362" y="42"/>
-      <point x="259" y="175" type="curve" smooth="yes"/>
-      <point x="155" y="311"/>
-      <point x="102" y="503"/>
-      <point x="102" y="744" type="curve" name="dh01" smooth="yes"/>
-      <point x="102" y="1238"/>
-      <point x="329" y="1520"/>
-      <point x="703" y="1520" type="curve" name="at01" smooth="yes"/>
-      <point x="770" y="1520"/>
-      <point x="831" y="1511"/>
-      <point x="887" y="1494" type="curve" smooth="yes"/>
-      <point x="946" y="1475"/>
-      <point x="1001" y="1448"/>
-      <point x="1053" y="1413" type="curve" name="hr01"/>
-      <point x="1053" y="1206" type="line" name="ih01"/>
-      <point x="996" y="1261"/>
-      <point x="938" y="1297"/>
-      <point x="887" y="1320" type="curve" smooth="yes"/>
-      <point x="828" y="1345"/>
-      <point x="766" y="1356"/>
-      <point x="706" y="1356" type="curve" name="sv01" smooth="yes"/>
-      <point x="577" y="1356"/>
-      <point x="480" y="1308"/>
-      <point x="412" y="1204" type="curve" smooth="yes"/>
-      <point x="345" y="1101"/>
-      <point x="313" y="952"/>
-      <point x="313" y="743" type="curve" name="dh02" smooth="yes"/>
-      <point x="313" y="532"/>
-      <point x="345" y="385"/>
-      <point x="409" y="285" type="curve" smooth="yes"/>
-      <point x="472" y="185"/>
-      <point x="570" y="135"/>
-      <point x="703" y="135" type="curve" name="dv02" smooth="yes"/>
-      <point x="746" y="135"/>
-      <point x="785" y="140"/>
-      <point x="820" y="151" type="curve" smooth="yes"/>
-      <point x="852" y="162"/>
-      <point x="883" y="176"/>
-      <point x="911" y="199" type="curve" name="sh01"/>
-      <point x="911" y="600" type="line" name="dv03"/>
+      <point x="699" y="-29" type="curve" smooth="yes"/>
+      <point x="326" y="-29"/>
+      <point x="102" y="260"/>
+      <point x="102" y="743" type="curve" smooth="yes"/>
+      <point x="102" y="1228"/>
+      <point x="328" y="1520"/>
+      <point x="705" y="1520" type="curve" smooth="yes"/>
+      <point x="834" y="1520"/>
+      <point x="944" y="1486"/>
+      <point x="1053" y="1413" type="curve"/>
+      <point x="1053" y="1206" type="line"/>
+      <point x="948" y="1307"/>
+      <point x="835" y="1356"/>
+      <point x="710" y="1356" type="curve" smooth="yes"/>
+      <point x="450" y="1356"/>
+      <point x="313" y="1142"/>
+      <point x="313" y="739" type="curve" smooth="yes"/>
+      <point x="313" y="342"/>
+      <point x="446" y="135"/>
+      <point x="705" y="135" type="curve" smooth="yes"/>
+      <point x="788" y="135"/>
+      <point x="859" y="157"/>
+      <point x="911" y="199" type="curve"/>
+      <point x="911" y="600" type="line"/>
       <point x="694" y="600" type="line"/>
-      <point x="694" y="766" type="line" name="dh03"/>
-      <point x="1104" y="766" type="line" name="dh04"/>
+      <point x="694" y="766" type="line"/>
+      <point x="1104" y="766" type="line"/>
       <point x="1104" y="123" type="line"/>
-      <point x="1050" y="73"/>
-      <point x="989" y="35"/>
-      <point x="922" y="10" type="curve" smooth="yes"/>
-      <point x="854" y="-16"/>
-      <point x="780" y="-29"/>
+      <point x="996" y="23"/>
+      <point x="858" y="-29"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Regular.ufo/glyphs/G_amma.glif b/source/Hack-Regular.ufo/glyphs/G_amma.glif
index 17dea8d9e..3bad65873 100644
--- a/source/Hack-Regular.ufo/glyphs/G_amma.glif
+++ b/source/Hack-Regular.ufo/glyphs/G_amma.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Gamma" format="1">
+<glyph name="Gamma" format="2">
   <advance width="1233"/>
   <unicode hex="0393"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/G_breve.glif b/source/Hack-Regular.ufo/glyphs/G_breve.glif
index c188097e1..7004624df 100644
--- a/source/Hack-Regular.ufo/glyphs/G_breve.glif
+++ b/source/Hack-Regular.ufo/glyphs/G_breve.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Gbreve" format="1">
+<glyph name="Gbreve" format="2">
   <advance width="1233"/>
   <unicode hex="011E"/>
   <outline>
     <contour>
-      <point x="656" y="1589" type="curve" name="dv02" smooth="yes"/>
+      <point x="656" y="1589" type="curve" smooth="yes" name="dv02"/>
       <point x="463" y="1589"/>
       <point x="358" y="1670"/>
       <point x="343" y="1831" type="curve"/>
       <point x="462" y="1831" type="line" name="sv01"/>
       <point x="478" y="1759"/>
       <point x="545" y="1720"/>
-      <point x="658" y="1720" type="curve" name="dv03" smooth="yes"/>
+      <point x="658" y="1720" type="curve" smooth="yes" name="dv03"/>
       <point x="767" y="1720"/>
       <point x="831" y="1757"/>
       <point x="851" y="1831" type="curve" name="sv02"/>
@@ -20,19 +20,19 @@
       <point x="849" y="1589"/>
     </contour>
     <contour>
-      <point x="700" y="-29" type="curve" name="hr01" smooth="yes"/>
+      <point x="700" y="-29" type="curve" smooth="yes" name="hr01"/>
       <point x="509" y="-29"/>
       <point x="362" y="42"/>
       <point x="259" y="175" type="curve" smooth="yes"/>
       <point x="155" y="311"/>
       <point x="102" y="503"/>
-      <point x="102" y="744" type="curve" name="dh01" smooth="yes"/>
+      <point x="102" y="744" type="curve" smooth="yes" name="dh01"/>
       <point x="102" y="985"/>
       <point x="154" y="1179"/>
       <point x="261" y="1316" type="curve" smooth="yes"/>
       <point x="362" y="1445"/>
       <point x="511" y="1520"/>
-      <point x="702" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="702" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="829" y="1520"/>
       <point x="952" y="1483"/>
       <point x="1053" y="1413" type="curve"/>
@@ -42,19 +42,19 @@
       <point x="887" y="1320" type="curve" smooth="yes"/>
       <point x="828" y="1345"/>
       <point x="766" y="1356"/>
-      <point x="706" y="1356" type="curve" name="sv03" smooth="yes"/>
+      <point x="706" y="1356" type="curve" smooth="yes" name="sv03"/>
       <point x="577" y="1356"/>
       <point x="480" y="1308"/>
       <point x="412" y="1204" type="curve" smooth="yes"/>
       <point x="345" y="1101"/>
       <point x="313" y="952"/>
-      <point x="313" y="743" type="curve" name="dh02" smooth="yes"/>
+      <point x="313" y="743" type="curve" smooth="yes" name="dh02"/>
       <point x="313" y="532"/>
       <point x="345" y="385"/>
       <point x="409" y="285" type="curve" smooth="yes"/>
       <point x="476" y="181"/>
       <point x="571" y="135"/>
-      <point x="703" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="703" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="794" y="135"/>
       <point x="855" y="154"/>
       <point x="911" y="199" type="curve" name="sh01"/>
@@ -65,7 +65,7 @@
       <point x="1104" y="123" type="line" name="hr02"/>
       <point x="1050" y="73"/>
       <point x="989" y="35"/>
-      <point x="922" y="10" type="curve" name="hr03" smooth="yes"/>
+      <point x="922" y="10" type="curve" smooth="yes" name="hr03"/>
       <point x="854" y="-16"/>
       <point x="780" y="-29"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/G_caron.glif b/source/Hack-Regular.ufo/glyphs/G_caron.glif
index 29f6957a4..edbd0e4da 100644
--- a/source/Hack-Regular.ufo/glyphs/G_caron.glif
+++ b/source/Hack-Regular.ufo/glyphs/G_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Gcaron" format="1">
+<glyph name="Gcaron" format="2">
   <advance width="1233"/>
   <unicode hex="01E6"/>
   <outline>
@@ -13,26 +13,26 @@
       <point x="612" y="1586" type="line"/>
     </contour>
     <contour>
-      <point x="700" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="700" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="324" y="-29"/>
       <point x="102" y="255"/>
-      <point x="102" y="743" type="curve" name="dh01" smooth="yes"/>
+      <point x="102" y="743" type="curve" smooth="yes" name="dh01"/>
       <point x="102" y="1233"/>
       <point x="327" y="1520"/>
-      <point x="703" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="703" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="835" y="1520"/>
       <point x="945" y="1485"/>
       <point x="1053" y="1413" type="curve"/>
       <point x="1053" y="1206" type="line" name="ih03"/>
       <point x="945" y="1310"/>
       <point x="835" y="1356"/>
-      <point x="707" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="707" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="440" y="1356"/>
       <point x="313" y="1155"/>
-      <point x="313" y="739" type="curve" name="dh02" smooth="yes"/>
+      <point x="313" y="739" type="curve" smooth="yes" name="dh02"/>
       <point x="313" y="330"/>
       <point x="438" y="135"/>
-      <point x="705" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="705" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="790" y="135"/>
       <point x="855" y="155"/>
       <point x="911" y="199" type="curve" name="sh01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/G_circumflex.glif b/source/Hack-Regular.ufo/glyphs/G_circumflex.glif
index 2acebf363..8cbf7fd44 100644
--- a/source/Hack-Regular.ufo/glyphs/G_circumflex.glif
+++ b/source/Hack-Regular.ufo/glyphs/G_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Gcircumflex" format="1">
+<glyph name="Gcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="011C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/G_dotaccent.glif b/source/Hack-Regular.ufo/glyphs/G_dotaccent.glif
index 629278bfe..c302c535f 100644
--- a/source/Hack-Regular.ufo/glyphs/G_dotaccent.glif
+++ b/source/Hack-Regular.ufo/glyphs/G_dotaccent.glif
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Gdotaccent" format="1">
+<glyph name="Gdotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="0120"/>
   <outline>
     <contour>
-      <point x="618" y="1647" type="line" name="dv03" smooth="yes"/>
+      <point x="618" y="1647" type="line" smooth="yes" name="dv03"/>
       <point x="598" y="1647"/>
       <point x="588" y="1657"/>
-      <point x="588" y="1677" type="curve" name="dh03" smooth="yes"/>
+      <point x="588" y="1677" type="curve" smooth="yes" name="dh03"/>
       <point x="588" y="1822" type="line" smooth="yes"/>
       <point x="588" y="1842"/>
       <point x="598" y="1852"/>
-      <point x="618" y="1852" type="curve" name="dv04" smooth="yes"/>
+      <point x="618" y="1852" type="curve" smooth="yes" name="dv04"/>
       <point x="763" y="1852" type="line" smooth="yes"/>
       <point x="783" y="1852"/>
       <point x="793" y="1842"/>
-      <point x="793" y="1822" type="curve" name="hr01" smooth="yes"/>
-      <point x="793" y="1677" type="line" name="dh04" smooth="yes"/>
+      <point x="793" y="1822" type="curve" smooth="yes" name="hr01"/>
+      <point x="793" y="1677" type="line" smooth="yes" name="dh04"/>
       <point x="793" y="1657"/>
       <point x="783" y="1647"/>
       <point x="763" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="700" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="700" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="324" y="-29"/>
       <point x="102" y="255"/>
-      <point x="102" y="743" type="curve" name="dh01" smooth="yes"/>
+      <point x="102" y="743" type="curve" smooth="yes" name="dh01"/>
       <point x="102" y="1233"/>
       <point x="327" y="1520"/>
-      <point x="703" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="703" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="835" y="1520"/>
       <point x="945" y="1485"/>
       <point x="1053" y="1413" type="curve"/>
       <point x="1053" y="1206" type="line" name="ih02"/>
       <point x="945" y="1310"/>
       <point x="835" y="1356"/>
-      <point x="707" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="707" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="440" y="1356"/>
       <point x="313" y="1155"/>
-      <point x="313" y="739" type="curve" name="dh02" smooth="yes"/>
+      <point x="313" y="739" type="curve" smooth="yes" name="dh02"/>
       <point x="313" y="330"/>
       <point x="438" y="135"/>
-      <point x="705" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="705" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="790" y="135"/>
       <point x="855" y="155"/>
       <point x="911" y="199" type="curve" name="sh02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/H_.glif b/source/Hack-Regular.ufo/glyphs/H_.glif
index 4ed347448..f81aa553e 100644
--- a/source/Hack-Regular.ufo/glyphs/H_.glif
+++ b/source/Hack-Regular.ufo/glyphs/H_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="H" format="1">
+<glyph name="H" format="2">
   <advance width="1233"/>
   <unicode hex="0048"/>
   <outline>
     <contour>
-      <point x="137" y="1493" type="line" name="hr00"/>
-      <point x="340" y="1493" type="line" name="sh01"/>
+      <point x="137" y="1493" type="line"/>
+      <point x="340" y="1493" type="line"/>
       <point x="340" y="881" type="line"/>
-      <point x="893" y="881" type="line" name="dv02"/>
-      <point x="893" y="1493" type="line" name="ah01"/>
-      <point x="1096" y="1493" type="line" name="sh02"/>
-      <point x="1096" y="0" type="line" name="ab01"/>
-      <point x="893" y="0" type="line" name="sh03"/>
-      <point x="893" y="711" type="line" name="dv01"/>
-      <point x="340" y="711" type="line" name="sh04"/>
-      <point x="340" y="0" type="line" name="ab02"/>
+      <point x="893" y="881" type="line"/>
+      <point x="893" y="1493" type="line"/>
+      <point x="1096" y="1493" type="line"/>
+      <point x="1096" y="0" type="line"/>
+      <point x="893" y="0" type="line"/>
+      <point x="893" y="711" type="line"/>
+      <point x="340" y="711" type="line"/>
+      <point x="340" y="0" type="line"/>
       <point x="137" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/H_bar.glif b/source/Hack-Regular.ufo/glyphs/H_bar.glif
index 0b02c53e8..ba5e2f788 100644
--- a/source/Hack-Regular.ufo/glyphs/H_bar.glif
+++ b/source/Hack-Regular.ufo/glyphs/H_bar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Hbar" format="1">
+<glyph name="Hbar" format="2">
   <advance width="1233"/>
   <unicode hex="0126"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/H_circumflex.glif b/source/Hack-Regular.ufo/glyphs/H_circumflex.glif
index fb00d036b..9320eb7e8 100644
--- a/source/Hack-Regular.ufo/glyphs/H_circumflex.glif
+++ b/source/Hack-Regular.ufo/glyphs/H_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Hcircumflex" format="1">
+<glyph name="Hcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0124"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/I_.glif b/source/Hack-Regular.ufo/glyphs/I_.glif
index eb24a303c..738866667 100644
--- a/source/Hack-Regular.ufo/glyphs/I_.glif
+++ b/source/Hack-Regular.ufo/glyphs/I_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="I" format="1">
+<glyph name="I" format="2">
   <advance width="1233"/>
   <unicode hex="0049"/>
   <outline>
     <contour>
-      <point x="201" y="170" type="line" name="hr00"/>
-      <point x="514" y="170" type="line" name="dh01"/>
-      <point x="514" y="1323" type="line" name="sv01"/>
+      <point x="201" y="170" type="line"/>
+      <point x="514" y="170" type="line"/>
+      <point x="514" y="1323" type="line"/>
       <point x="201" y="1323" type="line"/>
-      <point x="201" y="1493" type="line" name="at01"/>
+      <point x="201" y="1493" type="line"/>
       <point x="1030" y="1493" type="line"/>
-      <point x="1030" y="1323" type="line" name="sv02"/>
-      <point x="717" y="1323" type="line" name="sv03"/>
-      <point x="717" y="170" type="line" name="dh02"/>
-      <point x="1030" y="170" type="line" name="sv04"/>
-      <point x="1030" y="0" type="line" name="ab01"/>
+      <point x="1030" y="1323" type="line"/>
+      <point x="717" y="1323" type="line"/>
+      <point x="717" y="170" type="line"/>
+      <point x="1030" y="170" type="line"/>
+      <point x="1030" y="0" type="line"/>
       <point x="201" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/I_J_.glif b/source/Hack-Regular.ufo/glyphs/I_J_.glif
index 6cb0b1576..585030e4c 100644
--- a/source/Hack-Regular.ufo/glyphs/I_J_.glif
+++ b/source/Hack-Regular.ufo/glyphs/I_J_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="IJ" format="1">
+<glyph name="IJ" format="2">
   <advance width="1233"/>
   <unicode hex="0132"/>
   <outline>
@@ -19,10 +19,10 @@
       <point x="1099" y="406" type="line"/>
       <point x="1099" y="333"/>
       <point x="1081" y="265"/>
-      <point x="1045" y="203" type="curve" name="hr01" smooth="yes"/>
+      <point x="1045" y="203" type="curve" smooth="yes" name="hr01"/>
       <point x="972" y="78"/>
       <point x="840" y="0"/>
-      <point x="693" y="0" type="curve" name="hr02" smooth="yes"/>
+      <point x="693" y="0" type="curve" smooth="yes" name="hr02"/>
       <point x="135" y="0" type="line"/>
     </contour>
     <contour>
diff --git a/source/Hack-Regular.ufo/glyphs/I_acute.glif b/source/Hack-Regular.ufo/glyphs/I_acute.glif
index d423af95c..b9f1af5cd 100644
--- a/source/Hack-Regular.ufo/glyphs/I_acute.glif
+++ b/source/Hack-Regular.ufo/glyphs/I_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Iacute" format="1">
+<glyph name="Iacute" format="2">
   <advance width="1233"/>
   <unicode hex="00CD"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/I_breve.glif b/source/Hack-Regular.ufo/glyphs/I_breve.glif
index 96dd8a3ee..6044648cc 100644
--- a/source/Hack-Regular.ufo/glyphs/I_breve.glif
+++ b/source/Hack-Regular.ufo/glyphs/I_breve.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ibreve" format="1">
+<glyph name="Ibreve" format="2">
   <advance width="1233"/>
   <unicode hex="012C"/>
   <outline>
@@ -18,14 +18,14 @@
       <point x="201" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="615" y="1619" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="1619" type="curve" smooth="yes" name="dv02"/>
       <point x="422" y="1619"/>
       <point x="317" y="1700"/>
       <point x="302" y="1861" type="curve"/>
       <point x="421" y="1861" type="line" name="sv01"/>
       <point x="437" y="1789"/>
       <point x="504" y="1750"/>
-      <point x="617" y="1750" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="1750" type="curve" smooth="yes" name="dv03"/>
       <point x="726" y="1750"/>
       <point x="790" y="1787"/>
       <point x="810" y="1861" type="curve" name="sv02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/I_circumflex.glif b/source/Hack-Regular.ufo/glyphs/I_circumflex.glif
index 73b071952..7c796b2c8 100644
--- a/source/Hack-Regular.ufo/glyphs/I_circumflex.glif
+++ b/source/Hack-Regular.ufo/glyphs/I_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Icircumflex" format="1">
+<glyph name="Icircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00CE"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/I_dieresis.glif b/source/Hack-Regular.ufo/glyphs/I_dieresis.glif
index 787ea1ee7..dd8faf14e 100644
--- a/source/Hack-Regular.ufo/glyphs/I_dieresis.glif
+++ b/source/Hack-Regular.ufo/glyphs/I_dieresis.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Idieresis" format="1">
+<glyph name="Idieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00CF"/>
   <outline>
     <contour>
-      <point x="349" y="1647" type="line" name="dv01" smooth="yes"/>
+      <point x="349" y="1647" type="line" smooth="yes" name="dv01"/>
       <point x="329" y="1647"/>
       <point x="319" y="1657"/>
-      <point x="319" y="1677" type="curve" name="dh01" smooth="yes"/>
+      <point x="319" y="1677" type="curve" smooth="yes" name="dh01"/>
       <point x="319" y="1820" type="line" smooth="yes"/>
       <point x="319" y="1840"/>
       <point x="329" y="1850"/>
-      <point x="349" y="1850" type="curve" name="dv02" smooth="yes"/>
+      <point x="349" y="1850" type="curve" smooth="yes" name="dv02"/>
       <point x="492" y="1850" type="line" smooth="yes"/>
       <point x="512" y="1850"/>
       <point x="522" y="1840"/>
       <point x="522" y="1820" type="curve" smooth="yes"/>
-      <point x="522" y="1677" type="line" name="dh02" smooth="yes"/>
+      <point x="522" y="1677" type="line" smooth="yes" name="dh02"/>
       <point x="522" y="1657"/>
       <point x="512" y="1647"/>
       <point x="492" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1647" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1647" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1647"/>
       <point x="711" y="1657"/>
-      <point x="711" y="1677" type="curve" name="sh02" smooth="yes"/>
+      <point x="711" y="1677" type="curve" smooth="yes" name="sh02"/>
       <point x="711" y="1820" type="line" smooth="yes"/>
       <point x="711" y="1840"/>
       <point x="721" y="1850"/>
-      <point x="741" y="1850" type="curve" name="sv02" smooth="yes"/>
+      <point x="741" y="1850" type="curve" smooth="yes" name="sv02"/>
       <point x="883" y="1850" type="line" smooth="yes"/>
       <point x="903" y="1850"/>
       <point x="913" y="1840"/>
-      <point x="913" y="1820" type="curve" name="hr01" smooth="yes"/>
-      <point x="913" y="1677" type="line" name="sh03" smooth="yes"/>
+      <point x="913" y="1820" type="curve" smooth="yes" name="hr01"/>
+      <point x="913" y="1677" type="line" smooth="yes" name="sh03"/>
       <point x="913" y="1657"/>
       <point x="903" y="1647"/>
       <point x="883" y="1647" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/I_dotaccent.glif b/source/Hack-Regular.ufo/glyphs/I_dotaccent.glif
index 250abcece..95bee6861 100644
--- a/source/Hack-Regular.ufo/glyphs/I_dotaccent.glif
+++ b/source/Hack-Regular.ufo/glyphs/I_dotaccent.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Idotaccent" format="1">
+<glyph name="Idotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="0130"/>
   <outline>
     <contour>
-      <point x="543" y="1647" type="line" name="hr00" smooth="yes"/>
+      <point x="543" y="1647" type="line" smooth="yes" name="hr00"/>
       <point x="523" y="1647"/>
       <point x="513" y="1657"/>
-      <point x="513" y="1677" type="curve" name="sh01" smooth="yes"/>
+      <point x="513" y="1677" type="curve" smooth="yes" name="sh01"/>
       <point x="513" y="1822" type="line" smooth="yes"/>
       <point x="513" y="1842"/>
       <point x="523" y="1852"/>
-      <point x="543" y="1852" type="curve" name="dv01" smooth="yes"/>
+      <point x="543" y="1852" type="curve" smooth="yes" name="dv01"/>
       <point x="688" y="1852" type="line" smooth="yes"/>
       <point x="708" y="1852"/>
       <point x="718" y="1842"/>
-      <point x="718" y="1822" type="curve" name="sh02" smooth="yes"/>
+      <point x="718" y="1822" type="curve" smooth="yes" name="sh02"/>
       <point x="718" y="1677" type="line" smooth="yes"/>
       <point x="718" y="1657"/>
       <point x="708" y="1647"/>
diff --git a/source/Hack-Regular.ufo/glyphs/I_grave.glif b/source/Hack-Regular.ufo/glyphs/I_grave.glif
index 0c28ff147..ee356b8e4 100644
--- a/source/Hack-Regular.ufo/glyphs/I_grave.glif
+++ b/source/Hack-Regular.ufo/glyphs/I_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Igrave" format="1">
+<glyph name="Igrave" format="2">
   <advance width="1233"/>
   <unicode hex="00CC"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/I_macron.glif b/source/Hack-Regular.ufo/glyphs/I_macron.glif
index 1d6193512..fd21da839 100644
--- a/source/Hack-Regular.ufo/glyphs/I_macron.glif
+++ b/source/Hack-Regular.ufo/glyphs/I_macron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Imacron" format="1">
+<glyph name="Imacron" format="2">
   <advance width="1233"/>
   <unicode hex="012A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/I_ogonek.glif b/source/Hack-Regular.ufo/glyphs/I_ogonek.glif
index 8ecd54207..754b36cd9 100644
--- a/source/Hack-Regular.ufo/glyphs/I_ogonek.glif
+++ b/source/Hack-Regular.ufo/glyphs/I_ogonek.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Iogonek" format="1">
+<glyph name="Iogonek" format="2">
   <advance width="1233"/>
   <unicode hex="012E"/>
   <outline>
@@ -11,20 +11,20 @@
       <point x="717" y="0" type="line"/>
       <point x="653" y="-87"/>
       <point x="629" y="-139"/>
-      <point x="629" y="-184" type="curve" name="dh02" smooth="yes"/>
+      <point x="629" y="-184" type="curve" smooth="yes" name="dh02"/>
       <point x="629" y="-240"/>
       <point x="667" y="-272"/>
-      <point x="739" y="-272" type="curve" name="dv01" smooth="yes"/>
+      <point x="739" y="-272" type="curve" smooth="yes" name="dv01"/>
       <point x="780" y="-272"/>
       <point x="822" y="-262"/>
       <point x="863" y="-242" type="curve" name="sh02"/>
       <point x="863" y="-375" type="line"/>
       <point x="807" y="-390"/>
       <point x="769" y="-395"/>
-      <point x="720" y="-395" type="curve" name="hr01" smooth="yes"/>
+      <point x="720" y="-395" type="curve" smooth="yes" name="hr01"/>
       <point x="571" y="-395"/>
       <point x="490" y="-340"/>
-      <point x="490" y="-221" type="curve" name="dh01" smooth="yes"/>
+      <point x="490" y="-221" type="curve" smooth="yes" name="dh01"/>
       <point x="490" y="-155"/>
       <point x="516" y="-93"/>
       <point x="598" y="0" type="curve" name="ih01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/I_ota.glif b/source/Hack-Regular.ufo/glyphs/I_ota.glif
index ad780235d..763b3681b 100644
--- a/source/Hack-Regular.ufo/glyphs/I_ota.glif
+++ b/source/Hack-Regular.ufo/glyphs/I_ota.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Iota" format="1">
+<glyph name="Iota" format="2">
   <advance width="1233"/>
   <unicode hex="0399"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/I_otadieresis.glif b/source/Hack-Regular.ufo/glyphs/I_otadieresis.glif
index 3a7e22bbd..3fd2f18c4 100644
--- a/source/Hack-Regular.ufo/glyphs/I_otadieresis.glif
+++ b/source/Hack-Regular.ufo/glyphs/I_otadieresis.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Iotadieresis" format="1">
+<glyph name="Iotadieresis" format="2">
   <advance width="1233"/>
   <unicode hex="03AA"/>
   <outline>
     <contour>
-      <point x="349" y="1649" type="line" name="dv01" smooth="yes"/>
+      <point x="349" y="1649" type="line" smooth="yes" name="dv01"/>
       <point x="329" y="1649"/>
       <point x="319" y="1659"/>
-      <point x="319" y="1679" type="curve" name="dh01" smooth="yes"/>
+      <point x="319" y="1679" type="curve" smooth="yes" name="dh01"/>
       <point x="319" y="1822" type="line" smooth="yes"/>
       <point x="319" y="1842"/>
       <point x="329" y="1852"/>
-      <point x="349" y="1852" type="curve" name="dv02" smooth="yes"/>
+      <point x="349" y="1852" type="curve" smooth="yes" name="dv02"/>
       <point x="492" y="1852" type="line" smooth="yes"/>
       <point x="512" y="1852"/>
       <point x="522" y="1842"/>
       <point x="522" y="1822" type="curve" smooth="yes"/>
-      <point x="522" y="1679" type="line" name="dh02" smooth="yes"/>
+      <point x="522" y="1679" type="line" smooth="yes" name="dh02"/>
       <point x="522" y="1659"/>
       <point x="512" y="1649"/>
       <point x="492" y="1649" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1649" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1649" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1649"/>
       <point x="711" y="1659"/>
-      <point x="711" y="1679" type="curve" name="sh02" smooth="yes"/>
+      <point x="711" y="1679" type="curve" smooth="yes" name="sh02"/>
       <point x="711" y="1822" type="line" smooth="yes"/>
       <point x="711" y="1842"/>
       <point x="721" y="1852"/>
-      <point x="741" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="741" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="883" y="1852" type="line" smooth="yes"/>
       <point x="903" y="1852"/>
       <point x="913" y="1842"/>
-      <point x="913" y="1822" type="curve" name="hr01" smooth="yes"/>
-      <point x="913" y="1679" type="line" name="sh03" smooth="yes"/>
+      <point x="913" y="1822" type="curve" smooth="yes" name="hr01"/>
+      <point x="913" y="1679" type="line" smooth="yes" name="sh03"/>
       <point x="913" y="1659"/>
       <point x="903" y="1649"/>
       <point x="883" y="1649" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/I_otatonos.glif b/source/Hack-Regular.ufo/glyphs/I_otatonos.glif
index 1045a891e..621ef2abe 100644
--- a/source/Hack-Regular.ufo/glyphs/I_otatonos.glif
+++ b/source/Hack-Regular.ufo/glyphs/I_otatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Iotatonos" format="1">
+<glyph name="Iotatonos" format="2">
   <advance width="1233"/>
   <unicode hex="038A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/I_tilde.glif b/source/Hack-Regular.ufo/glyphs/I_tilde.glif
index 5a1495184..8480b5933 100644
--- a/source/Hack-Regular.ufo/glyphs/I_tilde.glif
+++ b/source/Hack-Regular.ufo/glyphs/I_tilde.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Itilde" format="1">
+<glyph name="Itilde" format="2">
   <advance width="1233"/>
   <unicode hex="0128"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="339" y="1793" type="curve" smooth="yes"/>
       <point x="373" y="1832"/>
       <point x="419" y="1852"/>
-      <point x="476" y="1852" type="curve" name="dv02" smooth="yes"/>
+      <point x="476" y="1852" type="curve" smooth="yes" name="dv02"/>
       <point x="497" y="1852"/>
       <point x="519" y="1849"/>
       <point x="542" y="1844" type="curve" smooth="yes"/>
@@ -34,7 +34,7 @@
       <point x="893" y="1693" type="curve" smooth="yes"/>
       <point x="859" y="1653"/>
       <point x="814" y="1633"/>
-      <point x="757" y="1633" type="curve" name="sv02" smooth="yes"/>
+      <point x="757" y="1633" type="curve" smooth="yes" name="sv02"/>
       <point x="736" y="1633"/>
       <point x="715" y="1636"/>
       <point x="694" y="1641" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/J_.glif b/source/Hack-Regular.ufo/glyphs/J_.glif
index 439a85da3..dbd177a24 100644
--- a/source/Hack-Regular.ufo/glyphs/J_.glif
+++ b/source/Hack-Regular.ufo/glyphs/J_.glif
@@ -1,36 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="J" format="1">
+<glyph name="J" format="2">
   <advance width="1233"/>
   <unicode hex="004A"/>
   <outline>
     <contour>
-      <point x="502" y="-29" type="curve" name="hr00" smooth="yes"/>
-      <point x="433" y="-29"/>
-      <point x="368" y="-22"/>
-      <point x="307" y="-7" type="curve" smooth="yes"/>
-      <point x="242" y="8"/>
-      <point x="176" y="31"/>
+      <point x="513" y="-29" type="curve" smooth="yes"/>
+      <point x="374" y="-29"/>
+      <point x="245" y="0"/>
       <point x="109" y="61" type="curve"/>
       <point x="109" y="297" type="line"/>
-      <point x="170" y="243"/>
-      <point x="232" y="203"/>
-      <point x="297" y="176" type="curve" smooth="yes"/>
-      <point x="363" y="149"/>
-      <point x="430" y="135"/>
-      <point x="499" y="135" type="curve" name="dv01" smooth="yes"/>
-      <point x="588" y="135"/>
-      <point x="659" y="158"/>
-      <point x="698" y="210" type="curve" smooth="yes"/>
-      <point x="735" y="259"/>
-      <point x="754" y="352"/>
-      <point x="754" y="487" type="curve" name="dh01" smooth="yes"/>
-      <point x="754" y="1323" type="line" name="sv01"/>
+      <point x="229" y="190"/>
+      <point x="363" y="135"/>
+      <point x="504" y="135" type="curve" smooth="yes"/>
+      <point x="687" y="135"/>
+      <point x="754" y="228"/>
+      <point x="754" y="487" type="curve" smooth="yes"/>
+      <point x="754" y="1323" type="line"/>
       <point x="373" y="1323" type="line"/>
-      <point x="373" y="1493" type="line" name="at01"/>
+      <point x="373" y="1493" type="line"/>
       <point x="956" y="1493" type="line"/>
-      <point x="956" y="487" type="line" name="dh02" smooth="yes"/>
-      <point x="956" y="111"/>
-      <point x="825" y="-29"/>
+      <point x="956" y="487" type="line" smooth="yes"/>
+      <point x="956" y="118"/>
+      <point x="829" y="-29"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Regular.ufo/glyphs/J_circumflex.glif b/source/Hack-Regular.ufo/glyphs/J_circumflex.glif
index a0dd6fddb..42519a5da 100644
--- a/source/Hack-Regular.ufo/glyphs/J_circumflex.glif
+++ b/source/Hack-Regular.ufo/glyphs/J_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Jcircumflex" format="1">
+<glyph name="Jcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0134"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/K_.glif b/source/Hack-Regular.ufo/glyphs/K_.glif
index 1a3e3d1e2..b082a33e0 100644
--- a/source/Hack-Regular.ufo/glyphs/K_.glif
+++ b/source/Hack-Regular.ufo/glyphs/K_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="K" format="1">
+<glyph name="K" format="2">
   <advance width="1233"/>
   <unicode hex="004B"/>
   <outline>
     <contour>
-      <point x="137" y="1493" type="line" name="hr00"/>
-      <point x="340" y="1493" type="line" name="dh01"/>
-      <point x="340" y="829" type="line" name="iv01"/>
-      <point x="971" y="1493" type="line" name="at01"/>
+      <point x="137" y="1493" type="line"/>
+      <point x="340" y="1493" type="line"/>
+      <point x="340" y="829" type="line"/>
+      <point x="971" y="1493" type="line"/>
       <point x="1208" y="1493" type="line"/>
       <point x="627" y="883" type="line"/>
-      <point x="1225" y="0" type="line" name="ab01"/>
+      <point x="1225" y="0" type="line"/>
       <point x="981" y="0" type="line"/>
       <point x="494" y="748" type="line"/>
-      <point x="340" y="584" type="line" name="sh01"/>
-      <point x="340" y="0" type="line" name="ab02"/>
+      <point x="340" y="584" type="line"/>
+      <point x="340" y="0" type="line"/>
       <point x="137" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/K_appa.glif b/source/Hack-Regular.ufo/glyphs/K_appa.glif
index d010c9610..496a0a1d1 100644
--- a/source/Hack-Regular.ufo/glyphs/K_appa.glif
+++ b/source/Hack-Regular.ufo/glyphs/K_appa.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Kappa" format="1">
+<glyph name="Kappa" format="2">
   <advance width="1233"/>
   <unicode hex="039A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/L_.glif b/source/Hack-Regular.ufo/glyphs/L_.glif
index dc997ca64..46e50575b 100644
--- a/source/Hack-Regular.ufo/glyphs/L_.glif
+++ b/source/Hack-Regular.ufo/glyphs/L_.glif
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="L" format="1">
+<glyph name="L" format="2">
   <advance width="1233"/>
   <unicode hex="004C"/>
   <outline>
     <contour>
-      <point x="215" y="1493" type="line" name="hr00"/>
-      <point x="418" y="1493" type="line" name="dh01"/>
-      <point x="418" y="170" type="line" name="sv01"/>
+      <point x="215" y="1493" type="line"/>
+      <point x="418" y="1493" type="line"/>
+      <point x="418" y="170" type="line"/>
       <point x="1139" y="170" type="line"/>
-      <point x="1139" y="0" type="line" name="ab01"/>
+      <point x="1139" y="0" type="line"/>
       <point x="215" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/L_acute.glif b/source/Hack-Regular.ufo/glyphs/L_acute.glif
index 84d335f33..159b4fe50 100644
--- a/source/Hack-Regular.ufo/glyphs/L_acute.glif
+++ b/source/Hack-Regular.ufo/glyphs/L_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Lacute" format="1">
+<glyph name="Lacute" format="2">
   <advance width="1233"/>
   <unicode hex="0139"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/L_ambda.glif b/source/Hack-Regular.ufo/glyphs/L_ambda.glif
index c81f1e9d1..23642740d 100644
--- a/source/Hack-Regular.ufo/glyphs/L_ambda.glif
+++ b/source/Hack-Regular.ufo/glyphs/L_ambda.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Lambda" format="1">
+<glyph name="Lambda" format="2">
   <advance width="1233"/>
   <unicode hex="039B"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/L_caron.glif b/source/Hack-Regular.ufo/glyphs/L_caron.glif
index 2e32d6ae6..b689d3d21 100644
--- a/source/Hack-Regular.ufo/glyphs/L_caron.glif
+++ b/source/Hack-Regular.ufo/glyphs/L_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Lcaron" format="1">
+<glyph name="Lcaron" format="2">
   <advance width="1233"/>
   <unicode hex="013D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/L_dot.glif b/source/Hack-Regular.ufo/glyphs/L_dot.glif
index fbc322246..d3df99075 100644
--- a/source/Hack-Regular.ufo/glyphs/L_dot.glif
+++ b/source/Hack-Regular.ufo/glyphs/L_dot.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ldot" format="1">
+<glyph name="Ldot" format="2">
   <advance width="1233"/>
   <unicode hex="013F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/L_slash.glif b/source/Hack-Regular.ufo/glyphs/L_slash.glif
index 5de6aa184..c948f012e 100644
--- a/source/Hack-Regular.ufo/glyphs/L_slash.glif
+++ b/source/Hack-Regular.ufo/glyphs/L_slash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Lslash" format="1">
+<glyph name="Lslash" format="2">
   <advance width="1233"/>
   <unicode hex="0141"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/M_.glif b/source/Hack-Regular.ufo/glyphs/M_.glif
index 1e1ca1b58..45a52608d 100644
--- a/source/Hack-Regular.ufo/glyphs/M_.glif
+++ b/source/Hack-Regular.ufo/glyphs/M_.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="M" format="1">
+<glyph name="M" format="2">
   <advance width="1233"/>
   <unicode hex="004D"/>
   <outline>
     <contour>
-      <point x="86" y="1493" type="line" name="hr00"/>
+      <point x="86" y="1493" type="line"/>
       <point x="356" y="1493" type="line"/>
-      <point x="614" y="733" type="line" name="ih01"/>
-      <point x="874" y="1493" type="line" name="at01"/>
+      <point x="614" y="733" type="line"/>
+      <point x="874" y="1493" type="line"/>
       <point x="1145" y="1493" type="line"/>
-      <point x="1145" y="0" type="line" name="sh01"/>
-      <point x="958" y="0" type="line" name="ah01"/>
-      <point x="958" y="1319" type="line" name="iv01"/>
+      <point x="1145" y="0" type="line"/>
+      <point x="958" y="0" type="line"/>
+      <point x="958" y="1319" type="line"/>
       <point x="692" y="532" type="line"/>
       <point x="539" y="532" type="line"/>
-      <point x="272" y="1319" type="line" name="sh02"/>
-      <point x="272" y="0" type="line" name="ab01"/>
+      <point x="272" y="1319" type="line"/>
+      <point x="272" y="0" type="line"/>
       <point x="86" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/M_u.glif b/source/Hack-Regular.ufo/glyphs/M_u.glif
index 6db326b1b..5ff2c0e89 100644
--- a/source/Hack-Regular.ufo/glyphs/M_u.glif
+++ b/source/Hack-Regular.ufo/glyphs/M_u.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Mu" format="1">
+<glyph name="Mu" format="2">
   <advance width="1233"/>
   <unicode hex="039C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/N_.glif b/source/Hack-Regular.ufo/glyphs/N_.glif
index 921dcb6ad..4abff45a7 100644
--- a/source/Hack-Regular.ufo/glyphs/N_.glif
+++ b/source/Hack-Regular.ufo/glyphs/N_.glif
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="N" format="1">
+<glyph name="N" format="2">
   <advance width="1233"/>
   <unicode hex="004E"/>
   <outline>
     <contour>
-      <point x="139" y="1493" type="line" name="hr00"/>
+      <point x="139" y="1493" type="line"/>
       <point x="395" y="1493" type="line"/>
-      <point x="899" y="264" type="line" name="ah01"/>
-      <point x="899" y="1493" type="line" name="at01"/>
+      <point x="899" y="264" type="line"/>
+      <point x="899" y="1493" type="line"/>
       <point x="1094" y="1493" type="line"/>
-      <point x="1094" y="0" type="line" name="sh01"/>
+      <point x="1094" y="0" type="line"/>
       <point x="838" y="0" type="line"/>
-      <point x="334" y="1229" type="line" name="sh02"/>
-      <point x="334" y="0" type="line" name="ab01"/>
+      <point x="334" y="1229" type="line"/>
+      <point x="334" y="0" type="line"/>
       <point x="139" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/N_U_L_L_.glif b/source/Hack-Regular.ufo/glyphs/N_U_L_L_.glif
index fa0b87887..79a4001e6 100644
--- a/source/Hack-Regular.ufo/glyphs/N_U_L_L_.glif
+++ b/source/Hack-Regular.ufo/glyphs/N_U_L_L_.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="NULL" format="1">
-  <advance width="0"/>
+<glyph name="NULL" format="2">
   <unicode hex="0000"/>
   <outline>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/N_acute.glif b/source/Hack-Regular.ufo/glyphs/N_acute.glif
index f7d7eb2b3..16dc9bb2c 100644
--- a/source/Hack-Regular.ufo/glyphs/N_acute.glif
+++ b/source/Hack-Regular.ufo/glyphs/N_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Nacute" format="1">
+<glyph name="Nacute" format="2">
   <advance width="1233"/>
   <unicode hex="0143"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/N_caron.glif b/source/Hack-Regular.ufo/glyphs/N_caron.glif
index e8b724fec..9320a89cf 100644
--- a/source/Hack-Regular.ufo/glyphs/N_caron.glif
+++ b/source/Hack-Regular.ufo/glyphs/N_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ncaron" format="1">
+<glyph name="Ncaron" format="2">
   <advance width="1233"/>
   <unicode hex="0147"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/N_tilde.glif b/source/Hack-Regular.ufo/glyphs/N_tilde.glif
index 3dbdd40d3..d828ce226 100644
--- a/source/Hack-Regular.ufo/glyphs/N_tilde.glif
+++ b/source/Hack-Regular.ufo/glyphs/N_tilde.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ntilde" format="1">
+<glyph name="Ntilde" format="2">
   <advance width="1233"/>
   <unicode hex="00D1"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="287" y="1633" type="line" name="hr00"/>
       <point x="287" y="1697"/>
       <point x="302" y="1750"/>
-      <point x="339" y="1793" type="curve" name="sh03" smooth="yes"/>
+      <point x="339" y="1793" type="curve" smooth="yes" name="sh03"/>
       <point x="373" y="1832"/>
       <point x="419" y="1852"/>
-      <point x="476" y="1852" type="curve" name="dv02" smooth="yes"/>
+      <point x="476" y="1852" type="curve" smooth="yes" name="dv02"/>
       <point x="497" y="1852"/>
       <point x="519" y="1849"/>
       <point x="542" y="1844" type="curve" smooth="yes"/>
@@ -31,10 +31,10 @@
       <point x="946" y="1852" type="line"/>
       <point x="945" y="1786"/>
       <point x="928" y="1733"/>
-      <point x="893" y="1693" type="curve" name="sh04" smooth="yes"/>
+      <point x="893" y="1693" type="curve" smooth="yes" name="sh04"/>
       <point x="859" y="1653"/>
       <point x="814" y="1633"/>
-      <point x="757" y="1633" type="curve" name="sv02" smooth="yes"/>
+      <point x="757" y="1633" type="curve" smooth="yes" name="sv02"/>
       <point x="736" y="1633"/>
       <point x="715" y="1636"/>
       <point x="694" y="1641" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/N_u.glif b/source/Hack-Regular.ufo/glyphs/N_u.glif
index 4bbc355ad..f29cf9ce2 100644
--- a/source/Hack-Regular.ufo/glyphs/N_u.glif
+++ b/source/Hack-Regular.ufo/glyphs/N_u.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Nu" format="1">
+<glyph name="Nu" format="2">
   <advance width="1233"/>
   <unicode hex="039D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/O_.glif b/source/Hack-Regular.ufo/glyphs/O_.glif
index 6fcc23b0d..46f8510c3 100644
--- a/source/Hack-Regular.ufo/glyphs/O_.glif
+++ b/source/Hack-Regular.ufo/glyphs/O_.glif
@@ -1,59 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="O" format="1">
+<glyph name="O" format="2">
   <advance width="1233"/>
   <unicode hex="004F"/>
   <outline>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr00" smooth="yes"/>
-      <point x="447" y="-29"/>
-      <point x="322" y="35"/>
-      <point x="240" y="162" type="curve" smooth="yes"/>
-      <point x="158" y="289"/>
-      <point x="117" y="483"/>
-      <point x="117" y="745" type="curve" name="sh01" smooth="yes"/>
-      <point x="117" y="1006"/>
-      <point x="158" y="1201"/>
-      <point x="241" y="1328" type="curve" smooth="yes"/>
-      <point x="324" y="1456"/>
-      <point x="445" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
-      <point x="780" y="1520"/>
-      <point x="908" y="1461"/>
-      <point x="993" y="1328" type="curve" smooth="yes"/>
-      <point x="1075" y="1200"/>
-      <point x="1116" y="1006"/>
-      <point x="1116" y="745" type="curve" name="sh02" smooth="yes"/>
-      <point x="1116" y="485"/>
-      <point x="1075" y="291"/>
-      <point x="993" y="163" type="curve" smooth="yes"/>
-      <point x="908" y="30"/>
-      <point x="780" y="-29"/>
+      <point x="616.133" y="-29" type="curve" smooth="yes"/>
+      <point x="287.817" y="-29"/>
+      <point x="117" y="234.919"/>
+      <point x="117" y="743.559" type="curve" smooth="yes"/>
+      <point x="117" y="1253.36"/>
+      <point x="288.6" y="1520"/>
+      <point x="617.584" y="1520" type="curve" smooth="yes"/>
+      <point x="945.592" y="1520"/>
+      <point x="1116" y="1255.29"/>
+      <point x="1116" y="745.766" type="curve" smooth="yes"/>
+      <point x="1116" y="235.584"/>
+      <point x="945.294" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="135" type="curve" name="dv01" smooth="yes"/>
-      <point x="719" y="135"/>
-      <point x="793" y="182"/>
-      <point x="838" y="276" type="curve" smooth="yes"/>
-      <point x="883" y="368"/>
-      <point x="905" y="524"/>
-      <point x="905" y="745" type="curve" name="ah01" smooth="yes"/>
-      <point x="905" y="965"/>
-      <point x="883" y="1122"/>
-      <point x="838" y="1215" type="curve" smooth="yes"/>
-      <point x="793" y="1309"/>
-      <point x="719" y="1356"/>
-      <point x="616" y="1356" type="curve" name="sv01" smooth="yes"/>
-      <point x="514" y="1356"/>
-      <point x="441" y="1309"/>
-      <point x="396" y="1215" type="curve" smooth="yes"/>
-      <point x="351" y="1120"/>
-      <point x="328" y="964"/>
-      <point x="328" y="745" type="curve" name="sh03" smooth="yes"/>
-      <point x="328" y="527"/>
-      <point x="351" y="371"/>
-      <point x="396" y="276" type="curve" smooth="yes"/>
-      <point x="441" y="182"/>
-      <point x="514" y="135"/>
+      <point x="616.5" y="135" type="curve" smooth="yes"/>
+      <point x="718.636" y="135"/>
+      <point x="792.841" y="181.671"/>
+      <point x="837.522" y="274.012" type="curve" smooth="yes"/>
+      <point x="882.734" y="367.451"/>
+      <point x="905" y="522.697"/>
+      <point x="905" y="744.5" type="curve" smooth="yes"/>
+      <point x="905" y="966.549"/>
+      <point x="882.685" y="1122.65"/>
+      <point x="837.532" y="1216.47" type="curve" smooth="yes"/>
+      <point x="792.901" y="1309.21"/>
+      <point x="718.773" y="1356"/>
+      <point x="616.5" y="1356" type="curve" smooth="yes"/>
+      <point x="514.176" y="1356"/>
+      <point x="441.077" y="1309.16"/>
+      <point x="396.147" y="1214.81" type="curve" smooth="yes"/>
+      <point x="350.75" y="1119.47"/>
+      <point x="328" y="962.803"/>
+      <point x="328" y="745.5" type="curve" smooth="yes"/>
+      <point x="328" y="528.197"/>
+      <point x="350.75" y="371.525"/>
+      <point x="396.147" y="276.191" type="curve" smooth="yes"/>
+      <point x="441.077" y="181.838"/>
+      <point x="514.176" y="135"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Regular.ufo/glyphs/O_E_.glif b/source/Hack-Regular.ufo/glyphs/O_E_.glif
index f41ef22a7..e9577e8b2 100644
--- a/source/Hack-Regular.ufo/glyphs/O_E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/O_E_.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="OE" format="1">
+<glyph name="OE" format="2">
   <advance width="1233"/>
   <unicode hex="0152"/>
   <outline>
     <contour>
-      <point x="612" y="0" type="line" name="hr00" smooth="yes"/>
+      <point x="612" y="0" type="line" smooth="yes" name="hr00"/>
       <point x="401" y="0"/>
       <point x="275" y="60"/>
       <point x="196" y="167" type="curve" smooth="yes"/>
       <point x="111" y="283"/>
       <point x="72" y="468"/>
-      <point x="72" y="747" type="curve" name="sh01" smooth="yes"/>
+      <point x="72" y="747" type="curve" smooth="yes" name="sh01"/>
       <point x="72" y="1042"/>
       <point x="116" y="1219"/>
       <point x="195" y="1327" type="curve" smooth="yes"/>
       <point x="275" y="1436"/>
       <point x="405" y="1493"/>
-      <point x="612" y="1493" type="curve" name="at01" smooth="yes"/>
+      <point x="612" y="1493" type="curve" smooth="yes" name="at01"/>
       <point x="1206" y="1493" type="line"/>
       <point x="1206" y="1323" type="line" name="sv01"/>
       <point x="848" y="1323" type="line" name="sh03"/>
@@ -31,19 +31,19 @@
     <contour>
       <point x="651" y="170" type="line" name="ah01"/>
       <point x="651" y="1323" type="line" name="sv02"/>
-      <point x="590" y="1323" type="line" name="sv03" smooth="yes"/>
+      <point x="590" y="1323" type="line" smooth="yes" name="sv03"/>
       <point x="472" y="1323"/>
       <point x="390" y="1285"/>
       <point x="344" y="1208" type="curve" smooth="yes"/>
       <point x="299" y="1132"/>
       <point x="274" y="990"/>
-      <point x="274" y="745" type="curve" name="sh04" smooth="yes"/>
+      <point x="274" y="745" type="curve" smooth="yes" name="sh04"/>
       <point x="274" y="505"/>
       <point x="297" y="362"/>
       <point x="344" y="285" type="curve" smooth="yes"/>
       <point x="390" y="208"/>
       <point x="472" y="170"/>
-      <point x="590" y="170" type="curve" name="sv04" smooth="yes"/>
+      <point x="590" y="170" type="curve" smooth="yes" name="sv04"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Regular.ufo/glyphs/O_acute.glif b/source/Hack-Regular.ufo/glyphs/O_acute.glif
index 18feb0fcd..f4e3a6d5d 100644
--- a/source/Hack-Regular.ufo/glyphs/O_acute.glif
+++ b/source/Hack-Regular.ufo/glyphs/O_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Oacute" format="1">
+<glyph name="Oacute" format="2">
   <advance width="1233"/>
   <unicode hex="00D3"/>
   <outline>
@@ -10,25 +10,25 @@
       <point x="504" y="1592" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="447" y="-29"/>
       <point x="322" y="35"/>
       <point x="240" y="162" type="curve" smooth="yes"/>
       <point x="158" y="289"/>
       <point x="117" y="483"/>
-      <point x="117" y="745" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="745" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="1006"/>
       <point x="158" y="1201"/>
       <point x="241" y="1328" type="curve" smooth="yes"/>
       <point x="324" y="1456"/>
       <point x="445" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="780" y="1520"/>
       <point x="908" y="1461"/>
       <point x="993" y="1328" type="curve" smooth="yes"/>
       <point x="1075" y="1200"/>
       <point x="1116" y="1006"/>
-      <point x="1116" y="745" type="curve" name="sh02" smooth="yes"/>
+      <point x="1116" y="745" type="curve" smooth="yes" name="sh02"/>
       <point x="1116" y="485"/>
       <point x="1075" y="291"/>
       <point x="993" y="163" type="curve" smooth="yes"/>
@@ -36,25 +36,25 @@
       <point x="780" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="719" y="135"/>
       <point x="793" y="182"/>
       <point x="838" y="276" type="curve" smooth="yes"/>
       <point x="883" y="368"/>
       <point x="905" y="524"/>
-      <point x="905" y="745" type="curve" name="ah01" smooth="yes"/>
+      <point x="905" y="745" type="curve" smooth="yes" name="ah01"/>
       <point x="905" y="965"/>
       <point x="883" y="1122"/>
       <point x="838" y="1215" type="curve" smooth="yes"/>
       <point x="793" y="1309"/>
       <point x="719" y="1356"/>
-      <point x="616" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="514" y="1356"/>
       <point x="441" y="1309"/>
       <point x="396" y="1215" type="curve" smooth="yes"/>
       <point x="351" y="1120"/>
       <point x="328" y="964"/>
-      <point x="328" y="745" type="curve" name="sh03" smooth="yes"/>
+      <point x="328" y="745" type="curve" smooth="yes" name="sh03"/>
       <point x="328" y="527"/>
       <point x="351" y="371"/>
       <point x="396" y="276" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/O_breve.glif b/source/Hack-Regular.ufo/glyphs/O_breve.glif
index aa6d1c677..119b45cdb 100644
--- a/source/Hack-Regular.ufo/glyphs/O_breve.glif
+++ b/source/Hack-Regular.ufo/glyphs/O_breve.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Obreve" format="1">
+<glyph name="Obreve" format="2">
   <advance width="1233"/>
   <unicode hex="014E"/>
   <outline>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="447" y="-29"/>
       <point x="322" y="35"/>
       <point x="240" y="162" type="curve" smooth="yes"/>
       <point x="158" y="289"/>
       <point x="117" y="483"/>
-      <point x="117" y="745" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="745" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="1006"/>
       <point x="158" y="1201"/>
       <point x="241" y="1328" type="curve" smooth="yes"/>
       <point x="324" y="1456"/>
       <point x="445" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="780" y="1520"/>
       <point x="908" y="1461"/>
       <point x="993" y="1328" type="curve" smooth="yes"/>
       <point x="1075" y="1200"/>
       <point x="1116" y="1006"/>
-      <point x="1116" y="745" type="curve" name="sh02" smooth="yes"/>
+      <point x="1116" y="745" type="curve" smooth="yes" name="sh02"/>
       <point x="1116" y="485"/>
       <point x="1075" y="291"/>
       <point x="993" y="163" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="780" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="719" y="135"/>
       <point x="793" y="182"/>
       <point x="838" y="276" type="curve" smooth="yes"/>
       <point x="883" y="368"/>
       <point x="905" y="524"/>
-      <point x="905" y="745" type="curve" name="ah01" smooth="yes"/>
+      <point x="905" y="745" type="curve" smooth="yes" name="ah01"/>
       <point x="905" y="965"/>
       <point x="883" y="1122"/>
       <point x="838" y="1215" type="curve" smooth="yes"/>
       <point x="793" y="1309"/>
       <point x="719" y="1356"/>
-      <point x="616" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="514" y="1356"/>
       <point x="441" y="1309"/>
       <point x="396" y="1215" type="curve" smooth="yes"/>
       <point x="351" y="1120"/>
       <point x="328" y="964"/>
-      <point x="328" y="745" type="curve" name="sh03" smooth="yes"/>
+      <point x="328" y="745" type="curve" smooth="yes" name="sh03"/>
       <point x="328" y="527"/>
       <point x="351" y="371"/>
       <point x="396" y="276" type="curve" smooth="yes"/>
@@ -56,14 +56,14 @@
       <point x="514" y="135"/>
     </contour>
     <contour>
-      <point x="616" y="1589" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1589" type="curve" smooth="yes" name="dv02"/>
       <point x="423" y="1589"/>
       <point x="319" y="1670"/>
       <point x="303" y="1831" type="curve"/>
       <point x="422" y="1831" type="line" name="sv01"/>
       <point x="438" y="1759"/>
       <point x="505" y="1720"/>
-      <point x="618" y="1720" type="curve" name="dv03" smooth="yes"/>
+      <point x="618" y="1720" type="curve" smooth="yes" name="dv03"/>
       <point x="727" y="1720"/>
       <point x="791" y="1757"/>
       <point x="811" y="1831" type="curve" name="sv02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/O_circumflex.glif b/source/Hack-Regular.ufo/glyphs/O_circumflex.glif
index e28c52fcd..099ba0074 100644
--- a/source/Hack-Regular.ufo/glyphs/O_circumflex.glif
+++ b/source/Hack-Regular.ufo/glyphs/O_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ocircumflex" format="1">
+<glyph name="Ocircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00D4"/>
   <outline>
@@ -13,25 +13,25 @@
       <point x="329" y="1586" type="line" name="sh04"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="447" y="-29"/>
       <point x="322" y="35"/>
       <point x="240" y="162" type="curve" smooth="yes"/>
       <point x="158" y="289"/>
       <point x="117" y="483"/>
-      <point x="117" y="745" type="curve" name="sh02" smooth="yes"/>
+      <point x="117" y="745" type="curve" smooth="yes" name="sh02"/>
       <point x="117" y="1006"/>
       <point x="158" y="1201"/>
       <point x="241" y="1328" type="curve" smooth="yes"/>
       <point x="324" y="1456"/>
       <point x="445" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="780" y="1520"/>
       <point x="908" y="1461"/>
       <point x="993" y="1328" type="curve" smooth="yes"/>
       <point x="1075" y="1200"/>
       <point x="1116" y="1006"/>
-      <point x="1116" y="745" type="curve" name="sh01" smooth="yes"/>
+      <point x="1116" y="745" type="curve" smooth="yes" name="sh01"/>
       <point x="1116" y="485"/>
       <point x="1075" y="291"/>
       <point x="993" y="163" type="curve" smooth="yes"/>
@@ -39,25 +39,25 @@
       <point x="780" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="719" y="135"/>
       <point x="793" y="182"/>
       <point x="838" y="276" type="curve" smooth="yes"/>
       <point x="883" y="368"/>
       <point x="905" y="524"/>
-      <point x="905" y="745" type="curve" name="ah01" smooth="yes"/>
+      <point x="905" y="745" type="curve" smooth="yes" name="ah01"/>
       <point x="905" y="965"/>
       <point x="883" y="1122"/>
       <point x="838" y="1215" type="curve" smooth="yes"/>
       <point x="793" y="1309"/>
       <point x="719" y="1356"/>
-      <point x="616" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="514" y="1356"/>
       <point x="441" y="1309"/>
       <point x="396" y="1215" type="curve" smooth="yes"/>
       <point x="351" y="1120"/>
       <point x="328" y="964"/>
-      <point x="328" y="745" type="curve" name="sh03" smooth="yes"/>
+      <point x="328" y="745" type="curve" smooth="yes" name="sh03"/>
       <point x="328" y="527"/>
       <point x="351" y="371"/>
       <point x="396" y="276" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/O_dieresis.glif b/source/Hack-Regular.ufo/glyphs/O_dieresis.glif
index 5c2e718a0..fb752ce3f 100644
--- a/source/Hack-Regular.ufo/glyphs/O_dieresis.glif
+++ b/source/Hack-Regular.ufo/glyphs/O_dieresis.glif
@@ -1,64 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Odieresis" format="1">
+<glyph name="Odieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00D6"/>
   <outline>
     <contour>
-      <point x="349" y="1647" type="line" name="dv03" smooth="yes"/>
+      <point x="349" y="1647" type="line" smooth="yes" name="dv03"/>
       <point x="329" y="1647"/>
       <point x="319" y="1657"/>
-      <point x="319" y="1677" type="curve" name="sh01" smooth="yes"/>
+      <point x="319" y="1677" type="curve" smooth="yes" name="sh01"/>
       <point x="319" y="1820" type="line" smooth="yes"/>
       <point x="319" y="1840"/>
       <point x="329" y="1850"/>
-      <point x="349" y="1850" type="curve" name="dv04" smooth="yes"/>
+      <point x="349" y="1850" type="curve" smooth="yes" name="dv04"/>
       <point x="492" y="1850" type="line" smooth="yes"/>
       <point x="512" y="1850"/>
       <point x="522" y="1840"/>
       <point x="522" y="1820" type="curve" smooth="yes"/>
-      <point x="522" y="1677" type="line" name="sh02" smooth="yes"/>
+      <point x="522" y="1677" type="line" smooth="yes" name="sh02"/>
       <point x="522" y="1657"/>
       <point x="512" y="1647"/>
       <point x="492" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1647" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1647" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1647"/>
       <point x="711" y="1657"/>
-      <point x="711" y="1677" type="curve" name="dh03" smooth="yes"/>
+      <point x="711" y="1677" type="curve" smooth="yes" name="dh03"/>
       <point x="711" y="1820" type="line" smooth="yes"/>
       <point x="711" y="1840"/>
       <point x="721" y="1850"/>
-      <point x="741" y="1850" type="curve" name="sv02" smooth="yes"/>
+      <point x="741" y="1850" type="curve" smooth="yes" name="sv02"/>
       <point x="883" y="1850" type="line" smooth="yes"/>
       <point x="903" y="1850"/>
       <point x="913" y="1840"/>
       <point x="913" y="1820" type="curve" smooth="yes"/>
-      <point x="913" y="1677" type="line" name="dh04" smooth="yes"/>
+      <point x="913" y="1677" type="line" smooth="yes" name="dh04"/>
       <point x="913" y="1657"/>
       <point x="903" y="1647"/>
       <point x="883" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="447" y="-29"/>
       <point x="322" y="35"/>
       <point x="240" y="162" type="curve" smooth="yes"/>
       <point x="158" y="289"/>
       <point x="117" y="483"/>
-      <point x="117" y="745" type="curve" name="dh01" smooth="yes"/>
+      <point x="117" y="745" type="curve" smooth="yes" name="dh01"/>
       <point x="117" y="1006"/>
       <point x="158" y="1201"/>
-      <point x="241" y="1328" type="curve" name="hr01" smooth="yes"/>
+      <point x="241" y="1328" type="curve" smooth="yes" name="hr01"/>
       <point x="324" y="1456"/>
       <point x="445" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="780" y="1520"/>
       <point x="908" y="1461"/>
       <point x="993" y="1328" type="curve" smooth="yes"/>
       <point x="1075" y="1200"/>
       <point x="1116" y="1006"/>
-      <point x="1116" y="745" type="curve" name="sh03" smooth="yes"/>
+      <point x="1116" y="745" type="curve" smooth="yes" name="sh03"/>
       <point x="1116" y="485"/>
       <point x="1075" y="291"/>
       <point x="993" y="163" type="curve" smooth="yes"/>
@@ -66,25 +66,25 @@
       <point x="780" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="719" y="135"/>
       <point x="793" y="182"/>
       <point x="838" y="276" type="curve" smooth="yes"/>
       <point x="883" y="368"/>
       <point x="905" y="524"/>
-      <point x="905" y="745" type="curve" name="sh04" smooth="yes"/>
+      <point x="905" y="745" type="curve" smooth="yes" name="sh04"/>
       <point x="905" y="965"/>
       <point x="883" y="1122"/>
       <point x="838" y="1215" type="curve" smooth="yes"/>
       <point x="793" y="1309"/>
       <point x="719" y="1356"/>
-      <point x="616" y="1356" type="curve" name="sv03" smooth="yes"/>
+      <point x="616" y="1356" type="curve" smooth="yes" name="sv03"/>
       <point x="514" y="1356"/>
       <point x="441" y="1309"/>
       <point x="396" y="1215" type="curve" smooth="yes"/>
       <point x="351" y="1120"/>
       <point x="328" y="964"/>
-      <point x="328" y="745" type="curve" name="dh02" smooth="yes"/>
+      <point x="328" y="745" type="curve" smooth="yes" name="dh02"/>
       <point x="328" y="527"/>
       <point x="351" y="371"/>
       <point x="396" y="276" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/O_grave.glif b/source/Hack-Regular.ufo/glyphs/O_grave.glif
index dbdc6f04d..0d40914e7 100644
--- a/source/Hack-Regular.ufo/glyphs/O_grave.glif
+++ b/source/Hack-Regular.ufo/glyphs/O_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ograve" format="1">
+<glyph name="Ograve" format="2">
   <advance width="1233"/>
   <unicode hex="00D2"/>
   <outline>
@@ -10,25 +10,25 @@
       <point x="609" y="1592" type="line"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="447" y="-29"/>
       <point x="322" y="35"/>
       <point x="240" y="162" type="curve" smooth="yes"/>
       <point x="158" y="289"/>
       <point x="117" y="483"/>
-      <point x="117" y="745" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="745" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="1006"/>
       <point x="158" y="1201"/>
       <point x="241" y="1328" type="curve" smooth="yes"/>
       <point x="324" y="1456"/>
       <point x="445" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="780" y="1520"/>
       <point x="908" y="1461"/>
       <point x="993" y="1328" type="curve" smooth="yes"/>
       <point x="1075" y="1200"/>
       <point x="1116" y="1006"/>
-      <point x="1116" y="745" type="curve" name="sh02" smooth="yes"/>
+      <point x="1116" y="745" type="curve" smooth="yes" name="sh02"/>
       <point x="1116" y="485"/>
       <point x="1075" y="291"/>
       <point x="993" y="163" type="curve" smooth="yes"/>
@@ -36,25 +36,25 @@
       <point x="780" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="719" y="135"/>
       <point x="793" y="182"/>
       <point x="838" y="276" type="curve" smooth="yes"/>
       <point x="883" y="368"/>
       <point x="905" y="524"/>
-      <point x="905" y="745" type="curve" name="ah01" smooth="yes"/>
+      <point x="905" y="745" type="curve" smooth="yes" name="ah01"/>
       <point x="905" y="965"/>
       <point x="883" y="1122"/>
       <point x="838" y="1215" type="curve" smooth="yes"/>
       <point x="793" y="1309"/>
       <point x="719" y="1356"/>
-      <point x="616" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="514" y="1356"/>
       <point x="441" y="1309"/>
       <point x="396" y="1215" type="curve" smooth="yes"/>
       <point x="351" y="1120"/>
       <point x="328" y="964"/>
-      <point x="328" y="745" type="curve" name="sh03" smooth="yes"/>
+      <point x="328" y="745" type="curve" smooth="yes" name="sh03"/>
       <point x="328" y="527"/>
       <point x="351" y="371"/>
       <point x="396" y="276" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/O_horn.glif b/source/Hack-Regular.ufo/glyphs/O_horn.glif
index f500dc11a..d6309c783 100644
--- a/source/Hack-Regular.ufo/glyphs/O_horn.glif
+++ b/source/Hack-Regular.ufo/glyphs/O_horn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ohorn" format="1">
+<glyph name="Ohorn" format="2">
   <advance width="1233"/>
   <unicode hex="01A0"/>
   <outline>
@@ -7,34 +7,34 @@
       <point x="1171" y="1557" type="line" name="at02"/>
       <point x="1186" y="1501"/>
       <point x="1191" y="1463"/>
-      <point x="1191" y="1414" type="curve" name="dh06" smooth="yes"/>
+      <point x="1191" y="1414" type="curve" smooth="yes" name="dh06"/>
       <point x="1191" y="1265"/>
       <point x="1136" y="1184"/>
-      <point x="1017" y="1184" type="curve" name="sv01" smooth="yes"/>
+      <point x="1017" y="1184" type="curve" smooth="yes" name="sv01"/>
       <point x="993" y="1184"/>
       <point x="969" y="1188"/>
       <point x="944" y="1196" type="curve" name="ih01"/>
       <point x="985" y="1079"/>
       <point x="1005" y="928"/>
-      <point x="1005" y="745" type="curve" name="dh04" smooth="yes"/>
+      <point x="1005" y="745" type="curve" smooth="yes" name="dh04"/>
       <point x="1005" y="225"/>
       <point x="841" y="-29"/>
-      <point x="504" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="504" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="169" y="-29"/>
       <point x="6" y="221"/>
-      <point x="6" y="744" type="curve" name="dh01" smooth="yes"/>
+      <point x="6" y="744" type="curve" smooth="yes" name="dh01"/>
       <point x="6" y="1267"/>
       <point x="169" y="1520"/>
-      <point x="505" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="505" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="652" y="1520"/>
       <point x="765" y="1472"/>
       <point x="845" y="1376" type="curve"/>
       <point x="905" y="1337"/>
       <point x="944" y="1323"/>
-      <point x="980" y="1323" type="curve" name="hr01" smooth="yes"/>
+      <point x="980" y="1323" type="curve" smooth="yes" name="hr01"/>
       <point x="1036" y="1323"/>
       <point x="1068" y="1361"/>
-      <point x="1068" y="1433" type="curve" name="dh05" smooth="yes"/>
+      <point x="1068" y="1433" type="curve" smooth="yes" name="dh05"/>
       <point x="1068" y="1474"/>
       <point x="1058" y="1516"/>
       <point x="1038" y="1557" type="curve" name="hr02"/>
@@ -43,25 +43,25 @@
       <point x="727" y="276" type="curve" smooth="yes"/>
       <point x="772" y="368"/>
       <point x="794" y="524"/>
-      <point x="794" y="745" type="curve" name="dh03" smooth="yes"/>
+      <point x="794" y="745" type="curve" smooth="yes" name="dh03"/>
       <point x="794" y="965"/>
       <point x="772" y="1122"/>
       <point x="727" y="1215" type="curve" smooth="yes"/>
       <point x="682" y="1309"/>
       <point x="608" y="1356"/>
-      <point x="505" y="1356" type="curve" name="sv02" smooth="yes"/>
+      <point x="505" y="1356" type="curve" smooth="yes" name="sv02"/>
       <point x="403" y="1356"/>
       <point x="330" y="1309"/>
       <point x="285" y="1215" type="curve" smooth="yes"/>
       <point x="240" y="1120"/>
       <point x="217" y="964"/>
-      <point x="217" y="745" type="curve" name="dh02" smooth="yes"/>
+      <point x="217" y="745" type="curve" smooth="yes" name="dh02"/>
       <point x="217" y="527"/>
       <point x="240" y="371"/>
       <point x="285" y="276" type="curve" smooth="yes"/>
       <point x="330" y="182"/>
       <point x="403" y="135"/>
-      <point x="505" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="505" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="608" y="135"/>
       <point x="682" y="182"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/O_hungarumlaut.glif b/source/Hack-Regular.ufo/glyphs/O_hungarumlaut.glif
index 559be3ae3..2b26740dc 100644
--- a/source/Hack-Regular.ufo/glyphs/O_hungarumlaut.glif
+++ b/source/Hack-Regular.ufo/glyphs/O_hungarumlaut.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ohungarumlaut" format="1">
+<glyph name="Ohungarumlaut" format="2">
   <advance width="1233"/>
   <unicode hex="0150"/>
   <outline>
@@ -16,39 +16,39 @@
       <point x="663" y="1595" type="line" name="ih04"/>
     </contour>
     <contour>
-      <point x="615" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="280" y="-29"/>
       <point x="117" y="221"/>
-      <point x="117" y="744" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="744" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="1267"/>
       <point x="280" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="953" y="1520"/>
       <point x="1116" y="1266"/>
-      <point x="1116" y="745" type="curve" name="sh02" smooth="yes"/>
+      <point x="1116" y="745" type="curve" smooth="yes" name="sh02"/>
       <point x="1116" y="225"/>
       <point x="952" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="719" y="135"/>
       <point x="793" y="182"/>
       <point x="838" y="276" type="curve" smooth="yes"/>
       <point x="883" y="368"/>
       <point x="905" y="524"/>
-      <point x="905" y="745" type="curve" name="ah01" smooth="yes"/>
+      <point x="905" y="745" type="curve" smooth="yes" name="ah01"/>
       <point x="905" y="965"/>
       <point x="883" y="1122"/>
       <point x="838" y="1215" type="curve" smooth="yes"/>
       <point x="793" y="1309"/>
       <point x="719" y="1356"/>
-      <point x="616" y="1356" type="curve" name="sv03" smooth="yes"/>
+      <point x="616" y="1356" type="curve" smooth="yes" name="sv03"/>
       <point x="514" y="1356"/>
       <point x="441" y="1309"/>
       <point x="396" y="1215" type="curve" smooth="yes"/>
       <point x="351" y="1120"/>
       <point x="328" y="964"/>
-      <point x="328" y="745" type="curve" name="sh03" smooth="yes"/>
+      <point x="328" y="745" type="curve" smooth="yes" name="sh03"/>
       <point x="328" y="527"/>
       <point x="351" y="371"/>
       <point x="396" y="276" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/O_macron.glif b/source/Hack-Regular.ufo/glyphs/O_macron.glif
index 2961f4800..360132d44 100644
--- a/source/Hack-Regular.ufo/glyphs/O_macron.glif
+++ b/source/Hack-Regular.ufo/glyphs/O_macron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Omacron" format="1">
+<glyph name="Omacron" format="2">
   <advance width="1233"/>
   <unicode hex="014C"/>
   <outline>
@@ -10,39 +10,39 @@
       <point x="317" y="1652" type="line"/>
     </contour>
     <contour>
-      <point x="615" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="280" y="-29"/>
       <point x="117" y="221"/>
-      <point x="117" y="744" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="744" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="1267"/>
       <point x="280" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="953" y="1520"/>
       <point x="1116" y="1266"/>
-      <point x="1116" y="745" type="curve" name="sh04" smooth="yes"/>
+      <point x="1116" y="745" type="curve" smooth="yes" name="sh04"/>
       <point x="1116" y="225"/>
       <point x="952" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="719" y="135"/>
       <point x="793" y="182"/>
       <point x="838" y="276" type="curve" smooth="yes"/>
       <point x="883" y="368"/>
       <point x="905" y="524"/>
-      <point x="905" y="745" type="curve" name="ah01" smooth="yes"/>
+      <point x="905" y="745" type="curve" smooth="yes" name="ah01"/>
       <point x="905" y="965"/>
       <point x="883" y="1122"/>
       <point x="838" y="1215" type="curve" smooth="yes"/>
       <point x="793" y="1309"/>
       <point x="719" y="1356"/>
-      <point x="616" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="514" y="1356"/>
       <point x="441" y="1309"/>
       <point x="396" y="1215" type="curve" smooth="yes"/>
       <point x="351" y="1120"/>
       <point x="328" y="964"/>
-      <point x="328" y="745" type="curve" name="sh02" smooth="yes"/>
+      <point x="328" y="745" type="curve" smooth="yes" name="sh02"/>
       <point x="328" y="527"/>
       <point x="351" y="371"/>
       <point x="396" y="276" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/O_megatonos.glif b/source/Hack-Regular.ufo/glyphs/O_megatonos.glif
index ef0d3595f..2cc4d5afd 100644
--- a/source/Hack-Regular.ufo/glyphs/O_megatonos.glif
+++ b/source/Hack-Regular.ufo/glyphs/O_megatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Omegatonos" format="1">
+<glyph name="Omegatonos" format="2">
   <advance width="1233"/>
   <unicode hex="038F"/>
   <outline>
@@ -14,13 +14,13 @@
       <point x="364" y="172" type="line"/>
       <point x="204" y="346"/>
       <point x="131" y="528"/>
-      <point x="131" y="778" type="curve" name="hr02" smooth="yes"/>
+      <point x="131" y="778" type="curve" smooth="yes" name="hr02"/>
       <point x="131" y="1200"/>
       <point x="339" y="1460"/>
-      <point x="660" y="1460" type="curve" name="dv02" smooth="yes"/>
+      <point x="660" y="1460" type="curve" smooth="yes" name="dv02"/>
       <point x="983" y="1460"/>
       <point x="1190" y="1198"/>
-      <point x="1190" y="778" type="curve" name="dh03" smooth="yes"/>
+      <point x="1190" y="778" type="curve" smooth="yes" name="dh03"/>
       <point x="1190" y="533"/>
       <point x="1119" y="349"/>
       <point x="956" y="172" type="curve" name="ih02"/>
@@ -30,13 +30,13 @@
       <point x="741" y="172" type="line" name="dh02"/>
       <point x="896" y="268"/>
       <point x="995" y="505"/>
-      <point x="995" y="788" type="curve" name="sh03" smooth="yes"/>
+      <point x="995" y="788" type="curve" smooth="yes" name="sh03"/>
       <point x="995" y="1112"/>
       <point x="865" y="1294"/>
-      <point x="661" y="1294" type="curve" name="dv01" smooth="yes"/>
+      <point x="661" y="1294" type="curve" smooth="yes" name="dv01"/>
       <point x="456" y="1294"/>
       <point x="328" y="1112"/>
-      <point x="328" y="789" type="curve" name="dh01" smooth="yes"/>
+      <point x="328" y="789" type="curve" smooth="yes" name="dh01"/>
       <point x="328" y="519"/>
       <point x="418" y="273"/>
       <point x="582" y="172" type="curve" name="sh04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/O_micron.glif b/source/Hack-Regular.ufo/glyphs/O_micron.glif
index fe15d2d66..860dd671a 100644
--- a/source/Hack-Regular.ufo/glyphs/O_micron.glif
+++ b/source/Hack-Regular.ufo/glyphs/O_micron.glif
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Omicron" format="1">
+<glyph name="Omicron" format="2">
   <advance width="1233"/>
   <unicode hex="039F"/>
   <outline>
     <contour>
-      <point x="615" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="615" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="280" y="-29"/>
       <point x="117" y="221"/>
-      <point x="117" y="744" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="744" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="1267"/>
       <point x="280" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="953" y="1520"/>
       <point x="1116" y="1266"/>
-      <point x="1116" y="745" type="curve" name="sh02" smooth="yes"/>
+      <point x="1116" y="745" type="curve" smooth="yes" name="sh02"/>
       <point x="1116" y="225"/>
       <point x="952" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="727" y="135"/>
       <point x="795" y="186"/>
       <point x="838" y="277" type="curve" smooth="yes"/>
       <point x="880" y="365"/>
       <point x="905" y="506"/>
-      <point x="905" y="747" type="curve" name="ah01" smooth="yes"/>
+      <point x="905" y="747" type="curve" smooth="yes" name="ah01"/>
       <point x="905" y="987"/>
       <point x="879" y="1125"/>
       <point x="837" y="1215" type="curve" smooth="yes"/>
       <point x="790" y="1311"/>
       <point x="721" y="1356"/>
-      <point x="617" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="617" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="512" y="1356"/>
       <point x="441" y="1310"/>
       <point x="396" y="1214" type="curve" smooth="yes"/>
       <point x="351" y="1119"/>
       <point x="328" y="962"/>
-      <point x="328" y="745" type="curve" name="sh03" smooth="yes"/>
+      <point x="328" y="745" type="curve" smooth="yes" name="sh03"/>
       <point x="328" y="525"/>
       <point x="349" y="374"/>
       <point x="396" y="277" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/O_microntonos.glif b/source/Hack-Regular.ufo/glyphs/O_microntonos.glif
index 21aad82ca..4400cebd0 100644
--- a/source/Hack-Regular.ufo/glyphs/O_microntonos.glif
+++ b/source/Hack-Regular.ufo/glyphs/O_microntonos.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Omicrontonos" format="1">
+<glyph name="Omicrontonos" format="2">
   <advance width="1233"/>
   <unicode hex="038C"/>
   <outline>
     <contour>
-      <point x="676" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="676" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="339" y="-29"/>
       <point x="177" y="222"/>
-      <point x="177" y="745" type="curve" name="sh01" smooth="yes"/>
+      <point x="177" y="745" type="curve" smooth="yes" name="sh01"/>
       <point x="177" y="1266"/>
       <point x="340" y="1520"/>
-      <point x="676" y="1520" type="curve" name="at02" smooth="yes"/>
+      <point x="676" y="1520" type="curve" smooth="yes" name="at02"/>
       <point x="1013" y="1520"/>
       <point x="1176" y="1266"/>
-      <point x="1176" y="745" type="curve" name="sh02" smooth="yes"/>
+      <point x="1176" y="745" type="curve" smooth="yes" name="sh02"/>
       <point x="1176" y="225"/>
       <point x="1013" y="-29"/>
     </contour>
@@ -24,25 +24,25 @@
       <point x="-178" y="1117" type="line"/>
     </contour>
     <contour>
-      <point x="676" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="676" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="779" y="135"/>
       <point x="853" y="182"/>
-      <point x="898" y="276" type="curve" name="hr01" smooth="yes"/>
+      <point x="898" y="276" type="curve" smooth="yes" name="hr01"/>
       <point x="943" y="368"/>
       <point x="965" y="524"/>
-      <point x="965" y="745" type="curve" name="ah01" smooth="yes"/>
+      <point x="965" y="745" type="curve" smooth="yes" name="ah01"/>
       <point x="965" y="965"/>
       <point x="943" y="1122"/>
-      <point x="898" y="1215" type="curve" name="hr02" smooth="yes"/>
+      <point x="898" y="1215" type="curve" smooth="yes" name="hr02"/>
       <point x="853" y="1309"/>
       <point x="779" y="1356"/>
-      <point x="676" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="676" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="574" y="1356"/>
       <point x="501" y="1309"/>
       <point x="456" y="1215" type="curve" smooth="yes"/>
       <point x="411" y="1120"/>
       <point x="388" y="964"/>
-      <point x="388" y="745" type="curve" name="sh03" smooth="yes"/>
+      <point x="388" y="745" type="curve" smooth="yes" name="sh03"/>
       <point x="388" y="527"/>
       <point x="411" y="371"/>
       <point x="456" y="276" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/O_slash.glif b/source/Hack-Regular.ufo/glyphs/O_slash.glif
index c79b66c88..f95ddfb0e 100644
--- a/source/Hack-Regular.ufo/glyphs/O_slash.glif
+++ b/source/Hack-Regular.ufo/glyphs/O_slash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Oslash" format="1">
+<glyph name="Oslash" format="2">
   <advance width="1233"/>
   <unicode hex="00D8"/>
   <outline>
@@ -11,13 +11,13 @@
       <point x="136" y="456" type="curve" smooth="yes"/>
       <point x="124" y="540"/>
       <point x="117" y="628"/>
-      <point x="117" y="740" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="740" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="1011"/>
       <point x="157" y="1199"/>
       <point x="241" y="1328" type="curve" smooth="yes"/>
       <point x="326" y="1460"/>
       <point x="450" y="1520"/>
-      <point x="615" y="1520" type="curve" name="at02" smooth="yes"/>
+      <point x="615" y="1520" type="curve" smooth="yes" name="at02"/>
       <point x="695" y="1520"/>
       <point x="759" y="1506"/>
       <point x="818" y="1479" type="curve" smooth="yes"/>
@@ -32,13 +32,13 @@
       <point x="1095" y="1037" type="curve" smooth="yes"/>
       <point x="1108" y="960"/>
       <point x="1116" y="859"/>
-      <point x="1116" y="744" type="curve" name="sh02" smooth="yes"/>
+      <point x="1116" y="744" type="curve" smooth="yes" name="sh02"/>
       <point x="1116" y="485"/>
       <point x="1075" y="291"/>
       <point x="993" y="163" type="curve" smooth="yes"/>
       <point x="913" y="38"/>
       <point x="791" y="-29"/>
-      <point x="612" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="612" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="536" y="-29"/>
       <point x="469" y="-17"/>
       <point x="405" y="12" type="curve" smooth="yes"/>
@@ -54,31 +54,31 @@
       <point x="760" y="1314" type="curve" smooth="yes"/>
       <point x="721" y="1343"/>
       <point x="671" y="1356"/>
-      <point x="615" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="615" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="503" y="1356"/>
       <point x="437" y="1304"/>
       <point x="394" y="1208" type="curve" smooth="yes"/>
       <point x="349" y="1107"/>
       <point x="328" y="951"/>
-      <point x="328" y="686" type="curve" name="sh03" smooth="yes"/>
+      <point x="328" y="686" type="curve" smooth="yes" name="sh03"/>
       <point x="328" y="628"/>
       <point x="328" y="598"/>
-      <point x="331" y="556" type="curve" name="sh05" smooth="yes"/>
+      <point x="331" y="556" type="curve" smooth="yes" name="sh05"/>
       <point x="332" y="537"/>
       <point x="331" y="518"/>
       <point x="338" y="471" type="curve" name="sh06"/>
     </contour>
     <contour>
-      <point x="617" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="726" y="135"/>
       <point x="795" y="186"/>
       <point x="838" y="277" type="curve" smooth="yes"/>
       <point x="881" y="365"/>
       <point x="905" y="506"/>
-      <point x="905" y="748" type="curve" name="ah01" smooth="yes"/>
+      <point x="905" y="748" type="curve" smooth="yes" name="ah01"/>
       <point x="905" y="817"/>
       <point x="903" y="878"/>
-      <point x="900" y="923" type="curve" name="sh07" smooth="yes"/>
+      <point x="900" y="923" type="curve" smooth="yes" name="sh07"/>
       <point x="897" y="967"/>
       <point x="893" y="1001"/>
       <point x="885" y="1036" type="curve" name="ih03"/>
diff --git a/source/Hack-Regular.ufo/glyphs/O_slashacute.glif b/source/Hack-Regular.ufo/glyphs/O_slashacute.glif
index 05e2cace5..d6f9d11fa 100644
--- a/source/Hack-Regular.ufo/glyphs/O_slashacute.glif
+++ b/source/Hack-Regular.ufo/glyphs/O_slashacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Oslashacute" format="1">
+<glyph name="Oslashacute" format="2">
   <advance width="1233"/>
   <unicode hex="01FE"/>
   <outline>
@@ -14,10 +14,10 @@
       <point x="186" y="252" type="line"/>
       <point x="143" y="348"/>
       <point x="117" y="536"/>
-      <point x="117" y="744" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="744" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="1265"/>
       <point x="279" y="1520"/>
-      <point x="614" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="614" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="769" y="1520"/>
       <point x="884" y="1466"/>
       <point x="961" y="1358" type="curve" name="ih03"/>
@@ -26,10 +26,10 @@
       <point x="1032" y="1247" type="line"/>
       <point x="1088" y="1139"/>
       <point x="1116" y="964"/>
-      <point x="1116" y="744" type="curve" name="sh03" smooth="yes"/>
+      <point x="1116" y="744" type="curve" smooth="yes" name="sh03"/>
       <point x="1116" y="224"/>
       <point x="953" y="-29"/>
-      <point x="613" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="613" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="454" y="-29"/>
       <point x="335" y="25"/>
       <point x="254" y="133" type="curve" name="ih04"/>
@@ -39,25 +39,25 @@
       <point x="842" y="1190" type="line"/>
       <point x="810" y="1294"/>
       <point x="736" y="1356"/>
-      <point x="615" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="615" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="502" y="1356"/>
       <point x="438" y="1303"/>
       <point x="395" y="1210" type="curve" smooth="yes"/>
       <point x="346" y="1101"/>
       <point x="328" y="930"/>
-      <point x="328" y="682" type="curve" name="sh04" smooth="yes"/>
+      <point x="328" y="682" type="curve" smooth="yes" name="sh04"/>
       <point x="328" y="581"/>
       <point x="331" y="516"/>
       <point x="338" y="471" type="curve" name="sh05"/>
     </contour>
     <contour>
-      <point x="619" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="720" y="135"/>
       <point x="793" y="182"/>
       <point x="838" y="277" type="curve" smooth="yes"/>
       <point x="881" y="366"/>
       <point x="905" y="502"/>
-      <point x="905" y="755" type="curve" name="ah01" smooth="yes"/>
+      <point x="905" y="755" type="curve" smooth="yes" name="ah01"/>
       <point x="905" y="888"/>
       <point x="898" y="976"/>
       <point x="885" y="1036" type="curve" name="ih05"/>
diff --git a/source/Hack-Regular.ufo/glyphs/O_tilde.glif b/source/Hack-Regular.ufo/glyphs/O_tilde.glif
index 0862f26d8..6e71ed641 100644
--- a/source/Hack-Regular.ufo/glyphs/O_tilde.glif
+++ b/source/Hack-Regular.ufo/glyphs/O_tilde.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Otilde" format="1">
+<glyph name="Otilde" format="2">
   <advance width="1233"/>
   <unicode hex="00D5"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="287" y="1633" type="line" name="hr00"/>
       <point x="287" y="1697"/>
       <point x="302" y="1750"/>
-      <point x="339" y="1793" type="curve" name="sh03" smooth="yes"/>
+      <point x="339" y="1793" type="curve" smooth="yes" name="sh03"/>
       <point x="373" y="1832"/>
       <point x="419" y="1852"/>
-      <point x="476" y="1852" type="curve" name="dv04" smooth="yes"/>
+      <point x="476" y="1852" type="curve" smooth="yes" name="dv04"/>
       <point x="497" y="1852"/>
       <point x="519" y="1849"/>
       <point x="542" y="1844" type="curve" smooth="yes"/>
@@ -31,10 +31,10 @@
       <point x="946" y="1852" type="line"/>
       <point x="945" y="1786"/>
       <point x="928" y="1733"/>
-      <point x="893" y="1693" type="curve" name="sh04" smooth="yes"/>
+      <point x="893" y="1693" type="curve" smooth="yes" name="sh04"/>
       <point x="859" y="1653"/>
       <point x="814" y="1633"/>
-      <point x="757" y="1633" type="curve" name="sv02" smooth="yes"/>
+      <point x="757" y="1633" type="curve" smooth="yes" name="sv02"/>
       <point x="736" y="1633"/>
       <point x="715" y="1636"/>
       <point x="694" y="1641" type="curve" smooth="yes"/>
@@ -57,25 +57,25 @@
       <point x="412" y="1633" type="line" name="dv03"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="447" y="-29"/>
       <point x="322" y="35"/>
       <point x="240" y="162" type="curve" smooth="yes"/>
       <point x="158" y="289"/>
       <point x="117" y="483"/>
-      <point x="117" y="745" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="745" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="1006"/>
       <point x="158" y="1201"/>
       <point x="241" y="1328" type="curve" smooth="yes"/>
       <point x="324" y="1456"/>
       <point x="445" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="780" y="1520"/>
       <point x="908" y="1461"/>
       <point x="993" y="1328" type="curve" smooth="yes"/>
       <point x="1075" y="1200"/>
       <point x="1116" y="1006"/>
-      <point x="1116" y="745" type="curve" name="sh05" smooth="yes"/>
+      <point x="1116" y="745" type="curve" smooth="yes" name="sh05"/>
       <point x="1116" y="485"/>
       <point x="1075" y="291"/>
       <point x="993" y="163" type="curve" smooth="yes"/>
@@ -83,25 +83,25 @@
       <point x="780" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="719" y="135"/>
       <point x="793" y="182"/>
       <point x="838" y="276" type="curve" smooth="yes"/>
       <point x="883" y="368"/>
       <point x="905" y="524"/>
-      <point x="905" y="745" type="curve" name="ah01" smooth="yes"/>
+      <point x="905" y="745" type="curve" smooth="yes" name="ah01"/>
       <point x="905" y="965"/>
       <point x="883" y="1122"/>
       <point x="838" y="1215" type="curve" smooth="yes"/>
       <point x="793" y="1309"/>
       <point x="719" y="1356"/>
-      <point x="616" y="1356" type="curve" name="sv03" smooth="yes"/>
+      <point x="616" y="1356" type="curve" smooth="yes" name="sv03"/>
       <point x="514" y="1356"/>
       <point x="441" y="1309"/>
       <point x="396" y="1215" type="curve" smooth="yes"/>
       <point x="351" y="1120"/>
       <point x="328" y="964"/>
-      <point x="328" y="745" type="curve" name="sh02" smooth="yes"/>
+      <point x="328" y="745" type="curve" smooth="yes" name="sh02"/>
       <point x="328" y="527"/>
       <point x="351" y="371"/>
       <point x="396" y="276" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/P_.glif b/source/Hack-Regular.ufo/glyphs/P_.glif
index 926c4e8e6..40661daf7 100644
--- a/source/Hack-Regular.ufo/glyphs/P_.glif
+++ b/source/Hack-Regular.ufo/glyphs/P_.glif
@@ -1,42 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="P" format="1">
+<glyph name="P" format="2">
   <advance width="1233"/>
   <unicode hex="0050"/>
   <outline>
     <contour>
-      <point x="172" y="1493" type="line" name="hr00"/>
+      <point x="172" y="1493" type="line"/>
       <point x="608" y="1493" type="line" smooth="yes"/>
-      <point x="774" y="1493"/>
-      <point x="900" y="1455"/>
-      <point x="987" y="1380" type="curve" smooth="yes"/>
-      <point x="1076" y="1301"/>
-      <point x="1116" y="1187"/>
-      <point x="1116" y="1046" type="curve" name="sh01" smooth="yes"/>
-      <point x="1116" y="899"/>
-      <point x="1073" y="788"/>
-      <point x="988" y="713" type="curve" smooth="yes"/>
-      <point x="904" y="638"/>
-      <point x="777" y="600"/>
-      <point x="608" y="600" type="curve" name="dv01" smooth="yes"/>
-      <point x="374" y="600" type="line" name="sh03"/>
-      <point x="374" y="0" type="line" name="ab01"/>
+      <point x="907.104" y="1493"/>
+      <point x="1116" y="1368.4"/>
+      <point x="1116" y="1044.9" type="curve" smooth="yes"/>
+      <point x="1116" y="722.156"/>
+      <point x="908.083" y="600"/>
+      <point x="608" y="600" type="curve" smooth="yes"/>
+      <point x="374" y="600" type="line"/>
+      <point x="374" y="0" type="line"/>
       <point x="172" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="608" y="766" type="line" name="dv02" smooth="yes"/>
-      <point x="708" y="766"/>
-      <point x="779" y="795"/>
-      <point x="827" y="840" type="curve" smooth="yes"/>
-      <point x="879" y="889"/>
-      <point x="905" y="958"/>
-      <point x="905" y="1047" type="curve" name="ah01" smooth="yes"/>
-      <point x="905" y="1136"/>
-      <point x="879" y="1205"/>
-      <point x="827" y="1254" type="curve" smooth="yes"/>
-      <point x="776" y="1303"/>
-      <point x="703" y="1327"/>
-      <point x="608" y="1327" type="curve" name="sv01" smooth="yes"/>
-      <point x="374" y="1327" type="line" name="sh02"/>
+      <point x="608" y="766" type="line" smooth="yes"/>
+      <point x="787.405" y="766"/>
+      <point x="905" y="861.416"/>
+      <point x="905" y="1048.02" type="curve" smooth="yes"/>
+      <point x="905" y="1234.08"/>
+      <point x="788.087" y="1327"/>
+      <point x="608" y="1327" type="curve" smooth="yes"/>
+      <point x="374" y="1327" type="line"/>
       <point x="374" y="766" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/P_hi.glif b/source/Hack-Regular.ufo/glyphs/P_hi.glif
index 89b0a1252..fbefe025e 100644
--- a/source/Hack-Regular.ufo/glyphs/P_hi.glif
+++ b/source/Hack-Regular.ufo/glyphs/P_hi.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Phi" format="1">
+<glyph name="Phi" format="2">
   <advance width="1233"/>
   <unicode hex="03A6"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="515" y="286" type="line"/>
       <point x="279" y="310"/>
       <point x="118" y="433"/>
-      <point x="118" y="745" type="curve" name="dh01" smooth="yes"/>
+      <point x="118" y="745" type="curve" smooth="yes" name="dh01"/>
       <point x="118" y="1057"/>
       <point x="280" y="1181"/>
       <point x="515" y="1205" type="curve" name="sh01"/>
@@ -22,7 +22,7 @@
       <point x="718" y="1205" type="line"/>
       <point x="953" y="1181"/>
       <point x="1115" y="1057"/>
-      <point x="1115" y="745" type="curve" name="dh06" smooth="yes"/>
+      <point x="1115" y="745" type="curve" smooth="yes" name="dh06"/>
       <point x="1115" y="433"/>
       <point x="954" y="310"/>
       <point x="718" y="286" type="curve" name="hr02"/>
@@ -38,7 +38,7 @@
       <point x="397" y="971" type="curve" smooth="yes"/>
       <point x="352" y="926"/>
       <point x="329" y="850"/>
-      <point x="329" y="745" type="curve" name="dh02" smooth="yes"/>
+      <point x="329" y="745" type="curve" smooth="yes" name="dh02"/>
       <point x="329" y="640"/>
       <point x="352" y="565"/>
       <point x="397" y="520" type="curve" smooth="yes"/>
@@ -53,7 +53,7 @@
       <point x="837" y="520" type="curve" smooth="yes"/>
       <point x="882" y="565"/>
       <point x="904" y="640"/>
-      <point x="904" y="745" type="curve" name="dh05" smooth="yes"/>
+      <point x="904" y="745" type="curve" smooth="yes" name="dh05"/>
       <point x="904" y="851"/>
       <point x="882" y="926"/>
       <point x="837" y="971" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/P_i.glif b/source/Hack-Regular.ufo/glyphs/P_i.glif
index 269d12e3d..42ab2c7f3 100644
--- a/source/Hack-Regular.ufo/glyphs/P_i.glif
+++ b/source/Hack-Regular.ufo/glyphs/P_i.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Pi" format="1">
+<glyph name="Pi" format="2">
   <advance width="1233"/>
   <unicode hex="03A0"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/P_si.glif b/source/Hack-Regular.ufo/glyphs/P_si.glif
index c09b71963..9aeb48bfe 100644
--- a/source/Hack-Regular.ufo/glyphs/P_si.glif
+++ b/source/Hack-Regular.ufo/glyphs/P_si.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Psi" format="1">
+<glyph name="Psi" format="2">
   <advance width="1233"/>
   <unicode hex="03A8"/>
   <outline>
@@ -9,13 +9,13 @@
       <point x="514" y="384" type="line"/>
       <point x="396" y="405"/>
       <point x="305" y="466"/>
-      <point x="240" y="567" type="curve" name="hr01" smooth="yes"/>
+      <point x="240" y="567" type="curve" smooth="yes" name="hr01"/>
       <point x="158" y="694"/>
       <point x="117" y="888"/>
-      <point x="117" y="1150" type="curve" name="dh01" smooth="yes"/>
+      <point x="117" y="1150" type="curve" smooth="yes" name="dh01"/>
       <point x="117" y="1493" type="line" name="at01"/>
       <point x="320" y="1493" type="line"/>
-      <point x="320" y="1150" type="line" name="dh02" smooth="yes"/>
+      <point x="320" y="1150" type="line" smooth="yes" name="dh02"/>
       <point x="320" y="919"/>
       <point x="348" y="774"/>
       <point x="396" y="681" type="curve" smooth="yes"/>
@@ -30,10 +30,10 @@
       <point x="836" y="681" type="curve" smooth="yes"/>
       <point x="886" y="778"/>
       <point x="911" y="934"/>
-      <point x="911" y="1150" type="curve" name="dh05" smooth="yes"/>
+      <point x="911" y="1150" type="curve" smooth="yes" name="dh05"/>
       <point x="911" y="1493" type="line" name="at03"/>
       <point x="1114" y="1493" type="line"/>
-      <point x="1114" y="1150" type="line" name="dh06" smooth="yes"/>
+      <point x="1114" y="1150" type="line" smooth="yes" name="dh06"/>
       <point x="1114" y="888"/>
       <point x="1073" y="694"/>
       <point x="991" y="567" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/Q_.glif b/source/Hack-Regular.ufo/glyphs/Q_.glif
index 4aa20fe92..6eee1df6b 100644
--- a/source/Hack-Regular.ufo/glyphs/Q_.glif
+++ b/source/Hack-Regular.ufo/glyphs/Q_.glif
@@ -1,62 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Q" format="1">
+<glyph name="Q" format="2">
   <advance width="1233"/>
   <unicode hex="0051"/>
   <outline>
     <contour>
-      <point x="655" y="-27" type="line" name="ab01"/>
-      <point x="648" y="-27"/>
-      <point x="621" y="-29"/>
-      <point x="617" y="-29" type="curve" name="ab03"/>
-      <point x="285" y="-37"/>
-      <point x="113" y="235"/>
-      <point x="117" y="745" type="curve" name="sh01"/>
-      <point x="117" y="1006"/>
-      <point x="158" y="1201"/>
-      <point x="241" y="1328" type="curve" smooth="yes"/>
-      <point x="324" y="1456"/>
-      <point x="445" y="1520"/>
-      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
-      <point x="780" y="1520"/>
-      <point x="908" y="1461"/>
-      <point x="993" y="1328" type="curve" smooth="yes"/>
-      <point x="1075" y="1200"/>
-      <point x="1116" y="1006"/>
-      <point x="1116" y="745" type="curve" smooth="yes" name="sh02"/>
-      <point x="1116" y="550"/>
-      <point x="1093" y="392"/>
-      <point x="1048" y="272" type="curve" smooth="yes"/>
-      <point x="1004" y="155"/>
-      <point x="935" y="68"/>
-      <point x="840" y="20" type="curve" name="iv01"/>
-      <point x="1202" y="-350" type="line" name="sh03"/>
+      <point x="655" y="-27" type="line"/>
+      <point x="652.807" y="-27"/>
+      <point x="646.223" y="-27.2967"/>
+      <point x="640.367" y="-27.6594" type="curve"/>
+      <point x="622.755" y="-28.7503"/>
+      <point x="618.402" y="-29"/>
+      <point x="617" y="-29" type="curve"/>
+      <point x="608" y="-29" type="line" smooth="yes"/>
+      <point x="283.755" y="-29"/>
+      <point x="116.93" y="233.941"/>
+      <point x="116.93" y="744.868" type="curve" smooth="yes"/>
+      <point x="116.93" y="1258.35"/>
+      <point x="285.425" y="1520"/>
+      <point x="610.267" y="1520" type="curve" smooth="yes"/>
+      <point x="941.292" y="1520"/>
+      <point x="1116" y="1248.29"/>
+      <point x="1116" y="742.168" type="curve" smooth="yes"/>
+      <point x="1116" y="364.699"/>
+      <point x="1018.82" y="110.354"/>
+      <point x="840" y="20" type="curve"/>
+      <point x="1202" y="-350" type="line"/>
       <point x="966" y="-350" type="line"/>
     </contour>
     <contour>
-      <point x="616" y="135" type="curve" smooth="yes" name="sv01"/>
-      <point x="719" y="135"/>
-      <point x="793" y="182"/>
-      <point x="838" y="276" type="curve" smooth="yes"/>
-      <point x="883" y="368"/>
-      <point x="905" y="524"/>
-      <point x="905" y="745" type="curve" smooth="yes" name="ah01"/>
-      <point x="905" y="965"/>
-      <point x="883" y="1122"/>
-      <point x="838" y="1215" type="curve" smooth="yes"/>
-      <point x="793" y="1309"/>
-      <point x="719" y="1356"/>
-      <point x="616" y="1356" type="curve" smooth="yes" name="sv02"/>
-      <point x="514" y="1356"/>
-      <point x="441" y="1309"/>
-      <point x="396" y="1215" type="curve" smooth="yes"/>
-      <point x="351" y="1120"/>
-      <point x="328" y="964"/>
-      <point x="328" y="745" type="curve" smooth="yes" name="sh04"/>
-      <point x="328" y="527"/>
-      <point x="351" y="371"/>
-      <point x="396" y="276" type="curve" smooth="yes"/>
-      <point x="441" y="182"/>
-      <point x="514" y="135"/>
+      <point x="617.996" y="135" type="curve" smooth="yes"/>
+      <point x="719.511" y="135"/>
+      <point x="792.566" y="181.103"/>
+      <point x="837.192" y="273.331" type="curve" smooth="yes"/>
+      <point x="882.68" y="367.338"/>
+      <point x="905" y="522.431"/>
+      <point x="905" y="744.503" type="curve" smooth="yes"/>
+      <point x="905" y="966.549"/>
+      <point x="882.685" y="1122.65"/>
+      <point x="837.533" y="1216.47" type="curve" smooth="yes"/>
+      <point x="792.901" y="1309.21"/>
+      <point x="718.773" y="1356"/>
+      <point x="616.498" y="1356" type="curve" smooth="yes"/>
+      <point x="514.175" y="1356"/>
+      <point x="441.077" y="1309.16"/>
+      <point x="396.147" y="1214.81" type="curve" smooth="yes"/>
+      <point x="350.75" y="1119.47"/>
+      <point x="328" y="962.803"/>
+      <point x="328" y="745.501" type="curve" smooth="yes"/>
+      <point x="328" y="528.461"/>
+      <point x="350.695" y="371.64"/>
+      <point x="395.817" y="276.884" type="curve" smooth="yes"/>
+      <point x="440.803" y="182.413"/>
+      <point x="515.049" y="135"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Regular.ufo/glyphs/R_.glif b/source/Hack-Regular.ufo/glyphs/R_.glif
index 97f63dfc0..80cc0d7f1 100644
--- a/source/Hack-Regular.ufo/glyphs/R_.glif
+++ b/source/Hack-Regular.ufo/glyphs/R_.glif
@@ -1,57 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="R" format="1">
+<glyph name="R" format="2">
   <advance width="1233"/>
   <unicode hex="0052"/>
   <outline>
     <contour>
-      <point x="143" y="1493" type="line" name="hr00"/>
+      <point x="143" y="1493" type="line"/>
       <point x="559" y="1493" type="line" smooth="yes"/>
-      <point x="723" y="1493"/>
-      <point x="849" y="1456"/>
-      <point x="936" y="1382" type="curve" smooth="yes"/>
-      <point x="1024" y="1307"/>
-      <point x="1067" y="1200"/>
-      <point x="1067" y="1065" type="curve" name="sh01" smooth="yes"/>
-      <point x="1067" y="960"/>
-      <point x="1040" y="883"/>
-      <point x="987" y="820" type="curve" smooth="yes"/>
-      <point x="934" y="757"/>
-      <point x="858" y="719"/>
-      <point x="760" y="705" type="curve" name="ih01"/>
-      <point x="813" y="692"/>
-      <point x="860" y="665"/>
-      <point x="893" y="630" type="curve" smooth="yes"/>
-      <point x="930" y="591"/>
-      <point x="971" y="525"/>
-      <point x="1030" y="408" type="curve" smooth="yes"/>
-      <point x="1233" y="0" type="line" name="ab01"/>
+      <point x="862.06" y="1493"/>
+      <point x="1067" y="1324.13"/>
+      <point x="1067" y="1074.41" type="curve" smooth="yes"/>
+      <point x="1067" y="865.174"/>
+      <point x="957.195" y="733.047"/>
+      <point x="760" y="705" type="curve"/>
+      <point x="899.635" y="670.703"/>
+      <point x="968.524" y="531.872"/>
+      <point x="1023" y="422.081" type="curve" smooth="yes"/>
+      <point x="1233" y="0" type="line"/>
       <point x="1016" y="0" type="line"/>
       <point x="838" y="377" type="line" smooth="yes"/>
-      <point x="786" y="488"/>
-      <point x="740" y="554"/>
-      <point x="700" y="585" type="curve" smooth="yes"/>
-      <point x="659" y="617"/>
-      <point x="602" y="631"/>
-      <point x="539" y="631" type="curve" name="dv01" smooth="yes"/>
-      <point x="346" y="631" type="line" name="sh03"/>
-      <point x="346" y="0" type="line" name="ab02"/>
+      <point x="745.235" y="573.205"/>
+      <point x="677.201" y="631"/>
+      <point x="539" y="631" type="curve" smooth="yes"/>
+      <point x="346" y="631" type="line"/>
+      <point x="346" y="0" type="line"/>
       <point x="143" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="567" y="797" type="line" name="dv02" smooth="yes"/>
-      <point x="664" y="797"/>
-      <point x="736" y="819"/>
-      <point x="783" y="862" type="curve" smooth="yes"/>
-      <point x="830" y="905"/>
-      <point x="854" y="972"/>
-      <point x="854" y="1059" type="curve" name="ah01" smooth="yes"/>
-      <point x="854" y="1146"/>
-      <point x="830" y="1212"/>
-      <point x="779" y="1259" type="curve" smooth="yes"/>
-      <point x="731" y="1302"/>
-      <point x="659" y="1327"/>
-      <point x="559" y="1327" type="curve" name="sv01" smooth="yes"/>
-      <point x="346" y="1327" type="line" name="sh02"/>
+      <point x="567" y="797" type="line" smooth="yes"/>
+      <point x="752.186" y="797"/>
+      <point x="854" y="888.777"/>
+      <point x="854" y="1055.71" type="curve" smooth="yes"/>
+      <point x="854" y="1240.52"/>
+      <point x="759.959" y="1327"/>
+      <point x="559" y="1327" type="curve" smooth="yes"/>
+      <point x="346" y="1327" type="line"/>
       <point x="346" y="797" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/R_acute.glif b/source/Hack-Regular.ufo/glyphs/R_acute.glif
index 1b98f3b6e..bac096ae1 100644
--- a/source/Hack-Regular.ufo/glyphs/R_acute.glif
+++ b/source/Hack-Regular.ufo/glyphs/R_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Racute" format="1">
+<glyph name="Racute" format="2">
   <advance width="1233"/>
   <unicode hex="0154"/>
   <outline>
@@ -14,7 +14,7 @@
       <point x="559" y="1493" type="line" smooth="yes"/>
       <point x="886" y="1493"/>
       <point x="1067" y="1337"/>
-      <point x="1067" y="1069" type="curve" name="sh02" smooth="yes"/>
+      <point x="1067" y="1069" type="curve" smooth="yes" name="sh02"/>
       <point x="1067" y="856"/>
       <point x="953" y="734"/>
       <point x="760" y="705" type="curve" name="ih03"/>
@@ -26,19 +26,19 @@
       <point x="838" y="377" type="line" smooth="yes"/>
       <point x="734" y="596"/>
       <point x="667" y="631"/>
-      <point x="539" y="631" type="curve" name="dv01" smooth="yes"/>
+      <point x="539" y="631" type="curve" smooth="yes" name="dv01"/>
       <point x="346" y="631" type="line" name="sh04"/>
       <point x="346" y="0" type="line" name="ab02"/>
       <point x="143" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="567" y="797" type="line" name="dv02" smooth="yes"/>
+      <point x="567" y="797" type="line" smooth="yes" name="dv02"/>
       <point x="758" y="797"/>
       <point x="854" y="883"/>
-      <point x="854" y="1056" type="curve" name="ah01" smooth="yes"/>
+      <point x="854" y="1056" type="curve" smooth="yes" name="ah01"/>
       <point x="854" y="1237"/>
       <point x="751" y="1327"/>
-      <point x="559" y="1327" type="curve" name="sv01" smooth="yes"/>
+      <point x="559" y="1327" type="curve" smooth="yes" name="sv01"/>
       <point x="346" y="1327" type="line" name="sh03"/>
       <point x="346" y="797" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/R_caron.glif b/source/Hack-Regular.ufo/glyphs/R_caron.glif
index 8bfadee75..747d120d2 100644
--- a/source/Hack-Regular.ufo/glyphs/R_caron.glif
+++ b/source/Hack-Regular.ufo/glyphs/R_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Rcaron" format="1">
+<glyph name="Rcaron" format="2">
   <advance width="1233"/>
   <unicode hex="0158"/>
   <outline>
@@ -17,7 +17,7 @@
       <point x="559" y="1493" type="line" smooth="yes"/>
       <point x="886" y="1493"/>
       <point x="1067" y="1337"/>
-      <point x="1067" y="1069" type="curve" name="sh04" smooth="yes"/>
+      <point x="1067" y="1069" type="curve" smooth="yes" name="sh04"/>
       <point x="1067" y="856"/>
       <point x="953" y="734"/>
       <point x="760" y="705" type="curve" name="ih01"/>
@@ -29,19 +29,19 @@
       <point x="838" y="377" type="line" smooth="yes"/>
       <point x="734" y="596"/>
       <point x="667" y="631"/>
-      <point x="539" y="631" type="curve" name="dv01" smooth="yes"/>
+      <point x="539" y="631" type="curve" smooth="yes" name="dv01"/>
       <point x="346" y="631" type="line" name="sh05"/>
       <point x="346" y="0" type="line" name="ab02"/>
       <point x="143" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="567" y="797" type="line" name="dv02" smooth="yes"/>
+      <point x="567" y="797" type="line" smooth="yes" name="dv02"/>
       <point x="758" y="797"/>
       <point x="854" y="883"/>
-      <point x="854" y="1056" type="curve" name="ah01" smooth="yes"/>
+      <point x="854" y="1056" type="curve" smooth="yes" name="ah01"/>
       <point x="854" y="1237"/>
       <point x="751" y="1327"/>
-      <point x="559" y="1327" type="curve" name="sv01" smooth="yes"/>
+      <point x="559" y="1327" type="curve" smooth="yes" name="sv01"/>
       <point x="346" y="1327" type="line" name="sh02"/>
       <point x="346" y="797" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/R_ho.glif b/source/Hack-Regular.ufo/glyphs/R_ho.glif
index ad467cbd1..f3e4407bb 100644
--- a/source/Hack-Regular.ufo/glyphs/R_ho.glif
+++ b/source/Hack-Regular.ufo/glyphs/R_ho.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Rho" format="1">
+<glyph name="Rho" format="2">
   <advance width="1233"/>
   <unicode hex="03A1"/>
   <outline>
@@ -8,22 +8,22 @@
       <point x="608" y="1493" type="line" smooth="yes"/>
       <point x="943" y="1493"/>
       <point x="1116" y="1342"/>
-      <point x="1116" y="1046" type="curve" name="sh01" smooth="yes"/>
+      <point x="1116" y="1046" type="curve" smooth="yes" name="sh01"/>
       <point x="1116" y="751"/>
       <point x="945" y="600"/>
-      <point x="608" y="600" type="curve" name="dv01" smooth="yes"/>
+      <point x="608" y="600" type="curve" smooth="yes" name="dv01"/>
       <point x="374" y="600" type="line" name="sh03"/>
       <point x="374" y="0" type="line" name="ab01"/>
       <point x="172" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="608" y="766" type="line" name="dv02" smooth="yes"/>
+      <point x="608" y="766" type="line" smooth="yes" name="dv02"/>
       <point x="796" y="766"/>
       <point x="905" y="868"/>
-      <point x="905" y="1047" type="curve" name="ah01" smooth="yes"/>
+      <point x="905" y="1047" type="curve" smooth="yes" name="ah01"/>
       <point x="905" y="1226"/>
       <point x="797" y="1327"/>
-      <point x="608" y="1327" type="curve" name="sv01" smooth="yes"/>
+      <point x="608" y="1327" type="curve" smooth="yes" name="sv01"/>
       <point x="374" y="1327" type="line" name="sh02"/>
       <point x="374" y="766" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/S_.glif b/source/Hack-Regular.ufo/glyphs/S_.glif
index 41d1024ad..31a0c6b04 100644
--- a/source/Hack-Regular.ufo/glyphs/S_.glif
+++ b/source/Hack-Regular.ufo/glyphs/S_.glif
@@ -1,79 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="S" format="1">
+<glyph name="S" format="2">
   <advance width="1233"/>
   <unicode hex="0053"/>
   <outline>
     <contour>
-      <point x="584" y="-29" type="curve" name="hr00" smooth="yes"/>
-      <point x="441" y="-29"/>
-      <point x="301" y="2"/>
+      <point x="590.602" y="-29" type="curve" smooth="yes"/>
+      <point x="447.131" y="-29"/>
+      <point x="303.682" y="0.843649"/>
       <point x="158" y="61" type="curve"/>
-      <point x="158" y="276" type="line" name="ih01"/>
-      <point x="235" y="227"/>
-      <point x="307" y="192"/>
-      <point x="376" y="169" type="curve" smooth="yes"/>
-      <point x="444" y="146"/>
-      <point x="512" y="135"/>
-      <point x="581" y="135" type="curve" name="dv01" smooth="yes"/>
-      <point x="681" y="135"/>
-      <point x="763" y="158"/>
-      <point x="820" y="203" type="curve" smooth="yes"/>
-      <point x="879" y="250"/>
-      <point x="905" y="315"/>
-      <point x="905" y="400" type="curve" name="ah01" smooth="yes"/>
-      <point x="905" y="475"/>
-      <point x="886" y="526"/>
-      <point x="847" y="565" type="curve" smooth="yes"/>
-      <point x="804" y="609"/>
-      <point x="743" y="634"/>
-      <point x="643" y="657" type="curve" smooth="yes"/>
-      <point x="535" y="682" type="line" smooth="yes"/>
-      <point x="400" y="713"/>
-      <point x="300" y="756"/>
-      <point x="233" y="824" type="curve" smooth="yes"/>
-      <point x="170" y="887"/>
-      <point x="139" y="972"/>
-      <point x="139" y="1079" type="curve" name="sh01" smooth="yes"/>
-      <point x="139" y="1215"/>
-      <point x="187" y="1324"/>
-      <point x="274" y="1401" type="curve" smooth="yes"/>
-      <point x="359" y="1477"/>
-      <point x="479" y="1520"/>
-      <point x="631" y="1520" type="curve" name="at01" smooth="yes"/>
-      <point x="688" y="1520"/>
-      <point x="748" y="1514"/>
-      <point x="812" y="1501" type="curve" smooth="yes"/>
-      <point x="874" y="1488"/>
-      <point x="941" y="1469"/>
+      <point x="158" y="276" type="line"/>
+      <point x="307.196" y="180.884"/>
+      <point x="445.93" y="135"/>
+      <point x="585.427" y="135" type="curve" smooth="yes"/>
+      <point x="788.502" y="135"/>
+      <point x="905" y="232.239"/>
+      <point x="905" y="410.535" type="curve" smooth="yes"/>
+      <point x="905" y="553.489"/>
+      <point x="830.108" y="613.029"/>
+      <point x="560.776" y="676.323" type="curve" smooth="yes"/>
+      <point x="545.093" y="679.988" type="line" smooth="yes"/>
+      <point x="259.255" y="746.603"/>
+      <point x="139" y="864.861"/>
+      <point x="139" y="1077.62" type="curve" smooth="yes"/>
+      <point x="139" y="1347.67"/>
+      <point x="332.73" y="1520"/>
+      <point x="632.472" y="1520" type="curve" smooth="yes"/>
+      <point x="749.243" y="1520"/>
+      <point x="875.851" y="1493.85"/>
       <point x="1012" y="1442" type="curve"/>
-      <point x="1012" y="1237" type="line" name="ih02"/>
-      <point x="948" y="1278"/>
-      <point x="888" y="1306"/>
-      <point x="828" y="1326" type="curve" smooth="yes"/>
-      <point x="766" y="1346"/>
-      <point x="704" y="1356"/>
-      <point x="642" y="1356" type="curve" name="sv01" smooth="yes"/>
-      <point x="451" y="1356"/>
-      <point x="332" y="1261"/>
-      <point x="332" y="1105" type="curve" name="sh02" smooth="yes"/>
-      <point x="332" y="1037"/>
-      <point x="352" y="993"/>
-      <point x="387" y="960" type="curve" smooth="yes"/>
-      <point x="428" y="921"/>
-      <point x="490" y="895"/>
-      <point x="590" y="872" type="curve" smooth="yes"/>
-      <point x="696" y="848" type="line" smooth="yes"/>
-      <point x="837" y="816"/>
-      <point x="936" y="765"/>
-      <point x="1001" y="694" type="curve" smooth="yes"/>
-      <point x="1066" y="625"/>
-      <point x="1098" y="530"/>
-      <point x="1098" y="410" type="curve" name="sh03" smooth="yes"/>
-      <point x="1098" y="258"/>
-      <point x="1048" y="152"/>
-      <point x="967" y="83" type="curve" smooth="yes"/>
-      <point x="879" y="8"/>
-      <point x="749" y="-29"/>
+      <point x="1012" y="1237" type="line"/>
+      <point x="889.844" y="1315.38"/>
+      <point x="764.05" y="1356"/>
+      <point x="640.96" y="1356" type="curve" smooth="yes"/>
+      <point x="452.387" y="1356"/>
+      <point x="332" y="1260.67"/>
+      <point x="332" y="1104.57" type="curve" smooth="yes"/>
+      <point x="332" y="974.435"/>
+      <point x="415.667" y="907.175"/>
+      <point x="640.12" y="860.1" type="curve" smooth="yes"/>
+      <point x="964.797" y="792.006"/>
+      <point x="1098" y="660.05"/>
+      <point x="1098" y="412.601" type="curve" smooth="yes"/>
+      <point x="1098" y="125.564"/>
+      <point x="918.767" y="-29"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Regular.ufo/glyphs/S_acute.glif b/source/Hack-Regular.ufo/glyphs/S_acute.glif
index d38a4194b..44b2b63a5 100644
--- a/source/Hack-Regular.ufo/glyphs/S_acute.glif
+++ b/source/Hack-Regular.ufo/glyphs/S_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Sacute" format="1">
+<glyph name="Sacute" format="2">
   <advance width="1233"/>
   <unicode hex="015A"/>
   <outline>
@@ -10,44 +10,44 @@
       <point x="504" y="1592" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="586" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="586" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="439" y="-29"/>
       <point x="302" y="1"/>
       <point x="158" y="61" type="curve"/>
       <point x="158" y="276" type="line" name="ih03"/>
       <point x="311" y="179"/>
       <point x="442" y="135"/>
-      <point x="583" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="583" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="787" y="135"/>
       <point x="905" y="225"/>
-      <point x="905" y="405" type="curve" name="ah01" smooth="yes"/>
+      <point x="905" y="405" type="curve" smooth="yes" name="ah01"/>
       <point x="905" y="539"/>
       <point x="839" y="611"/>
       <point x="643" y="657" type="curve" smooth="yes"/>
       <point x="535" y="682" type="line" smooth="yes"/>
       <point x="255" y="746"/>
       <point x="139" y="869"/>
-      <point x="139" y="1077" type="curve" name="sh01" smooth="yes"/>
+      <point x="139" y="1077" type="curve" smooth="yes" name="sh01"/>
       <point x="139" y="1346"/>
       <point x="334" y="1520"/>
-      <point x="631" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="631" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="745" y="1520"/>
       <point x="872" y="1494"/>
       <point x="1012" y="1442" type="curve"/>
       <point x="1012" y="1237" type="line" name="ih04"/>
       <point x="889" y="1316"/>
       <point x="765" y="1356"/>
-      <point x="640" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="640" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="451" y="1356"/>
       <point x="332" y="1265"/>
-      <point x="332" y="1101" type="curve" name="sh02" smooth="yes"/>
+      <point x="332" y="1101" type="curve" smooth="yes" name="sh02"/>
       <point x="332" y="982"/>
       <point x="395" y="915"/>
       <point x="590" y="872" type="curve" smooth="yes"/>
       <point x="696" y="848" type="line" smooth="yes"/>
       <point x="979" y="784"/>
       <point x="1098" y="644"/>
-      <point x="1098" y="411" type="curve" name="hr01" smooth="yes"/>
+      <point x="1098" y="411" type="curve" smooth="yes" name="hr01"/>
       <point x="1098" y="124"/>
       <point x="917" y="-29"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/S_caron.glif b/source/Hack-Regular.ufo/glyphs/S_caron.glif
index 679e08af6..f9cbb393c 100644
--- a/source/Hack-Regular.ufo/glyphs/S_caron.glif
+++ b/source/Hack-Regular.ufo/glyphs/S_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Scaron" format="1">
+<glyph name="Scaron" format="2">
   <advance width="1233"/>
   <unicode hex="0160"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="538" y="1586" type="line"/>
     </contour>
     <contour>
-      <point x="584" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="584" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="508" y="-29"/>
       <point x="435" y="-22"/>
       <point x="371" y="-7" type="curve"/>
@@ -26,13 +26,13 @@
       <point x="376" y="169" type="curve" smooth="yes"/>
       <point x="448" y="145"/>
       <point x="515" y="135"/>
-      <point x="582" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="582" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="682" y="135"/>
       <point x="763" y="158"/>
       <point x="820" y="203" type="curve" smooth="yes"/>
       <point x="873" y="246"/>
       <point x="905" y="307"/>
-      <point x="905" y="399" type="curve" name="ah01" smooth="yes"/>
+      <point x="905" y="399" type="curve" smooth="yes" name="ah01"/>
       <point x="905" y="475"/>
       <point x="883" y="529"/>
       <point x="847" y="566" type="curve" smooth="yes"/>
@@ -45,10 +45,10 @@
       <point x="233" y="824" type="curve" smooth="yes"/>
       <point x="172" y="887"/>
       <point x="139" y="967"/>
-      <point x="139" y="1079" type="curve" name="sh01" smooth="yes"/>
+      <point x="139" y="1079" type="curve" smooth="yes" name="sh01"/>
       <point x="139" y="1351"/>
       <point x="333" y="1520"/>
-      <point x="631" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="631" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="688" y="1520"/>
       <point x="748" y="1514"/>
       <point x="812" y="1501" type="curve" smooth="yes"/>
@@ -61,26 +61,26 @@
       <point x="828" y="1326" type="curve" smooth="yes"/>
       <point x="766" y="1346"/>
       <point x="704" y="1356"/>
-      <point x="642" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="642" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="542" y="1356"/>
       <point x="465" y="1331"/>
       <point x="414" y="1290" type="curve" smooth="yes"/>
       <point x="361" y="1247"/>
       <point x="332" y="1185"/>
-      <point x="332" y="1105" type="curve" name="sh02" smooth="yes"/>
+      <point x="332" y="1105" type="curve" smooth="yes" name="sh02"/>
       <point x="332" y="1050"/>
       <point x="344" y="1000"/>
       <point x="387" y="960" type="curve" smooth="yes"/>
       <point x="426" y="923"/>
       <point x="489" y="895"/>
       <point x="590" y="872" type="curve" smooth="yes"/>
-      <point x="696" y="848" type="line" name="hr01" smooth="yes"/>
+      <point x="696" y="848" type="line" smooth="yes" name="hr01"/>
       <point x="825" y="819"/>
       <point x="930" y="770"/>
       <point x="1001" y="694" type="curve" smooth="yes"/>
       <point x="1066" y="625"/>
       <point x="1098" y="530"/>
-      <point x="1098" y="410" type="curve" name="sh04" smooth="yes"/>
+      <point x="1098" y="410" type="curve" smooth="yes" name="sh04"/>
       <point x="1098" y="258"/>
       <point x="1048" y="152"/>
       <point x="967" y="83" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/S_cedilla.glif b/source/Hack-Regular.ufo/glyphs/S_cedilla.glif
index 6a5a231b6..da56c1c83 100644
--- a/source/Hack-Regular.ufo/glyphs/S_cedilla.glif
+++ b/source/Hack-Regular.ufo/glyphs/S_cedilla.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Scedilla" format="1">
+<glyph name="Scedilla" format="2">
   <advance width="1233"/>
   <unicode hex="015E"/>
   <outline>
     <contour>
-      <point x="1001" y="694" type="curve" name="hr00" smooth="yes"/>
+      <point x="1001" y="694" type="curve" smooth="yes" name="hr00"/>
       <point x="1066" y="625"/>
       <point x="1098" y="530"/>
-      <point x="1098" y="410" type="curve" name="dh06" smooth="yes"/>
+      <point x="1098" y="410" type="curve" smooth="yes" name="dh06"/>
       <point x="1098" y="258"/>
       <point x="1048" y="152"/>
       <point x="967" y="83" type="curve" smooth="yes"/>
@@ -19,23 +19,23 @@
       <point x="783" y="-115" type="curve" smooth="yes"/>
       <point x="798" y="-146"/>
       <point x="809" y="-179"/>
-      <point x="809" y="-219" type="curve" name="dh04" smooth="yes"/>
+      <point x="809" y="-219" type="curve" smooth="yes" name="dh04"/>
       <point x="809" y="-272"/>
       <point x="789" y="-319"/>
       <point x="749" y="-350" type="curve" smooth="yes"/>
       <point x="710" y="-379"/>
       <point x="653" y="-395"/>
-      <point x="570" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="570" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="541" y="-395"/>
       <point x="512" y="-393"/>
-      <point x="483" y="-389" type="curve" name="sv01" smooth="yes"/>
+      <point x="483" y="-389" type="curve" smooth="yes" name="sv01"/>
       <point x="452" y="-385"/>
       <point x="423" y="-379"/>
       <point x="395" y="-371" type="curve"/>
       <point x="395" y="-240" type="line" name="dh03"/>
       <point x="440" y="-261"/>
       <point x="494" y="-272"/>
-      <point x="546" y="-272" type="curve" name="dv02" smooth="yes"/>
+      <point x="546" y="-272" type="curve" smooth="yes" name="dv02"/>
       <point x="631" y="-272"/>
       <point x="670" y="-239"/>
       <point x="670" y="-180" type="curve" smooth="yes"/>
@@ -64,7 +64,7 @@
       <point x="820" y="203" type="curve" smooth="yes"/>
       <point x="873" y="246"/>
       <point x="905" y="307"/>
-      <point x="905" y="399" type="curve" name="dh05" smooth="yes"/>
+      <point x="905" y="399" type="curve" smooth="yes" name="dh05"/>
       <point x="905" y="475"/>
       <point x="883" y="529"/>
       <point x="847" y="566" type="curve" smooth="yes"/>
@@ -77,10 +77,10 @@
       <point x="233" y="824" type="curve" smooth="yes"/>
       <point x="172" y="887"/>
       <point x="139" y="967"/>
-      <point x="139" y="1079" type="curve" name="dh01" smooth="yes"/>
+      <point x="139" y="1079" type="curve" smooth="yes" name="dh01"/>
       <point x="139" y="1351"/>
       <point x="333" y="1520"/>
-      <point x="631" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="631" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="688" y="1520"/>
       <point x="748" y="1514"/>
       <point x="812" y="1501" type="curve" smooth="yes"/>
@@ -93,13 +93,13 @@
       <point x="828" y="1326" type="curve" smooth="yes"/>
       <point x="766" y="1346"/>
       <point x="704" y="1356"/>
-      <point x="642" y="1356" type="curve" name="sv02" smooth="yes"/>
+      <point x="642" y="1356" type="curve" smooth="yes" name="sv02"/>
       <point x="542" y="1356"/>
       <point x="465" y="1331"/>
       <point x="414" y="1290" type="curve" smooth="yes"/>
       <point x="361" y="1247"/>
       <point x="332" y="1185"/>
-      <point x="332" y="1105" type="curve" name="dh02" smooth="yes"/>
+      <point x="332" y="1105" type="curve" smooth="yes" name="dh02"/>
       <point x="332" y="1050"/>
       <point x="344" y="1000"/>
       <point x="387" y="960" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/S_circumflex.glif b/source/Hack-Regular.ufo/glyphs/S_circumflex.glif
index 2828b8b7f..3b580b908 100644
--- a/source/Hack-Regular.ufo/glyphs/S_circumflex.glif
+++ b/source/Hack-Regular.ufo/glyphs/S_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Scircumflex" format="1">
+<glyph name="Scircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="015C"/>
   <outline>
@@ -62,7 +62,7 @@
       <point x="1098" y="410" type="curve" smooth="yes"/>
       <point x="1098" y="123"/>
       <point x="920" y="-29"/>
-      <point x="584" y="-29" type="curve" name="hr01" smooth="yes"/>
+      <point x="584" y="-29" type="curve" smooth="yes" name="hr01"/>
       <point x="437" y="-29"/>
       <point x="310" y="-2"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/S_igma.glif b/source/Hack-Regular.ufo/glyphs/S_igma.glif
index 8ff40a4a2..9981a8217 100644
--- a/source/Hack-Regular.ufo/glyphs/S_igma.glif
+++ b/source/Hack-Regular.ufo/glyphs/S_igma.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Sigma" format="1">
+<glyph name="Sigma" format="2">
   <advance width="1233"/>
   <unicode hex="03A3"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/T_.glif b/source/Hack-Regular.ufo/glyphs/T_.glif
index 76d0521f4..19864496d 100644
--- a/source/Hack-Regular.ufo/glyphs/T_.glif
+++ b/source/Hack-Regular.ufo/glyphs/T_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="T" format="1">
+<glyph name="T" format="2">
   <advance width="1233"/>
   <unicode hex="0054"/>
   <outline>
     <contour>
-      <point x="516" y="1323" type="line" name="hr00"/>
+      <point x="516" y="1323" type="line"/>
       <point x="47" y="1323" type="line"/>
-      <point x="47" y="1493" type="line" name="at01"/>
+      <point x="47" y="1493" type="line"/>
       <point x="1186" y="1493" type="line"/>
-      <point x="1186" y="1323" type="line" name="sv01"/>
-      <point x="719" y="1323" type="line" name="dh01"/>
-      <point x="719" y="0" type="line" name="ab01"/>
+      <point x="1186" y="1323" type="line"/>
+      <point x="719" y="1323" type="line"/>
+      <point x="719" y="0" type="line"/>
       <point x="516" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/T_au.glif b/source/Hack-Regular.ufo/glyphs/T_au.glif
index 8b6225ad0..cdd67ee88 100644
--- a/source/Hack-Regular.ufo/glyphs/T_au.glif
+++ b/source/Hack-Regular.ufo/glyphs/T_au.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Tau" format="1">
+<glyph name="Tau" format="2">
   <advance width="1233"/>
   <unicode hex="03A4"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/T_bar.glif b/source/Hack-Regular.ufo/glyphs/T_bar.glif
index ffc092089..a7cb17059 100644
--- a/source/Hack-Regular.ufo/glyphs/T_bar.glif
+++ b/source/Hack-Regular.ufo/glyphs/T_bar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Tbar" format="1">
+<glyph name="Tbar" format="2">
   <advance width="1233"/>
   <unicode hex="0166"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/T_caron.glif b/source/Hack-Regular.ufo/glyphs/T_caron.glif
index 468ed03bf..499ca7193 100644
--- a/source/Hack-Regular.ufo/glyphs/T_caron.glif
+++ b/source/Hack-Regular.ufo/glyphs/T_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Tcaron" format="1">
+<glyph name="Tcaron" format="2">
   <advance width="1233"/>
   <unicode hex="0164"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/T_heta.glif b/source/Hack-Regular.ufo/glyphs/T_heta.glif
index bcd725dd1..ef941431f 100644
--- a/source/Hack-Regular.ufo/glyphs/T_heta.glif
+++ b/source/Hack-Regular.ufo/glyphs/T_heta.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Theta" format="1">
+<glyph name="Theta" format="2">
   <advance width="1233"/>
   <unicode hex="0398"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/T_horn.glif b/source/Hack-Regular.ufo/glyphs/T_horn.glif
index 12540f0ec..76904c27b 100644
--- a/source/Hack-Regular.ufo/glyphs/T_horn.glif
+++ b/source/Hack-Regular.ufo/glyphs/T_horn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Thorn" format="1">
+<glyph name="Thorn" format="2">
   <advance width="1233"/>
   <unicode hex="00DE"/>
   <outline>
@@ -7,37 +7,37 @@
       <point x="201" y="1493" type="line" name="hr00"/>
       <point x="403" y="1493" type="line" name="sh01"/>
       <point x="403" y="1223" type="line"/>
-      <point x="657" y="1223" type="line" name="dv04" smooth="yes"/>
+      <point x="657" y="1223" type="line" smooth="yes" name="dv04"/>
       <point x="830" y="1223"/>
       <point x="958" y="1188"/>
       <point x="1041" y="1118" type="curve" smooth="yes"/>
       <point x="1124" y="1048"/>
       <point x="1165" y="940"/>
-      <point x="1165" y="794" type="curve" name="sh02" smooth="yes"/>
+      <point x="1165" y="794" type="curve" smooth="yes" name="sh02"/>
       <point x="1165" y="645"/>
       <point x="1122" y="540"/>
       <point x="1041" y="472" type="curve" smooth="yes"/>
       <point x="958" y="402"/>
       <point x="830" y="367"/>
-      <point x="657" y="367" type="curve" name="dv01" smooth="yes"/>
+      <point x="657" y="367" type="curve" smooth="yes" name="dv01"/>
       <point x="403" y="367" type="line" name="sh03"/>
       <point x="403" y="0" type="line" name="ab01"/>
       <point x="201" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="637" y="532" type="line" name="dv02" smooth="yes"/>
+      <point x="637" y="532" type="line" smooth="yes" name="dv02"/>
       <point x="742" y="532"/>
       <point x="821" y="554"/>
       <point x="874" y="598" type="curve" smooth="yes"/>
       <point x="926" y="642"/>
       <point x="952" y="708"/>
-      <point x="952" y="795" type="curve" name="ah01" smooth="yes"/>
+      <point x="952" y="795" type="curve" smooth="yes" name="ah01"/>
       <point x="952" y="879"/>
       <point x="927" y="948"/>
       <point x="874" y="992" type="curve" smooth="yes"/>
       <point x="826" y="1032"/>
       <point x="748" y="1057"/>
-      <point x="637" y="1057" type="curve" name="dv03" smooth="yes"/>
+      <point x="637" y="1057" type="curve" smooth="yes" name="dv03"/>
       <point x="403" y="1057" type="line" name="sh04"/>
       <point x="403" y="532" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/U_.glif b/source/Hack-Regular.ufo/glyphs/U_.glif
index 2c9502f77..c743c0bea 100644
--- a/source/Hack-Regular.ufo/glyphs/U_.glif
+++ b/source/Hack-Regular.ufo/glyphs/U_.glif
@@ -1,63 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="U" format="1">
+<glyph name="U" format="2">
   <advance width="1233"/>
   <unicode hex="0055"/>
   <outline>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr00" smooth="yes"/>
-      <point x="544" y="-29"/>
-      <point x="483" y="-19"/>
-      <point x="427" y="0" type="curve"/>
-      <point x="375" y="19"/>
-      <point x="316" y="49"/>
-      <point x="273" y="88" type="curve" smooth="yes"/>
-      <point x="232" y="125"/>
-      <point x="200" y="173"/>
-      <point x="177" y="249" type="curve"/>
-      <point x="156" y="316"/>
-      <point x="147" y="409"/>
-      <point x="147" y="573" type="curve" name="sh01" smooth="yes"/>
-      <point x="147" y="1493" type="line" name="at01"/>
-      <point x="350" y="1493" type="line"/>
-      <point x="350" y="481" type="line" name="sh02" smooth="yes"/>
-      <point x="350" y="408"/>
-      <point x="352" y="357"/>
-      <point x="356" y="326" type="curve" name="sh03" smooth="yes"/>
-      <point x="360" y="295"/>
-      <point x="367" y="271"/>
-      <point x="377" y="254" type="curve" smooth="yes"/>
-      <point x="398" y="215"/>
-      <point x="429" y="185"/>
-      <point x="470" y="165" type="curve" smooth="yes"/>
-      <point x="510" y="145"/>
-      <point x="559" y="135"/>
-      <point x="616" y="135" type="curve" name="dv01" smooth="yes"/>
-      <point x="674" y="135"/>
-      <point x="723" y="145"/>
-      <point x="763" y="165" type="curve" smooth="yes"/>
-      <point x="804" y="186"/>
-      <point x="835" y="215"/>
-      <point x="856" y="254" type="curve" smooth="yes"/>
-      <point x="867" y="274"/>
-      <point x="873" y="293"/>
-      <point x="877" y="325" type="curve" name="sh04" smooth="yes"/>
-      <point x="881" y="356"/>
-      <point x="883" y="407"/>
-      <point x="883" y="479" type="curve" name="ah01" smooth="yes"/>
-      <point x="883" y="1493" type="line" name="at02"/>
+      <point x="630.85" y="-29" type="curve" smooth="yes"/>
+      <point x="290.187" y="-29"/>
+      <point x="147" y="150.249"/>
+      <point x="147" y="573" type="curve" smooth="yes"/>
+      <point x="147" y="1493" type="line"/>
+      <point x="349.929" y="1493" type="line"/>
+      <point x="349.929" y="479" type="line" smooth="yes"/>
+      <point x="349.929" y="250.684"/>
+      <point x="443.992" y="135"/>
+      <point x="632.884" y="135" type="curve" smooth="yes"/>
+      <point x="808.968" y="135"/>
+      <point x="883.011" y="235.527"/>
+      <point x="883.011" y="479" type="curve" smooth="yes"/>
+      <point x="883.011" y="1493" type="line"/>
       <point x="1085" y="1493" type="line"/>
-      <point x="1085" y="573" type="line" name="sh05" smooth="yes"/>
-      <point x="1085" y="397"/>
-      <point x="1073" y="309"/>
-      <point x="1057" y="249" type="curve" smooth="yes"/>
-      <point x="1038" y="182"/>
-      <point x="1004" y="129"/>
-      <point x="959" y="88" type="curve" smooth="yes"/>
-      <point x="915" y="48"/>
-      <point x="858" y="19"/>
-      <point x="806" y="0" type="curve" smooth="yes"/>
-      <point x="757" y="-17"/>
-      <point x="695" y="-29"/>
+      <point x="1085" y="573" type="line" smooth="yes"/>
+      <point x="1085" y="137.155"/>
+      <point x="958.835" y="-29"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Regular.ufo/glyphs/U_acute.glif b/source/Hack-Regular.ufo/glyphs/U_acute.glif
index ecb636d78..28dc50dff 100644
--- a/source/Hack-Regular.ufo/glyphs/U_acute.glif
+++ b/source/Hack-Regular.ufo/glyphs/U_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Uacute" format="1">
+<glyph name="Uacute" format="2">
   <advance width="1233"/>
   <unicode hex="00DA"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="475" y="1592" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="544" y="-29"/>
       <point x="483" y="-19"/>
       <point x="427" y="0" type="curve"/>
@@ -22,13 +22,13 @@
       <point x="177" y="249" type="curve"/>
       <point x="156" y="316"/>
       <point x="147" y="409"/>
-      <point x="147" y="573" type="curve" name="sh01" smooth="yes"/>
+      <point x="147" y="573" type="curve" smooth="yes" name="sh01"/>
       <point x="147" y="1493" type="line" name="at01"/>
       <point x="350" y="1493" type="line"/>
-      <point x="350" y="481" type="line" name="sh03" smooth="yes"/>
+      <point x="350" y="481" type="line" smooth="yes" name="sh03"/>
       <point x="350" y="408"/>
       <point x="352" y="357"/>
-      <point x="356" y="326" type="curve" name="sh04" smooth="yes"/>
+      <point x="356" y="326" type="curve" smooth="yes" name="sh04"/>
       <point x="360" y="295"/>
       <point x="367" y="271"/>
       <point x="377" y="254" type="curve" smooth="yes"/>
@@ -37,7 +37,7 @@
       <point x="470" y="165" type="curve" smooth="yes"/>
       <point x="510" y="145"/>
       <point x="559" y="135"/>
-      <point x="616" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="674" y="135"/>
       <point x="723" y="145"/>
       <point x="763" y="165" type="curve" smooth="yes"/>
@@ -46,13 +46,13 @@
       <point x="856" y="254" type="curve" smooth="yes"/>
       <point x="867" y="274"/>
       <point x="873" y="293"/>
-      <point x="877" y="325" type="curve" name="sh05" smooth="yes"/>
+      <point x="877" y="325" type="curve" smooth="yes" name="sh05"/>
       <point x="881" y="356"/>
       <point x="883" y="407"/>
-      <point x="883" y="479" type="curve" name="ah01" smooth="yes"/>
+      <point x="883" y="479" type="curve" smooth="yes" name="ah01"/>
       <point x="883" y="1493" type="line" name="at02"/>
       <point x="1085" y="1493" type="line"/>
-      <point x="1085" y="573" type="line" name="sh02" smooth="yes"/>
+      <point x="1085" y="573" type="line" smooth="yes" name="sh02"/>
       <point x="1085" y="397"/>
       <point x="1073" y="309"/>
       <point x="1057" y="249" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/U_breve.glif b/source/Hack-Regular.ufo/glyphs/U_breve.glif
index 196f4aa8a..464f4d35e 100644
--- a/source/Hack-Regular.ufo/glyphs/U_breve.glif
+++ b/source/Hack-Regular.ufo/glyphs/U_breve.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ubreve" format="1">
+<glyph name="Ubreve" format="2">
   <advance width="1233"/>
   <unicode hex="016C"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="811" y="1831" type="line"/>
       <point x="791" y="1757"/>
       <point x="727" y="1720"/>
-      <point x="618" y="1720" type="curve" name="hr01" smooth="yes"/>
+      <point x="618" y="1720" type="curve" smooth="yes" name="hr01"/>
       <point x="506" y="1720"/>
       <point x="438" y="1759"/>
       <point x="422" y="1831" type="curve" name="hr02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/U_circumflex.glif b/source/Hack-Regular.ufo/glyphs/U_circumflex.glif
index 76464ace1..be4049e5c 100644
--- a/source/Hack-Regular.ufo/glyphs/U_circumflex.glif
+++ b/source/Hack-Regular.ufo/glyphs/U_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ucircumflex" format="1">
+<glyph name="Ucircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00DB"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="311" y="1586" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="544" y="-29"/>
       <point x="483" y="-19"/>
       <point x="427" y="0" type="curve"/>
@@ -25,13 +25,13 @@
       <point x="177" y="249" type="curve"/>
       <point x="156" y="316"/>
       <point x="147" y="409"/>
-      <point x="147" y="573" type="curve" name="sh02" smooth="yes"/>
+      <point x="147" y="573" type="curve" smooth="yes" name="sh02"/>
       <point x="147" y="1493" type="line" name="at01"/>
       <point x="350" y="1493" type="line"/>
-      <point x="350" y="481" type="line" name="sh03" smooth="yes"/>
+      <point x="350" y="481" type="line" smooth="yes" name="sh03"/>
       <point x="350" y="408"/>
       <point x="352" y="357"/>
-      <point x="356" y="326" type="curve" name="sh04" smooth="yes"/>
+      <point x="356" y="326" type="curve" smooth="yes" name="sh04"/>
       <point x="360" y="295"/>
       <point x="367" y="271"/>
       <point x="377" y="254" type="curve" smooth="yes"/>
@@ -40,7 +40,7 @@
       <point x="470" y="165" type="curve" smooth="yes"/>
       <point x="510" y="145"/>
       <point x="559" y="135"/>
-      <point x="616" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="674" y="135"/>
       <point x="723" y="145"/>
       <point x="763" y="165" type="curve" smooth="yes"/>
@@ -49,13 +49,13 @@
       <point x="856" y="254" type="curve" smooth="yes"/>
       <point x="867" y="274"/>
       <point x="873" y="293"/>
-      <point x="877" y="325" type="curve" name="sh05" smooth="yes"/>
+      <point x="877" y="325" type="curve" smooth="yes" name="sh05"/>
       <point x="881" y="356"/>
       <point x="883" y="407"/>
-      <point x="883" y="479" type="curve" name="ah01" smooth="yes"/>
+      <point x="883" y="479" type="curve" smooth="yes" name="ah01"/>
       <point x="883" y="1493" type="line" name="at02"/>
       <point x="1085" y="1493" type="line"/>
-      <point x="1085" y="573" type="line" name="sh01" smooth="yes"/>
+      <point x="1085" y="573" type="line" smooth="yes" name="sh01"/>
       <point x="1085" y="397"/>
       <point x="1073" y="309"/>
       <point x="1057" y="249" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/U_dieresis.glif b/source/Hack-Regular.ufo/glyphs/U_dieresis.glif
index 0da2c7792..5a9e751da 100644
--- a/source/Hack-Regular.ufo/glyphs/U_dieresis.glif
+++ b/source/Hack-Regular.ufo/glyphs/U_dieresis.glif
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Udieresis" format="1">
+<glyph name="Udieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00DC"/>
   <outline>
     <contour>
-      <point x="349" y="1647" type="line" name="dv03" smooth="yes"/>
+      <point x="349" y="1647" type="line" smooth="yes" name="dv03"/>
       <point x="329" y="1647"/>
       <point x="319" y="1657"/>
-      <point x="319" y="1677" type="curve" name="ih01" smooth="yes"/>
+      <point x="319" y="1677" type="curve" smooth="yes" name="ih01"/>
       <point x="319" y="1820" type="line" smooth="yes"/>
       <point x="319" y="1840"/>
       <point x="329" y="1850"/>
-      <point x="349" y="1850" type="curve" name="dv04" smooth="yes"/>
+      <point x="349" y="1850" type="curve" smooth="yes" name="dv04"/>
       <point x="492" y="1850" type="line" smooth="yes"/>
       <point x="512" y="1850"/>
       <point x="522" y="1840"/>
       <point x="522" y="1820" type="curve" smooth="yes"/>
-      <point x="522" y="1677" type="line" name="sh01" smooth="yes"/>
+      <point x="522" y="1677" type="line" smooth="yes" name="sh01"/>
       <point x="522" y="1657"/>
       <point x="512" y="1647"/>
       <point x="492" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1647" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1647" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1647"/>
       <point x="711" y="1657"/>
-      <point x="711" y="1677" type="curve" name="dh03" smooth="yes"/>
+      <point x="711" y="1677" type="curve" smooth="yes" name="dh03"/>
       <point x="711" y="1820" type="line" smooth="yes"/>
       <point x="711" y="1840"/>
       <point x="721" y="1850"/>
-      <point x="741" y="1850" type="curve" name="sv02" smooth="yes"/>
+      <point x="741" y="1850" type="curve" smooth="yes" name="sv02"/>
       <point x="883" y="1850" type="line" smooth="yes"/>
       <point x="903" y="1850"/>
       <point x="913" y="1840"/>
       <point x="913" y="1820" type="curve" smooth="yes"/>
-      <point x="913" y="1677" type="line" name="dh04" smooth="yes"/>
+      <point x="913" y="1677" type="line" smooth="yes" name="dh04"/>
       <point x="913" y="1657"/>
       <point x="903" y="1647"/>
       <point x="883" y="1647" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="544" y="-29"/>
       <point x="483" y="-19"/>
       <point x="427" y="0" type="curve"/>
@@ -52,31 +52,31 @@
       <point x="177" y="249" type="curve"/>
       <point x="156" y="316"/>
       <point x="147" y="409"/>
-      <point x="147" y="573" type="curve" name="dh01" smooth="yes"/>
+      <point x="147" y="573" type="curve" smooth="yes" name="dh01"/>
       <point x="147" y="1493" type="line" name="at01"/>
       <point x="350" y="1493" type="line"/>
-      <point x="350" y="481" type="line" name="dh02" smooth="yes"/>
+      <point x="350" y="481" type="line" smooth="yes" name="dh02"/>
       <point x="350" y="408"/>
       <point x="352" y="357"/>
-      <point x="356" y="326" type="curve" name="hr01" smooth="yes"/>
+      <point x="356" y="326" type="curve" smooth="yes" name="hr01"/>
       <point x="360" y="295"/>
       <point x="367" y="271"/>
       <point x="377" y="254" type="curve" smooth="yes"/>
       <point x="398" y="215"/>
       <point x="429" y="185"/>
-      <point x="470" y="165" type="curve" name="hr02" smooth="yes"/>
+      <point x="470" y="165" type="curve" smooth="yes" name="hr02"/>
       <point x="510" y="145"/>
       <point x="559" y="135"/>
-      <point x="616" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="674" y="135"/>
       <point x="723" y="145"/>
-      <point x="763" y="165" type="curve" name="hr03" smooth="yes"/>
+      <point x="763" y="165" type="curve" smooth="yes" name="hr03"/>
       <point x="804" y="186"/>
       <point x="835" y="215"/>
-      <point x="856" y="254" type="curve" name="hr04" smooth="yes"/>
+      <point x="856" y="254" type="curve" smooth="yes" name="hr04"/>
       <point x="867" y="274"/>
       <point x="873" y="293"/>
-      <point x="877" y="325" type="curve" name="sh02" smooth="yes"/>
+      <point x="877" y="325" type="curve" smooth="yes" name="sh02"/>
       <point x="881" y="356"/>
       <point x="883" y="407"/>
       <point x="883" y="479" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/U_grave.glif b/source/Hack-Regular.ufo/glyphs/U_grave.glif
index 55b5ccd86..edbfb6bdc 100644
--- a/source/Hack-Regular.ufo/glyphs/U_grave.glif
+++ b/source/Hack-Regular.ufo/glyphs/U_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ugrave" format="1">
+<glyph name="Ugrave" format="2">
   <advance width="1233"/>
   <unicode hex="00D9"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="604" y="1588" type="line"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="544" y="-29"/>
       <point x="483" y="-19"/>
       <point x="427" y="0" type="curve"/>
@@ -22,13 +22,13 @@
       <point x="177" y="249" type="curve"/>
       <point x="156" y="316"/>
       <point x="147" y="409"/>
-      <point x="147" y="573" type="curve" name="sh01" smooth="yes"/>
+      <point x="147" y="573" type="curve" smooth="yes" name="sh01"/>
       <point x="147" y="1493" type="line" name="at01"/>
       <point x="350" y="1493" type="line"/>
-      <point x="350" y="481" type="line" name="sh03" smooth="yes"/>
+      <point x="350" y="481" type="line" smooth="yes" name="sh03"/>
       <point x="350" y="408"/>
       <point x="352" y="357"/>
-      <point x="356" y="326" type="curve" name="sh04" smooth="yes"/>
+      <point x="356" y="326" type="curve" smooth="yes" name="sh04"/>
       <point x="360" y="295"/>
       <point x="367" y="271"/>
       <point x="377" y="254" type="curve" smooth="yes"/>
@@ -37,7 +37,7 @@
       <point x="470" y="165" type="curve" smooth="yes"/>
       <point x="510" y="145"/>
       <point x="559" y="135"/>
-      <point x="616" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="674" y="135"/>
       <point x="723" y="145"/>
       <point x="763" y="165" type="curve" smooth="yes"/>
@@ -46,13 +46,13 @@
       <point x="856" y="254" type="curve" smooth="yes"/>
       <point x="867" y="274"/>
       <point x="873" y="293"/>
-      <point x="877" y="325" type="curve" name="sh05" smooth="yes"/>
+      <point x="877" y="325" type="curve" smooth="yes" name="sh05"/>
       <point x="881" y="356"/>
       <point x="883" y="407"/>
-      <point x="883" y="479" type="curve" name="ah01" smooth="yes"/>
+      <point x="883" y="479" type="curve" smooth="yes" name="ah01"/>
       <point x="883" y="1493" type="line" name="at02"/>
       <point x="1085" y="1493" type="line"/>
-      <point x="1085" y="573" type="line" name="sh02" smooth="yes"/>
+      <point x="1085" y="573" type="line" smooth="yes" name="sh02"/>
       <point x="1085" y="397"/>
       <point x="1073" y="309"/>
       <point x="1057" y="249" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/U_horn.glif b/source/Hack-Regular.ufo/glyphs/U_horn.glif
index 7b2fd79ce..62b7fc154 100644
--- a/source/Hack-Regular.ufo/glyphs/U_horn.glif
+++ b/source/Hack-Regular.ufo/glyphs/U_horn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Uhorn" format="1">
+<glyph name="Uhorn" format="2">
   <advance width="1233"/>
   <unicode hex="01AF"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="1204" y="1561" type="line" name="at03"/>
       <point x="1219" y="1505"/>
       <point x="1224" y="1467"/>
-      <point x="1224" y="1418" type="curve" name="dh06" smooth="yes"/>
+      <point x="1224" y="1418" type="curve" smooth="yes" name="dh06"/>
       <point x="1224" y="1269"/>
       <point x="1169" y="1188"/>
-      <point x="1050" y="1188" type="curve" name="hr01" smooth="yes"/>
+      <point x="1050" y="1188" type="curve" smooth="yes" name="hr01"/>
       <point x="1015" y="1188"/>
       <point x="983" y="1194"/>
       <point x="947" y="1213" type="curve" name="iv01"/>
-      <point x="947" y="573" type="line" name="dh04" smooth="yes"/>
+      <point x="947" y="573" type="line" smooth="yes" name="dh04"/>
       <point x="947" y="405"/>
       <point x="937" y="316"/>
       <point x="918" y="248" type="curve"/>
@@ -23,7 +23,7 @@
       <point x="669" y="0" type="curve" smooth="yes"/>
       <point x="611" y="-19"/>
       <point x="548" y="-29"/>
-      <point x="480" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="480" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="335" y="-29"/>
       <point x="216" y="15"/>
       <point x="136" y="87" type="curve" smooth="yes"/>
@@ -32,37 +32,37 @@
       <point x="38" y="250" type="curve" smooth="yes"/>
       <point x="19" y="313"/>
       <point x="9" y="409"/>
-      <point x="9" y="573" type="curve" name="dh01" smooth="yes"/>
+      <point x="9" y="573" type="curve" smooth="yes" name="dh01"/>
       <point x="9" y="1493" type="line" name="at01"/>
       <point x="212" y="1493" type="line"/>
-      <point x="212" y="481" type="line" name="dh02" smooth="yes"/>
+      <point x="212" y="481" type="line" smooth="yes" name="dh02"/>
       <point x="212" y="408"/>
       <point x="214" y="357"/>
-      <point x="218" y="326" type="curve" name="sh01" smooth="yes"/>
+      <point x="218" y="326" type="curve" smooth="yes" name="sh01"/>
       <point x="226" y="269"/>
       <point x="253" y="201"/>
       <point x="332" y="164" type="curve" smooth="yes"/>
       <point x="371" y="145"/>
       <point x="422" y="135"/>
-      <point x="478" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="478" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="591" y="135"/>
       <point x="682" y="178"/>
       <point x="719" y="254" type="curve" smooth="yes"/>
       <point x="727" y="270"/>
       <point x="735" y="294"/>
-      <point x="739" y="325" type="curve" name="sh02" smooth="yes"/>
+      <point x="739" y="325" type="curve" smooth="yes" name="sh02"/>
       <point x="743" y="356"/>
       <point x="745" y="407"/>
-      <point x="745" y="479" type="curve" name="dh03" smooth="yes"/>
+      <point x="745" y="479" type="curve" smooth="yes" name="dh03"/>
       <point x="745" y="1493" type="line" name="at02"/>
       <point x="947" y="1493" type="line" name="sh03"/>
       <point x="947" y="1342" type="line"/>
       <point x="972" y="1332"/>
       <point x="994" y="1327"/>
-      <point x="1013" y="1327" type="curve" name="sv01" smooth="yes"/>
+      <point x="1013" y="1327" type="curve" smooth="yes" name="sv01"/>
       <point x="1069" y="1327"/>
       <point x="1101" y="1365"/>
-      <point x="1101" y="1437" type="curve" name="dh05" smooth="yes"/>
+      <point x="1101" y="1437" type="curve" smooth="yes" name="dh05"/>
       <point x="1101" y="1478"/>
       <point x="1091" y="1520"/>
       <point x="1071" y="1561" type="curve" name="hr02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/U_hungarumlaut.glif b/source/Hack-Regular.ufo/glyphs/U_hungarumlaut.glif
index 02c566b38..341494e80 100644
--- a/source/Hack-Regular.ufo/glyphs/U_hungarumlaut.glif
+++ b/source/Hack-Regular.ufo/glyphs/U_hungarumlaut.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Uhungarumlaut" format="1">
+<glyph name="Uhungarumlaut" format="2">
   <advance width="1233"/>
   <unicode hex="0170"/>
   <outline>
@@ -16,7 +16,7 @@
       <point x="663" y="1588" type="line" name="ih03"/>
     </contour>
     <contour>
-      <point x="618" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="618" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="473" y="-29"/>
       <point x="354" y="15"/>
       <point x="274" y="87" type="curve" smooth="yes"/>
@@ -25,31 +25,31 @@
       <point x="176" y="250" type="curve" smooth="yes"/>
       <point x="157" y="313"/>
       <point x="147" y="409"/>
-      <point x="147" y="573" type="curve" name="sh01" smooth="yes"/>
+      <point x="147" y="573" type="curve" smooth="yes" name="sh01"/>
       <point x="147" y="1493" type="line" name="at01"/>
       <point x="350" y="1493" type="line"/>
-      <point x="350" y="481" type="line" name="sh03" smooth="yes"/>
+      <point x="350" y="481" type="line" smooth="yes" name="sh03"/>
       <point x="350" y="408"/>
       <point x="352" y="357"/>
-      <point x="356" y="326" type="curve" name="sh05" smooth="yes"/>
+      <point x="356" y="326" type="curve" smooth="yes" name="sh05"/>
       <point x="364" y="269"/>
       <point x="391" y="201"/>
       <point x="470" y="164" type="curve" smooth="yes"/>
       <point x="509" y="145"/>
       <point x="560" y="135"/>
-      <point x="616" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="729" y="135"/>
       <point x="820" y="178"/>
       <point x="857" y="254" type="curve" smooth="yes"/>
       <point x="865" y="270"/>
       <point x="873" y="294"/>
-      <point x="877" y="325" type="curve" name="sh06" smooth="yes"/>
+      <point x="877" y="325" type="curve" smooth="yes" name="sh06"/>
       <point x="881" y="356"/>
       <point x="883" y="407"/>
-      <point x="883" y="479" type="curve" name="ah01" smooth="yes"/>
+      <point x="883" y="479" type="curve" smooth="yes" name="ah01"/>
       <point x="883" y="1493" type="line" name="at02"/>
       <point x="1085" y="1493" type="line"/>
-      <point x="1085" y="573" type="line" name="sh02" smooth="yes"/>
+      <point x="1085" y="573" type="line" smooth="yes" name="sh02"/>
       <point x="1085" y="405"/>
       <point x="1075" y="316"/>
       <point x="1056" y="248" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/U_macron.glif b/source/Hack-Regular.ufo/glyphs/U_macron.glif
index d2a54d2ef..04b47587e 100644
--- a/source/Hack-Regular.ufo/glyphs/U_macron.glif
+++ b/source/Hack-Regular.ufo/glyphs/U_macron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Umacron" format="1">
+<glyph name="Umacron" format="2">
   <advance width="1233"/>
   <unicode hex="016A"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="317" y="1652" type="line"/>
     </contour>
     <contour>
-      <point x="618" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="618" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="473" y="-29"/>
       <point x="354" y="15"/>
       <point x="274" y="87" type="curve" smooth="yes"/>
@@ -19,31 +19,31 @@
       <point x="176" y="250" type="curve" smooth="yes"/>
       <point x="157" y="313"/>
       <point x="147" y="409"/>
-      <point x="147" y="573" type="curve" name="sh01" smooth="yes"/>
+      <point x="147" y="573" type="curve" smooth="yes" name="sh01"/>
       <point x="147" y="1493" type="line" name="at01"/>
       <point x="350" y="1493" type="line"/>
-      <point x="350" y="481" type="line" name="sh02" smooth="yes"/>
+      <point x="350" y="481" type="line" smooth="yes" name="sh02"/>
       <point x="350" y="408"/>
       <point x="352" y="357"/>
-      <point x="356" y="326" type="curve" name="sh03" smooth="yes"/>
+      <point x="356" y="326" type="curve" smooth="yes" name="sh03"/>
       <point x="364" y="269"/>
       <point x="391" y="201"/>
       <point x="470" y="164" type="curve" smooth="yes"/>
       <point x="509" y="145"/>
       <point x="560" y="135"/>
-      <point x="616" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="729" y="135"/>
       <point x="820" y="178"/>
       <point x="857" y="254" type="curve" smooth="yes"/>
       <point x="865" y="270"/>
       <point x="873" y="294"/>
-      <point x="877" y="325" type="curve" name="sh04" smooth="yes"/>
+      <point x="877" y="325" type="curve" smooth="yes" name="sh04"/>
       <point x="881" y="356"/>
       <point x="883" y="407"/>
-      <point x="883" y="479" type="curve" name="ah01" smooth="yes"/>
+      <point x="883" y="479" type="curve" smooth="yes" name="ah01"/>
       <point x="883" y="1493" type="line" name="at02"/>
       <point x="1085" y="1493" type="line"/>
-      <point x="1085" y="573" type="line" name="sh05" smooth="yes"/>
+      <point x="1085" y="573" type="line" smooth="yes" name="sh05"/>
       <point x="1085" y="405"/>
       <point x="1075" y="316"/>
       <point x="1056" y="248" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/U_ogonek.glif b/source/Hack-Regular.ufo/glyphs/U_ogonek.glif
index 5585bccdb..1c6f9e5c2 100644
--- a/source/Hack-Regular.ufo/glyphs/U_ogonek.glif
+++ b/source/Hack-Regular.ufo/glyphs/U_ogonek.glif
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Uogonek" format="1">
+<glyph name="Uogonek" format="2">
   <advance width="1233"/>
   <unicode hex="0172"/>
   <outline>
     <contour>
       <point x="1085" y="1493" type="line" name="at01"/>
-      <point x="1085" y="573" type="line" name="dh06" smooth="yes"/>
+      <point x="1085" y="573" type="line" smooth="yes" name="dh06"/>
       <point x="1085" y="405"/>
       <point x="1075" y="316"/>
       <point x="1056" y="248" type="curve"/>
@@ -17,20 +17,20 @@
       <point x="667" y="-27" type="curve"/>
       <point x="608" y="-108"/>
       <point x="587" y="-157"/>
-      <point x="587" y="-200" type="curve" name="dh04" smooth="yes"/>
+      <point x="587" y="-200" type="curve" smooth="yes" name="dh04"/>
       <point x="587" y="-256"/>
       <point x="625" y="-288"/>
-      <point x="697" y="-288" type="curve" name="dv02" smooth="yes"/>
+      <point x="697" y="-288" type="curve" smooth="yes" name="dv02"/>
       <point x="738" y="-288"/>
       <point x="780" y="-278"/>
       <point x="821" y="-258" type="curve" name="sh01"/>
       <point x="821" y="-391" type="line"/>
       <point x="765" y="-406"/>
       <point x="727" y="-411"/>
-      <point x="678" y="-411" type="curve" name="dv01" smooth="yes"/>
+      <point x="678" y="-411" type="curve" smooth="yes" name="dv01"/>
       <point x="529" y="-411"/>
       <point x="448" y="-356"/>
-      <point x="448" y="-237" type="curve" name="dh03" smooth="yes"/>
+      <point x="448" y="-237" type="curve" smooth="yes" name="dh03"/>
       <point x="448" y="-174"/>
       <point x="471" y="-112"/>
       <point x="548" y="-25" type="curve" name="ih01"/>
@@ -42,16 +42,16 @@
       <point x="176" y="250" type="curve" smooth="yes"/>
       <point x="157" y="313"/>
       <point x="147" y="409"/>
-      <point x="147" y="573" type="curve" name="dh01" smooth="yes"/>
+      <point x="147" y="573" type="curve" smooth="yes" name="dh01"/>
       <point x="147" y="1493" type="line" name="at02"/>
       <point x="350" y="1493" type="line"/>
-      <point x="350" y="481" type="line" name="dh02" smooth="yes"/>
+      <point x="350" y="481" type="line" smooth="yes" name="dh02"/>
       <point x="350" y="408"/>
       <point x="352" y="357"/>
-      <point x="356" y="326" type="curve" name="sh02" smooth="yes"/>
+      <point x="356" y="326" type="curve" smooth="yes" name="sh02"/>
       <point x="364" y="269"/>
       <point x="391" y="201"/>
-      <point x="470" y="164" type="curve" name="hr01" smooth="yes"/>
+      <point x="470" y="164" type="curve" smooth="yes" name="hr01"/>
       <point x="509" y="145"/>
       <point x="560" y="135"/>
       <point x="616" y="135" type="curve" smooth="yes"/>
@@ -60,10 +60,10 @@
       <point x="857" y="254" type="curve" smooth="yes"/>
       <point x="865" y="270"/>
       <point x="873" y="294"/>
-      <point x="877" y="325" type="curve" name="sh03" smooth="yes"/>
+      <point x="877" y="325" type="curve" smooth="yes" name="sh03"/>
       <point x="881" y="356"/>
       <point x="883" y="407"/>
-      <point x="883" y="479" type="curve" name="dh05" smooth="yes"/>
+      <point x="883" y="479" type="curve" smooth="yes" name="dh05"/>
       <point x="883" y="1493" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/U_psilon.glif b/source/Hack-Regular.ufo/glyphs/U_psilon.glif
index 50ff5b5aa..f59a15e1a 100644
--- a/source/Hack-Regular.ufo/glyphs/U_psilon.glif
+++ b/source/Hack-Regular.ufo/glyphs/U_psilon.glif
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Upsilon" format="1">
+<glyph name="Upsilon" format="2">
   <advance width="1233"/>
   <unicode hex="03A5"/>
   <outline>
     <contour>
-      <point x="504" y="650" type="line" name="dh01" smooth="yes"/>
+      <point x="504" y="650" type="line" smooth="yes" name="dh01"/>
       <point x="504" y="890"/>
       <point x="399" y="1229"/>
       <point x="270" y="1297" type="curve" smooth="yes"/>
       <point x="235" y="1316"/>
       <point x="166" y="1332"/>
-      <point x="112" y="1332" type="curve" name="sv01" smooth="yes"/>
+      <point x="112" y="1332" type="curve" smooth="yes" name="sv01"/>
       <point x="89" y="1332"/>
       <point x="61" y="1330"/>
       <point x="34" y="1323" type="curve"/>
       <point x="34" y="1493" type="line" name="at01"/>
       <point x="58" y="1501"/>
       <point x="88" y="1504"/>
-      <point x="120" y="1504" type="curve" name="at02" smooth="yes"/>
+      <point x="120" y="1504" type="curve" smooth="yes" name="at02"/>
       <point x="161" y="1504"/>
       <point x="217" y="1499"/>
-      <point x="261" y="1490" type="curve" name="at03" smooth="yes"/>
+      <point x="261" y="1490" type="curve" smooth="yes" name="at03"/>
       <point x="442" y="1453"/>
       <point x="553" y="1321"/>
       <point x="606" y="1044" type="curve" name="ih01"/>
       <point x="686" y="1316"/>
       <point x="802" y="1455"/>
-      <point x="949" y="1490" type="curve" name="at04" smooth="yes"/>
+      <point x="949" y="1490" type="curve" smooth="yes" name="at04"/>
       <point x="976" y="1497"/>
       <point x="995" y="1497"/>
-      <point x="1008" y="1497" type="curve" name="at05" smooth="yes"/>
+      <point x="1008" y="1497" type="curve" smooth="yes" name="at05"/>
       <point x="1113" y="1497"/>
       <point x="1209" y="1431"/>
       <point x="1209" y="1318" type="curve" smooth="yes"/>
       <point x="1209" y="1295"/>
       <point x="1206" y="1257"/>
-      <point x="1191" y="1224" type="curve" name="hr01" smooth="yes"/>
+      <point x="1191" y="1224" type="curve" smooth="yes" name="hr01"/>
       <point x="1168" y="1173"/>
       <point x="1129" y="1157"/>
       <point x="1090" y="1157" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="941" y="1297" type="curve" name="iv01"/>
       <point x="790" y="1193"/>
       <point x="707" y="869"/>
-      <point x="707" y="650" type="curve" name="hr02" smooth="yes"/>
+      <point x="707" y="650" type="curve" smooth="yes" name="hr02"/>
       <point x="707" y="0" type="line" name="ab01"/>
       <point x="504" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/U_psilondieresis.glif b/source/Hack-Regular.ufo/glyphs/U_psilondieresis.glif
index 74493677b..1e0056c6c 100644
--- a/source/Hack-Regular.ufo/glyphs/U_psilondieresis.glif
+++ b/source/Hack-Regular.ufo/glyphs/U_psilondieresis.glif
@@ -1,86 +1,86 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Upsilondieresis" format="1">
+<glyph name="Upsilondieresis" format="2">
   <advance width="1233"/>
   <unicode hex="03AB"/>
   <outline>
     <contour>
-      <point x="349" y="1649" type="line" name="dv01" smooth="yes"/>
+      <point x="349" y="1649" type="line" smooth="yes" name="dv01"/>
       <point x="329" y="1649"/>
       <point x="319" y="1659"/>
-      <point x="319" y="1679" type="curve" name="dh01" smooth="yes"/>
+      <point x="319" y="1679" type="curve" smooth="yes" name="dh01"/>
       <point x="319" y="1822" type="line" smooth="yes"/>
       <point x="319" y="1842"/>
       <point x="329" y="1852"/>
-      <point x="349" y="1852" type="curve" name="dv02" smooth="yes"/>
+      <point x="349" y="1852" type="curve" smooth="yes" name="dv02"/>
       <point x="492" y="1852" type="line" smooth="yes"/>
       <point x="512" y="1852"/>
       <point x="522" y="1842"/>
       <point x="522" y="1822" type="curve" smooth="yes"/>
-      <point x="522" y="1679" type="line" name="dh02" smooth="yes"/>
+      <point x="522" y="1679" type="line" smooth="yes" name="dh02"/>
       <point x="522" y="1659"/>
       <point x="512" y="1649"/>
       <point x="492" y="1649" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1649" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1649" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1649"/>
       <point x="711" y="1659"/>
-      <point x="711" y="1679" type="curve" name="sh02" smooth="yes"/>
+      <point x="711" y="1679" type="curve" smooth="yes" name="sh02"/>
       <point x="711" y="1822" type="line" smooth="yes"/>
       <point x="711" y="1842"/>
       <point x="721" y="1852"/>
-      <point x="741" y="1852" type="curve" name="hr01" smooth="yes"/>
+      <point x="741" y="1852" type="curve" smooth="yes" name="hr01"/>
       <point x="883" y="1852" type="line" smooth="yes"/>
       <point x="903" y="1852"/>
       <point x="913" y="1842"/>
       <point x="913" y="1822" type="curve" smooth="yes"/>
-      <point x="913" y="1679" type="line" name="hr02" smooth="yes"/>
+      <point x="913" y="1679" type="line" smooth="yes" name="hr02"/>
       <point x="913" y="1659"/>
       <point x="903" y="1649"/>
       <point x="883" y="1649" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="504" y="650" type="line" name="ih01" smooth="yes"/>
+      <point x="504" y="650" type="line" smooth="yes" name="ih01"/>
       <point x="504" y="890"/>
       <point x="399" y="1229"/>
       <point x="270" y="1297" type="curve" smooth="yes"/>
       <point x="235" y="1316"/>
       <point x="166" y="1332"/>
-      <point x="112" y="1332" type="curve" name="sv02" smooth="yes"/>
+      <point x="112" y="1332" type="curve" smooth="yes" name="sv02"/>
       <point x="89" y="1332"/>
       <point x="61" y="1330"/>
       <point x="34" y="1323" type="curve"/>
       <point x="34" y="1493" type="line" name="at01"/>
       <point x="58" y="1501"/>
       <point x="88" y="1504"/>
-      <point x="120" y="1504" type="curve" name="at02" smooth="yes"/>
+      <point x="120" y="1504" type="curve" smooth="yes" name="at02"/>
       <point x="161" y="1504"/>
       <point x="217" y="1499"/>
-      <point x="261" y="1490" type="curve" name="at03" smooth="yes"/>
+      <point x="261" y="1490" type="curve" smooth="yes" name="at03"/>
       <point x="442" y="1453"/>
       <point x="553" y="1321"/>
       <point x="606" y="1044" type="curve" name="ih02"/>
       <point x="686" y="1316"/>
       <point x="802" y="1455"/>
-      <point x="949" y="1490" type="curve" name="at04" smooth="yes"/>
+      <point x="949" y="1490" type="curve" smooth="yes" name="at04"/>
       <point x="976" y="1497"/>
       <point x="995" y="1497"/>
-      <point x="1008" y="1497" type="curve" name="at05" smooth="yes"/>
+      <point x="1008" y="1497" type="curve" smooth="yes" name="at05"/>
       <point x="1113" y="1497"/>
       <point x="1209" y="1431"/>
-      <point x="1209" y="1318" type="curve" name="hr03" smooth="yes"/>
+      <point x="1209" y="1318" type="curve" smooth="yes" name="hr03"/>
       <point x="1209" y="1295"/>
       <point x="1206" y="1257"/>
       <point x="1191" y="1224" type="curve" smooth="yes"/>
       <point x="1168" y="1173"/>
       <point x="1129" y="1157"/>
-      <point x="1090" y="1157" type="curve" name="sv03" smooth="yes"/>
+      <point x="1090" y="1157" type="curve" smooth="yes" name="sv03"/>
       <point x="1023" y="1157"/>
       <point x="952" y="1206"/>
       <point x="941" y="1297" type="curve" name="iv01"/>
       <point x="790" y="1193"/>
       <point x="707" y="869"/>
-      <point x="707" y="650" type="curve" name="sh01" smooth="yes"/>
+      <point x="707" y="650" type="curve" smooth="yes" name="sh01"/>
       <point x="707" y="0" type="line" name="sh03"/>
       <point x="504" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/U_psilontonos.glif b/source/Hack-Regular.ufo/glyphs/U_psilontonos.glif
index 99ff690f5..8d371cfb5 100644
--- a/source/Hack-Regular.ufo/glyphs/U_psilontonos.glif
+++ b/source/Hack-Regular.ufo/glyphs/U_psilontonos.glif
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Upsilontonos" format="1">
+<glyph name="Upsilontonos" format="2">
   <advance width="1233"/>
   <unicode hex="038E"/>
   <outline>
     <contour>
-      <point x="519" y="650" type="line" name="dh01" smooth="yes"/>
+      <point x="519" y="650" type="line" smooth="yes" name="dh01"/>
       <point x="519" y="890"/>
       <point x="414" y="1229"/>
       <point x="285" y="1297" type="curve" smooth="yes"/>
       <point x="250" y="1316"/>
       <point x="181" y="1332"/>
-      <point x="127" y="1332" type="curve" name="sv01" smooth="yes"/>
+      <point x="127" y="1332" type="curve" smooth="yes" name="sv01"/>
       <point x="104" y="1332"/>
       <point x="76" y="1330"/>
       <point x="49" y="1323" type="curve"/>
       <point x="49" y="1493" type="line" name="at01"/>
       <point x="73" y="1501"/>
       <point x="103" y="1504"/>
-      <point x="135" y="1504" type="curve" name="at02" smooth="yes"/>
+      <point x="135" y="1504" type="curve" smooth="yes" name="at02"/>
       <point x="176" y="1504"/>
       <point x="232" y="1499"/>
-      <point x="276" y="1490" type="curve" name="at03" smooth="yes"/>
+      <point x="276" y="1490" type="curve" smooth="yes" name="at03"/>
       <point x="457" y="1453"/>
       <point x="568" y="1321"/>
       <point x="621" y="1044" type="curve" name="ih01"/>
       <point x="701" y="1316"/>
       <point x="817" y="1455"/>
-      <point x="964" y="1490" type="curve" name="at04" smooth="yes"/>
+      <point x="964" y="1490" type="curve" smooth="yes" name="at04"/>
       <point x="991" y="1497"/>
       <point x="1010" y="1497"/>
-      <point x="1023" y="1497" type="curve" name="at05" smooth="yes"/>
+      <point x="1023" y="1497" type="curve" smooth="yes" name="at05"/>
       <point x="1128" y="1497"/>
       <point x="1224" y="1431"/>
       <point x="1224" y="1318" type="curve" smooth="yes"/>
       <point x="1224" y="1295"/>
       <point x="1221" y="1257"/>
-      <point x="1206" y="1224" type="curve" name="hr01" smooth="yes"/>
+      <point x="1206" y="1224" type="curve" smooth="yes" name="hr01"/>
       <point x="1183" y="1173"/>
       <point x="1144" y="1157"/>
       <point x="1105" y="1157" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="956" y="1297" type="curve" name="iv01"/>
       <point x="805" y="1193"/>
       <point x="722" y="869"/>
-      <point x="722" y="650" type="curve" name="dh02" smooth="yes"/>
+      <point x="722" y="650" type="curve" smooth="yes" name="dh02"/>
       <point x="722" y="0" type="line" name="hr02"/>
       <point x="519" y="0" type="line" name="hr03"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/U_ring.glif b/source/Hack-Regular.ufo/glyphs/U_ring.glif
index 02534b310..f14223e09 100644
--- a/source/Hack-Regular.ufo/glyphs/U_ring.glif
+++ b/source/Hack-Regular.ufo/glyphs/U_ring.glif
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Uring" format="1">
+<glyph name="Uring" format="2">
   <advance width="1233"/>
   <unicode hex="016E"/>
   <outline>
     <contour>
-      <point x="627" y="1352" type="curve" name="dv05" smooth="yes"/>
+      <point x="627" y="1352" type="curve" smooth="yes" name="dv05"/>
       <point x="473" y="1352"/>
       <point x="352" y="1474"/>
-      <point x="352" y="1627" type="curve" name="sh01" smooth="yes"/>
+      <point x="352" y="1627" type="curve" smooth="yes" name="sh01"/>
       <point x="352" y="1779"/>
       <point x="473" y="1901"/>
-      <point x="627" y="1901" type="curve" name="dv04" smooth="yes"/>
+      <point x="627" y="1901" type="curve" smooth="yes" name="dv04"/>
       <point x="782" y="1901"/>
       <point x="901" y="1779"/>
-      <point x="901" y="1627" type="curve" name="dh04" smooth="yes"/>
+      <point x="901" y="1627" type="curve" smooth="yes" name="dh04"/>
       <point x="901" y="1474"/>
       <point x="782" y="1352"/>
     </contour>
     <contour>
-      <point x="626" y="1475" type="curve" name="dv06" smooth="yes"/>
+      <point x="626" y="1475" type="curve" smooth="yes" name="dv06"/>
       <point x="710" y="1475"/>
       <point x="778" y="1543"/>
-      <point x="778" y="1627" type="curve" name="dh03" smooth="yes"/>
+      <point x="778" y="1627" type="curve" smooth="yes" name="dh03"/>
       <point x="778" y="1711"/>
       <point x="710" y="1778"/>
-      <point x="626" y="1778" type="curve" name="dv03" smooth="yes"/>
+      <point x="626" y="1778" type="curve" smooth="yes" name="dv03"/>
       <point x="541" y="1778"/>
       <point x="475" y="1712"/>
-      <point x="475" y="1627" type="curve" name="sh02" smooth="yes"/>
+      <point x="475" y="1627" type="curve" smooth="yes" name="sh02"/>
       <point x="475" y="1541"/>
       <point x="541" y="1475"/>
     </contour>
     <contour>
-      <point x="618" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="618" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="473" y="-29"/>
       <point x="354" y="15"/>
       <point x="274" y="87" type="curve" smooth="yes"/>
@@ -41,31 +41,31 @@
       <point x="176" y="250" type="curve" smooth="yes"/>
       <point x="157" y="313"/>
       <point x="147" y="409"/>
-      <point x="147" y="573" type="curve" name="dh01" smooth="yes"/>
+      <point x="147" y="573" type="curve" smooth="yes" name="dh01"/>
       <point x="147" y="1493" type="line" name="at01"/>
       <point x="350" y="1493" type="line"/>
-      <point x="350" y="481" type="line" name="dh02" smooth="yes"/>
+      <point x="350" y="481" type="line" smooth="yes" name="dh02"/>
       <point x="350" y="408"/>
       <point x="352" y="357"/>
-      <point x="356" y="326" type="curve" name="sh03" smooth="yes"/>
+      <point x="356" y="326" type="curve" smooth="yes" name="sh03"/>
       <point x="364" y="269"/>
       <point x="391" y="201"/>
       <point x="470" y="164" type="curve" smooth="yes"/>
       <point x="509" y="145"/>
       <point x="560" y="135"/>
-      <point x="616" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="729" y="135"/>
       <point x="820" y="178"/>
       <point x="857" y="254" type="curve" smooth="yes"/>
       <point x="865" y="270"/>
       <point x="873" y="294"/>
-      <point x="877" y="325" type="curve" name="sh04" smooth="yes"/>
+      <point x="877" y="325" type="curve" smooth="yes" name="sh04"/>
       <point x="881" y="356"/>
       <point x="883" y="407"/>
-      <point x="883" y="479" type="curve" name="ih01" smooth="yes"/>
+      <point x="883" y="479" type="curve" smooth="yes" name="ih01"/>
       <point x="883" y="1493" type="line" name="at02"/>
       <point x="1085" y="1493" type="line" name="hr01"/>
-      <point x="1085" y="573" type="line" name="sh05" smooth="yes"/>
+      <point x="1085" y="573" type="line" smooth="yes" name="sh05"/>
       <point x="1085" y="405"/>
       <point x="1075" y="316"/>
       <point x="1056" y="248" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/U_tilde.glif b/source/Hack-Regular.ufo/glyphs/U_tilde.glif
index 529ff0ce6..9f8a100be 100644
--- a/source/Hack-Regular.ufo/glyphs/U_tilde.glif
+++ b/source/Hack-Regular.ufo/glyphs/U_tilde.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Utilde" format="1">
+<glyph name="Utilde" format="2">
   <advance width="1233"/>
   <unicode hex="0168"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="287" y="1633" type="line" name="sv01"/>
       <point x="287" y="1769"/>
       <point x="357" y="1852"/>
-      <point x="482" y="1852" type="curve" name="dv04" smooth="yes"/>
+      <point x="482" y="1852" type="curve" smooth="yes" name="dv04"/>
       <point x="535" y="1852"/>
       <point x="570" y="1836"/>
       <point x="621" y="1809" type="curve" smooth="yes"/>
       <point x="678" y="1779" type="line"/>
       <point x="707" y="1762"/>
       <point x="731" y="1754"/>
-      <point x="750" y="1754" type="curve" name="dv06" smooth="yes"/>
+      <point x="750" y="1754" type="curve" smooth="yes" name="dv06"/>
       <point x="791" y="1754"/>
       <point x="821" y="1790"/>
       <point x="821" y="1846" type="curve" smooth="yes"/>
@@ -22,21 +22,21 @@
       <point x="946" y="1852" type="line"/>
       <point x="941" y="1721"/>
       <point x="877" y="1633"/>
-      <point x="753" y="1633" type="curve" name="dv05" smooth="yes"/>
+      <point x="753" y="1633" type="curve" smooth="yes" name="dv05"/>
       <point x="710" y="1633"/>
       <point x="673" y="1644"/>
       <point x="612" y="1676" type="curve"/>
       <point x="555" y="1709" type="line" smooth="yes"/>
       <point x="522" y="1728"/>
       <point x="505" y="1734"/>
-      <point x="486" y="1734" type="curve" name="dv03" smooth="yes"/>
+      <point x="486" y="1734" type="curve" smooth="yes" name="dv03"/>
       <point x="441" y="1734"/>
       <point x="412" y="1699"/>
       <point x="412" y="1639" type="curve" smooth="yes"/>
       <point x="412" y="1633" type="line"/>
     </contour>
     <contour>
-      <point x="618" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="618" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="473" y="-29"/>
       <point x="354" y="15"/>
       <point x="274" y="87" type="curve" smooth="yes"/>
@@ -45,37 +45,37 @@
       <point x="176" y="250" type="curve" smooth="yes"/>
       <point x="157" y="313"/>
       <point x="147" y="409"/>
-      <point x="147" y="573" type="curve" name="sh01" smooth="yes"/>
+      <point x="147" y="573" type="curve" smooth="yes" name="sh01"/>
       <point x="147" y="1493" type="line" name="at01"/>
       <point x="350" y="1493" type="line"/>
-      <point x="350" y="481" type="line" name="sh02" smooth="yes"/>
+      <point x="350" y="481" type="line" smooth="yes" name="sh02"/>
       <point x="350" y="408"/>
       <point x="352" y="357"/>
-      <point x="356" y="326" type="curve" name="hr01" smooth="yes"/>
+      <point x="356" y="326" type="curve" smooth="yes" name="hr01"/>
       <point x="364" y="269"/>
       <point x="391" y="201"/>
       <point x="470" y="164" type="curve" smooth="yes"/>
       <point x="509" y="145"/>
       <point x="560" y="135"/>
-      <point x="616" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="729" y="135"/>
       <point x="820" y="178"/>
-      <point x="857" y="254" type="curve" name="hr02" smooth="yes"/>
+      <point x="857" y="254" type="curve" smooth="yes" name="hr02"/>
       <point x="865" y="270"/>
       <point x="873" y="294"/>
-      <point x="877" y="325" type="curve" name="hr03" smooth="yes"/>
+      <point x="877" y="325" type="curve" smooth="yes" name="hr03"/>
       <point x="881" y="356"/>
       <point x="883" y="407"/>
-      <point x="883" y="479" type="curve" name="ah01" smooth="yes"/>
+      <point x="883" y="479" type="curve" smooth="yes" name="ah01"/>
       <point x="883" y="1493" type="line" name="at02"/>
       <point x="1085" y="1493" type="line" name="hr04"/>
-      <point x="1085" y="573" type="line" name="sh03" smooth="yes"/>
+      <point x="1085" y="573" type="line" smooth="yes" name="sh03"/>
       <point x="1085" y="405"/>
       <point x="1075" y="316"/>
       <point x="1056" y="248" type="curve"/>
       <point x="1014" y="108"/>
       <point x="912" y="35"/>
-      <point x="807" y="0" type="curve" name="hr05" smooth="yes"/>
+      <point x="807" y="0" type="curve" smooth="yes" name="hr05"/>
       <point x="749" y="-19"/>
       <point x="686" y="-29"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/V_.glif b/source/Hack-Regular.ufo/glyphs/V_.glif
index 622d6e196..b4374ad84 100644
--- a/source/Hack-Regular.ufo/glyphs/V_.glif
+++ b/source/Hack-Regular.ufo/glyphs/V_.glif
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="V" format="1">
+<glyph name="V" format="2">
   <advance width="1233"/>
   <unicode hex="0056"/>
   <outline>
     <contour>
-      <point x="57" y="1493" type="line" name="hr00"/>
+      <point x="57" y="1493" type="line"/>
       <point x="266" y="1493" type="line"/>
-      <point x="616" y="170" type="line" name="iv01"/>
-      <point x="967" y="1493" type="line" name="at01"/>
+      <point x="616" y="170" type="line"/>
+      <point x="967" y="1493" type="line"/>
       <point x="1176" y="1493" type="line"/>
-      <point x="739" y="0" type="line" name="ab01"/>
+      <point x="739" y="0" type="line"/>
       <point x="494" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/W_.glif b/source/Hack-Regular.ufo/glyphs/W_.glif
index 8238ebff9..18abd601c 100644
--- a/source/Hack-Regular.ufo/glyphs/W_.glif
+++ b/source/Hack-Regular.ufo/glyphs/W_.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="W" format="1">
+<glyph name="W" format="2">
   <advance width="1233"/>
   <unicode hex="0057"/>
   <outline>
     <contour>
-      <point x="0" y="1493" type="line" name="hr00"/>
+      <point x="0" y="1493" type="line"/>
       <point x="197" y="1493" type="line"/>
-      <point x="340" y="281" type="line" name="iv01"/>
+      <point x="340" y="281" type="line"/>
       <point x="510" y="1083" type="line"/>
       <point x="721" y="1083" type="line"/>
-      <point x="893" y="279" type="line" name="iv02"/>
-      <point x="1036" y="1493" type="line" name="at01"/>
+      <point x="893" y="279" type="line"/>
+      <point x="1036" y="1493" type="line"/>
       <point x="1233" y="1493" type="line"/>
-      <point x="1010" y="0" type="line" name="ab01"/>
+      <point x="1010" y="0" type="line"/>
       <point x="819" y="0" type="line"/>
-      <point x="616" y="887" type="line" name="iv03"/>
-      <point x="414" y="0" type="line" name="ab02"/>
+      <point x="616" y="887" type="line"/>
+      <point x="414" y="0" type="line"/>
       <point x="223" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/W_acute.glif b/source/Hack-Regular.ufo/glyphs/W_acute.glif
index fa6ea867e..3d5570746 100644
--- a/source/Hack-Regular.ufo/glyphs/W_acute.glif
+++ b/source/Hack-Regular.ufo/glyphs/W_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Wacute" format="1">
+<glyph name="Wacute" format="2">
   <advance width="1233"/>
   <unicode hex="1E82"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/W_circumflex.glif b/source/Hack-Regular.ufo/glyphs/W_circumflex.glif
index 732f9cc1f..79b08cb59 100644
--- a/source/Hack-Regular.ufo/glyphs/W_circumflex.glif
+++ b/source/Hack-Regular.ufo/glyphs/W_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Wcircumflex" format="1">
+<glyph name="Wcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0174"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/W_dieresis.glif b/source/Hack-Regular.ufo/glyphs/W_dieresis.glif
index 759e1a651..944b6cd43 100644
--- a/source/Hack-Regular.ufo/glyphs/W_dieresis.glif
+++ b/source/Hack-Regular.ufo/glyphs/W_dieresis.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Wdieresis" format="1">
+<glyph name="Wdieresis" format="2">
   <advance width="1233"/>
   <unicode hex="1E84"/>
   <outline>
     <contour>
-      <point x="350" y="1650" type="line" name="hr00" smooth="yes"/>
+      <point x="350" y="1650" type="line" smooth="yes" name="hr00"/>
       <point x="333" y="1650"/>
       <point x="319" y="1664"/>
-      <point x="319" y="1681" type="curve" name="sh01" smooth="yes"/>
+      <point x="319" y="1681" type="curve" smooth="yes" name="sh01"/>
       <point x="319" y="1821" type="line" smooth="yes"/>
       <point x="319" y="1838"/>
       <point x="333" y="1852"/>
-      <point x="350" y="1852" type="curve" name="dv01" smooth="yes"/>
+      <point x="350" y="1852" type="curve" smooth="yes" name="dv01"/>
       <point x="491" y="1852" type="line" smooth="yes"/>
       <point x="508" y="1852"/>
       <point x="522" y="1838"/>
       <point x="522" y="1821" type="curve" smooth="yes"/>
-      <point x="522" y="1681" type="line" name="sh02" smooth="yes"/>
+      <point x="522" y="1681" type="line" smooth="yes" name="sh02"/>
       <point x="522" y="1664"/>
       <point x="508" y="1650"/>
       <point x="491" y="1650" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="742" y="1650" type="line" name="sv01" smooth="yes"/>
+      <point x="742" y="1650" type="line" smooth="yes" name="sv01"/>
       <point x="725" y="1650"/>
       <point x="711" y="1664"/>
-      <point x="711" y="1681" type="curve" name="ah01" smooth="yes"/>
+      <point x="711" y="1681" type="curve" smooth="yes" name="ah01"/>
       <point x="711" y="1821" type="line" smooth="yes"/>
       <point x="711" y="1838"/>
       <point x="725" y="1852"/>
-      <point x="742" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="742" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="882" y="1852" type="line" smooth="yes"/>
       <point x="899" y="1852"/>
       <point x="913" y="1838"/>
       <point x="913" y="1821" type="curve" smooth="yes"/>
-      <point x="913" y="1681" type="line" name="sh03" smooth="yes"/>
+      <point x="913" y="1681" type="line" smooth="yes" name="sh03"/>
       <point x="913" y="1664"/>
       <point x="899" y="1650"/>
       <point x="882" y="1650" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/W_grave.glif b/source/Hack-Regular.ufo/glyphs/W_grave.glif
index 3ad0040dd..0e413ad52 100644
--- a/source/Hack-Regular.ufo/glyphs/W_grave.glif
+++ b/source/Hack-Regular.ufo/glyphs/W_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Wgrave" format="1">
+<glyph name="Wgrave" format="2">
   <advance width="1233"/>
   <unicode hex="1E80"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/X_.glif b/source/Hack-Regular.ufo/glyphs/X_.glif
index b7e046044..98498e7f5 100644
--- a/source/Hack-Regular.ufo/glyphs/X_.glif
+++ b/source/Hack-Regular.ufo/glyphs/X_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="X" format="1">
+<glyph name="X" format="2">
   <advance width="1233"/>
   <unicode hex="0058"/>
   <outline>
     <contour>
-      <point x="518" y="791" type="line" name="hr00"/>
-      <point x="86" y="1493" type="line" name="at01"/>
+      <point x="518" y="791" type="line"/>
+      <point x="86" y="1493" type="line"/>
       <point x="303" y="1493" type="line"/>
-      <point x="631" y="930" type="line" name="iv01"/>
-      <point x="965" y="1493" type="line" name="at02"/>
+      <point x="631" y="930" type="line"/>
+      <point x="965" y="1493" type="line"/>
       <point x="1182" y="1493" type="line"/>
       <point x="735" y="791" type="line"/>
-      <point x="1214" y="0" type="line" name="ab01"/>
+      <point x="1214" y="0" type="line"/>
       <point x="997" y="0" type="line"/>
-      <point x="631" y="643" type="line" name="iv02"/>
-      <point x="236" y="0" type="line" name="ab02"/>
+      <point x="631" y="643" type="line"/>
+      <point x="236" y="0" type="line"/>
       <point x="18" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/X_i.glif b/source/Hack-Regular.ufo/glyphs/X_i.glif
index a4fa31dfb..3e5e2c324 100644
--- a/source/Hack-Regular.ufo/glyphs/X_i.glif
+++ b/source/Hack-Regular.ufo/glyphs/X_i.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Xi" format="1">
+<glyph name="Xi" format="2">
   <advance width="1233"/>
   <unicode hex="039E"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/Y_.glif b/source/Hack-Regular.ufo/glyphs/Y_.glif
index dda0a9f2e..934e4034e 100644
--- a/source/Hack-Regular.ufo/glyphs/Y_.glif
+++ b/source/Hack-Regular.ufo/glyphs/Y_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Y" format="1">
+<glyph name="Y" format="2">
   <advance width="1233"/>
   <unicode hex="0059"/>
   <outline>
     <contour>
-      <point x="514" y="670" type="line" name="hr00"/>
-      <point x="37" y="1493" type="line" name="at01"/>
+      <point x="514" y="670" type="line"/>
+      <point x="37" y="1493" type="line"/>
       <point x="252" y="1493" type="line"/>
-      <point x="616" y="834" type="line" name="ih01"/>
-      <point x="979" y="1493" type="line" name="at02"/>
+      <point x="616" y="834" type="line"/>
+      <point x="979" y="1493" type="line"/>
       <point x="1196" y="1493" type="line"/>
-      <point x="717" y="670" type="line" name="dh01"/>
-      <point x="717" y="0" type="line" name="ab01"/>
+      <point x="717" y="670" type="line"/>
+      <point x="717" y="0" type="line"/>
       <point x="514" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/Y_acute.glif b/source/Hack-Regular.ufo/glyphs/Y_acute.glif
index 20ea9294a..cad34e1d1 100644
--- a/source/Hack-Regular.ufo/glyphs/Y_acute.glif
+++ b/source/Hack-Regular.ufo/glyphs/Y_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Yacute" format="1">
+<glyph name="Yacute" format="2">
   <advance width="1233"/>
   <unicode hex="00DD"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/Y_circumflex.glif b/source/Hack-Regular.ufo/glyphs/Y_circumflex.glif
index 8db566b39..593a605a4 100644
--- a/source/Hack-Regular.ufo/glyphs/Y_circumflex.glif
+++ b/source/Hack-Regular.ufo/glyphs/Y_circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ycircumflex" format="1">
+<glyph name="Ycircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0176"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/Y_dieresis.glif b/source/Hack-Regular.ufo/glyphs/Y_dieresis.glif
index e4e8bb898..97eb5784c 100644
--- a/source/Hack-Regular.ufo/glyphs/Y_dieresis.glif
+++ b/source/Hack-Regular.ufo/glyphs/Y_dieresis.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ydieresis" format="1">
+<glyph name="Ydieresis" format="2">
   <advance width="1233"/>
   <unicode hex="0178"/>
   <outline>
     <contour>
-      <point x="349" y="1649" type="line" name="dv01" smooth="yes"/>
+      <point x="349" y="1649" type="line" smooth="yes" name="dv01"/>
       <point x="329" y="1649"/>
       <point x="319" y="1659"/>
-      <point x="319" y="1679" type="curve" name="dh01" smooth="yes"/>
+      <point x="319" y="1679" type="curve" smooth="yes" name="dh01"/>
       <point x="319" y="1822" type="line" smooth="yes"/>
       <point x="319" y="1842"/>
       <point x="329" y="1852"/>
-      <point x="349" y="1852" type="curve" name="dv02" smooth="yes"/>
+      <point x="349" y="1852" type="curve" smooth="yes" name="dv02"/>
       <point x="492" y="1852" type="line" smooth="yes"/>
       <point x="512" y="1852"/>
       <point x="522" y="1842"/>
       <point x="522" y="1822" type="curve" smooth="yes"/>
-      <point x="522" y="1679" type="line" name="dh02" smooth="yes"/>
+      <point x="522" y="1679" type="line" smooth="yes" name="dh02"/>
       <point x="522" y="1659"/>
       <point x="512" y="1649"/>
       <point x="492" y="1649" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1649" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1649" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1649"/>
       <point x="711" y="1659"/>
-      <point x="711" y="1679" type="curve" name="sh02" smooth="yes"/>
-      <point x="711" y="1822" type="line" name="hr01" smooth="yes"/>
+      <point x="711" y="1679" type="curve" smooth="yes" name="sh02"/>
+      <point x="711" y="1822" type="line" smooth="yes" name="hr01"/>
       <point x="711" y="1842"/>
       <point x="721" y="1852"/>
-      <point x="741" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="741" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="883" y="1852" type="line" smooth="yes"/>
       <point x="903" y="1852"/>
       <point x="913" y="1842"/>
       <point x="913" y="1822" type="curve" smooth="yes"/>
-      <point x="913" y="1679" type="line" name="sh03" smooth="yes"/>
+      <point x="913" y="1679" type="line" smooth="yes" name="sh03"/>
       <point x="913" y="1659"/>
       <point x="903" y="1649"/>
       <point x="883" y="1649" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/Y_grave.glif b/source/Hack-Regular.ufo/glyphs/Y_grave.glif
index fb6452575..33ce0a4d4 100644
--- a/source/Hack-Regular.ufo/glyphs/Y_grave.glif
+++ b/source/Hack-Regular.ufo/glyphs/Y_grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Ygrave" format="1">
+<glyph name="Ygrave" format="2">
   <advance width="1233"/>
   <unicode hex="1EF2"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/Z_.glif b/source/Hack-Regular.ufo/glyphs/Z_.glif
index b1066c0e4..06af99779 100644
--- a/source/Hack-Regular.ufo/glyphs/Z_.glif
+++ b/source/Hack-Regular.ufo/glyphs/Z_.glif
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Z" format="1">
+<glyph name="Z" format="2">
   <advance width="1233"/>
   <unicode hex="005A"/>
   <outline>
     <contour>
-      <point x="110" y="154" type="line" name="hr00"/>
-      <point x="869" y="1323" type="line" name="sv01"/>
+      <point x="110" y="154" type="line"/>
+      <point x="869" y="1323" type="line"/>
       <point x="132" y="1323" type="line"/>
-      <point x="132" y="1493" type="line" name="at01"/>
+      <point x="132" y="1493" type="line"/>
       <point x="1101" y="1493" type="line"/>
       <point x="1101" y="1339" type="line"/>
-      <point x="321" y="170" type="line" name="sv02"/>
+      <point x="321" y="170" type="line"/>
       <point x="1123" y="170" type="line"/>
-      <point x="1123" y="0" type="line" name="ab01"/>
+      <point x="1123" y="0" type="line"/>
       <point x="110" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/Z_acute.glif b/source/Hack-Regular.ufo/glyphs/Z_acute.glif
index 19e0e771e..52064f25c 100644
--- a/source/Hack-Regular.ufo/glyphs/Z_acute.glif
+++ b/source/Hack-Regular.ufo/glyphs/Z_acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Zacute" format="1">
+<glyph name="Zacute" format="2">
   <advance width="1233"/>
   <unicode hex="0179"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/Z_caron.glif b/source/Hack-Regular.ufo/glyphs/Z_caron.glif
index 34e9aa029..ccfb416a2 100644
--- a/source/Hack-Regular.ufo/glyphs/Z_caron.glif
+++ b/source/Hack-Regular.ufo/glyphs/Z_caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Zcaron" format="1">
+<glyph name="Zcaron" format="2">
   <advance width="1233"/>
   <unicode hex="017D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/Z_dotaccent.glif b/source/Hack-Regular.ufo/glyphs/Z_dotaccent.glif
index 63b7f98ca..fb2504f9e 100644
--- a/source/Hack-Regular.ufo/glyphs/Z_dotaccent.glif
+++ b/source/Hack-Regular.ufo/glyphs/Z_dotaccent.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Zdotaccent" format="1">
+<glyph name="Zdotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="017B"/>
   <outline>
     <contour>
-      <point x="547" y="1647" type="line" name="hr00" smooth="yes"/>
+      <point x="547" y="1647" type="line" smooth="yes" name="hr00"/>
       <point x="527" y="1647"/>
       <point x="517" y="1657"/>
-      <point x="517" y="1677" type="curve" name="dh01" smooth="yes"/>
+      <point x="517" y="1677" type="curve" smooth="yes" name="dh01"/>
       <point x="517" y="1822" type="line" smooth="yes"/>
       <point x="517" y="1842"/>
       <point x="527" y="1852"/>
-      <point x="547" y="1852" type="curve" name="dv01" smooth="yes"/>
+      <point x="547" y="1852" type="curve" smooth="yes" name="dv01"/>
       <point x="692" y="1852" type="line" smooth="yes"/>
       <point x="712" y="1852"/>
       <point x="722" y="1842"/>
       <point x="722" y="1822" type="curve" smooth="yes"/>
-      <point x="722" y="1677" type="line" name="dh02" smooth="yes"/>
+      <point x="722" y="1677" type="line" smooth="yes" name="dh02"/>
       <point x="722" y="1657"/>
       <point x="712" y="1647"/>
       <point x="692" y="1647" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/Z_eta.glif b/source/Hack-Regular.ufo/glyphs/Z_eta.glif
index c64cb130b..de0c90180 100644
--- a/source/Hack-Regular.ufo/glyphs/Z_eta.glif
+++ b/source/Hack-Regular.ufo/glyphs/Z_eta.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Zeta" format="1">
+<glyph name="Zeta" format="2">
   <advance width="1233"/>
   <unicode hex="0396"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/_1531.glif b/source/Hack-Regular.ufo/glyphs/_1531.glif
index cfed1df01..ff7f840d8 100644
--- a/source/Hack-Regular.ufo/glyphs/_1531.glif
+++ b/source/Hack-Regular.ufo/glyphs/_1531.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="_1531" format="1">
-  <advance width="0"/>
+<glyph name="_1531" format="2">
   <outline>
   </outline>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/_notdef.glif b/source/Hack-Regular.ufo/glyphs/_notdef.glif
index 31e48490a..f1405a9e8 100644
--- a/source/Hack-Regular.ufo/glyphs/_notdef.glif
+++ b/source/Hack-Regular.ufo/glyphs/_notdef.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name=".notdef" format="1">
+<glyph name=".notdef" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Regular.ufo/glyphs/a.glif b/source/Hack-Regular.ufo/glyphs/a.glif
index acfe06b85..14be9ef1b 100644
--- a/source/Hack-Regular.ufo/glyphs/a.glif
+++ b/source/Hack-Regular.ufo/glyphs/a.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="a" format="1">
+<glyph name="a" format="2">
   <advance width="1233"/>
   <unicode hex="0061"/>
   <outline>
@@ -55,9 +55,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/aacute.glif b/source/Hack-Regular.ufo/glyphs/aacute.glif
index ee5663724..8174c6ab2 100644
--- a/source/Hack-Regular.ufo/glyphs/aacute.glif
+++ b/source/Hack-Regular.ufo/glyphs/aacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="aacute" format="1">
+<glyph name="aacute" format="2">
   <advance width="1233"/>
   <unicode hex="00E1"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="478" y="1297" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="513" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="513" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="397" y="-29"/>
       <point x="305" y="3"/>
       <point x="238" y="68" type="curve" smooth="yes"/>
       <point x="174" y="129"/>
       <point x="136" y="210"/>
-      <point x="136" y="327" type="curve" name="sh02" smooth="yes"/>
+      <point x="136" y="327" type="curve" smooth="yes" name="sh02"/>
       <point x="136" y="450"/>
       <point x="178" y="545"/>
       <point x="262" y="610" type="curve" smooth="yes"/>
@@ -30,10 +30,10 @@
       <point x="809" y="931" type="curve" smooth="yes"/>
       <point x="765" y="971"/>
       <point x="692" y="991"/>
-      <point x="596" y="991" type="curve" name="dv04" smooth="yes"/>
+      <point x="596" y="991" type="curve" smooth="yes" name="dv04"/>
       <point x="533" y="991"/>
       <point x="469" y="982"/>
-      <point x="405" y="964" type="curve" name="hr01" smooth="yes"/>
+      <point x="405" y="964" type="curve" smooth="yes" name="hr01"/>
       <point x="340" y="946"/>
       <point x="278" y="920"/>
       <point x="218" y="885" type="curve" name="ih03"/>
@@ -43,7 +43,7 @@
       <point x="414" y="1128" type="curve" smooth="yes"/>
       <point x="475" y="1141"/>
       <point x="536" y="1147"/>
-      <point x="597" y="1147" type="curve" name="dv05" smooth="yes"/>
+      <point x="597" y="1147" type="curve" smooth="yes" name="dv05"/>
       <point x="692" y="1147"/>
       <point x="767" y="1133"/>
       <point x="834" y="1105" type="curve" smooth="yes"/>
@@ -55,11 +55,11 @@
       <point x="1046" y="860" type="curve" smooth="yes"/>
       <point x="1057" y="811"/>
       <point x="1062" y="738"/>
-      <point x="1062" y="639" type="curve" name="sh01" smooth="yes"/>
+      <point x="1062" y="639" type="curve" smooth="yes" name="sh01"/>
       <point x="1062" y="410" type="line"/>
       <point x="1065" y="333"/>
       <point x="1064" y="277"/>
-      <point x="1071" y="226" type="curve" name="sh03" smooth="yes"/>
+      <point x="1071" y="226" type="curve" smooth="yes" name="sh03"/>
       <point x="1078" y="170"/>
       <point x="1087" y="116"/>
       <point x="1094" y="91" type="curve" smooth="yes"/>
@@ -80,21 +80,21 @@
       <point x="594" y="-29"/>
     </contour>
     <contour>
-      <point x="551" y="125" type="curve" name="dv02" smooth="yes"/>
+      <point x="551" y="125" type="curve" smooth="yes" name="dv02"/>
       <point x="652" y="125"/>
       <point x="731" y="160"/>
       <point x="789" y="231" type="curve" smooth="yes"/>
       <point x="848" y="303"/>
       <point x="877" y="400"/>
-      <point x="877" y="522" type="curve" name="sh05" smooth="yes"/>
+      <point x="877" y="522" type="curve" smooth="yes" name="sh05"/>
       <point x="877" y="563" type="line" name="dv03"/>
       <point x="644" y="563" type="line" smooth="yes"/>
       <point x="537" y="563"/>
       <point x="457" y="544"/>
-      <point x="402" y="507" type="curve" name="hr02" smooth="yes"/>
+      <point x="402" y="507" type="curve" smooth="yes" name="hr02"/>
       <point x="345" y="468"/>
       <point x="320" y="412"/>
-      <point x="320" y="337" type="curve" name="sh04" smooth="yes"/>
+      <point x="320" y="337" type="curve" smooth="yes" name="sh04"/>
       <point x="320" y="268"/>
       <point x="342" y="217"/>
       <point x="381" y="181" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/abreve.glif b/source/Hack-Regular.ufo/glyphs/abreve.glif
index 49a208df0..92dbef3a1 100644
--- a/source/Hack-Regular.ufo/glyphs/abreve.glif
+++ b/source/Hack-Regular.ufo/glyphs/abreve.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="abreve" format="1">
+<glyph name="abreve" format="2">
   <advance width="1233"/>
   <unicode hex="0103"/>
   <outline>
     <contour>
-      <point x="619" y="1296" type="curve" name="dv03" smooth="yes"/>
+      <point x="619" y="1296" type="curve" smooth="yes" name="dv03"/>
       <point x="426" y="1296"/>
       <point x="321" y="1392"/>
       <point x="306" y="1583" type="curve" name="sh03"/>
       <point x="425" y="1583" type="line" name="dv04"/>
       <point x="440" y="1487"/>
       <point x="497" y="1433"/>
-      <point x="618" y="1433" type="curve" name="sv01" smooth="yes"/>
+      <point x="618" y="1433" type="curve" smooth="yes" name="sv01"/>
       <point x="733" y="1433"/>
       <point x="795" y="1482"/>
       <point x="814" y="1583" type="curve" name="sv02"/>
@@ -20,13 +20,13 @@
       <point x="813" y="1296"/>
     </contour>
     <contour>
-      <point x="513" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="513" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="397" y="-29"/>
       <point x="305" y="3"/>
       <point x="238" y="68" type="curve" smooth="yes"/>
       <point x="174" y="129"/>
       <point x="136" y="210"/>
-      <point x="136" y="327" type="curve" name="sh01" smooth="yes"/>
+      <point x="136" y="327" type="curve" smooth="yes" name="sh01"/>
       <point x="136" y="450"/>
       <point x="178" y="545"/>
       <point x="262" y="610" type="curve" smooth="yes"/>
@@ -37,10 +37,10 @@
       <point x="877" y="736" type="line" smooth="yes"/>
       <point x="877" y="821"/>
       <point x="854" y="890"/>
-      <point x="809" y="931" type="curve" name="hr01" smooth="yes"/>
+      <point x="809" y="931" type="curve" smooth="yes" name="hr01"/>
       <point x="765" y="971"/>
       <point x="692" y="991"/>
-      <point x="596" y="991" type="curve" name="dv05" smooth="yes"/>
+      <point x="596" y="991" type="curve" smooth="yes" name="dv05"/>
       <point x="533" y="991"/>
       <point x="469" y="982"/>
       <point x="405" y="964" type="curve" smooth="yes"/>
@@ -53,7 +53,7 @@
       <point x="414" y="1128" type="curve" smooth="yes"/>
       <point x="475" y="1141"/>
       <point x="536" y="1147"/>
-      <point x="597" y="1147" type="curve" name="dv06" smooth="yes"/>
+      <point x="597" y="1147" type="curve" smooth="yes" name="dv06"/>
       <point x="692" y="1147"/>
       <point x="767" y="1133"/>
       <point x="834" y="1105" type="curve" smooth="yes"/>
@@ -65,11 +65,11 @@
       <point x="1046" y="860" type="curve" smooth="yes"/>
       <point x="1057" y="811"/>
       <point x="1062" y="738"/>
-      <point x="1062" y="639" type="curve" name="sh04" smooth="yes"/>
+      <point x="1062" y="639" type="curve" smooth="yes" name="sh04"/>
       <point x="1062" y="410" type="line"/>
       <point x="1065" y="333"/>
       <point x="1064" y="277"/>
-      <point x="1071" y="226" type="curve" name="sh05" smooth="yes"/>
+      <point x="1071" y="226" type="curve" smooth="yes" name="sh05"/>
       <point x="1078" y="170"/>
       <point x="1087" y="116"/>
       <point x="1094" y="91" type="curve" smooth="yes"/>
@@ -90,13 +90,13 @@
       <point x="594" y="-29"/>
     </contour>
     <contour>
-      <point x="551" y="125" type="curve" name="dv02" smooth="yes"/>
+      <point x="551" y="125" type="curve" smooth="yes" name="dv02"/>
       <point x="652" y="125"/>
       <point x="731" y="160"/>
       <point x="789" y="231" type="curve" smooth="yes"/>
       <point x="848" y="303"/>
       <point x="877" y="400"/>
-      <point x="877" y="522" type="curve" name="sh06" smooth="yes"/>
+      <point x="877" y="522" type="curve" smooth="yes" name="sh06"/>
       <point x="877" y="563" type="line" name="hr02"/>
       <point x="644" y="563" type="line" smooth="yes"/>
       <point x="537" y="563"/>
@@ -104,10 +104,10 @@
       <point x="402" y="507" type="curve" smooth="yes"/>
       <point x="345" y="468"/>
       <point x="320" y="412"/>
-      <point x="320" y="337" type="curve" name="sh02" smooth="yes"/>
+      <point x="320" y="337" type="curve" smooth="yes" name="sh02"/>
       <point x="320" y="268"/>
       <point x="342" y="217"/>
-      <point x="381" y="181" type="curve" name="hr03" smooth="yes"/>
+      <point x="381" y="181" type="curve" smooth="yes" name="hr03"/>
       <point x="420" y="146"/>
       <point x="474" y="125"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/acircumflex.glif b/source/Hack-Regular.ufo/glyphs/acircumflex.glif
index b0fd075d7..c6233a1cb 100644
--- a/source/Hack-Regular.ufo/glyphs/acircumflex.glif
+++ b/source/Hack-Regular.ufo/glyphs/acircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="acircumflex" format="1">
+<glyph name="acircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00E2"/>
   <outline>
@@ -13,13 +13,13 @@
       <point x="300" y="1297" type="line" name="ih03"/>
     </contour>
     <contour>
-      <point x="513" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="513" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="397" y="-29"/>
       <point x="305" y="3"/>
       <point x="238" y="68" type="curve" smooth="yes"/>
       <point x="174" y="129"/>
       <point x="136" y="210"/>
-      <point x="136" y="327" type="curve" name="sh02" smooth="yes"/>
+      <point x="136" y="327" type="curve" smooth="yes" name="sh02"/>
       <point x="136" y="450"/>
       <point x="178" y="545"/>
       <point x="262" y="610" type="curve" smooth="yes"/>
@@ -27,13 +27,13 @@
       <point x="467" y="707"/>
       <point x="630" y="707" type="curve" smooth="yes"/>
       <point x="877" y="707" type="line" name="ah01"/>
-      <point x="877" y="736" type="line" name="hr01" smooth="yes"/>
+      <point x="877" y="736" type="line" smooth="yes" name="hr01"/>
       <point x="877" y="821"/>
       <point x="854" y="890"/>
       <point x="809" y="931" type="curve" smooth="yes"/>
       <point x="765" y="971"/>
       <point x="692" y="991"/>
-      <point x="596" y="991" type="curve" name="dv04" smooth="yes"/>
+      <point x="596" y="991" type="curve" smooth="yes" name="dv04"/>
       <point x="533" y="991"/>
       <point x="469" y="982"/>
       <point x="405" y="964" type="curve" smooth="yes"/>
@@ -46,7 +46,7 @@
       <point x="414" y="1128" type="curve" smooth="yes"/>
       <point x="475" y="1141"/>
       <point x="536" y="1147"/>
-      <point x="597" y="1147" type="curve" name="dv05" smooth="yes"/>
+      <point x="597" y="1147" type="curve" smooth="yes" name="dv05"/>
       <point x="692" y="1147"/>
       <point x="767" y="1133"/>
       <point x="834" y="1105" type="curve" smooth="yes"/>
@@ -58,11 +58,11 @@
       <point x="1046" y="860" type="curve" smooth="yes"/>
       <point x="1057" y="811"/>
       <point x="1062" y="738"/>
-      <point x="1062" y="639" type="curve" name="sh01" smooth="yes"/>
+      <point x="1062" y="639" type="curve" smooth="yes" name="sh01"/>
       <point x="1062" y="410" type="line"/>
       <point x="1065" y="333"/>
       <point x="1064" y="277"/>
-      <point x="1071" y="226" type="curve" name="sh03" smooth="yes"/>
+      <point x="1071" y="226" type="curve" smooth="yes" name="sh03"/>
       <point x="1078" y="170"/>
       <point x="1087" y="116"/>
       <point x="1094" y="91" type="curve" smooth="yes"/>
@@ -83,13 +83,13 @@
       <point x="594" y="-29"/>
     </contour>
     <contour>
-      <point x="551" y="125" type="curve" name="dv02" smooth="yes"/>
+      <point x="551" y="125" type="curve" smooth="yes" name="dv02"/>
       <point x="652" y="125"/>
       <point x="731" y="160"/>
       <point x="789" y="231" type="curve" smooth="yes"/>
       <point x="848" y="303"/>
       <point x="877" y="400"/>
-      <point x="877" y="522" type="curve" name="hr02" smooth="yes"/>
+      <point x="877" y="522" type="curve" smooth="yes" name="hr02"/>
       <point x="877" y="563" type="line" name="dv03"/>
       <point x="644" y="563" type="line" smooth="yes"/>
       <point x="537" y="563"/>
@@ -97,7 +97,7 @@
       <point x="402" y="507" type="curve" smooth="yes"/>
       <point x="345" y="468"/>
       <point x="320" y="412"/>
-      <point x="320" y="337" type="curve" name="sh04" smooth="yes"/>
+      <point x="320" y="337" type="curve" smooth="yes" name="sh04"/>
       <point x="320" y="268"/>
       <point x="342" y="217"/>
       <point x="381" y="181" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/acute.glif b/source/Hack-Regular.ufo/glyphs/acute.glif
index 2732df946..9651a3c6b 100644
--- a/source/Hack-Regular.ufo/glyphs/acute.glif
+++ b/source/Hack-Regular.ufo/glyphs/acute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="acute" format="1">
+<glyph name="acute" format="2">
   <advance width="1233"/>
   <unicode hex="00B4"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/acutecomb.glif b/source/Hack-Regular.ufo/glyphs/acutecomb.glif
index 6812d7b8c..8a6e0dc6d 100644
--- a/source/Hack-Regular.ufo/glyphs/acutecomb.glif
+++ b/source/Hack-Regular.ufo/glyphs/acutecomb.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="acutecomb" format="1">
-  <advance width="0"/>
+<glyph name="acutecomb" format="2">
   <unicode hex="0301"/>
   <outline>
     <contour>
diff --git a/source/Hack-Regular.ufo/glyphs/adieresis.glif b/source/Hack-Regular.ufo/glyphs/adieresis.glif
index 4512ba966..d5927cc3f 100644
--- a/source/Hack-Regular.ufo/glyphs/adieresis.glif
+++ b/source/Hack-Regular.ufo/glyphs/adieresis.glif
@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="adieresis" format="1">
+<glyph name="adieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00E4"/>
   <outline>
     <contour>
-      <point x="352" y="1350" type="line" name="dv03" smooth="yes"/>
+      <point x="352" y="1350" type="line" smooth="yes" name="dv03"/>
       <point x="332" y="1350"/>
       <point x="322" y="1360"/>
-      <point x="322" y="1380" type="curve" name="sh01" smooth="yes"/>
+      <point x="322" y="1380" type="curve" smooth="yes" name="sh01"/>
       <point x="322" y="1522" type="line" smooth="yes"/>
       <point x="322" y="1542"/>
       <point x="332" y="1552"/>
-      <point x="352" y="1552" type="curve" name="dv04" smooth="yes"/>
+      <point x="352" y="1552" type="curve" smooth="yes" name="dv04"/>
       <point x="495" y="1552" type="line" smooth="yes"/>
       <point x="515" y="1552"/>
       <point x="525" y="1542"/>
       <point x="525" y="1522" type="curve" smooth="yes"/>
-      <point x="525" y="1380" type="line" name="sh02" smooth="yes"/>
+      <point x="525" y="1380" type="line" smooth="yes" name="sh02"/>
       <point x="525" y="1360"/>
       <point x="515" y="1350"/>
       <point x="495" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="744" y="1350" type="line" name="sv01" smooth="yes"/>
+      <point x="744" y="1350" type="line" smooth="yes" name="sv01"/>
       <point x="724" y="1350"/>
       <point x="714" y="1360"/>
-      <point x="714" y="1380" type="curve" name="sh03" smooth="yes"/>
+      <point x="714" y="1380" type="curve" smooth="yes" name="sh03"/>
       <point x="714" y="1522" type="line" smooth="yes"/>
       <point x="714" y="1542"/>
       <point x="724" y="1552"/>
-      <point x="744" y="1552" type="curve" name="sv02" smooth="yes"/>
+      <point x="744" y="1552" type="curve" smooth="yes" name="sv02"/>
       <point x="886" y="1552" type="line" smooth="yes"/>
       <point x="906" y="1552"/>
       <point x="916" y="1542"/>
-      <point x="916" y="1522" type="curve" name="hr01" smooth="yes"/>
-      <point x="916" y="1380" type="line" name="ih01" smooth="yes"/>
+      <point x="916" y="1522" type="curve" smooth="yes" name="hr01"/>
+      <point x="916" y="1380" type="line" smooth="yes" name="ih01"/>
       <point x="916" y="1360"/>
       <point x="906" y="1350"/>
       <point x="886" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="513" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="513" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="397" y="-29"/>
       <point x="305" y="3"/>
       <point x="238" y="68" type="curve" smooth="yes"/>
       <point x="174" y="129"/>
       <point x="136" y="210"/>
-      <point x="136" y="327" type="curve" name="dh01" smooth="yes"/>
+      <point x="136" y="327" type="curve" smooth="yes" name="dh01"/>
       <point x="136" y="450"/>
       <point x="178" y="545"/>
       <point x="262" y="610" type="curve" smooth="yes"/>
@@ -60,7 +60,7 @@
       <point x="809" y="931" type="curve" smooth="yes"/>
       <point x="765" y="971"/>
       <point x="692" y="991"/>
-      <point x="596" y="991" type="curve" name="dv05" smooth="yes"/>
+      <point x="596" y="991" type="curve" smooth="yes" name="dv05"/>
       <point x="533" y="991"/>
       <point x="469" y="982"/>
       <point x="405" y="964" type="curve" smooth="yes"/>
@@ -73,7 +73,7 @@
       <point x="414" y="1128" type="curve" smooth="yes"/>
       <point x="475" y="1141"/>
       <point x="536" y="1147"/>
-      <point x="597" y="1147" type="curve" name="dv06" smooth="yes"/>
+      <point x="597" y="1147" type="curve" smooth="yes" name="dv06"/>
       <point x="692" y="1147"/>
       <point x="767" y="1133"/>
       <point x="834" y="1105" type="curve" smooth="yes"/>
@@ -85,11 +85,11 @@
       <point x="1046" y="860" type="curve" smooth="yes"/>
       <point x="1057" y="811"/>
       <point x="1062" y="738"/>
-      <point x="1062" y="639" type="curve" name="dh04" smooth="yes"/>
+      <point x="1062" y="639" type="curve" smooth="yes" name="dh04"/>
       <point x="1062" y="410" type="line"/>
       <point x="1065" y="333"/>
       <point x="1064" y="277"/>
-      <point x="1071" y="226" type="curve" name="hr02" smooth="yes"/>
+      <point x="1071" y="226" type="curve" smooth="yes" name="hr02"/>
       <point x="1078" y="170"/>
       <point x="1087" y="116"/>
       <point x="1094" y="91" type="curve" smooth="yes"/>
@@ -110,13 +110,13 @@
       <point x="594" y="-29"/>
     </contour>
     <contour>
-      <point x="551" y="125" type="curve" name="dv02" smooth="yes"/>
+      <point x="551" y="125" type="curve" smooth="yes" name="dv02"/>
       <point x="652" y="125"/>
       <point x="731" y="160"/>
       <point x="789" y="231" type="curve" smooth="yes"/>
       <point x="848" y="303"/>
       <point x="877" y="400"/>
-      <point x="877" y="522" type="curve" name="sh04" smooth="yes"/>
+      <point x="877" y="522" type="curve" smooth="yes" name="sh04"/>
       <point x="877" y="563" type="line" name="dv07"/>
       <point x="644" y="563" type="line" smooth="yes"/>
       <point x="537" y="563"/>
@@ -124,7 +124,7 @@
       <point x="402" y="507" type="curve" smooth="yes"/>
       <point x="345" y="468"/>
       <point x="320" y="412"/>
-      <point x="320" y="337" type="curve" name="dh02" smooth="yes"/>
+      <point x="320" y="337" type="curve" smooth="yes" name="dh02"/>
       <point x="320" y="268"/>
       <point x="342" y="217"/>
       <point x="381" y="181" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/ae.glif b/source/Hack-Regular.ufo/glyphs/ae.glif
index d03bb5cbb..20d1566ca 100644
--- a/source/Hack-Regular.ufo/glyphs/ae.glif
+++ b/source/Hack-Regular.ufo/glyphs/ae.glif
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ae" format="1">
+<glyph name="ae" format="2">
   <advance width="1233"/>
   <unicode hex="00E6"/>
   <outline>
     <contour>
-      <point x="358" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="358" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="255" y="-29"/>
       <point x="177" y="0"/>
       <point x="123" y="57" type="curve" smooth="yes"/>
       <point x="66" y="117"/>
       <point x="41" y="201"/>
-      <point x="41" y="304" type="curve" name="dh01" smooth="yes"/>
+      <point x="41" y="304" type="curve" smooth="yes" name="dh01"/>
       <point x="41" y="417"/>
       <point x="70" y="505"/>
       <point x="141" y="568" type="curve" smooth="yes"/>
       <point x="208" y="627"/>
       <point x="305" y="657"/>
-      <point x="432" y="657" type="curve" name="sv01" smooth="yes"/>
+      <point x="432" y="657" type="curve" smooth="yes" name="sv01"/>
       <point x="549" y="657" type="line" name="dh05"/>
       <point x="549" y="745" type="line" smooth="yes"/>
       <point x="549" y="905"/>
       <point x="482" y="993"/>
-      <point x="357" y="993" type="curve" name="dv02" smooth="yes"/>
+      <point x="357" y="993" type="curve" smooth="yes" name="dv02"/>
       <point x="318" y="993"/>
       <point x="273" y="985"/>
       <point x="234" y="972" type="curve" smooth="yes"/>
@@ -34,7 +34,7 @@
       <point x="249" y="1131" type="curve" smooth="yes"/>
       <point x="292" y="1142"/>
       <point x="334" y="1147"/>
-      <point x="376" y="1147" type="curve" name="dv03" smooth="yes"/>
+      <point x="376" y="1147" type="curve" smooth="yes" name="dv03"/>
       <point x="437" y="1147"/>
       <point x="487" y="1137"/>
       <point x="528" y="1116" type="curve" smooth="yes"/>
@@ -43,27 +43,27 @@
       <point x="627" y="1020" type="curve" name="ih02"/>
       <point x="671" y="1101"/>
       <point x="762" y="1147"/>
-      <point x="882" y="1147" type="curve" name="sv02" smooth="yes"/>
+      <point x="882" y="1147" type="curve" smooth="yes" name="sv02"/>
       <point x="995" y="1147"/>
       <point x="1080" y="1109"/>
       <point x="1128" y="1029" type="curve" smooth="yes"/>
       <point x="1176" y="950"/>
       <point x="1200" y="808"/>
-      <point x="1200" y="604" type="curve" name="dh04" smooth="yes"/>
+      <point x="1200" y="604" type="curve" smooth="yes" name="dh04"/>
       <point x="1200" y="514" type="line" name="dv04"/>
       <point x="709" y="514" type="line"/>
       <point x="708" y="503"/>
       <point x="708" y="493"/>
-      <point x="708" y="482" type="curve" name="sh01" smooth="yes"/>
+      <point x="708" y="482" type="curve" smooth="yes" name="sh01"/>
       <point x="708" y="478"/>
       <point x="707" y="474"/>
-      <point x="707" y="443" type="curve" name="dh06" smooth="yes"/>
+      <point x="707" y="443" type="curve" smooth="yes" name="dh06"/>
       <point x="707" y="312"/>
       <point x="726" y="241"/>
       <point x="758" y="196" type="curve" smooth="yes"/>
       <point x="794" y="145"/>
       <point x="848" y="125"/>
-      <point x="923" y="125" type="curve" name="sv03" smooth="yes"/>
+      <point x="923" y="125" type="curve" smooth="yes" name="sv03"/>
       <point x="973" y="125"/>
       <point x="1020" y="134"/>
       <point x="1064" y="151" type="curve" smooth="yes"/>
@@ -73,7 +73,7 @@
       <point x="1178" y="55" type="line"/>
       <point x="1098" y="-3"/>
       <point x="1023" y="-29"/>
-      <point x="917" y="-29" type="curve" name="sv04" smooth="yes"/>
+      <point x="917" y="-29" type="curve" smooth="yes" name="sv04"/>
       <point x="849" y="-29"/>
       <point x="785" y="-15"/>
       <point x="736" y="12" type="curve" smooth="yes"/>
@@ -94,20 +94,20 @@
       <point x="998" y="927" type="curve" smooth="yes"/>
       <point x="975" y="967"/>
       <point x="935" y="993"/>
-      <point x="872" y="993" type="curve" name="sv05" smooth="yes"/>
+      <point x="872" y="993" type="curve" smooth="yes" name="sv05"/>
       <point x="756" y="993"/>
       <point x="709" y="909"/>
-      <point x="709" y="700" type="curve" name="sh02" smooth="yes"/>
+      <point x="709" y="700" type="curve" smooth="yes" name="sh02"/>
       <point x="709" y="657" type="line"/>
     </contour>
     <contour>
-      <point x="375" y="125" type="curve" name="dv01" smooth="yes"/>
+      <point x="375" y="125" type="curve" smooth="yes" name="dv01"/>
       <point x="438" y="125"/>
       <point x="481" y="147"/>
       <point x="506" y="192" type="curve" smooth="yes"/>
       <point x="529" y="235"/>
       <point x="543" y="306"/>
-      <point x="543" y="442" type="curve" name="sh03" smooth="yes"/>
+      <point x="543" y="442" type="curve" smooth="yes" name="sh03"/>
       <point x="543" y="514" type="line" name="sv06"/>
       <point x="494" y="514" type="line" smooth="yes"/>
       <point x="381" y="514"/>
@@ -115,7 +115,7 @@
       <point x="265" y="469" type="curve" smooth="yes"/>
       <point x="225" y="438"/>
       <point x="205" y="385"/>
-      <point x="205" y="313" type="curve" name="dh02" smooth="yes"/>
+      <point x="205" y="313" type="curve" smooth="yes" name="dh02"/>
       <point x="205" y="252"/>
       <point x="220" y="206"/>
       <point x="250" y="174" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/agrave.glif b/source/Hack-Regular.ufo/glyphs/agrave.glif
index 8301e7164..3a205a5c7 100644
--- a/source/Hack-Regular.ufo/glyphs/agrave.glif
+++ b/source/Hack-Regular.ufo/glyphs/agrave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="agrave" format="1">
+<glyph name="agrave" format="2">
   <advance width="1233"/>
   <unicode hex="00E0"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="607" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="513" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="513" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="397" y="-29"/>
       <point x="305" y="3"/>
       <point x="238" y="68" type="curve" smooth="yes"/>
       <point x="174" y="129"/>
       <point x="136" y="210"/>
-      <point x="136" y="327" type="curve" name="sh01" smooth="yes"/>
+      <point x="136" y="327" type="curve" smooth="yes" name="sh01"/>
       <point x="136" y="450"/>
       <point x="178" y="545"/>
       <point x="262" y="610" type="curve" smooth="yes"/>
@@ -30,10 +30,10 @@
       <point x="809" y="931" type="curve" smooth="yes"/>
       <point x="765" y="971"/>
       <point x="692" y="991"/>
-      <point x="596" y="991" type="curve" name="dv04" smooth="yes"/>
+      <point x="596" y="991" type="curve" smooth="yes" name="dv04"/>
       <point x="533" y="991"/>
       <point x="469" y="982"/>
-      <point x="405" y="964" type="curve" name="hr01" smooth="yes"/>
+      <point x="405" y="964" type="curve" smooth="yes" name="hr01"/>
       <point x="340" y="946"/>
       <point x="278" y="920"/>
       <point x="218" y="885" type="curve" name="ih03"/>
@@ -43,7 +43,7 @@
       <point x="414" y="1128" type="curve" smooth="yes"/>
       <point x="475" y="1141"/>
       <point x="536" y="1147"/>
-      <point x="597" y="1147" type="curve" name="dv05" smooth="yes"/>
+      <point x="597" y="1147" type="curve" smooth="yes" name="dv05"/>
       <point x="692" y="1147"/>
       <point x="767" y="1133"/>
       <point x="834" y="1105" type="curve" smooth="yes"/>
@@ -55,11 +55,11 @@
       <point x="1046" y="860" type="curve" smooth="yes"/>
       <point x="1057" y="811"/>
       <point x="1062" y="738"/>
-      <point x="1062" y="639" type="curve" name="sh03" smooth="yes"/>
+      <point x="1062" y="639" type="curve" smooth="yes" name="sh03"/>
       <point x="1062" y="410" type="line"/>
       <point x="1065" y="333"/>
       <point x="1064" y="277"/>
-      <point x="1071" y="226" type="curve" name="sh04" smooth="yes"/>
+      <point x="1071" y="226" type="curve" smooth="yes" name="sh04"/>
       <point x="1078" y="170"/>
       <point x="1087" y="116"/>
       <point x="1094" y="91" type="curve" smooth="yes"/>
@@ -80,21 +80,21 @@
       <point x="594" y="-29"/>
     </contour>
     <contour>
-      <point x="551" y="125" type="curve" name="dv02" smooth="yes"/>
+      <point x="551" y="125" type="curve" smooth="yes" name="dv02"/>
       <point x="652" y="125"/>
       <point x="731" y="160"/>
       <point x="789" y="231" type="curve" smooth="yes"/>
       <point x="848" y="303"/>
       <point x="877" y="400"/>
-      <point x="877" y="522" type="curve" name="sh05" smooth="yes"/>
+      <point x="877" y="522" type="curve" smooth="yes" name="sh05"/>
       <point x="877" y="563" type="line" name="dv03"/>
       <point x="644" y="563" type="line" smooth="yes"/>
       <point x="537" y="563"/>
       <point x="457" y="544"/>
-      <point x="402" y="507" type="curve" name="hr02" smooth="yes"/>
+      <point x="402" y="507" type="curve" smooth="yes" name="hr02"/>
       <point x="345" y="468"/>
       <point x="320" y="412"/>
-      <point x="320" y="337" type="curve" name="sh02" smooth="yes"/>
+      <point x="320" y="337" type="curve" smooth="yes" name="sh02"/>
       <point x="320" y="268"/>
       <point x="342" y="217"/>
       <point x="381" y="181" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/alpha.glif b/source/Hack-Regular.ufo/glyphs/alpha.glif
index 9476ceab8..17a22e1f0 100644
--- a/source/Hack-Regular.ufo/glyphs/alpha.glif
+++ b/source/Hack-Regular.ufo/glyphs/alpha.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="alpha" format="1">
+<glyph name="alpha" format="2">
   <advance width="1233"/>
   <unicode hex="03B1"/>
   <outline>
     <contour>
-      <point x="508" y="-25" type="curve" name="ab01" smooth="yes"/>
+      <point x="508" y="-25" type="curve" smooth="yes" name="ab01"/>
       <point x="239" y="-25"/>
       <point x="70" y="188"/>
-      <point x="70" y="552" type="curve" name="dh01" smooth="yes"/>
+      <point x="70" y="552" type="curve" smooth="yes" name="dh01"/>
       <point x="70" y="960"/>
       <point x="280" y="1145"/>
-      <point x="520" y="1145" type="curve" name="at02" smooth="yes"/>
+      <point x="520" y="1145" type="curve" smooth="yes" name="at02"/>
       <point x="702" y="1145"/>
       <point x="831" y="1039"/>
       <point x="869" y="827" type="curve" name="iv01"/>
@@ -20,7 +20,7 @@
       <point x="967" y="294" type="line"/>
       <point x="978" y="229"/>
       <point x="1042" y="156"/>
-      <point x="1084" y="156" type="curve" name="sv02" smooth="yes"/>
+      <point x="1084" y="156" type="curve" smooth="yes" name="sv02"/>
       <point x="1172" y="156" type="line"/>
       <point x="1172" y="0" type="line" name="hr01"/>
       <point x="1062" y="0" type="line" smooth="yes"/>
@@ -31,7 +31,7 @@
       <point x="689" y="-25"/>
     </contour>
     <contour>
-      <point x="504" y="127" type="curve" name="sv03" smooth="yes"/>
+      <point x="504" y="127" type="curve" smooth="yes" name="sv03"/>
       <point x="588" y="127"/>
       <point x="657" y="197"/>
       <point x="705" y="340" type="curve" smooth="yes"/>
@@ -39,13 +39,13 @@
       <point x="722" y="752" type="line" smooth="yes"/>
       <point x="690" y="925"/>
       <point x="603" y="991"/>
-      <point x="515" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="515" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="450" y="991"/>
       <point x="388" y="955"/>
       <point x="341" y="879" type="curve" smooth="yes"/>
       <point x="290" y="795"/>
       <point x="264" y="676"/>
-      <point x="264" y="547" type="curve" name="hr02" smooth="yes"/>
+      <point x="264" y="547" type="curve" smooth="yes" name="hr02"/>
       <point x="264" y="269"/>
       <point x="387" y="127"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/alphatonos.glif b/source/Hack-Regular.ufo/glyphs/alphatonos.glif
index 768ac7b20..87b0db7d1 100644
--- a/source/Hack-Regular.ufo/glyphs/alphatonos.glif
+++ b/source/Hack-Regular.ufo/glyphs/alphatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="alphatonos" format="1">
+<glyph name="alphatonos" format="2">
   <advance width="1233"/>
   <unicode hex="03AC"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="475" y="1297" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="508" y="-25" type="curve" name="ab01" smooth="yes"/>
+      <point x="508" y="-25" type="curve" smooth="yes" name="ab01"/>
       <point x="239" y="-25"/>
       <point x="70" y="188"/>
-      <point x="70" y="552" type="curve" name="dh01" smooth="yes"/>
+      <point x="70" y="552" type="curve" smooth="yes" name="dh01"/>
       <point x="70" y="960"/>
       <point x="280" y="1145"/>
-      <point x="520" y="1145" type="curve" name="at02" smooth="yes"/>
+      <point x="520" y="1145" type="curve" smooth="yes" name="at02"/>
       <point x="702" y="1145"/>
       <point x="831" y="1039"/>
       <point x="869" y="827" type="curve" name="iv02"/>
@@ -26,7 +26,7 @@
       <point x="967" y="294" type="line"/>
       <point x="978" y="229"/>
       <point x="1042" y="156"/>
-      <point x="1084" y="156" type="curve" name="sv02" smooth="yes"/>
+      <point x="1084" y="156" type="curve" smooth="yes" name="sv02"/>
       <point x="1172" y="156" type="line"/>
       <point x="1172" y="0" type="line" name="ab02"/>
       <point x="1062" y="0" type="line" smooth="yes"/>
@@ -37,7 +37,7 @@
       <point x="689" y="-25"/>
     </contour>
     <contour>
-      <point x="504" y="127" type="curve" name="sv03" smooth="yes"/>
+      <point x="504" y="127" type="curve" smooth="yes" name="sv03"/>
       <point x="588" y="127"/>
       <point x="657" y="197"/>
       <point x="705" y="340" type="curve" smooth="yes"/>
@@ -45,13 +45,13 @@
       <point x="722" y="752" type="line" smooth="yes"/>
       <point x="690" y="925"/>
       <point x="603" y="991"/>
-      <point x="515" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="515" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="450" y="991"/>
       <point x="388" y="955"/>
       <point x="341" y="879" type="curve" smooth="yes"/>
       <point x="290" y="795"/>
       <point x="264" y="676"/>
-      <point x="264" y="547" type="curve" name="dh02" smooth="yes"/>
+      <point x="264" y="547" type="curve" smooth="yes" name="dh02"/>
       <point x="264" y="269"/>
       <point x="387" y="127"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/amacron.glif b/source/Hack-Regular.ufo/glyphs/amacron.glif
index d4cdb9b79..39eb80c55 100644
--- a/source/Hack-Regular.ufo/glyphs/amacron.glif
+++ b/source/Hack-Regular.ufo/glyphs/amacron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="amacron" format="1">
+<glyph name="amacron" format="2">
   <advance width="1233"/>
   <unicode hex="0101"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="320" y="1348" type="line"/>
     </contour>
     <contour>
-      <point x="513" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="513" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="397" y="-29"/>
       <point x="305" y="3"/>
       <point x="238" y="68" type="curve" smooth="yes"/>
       <point x="174" y="129"/>
       <point x="136" y="210"/>
-      <point x="136" y="327" type="curve" name="sh01" smooth="yes"/>
+      <point x="136" y="327" type="curve" smooth="yes" name="sh01"/>
       <point x="136" y="450"/>
       <point x="178" y="545"/>
       <point x="262" y="610" type="curve" smooth="yes"/>
@@ -30,10 +30,10 @@
       <point x="809" y="931" type="curve" smooth="yes"/>
       <point x="765" y="971"/>
       <point x="692" y="991"/>
-      <point x="596" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="596" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="533" y="991"/>
       <point x="469" y="982"/>
-      <point x="405" y="964" type="curve" name="hr01" smooth="yes"/>
+      <point x="405" y="964" type="curve" smooth="yes" name="hr01"/>
       <point x="340" y="946"/>
       <point x="278" y="920"/>
       <point x="218" y="885" type="curve" name="ih01"/>
@@ -43,7 +43,7 @@
       <point x="414" y="1128" type="curve" smooth="yes"/>
       <point x="475" y="1141"/>
       <point x="536" y="1147"/>
-      <point x="597" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="597" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="692" y="1147"/>
       <point x="767" y="1133"/>
       <point x="834" y="1105" type="curve" smooth="yes"/>
@@ -55,11 +55,11 @@
       <point x="1046" y="860" type="curve" smooth="yes"/>
       <point x="1057" y="811"/>
       <point x="1062" y="738"/>
-      <point x="1062" y="639" type="curve" name="sh04" smooth="yes"/>
+      <point x="1062" y="639" type="curve" smooth="yes" name="sh04"/>
       <point x="1062" y="410" type="line"/>
       <point x="1065" y="333"/>
       <point x="1064" y="277"/>
-      <point x="1071" y="226" type="curve" name="sh05" smooth="yes"/>
+      <point x="1071" y="226" type="curve" smooth="yes" name="sh05"/>
       <point x="1078" y="170"/>
       <point x="1087" y="116"/>
       <point x="1094" y="91" type="curve" smooth="yes"/>
@@ -80,21 +80,21 @@
       <point x="594" y="-29"/>
     </contour>
     <contour>
-      <point x="551" y="125" type="curve" name="dv02" smooth="yes"/>
+      <point x="551" y="125" type="curve" smooth="yes" name="dv02"/>
       <point x="652" y="125"/>
       <point x="731" y="160"/>
       <point x="789" y="231" type="curve" smooth="yes"/>
       <point x="848" y="303"/>
       <point x="877" y="400"/>
-      <point x="877" y="522" type="curve" name="sh06" smooth="yes"/>
+      <point x="877" y="522" type="curve" smooth="yes" name="sh06"/>
       <point x="877" y="563" type="line" name="dv05"/>
       <point x="644" y="563" type="line" smooth="yes"/>
       <point x="537" y="563"/>
       <point x="457" y="544"/>
-      <point x="402" y="507" type="curve" name="hr02" smooth="yes"/>
+      <point x="402" y="507" type="curve" smooth="yes" name="hr02"/>
       <point x="345" y="468"/>
       <point x="320" y="412"/>
-      <point x="320" y="337" type="curve" name="sh02" smooth="yes"/>
+      <point x="320" y="337" type="curve" smooth="yes" name="sh02"/>
       <point x="320" y="268"/>
       <point x="342" y="217"/>
       <point x="381" y="181" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/ampersand.glif b/source/Hack-Regular.ufo/glyphs/ampersand.glif
index e2d1c53cf..fc18e4238 100644
--- a/source/Hack-Regular.ufo/glyphs/ampersand.glif
+++ b/source/Hack-Regular.ufo/glyphs/ampersand.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ampersand" format="1">
+<glyph name="ampersand" format="2">
   <advance width="1233"/>
   <unicode hex="0026"/>
   <outline>
     <contour>
-      <point x="552" y="-30" type="curve" name="dv01" smooth="yes"/>
+      <point x="552" y="-30" type="curve" smooth="yes" name="dv01"/>
       <point x="409" y="-30"/>
       <point x="286" y="22"/>
       <point x="198" y="106" type="curve" smooth="yes"/>
       <point x="113" y="187"/>
       <point x="56" y="302"/>
-      <point x="56" y="439" type="curve" name="dh01" smooth="yes"/>
+      <point x="56" y="439" type="curve" smooth="yes" name="dh01"/>
       <point x="56" y="528"/>
       <point x="79" y="619"/>
       <point x="126" y="698" type="curve" smooth="yes"/>
@@ -22,16 +22,16 @@
       <point x="260" y="1056" type="curve" smooth="yes"/>
       <point x="244" y="1102"/>
       <point x="236" y="1149"/>
-      <point x="236" y="1197" type="curve" name="sh01" smooth="yes"/>
+      <point x="236" y="1197" type="curve" smooth="yes" name="sh01"/>
       <point x="236" y="1302"/>
       <point x="272" y="1377"/>
       <point x="336" y="1433" type="curve" smooth="yes"/>
       <point x="402" y="1491"/>
       <point x="493" y="1520"/>
-      <point x="608" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="608" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="651" y="1520"/>
       <point x="695" y="1516"/>
-      <point x="739" y="1508" type="curve" name="at02" smooth="yes"/>
+      <point x="739" y="1508" type="curve" smooth="yes" name="at02"/>
       <point x="778" y="1501"/>
       <point x="823" y="1489"/>
       <point x="874" y="1473" type="curve"/>
@@ -41,13 +41,13 @@
       <point x="752" y="1348" type="curve" smooth="yes"/>
       <point x="711" y="1360"/>
       <point x="668" y="1366"/>
-      <point x="624" y="1366" type="curve" name="hr01" smooth="yes"/>
+      <point x="624" y="1366" type="curve" smooth="yes" name="hr01"/>
       <point x="557" y="1366"/>
       <point x="505" y="1351"/>
       <point x="468" y="1321" type="curve" smooth="yes"/>
       <point x="431" y="1291"/>
       <point x="412" y="1250"/>
-      <point x="412" y="1197" type="curve" name="sh02" smooth="yes"/>
+      <point x="412" y="1197" type="curve" smooth="yes" name="sh02"/>
       <point x="412" y="1158"/>
       <point x="422" y="1118"/>
       <point x="441" y="1075" type="curve" smooth="yes"/>
@@ -60,13 +60,13 @@
       <point x="1021" y="472" type="curve" smooth="yes"/>
       <point x="1034" y="523"/>
       <point x="1040" y="583"/>
-      <point x="1040" y="647" type="curve" name="dh03" smooth="yes"/>
+      <point x="1040" y="647" type="curve" smooth="yes" name="dh03"/>
       <point x="1040" y="674"/>
       <point x="1040" y="706"/>
-      <point x="1037" y="753" type="curve" name="sh03" smooth="yes"/>
+      <point x="1037" y="753" type="curve" smooth="yes" name="sh03"/>
       <point x="1036" y="760" type="line"/>
       <point x="1200" y="760" type="line"/>
-      <point x="1200" y="721" type="line" name="dh04" smooth="yes"/>
+      <point x="1200" y="721" type="line" smooth="yes" name="dh04"/>
       <point x="1200" y="613"/>
       <point x="1188" y="519"/>
       <point x="1163" y="439" type="curve" smooth="yes"/>
@@ -78,12 +78,12 @@
       <point x="930" y="109" type="line"/>
       <point x="877" y="64"/>
       <point x="821" y="29"/>
-      <point x="753" y="5" type="curve" name="ab02" smooth="yes"/>
+      <point x="753" y="5" type="curve" smooth="yes" name="ab02"/>
       <point x="697" y="-15"/>
       <point x="628" y="-30"/>
     </contour>
     <contour>
-      <point x="585" y="125" type="curve" name="dv02" smooth="yes"/>
+      <point x="585" y="125" type="curve" smooth="yes" name="dv02"/>
       <point x="618" y="125"/>
       <point x="645" y="129"/>
       <point x="676" y="137" type="curve" smooth="yes"/>
@@ -102,7 +102,7 @@
       <point x="279" y="649" type="curve" smooth="yes"/>
       <point x="248" y="594"/>
       <point x="233" y="536"/>
-      <point x="233" y="473" type="curve" name="dh02" smooth="yes"/>
+      <point x="233" y="473" type="curve" smooth="yes" name="dh02"/>
       <point x="233" y="377"/>
       <point x="265" y="292"/>
       <point x="332" y="225" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/angle.glif b/source/Hack-Regular.ufo/glyphs/angle.glif
index 3e37e3fea..15ed0c692 100644
--- a/source/Hack-Regular.ufo/glyphs/angle.glif
+++ b/source/Hack-Regular.ufo/glyphs/angle.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="angle" format="1">
+<glyph name="angle" format="2">
   <advance width="1233"/>
   <unicode hex="2220"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/aogonek.glif b/source/Hack-Regular.ufo/glyphs/aogonek.glif
index 64c290c4a..4443d0284 100644
--- a/source/Hack-Regular.ufo/glyphs/aogonek.glif
+++ b/source/Hack-Regular.ufo/glyphs/aogonek.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="aogonek" format="1">
+<glyph name="aogonek" format="2">
   <advance width="1233"/>
   <unicode hex="0105"/>
   <outline>
     <contour>
-      <point x="1078" y="-269" type="curve" name="dv02" smooth="yes"/>
+      <point x="1078" y="-269" type="curve" smooth="yes" name="dv02"/>
       <point x="1119" y="-269"/>
       <point x="1161" y="-259"/>
       <point x="1202" y="-239" type="curve" name="dh04"/>
       <point x="1202" y="-372" type="line"/>
       <point x="1146" y="-387"/>
       <point x="1108" y="-392"/>
-      <point x="1059" y="-392" type="curve" name="dv01" smooth="yes"/>
+      <point x="1059" y="-392" type="curve" smooth="yes" name="dv01"/>
       <point x="910" y="-392"/>
       <point x="829" y="-337"/>
-      <point x="829" y="-218" type="curve" name="dh03" smooth="yes"/>
+      <point x="829" y="-218" type="curve" smooth="yes" name="dh03"/>
       <point x="829" y="-152"/>
       <point x="855" y="-92"/>
       <point x="935" y="1" type="curve" name="ab01"/>
@@ -29,13 +29,13 @@
       <point x="729" y="19" type="curve" smooth="yes"/>
       <point x="665" y="-14"/>
       <point x="594" y="-29"/>
-      <point x="513" y="-29" type="curve" name="hr01" smooth="yes"/>
+      <point x="513" y="-29" type="curve" smooth="yes" name="hr01"/>
       <point x="397" y="-29"/>
       <point x="305" y="3"/>
       <point x="238" y="68" type="curve" smooth="yes"/>
       <point x="174" y="129"/>
       <point x="136" y="210"/>
-      <point x="136" y="327" type="curve" name="dh01" smooth="yes"/>
+      <point x="136" y="327" type="curve" smooth="yes" name="dh01"/>
       <point x="136" y="450"/>
       <point x="178" y="545"/>
       <point x="262" y="610" type="curve" smooth="yes"/>
@@ -49,7 +49,7 @@
       <point x="809" y="931" type="curve" smooth="yes"/>
       <point x="765" y="971"/>
       <point x="692" y="991"/>
-      <point x="596" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="596" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="533" y="991"/>
       <point x="469" y="982"/>
       <point x="405" y="964" type="curve" smooth="yes"/>
@@ -62,7 +62,7 @@
       <point x="414" y="1128" type="curve" smooth="yes"/>
       <point x="475" y="1141"/>
       <point x="536" y="1147"/>
-      <point x="597" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="597" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="692" y="1147"/>
       <point x="767" y="1133"/>
       <point x="834" y="1105" type="curve" smooth="yes"/>
@@ -74,11 +74,11 @@
       <point x="1046" y="860" type="curve" smooth="yes"/>
       <point x="1057" y="811"/>
       <point x="1062" y="738"/>
-      <point x="1062" y="639" type="curve" name="sh01" smooth="yes"/>
+      <point x="1062" y="639" type="curve" smooth="yes" name="sh01"/>
       <point x="1062" y="410" type="line"/>
       <point x="1065" y="333"/>
       <point x="1064" y="277"/>
-      <point x="1071" y="226" type="curve" name="sh02" smooth="yes"/>
+      <point x="1071" y="226" type="curve" smooth="yes" name="sh02"/>
       <point x="1078" y="170"/>
       <point x="1087" y="116"/>
       <point x="1094" y="91" type="curve" smooth="yes"/>
@@ -88,7 +88,7 @@
       <point x="1054" y="0" type="line"/>
       <point x="991" y="-85"/>
       <point x="968" y="-137"/>
-      <point x="968" y="-181" type="curve" name="sh03" smooth="yes"/>
+      <point x="968" y="-181" type="curve" smooth="yes" name="sh03"/>
       <point x="968" y="-237"/>
       <point x="1006" y="-269"/>
     </contour>
@@ -100,13 +100,13 @@
       <point x="402" y="507" type="curve" smooth="yes"/>
       <point x="345" y="468"/>
       <point x="320" y="412"/>
-      <point x="320" y="337" type="curve" name="dh02" smooth="yes"/>
+      <point x="320" y="337" type="curve" smooth="yes" name="dh02"/>
       <point x="320" y="268"/>
       <point x="342" y="217"/>
-      <point x="381" y="181" type="curve" name="hr03" smooth="yes"/>
+      <point x="381" y="181" type="curve" smooth="yes" name="hr03"/>
       <point x="420" y="146"/>
       <point x="474" y="125"/>
-      <point x="551" y="125" type="curve" name="dv05" smooth="yes"/>
+      <point x="551" y="125" type="curve" smooth="yes" name="dv05"/>
       <point x="652" y="125"/>
       <point x="731" y="160"/>
       <point x="789" y="231" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/approxequal.glif b/source/Hack-Regular.ufo/glyphs/approxequal.glif
index 4044baedb..7ffa941ed 100644
--- a/source/Hack-Regular.ufo/glyphs/approxequal.glif
+++ b/source/Hack-Regular.ufo/glyphs/approxequal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="approxequal" format="1">
+<glyph name="approxequal" format="2">
   <advance width="1233"/>
   <unicode hex="2248"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="239" y="936" type="curve" smooth="yes"/>
       <point x="287" y="955"/>
       <point x="335" y="963"/>
-      <point x="407" y="963" type="curve" name="hr01" smooth="yes"/>
+      <point x="407" y="963" type="curve" smooth="yes" name="hr01"/>
       <point x="430" y="963"/>
       <point x="448" y="962"/>
       <point x="498" y="951" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="655" y="894" type="curve" smooth="yes"/>
       <point x="718" y="863"/>
       <point x="798" y="840"/>
-      <point x="866" y="840" type="curve" name="hr02" smooth="yes"/>
+      <point x="866" y="840" type="curve" smooth="yes" name="hr02"/>
       <point x="911" y="840"/>
       <point x="957" y="850"/>
       <point x="1003" y="870" type="curve" smooth="yes"/>
@@ -35,7 +35,7 @@
       <point x="999" y="702" type="curve" smooth="yes"/>
       <point x="951" y="683"/>
       <point x="901" y="674"/>
-      <point x="850" y="674" type="curve" name="hr04" smooth="yes"/>
+      <point x="850" y="674" type="curve" smooth="yes" name="hr04"/>
       <point x="775" y="674"/>
       <point x="718" y="694"/>
       <point x="645" y="725" type="curve" smooth="yes"/>
@@ -45,10 +45,10 @@
       <point x="484" y="785" type="curve" smooth="yes"/>
       <point x="449" y="793"/>
       <point x="415" y="797"/>
-      <point x="382" y="797" type="curve" name="hr05" smooth="yes"/>
+      <point x="382" y="797" type="curve" smooth="yes" name="hr05"/>
       <point x="327" y="797"/>
       <point x="275" y="787"/>
-      <point x="232" y="768" type="curve" name="hr06" smooth="yes"/>
+      <point x="232" y="768" type="curve" smooth="yes" name="hr06"/>
       <point x="191" y="751"/>
       <point x="139" y="719"/>
       <point x="88" y="674" type="curve"/>
@@ -60,7 +60,7 @@
       <point x="240" y="569" type="curve" smooth="yes"/>
       <point x="283" y="585"/>
       <point x="337" y="596"/>
-      <point x="392" y="596" type="curve" name="hr07" smooth="yes"/>
+      <point x="392" y="596" type="curve" smooth="yes" name="hr07"/>
       <point x="459" y="596"/>
       <point x="535" y="578"/>
       <point x="621" y="541" type="curve"/>
@@ -68,7 +68,7 @@
       <point x="655" y="526" type="line" smooth="yes"/>
       <point x="735" y="490"/>
       <point x="794" y="471"/>
-      <point x="862" y="471" type="curve" name="hr08" smooth="yes"/>
+      <point x="862" y="471" type="curve" smooth="yes" name="hr08"/>
       <point x="917" y="471"/>
       <point x="958" y="483"/>
       <point x="1001" y="502" type="curve" smooth="yes"/>
@@ -81,7 +81,7 @@
       <point x="999" y="333" type="curve" smooth="yes"/>
       <point x="951" y="314"/>
       <point x="899" y="305"/>
-      <point x="851" y="305" type="curve" name="hr10" smooth="yes"/>
+      <point x="851" y="305" type="curve" smooth="yes" name="hr10"/>
       <point x="786" y="305"/>
       <point x="721" y="321"/>
       <point x="645" y="356" type="curve" smooth="yes"/>
@@ -91,10 +91,10 @@
       <point x="480" y="419" type="curve" smooth="yes"/>
       <point x="455" y="426"/>
       <point x="414" y="430"/>
-      <point x="379" y="430" type="curve" name="hr11" smooth="yes"/>
+      <point x="379" y="430" type="curve" smooth="yes" name="hr11"/>
       <point x="328" y="430"/>
       <point x="280" y="420"/>
-      <point x="233" y="400" type="curve" name="hr12" smooth="yes"/>
+      <point x="233" y="400" type="curve" smooth="yes" name="hr12"/>
       <point x="186" y="380"/>
       <point x="137" y="348"/>
       <point x="88" y="305" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/aring.glif b/source/Hack-Regular.ufo/glyphs/aring.glif
index ad4482d90..f91c9e9fe 100644
--- a/source/Hack-Regular.ufo/glyphs/aring.glif
+++ b/source/Hack-Regular.ufo/glyphs/aring.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="aring" format="1">
+<glyph name="aring" format="2">
   <advance width="1233"/>
   <unicode hex="00E5"/>
   <outline>
     <contour>
-      <point x="619" y="1249" type="curve" name="dv05" smooth="yes"/>
+      <point x="619" y="1249" type="curve" smooth="yes" name="dv05"/>
       <point x="543" y="1249"/>
       <point x="478" y="1276"/>
       <point x="425" y="1329" type="curve" smooth="yes"/>
       <point x="372" y="1382"/>
       <point x="345" y="1447"/>
-      <point x="345" y="1524" type="curve" name="dh05" smooth="yes"/>
+      <point x="345" y="1524" type="curve" smooth="yes" name="dh05"/>
       <point x="345" y="1601"/>
       <point x="372" y="1666"/>
       <point x="425" y="1719" type="curve" smooth="yes"/>
       <point x="478" y="1772"/>
       <point x="542" y="1798"/>
-      <point x="619" y="1798" type="curve" name="dv04" smooth="yes"/>
+      <point x="619" y="1798" type="curve" smooth="yes" name="dv04"/>
       <point x="697" y="1798"/>
       <point x="762" y="1772"/>
       <point x="815" y="1719" type="curve" smooth="yes"/>
       <point x="868" y="1666"/>
       <point x="894" y="1601"/>
-      <point x="894" y="1524" type="curve" name="ih01" smooth="yes"/>
+      <point x="894" y="1524" type="curve" smooth="yes" name="ih01"/>
       <point x="894" y="1447"/>
       <point x="868" y="1382"/>
       <point x="815" y="1329" type="curve" smooth="yes"/>
@@ -30,30 +30,30 @@
       <point x="696" y="1249"/>
     </contour>
     <contour>
-      <point x="619" y="1372" type="curve" name="dv06" smooth="yes"/>
+      <point x="619" y="1372" type="curve" smooth="yes" name="dv06"/>
       <point x="704" y="1372"/>
       <point x="771" y="1439"/>
-      <point x="771" y="1524" type="curve" name="sh01" smooth="yes"/>
+      <point x="771" y="1524" type="curve" smooth="yes" name="sh01"/>
       <point x="771" y="1608"/>
       <point x="705" y="1675"/>
-      <point x="618" y="1675" type="curve" name="dv03" smooth="yes"/>
+      <point x="618" y="1675" type="curve" smooth="yes" name="dv03"/>
       <point x="576" y="1675"/>
       <point x="541" y="1661"/>
-      <point x="512" y="1632" type="curve" name="hr01" smooth="yes"/>
+      <point x="512" y="1632" type="curve" smooth="yes" name="hr01"/>
       <point x="483" y="1603"/>
       <point x="468" y="1567"/>
-      <point x="468" y="1524" type="curve" name="dh06" smooth="yes"/>
+      <point x="468" y="1524" type="curve" smooth="yes" name="dh06"/>
       <point x="468" y="1439"/>
       <point x="535" y="1372"/>
     </contour>
     <contour>
-      <point x="513" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="513" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="397" y="-29"/>
       <point x="305" y="3"/>
       <point x="238" y="68" type="curve" smooth="yes"/>
       <point x="174" y="129"/>
       <point x="136" y="210"/>
-      <point x="136" y="327" type="curve" name="dh01" smooth="yes"/>
+      <point x="136" y="327" type="curve" smooth="yes" name="dh01"/>
       <point x="136" y="450"/>
       <point x="178" y="545"/>
       <point x="262" y="610" type="curve" smooth="yes"/>
@@ -67,7 +67,7 @@
       <point x="809" y="931" type="curve" smooth="yes"/>
       <point x="765" y="971"/>
       <point x="692" y="991"/>
-      <point x="596" y="991" type="curve" name="dv08" smooth="yes"/>
+      <point x="596" y="991" type="curve" smooth="yes" name="dv08"/>
       <point x="533" y="991"/>
       <point x="469" y="982"/>
       <point x="405" y="964" type="curve" smooth="yes"/>
@@ -80,7 +80,7 @@
       <point x="414" y="1128" type="curve" smooth="yes"/>
       <point x="475" y="1141"/>
       <point x="536" y="1147"/>
-      <point x="597" y="1147" type="curve" name="dv09" smooth="yes"/>
+      <point x="597" y="1147" type="curve" smooth="yes" name="dv09"/>
       <point x="692" y="1147"/>
       <point x="767" y="1133"/>
       <point x="834" y="1105" type="curve" smooth="yes"/>
@@ -92,11 +92,11 @@
       <point x="1046" y="860" type="curve" smooth="yes"/>
       <point x="1057" y="811"/>
       <point x="1062" y="738"/>
-      <point x="1062" y="639" type="curve" name="dh04" smooth="yes"/>
+      <point x="1062" y="639" type="curve" smooth="yes" name="dh04"/>
       <point x="1062" y="410" type="line"/>
       <point x="1065" y="333"/>
       <point x="1064" y="277"/>
-      <point x="1071" y="226" type="curve" name="hr02" smooth="yes"/>
+      <point x="1071" y="226" type="curve" smooth="yes" name="hr02"/>
       <point x="1078" y="170"/>
       <point x="1087" y="116"/>
       <point x="1094" y="91" type="curve" smooth="yes"/>
@@ -117,13 +117,13 @@
       <point x="594" y="-29"/>
     </contour>
     <contour>
-      <point x="551" y="125" type="curve" name="dv02" smooth="yes"/>
+      <point x="551" y="125" type="curve" smooth="yes" name="dv02"/>
       <point x="652" y="125"/>
       <point x="731" y="160"/>
       <point x="789" y="231" type="curve" smooth="yes"/>
       <point x="848" y="303"/>
       <point x="877" y="400"/>
-      <point x="877" y="522" type="curve" name="sh03" smooth="yes"/>
+      <point x="877" y="522" type="curve" smooth="yes" name="sh03"/>
       <point x="877" y="563" type="line" name="dv07"/>
       <point x="644" y="563" type="line" smooth="yes"/>
       <point x="537" y="563"/>
@@ -131,7 +131,7 @@
       <point x="402" y="507" type="curve" smooth="yes"/>
       <point x="345" y="468"/>
       <point x="320" y="412"/>
-      <point x="320" y="337" type="curve" name="dh02" smooth="yes"/>
+      <point x="320" y="337" type="curve" smooth="yes" name="dh02"/>
       <point x="320" y="268"/>
       <point x="342" y="217"/>
       <point x="381" y="181" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/arrowboth.glif b/source/Hack-Regular.ufo/glyphs/arrowboth.glif
index 579e9af35..a682509b7 100644
--- a/source/Hack-Regular.ufo/glyphs/arrowboth.glif
+++ b/source/Hack-Regular.ufo/glyphs/arrowboth.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowboth" format="1">
+<glyph name="arrowboth" format="2">
   <advance width="1233"/>
   <unicode hex="2194"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/arrowdblboth.glif b/source/Hack-Regular.ufo/glyphs/arrowdblboth.glif
index b2b312569..8d65e12c1 100644
--- a/source/Hack-Regular.ufo/glyphs/arrowdblboth.glif
+++ b/source/Hack-Regular.ufo/glyphs/arrowdblboth.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowdblboth" format="1">
+<glyph name="arrowdblboth" format="2">
   <advance width="1233"/>
   <unicode hex="21D4"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/arrowdbldown.glif b/source/Hack-Regular.ufo/glyphs/arrowdbldown.glif
index 3d57ac1b2..894acf78d 100644
--- a/source/Hack-Regular.ufo/glyphs/arrowdbldown.glif
+++ b/source/Hack-Regular.ufo/glyphs/arrowdbldown.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowdbldown" format="1">
+<glyph name="arrowdbldown" format="2">
   <advance width="1233"/>
   <unicode hex="21D3"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/arrowdblleft.glif b/source/Hack-Regular.ufo/glyphs/arrowdblleft.glif
index 6d3550a27..abca25d60 100644
--- a/source/Hack-Regular.ufo/glyphs/arrowdblleft.glif
+++ b/source/Hack-Regular.ufo/glyphs/arrowdblleft.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowdblleft" format="1">
+<glyph name="arrowdblleft" format="2">
   <advance width="1233"/>
   <unicode hex="21D0"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/arrowdblright.glif b/source/Hack-Regular.ufo/glyphs/arrowdblright.glif
index 7c0c7ef9d..5a557ebef 100644
--- a/source/Hack-Regular.ufo/glyphs/arrowdblright.glif
+++ b/source/Hack-Regular.ufo/glyphs/arrowdblright.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowdblright" format="1">
+<glyph name="arrowdblright" format="2">
   <advance width="1233"/>
   <unicode hex="21D2"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/arrowdblup.glif b/source/Hack-Regular.ufo/glyphs/arrowdblup.glif
index f5e947b63..e25b57598 100644
--- a/source/Hack-Regular.ufo/glyphs/arrowdblup.glif
+++ b/source/Hack-Regular.ufo/glyphs/arrowdblup.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowdblup" format="1">
+<glyph name="arrowdblup" format="2">
   <advance width="1233"/>
   <unicode hex="21D1"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/arrowdown.glif b/source/Hack-Regular.ufo/glyphs/arrowdown.glif
index 56d9f1a7b..1bf71f83e 100644
--- a/source/Hack-Regular.ufo/glyphs/arrowdown.glif
+++ b/source/Hack-Regular.ufo/glyphs/arrowdown.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowdown" format="1">
+<glyph name="arrowdown" format="2">
   <advance width="1233"/>
   <unicode hex="2193"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/arrowleft.glif b/source/Hack-Regular.ufo/glyphs/arrowleft.glif
index 7cd249bb7..3c47574db 100644
--- a/source/Hack-Regular.ufo/glyphs/arrowleft.glif
+++ b/source/Hack-Regular.ufo/glyphs/arrowleft.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowleft" format="1">
+<glyph name="arrowleft" format="2">
   <advance width="1233"/>
   <unicode hex="2190"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/arrowright.glif b/source/Hack-Regular.ufo/glyphs/arrowright.glif
index ed94c7222..08129570c 100644
--- a/source/Hack-Regular.ufo/glyphs/arrowright.glif
+++ b/source/Hack-Regular.ufo/glyphs/arrowright.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowright" format="1">
+<glyph name="arrowright" format="2">
   <advance width="1233"/>
   <unicode hex="2192"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/arrowup.glif b/source/Hack-Regular.ufo/glyphs/arrowup.glif
index 4d5cf67e5..fb5330471 100644
--- a/source/Hack-Regular.ufo/glyphs/arrowup.glif
+++ b/source/Hack-Regular.ufo/glyphs/arrowup.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowup" format="1">
+<glyph name="arrowup" format="2">
   <advance width="1233"/>
   <unicode hex="2191"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/arrowupdn.glif b/source/Hack-Regular.ufo/glyphs/arrowupdn.glif
index 2db0da577..73c605f8e 100644
--- a/source/Hack-Regular.ufo/glyphs/arrowupdn.glif
+++ b/source/Hack-Regular.ufo/glyphs/arrowupdn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowupdn" format="1">
+<glyph name="arrowupdn" format="2">
   <advance width="1233"/>
   <unicode hex="2195"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/arrowupdnbse.glif b/source/Hack-Regular.ufo/glyphs/arrowupdnbse.glif
index 9ebab81c0..db093e9ac 100644
--- a/source/Hack-Regular.ufo/glyphs/arrowupdnbse.glif
+++ b/source/Hack-Regular.ufo/glyphs/arrowupdnbse.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowupdnbse" format="1">
+<glyph name="arrowupdnbse" format="2">
   <advance width="1233"/>
   <unicode hex="21A8"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/asciicircum.glif b/source/Hack-Regular.ufo/glyphs/asciicircum.glif
index 9b7325077..91f231c12 100644
--- a/source/Hack-Regular.ufo/glyphs/asciicircum.glif
+++ b/source/Hack-Regular.ufo/glyphs/asciicircum.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="asciicircum" format="1">
+<glyph name="asciicircum" format="2">
   <advance width="1233"/>
   <unicode hex="005E"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/asciitilde.glif b/source/Hack-Regular.ufo/glyphs/asciitilde.glif
index 2c2a98ec4..ef85e23d3 100644
--- a/source/Hack-Regular.ufo/glyphs/asciitilde.glif
+++ b/source/Hack-Regular.ufo/glyphs/asciitilde.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="asciitilde" format="1">
+<glyph name="asciitilde" format="2">
   <advance width="1233"/>
   <unicode hex="007E"/>
   <outline>
@@ -44,7 +44,7 @@
       <point x="649" y="679" type="curve" smooth="yes"/>
       <point x="685" y="630"/>
       <point x="720" y="588"/>
-      <point x="754" y="554" type="curve" name="hr01" smooth="yes"/>
+      <point x="754" y="554" type="curve" smooth="yes" name="hr01"/>
       <point x="782" y="525"/>
       <point x="809" y="510"/>
       <point x="842" y="510" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/asterisk.glif b/source/Hack-Regular.ufo/glyphs/asterisk.glif
index ae25225ac..c473e3f21 100644
--- a/source/Hack-Regular.ufo/glyphs/asterisk.glif
+++ b/source/Hack-Regular.ufo/glyphs/asterisk.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="asterisk" format="1">
+<glyph name="asterisk" format="2">
   <advance width="1233"/>
   <unicode hex="002A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/asteriskmath.glif b/source/Hack-Regular.ufo/glyphs/asteriskmath.glif
index 7a17e9143..dc2a1e93a 100644
--- a/source/Hack-Regular.ufo/glyphs/asteriskmath.glif
+++ b/source/Hack-Regular.ufo/glyphs/asteriskmath.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="asteriskmath" format="1">
+<glyph name="asteriskmath" format="2">
   <advance width="1233"/>
   <unicode hex="2217"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/at.glif b/source/Hack-Regular.ufo/glyphs/at.glif
index 02ef8217e..1f13b4439 100644
--- a/source/Hack-Regular.ufo/glyphs/at.glif
+++ b/source/Hack-Regular.ufo/glyphs/at.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="at" format="1">
+<glyph name="at" format="2">
   <advance width="1233"/>
   <unicode hex="0040"/>
   <outline>
     <contour>
-      <point x="796" y="-319" type="curve" name="hr00" smooth="yes"/>
+      <point x="796" y="-319" type="curve" smooth="yes" name="hr00"/>
       <point x="577" y="-319"/>
       <point x="379" y="-244"/>
       <point x="236" y="-87" type="curve" smooth="yes"/>
       <point x="101" y="62"/>
       <point x="27" y="275"/>
-      <point x="27" y="547" type="curve" name="dh01" smooth="yes"/>
+      <point x="27" y="547" type="curve" smooth="yes" name="dh01"/>
       <point x="27" y="798"/>
       <point x="89" y="1011"/>
       <point x="214" y="1164" type="curve" smooth="yes"/>
       <point x="342" y="1321"/>
       <point x="518" y="1395"/>
-      <point x="709" y="1395" type="curve" name="dv03" smooth="yes"/>
+      <point x="709" y="1395" type="curve" smooth="yes" name="dv03"/>
       <point x="1006" y="1395"/>
       <point x="1178" y="1205"/>
       <point x="1178" y="905" type="curve" smooth="yes"/>
@@ -28,19 +28,19 @@
       <point x="932" y="149" type="curve" smooth="yes"/>
       <point x="889" y="126"/>
       <point x="840" y="115"/>
-      <point x="785" y="115" type="curve" name="dv04" smooth="yes"/>
+      <point x="785" y="115" type="curve" smooth="yes" name="dv04"/>
       <point x="678" y="115"/>
       <point x="585" y="158"/>
       <point x="517" y="235" type="curve" smooth="yes"/>
       <point x="453" y="307"/>
       <point x="412" y="414"/>
-      <point x="412" y="546" type="curve" name="dh03" smooth="yes"/>
+      <point x="412" y="546" type="curve" smooth="yes" name="dh03"/>
       <point x="412" y="667"/>
       <point x="446" y="773"/>
       <point x="517" y="854" type="curve" smooth="yes"/>
       <point x="590" y="938"/>
       <point x="685" y="975"/>
-      <point x="782" y="975" type="curve" name="dv07" smooth="yes"/>
+      <point x="782" y="975" type="curve" smooth="yes" name="dv07"/>
       <point x="838" y="975"/>
       <point x="886" y="963"/>
       <point x="931" y="940" type="curve" smooth="yes"/>
@@ -53,19 +53,19 @@
       <point x="947" y="1159" type="curve" smooth="yes"/>
       <point x="891" y="1220"/>
       <point x="809" y="1253"/>
-      <point x="702" y="1253" type="curve" name="dv02" smooth="yes"/>
+      <point x="702" y="1253" type="curve" smooth="yes" name="dv02"/>
       <point x="553" y="1253"/>
       <point x="419" y="1190"/>
       <point x="322" y="1062" type="curve" smooth="yes"/>
       <point x="227" y="938"/>
       <point x="176" y="764"/>
-      <point x="176" y="549" type="curve" name="dh02" smooth="yes"/>
+      <point x="176" y="549" type="curve" smooth="yes" name="dh02"/>
       <point x="176" y="322"/>
       <point x="233" y="143"/>
       <point x="340" y="18" type="curve" smooth="yes"/>
       <point x="444" y="-106"/>
       <point x="595" y="-176"/>
-      <point x="778" y="-176" type="curve" name="dv01" smooth="yes"/>
+      <point x="778" y="-176" type="curve" smooth="yes" name="dv01"/>
       <point x="854" y="-176"/>
       <point x="922" y="-164"/>
       <point x="999" y="-135" type="curve"/>
@@ -77,22 +77,22 @@
       <point x="847" y="-319"/>
     </contour>
     <contour>
-      <point x="803" y="260" type="curve" name="dv05" smooth="yes"/>
+      <point x="803" y="260" type="curve" smooth="yes" name="dv05"/>
       <point x="946" y="260"/>
       <point x="1038" y="374"/>
-      <point x="1038" y="545" type="curve" name="sh02" smooth="yes"/>
+      <point x="1038" y="545" type="curve" smooth="yes" name="sh02"/>
       <point x="1038" y="629"/>
       <point x="1017" y="702"/>
       <point x="974" y="753" type="curve" smooth="yes"/>
       <point x="933" y="802"/>
       <point x="873" y="829"/>
-      <point x="802" y="829" type="curve" name="dv06" smooth="yes"/>
+      <point x="802" y="829" type="curve" smooth="yes" name="dv06"/>
       <point x="732" y="829"/>
       <point x="675" y="803"/>
       <point x="632" y="752" type="curve" smooth="yes"/>
       <point x="589" y="701"/>
       <point x="567" y="633"/>
-      <point x="567" y="546" type="curve" name="dh04" smooth="yes"/>
+      <point x="567" y="546" type="curve" smooth="yes" name="dh04"/>
       <point x="567" y="458"/>
       <point x="589" y="388"/>
       <point x="632" y="337" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/atilde.glif b/source/Hack-Regular.ufo/glyphs/atilde.glif
index 4676ea1f3..1e5b3d82e 100644
--- a/source/Hack-Regular.ufo/glyphs/atilde.glif
+++ b/source/Hack-Regular.ufo/glyphs/atilde.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="atilde" format="1">
+<glyph name="atilde" format="2">
   <advance width="1233"/>
   <unicode hex="00E3"/>
   <outline>
@@ -10,14 +10,14 @@
       <point x="342" y="1547" type="curve" smooth="yes"/>
       <point x="376" y="1596"/>
       <point x="423" y="1621"/>
-      <point x="483" y="1621" type="curve" name="dv04" smooth="yes"/>
+      <point x="483" y="1621" type="curve" smooth="yes" name="dv04"/>
       <point x="509" y="1621"/>
       <point x="533" y="1616"/>
       <point x="555" y="1607" type="curve" smooth="yes"/>
       <point x="575" y="1598"/>
       <point x="598" y="1583"/>
       <point x="624" y="1560" type="curve"/>
-      <point x="681" y="1505" type="line" name="at01" smooth="yes"/>
+      <point x="681" y="1505" type="line" smooth="yes" name="at01"/>
       <point x="696" y="1492"/>
       <point x="711" y="1481"/>
       <point x="719" y="1476" type="curve" smooth="yes"/>
@@ -26,7 +26,7 @@
       <point x="749" y="1466" type="curve" smooth="yes"/>
       <point x="774" y="1466"/>
       <point x="793" y="1478"/>
-      <point x="805" y="1503" type="curve" name="at02" smooth="yes"/>
+      <point x="805" y="1503" type="curve" smooth="yes" name="at02"/>
       <point x="816" y="1527"/>
       <point x="823" y="1566"/>
       <point x="824" y="1621" type="curve" name="sv01"/>
@@ -36,20 +36,20 @@
       <point x="897" y="1413" type="curve" smooth="yes"/>
       <point x="863" y="1364"/>
       <point x="816" y="1339"/>
-      <point x="756" y="1339" type="curve" name="sv02" smooth="yes"/>
+      <point x="756" y="1339" type="curve" smooth="yes" name="sv02"/>
       <point x="730" y="1339"/>
       <point x="706" y="1344"/>
-      <point x="684" y="1353" type="curve" name="hr01" smooth="yes"/>
+      <point x="684" y="1353" type="curve" smooth="yes" name="hr01"/>
       <point x="664" y="1362"/>
       <point x="641" y="1377"/>
       <point x="615" y="1400" type="curve"/>
       <point x="558" y="1455" type="line" smooth="yes"/>
       <point x="541" y="1471"/>
       <point x="528" y="1480"/>
-      <point x="520" y="1485" type="curve" name="at03" smooth="yes"/>
+      <point x="520" y="1485" type="curve" smooth="yes" name="at03"/>
       <point x="508" y="1492"/>
       <point x="501" y="1494"/>
-      <point x="490" y="1494" type="curve" name="at04" smooth="yes"/>
+      <point x="490" y="1494" type="curve" smooth="yes" name="at04"/>
       <point x="465" y="1494"/>
       <point x="446" y="1482"/>
       <point x="434" y="1457" type="curve" smooth="yes"/>
@@ -58,13 +58,13 @@
       <point x="414" y="1339" type="curve" name="dv03"/>
     </contour>
     <contour>
-      <point x="513" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="513" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="397" y="-29"/>
       <point x="305" y="3"/>
       <point x="238" y="68" type="curve" smooth="yes"/>
       <point x="174" y="129"/>
       <point x="136" y="210"/>
-      <point x="136" y="327" type="curve" name="sh01" smooth="yes"/>
+      <point x="136" y="327" type="curve" smooth="yes" name="sh01"/>
       <point x="136" y="450"/>
       <point x="178" y="545"/>
       <point x="262" y="610" type="curve" smooth="yes"/>
@@ -78,7 +78,7 @@
       <point x="809" y="931" type="curve" smooth="yes"/>
       <point x="765" y="971"/>
       <point x="692" y="991"/>
-      <point x="596" y="991" type="curve" name="dv06" smooth="yes"/>
+      <point x="596" y="991" type="curve" smooth="yes" name="dv06"/>
       <point x="533" y="991"/>
       <point x="469" y="982"/>
       <point x="405" y="964" type="curve" smooth="yes"/>
@@ -91,23 +91,23 @@
       <point x="414" y="1128" type="curve" smooth="yes"/>
       <point x="475" y="1141"/>
       <point x="536" y="1147"/>
-      <point x="597" y="1147" type="curve" name="dv07" smooth="yes"/>
+      <point x="597" y="1147" type="curve" smooth="yes" name="dv07"/>
       <point x="692" y="1147"/>
       <point x="767" y="1133"/>
       <point x="834" y="1105" type="curve" smooth="yes"/>
       <point x="895" y="1078"/>
       <point x="953" y="1037"/>
-      <point x="992" y="984" type="curve" name="hr02" smooth="yes"/>
+      <point x="992" y="984" type="curve" smooth="yes" name="hr02"/>
       <point x="1020" y="945"/>
       <point x="1037" y="901"/>
       <point x="1046" y="860" type="curve" smooth="yes"/>
       <point x="1057" y="811"/>
       <point x="1062" y="738"/>
-      <point x="1062" y="639" type="curve" name="sh03" smooth="yes"/>
+      <point x="1062" y="639" type="curve" smooth="yes" name="sh03"/>
       <point x="1062" y="410" type="line" name="hr03"/>
       <point x="1065" y="333"/>
       <point x="1064" y="277"/>
-      <point x="1071" y="226" type="curve" name="sh04" smooth="yes"/>
+      <point x="1071" y="226" type="curve" smooth="yes" name="sh04"/>
       <point x="1078" y="170"/>
       <point x="1087" y="116"/>
       <point x="1094" y="91" type="curve" smooth="yes"/>
@@ -117,7 +117,7 @@
       <point x="936" y="0" type="line"/>
       <point x="929" y="16"/>
       <point x="918" y="50"/>
-      <point x="909" y="87" type="curve" name="hr04" smooth="yes"/>
+      <point x="909" y="87" type="curve" smooth="yes" name="hr04"/>
       <point x="902" y="116"/>
       <point x="896" y="149"/>
       <point x="893" y="170" type="curve" name="ih02"/>
@@ -128,13 +128,13 @@
       <point x="594" y="-29"/>
     </contour>
     <contour>
-      <point x="551" y="125" type="curve" name="dv02" smooth="yes"/>
+      <point x="551" y="125" type="curve" smooth="yes" name="dv02"/>
       <point x="652" y="125"/>
       <point x="731" y="160"/>
       <point x="789" y="231" type="curve" smooth="yes"/>
       <point x="848" y="303"/>
       <point x="877" y="400"/>
-      <point x="877" y="522" type="curve" name="sh05" smooth="yes"/>
+      <point x="877" y="522" type="curve" smooth="yes" name="sh05"/>
       <point x="877" y="563" type="line" name="dv05"/>
       <point x="644" y="563" type="line" smooth="yes"/>
       <point x="537" y="563"/>
@@ -142,7 +142,7 @@
       <point x="402" y="507" type="curve" smooth="yes"/>
       <point x="345" y="468"/>
       <point x="320" y="412"/>
-      <point x="320" y="337" type="curve" name="sh02" smooth="yes"/>
+      <point x="320" y="337" type="curve" smooth="yes" name="sh02"/>
       <point x="320" y="268"/>
       <point x="342" y="217"/>
       <point x="381" y="181" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/b.glif b/source/Hack-Regular.ufo/glyphs/b.glif
index 63bdc857a..34936f2f7 100644
--- a/source/Hack-Regular.ufo/glyphs/b.glif
+++ b/source/Hack-Regular.ufo/glyphs/b.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="b" format="1">
+<glyph name="b" format="2">
   <advance width="1233"/>
   <unicode hex="0062"/>
   <outline>
@@ -38,9 +38,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/backslash.glif b/source/Hack-Regular.ufo/glyphs/backslash.glif
index 5aa4a4ba5..01c90037c 100644
--- a/source/Hack-Regular.ufo/glyphs/backslash.glif
+++ b/source/Hack-Regular.ufo/glyphs/backslash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="backslash" format="1">
+<glyph name="backslash" format="2">
   <advance width="1233"/>
   <unicode hex="005C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/bar.glif b/source/Hack-Regular.ufo/glyphs/bar.glif
index 922866c04..8f858d7c1 100644
--- a/source/Hack-Regular.ufo/glyphs/bar.glif
+++ b/source/Hack-Regular.ufo/glyphs/bar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="bar" format="1">
+<glyph name="bar" format="2">
   <advance width="1233"/>
   <unicode hex="007C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/beta.glif b/source/Hack-Regular.ufo/glyphs/beta.glif
index b1bd07ae4..192e38f39 100644
--- a/source/Hack-Regular.ufo/glyphs/beta.glif
+++ b/source/Hack-Regular.ufo/glyphs/beta.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="beta" format="1">
+<glyph name="beta" format="2">
   <advance width="1233"/>
   <unicode hex="03B2"/>
   <outline>
     <contour>
-      <point x="152" y="1113" type="line" name="dh01" smooth="yes"/>
+      <point x="152" y="1113" type="line" smooth="yes" name="dh01"/>
       <point x="152" y="1433"/>
       <point x="361" y="1571"/>
-      <point x="574" y="1571" type="curve" name="at01" smooth="yes"/>
+      <point x="574" y="1571" type="curve" smooth="yes" name="at01"/>
       <point x="774" y="1571"/>
       <point x="1012" y="1451"/>
-      <point x="1012" y="1163" type="curve" name="dh03" smooth="yes"/>
+      <point x="1012" y="1163" type="curve" smooth="yes" name="dh03"/>
       <point x="1012" y="1021"/>
       <point x="955" y="872"/>
       <point x="840" y="810" type="curve" name="ih01"/>
       <point x="1013" y="775"/>
       <point x="1123" y="600"/>
-      <point x="1123" y="417" type="curve" name="sh02" smooth="yes"/>
+      <point x="1123" y="417" type="curve" smooth="yes" name="sh02"/>
       <point x="1123" y="165"/>
       <point x="918" y="-18"/>
       <point x="638" y="-21" type="curve" name="ab02"/>
@@ -30,26 +30,26 @@
       <point x="337" y="342" type="line"/>
       <point x="390" y="249"/>
       <point x="538" y="178"/>
-      <point x="670" y="178" type="curve" name="sv01" smooth="yes"/>
+      <point x="670" y="178" type="curve" smooth="yes" name="sv01"/>
       <point x="809" y="178"/>
       <point x="933" y="256"/>
-      <point x="933" y="440" type="curve" name="sh01" smooth="yes"/>
+      <point x="933" y="440" type="curve" smooth="yes" name="sh01"/>
       <point x="933" y="624"/>
       <point x="806" y="712"/>
-      <point x="541" y="712" type="curve" name="dv01" smooth="yes"/>
+      <point x="541" y="712" type="curve" smooth="yes" name="dv01"/>
       <point x="513" y="712"/>
       <point x="492" y="711"/>
       <point x="469" y="710" type="curve"/>
       <point x="469" y="880" type="line" name="dv02"/>
       <point x="705" y="872"/>
       <point x="832" y="988"/>
-      <point x="832" y="1154" type="curve" name="hr02" smooth="yes"/>
+      <point x="832" y="1154" type="curve" smooth="yes" name="hr02"/>
       <point x="832" y="1327"/>
       <point x="693" y="1381"/>
-      <point x="589" y="1381" type="curve" name="sv02" smooth="yes"/>
+      <point x="589" y="1381" type="curve" smooth="yes" name="sv02"/>
       <point x="462" y="1381"/>
       <point x="337" y="1302"/>
-      <point x="337" y="1107" type="curve" name="dh02" smooth="yes"/>
+      <point x="337" y="1107" type="curve" smooth="yes" name="dh02"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Regular.ufo/glyphs/block.glif b/source/Hack-Regular.ufo/glyphs/block.glif
index bf10efca1..89dc04bf7 100644
--- a/source/Hack-Regular.ufo/glyphs/block.glif
+++ b/source/Hack-Regular.ufo/glyphs/block.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="block" format="1">
+<glyph name="block" format="2">
   <advance width="1233"/>
   <unicode hex="2588"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/braceleft.glif b/source/Hack-Regular.ufo/glyphs/braceleft.glif
index 9ee37fbae..650f07ecb 100644
--- a/source/Hack-Regular.ufo/glyphs/braceleft.glif
+++ b/source/Hack-Regular.ufo/glyphs/braceleft.glif
@@ -1,73 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="braceleft" format="1">
+<glyph name="braceleft" format="2">
   <advance width="1233"/>
   <unicode hex="007B"/>
   <outline>
     <contour>
-      <point x="908" y="-253" type="line" name="hr00" smooth="yes"/>
-      <point x="743" y="-253"/>
-      <point x="632" y="-228"/>
-      <point x="575" y="-179" type="curve" smooth="yes"/>
-      <point x="518" y="-130"/>
-      <point x="490" y="-32"/>
-      <point x="490" y="116" type="curve" smooth="yes"/>
-      <point x="490" y="355" type="line" smooth="yes"/>
-      <point x="490" y="455"/>
-      <point x="472" y="525"/>
-      <point x="437" y="564" type="curve" smooth="yes"/>
-      <point x="401" y="603"/>
-      <point x="336" y="622"/>
-      <point x="243" y="622" type="curve" name="dv04" smooth="yes"/>
-      <point x="127" y="622" type="line"/>
-      <point x="127" y="765" type="line"/>
-      <point x="243" y="765" type="line" name="dv05" smooth="yes"/>
-      <point x="337" y="765"/>
-      <point x="402" y="784"/>
-      <point x="437" y="822" type="curve" smooth="yes"/>
-      <point x="472" y="861"/>
-      <point x="490" y="930"/>
-      <point x="490" y="1029" type="curve" smooth="yes"/>
-      <point x="490" y="1269" type="line" smooth="yes"/>
-      <point x="490" y="1417"/>
-      <point x="518" y="1515"/>
-      <point x="575" y="1564" type="curve" smooth="yes"/>
-      <point x="630" y="1613"/>
-      <point x="741" y="1637"/>
-      <point x="908" y="1637" type="curve" smooth="yes"/>
-      <point x="972" y="1637" type="line" name="dv03"/>
-      <point x="972" y="1494" type="line" name="dv02"/>
-      <point x="902" y="1494" type="line" smooth="yes"/>
-      <point x="809" y="1494"/>
-      <point x="748" y="1480"/>
-      <point x="720" y="1451" type="curve" smooth="yes"/>
-      <point x="691" y="1422"/>
-      <point x="677" y="1360"/>
-      <point x="677" y="1265" type="curve" smooth="yes"/>
-      <point x="677" y="1017" type="line" smooth="yes"/>
-      <point x="677" y="912"/>
-      <point x="662" y="836"/>
-      <point x="632" y="789" type="curve" smooth="yes"/>
-      <point x="603" y="744"/>
-      <point x="551" y="710"/>
-      <point x="476" y="693" type="curve" name="iv01"/>
-      <point x="624" y="657"/>
-      <point x="677" y="576"/>
-      <point x="677" y="368" type="curve" smooth="yes"/>
-      <point x="677" y="120" type="line" smooth="yes"/>
-      <point x="677" y="25"/>
-      <point x="691" y="-37"/>
-      <point x="720" y="-66" type="curve" smooth="yes"/>
-      <point x="748" y="-95"/>
-      <point x="809" y="-109"/>
-      <point x="902" y="-109" type="curve" name="dv01" smooth="yes"/>
-      <point x="972" y="-109" type="line"/>
-      <point x="972" y="-253" type="line" name="sv01"/>
+      <point x="908" y="-195" type="line" smooth="yes" name="hr00"/>
+      <point x="488" y="-195"/>
+      <point x="490" y="-65"/>
+      <point x="490" y="132" type="curve" smooth="yes"/>
+      <point x="490" y="653"/>
+      <point x="472" y="680"/>
+      <point x="127" y="680" type="curve"/>
+      <point x="127" y="823" type="line"/>
+      <point x="469" y="823"/>
+      <point x="489" y="853"/>
+      <point x="489" y="1362" type="curve" smooth="yes"/>
+      <point x="489" y="1618"/>
+      <point x="598" y="1693"/>
+      <point x="972" y="1693" type="curve" name="dv03"/>
+      <point x="972" y="1552" type="line" name="dv02"/>
+      <point x="916" y="1552" type="line" smooth="yes"/>
+      <point x="718" y="1552"/>
+      <point x="677" y="1513"/>
+      <point x="677" y="1323" type="curve" smooth="yes"/>
+      <point x="677" y="1075" type="line" smooth="yes"/>
+      <point x="677" y="875"/>
+      <point x="620" y="783"/>
+      <point x="476" y="751" type="curve" name="iv01"/>
+      <point x="621" y="716"/>
+      <point x="677" y="627"/>
+      <point x="677" y="426" type="curve" smooth="yes"/>
+      <point x="677" y="178" type="line" smooth="yes"/>
+      <point x="677" y="-11"/>
+      <point x="718" y="-51"/>
+      <point x="914" y="-51" type="curve" smooth="yes"/>
+      <point x="972" y="-51" type="line"/>
+      <point x="972" y="-195" type="line" name="sv01"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
+      <string>2018-06-05 12:06:25 +0000</string>
     </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/braceright.glif b/source/Hack-Regular.ufo/glyphs/braceright.glif
index f45b0ed01..46f157a77 100644
--- a/source/Hack-Regular.ufo/glyphs/braceright.glif
+++ b/source/Hack-Regular.ufo/glyphs/braceright.glif
@@ -1,73 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="braceright" format="1">
+<glyph name="braceright" format="2">
   <advance width="1233"/>
   <unicode hex="007D"/>
   <outline>
     <contour>
-      <point x="261" y="-118" type="line" name="hr00"/>
-      <point x="329" y="-118" type="line" name="dv02" smooth="yes"/>
-      <point x="422" y="-118"/>
-      <point x="484" y="-103"/>
-      <point x="513" y="-74" type="curve" smooth="yes"/>
-      <point x="542" y="-45"/>
-      <point x="556" y="16"/>
-      <point x="556" y="111" type="curve" smooth="yes"/>
-      <point x="556" y="359" type="line" smooth="yes"/>
-      <point x="556" y="567"/>
-      <point x="609" y="648"/>
-      <point x="757" y="684" type="curve" name="iv01"/>
-      <point x="684" y="701"/>
-      <point x="632" y="733"/>
-      <point x="602" y="780" type="curve" smooth="yes"/>
-      <point x="573" y="825"/>
-      <point x="556" y="895"/>
-      <point x="556" y="1008" type="curve" smooth="yes"/>
-      <point x="556" y="1256" type="line" smooth="yes"/>
-      <point x="556" y="1351"/>
-      <point x="542" y="1412"/>
-      <point x="513" y="1441" type="curve" smooth="yes"/>
-      <point x="484" y="1470"/>
-      <point x="422" y="1485"/>
-      <point x="329" y="1485" type="curve" name="dv03" smooth="yes"/>
-      <point x="261" y="1485" type="line"/>
-      <point x="261" y="1628" type="line"/>
-      <point x="323" y="1628" type="line" name="dv04" smooth="yes"/>
-      <point x="490" y="1628"/>
-      <point x="601" y="1604"/>
-      <point x="656" y="1555" type="curve" smooth="yes"/>
-      <point x="712" y="1506"/>
-      <point x="740" y="1407"/>
-      <point x="740" y="1260" type="curve" smooth="yes"/>
-      <point x="740" y="1020" type="line" smooth="yes"/>
-      <point x="740" y="916"/>
-      <point x="768" y="853"/>
-      <point x="824" y="813" type="curve" smooth="yes"/>
-      <point x="877" y="774"/>
-      <point x="956" y="756"/>
-      <point x="1048" y="756" type="curve" smooth="yes"/>
-      <point x="1112" y="756" type="line" name="dv06"/>
-      <point x="1112" y="613" type="line" name="dv05"/>
-      <point x="1048" y="613" type="line" smooth="yes"/>
-      <point x="953" y="613"/>
-      <point x="876" y="594"/>
-      <point x="824" y="555" type="curve" smooth="yes"/>
-      <point x="768" y="514"/>
-      <point x="740" y="450"/>
-      <point x="740" y="346" type="curve" smooth="yes"/>
-      <point x="740" y="107" type="line" smooth="yes"/>
-      <point x="740" y="-41"/>
-      <point x="712" y="-139"/>
-      <point x="656" y="-188" type="curve" smooth="yes"/>
-      <point x="599" y="-237"/>
-      <point x="488" y="-262"/>
-      <point x="323" y="-262" type="curve" name="dv01" smooth="yes"/>
-      <point x="261" y="-262" type="line"/>
+      <point x="325" y="-195" type="curve" smooth="yes" name="hr00"/>
+      <point x="261" y="-195" type="line" name="sv01"/>
+      <point x="261" y="-51" type="line"/>
+      <point x="319" y="-51" type="line" smooth="yes"/>
+      <point x="515" y="-51"/>
+      <point x="556" y="-11"/>
+      <point x="556" y="178" type="curve" smooth="yes"/>
+      <point x="556" y="426" type="line" smooth="yes"/>
+      <point x="556" y="627"/>
+      <point x="612" y="716"/>
+      <point x="757" y="751" type="curve" name="iv01"/>
+      <point x="613" y="783"/>
+      <point x="556" y="875"/>
+      <point x="556" y="1075" type="curve" smooth="yes"/>
+      <point x="556" y="1323" type="line" smooth="yes"/>
+      <point x="556" y="1513"/>
+      <point x="515" y="1552"/>
+      <point x="317" y="1552" type="curve" smooth="yes"/>
+      <point x="261" y="1552" type="line" name="dv02"/>
+      <point x="261" y="1693" type="line" name="dv03"/>
+      <point x="635" y="1693"/>
+      <point x="744" y="1618"/>
+      <point x="744" y="1362" type="curve" smooth="yes"/>
+      <point x="744" y="853"/>
+      <point x="764" y="823"/>
+      <point x="1106" y="823" type="curve"/>
+      <point x="1106" y="680" type="line"/>
+      <point x="761" y="680"/>
+      <point x="743" y="653"/>
+      <point x="743" y="132" type="curve" smooth="yes"/>
+      <point x="743" y="-65"/>
+      <point x="745" y="-195"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
+      <string>2018-06-05 12:24:17 +0000</string>
     </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/bracketleft.glif b/source/Hack-Regular.ufo/glyphs/bracketleft.glif
index 6e101fa92..2e0c889fb 100644
--- a/source/Hack-Regular.ufo/glyphs/bracketleft.glif
+++ b/source/Hack-Regular.ufo/glyphs/bracketleft.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="bracketleft" format="1">
+<glyph name="bracketleft" format="2">
   <advance width="1233"/>
   <unicode hex="005B"/>
   <outline>
     <contour>
-      <point x="323" y="1636" type="line" name="dh01"/>
-      <point x="947" y="1636" type="line" name="sh01"/>
-      <point x="947" y="1493" type="line" name="dv02"/>
-      <point x="507" y="1493" type="line" name="hr01"/>
-      <point x="507" y="-127" type="line"/>
-      <point x="947" y="-127" type="line" name="hr02"/>
-      <point x="947" y="-270" type="line" name="dv01"/>
-      <point x="323" y="-270" type="line"/>
+      <point x="323" y="1700" type="line" name="dh01"/>
+      <point x="947" y="1700" type="line" name="sh01"/>
+      <point x="947" y="1557" type="line" name="dv02"/>
+      <point x="507" y="1557" type="line" name="hr01"/>
+      <point x="507" y="-63" type="line"/>
+      <point x="947" y="-63" type="line" name="hr02"/>
+      <point x="947" y="-206" type="line" name="dv01"/>
+      <point x="323" y="-206" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
+      <string>2018-06-05 12:03:08 +0000</string>
     </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/bracketright.glif b/source/Hack-Regular.ufo/glyphs/bracketright.glif
index a2ae92a37..ef0335dec 100644
--- a/source/Hack-Regular.ufo/glyphs/bracketright.glif
+++ b/source/Hack-Regular.ufo/glyphs/bracketright.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="bracketright" format="1">
+<glyph name="bracketright" format="2">
   <advance width="1233"/>
   <unicode hex="005D"/>
   <outline>
     <contour>
-      <point x="286" y="-127" type="line" name="hr00"/>
-      <point x="726" y="-127" type="line" name="sh01"/>
-      <point x="726" y="1492" type="line" name="dv01"/>
-      <point x="286" y="1492" type="line" name="sh02"/>
-      <point x="286" y="1635" type="line"/>
-      <point x="910" y="1635" type="line" name="hr01"/>
-      <point x="910" y="-270" type="line" name="dh01"/>
-      <point x="286" y="-270" type="line" name="hr02"/>
+      <point x="286" y="-62" type="line" name="hr00"/>
+      <point x="726" y="-62" type="line" name="sh01"/>
+      <point x="726" y="1557" type="line" name="dv01"/>
+      <point x="286" y="1557" type="line" name="sh02"/>
+      <point x="286" y="1700" type="line"/>
+      <point x="910" y="1700" type="line" name="hr01"/>
+      <point x="910" y="-205" type="line" name="dh01"/>
+      <point x="286" y="-205" type="line" name="hr02"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
+      <string>2018-06-05 12:04:07 +0000</string>
     </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/breve.glif b/source/Hack-Regular.ufo/glyphs/breve.glif
index df84f610a..5c016e5fd 100644
--- a/source/Hack-Regular.ufo/glyphs/breve.glif
+++ b/source/Hack-Regular.ufo/glyphs/breve.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="breve" format="1">
+<glyph name="breve" format="2">
   <advance width="1233"/>
   <unicode hex="02D8"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="481" y="1495" type="curve" smooth="yes"/>
       <point x="512" y="1470"/>
       <point x="557" y="1458"/>
-      <point x="616" y="1458" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1458" type="curve" smooth="yes" name="dv01"/>
       <point x="673" y="1458"/>
       <point x="718" y="1470"/>
       <point x="749" y="1495" type="curve" smooth="yes"/>
@@ -23,7 +23,7 @@
       <point x="840" y="1393" type="curve" smooth="yes"/>
       <point x="787" y="1345"/>
       <point x="712" y="1321"/>
-      <point x="616" y="1321" type="curve" name="hr01" smooth="yes"/>
+      <point x="616" y="1321" type="curve" smooth="yes" name="hr01"/>
       <point x="424" y="1321"/>
       <point x="318" y="1417"/>
       <point x="303" y="1608" type="curve" name="hr02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/brokenbar.glif b/source/Hack-Regular.ufo/glyphs/brokenbar.glif
index cb08926a1..3e6712bf7 100644
--- a/source/Hack-Regular.ufo/glyphs/brokenbar.glif
+++ b/source/Hack-Regular.ufo/glyphs/brokenbar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="brokenbar" format="1">
+<glyph name="brokenbar" format="2">
   <advance width="1233"/>
   <unicode hex="00A6"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/bullet.glif b/source/Hack-Regular.ufo/glyphs/bullet.glif
index f921eccf4..b3c4e3647 100644
--- a/source/Hack-Regular.ufo/glyphs/bullet.glif
+++ b/source/Hack-Regular.ufo/glyphs/bullet.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="bullet" format="1">
+<glyph name="bullet" format="2">
   <advance width="1233"/>
   <unicode hex="2022"/>
   <outline>
     <contour>
-      <point x="614" y="465" type="curve" name="hr00" smooth="yes"/>
+      <point x="614" y="465" type="curve" smooth="yes" name="hr00"/>
       <point x="533" y="465"/>
       <point x="460" y="495"/>
       <point x="404" y="551" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="404" y="972" type="curve" smooth="yes"/>
       <point x="456" y="1024"/>
       <point x="530" y="1057"/>
-      <point x="615" y="1057" type="curve" name="av01" smooth="yes"/>
+      <point x="615" y="1057" type="curve" smooth="yes" name="av01"/>
       <point x="699" y="1057"/>
       <point x="771" y="1027"/>
       <point x="827" y="972" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/c.glif b/source/Hack-Regular.ufo/glyphs/c.glif
index cbb84c375..21f89be52 100644
--- a/source/Hack-Regular.ufo/glyphs/c.glif
+++ b/source/Hack-Regular.ufo/glyphs/c.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c" format="1">
+<glyph name="c" format="2">
   <advance width="1233"/>
   <unicode hex="0063"/>
   <outline>
@@ -33,9 +33,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/c6459.glif b/source/Hack-Regular.ufo/glyphs/c6459.glif
index c0cfc32bc..20fc6d8c1 100644
--- a/source/Hack-Regular.ufo/glyphs/c6459.glif
+++ b/source/Hack-Regular.ufo/glyphs/c6459.glif
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6459" format="1">
+<glyph name="c6459" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="492" y="1497" type="line" name="hr00" smooth="yes"/>
+      <point x="492" y="1497" type="line" smooth="yes" name="hr00"/>
       <point x="512" y="1497"/>
       <point x="522" y="1487"/>
       <point x="522" y="1467" type="curve" smooth="yes"/>
-      <point x="522" y="1324" type="line" name="sh02" smooth="yes"/>
+      <point x="522" y="1324" type="line" smooth="yes" name="sh02"/>
       <point x="522" y="1304"/>
       <point x="512" y="1294"/>
-      <point x="492" y="1294" type="curve" name="sv01" smooth="yes"/>
+      <point x="492" y="1294" type="curve" smooth="yes" name="sv01"/>
       <point x="349" y="1294" type="line" smooth="yes"/>
       <point x="329" y="1294"/>
       <point x="319" y="1304"/>
-      <point x="319" y="1324" type="curve" name="sh01" smooth="yes"/>
+      <point x="319" y="1324" type="curve" smooth="yes" name="sh01"/>
       <point x="319" y="1467" type="line" smooth="yes"/>
       <point x="319" y="1487"/>
       <point x="329" y="1497"/>
       <point x="349" y="1497" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="883" y="1497" type="line" name="at01" smooth="yes"/>
+      <point x="883" y="1497" type="line" smooth="yes" name="at01"/>
       <point x="903" y="1497"/>
       <point x="913" y="1487"/>
       <point x="913" y="1467" type="curve" smooth="yes"/>
-      <point x="913" y="1324" type="line" name="sh03" smooth="yes"/>
+      <point x="913" y="1324" type="line" smooth="yes" name="sh03"/>
       <point x="913" y="1304"/>
       <point x="903" y="1294"/>
-      <point x="883" y="1294" type="curve" name="sv02" smooth="yes"/>
-      <point x="741" y="1294" type="line" name="sv03" smooth="yes"/>
+      <point x="883" y="1294" type="curve" smooth="yes" name="sv02"/>
+      <point x="741" y="1294" type="line" smooth="yes" name="sv03"/>
       <point x="721" y="1294"/>
       <point x="711" y="1304"/>
-      <point x="711" y="1324" type="curve" name="ah01" smooth="yes"/>
+      <point x="711" y="1324" type="curve" smooth="yes" name="ah01"/>
       <point x="711" y="1467" type="line" smooth="yes"/>
       <point x="711" y="1487"/>
       <point x="721" y="1497"/>
diff --git a/source/Hack-Regular.ufo/glyphs/c6460.glif b/source/Hack-Regular.ufo/glyphs/c6460.glif
index a21d6cafa..721b6f6ba 100644
--- a/source/Hack-Regular.ufo/glyphs/c6460.glif
+++ b/source/Hack-Regular.ufo/glyphs/c6460.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6460" format="1">
+<glyph name="c6460" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Regular.ufo/glyphs/c6461.glif b/source/Hack-Regular.ufo/glyphs/c6461.glif
index 2a8f829ef..123bfd7b0 100644
--- a/source/Hack-Regular.ufo/glyphs/c6461.glif
+++ b/source/Hack-Regular.ufo/glyphs/c6461.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6461" format="1">
+<glyph name="c6461" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="555" y="1370" type="line" name="hr00" smooth="yes"/>
+      <point x="555" y="1370" type="line" smooth="yes" name="hr00"/>
       <point x="538" y="1379"/>
       <point x="526" y="1386"/>
       <point x="515" y="1390" type="curve" smooth="yes"/>
@@ -23,10 +23,10 @@
       <point x="339" y="1454" type="curve" smooth="yes"/>
       <point x="373" y="1493"/>
       <point x="418" y="1513"/>
-      <point x="475" y="1513" type="curve" name="at01" smooth="yes"/>
+      <point x="475" y="1513" type="curve" smooth="yes" name="at01"/>
       <point x="499" y="1513"/>
       <point x="521" y="1510"/>
-      <point x="542" y="1505" type="curve" name="at02" smooth="yes"/>
+      <point x="542" y="1505" type="curve" smooth="yes" name="at02"/>
       <point x="562" y="1500"/>
       <point x="588" y="1489"/>
       <point x="621" y="1470" type="curve" smooth="yes"/>
@@ -39,7 +39,7 @@
       <point x="750" y="1415" type="curve" smooth="yes"/>
       <point x="791" y="1415"/>
       <point x="821" y="1454"/>
-      <point x="821" y="1507" type="curve" name="at03" smooth="yes"/>
+      <point x="821" y="1507" type="curve" smooth="yes" name="at03"/>
       <point x="821" y="1513" type="line"/>
       <point x="946" y="1513" type="line" name="at04"/>
       <point x="945" y="1446"/>
@@ -47,7 +47,7 @@
       <point x="893" y="1354" type="curve" smooth="yes"/>
       <point x="859" y="1314"/>
       <point x="814" y="1294"/>
-      <point x="758" y="1294" type="curve" name="sv02" smooth="yes"/>
+      <point x="758" y="1294" type="curve" smooth="yes" name="sv02"/>
       <point x="737" y="1294"/>
       <point x="715" y="1297"/>
       <point x="694" y="1302" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/c6468.glif b/source/Hack-Regular.ufo/glyphs/c6468.glif
index c30bde8e0..be2dfdcfa 100644
--- a/source/Hack-Regular.ufo/glyphs/c6468.glif
+++ b/source/Hack-Regular.ufo/glyphs/c6468.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6468" format="1">
+<glyph name="c6468" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Regular.ufo/glyphs/c6470.glif b/source/Hack-Regular.ufo/glyphs/c6470.glif
index ba3c994fc..7b12127ac 100644
--- a/source/Hack-Regular.ufo/glyphs/c6470.glif
+++ b/source/Hack-Regular.ufo/glyphs/c6470.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6470" format="1">
+<glyph name="c6470" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Regular.ufo/glyphs/c6472.glif b/source/Hack-Regular.ufo/glyphs/c6472.glif
index 1fddfcf41..0c6b28269 100644
--- a/source/Hack-Regular.ufo/glyphs/c6472.glif
+++ b/source/Hack-Regular.ufo/glyphs/c6472.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6472" format="1">
+<glyph name="c6472" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Regular.ufo/glyphs/c6475.glif b/source/Hack-Regular.ufo/glyphs/c6475.glif
index 5bc076a50..0d73c2674 100644
--- a/source/Hack-Regular.ufo/glyphs/c6475.glif
+++ b/source/Hack-Regular.ufo/glyphs/c6475.glif
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6475" format="1">
+<glyph name="c6475" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
       <point x="422" y="1528" type="line" name="sv01"/>
       <point x="438" y="1457"/>
       <point x="507" y="1417"/>
-      <point x="616" y="1417" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1417" type="curve" smooth="yes" name="dv01"/>
       <point x="671" y="1417"/>
       <point x="715" y="1426"/>
       <point x="748" y="1445" type="curve" smooth="yes"/>
@@ -19,7 +19,7 @@
       <point x="840" y="1348" type="curve" smooth="yes"/>
       <point x="787" y="1307"/>
       <point x="712" y="1286"/>
-      <point x="616" y="1286" type="curve" name="hr01" smooth="yes"/>
+      <point x="616" y="1286" type="curve" smooth="yes" name="hr01"/>
       <point x="520" y="1286"/>
       <point x="446" y="1306"/>
       <point x="393" y="1347" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/c6476.glif b/source/Hack-Regular.ufo/glyphs/c6476.glif
index 88012f6c5..6b13135a9 100644
--- a/source/Hack-Regular.ufo/glyphs/c6476.glif
+++ b/source/Hack-Regular.ufo/glyphs/c6476.glif
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6476" format="1">
+<glyph name="c6476" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="689" y="1499" type="line" name="hr00" smooth="yes"/>
+      <point x="689" y="1499" type="line" smooth="yes" name="hr00"/>
       <point x="709" y="1499"/>
       <point x="719" y="1489"/>
       <point x="719" y="1469" type="curve" smooth="yes"/>
-      <point x="719" y="1324" type="line" name="dh02" smooth="yes"/>
+      <point x="719" y="1324" type="line" smooth="yes" name="dh02"/>
       <point x="719" y="1304"/>
       <point x="709" y="1294"/>
-      <point x="689" y="1294" type="curve" name="sv01" smooth="yes"/>
-      <point x="544" y="1294" type="line" name="sv02" smooth="yes"/>
+      <point x="689" y="1294" type="curve" smooth="yes" name="sv01"/>
+      <point x="544" y="1294" type="line" smooth="yes" name="sv02"/>
       <point x="524" y="1294"/>
       <point x="514" y="1304"/>
-      <point x="514" y="1324" type="curve" name="dh01" smooth="yes"/>
+      <point x="514" y="1324" type="curve" smooth="yes" name="dh01"/>
       <point x="514" y="1469" type="line" smooth="yes"/>
       <point x="514" y="1489"/>
       <point x="524" y="1499"/>
-      <point x="544" y="1499" type="curve" name="at01" smooth="yes"/>
+      <point x="544" y="1499" type="curve" smooth="yes" name="at01"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Regular.ufo/glyphs/c6477.glif b/source/Hack-Regular.ufo/glyphs/c6477.glif
index 5b129cbbc..69bbc33cf 100644
--- a/source/Hack-Regular.ufo/glyphs/c6477.glif
+++ b/source/Hack-Regular.ufo/glyphs/c6477.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6477" format="1">
+<glyph name="c6477" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Regular.ufo/glyphs/c6478.glif b/source/Hack-Regular.ufo/glyphs/c6478.glif
index f6c5b8141..ca285d6f2 100644
--- a/source/Hack-Regular.ufo/glyphs/c6478.glif
+++ b/source/Hack-Regular.ufo/glyphs/c6478.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="c6478" format="1">
+<glyph name="c6478" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Regular.ufo/glyphs/cacute.glif b/source/Hack-Regular.ufo/glyphs/cacute.glif
index 07be9499b..65034679f 100644
--- a/source/Hack-Regular.ufo/glyphs/cacute.glif
+++ b/source/Hack-Regular.ufo/glyphs/cacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="cacute" format="1">
+<glyph name="cacute" format="2">
   <advance width="1233"/>
   <unicode hex="0107"/>
   <outline>
@@ -10,16 +10,16 @@
       <point x="534" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="712" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="712" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="373" y="-29"/>
       <point x="164" y="192"/>
-      <point x="164" y="559" type="curve" name="dh01" smooth="yes"/>
+      <point x="164" y="559" type="curve" smooth="yes" name="dh01"/>
       <point x="164" y="750"/>
       <point x="218" y="893"/>
       <point x="311" y="992" type="curve" smooth="yes"/>
       <point x="410" y="1096"/>
       <point x="546" y="1147"/>
-      <point x="713" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="713" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="774" y="1147"/>
       <point x="824" y="1141"/>
       <point x="875" y="1126" type="curve" smooth="yes"/>
@@ -32,19 +32,19 @@
       <point x="884" y="962" type="curve" smooth="yes"/>
       <point x="834" y="981"/>
       <point x="779" y="991"/>
-      <point x="718" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="718" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="602" y="991"/>
       <point x="513" y="954"/>
       <point x="451" y="879" type="curve" smooth="yes"/>
       <point x="389" y="804"/>
       <point x="358" y="697"/>
-      <point x="358" y="560" type="curve" name="dh02" smooth="yes"/>
+      <point x="358" y="560" type="curve" smooth="yes" name="dh02"/>
       <point x="358" y="432"/>
       <point x="384" y="320"/>
       <point x="451" y="240" type="curve" smooth="yes"/>
       <point x="514" y="165"/>
       <point x="604" y="127"/>
-      <point x="721" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="721" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="788" y="127"/>
       <point x="842" y="138"/>
       <point x="889" y="157" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/caron.glif b/source/Hack-Regular.ufo/glyphs/caron.glif
index a831aa033..5b0d1a68e 100644
--- a/source/Hack-Regular.ufo/glyphs/caron.glif
+++ b/source/Hack-Regular.ufo/glyphs/caron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="caron" format="1">
+<glyph name="caron" format="2">
   <advance width="1233"/>
   <unicode hex="02C7"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/carriagereturn.glif b/source/Hack-Regular.ufo/glyphs/carriagereturn.glif
index 3d3e92fb9..c86459e08 100644
--- a/source/Hack-Regular.ufo/glyphs/carriagereturn.glif
+++ b/source/Hack-Regular.ufo/glyphs/carriagereturn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="carriagereturn" format="1">
+<glyph name="carriagereturn" format="2">
   <advance width="1233"/>
   <unicode hex="21B5"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/ccaron.glif b/source/Hack-Regular.ufo/glyphs/ccaron.glif
index d5e9fd60d..c0ecb3b72 100644
--- a/source/Hack-Regular.ufo/glyphs/ccaron.glif
+++ b/source/Hack-Regular.ufo/glyphs/ccaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ccaron" format="1">
+<glyph name="ccaron" format="2">
   <advance width="1233"/>
   <unicode hex="010D"/>
   <outline>
@@ -13,16 +13,16 @@
       <point x="602" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="712" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="712" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="373" y="-29"/>
       <point x="164" y="192"/>
-      <point x="164" y="559" type="curve" name="dh01" smooth="yes"/>
+      <point x="164" y="559" type="curve" smooth="yes" name="dh01"/>
       <point x="164" y="750"/>
       <point x="218" y="893"/>
       <point x="311" y="992" type="curve" smooth="yes"/>
       <point x="410" y="1096"/>
       <point x="546" y="1147"/>
-      <point x="713" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="713" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="774" y="1147"/>
       <point x="824" y="1141"/>
       <point x="875" y="1126" type="curve" smooth="yes"/>
@@ -35,19 +35,19 @@
       <point x="884" y="962" type="curve" smooth="yes"/>
       <point x="834" y="981"/>
       <point x="779" y="991"/>
-      <point x="718" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="718" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="602" y="991"/>
       <point x="513" y="954"/>
       <point x="451" y="879" type="curve" smooth="yes"/>
       <point x="389" y="804"/>
       <point x="358" y="697"/>
-      <point x="358" y="560" type="curve" name="dh02" smooth="yes"/>
+      <point x="358" y="560" type="curve" smooth="yes" name="dh02"/>
       <point x="358" y="432"/>
       <point x="384" y="320"/>
       <point x="451" y="240" type="curve" smooth="yes"/>
       <point x="514" y="165"/>
       <point x="604" y="127"/>
-      <point x="721" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="721" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="788" y="127"/>
       <point x="842" y="138"/>
       <point x="889" y="157" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/ccedilla.glif b/source/Hack-Regular.ufo/glyphs/ccedilla.glif
index 78f680a2a..8b0576ecb 100644
--- a/source/Hack-Regular.ufo/glyphs/ccedilla.glif
+++ b/source/Hack-Regular.ufo/glyphs/ccedilla.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ccedilla" format="1">
+<glyph name="ccedilla" format="2">
   <advance width="1233"/>
   <unicode hex="00E7"/>
   <outline>
     <contour>
-      <point x="718" y="991" type="curve" name="hr00" smooth="yes"/>
+      <point x="718" y="991" type="curve" smooth="yes" name="hr00"/>
       <point x="602" y="991"/>
       <point x="513" y="954"/>
       <point x="451" y="879" type="curve" smooth="yes"/>
       <point x="389" y="804"/>
       <point x="358" y="697"/>
-      <point x="358" y="560" type="curve" name="dh02" smooth="yes"/>
+      <point x="358" y="560" type="curve" smooth="yes" name="dh02"/>
       <point x="358" y="432"/>
       <point x="384" y="320"/>
       <point x="451" y="240" type="curve" smooth="yes"/>
       <point x="514" y="165"/>
       <point x="604" y="127"/>
-      <point x="721" y="127" type="curve" name="dv05" smooth="yes"/>
+      <point x="721" y="127" type="curve" smooth="yes" name="dv05"/>
       <point x="788" y="127"/>
       <point x="842" y="138"/>
       <point x="889" y="157" type="curve" smooth="yes"/>
@@ -35,23 +35,23 @@
       <point x="856" y="-115" type="curve" smooth="yes"/>
       <point x="871" y="-146"/>
       <point x="882" y="-179"/>
-      <point x="882" y="-219" type="curve" name="dh04" smooth="yes"/>
+      <point x="882" y="-219" type="curve" smooth="yes" name="dh04"/>
       <point x="882" y="-272"/>
       <point x="862" y="-319"/>
       <point x="822" y="-350" type="curve" smooth="yes"/>
       <point x="783" y="-379"/>
       <point x="726" y="-395"/>
-      <point x="643" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="643" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="614" y="-395"/>
       <point x="585" y="-393"/>
-      <point x="556" y="-389" type="curve" name="sv01" smooth="yes"/>
+      <point x="556" y="-389" type="curve" smooth="yes" name="sv01"/>
       <point x="525" y="-385"/>
       <point x="496" y="-379"/>
       <point x="468" y="-371" type="curve"/>
       <point x="468" y="-240" type="line" name="dh03"/>
       <point x="513" y="-261"/>
       <point x="567" y="-272"/>
-      <point x="619" y="-272" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="-272" type="curve" smooth="yes" name="dv02"/>
       <point x="704" y="-272"/>
       <point x="743" y="-239"/>
       <point x="743" y="-180" type="curve" smooth="yes"/>
@@ -66,13 +66,13 @@
       <point x="310" y="127" type="curve" smooth="yes"/>
       <point x="214" y="230"/>
       <point x="164" y="376"/>
-      <point x="164" y="559" type="curve" name="dh01" smooth="yes"/>
+      <point x="164" y="559" type="curve" smooth="yes" name="dh01"/>
       <point x="164" y="750"/>
       <point x="218" y="893"/>
       <point x="311" y="992" type="curve" smooth="yes"/>
       <point x="410" y="1096"/>
       <point x="546" y="1147"/>
-      <point x="713" y="1147" type="curve" name="dv03" smooth="yes"/>
+      <point x="713" y="1147" type="curve" smooth="yes" name="dv03"/>
       <point x="774" y="1147"/>
       <point x="824" y="1141"/>
       <point x="875" y="1126" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/ccircumflex.glif b/source/Hack-Regular.ufo/glyphs/ccircumflex.glif
index 38535d498..73640467a 100644
--- a/source/Hack-Regular.ufo/glyphs/ccircumflex.glif
+++ b/source/Hack-Regular.ufo/glyphs/ccircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ccircumflex" format="1">
+<glyph name="ccircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0109"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/cdotaccent.glif b/source/Hack-Regular.ufo/glyphs/cdotaccent.glif
index e83f22752..5db874cd7 100644
--- a/source/Hack-Regular.ufo/glyphs/cdotaccent.glif
+++ b/source/Hack-Regular.ufo/glyphs/cdotaccent.glif
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="cdotaccent" format="1">
+<glyph name="cdotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="010B"/>
   <outline>
     <contour>
-      <point x="587" y="1348" type="line" name="hr00" smooth="yes"/>
+      <point x="587" y="1348" type="line" smooth="yes" name="hr00"/>
       <point x="567" y="1348"/>
       <point x="557" y="1358"/>
-      <point x="557" y="1378" type="curve" name="ah01" smooth="yes"/>
+      <point x="557" y="1378" type="curve" smooth="yes" name="ah01"/>
       <point x="557" y="1522" type="line" smooth="yes"/>
       <point x="557" y="1542"/>
       <point x="567" y="1552"/>
-      <point x="587" y="1552" type="curve" name="dv03" smooth="yes"/>
+      <point x="587" y="1552" type="curve" smooth="yes" name="dv03"/>
       <point x="732" y="1552" type="line" smooth="yes"/>
       <point x="752" y="1552"/>
       <point x="762" y="1542"/>
       <point x="762" y="1522" type="curve" smooth="yes"/>
-      <point x="762" y="1378" type="line" name="sh01" smooth="yes"/>
+      <point x="762" y="1378" type="line" smooth="yes" name="sh01"/>
       <point x="762" y="1358"/>
       <point x="752" y="1348"/>
       <point x="732" y="1348" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="717" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="717" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="370" y="-29"/>
       <point x="164" y="191"/>
-      <point x="164" y="559" type="curve" name="sh02" smooth="yes"/>
+      <point x="164" y="559" type="curve" smooth="yes" name="sh02"/>
       <point x="164" y="927"/>
       <point x="370" y="1147"/>
-      <point x="717" y="1147" type="curve" name="dv05" smooth="yes"/>
+      <point x="717" y="1147" type="curve" smooth="yes" name="dv05"/>
       <point x="825" y="1147"/>
       <point x="926" y="1121"/>
       <point x="1030" y="1061" type="curve"/>
       <point x="1030" y="868" type="line"/>
       <point x="933" y="955"/>
       <point x="841" y="991"/>
-      <point x="717" y="991" type="curve" name="dv04" smooth="yes"/>
+      <point x="717" y="991" type="curve" smooth="yes" name="dv04"/>
       <point x="485" y="991"/>
       <point x="358" y="838"/>
-      <point x="358" y="559" type="curve" name="sh03" smooth="yes"/>
+      <point x="358" y="559" type="curve" smooth="yes" name="sh03"/>
       <point x="358" y="282"/>
       <point x="486" y="127"/>
-      <point x="717" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="717" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="846" y="127"/>
       <point x="942" y="164"/>
       <point x="1030" y="248" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/cedilla.glif b/source/Hack-Regular.ufo/glyphs/cedilla.glif
index e4e80ab41..dc1dabaa8 100644
--- a/source/Hack-Regular.ufo/glyphs/cedilla.glif
+++ b/source/Hack-Regular.ufo/glyphs/cedilla.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="cedilla" format="1">
+<glyph name="cedilla" format="2">
   <advance width="1233"/>
   <unicode hex="00B8"/>
   <outline>
@@ -10,23 +10,23 @@
       <point x="783" y="-115" type="curve" smooth="yes"/>
       <point x="798" y="-146"/>
       <point x="809" y="-179"/>
-      <point x="809" y="-219" type="curve" name="dh02" smooth="yes"/>
+      <point x="809" y="-219" type="curve" smooth="yes" name="dh02"/>
       <point x="809" y="-272"/>
       <point x="789" y="-319"/>
       <point x="749" y="-350" type="curve" smooth="yes"/>
       <point x="710" y="-379"/>
       <point x="653" y="-395"/>
-      <point x="570" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="570" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="541" y="-395"/>
       <point x="512" y="-393"/>
-      <point x="483" y="-389" type="curve" name="sv01" smooth="yes"/>
+      <point x="483" y="-389" type="curve" smooth="yes" name="sv01"/>
       <point x="452" y="-385"/>
       <point x="423" y="-379"/>
       <point x="395" y="-371" type="curve"/>
       <point x="395" y="-240" type="line" name="dh01"/>
       <point x="440" y="-261"/>
       <point x="494" y="-272"/>
-      <point x="546" y="-272" type="curve" name="dv02" smooth="yes"/>
+      <point x="546" y="-272" type="curve" smooth="yes" name="dv02"/>
       <point x="631" y="-272"/>
       <point x="670" y="-239"/>
       <point x="670" y="-180" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/cent.glif b/source/Hack-Regular.ufo/glyphs/cent.glif
index 35cd0cbbd..b72f6e8ce 100644
--- a/source/Hack-Regular.ufo/glyphs/cent.glif
+++ b/source/Hack-Regular.ufo/glyphs/cent.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="cent" format="1">
+<glyph name="cent" format="2">
   <advance width="1233"/>
   <unicode hex="00A2"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="344" y="152" type="curve" smooth="yes"/>
       <point x="260" y="255"/>
       <point x="210" y="398"/>
-      <point x="210" y="558" type="curve" name="dh01" smooth="yes"/>
+      <point x="210" y="558" type="curve" smooth="yes" name="dh01"/>
       <point x="210" y="721"/>
       <point x="262" y="866"/>
       <point x="345" y="967" type="curve" smooth="yes"/>
@@ -54,7 +54,7 @@
       <point x="486" y="861" type="curve" smooth="yes"/>
       <point x="433" y="782"/>
       <point x="406" y="681"/>
-      <point x="406" y="559" type="curve" name="dh02" smooth="yes"/>
+      <point x="406" y="559" type="curve" smooth="yes" name="dh02"/>
       <point x="406" y="437"/>
       <point x="433" y="337"/>
       <point x="486" y="258" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/chi.glif b/source/Hack-Regular.ufo/glyphs/chi.glif
index 04b3db28c..0785ba0d8 100644
--- a/source/Hack-Regular.ufo/glyphs/chi.glif
+++ b/source/Hack-Regular.ufo/glyphs/chi.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="chi" format="1">
+<glyph name="chi" format="2">
   <advance width="1233"/>
   <unicode hex="03C7"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="341" y="836" type="line" smooth="yes"/>
       <point x="310" y="920"/>
       <point x="242" y="962"/>
-      <point x="138" y="962" type="curve" name="sv01" smooth="yes"/>
+      <point x="138" y="962" type="curve" smooth="yes" name="sv01"/>
       <point x="89" y="962" type="line"/>
       <point x="89" y="1120" type="line" name="at01"/>
       <point x="159" y="1120" type="line" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="891" y="-142" type="line"/>
       <point x="922" y="-226"/>
       <point x="990" y="-268"/>
-      <point x="1095" y="-268" type="curve" name="sv02" smooth="yes"/>
+      <point x="1095" y="-268" type="curve" smooth="yes" name="sv02"/>
       <point x="1144" y="-268" type="line"/>
       <point x="1144" y="-426" type="line" name="ab01"/>
       <point x="1074" y="-426" type="line" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/circle.glif b/source/Hack-Regular.ufo/glyphs/circle.glif
index 039d68867..14db8f49a 100644
--- a/source/Hack-Regular.ufo/glyphs/circle.glif
+++ b/source/Hack-Regular.ufo/glyphs/circle.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="circle" format="1">
+<glyph name="circle" format="2">
   <advance width="1233"/>
   <unicode hex="25CB"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv03"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="616" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="692" y="39"/>
       <point x="778" y="62"/>
       <point x="861" y="109" type="curve" smooth="yes"/>
       <point x="1021" y="200"/>
       <point x="1105" y="349"/>
-      <point x="1105" y="532" type="curve" name="ah01" smooth="yes"/>
+      <point x="1105" y="532" type="curve" smooth="yes" name="ah01"/>
       <point x="1105" y="715"/>
       <point x="1021" y="864"/>
       <point x="861" y="955" type="curve" smooth="yes"/>
       <point x="778" y="1002"/>
       <point x="692" y="1025"/>
-      <point x="616" y="1025" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1025" type="curve" smooth="yes" name="dv02"/>
       <point x="540" y="1025"/>
       <point x="454" y="1002"/>
       <point x="371" y="955" type="curve" smooth="yes"/>
       <point x="216" y="867"/>
       <point x="128" y="723"/>
-      <point x="128" y="532" type="curve" name="sh03" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="sh03"/>
       <point x="128" y="341"/>
       <point x="216" y="197"/>
       <point x="371" y="109" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/circlemultiply.glif b/source/Hack-Regular.ufo/glyphs/circlemultiply.glif
index 5b8e92397..041373b1b 100644
--- a/source/Hack-Regular.ufo/glyphs/circlemultiply.glif
+++ b/source/Hack-Regular.ufo/glyphs/circlemultiply.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="circlemultiply" format="1">
+<glyph name="circlemultiply" format="2">
   <advance width="1233"/>
   <unicode hex="2297"/>
   <outline>
     <contour>
-      <point x="617" y="106" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="106" type="curve" smooth="yes" name="hr00"/>
       <point x="465" y="106"/>
       <point x="331" y="168"/>
       <point x="236" y="263" type="curve" smooth="yes"/>
       <point x="132" y="367"/>
       <point x="80" y="503"/>
-      <point x="80" y="644" type="curve" name="sh01" smooth="yes"/>
+      <point x="80" y="644" type="curve" smooth="yes" name="sh01"/>
       <point x="80" y="785"/>
       <point x="132" y="919"/>
       <point x="236" y="1023" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="412" y="1142" type="curve" smooth="yes"/>
       <point x="479" y="1170"/>
       <point x="544" y="1182"/>
-      <point x="613" y="1182" type="curve" name="dv03" smooth="yes"/>
+      <point x="613" y="1182" type="curve" smooth="yes" name="dv03"/>
       <point x="770" y="1182"/>
       <point x="901" y="1120"/>
       <point x="997" y="1024" type="curve" smooth="yes"/>
       <point x="1101" y="920"/>
       <point x="1153" y="786"/>
-      <point x="1153" y="643" type="curve" name="sh02" smooth="yes"/>
+      <point x="1153" y="643" type="curve" smooth="yes" name="sh02"/>
       <point x="1153" y="504"/>
       <point x="1102" y="368"/>
       <point x="997" y="263" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="770" y="106"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="533"/>
-      <point x="1012" y="646" type="curve" name="ah01" smooth="yes"/>
+      <point x="1012" y="646" type="curve" smooth="yes" name="ah01"/>
       <point x="1012" y="747"/>
       <point x="977" y="844"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="412" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/circleplus.glif b/source/Hack-Regular.ufo/glyphs/circleplus.glif
index b76b16e8a..ad50242b2 100644
--- a/source/Hack-Regular.ufo/glyphs/circleplus.glif
+++ b/source/Hack-Regular.ufo/glyphs/circleplus.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="circleplus" format="1">
+<glyph name="circleplus" format="2">
   <advance width="1233"/>
   <unicode hex="2295"/>
   <outline>
     <contour>
-      <point x="617" y="106" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="106" type="curve" smooth="yes" name="hr00"/>
       <point x="465" y="106"/>
       <point x="331" y="168"/>
       <point x="236" y="263" type="curve" smooth="yes"/>
       <point x="132" y="367"/>
       <point x="80" y="503"/>
-      <point x="80" y="644" type="curve" name="dh01" smooth="yes"/>
+      <point x="80" y="644" type="curve" smooth="yes" name="dh01"/>
       <point x="80" y="785"/>
       <point x="132" y="919"/>
       <point x="236" y="1023" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="412" y="1142" type="curve" smooth="yes"/>
       <point x="479" y="1170"/>
       <point x="544" y="1182"/>
-      <point x="613" y="1182" type="curve" name="dv03" smooth="yes"/>
+      <point x="613" y="1182" type="curve" smooth="yes" name="dv03"/>
       <point x="770" y="1182"/>
       <point x="901" y="1120"/>
       <point x="997" y="1024" type="curve" smooth="yes"/>
       <point x="1101" y="920"/>
       <point x="1153" y="786"/>
-      <point x="1153" y="643" type="curve" name="dh06" smooth="yes"/>
+      <point x="1153" y="643" type="curve" smooth="yes" name="dh06"/>
       <point x="1153" y="504"/>
       <point x="1102" y="368"/>
       <point x="997" y="263" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="770" y="106"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="533"/>
-      <point x="1012" y="646" type="curve" name="dh05" smooth="yes"/>
+      <point x="1012" y="646" type="curve" smooth="yes" name="dh05"/>
       <point x="1012" y="747"/>
       <point x="977" y="844"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="412" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="dh02" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="dh02"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/circumflex.glif b/source/Hack-Regular.ufo/glyphs/circumflex.glif
index 156b5a2ea..6c7f96648 100644
--- a/source/Hack-Regular.ufo/glyphs/circumflex.glif
+++ b/source/Hack-Regular.ufo/glyphs/circumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="circumflex" format="1">
+<glyph name="circumflex" format="2">
   <advance width="1233"/>
   <unicode hex="02C6"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/colon.glif b/source/Hack-Regular.ufo/glyphs/colon.glif
index a90f4fc88..ace24fb40 100644
--- a/source/Hack-Regular.ufo/glyphs/colon.glif
+++ b/source/Hack-Regular.ufo/glyphs/colon.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="colon" format="1">
+<glyph name="colon" format="2">
   <advance width="1233"/>
   <unicode hex="003A"/>
   <outline>
     <contour>
-      <point x="620" y="776" type="curve" name="hr00" smooth="yes"/>
+      <point x="620" y="776" type="curve" smooth="yes" name="hr00"/>
       <point x="529" y="776"/>
       <point x="458" y="845"/>
-      <point x="458" y="945" type="curve" name="dh01" smooth="yes"/>
+      <point x="458" y="945" type="curve" smooth="yes" name="dh01"/>
       <point x="458" y="1045"/>
       <point x="529" y="1114"/>
-      <point x="620" y="1114" type="curve" name="dv01" smooth="yes"/>
+      <point x="620" y="1114" type="curve" smooth="yes" name="dv01"/>
       <point x="711" y="1114"/>
       <point x="782" y="1045"/>
-      <point x="782" y="945" type="curve" name="dh02" smooth="yes"/>
+      <point x="782" y="945" type="curve" smooth="yes" name="dh02"/>
       <point x="782" y="845"/>
       <point x="711" y="776"/>
     </contour>
     <contour>
-      <point x="620" y="60" type="curve" name="ab01" smooth="yes"/>
+      <point x="620" y="60" type="curve" smooth="yes" name="ab01"/>
       <point x="529" y="60"/>
       <point x="458" y="129"/>
-      <point x="458" y="229" type="curve" name="sh01" smooth="yes"/>
+      <point x="458" y="229" type="curve" smooth="yes" name="sh01"/>
       <point x="458" y="329"/>
       <point x="529" y="398"/>
-      <point x="620" y="398" type="curve" name="sv01" smooth="yes"/>
+      <point x="620" y="398" type="curve" smooth="yes" name="sv01"/>
       <point x="711" y="398"/>
       <point x="782" y="329"/>
-      <point x="782" y="229" type="curve" name="sh02" smooth="yes"/>
+      <point x="782" y="229" type="curve" smooth="yes" name="sh02"/>
       <point x="782" y="129"/>
       <point x="711" y="60"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/colonmonetary.glif b/source/Hack-Regular.ufo/glyphs/colonmonetary.glif
index eaa8b7977..a9494c3ce 100644
--- a/source/Hack-Regular.ufo/glyphs/colonmonetary.glif
+++ b/source/Hack-Regular.ufo/glyphs/colonmonetary.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="colonmonetary" format="1">
+<glyph name="colonmonetary" format="2">
   <advance width="1233"/>
   <unicode hex="20A1"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="285" y="179" type="curve" smooth="yes"/>
       <point x="177" y="318"/>
       <point x="123" y="506"/>
-      <point x="123" y="743" type="curve" name="dh01" smooth="yes"/>
+      <point x="123" y="743" type="curve" smooth="yes" name="dh01"/>
       <point x="123" y="1228"/>
       <point x="351" y="1491"/>
       <point x="671" y="1518" type="curve"/>
@@ -31,14 +31,14 @@
       <point x="1050" y="1239"/>
       <point x="1012" y="1266" type="curve" name="iv02"/>
       <point x="722" y="137" type="line"/>
-      <point x="738" y="137" type="line" name="dv02" smooth="yes"/>
+      <point x="738" y="137" type="line" smooth="yes" name="dv02"/>
       <point x="883" y="137"/>
       <point x="1011" y="200"/>
       <point x="1123" y="326" type="curve" name="iv03"/>
       <point x="1123" y="115" type="line"/>
       <point x="1006" y="19"/>
       <point x="875" y="-29"/>
-      <point x="732" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="732" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="711" y="-29"/>
       <point x="696" y="-28"/>
       <point x="680" y="-27" type="curve" name="sv01"/>
@@ -68,7 +68,7 @@
       <point x="413" y="1198" type="curve" smooth="yes"/>
       <point x="338" y="1093"/>
       <point x="300" y="942"/>
-      <point x="300" y="745" type="curve" name="dh02" smooth="yes"/>
+      <point x="300" y="745" type="curve" smooth="yes" name="dh02"/>
       <point x="300" y="588"/>
       <point x="325" y="459"/>
       <point x="374" y="359" type="curve" name="iv06"/>
diff --git a/source/Hack-Regular.ufo/glyphs/comma.glif b/source/Hack-Regular.ufo/glyphs/comma.glif
index 9d1c1cc66..5ea026a9b 100644
--- a/source/Hack-Regular.ufo/glyphs/comma.glif
+++ b/source/Hack-Regular.ufo/glyphs/comma.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="comma" format="1">
+<glyph name="comma" format="2">
   <advance width="1233"/>
   <unicode hex="002C"/>
   <outline>
@@ -10,28 +10,28 @@
       <point x="652" y="51" type="curve" name="sh01"/>
       <point x="636" y="48"/>
       <point x="624" y="47"/>
-      <point x="612" y="47" type="curve" name="dv01" smooth="yes"/>
+      <point x="612" y="47" type="curve" smooth="yes" name="dv01"/>
       <point x="569" y="47"/>
       <point x="531" y="59"/>
       <point x="502" y="86" type="curve" smooth="yes"/>
       <point x="473" y="112"/>
       <point x="458" y="149"/>
-      <point x="458" y="196" type="curve" name="dh01" smooth="yes"/>
+      <point x="458" y="196" type="curve" smooth="yes" name="dh01"/>
       <point x="458" y="240"/>
       <point x="472" y="281"/>
       <point x="504" y="309" type="curve" smooth="yes"/>
       <point x="531" y="332"/>
       <point x="572" y="349"/>
-      <point x="620" y="349" type="curve" name="dv02" smooth="yes"/>
+      <point x="620" y="349" type="curve" smooth="yes" name="dv02"/>
       <point x="677" y="349"/>
       <point x="721" y="326"/>
       <point x="752" y="281" type="curve" smooth="yes"/>
       <point x="783" y="236"/>
       <point x="798" y="174"/>
-      <point x="798" y="93" type="curve" name="dh02" smooth="yes"/>
+      <point x="798" y="93" type="curve" smooth="yes" name="dh02"/>
       <point x="798" y="-21"/>
       <point x="767" y="-119"/>
-      <point x="706" y="-202" type="curve" name="hr01" smooth="yes"/>
+      <point x="706" y="-202" type="curve" smooth="yes" name="hr01"/>
       <point x="645" y="-284"/>
       <point x="558" y="-346"/>
       <point x="446" y="-387" type="curve" name="av01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/congruent.glif b/source/Hack-Regular.ufo/glyphs/congruent.glif
index 7fd837b4e..d8158e6d7 100644
--- a/source/Hack-Regular.ufo/glyphs/congruent.glif
+++ b/source/Hack-Regular.ufo/glyphs/congruent.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="congruent" format="1">
+<glyph name="congruent" format="2">
   <advance width="1233"/>
   <unicode hex="2245"/>
   <outline>
@@ -7,28 +7,28 @@
       <point x="88" y="1052" type="line" name="hr00"/>
       <point x="200" y="1137"/>
       <point x="291" y="1167"/>
-      <point x="399" y="1167" type="curve" name="dv03" smooth="yes"/>
+      <point x="399" y="1167" type="curve" smooth="yes" name="dv03"/>
       <point x="447" y="1167"/>
       <point x="510" y="1160"/>
       <point x="623" y="1112" type="curve" smooth="yes"/>
       <point x="655" y="1098" type="line" smooth="yes"/>
       <point x="736" y="1062"/>
       <point x="797" y="1044"/>
-      <point x="862" y="1044" type="curve" name="dv05" smooth="yes"/>
+      <point x="862" y="1044" type="curve" smooth="yes" name="dv05"/>
       <point x="958" y="1044"/>
       <point x="1045" y="1083"/>
       <point x="1145" y="1167" type="curve"/>
       <point x="1145" y="992" type="line"/>
       <point x="1053" y="919"/>
       <point x="959" y="878"/>
-      <point x="850" y="878" type="curve" name="dv04" smooth="yes"/>
+      <point x="850" y="878" type="curve" smooth="yes" name="dv04"/>
       <point x="778" y="878"/>
       <point x="726" y="894"/>
       <point x="645" y="929" type="curve" smooth="yes"/>
-      <point x="612" y="943" type="line" name="hr01" smooth="yes"/>
+      <point x="612" y="943" type="line" smooth="yes" name="hr01"/>
       <point x="522" y="980"/>
       <point x="468" y="1001"/>
-      <point x="385" y="1001" type="curve" name="dv02" smooth="yes"/>
+      <point x="385" y="1001" type="curve" smooth="yes" name="dv02"/>
       <point x="282" y="1001"/>
       <point x="192" y="969"/>
       <point x="88" y="878" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/contents.plist b/source/Hack-Regular.ufo/glyphs/contents.plist
index 5252fe6ba..6a44310b5 100644
--- a/source/Hack-Regular.ufo/glyphs/contents.plist
+++ b/source/Hack-Regular.ufo/glyphs/contents.plist
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>.notdef</key>
@@ -60,6 +60,8 @@
 	<string>E_.glif</string>
 	<key>Eacute</key>
 	<string>E_acute.glif</string>
+	<key>Ebreve</key>
+	<string>E_breve.glif</string>
 	<key>Ecaron</key>
 	<string>E_caron.glif</string>
 	<key>Ecircumflex</key>
@@ -114,6 +116,8 @@
 	<string>I_J_.glif</string>
 	<key>Iacute</key>
 	<string>I_acute.glif</string>
+	<key>Ibreve</key>
+	<string>I_breve.glif</string>
 	<key>Icircumflex</key>
 	<string>I_circumflex.glif</string>
 	<key>Idieresis</key>
@@ -124,10 +128,6 @@
 	<string>I_grave.glif</string>
 	<key>Imacron</key>
 	<string>I_macron.glif</string>
-	<key>Ibreve</key>
-	<string>I_breve.glif</string>
-	<key>ibreve</key>
-	<string>ibreve.glif</string>
 	<key>Iogonek</key>
 	<string>I_ogonek.glif</string>
 	<key>Iota</key>
@@ -180,6 +180,8 @@
 	<string>O_E_.glif</string>
 	<key>Oacute</key>
 	<string>O_acute.glif</string>
+	<key>Obreve</key>
+	<string>O_breve.glif</string>
 	<key>Ocircumflex</key>
 	<string>O_circumflex.glif</string>
 	<key>Odieresis</key>
@@ -510,6 +512,8 @@
 	<string>e.glif</string>
 	<key>eacute</key>
 	<string>eacute.glif</string>
+	<key>ebreve</key>
+	<string>ebreve.glif</string>
 	<key>ecaron</key>
 	<string>ecaron.glif</string>
 	<key>ecircumflex</key>
@@ -526,18 +530,10 @@
 	<string>eight.subs.glif</string>
 	<key>element</key>
 	<string>element.glif</string>
-	<key>onedotenleader</key>
-	<string>onedotenleader.glif</string>
-	<key>twodotenleader</key>
-	<string>twodotenleader.glif</string>
 	<key>ellipsis</key>
 	<string>ellipsis.glif</string>
 	<key>emacron</key>
 	<string>emacron.glif</string>
-	<key>Ebreve</key>
-	<string>E_breve.glif</string>
-	<key>ebreve</key>
-	<string>ebreve.glif</string>
 	<key>emdash</key>
 	<string>emdash.glif</string>
 	<key>emptyset</key>
@@ -640,10 +636,14 @@
 	<string>hungarumlaut.glif</string>
 	<key>hyphen</key>
 	<string>hyphen.glif</string>
+	<key>hyphenationpoint</key>
+	<string>hyphenationpoint.glif</string>
 	<key>i</key>
 	<string>i.glif</string>
 	<key>iacute</key>
 	<string>iacute.glif</string>
+	<key>ibreve</key>
+	<string>ibreve.glif</string>
 	<key>icircumflex</key>
 	<string>icircumflex.glif</string>
 	<key>idieresis</key>
@@ -726,8 +726,12 @@
 	<string>m.glif</string>
 	<key>macron</key>
 	<string>macron.glif</string>
+	<key>millisecond</key>
+	<string>millisecond.glif</string>
 	<key>minus</key>
 	<string>minus.glif</string>
+	<key>minute</key>
+	<string>minute.glif</string>
 	<key>multiply</key>
 	<string>multiply.glif</string>
 	<key>musicalnote</key>
@@ -760,6 +764,8 @@
 	<string>o.glif</string>
 	<key>oacute</key>
 	<string>oacute.glif</string>
+	<key>obreve</key>
+	<string>obreve.glif</string>
 	<key>ocircumflex</key>
 	<string>ocircumflex.glif</string>
 	<key>odieresis</key>
@@ -776,10 +782,6 @@
 	<string>ohungarumlaut.glif</string>
 	<key>omacron</key>
 	<string>omacron.glif</string>
-	<key>Obreve</key>
-	<string>O_breve.glif</string>
-	<key>obreve</key>
-	<string>obreve.glif</string>
 	<key>omega</key>
 	<string>omega.glif</string>
 	<key>omegatonos</key>
@@ -792,6 +794,8 @@
 	<string>one.glif</string>
 	<key>one.subs</key>
 	<string>one.subs.glif</string>
+	<key>onedotenleader</key>
+	<string>onedotenleader.glif</string>
 	<key>oneeighth</key>
 	<string>oneeighth.glif</string>
 	<key>onehalf</key>
@@ -898,6 +902,8 @@
 	<string>ring.glif</string>
 	<key>rtblock</key>
 	<string>rtblock.glif</string>
+	<key>ruble</key>
+	<string>ruble.glif</string>
 	<key>s</key>
 	<string>s.glif</string>
 	<key>sacute</key>
@@ -908,6 +914,8 @@
 	<string>scedilla.glif</string>
 	<key>scircumflex</key>
 	<string>scircumflex.glif</string>
+	<key>second</key>
+	<string>second.glif</string>
 	<key>section</key>
 	<string>section.glif</string>
 	<key>semicolon</key>
@@ -980,6 +988,8 @@
 	<string>two.glif</string>
 	<key>two.subs</key>
 	<string>two.subs.glif</string>
+	<key>twodotenleader</key>
+	<string>twodotenleader.glif</string>
 	<key>u</key>
 	<string>u.glif</string>
 	<key>uacute</key>
@@ -1738,18 +1748,10 @@
 	<string>uni201F_.glif</string>
 	<key>uni2023</key>
 	<string>uni2023.glif</string>
-	<key>hyphenationpoint</key>
-	<string>hyphenationpoint.glif</string>
 	<key>uni202F</key>
 	<string>uni202F_.glif</string>
 	<key>uni2031</key>
 	<string>uni2031.glif</string>
-	<key>minute</key>
-	<string>minute.glif</string>
-	<key>second</key>
-	<string>second.glif</string>
-	<key>millisecond</key>
-	<string>millisecond.glif</string>
 	<key>uni2035</key>
 	<string>uni2035.glif</string>
 	<key>uni2036</key>
diff --git a/source/Hack-Regular.ufo/glyphs/copyright.glif b/source/Hack-Regular.ufo/glyphs/copyright.glif
index 68b994517..717b28aea 100644
--- a/source/Hack-Regular.ufo/glyphs/copyright.glif
+++ b/source/Hack-Regular.ufo/glyphs/copyright.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="copyright" format="1">
+<glyph name="copyright" format="2">
   <advance width="1233"/>
   <unicode hex="00A9"/>
   <outline>
     <contour>
-      <point x="616" y="125" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="125" type="curve" smooth="yes" name="hr00"/>
       <point x="448" y="125"/>
       <point x="302" y="186"/>
       <point x="181" y="307" type="curve" smooth="yes"/>
@@ -13,7 +13,7 @@
       <point x="46" y="507" type="curve" smooth="yes"/>
       <point x="15" y="579"/>
       <point x="0" y="653"/>
-      <point x="0" y="741" type="curve" name="dh01" smooth="yes"/>
+      <point x="0" y="741" type="curve" smooth="yes" name="dh01"/>
       <point x="0" y="826"/>
       <point x="15" y="905"/>
       <point x="46" y="977" type="curve" smooth="yes"/>
@@ -25,7 +25,7 @@
       <point x="381" y="1313" type="curve" smooth="yes"/>
       <point x="454" y="1343"/>
       <point x="532" y="1358"/>
-      <point x="616" y="1358" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1358" type="curve" smooth="yes" name="dv03"/>
       <point x="700" y="1358"/>
       <point x="779" y="1343"/>
       <point x="852" y="1313" type="curve" smooth="yes"/>
@@ -37,7 +37,7 @@
       <point x="1187" y="977" type="curve" smooth="yes"/>
       <point x="1218" y="905"/>
       <point x="1233" y="827"/>
-      <point x="1233" y="742" type="curve" name="dh06" smooth="yes"/>
+      <point x="1233" y="742" type="curve" smooth="yes" name="dh06"/>
       <point x="1233" y="657"/>
       <point x="1218" y="579"/>
       <point x="1188" y="508" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="701" y="125"/>
     </contour>
     <contour>
-      <point x="617" y="227" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="227" type="curve" smooth="yes" name="dv01"/>
       <point x="686" y="227"/>
       <point x="751" y="240"/>
       <point x="812" y="265" type="curve" smooth="yes"/>
@@ -63,31 +63,31 @@
       <point x="1093" y="546" type="curve" smooth="yes"/>
       <point x="1118" y="605"/>
       <point x="1130" y="670"/>
-      <point x="1130" y="741" type="curve" name="dh05" smooth="yes"/>
+      <point x="1130" y="741" type="curve" smooth="yes" name="dh05"/>
       <point x="1130" y="813"/>
       <point x="1117" y="878"/>
       <point x="1092" y="939" type="curve" smooth="yes"/>
       <point x="1067" y="1000"/>
       <point x="1029" y="1056"/>
-      <point x="979" y="1106" type="curve" name="at01" smooth="yes"/>
+      <point x="979" y="1106" type="curve" smooth="yes" name="at01"/>
       <point x="930" y="1155"/>
       <point x="875" y="1193"/>
       <point x="814" y="1218" type="curve" smooth="yes"/>
       <point x="754" y="1243"/>
       <point x="688" y="1255"/>
-      <point x="616" y="1255" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1255" type="curve" smooth="yes" name="dv02"/>
       <point x="545" y="1255"/>
       <point x="479" y="1243"/>
       <point x="420" y="1218" type="curve" smooth="yes"/>
       <point x="359" y="1193"/>
       <point x="303" y="1155"/>
-      <point x="254" y="1106" type="curve" name="at02" smooth="yes"/>
+      <point x="254" y="1106" type="curve" smooth="yes" name="at02"/>
       <point x="203" y="1055"/>
       <point x="166" y="1000"/>
       <point x="141" y="939" type="curve" smooth="yes"/>
       <point x="115" y="877"/>
       <point x="102" y="811"/>
-      <point x="102" y="742" type="curve" name="dh02" smooth="yes"/>
+      <point x="102" y="742" type="curve" smooth="yes" name="dh02"/>
       <point x="102" y="670"/>
       <point x="114" y="609"/>
       <point x="141" y="546" type="curve" smooth="yes"/>
@@ -101,19 +101,19 @@
       <point x="545" y="227"/>
     </contour>
     <contour>
-      <point x="638" y="369" type="curve" name="dv04" smooth="yes"/>
+      <point x="638" y="369" type="curve" smooth="yes" name="dv04"/>
       <point x="395" y="369"/>
       <point x="250" y="512"/>
-      <point x="250" y="741" type="curve" name="dh03" smooth="yes"/>
+      <point x="250" y="741" type="curve" smooth="yes" name="dh03"/>
       <point x="250" y="854"/>
       <point x="286" y="949"/>
       <point x="354" y="1016" type="curve" smooth="yes"/>
       <point x="421" y="1080"/>
       <point x="518" y="1116"/>
-      <point x="638" y="1116" type="curve" name="at03" smooth="yes"/>
+      <point x="638" y="1116" type="curve" smooth="yes" name="at03"/>
       <point x="678" y="1116"/>
       <point x="716" y="1112"/>
-      <point x="755" y="1105" type="curve" name="at04" smooth="yes"/>
+      <point x="755" y="1105" type="curve" smooth="yes" name="at04"/>
       <point x="792" y="1098"/>
       <point x="824" y="1088"/>
       <point x="864" y="1071" type="curve"/>
@@ -123,16 +123,16 @@
       <point x="751" y="1005" type="curve" smooth="yes"/>
       <point x="714" y="1014"/>
       <point x="674" y="1018"/>
-      <point x="641" y="1018" type="curve" name="sv01" smooth="yes"/>
+      <point x="641" y="1018" type="curve" smooth="yes" name="sv01"/>
       <point x="565" y="1018"/>
       <point x="500" y="996"/>
       <point x="453" y="945" type="curve" smooth="yes"/>
       <point x="410" y="898"/>
       <point x="385" y="827"/>
-      <point x="385" y="739" type="curve" name="dh04" smooth="yes"/>
+      <point x="385" y="739" type="curve" smooth="yes" name="dh04"/>
       <point x="385" y="567"/>
       <point x="480" y="467"/>
-      <point x="657" y="467" type="curve" name="dv05" smooth="yes"/>
+      <point x="657" y="467" type="curve" smooth="yes" name="dv05"/>
       <point x="733" y="467"/>
       <point x="798" y="482"/>
       <point x="864" y="518" type="curve" name="ih02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/currency.glif b/source/Hack-Regular.ufo/glyphs/currency.glif
index 5c4ca754f..0640004e3 100644
--- a/source/Hack-Regular.ufo/glyphs/currency.glif
+++ b/source/Hack-Regular.ufo/glyphs/currency.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="currency" format="1">
+<glyph name="currency" format="2">
   <advance width="1233"/>
   <unicode hex="00A4"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="371" y="451" type="line"/>
       <point x="327" y="523"/>
       <point x="311" y="577"/>
-      <point x="311" y="642" type="curve" name="sh01" smooth="yes"/>
+      <point x="311" y="642" type="curve" smooth="yes" name="sh01"/>
       <point x="311" y="679"/>
       <point x="316" y="707"/>
       <point x="327" y="738" type="curve" smooth="yes"/>
@@ -23,7 +23,7 @@
       <point x="557" y="968" type="curve" smooth="yes"/>
       <point x="587" y="978"/>
       <point x="618" y="983"/>
-      <point x="651" y="983" type="curve" name="dv04" smooth="yes"/>
+      <point x="651" y="983" type="curve" smooth="yes" name="dv04"/>
       <point x="716" y="983"/>
       <point x="775" y="964"/>
       <point x="844" y="924" type="curve"/>
@@ -32,10 +32,10 @@
       <point x="934" y="831" type="line"/>
       <point x="954" y="798"/>
       <point x="972" y="760"/>
-      <point x="979" y="736" type="curve" name="sh04" smooth="yes"/>
+      <point x="979" y="736" type="curve" smooth="yes" name="sh04"/>
       <point x="988" y="707"/>
       <point x="993" y="671"/>
-      <point x="993" y="640" type="curve" name="sh03" smooth="yes"/>
+      <point x="993" y="640" type="curve" smooth="yes" name="sh03"/>
       <point x="993" y="607"/>
       <point x="988" y="576"/>
       <point x="978" y="546" type="curve" smooth="yes"/>
@@ -50,32 +50,32 @@
       <point x="749" y="316" type="curve" smooth="yes"/>
       <point x="718" y="306"/>
       <point x="685" y="301"/>
-      <point x="652" y="301" type="curve" name="dv01" smooth="yes"/>
+      <point x="652" y="301" type="curve" smooth="yes" name="dv01"/>
       <point x="588" y="301"/>
       <point x="527" y="319"/>
       <point x="461" y="358" type="curve"/>
       <point x="297" y="195" type="line" name="sh06"/>
     </contour>
     <contour>
-      <point x="653" y="426" type="curve" name="dv02" smooth="yes"/>
+      <point x="653" y="426" type="curve" smooth="yes" name="dv02"/>
       <point x="712" y="426"/>
       <point x="765" y="447"/>
       <point x="806" y="488" type="curve" smooth="yes"/>
       <point x="846" y="529"/>
       <point x="868" y="583"/>
-      <point x="868" y="643" type="curve" name="ah01" smooth="yes"/>
+      <point x="868" y="643" type="curve" smooth="yes" name="ah01"/>
       <point x="868" y="703"/>
       <point x="846" y="756"/>
       <point x="807" y="795" type="curve" smooth="yes"/>
       <point x="767" y="835"/>
       <point x="713" y="856"/>
-      <point x="653" y="856" type="curve" name="dv03" smooth="yes"/>
+      <point x="653" y="856" type="curve" smooth="yes" name="dv03"/>
       <point x="596" y="856"/>
       <point x="542" y="836"/>
       <point x="501" y="796" type="curve" smooth="yes"/>
       <point x="462" y="759"/>
       <point x="438" y="706"/>
-      <point x="438" y="642" type="curve" name="sh07" smooth="yes"/>
+      <point x="438" y="642" type="curve" smooth="yes" name="sh07"/>
       <point x="438" y="583"/>
       <point x="459" y="532"/>
       <point x="500" y="489" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/d.glif b/source/Hack-Regular.ufo/glyphs/d.glif
index 55647672e..4eb4fc3b7 100644
--- a/source/Hack-Regular.ufo/glyphs/d.glif
+++ b/source/Hack-Regular.ufo/glyphs/d.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="d" format="1">
+<glyph name="d" format="2">
   <advance width="1233"/>
   <unicode hex="0064"/>
   <outline>
@@ -38,9 +38,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/dagger.glif b/source/Hack-Regular.ufo/glyphs/dagger.glif
index c84c0c26b..694e3edba 100644
--- a/source/Hack-Regular.ufo/glyphs/dagger.glif
+++ b/source/Hack-Regular.ufo/glyphs/dagger.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dagger" format="1">
+<glyph name="dagger" format="2">
   <advance width="1233"/>
   <unicode hex="2020"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/daggerdbl.glif b/source/Hack-Regular.ufo/glyphs/daggerdbl.glif
index 1acfb6c62..84b671ad4 100644
--- a/source/Hack-Regular.ufo/glyphs/daggerdbl.glif
+++ b/source/Hack-Regular.ufo/glyphs/daggerdbl.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="daggerdbl" format="1">
+<glyph name="daggerdbl" format="2">
   <advance width="1233"/>
   <unicode hex="2021"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/dcaron.glif b/source/Hack-Regular.ufo/glyphs/dcaron.glif
index 0ba7520a9..9ce5bdfba 100644
--- a/source/Hack-Regular.ufo/glyphs/dcaron.glif
+++ b/source/Hack-Regular.ufo/glyphs/dcaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dcaron" format="1">
+<glyph name="dcaron" format="2">
   <advance width="1233"/>
   <unicode hex="010F"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="1045" y="1181" type="line"/>
     </contour>
     <contour>
-      <point x="526" y="-29" type="curve" name="sv03" smooth="yes"/>
+      <point x="526" y="-29" type="curve" smooth="yes" name="sv03"/>
       <point x="259" y="-29"/>
       <point x="93" y="194"/>
-      <point x="93" y="561" type="curve" name="sh01" smooth="yes"/>
+      <point x="93" y="561" type="curve" smooth="yes" name="sh01"/>
       <point x="93" y="927"/>
       <point x="260" y="1147"/>
-      <point x="527" y="1147" type="curve" name="dv02" smooth="yes"/>
+      <point x="527" y="1147" type="curve" smooth="yes" name="dv02"/>
       <point x="666" y="1147"/>
       <point x="768" y="1089"/>
       <point x="828" y="977" type="curve" name="hr01"/>
@@ -29,16 +29,16 @@
       <point x="663" y="-29"/>
     </contour>
     <contour>
-      <point x="556" y="127" type="curve" name="sv02" smooth="yes"/>
+      <point x="556" y="127" type="curve" smooth="yes" name="sv02"/>
       <point x="735" y="127"/>
       <point x="828" y="274"/>
-      <point x="828" y="559" type="curve" name="hr02" smooth="yes"/>
+      <point x="828" y="559" type="curve" smooth="yes" name="hr02"/>
       <point x="828" y="844"/>
       <point x="735" y="991"/>
-      <point x="556" y="991" type="curve" name="dv01" smooth="yes"/>
+      <point x="556" y="991" type="curve" smooth="yes" name="dv01"/>
       <point x="377" y="991"/>
       <point x="287" y="846"/>
-      <point x="287" y="559" type="curve" name="sh04" smooth="yes"/>
+      <point x="287" y="559" type="curve" smooth="yes" name="sh04"/>
       <point x="287" y="272"/>
       <point x="377" y="127"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/dcroat.glif b/source/Hack-Regular.ufo/glyphs/dcroat.glif
index 87c3b0d00..1f5b3184c 100644
--- a/source/Hack-Regular.ufo/glyphs/dcroat.glif
+++ b/source/Hack-Regular.ufo/glyphs/dcroat.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dcroat" format="1">
+<glyph name="dcroat" format="2">
   <advance width="1233"/>
   <unicode hex="0111"/>
   <outline>
     <contour>
-      <point x="559" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="559" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="418" y="-29"/>
       <point x="311" y="30"/>
       <point x="239" y="129" type="curve" smooth="yes"/>
       <point x="162" y="234"/>
       <point x="123" y="382"/>
-      <point x="123" y="562" type="curve" name="sh01" smooth="yes"/>
+      <point x="123" y="562" type="curve" smooth="yes" name="sh01"/>
       <point x="123" y="925"/>
       <point x="291" y="1147"/>
-      <point x="559" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="559" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="627" y="1147"/>
       <point x="686" y="1133"/>
       <point x="737" y="1104" type="curve" smooth="yes"/>
@@ -40,25 +40,25 @@
       <point x="626" y="-29"/>
     </contour>
     <contour>
-      <point x="585" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="585" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="675" y="127"/>
       <point x="743" y="164"/>
       <point x="789" y="237" type="curve" smooth="yes"/>
       <point x="835" y="310"/>
       <point x="858" y="417"/>
-      <point x="858" y="559" type="curve" name="sh05" smooth="yes"/>
+      <point x="858" y="559" type="curve" smooth="yes" name="sh05"/>
       <point x="858" y="701"/>
       <point x="835" y="809"/>
       <point x="789" y="882" type="curve" smooth="yes"/>
       <point x="746" y="950"/>
       <point x="681" y="991"/>
-      <point x="586" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="586" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="497" y="991"/>
       <point x="430" y="955"/>
       <point x="385" y="882" type="curve" smooth="yes"/>
       <point x="340" y="809"/>
       <point x="317" y="701"/>
-      <point x="317" y="559" type="curve" name="sh06" smooth="yes"/>
+      <point x="317" y="559" type="curve" smooth="yes" name="sh06"/>
       <point x="317" y="417"/>
       <point x="340" y="309"/>
       <point x="385" y="236" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/degree.glif b/source/Hack-Regular.ufo/glyphs/degree.glif
index 4063b195d..114dc5894 100644
--- a/source/Hack-Regular.ufo/glyphs/degree.glif
+++ b/source/Hack-Regular.ufo/glyphs/degree.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="degree" format="1">
+<glyph name="degree" format="2">
   <advance width="1233"/>
   <unicode hex="00B0"/>
   <outline>
     <contour>
-      <point x="612" y="885" type="curve" name="hr00" smooth="yes"/>
+      <point x="612" y="885" type="curve" smooth="yes" name="hr00"/>
       <point x="528" y="885"/>
       <point x="448" y="915"/>
       <point x="388" y="975" type="curve" smooth="yes"/>
       <point x="335" y="1028"/>
       <point x="299" y="1106"/>
-      <point x="299" y="1199" type="curve" name="sh01" smooth="yes"/>
+      <point x="299" y="1199" type="curve" smooth="yes" name="sh01"/>
       <point x="299" y="1288"/>
       <point x="331" y="1367"/>
       <point x="390" y="1427" type="curve" smooth="yes"/>
       <point x="447" y="1486"/>
       <point x="526" y="1520"/>
-      <point x="615" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="615" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="655" y="1520"/>
       <point x="700" y="1513"/>
       <point x="740" y="1496" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="911" y="1322" type="curve" smooth="yes"/>
       <point x="926" y="1285"/>
       <point x="934" y="1245"/>
-      <point x="934" y="1202" type="curve" name="sh02" smooth="yes"/>
+      <point x="934" y="1202" type="curve" smooth="yes" name="sh02"/>
       <point x="934" y="1114"/>
       <point x="901" y="1033"/>
       <point x="842" y="976" type="curve" smooth="yes"/>
@@ -36,25 +36,25 @@
       <point x="703" y="885"/>
     </contour>
     <contour>
-      <point x="614" y="1012" type="curve" name="dv01" smooth="yes"/>
+      <point x="614" y="1012" type="curve" smooth="yes" name="dv01"/>
       <point x="669" y="1012"/>
       <point x="719" y="1034"/>
       <point x="752" y="1067" type="curve" smooth="yes"/>
       <point x="791" y="1106"/>
       <point x="807" y="1154"/>
-      <point x="807" y="1201" type="curve" name="ah01" smooth="yes"/>
+      <point x="807" y="1201" type="curve" smooth="yes" name="ah01"/>
       <point x="807" y="1252"/>
       <point x="787" y="1300"/>
       <point x="751" y="1336" type="curve" smooth="yes"/>
       <point x="720" y="1367"/>
       <point x="672" y="1391"/>
-      <point x="616" y="1391" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1391" type="curve" smooth="yes" name="sv01"/>
       <point x="563" y="1391"/>
       <point x="515" y="1370"/>
       <point x="482" y="1337" type="curve" smooth="yes"/>
       <point x="446" y="1301"/>
       <point x="426" y="1251"/>
-      <point x="426" y="1199" type="curve" name="sh03" smooth="yes"/>
+      <point x="426" y="1199" type="curve" smooth="yes" name="sh03"/>
       <point x="426" y="1144"/>
       <point x="446" y="1100"/>
       <point x="481" y="1065" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/delta.glif b/source/Hack-Regular.ufo/glyphs/delta.glif
index 2b9461ed4..c166c4d3d 100644
--- a/source/Hack-Regular.ufo/glyphs/delta.glif
+++ b/source/Hack-Regular.ufo/glyphs/delta.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="delta" format="1">
+<glyph name="delta" format="2">
   <advance width="1233"/>
   <unicode hex="03B4"/>
   <outline>
     <contour>
-      <point x="617" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="304" y="-29"/>
       <point x="137" y="174"/>
-      <point x="137" y="559" type="curve" name="dh01" smooth="yes"/>
+      <point x="137" y="559" type="curve" smooth="yes" name="dh01"/>
       <point x="137" y="760"/>
       <point x="183" y="903"/>
       <point x="260" y="996" type="curve" smooth="yes"/>
@@ -19,18 +19,18 @@
       <point x="275" y="1116" type="curve" smooth="yes"/>
       <point x="230" y="1163"/>
       <point x="213" y="1210"/>
-      <point x="213" y="1269" type="curve" name="sh01" smooth="yes"/>
+      <point x="213" y="1269" type="curve" smooth="yes" name="sh01"/>
       <point x="213" y="1450"/>
       <point x="378" y="1569"/>
-      <point x="658" y="1569" type="curve" name="at01" smooth="yes"/>
+      <point x="658" y="1569" type="curve" smooth="yes" name="at01"/>
       <point x="709" y="1569"/>
       <point x="766" y="1565"/>
-      <point x="799" y="1557" type="curve" name="at02" smooth="yes"/>
+      <point x="799" y="1557" type="curve" smooth="yes" name="at02"/>
       <point x="950" y="1521" type="line"/>
       <point x="950" y="1348" type="line" name="hr01"/>
       <point x="862" y="1380"/>
       <point x="755" y="1405"/>
-      <point x="647" y="1402" type="curve" name="sv01" smooth="yes"/>
+      <point x="647" y="1402" type="curve" smooth="yes" name="sv01"/>
       <point x="615" y="1401" type="line" smooth="yes"/>
       <point x="568" y="1400"/>
       <point x="526" y="1388"/>
@@ -38,7 +38,7 @@
       <point x="443" y="1328" type="line"/>
       <point x="425" y="1312"/>
       <point x="416" y="1288"/>
-      <point x="416" y="1257" type="curve" name="sh02" smooth="yes"/>
+      <point x="416" y="1257" type="curve" smooth="yes" name="sh02"/>
       <point x="416" y="1214"/>
       <point x="432" y="1189"/>
       <point x="487" y="1161" type="curve"/>
@@ -47,21 +47,21 @@
       <point x="616" y="1147" type="curve" name="dv04"/>
       <point x="937" y="1138"/>
       <point x="1096" y="941"/>
-      <point x="1096" y="561" type="curve" name="dh04" smooth="yes"/>
+      <point x="1096" y="561" type="curve" smooth="yes" name="dh04"/>
       <point x="1096" y="173"/>
       <point x="930" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="805" y="127"/>
       <point x="901" y="274"/>
-      <point x="901" y="559" type="curve" name="dh03" smooth="yes"/>
+      <point x="901" y="559" type="curve" smooth="yes" name="dh03"/>
       <point x="901" y="846"/>
       <point x="805" y="991"/>
-      <point x="616" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="428" y="991"/>
       <point x="332" y="846"/>
-      <point x="332" y="559" type="curve" name="dh02" smooth="yes"/>
+      <point x="332" y="559" type="curve" smooth="yes" name="dh02"/>
       <point x="332" y="274"/>
       <point x="428" y="127"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/dieresis.glif b/source/Hack-Regular.ufo/glyphs/dieresis.glif
index 2f39a6342..02b99d494 100644
--- a/source/Hack-Regular.ufo/glyphs/dieresis.glif
+++ b/source/Hack-Regular.ufo/glyphs/dieresis.glif
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dieresis" format="1">
+<glyph name="dieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00A8"/>
   <outline>
     <contour>
-      <point x="492" y="1552" type="line" name="hr00" smooth="yes"/>
+      <point x="492" y="1552" type="line" smooth="yes" name="hr00"/>
       <point x="512" y="1552"/>
       <point x="522" y="1542"/>
       <point x="522" y="1522" type="curve" smooth="yes"/>
-      <point x="522" y="1380" type="line" name="sh02" smooth="yes"/>
+      <point x="522" y="1380" type="line" smooth="yes" name="sh02"/>
       <point x="522" y="1360"/>
       <point x="512" y="1350"/>
-      <point x="492" y="1350" type="curve" name="dv01" smooth="yes"/>
+      <point x="492" y="1350" type="curve" smooth="yes" name="dv01"/>
       <point x="349" y="1350" type="line" smooth="yes"/>
       <point x="329" y="1350"/>
       <point x="319" y="1360"/>
-      <point x="319" y="1380" type="curve" name="sh01" smooth="yes"/>
+      <point x="319" y="1380" type="curve" smooth="yes" name="sh01"/>
       <point x="319" y="1522" type="line" smooth="yes"/>
       <point x="319" y="1542"/>
       <point x="329" y="1552"/>
       <point x="349" y="1552" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="883" y="1552" type="line" name="sv01" smooth="yes"/>
+      <point x="883" y="1552" type="line" smooth="yes" name="sv01"/>
       <point x="903" y="1552"/>
       <point x="913" y="1542"/>
       <point x="913" y="1522" type="curve" smooth="yes"/>
-      <point x="913" y="1380" type="line" name="sh03" smooth="yes"/>
+      <point x="913" y="1380" type="line" smooth="yes" name="sh03"/>
       <point x="913" y="1360"/>
       <point x="903" y="1350"/>
-      <point x="883" y="1350" type="curve" name="sv02" smooth="yes"/>
+      <point x="883" y="1350" type="curve" smooth="yes" name="sv02"/>
       <point x="741" y="1350" type="line" smooth="yes"/>
       <point x="721" y="1350"/>
       <point x="711" y="1360"/>
-      <point x="711" y="1380" type="curve" name="ah01" smooth="yes"/>
+      <point x="711" y="1380" type="curve" smooth="yes" name="ah01"/>
       <point x="711" y="1522" type="line" smooth="yes"/>
       <point x="711" y="1542"/>
       <point x="721" y="1552"/>
diff --git a/source/Hack-Regular.ufo/glyphs/dieresistonos.glif b/source/Hack-Regular.ufo/glyphs/dieresistonos.glif
index 860e6fcdd..1dabc21a3 100644
--- a/source/Hack-Regular.ufo/glyphs/dieresistonos.glif
+++ b/source/Hack-Regular.ufo/glyphs/dieresistonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dieresistonos" format="1">
+<glyph name="dieresistonos" format="2">
   <advance width="1233"/>
   <unicode hex="0385"/>
   <outline>
@@ -10,37 +10,37 @@
       <point x="485" y="1518" type="line" name="hr02"/>
     </contour>
     <contour>
-      <point x="272" y="1326" type="line" name="sv01" smooth="yes"/>
+      <point x="272" y="1326" type="line" smooth="yes" name="sv01"/>
       <point x="252" y="1326"/>
       <point x="242" y="1336"/>
-      <point x="242" y="1356" type="curve" name="hr03" smooth="yes"/>
+      <point x="242" y="1356" type="curve" smooth="yes" name="hr03"/>
       <point x="242" y="1498" type="line" smooth="yes"/>
       <point x="242" y="1518"/>
       <point x="252" y="1528"/>
-      <point x="272" y="1528" type="curve" name="hr04" smooth="yes"/>
+      <point x="272" y="1528" type="curve" smooth="yes" name="hr04"/>
       <point x="415" y="1528" type="line" smooth="yes"/>
       <point x="435" y="1528"/>
       <point x="445" y="1518"/>
       <point x="445" y="1498" type="curve" smooth="yes"/>
-      <point x="445" y="1356" type="line" name="hr05" smooth="yes"/>
+      <point x="445" y="1356" type="line" smooth="yes" name="hr05"/>
       <point x="445" y="1336"/>
       <point x="435" y="1326"/>
-      <point x="415" y="1326" type="curve" name="hr06" smooth="yes"/>
+      <point x="415" y="1326" type="curve" smooth="yes" name="hr06"/>
     </contour>
     <contour>
-      <point x="749" y="1326" type="line" name="sv02" smooth="yes"/>
+      <point x="749" y="1326" type="line" smooth="yes" name="sv02"/>
       <point x="729" y="1326"/>
       <point x="719" y="1336"/>
-      <point x="719" y="1356" type="curve" name="hr07" smooth="yes"/>
+      <point x="719" y="1356" type="curve" smooth="yes" name="hr07"/>
       <point x="719" y="1498" type="line" smooth="yes"/>
       <point x="719" y="1518"/>
       <point x="729" y="1528"/>
-      <point x="749" y="1528" type="curve" name="hr08" smooth="yes"/>
-      <point x="891" y="1528" type="line" name="hr09" smooth="yes"/>
+      <point x="749" y="1528" type="curve" smooth="yes" name="hr08"/>
+      <point x="891" y="1528" type="line" smooth="yes" name="hr09"/>
       <point x="911" y="1528"/>
       <point x="921" y="1518"/>
       <point x="921" y="1498" type="curve" smooth="yes"/>
-      <point x="921" y="1356" type="line" name="sh01" smooth="yes"/>
+      <point x="921" y="1356" type="line" smooth="yes" name="sh01"/>
       <point x="921" y="1336"/>
       <point x="911" y="1326"/>
       <point x="891" y="1326" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/divide.glif b/source/Hack-Regular.ufo/glyphs/divide.glif
index 59455b3d0..eef0f29cc 100644
--- a/source/Hack-Regular.ufo/glyphs/divide.glif
+++ b/source/Hack-Regular.ufo/glyphs/divide.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="divide" format="1">
+<glyph name="divide" format="2">
   <advance width="1233"/>
   <unicode hex="00F7"/>
   <outline>
     <contour>
-      <point x="524" y="889" type="line" name="hr00" smooth="yes"/>
+      <point x="524" y="889" type="line" smooth="yes" name="hr00"/>
       <point x="504" y="889"/>
       <point x="494" y="899"/>
-      <point x="494" y="919" type="curve" name="dh01" smooth="yes"/>
+      <point x="494" y="919" type="curve" smooth="yes" name="dh01"/>
       <point x="494" y="1105" type="line" smooth="yes"/>
       <point x="494" y="1125"/>
       <point x="504" y="1135"/>
-      <point x="524" y="1135" type="curve" name="at01" smooth="yes"/>
+      <point x="524" y="1135" type="curve" smooth="yes" name="at01"/>
       <point x="709" y="1135" type="line" smooth="yes"/>
       <point x="729" y="1135"/>
       <point x="739" y="1125"/>
       <point x="739" y="1105" type="curve" smooth="yes"/>
-      <point x="739" y="919" type="line" name="dh02" smooth="yes"/>
+      <point x="739" y="919" type="line" smooth="yes" name="dh02"/>
       <point x="739" y="899"/>
       <point x="729" y="889"/>
       <point x="709" y="889" type="curve" smooth="yes"/>
@@ -28,18 +28,18 @@
       <point x="88" y="557" type="line"/>
     </contour>
     <contour>
-      <point x="524" y="150" type="line" name="dv01" smooth="yes"/>
+      <point x="524" y="150" type="line" smooth="yes" name="dv01"/>
       <point x="504" y="150"/>
       <point x="494" y="160"/>
-      <point x="494" y="180" type="curve" name="sh01" smooth="yes"/>
+      <point x="494" y="180" type="curve" smooth="yes" name="sh01"/>
       <point x="494" y="365" type="line" smooth="yes"/>
       <point x="494" y="385"/>
       <point x="504" y="395"/>
-      <point x="524" y="395" type="curve" name="dv02" smooth="yes"/>
+      <point x="524" y="395" type="curve" smooth="yes" name="dv02"/>
       <point x="709" y="395" type="line" smooth="yes"/>
       <point x="729" y="395"/>
       <point x="739" y="385"/>
-      <point x="739" y="365" type="curve" name="sh02" smooth="yes"/>
+      <point x="739" y="365" type="curve" smooth="yes" name="sh02"/>
       <point x="739" y="180" type="line" smooth="yes"/>
       <point x="739" y="160"/>
       <point x="729" y="150"/>
diff --git a/source/Hack-Regular.ufo/glyphs/dkshade.glif b/source/Hack-Regular.ufo/glyphs/dkshade.glif
index 4107a505a..8a2848824 100644
--- a/source/Hack-Regular.ufo/glyphs/dkshade.glif
+++ b/source/Hack-Regular.ufo/glyphs/dkshade.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dkshade" format="1">
+<glyph name="dkshade" format="2">
   <advance width="1233"/>
   <unicode hex="2593"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/dnblock.glif b/source/Hack-Regular.ufo/glyphs/dnblock.glif
index c4ac1b174..be098426e 100644
--- a/source/Hack-Regular.ufo/glyphs/dnblock.glif
+++ b/source/Hack-Regular.ufo/glyphs/dnblock.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dnblock" format="1">
+<glyph name="dnblock" format="2">
   <advance width="1233"/>
   <unicode hex="2584"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/dollar.glif b/source/Hack-Regular.ufo/glyphs/dollar.glif
index 6602de54d..77bd4a31d 100644
--- a/source/Hack-Regular.ufo/glyphs/dollar.glif
+++ b/source/Hack-Regular.ufo/glyphs/dollar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dollar" format="1">
+<glyph name="dollar" format="2">
   <advance width="1233"/>
   <unicode hex="0024"/>
   <outline>
@@ -24,7 +24,7 @@
       <point x="291" y="722" type="curve" smooth="yes"/>
       <point x="223" y="783"/>
       <point x="190" y="861"/>
-      <point x="190" y="964" type="curve" name="dh01" smooth="yes"/>
+      <point x="190" y="964" type="curve" smooth="yes" name="dh01"/>
       <point x="190" y="1068"/>
       <point x="225" y="1151"/>
       <point x="296" y="1214" type="curve" smooth="yes"/>
@@ -53,7 +53,7 @@
       <point x="1006" y="622" type="curve" smooth="yes"/>
       <point x="1078" y="557"/>
       <point x="1114" y="474"/>
-      <point x="1114" y="373" type="curve" name="dh06" smooth="yes"/>
+      <point x="1114" y="373" type="curve" smooth="yes" name="dh06"/>
       <point x="1114" y="272"/>
       <point x="1078" y="186"/>
       <point x="998" y="114" type="curve" smooth="yes"/>
@@ -70,7 +70,7 @@
       <point x="430" y="1123" type="curve" smooth="yes"/>
       <point x="391" y="1086"/>
       <point x="371" y="1036"/>
-      <point x="371" y="974" type="curve" name="dh02" smooth="yes"/>
+      <point x="371" y="974" type="curve" smooth="yes" name="dh02"/>
       <point x="371" y="913"/>
       <point x="390" y="870"/>
       <point x="426" y="837" type="curve" smooth="yes"/>
@@ -85,7 +85,7 @@
       <point x="864" y="207" type="curve" smooth="yes"/>
       <point x="905" y="246"/>
       <point x="926" y="298"/>
-      <point x="926" y="363" type="curve" name="dh05" smooth="yes"/>
+      <point x="926" y="363" type="curve" smooth="yes" name="dh05"/>
       <point x="926" y="424"/>
       <point x="909" y="475"/>
       <point x="870" y="510" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/dong.glif b/source/Hack-Regular.ufo/glyphs/dong.glif
index 4f7960bad..c0dd57177 100644
--- a/source/Hack-Regular.ufo/glyphs/dong.glif
+++ b/source/Hack-Regular.ufo/glyphs/dong.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dong" format="1">
+<glyph name="dong" format="2">
   <advance width="1233"/>
   <unicode hex="20AB"/>
   <outline>
     <contour>
-      <point x="678" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="678" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="411" y="-29"/>
       <point x="245" y="194"/>
-      <point x="245" y="561" type="curve" name="sh01" smooth="yes"/>
+      <point x="245" y="561" type="curve" smooth="yes" name="sh01"/>
       <point x="245" y="927"/>
       <point x="412" y="1147"/>
-      <point x="679" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="679" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="818" y="1147"/>
       <point x="920" y="1089"/>
       <point x="980" y="977" type="curve"/>
@@ -31,16 +31,16 @@
       <point x="815" y="-29"/>
     </contour>
     <contour>
-      <point x="708" y="127" type="curve" name="sv01" smooth="yes"/>
+      <point x="708" y="127" type="curve" smooth="yes" name="sv01"/>
       <point x="887" y="127"/>
       <point x="980" y="274"/>
-      <point x="980" y="559" type="curve" name="sh06" smooth="yes"/>
+      <point x="980" y="559" type="curve" smooth="yes" name="sh06"/>
       <point x="980" y="844"/>
       <point x="887" y="991"/>
-      <point x="708" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="708" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="529" y="991"/>
       <point x="439" y="846"/>
-      <point x="439" y="559" type="curve" name="sh07" smooth="yes"/>
+      <point x="439" y="559" type="curve" smooth="yes" name="sh07"/>
       <point x="439" y="272"/>
       <point x="529" y="127"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/dotaccent.glif b/source/Hack-Regular.ufo/glyphs/dotaccent.glif
index c6a51624e..a9b446d85 100644
--- a/source/Hack-Regular.ufo/glyphs/dotaccent.glif
+++ b/source/Hack-Regular.ufo/glyphs/dotaccent.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dotaccent" format="1">
+<glyph name="dotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="02D9"/>
   <outline>
     <contour>
-      <point x="689" y="1552" type="line" name="hr00" smooth="yes"/>
+      <point x="689" y="1552" type="line" smooth="yes" name="hr00"/>
       <point x="709" y="1552"/>
       <point x="719" y="1542"/>
       <point x="719" y="1522" type="curve" smooth="yes"/>
-      <point x="719" y="1378" type="line" name="dh02" smooth="yes"/>
+      <point x="719" y="1378" type="line" smooth="yes" name="dh02"/>
       <point x="719" y="1358"/>
       <point x="709" y="1348"/>
-      <point x="689" y="1348" type="curve" name="dv01" smooth="yes"/>
+      <point x="689" y="1348" type="curve" smooth="yes" name="dv01"/>
       <point x="544" y="1348" type="line" smooth="yes"/>
       <point x="524" y="1348"/>
       <point x="514" y="1358"/>
-      <point x="514" y="1378" type="curve" name="dh01" smooth="yes"/>
+      <point x="514" y="1378" type="curve" smooth="yes" name="dh01"/>
       <point x="514" y="1522" type="line" smooth="yes"/>
       <point x="514" y="1542"/>
       <point x="524" y="1552"/>
-      <point x="544" y="1552" type="curve" name="sv01" smooth="yes"/>
+      <point x="544" y="1552" type="curve" smooth="yes" name="sv01"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Regular.ufo/glyphs/dotbelowcomb.glif b/source/Hack-Regular.ufo/glyphs/dotbelowcomb.glif
index 2b2b724d1..709ebf4bb 100644
--- a/source/Hack-Regular.ufo/glyphs/dotbelowcomb.glif
+++ b/source/Hack-Regular.ufo/glyphs/dotbelowcomb.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dotbelowcomb" format="1">
-  <advance width="0"/>
+<glyph name="dotbelowcomb" format="2">
   <unicode hex="0323"/>
   <outline>
     <contour>
diff --git a/source/Hack-Regular.ufo/glyphs/dotlessi.glif b/source/Hack-Regular.ufo/glyphs/dotlessi.glif
index 90d55bb2b..e84dde1d6 100644
--- a/source/Hack-Regular.ufo/glyphs/dotlessi.glif
+++ b/source/Hack-Regular.ufo/glyphs/dotlessi.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dotlessi" format="1">
+<glyph name="dotlessi" format="2">
   <advance width="1233"/>
   <unicode hex="0131"/>
   <outline>
     <contour>
-      <point x="859" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="859" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="752" y="-8"/>
       <point x="668" y="23"/>
       <point x="604" y="98" type="curve" smooth="yes"/>
       <point x="543" y="169"/>
       <point x="513" y="269"/>
-      <point x="513" y="398" type="curve" name="sh01" smooth="yes"/>
+      <point x="513" y="398" type="curve" smooth="yes" name="sh01"/>
       <point x="513" y="976" type="line" name="sv01"/>
       <point x="268" y="976" type="line"/>
       <point x="268" y="1120" type="line" name="dh01"/>
@@ -18,10 +18,10 @@
       <point x="697" y="398" type="line" smooth="yes"/>
       <point x="697" y="315"/>
       <point x="712" y="252"/>
-      <point x="743" y="211" type="curve" name="hr01" smooth="yes"/>
+      <point x="743" y="211" type="curve" smooth="yes" name="hr01"/>
       <point x="775" y="167"/>
       <point x="820" y="148"/>
-      <point x="877" y="148" type="curve" name="sv02" smooth="yes"/>
+      <point x="877" y="148" type="curve" smooth="yes" name="sv02"/>
       <point x="1092" y="148" type="line" name="sv03"/>
       <point x="1092" y="-8" type="line" name="ab02"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/dotmath.glif b/source/Hack-Regular.ufo/glyphs/dotmath.glif
index fc4237658..2ebe6297e 100644
--- a/source/Hack-Regular.ufo/glyphs/dotmath.glif
+++ b/source/Hack-Regular.ufo/glyphs/dotmath.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="dotmath" format="1">
+<glyph name="dotmath" format="2">
   <advance width="1233"/>
   <unicode hex="22C5"/>
   <outline>
     <contour>
-      <point x="519" y="559" type="line" name="hr00" smooth="yes"/>
+      <point x="519" y="559" type="line" smooth="yes" name="hr00"/>
       <point x="499" y="559"/>
       <point x="489" y="569"/>
-      <point x="489" y="589" type="curve" name="dh01" smooth="yes"/>
+      <point x="489" y="589" type="curve" smooth="yes" name="dh01"/>
       <point x="489" y="834" type="line" smooth="yes"/>
       <point x="489" y="854"/>
       <point x="499" y="864"/>
-      <point x="519" y="864" type="curve" name="dv01" smooth="yes"/>
+      <point x="519" y="864" type="curve" smooth="yes" name="dv01"/>
       <point x="711" y="864" type="line" smooth="yes"/>
       <point x="731" y="864"/>
       <point x="741" y="854"/>
       <point x="741" y="834" type="curve" smooth="yes"/>
-      <point x="741" y="589" type="line" name="dh02" smooth="yes"/>
+      <point x="741" y="589" type="line" smooth="yes" name="dh02"/>
       <point x="741" y="569"/>
       <point x="731" y="559"/>
-      <point x="711" y="559" type="curve" name="sv01" smooth="yes"/>
+      <point x="711" y="559" type="curve" smooth="yes" name="sv01"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Regular.ufo/glyphs/e.glif b/source/Hack-Regular.ufo/glyphs/e.glif
index 9f2673bfe..c07ae1cef 100644
--- a/source/Hack-Regular.ufo/glyphs/e.glif
+++ b/source/Hack-Regular.ufo/glyphs/e.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="e" format="1">
+<glyph name="e" format="2">
   <advance width="1233"/>
   <unicode hex="0065"/>
   <outline>
@@ -38,9 +38,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/eacute.glif b/source/Hack-Regular.ufo/glyphs/eacute.glif
index c21bb9217..6f0cbad57 100644
--- a/source/Hack-Regular.ufo/glyphs/eacute.glif
+++ b/source/Hack-Regular.ufo/glyphs/eacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eacute" format="1">
+<glyph name="eacute" format="2">
   <advance width="1233"/>
   <unicode hex="00E9"/>
   <outline>
@@ -10,19 +10,19 @@
       <point x="490" y="1297" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="677" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="677" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="332" y="-29"/>
       <point x="124" y="192"/>
-      <point x="124" y="558" type="curve" name="sh02" smooth="yes"/>
+      <point x="124" y="558" type="curve" smooth="yes" name="sh02"/>
       <point x="124" y="746"/>
       <point x="178" y="887"/>
       <point x="267" y="987" type="curve" smooth="yes"/>
       <point x="364" y="1095"/>
       <point x="498" y="1147"/>
-      <point x="649" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="649" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="941" y="1147"/>
       <point x="1113" y="944"/>
-      <point x="1113" y="606" type="curve" name="sh01" smooth="yes"/>
+      <point x="1113" y="606" type="curve" smooth="yes" name="sh01"/>
       <point x="1113" y="516" type="line"/>
       <point x="316" y="516" type="line" name="sh03"/>
       <point x="316" y="510" type="line" smooth="yes"/>
@@ -31,7 +31,7 @@
       <point x="412" y="227" type="curve" smooth="yes"/>
       <point x="473" y="163"/>
       <point x="559" y="127"/>
-      <point x="680" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="680" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="741" y="127"/>
       <point x="802" y="136"/>
       <point x="865" y="155" type="curve" smooth="yes"/>
@@ -52,7 +52,7 @@
       <point x="853" y="907" type="curve" smooth="yes"/>
       <point x="805" y="963"/>
       <point x="733" y="991"/>
-      <point x="645" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="645" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="555" y="991"/>
       <point x="482" y="962"/>
       <point x="425" y="903" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/ebreve.glif b/source/Hack-Regular.ufo/glyphs/ebreve.glif
index d626a5ad0..f8f9774b5 100644
--- a/source/Hack-Regular.ufo/glyphs/ebreve.glif
+++ b/source/Hack-Regular.ufo/glyphs/ebreve.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ebreve" format="1">
+<glyph name="ebreve" format="2">
   <advance width="1233"/>
   <unicode hex="0115"/>
   <outline>
     <contour>
-      <point x="677" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="677" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="332" y="-29"/>
       <point x="124" y="192"/>
-      <point x="124" y="558" type="curve" name="sh01" smooth="yes"/>
+      <point x="124" y="558" type="curve" smooth="yes" name="sh01"/>
       <point x="124" y="746"/>
       <point x="178" y="887"/>
       <point x="267" y="987" type="curve" smooth="yes"/>
       <point x="364" y="1095"/>
       <point x="498" y="1147"/>
-      <point x="649" y="1147" type="curve" name="dv03" smooth="yes"/>
+      <point x="649" y="1147" type="curve" smooth="yes" name="dv03"/>
       <point x="941" y="1147"/>
       <point x="1113" y="944"/>
-      <point x="1113" y="606" type="curve" name="sh02" smooth="yes"/>
+      <point x="1113" y="606" type="curve" smooth="yes" name="sh02"/>
       <point x="1113" y="516" type="line"/>
       <point x="316" y="516" type="line" name="sh03"/>
       <point x="316" y="510" type="line" smooth="yes"/>
@@ -25,7 +25,7 @@
       <point x="412" y="227" type="curve" smooth="yes"/>
       <point x="473" y="163"/>
       <point x="559" y="127"/>
-      <point x="680" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="680" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="741" y="127"/>
       <point x="802" y="136"/>
       <point x="865" y="155" type="curve" smooth="yes"/>
@@ -46,7 +46,7 @@
       <point x="853" y="907" type="curve" smooth="yes"/>
       <point x="805" y="963"/>
       <point x="733" y="991"/>
-      <point x="645" y="991" type="curve" name="dv02" smooth="yes"/>
+      <point x="645" y="991" type="curve" smooth="yes" name="dv02"/>
       <point x="555" y="991"/>
       <point x="482" y="962"/>
       <point x="425" y="903" type="curve" smooth="yes"/>
@@ -55,7 +55,7 @@
       <point x="323" y="659" type="curve" name="sh04"/>
     </contour>
     <contour>
-      <point x="644" y="1298" type="curve" name="dv03" smooth="yes"/>
+      <point x="644" y="1298" type="curve" smooth="yes" name="dv03"/>
       <point x="452" y="1298"/>
       <point x="346" y="1394"/>
       <point x="331" y="1585" type="curve" name="sh03"/>
@@ -65,7 +65,7 @@
       <point x="509" y="1472" type="curve" smooth="yes"/>
       <point x="540" y="1447"/>
       <point x="585" y="1435"/>
-      <point x="644" y="1435" type="curve" name="dv04" smooth="yes"/>
+      <point x="644" y="1435" type="curve" smooth="yes" name="dv04"/>
       <point x="701" y="1435"/>
       <point x="746" y="1447"/>
       <point x="777" y="1472" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/ecaron.glif b/source/Hack-Regular.ufo/glyphs/ecaron.glif
index 01d5361fa..729c6ccdb 100644
--- a/source/Hack-Regular.ufo/glyphs/ecaron.glif
+++ b/source/Hack-Regular.ufo/glyphs/ecaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ecaron" format="1">
+<glyph name="ecaron" format="2">
   <advance width="1233"/>
   <unicode hex="011B"/>
   <outline>
@@ -13,22 +13,22 @@
       <point x="579" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="677" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="677" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="330" y="-29"/>
       <point x="124" y="195"/>
-      <point x="124" y="555" type="curve" name="sh01" smooth="yes"/>
+      <point x="124" y="555" type="curve" smooth="yes" name="sh01"/>
       <point x="124" y="916"/>
       <point x="333" y="1147"/>
-      <point x="645" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="645" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="941" y="1147"/>
       <point x="1113" y="941"/>
-      <point x="1113" y="606" type="curve" name="sh02" smooth="yes"/>
+      <point x="1113" y="606" type="curve" smooth="yes" name="sh02"/>
       <point x="1113" y="516" type="line"/>
       <point x="316" y="516" type="line" name="sh03"/>
       <point x="316" y="510" type="line" smooth="yes"/>
       <point x="316" y="266"/>
       <point x="450" y="127"/>
-      <point x="680" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="680" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="800" y="127"/>
       <point x="925" y="164"/>
       <point x="1070" y="240" type="curve" name="ih03"/>
@@ -40,7 +40,7 @@
       <point x="929" y="660" type="line" name="ah01"/>
       <point x="925" y="869"/>
       <point x="828" y="991"/>
-      <point x="647" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="647" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="466" y="991"/>
       <point x="346" y="871"/>
       <point x="323" y="659" type="curve" name="sh04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/ecircumflex.glif b/source/Hack-Regular.ufo/glyphs/ecircumflex.glif
index f54a60c9a..7a6abbde8 100644
--- a/source/Hack-Regular.ufo/glyphs/ecircumflex.glif
+++ b/source/Hack-Regular.ufo/glyphs/ecircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ecircumflex" format="1">
+<glyph name="ecircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00EA"/>
   <outline>
@@ -13,19 +13,19 @@
       <point x="312" y="1297" type="line" name="sh04"/>
     </contour>
     <contour>
-      <point x="677" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="677" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="332" y="-29"/>
       <point x="124" y="192"/>
-      <point x="124" y="558" type="curve" name="sh02" smooth="yes"/>
+      <point x="124" y="558" type="curve" smooth="yes" name="sh02"/>
       <point x="124" y="746"/>
       <point x="178" y="887"/>
       <point x="267" y="987" type="curve" smooth="yes"/>
       <point x="364" y="1095"/>
       <point x="498" y="1147"/>
-      <point x="649" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="649" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="941" y="1147"/>
       <point x="1113" y="944"/>
-      <point x="1113" y="606" type="curve" name="sh01" smooth="yes"/>
+      <point x="1113" y="606" type="curve" smooth="yes" name="sh01"/>
       <point x="1113" y="516" type="line"/>
       <point x="316" y="516" type="line" name="sh03"/>
       <point x="316" y="510" type="line" smooth="yes"/>
@@ -34,7 +34,7 @@
       <point x="412" y="227" type="curve" smooth="yes"/>
       <point x="473" y="163"/>
       <point x="559" y="127"/>
-      <point x="680" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="680" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="741" y="127"/>
       <point x="802" y="136"/>
       <point x="865" y="155" type="curve" smooth="yes"/>
@@ -55,7 +55,7 @@
       <point x="853" y="907" type="curve" smooth="yes"/>
       <point x="805" y="963"/>
       <point x="733" y="991"/>
-      <point x="645" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="645" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="555" y="991"/>
       <point x="482" y="962"/>
       <point x="425" y="903" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/edieresis.glif b/source/Hack-Regular.ufo/glyphs/edieresis.glif
index 53bbdcc75..a7b67fba7 100644
--- a/source/Hack-Regular.ufo/glyphs/edieresis.glif
+++ b/source/Hack-Regular.ufo/glyphs/edieresis.glif
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="edieresis" format="1">
+<glyph name="edieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00EB"/>
   <outline>
     <contour>
-      <point x="364" y="1350" type="line" name="hr00" smooth="yes"/>
+      <point x="364" y="1350" type="line" smooth="yes" name="hr00"/>
       <point x="344" y="1350"/>
       <point x="334" y="1360"/>
       <point x="334" y="1380" type="curve" smooth="yes"/>
       <point x="334" y="1522" type="line" smooth="yes"/>
       <point x="334" y="1542"/>
       <point x="344" y="1552"/>
-      <point x="364" y="1552" type="curve" name="dv03" smooth="yes"/>
+      <point x="364" y="1552" type="curve" smooth="yes" name="dv03"/>
       <point x="507" y="1552" type="line" smooth="yes"/>
       <point x="527" y="1552"/>
       <point x="537" y="1542"/>
       <point x="537" y="1522" type="curve" smooth="yes"/>
-      <point x="537" y="1380" type="line" name="sh02" smooth="yes"/>
+      <point x="537" y="1380" type="line" smooth="yes" name="sh02"/>
       <point x="537" y="1360"/>
       <point x="527" y="1350"/>
       <point x="507" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="756" y="1350" type="line" name="sv01" smooth="yes"/>
+      <point x="756" y="1350" type="line" smooth="yes" name="sv01"/>
       <point x="736" y="1350"/>
       <point x="726" y="1360"/>
-      <point x="726" y="1380" type="curve" name="dh03" smooth="yes"/>
+      <point x="726" y="1380" type="curve" smooth="yes" name="dh03"/>
       <point x="726" y="1522" type="line" smooth="yes"/>
       <point x="726" y="1542"/>
       <point x="736" y="1552"/>
-      <point x="756" y="1552" type="curve" name="sv02" smooth="yes"/>
+      <point x="756" y="1552" type="curve" smooth="yes" name="sv02"/>
       <point x="898" y="1552" type="line" smooth="yes"/>
       <point x="918" y="1552"/>
       <point x="928" y="1542"/>
       <point x="928" y="1522" type="curve" smooth="yes"/>
-      <point x="928" y="1380" type="line" name="dh04" smooth="yes"/>
+      <point x="928" y="1380" type="line" smooth="yes" name="dh04"/>
       <point x="928" y="1360"/>
       <point x="918" y="1350"/>
       <point x="898" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="677" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="677" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="332" y="-29"/>
       <point x="124" y="192"/>
-      <point x="124" y="558" type="curve" name="dh01" smooth="yes"/>
+      <point x="124" y="558" type="curve" smooth="yes" name="dh01"/>
       <point x="124" y="746"/>
       <point x="178" y="887"/>
       <point x="267" y="987" type="curve" smooth="yes"/>
       <point x="364" y="1095"/>
       <point x="498" y="1147"/>
-      <point x="649" y="1147" type="curve" name="dv05" smooth="yes"/>
+      <point x="649" y="1147" type="curve" smooth="yes" name="dv05"/>
       <point x="941" y="1147"/>
       <point x="1113" y="944"/>
-      <point x="1113" y="606" type="curve" name="sh03" smooth="yes"/>
+      <point x="1113" y="606" type="curve" smooth="yes" name="sh03"/>
       <point x="1113" y="516" type="line"/>
       <point x="316" y="516" type="line" name="dh02"/>
       <point x="316" y="510" type="line" smooth="yes"/>
@@ -61,7 +61,7 @@
       <point x="412" y="227" type="curve" smooth="yes"/>
       <point x="473" y="163"/>
       <point x="559" y="127"/>
-      <point x="680" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="680" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="741" y="127"/>
       <point x="802" y="136"/>
       <point x="865" y="155" type="curve" smooth="yes"/>
@@ -82,7 +82,7 @@
       <point x="853" y="907" type="curve" smooth="yes"/>
       <point x="805" y="963"/>
       <point x="733" y="991"/>
-      <point x="645" y="991" type="curve" name="dv04" smooth="yes"/>
+      <point x="645" y="991" type="curve" smooth="yes" name="dv04"/>
       <point x="555" y="991"/>
       <point x="482" y="962"/>
       <point x="425" y="903" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/edotaccent.glif b/source/Hack-Regular.ufo/glyphs/edotaccent.glif
index 74a0634ec..a0712f0ff 100644
--- a/source/Hack-Regular.ufo/glyphs/edotaccent.glif
+++ b/source/Hack-Regular.ufo/glyphs/edotaccent.glif
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="edotaccent" format="1">
+<glyph name="edotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="0117"/>
   <outline>
     <contour>
-      <point x="558" y="1348" type="line" name="hr00" smooth="yes"/>
+      <point x="558" y="1348" type="line" smooth="yes" name="hr00"/>
       <point x="538" y="1348"/>
       <point x="528" y="1358"/>
-      <point x="528" y="1378" type="curve" name="dh03" smooth="yes"/>
+      <point x="528" y="1378" type="curve" smooth="yes" name="dh03"/>
       <point x="528" y="1522" type="line" smooth="yes"/>
       <point x="528" y="1542"/>
       <point x="538" y="1552"/>
-      <point x="558" y="1552" type="curve" name="dv03" smooth="yes"/>
+      <point x="558" y="1552" type="curve" smooth="yes" name="dv03"/>
       <point x="703" y="1552" type="line" smooth="yes"/>
       <point x="723" y="1552"/>
       <point x="733" y="1542"/>
       <point x="733" y="1522" type="curve" smooth="yes"/>
-      <point x="733" y="1378" type="line" name="dh04" smooth="yes"/>
+      <point x="733" y="1378" type="line" smooth="yes" name="dh04"/>
       <point x="733" y="1358"/>
       <point x="723" y="1348"/>
       <point x="703" y="1348" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="677" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="677" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="330" y="-29"/>
       <point x="124" y="195"/>
-      <point x="124" y="555" type="curve" name="dh01" smooth="yes"/>
+      <point x="124" y="555" type="curve" smooth="yes" name="dh01"/>
       <point x="124" y="916"/>
       <point x="333" y="1147"/>
-      <point x="645" y="1147" type="curve" name="dv05" smooth="yes"/>
+      <point x="645" y="1147" type="curve" smooth="yes" name="dv05"/>
       <point x="941" y="1147"/>
       <point x="1113" y="941"/>
-      <point x="1113" y="606" type="curve" name="dh06" smooth="yes"/>
+      <point x="1113" y="606" type="curve" smooth="yes" name="dh06"/>
       <point x="1113" y="516" type="line"/>
       <point x="316" y="516" type="line" name="dh02"/>
       <point x="316" y="510" type="line" smooth="yes"/>
       <point x="316" y="266"/>
       <point x="450" y="127"/>
-      <point x="680" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="680" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="800" y="127"/>
       <point x="925" y="164"/>
       <point x="1070" y="240" type="curve" name="ih01"/>
@@ -49,7 +49,7 @@
       <point x="929" y="660" type="line" name="dh05"/>
       <point x="925" y="869"/>
       <point x="828" y="991"/>
-      <point x="647" y="991" type="curve" name="dv04" smooth="yes"/>
+      <point x="647" y="991" type="curve" smooth="yes" name="dv04"/>
       <point x="466" y="991"/>
       <point x="346" y="871"/>
       <point x="323" y="659" type="curve" name="sh01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/egrave.glif b/source/Hack-Regular.ufo/glyphs/egrave.glif
index 938a7708d..9f790a946 100644
--- a/source/Hack-Regular.ufo/glyphs/egrave.glif
+++ b/source/Hack-Regular.ufo/glyphs/egrave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="egrave" format="1">
+<glyph name="egrave" format="2">
   <advance width="1233"/>
   <unicode hex="00E8"/>
   <outline>
@@ -10,19 +10,19 @@
       <point x="619" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="677" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="677" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="332" y="-29"/>
       <point x="124" y="192"/>
-      <point x="124" y="558" type="curve" name="sh01" smooth="yes"/>
+      <point x="124" y="558" type="curve" smooth="yes" name="sh01"/>
       <point x="124" y="746"/>
       <point x="178" y="887"/>
       <point x="267" y="987" type="curve" smooth="yes"/>
       <point x="364" y="1095"/>
       <point x="498" y="1147"/>
-      <point x="649" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="649" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="941" y="1147"/>
       <point x="1113" y="944"/>
-      <point x="1113" y="606" type="curve" name="sh03" smooth="yes"/>
+      <point x="1113" y="606" type="curve" smooth="yes" name="sh03"/>
       <point x="1113" y="516" type="line"/>
       <point x="316" y="516" type="line" name="sh02"/>
       <point x="316" y="510" type="line" smooth="yes"/>
@@ -31,7 +31,7 @@
       <point x="412" y="227" type="curve" smooth="yes"/>
       <point x="473" y="163"/>
       <point x="559" y="127"/>
-      <point x="680" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="680" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="741" y="127"/>
       <point x="802" y="136"/>
       <point x="865" y="155" type="curve" smooth="yes"/>
@@ -52,7 +52,7 @@
       <point x="853" y="907" type="curve" smooth="yes"/>
       <point x="805" y="963"/>
       <point x="733" y="991"/>
-      <point x="645" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="645" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="555" y="991"/>
       <point x="482" y="962"/>
       <point x="425" y="903" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/eight.glif b/source/Hack-Regular.ufo/glyphs/eight.glif
index 627ee936c..a59bd77e3 100644
--- a/source/Hack-Regular.ufo/glyphs/eight.glif
+++ b/source/Hack-Regular.ufo/glyphs/eight.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eight" format="1">
+<glyph name="eight" format="2">
   <advance width="1233"/>
   <unicode hex="0038"/>
   <outline>
     <contour>
-      <point x="615" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="312" y="-29"/>
       <point x="131" y="127"/>
-      <point x="131" y="400" type="curve" name="dh01" smooth="yes"/>
+      <point x="131" y="400" type="curve" smooth="yes" name="dh01"/>
       <point x="131" y="506"/>
       <point x="158" y="593"/>
       <point x="211" y="660" type="curve" smooth="yes"/>
@@ -19,25 +19,25 @@
       <point x="239" y="915" type="curve" smooth="yes"/>
       <point x="188" y="978"/>
       <point x="166" y="1053"/>
-      <point x="166" y="1137" type="curve" name="ih03" smooth="yes"/>
+      <point x="166" y="1137" type="curve" smooth="yes" name="ih03"/>
       <point x="166" y="1250"/>
       <point x="206" y="1345"/>
       <point x="287" y="1416" type="curve" smooth="yes"/>
       <point x="366" y="1484"/>
       <point x="473" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="759" y="1520"/>
       <point x="867" y="1484"/>
       <point x="946" y="1416" type="curve" smooth="yes"/>
       <point x="1026" y="1348"/>
       <point x="1067" y="1253"/>
-      <point x="1067" y="1136" type="curve" name="dh04" smooth="yes"/>
+      <point x="1067" y="1136" type="curve" smooth="yes" name="dh04"/>
       <point x="1067" y="960"/>
       <point x="967" y="838"/>
       <point x="793" y="793" type="curve" name="ih04"/>
       <point x="994" y="749"/>
       <point x="1102" y="613"/>
-      <point x="1102" y="402" type="curve" name="sh01" smooth="yes"/>
+      <point x="1102" y="402" type="curve" smooth="yes" name="sh01"/>
       <point x="1102" y="262"/>
       <point x="1056" y="156"/>
       <point x="973" y="84" type="curve" smooth="yes"/>
@@ -45,42 +45,42 @@
       <point x="768" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="868" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="868" type="curve" smooth="yes" name="dv03"/>
       <point x="697" y="868"/>
       <point x="759" y="889"/>
       <point x="802" y="931" type="curve" smooth="yes"/>
       <point x="845" y="973"/>
       <point x="866" y="1034"/>
-      <point x="866" y="1114" type="curve" name="dh03" smooth="yes"/>
+      <point x="866" y="1114" type="curve" smooth="yes" name="dh03"/>
       <point x="866" y="1195"/>
       <point x="845" y="1257"/>
       <point x="803" y="1300" type="curve" smooth="yes"/>
       <point x="760" y="1343"/>
       <point x="698" y="1364"/>
-      <point x="616" y="1364" type="curve" name="hr02" smooth="yes"/>
+      <point x="616" y="1364" type="curve" smooth="yes" name="hr02"/>
       <point x="455" y="1364"/>
       <point x="367" y="1277"/>
-      <point x="367" y="1114" type="curve" name="sh02" smooth="yes"/>
+      <point x="367" y="1114" type="curve" smooth="yes" name="sh02"/>
       <point x="367" y="954"/>
       <point x="455" y="868"/>
     </contour>
     <contour>
-      <point x="619" y="129" type="curve" name="hr03" smooth="yes"/>
+      <point x="619" y="129" type="curve" smooth="yes" name="hr03"/>
       <point x="797" y="129"/>
       <point x="899" y="236"/>
-      <point x="899" y="418" type="curve" name="ih01" smooth="yes"/>
+      <point x="899" y="418" type="curve" smooth="yes" name="ih01"/>
       <point x="899" y="517"/>
       <point x="872" y="586"/>
       <point x="825" y="633" type="curve" smooth="yes"/>
       <point x="775" y="684"/>
       <point x="705" y="709"/>
-      <point x="616" y="709" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="709" type="curve" smooth="yes" name="dv02"/>
       <point x="526" y="709"/>
       <point x="457" y="684"/>
       <point x="408" y="634" type="curve" smooth="yes"/>
       <point x="361" y="586"/>
       <point x="334" y="514"/>
-      <point x="334" y="421" type="curve" name="dh02" smooth="yes"/>
+      <point x="334" y="421" type="curve" smooth="yes" name="dh02"/>
       <point x="334" y="330"/>
       <point x="359" y="257"/>
       <point x="408" y="206" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/eight.subs.glif b/source/Hack-Regular.ufo/glyphs/eight.subs.glif
index 91490c5bd..e8aa98638 100644
--- a/source/Hack-Regular.ufo/glyphs/eight.subs.glif
+++ b/source/Hack-Regular.ufo/glyphs/eight.subs.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eight.subs" format="1">
+<glyph name="eight.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="616" y="-422" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-422" type="curve" smooth="yes" name="hr00"/>
       <point x="428" y="-422"/>
       <point x="315" y="-332"/>
       <point x="315" y="-183" type="curve" smooth="yes"/>
@@ -12,10 +12,10 @@
       <point x="507" y="38" type="curve" name="ih01"/>
       <point x="399" y="62"/>
       <point x="337" y="132"/>
-      <point x="337" y="228" type="curve" name="sh01" smooth="yes"/>
+      <point x="337" y="228" type="curve" smooth="yes" name="sh01"/>
       <point x="337" y="360"/>
       <point x="444" y="444"/>
-      <point x="616" y="444" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="444" type="curve" smooth="yes" name="dv03"/>
       <point x="789" y="444"/>
       <point x="896" y="360"/>
       <point x="896" y="228" type="curve" smooth="yes"/>
@@ -24,32 +24,32 @@
       <point x="726" y="38" type="curve" name="ih02"/>
       <point x="851" y="13"/>
       <point x="918" y="-62"/>
-      <point x="918" y="-182" type="curve" name="sh02" smooth="yes"/>
+      <point x="918" y="-182" type="curve" smooth="yes" name="sh02"/>
       <point x="918" y="-333"/>
       <point x="805" y="-422"/>
     </contour>
     <contour>
-      <point x="616" y="79" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="79" type="curve" smooth="yes" name="sv01"/>
       <point x="717" y="79"/>
       <point x="771" y="128"/>
-      <point x="771" y="217" type="curve" name="ah01" smooth="yes"/>
+      <point x="771" y="217" type="curve" smooth="yes" name="ah01"/>
       <point x="771" y="309"/>
       <point x="720" y="357"/>
-      <point x="616" y="357" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="357" type="curve" smooth="yes" name="dv02"/>
       <point x="516" y="357"/>
       <point x="462" y="309"/>
-      <point x="462" y="217" type="curve" name="sh03" smooth="yes"/>
+      <point x="462" y="217" type="curve" smooth="yes" name="sh03"/>
       <point x="462" y="128"/>
       <point x="516" y="79"/>
     </contour>
     <contour>
-      <point x="616" y="-334" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-334" type="curve" smooth="yes" name="dv01"/>
       <point x="729" y="-334"/>
       <point x="792" y="-275"/>
       <point x="792" y="-171" type="curve" smooth="yes"/>
       <point x="792" y="-67"/>
       <point x="728" y="-9"/>
-      <point x="616" y="-9" type="curve" name="ab01" smooth="yes"/>
+      <point x="616" y="-9" type="curve" smooth="yes" name="ab01"/>
       <point x="503" y="-9"/>
       <point x="441" y="-67"/>
       <point x="441" y="-171" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/element.glif b/source/Hack-Regular.ufo/glyphs/element.glif
index 1dd87ea5a..756432106 100644
--- a/source/Hack-Regular.ufo/glyphs/element.glif
+++ b/source/Hack-Regular.ufo/glyphs/element.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="element" format="1">
+<glyph name="element" format="2">
   <advance width="1233"/>
   <unicode hex="2208"/>
   <outline>
     <contour>
-      <point x="632" y="0" type="line" name="hr00" smooth="yes"/>
+      <point x="632" y="0" type="line" smooth="yes" name="hr00"/>
       <point x="447" y="0"/>
       <point x="285" y="144"/>
       <point x="197" y="365" type="curve" smooth="yes"/>
       <point x="152" y="478"/>
       <point x="130" y="600"/>
-      <point x="130" y="729" type="curve" name="dh01" smooth="yes"/>
+      <point x="130" y="729" type="curve" smooth="yes" name="dh01"/>
       <point x="130" y="997"/>
       <point x="224" y="1233"/>
       <point x="380" y="1366" type="curve" smooth="yes"/>
@@ -34,7 +34,7 @@
       <point x="346" y="450" type="curve" smooth="yes"/>
       <point x="413" y="265"/>
       <point x="515" y="170"/>
-      <point x="632" y="170" type="curve" name="sv01" smooth="yes"/>
+      <point x="632" y="170" type="curve" smooth="yes" name="sv01"/>
       <point x="1104" y="170" type="line" name="sv02"/>
       <point x="1104" y="0" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/ellipsis.glif b/source/Hack-Regular.ufo/glyphs/ellipsis.glif
index f3f4f85b1..7ca4ee385 100644
--- a/source/Hack-Regular.ufo/glyphs/ellipsis.glif
+++ b/source/Hack-Regular.ufo/glyphs/ellipsis.glif
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ellipsis" format="1">
+<glyph name="ellipsis" format="2">
   <advance width="1233"/>
   <unicode hex="2026"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line" name="hr00" smooth="yes"/>
+      <point x="110" y="0" type="line" smooth="yes" name="hr00"/>
       <point x="90" y="0"/>
       <point x="80" y="10"/>
-      <point x="80" y="30" type="curve" name="dh01" smooth="yes"/>
+      <point x="80" y="30" type="curve" smooth="yes" name="dh01"/>
       <point x="80" y="275" type="line" smooth="yes"/>
       <point x="80" y="295"/>
       <point x="90" y="305"/>
-      <point x="110" y="305" type="curve" name="sv01" smooth="yes"/>
+      <point x="110" y="305" type="curve" smooth="yes" name="sv01"/>
       <point x="302" y="305" type="line" smooth="yes"/>
       <point x="322" y="305"/>
       <point x="332" y="295"/>
       <point x="332" y="275" type="curve" smooth="yes"/>
-      <point x="332" y="30" type="line" name="dh02" smooth="yes"/>
+      <point x="332" y="30" type="line" smooth="yes" name="dh02"/>
       <point x="332" y="10"/>
       <point x="322" y="0"/>
       <point x="302" y="0" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="519" y="0" type="line" name="ab01" smooth="yes"/>
+      <point x="519" y="0" type="line" smooth="yes" name="ab01"/>
       <point x="499" y="0"/>
       <point x="489" y="10"/>
-      <point x="489" y="30" type="curve" name="dh03" smooth="yes"/>
+      <point x="489" y="30" type="curve" smooth="yes" name="dh03"/>
       <point x="489" y="275" type="line" smooth="yes"/>
       <point x="489" y="295"/>
       <point x="499" y="305"/>
-      <point x="519" y="305" type="curve" name="sv02" smooth="yes"/>
-      <point x="711" y="305" type="line" name="sv03" smooth="yes"/>
+      <point x="519" y="305" type="curve" smooth="yes" name="sv02"/>
+      <point x="711" y="305" type="line" smooth="yes" name="sv03"/>
       <point x="731" y="305"/>
       <point x="741" y="295"/>
       <point x="741" y="275" type="curve" smooth="yes"/>
-      <point x="741" y="30" type="line" name="dh04" smooth="yes"/>
+      <point x="741" y="30" type="line" smooth="yes" name="dh04"/>
       <point x="741" y="10"/>
       <point x="731" y="0"/>
       <point x="711" y="0" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="929" y="0" type="line" name="ab02" smooth="yes"/>
+      <point x="929" y="0" type="line" smooth="yes" name="ab02"/>
       <point x="909" y="0"/>
       <point x="899" y="10"/>
-      <point x="899" y="30" type="curve" name="dh05" smooth="yes"/>
+      <point x="899" y="30" type="curve" smooth="yes" name="dh05"/>
       <point x="899" y="275" type="line" smooth="yes"/>
       <point x="899" y="295"/>
       <point x="909" y="305"/>
-      <point x="929" y="305" type="curve" name="sv04" smooth="yes"/>
-      <point x="1121" y="305" type="line" name="sv05" smooth="yes"/>
+      <point x="929" y="305" type="curve" smooth="yes" name="sv04"/>
+      <point x="1121" y="305" type="line" smooth="yes" name="sv05"/>
       <point x="1141" y="305"/>
       <point x="1151" y="295"/>
       <point x="1151" y="275" type="curve" smooth="yes"/>
-      <point x="1151" y="30" type="line" name="dh06" smooth="yes"/>
+      <point x="1151" y="30" type="line" smooth="yes" name="dh06"/>
       <point x="1151" y="10"/>
       <point x="1141" y="0"/>
       <point x="1121" y="0" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/emacron.glif b/source/Hack-Regular.ufo/glyphs/emacron.glif
index a5747dca2..8df0a428d 100644
--- a/source/Hack-Regular.ufo/glyphs/emacron.glif
+++ b/source/Hack-Regular.ufo/glyphs/emacron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="emacron" format="1">
+<glyph name="emacron" format="2">
   <advance width="1233"/>
   <unicode hex="0113"/>
   <outline>
@@ -10,22 +10,22 @@
       <point x="353" y="1348" type="line"/>
     </contour>
     <contour>
-      <point x="677" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="677" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="330" y="-29"/>
       <point x="124" y="195"/>
-      <point x="124" y="555" type="curve" name="sh01" smooth="yes"/>
+      <point x="124" y="555" type="curve" smooth="yes" name="sh01"/>
       <point x="124" y="916"/>
       <point x="333" y="1147"/>
-      <point x="645" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="645" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="941" y="1147"/>
       <point x="1113" y="941"/>
-      <point x="1113" y="606" type="curve" name="sh02" smooth="yes"/>
+      <point x="1113" y="606" type="curve" smooth="yes" name="sh02"/>
       <point x="1113" y="516" type="line"/>
       <point x="316" y="516" type="line" name="sh03"/>
       <point x="316" y="510" type="line" smooth="yes"/>
       <point x="316" y="266"/>
       <point x="450" y="127"/>
-      <point x="680" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="680" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="800" y="127"/>
       <point x="925" y="164"/>
       <point x="1070" y="240" type="curve" name="ih01"/>
@@ -37,7 +37,7 @@
       <point x="929" y="660" type="line" name="ah01"/>
       <point x="925" y="869"/>
       <point x="828" y="991"/>
-      <point x="647" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="647" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="466" y="991"/>
       <point x="346" y="871"/>
       <point x="323" y="659" type="curve" name="sh04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/emdash.glif b/source/Hack-Regular.ufo/glyphs/emdash.glif
index 0a356607a..53694690a 100644
--- a/source/Hack-Regular.ufo/glyphs/emdash.glif
+++ b/source/Hack-Regular.ufo/glyphs/emdash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="emdash" format="1">
+<glyph name="emdash" format="2">
   <advance width="1233"/>
   <unicode hex="2014"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/emptyset.glif b/source/Hack-Regular.ufo/glyphs/emptyset.glif
index 7dc9233af..ec9609267 100644
--- a/source/Hack-Regular.ufo/glyphs/emptyset.glif
+++ b/source/Hack-Regular.ufo/glyphs/emptyset.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="emptyset" format="1">
+<glyph name="emptyset" format="2">
   <advance width="1233"/>
   <unicode hex="2205"/>
   <outline>
@@ -8,13 +8,13 @@
       <point x="191" y="315" type="line"/>
       <point x="130" y="392"/>
       <point x="80" y="498"/>
-      <point x="80" y="643" type="curve" name="sh01" smooth="yes"/>
+      <point x="80" y="643" type="curve" smooth="yes" name="sh01"/>
       <point x="80" y="792"/>
       <point x="132" y="918"/>
       <point x="237" y="1023" type="curve" smooth="yes"/>
       <point x="343" y="1129"/>
       <point x="470" y="1182"/>
-      <point x="617" y="1182" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1182" type="curve" smooth="yes" name="av01"/>
       <point x="765" y="1182"/>
       <point x="867" y="1128"/>
       <point x="945" y="1069" type="curve"/>
@@ -23,13 +23,13 @@
       <point x="1043" y="969" type="line"/>
       <point x="1103" y="894"/>
       <point x="1153" y="789"/>
-      <point x="1153" y="644" type="curve" name="sh03" smooth="yes"/>
+      <point x="1153" y="644" type="curve" smooth="yes" name="sh03"/>
       <point x="1153" y="495"/>
       <point x="1101" y="369"/>
       <point x="996" y="264" type="curve" smooth="yes"/>
       <point x="896" y="164"/>
       <point x="770" y="106"/>
-      <point x="615" y="106" type="curve" name="av03" smooth="yes"/>
+      <point x="615" y="106" type="curve" smooth="yes" name="av03"/>
       <point x="471" y="106"/>
       <point x="365" y="156"/>
       <point x="291" y="217" type="curve"/>
@@ -39,16 +39,16 @@
       <point x="844" y="968" type="line"/>
       <point x="820" y="985"/>
       <point x="797" y="999"/>
-      <point x="768" y="1011" type="curve" name="hr01" smooth="yes"/>
+      <point x="768" y="1011" type="curve" smooth="yes" name="hr01"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="sv01" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="sv01"/>
       <point x="515" y="1041"/>
       <point x="413" y="1001"/>
-      <point x="336" y="925" type="curve" name="hr02" smooth="yes"/>
+      <point x="336" y="925" type="curve" smooth="yes" name="hr02"/>
       <point x="256" y="845"/>
       <point x="221" y="744"/>
-      <point x="221" y="640" type="curve" name="sh05" smooth="yes"/>
+      <point x="221" y="640" type="curve" smooth="yes" name="sh05"/>
       <point x="221" y="587"/>
       <point x="230" y="538"/>
       <point x="249" y="492" type="curve" smooth="yes"/>
@@ -57,16 +57,16 @@
       <point x="292" y="416" type="curve"/>
     </contour>
     <contour>
-      <point x="614" y="246" type="curve" name="sv02" smooth="yes"/>
+      <point x="614" y="246" type="curve" smooth="yes" name="sv02"/>
       <point x="718" y="246"/>
       <point x="821" y="286"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="976" y="441"/>
       <point x="1012" y="541"/>
-      <point x="1012" y="645" type="curve" name="ah01" smooth="yes"/>
+      <point x="1012" y="645" type="curve" smooth="yes" name="ah01"/>
       <point x="1012" y="696"/>
       <point x="1003" y="748"/>
-      <point x="984" y="795" type="curve" name="hr03" smooth="yes"/>
+      <point x="984" y="795" type="curve" smooth="yes" name="hr03"/>
       <point x="975" y="818"/>
       <point x="959" y="848"/>
       <point x="943" y="869" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/endash.glif b/source/Hack-Regular.ufo/glyphs/endash.glif
index d14055e95..63d5a7387 100644
--- a/source/Hack-Regular.ufo/glyphs/endash.glif
+++ b/source/Hack-Regular.ufo/glyphs/endash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="endash" format="1">
+<glyph name="endash" format="2">
   <advance width="1233"/>
   <unicode hex="2013"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/eng.glif b/source/Hack-Regular.ufo/glyphs/eng.glif
index ae99abe7f..4b6a4eccc 100644
--- a/source/Hack-Regular.ufo/glyphs/eng.glif
+++ b/source/Hack-Regular.ufo/glyphs/eng.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eng" format="1">
+<glyph name="eng" format="2">
   <advance width="1233"/>
   <unicode hex="014B"/>
   <outline>
@@ -8,11 +8,11 @@
       <point x="687" y="-270" type="line" smooth="yes"/>
       <point x="806" y="-270"/>
       <point x="866" y="-187"/>
-      <point x="866" y="-20" type="curve" name="ah01" smooth="yes"/>
+      <point x="866" y="-20" type="curve" smooth="yes" name="ah01"/>
       <point x="866" y="694" type="line" smooth="yes"/>
       <point x="866" y="895"/>
       <point x="799" y="987"/>
-      <point x="648" y="987" type="curve" name="sv02" smooth="yes"/>
+      <point x="648" y="987" type="curve" smooth="yes" name="sv02"/>
       <point x="473" y="987"/>
       <point x="379" y="862"/>
       <point x="379" y="633" type="curve" smooth="yes"/>
@@ -23,14 +23,14 @@
       <point x="379" y="952" type="line" name="sh02"/>
       <point x="444" y="1081"/>
       <point x="558" y="1147"/>
-      <point x="711" y="1147" type="curve" name="sv03" smooth="yes"/>
+      <point x="711" y="1147" type="curve" smooth="yes" name="sv03"/>
       <point x="940" y="1147"/>
       <point x="1051" y="999"/>
       <point x="1051" y="694" type="curve" smooth="yes"/>
-      <point x="1051" y="-20" type="line" name="sh03" smooth="yes"/>
+      <point x="1051" y="-20" type="line" smooth="yes" name="sh03"/>
       <point x="1051" y="-281"/>
       <point x="928" y="-426"/>
-      <point x="707" y="-426" type="curve" name="ab01" smooth="yes"/>
+      <point x="707" y="-426" type="curve" smooth="yes" name="ab01"/>
       <point x="502" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/eogonek.glif b/source/Hack-Regular.ufo/glyphs/eogonek.glif
index 937563286..5279d023d 100644
--- a/source/Hack-Regular.ufo/glyphs/eogonek.glif
+++ b/source/Hack-Regular.ufo/glyphs/eogonek.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eogonek" format="1">
+<glyph name="eogonek" format="2">
   <advance width="1233"/>
   <unicode hex="0119"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="316" y="510" type="line" smooth="yes"/>
       <point x="316" y="266"/>
       <point x="450" y="127"/>
-      <point x="680" y="127" type="curve" name="dv05" smooth="yes"/>
+      <point x="680" y="127" type="curve" smooth="yes" name="dv05"/>
       <point x="800" y="127"/>
       <point x="925" y="164"/>
       <point x="1070" y="240" type="curve" name="ih01"/>
@@ -18,39 +18,39 @@
       <point x="893" y="-1" type="curve"/>
       <point x="830" y="-88"/>
       <point x="806" y="-139"/>
-      <point x="806" y="-184" type="curve" name="dh04" smooth="yes"/>
+      <point x="806" y="-184" type="curve" smooth="yes" name="dh04"/>
       <point x="806" y="-240"/>
       <point x="844" y="-272"/>
-      <point x="916" y="-272" type="curve" name="dv02" smooth="yes"/>
+      <point x="916" y="-272" type="curve" smooth="yes" name="dv02"/>
       <point x="957" y="-272"/>
       <point x="999" y="-262"/>
       <point x="1040" y="-242" type="curve" name="sh01"/>
       <point x="1040" y="-375" type="line"/>
       <point x="984" y="-390"/>
       <point x="946" y="-395"/>
-      <point x="897" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="897" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="748" y="-395"/>
       <point x="667" y="-340"/>
-      <point x="667" y="-221" type="curve" name="dh03" smooth="yes"/>
+      <point x="667" y="-221" type="curve" smooth="yes" name="dh03"/>
       <point x="667" y="-162"/>
       <point x="688" y="-104"/>
       <point x="754" y="-25" type="curve" name="hr01"/>
       <point x="727" y="-28"/>
       <point x="702" y="-29"/>
-      <point x="677" y="-29" type="curve" name="dv04" smooth="yes"/>
+      <point x="677" y="-29" type="curve" smooth="yes" name="dv04"/>
       <point x="330" y="-29"/>
       <point x="124" y="195"/>
-      <point x="124" y="555" type="curve" name="dh01" smooth="yes"/>
+      <point x="124" y="555" type="curve" smooth="yes" name="dh01"/>
       <point x="124" y="916"/>
       <point x="333" y="1147"/>
-      <point x="645" y="1147" type="curve" name="hr02" smooth="yes"/>
+      <point x="645" y="1147" type="curve" smooth="yes" name="hr02"/>
       <point x="941" y="1147"/>
       <point x="1113" y="941"/>
-      <point x="1113" y="606" type="curve" name="dh06" smooth="yes"/>
+      <point x="1113" y="606" type="curve" smooth="yes" name="dh06"/>
       <point x="1113" y="516" type="line"/>
     </contour>
     <contour>
-      <point x="647" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="647" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="466" y="991"/>
       <point x="346" y="871"/>
       <point x="323" y="659" type="curve" name="sh02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/epsilon.glif b/source/Hack-Regular.ufo/glyphs/epsilon.glif
index 8ecb3d076..4385893c2 100644
--- a/source/Hack-Regular.ufo/glyphs/epsilon.glif
+++ b/source/Hack-Regular.ufo/glyphs/epsilon.glif
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="epsilon" format="1">
+<glyph name="epsilon" format="2">
   <advance width="1233"/>
   <unicode hex="03B5"/>
   <outline>
     <contour>
-      <point x="693" y="-22" type="curve" name="ab01" smooth="yes"/>
+      <point x="693" y="-22" type="curve" smooth="yes" name="ab01"/>
       <point x="361" y="-22"/>
       <point x="169" y="110"/>
-      <point x="169" y="321" type="curve" name="sh01" smooth="yes"/>
+      <point x="169" y="321" type="curve" smooth="yes" name="sh01"/>
       <point x="169" y="480"/>
       <point x="277" y="575"/>
       <point x="449" y="607" type="curve" name="iv01"/>
       <point x="289" y="640"/>
       <point x="201" y="728"/>
-      <point x="201" y="856" type="curve" name="sh02" smooth="yes"/>
+      <point x="201" y="856" type="curve" smooth="yes" name="sh02"/>
       <point x="201" y="1034"/>
       <point x="375" y="1147"/>
-      <point x="655" y="1147" type="curve" name="dv02" smooth="yes"/>
+      <point x="655" y="1147" type="curve" smooth="yes" name="dv02"/>
       <point x="760" y="1147"/>
       <point x="883" y="1131"/>
       <point x="1023" y="1099" type="curve"/>
       <point x="1023" y="932" type="line"/>
       <point x="883" y="968"/>
       <point x="770" y="984"/>
-      <point x="674" y="984" type="curve" name="dv01" smooth="yes"/>
+      <point x="674" y="984" type="curve" smooth="yes" name="dv01"/>
       <point x="485" y="984"/>
       <point x="384" y="922"/>
-      <point x="384" y="830" type="curve" name="sh03" smooth="yes"/>
+      <point x="384" y="830" type="curve" smooth="yes" name="sh03"/>
       <point x="384" y="739"/>
       <point x="482" y="676"/>
-      <point x="663" y="676" type="curve" name="hr01" smooth="yes"/>
+      <point x="663" y="676" type="curve" smooth="yes" name="hr01"/>
       <point x="829" y="676" type="line" name="dv04"/>
       <point x="829" y="532" type="line" name="dv03"/>
       <point x="670" y="532" type="line" smooth="yes"/>
       <point x="470" y="532"/>
       <point x="352" y="454"/>
-      <point x="352" y="334" type="curve" name="sh04" smooth="yes"/>
+      <point x="352" y="334" type="curve" smooth="yes" name="sh04"/>
       <point x="352" y="213"/>
       <point x="474" y="138"/>
-      <point x="707" y="138" type="curve" name="sv01" smooth="yes"/>
+      <point x="707" y="138" type="curve" smooth="yes" name="sv01"/>
       <point x="839" y="138"/>
       <point x="960" y="162"/>
       <point x="1064" y="207" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/epsilontonos.glif b/source/Hack-Regular.ufo/glyphs/epsilontonos.glif
index bb7cb04e5..5fe6cf4ba 100644
--- a/source/Hack-Regular.ufo/glyphs/epsilontonos.glif
+++ b/source/Hack-Regular.ufo/glyphs/epsilontonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="epsilontonos" format="1">
+<glyph name="epsilontonos" format="2">
   <advance width="1233"/>
   <unicode hex="03AD"/>
   <outline>
@@ -10,41 +10,41 @@
       <point x="475" y="1299" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="693" y="-22" type="curve" name="ab01" smooth="yes"/>
+      <point x="693" y="-22" type="curve" smooth="yes" name="ab01"/>
       <point x="361" y="-22"/>
       <point x="169" y="110"/>
-      <point x="169" y="321" type="curve" name="sh01" smooth="yes"/>
+      <point x="169" y="321" type="curve" smooth="yes" name="sh01"/>
       <point x="169" y="480"/>
       <point x="277" y="575"/>
       <point x="449" y="607" type="curve" name="iv02"/>
       <point x="289" y="640"/>
       <point x="201" y="728"/>
-      <point x="201" y="856" type="curve" name="sh02" smooth="yes"/>
+      <point x="201" y="856" type="curve" smooth="yes" name="sh02"/>
       <point x="201" y="1034"/>
       <point x="375" y="1147"/>
-      <point x="655" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="655" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="760" y="1147"/>
       <point x="883" y="1131"/>
       <point x="1023" y="1099" type="curve" name="hr01"/>
       <point x="1023" y="932" type="line"/>
       <point x="883" y="968"/>
       <point x="770" y="984"/>
-      <point x="674" y="984" type="curve" name="dv03" smooth="yes"/>
+      <point x="674" y="984" type="curve" smooth="yes" name="dv03"/>
       <point x="485" y="984"/>
       <point x="384" y="922"/>
-      <point x="384" y="830" type="curve" name="sh03" smooth="yes"/>
+      <point x="384" y="830" type="curve" smooth="yes" name="sh03"/>
       <point x="384" y="739"/>
       <point x="482" y="676"/>
       <point x="663" y="676" type="curve" smooth="yes"/>
       <point x="829" y="676" type="line" name="dv02"/>
       <point x="829" y="532" type="line" name="dv01"/>
-      <point x="670" y="532" type="line" name="hr02" smooth="yes"/>
+      <point x="670" y="532" type="line" smooth="yes" name="hr02"/>
       <point x="470" y="532"/>
       <point x="352" y="454"/>
-      <point x="352" y="334" type="curve" name="sh04" smooth="yes"/>
+      <point x="352" y="334" type="curve" smooth="yes" name="sh04"/>
       <point x="352" y="213"/>
       <point x="474" y="138"/>
-      <point x="707" y="138" type="curve" name="sv01" smooth="yes"/>
+      <point x="707" y="138" type="curve" smooth="yes" name="sv01"/>
       <point x="839" y="138"/>
       <point x="960" y="162"/>
       <point x="1064" y="207" type="curve" name="iv03"/>
diff --git a/source/Hack-Regular.ufo/glyphs/equal.glif b/source/Hack-Regular.ufo/glyphs/equal.glif
index d73313a4c..7628dca26 100644
--- a/source/Hack-Regular.ufo/glyphs/equal.glif
+++ b/source/Hack-Regular.ufo/glyphs/equal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="equal" format="1">
+<glyph name="equal" format="2">
   <advance width="1233"/>
   <unicode hex="003D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/equivalence.glif b/source/Hack-Regular.ufo/glyphs/equivalence.glif
index 8f382f691..339685b14 100644
--- a/source/Hack-Regular.ufo/glyphs/equivalence.glif
+++ b/source/Hack-Regular.ufo/glyphs/equivalence.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="equivalence" format="1">
+<glyph name="equivalence" format="2">
   <advance width="1233"/>
   <unicode hex="2261"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/eta.glif b/source/Hack-Regular.ufo/glyphs/eta.glif
index c2125765e..80a6ca15a 100644
--- a/source/Hack-Regular.ufo/glyphs/eta.glif
+++ b/source/Hack-Regular.ufo/glyphs/eta.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eta" format="1">
+<glyph name="eta" format="2">
   <advance width="1233"/>
   <unicode hex="03B7"/>
   <outline>
     <contour>
-      <point x="866" y="694" type="line" name="ah01" smooth="yes"/>
+      <point x="866" y="694" type="line" smooth="yes" name="ah01"/>
       <point x="866" y="895"/>
       <point x="799" y="987"/>
-      <point x="648" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="648" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="473" y="987"/>
       <point x="379" y="862"/>
       <point x="379" y="633" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="379" y="952" type="line" name="sh03"/>
       <point x="444" y="1081"/>
       <point x="558" y="1147"/>
-      <point x="711" y="1147" type="curve" name="sv02" smooth="yes"/>
+      <point x="711" y="1147" type="curve" smooth="yes" name="sv02"/>
       <point x="940" y="1147"/>
       <point x="1051" y="999"/>
-      <point x="1051" y="694" type="curve" name="sh04" smooth="yes"/>
+      <point x="1051" y="694" type="curve" smooth="yes" name="sh04"/>
       <point x="1051" y="-426" type="line" name="ab01"/>
       <point x="866" y="-426" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/etatonos.glif b/source/Hack-Regular.ufo/glyphs/etatonos.glif
index 4bd739f6a..27532fed1 100644
--- a/source/Hack-Regular.ufo/glyphs/etatonos.glif
+++ b/source/Hack-Regular.ufo/glyphs/etatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="etatonos" format="1">
+<glyph name="etatonos" format="2">
   <advance width="1233"/>
   <unicode hex="03AE"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="475" y="1299" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="866" y="694" type="line" name="ah01" smooth="yes"/>
+      <point x="866" y="694" type="line" smooth="yes" name="ah01"/>
       <point x="866" y="895"/>
       <point x="799" y="987"/>
-      <point x="648" y="987" type="curve" name="hr01" smooth="yes"/>
+      <point x="648" y="987" type="curve" smooth="yes" name="hr01"/>
       <point x="473" y="987"/>
       <point x="379" y="862"/>
       <point x="379" y="633" type="curve" smooth="yes"/>
@@ -24,10 +24,10 @@
       <point x="379" y="952" type="line" name="sh04"/>
       <point x="444" y="1081"/>
       <point x="558" y="1147"/>
-      <point x="711" y="1147" type="curve" name="sv01" smooth="yes"/>
+      <point x="711" y="1147" type="curve" smooth="yes" name="sv01"/>
       <point x="940" y="1147"/>
       <point x="1051" y="999"/>
-      <point x="1051" y="694" type="curve" name="sh01" smooth="yes"/>
+      <point x="1051" y="694" type="curve" smooth="yes" name="sh01"/>
       <point x="1051" y="-426" type="line" name="ab01"/>
       <point x="866" y="-426" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/eth.glif b/source/Hack-Regular.ufo/glyphs/eth.glif
index 270c83c42..0297891a8 100644
--- a/source/Hack-Regular.ufo/glyphs/eth.glif
+++ b/source/Hack-Regular.ufo/glyphs/eth.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="eth" format="1">
+<glyph name="eth" format="2">
   <advance width="1233"/>
   <unicode hex="00F0"/>
   <outline>
     <contour>
-      <point x="617" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="462" y="-29"/>
       <point x="345" y="22"/>
       <point x="262" y="119" type="curve" smooth="yes"/>
       <point x="178" y="219"/>
       <point x="137" y="358"/>
-      <point x="137" y="533" type="curve" name="sh01" smooth="yes"/>
+      <point x="137" y="533" type="curve" smooth="yes" name="sh01"/>
       <point x="137" y="889"/>
       <point x="303" y="1096"/>
-      <point x="631" y="1096" type="curve" name="dv03" smooth="yes"/>
+      <point x="631" y="1096" type="curve" smooth="yes" name="dv03"/>
       <point x="655" y="1096"/>
       <point x="659" y="1095"/>
       <point x="663" y="1095" type="curve" name="sv01"/>
@@ -40,7 +40,7 @@
       <point x="1005" y="925" type="curve" smooth="yes"/>
       <point x="1066" y="797"/>
       <point x="1096" y="672"/>
-      <point x="1096" y="528" type="curve" name="sh02" smooth="yes"/>
+      <point x="1096" y="528" type="curve" smooth="yes" name="sh02"/>
       <point x="1096" y="357"/>
       <point x="1055" y="219"/>
       <point x="971" y="119" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="766" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="708" y="127"/>
       <point x="778" y="162"/>
       <point x="827" y="233" type="curve" smooth="yes"/>
       <point x="876" y="305"/>
       <point x="901" y="406"/>
-      <point x="901" y="531" type="curve" name="ah01" smooth="yes"/>
+      <point x="901" y="531" type="curve" smooth="yes" name="ah01"/>
       <point x="901" y="685"/>
       <point x="859" y="825"/>
       <point x="793" y="918" type="curve"/>
@@ -63,10 +63,10 @@
       <point x="717" y="938" type="curve" smooth="yes"/>
       <point x="690" y="942"/>
       <point x="663" y="944"/>
-      <point x="638" y="944" type="curve" name="dv02" smooth="yes"/>
+      <point x="638" y="944" type="curve" smooth="yes" name="dv02"/>
       <point x="437" y="944"/>
       <point x="332" y="800"/>
-      <point x="332" y="534" type="curve" name="sh03" smooth="yes"/>
+      <point x="332" y="534" type="curve" smooth="yes" name="sh03"/>
       <point x="332" y="405"/>
       <point x="357" y="304"/>
       <point x="406" y="233" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/exclam.glif b/source/Hack-Regular.ufo/glyphs/exclam.glif
index d7de340e0..2c02673f1 100644
--- a/source/Hack-Regular.ufo/glyphs/exclam.glif
+++ b/source/Hack-Regular.ufo/glyphs/exclam.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="exclam" format="1">
+<glyph name="exclam" format="2">
   <advance width="1233"/>
   <unicode hex="0021"/>
   <outline>
@@ -12,25 +12,25 @@
       <point x="558" y="486" type="line"/>
     </contour>
     <contour>
-      <point x="616" y="-60" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-60" type="curve" smooth="yes" name="dv01"/>
       <point x="569" y="-60"/>
       <point x="531" y="-44"/>
       <point x="500" y="-12" type="curve" smooth="yes"/>
       <point x="469" y="19"/>
       <point x="454" y="61"/>
-      <point x="454" y="113" type="curve" name="dh01" smooth="yes"/>
+      <point x="454" y="113" type="curve" smooth="yes" name="dh01"/>
       <point x="454" y="164"/>
       <point x="469" y="206"/>
       <point x="500" y="237" type="curve" smooth="yes"/>
       <point x="531" y="268"/>
       <point x="570" y="284"/>
-      <point x="616" y="284" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="284" type="curve" smooth="yes" name="dv02"/>
       <point x="662" y="284"/>
       <point x="701" y="268"/>
-      <point x="732" y="237" type="curve" name="hr01" smooth="yes"/>
+      <point x="732" y="237" type="curve" smooth="yes" name="hr01"/>
       <point x="763" y="206"/>
       <point x="778" y="165"/>
-      <point x="778" y="113" type="curve" name="dh02" smooth="yes"/>
+      <point x="778" y="113" type="curve" smooth="yes" name="dh02"/>
       <point x="778" y="57"/>
       <point x="763" y="19"/>
       <point x="732" y="-12" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/exclamdbl.glif b/source/Hack-Regular.ufo/glyphs/exclamdbl.glif
index 0f23f5efb..b7ad01794 100644
--- a/source/Hack-Regular.ufo/glyphs/exclamdbl.glif
+++ b/source/Hack-Regular.ufo/glyphs/exclamdbl.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="exclamdbl" format="1">
+<glyph name="exclamdbl" format="2">
   <advance width="1233"/>
   <unicode hex="203C"/>
   <outline>
@@ -20,25 +20,25 @@
       <point x="838" y="486" type="line"/>
     </contour>
     <contour>
-      <point x="406" y="-60" type="curve" name="dv01" smooth="yes"/>
+      <point x="406" y="-60" type="curve" smooth="yes" name="dv01"/>
       <point x="359" y="-60"/>
       <point x="321" y="-44"/>
       <point x="290" y="-12" type="curve" smooth="yes"/>
       <point x="259" y="19"/>
       <point x="244" y="61"/>
-      <point x="244" y="113" type="curve" name="dh01" smooth="yes"/>
+      <point x="244" y="113" type="curve" smooth="yes" name="dh01"/>
       <point x="244" y="164"/>
       <point x="259" y="206"/>
       <point x="290" y="237" type="curve" smooth="yes"/>
       <point x="321" y="268"/>
       <point x="360" y="284"/>
-      <point x="406" y="284" type="curve" name="dv02" smooth="yes"/>
+      <point x="406" y="284" type="curve" smooth="yes" name="dv02"/>
       <point x="452" y="284"/>
       <point x="491" y="268"/>
       <point x="522" y="237" type="curve" smooth="yes"/>
       <point x="553" y="206"/>
       <point x="568" y="165"/>
-      <point x="568" y="113" type="curve" name="dh02" smooth="yes"/>
+      <point x="568" y="113" type="curve" smooth="yes" name="dh02"/>
       <point x="568" y="57"/>
       <point x="553" y="19"/>
       <point x="522" y="-12" type="curve" smooth="yes"/>
@@ -46,25 +46,25 @@
       <point x="452" y="-60"/>
     </contour>
     <contour>
-      <point x="896" y="-60" type="curve" name="hr01" smooth="yes"/>
+      <point x="896" y="-60" type="curve" smooth="yes" name="hr01"/>
       <point x="849" y="-60"/>
       <point x="811" y="-44"/>
       <point x="780" y="-12" type="curve" smooth="yes"/>
       <point x="749" y="19"/>
       <point x="734" y="61"/>
-      <point x="734" y="113" type="curve" name="dh03" smooth="yes"/>
+      <point x="734" y="113" type="curve" smooth="yes" name="dh03"/>
       <point x="734" y="164"/>
       <point x="749" y="206"/>
       <point x="780" y="237" type="curve" smooth="yes"/>
       <point x="811" y="268"/>
       <point x="850" y="284"/>
-      <point x="896" y="284" type="curve" name="sv01" smooth="yes"/>
+      <point x="896" y="284" type="curve" smooth="yes" name="sv01"/>
       <point x="942" y="284"/>
       <point x="981" y="268"/>
       <point x="1012" y="237" type="curve" smooth="yes"/>
       <point x="1043" y="206"/>
       <point x="1058" y="165"/>
-      <point x="1058" y="113" type="curve" name="dh04" smooth="yes"/>
+      <point x="1058" y="113" type="curve" smooth="yes" name="dh04"/>
       <point x="1058" y="57"/>
       <point x="1043" y="19"/>
       <point x="1012" y="-12" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/exclamdown.case.glif b/source/Hack-Regular.ufo/glyphs/exclamdown.case.glif
index 230819e3f..91095eff4 100644
--- a/source/Hack-Regular.ufo/glyphs/exclamdown.case.glif
+++ b/source/Hack-Regular.ufo/glyphs/exclamdown.case.glif
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="exclamdown.case" format="1">
+<glyph name="exclamdown.case" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="626" y="1498" type="curve" name="at01" smooth="yes"/>
+      <point x="626" y="1498" type="curve" smooth="yes" name="at01"/>
       <point x="672" y="1498"/>
       <point x="711" y="1482"/>
       <point x="742" y="1450" type="curve" smooth="yes"/>
       <point x="773" y="1419"/>
       <point x="788" y="1381"/>
-      <point x="788" y="1325" type="curve" name="dh02" smooth="yes"/>
+      <point x="788" y="1325" type="curve" smooth="yes" name="dh02"/>
       <point x="788" y="1273"/>
       <point x="773" y="1232"/>
       <point x="742" y="1201" type="curve" smooth="yes"/>
       <point x="711" y="1170"/>
       <point x="672" y="1154"/>
-      <point x="626" y="1154" type="curve" name="sv01" smooth="yes"/>
+      <point x="626" y="1154" type="curve" smooth="yes" name="sv01"/>
       <point x="580" y="1154"/>
       <point x="541" y="1170"/>
       <point x="510" y="1201" type="curve" smooth="yes"/>
       <point x="479" y="1232"/>
       <point x="464" y="1274"/>
-      <point x="464" y="1325" type="curve" name="dh01" smooth="yes"/>
+      <point x="464" y="1325" type="curve" smooth="yes" name="dh01"/>
       <point x="464" y="1377"/>
       <point x="479" y="1419"/>
       <point x="510" y="1450" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/exclamdown.glif b/source/Hack-Regular.ufo/glyphs/exclamdown.glif
index a3b659e17..09a80a4de 100644
--- a/source/Hack-Regular.ufo/glyphs/exclamdown.glif
+++ b/source/Hack-Regular.ufo/glyphs/exclamdown.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="exclamdown" format="1">
+<glyph name="exclamdown" format="2">
   <advance width="1233"/>
   <unicode hex="00A1"/>
   <outline>
     <contour>
-      <point x="626" y="1498" type="curve" name="at01" smooth="yes"/>
+      <point x="626" y="1498" type="curve" smooth="yes" name="at01"/>
       <point x="672" y="1498"/>
       <point x="711" y="1482"/>
       <point x="742" y="1450" type="curve" smooth="yes"/>
       <point x="773" y="1419"/>
       <point x="788" y="1381"/>
-      <point x="788" y="1325" type="curve" name="dh02" smooth="yes"/>
+      <point x="788" y="1325" type="curve" smooth="yes" name="dh02"/>
       <point x="788" y="1273"/>
       <point x="773" y="1232"/>
       <point x="742" y="1201" type="curve" smooth="yes"/>
       <point x="711" y="1170"/>
       <point x="672" y="1154"/>
-      <point x="626" y="1154" type="curve" name="sv01" smooth="yes"/>
+      <point x="626" y="1154" type="curve" smooth="yes" name="sv01"/>
       <point x="580" y="1154"/>
       <point x="541" y="1170"/>
       <point x="510" y="1201" type="curve" smooth="yes"/>
       <point x="479" y="1232"/>
       <point x="464" y="1274"/>
-      <point x="464" y="1325" type="curve" name="dh01" smooth="yes"/>
+      <point x="464" y="1325" type="curve" smooth="yes" name="dh01"/>
       <point x="464" y="1377"/>
       <point x="479" y="1419"/>
       <point x="510" y="1450" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/existential.glif b/source/Hack-Regular.ufo/glyphs/existential.glif
index 0dd4a56d8..f5dfcdbd2 100644
--- a/source/Hack-Regular.ufo/glyphs/existential.glif
+++ b/source/Hack-Regular.ufo/glyphs/existential.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="existential" format="1">
+<glyph name="existential" format="2">
   <advance width="1233"/>
   <unicode hex="2203"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/f.glif b/source/Hack-Regular.ufo/glyphs/f.glif
index f8c6a3063..74ad8c66c 100644
--- a/source/Hack-Regular.ufo/glyphs/f.glif
+++ b/source/Hack-Regular.ufo/glyphs/f.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="f" format="1">
+<glyph name="f" format="2">
   <advance width="1233"/>
   <unicode hex="0066"/>
   <outline>
@@ -27,9 +27,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/figuredash.glif b/source/Hack-Regular.ufo/glyphs/figuredash.glif
index 6f9be1552..985b4ce80 100644
--- a/source/Hack-Regular.ufo/glyphs/figuredash.glif
+++ b/source/Hack-Regular.ufo/glyphs/figuredash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="figuredash" format="1">
+<glyph name="figuredash" format="2">
   <advance width="1233"/>
   <unicode hex="2012"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/filledbox.glif b/source/Hack-Regular.ufo/glyphs/filledbox.glif
index ce4481119..a7028df70 100644
--- a/source/Hack-Regular.ufo/glyphs/filledbox.glif
+++ b/source/Hack-Regular.ufo/glyphs/filledbox.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="filledbox" format="1">
+<glyph name="filledbox" format="2">
   <advance width="1233"/>
   <unicode hex="25A0"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/filledrect.glif b/source/Hack-Regular.ufo/glyphs/filledrect.glif
index 2dfc9ac67..eca6c2868 100644
--- a/source/Hack-Regular.ufo/glyphs/filledrect.glif
+++ b/source/Hack-Regular.ufo/glyphs/filledrect.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="filledrect" format="1">
+<glyph name="filledrect" format="2">
   <advance width="1233"/>
   <unicode hex="25AC"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/five.glif b/source/Hack-Regular.ufo/glyphs/five.glif
index bb951b204..b14d1e61b 100644
--- a/source/Hack-Regular.ufo/glyphs/five.glif
+++ b/source/Hack-Regular.ufo/glyphs/five.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="five" format="1">
+<glyph name="five" format="2">
   <advance width="1233"/>
   <unicode hex="0035"/>
   <outline>
     <contour>
-      <point x="525" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="525" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="465" y="-29"/>
       <point x="385" y="-24"/>
       <point x="320" y="-13" type="curve" smooth="yes"/>
@@ -17,19 +17,19 @@
       <point x="328" y="166" type="curve" smooth="yes"/>
       <point x="391" y="149"/>
       <point x="452" y="141"/>
-      <point x="513" y="141" type="curve" name="dv01" smooth="yes"/>
+      <point x="513" y="141" type="curve" smooth="yes" name="dv01"/>
       <point x="629" y="141"/>
       <point x="717" y="170"/>
       <point x="776" y="229" type="curve" smooth="yes"/>
       <point x="836" y="288"/>
       <point x="866" y="370"/>
-      <point x="866" y="477" type="curve" name="ah01" smooth="yes"/>
+      <point x="866" y="477" type="curve" smooth="yes" name="ah01"/>
       <point x="866" y="593"/>
       <point x="830" y="674"/>
       <point x="773" y="729" type="curve" smooth="yes"/>
       <point x="717" y="782"/>
       <point x="629" y="817"/>
-      <point x="508" y="817" type="curve" name="dv02" smooth="yes"/>
+      <point x="508" y="817" type="curve" smooth="yes" name="dv02"/>
       <point x="459" y="817"/>
       <point x="405" y="811"/>
       <point x="354" y="799" type="curve" smooth="yes"/>
@@ -46,13 +46,13 @@
       <point x="478" y="980" type="curve" smooth="yes"/>
       <point x="505" y="985"/>
       <point x="535" y="987"/>
-      <point x="566" y="987" type="curve" name="dv03" smooth="yes"/>
+      <point x="566" y="987" type="curve" smooth="yes" name="dv03"/>
       <point x="727" y="987"/>
       <point x="850" y="934"/>
       <point x="934" y="850" type="curve" smooth="yes"/>
       <point x="1025" y="758"/>
       <point x="1069" y="632"/>
-      <point x="1069" y="481" type="curve" name="sh03" smooth="yes"/>
+      <point x="1069" y="481" type="curve" smooth="yes" name="sh03"/>
       <point x="1069" y="324"/>
       <point x="1020" y="195"/>
       <point x="928" y="106" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/five.subs.glif b/source/Hack-Regular.ufo/glyphs/five.subs.glif
index 3bb0845d4..dced6801e 100644
--- a/source/Hack-Regular.ufo/glyphs/five.subs.glif
+++ b/source/Hack-Regular.ufo/glyphs/five.subs.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="five.subs" format="1">
+<glyph name="five.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="563" y="-415" type="curve" name="hr00" smooth="yes"/>
+      <point x="563" y="-415" type="curve" smooth="yes" name="hr00"/>
       <point x="464" y="-415"/>
       <point x="383" y="-403"/>
       <point x="319" y="-379" type="curve"/>
       <point x="319" y="-265" type="line"/>
       <point x="388" y="-300"/>
       <point x="471" y="-320"/>
-      <point x="551" y="-320" type="curve" name="dv01" smooth="yes"/>
+      <point x="551" y="-320" type="curve" smooth="yes" name="dv01"/>
       <point x="691" y="-320"/>
       <point x="767" y="-252"/>
-      <point x="767" y="-131" type="curve" name="ah01" smooth="yes"/>
+      <point x="767" y="-131" type="curve" smooth="yes" name="ah01"/>
       <point x="767" y="-11"/>
       <point x="685" y="58"/>
-      <point x="548" y="58" type="curve" name="dv04" smooth="yes"/>
+      <point x="548" y="58" type="curve" smooth="yes" name="dv04"/>
       <point x="481" y="58"/>
       <point x="418" y="44"/>
       <point x="358" y="17" type="curve" name="sh01"/>
@@ -27,10 +27,10 @@
       <point x="473" y="136" type="line" name="sh02"/>
       <point x="506" y="147"/>
       <point x="542" y="153"/>
-      <point x="581" y="153" type="curve" name="dv05" smooth="yes"/>
+      <point x="581" y="153" type="curve" smooth="yes" name="dv05"/>
       <point x="772" y="153"/>
       <point x="893" y="44"/>
-      <point x="893" y="-131" type="curve" name="sh03" smooth="yes"/>
+      <point x="893" y="-131" type="curve" smooth="yes" name="sh03"/>
       <point x="893" y="-307"/>
       <point x="767" y="-415"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/fiveeighths.glif b/source/Hack-Regular.ufo/glyphs/fiveeighths.glif
index 9203e2f0f..3919864d9 100644
--- a/source/Hack-Regular.ufo/glyphs/fiveeighths.glif
+++ b/source/Hack-Regular.ufo/glyphs/fiveeighths.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="fiveeighths" format="1">
+<glyph name="fiveeighths" format="2">
   <advance width="1233"/>
   <unicode hex="215D"/>
   <outline>
     <contour>
-      <point x="305" y="809" type="curve" name="dv11" smooth="yes"/>
+      <point x="305" y="809" type="curve" smooth="yes" name="dv11"/>
       <point x="206" y="809"/>
       <point x="125" y="821"/>
       <point x="61" y="845" type="curve"/>
       <point x="61" y="959" type="line"/>
       <point x="130" y="924"/>
       <point x="213" y="904"/>
-      <point x="293" y="904" type="curve" name="dv12" smooth="yes"/>
+      <point x="293" y="904" type="curve" smooth="yes" name="dv12"/>
       <point x="433" y="904"/>
       <point x="509" y="972"/>
-      <point x="509" y="1093" type="curve" name="dh03" smooth="yes"/>
+      <point x="509" y="1093" type="curve" smooth="yes" name="dh03"/>
       <point x="509" y="1213"/>
       <point x="427" y="1282"/>
-      <point x="290" y="1282" type="curve" name="dv05" smooth="yes"/>
+      <point x="290" y="1282" type="curve" smooth="yes" name="dv05"/>
       <point x="223" y="1282"/>
       <point x="160" y="1268"/>
       <point x="100" y="1241" type="curve" name="dh01"/>
@@ -28,10 +28,10 @@
       <point x="215" y="1360" type="line" name="dh02"/>
       <point x="248" y="1371"/>
       <point x="284" y="1377"/>
-      <point x="323" y="1377" type="curve" name="dv06" smooth="yes"/>
+      <point x="323" y="1377" type="curve" smooth="yes" name="dv06"/>
       <point x="514" y="1377"/>
       <point x="635" y="1268"/>
-      <point x="635" y="1093" type="curve" name="dh04" smooth="yes"/>
+      <point x="635" y="1093" type="curve" smooth="yes" name="dh04"/>
       <point x="635" y="917"/>
       <point x="509" y="809"/>
     </contour>
@@ -42,19 +42,19 @@
       <point x="51" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="817" y="-286" type="curve" name="dv01" smooth="yes"/>
+      <point x="817" y="-286" type="curve" smooth="yes" name="dv01"/>
       <point x="629" y="-286"/>
       <point x="516" y="-196"/>
-      <point x="516" y="-47" type="curve" name="sh01" smooth="yes"/>
+      <point x="516" y="-47" type="curve" smooth="yes" name="sh01"/>
       <point x="516" y="74"/>
       <point x="583" y="149"/>
       <point x="708" y="174" type="curve" name="ih01"/>
       <point x="600" y="198"/>
       <point x="538" y="268"/>
-      <point x="538" y="364" type="curve" name="sh02" smooth="yes"/>
+      <point x="538" y="364" type="curve" smooth="yes" name="sh02"/>
       <point x="538" y="496"/>
       <point x="645" y="580"/>
-      <point x="817" y="580" type="curve" name="dv10" smooth="yes"/>
+      <point x="817" y="580" type="curve" smooth="yes" name="dv10"/>
       <point x="990" y="580"/>
       <point x="1097" y="496"/>
       <point x="1097" y="364" type="curve" smooth="yes"/>
@@ -63,35 +63,35 @@
       <point x="927" y="174" type="curve" name="ih02"/>
       <point x="1052" y="149"/>
       <point x="1119" y="74"/>
-      <point x="1119" y="-46" type="curve" name="dh06" smooth="yes"/>
+      <point x="1119" y="-46" type="curve" smooth="yes" name="dh06"/>
       <point x="1119" y="-197"/>
       <point x="1006" y="-286"/>
     </contour>
     <contour>
-      <point x="817" y="215" type="curve" name="dv08" smooth="yes"/>
+      <point x="817" y="215" type="curve" smooth="yes" name="dv08"/>
       <point x="918" y="215"/>
       <point x="972" y="264"/>
-      <point x="972" y="353" type="curve" name="dh05" smooth="yes"/>
+      <point x="972" y="353" type="curve" smooth="yes" name="dh05"/>
       <point x="972" y="445"/>
       <point x="921" y="493"/>
-      <point x="817" y="493" type="curve" name="dv09" smooth="yes"/>
+      <point x="817" y="493" type="curve" smooth="yes" name="dv09"/>
       <point x="717" y="493"/>
       <point x="663" y="445"/>
-      <point x="663" y="353" type="curve" name="sh03" smooth="yes"/>
+      <point x="663" y="353" type="curve" smooth="yes" name="sh03"/>
       <point x="663" y="264"/>
       <point x="717" y="215"/>
     </contour>
     <contour>
-      <point x="817" y="-198" type="curve" name="dv02" smooth="yes"/>
+      <point x="817" y="-198" type="curve" smooth="yes" name="dv02"/>
       <point x="930" y="-198"/>
       <point x="993" y="-139"/>
       <point x="993" y="-35" type="curve" smooth="yes"/>
       <point x="993" y="69"/>
       <point x="929" y="127"/>
-      <point x="817" y="127" type="curve" name="dv07" smooth="yes"/>
+      <point x="817" y="127" type="curve" smooth="yes" name="dv07"/>
       <point x="704" y="127"/>
       <point x="642" y="69"/>
-      <point x="642" y="-35" type="curve" name="hr01" smooth="yes"/>
+      <point x="642" y="-35" type="curve" smooth="yes" name="hr01"/>
       <point x="642" y="-139"/>
       <point x="708" y="-198"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/florin.glif b/source/Hack-Regular.ufo/glyphs/florin.glif
index 08e951cfd..cd45fcee2 100644
--- a/source/Hack-Regular.ufo/glyphs/florin.glif
+++ b/source/Hack-Regular.ufo/glyphs/florin.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="florin" format="1">
+<glyph name="florin" format="2">
   <advance width="1233"/>
   <unicode hex="0192"/>
   <outline>
     <contour>
-      <point x="203" y="-426" type="curve" name="hr00" smooth="yes"/>
+      <point x="203" y="-426" type="curve" smooth="yes" name="hr00"/>
       <point x="168" y="-426"/>
       <point x="132" y="-423"/>
-      <point x="97" y="-416" type="curve" name="ab01" smooth="yes"/>
+      <point x="97" y="-416" type="curve" smooth="yes" name="ab01"/>
       <point x="64" y="-409"/>
       <point x="31" y="-398"/>
       <point x="0" y="-383" type="curve"/>
@@ -17,7 +17,7 @@
       <point x="99" y="-267" type="curve" smooth="yes"/>
       <point x="132" y="-278"/>
       <point x="166" y="-283"/>
-      <point x="195" y="-283" type="curve" name="sv01" smooth="yes"/>
+      <point x="195" y="-283" type="curve" smooth="yes" name="sv01"/>
       <point x="331" y="-283"/>
       <point x="404" y="-188"/>
       <point x="440" y="18" type="curve"/>
@@ -31,10 +31,10 @@
       <point x="754" y="1456" type="curve" smooth="yes"/>
       <point x="820" y="1523"/>
       <point x="903" y="1556"/>
-      <point x="1002" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="1002" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="1034" y="1556"/>
       <point x="1067" y="1553"/>
-      <point x="1100" y="1547" type="curve" name="at02" smooth="yes"/>
+      <point x="1100" y="1547" type="curve" smooth="yes" name="at02"/>
       <point x="1132" y="1541"/>
       <point x="1165" y="1532"/>
       <point x="1200" y="1520" type="curve"/>
@@ -44,7 +44,7 @@
       <point x="1123" y="1399" type="curve" smooth="yes"/>
       <point x="1100" y="1407"/>
       <point x="1070" y="1413"/>
-      <point x="1035" y="1413" type="curve" name="sv02" smooth="yes"/>
+      <point x="1035" y="1413" type="curve" smooth="yes" name="sv02"/>
       <point x="967" y="1413"/>
       <point x="916" y="1390"/>
       <point x="879" y="1351" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/four.glif b/source/Hack-Regular.ufo/glyphs/four.glif
index 561574483..ab55fe9f7 100644
--- a/source/Hack-Regular.ufo/glyphs/four.glif
+++ b/source/Hack-Regular.ufo/glyphs/four.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="four" format="1">
+<glyph name="four" format="2">
   <advance width="1233"/>
   <unicode hex="0034"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/four.subs.glif b/source/Hack-Regular.ufo/glyphs/four.subs.glif
index 494627b10..f04e4188a 100644
--- a/source/Hack-Regular.ufo/glyphs/four.subs.glif
+++ b/source/Hack-Regular.ufo/glyphs/four.subs.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="four.subs" format="1">
+<glyph name="four.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Regular.ufo/glyphs/fraction.glif b/source/Hack-Regular.ufo/glyphs/fraction.glif
index 7a0aec39b..abdb0305d 100644
--- a/source/Hack-Regular.ufo/glyphs/fraction.glif
+++ b/source/Hack-Regular.ufo/glyphs/fraction.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="fraction" format="1">
+<glyph name="fraction" format="2">
   <advance width="1233"/>
   <unicode hex="2044"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/franc.glif b/source/Hack-Regular.ufo/glyphs/franc.glif
index 6f6b28e0b..cb4d188f1 100644
--- a/source/Hack-Regular.ufo/glyphs/franc.glif
+++ b/source/Hack-Regular.ufo/glyphs/franc.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="franc" format="1">
+<glyph name="franc" format="2">
   <advance width="1233"/>
   <unicode hex="20A3"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/g.glif b/source/Hack-Regular.ufo/glyphs/g.glif
index 330c5282e..5cde3f0d6 100644
--- a/source/Hack-Regular.ufo/glyphs/g.glif
+++ b/source/Hack-Regular.ufo/glyphs/g.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="g" format="1">
+<glyph name="g" format="2">
   <advance width="1233"/>
   <unicode hex="0067"/>
   <outline>
@@ -50,9 +50,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/gamma.glif b/source/Hack-Regular.ufo/glyphs/gamma.glif
index ba722e634..5336ab42b 100644
--- a/source/Hack-Regular.ufo/glyphs/gamma.glif
+++ b/source/Hack-Regular.ufo/glyphs/gamma.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gamma" format="1">
+<glyph name="gamma" format="2">
   <advance width="1233"/>
   <unicode hex="03B3"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="254" y="836" type="line" smooth="yes"/>
       <point x="224" y="920"/>
       <point x="178" y="962"/>
-      <point x="115" y="962" type="curve" name="sv01" smooth="yes"/>
+      <point x="115" y="962" type="curve" smooth="yes" name="sv01"/>
       <point x="66" y="962" type="line"/>
       <point x="66" y="1120" type="line" name="at01"/>
       <point x="136" y="1120" type="line" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/gbreve.glif b/source/Hack-Regular.ufo/glyphs/gbreve.glif
index 291611301..69355b20e 100644
--- a/source/Hack-Regular.ufo/glyphs/gbreve.glif
+++ b/source/Hack-Regular.ufo/glyphs/gbreve.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gbreve" format="1">
+<glyph name="gbreve" format="2">
   <advance width="1233"/>
   <unicode hex="011F"/>
   <outline>
     <contour>
-      <point x="644" y="1298" type="curve" name="dv03" smooth="yes"/>
+      <point x="644" y="1298" type="curve" smooth="yes" name="dv03"/>
       <point x="452" y="1298"/>
       <point x="346" y="1394"/>
       <point x="331" y="1585" type="curve" name="sh03"/>
@@ -14,7 +14,7 @@
       <point x="509" y="1472" type="curve" smooth="yes"/>
       <point x="540" y="1447"/>
       <point x="585" y="1435"/>
-      <point x="644" y="1435" type="curve" name="dv04" smooth="yes"/>
+      <point x="644" y="1435" type="curve" smooth="yes" name="dv04"/>
       <point x="701" y="1435"/>
       <point x="746" y="1447"/>
       <point x="777" y="1472" type="curve" smooth="yes"/>
@@ -29,7 +29,7 @@
       <point x="740" y="1298"/>
     </contour>
     <contour>
-      <point x="601" y="-440" type="curve" name="dv01" smooth="yes"/>
+      <point x="601" y="-440" type="curve" smooth="yes" name="dv01"/>
       <point x="549" y="-440"/>
       <point x="498" y="-435"/>
       <point x="442" y="-426" type="curve" smooth="yes"/>
@@ -42,32 +42,32 @@
       <point x="454" y="-271" type="curve" smooth="yes"/>
       <point x="506" y="-286"/>
       <point x="556" y="-293"/>
-      <point x="605" y="-293" type="curve" name="dv02" smooth="yes"/>
+      <point x="605" y="-293" type="curve" smooth="yes" name="dv02"/>
       <point x="704" y="-293"/>
       <point x="771" y="-267"/>
       <point x="818" y="-211" type="curve" smooth="yes"/>
       <point x="862" y="-158"/>
       <point x="886" y="-79"/>
-      <point x="886" y="45" type="curve" name="ah01" smooth="yes"/>
+      <point x="886" y="45" type="curve" smooth="yes" name="ah01"/>
       <point x="886" y="178" type="line"/>
       <point x="857" y="116"/>
       <point x="817" y="69"/>
       <point x="766" y="38" type="curve" smooth="yes"/>
       <point x="715" y="7"/>
       <point x="654" y="-8"/>
-      <point x="582" y="-8" type="curve" name="ab01" smooth="yes"/>
+      <point x="582" y="-8" type="curve" smooth="yes" name="ab01"/>
       <point x="451" y="-8"/>
       <point x="346" y="44"/>
       <point x="268" y="149" type="curve" smooth="yes"/>
       <point x="190" y="254"/>
       <point x="151" y="394"/>
-      <point x="151" y="569" type="curve" name="sh01" smooth="yes"/>
+      <point x="151" y="569" type="curve" smooth="yes" name="sh01"/>
       <point x="151" y="744"/>
       <point x="190" y="885"/>
       <point x="268" y="990" type="curve" smooth="yes"/>
       <point x="347" y="1095"/>
       <point x="448" y="1147"/>
-      <point x="583" y="1147" type="curve" name="dv06" smooth="yes"/>
+      <point x="583" y="1147" type="curve" smooth="yes" name="dv06"/>
       <point x="652" y="1147"/>
       <point x="713" y="1133"/>
       <point x="764" y="1104" type="curve" smooth="yes"/>
@@ -76,7 +76,7 @@
       <point x="886" y="971" type="curve" name="sh04"/>
       <point x="904" y="1116" type="line"/>
       <point x="1070" y="1116" type="line"/>
-      <point x="1070" y="72" type="line" name="sh05" smooth="yes"/>
+      <point x="1070" y="72" type="line" smooth="yes" name="sh05"/>
       <point x="1070" y="-95"/>
       <point x="1030" y="-223"/>
       <point x="951" y="-310" type="curve" smooth="yes"/>
@@ -84,19 +84,19 @@
       <point x="756" y="-440"/>
     </contour>
     <contour>
-      <point x="622" y="145" type="curve" name="sv03" smooth="yes"/>
+      <point x="622" y="145" type="curve" smooth="yes" name="sv03"/>
       <point x="795" y="145"/>
       <point x="886" y="294"/>
-      <point x="886" y="569" type="curve" name="sh06" smooth="yes"/>
+      <point x="886" y="569" type="curve" smooth="yes" name="sh06"/>
       <point x="886" y="708"/>
       <point x="864" y="813"/>
       <point x="819" y="884" type="curve" smooth="yes"/>
       <point x="772" y="960"/>
       <point x="704" y="991"/>
-      <point x="621" y="991" type="curve" name="dv05" smooth="yes"/>
+      <point x="621" y="991" type="curve" smooth="yes" name="dv05"/>
       <point x="442" y="991"/>
       <point x="345" y="847"/>
-      <point x="345" y="568" type="curve" name="sh02" smooth="yes"/>
+      <point x="345" y="568" type="curve" smooth="yes" name="sh02"/>
       <point x="345" y="295"/>
       <point x="445" y="145"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/gcaron.glif b/source/Hack-Regular.ufo/glyphs/gcaron.glif
index 69ef8cb8f..dee63ffb0 100644
--- a/source/Hack-Regular.ufo/glyphs/gcaron.glif
+++ b/source/Hack-Regular.ufo/glyphs/gcaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gcaron" format="1">
+<glyph name="gcaron" format="2">
   <advance width="1233"/>
   <unicode hex="01E7"/>
   <outline>
@@ -13,47 +13,47 @@
       <point x="571" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="601" y="-440" type="curve" name="dv01" smooth="yes"/>
+      <point x="601" y="-440" type="curve" smooth="yes" name="dv01"/>
       <point x="500" y="-440"/>
       <point x="388" y="-421"/>
       <point x="276" y="-385" type="curve"/>
       <point x="276" y="-203" type="line" name="ih04"/>
       <point x="410" y="-265"/>
       <point x="509" y="-293"/>
-      <point x="607" y="-293" type="curve" name="hr01" smooth="yes"/>
+      <point x="607" y="-293" type="curve" smooth="yes" name="hr01"/>
       <point x="800" y="-293"/>
       <point x="886" y="-186"/>
-      <point x="886" y="45" type="curve" name="ah01" smooth="yes"/>
+      <point x="886" y="45" type="curve" smooth="yes" name="ah01"/>
       <point x="886" y="178" type="line" name="iv01"/>
       <point x="830" y="57"/>
       <point x="730" y="-8"/>
-      <point x="585" y="-8" type="curve" name="ab01" smooth="yes"/>
+      <point x="585" y="-8" type="curve" smooth="yes" name="ab01"/>
       <point x="318" y="-8"/>
       <point x="151" y="218"/>
-      <point x="151" y="570" type="curve" name="sh01" smooth="yes"/>
+      <point x="151" y="570" type="curve" smooth="yes" name="sh01"/>
       <point x="151" y="921"/>
       <point x="317" y="1147"/>
-      <point x="586" y="1147" type="curve" name="sv02" smooth="yes"/>
+      <point x="586" y="1147" type="curve" smooth="yes" name="sv02"/>
       <point x="723" y="1147"/>
       <point x="825" y="1090"/>
       <point x="886" y="971" type="curve" name="sh04"/>
       <point x="904" y="1116" type="line" name="at01"/>
       <point x="1070" y="1116" type="line"/>
-      <point x="1070" y="72" type="line" name="sh03" smooth="yes"/>
+      <point x="1070" y="72" type="line" smooth="yes" name="sh03"/>
       <point x="1070" y="-267"/>
       <point x="910" y="-440"/>
     </contour>
     <contour>
-      <point x="620" y="145" type="curve" name="sv03" smooth="yes"/>
+      <point x="620" y="145" type="curve" smooth="yes" name="sv03"/>
       <point x="796" y="145"/>
       <point x="886" y="292"/>
-      <point x="886" y="569" type="curve" name="sh05" smooth="yes"/>
+      <point x="886" y="569" type="curve" smooth="yes" name="sh05"/>
       <point x="886" y="846"/>
       <point x="796" y="991"/>
-      <point x="619" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="619" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="443" y="991"/>
       <point x="345" y="847"/>
-      <point x="345" y="570" type="curve" name="sh02" smooth="yes"/>
+      <point x="345" y="570" type="curve" smooth="yes" name="sh02"/>
       <point x="345" y="291"/>
       <point x="444" y="145"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/gcircumflex.glif b/source/Hack-Regular.ufo/glyphs/gcircumflex.glif
index c614f7b07..6479432bd 100644
--- a/source/Hack-Regular.ufo/glyphs/gcircumflex.glif
+++ b/source/Hack-Regular.ufo/glyphs/gcircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gcircumflex" format="1">
+<glyph name="gcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="011D"/>
   <outline>
@@ -23,7 +23,7 @@
       <point x="818" y="-211" type="curve" smooth="yes"/>
       <point x="863" y="-158"/>
       <point x="886" y="-72"/>
-      <point x="886" y="45" type="curve" name="hr01" smooth="yes"/>
+      <point x="886" y="45" type="curve" smooth="yes" name="hr01"/>
       <point x="886" y="178" type="line"/>
       <point x="829" y="54"/>
       <point x="728" y="-8"/>
diff --git a/source/Hack-Regular.ufo/glyphs/gdotaccent.glif b/source/Hack-Regular.ufo/glyphs/gdotaccent.glif
index 24167c8cd..d4bc2b812 100644
--- a/source/Hack-Regular.ufo/glyphs/gdotaccent.glif
+++ b/source/Hack-Regular.ufo/glyphs/gdotaccent.glif
@@ -1,68 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gdotaccent" format="1">
+<glyph name="gdotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="0121"/>
   <outline>
     <contour>
-      <point x="571" y="1348" type="line" name="dv03" smooth="yes"/>
+      <point x="571" y="1348" type="line" smooth="yes" name="dv03"/>
       <point x="551" y="1348"/>
       <point x="541" y="1358"/>
-      <point x="541" y="1378" type="curve" name="dh03" smooth="yes"/>
+      <point x="541" y="1378" type="curve" smooth="yes" name="dh03"/>
       <point x="541" y="1522" type="line" smooth="yes"/>
       <point x="541" y="1542"/>
       <point x="551" y="1552"/>
-      <point x="571" y="1552" type="curve" name="dv04" smooth="yes"/>
+      <point x="571" y="1552" type="curve" smooth="yes" name="dv04"/>
       <point x="716" y="1552" type="line" smooth="yes"/>
       <point x="736" y="1552"/>
       <point x="746" y="1542"/>
       <point x="746" y="1522" type="curve" smooth="yes"/>
-      <point x="746" y="1378" type="line" name="dh04" smooth="yes"/>
+      <point x="746" y="1378" type="line" smooth="yes" name="dh04"/>
       <point x="746" y="1358"/>
       <point x="736" y="1348"/>
       <point x="716" y="1348" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="601" y="-440" type="curve" name="dv01" smooth="yes"/>
+      <point x="601" y="-440" type="curve" smooth="yes" name="dv01"/>
       <point x="500" y="-440"/>
       <point x="388" y="-421"/>
       <point x="276" y="-385" type="curve"/>
       <point x="276" y="-203" type="line" name="hr01"/>
       <point x="410" y="-265"/>
       <point x="509" y="-293"/>
-      <point x="607" y="-293" type="curve" name="dv02" smooth="yes"/>
+      <point x="607" y="-293" type="curve" smooth="yes" name="dv02"/>
       <point x="800" y="-293"/>
       <point x="886" y="-186"/>
-      <point x="886" y="45" type="curve" name="dh05" smooth="yes"/>
+      <point x="886" y="45" type="curve" smooth="yes" name="dh05"/>
       <point x="886" y="178" type="line" name="iv01"/>
       <point x="830" y="57"/>
       <point x="730" y="-8"/>
-      <point x="585" y="-8" type="curve" name="ab01" smooth="yes"/>
+      <point x="585" y="-8" type="curve" smooth="yes" name="ab01"/>
       <point x="318" y="-8"/>
       <point x="151" y="218"/>
-      <point x="151" y="570" type="curve" name="dh01" smooth="yes"/>
+      <point x="151" y="570" type="curve" smooth="yes" name="dh01"/>
       <point x="151" y="921"/>
       <point x="317" y="1147"/>
-      <point x="586" y="1147" type="curve" name="sv02" smooth="yes"/>
+      <point x="586" y="1147" type="curve" smooth="yes" name="sv02"/>
       <point x="723" y="1147"/>
       <point x="825" y="1090"/>
       <point x="886" y="971" type="curve" name="sh01"/>
       <point x="904" y="1116" type="line" name="at01"/>
       <point x="1070" y="1116" type="line"/>
-      <point x="1070" y="72" type="line" name="dh06" smooth="yes"/>
+      <point x="1070" y="72" type="line" smooth="yes" name="dh06"/>
       <point x="1070" y="-267"/>
       <point x="910" y="-440"/>
     </contour>
     <contour>
-      <point x="620" y="145" type="curve" name="sv03" smooth="yes"/>
+      <point x="620" y="145" type="curve" smooth="yes" name="sv03"/>
       <point x="796" y="145"/>
       <point x="886" y="292"/>
-      <point x="886" y="569" type="curve" name="sh02" smooth="yes"/>
+      <point x="886" y="569" type="curve" smooth="yes" name="sh02"/>
       <point x="886" y="846"/>
       <point x="796" y="991"/>
-      <point x="619" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="619" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="443" y="991"/>
       <point x="345" y="847"/>
-      <point x="345" y="570" type="curve" name="dh02" smooth="yes"/>
+      <point x="345" y="570" type="curve" smooth="yes" name="dh02"/>
       <point x="345" y="291"/>
       <point x="444" y="145"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/germandbls.glif b/source/Hack-Regular.ufo/glyphs/germandbls.glif
index 64f30a20a..abe5cfabe 100644
--- a/source/Hack-Regular.ufo/glyphs/germandbls.glif
+++ b/source/Hack-Regular.ufo/glyphs/germandbls.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="germandbls" format="1">
+<glyph name="germandbls" format="2">
   <advance width="1233"/>
   <unicode hex="00DF"/>
   <outline>
     <contour>
-      <point x="731" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="731" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="686" y="-29"/>
       <point x="636" y="-25"/>
       <point x="593" y="-17" type="curve" smooth="yes"/>
@@ -17,13 +17,13 @@
       <point x="602" y="138" type="curve" smooth="yes"/>
       <point x="646" y="128"/>
       <point x="688" y="123"/>
-      <point x="728" y="123" type="curve" name="dv02" smooth="yes"/>
+      <point x="728" y="123" type="curve" smooth="yes" name="dv02"/>
       <point x="801" y="123"/>
       <point x="858" y="140"/>
       <point x="899" y="171" type="curve" smooth="yes"/>
       <point x="946" y="206"/>
       <point x="963" y="250"/>
-      <point x="963" y="310" type="curve" name="dh05" smooth="yes"/>
+      <point x="963" y="310" type="curve" smooth="yes" name="dh05"/>
       <point x="963" y="353"/>
       <point x="954" y="384"/>
       <point x="929" y="419" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="574" y="703" type="curve" smooth="yes"/>
       <point x="543" y="748"/>
       <point x="528" y="791"/>
-      <point x="528" y="851" type="curve" name="dh03" smooth="yes"/>
+      <point x="528" y="851" type="curve" smooth="yes" name="dh03"/>
       <point x="528" y="931"/>
       <point x="554" y="1005"/>
       <point x="609" y="1062" type="curve" smooth="yes"/>
@@ -48,7 +48,7 @@
       <point x="784" y="1346" type="curve" smooth="yes"/>
       <point x="743" y="1384"/>
       <point x="685" y="1403"/>
-      <point x="610" y="1403" type="curve" name="sv01" smooth="yes"/>
+      <point x="610" y="1403" type="curve" smooth="yes" name="sv01"/>
       <point x="529" y="1403"/>
       <point x="470" y="1381"/>
       <point x="432" y="1338" type="curve" smooth="yes"/>
@@ -63,7 +63,7 @@
       <point x="293" y="1453" type="curve" smooth="yes"/>
       <point x="364" y="1522"/>
       <point x="473" y="1556"/>
-      <point x="610" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="610" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="749" y="1556"/>
       <point x="854" y="1519"/>
       <point x="923" y="1446" type="curve" smooth="yes"/>
@@ -75,20 +75,20 @@
       <point x="791" y="1043" type="curve" smooth="yes"/>
       <point x="735" y="1002"/>
       <point x="707" y="948"/>
-      <point x="707" y="883" type="curve" name="dh04" smooth="yes"/>
+      <point x="707" y="883" type="curve" smooth="yes" name="dh04"/>
       <point x="707" y="846"/>
       <point x="716" y="821"/>
       <point x="735" y="794" type="curve" smooth="yes"/>
       <point x="758" y="762"/>
       <point x="788" y="740"/>
-      <point x="829" y="713" type="curve" name="hr02" smooth="yes"/>
+      <point x="829" y="713" type="curve" smooth="yes" name="hr02"/>
       <point x="887" y="676" type="line" smooth="yes"/>
       <point x="992" y="609"/>
       <point x="1055" y="560"/>
       <point x="1094" y="501" type="curve" smooth="yes"/>
       <point x="1131" y="445"/>
       <point x="1149" y="378"/>
-      <point x="1149" y="306" type="curve" name="dh06" smooth="yes"/>
+      <point x="1149" y="306" type="curve" smooth="yes" name="dh06"/>
       <point x="1149" y="207"/>
       <point x="1117" y="122"/>
       <point x="1037" y="59" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/gradient.glif b/source/Hack-Regular.ufo/glyphs/gradient.glif
index dd29e1d1e..42fec63dd 100644
--- a/source/Hack-Regular.ufo/glyphs/gradient.glif
+++ b/source/Hack-Regular.ufo/glyphs/gradient.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gradient" format="1">
+<glyph name="gradient" format="2">
   <advance width="1233"/>
   <unicode hex="2207"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/grave.glif b/source/Hack-Regular.ufo/glyphs/grave.glif
index b53b3e4f6..253c1ecba 100644
--- a/source/Hack-Regular.ufo/glyphs/grave.glif
+++ b/source/Hack-Regular.ufo/glyphs/grave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="grave" format="1">
+<glyph name="grave" format="2">
   <advance width="1233"/>
   <unicode hex="0060"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/gravecomb.glif b/source/Hack-Regular.ufo/glyphs/gravecomb.glif
index affda295b..5036d1fd6 100644
--- a/source/Hack-Regular.ufo/glyphs/gravecomb.glif
+++ b/source/Hack-Regular.ufo/glyphs/gravecomb.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="gravecomb" format="1">
-  <advance width="0"/>
+<glyph name="gravecomb" format="2">
   <unicode hex="0300"/>
   <outline>
     <contour>
diff --git a/source/Hack-Regular.ufo/glyphs/greater.glif b/source/Hack-Regular.ufo/glyphs/greater.glif
index 9eed786ea..827840932 100644
--- a/source/Hack-Regular.ufo/glyphs/greater.glif
+++ b/source/Hack-Regular.ufo/glyphs/greater.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="greater" format="1">
+<glyph name="greater" format="2">
   <advance width="1233"/>
   <unicode hex="003E"/>
   <outline>
     <contour>
-      <point x="88" y="324" type="line" name="hr00"/>
-      <point x="938" y="641" type="line" name="iv01"/>
-      <point x="88" y="961" type="line"/>
-      <point x="88" y="1143" type="line" name="at01"/>
+      <point x="88" y="234" type="line" name="hr00"/>
+      <point x="928" y="641" type="line" name="iv01"/>
+      <point x="88" y="1051" type="line"/>
+      <point x="88" y="1243" type="line" name="at01"/>
       <point x="1145" y="725" type="line"/>
       <point x="1145" y="559" type="line"/>
-      <point x="88" y="141" type="line" name="av01"/>
+      <point x="88" y="41" type="line" name="av01"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Regular.ufo/glyphs/greaterequal.glif b/source/Hack-Regular.ufo/glyphs/greaterequal.glif
index aa5bab370..f390c010e 100644
--- a/source/Hack-Regular.ufo/glyphs/greaterequal.glif
+++ b/source/Hack-Regular.ufo/glyphs/greaterequal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="greaterequal" format="1">
+<glyph name="greaterequal" format="2">
   <advance width="1233"/>
   <unicode hex="2265"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/guillemotleft.glif b/source/Hack-Regular.ufo/glyphs/guillemotleft.glif
index 588470f82..09fce4b56 100644
--- a/source/Hack-Regular.ufo/glyphs/guillemotleft.glif
+++ b/source/Hack-Regular.ufo/glyphs/guillemotleft.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="guillemotleft" format="1">
+<glyph name="guillemotleft" format="2">
   <advance width="1233"/>
   <unicode hex="00AB"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/guillemotright.glif b/source/Hack-Regular.ufo/glyphs/guillemotright.glif
index 83c3ad3c9..2065ff249 100644
--- a/source/Hack-Regular.ufo/glyphs/guillemotright.glif
+++ b/source/Hack-Regular.ufo/glyphs/guillemotright.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="guillemotright" format="1">
+<glyph name="guillemotright" format="2">
   <advance width="1233"/>
   <unicode hex="00BB"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/guilsinglleft.glif b/source/Hack-Regular.ufo/glyphs/guilsinglleft.glif
index c7ce4cfb7..5064ed4c2 100644
--- a/source/Hack-Regular.ufo/glyphs/guilsinglleft.glif
+++ b/source/Hack-Regular.ufo/glyphs/guilsinglleft.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="guilsinglleft" format="1">
+<glyph name="guilsinglleft" format="2">
   <advance width="1233"/>
   <unicode hex="2039"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/guilsinglright.glif b/source/Hack-Regular.ufo/glyphs/guilsinglright.glif
index 632141ce7..fbe5128b1 100644
--- a/source/Hack-Regular.ufo/glyphs/guilsinglright.glif
+++ b/source/Hack-Regular.ufo/glyphs/guilsinglright.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="guilsinglright" format="1">
+<glyph name="guilsinglright" format="2">
   <advance width="1233"/>
   <unicode hex="203A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/h.glif b/source/Hack-Regular.ufo/glyphs/h.glif
index a0aa37bf9..1032ab821 100644
--- a/source/Hack-Regular.ufo/glyphs/h.glif
+++ b/source/Hack-Regular.ufo/glyphs/h.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="h" format="1">
+<glyph name="h" format="2">
   <advance width="1233"/>
   <unicode hex="0068"/>
   <outline>
@@ -27,9 +27,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/hbar.glif b/source/Hack-Regular.ufo/glyphs/hbar.glif
index c7aa9c41e..ac1896b88 100644
--- a/source/Hack-Regular.ufo/glyphs/hbar.glif
+++ b/source/Hack-Regular.ufo/glyphs/hbar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="hbar" format="1">
+<glyph name="hbar" format="2">
   <advance width="1233"/>
   <unicode hex="0127"/>
   <outline>
@@ -17,7 +17,7 @@
       <point x="379" y="952" type="line" name="iv01"/>
       <point x="444" y="1081"/>
       <point x="558" y="1147"/>
-      <point x="711" y="1147" type="curve" name="dv02" smooth="yes"/>
+      <point x="711" y="1147" type="curve" smooth="yes" name="dv02"/>
       <point x="940" y="1147"/>
       <point x="1051" y="999"/>
       <point x="1051" y="694" type="curve" smooth="yes"/>
@@ -26,10 +26,10 @@
       <point x="866" y="694" type="line" smooth="yes"/>
       <point x="866" y="895"/>
       <point x="799" y="987"/>
-      <point x="648" y="987" type="curve" name="dv01" smooth="yes"/>
+      <point x="648" y="987" type="curve" smooth="yes" name="dv01"/>
       <point x="473" y="987"/>
       <point x="379" y="862"/>
-      <point x="379" y="633" type="curve" name="sh05" smooth="yes"/>
+      <point x="379" y="633" type="curve" smooth="yes" name="sh05"/>
       <point x="379" y="0" type="line" name="ab01"/>
       <point x="195" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/hcircumflex.glif b/source/Hack-Regular.ufo/glyphs/hcircumflex.glif
index 888082733..5581cf077 100644
--- a/source/Hack-Regular.ufo/glyphs/hcircumflex.glif
+++ b/source/Hack-Regular.ufo/glyphs/hcircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="hcircumflex" format="1">
+<glyph name="hcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0125"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/hookabovecomb.glif b/source/Hack-Regular.ufo/glyphs/hookabovecomb.glif
index 6545dfa4e..ae7f8dbdd 100644
--- a/source/Hack-Regular.ufo/glyphs/hookabovecomb.glif
+++ b/source/Hack-Regular.ufo/glyphs/hookabovecomb.glif
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="hookabovecomb" format="1">
-  <advance width="0"/>
+<glyph name="hookabovecomb" format="2">
   <unicode hex="0309"/>
   <outline>
     <contour>
-      <point x="-647" y="1734" type="curve" name="dv02" smooth="yes"/>
+      <point x="-647" y="1734" type="curve" smooth="yes" name="dv02"/>
       <point x="-494" y="1734"/>
       <point x="-415" y="1677"/>
       <point x="-410" y="1564" type="curve" name="dh02"/>
       <point x="-409" y="1562"/>
       <point x="-409" y="1559"/>
-      <point x="-409" y="1554" type="curve" name="sh01" smooth="yes"/>
+      <point x="-409" y="1554" type="curve" smooth="yes" name="sh01"/>
       <point x="-409" y="1470"/>
       <point x="-470" y="1397"/>
       <point x="-539" y="1354" type="curve" name="sh03"/>
@@ -22,10 +21,10 @@
       <point x="-571" y="1444" type="curve"/>
       <point x="-556" y="1457"/>
       <point x="-549" y="1481"/>
-      <point x="-549" y="1517" type="curve" name="sh02" smooth="yes"/>
+      <point x="-549" y="1517" type="curve" smooth="yes" name="sh02"/>
       <point x="-549" y="1580"/>
       <point x="-589" y="1611"/>
-      <point x="-669" y="1611" type="curve" name="sv01" smooth="yes"/>
+      <point x="-669" y="1611" type="curve" smooth="yes" name="sv01"/>
       <point x="-728" y="1611"/>
       <point x="-779" y="1600"/>
       <point x="-823" y="1579" type="curve" name="dh01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/hungarumlaut.glif b/source/Hack-Regular.ufo/glyphs/hungarumlaut.glif
index 4c0f5ef78..4aa6fd198 100644
--- a/source/Hack-Regular.ufo/glyphs/hungarumlaut.glif
+++ b/source/Hack-Regular.ufo/glyphs/hungarumlaut.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="hungarumlaut" format="1">
+<glyph name="hungarumlaut" format="2">
   <advance width="1233"/>
   <unicode hex="02DD"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/hyphen.glif b/source/Hack-Regular.ufo/glyphs/hyphen.glif
index a58a93437..2728ff179 100644
--- a/source/Hack-Regular.ufo/glyphs/hyphen.glif
+++ b/source/Hack-Regular.ufo/glyphs/hyphen.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="hyphen" format="1">
+<glyph name="hyphen" format="2">
   <advance width="1233"/>
   <unicode hex="002D"/>
   <outline>
     <contour>
-      <point x="206" y="683" type="line" name="hr00"/>
-      <point x="1027" y="683" type="line" name="dv02"/>
-      <point x="1027" y="519" type="line" name="dv01"/>
-      <point x="206" y="519" type="line"/>
+      <point x="206" y="727" type="line" name="hr00"/>
+      <point x="1027" y="727" type="line" name="dv02"/>
+      <point x="1027" y="563" type="line" name="dv01"/>
+      <point x="206" y="563" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
+      <string>2018-06-07 23:52:58 +0000</string>
     </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/hyphenationpoint.glif b/source/Hack-Regular.ufo/glyphs/hyphenationpoint.glif
index 20f68df75..7b15119fd 100644
--- a/source/Hack-Regular.ufo/glyphs/hyphenationpoint.glif
+++ b/source/Hack-Regular.ufo/glyphs/hyphenationpoint.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="hyphenationpoint" format="1">
+<glyph name="hyphenationpoint" format="2">
   <advance width="1233"/>
   <unicode hex="2027"/>
   <outline>
     <contour>
-      <point x="616" y="576" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="576" type="curve" smooth="yes" name="hr00"/>
       <point x="525" y="576"/>
       <point x="454" y="645"/>
       <point x="454" y="745" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/i.glif b/source/Hack-Regular.ufo/glyphs/i.glif
index d651ac495..dbbe950bc 100644
--- a/source/Hack-Regular.ufo/glyphs/i.glif
+++ b/source/Hack-Regular.ufo/glyphs/i.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="i" format="1">
+<glyph name="i" format="2">
   <advance width="1233"/>
   <unicode hex="0069"/>
   <outline>
@@ -39,9 +39,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/iacute.glif b/source/Hack-Regular.ufo/glyphs/iacute.glif
index 00189b41f..f55a1ffa2 100644
--- a/source/Hack-Regular.ufo/glyphs/iacute.glif
+++ b/source/Hack-Regular.ufo/glyphs/iacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="iacute" format="1">
+<glyph name="iacute" format="2">
   <advance width="1233"/>
   <unicode hex="00ED"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="513" y="1271" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="859" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="859" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="752" y="-8"/>
       <point x="668" y="23"/>
       <point x="604" y="98" type="curve" smooth="yes"/>
@@ -27,7 +27,7 @@
       <point x="743" y="211" type="curve" smooth="yes"/>
       <point x="775" y="167"/>
       <point x="820" y="148"/>
-      <point x="877" y="148" type="curve" name="sv01" smooth="yes"/>
+      <point x="877" y="148" type="curve" smooth="yes" name="sv01"/>
       <point x="1092" y="148" type="line"/>
       <point x="1092" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/ibreve.glif b/source/Hack-Regular.ufo/glyphs/ibreve.glif
index c27f6e778..21e8f0650 100644
--- a/source/Hack-Regular.ufo/glyphs/ibreve.glif
+++ b/source/Hack-Regular.ufo/glyphs/ibreve.glif
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ibreve" format="1">
+<glyph name="ibreve" format="2">
   <advance width="1233"/>
   <unicode hex="012D"/>
   <outline>
     <contour>
       <point x="776" y="1322"/>
       <point x="701" y="1298"/>
-      <point x="605" y="1298" type="curve" name="dv03" smooth="yes"/>
+      <point x="605" y="1298" type="curve" smooth="yes" name="dv03"/>
       <point x="413" y="1298"/>
       <point x="307" y="1394"/>
       <point x="292" y="1585" type="curve" name="sh03"/>
@@ -16,7 +16,7 @@
       <point x="470" y="1472" type="curve" smooth="yes"/>
       <point x="501" y="1447"/>
       <point x="546" y="1435"/>
-      <point x="605" y="1435" type="curve" name="dv04" smooth="yes"/>
+      <point x="605" y="1435" type="curve" smooth="yes" name="dv04"/>
       <point x="662" y="1435"/>
       <point x="707" y="1447"/>
       <point x="738" y="1472" type="curve" smooth="yes"/>
@@ -29,13 +29,13 @@
       <point x="829" y="1370" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="859" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="859" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="752" y="-8"/>
       <point x="668" y="23"/>
       <point x="604" y="98" type="curve" smooth="yes"/>
       <point x="543" y="169"/>
       <point x="513" y="269"/>
-      <point x="513" y="398" type="curve" name="sh01" smooth="yes"/>
+      <point x="513" y="398" type="curve" smooth="yes" name="sh01"/>
       <point x="513" y="976" type="line" name="sv01"/>
       <point x="268" y="976" type="line"/>
       <point x="268" y="1120" type="line" name="dh01"/>
@@ -43,10 +43,10 @@
       <point x="697" y="398" type="line" smooth="yes"/>
       <point x="697" y="315"/>
       <point x="712" y="252"/>
-      <point x="743" y="211" type="curve" name="hr01" smooth="yes"/>
+      <point x="743" y="211" type="curve" smooth="yes" name="hr01"/>
       <point x="775" y="167"/>
       <point x="820" y="148"/>
-      <point x="877" y="148" type="curve" name="sv02" smooth="yes"/>
+      <point x="877" y="148" type="curve" smooth="yes" name="sv02"/>
       <point x="1092" y="148" type="line" name="sv03"/>
       <point x="1092" y="-8" type="line" name="ab02"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/icircumflex.glif b/source/Hack-Regular.ufo/glyphs/icircumflex.glif
index 9acc7d4fb..01049f491 100644
--- a/source/Hack-Regular.ufo/glyphs/icircumflex.glif
+++ b/source/Hack-Regular.ufo/glyphs/icircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="icircumflex" format="1">
+<glyph name="icircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00EE"/>
   <outline>
@@ -13,13 +13,13 @@
       <point x="268" y="1272" type="line" name="iv02"/>
     </contour>
     <contour>
-      <point x="859" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="859" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="752" y="-8"/>
       <point x="668" y="23"/>
-      <point x="604" y="98" type="curve" name="hr01" smooth="yes"/>
+      <point x="604" y="98" type="curve" smooth="yes" name="hr01"/>
       <point x="543" y="169"/>
       <point x="513" y="269"/>
-      <point x="513" y="398" type="curve" name="sh01" smooth="yes"/>
+      <point x="513" y="398" type="curve" smooth="yes" name="sh01"/>
       <point x="513" y="976" type="line" name="sv01"/>
       <point x="268" y="976" type="line"/>
       <point x="268" y="1120" type="line" name="hr02"/>
@@ -30,7 +30,7 @@
       <point x="743" y="211" type="curve" smooth="yes"/>
       <point x="775" y="167"/>
       <point x="820" y="148"/>
-      <point x="877" y="148" type="curve" name="sv02" smooth="yes"/>
+      <point x="877" y="148" type="curve" smooth="yes" name="sv02"/>
       <point x="1092" y="148" type="line"/>
       <point x="1092" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/idieresis.glif b/source/Hack-Regular.ufo/glyphs/idieresis.glif
index 15264b727..db3dc1716 100644
--- a/source/Hack-Regular.ufo/glyphs/idieresis.glif
+++ b/source/Hack-Regular.ufo/glyphs/idieresis.glif
@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="idieresis" format="1">
+<glyph name="idieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00EF"/>
   <outline>
     <contour>
-      <point x="328" y="1350" type="line" name="dv01" smooth="yes"/>
+      <point x="328" y="1350" type="line" smooth="yes" name="dv01"/>
       <point x="308" y="1350"/>
       <point x="298" y="1360"/>
-      <point x="298" y="1380" type="curve" name="ih01" smooth="yes"/>
+      <point x="298" y="1380" type="curve" smooth="yes" name="ih01"/>
       <point x="298" y="1522" type="line" smooth="yes"/>
       <point x="298" y="1542"/>
       <point x="308" y="1552"/>
-      <point x="328" y="1552" type="curve" name="dv02" smooth="yes"/>
+      <point x="328" y="1552" type="curve" smooth="yes" name="dv02"/>
       <point x="471" y="1552" type="line" smooth="yes"/>
       <point x="491" y="1552"/>
       <point x="501" y="1542"/>
       <point x="501" y="1522" type="curve" smooth="yes"/>
-      <point x="501" y="1380" type="line" name="sh01" smooth="yes"/>
+      <point x="501" y="1380" type="line" smooth="yes" name="sh01"/>
       <point x="501" y="1360"/>
       <point x="491" y="1350"/>
       <point x="471" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="720" y="1350" type="line" name="hr01" smooth="yes"/>
+      <point x="720" y="1350" type="line" smooth="yes" name="hr01"/>
       <point x="700" y="1350"/>
       <point x="690" y="1360"/>
-      <point x="690" y="1380" type="curve" name="sh02" smooth="yes"/>
+      <point x="690" y="1380" type="curve" smooth="yes" name="sh02"/>
       <point x="690" y="1522" type="line" smooth="yes"/>
       <point x="690" y="1542"/>
       <point x="700" y="1552"/>
-      <point x="720" y="1552" type="curve" name="sv01" smooth="yes"/>
+      <point x="720" y="1552" type="curve" smooth="yes" name="sv01"/>
       <point x="862" y="1552" type="line" smooth="yes"/>
       <point x="882" y="1552"/>
       <point x="892" y="1542"/>
-      <point x="892" y="1522" type="curve" name="hr02" smooth="yes"/>
-      <point x="892" y="1380" type="line" name="sh03" smooth="yes"/>
+      <point x="892" y="1522" type="curve" smooth="yes" name="hr02"/>
+      <point x="892" y="1380" type="line" smooth="yes" name="sh03"/>
       <point x="892" y="1360"/>
       <point x="882" y="1350"/>
       <point x="862" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="859" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="859" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="752" y="-8"/>
       <point x="668" y="23"/>
       <point x="604" y="98" type="curve" smooth="yes"/>
       <point x="543" y="169"/>
       <point x="513" y="269"/>
-      <point x="513" y="398" type="curve" name="sh04" smooth="yes"/>
+      <point x="513" y="398" type="curve" smooth="yes" name="sh04"/>
       <point x="513" y="976" type="line" name="sv02"/>
       <point x="268" y="976" type="line"/>
       <point x="268" y="1120" type="line" name="dh01"/>
@@ -57,7 +57,7 @@
       <point x="743" y="211" type="curve" smooth="yes"/>
       <point x="775" y="167"/>
       <point x="820" y="148"/>
-      <point x="877" y="148" type="curve" name="sv03" smooth="yes"/>
+      <point x="877" y="148" type="curve" smooth="yes" name="sv03"/>
       <point x="1092" y="148" type="line"/>
       <point x="1092" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/igrave.glif b/source/Hack-Regular.ufo/glyphs/igrave.glif
index 35b2b2558..b2a11ec6c 100644
--- a/source/Hack-Regular.ufo/glyphs/igrave.glif
+++ b/source/Hack-Regular.ufo/glyphs/igrave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="igrave" format="1">
+<glyph name="igrave" format="2">
   <advance width="1233"/>
   <unicode hex="00EC"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="543" y="1271" type="line"/>
     </contour>
     <contour>
-      <point x="859" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="859" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="752" y="-8"/>
       <point x="668" y="23"/>
       <point x="604" y="98" type="curve" smooth="yes"/>
       <point x="543" y="169"/>
       <point x="513" y="269"/>
-      <point x="513" y="398" type="curve" name="sh01" smooth="yes"/>
+      <point x="513" y="398" type="curve" smooth="yes" name="sh01"/>
       <point x="513" y="976" type="line" name="sv01"/>
       <point x="268" y="976" type="line" name="hr01"/>
       <point x="268" y="1120" type="line" name="dh01"/>
@@ -27,7 +27,7 @@
       <point x="743" y="211" type="curve" smooth="yes"/>
       <point x="775" y="167"/>
       <point x="820" y="148"/>
-      <point x="877" y="148" type="curve" name="sv02" smooth="yes"/>
+      <point x="877" y="148" type="curve" smooth="yes" name="sv02"/>
       <point x="1092" y="148" type="line"/>
       <point x="1092" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/ij.glif b/source/Hack-Regular.ufo/glyphs/ij.glif
index adb5cfb4f..cbb0556cd 100644
--- a/source/Hack-Regular.ufo/glyphs/ij.glif
+++ b/source/Hack-Regular.ufo/glyphs/ij.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ij" format="1">
+<glyph name="ij" format="2">
   <advance width="1233"/>
   <unicode hex="0133"/>
   <outline>
     <contour>
-      <point x="176" y="1353" type="curve" name="hr00" smooth="yes"/>
+      <point x="176" y="1353" type="curve" smooth="yes" name="hr00"/>
       <point x="176" y="1526" type="line" smooth="yes"/>
       <point x="176" y="1546"/>
       <point x="186" y="1556"/>
@@ -16,7 +16,7 @@
       <point x="380" y="1353" type="line" smooth="yes"/>
       <point x="380" y="1333"/>
       <point x="370" y="1323"/>
-      <point x="350" y="1323" type="curve" name="hr01" smooth="yes"/>
+      <point x="350" y="1323" type="curve" smooth="yes" name="hr01"/>
       <point x="206" y="1323" type="line" smooth="yes"/>
       <point x="186" y="1323"/>
       <point x="176" y="1333"/>
diff --git a/source/Hack-Regular.ufo/glyphs/imacron.glif b/source/Hack-Regular.ufo/glyphs/imacron.glif
index a34fe1f61..67a7bdc45 100644
--- a/source/Hack-Regular.ufo/glyphs/imacron.glif
+++ b/source/Hack-Regular.ufo/glyphs/imacron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="imacron" format="1">
+<glyph name="imacron" format="2">
   <advance width="1233"/>
   <unicode hex="012B"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="268" y="1320" type="line"/>
     </contour>
     <contour>
-      <point x="859" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="859" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="752" y="-8"/>
       <point x="668" y="23"/>
       <point x="604" y="98" type="curve" smooth="yes"/>
       <point x="543" y="169"/>
       <point x="513" y="269"/>
-      <point x="513" y="398" type="curve" name="sh02" smooth="yes"/>
+      <point x="513" y="398" type="curve" smooth="yes" name="sh02"/>
       <point x="513" y="976" type="line" name="sv01"/>
       <point x="268" y="976" type="line" name="hr01"/>
       <point x="268" y="1120" type="line" name="dh01"/>
@@ -24,10 +24,10 @@
       <point x="697" y="398" type="line" smooth="yes"/>
       <point x="697" y="315"/>
       <point x="712" y="252"/>
-      <point x="743" y="211" type="curve" name="hr02" smooth="yes"/>
+      <point x="743" y="211" type="curve" smooth="yes" name="hr02"/>
       <point x="775" y="167"/>
       <point x="820" y="148"/>
-      <point x="877" y="148" type="curve" name="sv02" smooth="yes"/>
+      <point x="877" y="148" type="curve" smooth="yes" name="sv02"/>
       <point x="1092" y="148" type="line"/>
       <point x="1092" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/infinity.glif b/source/Hack-Regular.ufo/glyphs/infinity.glif
index ef5d93168..b131cbfad 100644
--- a/source/Hack-Regular.ufo/glyphs/infinity.glif
+++ b/source/Hack-Regular.ufo/glyphs/infinity.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="infinity" format="1">
+<glyph name="infinity" format="2">
   <advance width="1233"/>
   <unicode hex="221E"/>
   <outline>
     <contour>
-      <point x="332" y="250" type="curve" name="hr00" smooth="yes"/>
+      <point x="332" y="250" type="curve" smooth="yes" name="hr00"/>
       <point x="165" y="250"/>
       <point x="41" y="410"/>
-      <point x="41" y="632" type="curve" name="sh01" smooth="yes"/>
+      <point x="41" y="632" type="curve" smooth="yes" name="sh01"/>
       <point x="41" y="739"/>
       <point x="67" y="836"/>
       <point x="119" y="905" type="curve" smooth="yes"/>
       <point x="168" y="970"/>
       <point x="240" y="1008"/>
-      <point x="332" y="1008" type="curve" name="dv03" smooth="yes"/>
+      <point x="332" y="1008" type="curve" smooth="yes" name="dv03"/>
       <point x="399" y="1008"/>
       <point x="447" y="988"/>
       <point x="491" y="951" type="curve" smooth="yes"/>
@@ -22,19 +22,19 @@
       <point x="616" y="764" type="curve" name="ih01"/>
       <point x="679" y="924"/>
       <point x="778" y="1008"/>
-      <point x="900" y="1008" type="curve" name="sv01" smooth="yes"/>
+      <point x="900" y="1008" type="curve" smooth="yes" name="sv01"/>
       <point x="984" y="1008"/>
       <point x="1055" y="967"/>
       <point x="1107" y="899" type="curve" smooth="yes"/>
       <point x="1156" y="835"/>
       <point x="1192" y="746"/>
-      <point x="1192" y="626" type="curve" name="sh02" smooth="yes"/>
+      <point x="1192" y="626" type="curve" smooth="yes" name="sh02"/>
       <point x="1192" y="515"/>
       <point x="1162" y="420"/>
       <point x="1111" y="355" type="curve" smooth="yes"/>
       <point x="1058" y="286"/>
       <point x="984" y="250"/>
-      <point x="903" y="250" type="curve" name="sv02" smooth="yes"/>
+      <point x="903" y="250" type="curve" smooth="yes" name="sv02"/>
       <point x="848" y="250"/>
       <point x="799" y="267"/>
       <point x="756" y="300" type="curve" smooth="yes"/>
@@ -48,7 +48,7 @@
       <point x="387" y="250"/>
     </contour>
     <contour>
-      <point x="318" y="391" type="curve" name="dv01" smooth="yes"/>
+      <point x="318" y="391" type="curve" smooth="yes" name="dv01"/>
       <point x="362" y="391"/>
       <point x="402" y="411"/>
       <point x="437" y="450" type="curve" smooth="yes"/>
@@ -60,13 +60,13 @@
       <point x="435" y="819" type="curve" smooth="yes"/>
       <point x="404" y="852"/>
       <point x="369" y="868"/>
-      <point x="329" y="868" type="curve" name="dv02" smooth="yes"/>
+      <point x="329" y="868" type="curve" smooth="yes" name="dv02"/>
       <point x="284" y="868"/>
       <point x="242" y="846"/>
       <point x="211" y="802" type="curve" smooth="yes"/>
       <point x="184" y="763"/>
       <point x="166" y="706"/>
-      <point x="166" y="627" type="curve" name="sh03" smooth="yes"/>
+      <point x="166" y="627" type="curve" smooth="yes" name="sh03"/>
       <point x="166" y="559"/>
       <point x="180" y="499"/>
       <point x="208" y="455" type="curve" smooth="yes"/>
@@ -74,19 +74,19 @@
       <point x="270" y="391"/>
     </contour>
     <contour>
-      <point x="903" y="391" type="curve" name="sv03" smooth="yes"/>
+      <point x="903" y="391" type="curve" smooth="yes" name="sv03"/>
       <point x="948" y="391"/>
       <point x="989" y="411"/>
       <point x="1020" y="458" type="curve" smooth="yes"/>
       <point x="1049" y="501"/>
       <point x="1065" y="558"/>
-      <point x="1065" y="634" type="curve" name="ah01" smooth="yes"/>
+      <point x="1065" y="634" type="curve" smooth="yes" name="ah01"/>
       <point x="1065" y="704"/>
       <point x="1051" y="761"/>
       <point x="1023" y="804" type="curve" smooth="yes"/>
       <point x="995" y="847"/>
       <point x="958" y="868"/>
-      <point x="911" y="868" type="curve" name="sv04" smooth="yes"/>
+      <point x="911" y="868" type="curve" smooth="yes" name="sv04"/>
       <point x="867" y="868"/>
       <point x="828" y="849"/>
       <point x="793" y="810" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/integral.glif b/source/Hack-Regular.ufo/glyphs/integral.glif
index eb217830b..261b1ef0c 100644
--- a/source/Hack-Regular.ufo/glyphs/integral.glif
+++ b/source/Hack-Regular.ufo/glyphs/integral.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="integral" format="1">
+<glyph name="integral" format="2">
   <advance width="1233"/>
   <unicode hex="222B"/>
   <outline>
     <contour>
-      <point x="314" y="-371" type="curve" name="dv01" smooth="yes"/>
+      <point x="314" y="-371" type="curve" smooth="yes" name="dv01"/>
       <point x="259" y="-371"/>
       <point x="214" y="-358"/>
       <point x="179" y="-330" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="163" y="-136" type="curve" smooth="yes"/>
       <point x="186" y="-115"/>
       <point x="217" y="-104"/>
-      <point x="256" y="-104" type="curve" name="sv01" smooth="yes"/>
+      <point x="256" y="-104" type="curve" smooth="yes" name="sv01"/>
       <point x="279" y="-104"/>
       <point x="299" y="-109"/>
       <point x="315" y="-119" type="curve" smooth="yes"/>
@@ -25,7 +25,7 @@
       <point x="354" y="-161" type="curve" smooth="yes"/>
       <point x="366" y="-186"/>
       <point x="365" y="-262"/>
-      <point x="395" y="-262" type="curve" name="hr01" smooth="yes"/>
+      <point x="395" y="-262" type="curve" smooth="yes" name="hr01"/>
       <point x="468" y="-262"/>
       <point x="502" y="-18"/>
       <point x="513" y="426" type="curve"/>
@@ -34,7 +34,7 @@
       <point x="516" y="591" type="curve"/>
       <point x="535" y="1272"/>
       <point x="654" y="1550"/>
-      <point x="915" y="1550" type="curve" name="dv02" smooth="yes"/>
+      <point x="915" y="1550" type="curve" smooth="yes" name="dv02"/>
       <point x="967" y="1550"/>
       <point x="1016" y="1539"/>
       <point x="1051" y="1508" type="curve" smooth="yes"/>
@@ -43,7 +43,7 @@
       <point x="1100" y="1399" type="curve" smooth="yes"/>
       <point x="1100" y="1331"/>
       <point x="1054" y="1284"/>
-      <point x="981" y="1284" type="curve" name="sv02" smooth="yes"/>
+      <point x="981" y="1284" type="curve" smooth="yes" name="sv02"/>
       <point x="953" y="1284"/>
       <point x="930" y="1290"/>
       <point x="911" y="1303" type="curve" smooth="yes"/>
@@ -55,7 +55,7 @@
       <point x="861" y="1408" type="curve" smooth="yes"/>
       <point x="857" y="1433"/>
       <point x="853" y="1444"/>
-      <point x="837" y="1444" type="curve" name="hr02" smooth="yes"/>
+      <point x="837" y="1444" type="curve" smooth="yes" name="hr02"/>
       <point x="769" y="1444"/>
       <point x="728" y="1240"/>
       <point x="719" y="825" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/integralbt.glif b/source/Hack-Regular.ufo/glyphs/integralbt.glif
index d71ef3452..e70d2a431 100644
--- a/source/Hack-Regular.ufo/glyphs/integralbt.glif
+++ b/source/Hack-Regular.ufo/glyphs/integralbt.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="integralbt" format="1">
+<glyph name="integralbt" format="2">
   <advance width="1233"/>
   <unicode hex="2321"/>
   <outline>
     <contour>
-      <point x="310" y="-486" type="curve" name="hr00" smooth="yes"/>
+      <point x="310" y="-486" type="curve" smooth="yes" name="hr00"/>
       <point x="193" y="-486"/>
       <point x="124" y="-424"/>
       <point x="124" y="-336" type="curve" smooth="yes"/>
@@ -19,17 +19,17 @@
       <point x="364" y="-344" type="curve" smooth="yes"/>
       <point x="368" y="-369"/>
       <point x="371" y="-380"/>
-      <point x="386" y="-380" type="curve" name="dv01" smooth="yes"/>
+      <point x="386" y="-380" type="curve" smooth="yes" name="dv01"/>
       <point x="451" y="-380"/>
       <point x="494" y="-174"/>
       <point x="505" y="239" type="curve" smooth="yes"/>
       <point x="513" y="542" type="line" name="dh01"/>
       <point x="513" y="1929" type="line" name="av01"/>
       <point x="711" y="1929" type="line"/>
-      <point x="711" y="638" type="line" name="dh02" smooth="yes"/>
+      <point x="711" y="638" type="line" smooth="yes" name="dh02"/>
       <point x="711" y="614"/>
       <point x="710" y="559"/>
-      <point x="708" y="473" type="curve" name="sh01" smooth="yes"/>
+      <point x="708" y="473" type="curve" smooth="yes" name="sh01"/>
       <point x="699" y="122"/>
       <point x="664" y="-117"/>
       <point x="601" y="-264" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/integraltp.glif b/source/Hack-Regular.ufo/glyphs/integraltp.glif
index f9891bd88..e08d7da8c 100644
--- a/source/Hack-Regular.ufo/glyphs/integraltp.glif
+++ b/source/Hack-Regular.ufo/glyphs/integraltp.glif
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="integraltp" format="1">
+<glyph name="integraltp" format="2">
   <advance width="1233"/>
   <unicode hex="2320"/>
   <outline>
     <contour>
-      <point x="513" y="776" type="line" name="dh01" smooth="yes"/>
+      <point x="513" y="776" type="line" smooth="yes" name="dh01"/>
       <point x="513" y="800"/>
       <point x="514" y="855"/>
-      <point x="516" y="941" type="curve" name="sh01" smooth="yes"/>
+      <point x="516" y="941" type="curve" smooth="yes" name="sh01"/>
       <point x="525" y="1292"/>
       <point x="560" y="1531"/>
       <point x="623" y="1678" type="curve" smooth="yes"/>
       <point x="687" y="1827"/>
       <point x="787" y="1900"/>
-      <point x="914" y="1900" type="curve" name="dv02" smooth="yes"/>
+      <point x="914" y="1900" type="curve" smooth="yes" name="dv02"/>
       <point x="1031" y="1900"/>
       <point x="1100" y="1838"/>
       <point x="1100" y="1750" type="curve" smooth="yes"/>
       <point x="1100" y="1678"/>
       <point x="1055" y="1634"/>
-      <point x="979" y="1634" type="curve" name="sv01" smooth="yes"/>
+      <point x="979" y="1634" type="curve" smooth="yes" name="sv01"/>
       <point x="920" y="1634"/>
       <point x="888" y="1660"/>
       <point x="871" y="1707" type="curve" smooth="yes"/>
       <point x="864" y="1726"/>
       <point x="864" y="1738"/>
-      <point x="861" y="1758" type="curve" name="hr01" smooth="yes"/>
+      <point x="861" y="1758" type="curve" smooth="yes" name="hr01"/>
       <point x="857" y="1787"/>
       <point x="850" y="1794"/>
-      <point x="838" y="1794" type="curve" name="dv01" smooth="yes"/>
+      <point x="838" y="1794" type="curve" smooth="yes" name="dv01"/>
       <point x="771" y="1794"/>
       <point x="730" y="1588"/>
       <point x="719" y="1175" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/intersection.glif b/source/Hack-Regular.ufo/glyphs/intersection.glif
index cdd9f1fd8..d83268eb8 100644
--- a/source/Hack-Regular.ufo/glyphs/intersection.glif
+++ b/source/Hack-Regular.ufo/glyphs/intersection.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="intersection" format="1">
+<glyph name="intersection" format="2">
   <advance width="1233"/>
   <unicode hex="2229"/>
   <outline>
     <contour>
-      <point x="164" y="580" type="line" name="hr00" smooth="yes"/>
+      <point x="164" y="580" type="line" smooth="yes" name="hr00"/>
       <point x="164" y="740"/>
       <point x="172" y="839"/>
       <point x="189" y="908" type="curve" smooth="yes"/>
@@ -13,7 +13,7 @@
       <point x="426" y="1157" type="curve" smooth="yes"/>
       <point x="484" y="1176"/>
       <point x="547" y="1186"/>
-      <point x="615" y="1186" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="1186" type="curve" smooth="yes" name="dv02"/>
       <point x="760" y="1186"/>
       <point x="882" y="1142"/>
       <point x="958" y="1069" type="curve" smooth="yes"/>
@@ -28,13 +28,13 @@
       <point x="896" y="674" type="line" smooth="yes"/>
       <point x="896" y="708"/>
       <point x="893" y="784"/>
-      <point x="885" y="832" type="curve" name="sh02" smooth="yes"/>
+      <point x="885" y="832" type="curve" smooth="yes" name="sh02"/>
       <point x="878" y="868"/>
       <point x="870" y="891"/>
       <point x="866" y="902" type="curve" smooth="yes"/>
       <point x="834" y="974"/>
       <point x="723" y="1022"/>
-      <point x="615" y="1022" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="1022" type="curve" smooth="yes" name="dv01"/>
       <point x="512" y="1022"/>
       <point x="405" y="979"/>
       <point x="367" y="903" type="curve" smooth="yes"/>
@@ -43,7 +43,7 @@
       <point x="349" y="832" type="curve" name="sh04"/>
       <point x="341" y="775"/>
       <point x="337" y="696"/>
-      <point x="337" y="672" type="curve" name="sh03" smooth="yes"/>
+      <point x="337" y="672" type="curve" smooth="yes" name="sh03"/>
       <point x="337" y="0" type="line" name="ab01"/>
       <point x="164" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/invbullet.glif b/source/Hack-Regular.ufo/glyphs/invbullet.glif
index a3eb0a7ae..44022180d 100644
--- a/source/Hack-Regular.ufo/glyphs/invbullet.glif
+++ b/source/Hack-Regular.ufo/glyphs/invbullet.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="invbullet" format="1">
+<glyph name="invbullet" format="2">
   <advance width="1233"/>
   <unicode hex="25D8"/>
   <outline>
@@ -10,16 +10,16 @@
       <point x="-20" y="-20" type="line" name="sh02"/>
     </contour>
     <contour>
-      <point x="614" y="465" type="curve" name="sv01" smooth="yes"/>
+      <point x="614" y="465" type="curve" smooth="yes" name="sv01"/>
       <point x="782" y="465"/>
       <point x="913" y="597"/>
-      <point x="913" y="762" type="curve" name="ah01" smooth="yes"/>
+      <point x="913" y="762" type="curve" smooth="yes" name="ah01"/>
       <point x="913" y="926"/>
       <point x="782" y="1057"/>
       <point x="615" y="1057" type="curve" smooth="yes"/>
       <point x="450" y="1057"/>
       <point x="319" y="926"/>
-      <point x="319" y="761" type="curve" name="sh03" smooth="yes"/>
+      <point x="319" y="761" type="curve" smooth="yes" name="sh03"/>
       <point x="319" y="596"/>
       <point x="449" y="465"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/invcircle.glif b/source/Hack-Regular.ufo/glyphs/invcircle.glif
index 6f676c198..73f1d490e 100644
--- a/source/Hack-Regular.ufo/glyphs/invcircle.glif
+++ b/source/Hack-Regular.ufo/glyphs/invcircle.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="invcircle" format="1">
+<glyph name="invcircle" format="2">
   <advance width="1233"/>
   <unicode hex="25D9"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="-20" y="-512" type="line"/>
     </contour>
     <contour>
-      <point x="617" y="-84" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="-84"/>
       <point x="818" y="-56"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="818" y="1120"/>
       <point x="710" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv03"/>
       <point x="524" y="1148"/>
       <point x="413" y="1119"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/iogonek.glif b/source/Hack-Regular.ufo/glyphs/iogonek.glif
index 68d9a102a..127fec28a 100644
--- a/source/Hack-Regular.ufo/glyphs/iogonek.glif
+++ b/source/Hack-Regular.ufo/glyphs/iogonek.glif
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="iogonek" format="1">
+<glyph name="iogonek" format="2">
   <advance width="1233"/>
   <unicode hex="012F"/>
   <outline>
     <contour>
-      <point x="526" y="1323" type="line" name="sv01" smooth="yes"/>
+      <point x="526" y="1323" type="line" smooth="yes" name="sv01"/>
       <point x="504" y="1323"/>
       <point x="493" y="1333"/>
       <point x="493" y="1353" type="curve" smooth="yes"/>
       <point x="493" y="1526" type="line" smooth="yes"/>
       <point x="493" y="1546"/>
       <point x="504" y="1556"/>
-      <point x="526" y="1556" type="curve" name="hr01" smooth="yes"/>
+      <point x="526" y="1556" type="curve" smooth="yes" name="hr01"/>
       <point x="664" y="1556" type="line" smooth="yes"/>
       <point x="686" y="1556"/>
       <point x="697" y="1546"/>
-      <point x="697" y="1526" type="curve" name="sh01" smooth="yes"/>
-      <point x="697" y="1353" type="line" name="sh03" smooth="yes"/>
+      <point x="697" y="1526" type="curve" smooth="yes" name="sh01"/>
+      <point x="697" y="1353" type="line" smooth="yes" name="sh03"/>
       <point x="697" y="1333"/>
       <point x="686" y="1323"/>
       <point x="664" y="1323" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="972" y="-261" type="curve" name="dv01" smooth="yes"/>
+      <point x="972" y="-261" type="curve" smooth="yes" name="dv01"/>
       <point x="1013" y="-261"/>
       <point x="1055" y="-251"/>
       <point x="1096" y="-231" type="curve" name="sh05"/>
       <point x="1096" y="-364" type="line"/>
       <point x="1040" y="-379"/>
       <point x="1002" y="-384"/>
-      <point x="953" y="-384" type="curve" name="hr02" smooth="yes"/>
+      <point x="953" y="-384" type="curve" smooth="yes" name="hr02"/>
       <point x="804" y="-384"/>
       <point x="723" y="-329"/>
-      <point x="723" y="-210" type="curve" name="dh03" smooth="yes"/>
+      <point x="723" y="-210" type="curve" smooth="yes" name="dh03"/>
       <point x="723" y="-147"/>
       <point x="746" y="-92"/>
       <point x="816" y="-6" type="curve" name="ih01"/>
@@ -41,24 +41,24 @@
       <point x="604" y="98" type="curve" smooth="yes"/>
       <point x="543" y="169"/>
       <point x="513" y="269"/>
-      <point x="513" y="398" type="curve" name="sh06" smooth="yes"/>
+      <point x="513" y="398" type="curve" smooth="yes" name="sh06"/>
       <point x="513" y="976" type="line" name="sv02"/>
       <point x="268" y="976" type="line"/>
       <point x="268" y="1120" type="line" name="dh01"/>
       <point x="697" y="1120" type="line" name="dh02"/>
-      <point x="697" y="398" type="line" name="sh02" smooth="yes"/>
+      <point x="697" y="398" type="line" smooth="yes" name="sh02"/>
       <point x="697" y="315"/>
       <point x="712" y="252"/>
       <point x="743" y="211" type="curve" smooth="yes"/>
       <point x="775" y="167"/>
       <point x="820" y="148"/>
-      <point x="877" y="148" type="curve" name="sv03" smooth="yes"/>
+      <point x="877" y="148" type="curve" smooth="yes" name="sv03"/>
       <point x="1092" y="148" type="line" name="sv04"/>
       <point x="1092" y="-8" type="line" name="sh04"/>
       <point x="936" y="-8" type="line"/>
       <point x="883" y="-84"/>
       <point x="862" y="-130"/>
-      <point x="862" y="-173" type="curve" name="dh04" smooth="yes"/>
+      <point x="862" y="-173" type="curve" smooth="yes" name="dh04"/>
       <point x="862" y="-229"/>
       <point x="900" y="-261"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/iota.glif b/source/Hack-Regular.ufo/glyphs/iota.glif
index 2465c0d34..9db033c8a 100644
--- a/source/Hack-Regular.ufo/glyphs/iota.glif
+++ b/source/Hack-Regular.ufo/glyphs/iota.glif
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="iota" format="1">
+<glyph name="iota" format="2">
   <advance width="1233"/>
   <unicode hex="03B9"/>
   <outline>
     <contour>
-      <point x="864" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="864" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="739" y="-8"/>
       <point x="653" y="28"/>
       <point x="602" y="88" type="curve" smooth="yes"/>
       <point x="547" y="153"/>
       <point x="520" y="261"/>
-      <point x="520" y="398" type="curve" name="sh01" smooth="yes"/>
+      <point x="520" y="398" type="curve" smooth="yes" name="sh01"/>
       <point x="520" y="977" type="line" name="sv01"/>
       <point x="310" y="977" type="line"/>
       <point x="310" y="1120" type="line" name="dh01"/>
       <point x="708" y="1120" type="line" name="dh02"/>
-      <point x="708" y="387" type="line" name="hr01" smooth="yes"/>
+      <point x="708" y="387" type="line" smooth="yes" name="hr01"/>
       <point x="708" y="194"/>
       <point x="742" y="148"/>
-      <point x="886" y="148" type="curve" name="sv02" smooth="yes"/>
+      <point x="886" y="148" type="curve" smooth="yes" name="sv02"/>
       <point x="975" y="148" type="line" name="sv03"/>
       <point x="975" y="-8" type="line" name="ab02"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/iotadieresis.glif b/source/Hack-Regular.ufo/glyphs/iotadieresis.glif
index 34967c6b1..fb8f52550 100644
--- a/source/Hack-Regular.ufo/glyphs/iotadieresis.glif
+++ b/source/Hack-Regular.ufo/glyphs/iotadieresis.glif
@@ -1,60 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="iotadieresis" format="1">
+<glyph name="iotadieresis" format="2">
   <advance width="1233"/>
   <unicode hex="03CA"/>
   <outline>
     <contour>
-      <point x="349" y="1321" type="line" name="dv01" smooth="yes"/>
+      <point x="349" y="1321" type="line" smooth="yes" name="dv01"/>
       <point x="329" y="1321"/>
       <point x="319" y="1331"/>
-      <point x="319" y="1351" type="curve" name="dh01" smooth="yes"/>
+      <point x="319" y="1351" type="curve" smooth="yes" name="dh01"/>
       <point x="319" y="1493" type="line" smooth="yes"/>
       <point x="319" y="1513"/>
       <point x="329" y="1523"/>
-      <point x="349" y="1523" type="curve" name="dv02" smooth="yes"/>
+      <point x="349" y="1523" type="curve" smooth="yes" name="dv02"/>
       <point x="492" y="1523" type="line" smooth="yes"/>
       <point x="512" y="1523"/>
       <point x="522" y="1513"/>
-      <point x="522" y="1493" type="curve" name="hr01" smooth="yes"/>
-      <point x="522" y="1351" type="line" name="dh02" smooth="yes"/>
+      <point x="522" y="1493" type="curve" smooth="yes" name="hr01"/>
+      <point x="522" y="1351" type="line" smooth="yes" name="dh02"/>
       <point x="522" y="1331"/>
       <point x="512" y="1321"/>
-      <point x="492" y="1321" type="curve" name="hr02" smooth="yes"/>
+      <point x="492" y="1321" type="curve" smooth="yes" name="hr02"/>
     </contour>
     <contour>
-      <point x="741" y="1321" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1321" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1321"/>
       <point x="711" y="1331"/>
-      <point x="711" y="1351" type="curve" name="sh02" smooth="yes"/>
+      <point x="711" y="1351" type="curve" smooth="yes" name="sh02"/>
       <point x="711" y="1493" type="line" smooth="yes"/>
       <point x="711" y="1513"/>
       <point x="721" y="1523"/>
-      <point x="741" y="1523" type="curve" name="sv02" smooth="yes"/>
+      <point x="741" y="1523" type="curve" smooth="yes" name="sv02"/>
       <point x="883" y="1523" type="line" smooth="yes"/>
       <point x="903" y="1523"/>
       <point x="913" y="1513"/>
       <point x="913" y="1493" type="curve" smooth="yes"/>
-      <point x="913" y="1351" type="line" name="sh03" smooth="yes"/>
+      <point x="913" y="1351" type="line" smooth="yes" name="sh03"/>
       <point x="913" y="1331"/>
       <point x="903" y="1321"/>
       <point x="883" y="1321" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="864" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="864" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="739" y="-8"/>
       <point x="653" y="28"/>
       <point x="602" y="88" type="curve" smooth="yes"/>
       <point x="547" y="153"/>
       <point x="520" y="261"/>
-      <point x="520" y="398" type="curve" name="sh04" smooth="yes"/>
+      <point x="520" y="398" type="curve" smooth="yes" name="sh04"/>
       <point x="520" y="977" type="line" name="sv03"/>
       <point x="310" y="977" type="line" name="hr03"/>
       <point x="310" y="1120" type="line" name="at01"/>
       <point x="708" y="1120" type="line" name="sh05"/>
-      <point x="708" y="387" type="line" name="sh01" smooth="yes"/>
+      <point x="708" y="387" type="line" smooth="yes" name="sh01"/>
       <point x="708" y="194"/>
       <point x="742" y="148"/>
-      <point x="886" y="148" type="curve" name="sv04" smooth="yes"/>
+      <point x="886" y="148" type="curve" smooth="yes" name="sv04"/>
       <point x="975" y="148" type="line"/>
       <point x="975" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/iotadieresistonos.glif b/source/Hack-Regular.ufo/glyphs/iotadieresistonos.glif
index 84b41ca72..73d2566c8 100644
--- a/source/Hack-Regular.ufo/glyphs/iotadieresistonos.glif
+++ b/source/Hack-Regular.ufo/glyphs/iotadieresistonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="iotadieresistonos" format="1">
+<glyph name="iotadieresistonos" format="2">
   <advance width="1233"/>
   <unicode hex="0390"/>
   <outline>
@@ -10,57 +10,57 @@
       <point x="485" y="1516" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="272" y="1321" type="line" name="sv01" smooth="yes"/>
+      <point x="272" y="1321" type="line" smooth="yes" name="sv01"/>
       <point x="252" y="1321"/>
       <point x="242" y="1331"/>
-      <point x="242" y="1351" type="curve" name="dh01" smooth="yes"/>
+      <point x="242" y="1351" type="curve" smooth="yes" name="dh01"/>
       <point x="242" y="1493" type="line" smooth="yes"/>
       <point x="242" y="1513"/>
       <point x="252" y="1523"/>
-      <point x="272" y="1523" type="curve" name="hr01" smooth="yes"/>
+      <point x="272" y="1523" type="curve" smooth="yes" name="hr01"/>
       <point x="415" y="1523" type="line" smooth="yes"/>
       <point x="435" y="1523"/>
       <point x="445" y="1513"/>
       <point x="445" y="1493" type="curve" smooth="yes"/>
-      <point x="445" y="1351" type="line" name="dh02" smooth="yes"/>
+      <point x="445" y="1351" type="line" smooth="yes" name="dh02"/>
       <point x="445" y="1331"/>
       <point x="435" y="1321"/>
       <point x="415" y="1321" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="749" y="1321" type="line" name="sv02" smooth="yes"/>
+      <point x="749" y="1321" type="line" smooth="yes" name="sv02"/>
       <point x="729" y="1321"/>
       <point x="719" y="1331"/>
-      <point x="719" y="1351" type="curve" name="sh02" smooth="yes"/>
-      <point x="719" y="1493" type="line" name="sh03" smooth="yes"/>
+      <point x="719" y="1351" type="curve" smooth="yes" name="sh02"/>
+      <point x="719" y="1493" type="line" smooth="yes" name="sh03"/>
       <point x="719" y="1513"/>
       <point x="729" y="1523"/>
-      <point x="749" y="1523" type="curve" name="at02" smooth="yes"/>
-      <point x="891" y="1523" type="line" name="sv03" smooth="yes"/>
+      <point x="749" y="1523" type="curve" smooth="yes" name="at02"/>
+      <point x="891" y="1523" type="line" smooth="yes" name="sv03"/>
       <point x="911" y="1523"/>
       <point x="921" y="1513"/>
       <point x="921" y="1493" type="curve" smooth="yes"/>
-      <point x="921" y="1351" type="line" name="sh04" smooth="yes"/>
+      <point x="921" y="1351" type="line" smooth="yes" name="sh04"/>
       <point x="921" y="1331"/>
       <point x="911" y="1321"/>
       <point x="891" y="1321" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="864" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="864" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="744" y="-8"/>
       <point x="657" y="24"/>
       <point x="602" y="88" type="curve" smooth="yes"/>
       <point x="547" y="154"/>
       <point x="520" y="257"/>
-      <point x="520" y="398" type="curve" name="sh05" smooth="yes"/>
+      <point x="520" y="398" type="curve" smooth="yes" name="sh05"/>
       <point x="520" y="977" type="line" name="sv04"/>
       <point x="310" y="977" type="line"/>
       <point x="310" y="1120" type="line" name="ih01"/>
       <point x="708" y="1120" type="line" name="sh01"/>
-      <point x="708" y="387" type="line" name="hr02" smooth="yes"/>
+      <point x="708" y="387" type="line" smooth="yes" name="hr02"/>
       <point x="708" y="194"/>
       <point x="742" y="148"/>
-      <point x="886" y="148" type="curve" name="sv05" smooth="yes"/>
+      <point x="886" y="148" type="curve" smooth="yes" name="sv05"/>
       <point x="975" y="148" type="line"/>
       <point x="975" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/iotatonos.glif b/source/Hack-Regular.ufo/glyphs/iotatonos.glif
index fb5a6c82b..35883d365 100644
--- a/source/Hack-Regular.ufo/glyphs/iotatonos.glif
+++ b/source/Hack-Regular.ufo/glyphs/iotatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="iotatonos" format="1">
+<glyph name="iotatonos" format="2">
   <advance width="1233"/>
   <unicode hex="03AF"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="475" y="1272" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="864" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="864" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="739" y="-8"/>
       <point x="653" y="28"/>
       <point x="602" y="88" type="curve" smooth="yes"/>
       <point x="547" y="153"/>
       <point x="520" y="261"/>
-      <point x="520" y="398" type="curve" name="sh01" smooth="yes"/>
+      <point x="520" y="398" type="curve" smooth="yes" name="sh01"/>
       <point x="520" y="977" type="line" name="hr01"/>
       <point x="310" y="977" type="line"/>
       <point x="310" y="1120" type="line" name="dh01"/>
@@ -24,7 +24,7 @@
       <point x="708" y="387" type="line" smooth="yes"/>
       <point x="708" y="194"/>
       <point x="742" y="148"/>
-      <point x="886" y="148" type="curve" name="sv01" smooth="yes"/>
+      <point x="886" y="148" type="curve" smooth="yes" name="sv01"/>
       <point x="975" y="148" type="line"/>
       <point x="975" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/itilde.glif b/source/Hack-Regular.ufo/glyphs/itilde.glif
index 41cf51f2f..0a209efdb 100644
--- a/source/Hack-Regular.ufo/glyphs/itilde.glif
+++ b/source/Hack-Regular.ufo/glyphs/itilde.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="itilde" format="1">
+<glyph name="itilde" format="2">
   <advance width="1233"/>
   <unicode hex="0129"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="268" y="1259" type="line" name="sh01"/>
       <point x="268" y="1433"/>
       <point x="338" y="1541"/>
-      <point x="463" y="1541" type="curve" name="dv02" smooth="yes"/>
+      <point x="463" y="1541" type="curve" smooth="yes" name="dv02"/>
       <point x="514" y="1541"/>
       <point x="553" y="1524"/>
       <point x="602" y="1480" type="curve"/>
@@ -24,7 +24,7 @@
       <point x="927" y="1541" type="line"/>
       <point x="927" y="1367"/>
       <point x="857" y="1259"/>
-      <point x="732" y="1259" type="curve" name="hr01" smooth="yes"/>
+      <point x="732" y="1259" type="curve" smooth="yes" name="hr01"/>
       <point x="681" y="1259"/>
       <point x="642" y="1276"/>
       <point x="593" y="1320" type="curve"/>
@@ -40,13 +40,13 @@
       <point x="392" y="1259" type="curve" name="dv01"/>
     </contour>
     <contour>
-      <point x="859" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="859" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="752" y="-8"/>
       <point x="668" y="23"/>
       <point x="604" y="98" type="curve" smooth="yes"/>
       <point x="543" y="169"/>
       <point x="513" y="269"/>
-      <point x="513" y="398" type="curve" name="sh02" smooth="yes"/>
+      <point x="513" y="398" type="curve" smooth="yes" name="sh02"/>
       <point x="513" y="976" type="line" name="sv02"/>
       <point x="268" y="976" type="line"/>
       <point x="268" y="1120" type="line" name="dh01"/>
@@ -57,7 +57,7 @@
       <point x="743" y="211" type="curve" smooth="yes"/>
       <point x="775" y="167"/>
       <point x="820" y="148"/>
-      <point x="877" y="148" type="curve" name="sv03" smooth="yes"/>
+      <point x="877" y="148" type="curve" smooth="yes" name="sv03"/>
       <point x="1092" y="148" type="line"/>
       <point x="1092" y="-8" type="line" name="hr02"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/j.glif b/source/Hack-Regular.ufo/glyphs/j.glif
index dddd415b4..cc465cf51 100644
--- a/source/Hack-Regular.ufo/glyphs/j.glif
+++ b/source/Hack-Regular.ufo/glyphs/j.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="j" format="1">
+<glyph name="j" format="2">
   <advance width="1233"/>
   <unicode hex="006A"/>
   <outline>
@@ -39,9 +39,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/jcircumflex.glif b/source/Hack-Regular.ufo/glyphs/jcircumflex.glif
index eebc0d042..6f5fe9b9a 100644
--- a/source/Hack-Regular.ufo/glyphs/jcircumflex.glif
+++ b/source/Hack-Regular.ufo/glyphs/jcircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="jcircumflex" format="1">
+<glyph name="jcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0135"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/k.glif b/source/Hack-Regular.ufo/glyphs/k.glif
index bb2f6008b..b1c168a42 100644
--- a/source/Hack-Regular.ufo/glyphs/k.glif
+++ b/source/Hack-Regular.ufo/glyphs/k.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="k" format="1">
+<glyph name="k" format="2">
   <advance width="1233"/>
   <unicode hex="006B"/>
   <outline>
@@ -19,9 +19,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/kappa.glif b/source/Hack-Regular.ufo/glyphs/kappa.glif
index 107f8c81e..a7e7356d1 100644
--- a/source/Hack-Regular.ufo/glyphs/kappa.glif
+++ b/source/Hack-Regular.ufo/glyphs/kappa.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="kappa" format="1">
+<glyph name="kappa" format="2">
   <advance width="1233"/>
   <unicode hex="03BA"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/kgreenlandic.glif b/source/Hack-Regular.ufo/glyphs/kgreenlandic.glif
index 126c5d68c..f1373165c 100644
--- a/source/Hack-Regular.ufo/glyphs/kgreenlandic.glif
+++ b/source/Hack-Regular.ufo/glyphs/kgreenlandic.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="kgreenlandic" format="1">
+<glyph name="kgreenlandic" format="2">
   <advance width="1233"/>
   <unicode hex="0138"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/l.glif b/source/Hack-Regular.ufo/glyphs/l.glif
index ee650dcdb..92d5ceb59 100644
--- a/source/Hack-Regular.ufo/glyphs/l.glif
+++ b/source/Hack-Regular.ufo/glyphs/l.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="l" format="1">
+<glyph name="l" format="2">
   <advance width="1233"/>
   <unicode hex="006C"/>
   <outline>
@@ -21,9 +21,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/lacute.glif b/source/Hack-Regular.ufo/glyphs/lacute.glif
index 730b64969..6b35138a9 100644
--- a/source/Hack-Regular.ufo/glyphs/lacute.glif
+++ b/source/Hack-Regular.ufo/glyphs/lacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lacute" format="1">
+<glyph name="lacute" format="2">
   <advance width="1233"/>
   <unicode hex="013A"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="380" y="1616" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="801" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="801" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="580" y="-8"/>
       <point x="455" y="138"/>
-      <point x="455" y="398" type="curve" name="sh01" smooth="yes"/>
+      <point x="455" y="398" type="curve" smooth="yes" name="sh01"/>
       <point x="455" y="1412" type="line" name="sv01"/>
       <point x="160" y="1412" type="line" name="hr01"/>
       <point x="160" y="1556" type="line" name="dh01"/>
@@ -21,7 +21,7 @@
       <point x="639" y="398" type="line" smooth="yes"/>
       <point x="639" y="231"/>
       <point x="699" y="148"/>
-      <point x="819" y="148" type="curve" name="sv02" smooth="yes"/>
+      <point x="819" y="148" type="curve" smooth="yes" name="sv02"/>
       <point x="1034" y="148" type="line"/>
       <point x="1034" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/lambda.glif b/source/Hack-Regular.ufo/glyphs/lambda.glif
index 13c16c13d..ed985f922 100644
--- a/source/Hack-Regular.ufo/glyphs/lambda.glif
+++ b/source/Hack-Regular.ufo/glyphs/lambda.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lambda" format="1">
+<glyph name="lambda" format="2">
   <advance width="1233"/>
   <unicode hex="03BB"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="485" y="1272" type="line" smooth="yes"/>
       <point x="452" y="1361"/>
       <point x="385" y="1398"/>
-      <point x="284" y="1398" type="curve" name="sv01" smooth="yes"/>
+      <point x="284" y="1398" type="curve" smooth="yes" name="sv01"/>
       <point x="235" y="1398" type="line"/>
       <point x="235" y="1556" type="line" name="at01"/>
       <point x="305" y="1554" type="line" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/layerinfo.plist b/source/Hack-Regular.ufo/glyphs/layerinfo.plist
new file mode 100644
index 000000000..0c67376eb
--- /dev/null
+++ b/source/Hack-Regular.ufo/glyphs/layerinfo.plist
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
diff --git a/source/Hack-Regular.ufo/glyphs/lcaron.glif b/source/Hack-Regular.ufo/glyphs/lcaron.glif
index 244fe7d3b..3d9f213e8 100644
--- a/source/Hack-Regular.ufo/glyphs/lcaron.glif
+++ b/source/Hack-Regular.ufo/glyphs/lcaron.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lcaron" format="1">
+<glyph name="lcaron" format="2">
   <advance width="1233"/>
   <unicode hex="013E"/>
   <outline>
     <contour>
-      <point x="801" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="801" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="580" y="-8"/>
       <point x="455" y="138"/>
-      <point x="455" y="398" type="curve" name="sh01" smooth="yes"/>
+      <point x="455" y="398" type="curve" smooth="yes" name="sh01"/>
       <point x="455" y="1412" type="line" name="sv01"/>
       <point x="160" y="1412" type="line"/>
       <point x="160" y="1556" type="line" name="dh01"/>
@@ -15,7 +15,7 @@
       <point x="639" y="398" type="line" smooth="yes"/>
       <point x="639" y="231"/>
       <point x="699" y="148"/>
-      <point x="819" y="148" type="curve" name="sv02" smooth="yes"/>
+      <point x="819" y="148" type="curve" smooth="yes" name="sv02"/>
       <point x="1034" y="148" type="line"/>
       <point x="1034" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/ldot.glif b/source/Hack-Regular.ufo/glyphs/ldot.glif
index df3ed5c7a..b2d84576e 100644
--- a/source/Hack-Regular.ufo/glyphs/ldot.glif
+++ b/source/Hack-Regular.ufo/glyphs/ldot.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ldot" format="1">
+<glyph name="ldot" format="2">
   <advance width="1233"/>
   <unicode hex="0140"/>
   <outline>
     <contour>
-      <point x="566" y="98" type="curve" name="hr00" smooth="yes"/>
+      <point x="566" y="98" type="curve" smooth="yes" name="hr00"/>
       <point x="505" y="169"/>
       <point x="475" y="269"/>
       <point x="475" y="398" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="1054" y="550"/>
       <point x="1044" y="540"/>
       <point x="1024" y="540" type="curve" smooth="yes"/>
-      <point x="879" y="540" type="line" name="hr01" smooth="yes"/>
+      <point x="879" y="540" type="line" smooth="yes" name="hr01"/>
       <point x="859" y="540"/>
       <point x="849" y="550"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/less.glif b/source/Hack-Regular.ufo/glyphs/less.glif
index 0d1f12cc9..f69a55b5d 100644
--- a/source/Hack-Regular.ufo/glyphs/less.glif
+++ b/source/Hack-Regular.ufo/glyphs/less.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="less" format="1">
+<glyph name="less" format="2">
   <advance width="1233"/>
   <unicode hex="003C"/>
   <outline>
     <contour>
       <point x="88" y="559" type="line" name="hr00"/>
       <point x="88" y="725" type="line"/>
-      <point x="1145" y="1143" type="line" name="at01"/>
-      <point x="1145" y="961" type="line"/>
-      <point x="295" y="641" type="line" name="iv01"/>
-      <point x="1145" y="324" type="line"/>
-      <point x="1145" y="141" type="line" name="av01"/>
+      <point x="1145" y="1243" type="line" name="at01"/>
+      <point x="1145" y="1051" type="line"/>
+      <point x="305" y="641" type="line" name="iv01"/>
+      <point x="1145" y="234" type="line"/>
+      <point x="1145" y="41" type="line" name="av01"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Regular.ufo/glyphs/lessequal.glif b/source/Hack-Regular.ufo/glyphs/lessequal.glif
index 579f938f3..20aa154aa 100644
--- a/source/Hack-Regular.ufo/glyphs/lessequal.glif
+++ b/source/Hack-Regular.ufo/glyphs/lessequal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lessequal" format="1">
+<glyph name="lessequal" format="2">
   <advance width="1233"/>
   <unicode hex="2264"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/lfblock.glif b/source/Hack-Regular.ufo/glyphs/lfblock.glif
index 479d7a6a4..a5f8c99cd 100644
--- a/source/Hack-Regular.ufo/glyphs/lfblock.glif
+++ b/source/Hack-Regular.ufo/glyphs/lfblock.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lfblock" format="1">
+<glyph name="lfblock" format="2">
   <advance width="1233"/>
   <unicode hex="258C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/lira.glif b/source/Hack-Regular.ufo/glyphs/lira.glif
index 9b411d8ec..a8aee8885 100644
--- a/source/Hack-Regular.ufo/glyphs/lira.glif
+++ b/source/Hack-Regular.ufo/glyphs/lira.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lira" format="1">
+<glyph name="lira" format="2">
   <advance width="1233"/>
   <unicode hex="20A4"/>
   <outline>
@@ -17,17 +17,17 @@
       <point x="375" y="1016" type="line" smooth="yes"/>
       <point x="375" y="1356"/>
       <point x="512" y="1520"/>
-      <point x="807" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="807" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="915" y="1520"/>
       <point x="1007" y="1499"/>
       <point x="1112" y="1460" type="curve"/>
       <point x="1112" y="1278" type="line" name="iv01"/>
       <point x="1008" y="1334"/>
       <point x="927" y="1360"/>
-      <point x="828" y="1360" type="curve" name="sv01" smooth="yes"/>
+      <point x="828" y="1360" type="curve" smooth="yes" name="sv01"/>
       <point x="642" y="1360"/>
       <point x="575" y="1269"/>
-      <point x="575" y="993" type="curve" name="sh03" smooth="yes"/>
+      <point x="575" y="993" type="curve" smooth="yes" name="sh03"/>
       <point x="575" y="921" type="line" name="sv02"/>
       <point x="966" y="921" type="line"/>
       <point x="966" y="778" type="line" name="sv03"/>
diff --git a/source/Hack-Regular.ufo/glyphs/logicaland.glif b/source/Hack-Regular.ufo/glyphs/logicaland.glif
index 301a644c5..bf3b706b5 100644
--- a/source/Hack-Regular.ufo/glyphs/logicaland.glif
+++ b/source/Hack-Regular.ufo/glyphs/logicaland.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="logicaland" format="1">
+<glyph name="logicaland" format="2">
   <advance width="1233"/>
   <unicode hex="2227"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/logicalnot.glif b/source/Hack-Regular.ufo/glyphs/logicalnot.glif
index 84962a17b..cb4d3f9cd 100644
--- a/source/Hack-Regular.ufo/glyphs/logicalnot.glif
+++ b/source/Hack-Regular.ufo/glyphs/logicalnot.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="logicalnot" format="1">
+<glyph name="logicalnot" format="2">
   <advance width="1233"/>
   <unicode hex="00AC"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/logicalor.glif b/source/Hack-Regular.ufo/glyphs/logicalor.glif
index 4ae815258..62c85e6c2 100644
--- a/source/Hack-Regular.ufo/glyphs/logicalor.glif
+++ b/source/Hack-Regular.ufo/glyphs/logicalor.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="logicalor" format="1">
+<glyph name="logicalor" format="2">
   <advance width="1233"/>
   <unicode hex="2228"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/longs.glif b/source/Hack-Regular.ufo/glyphs/longs.glif
index fcce6a960..d46b7dfcf 100644
--- a/source/Hack-Regular.ufo/glyphs/longs.glif
+++ b/source/Hack-Regular.ufo/glyphs/longs.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="longs" format="1">
+<glyph name="longs" format="2">
   <advance width="1233"/>
   <unicode hex="017F"/>
   <outline>
@@ -14,7 +14,7 @@
       <point x="650" y="1469" type="curve" smooth="yes"/>
       <point x="707" y="1526"/>
       <point x="794" y="1556"/>
-      <point x="913" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="913" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="1134" y="1556" type="line"/>
       <point x="1134" y="1403" type="line" name="sv02"/>
       <point x="925" y="1403" type="line" smooth="yes"/>
@@ -23,7 +23,7 @@
       <point x="788" y="1363" type="curve" smooth="yes"/>
       <point x="762" y="1336"/>
       <point x="749" y="1288"/>
-      <point x="749" y="1219" type="curve" name="sh02" smooth="yes"/>
+      <point x="749" y="1219" type="curve" smooth="yes" name="sh02"/>
       <point x="749" y="1120" type="line" name="at03"/>
       <point x="749" y="-270" type="line" name="ab01"/>
       <point x="565" y="-270" type="line"/>
diff --git a/source/Hack-Regular.ufo/glyphs/lozenge.glif b/source/Hack-Regular.ufo/glyphs/lozenge.glif
index 88d12a8f8..4252cd2f9 100644
--- a/source/Hack-Regular.ufo/glyphs/lozenge.glif
+++ b/source/Hack-Regular.ufo/glyphs/lozenge.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lozenge" format="1">
+<glyph name="lozenge" format="2">
   <advance width="1233"/>
   <unicode hex="25CA"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/lslash.glif b/source/Hack-Regular.ufo/glyphs/lslash.glif
index 795b2030b..2d4d35d3d 100644
--- a/source/Hack-Regular.ufo/glyphs/lslash.glif
+++ b/source/Hack-Regular.ufo/glyphs/lslash.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="lslash" format="1">
+<glyph name="lslash" format="2">
   <advance width="1233"/>
   <unicode hex="0142"/>
   <outline>
     <contour>
-      <point x="801" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="801" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="694" y="-8"/>
       <point x="610" y="23"/>
       <point x="546" y="98" type="curve" smooth="yes"/>
       <point x="485" y="169"/>
       <point x="455" y="269"/>
-      <point x="455" y="398" type="curve" name="sh01" smooth="yes"/>
+      <point x="455" y="398" type="curve" smooth="yes" name="sh01"/>
       <point x="455" y="690" type="line" name="ih01"/>
       <point x="156" y="481" type="line"/>
       <point x="76" y="592" type="line"/>
@@ -29,7 +29,7 @@
       <point x="685" y="211" type="curve" smooth="yes"/>
       <point x="717" y="167"/>
       <point x="762" y="148"/>
-      <point x="819" y="148" type="curve" name="sv02" smooth="yes"/>
+      <point x="819" y="148" type="curve" smooth="yes" name="sv02"/>
       <point x="1034" y="148" type="line" name="sv03"/>
       <point x="1034" y="-8" type="line" name="ab02"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/ltshade.glif b/source/Hack-Regular.ufo/glyphs/ltshade.glif
index 80c634926..d044e38f7 100644
--- a/source/Hack-Regular.ufo/glyphs/ltshade.glif
+++ b/source/Hack-Regular.ufo/glyphs/ltshade.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ltshade" format="1">
+<glyph name="ltshade" format="2">
   <advance width="1233"/>
   <unicode hex="2591"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/m.glif b/source/Hack-Regular.ufo/glyphs/m.glif
index 01b5f1527..35ead17e3 100644
--- a/source/Hack-Regular.ufo/glyphs/m.glif
+++ b/source/Hack-Regular.ufo/glyphs/m.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="m" format="1">
+<glyph name="m" format="2">
   <advance width="1233"/>
   <unicode hex="006D"/>
   <outline>
@@ -57,9 +57,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/macron.glif b/source/Hack-Regular.ufo/glyphs/macron.glif
index a539284f2..30844fdc9 100644
--- a/source/Hack-Regular.ufo/glyphs/macron.glif
+++ b/source/Hack-Regular.ufo/glyphs/macron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="macron" format="1">
+<glyph name="macron" format="2">
   <advance width="1233"/>
   <unicode hex="00AF"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/millisecond.glif b/source/Hack-Regular.ufo/glyphs/millisecond.glif
index f7d2d6a51..b2e365840 100644
--- a/source/Hack-Regular.ufo/glyphs/millisecond.glif
+++ b/source/Hack-Regular.ufo/glyphs/millisecond.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="millisecond" format="1">
+<glyph name="millisecond" format="2">
   <advance width="1233"/>
   <unicode hex="2034"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/minus.glif b/source/Hack-Regular.ufo/glyphs/minus.glif
index 93f5769bb..d76106efb 100644
--- a/source/Hack-Regular.ufo/glyphs/minus.glif
+++ b/source/Hack-Regular.ufo/glyphs/minus.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="minus" format="1">
+<glyph name="minus" format="2">
   <advance width="1233"/>
   <unicode hex="2212"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/minute.glif b/source/Hack-Regular.ufo/glyphs/minute.glif
index 4882dcf9e..68772aa09 100644
--- a/source/Hack-Regular.ufo/glyphs/minute.glif
+++ b/source/Hack-Regular.ufo/glyphs/minute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="minute" format="1">
+<glyph name="minute" format="2">
   <advance width="1233"/>
   <unicode hex="2032"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/multiply.glif b/source/Hack-Regular.ufo/glyphs/multiply.glif
index 1d9b4fbd6..3c9831f81 100644
--- a/source/Hack-Regular.ufo/glyphs/multiply.glif
+++ b/source/Hack-Regular.ufo/glyphs/multiply.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="multiply" format="1">
+<glyph name="multiply" format="2">
   <advance width="1233"/>
   <unicode hex="00D7"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/musicalnote.glif b/source/Hack-Regular.ufo/glyphs/musicalnote.glif
index 4a24eed2a..fdb4d8c56 100644
--- a/source/Hack-Regular.ufo/glyphs/musicalnote.glif
+++ b/source/Hack-Regular.ufo/glyphs/musicalnote.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="musicalnote" format="1">
+<glyph name="musicalnote" format="2">
   <advance width="1233"/>
   <unicode hex="266A"/>
   <outline>
     <contour>
-      <point x="1154" y="956" type="curve" name="hr00" smooth="yes"/>
+      <point x="1154" y="956" type="curve" smooth="yes" name="hr00"/>
       <point x="1118" y="1145"/>
       <point x="1020" y="1329"/>
       <point x="847" y="1493" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/n.glif b/source/Hack-Regular.ufo/glyphs/n.glif
index 9c95278a6..e7344f338 100644
--- a/source/Hack-Regular.ufo/glyphs/n.glif
+++ b/source/Hack-Regular.ufo/glyphs/n.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="n" format="1">
+<glyph name="n" format="2">
   <advance width="1233"/>
   <unicode hex="006E"/>
   <outline>
@@ -27,9 +27,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/nacute.glif b/source/Hack-Regular.ufo/glyphs/nacute.glif
index 7be08198d..ec9cbede3 100644
--- a/source/Hack-Regular.ufo/glyphs/nacute.glif
+++ b/source/Hack-Regular.ufo/glyphs/nacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="nacute" format="1">
+<glyph name="nacute" format="2">
   <advance width="1233"/>
   <unicode hex="0144"/>
   <outline>
@@ -15,7 +15,7 @@
       <point x="379" y="952" type="line" name="sh03"/>
       <point x="444" y="1081"/>
       <point x="558" y="1147"/>
-      <point x="711" y="1147" type="curve" name="sv02" smooth="yes"/>
+      <point x="711" y="1147" type="curve" smooth="yes" name="sv02"/>
       <point x="940" y="1147"/>
       <point x="1051" y="999"/>
       <point x="1051" y="694" type="curve" smooth="yes"/>
@@ -24,10 +24,10 @@
       <point x="866" y="694" type="line" smooth="yes"/>
       <point x="866" y="895"/>
       <point x="799" y="987"/>
-      <point x="648" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="648" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="473" y="987"/>
       <point x="379" y="862"/>
-      <point x="379" y="633" type="curve" name="sh04" smooth="yes"/>
+      <point x="379" y="633" type="curve" smooth="yes" name="sh04"/>
       <point x="379" y="0" type="line" name="ab01"/>
       <point x="195" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/napostrophe.glif b/source/Hack-Regular.ufo/glyphs/napostrophe.glif
index fd288942a..240e1484e 100644
--- a/source/Hack-Regular.ufo/glyphs/napostrophe.glif
+++ b/source/Hack-Regular.ufo/glyphs/napostrophe.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="napostrophe" format="1">
+<glyph name="napostrophe" format="2">
   <advance width="1233"/>
   <unicode hex="0149"/>
   <outline>
@@ -23,7 +23,7 @@
       <point x="1144" y="1035" type="curve" smooth="yes"/>
       <point x="1200" y="960"/>
       <point x="1228" y="846"/>
-      <point x="1228" y="694" type="curve" name="hr01" smooth="yes"/>
+      <point x="1228" y="694" type="curve" smooth="yes" name="hr01"/>
       <point x="1228" y="0" type="line"/>
       <point x="1043" y="0" type="line"/>
       <point x="1043" y="694" type="line" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/ncaron.glif b/source/Hack-Regular.ufo/glyphs/ncaron.glif
index 18dcf0b9f..3875e756d 100644
--- a/source/Hack-Regular.ufo/glyphs/ncaron.glif
+++ b/source/Hack-Regular.ufo/glyphs/ncaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ncaron" format="1">
+<glyph name="ncaron" format="2">
   <advance width="1233"/>
   <unicode hex="0148"/>
   <outline>
@@ -18,7 +18,7 @@
       <point x="379" y="952" type="line" name="sh02"/>
       <point x="444" y="1081"/>
       <point x="558" y="1147"/>
-      <point x="711" y="1147" type="curve" name="hr01" smooth="yes"/>
+      <point x="711" y="1147" type="curve" smooth="yes" name="hr01"/>
       <point x="940" y="1147"/>
       <point x="1051" y="999"/>
       <point x="1051" y="694" type="curve" smooth="yes"/>
@@ -27,10 +27,10 @@
       <point x="866" y="694" type="line" smooth="yes"/>
       <point x="866" y="895"/>
       <point x="799" y="987"/>
-      <point x="648" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="648" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="473" y="987"/>
       <point x="379" y="862"/>
-      <point x="379" y="633" type="curve" name="sh04" smooth="yes"/>
+      <point x="379" y="633" type="curve" smooth="yes" name="sh04"/>
       <point x="379" y="0" type="line" name="ab01"/>
       <point x="195" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/nine.glif b/source/Hack-Regular.ufo/glyphs/nine.glif
index 45721b6ce..4c5a9552f 100644
--- a/source/Hack-Regular.ufo/glyphs/nine.glif
+++ b/source/Hack-Regular.ufo/glyphs/nine.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="nine" format="1">
+<glyph name="nine" format="2">
   <advance width="1233"/>
   <unicode hex="0039"/>
   <outline>
     <contour>
-      <point x="528" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="528" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="479" y="-29"/>
       <point x="426" y="-25"/>
       <point x="379" y="-14" type="curve" smooth="yes"/>
@@ -17,7 +17,7 @@
       <point x="370" y="161" type="curve" smooth="yes"/>
       <point x="418" y="148"/>
       <point x="467" y="141"/>
-      <point x="517" y="141" type="curve" name="dv02" smooth="yes"/>
+      <point x="517" y="141" type="curve" smooth="yes" name="dv02"/>
       <point x="646" y="141"/>
       <point x="743" y="189"/>
       <point x="809" y="286" type="curve" smooth="yes"/>
@@ -29,25 +29,25 @@
       <point x="775" y="557" type="curve" smooth="yes"/>
       <point x="720" y="522"/>
       <point x="651" y="504"/>
-      <point x="569" y="504" type="curve" name="dv03" smooth="yes"/>
+      <point x="569" y="504" type="curve" smooth="yes" name="dv03"/>
       <point x="436" y="504"/>
       <point x="325" y="549"/>
       <point x="246" y="637" type="curve" smooth="yes"/>
       <point x="167" y="726"/>
       <point x="127" y="851"/>
-      <point x="127" y="1010" type="curve" name="dh01" smooth="yes"/>
+      <point x="127" y="1010" type="curve" smooth="yes" name="dh01"/>
       <point x="127" y="1167"/>
       <point x="165" y="1298"/>
       <point x="249" y="1389" type="curve" smooth="yes"/>
       <point x="329" y="1477"/>
       <point x="446" y="1520"/>
-      <point x="594" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="594" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="777" y="1520"/>
       <point x="893" y="1453"/>
       <point x="972" y="1332" type="curve" smooth="yes"/>
       <point x="1057" y="1199"/>
       <point x="1094" y="1006"/>
-      <point x="1094" y="766" type="curve" name="dh03" smooth="yes"/>
+      <point x="1094" y="766" type="curve" smooth="yes" name="dh03"/>
       <point x="1094" y="502"/>
       <point x="1050" y="304"/>
       <point x="950" y="169" type="curve" smooth="yes"/>
@@ -55,25 +55,25 @@
       <point x="707" y="-29"/>
     </contour>
     <contour>
-      <point x="593" y="662" type="curve" name="dv04" smooth="yes"/>
+      <point x="593" y="662" type="curve" smooth="yes" name="dv04"/>
       <point x="686" y="662"/>
       <point x="754" y="697"/>
       <point x="799" y="754" type="curve" smooth="yes"/>
       <point x="846" y="813"/>
       <point x="872" y="899"/>
-      <point x="872" y="1012" type="curve" name="hr01" smooth="yes"/>
+      <point x="872" y="1012" type="curve" smooth="yes" name="hr01"/>
       <point x="872" y="1125"/>
       <point x="846" y="1211"/>
       <point x="799" y="1270" type="curve" smooth="yes"/>
       <point x="754" y="1327"/>
       <point x="686" y="1362"/>
-      <point x="593" y="1362" type="curve" name="sv01" smooth="yes"/>
+      <point x="593" y="1362" type="curve" smooth="yes" name="sv01"/>
       <point x="510" y="1362"/>
       <point x="441" y="1335"/>
       <point x="394" y="1274" type="curve" smooth="yes"/>
       <point x="349" y="1215"/>
       <point x="326" y="1127"/>
-      <point x="326" y="1012" type="curve" name="dh02" smooth="yes"/>
+      <point x="326" y="1012" type="curve" smooth="yes" name="dh02"/>
       <point x="326" y="897"/>
       <point x="349" y="809"/>
       <point x="394" y="750" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/nine.subs.glif b/source/Hack-Regular.ufo/glyphs/nine.subs.glif
index dc6f55506..c131296c2 100644
--- a/source/Hack-Regular.ufo/glyphs/nine.subs.glif
+++ b/source/Hack-Regular.ufo/glyphs/nine.subs.glif
@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="nine.subs" format="1">
+<glyph name="nine.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="551" y="-414" type="curve" name="hr00" smooth="yes"/>
+      <point x="551" y="-414" type="curve" smooth="yes" name="hr00"/>
       <point x="491" y="-414"/>
       <point x="428" y="-402"/>
       <point x="371" y="-381" type="curve"/>
       <point x="371" y="-277" type="line" name="ih01"/>
       <point x="424" y="-304"/>
       <point x="482" y="-319"/>
-      <point x="546" y="-319" type="curve" name="dv01" smooth="yes"/>
+      <point x="546" y="-319" type="curve" smooth="yes" name="dv01"/>
       <point x="707" y="-319"/>
       <point x="788" y="-213"/>
       <point x="788" y="0" type="curve" name="ih02"/>
       <point x="749" y="-76"/>
       <point x="677" y="-116"/>
-      <point x="585" y="-116" type="curve" name="dv04" smooth="yes"/>
+      <point x="585" y="-116" type="curve" smooth="yes" name="dv04"/>
       <point x="402" y="-116"/>
       <point x="304" y="-14"/>
-      <point x="304" y="170" type="curve" name="sh01" smooth="yes"/>
+      <point x="304" y="170" type="curve" smooth="yes" name="sh01"/>
       <point x="304" y="351"/>
       <point x="408" y="453"/>
-      <point x="592" y="453" type="curve" name="dv03" smooth="yes"/>
+      <point x="592" y="453" type="curve" smooth="yes" name="dv03"/>
       <point x="808" y="453"/>
       <point x="904" y="319"/>
-      <point x="904" y="19" type="curve" name="sh03" smooth="yes"/>
+      <point x="904" y="19" type="curve" smooth="yes" name="sh03"/>
       <point x="904" y="-264"/>
       <point x="782" y="-414"/>
     </contour>
     <contour>
-      <point x="595" y="-28" type="curve" name="dv05" smooth="yes"/>
+      <point x="595" y="-28" type="curve" smooth="yes" name="dv05"/>
       <point x="703" y="-28"/>
       <point x="766" y="44"/>
-      <point x="766" y="169" type="curve" name="ah01" smooth="yes"/>
+      <point x="766" y="169" type="curve" smooth="yes" name="ah01"/>
       <point x="766" y="293"/>
       <point x="703" y="365"/>
-      <point x="595" y="365" type="curve" name="dv02" smooth="yes"/>
+      <point x="595" y="365" type="curve" smooth="yes" name="dv02"/>
       <point x="483" y="365"/>
       <point x="427" y="300"/>
-      <point x="427" y="169" type="curve" name="sh02" smooth="yes"/>
+      <point x="427" y="169" type="curve" smooth="yes" name="sh02"/>
       <point x="427" y="38"/>
       <point x="483" y="-28"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/notelement.glif b/source/Hack-Regular.ufo/glyphs/notelement.glif
index 81411c9ce..7825f2d8f 100644
--- a/source/Hack-Regular.ufo/glyphs/notelement.glif
+++ b/source/Hack-Regular.ufo/glyphs/notelement.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="notelement" format="1">
+<glyph name="notelement" format="2">
   <advance width="1233"/>
   <unicode hex="2209"/>
   <outline>
@@ -8,13 +8,13 @@
       <point x="386" y="93" type="line"/>
       <point x="226" y="224"/>
       <point x="130" y="468"/>
-      <point x="130" y="732" type="curve" name="dh01" smooth="yes"/>
+      <point x="130" y="732" type="curve" smooth="yes" name="dh01"/>
       <point x="130" y="996"/>
       <point x="225" y="1235"/>
       <point x="380" y="1366" type="curve" smooth="yes"/>
       <point x="457" y="1431"/>
       <point x="541" y="1464"/>
-      <point x="632" y="1464" type="curve" name="sv01" smooth="yes"/>
+      <point x="632" y="1464" type="curve" smooth="yes" name="sv01"/>
       <point x="802" y="1464" type="line"/>
       <point x="856" y="1641" type="line" name="av02"/>
       <point x="1019" y="1591" type="line"/>
@@ -29,7 +29,7 @@
       <point x="588" y="174" type="line"/>
       <point x="601" y="171"/>
       <point x="615" y="170"/>
-      <point x="632" y="170" type="curve" name="sv02" smooth="yes"/>
+      <point x="632" y="170" type="curve" smooth="yes" name="sv02"/>
       <point x="1104" y="170" type="line" name="sv03"/>
       <point x="1104" y="0" type="line" name="ab01"/>
       <point x="632" y="0" type="line" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/notequal.glif b/source/Hack-Regular.ufo/glyphs/notequal.glif
index d0f2c40a9..9ed3d2fc4 100644
--- a/source/Hack-Regular.ufo/glyphs/notequal.glif
+++ b/source/Hack-Regular.ufo/glyphs/notequal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="notequal" format="1">
+<glyph name="notequal" format="2">
   <advance width="1233"/>
   <unicode hex="2260"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/notsubset.glif b/source/Hack-Regular.ufo/glyphs/notsubset.glif
index 139055197..4a163ffd0 100644
--- a/source/Hack-Regular.ufo/glyphs/notsubset.glif
+++ b/source/Hack-Regular.ufo/glyphs/notsubset.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="notsubset" format="1">
+<glyph name="notsubset" format="2">
   <advance width="1233"/>
   <unicode hex="2284"/>
   <outline>
@@ -11,10 +11,10 @@
       <point x="227" y="302" type="curve" smooth="yes"/>
       <point x="136" y="394"/>
       <point x="88" y="504"/>
-      <point x="88" y="636" type="curve" name="dh01" smooth="yes"/>
+      <point x="88" y="636" type="curve" smooth="yes" name="dh01"/>
       <point x="88" y="908"/>
       <point x="298" y="1119"/>
-      <point x="565" y="1119" type="curve" name="at01" smooth="yes"/>
+      <point x="565" y="1119" type="curve" smooth="yes" name="at01"/>
       <point x="691" y="1119" type="line"/>
       <point x="766" y="1342" type="line" name="av02"/>
       <point x="927" y="1289" type="line"/>
@@ -30,10 +30,10 @@
     </contour>
     <contour>
       <point x="639" y="969" type="line" name="sv02"/>
-      <point x="565" y="969" type="line" name="sv03" smooth="yes"/>
+      <point x="565" y="969" type="line" smooth="yes" name="sv03"/>
       <point x="382" y="969"/>
       <point x="238" y="825"/>
-      <point x="238" y="638" type="curve" name="dh02" smooth="yes"/>
+      <point x="238" y="638" type="curve" smooth="yes" name="dh02"/>
       <point x="238" y="550"/>
       <point x="269" y="473"/>
       <point x="333" y="409" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/ntilde.glif b/source/Hack-Regular.ufo/glyphs/ntilde.glif
index 3a2366fd3..5da3e5f57 100644
--- a/source/Hack-Regular.ufo/glyphs/ntilde.glif
+++ b/source/Hack-Regular.ufo/glyphs/ntilde.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ntilde" format="1">
+<glyph name="ntilde" format="2">
   <advance width="1233"/>
   <unicode hex="00F1"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="339" y="1494" type="curve" smooth="yes"/>
       <point x="373" y="1543"/>
       <point x="420" y="1568"/>
-      <point x="480" y="1568" type="curve" name="at01" smooth="yes"/>
+      <point x="480" y="1568" type="curve" smooth="yes" name="at01"/>
       <point x="506" y="1568"/>
       <point x="530" y="1563"/>
-      <point x="552" y="1554" type="curve" name="at02" smooth="yes"/>
+      <point x="552" y="1554" type="curve" smooth="yes" name="at02"/>
       <point x="572" y="1545"/>
       <point x="595" y="1530"/>
       <point x="621" y="1507" type="curve"/>
@@ -36,7 +36,7 @@
       <point x="894" y="1360" type="curve" smooth="yes"/>
       <point x="860" y="1311"/>
       <point x="813" y="1286"/>
-      <point x="753" y="1286" type="curve" name="sv02" smooth="yes"/>
+      <point x="753" y="1286" type="curve" smooth="yes" name="sv02"/>
       <point x="727" y="1286"/>
       <point x="703" y="1291"/>
       <point x="681" y="1300" type="curve" smooth="yes"/>
@@ -63,7 +63,7 @@
       <point x="379" y="952" type="line" name="sh02"/>
       <point x="446" y="1081"/>
       <point x="557" y="1147"/>
-      <point x="710" y="1147" type="curve" name="dv02" smooth="yes"/>
+      <point x="710" y="1147" type="curve" smooth="yes" name="dv02"/>
       <point x="830" y="1147"/>
       <point x="912" y="1107"/>
       <point x="967" y="1035" type="curve" smooth="yes"/>
@@ -75,13 +75,13 @@
       <point x="866" y="694" type="line" smooth="yes"/>
       <point x="866" y="895"/>
       <point x="798" y="987"/>
-      <point x="646" y="987" type="curve" name="dv01" smooth="yes"/>
+      <point x="646" y="987" type="curve" smooth="yes" name="dv01"/>
       <point x="558" y="987"/>
       <point x="494" y="956"/>
       <point x="449" y="896" type="curve" smooth="yes"/>
       <point x="402" y="835"/>
       <point x="379" y="748"/>
-      <point x="379" y="633" type="curve" name="sh04" smooth="yes"/>
+      <point x="379" y="633" type="curve" smooth="yes" name="sh04"/>
       <point x="379" y="0" type="line" name="ab01"/>
       <point x="195" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/nu.glif b/source/Hack-Regular.ufo/glyphs/nu.glif
index b5ed30b4f..50dda542c 100644
--- a/source/Hack-Regular.ufo/glyphs/nu.glif
+++ b/source/Hack-Regular.ufo/glyphs/nu.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="nu" format="1">
+<glyph name="nu" format="2">
   <advance width="1233"/>
   <unicode hex="03BD"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="603" y="180" type="line" name="iv01"/>
       <point x="770" y="350"/>
       <point x="903" y="582"/>
-      <point x="903" y="721" type="curve" name="dh01" smooth="yes"/>
+      <point x="903" y="721" type="curve" smooth="yes" name="dh01"/>
       <point x="903" y="753"/>
       <point x="896" y="810"/>
       <point x="881" y="870" type="curve"/>
@@ -19,7 +19,7 @@
       <point x="933" y="1120" type="line"/>
       <point x="1021" y="1002"/>
       <point x="1090" y="831"/>
-      <point x="1090" y="707" type="curve" name="dh02" smooth="yes"/>
+      <point x="1090" y="707" type="curve" smooth="yes" name="dh02"/>
       <point x="1090" y="462"/>
       <point x="819" y="153"/>
       <point x="654" y="0" type="curve" name="ab01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/numbersign.glif b/source/Hack-Regular.ufo/glyphs/numbersign.glif
index e1e48c4bb..ab45eee58 100644
--- a/source/Hack-Regular.ufo/glyphs/numbersign.glif
+++ b/source/Hack-Regular.ufo/glyphs/numbersign.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="numbersign" format="1">
+<glyph name="numbersign" format="2">
   <advance width="1233"/>
   <unicode hex="0023"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/o.glif b/source/Hack-Regular.ufo/glyphs/o.glif
index 55fe12550..3e127f162 100644
--- a/source/Hack-Regular.ufo/glyphs/o.glif
+++ b/source/Hack-Regular.ufo/glyphs/o.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="o" format="1">
+<glyph name="o" format="2">
   <advance width="1233"/>
   <unicode hex="006F"/>
   <outline>
@@ -33,9 +33,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/oacute.glif b/source/Hack-Regular.ufo/glyphs/oacute.glif
index 56adc977d..5d3508818 100644
--- a/source/Hack-Regular.ufo/glyphs/oacute.glif
+++ b/source/Hack-Regular.ufo/glyphs/oacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="oacute" format="1">
+<glyph name="oacute" format="2">
   <advance width="1233"/>
   <unicode hex="00F3"/>
   <outline>
@@ -10,25 +10,25 @@
       <point x="475" y="1297" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="463" y="-29"/>
       <point x="343" y="21"/>
       <point x="260" y="121" type="curve"/>
       <point x="176" y="225"/>
       <point x="137" y="373"/>
-      <point x="137" y="560" type="curve" name="sh02" smooth="yes"/>
+      <point x="137" y="560" type="curve" smooth="yes" name="sh02"/>
       <point x="137" y="749"/>
       <point x="178" y="895"/>
       <point x="260" y="996" type="curve" smooth="yes"/>
       <point x="342" y="1097"/>
       <point x="461" y="1147"/>
-      <point x="616" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="776" y="1147"/>
       <point x="893" y="1095"/>
       <point x="973" y="996" type="curve" smooth="yes"/>
       <point x="1055" y="895"/>
       <point x="1096" y="750"/>
-      <point x="1096" y="561" type="curve" name="sh01" smooth="yes"/>
+      <point x="1096" y="561" type="curve" smooth="yes" name="sh01"/>
       <point x="1096" y="370"/>
       <point x="1056" y="221"/>
       <point x="973" y="121" type="curve" smooth="yes"/>
@@ -36,25 +36,25 @@
       <point x="773" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="127"/>
       <point x="781" y="164"/>
       <point x="829" y="237" type="curve" smooth="yes"/>
       <point x="877" y="310"/>
       <point x="901" y="417"/>
-      <point x="901" y="559" type="curve" name="ah01" smooth="yes"/>
+      <point x="901" y="559" type="curve" smooth="yes" name="ah01"/>
       <point x="901" y="701"/>
       <point x="877" y="809"/>
       <point x="829" y="882" type="curve" smooth="yes"/>
       <point x="781" y="955"/>
       <point x="710" y="991"/>
-      <point x="616" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="523" y="991"/>
       <point x="452" y="955"/>
       <point x="404" y="882" type="curve" smooth="yes"/>
       <point x="356" y="809"/>
       <point x="332" y="701"/>
-      <point x="332" y="559" type="curve" name="sh03" smooth="yes"/>
+      <point x="332" y="559" type="curve" smooth="yes" name="sh03"/>
       <point x="332" y="417"/>
       <point x="356" y="310"/>
       <point x="404" y="237" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/obreve.glif b/source/Hack-Regular.ufo/glyphs/obreve.glif
index bbf55f691..bc425f46b 100644
--- a/source/Hack-Regular.ufo/glyphs/obreve.glif
+++ b/source/Hack-Regular.ufo/glyphs/obreve.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="obreve" format="1">
+<glyph name="obreve" format="2">
   <advance width="1233"/>
   <unicode hex="014F"/>
   <outline>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="463" y="-29"/>
       <point x="343" y="21"/>
       <point x="260" y="121" type="curve"/>
       <point x="176" y="225"/>
       <point x="137" y="373"/>
-      <point x="137" y="560" type="curve" name="sh01" smooth="yes"/>
+      <point x="137" y="560" type="curve" smooth="yes" name="sh01"/>
       <point x="137" y="749"/>
       <point x="178" y="895"/>
       <point x="260" y="996" type="curve" smooth="yes"/>
       <point x="342" y="1097"/>
       <point x="461" y="1147"/>
-      <point x="616" y="1147" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="dv03"/>
       <point x="776" y="1147"/>
       <point x="893" y="1095"/>
       <point x="973" y="996" type="curve" smooth="yes"/>
       <point x="1055" y="895"/>
       <point x="1096" y="750"/>
-      <point x="1096" y="561" type="curve" name="sh02" smooth="yes"/>
+      <point x="1096" y="561" type="curve" smooth="yes" name="sh02"/>
       <point x="1096" y="370"/>
       <point x="1056" y="221"/>
       <point x="973" y="121" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="773" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="710" y="127"/>
       <point x="781" y="164"/>
       <point x="829" y="237" type="curve" smooth="yes"/>
       <point x="877" y="310"/>
       <point x="901" y="417"/>
-      <point x="901" y="559" type="curve" name="ah01" smooth="yes"/>
+      <point x="901" y="559" type="curve" smooth="yes" name="ah01"/>
       <point x="901" y="701"/>
       <point x="877" y="809"/>
       <point x="829" y="882" type="curve" smooth="yes"/>
       <point x="781" y="955"/>
       <point x="710" y="991"/>
-      <point x="616" y="991" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="991" type="curve" smooth="yes" name="dv02"/>
       <point x="523" y="991"/>
       <point x="452" y="955"/>
       <point x="404" y="882" type="curve" smooth="yes"/>
       <point x="356" y="809"/>
       <point x="332" y="701"/>
-      <point x="332" y="559" type="curve" name="sh03" smooth="yes"/>
+      <point x="332" y="559" type="curve" smooth="yes" name="sh03"/>
       <point x="332" y="417"/>
       <point x="356" y="310"/>
       <point x="404" y="237" type="curve" smooth="yes"/>
@@ -56,7 +56,7 @@
       <point x="523" y="127"/>
     </contour>
     <contour>
-      <point x="616" y="1298" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1298" type="curve" smooth="yes" name="dv03"/>
       <point x="423" y="1298"/>
       <point x="317" y="1395"/>
       <point x="303" y="1585" type="curve" name="sh03"/>
@@ -66,7 +66,7 @@
       <point x="481" y="1472" type="curve" smooth="yes"/>
       <point x="512" y="1447"/>
       <point x="557" y="1435"/>
-      <point x="616" y="1435" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="1435" type="curve" smooth="yes" name="dv04"/>
       <point x="673" y="1435"/>
       <point x="718" y="1447"/>
       <point x="749" y="1472" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/ocircumflex.glif b/source/Hack-Regular.ufo/glyphs/ocircumflex.glif
index ff093c6c2..187f7d32a 100644
--- a/source/Hack-Regular.ufo/glyphs/ocircumflex.glif
+++ b/source/Hack-Regular.ufo/glyphs/ocircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ocircumflex" format="1">
+<glyph name="ocircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00F4"/>
   <outline>
@@ -13,25 +13,25 @@
       <point x="297" y="1297" type="line" name="ih03"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="463" y="-29"/>
       <point x="343" y="21"/>
       <point x="260" y="121" type="curve"/>
       <point x="176" y="225"/>
       <point x="137" y="373"/>
-      <point x="137" y="560" type="curve" name="sh02" smooth="yes"/>
+      <point x="137" y="560" type="curve" smooth="yes" name="sh02"/>
       <point x="137" y="749"/>
       <point x="178" y="895"/>
       <point x="260" y="996" type="curve" smooth="yes"/>
       <point x="342" y="1097"/>
       <point x="461" y="1147"/>
-      <point x="616" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="776" y="1147"/>
       <point x="893" y="1095"/>
       <point x="973" y="996" type="curve" smooth="yes"/>
       <point x="1055" y="895"/>
       <point x="1096" y="750"/>
-      <point x="1096" y="561" type="curve" name="sh01" smooth="yes"/>
+      <point x="1096" y="561" type="curve" smooth="yes" name="sh01"/>
       <point x="1096" y="370"/>
       <point x="1056" y="221"/>
       <point x="973" y="121" type="curve" smooth="yes"/>
@@ -39,25 +39,25 @@
       <point x="773" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="127"/>
       <point x="781" y="164"/>
       <point x="829" y="237" type="curve" smooth="yes"/>
       <point x="877" y="310"/>
       <point x="901" y="417"/>
-      <point x="901" y="559" type="curve" name="ah01" smooth="yes"/>
+      <point x="901" y="559" type="curve" smooth="yes" name="ah01"/>
       <point x="901" y="701"/>
       <point x="877" y="809"/>
       <point x="829" y="882" type="curve" smooth="yes"/>
       <point x="781" y="955"/>
       <point x="710" y="991"/>
-      <point x="616" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="523" y="991"/>
       <point x="452" y="955"/>
       <point x="404" y="882" type="curve" smooth="yes"/>
       <point x="356" y="809"/>
       <point x="332" y="701"/>
-      <point x="332" y="559" type="curve" name="sh03" smooth="yes"/>
+      <point x="332" y="559" type="curve" smooth="yes" name="sh03"/>
       <point x="332" y="417"/>
       <point x="356" y="310"/>
       <point x="404" y="237" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/odieresis.glif b/source/Hack-Regular.ufo/glyphs/odieresis.glif
index 17a651507..86cc82366 100644
--- a/source/Hack-Regular.ufo/glyphs/odieresis.glif
+++ b/source/Hack-Regular.ufo/glyphs/odieresis.glif
@@ -1,64 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="odieresis" format="1">
+<glyph name="odieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00F6"/>
   <outline>
     <contour>
-      <point x="349" y="1350" type="line" name="dv03" smooth="yes"/>
+      <point x="349" y="1350" type="line" smooth="yes" name="dv03"/>
       <point x="329" y="1350"/>
       <point x="319" y="1360"/>
-      <point x="319" y="1380" type="curve" name="sh01" smooth="yes"/>
+      <point x="319" y="1380" type="curve" smooth="yes" name="sh01"/>
       <point x="319" y="1522" type="line" smooth="yes"/>
       <point x="319" y="1542"/>
       <point x="329" y="1552"/>
-      <point x="349" y="1552" type="curve" name="dv04" smooth="yes"/>
+      <point x="349" y="1552" type="curve" smooth="yes" name="dv04"/>
       <point x="492" y="1552" type="line" smooth="yes"/>
       <point x="512" y="1552"/>
       <point x="522" y="1542"/>
       <point x="522" y="1522" type="curve" smooth="yes"/>
-      <point x="522" y="1380" type="line" name="sh02" smooth="yes"/>
+      <point x="522" y="1380" type="line" smooth="yes" name="sh02"/>
       <point x="522" y="1360"/>
       <point x="512" y="1350"/>
       <point x="492" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1350" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1350" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1350"/>
       <point x="711" y="1360"/>
-      <point x="711" y="1380" type="curve" name="dh03" smooth="yes"/>
+      <point x="711" y="1380" type="curve" smooth="yes" name="dh03"/>
       <point x="711" y="1522" type="line" smooth="yes"/>
       <point x="711" y="1542"/>
       <point x="721" y="1552"/>
-      <point x="741" y="1552" type="curve" name="sv02" smooth="yes"/>
+      <point x="741" y="1552" type="curve" smooth="yes" name="sv02"/>
       <point x="883" y="1552" type="line" smooth="yes"/>
       <point x="903" y="1552"/>
       <point x="913" y="1542"/>
       <point x="913" y="1522" type="curve" smooth="yes"/>
-      <point x="913" y="1380" type="line" name="dh04" smooth="yes"/>
+      <point x="913" y="1380" type="line" smooth="yes" name="dh04"/>
       <point x="913" y="1360"/>
       <point x="903" y="1350"/>
       <point x="883" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="463" y="-29"/>
       <point x="343" y="21"/>
       <point x="260" y="121" type="curve"/>
       <point x="176" y="225"/>
       <point x="137" y="373"/>
-      <point x="137" y="560" type="curve" name="dh01" smooth="yes"/>
+      <point x="137" y="560" type="curve" smooth="yes" name="dh01"/>
       <point x="137" y="749"/>
       <point x="178" y="895"/>
-      <point x="260" y="996" type="curve" name="hr01" smooth="yes"/>
+      <point x="260" y="996" type="curve" smooth="yes" name="hr01"/>
       <point x="342" y="1097"/>
       <point x="461" y="1147"/>
-      <point x="616" y="1147" type="curve" name="dv06" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="dv06"/>
       <point x="776" y="1147"/>
       <point x="893" y="1095"/>
       <point x="973" y="996" type="curve" smooth="yes"/>
       <point x="1055" y="895"/>
       <point x="1096" y="750"/>
-      <point x="1096" y="561" type="curve" name="sh03" smooth="yes"/>
+      <point x="1096" y="561" type="curve" smooth="yes" name="sh03"/>
       <point x="1096" y="370"/>
       <point x="1056" y="221"/>
       <point x="973" y="121" type="curve" smooth="yes"/>
@@ -66,25 +66,25 @@
       <point x="773" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="127"/>
       <point x="781" y="164"/>
       <point x="829" y="237" type="curve" smooth="yes"/>
       <point x="877" y="310"/>
       <point x="901" y="417"/>
-      <point x="901" y="559" type="curve" name="sh04" smooth="yes"/>
+      <point x="901" y="559" type="curve" smooth="yes" name="sh04"/>
       <point x="901" y="701"/>
       <point x="877" y="809"/>
       <point x="829" y="882" type="curve" smooth="yes"/>
       <point x="781" y="955"/>
       <point x="710" y="991"/>
-      <point x="616" y="991" type="curve" name="dv05" smooth="yes"/>
+      <point x="616" y="991" type="curve" smooth="yes" name="dv05"/>
       <point x="523" y="991"/>
       <point x="452" y="955"/>
       <point x="404" y="882" type="curve" smooth="yes"/>
       <point x="356" y="809"/>
       <point x="332" y="701"/>
-      <point x="332" y="559" type="curve" name="dh02" smooth="yes"/>
+      <point x="332" y="559" type="curve" smooth="yes" name="dh02"/>
       <point x="332" y="417"/>
       <point x="356" y="310"/>
       <point x="404" y="237" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/oe.glif b/source/Hack-Regular.ufo/glyphs/oe.glif
index 4949f0daf..ab38e2616 100644
--- a/source/Hack-Regular.ufo/glyphs/oe.glif
+++ b/source/Hack-Regular.ufo/glyphs/oe.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="oe" format="1">
+<glyph name="oe" format="2">
   <advance width="1233"/>
   <unicode hex="0153"/>
   <outline>
     <contour>
-      <point x="369" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="369" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="237" y="-29"/>
       <point x="155" y="21"/>
       <point x="100" y="109" type="curve" smooth="yes"/>
       <point x="40" y="205"/>
       <point x="14" y="347"/>
-      <point x="14" y="558" type="curve" name="dh01" smooth="yes"/>
+      <point x="14" y="558" type="curve" smooth="yes" name="dh01"/>
       <point x="14" y="783"/>
       <point x="45" y="919"/>
       <point x="99" y="1008" type="curve" smooth="yes"/>
       <point x="156" y="1101"/>
       <point x="244" y="1147"/>
-      <point x="373" y="1147" type="curve" name="dv03" smooth="yes"/>
+      <point x="373" y="1147" type="curve" smooth="yes" name="dv03"/>
       <point x="433" y="1147"/>
       <point x="484" y="1137"/>
       <point x="526" y="1116" type="curve" smooth="yes"/>
@@ -25,13 +25,13 @@
       <point x="637" y="1020" type="curve" name="ih01"/>
       <point x="685" y="1101"/>
       <point x="776" y="1147"/>
-      <point x="893" y="1147" type="curve" name="sv01" smooth="yes"/>
+      <point x="893" y="1147" type="curve" smooth="yes" name="sv01"/>
       <point x="1008" y="1147"/>
       <point x="1090" y="1108"/>
       <point x="1138" y="1029" type="curve" smooth="yes"/>
       <point x="1186" y="950"/>
       <point x="1210" y="808"/>
-      <point x="1210" y="604" type="curve" name="dh06" smooth="yes"/>
+      <point x="1210" y="604" type="curve" smooth="yes" name="dh06"/>
       <point x="1210" y="514" type="line" name="dv04"/>
       <point x="719" y="514" type="line" name="dh04"/>
       <point x="719" y="430" type="line" smooth="yes"/>
@@ -40,7 +40,7 @@
       <point x="769" y="195" type="curve" smooth="yes"/>
       <point x="802" y="147"/>
       <point x="852" y="123"/>
-      <point x="932" y="123" type="curve" name="sv02" smooth="yes"/>
+      <point x="932" y="123" type="curve" smooth="yes" name="sv02"/>
       <point x="981" y="123"/>
       <point x="1032" y="131"/>
       <point x="1076" y="150" type="curve" smooth="yes"/>
@@ -53,7 +53,7 @@
       <point x="1067" y="-9" type="curve" smooth="yes"/>
       <point x="1031" y="-21"/>
       <point x="980" y="-29"/>
-      <point x="927" y="-29" type="curve" name="sv03" smooth="yes"/>
+      <point x="927" y="-29" type="curve" smooth="yes" name="sv03"/>
       <point x="798" y="-29"/>
       <point x="703" y="13"/>
       <point x="637" y="104" type="curve" name="ih03"/>
@@ -64,22 +64,22 @@
       <point x="430" y="-29"/>
     </contour>
     <contour>
-      <point x="372" y="123" type="curve" name="dv01" smooth="yes"/>
+      <point x="372" y="123" type="curve" smooth="yes" name="dv01"/>
       <point x="441" y="123"/>
       <point x="489" y="151"/>
       <point x="516" y="207" type="curve" smooth="yes"/>
       <point x="543" y="263"/>
       <point x="557" y="361"/>
-      <point x="557" y="550" type="curve" name="dh03" smooth="yes"/>
+      <point x="557" y="550" type="curve" smooth="yes" name="dh03"/>
       <point x="557" y="912"/>
       <point x="509" y="995"/>
-      <point x="373" y="995" type="curve" name="dv02" smooth="yes"/>
+      <point x="373" y="995" type="curve" smooth="yes" name="dv02"/>
       <point x="300" y="995"/>
       <point x="256" y="965"/>
       <point x="231" y="912" type="curve" smooth="yes"/>
       <point x="205" y="857"/>
       <point x="190" y="762"/>
-      <point x="190" y="558" type="curve" name="dh02" smooth="yes"/>
+      <point x="190" y="558" type="curve" smooth="yes" name="dh02"/>
       <point x="190" y="361"/>
       <point x="204" y="263"/>
       <point x="231" y="207" type="curve" smooth="yes"/>
@@ -93,13 +93,13 @@
       <point x="1049" y="709" type="curve" name="dh05"/>
       <point x="1049" y="912"/>
       <point x="998" y="995"/>
-      <point x="883" y="995" type="curve" name="sv04" smooth="yes"/>
+      <point x="883" y="995" type="curve" smooth="yes" name="sv04"/>
       <point x="825" y="995"/>
       <point x="783" y="972"/>
       <point x="758" y="927" type="curve" smooth="yes"/>
       <point x="732" y="881"/>
       <point x="719" y="805"/>
-      <point x="719" y="700" type="curve" name="sh02" smooth="yes"/>
+      <point x="719" y="700" type="curve" smooth="yes" name="sh02"/>
       <point x="719" y="657" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/ogonek.glif b/source/Hack-Regular.ufo/glyphs/ogonek.glif
index 326f2f342..676780e7e 100644
--- a/source/Hack-Regular.ufo/glyphs/ogonek.glif
+++ b/source/Hack-Regular.ufo/glyphs/ogonek.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ogonek" format="1">
+<glyph name="ogonek" format="2">
   <advance width="1233"/>
   <unicode hex="02DB"/>
   <outline>
@@ -16,7 +16,7 @@
       <point x="587" y="-249" type="curve" smooth="yes"/>
       <point x="606" y="-264"/>
       <point x="633" y="-272"/>
-      <point x="668" y="-272" type="curve" name="dv02" smooth="yes"/>
+      <point x="668" y="-272" type="curve" smooth="yes" name="dv02"/>
       <point x="691" y="-272"/>
       <point x="712" y="-270"/>
       <point x="731" y="-265" type="curve" smooth="yes"/>
@@ -26,16 +26,16 @@
       <point x="793" y="-375" type="line"/>
       <point x="768" y="-382"/>
       <point x="744" y="-387"/>
-      <point x="721" y="-390" type="curve" name="sv01" smooth="yes"/>
+      <point x="721" y="-390" type="curve" smooth="yes" name="sv01"/>
       <point x="698" y="-393"/>
       <point x="677" y="-395"/>
-      <point x="657" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="657" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="575" y="-395"/>
       <point x="515" y="-381"/>
       <point x="478" y="-352" type="curve" smooth="yes"/>
       <point x="439" y="-323"/>
       <point x="420" y="-278"/>
-      <point x="420" y="-215" type="curve" name="dh01" smooth="yes"/>
+      <point x="420" y="-215" type="curve" smooth="yes" name="dh01"/>
       <point x="420" y="-184"/>
       <point x="429" y="-150"/>
       <point x="447" y="-115" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/ograve.glif b/source/Hack-Regular.ufo/glyphs/ograve.glif
index 942daa9be..f7d1297a0 100644
--- a/source/Hack-Regular.ufo/glyphs/ograve.glif
+++ b/source/Hack-Regular.ufo/glyphs/ograve.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ograve" format="1">
+<glyph name="ograve" format="2">
   <advance width="1233"/>
   <unicode hex="00F2"/>
   <outline>
@@ -10,25 +10,25 @@
       <point x="604" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="463" y="-29"/>
       <point x="343" y="21"/>
       <point x="260" y="121" type="curve"/>
       <point x="176" y="225"/>
       <point x="137" y="373"/>
-      <point x="137" y="560" type="curve" name="sh01" smooth="yes"/>
+      <point x="137" y="560" type="curve" smooth="yes" name="sh01"/>
       <point x="137" y="749"/>
       <point x="178" y="895"/>
       <point x="260" y="996" type="curve" smooth="yes"/>
       <point x="342" y="1097"/>
       <point x="461" y="1147"/>
-      <point x="616" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="776" y="1147"/>
       <point x="893" y="1095"/>
       <point x="973" y="996" type="curve" smooth="yes"/>
       <point x="1055" y="895"/>
       <point x="1096" y="750"/>
-      <point x="1096" y="561" type="curve" name="sh03" smooth="yes"/>
+      <point x="1096" y="561" type="curve" smooth="yes" name="sh03"/>
       <point x="1096" y="370"/>
       <point x="1056" y="221"/>
       <point x="973" y="121" type="curve" smooth="yes"/>
@@ -36,25 +36,25 @@
       <point x="773" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="127"/>
       <point x="781" y="164"/>
       <point x="829" y="237" type="curve" smooth="yes"/>
       <point x="877" y="310"/>
       <point x="901" y="417"/>
-      <point x="901" y="559" type="curve" name="ah01" smooth="yes"/>
+      <point x="901" y="559" type="curve" smooth="yes" name="ah01"/>
       <point x="901" y="701"/>
       <point x="877" y="809"/>
       <point x="829" y="882" type="curve" smooth="yes"/>
       <point x="781" y="955"/>
       <point x="710" y="991"/>
-      <point x="616" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="523" y="991"/>
       <point x="452" y="955"/>
       <point x="404" y="882" type="curve" smooth="yes"/>
       <point x="356" y="809"/>
       <point x="332" y="701"/>
-      <point x="332" y="559" type="curve" name="sh02" smooth="yes"/>
+      <point x="332" y="559" type="curve" smooth="yes" name="sh02"/>
       <point x="332" y="417"/>
       <point x="356" y="310"/>
       <point x="404" y="237" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/ohorn.glif b/source/Hack-Regular.ufo/glyphs/ohorn.glif
index de6c7c6ad..af81bfc66 100644
--- a/source/Hack-Regular.ufo/glyphs/ohorn.glif
+++ b/source/Hack-Regular.ufo/glyphs/ohorn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ohorn" format="1">
+<glyph name="ohorn" format="2">
   <advance width="1233"/>
   <unicode hex="01A1"/>
   <outline>
@@ -7,49 +7,49 @@
       <point x="1182" y="1137" type="line" name="at01"/>
       <point x="1197" y="1081"/>
       <point x="1202" y="1043"/>
-      <point x="1202" y="994" type="curve" name="dh06" smooth="yes"/>
+      <point x="1202" y="994" type="curve" smooth="yes" name="dh06"/>
       <point x="1202" y="845"/>
       <point x="1147" y="764"/>
-      <point x="1028" y="764" type="curve" name="dv02" smooth="yes"/>
+      <point x="1028" y="764" type="curve" smooth="yes" name="dv02"/>
       <point x="1008" y="764"/>
       <point x="989" y="765"/>
       <point x="970" y="772" type="curve" name="ih01"/>
       <point x="984" y="708"/>
       <point x="991" y="637"/>
-      <point x="991" y="558" type="curve" name="dh04" smooth="yes"/>
+      <point x="991" y="558" type="curve" smooth="yes" name="dh04"/>
       <point x="991" y="177"/>
       <point x="823" y="-29"/>
-      <point x="511" y="-29" type="curve" name="hr01" smooth="yes"/>
+      <point x="511" y="-29" type="curve" smooth="yes" name="hr01"/>
       <point x="198" y="-29"/>
       <point x="32" y="174"/>
-      <point x="32" y="558" type="curve" name="dh01" smooth="yes"/>
+      <point x="32" y="558" type="curve" smooth="yes" name="dh01"/>
       <point x="32" y="939"/>
       <point x="200" y="1147"/>
-      <point x="511" y="1147" type="curve" name="at02" smooth="yes"/>
+      <point x="511" y="1147" type="curve" smooth="yes" name="at02"/>
       <point x="702" y="1147"/>
       <point x="837" y="1071"/>
       <point x="916" y="922" type="curve"/>
       <point x="944" y="909"/>
       <point x="969" y="903"/>
-      <point x="991" y="903" type="curve" name="hr02" smooth="yes"/>
+      <point x="991" y="903" type="curve" smooth="yes" name="hr02"/>
       <point x="1047" y="903"/>
       <point x="1079" y="941"/>
-      <point x="1079" y="1013" type="curve" name="dh05" smooth="yes"/>
+      <point x="1079" y="1013" type="curve" smooth="yes" name="dh05"/>
       <point x="1079" y="1054"/>
       <point x="1069" y="1096"/>
       <point x="1049" y="1137" type="curve" name="ih02"/>
     </contour>
     <contour>
-      <point x="511" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="511" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="700" y="127"/>
       <point x="796" y="274"/>
-      <point x="796" y="559" type="curve" name="dh03" smooth="yes"/>
+      <point x="796" y="559" type="curve" smooth="yes" name="dh03"/>
       <point x="796" y="846"/>
       <point x="700" y="991"/>
-      <point x="511" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="511" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="323" y="991"/>
       <point x="227" y="846"/>
-      <point x="227" y="559" type="curve" name="dh02" smooth="yes"/>
+      <point x="227" y="559" type="curve" smooth="yes" name="dh02"/>
       <point x="227" y="274"/>
       <point x="323" y="127"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/ohungarumlaut.glif b/source/Hack-Regular.ufo/glyphs/ohungarumlaut.glif
index 770bd2a5a..8b236a2f8 100644
--- a/source/Hack-Regular.ufo/glyphs/ohungarumlaut.glif
+++ b/source/Hack-Regular.ufo/glyphs/ohungarumlaut.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ohungarumlaut" format="1">
+<glyph name="ohungarumlaut" format="2">
   <advance width="1233"/>
   <unicode hex="0151"/>
   <outline>
@@ -16,30 +16,30 @@
       <point x="664" y="1297" type="line" name="ih03"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="303" y="-29"/>
       <point x="137" y="174"/>
-      <point x="137" y="558" type="curve" name="sh01" smooth="yes"/>
+      <point x="137" y="558" type="curve" smooth="yes" name="sh01"/>
       <point x="137" y="939"/>
       <point x="305" y="1147"/>
-      <point x="616" y="1147" type="curve" name="dv05" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="dv05"/>
       <point x="927" y="1147"/>
       <point x="1096" y="939"/>
-      <point x="1096" y="558" type="curve" name="sh02" smooth="yes"/>
+      <point x="1096" y="558" type="curve" smooth="yes" name="sh02"/>
       <point x="1096" y="177"/>
       <point x="928" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="805" y="127"/>
       <point x="901" y="274"/>
-      <point x="901" y="559" type="curve" name="ah01" smooth="yes"/>
+      <point x="901" y="559" type="curve" smooth="yes" name="ah01"/>
       <point x="901" y="846"/>
       <point x="805" y="991"/>
-      <point x="616" y="991" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="991" type="curve" smooth="yes" name="dv04"/>
       <point x="428" y="991"/>
       <point x="332" y="846"/>
-      <point x="332" y="559" type="curve" name="sh03" smooth="yes"/>
+      <point x="332" y="559" type="curve" smooth="yes" name="sh03"/>
       <point x="332" y="274"/>
       <point x="428" y="127"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/omacron.glif b/source/Hack-Regular.ufo/glyphs/omacron.glif
index 045089a1b..d9168868a 100644
--- a/source/Hack-Regular.ufo/glyphs/omacron.glif
+++ b/source/Hack-Regular.ufo/glyphs/omacron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="omacron" format="1">
+<glyph name="omacron" format="2">
   <advance width="1233"/>
   <unicode hex="014D"/>
   <outline>
@@ -10,30 +10,30 @@
       <point x="317" y="1347" type="line"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="303" y="-29"/>
       <point x="137" y="174"/>
-      <point x="137" y="558" type="curve" name="sh02" smooth="yes"/>
+      <point x="137" y="558" type="curve" smooth="yes" name="sh02"/>
       <point x="137" y="939"/>
       <point x="305" y="1147"/>
-      <point x="616" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="927" y="1147"/>
       <point x="1096" y="939"/>
-      <point x="1096" y="558" type="curve" name="sh03" smooth="yes"/>
+      <point x="1096" y="558" type="curve" smooth="yes" name="sh03"/>
       <point x="1096" y="177"/>
       <point x="928" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="805" y="127"/>
       <point x="901" y="274"/>
-      <point x="901" y="559" type="curve" name="ah01" smooth="yes"/>
+      <point x="901" y="559" type="curve" smooth="yes" name="ah01"/>
       <point x="901" y="846"/>
       <point x="805" y="991"/>
-      <point x="616" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="428" y="991"/>
       <point x="332" y="846"/>
-      <point x="332" y="559" type="curve" name="sh04" smooth="yes"/>
+      <point x="332" y="559" type="curve" smooth="yes" name="sh04"/>
       <point x="332" y="274"/>
       <point x="428" y="127"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/omega.glif b/source/Hack-Regular.ufo/glyphs/omega.glif
index 4574718ff..fea9bcb71 100644
--- a/source/Hack-Regular.ufo/glyphs/omega.glif
+++ b/source/Hack-Regular.ufo/glyphs/omega.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="omega" format="1">
+<glyph name="omega" format="2">
   <advance width="1233"/>
   <unicode hex="03C9"/>
   <outline>
     <contour>
-      <point x="369" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="369" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="147" y="-29"/>
       <point x="70" y="183"/>
-      <point x="70" y="531" type="curve" name="sh01" smooth="yes"/>
+      <point x="70" y="531" type="curve" smooth="yes" name="sh01"/>
       <point x="70" y="763"/>
       <point x="105" y="917"/>
       <point x="201" y="1120" type="curve" name="at01"/>
       <point x="391" y="1120" type="line" name="ih01"/>
       <point x="300" y="915"/>
       <point x="265" y="755"/>
-      <point x="265" y="512" type="curve" name="sh03" smooth="yes"/>
+      <point x="265" y="512" type="curve" smooth="yes" name="sh03"/>
       <point x="265" y="255"/>
       <point x="303" y="127"/>
-      <point x="390" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="390" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="439" y="127"/>
       <point x="487" y="168"/>
       <point x="507" y="240" type="curve" smooth="yes"/>
@@ -30,13 +30,13 @@
       <point x="728" y="241" type="curve"/>
       <point x="747" y="170"/>
       <point x="787" y="127"/>
-      <point x="832" y="127" type="curve" name="sv01" smooth="yes"/>
+      <point x="832" y="127" type="curve" smooth="yes" name="sv01"/>
       <point x="891" y="127"/>
       <point x="934" y="199"/>
       <point x="952" y="270" type="curve"/>
       <point x="960" y="308"/>
       <point x="969" y="363"/>
-      <point x="969" y="526" type="curve" name="sh05" smooth="yes"/>
+      <point x="969" y="526" type="curve" smooth="yes" name="sh05"/>
       <point x="969" y="558" type="line" smooth="yes"/>
       <point x="969" y="749"/>
       <point x="927" y="937"/>
@@ -44,10 +44,10 @@
       <point x="1033" y="1120" type="line"/>
       <point x="1129" y="917"/>
       <point x="1164" y="763"/>
-      <point x="1164" y="531" type="curve" name="sh06" smooth="yes"/>
+      <point x="1164" y="531" type="curve" smooth="yes" name="sh06"/>
       <point x="1164" y="183"/>
       <point x="1086" y="-29"/>
-      <point x="865" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="865" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="728" y="-29"/>
       <point x="646" y="51"/>
       <point x="617" y="150" type="curve" name="ih03"/>
diff --git a/source/Hack-Regular.ufo/glyphs/omegatonos.glif b/source/Hack-Regular.ufo/glyphs/omegatonos.glif
index 209216bfb..15f3ec8d1 100644
--- a/source/Hack-Regular.ufo/glyphs/omegatonos.glif
+++ b/source/Hack-Regular.ufo/glyphs/omegatonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="omegatonos" format="1">
+<glyph name="omegatonos" format="2">
   <advance width="1233"/>
   <unicode hex="03CE"/>
   <outline>
@@ -10,20 +10,20 @@
       <point x="475" y="1272" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="369" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="369" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="147" y="-29"/>
       <point x="70" y="183"/>
-      <point x="70" y="531" type="curve" name="sh01" smooth="yes"/>
+      <point x="70" y="531" type="curve" smooth="yes" name="sh01"/>
       <point x="70" y="763"/>
       <point x="105" y="917"/>
       <point x="201" y="1120" type="curve" name="at01"/>
       <point x="391" y="1120" type="line" name="ih03"/>
       <point x="300" y="915"/>
       <point x="265" y="755"/>
-      <point x="265" y="512" type="curve" name="sh04" smooth="yes"/>
+      <point x="265" y="512" type="curve" smooth="yes" name="sh04"/>
       <point x="265" y="255"/>
       <point x="303" y="127"/>
-      <point x="390" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="390" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="439" y="127"/>
       <point x="487" y="168"/>
       <point x="507" y="240" type="curve" smooth="yes"/>
@@ -36,13 +36,13 @@
       <point x="728" y="241" type="curve"/>
       <point x="747" y="170"/>
       <point x="787" y="127"/>
-      <point x="832" y="127" type="curve" name="sv01" smooth="yes"/>
+      <point x="832" y="127" type="curve" smooth="yes" name="sv01"/>
       <point x="891" y="127"/>
       <point x="934" y="199"/>
       <point x="952" y="270" type="curve"/>
       <point x="960" y="308"/>
       <point x="969" y="363"/>
-      <point x="969" y="526" type="curve" name="sh03" smooth="yes"/>
+      <point x="969" y="526" type="curve" smooth="yes" name="sh03"/>
       <point x="969" y="558" type="line" smooth="yes"/>
       <point x="969" y="749"/>
       <point x="927" y="937"/>
@@ -50,10 +50,10 @@
       <point x="1033" y="1120" type="line"/>
       <point x="1129" y="917"/>
       <point x="1164" y="763"/>
-      <point x="1164" y="531" type="curve" name="sh06" smooth="yes"/>
+      <point x="1164" y="531" type="curve" smooth="yes" name="sh06"/>
       <point x="1164" y="183"/>
       <point x="1086" y="-29"/>
-      <point x="865" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="865" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="728" y="-29"/>
       <point x="646" y="51"/>
       <point x="617" y="150" type="curve" name="ih05"/>
diff --git a/source/Hack-Regular.ufo/glyphs/omicron.glif b/source/Hack-Regular.ufo/glyphs/omicron.glif
index 62b9415b5..219a75556 100644
--- a/source/Hack-Regular.ufo/glyphs/omicron.glif
+++ b/source/Hack-Regular.ufo/glyphs/omicron.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="omicron" format="1">
+<glyph name="omicron" format="2">
   <advance width="1233"/>
   <unicode hex="03BF"/>
   <outline>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="303" y="-29"/>
       <point x="137" y="174"/>
-      <point x="137" y="558" type="curve" name="sh01" smooth="yes"/>
+      <point x="137" y="558" type="curve" smooth="yes" name="sh01"/>
       <point x="137" y="939"/>
       <point x="305" y="1147"/>
-      <point x="616" y="1147" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="dv03"/>
       <point x="927" y="1147"/>
       <point x="1096" y="939"/>
-      <point x="1096" y="558" type="curve" name="sh02" smooth="yes"/>
+      <point x="1096" y="558" type="curve" smooth="yes" name="sh02"/>
       <point x="1096" y="177"/>
       <point x="928" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="805" y="127"/>
       <point x="901" y="274"/>
-      <point x="901" y="559" type="curve" name="ah01" smooth="yes"/>
+      <point x="901" y="559" type="curve" smooth="yes" name="ah01"/>
       <point x="901" y="846"/>
       <point x="805" y="991"/>
-      <point x="616" y="991" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="991" type="curve" smooth="yes" name="dv02"/>
       <point x="428" y="991"/>
       <point x="332" y="846"/>
-      <point x="332" y="559" type="curve" name="sh03" smooth="yes"/>
+      <point x="332" y="559" type="curve" smooth="yes" name="sh03"/>
       <point x="332" y="274"/>
       <point x="428" y="127"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/omicrontonos.glif b/source/Hack-Regular.ufo/glyphs/omicrontonos.glif
index 562225056..7f146c547 100644
--- a/source/Hack-Regular.ufo/glyphs/omicrontonos.glif
+++ b/source/Hack-Regular.ufo/glyphs/omicrontonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="omicrontonos" format="1">
+<glyph name="omicrontonos" format="2">
   <advance width="1233"/>
   <unicode hex="03CC"/>
   <outline>
@@ -10,30 +10,30 @@
       <point x="475" y="1299" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="303" y="-29"/>
       <point x="137" y="174"/>
-      <point x="137" y="558" type="curve" name="sh02" smooth="yes"/>
+      <point x="137" y="558" type="curve" smooth="yes" name="sh02"/>
       <point x="137" y="939"/>
       <point x="305" y="1147"/>
-      <point x="616" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="927" y="1147"/>
       <point x="1096" y="939"/>
-      <point x="1096" y="558" type="curve" name="sh01" smooth="yes"/>
+      <point x="1096" y="558" type="curve" smooth="yes" name="sh01"/>
       <point x="1096" y="177"/>
       <point x="928" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="805" y="127"/>
       <point x="901" y="274"/>
-      <point x="901" y="559" type="curve" name="ah01" smooth="yes"/>
+      <point x="901" y="559" type="curve" smooth="yes" name="ah01"/>
       <point x="901" y="846"/>
       <point x="805" y="991"/>
-      <point x="616" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="428" y="991"/>
       <point x="332" y="846"/>
-      <point x="332" y="559" type="curve" name="sh03" smooth="yes"/>
+      <point x="332" y="559" type="curve" smooth="yes" name="sh03"/>
       <point x="332" y="274"/>
       <point x="428" y="127"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/one.glif b/source/Hack-Regular.ufo/glyphs/one.glif
index 9908226b7..70986e5b9 100644
--- a/source/Hack-Regular.ufo/glyphs/one.glif
+++ b/source/Hack-Regular.ufo/glyphs/one.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="one" format="1">
+<glyph name="one" format="2">
   <advance width="1233"/>
   <unicode hex="0031"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/one.subs.glif b/source/Hack-Regular.ufo/glyphs/one.subs.glif
index 69bd71f14..cbf56a81b 100644
--- a/source/Hack-Regular.ufo/glyphs/one.subs.glif
+++ b/source/Hack-Regular.ufo/glyphs/one.subs.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="one.subs" format="1">
+<glyph name="one.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Regular.ufo/glyphs/onedotenleader.glif b/source/Hack-Regular.ufo/glyphs/onedotenleader.glif
index 4279e27eb..442696ebc 100644
--- a/source/Hack-Regular.ufo/glyphs/onedotenleader.glif
+++ b/source/Hack-Regular.ufo/glyphs/onedotenleader.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="onedotenleader" format="1">
+<glyph name="onedotenleader" format="2">
   <advance width="1233"/>
   <unicode hex="2024"/>
   <outline>
     <contour>
-      <point x="519" y="0" type="line" name="ab01" smooth="yes"/>
+      <point x="519" y="0" type="line" smooth="yes" name="ab01"/>
       <point x="499" y="0"/>
       <point x="489" y="10"/>
-      <point x="489" y="30" type="curve" name="dh03" smooth="yes"/>
+      <point x="489" y="30" type="curve" smooth="yes" name="dh03"/>
       <point x="489" y="275" type="line" smooth="yes"/>
       <point x="489" y="295"/>
       <point x="499" y="305"/>
-      <point x="519" y="305" type="curve" name="sv02" smooth="yes"/>
-      <point x="711" y="305" type="line" name="sv03" smooth="yes"/>
+      <point x="519" y="305" type="curve" smooth="yes" name="sv02"/>
+      <point x="711" y="305" type="line" smooth="yes" name="sv03"/>
       <point x="731" y="305"/>
       <point x="741" y="295"/>
       <point x="741" y="275" type="curve" smooth="yes"/>
-      <point x="741" y="30" type="line" name="dh04" smooth="yes"/>
+      <point x="741" y="30" type="line" smooth="yes" name="dh04"/>
       <point x="741" y="10"/>
       <point x="731" y="0"/>
       <point x="711" y="0" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/oneeighth.glif b/source/Hack-Regular.ufo/glyphs/oneeighth.glif
index 58b1cb9a0..39108fecf 100644
--- a/source/Hack-Regular.ufo/glyphs/oneeighth.glif
+++ b/source/Hack-Regular.ufo/glyphs/oneeighth.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="oneeighth" format="1">
+<glyph name="oneeighth" format="2">
   <advance width="1233"/>
   <unicode hex="215B"/>
   <outline>
@@ -23,7 +23,7 @@
       <point x="51" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="817" y="-286" type="curve" name="dv01" smooth="yes"/>
+      <point x="817" y="-286" type="curve" smooth="yes" name="dv01"/>
       <point x="629" y="-286"/>
       <point x="516" y="-196"/>
       <point x="516" y="-47" type="curve" smooth="yes"/>
@@ -32,10 +32,10 @@
       <point x="708" y="174" type="curve" name="ih01"/>
       <point x="600" y="198"/>
       <point x="538" y="268"/>
-      <point x="538" y="364" type="curve" name="dh03" smooth="yes"/>
+      <point x="538" y="364" type="curve" smooth="yes" name="dh03"/>
       <point x="538" y="496"/>
       <point x="645" y="580"/>
-      <point x="817" y="580" type="curve" name="dv06" smooth="yes"/>
+      <point x="817" y="580" type="curve" smooth="yes" name="dv06"/>
       <point x="990" y="580"/>
       <point x="1097" y="496"/>
       <point x="1097" y="364" type="curve" smooth="yes"/>
@@ -44,32 +44,32 @@
       <point x="927" y="174" type="curve" name="ih02"/>
       <point x="1052" y="149"/>
       <point x="1119" y="74"/>
-      <point x="1119" y="-46" type="curve" name="dh06" smooth="yes"/>
+      <point x="1119" y="-46" type="curve" smooth="yes" name="dh06"/>
       <point x="1119" y="-197"/>
       <point x="1006" y="-286"/>
     </contour>
     <contour>
-      <point x="817" y="215" type="curve" name="dv04" smooth="yes"/>
+      <point x="817" y="215" type="curve" smooth="yes" name="dv04"/>
       <point x="918" y="215"/>
       <point x="972" y="264"/>
-      <point x="972" y="353" type="curve" name="dh05" smooth="yes"/>
+      <point x="972" y="353" type="curve" smooth="yes" name="dh05"/>
       <point x="972" y="445"/>
       <point x="921" y="493"/>
-      <point x="817" y="493" type="curve" name="dv05" smooth="yes"/>
+      <point x="817" y="493" type="curve" smooth="yes" name="dv05"/>
       <point x="717" y="493"/>
       <point x="663" y="445"/>
-      <point x="663" y="353" type="curve" name="dh04" smooth="yes"/>
+      <point x="663" y="353" type="curve" smooth="yes" name="dh04"/>
       <point x="663" y="264"/>
       <point x="717" y="215"/>
     </contour>
     <contour>
-      <point x="817" y="-198" type="curve" name="dv02" smooth="yes"/>
+      <point x="817" y="-198" type="curve" smooth="yes" name="dv02"/>
       <point x="930" y="-198"/>
       <point x="993" y="-139"/>
       <point x="993" y="-35" type="curve" smooth="yes"/>
       <point x="993" y="69"/>
       <point x="929" y="127"/>
-      <point x="817" y="127" type="curve" name="dv03" smooth="yes"/>
+      <point x="817" y="127" type="curve" smooth="yes" name="dv03"/>
       <point x="704" y="127"/>
       <point x="642" y="69"/>
       <point x="642" y="-35" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/onehalf.glif b/source/Hack-Regular.ufo/glyphs/onehalf.glif
index 816a0be96..8f3079bef 100644
--- a/source/Hack-Regular.ufo/glyphs/onehalf.glif
+++ b/source/Hack-Regular.ufo/glyphs/onehalf.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="onehalf" format="1">
+<glyph name="onehalf" format="2">
   <advance width="1233"/>
   <unicode hex="00BD"/>
   <outline>
@@ -30,10 +30,10 @@
       <point x="896" y="224" type="curve" smooth="yes"/>
       <point x="923" y="265"/>
       <point x="936" y="302"/>
-      <point x="936" y="337" type="curve" name="dh03" smooth="yes"/>
+      <point x="936" y="337" type="curve" smooth="yes" name="dh03"/>
       <point x="936" y="417"/>
       <point x="863" y="473"/>
-      <point x="756" y="473" type="curve" name="dv02" smooth="yes"/>
+      <point x="756" y="473" type="curve" smooth="yes" name="dv02"/>
       <point x="721" y="473"/>
       <point x="686" y="467"/>
       <point x="649" y="455" type="curve" smooth="yes"/>
@@ -46,13 +46,13 @@
       <point x="655" y="568" type="curve" smooth="yes"/>
       <point x="695" y="577"/>
       <point x="734" y="582"/>
-      <point x="777" y="582" type="curve" name="dv03" smooth="yes"/>
+      <point x="777" y="582" type="curve" smooth="yes" name="dv03"/>
       <point x="870" y="582"/>
       <point x="945" y="560"/>
       <point x="1002" y="516" type="curve" smooth="yes"/>
       <point x="1061" y="471"/>
       <point x="1088" y="411"/>
-      <point x="1088" y="344" type="curve" name="sh02" smooth="yes"/>
+      <point x="1088" y="344" type="curve" smooth="yes" name="sh02"/>
       <point x="1088" y="297"/>
       <point x="1074" y="263"/>
       <point x="1051" y="227" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/onequarter.glif b/source/Hack-Regular.ufo/glyphs/onequarter.glif
index 5d993cbf3..a160b3c86 100644
--- a/source/Hack-Regular.ufo/glyphs/onequarter.glif
+++ b/source/Hack-Regular.ufo/glyphs/onequarter.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="onequarter" format="1">
+<glyph name="onequarter" format="2">
   <advance width="1233"/>
   <unicode hex="00BC"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/openbullet.glif b/source/Hack-Regular.ufo/glyphs/openbullet.glif
index a865861d3..a5a69714a 100644
--- a/source/Hack-Regular.ufo/glyphs/openbullet.glif
+++ b/source/Hack-Regular.ufo/glyphs/openbullet.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="openbullet" format="1">
+<glyph name="openbullet" format="2">
   <advance width="1233"/>
   <unicode hex="25E6"/>
   <outline>
     <contour>
-      <point x="614" y="465" type="curve" name="hr00" smooth="yes"/>
+      <point x="614" y="465" type="curve" smooth="yes" name="hr00"/>
       <point x="449" y="465"/>
       <point x="319" y="596"/>
-      <point x="319" y="761" type="curve" name="sh01" smooth="yes"/>
+      <point x="319" y="761" type="curve" smooth="yes" name="sh01"/>
       <point x="319" y="926"/>
       <point x="450" y="1057"/>
-      <point x="615" y="1057" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1057" type="curve" smooth="yes" name="dv03"/>
       <point x="782" y="1057"/>
       <point x="913" y="926"/>
-      <point x="913" y="762" type="curve" name="sh02" smooth="yes"/>
+      <point x="913" y="762" type="curve" smooth="yes" name="sh02"/>
       <point x="913" y="597"/>
       <point x="782" y="465"/>
     </contour>
     <contour>
-      <point x="614" y="524" type="curve" name="dv01" smooth="yes"/>
+      <point x="614" y="524" type="curve" smooth="yes" name="dv01"/>
       <point x="746" y="524"/>
       <point x="854" y="630"/>
-      <point x="854" y="762" type="curve" name="ah01" smooth="yes"/>
+      <point x="854" y="762" type="curve" smooth="yes" name="ah01"/>
       <point x="854" y="893"/>
       <point x="748" y="998"/>
-      <point x="615" y="998" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="998" type="curve" smooth="yes" name="dv02"/>
       <point x="483" y="998"/>
       <point x="378" y="893"/>
-      <point x="378" y="761" type="curve" name="sh03" smooth="yes"/>
+      <point x="378" y="761" type="curve" smooth="yes" name="sh03"/>
       <point x="378" y="629"/>
       <point x="482" y="524"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/ordfeminine.glif b/source/Hack-Regular.ufo/glyphs/ordfeminine.glif
index 77f7d3b85..fe3f10201 100644
--- a/source/Hack-Regular.ufo/glyphs/ordfeminine.glif
+++ b/source/Hack-Regular.ufo/glyphs/ordfeminine.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ordfeminine" format="1">
+<glyph name="ordfeminine" format="2">
   <advance width="1233"/>
   <unicode hex="00AA"/>
   <outline>
     <contour>
-      <point x="547" y="698" type="curve" name="hr00" smooth="yes"/>
+      <point x="547" y="698" type="curve" smooth="yes" name="hr00"/>
       <point x="463" y="698"/>
       <point x="396" y="721"/>
       <point x="345" y="766" type="curve" smooth="yes"/>
       <point x="295" y="811"/>
       <point x="270" y="872"/>
-      <point x="270" y="949" type="curve" name="sh01" smooth="yes"/>
+      <point x="270" y="949" type="curve" smooth="yes" name="sh01"/>
       <point x="270" y="1035"/>
       <point x="301" y="1102"/>
       <point x="363" y="1149" type="curve" smooth="yes"/>
@@ -24,7 +24,7 @@
       <point x="751" y="1359" type="curve" smooth="yes"/>
       <point x="704" y="1394"/>
       <point x="643" y="1405"/>
-      <point x="583" y="1405" type="curve" name="sv01" smooth="yes"/>
+      <point x="583" y="1405" type="curve" smooth="yes" name="sv01"/>
       <point x="539" y="1405"/>
       <point x="501" y="1399"/>
       <point x="462" y="1388" type="curve" smooth="yes"/>
@@ -34,16 +34,16 @@
       <point x="332" y="1464" type="line"/>
       <point x="377" y="1483"/>
       <point x="427" y="1498"/>
-      <point x="468" y="1506" type="curve" name="at01" smooth="yes"/>
+      <point x="468" y="1506" type="curve" smooth="yes" name="at01"/>
       <point x="513" y="1515"/>
       <point x="552" y="1520"/>
-      <point x="603" y="1520" type="curve" name="at02" smooth="yes"/>
+      <point x="603" y="1520" type="curve" smooth="yes" name="at02"/>
       <point x="721" y="1520"/>
       <point x="809" y="1491"/>
       <point x="867" y="1434" type="curve" smooth="yes"/>
       <point x="926" y="1377"/>
       <point x="954" y="1290"/>
-      <point x="954" y="1165" type="curve" name="sh03" smooth="yes"/>
+      <point x="954" y="1165" type="curve" smooth="yes" name="sh03"/>
       <point x="954" y="717" type="line"/>
       <point x="825" y="717" type="line" name="sh04"/>
       <point x="811" y="829" type="line"/>
@@ -54,13 +54,13 @@
       <point x="606" y="698"/>
     </contour>
     <contour>
-      <point x="576" y="817" type="curve" name="dv02" smooth="yes"/>
+      <point x="576" y="817" type="curve" smooth="yes" name="dv02"/>
       <point x="648" y="817"/>
       <point x="703" y="842"/>
       <point x="746" y="889" type="curve" smooth="yes"/>
       <point x="789" y="936"/>
       <point x="811" y="998"/>
-      <point x="811" y="1075" type="curve" name="sh05" smooth="yes"/>
+      <point x="811" y="1075" type="curve" smooth="yes" name="sh05"/>
       <point x="811" y="1104" type="line" name="dv03"/>
       <point x="684" y="1104" type="line" smooth="yes"/>
       <point x="587" y="1104"/>
@@ -68,7 +68,7 @@
       <point x="478" y="1070" type="curve" smooth="yes"/>
       <point x="437" y="1047"/>
       <point x="416" y="1009"/>
-      <point x="416" y="958" type="curve" name="sh02" smooth="yes"/>
+      <point x="416" y="958" type="curve" smooth="yes" name="sh02"/>
       <point x="416" y="910"/>
       <point x="433" y="879"/>
       <point x="460" y="856" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/ordmasculine.glif b/source/Hack-Regular.ufo/glyphs/ordmasculine.glif
index d1a5c8510..a67d2b279 100644
--- a/source/Hack-Regular.ufo/glyphs/ordmasculine.glif
+++ b/source/Hack-Regular.ufo/glyphs/ordmasculine.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ordmasculine" format="1">
+<glyph name="ordmasculine" format="2">
   <advance width="1233"/>
   <unicode hex="00BA"/>
   <outline>
     <contour>
-      <point x="616" y="698" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="698" type="curve" smooth="yes" name="hr00"/>
       <point x="491" y="698"/>
       <point x="405" y="744"/>
       <point x="345" y="809" type="curve" smooth="yes"/>
       <point x="282" y="877"/>
       <point x="244" y="977"/>
-      <point x="244" y="1108" type="curve" name="sh01" smooth="yes"/>
+      <point x="244" y="1108" type="curve" smooth="yes" name="sh01"/>
       <point x="244" y="1231"/>
       <point x="277" y="1332"/>
       <point x="345" y="1408" type="curve" smooth="yes"/>
       <point x="408" y="1477"/>
       <point x="496" y="1520"/>
-      <point x="617" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="617" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="737" y="1520"/>
       <point x="826" y="1478"/>
       <point x="889" y="1407" type="curve" smooth="yes"/>
       <point x="956" y="1332"/>
       <point x="989" y="1233"/>
-      <point x="989" y="1108" type="curve" name="sh02" smooth="yes"/>
+      <point x="989" y="1108" type="curve" smooth="yes" name="sh02"/>
       <point x="989" y="984"/>
       <point x="956" y="885"/>
       <point x="889" y="810" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="737" y="698"/>
     </contour>
     <contour>
-      <point x="616" y="815" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="815" type="curve" smooth="yes" name="dv03"/>
       <point x="681" y="815"/>
       <point x="737" y="841"/>
       <point x="776" y="893" type="curve" smooth="yes"/>
       <point x="812" y="941"/>
       <point x="834" y="1013"/>
-      <point x="834" y="1110" type="curve" name="ah01" smooth="yes"/>
+      <point x="834" y="1110" type="curve" smooth="yes" name="ah01"/>
       <point x="834" y="1201"/>
       <point x="815" y="1273"/>
       <point x="777" y="1325" type="curve" smooth="yes"/>
       <point x="741" y="1374"/>
       <point x="689" y="1403"/>
-      <point x="617" y="1403" type="curve" name="sv01" smooth="yes"/>
+      <point x="617" y="1403" type="curve" smooth="yes" name="sv01"/>
       <point x="548" y="1403"/>
       <point x="495" y="1377"/>
       <point x="457" y="1326" type="curve" smooth="yes"/>
       <point x="418" y="1273"/>
       <point x="399" y="1201"/>
-      <point x="399" y="1108" type="curve" name="sh03" smooth="yes"/>
+      <point x="399" y="1108" type="curve" smooth="yes" name="sh03"/>
       <point x="399" y="1016"/>
       <point x="418" y="943"/>
       <point x="457" y="891" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/orthogonal.glif b/source/Hack-Regular.ufo/glyphs/orthogonal.glif
index c52bf58bd..f94efeca9 100644
--- a/source/Hack-Regular.ufo/glyphs/orthogonal.glif
+++ b/source/Hack-Regular.ufo/glyphs/orthogonal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="orthogonal" format="1">
+<glyph name="orthogonal" format="2">
   <advance width="1233"/>
   <unicode hex="221F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/oslash.glif b/source/Hack-Regular.ufo/glyphs/oslash.glif
index 5b2590bbb..325fefbde 100644
--- a/source/Hack-Regular.ufo/glyphs/oslash.glif
+++ b/source/Hack-Regular.ufo/glyphs/oslash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="oslash" format="1">
+<glyph name="oslash" format="2">
   <advance width="1233"/>
   <unicode hex="00F8"/>
   <outline>
@@ -11,13 +11,13 @@
       <point x="158" y="349" type="curve" smooth="yes"/>
       <point x="143" y="417"/>
       <point x="137" y="480"/>
-      <point x="137" y="559" type="curve" name="sh01" smooth="yes"/>
+      <point x="137" y="559" type="curve" smooth="yes" name="sh01"/>
       <point x="137" y="749"/>
       <point x="178" y="895"/>
       <point x="260" y="996" type="curve" smooth="yes"/>
       <point x="342" y="1097"/>
       <point x="460" y="1147"/>
-      <point x="615" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="615" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="680" y="1147"/>
       <point x="744" y="1139"/>
       <point x="795" y="1120" type="curve" smooth="yes"/>
@@ -32,13 +32,13 @@
       <point x="1074" y="778" type="curve" smooth="yes"/>
       <point x="1089" y="713"/>
       <point x="1096" y="640"/>
-      <point x="1096" y="561" type="curve" name="sh02" smooth="yes"/>
+      <point x="1096" y="561" type="curve" smooth="yes" name="sh02"/>
       <point x="1096" y="370"/>
       <point x="1056" y="221"/>
       <point x="973" y="121" type="curve" smooth="yes"/>
       <point x="891" y="21"/>
       <point x="772" y="-29"/>
-      <point x="615" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="542" y="-29"/>
       <point x="486" y="-18"/>
       <point x="435" y="1" type="curve" smooth="yes"/>
@@ -54,31 +54,31 @@
       <point x="733" y="968" type="curve" smooth="yes"/>
       <point x="699" y="983"/>
       <point x="660" y="991"/>
-      <point x="616" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="523" y="991"/>
       <point x="452" y="955"/>
       <point x="403" y="884" type="curve" smooth="yes"/>
       <point x="355" y="815"/>
       <point x="328" y="716"/>
-      <point x="328" y="579" type="curve" name="sh04" smooth="yes"/>
+      <point x="328" y="579" type="curve" smooth="yes" name="sh04"/>
       <point x="328" y="542"/>
       <point x="330" y="508"/>
-      <point x="335" y="469" type="curve" name="sh05" smooth="yes"/>
+      <point x="335" y="469" type="curve" smooth="yes" name="sh05"/>
       <point x="340" y="430"/>
       <point x="347" y="387"/>
       <point x="356" y="340" type="curve" name="ih01"/>
     </contour>
     <contour>
-      <point x="615" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="127"/>
       <point x="781" y="164"/>
       <point x="829" y="237" type="curve" smooth="yes"/>
       <point x="877" y="310"/>
       <point x="901" y="419"/>
-      <point x="901" y="556" type="curve" name="ah01" smooth="yes"/>
+      <point x="901" y="556" type="curve" smooth="yes" name="ah01"/>
       <point x="901" y="596"/>
       <point x="899" y="630"/>
-      <point x="895" y="667" type="curve" name="sh06" smooth="yes"/>
+      <point x="895" y="667" type="curve" smooth="yes" name="sh06"/>
       <point x="892" y="695"/>
       <point x="888" y="732"/>
       <point x="877" y="780" type="curve" name="ih02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/oslashacute.glif b/source/Hack-Regular.ufo/glyphs/oslashacute.glif
index 67bf9ab32..88bd17ee9 100644
--- a/source/Hack-Regular.ufo/glyphs/oslashacute.glif
+++ b/source/Hack-Regular.ufo/glyphs/oslashacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="oslashacute" format="1">
+<glyph name="oslashacute" format="2">
   <advance width="1233"/>
   <unicode hex="01FF"/>
   <outline>
@@ -14,10 +14,10 @@
       <point x="217" y="180" type="line"/>
       <point x="165" y="276"/>
       <point x="137" y="406"/>
-      <point x="137" y="562" type="curve" name="sh02" smooth="yes"/>
+      <point x="137" y="562" type="curve" smooth="yes" name="sh02"/>
       <point x="137" y="940"/>
       <point x="305" y="1147"/>
-      <point x="618" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="618" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="749" y="1147"/>
       <point x="854" y="1112"/>
       <point x="934" y="1036" type="curve"/>
@@ -26,10 +26,10 @@
       <point x="1010" y="940" type="line"/>
       <point x="1066" y="852"/>
       <point x="1096" y="723"/>
-      <point x="1096" y="560" type="curve" name="sh01" smooth="yes"/>
+      <point x="1096" y="560" type="curve" smooth="yes" name="sh01"/>
       <point x="1096" y="173"/>
       <point x="929" y="-29"/>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="480" y="-29"/>
       <point x="374" y="11"/>
       <point x="299" y="90" type="curve"/>
@@ -39,19 +39,19 @@
       <point x="817" y="897" type="line"/>
       <point x="769" y="964"/>
       <point x="700" y="991"/>
-      <point x="619" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="619" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="431" y="991"/>
       <point x="328" y="842"/>
-      <point x="328" y="584" type="curve" name="sh04" smooth="yes"/>
+      <point x="328" y="584" type="curve" smooth="yes" name="sh04"/>
       <point x="328" y="508"/>
       <point x="337" y="436"/>
       <point x="356" y="340" type="curve" name="ih03"/>
     </contour>
     <contour>
-      <point x="615" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="804" y="127"/>
       <point x="901" y="277"/>
-      <point x="901" y="552" type="curve" name="ah01" smooth="yes"/>
+      <point x="901" y="552" type="curve" smooth="yes" name="ah01"/>
       <point x="901" y="632"/>
       <point x="893" y="703"/>
       <point x="877" y="780" type="curve" name="ih04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/otilde.glif b/source/Hack-Regular.ufo/glyphs/otilde.glif
index c116b6a11..ea933308c 100644
--- a/source/Hack-Regular.ufo/glyphs/otilde.glif
+++ b/source/Hack-Regular.ufo/glyphs/otilde.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="otilde" format="1">
+<glyph name="otilde" format="2">
   <advance width="1233"/>
   <unicode hex="00F5"/>
   <outline>
@@ -7,13 +7,13 @@
       <point x="287" y="1286" type="line" name="hr00"/>
       <point x="288" y="1376"/>
       <point x="306" y="1445"/>
-      <point x="339" y="1494" type="curve" name="sh03" smooth="yes"/>
+      <point x="339" y="1494" type="curve" smooth="yes" name="sh03"/>
       <point x="373" y="1543"/>
       <point x="420" y="1568"/>
-      <point x="480" y="1568" type="curve" name="at01" smooth="yes"/>
+      <point x="480" y="1568" type="curve" smooth="yes" name="at01"/>
       <point x="506" y="1568"/>
       <point x="530" y="1563"/>
-      <point x="552" y="1554" type="curve" name="at02" smooth="yes"/>
+      <point x="552" y="1554" type="curve" smooth="yes" name="at02"/>
       <point x="572" y="1545"/>
       <point x="595" y="1530"/>
       <point x="621" y="1507" type="curve"/>
@@ -33,10 +33,10 @@
       <point x="946" y="1568" type="line"/>
       <point x="945" y="1478"/>
       <point x="927" y="1409"/>
-      <point x="894" y="1360" type="curve" name="sh04" smooth="yes"/>
+      <point x="894" y="1360" type="curve" smooth="yes" name="sh04"/>
       <point x="860" y="1311"/>
       <point x="813" y="1286"/>
-      <point x="753" y="1286" type="curve" name="sv01" smooth="yes"/>
+      <point x="753" y="1286" type="curve" smooth="yes" name="sv01"/>
       <point x="727" y="1286"/>
       <point x="703" y="1291"/>
       <point x="681" y="1300" type="curve" smooth="yes"/>
@@ -58,25 +58,25 @@
       <point x="411" y="1286" type="curve"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="463" y="-29"/>
       <point x="343" y="21"/>
       <point x="260" y="121" type="curve"/>
       <point x="176" y="225"/>
       <point x="137" y="373"/>
-      <point x="137" y="560" type="curve" name="sh01" smooth="yes"/>
+      <point x="137" y="560" type="curve" smooth="yes" name="sh01"/>
       <point x="137" y="749"/>
       <point x="178" y="895"/>
       <point x="260" y="996" type="curve" smooth="yes"/>
       <point x="342" y="1097"/>
       <point x="461" y="1147"/>
-      <point x="616" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="776" y="1147"/>
       <point x="893" y="1095"/>
       <point x="973" y="996" type="curve" smooth="yes"/>
       <point x="1055" y="895"/>
       <point x="1096" y="750"/>
-      <point x="1096" y="561" type="curve" name="sh05" smooth="yes"/>
+      <point x="1096" y="561" type="curve" smooth="yes" name="sh05"/>
       <point x="1096" y="370"/>
       <point x="1056" y="221"/>
       <point x="973" y="121" type="curve" smooth="yes"/>
@@ -84,25 +84,25 @@
       <point x="773" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="127"/>
       <point x="781" y="164"/>
       <point x="829" y="237" type="curve" smooth="yes"/>
       <point x="877" y="310"/>
       <point x="901" y="417"/>
-      <point x="901" y="559" type="curve" name="ah01" smooth="yes"/>
+      <point x="901" y="559" type="curve" smooth="yes" name="ah01"/>
       <point x="901" y="701"/>
       <point x="877" y="809"/>
       <point x="829" y="882" type="curve" smooth="yes"/>
       <point x="781" y="955"/>
       <point x="710" y="991"/>
-      <point x="616" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="523" y="991"/>
       <point x="452" y="955"/>
       <point x="404" y="882" type="curve" smooth="yes"/>
       <point x="356" y="809"/>
       <point x="332" y="701"/>
-      <point x="332" y="559" type="curve" name="sh02" smooth="yes"/>
+      <point x="332" y="559" type="curve" smooth="yes" name="sh02"/>
       <point x="332" y="417"/>
       <point x="356" y="310"/>
       <point x="404" y="237" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/p.glif b/source/Hack-Regular.ufo/glyphs/p.glif
index 6a41da64f..b25b99e5c 100644
--- a/source/Hack-Regular.ufo/glyphs/p.glif
+++ b/source/Hack-Regular.ufo/glyphs/p.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="p" format="1">
+<glyph name="p" format="2">
   <advance width="1233"/>
   <unicode hex="0070"/>
   <outline>
@@ -38,9 +38,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/paragraph.glif b/source/Hack-Regular.ufo/glyphs/paragraph.glif
index 3a452e8e7..0f3dc7b35 100644
--- a/source/Hack-Regular.ufo/glyphs/paragraph.glif
+++ b/source/Hack-Regular.ufo/glyphs/paragraph.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="paragraph" format="1">
+<glyph name="paragraph" format="2">
   <advance width="1233"/>
   <unicode hex="00B6"/>
   <outline>
@@ -16,7 +16,7 @@
       <point x="237" y="1377" type="curve" smooth="yes"/>
       <point x="324" y="1454"/>
       <point x="439" y="1493"/>
-      <point x="582" y="1493" type="curve" name="at01" smooth="yes"/>
+      <point x="582" y="1493" type="curve" smooth="yes" name="at01"/>
       <point x="1030" y="1493" type="line"/>
       <point x="1030" y="-197" type="line" name="sh01"/>
       <point x="889" y="-197" type="line" name="ah01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/parenleft.glif b/source/Hack-Regular.ufo/glyphs/parenleft.glif
index 00286ecd1..e34b0bef5 100644
--- a/source/Hack-Regular.ufo/glyphs/parenleft.glif
+++ b/source/Hack-Regular.ufo/glyphs/parenleft.glif
@@ -1,32 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="parenleft" format="1">
+<glyph name="parenleft" format="2">
   <advance width="1233"/>
   <unicode hex="0028"/>
   <outline>
     <contour>
-      <point x="595" y="-270" type="line" name="hr00"/>
-      <point x="491" y="-105"/>
-      <point x="419" y="43"/>
-      <point x="370" y="194" type="curve" smooth="yes"/>
-      <point x="321" y="345"/>
-      <point x="296" y="495"/>
-      <point x="296" y="643" type="curve" name="dh01" smooth="yes"/>
-      <point x="296" y="790"/>
-      <point x="321" y="940"/>
-      <point x="370" y="1092" type="curve" smooth="yes"/>
-      <point x="421" y="1245"/>
-      <point x="492" y="1394"/>
-      <point x="595" y="1554" type="curve" name="at01"/>
-      <point x="755" y="1554" type="line"/>
-      <point x="660" y="1393"/>
-      <point x="600" y="1249"/>
-      <point x="557" y="1100" type="curve" smooth="yes"/>
-      <point x="512" y="943"/>
-      <point x="491" y="796"/>
-      <point x="491" y="643" type="curve" name="dh02" smooth="yes"/>
-      <point x="491" y="334"/>
-      <point x="576" y="41"/>
-      <point x="755" y="-270" type="curve" name="av01"/>
+      <point x="947" y="-206" type="line" name="hr00"/>
+      <point x="552" y="-51"/>
+      <point x="293" y="250.821"/>
+      <point x="293" y="747" type="curve" smooth="yes" name="dh01"/>
+      <point x="293" y="1243.18"/>
+      <point x="555" y="1548"/>
+      <point x="947" y="1700" type="curve" name="at01"/>
+      <point x="947" y="1532" type="line"/>
+      <point x="631.582" y="1379.21"/>
+      <point x="477" y="1121.02"/>
+      <point x="477" y="747" type="curve" smooth="yes" name="dh02"/>
+      <point x="477" y="372.98"/>
+      <point x="631.582" y="114.795"/>
+      <point x="947" y="-38" type="curve" name="av01"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Regular.ufo/glyphs/parenright.glif b/source/Hack-Regular.ufo/glyphs/parenright.glif
index 637eb02d6..10e24485e 100644
--- a/source/Hack-Regular.ufo/glyphs/parenright.glif
+++ b/source/Hack-Regular.ufo/glyphs/parenright.glif
@@ -1,41 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="parenright" format="1">
+<glyph name="parenright" format="2">
   <advance width="1233"/>
   <unicode hex="0029"/>
   <outline>
     <contour>
-      <point x="478" y="-270" type="line" name="hr00"/>
-      <point x="566" y="-116"/>
-      <point x="632" y="37"/>
-      <point x="677" y="189" type="curve" smooth="yes"/>
-      <point x="718" y="332"/>
-      <point x="742" y="487"/>
-      <point x="742" y="643" type="curve" name="dh01" smooth="yes"/>
-      <point x="742" y="792"/>
-      <point x="720" y="949"/>
-      <point x="677" y="1098" type="curve" smooth="yes"/>
-      <point x="636" y="1241"/>
-      <point x="570" y="1395"/>
-      <point x="478" y="1554" type="curve" name="at01"/>
-      <point x="638" y="1554" type="line"/>
-      <point x="740" y="1396"/>
-      <point x="815" y="1242"/>
-      <point x="863" y="1092" type="curve" smooth="yes"/>
-      <point x="912" y="940"/>
-      <point x="937" y="790"/>
-      <point x="937" y="643" type="curve" name="dh02" smooth="yes"/>
-      <point x="937" y="494"/>
-      <point x="912" y="344"/>
-      <point x="863" y="192" type="curve" smooth="yes"/>
-      <point x="814" y="41"/>
-      <point x="739" y="-113"/>
-      <point x="638" y="-270" type="curve" name="av01"/>
+      <point x="286" y="-206" type="line" name="hr00"/>
+      <point x="681" y="-51"/>
+      <point x="940" y="250.821"/>
+      <point x="940" y="747" type="curve" smooth="yes" name="dh01"/>
+      <point x="940" y="1243.18"/>
+      <point x="678" y="1548"/>
+      <point x="286" y="1700" type="curve" name="at01"/>
+      <point x="286" y="1532" type="line"/>
+      <point x="601.418" y="1379.21"/>
+      <point x="756" y="1121.02"/>
+      <point x="756" y="747" type="curve" smooth="yes" name="dh02"/>
+      <point x="756" y="372.98"/>
+      <point x="601.418" y="114.795"/>
+      <point x="286" y="-38" type="curve" name="av01"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
+      <string>2018-06-04 23:57:45 +0000</string>
     </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/partialdiff.glif b/source/Hack-Regular.ufo/glyphs/partialdiff.glif
index 66feb3b88..3c297a1b0 100644
--- a/source/Hack-Regular.ufo/glyphs/partialdiff.glif
+++ b/source/Hack-Regular.ufo/glyphs/partialdiff.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="partialdiff" format="1">
+<glyph name="partialdiff" format="2">
   <advance width="1233"/>
   <unicode hex="2202"/>
   <outline>
     <contour>
-      <point x="545" y="-25" type="curve" name="ab01" smooth="yes"/>
+      <point x="545" y="-25" type="curve" smooth="yes" name="ab01"/>
       <point x="449" y="-25"/>
       <point x="358" y="11"/>
       <point x="291" y="82" type="curve" smooth="yes"/>
       <point x="223" y="154"/>
       <point x="190" y="249"/>
-      <point x="190" y="361" type="curve" name="dh01" smooth="yes"/>
+      <point x="190" y="361" type="curve" smooth="yes" name="dh01"/>
       <point x="190" y="477"/>
       <point x="227" y="595"/>
       <point x="300" y="682" type="curve" smooth="yes"/>
       <point x="376" y="771"/>
       <point x="477" y="809"/>
-      <point x="578" y="809" type="curve" name="dv04" smooth="yes"/>
+      <point x="578" y="809" type="curve" smooth="yes" name="dv04"/>
       <point x="641" y="809"/>
       <point x="695" y="794"/>
       <point x="738" y="764" type="curve" smooth="yes"/>
@@ -25,16 +25,16 @@
       <point x="842" y="621" type="curve" name="ih01"/>
       <point x="853" y="680"/>
       <point x="860" y="734"/>
-      <point x="865" y="790" type="curve" name="sh02" smooth="yes"/>
+      <point x="865" y="790" type="curve" smooth="yes" name="sh02"/>
       <point x="870" y="845"/>
       <point x="872" y="900"/>
-      <point x="872" y="939" type="curve" name="sh01" smooth="yes"/>
+      <point x="872" y="939" type="curve" smooth="yes" name="sh01"/>
       <point x="872" y="1027"/>
       <point x="863" y="1094"/>
       <point x="836" y="1141" type="curve" smooth="yes"/>
       <point x="811" y="1185"/>
       <point x="772" y="1206"/>
-      <point x="727" y="1206" type="curve" name="dv01" smooth="yes"/>
+      <point x="727" y="1206" type="curve" smooth="yes" name="dv01"/>
       <point x="683" y="1206"/>
       <point x="651" y="1187"/>
       <point x="600" y="1148" type="curve" smooth="yes"/>
@@ -52,13 +52,13 @@
       <point x="480" y="1277" type="curve"/>
       <point x="524" y="1308"/>
       <point x="586" y="1325"/>
-      <point x="654" y="1325" type="curve" name="dv02" smooth="yes"/>
+      <point x="654" y="1325" type="curve" smooth="yes" name="dv02"/>
       <point x="770" y="1325"/>
       <point x="869" y="1274"/>
       <point x="941" y="1170" type="curve" smooth="yes"/>
       <point x="1009" y="1070"/>
       <point x="1047" y="930"/>
-      <point x="1047" y="746" type="curve" name="dh04" smooth="yes"/>
+      <point x="1047" y="746" type="curve" smooth="yes" name="dh04"/>
       <point x="1047" y="523"/>
       <point x="992" y="331"/>
       <point x="904" y="195" type="curve" smooth="yes"/>
@@ -66,13 +66,13 @@
       <point x="686" y="-25"/>
     </contour>
     <contour>
-      <point x="543" y="31" type="curve" name="sv01" smooth="yes"/>
+      <point x="543" y="31" type="curve" smooth="yes" name="sv01"/>
       <point x="614" y="31"/>
       <point x="676" y="72"/>
-      <point x="723" y="160" type="curve" name="hr01" smooth="yes"/>
+      <point x="723" y="160" type="curve" smooth="yes" name="hr01"/>
       <point x="768" y="244"/>
       <point x="793" y="360"/>
-      <point x="793" y="483" type="curve" name="dh03" smooth="yes"/>
+      <point x="793" y="483" type="curve" smooth="yes" name="dh03"/>
       <point x="793" y="575"/>
       <point x="779" y="632"/>
       <point x="750" y="673" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/percent.glif b/source/Hack-Regular.ufo/glyphs/percent.glif
index b737263c6..888aa86ed 100644
--- a/source/Hack-Regular.ufo/glyphs/percent.glif
+++ b/source/Hack-Regular.ufo/glyphs/percent.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="percent" format="1">
+<glyph name="percent" format="2">
   <advance width="1233"/>
   <unicode hex="0025"/>
   <outline>
     <contour>
-      <point x="351" y="793" type="curve" name="dv05" smooth="yes"/>
+      <point x="351" y="793" type="curve" smooth="yes" name="dv05"/>
       <point x="260" y="793"/>
       <point x="181" y="828"/>
       <point x="125" y="884" type="curve" smooth="yes"/>
       <point x="65" y="944"/>
       <point x="33" y="1024"/>
-      <point x="33" y="1112" type="curve" name="dh01" smooth="yes"/>
+      <point x="33" y="1112" type="curve" smooth="yes" name="dh01"/>
       <point x="33" y="1298"/>
       <point x="171" y="1432"/>
-      <point x="352" y="1432" type="curve" name="dv02" smooth="yes"/>
+      <point x="352" y="1432" type="curve" smooth="yes" name="dv02"/>
       <point x="395" y="1432"/>
       <point x="436" y="1424"/>
       <point x="475" y="1408" type="curve" smooth="yes"/>
@@ -25,7 +25,7 @@
       <point x="648" y="1236" type="curve" smooth="yes"/>
       <point x="664" y="1197"/>
       <point x="672" y="1156"/>
-      <point x="672" y="1113" type="curve" name="dh04" smooth="yes"/>
+      <point x="672" y="1113" type="curve" smooth="yes" name="dh04"/>
       <point x="672" y="1025"/>
       <point x="639" y="944"/>
       <point x="580" y="885" type="curve" smooth="yes"/>
@@ -33,25 +33,25 @@
       <point x="443" y="793"/>
     </contour>
     <contour>
-      <point x="351" y="928" type="curve" name="dv06" smooth="yes"/>
+      <point x="351" y="928" type="curve" smooth="yes" name="dv06"/>
       <point x="400" y="928"/>
       <point x="447" y="946"/>
       <point x="483" y="981" type="curve" smooth="yes"/>
       <point x="514" y="1012"/>
       <point x="537" y="1057"/>
-      <point x="537" y="1113" type="curve" name="dh03" smooth="yes"/>
+      <point x="537" y="1113" type="curve" smooth="yes" name="dh03"/>
       <point x="537" y="1164"/>
       <point x="519" y="1207"/>
       <point x="483" y="1243" type="curve" smooth="yes"/>
       <point x="446" y="1278"/>
       <point x="403" y="1296"/>
-      <point x="353" y="1296" type="curve" name="dv01" smooth="yes"/>
+      <point x="353" y="1296" type="curve" smooth="yes" name="dv01"/>
       <point x="302" y="1296"/>
       <point x="258" y="1279"/>
       <point x="222" y="1244" type="curve" smooth="yes"/>
       <point x="189" y="1212"/>
       <point x="168" y="1165"/>
-      <point x="168" y="1112" type="curve" name="dh02" smooth="yes"/>
+      <point x="168" y="1112" type="curve" smooth="yes" name="dh02"/>
       <point x="168" y="1059"/>
       <point x="186" y="1015"/>
       <point x="221" y="980" type="curve" smooth="yes"/>
@@ -65,16 +65,16 @@
       <point x="42" y="453" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="879" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="879" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="788" y="0"/>
       <point x="712" y="31"/>
       <point x="651" y="92" type="curve" smooth="yes"/>
       <point x="591" y="153"/>
       <point x="561" y="231"/>
-      <point x="561" y="318" type="curve" name="ih02" smooth="yes"/>
+      <point x="561" y="318" type="curve" smooth="yes" name="ih02"/>
       <point x="561" y="505"/>
       <point x="699" y="639"/>
-      <point x="879" y="639" type="curve" name="dv04" smooth="yes"/>
+      <point x="879" y="639" type="curve" smooth="yes" name="dv04"/>
       <point x="966" y="639"/>
       <point x="1043" y="606"/>
       <point x="1104" y="545" type="curve" smooth="yes"/>
@@ -83,7 +83,7 @@
       <point x="1175" y="440" type="curve" smooth="yes"/>
       <point x="1192" y="402"/>
       <point x="1200" y="362"/>
-      <point x="1200" y="319" type="curve" name="hr01" smooth="yes"/>
+      <point x="1200" y="319" type="curve" smooth="yes" name="hr01"/>
       <point x="1200" y="235"/>
       <point x="1171" y="156"/>
       <point x="1107" y="92" type="curve" smooth="yes"/>
@@ -91,19 +91,19 @@
       <point x="967" y="0"/>
     </contour>
     <contour>
-      <point x="879" y="135" type="curve" name="sv01" smooth="yes"/>
+      <point x="879" y="135" type="curve" smooth="yes" name="sv01"/>
       <point x="930" y="135"/>
       <point x="974" y="153"/>
       <point x="1010" y="189" type="curve" smooth="yes"/>
       <point x="1045" y="224"/>
       <point x="1063" y="268"/>
-      <point x="1063" y="319" type="curve" name="dh05" smooth="yes"/>
+      <point x="1063" y="319" type="curve" smooth="yes" name="dh05"/>
       <point x="1063" y="422"/>
       <point x="980" y="504"/>
-      <point x="879" y="504" type="curve" name="dv03" smooth="yes"/>
+      <point x="879" y="504" type="curve" smooth="yes" name="dv03"/>
       <point x="776" y="504"/>
       <point x="696" y="424"/>
-      <point x="696" y="319" type="curve" name="sh03" smooth="yes"/>
+      <point x="696" y="319" type="curve" smooth="yes" name="sh03"/>
       <point x="696" y="215"/>
       <point x="776" y="135"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/period.glif b/source/Hack-Regular.ufo/glyphs/period.glif
index ac5398460..12407b08e 100644
--- a/source/Hack-Regular.ufo/glyphs/period.glif
+++ b/source/Hack-Regular.ufo/glyphs/period.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="period" format="1">
+<glyph name="period" format="2">
   <advance width="1233"/>
   <unicode hex="002E"/>
   <outline>
     <contour>
-      <point x="613" y="-27" type="curve" name="hr00" smooth="yes"/>
+      <point x="613" y="-27" type="curve" smooth="yes" name="hr00"/>
       <point x="522" y="-27"/>
       <point x="451" y="42"/>
-      <point x="451" y="142" type="curve" name="dh01" smooth="yes"/>
+      <point x="451" y="142" type="curve" smooth="yes" name="dh01"/>
       <point x="451" y="242"/>
       <point x="522" y="311"/>
-      <point x="613" y="311" type="curve" name="sv01" smooth="yes"/>
+      <point x="613" y="311" type="curve" smooth="yes" name="sv01"/>
       <point x="704" y="311"/>
       <point x="775" y="242"/>
-      <point x="775" y="142" type="curve" name="dh02" smooth="yes"/>
+      <point x="775" y="142" type="curve" smooth="yes" name="dh02"/>
       <point x="775" y="42"/>
       <point x="704" y="-27"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/periodcentered.glif b/source/Hack-Regular.ufo/glyphs/periodcentered.glif
index 3f59cf121..121be074e 100644
--- a/source/Hack-Regular.ufo/glyphs/periodcentered.glif
+++ b/source/Hack-Regular.ufo/glyphs/periodcentered.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="periodcentered" format="1">
+<glyph name="periodcentered" format="2">
   <advance width="1233"/>
   <unicode hex="00B7"/>
   <outline>
     <contour>
-      <point x="616" y="576" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="576" type="curve" smooth="yes" name="hr00"/>
       <point x="525" y="576"/>
       <point x="454" y="645"/>
       <point x="454" y="745" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/perthousand.glif b/source/Hack-Regular.ufo/glyphs/perthousand.glif
index c613a236d..091931e78 100644
--- a/source/Hack-Regular.ufo/glyphs/perthousand.glif
+++ b/source/Hack-Regular.ufo/glyphs/perthousand.glif
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="perthousand" format="1">
+<glyph name="perthousand" format="2">
   <advance width="1233"/>
   <unicode hex="2030"/>
   <outline>
     <contour>
-      <point x="287" y="856" type="curve" name="dv05" smooth="yes"/>
+      <point x="287" y="856" type="curve" smooth="yes" name="dv05"/>
       <point x="203" y="856"/>
       <point x="133" y="888"/>
       <point x="82" y="940" type="curve" smooth="yes"/>
       <point x="27" y="996"/>
       <point x="0" y="1067"/>
-      <point x="0" y="1144" type="curve" name="dh01" smooth="yes"/>
+      <point x="0" y="1144" type="curve" smooth="yes" name="dh01"/>
       <point x="0" y="1225"/>
       <point x="31" y="1298"/>
       <point x="83" y="1350" type="curve" smooth="yes"/>
       <point x="134" y="1401"/>
       <point x="206" y="1432"/>
-      <point x="286" y="1432" type="curve" name="dv02" smooth="yes"/>
+      <point x="286" y="1432" type="curve" smooth="yes" name="dv02"/>
       <point x="363" y="1432"/>
       <point x="435" y="1405"/>
       <point x="490" y="1350" type="curve" smooth="yes"/>
       <point x="538" y="1302"/>
       <point x="573" y="1231"/>
-      <point x="573" y="1144" type="curve" name="dh04" smooth="yes"/>
+      <point x="573" y="1144" type="curve" smooth="yes" name="dh04"/>
       <point x="573" y="984"/>
       <point x="449" y="856"/>
     </contour>
     <contour>
-      <point x="287" y="979" type="curve" name="dv06" smooth="yes"/>
+      <point x="287" y="979" type="curve" smooth="yes" name="dv06"/>
       <point x="333" y="979"/>
       <point x="372" y="995"/>
       <point x="405" y="1028" type="curve" smooth="yes"/>
       <point x="437" y="1060"/>
       <point x="453" y="1099"/>
-      <point x="453" y="1145" type="curve" name="dh03" smooth="yes"/>
+      <point x="453" y="1145" type="curve" smooth="yes" name="dh03"/>
       <point x="453" y="1236"/>
       <point x="378" y="1311"/>
-      <point x="287" y="1311" type="curve" name="dv01" smooth="yes"/>
+      <point x="287" y="1311" type="curve" smooth="yes" name="dv01"/>
       <point x="241" y="1311"/>
       <point x="202" y="1295"/>
       <point x="170" y="1263" type="curve" smooth="yes"/>
       <point x="137" y="1230"/>
       <point x="121" y="1191"/>
-      <point x="121" y="1145" type="curve" name="dh02" smooth="yes"/>
+      <point x="121" y="1145" type="curve" smooth="yes" name="dh02"/>
       <point x="121" y="1052"/>
       <point x="194" y="979"/>
     </contour>
@@ -53,25 +53,25 @@
       <point x="72" y="567" type="line"/>
     </contour>
     <contour>
-      <point x="329" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="329" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="246" y="0"/>
       <point x="175" y="32"/>
       <point x="126" y="83" type="curve" smooth="yes"/>
       <point x="71" y="139"/>
       <point x="45" y="210"/>
-      <point x="45" y="289" type="curve" name="ih01" smooth="yes"/>
+      <point x="45" y="289" type="curve" smooth="yes" name="ih01"/>
       <point x="45" y="369"/>
       <point x="72" y="438"/>
       <point x="128" y="494" type="curve" smooth="yes"/>
       <point x="184" y="549"/>
       <point x="253" y="575"/>
-      <point x="329" y="575" type="curve" name="dv04" smooth="yes"/>
+      <point x="329" y="575" type="curve" smooth="yes" name="dv04"/>
       <point x="413" y="575"/>
       <point x="484" y="542"/>
       <point x="533" y="493" type="curve" smooth="yes"/>
       <point x="588" y="438"/>
       <point x="616" y="368"/>
-      <point x="616" y="289" type="curve" name="sh01" smooth="yes"/>
+      <point x="616" y="289" type="curve" smooth="yes" name="sh01"/>
       <point x="616" y="210"/>
       <point x="587" y="139"/>
       <point x="534" y="84" type="curve" smooth="yes"/>
@@ -79,25 +79,25 @@
       <point x="412" y="0"/>
     </contour>
     <contour>
-      <point x="945" y="0" type="curve" name="ab02" smooth="yes"/>
+      <point x="945" y="0" type="curve" smooth="yes" name="ab02"/>
       <point x="865" y="0"/>
       <point x="794" y="29"/>
       <point x="741" y="84" type="curve" smooth="yes"/>
       <point x="686" y="140"/>
       <point x="659" y="211"/>
-      <point x="659" y="288" type="curve" name="dh05" smooth="yes"/>
+      <point x="659" y="288" type="curve" smooth="yes" name="dh05"/>
       <point x="659" y="372"/>
       <point x="690" y="441"/>
       <point x="741" y="492" type="curve" smooth="yes"/>
       <point x="796" y="547"/>
       <point x="866" y="575"/>
-      <point x="945" y="575" type="curve" name="sv01" smooth="yes"/>
+      <point x="945" y="575" type="curve" smooth="yes" name="sv01"/>
       <point x="1028" y="575"/>
       <point x="1100" y="543"/>
       <point x="1151" y="492" type="curve" smooth="yes"/>
       <point x="1206" y="437"/>
       <point x="1233" y="365"/>
-      <point x="1233" y="289" type="curve" name="dh08" smooth="yes"/>
+      <point x="1233" y="289" type="curve" smooth="yes" name="dh08"/>
       <point x="1233" y="210"/>
       <point x="1204" y="139"/>
       <point x="1151" y="84" type="curve" smooth="yes"/>
@@ -105,22 +105,22 @@
       <point x="1030" y="0"/>
     </contour>
     <contour>
-      <point x="329" y="121" type="curve" name="sv02" smooth="yes"/>
+      <point x="329" y="121" type="curve" smooth="yes" name="sv02"/>
       <point x="422" y="121"/>
       <point x="496" y="195"/>
-      <point x="496" y="288" type="curve" name="ih02" smooth="yes"/>
+      <point x="496" y="288" type="curve" smooth="yes" name="ih02"/>
       <point x="496" y="332"/>
       <point x="479" y="375"/>
       <point x="447" y="407" type="curve" smooth="yes"/>
       <point x="420" y="434"/>
       <point x="378" y="455"/>
-      <point x="329" y="455" type="curve" name="dv03" smooth="yes"/>
+      <point x="329" y="455" type="curve" smooth="yes" name="dv03"/>
       <point x="286" y="455"/>
       <point x="245" y="439"/>
       <point x="214" y="408" type="curve" smooth="yes"/>
       <point x="187" y="381"/>
       <point x="166" y="339"/>
-      <point x="166" y="288" type="curve" name="hr01" smooth="yes"/>
+      <point x="166" y="288" type="curve" smooth="yes" name="hr01"/>
       <point x="166" y="241"/>
       <point x="184" y="201"/>
       <point x="213" y="170" type="curve" smooth="yes"/>
@@ -128,25 +128,25 @@
       <point x="284" y="121"/>
     </contour>
     <contour>
-      <point x="946" y="121" type="curve" name="sv03" smooth="yes"/>
+      <point x="946" y="121" type="curve" smooth="yes" name="sv03"/>
       <point x="995" y="121"/>
       <point x="1037" y="141"/>
       <point x="1065" y="170" type="curve" smooth="yes"/>
       <point x="1097" y="203"/>
       <point x="1112" y="247"/>
-      <point x="1112" y="288" type="curve" name="dh07" smooth="yes"/>
+      <point x="1112" y="288" type="curve" smooth="yes" name="dh07"/>
       <point x="1112" y="331"/>
       <point x="1096" y="374"/>
       <point x="1063" y="407" type="curve" smooth="yes"/>
       <point x="1036" y="434"/>
       <point x="994" y="455"/>
-      <point x="946" y="455" type="curve" name="sv04" smooth="yes"/>
+      <point x="946" y="455" type="curve" smooth="yes" name="sv04"/>
       <point x="898" y="455"/>
       <point x="856" y="435"/>
       <point x="828" y="407" type="curve" smooth="yes"/>
       <point x="799" y="378"/>
       <point x="780" y="336"/>
-      <point x="780" y="288" type="curve" name="dh06" smooth="yes"/>
+      <point x="780" y="288" type="curve" smooth="yes" name="dh06"/>
       <point x="780" y="247"/>
       <point x="793" y="205"/>
       <point x="828" y="170" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/peseta.glif b/source/Hack-Regular.ufo/glyphs/peseta.glif
index 8c5060797..5eb9cc5ab 100644
--- a/source/Hack-Regular.ufo/glyphs/peseta.glif
+++ b/source/Hack-Regular.ufo/glyphs/peseta.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="peseta" format="1">
+<glyph name="peseta" format="2">
   <advance width="1233"/>
   <unicode hex="20A7"/>
   <outline>
     <contour>
-      <point x="999" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="999" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="940" y="-29"/>
       <point x="874" y="-6"/>
       <point x="803" y="41" type="curve"/>
@@ -12,12 +12,12 @@
       <point x="713" y="42" type="line" smooth="yes"/>
       <point x="573" y="42"/>
       <point x="526" y="132"/>
-      <point x="526" y="411" type="curve" name="dh04" smooth="yes"/>
+      <point x="526" y="411" type="curve" smooth="yes" name="dh04"/>
       <point x="526" y="1019" type="line" name="sv01"/>
       <point x="488" y="1019" type="line" name="dh03"/>
       <point x="484" y="752"/>
       <point x="403" y="600"/>
-      <point x="236" y="600" type="curve" name="dv05" smooth="yes"/>
+      <point x="236" y="600" type="curve" smooth="yes" name="dv05"/>
       <point x="110" y="600" type="line" name="hr01"/>
       <point x="110" y="0" type="line" name="dh01"/>
       <point x="10" y="0" type="line" name="hr02"/>
@@ -33,7 +33,7 @@
       <point x="807" y="1162" type="line" name="sh03"/>
       <point x="807" y="1019" type="line" name="hr04"/>
       <point x="618" y="1019" type="line"/>
-      <point x="618" y="411" type="line" name="dh05" smooth="yes"/>
+      <point x="618" y="411" type="line" smooth="yes" name="dh05"/>
       <point x="618" y="319"/>
       <point x="624" y="260"/>
       <point x="637" y="235" type="curve" smooth="yes"/>
@@ -44,48 +44,48 @@
       <point x="803" y="231" type="line" name="sh05"/>
       <point x="875" y="155"/>
       <point x="938" y="125"/>
-      <point x="1001" y="125" type="curve" name="dv02" smooth="yes"/>
+      <point x="1001" y="125" type="curve" smooth="yes" name="dv02"/>
       <point x="1085" y="125"/>
       <point x="1134" y="182"/>
-      <point x="1134" y="305" type="curve" name="dh08" smooth="yes"/>
+      <point x="1134" y="305" type="curve" smooth="yes" name="dh08"/>
       <point x="1134" y="409"/>
       <point x="1099" y="439"/>
       <point x="999" y="487" type="curve" smooth="yes"/>
       <point x="967" y="502" type="line"/>
       <point x="854" y="550"/>
       <point x="807" y="644"/>
-      <point x="807" y="815" type="curve" name="dh06" smooth="yes"/>
+      <point x="807" y="815" type="curve" smooth="yes" name="dh06"/>
       <point x="807" y="1030"/>
       <point x="881" y="1147"/>
-      <point x="1026" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="1026" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="1086" y="1147"/>
       <point x="1147" y="1127"/>
       <point x="1198" y="1087" type="curve" name="sh06"/>
       <point x="1198" y="913" type="line" name="ih01"/>
       <point x="1146" y="966"/>
       <point x="1093" y="993"/>
-      <point x="1030" y="993" type="curve" name="sv02" smooth="yes"/>
+      <point x="1030" y="993" type="curve" smooth="yes" name="sv02"/>
       <point x="940" y="993"/>
       <point x="895" y="936"/>
-      <point x="895" y="823" type="curve" name="dh07" smooth="yes"/>
+      <point x="895" y="823" type="curve" smooth="yes" name="dh07"/>
       <point x="895" y="742"/>
       <point x="918" y="700"/>
       <point x="1018" y="655" type="curve" smooth="yes"/>
       <point x="1049" y="641" type="line" smooth="yes"/>
       <point x="1173" y="585"/>
       <point x="1228" y="497"/>
-      <point x="1228" y="319" type="curve" name="dh09" smooth="yes"/>
+      <point x="1228" y="319" type="curve" smooth="yes" name="dh09"/>
       <point x="1228" y="95"/>
       <point x="1142" y="-29"/>
     </contour>
     <contour>
-      <point x="236" y="766" type="line" name="dv06" smooth="yes"/>
+      <point x="236" y="766" type="line" smooth="yes" name="dv06"/>
       <point x="329" y="766"/>
       <point x="383" y="866"/>
-      <point x="383" y="1047" type="curve" name="dh02" smooth="yes"/>
+      <point x="383" y="1047" type="curve" smooth="yes" name="dh02"/>
       <point x="383" y="1227"/>
       <point x="329" y="1327"/>
-      <point x="236" y="1327" type="curve" name="sv03" smooth="yes"/>
+      <point x="236" y="1327" type="curve" smooth="yes" name="sv03"/>
       <point x="110" y="1327" type="line" name="sh07"/>
       <point x="110" y="766" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/phi.glif b/source/Hack-Regular.ufo/glyphs/phi.glif
index 86494bef2..d148c6c97 100644
--- a/source/Hack-Regular.ufo/glyphs/phi.glif
+++ b/source/Hack-Regular.ufo/glyphs/phi.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="phi" format="1">
+<glyph name="phi" format="2">
   <advance width="1233"/>
   <unicode hex="03C6"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="525" y="-25" type="line" name="dh03"/>
       <point x="260" y="-25"/>
       <point x="76" y="186"/>
-      <point x="76" y="570" type="curve" name="dh01" smooth="yes"/>
+      <point x="76" y="570" type="curve" smooth="yes" name="dh01"/>
       <point x="76" y="950"/>
       <point x="255" y="1093"/>
       <point x="460" y="1128" type="curve" name="at01"/>
@@ -17,17 +17,17 @@
       <point x="346" y="864" type="curve" smooth="yes"/>
       <point x="295" y="787"/>
       <point x="270" y="688"/>
-      <point x="270" y="557" type="curve" name="dh02" smooth="yes"/>
+      <point x="270" y="557" type="curve" smooth="yes" name="dh02"/>
       <point x="270" y="272"/>
       <point x="390" y="139"/>
       <point x="525" y="139" type="curve" name="sh02"/>
-      <point x="525" y="826" type="line" name="hr01" smooth="yes"/>
+      <point x="525" y="826" type="line" smooth="yes" name="hr01"/>
       <point x="525" y="1029"/>
       <point x="612" y="1128"/>
-      <point x="763" y="1128" type="curve" name="at02" smooth="yes"/>
+      <point x="763" y="1128" type="curve" smooth="yes" name="at02"/>
       <point x="959" y="1128"/>
       <point x="1157" y="953"/>
-      <point x="1157" y="565" type="curve" name="dh05" smooth="yes"/>
+      <point x="1157" y="565" type="curve" smooth="yes" name="dh05"/>
       <point x="1157" y="181"/>
       <point x="965" y="-24"/>
       <point x="708" y="-24" type="curve" name="dh04"/>
@@ -38,13 +38,13 @@
       <point x="708" y="140" type="line" name="sh03"/>
       <point x="831" y="140"/>
       <point x="963" y="258"/>
-      <point x="963" y="570" type="curve" name="hr02" smooth="yes"/>
+      <point x="963" y="570" type="curve" smooth="yes" name="hr02"/>
       <point x="963" y="719"/>
       <point x="933" y="814"/>
       <point x="886" y="881" type="curve" smooth="yes"/>
       <point x="845" y="940"/>
       <point x="796" y="971"/>
-      <point x="767" y="971" type="curve" name="sv01" smooth="yes"/>
+      <point x="767" y="971" type="curve" smooth="yes" name="sv01"/>
       <point x="732" y="971"/>
       <point x="708" y="922"/>
       <point x="708" y="826" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/pi.glif b/source/Hack-Regular.ufo/glyphs/pi.glif
index f2984a230..c66bce8f6 100644
--- a/source/Hack-Regular.ufo/glyphs/pi.glif
+++ b/source/Hack-Regular.ufo/glyphs/pi.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="pi" format="1">
+<glyph name="pi" format="2">
   <advance width="1233"/>
   <unicode hex="03C0"/>
   <outline>
     <contour>
-      <point x="1037" y="-39" type="curve" name="av01" smooth="yes"/>
+      <point x="1037" y="-39" type="curve" smooth="yes" name="av01"/>
       <point x="961" y="-39"/>
       <point x="908" y="-17"/>
       <point x="877" y="27" type="curve" smooth="yes"/>
       <point x="846" y="70"/>
       <point x="831" y="144"/>
-      <point x="831" y="268" type="curve" name="dh03" smooth="yes"/>
+      <point x="831" y="268" type="curve" smooth="yes" name="dh03"/>
       <point x="831" y="952" type="line" name="sv01"/>
       <point x="403" y="952" type="line"/>
       <point x="403" y="0" type="line" name="dh02"/>
@@ -21,7 +21,7 @@
       <point x="1153" y="1100" type="line" name="dv02"/>
       <point x="1153" y="952" type="line" name="dv01"/>
       <point x="1012" y="952" type="line"/>
-      <point x="1012" y="248" type="line" name="dh04" smooth="yes"/>
+      <point x="1012" y="248" type="line" smooth="yes" name="dh04"/>
       <point x="1012" y="201"/>
       <point x="1018" y="168"/>
       <point x="1037" y="145" type="curve" smooth="yes"/>
@@ -37,7 +37,7 @@
       <point x="1182" y="-14" type="line" name="ab01"/>
       <point x="1161" y="-23"/>
       <point x="1137" y="-29"/>
-      <point x="1110" y="-33" type="curve" name="av02" smooth="yes"/>
+      <point x="1110" y="-33" type="curve" smooth="yes" name="av02"/>
       <point x="1085" y="-37"/>
       <point x="1060" y="-39"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/plus.glif b/source/Hack-Regular.ufo/glyphs/plus.glif
index 2a463ade1..6a3378ff5 100644
--- a/source/Hack-Regular.ufo/glyphs/plus.glif
+++ b/source/Hack-Regular.ufo/glyphs/plus.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="plus" format="1">
+<glyph name="plus" format="2">
   <advance width="1233"/>
   <unicode hex="002B"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/plusminus.glif b/source/Hack-Regular.ufo/glyphs/plusminus.glif
index d5ac0b452..92c518908 100644
--- a/source/Hack-Regular.ufo/glyphs/plusminus.glif
+++ b/source/Hack-Regular.ufo/glyphs/plusminus.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="plusminus" format="1">
+<glyph name="plusminus" format="2">
   <advance width="1233"/>
   <unicode hex="00B1"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/product.glif b/source/Hack-Regular.ufo/glyphs/product.glif
index 2a263063f..8fd878f16 100644
--- a/source/Hack-Regular.ufo/glyphs/product.glif
+++ b/source/Hack-Regular.ufo/glyphs/product.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="product" format="1">
+<glyph name="product" format="2">
   <advance width="1233"/>
   <unicode hex="220F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/propersubset.glif b/source/Hack-Regular.ufo/glyphs/propersubset.glif
index 2a455601e..a1741e6d8 100644
--- a/source/Hack-Regular.ufo/glyphs/propersubset.glif
+++ b/source/Hack-Regular.ufo/glyphs/propersubset.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="propersubset" format="1">
+<glyph name="propersubset" format="2">
   <advance width="1233"/>
   <unicode hex="2282"/>
   <outline>
     <contour>
-      <point x="566" y="163" type="line" name="hr00" smooth="yes"/>
+      <point x="566" y="163" type="line" smooth="yes" name="hr00"/>
       <point x="298" y="163"/>
       <point x="88" y="375"/>
-      <point x="88" y="641" type="curve" name="dh01" smooth="yes"/>
+      <point x="88" y="641" type="curve" smooth="yes" name="dh01"/>
       <point x="88" y="906"/>
       <point x="298" y="1119"/>
-      <point x="565" y="1119" type="curve" name="at01" smooth="yes"/>
+      <point x="565" y="1119" type="curve" smooth="yes" name="at01"/>
       <point x="1145" y="1119" type="line"/>
       <point x="1145" y="969" type="line" name="sv01"/>
       <point x="565" y="969" type="line" smooth="yes"/>
       <point x="382" y="969"/>
       <point x="238" y="821"/>
-      <point x="238" y="640" type="curve" name="dh02" smooth="yes"/>
+      <point x="238" y="640" type="curve" smooth="yes" name="dh02"/>
       <point x="238" y="457"/>
       <point x="384" y="313"/>
-      <point x="565" y="313" type="curve" name="dv01" smooth="yes"/>
+      <point x="565" y="313" type="curve" smooth="yes" name="dv01"/>
       <point x="1145" y="313" type="line"/>
       <point x="1145" y="163" type="line" name="sv02"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/propersuperset.glif b/source/Hack-Regular.ufo/glyphs/propersuperset.glif
index fc75a3015..a2f81ac1a 100644
--- a/source/Hack-Regular.ufo/glyphs/propersuperset.glif
+++ b/source/Hack-Regular.ufo/glyphs/propersuperset.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="propersuperset" format="1">
+<glyph name="propersuperset" format="2">
   <advance width="1233"/>
   <unicode hex="2283"/>
   <outline>
     <contour>
       <point x="88" y="313" type="line" name="hr00"/>
-      <point x="668" y="313" type="line" name="dv02" smooth="yes"/>
+      <point x="668" y="313" type="line" smooth="yes" name="dv02"/>
       <point x="849" y="313"/>
       <point x="995" y="457"/>
-      <point x="995" y="640" type="curve" name="dh01" smooth="yes"/>
+      <point x="995" y="640" type="curve" smooth="yes" name="dh01"/>
       <point x="995" y="821"/>
       <point x="851" y="969"/>
-      <point x="668" y="969" type="curve" name="sv01" smooth="yes"/>
+      <point x="668" y="969" type="curve" smooth="yes" name="sv01"/>
       <point x="88" y="969" type="line"/>
       <point x="88" y="1119" type="line" name="at01"/>
       <point x="668" y="1119" type="line" smooth="yes"/>
       <point x="935" y="1119"/>
       <point x="1145" y="906"/>
-      <point x="1145" y="641" type="curve" name="dh02" smooth="yes"/>
+      <point x="1145" y="641" type="curve" smooth="yes" name="dh02"/>
       <point x="1145" y="375"/>
       <point x="935" y="163"/>
-      <point x="667" y="163" type="curve" name="dv01" smooth="yes"/>
+      <point x="667" y="163" type="curve" smooth="yes" name="dv01"/>
       <point x="88" y="163" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/proportional.glif b/source/Hack-Regular.ufo/glyphs/proportional.glif
index d5236832f..4d5687b18 100644
--- a/source/Hack-Regular.ufo/glyphs/proportional.glif
+++ b/source/Hack-Regular.ufo/glyphs/proportional.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="proportional" format="1">
+<glyph name="proportional" format="2">
   <advance width="1233"/>
   <unicode hex="221D"/>
   <outline>
     <contour>
-      <point x="479" y="250" type="curve" name="hr00" smooth="yes"/>
+      <point x="479" y="250" type="curve" smooth="yes" name="hr00"/>
       <point x="310" y="250"/>
       <point x="186" y="405"/>
-      <point x="186" y="636" type="curve" name="dh01" smooth="yes"/>
+      <point x="186" y="636" type="curve" smooth="yes" name="dh01"/>
       <point x="186" y="857"/>
       <point x="300" y="1008"/>
-      <point x="477" y="1008" type="curve" name="sv01" smooth="yes"/>
+      <point x="477" y="1008" type="curve" smooth="yes" name="sv01"/>
       <point x="600" y="1008"/>
       <point x="687" y="936"/>
       <point x="762" y="764" type="curve"/>
@@ -35,7 +35,7 @@
       <point x="595" y="250"/>
     </contour>
     <contour>
-      <point x="465" y="391" type="curve" name="dv01" smooth="yes"/>
+      <point x="465" y="391" type="curve" smooth="yes" name="dv01"/>
       <point x="557" y="391"/>
       <point x="625" y="476"/>
       <point x="682" y="635" type="curve"/>
@@ -44,10 +44,10 @@
       <point x="580" y="819" type="curve" smooth="yes"/>
       <point x="549" y="852"/>
       <point x="514" y="868"/>
-      <point x="474" y="868" type="curve" name="sv04" smooth="yes"/>
+      <point x="474" y="868" type="curve" smooth="yes" name="sv04"/>
       <point x="378" y="868"/>
       <point x="312" y="773"/>
-      <point x="312" y="624" type="curve" name="dh02" smooth="yes"/>
+      <point x="312" y="624" type="curve" smooth="yes" name="dh02"/>
       <point x="312" y="484"/>
       <point x="371" y="391"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/psi.glif b/source/Hack-Regular.ufo/glyphs/psi.glif
index 71d4ed0f0..937b7d832 100644
--- a/source/Hack-Regular.ufo/glyphs/psi.glif
+++ b/source/Hack-Regular.ufo/glyphs/psi.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="psi" format="1">
+<glyph name="psi" format="2">
   <advance width="1233"/>
   <unicode hex="03C8"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="525" y="-25" type="line" name="hr00"/>
       <point x="333" y="-25"/>
       <point x="131" y="185"/>
-      <point x="131" y="472" type="curve" name="sh01" smooth="yes"/>
+      <point x="131" y="472" type="curve" smooth="yes" name="sh01"/>
       <point x="131" y="1120" type="line" name="at01"/>
       <point x="316" y="1120" type="line"/>
-      <point x="316" y="479" type="line" name="sh02" smooth="yes"/>
+      <point x="316" y="479" type="line" smooth="yes" name="sh02"/>
       <point x="316" y="360"/>
       <point x="345" y="285"/>
       <point x="400" y="226" type="curve" smooth="yes"/>
@@ -25,10 +25,10 @@
       <point x="833" y="226" type="curve" smooth="yes"/>
       <point x="888" y="285"/>
       <point x="917" y="360"/>
-      <point x="917" y="479" type="curve" name="sh06" smooth="yes"/>
+      <point x="917" y="479" type="curve" smooth="yes" name="sh06"/>
       <point x="917" y="1120" type="line" name="at03"/>
       <point x="1102" y="1120" type="line"/>
-      <point x="1102" y="472" type="line" name="sh07" smooth="yes"/>
+      <point x="1102" y="472" type="line" smooth="yes" name="sh07"/>
       <point x="1102" y="185"/>
       <point x="900" y="-25"/>
       <point x="708" y="-25" type="curve" name="sh04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/q.glif b/source/Hack-Regular.ufo/glyphs/q.glif
index c65cd8015..9035ed520 100644
--- a/source/Hack-Regular.ufo/glyphs/q.glif
+++ b/source/Hack-Regular.ufo/glyphs/q.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="q" format="1">
+<glyph name="q" format="2">
   <advance width="1233"/>
   <unicode hex="0071"/>
   <outline>
@@ -38,9 +38,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/question.glif b/source/Hack-Regular.ufo/glyphs/question.glif
index 9a7f9e5bf..57d38a3f0 100644
--- a/source/Hack-Regular.ufo/glyphs/question.glif
+++ b/source/Hack-Regular.ufo/glyphs/question.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="question" format="1">
+<glyph name="question" format="2">
   <advance width="1233"/>
   <unicode hex="003F"/>
   <outline>
     <contour>
-      <point x="494" y="583" type="line" name="ih01" smooth="yes"/>
+      <point x="494" y="583" type="line" smooth="yes" name="ih01"/>
       <point x="494" y="635"/>
       <point x="504" y="684"/>
       <point x="524" y="729" type="curve" smooth="yes"/>
@@ -17,13 +17,13 @@
       <point x="814" y="1072" type="curve" smooth="yes"/>
       <point x="830" y="1101"/>
       <point x="838" y="1132"/>
-      <point x="838" y="1166" type="curve" name="dh03" smooth="yes"/>
+      <point x="838" y="1166" type="curve" smooth="yes" name="dh03"/>
       <point x="838" y="1229"/>
       <point x="812" y="1276"/>
       <point x="773" y="1309" type="curve" smooth="yes"/>
       <point x="729" y="1346"/>
       <point x="671" y="1364"/>
-      <point x="600" y="1364" type="curve" name="dv03" smooth="yes"/>
+      <point x="600" y="1364" type="curve" smooth="yes" name="dv03"/>
       <point x="545" y="1364"/>
       <point x="489" y="1353"/>
       <point x="431" y="1330" type="curve" smooth="yes"/>
@@ -36,13 +36,13 @@
       <point x="434" y="1500" type="curve" smooth="yes"/>
       <point x="495" y="1519"/>
       <point x="560" y="1528"/>
-      <point x="629" y="1528" type="curve" name="dv04" smooth="yes"/>
+      <point x="629" y="1528" type="curve" smooth="yes" name="dv04"/>
       <point x="762" y="1528"/>
       <point x="863" y="1492"/>
       <point x="931" y="1432" type="curve" smooth="yes"/>
       <point x="1003" y="1368"/>
       <point x="1040" y="1278"/>
-      <point x="1040" y="1178" type="curve" name="dh04" smooth="yes"/>
+      <point x="1040" y="1178" type="curve" smooth="yes" name="dh04"/>
       <point x="1040" y="1125"/>
       <point x="1029" y="1076"/>
       <point x="1006" y="1033" type="curve" smooth="yes"/>
@@ -55,30 +55,30 @@
       <point x="703" y="682" type="curve" smooth="yes"/>
       <point x="690" y="655"/>
       <point x="684" y="628"/>
-      <point x="684" y="599" type="curve" name="sh01" smooth="yes"/>
+      <point x="684" y="599" type="curve" smooth="yes" name="sh01"/>
       <point x="684" y="472" type="line"/>
       <point x="494" y="472" type="line"/>
     </contour>
     <contour>
-      <point x="593" y="-40" type="curve" name="dv01" smooth="yes"/>
+      <point x="593" y="-40" type="curve" smooth="yes" name="dv01"/>
       <point x="552" y="-40"/>
       <point x="517" y="-26"/>
       <point x="489" y="2" type="curve" smooth="yes"/>
       <point x="460" y="31"/>
       <point x="446" y="70"/>
-      <point x="446" y="113" type="curve" name="dh01" smooth="yes"/>
+      <point x="446" y="113" type="curve" smooth="yes" name="dh01"/>
       <point x="446" y="156"/>
       <point x="460" y="194"/>
       <point x="488" y="222" type="curve" smooth="yes"/>
       <point x="511" y="245"/>
       <point x="547" y="264"/>
-      <point x="592" y="264" type="curve" name="dv02" smooth="yes"/>
+      <point x="592" y="264" type="curve" smooth="yes" name="dv02"/>
       <point x="635" y="264"/>
       <point x="669" y="249"/>
       <point x="696" y="222" type="curve" smooth="yes"/>
       <point x="724" y="194"/>
       <point x="738" y="158"/>
-      <point x="738" y="113" type="curve" name="dh02" smooth="yes"/>
+      <point x="738" y="113" type="curve" smooth="yes" name="dh02"/>
       <point x="738" y="68"/>
       <point x="724" y="31"/>
       <point x="696" y="3" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/questiondown.case.glif b/source/Hack-Regular.ufo/glyphs/questiondown.case.glif
index 3a86748fc..128692aff 100644
--- a/source/Hack-Regular.ufo/glyphs/questiondown.case.glif
+++ b/source/Hack-Regular.ufo/glyphs/questiondown.case.glif
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="questiondown.case" format="1">
+<glyph name="questiondown.case" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="646" y="1230" type="curve" name="dv01" smooth="yes"/>
+      <point x="646" y="1230" type="curve" smooth="yes" name="dv01"/>
       <point x="605" y="1230"/>
       <point x="570" y="1244"/>
       <point x="542" y="1272" type="curve" smooth="yes"/>
       <point x="513" y="1301"/>
       <point x="499" y="1340"/>
-      <point x="499" y="1383" type="curve" name="dh03" smooth="yes"/>
+      <point x="499" y="1383" type="curve" smooth="yes" name="dh03"/>
       <point x="499" y="1426"/>
       <point x="513" y="1464"/>
       <point x="541" y="1492" type="curve" smooth="yes"/>
       <point x="564" y="1515"/>
       <point x="600" y="1534"/>
-      <point x="645" y="1534" type="curve" name="dv02" smooth="yes"/>
+      <point x="645" y="1534" type="curve" smooth="yes" name="dv02"/>
       <point x="688" y="1534"/>
       <point x="722" y="1519"/>
       <point x="749" y="1492" type="curve" smooth="yes"/>
       <point x="777" y="1464"/>
       <point x="791" y="1428"/>
-      <point x="791" y="1383" type="curve" name="dh04" smooth="yes"/>
+      <point x="791" y="1383" type="curve" smooth="yes" name="dh04"/>
       <point x="791" y="1338"/>
       <point x="777" y="1301"/>
       <point x="749" y="1273" type="curve" smooth="yes"/>
@@ -29,34 +29,34 @@
       <point x="686" y="1230"/>
     </contour>
     <contour>
-      <point x="605" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="605" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="351" y="-27"/>
       <point x="193" y="112"/>
-      <point x="193" y="325" type="curve" name="dh01" smooth="yes"/>
+      <point x="193" y="325" type="curve" smooth="yes" name="dh01"/>
       <point x="193" y="424"/>
       <point x="227" y="501"/>
       <point x="354" y="625" type="curve" smooth="yes"/>
       <point x="442" y="711" type="line"/>
       <point x="531" y="800"/>
       <point x="547" y="832"/>
-      <point x="547" y="922" type="curve" name="sh01" smooth="yes"/>
+      <point x="547" y="922" type="curve" smooth="yes" name="sh01"/>
       <point x="547" y="927" type="line"/>
       <point x="548" y="942"/>
       <point x="549" y="956"/>
-      <point x="549" y="969" type="curve" name="ih01" smooth="yes"/>
+      <point x="549" y="969" type="curve" smooth="yes" name="ih01"/>
       <point x="549" y="1092" type="line"/>
       <point x="739" y="1092" type="line"/>
-      <point x="739" y="938" type="line" name="sh02" smooth="yes"/>
+      <point x="739" y="938" type="line" smooth="yes" name="sh02"/>
       <point x="739" y="799"/>
       <point x="701" y="728"/>
       <point x="594" y="621" type="curve" smooth="yes"/>
-      <point x="504" y="532" type="line" name="hr01" smooth="yes"/>
+      <point x="504" y="532" type="line" smooth="yes" name="hr01"/>
       <point x="427" y="455"/>
       <point x="395" y="411"/>
-      <point x="395" y="338" type="curve" name="dh02" smooth="yes"/>
+      <point x="395" y="338" type="curve" smooth="yes" name="dh02"/>
       <point x="395" y="217"/>
       <point x="490" y="137"/>
-      <point x="633" y="137" type="curve" name="sv01" smooth="yes"/>
+      <point x="633" y="137" type="curve" smooth="yes" name="sv01"/>
       <point x="742" y="137"/>
       <point x="858" y="183"/>
       <point x="989" y="274" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/questiondown.glif b/source/Hack-Regular.ufo/glyphs/questiondown.glif
index 643d9e67e..7d6f9574d 100644
--- a/source/Hack-Regular.ufo/glyphs/questiondown.glif
+++ b/source/Hack-Regular.ufo/glyphs/questiondown.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="questiondown" format="1">
+<glyph name="questiondown" format="2">
   <advance width="1233"/>
   <unicode hex="00BF"/>
   <outline>
     <contour>
-      <point x="656" y="1252" type="curve" name="sv01" smooth="yes"/>
+      <point x="656" y="1252" type="curve" smooth="yes" name="sv01"/>
       <point x="615" y="1252"/>
       <point x="580" y="1266"/>
       <point x="552" y="1294" type="curve" smooth="yes"/>
       <point x="523" y="1323"/>
       <point x="509" y="1362"/>
-      <point x="509" y="1405" type="curve" name="dh03" smooth="yes"/>
+      <point x="509" y="1405" type="curve" smooth="yes" name="dh03"/>
       <point x="509" y="1448"/>
       <point x="523" y="1486"/>
       <point x="551" y="1514" type="curve" smooth="yes"/>
       <point x="574" y="1537"/>
       <point x="610" y="1556"/>
-      <point x="655" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="655" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="698" y="1556"/>
       <point x="732" y="1541"/>
       <point x="759" y="1514" type="curve" smooth="yes"/>
       <point x="787" y="1486"/>
       <point x="801" y="1450"/>
-      <point x="801" y="1405" type="curve" name="dh04" smooth="yes"/>
+      <point x="801" y="1405" type="curve" smooth="yes" name="dh04"/>
       <point x="801" y="1360"/>
       <point x="787" y="1323"/>
       <point x="759" y="1295" type="curve" smooth="yes"/>
@@ -30,13 +30,13 @@
       <point x="696" y="1252"/>
     </contour>
     <contour>
-      <point x="602" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="602" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="477" y="-27"/>
       <point x="377" y="5"/>
       <point x="304" y="68" type="curve" smooth="yes"/>
       <point x="232" y="131"/>
       <point x="193" y="219"/>
-      <point x="193" y="324" type="curve" name="dh01" smooth="yes"/>
+      <point x="193" y="324" type="curve" smooth="yes" name="dh01"/>
       <point x="193" y="434"/>
       <point x="226" y="500"/>
       <point x="354" y="625" type="curve" smooth="yes"/>
@@ -46,14 +46,14 @@
       <point x="528" y="817" type="curve" smooth="yes"/>
       <point x="541" y="844"/>
       <point x="547" y="879"/>
-      <point x="547" y="922" type="curve" name="sh01" smooth="yes"/>
+      <point x="547" y="922" type="curve" smooth="yes" name="sh01"/>
       <point x="547" y="927" type="line"/>
       <point x="548" y="942"/>
       <point x="549" y="956"/>
-      <point x="549" y="969" type="curve" name="ih01" smooth="yes"/>
+      <point x="549" y="969" type="curve" smooth="yes" name="ih01"/>
       <point x="549" y="1092" type="line"/>
       <point x="739" y="1092" type="line"/>
-      <point x="739" y="938" type="line" name="sh02" smooth="yes"/>
+      <point x="739" y="938" type="line" smooth="yes" name="sh02"/>
       <point x="739" y="872"/>
       <point x="729" y="817"/>
       <point x="709" y="772" type="curve" smooth="yes"/>
@@ -66,13 +66,13 @@
       <point x="418" y="429" type="curve" smooth="yes"/>
       <point x="401" y="397"/>
       <point x="395" y="359"/>
-      <point x="395" y="332" type="curve" name="dh02" smooth="yes"/>
+      <point x="395" y="332" type="curve" smooth="yes" name="dh02"/>
       <point x="395" y="275"/>
       <point x="421" y="224"/>
       <point x="460" y="192" type="curve" smooth="yes"/>
       <point x="504" y="155"/>
       <point x="565" y="137"/>
-      <point x="633" y="137" type="curve" name="hr01" smooth="yes"/>
+      <point x="633" y="137" type="curve" smooth="yes" name="hr01"/>
       <point x="689" y="137"/>
       <point x="742" y="149"/>
       <point x="802" y="172" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/quotedbl.glif b/source/Hack-Regular.ufo/glyphs/quotedbl.glif
index a061881d9..4843ea44a 100644
--- a/source/Hack-Regular.ufo/glyphs/quotedbl.glif
+++ b/source/Hack-Regular.ufo/glyphs/quotedbl.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotedbl" format="1">
+<glyph name="quotedbl" format="2">
   <advance width="1233"/>
   <unicode hex="0022"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/quotedblbase.glif b/source/Hack-Regular.ufo/glyphs/quotedblbase.glif
index 38cf29562..d8ce3aa23 100644
--- a/source/Hack-Regular.ufo/glyphs/quotedblbase.glif
+++ b/source/Hack-Regular.ufo/glyphs/quotedblbase.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotedblbase" format="1">
+<glyph name="quotedblbase" format="2">
   <advance width="1233"/>
   <unicode hex="201E"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/quotedblleft.glif b/source/Hack-Regular.ufo/glyphs/quotedblleft.glif
index 5ef4ecf95..c9b8b41de 100644
--- a/source/Hack-Regular.ufo/glyphs/quotedblleft.glif
+++ b/source/Hack-Regular.ufo/glyphs/quotedblleft.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotedblleft" format="1">
+<glyph name="quotedblleft" format="2">
   <advance width="1233"/>
   <unicode hex="201C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/quotedblright.glif b/source/Hack-Regular.ufo/glyphs/quotedblright.glif
index cc848ab10..e0498b1de 100644
--- a/source/Hack-Regular.ufo/glyphs/quotedblright.glif
+++ b/source/Hack-Regular.ufo/glyphs/quotedblright.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotedblright" format="1">
+<glyph name="quotedblright" format="2">
   <advance width="1233"/>
   <unicode hex="201D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/quoteleft.glif b/source/Hack-Regular.ufo/glyphs/quoteleft.glif
index e98c0f4ee..b5f43d9da 100644
--- a/source/Hack-Regular.ufo/glyphs/quoteleft.glif
+++ b/source/Hack-Regular.ufo/glyphs/quoteleft.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quoteleft" format="1">
+<glyph name="quoteleft" format="2">
   <advance width="1233"/>
   <unicode hex="2018"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/quotereversed.glif b/source/Hack-Regular.ufo/glyphs/quotereversed.glif
index 3ccd4036a..31c0b9e92 100644
--- a/source/Hack-Regular.ufo/glyphs/quotereversed.glif
+++ b/source/Hack-Regular.ufo/glyphs/quotereversed.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotereversed" format="1">
+<glyph name="quotereversed" format="2">
   <advance width="1233"/>
   <unicode hex="201B"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/quoteright.glif b/source/Hack-Regular.ufo/glyphs/quoteright.glif
index 85e3b2b61..6e4b27900 100644
--- a/source/Hack-Regular.ufo/glyphs/quoteright.glif
+++ b/source/Hack-Regular.ufo/glyphs/quoteright.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quoteright" format="1">
+<glyph name="quoteright" format="2">
   <advance width="1233"/>
   <unicode hex="2019"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/quotesinglbase.glif b/source/Hack-Regular.ufo/glyphs/quotesinglbase.glif
index 35e44f793..54183f52d 100644
--- a/source/Hack-Regular.ufo/glyphs/quotesinglbase.glif
+++ b/source/Hack-Regular.ufo/glyphs/quotesinglbase.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotesinglbase" format="1">
+<glyph name="quotesinglbase" format="2">
   <advance width="1233"/>
   <unicode hex="201A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/quotesingle.glif b/source/Hack-Regular.ufo/glyphs/quotesingle.glif
index 33d2c4213..3eea5dde4 100644
--- a/source/Hack-Regular.ufo/glyphs/quotesingle.glif
+++ b/source/Hack-Regular.ufo/glyphs/quotesingle.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="quotesingle" format="1">
+<glyph name="quotesingle" format="2">
   <advance width="1233"/>
   <unicode hex="0027"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/r.glif b/source/Hack-Regular.ufo/glyphs/r.glif
index 6dac79765..464ecc5d4 100644
--- a/source/Hack-Regular.ufo/glyphs/r.glif
+++ b/source/Hack-Regular.ufo/glyphs/r.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="r" format="1">
+<glyph name="r" format="2">
   <advance width="1233"/>
   <unicode hex="0072"/>
   <outline>
@@ -25,9 +25,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/racute.glif b/source/Hack-Regular.ufo/glyphs/racute.glif
index 8521e4f97..cb7ed92dd 100644
--- a/source/Hack-Regular.ufo/glyphs/racute.glif
+++ b/source/Hack-Regular.ufo/glyphs/racute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="racute" format="1">
+<glyph name="racute" format="2">
   <advance width="1233"/>
   <unicode hex="0155"/>
   <outline>
@@ -15,17 +15,17 @@
       <point x="487" y="901" type="line" name="dh02"/>
       <point x="547" y="1056"/>
       <point x="673" y="1147"/>
-      <point x="856" y="1147" type="curve" name="sv02" smooth="yes"/>
+      <point x="856" y="1147" type="curve" smooth="yes" name="sv02"/>
       <point x="945" y="1147"/>
       <point x="1023" y="1125"/>
       <point x="1095" y="1077" type="curve" name="hr01"/>
       <point x="1095" y="889" type="line" name="iv02"/>
       <point x="1015" y="950"/>
       <point x="938" y="977"/>
-      <point x="841" y="977" type="curve" name="sv01" smooth="yes"/>
+      <point x="841" y="977" type="curve" smooth="yes" name="sv01"/>
       <point x="610" y="977"/>
       <point x="487" y="830"/>
-      <point x="487" y="557" type="curve" name="sh01" smooth="yes"/>
+      <point x="487" y="557" type="curve" smooth="yes" name="sh01"/>
       <point x="487" y="0" type="line" name="ab01"/>
       <point x="302" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/radical.glif b/source/Hack-Regular.ufo/glyphs/radical.glif
index 57cfb03dc..11b800389 100644
--- a/source/Hack-Regular.ufo/glyphs/radical.glif
+++ b/source/Hack-Regular.ufo/glyphs/radical.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="radical" format="1">
+<glyph name="radical" format="2">
   <advance width="1233"/>
   <unicode hex="221A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/rcaron.glif b/source/Hack-Regular.ufo/glyphs/rcaron.glif
index 4be26d40a..4e435bf2b 100644
--- a/source/Hack-Regular.ufo/glyphs/rcaron.glif
+++ b/source/Hack-Regular.ufo/glyphs/rcaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="rcaron" format="1">
+<glyph name="rcaron" format="2">
   <advance width="1233"/>
   <unicode hex="0159"/>
   <outline>
@@ -18,17 +18,17 @@
       <point x="487" y="901" type="line" name="dh02"/>
       <point x="547" y="1056"/>
       <point x="673" y="1147"/>
-      <point x="856" y="1147" type="curve" name="sv02" smooth="yes"/>
+      <point x="856" y="1147" type="curve" smooth="yes" name="sv02"/>
       <point x="945" y="1147"/>
       <point x="1023" y="1125"/>
       <point x="1095" y="1077" type="curve"/>
       <point x="1095" y="889" type="line" name="iv02"/>
       <point x="1015" y="950"/>
       <point x="938" y="977"/>
-      <point x="841" y="977" type="curve" name="sv01" smooth="yes"/>
+      <point x="841" y="977" type="curve" smooth="yes" name="sv01"/>
       <point x="610" y="977"/>
       <point x="487" y="830"/>
-      <point x="487" y="557" type="curve" name="sh01" smooth="yes"/>
+      <point x="487" y="557" type="curve" smooth="yes" name="sh01"/>
       <point x="487" y="0" type="line" name="ab01"/>
       <point x="302" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/reflexsubset.glif b/source/Hack-Regular.ufo/glyphs/reflexsubset.glif
index 94df8e7ca..35ce6b628 100644
--- a/source/Hack-Regular.ufo/glyphs/reflexsubset.glif
+++ b/source/Hack-Regular.ufo/glyphs/reflexsubset.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="reflexsubset" format="1">
+<glyph name="reflexsubset" format="2">
   <advance width="1233"/>
   <unicode hex="2286"/>
   <outline>
     <contour>
-      <point x="566" y="324" type="line" name="hr00" smooth="yes"/>
+      <point x="566" y="324" type="line" smooth="yes" name="hr00"/>
       <point x="298" y="324"/>
       <point x="88" y="536"/>
-      <point x="88" y="802" type="curve" name="dh01" smooth="yes"/>
+      <point x="88" y="802" type="curve" smooth="yes" name="dh01"/>
       <point x="88" y="1067"/>
       <point x="298" y="1280"/>
       <point x="565" y="1280" type="curve" smooth="yes"/>
@@ -16,10 +16,10 @@
       <point x="565" y="1130" type="line" smooth="yes"/>
       <point x="382" y="1130"/>
       <point x="238" y="982"/>
-      <point x="238" y="801" type="curve" name="dh02" smooth="yes"/>
+      <point x="238" y="801" type="curve" smooth="yes" name="dh02"/>
       <point x="238" y="618"/>
       <point x="384" y="474"/>
-      <point x="565" y="474" type="curve" name="dv03" smooth="yes"/>
+      <point x="565" y="474" type="curve" smooth="yes" name="dv03"/>
       <point x="1145" y="474" type="line"/>
       <point x="1145" y="324" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/reflexsuperset.glif b/source/Hack-Regular.ufo/glyphs/reflexsuperset.glif
index 6659c78ec..3fd28e63a 100644
--- a/source/Hack-Regular.ufo/glyphs/reflexsuperset.glif
+++ b/source/Hack-Regular.ufo/glyphs/reflexsuperset.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="reflexsuperset" format="1">
+<glyph name="reflexsuperset" format="2">
   <advance width="1233"/>
   <unicode hex="2287"/>
   <outline>
     <contour>
       <point x="88" y="474" type="line" name="hr00"/>
-      <point x="668" y="474" type="line" name="dv04" smooth="yes"/>
+      <point x="668" y="474" type="line" smooth="yes" name="dv04"/>
       <point x="849" y="474"/>
       <point x="995" y="618"/>
-      <point x="995" y="801" type="curve" name="dh01" smooth="yes"/>
+      <point x="995" y="801" type="curve" smooth="yes" name="dh01"/>
       <point x="995" y="982"/>
       <point x="851" y="1130"/>
-      <point x="668" y="1130" type="curve" name="dv01" smooth="yes"/>
+      <point x="668" y="1130" type="curve" smooth="yes" name="dv01"/>
       <point x="88" y="1130" type="line"/>
       <point x="88" y="1280" type="line"/>
-      <point x="668" y="1280" type="line" name="dv02" smooth="yes"/>
+      <point x="668" y="1280" type="line" smooth="yes" name="dv02"/>
       <point x="935" y="1280"/>
       <point x="1145" y="1067"/>
-      <point x="1145" y="802" type="curve" name="dh02" smooth="yes"/>
+      <point x="1145" y="802" type="curve" smooth="yes" name="dh02"/>
       <point x="1145" y="536"/>
       <point x="935" y="324"/>
-      <point x="667" y="324" type="curve" name="dv03" smooth="yes"/>
+      <point x="667" y="324" type="curve" smooth="yes" name="dv03"/>
       <point x="88" y="324" type="line"/>
     </contour>
     <contour>
diff --git a/source/Hack-Regular.ufo/glyphs/registered.glif b/source/Hack-Regular.ufo/glyphs/registered.glif
index f667cacb5..3b2b6f6c5 100644
--- a/source/Hack-Regular.ufo/glyphs/registered.glif
+++ b/source/Hack-Regular.ufo/glyphs/registered.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="registered" format="1">
+<glyph name="registered" format="2">
   <advance width="1233"/>
   <unicode hex="00AE"/>
   <outline>
     <contour>
-      <point x="616" y="125" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="125" type="curve" smooth="yes" name="hr00"/>
       <point x="448" y="125"/>
       <point x="302" y="186"/>
       <point x="181" y="307" type="curve" smooth="yes"/>
@@ -13,7 +13,7 @@
       <point x="46" y="507" type="curve" smooth="yes"/>
       <point x="15" y="579"/>
       <point x="0" y="653"/>
-      <point x="0" y="741" type="curve" name="dh01" smooth="yes"/>
+      <point x="0" y="741" type="curve" smooth="yes" name="dh01"/>
       <point x="0" y="826"/>
       <point x="15" y="905"/>
       <point x="46" y="977" type="curve" smooth="yes"/>
@@ -25,7 +25,7 @@
       <point x="381" y="1313" type="curve" smooth="yes"/>
       <point x="454" y="1343"/>
       <point x="532" y="1358"/>
-      <point x="616" y="1358" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1358" type="curve" smooth="yes" name="dv03"/>
       <point x="700" y="1358"/>
       <point x="779" y="1343"/>
       <point x="852" y="1313" type="curve" smooth="yes"/>
@@ -37,7 +37,7 @@
       <point x="1187" y="977" type="curve" smooth="yes"/>
       <point x="1218" y="905"/>
       <point x="1233" y="827"/>
-      <point x="1233" y="742" type="curve" name="dh08" smooth="yes"/>
+      <point x="1233" y="742" type="curve" smooth="yes" name="dh08"/>
       <point x="1233" y="657"/>
       <point x="1218" y="579"/>
       <point x="1188" y="508" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="701" y="125"/>
     </contour>
     <contour>
-      <point x="617" y="227" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="227" type="curve" smooth="yes" name="dv01"/>
       <point x="686" y="227"/>
       <point x="751" y="240"/>
       <point x="812" y="265" type="curve" smooth="yes"/>
@@ -63,7 +63,7 @@
       <point x="1093" y="546" type="curve" smooth="yes"/>
       <point x="1118" y="605"/>
       <point x="1130" y="670"/>
-      <point x="1130" y="741" type="curve" name="dh07" smooth="yes"/>
+      <point x="1130" y="741" type="curve" smooth="yes" name="dh07"/>
       <point x="1130" y="813"/>
       <point x="1117" y="878"/>
       <point x="1092" y="939" type="curve" smooth="yes"/>
@@ -75,7 +75,7 @@
       <point x="814" y="1218" type="curve" smooth="yes"/>
       <point x="754" y="1243"/>
       <point x="688" y="1255"/>
-      <point x="616" y="1255" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1255" type="curve" smooth="yes" name="dv02"/>
       <point x="545" y="1255"/>
       <point x="479" y="1243"/>
       <point x="420" y="1218" type="curve" smooth="yes"/>
@@ -87,7 +87,7 @@
       <point x="141" y="939" type="curve" smooth="yes"/>
       <point x="115" y="877"/>
       <point x="102" y="811"/>
-      <point x="102" y="742" type="curve" name="dh02" smooth="yes"/>
+      <point x="102" y="742" type="curve" smooth="yes" name="dh02"/>
       <point x="102" y="670"/>
       <point x="114" y="609"/>
       <point x="141" y="546" type="curve" smooth="yes"/>
@@ -102,13 +102,13 @@
     </contour>
     <contour>
       <point x="362" y="1100" type="line" name="dh03"/>
-      <point x="600" y="1100" type="line" name="dv05" smooth="yes"/>
+      <point x="600" y="1100" type="line" smooth="yes" name="dv05"/>
       <point x="699" y="1100"/>
       <point x="772" y="1084"/>
       <point x="819" y="1051" type="curve" smooth="yes"/>
       <point x="867" y="1018"/>
       <point x="891" y="968"/>
-      <point x="891" y="903" type="curve" name="dh06" smooth="yes"/>
+      <point x="891" y="903" type="curve" smooth="yes" name="dh06"/>
       <point x="891" y="852"/>
       <point x="876" y="815"/>
       <point x="847" y="784" type="curve" smooth="yes"/>
@@ -141,13 +141,13 @@
       <point x="721" y="811" type="curve" smooth="yes"/>
       <point x="746" y="829"/>
       <point x="758" y="859"/>
-      <point x="758" y="900" type="curve" name="dh05" smooth="yes"/>
+      <point x="758" y="900" type="curve" smooth="yes" name="dh05"/>
       <point x="758" y="939"/>
       <point x="748" y="971"/>
       <point x="721" y="990" type="curve" smooth="yes"/>
       <point x="696" y="1007"/>
       <point x="653" y="1016"/>
-      <point x="594" y="1016" type="curve" name="dv04" smooth="yes"/>
+      <point x="594" y="1016" type="curve" smooth="yes" name="dv04"/>
       <point x="492" y="1016" type="line" name="dh04"/>
       <point x="492" y="784" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/revlogicalnot.glif b/source/Hack-Regular.ufo/glyphs/revlogicalnot.glif
index f4b23ea54..05d28b867 100644
--- a/source/Hack-Regular.ufo/glyphs/revlogicalnot.glif
+++ b/source/Hack-Regular.ufo/glyphs/revlogicalnot.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="revlogicalnot" format="1">
+<glyph name="revlogicalnot" format="2">
   <advance width="1233"/>
   <unicode hex="2310"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/rho.glif b/source/Hack-Regular.ufo/glyphs/rho.glif
index 6e192d707..16c663c7f 100644
--- a/source/Hack-Regular.ufo/glyphs/rho.glif
+++ b/source/Hack-Regular.ufo/glyphs/rho.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="rho" format="1">
+<glyph name="rho" format="2">
   <advance width="1233"/>
   <unicode hex="03C1"/>
   <outline>
     <contour>
-      <point x="180" y="540" type="line" name="hr00" smooth="yes"/>
+      <point x="180" y="540" type="line" smooth="yes" name="hr00"/>
       <point x="180" y="961"/>
       <point x="350" y="1147"/>
-      <point x="633" y="1147" type="curve" name="dv02" smooth="yes"/>
+      <point x="633" y="1147" type="curve" smooth="yes" name="dv02"/>
       <point x="943" y="1147"/>
       <point x="1098" y="924"/>
-      <point x="1098" y="562" type="curve" name="sh01" smooth="yes"/>
+      <point x="1098" y="562" type="curve" smooth="yes" name="sh01"/>
       <point x="1098" y="189"/>
       <point x="933" y="-29"/>
-      <point x="666" y="-29" type="curve" name="dv03" smooth="yes"/>
+      <point x="666" y="-29" type="curve" smooth="yes" name="dv03"/>
       <point x="526" y="-29"/>
       <point x="425" y="29"/>
       <point x="365" y="141" type="curve" name="sh03"/>
@@ -21,16 +21,16 @@
       <point x="180" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="637" y="127" type="curve" name="dv04" smooth="yes"/>
+      <point x="637" y="127" type="curve" smooth="yes" name="dv04"/>
       <point x="816" y="127"/>
       <point x="905" y="272"/>
-      <point x="905" y="559" type="curve" name="ah01" smooth="yes"/>
+      <point x="905" y="559" type="curve" smooth="yes" name="ah01"/>
       <point x="905" y="846"/>
       <point x="816" y="991"/>
-      <point x="637" y="991" type="curve" name="dv01" smooth="yes"/>
+      <point x="637" y="991" type="curve" smooth="yes" name="dv01"/>
       <point x="457" y="991"/>
       <point x="365" y="844"/>
-      <point x="365" y="559" type="curve" name="sh02" smooth="yes"/>
+      <point x="365" y="559" type="curve" smooth="yes" name="sh02"/>
       <point x="365" y="274"/>
       <point x="457" y="127"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/ring.glif b/source/Hack-Regular.ufo/glyphs/ring.glif
index 7765ac74e..eaf104b78 100644
--- a/source/Hack-Regular.ufo/glyphs/ring.glif
+++ b/source/Hack-Regular.ufo/glyphs/ring.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ring" format="1">
+<glyph name="ring" format="2">
   <advance width="1233"/>
   <unicode hex="02DA"/>
   <outline>
     <contour>
-      <point x="891" y="1524" type="curve" name="hr00" smooth="yes"/>
+      <point x="891" y="1524" type="curve" smooth="yes" name="hr00"/>
       <point x="891" y="1447"/>
       <point x="865" y="1382"/>
       <point x="812" y="1329" type="curve" smooth="yes"/>
       <point x="759" y="1276"/>
       <point x="693" y="1249"/>
-      <point x="616" y="1249" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1249" type="curve" smooth="yes" name="dv01"/>
       <point x="540" y="1249"/>
       <point x="475" y="1276"/>
       <point x="422" y="1329" type="curve" smooth="yes"/>
       <point x="369" y="1382"/>
       <point x="342" y="1447"/>
-      <point x="342" y="1524" type="curve" name="sh01" smooth="yes"/>
+      <point x="342" y="1524" type="curve" smooth="yes" name="sh01"/>
       <point x="342" y="1601"/>
       <point x="369" y="1666"/>
       <point x="422" y="1719" type="curve" smooth="yes"/>
       <point x="475" y="1772"/>
       <point x="539" y="1798"/>
-      <point x="616" y="1798" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="1798" type="curve" smooth="yes" name="dv04"/>
       <point x="694" y="1798"/>
       <point x="759" y="1772"/>
       <point x="812" y="1719" type="curve" smooth="yes"/>
@@ -30,19 +30,19 @@
       <point x="891" y="1601"/>
     </contour>
     <contour>
-      <point x="768" y="1524" type="curve" name="ah01" smooth="yes"/>
+      <point x="768" y="1524" type="curve" smooth="yes" name="ah01"/>
       <point x="768" y="1608"/>
       <point x="702" y="1675"/>
-      <point x="615" y="1675" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1675" type="curve" smooth="yes" name="dv03"/>
       <point x="573" y="1675"/>
       <point x="538" y="1661"/>
       <point x="509" y="1632" type="curve" smooth="yes"/>
       <point x="480" y="1603"/>
       <point x="465" y="1567"/>
-      <point x="465" y="1524" type="curve" name="sh02" smooth="yes"/>
+      <point x="465" y="1524" type="curve" smooth="yes" name="sh02"/>
       <point x="465" y="1439"/>
       <point x="532" y="1372"/>
-      <point x="616" y="1372" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1372" type="curve" smooth="yes" name="dv02"/>
       <point x="701" y="1372"/>
       <point x="768" y="1439"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/rtblock.glif b/source/Hack-Regular.ufo/glyphs/rtblock.glif
index 992039b74..47a5058d3 100644
--- a/source/Hack-Regular.ufo/glyphs/rtblock.glif
+++ b/source/Hack-Regular.ufo/glyphs/rtblock.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="rtblock" format="1">
+<glyph name="rtblock" format="2">
   <advance width="1233"/>
   <unicode hex="2590"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/ruble.glif b/source/Hack-Regular.ufo/glyphs/ruble.glif
new file mode 100644
index 000000000..85f8cd3ac
--- /dev/null
+++ b/source/Hack-Regular.ufo/glyphs/ruble.glif
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="ruble" format="2">
+  <advance width="1233"/>
+  <unicode hex="20BD"/>
+  <outline>
+    <contour>
+      <point x="970" y="600"/>
+      <point x="1141" y="751"/>
+      <point x="1141" y="1046" type="curve" smooth="yes" name="sh01"/>
+      <point x="1141" y="1342"/>
+      <point x="968" y="1493"/>
+      <point x="633" y="1493" type="curve" smooth="yes"/>
+      <point x="197" y="1493" type="line" name="hr00"/>
+      <point x="197" y="766" type="line"/>
+      <point x="78" y="766" type="line"/>
+      <point x="78" y="600" type="line"/>
+      <point x="197" y="600" type="line"/>
+      <point x="197" y="455" type="line"/>
+      <point x="78" y="455" type="line"/>
+      <point x="78" y="289" type="line"/>
+      <point x="197" y="289" type="line"/>
+      <point x="197" y="0" type="line"/>
+      <point x="399" y="0" type="line" name="ab01"/>
+      <point x="399" y="289" type="line"/>
+      <point x="886" y="289" type="line"/>
+      <point x="886" y="455" type="line"/>
+      <point x="399" y="455" type="line"/>
+      <point x="399" y="600" type="line" name="sh03"/>
+      <point x="633" y="600" type="line" smooth="yes" name="dv01"/>
+    </contour>
+    <contour>
+      <point x="633" y="1327" type="line" smooth="yes" name="sv01"/>
+      <point x="822" y="1327"/>
+      <point x="930" y="1226"/>
+      <point x="930" y="1047" type="curve" smooth="yes" name="ah01"/>
+      <point x="930" y="868"/>
+      <point x="821" y="766"/>
+      <point x="633" y="766" type="curve" smooth="yes" name="dv02"/>
+      <point x="399" y="766" type="line"/>
+      <point x="399" y="1327" type="line" name="sh02"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2018-05-13 11:18:51 +0000</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/s.glif b/source/Hack-Regular.ufo/glyphs/s.glif
index a0427578a..f67d5bc8a 100644
--- a/source/Hack-Regular.ufo/glyphs/s.glif
+++ b/source/Hack-Regular.ufo/glyphs/s.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="s" format="1">
+<glyph name="s" format="2">
   <advance width="1233"/>
   <unicode hex="0073"/>
   <outline>
@@ -47,9 +47,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/sacute.glif b/source/Hack-Regular.ufo/glyphs/sacute.glif
index c1cbd0615..6ec0d38d9 100644
--- a/source/Hack-Regular.ufo/glyphs/sacute.glif
+++ b/source/Hack-Regular.ufo/glyphs/sacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="sacute" format="1">
+<glyph name="sacute" format="2">
   <advance width="1233"/>
   <unicode hex="015B"/>
   <outline>
@@ -10,17 +10,17 @@
       <point x="501" y="1297" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="587" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="587" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="471" y="-29"/>
       <point x="354" y="-6"/>
       <point x="213" y="41" type="curve" name="sh03"/>
       <point x="213" y="231" type="line"/>
       <point x="350" y="160"/>
       <point x="475" y="125"/>
-      <point x="588" y="125" type="curve" name="dv02" smooth="yes"/>
+      <point x="588" y="125" type="curve" smooth="yes" name="dv02"/>
       <point x="751" y="125"/>
       <point x="844" y="198"/>
-      <point x="844" y="305" type="curve" name="ah01" smooth="yes"/>
+      <point x="844" y="305" type="curve" smooth="yes" name="ah01"/>
       <point x="844" y="396"/>
       <point x="776" y="452"/>
       <point x="599" y="490" type="curve" smooth="yes"/>
@@ -28,20 +28,20 @@
       <point x="522" y="506" type="line" smooth="yes"/>
       <point x="303" y="549"/>
       <point x="217" y="646"/>
-      <point x="217" y="810" type="curve" name="sh02" smooth="yes"/>
+      <point x="217" y="810" type="curve" smooth="yes" name="sh02"/>
       <point x="217" y="1027"/>
       <point x="364" y="1147"/>
-      <point x="639" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="639" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="754" y="1147"/>
       <point x="866" y="1125"/>
       <point x="973" y="1081" type="curve"/>
       <point x="973" y="901" type="line" name="ih03"/>
       <point x="865" y="962"/>
       <point x="765" y="993"/>
-      <point x="645" y="993" type="curve" name="dv03" smooth="yes"/>
+      <point x="645" y="993" type="curve" smooth="yes" name="dv03"/>
       <point x="484" y="993"/>
       <point x="403" y="938"/>
-      <point x="403" y="828" type="curve" name="sh04" smooth="yes"/>
+      <point x="403" y="828" type="curve" smooth="yes" name="sh04"/>
       <point x="403" y="781"/>
       <point x="418" y="741"/>
       <point x="449" y="717" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="752" y="631" type="line" smooth="yes"/>
       <point x="936" y="596"/>
       <point x="1030" y="492"/>
-      <point x="1030" y="324" type="curve" name="sh01" smooth="yes"/>
+      <point x="1030" y="324" type="curve" smooth="yes" name="sh01"/>
       <point x="1030" y="103"/>
       <point x="863" y="-29"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/scaron.glif b/source/Hack-Regular.ufo/glyphs/scaron.glif
index d05f32631..6e7d61e3d 100644
--- a/source/Hack-Regular.ufo/glyphs/scaron.glif
+++ b/source/Hack-Regular.ufo/glyphs/scaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="scaron" format="1">
+<glyph name="scaron" format="2">
   <advance width="1233"/>
   <unicode hex="0161"/>
   <outline>
@@ -13,26 +13,26 @@
       <point x="543" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="590" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="590" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="531" y="-29"/>
       <point x="467" y="-23"/>
-      <point x="410" y="-12" type="curve" name="sh05" smooth="yes"/>
+      <point x="410" y="-12" type="curve" smooth="yes" name="sh05"/>
       <point x="358" y="-1"/>
       <point x="284" y="18"/>
       <point x="213" y="41" type="curve" name="sh03"/>
       <point x="213" y="231" type="line"/>
       <point x="298" y="188"/>
       <point x="353" y="168"/>
-      <point x="410" y="152" type="curve" name="sh06" smooth="yes"/>
+      <point x="410" y="152" type="curve" smooth="yes" name="sh06"/>
       <point x="471" y="135"/>
       <point x="527" y="125"/>
-      <point x="588" y="125" type="curve" name="dv02" smooth="yes"/>
+      <point x="588" y="125" type="curve" smooth="yes" name="dv02"/>
       <point x="669" y="125"/>
       <point x="732" y="142"/>
       <point x="777" y="175" type="curve" smooth="yes"/>
       <point x="824" y="210"/>
       <point x="844" y="259"/>
-      <point x="844" y="307" type="curve" name="ah01" smooth="yes"/>
+      <point x="844" y="307" type="curve" smooth="yes" name="ah01"/>
       <point x="844" y="400"/>
       <point x="768" y="455"/>
       <point x="599" y="490" type="curve" smooth="yes"/>
@@ -43,13 +43,13 @@
       <point x="290" y="611" type="curve" smooth="yes"/>
       <point x="241" y="660"/>
       <point x="217" y="727"/>
-      <point x="217" y="812" type="curve" name="sh01" smooth="yes"/>
+      <point x="217" y="812" type="curve" smooth="yes" name="sh01"/>
       <point x="217" y="920"/>
       <point x="254" y="1003"/>
       <point x="326" y="1060" type="curve" smooth="yes"/>
       <point x="402" y="1121"/>
       <point x="508" y="1147"/>
-      <point x="639" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="639" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="696" y="1147"/>
       <point x="754" y="1142"/>
       <point x="810" y="1131" type="curve" smooth="yes"/>
@@ -62,7 +62,7 @@
       <point x="814" y="970" type="curve" smooth="yes"/>
       <point x="761" y="985"/>
       <point x="708" y="993"/>
-      <point x="647" y="993" type="curve" name="dv03" smooth="yes"/>
+      <point x="647" y="993" type="curve" smooth="yes" name="dv03"/>
       <point x="570" y="993"/>
       <point x="506" y="980"/>
       <point x="465" y="953" type="curve" smooth="yes"/>
@@ -78,7 +78,7 @@
       <point x="960" y="527" type="curve" smooth="yes"/>
       <point x="1007" y="476"/>
       <point x="1030" y="408"/>
-      <point x="1030" y="323" type="curve" name="sh04" smooth="yes"/>
+      <point x="1030" y="323" type="curve" smooth="yes" name="sh04"/>
       <point x="1030" y="208"/>
       <point x="988" y="125"/>
       <point x="912" y="65" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/scedilla.glif b/source/Hack-Regular.ufo/glyphs/scedilla.glif
index fcbac57a6..088d1b2c8 100644
--- a/source/Hack-Regular.ufo/glyphs/scedilla.glif
+++ b/source/Hack-Regular.ufo/glyphs/scedilla.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="scedilla" format="1">
+<glyph name="scedilla" format="2">
   <advance width="1233"/>
   <unicode hex="015F"/>
   <outline>
     <contour>
-      <point x="960" y="527" type="curve" name="hr00" smooth="yes"/>
+      <point x="960" y="527" type="curve" smooth="yes" name="hr00"/>
       <point x="1007" y="476"/>
       <point x="1030" y="408"/>
-      <point x="1030" y="323" type="curve" name="dh04" smooth="yes"/>
+      <point x="1030" y="323" type="curve" smooth="yes" name="dh04"/>
       <point x="1030" y="208"/>
       <point x="988" y="125"/>
       <point x="912" y="65" type="curve" smooth="yes"/>
@@ -19,23 +19,23 @@
       <point x="783" y="-115" type="curve"/>
       <point x="798" y="-146"/>
       <point x="809" y="-179"/>
-      <point x="809" y="-219" type="curve" name="sh01" smooth="yes"/>
+      <point x="809" y="-219" type="curve" smooth="yes" name="sh01"/>
       <point x="809" y="-272"/>
       <point x="789" y="-319"/>
       <point x="749" y="-350" type="curve" smooth="yes"/>
       <point x="710" y="-379"/>
       <point x="653" y="-395"/>
-      <point x="570" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="570" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="541" y="-395"/>
       <point x="512" y="-393"/>
-      <point x="483" y="-389" type="curve" name="sv01" smooth="yes"/>
+      <point x="483" y="-389" type="curve" smooth="yes" name="sv01"/>
       <point x="452" y="-385"/>
       <point x="423" y="-379"/>
       <point x="395" y="-371" type="curve" name="sh02"/>
       <point x="395" y="-240" type="line" name="ih02"/>
       <point x="440" y="-261"/>
       <point x="494" y="-272"/>
-      <point x="546" y="-272" type="curve" name="dv02" smooth="yes"/>
+      <point x="546" y="-272" type="curve" smooth="yes" name="dv02"/>
       <point x="631" y="-272"/>
       <point x="670" y="-239"/>
       <point x="670" y="-180" type="curve" smooth="yes"/>
@@ -64,7 +64,7 @@
       <point x="777" y="175" type="curve" smooth="yes"/>
       <point x="824" y="210"/>
       <point x="844" y="259"/>
-      <point x="844" y="307" type="curve" name="dh03" smooth="yes"/>
+      <point x="844" y="307" type="curve" smooth="yes" name="dh03"/>
       <point x="844" y="400"/>
       <point x="768" y="455"/>
       <point x="599" y="490" type="curve" smooth="yes"/>
@@ -75,16 +75,16 @@
       <point x="290" y="611" type="curve" smooth="yes"/>
       <point x="241" y="660"/>
       <point x="217" y="727"/>
-      <point x="217" y="812" type="curve" name="dh01" smooth="yes"/>
+      <point x="217" y="812" type="curve" smooth="yes" name="dh01"/>
       <point x="217" y="920"/>
       <point x="254" y="1003"/>
       <point x="326" y="1060" type="curve" smooth="yes"/>
       <point x="402" y="1121"/>
       <point x="508" y="1147"/>
-      <point x="639" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="639" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="696" y="1147"/>
       <point x="754" y="1142"/>
-      <point x="810" y="1131" type="curve" name="hr01" smooth="yes"/>
+      <point x="810" y="1131" type="curve" smooth="yes" name="hr01"/>
       <point x="861" y="1120"/>
       <point x="917" y="1104"/>
       <point x="973" y="1081" type="curve"/>
@@ -94,7 +94,7 @@
       <point x="814" y="970" type="curve" smooth="yes"/>
       <point x="761" y="985"/>
       <point x="708" y="993"/>
-      <point x="647" y="993" type="curve" name="dv03" smooth="yes"/>
+      <point x="647" y="993" type="curve" smooth="yes" name="dv03"/>
       <point x="570" y="993"/>
       <point x="506" y="980"/>
       <point x="465" y="953" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/scircumflex.glif b/source/Hack-Regular.ufo/glyphs/scircumflex.glif
index fe12f84bf..fbe47be50 100644
--- a/source/Hack-Regular.ufo/glyphs/scircumflex.glif
+++ b/source/Hack-Regular.ufo/glyphs/scircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="scircumflex" format="1">
+<glyph name="scircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="015D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/second.glif b/source/Hack-Regular.ufo/glyphs/second.glif
index 8bf5957fc..e67272ee8 100644
--- a/source/Hack-Regular.ufo/glyphs/second.glif
+++ b/source/Hack-Regular.ufo/glyphs/second.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="second" format="1">
+<glyph name="second" format="2">
   <advance width="1233"/>
   <unicode hex="2033"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/section.glif b/source/Hack-Regular.ufo/glyphs/section.glif
index e8167f178..bcae30238 100644
--- a/source/Hack-Regular.ufo/glyphs/section.glif
+++ b/source/Hack-Regular.ufo/glyphs/section.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="section" format="1">
+<glyph name="section" format="2">
   <advance width="1233"/>
   <unicode hex="00A7"/>
   <outline>
     <contour>
-      <point x="595" y="-195" type="curve" name="dv01" smooth="yes"/>
+      <point x="595" y="-195" type="curve" smooth="yes" name="dv01"/>
       <point x="543" y="-195"/>
       <point x="487" y="-189"/>
       <point x="444" y="-181" type="curve" smooth="yes"/>
@@ -14,13 +14,13 @@
       <point x="279" y="27" type="line" name="ih01"/>
       <point x="398" y="-26"/>
       <point x="492" y="-51"/>
-      <point x="573" y="-51" type="curve" name="dv02" smooth="yes"/>
+      <point x="573" y="-51" type="curve" smooth="yes" name="dv02"/>
       <point x="640" y="-51"/>
       <point x="693" y="-37"/>
       <point x="730" y="-9" type="curve" smooth="yes"/>
       <point x="767" y="19"/>
       <point x="786" y="60"/>
-      <point x="786" y="103" type="curve" name="dh02" smooth="yes"/>
+      <point x="786" y="103" type="curve" smooth="yes" name="dh02"/>
       <point x="786" y="183"/>
       <point x="718" y="245"/>
       <point x="565" y="334" type="curve" smooth="yes"/>
@@ -30,7 +30,7 @@
       <point x="263" y="545" type="curve" smooth="yes"/>
       <point x="220" y="596"/>
       <point x="199" y="655"/>
-      <point x="199" y="724" type="curve" name="hr01" smooth="yes"/>
+      <point x="199" y="724" type="curve" smooth="yes" name="hr01"/>
       <point x="199" y="783"/>
       <point x="215" y="837"/>
       <point x="246" y="886" type="curve" smooth="yes"/>
@@ -42,29 +42,29 @@
       <point x="294" y="1106" type="curve" smooth="yes"/>
       <point x="274" y="1144"/>
       <point x="264" y="1185"/>
-      <point x="264" y="1230" type="curve" name="hr02" smooth="yes"/>
+      <point x="264" y="1230" type="curve" smooth="yes" name="hr02"/>
       <point x="264" y="1318"/>
       <point x="299" y="1391"/>
       <point x="364" y="1442" type="curve" smooth="yes"/>
       <point x="433" y="1497"/>
       <point x="529" y="1520"/>
-      <point x="629" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="629" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="680" y="1520"/>
       <point x="737" y="1514"/>
-      <point x="780" y="1506" type="curve" name="at02" smooth="yes"/>
+      <point x="780" y="1506" type="curve" smooth="yes" name="at02"/>
       <point x="827" y="1497"/>
       <point x="883" y="1481"/>
       <point x="936" y="1462" type="curve"/>
       <point x="936" y="1298" type="line" name="ih03"/>
       <point x="824" y="1351"/>
       <point x="732" y="1376"/>
-      <point x="651" y="1376" type="curve" name="sv01" smooth="yes"/>
+      <point x="651" y="1376" type="curve" smooth="yes" name="sv01"/>
       <point x="583" y="1376"/>
       <point x="536" y="1361"/>
       <point x="503" y="1336" type="curve" smooth="yes"/>
       <point x="467" y="1309"/>
       <point x="449" y="1268"/>
-      <point x="449" y="1232" type="curve" name="sh01" smooth="yes"/>
+      <point x="449" y="1232" type="curve" smooth="yes" name="sh01"/>
       <point x="449" y="1167"/>
       <point x="508" y="1103"/>
       <point x="653" y="1020" type="curve" smooth="yes"/>
@@ -74,7 +74,7 @@
       <point x="970" y="801" type="curve" smooth="yes"/>
       <point x="1014" y="750"/>
       <point x="1036" y="694"/>
-      <point x="1036" y="622" type="curve" name="sh02" smooth="yes"/>
+      <point x="1036" y="622" type="curve" smooth="yes" name="sh02"/>
       <point x="1036" y="563"/>
       <point x="1021" y="510"/>
       <point x="991" y="463" type="curve" smooth="yes"/>
@@ -86,7 +86,7 @@
       <point x="942" y="234" type="curve" smooth="yes"/>
       <point x="961" y="199"/>
       <point x="971" y="162"/>
-      <point x="971" y="111" type="curve" name="hr03" smooth="yes"/>
+      <point x="971" y="111" type="curve" smooth="yes" name="hr03"/>
       <point x="971" y="22"/>
       <point x="937" y="-55"/>
       <point x="869" y="-111" type="curve" smooth="yes"/>
@@ -100,7 +100,7 @@
       <point x="842" y="500" type="curve" smooth="yes"/>
       <point x="862" y="530"/>
       <point x="872" y="561"/>
-      <point x="872" y="592" type="curve" name="ih04" smooth="yes"/>
+      <point x="872" y="592" type="curve" smooth="yes" name="ih04"/>
       <point x="872" y="647"/>
       <point x="844" y="697"/>
       <point x="801" y="736" type="curve" smooth="yes"/>
@@ -112,7 +112,7 @@
       <point x="393" y="846" type="curve" smooth="yes"/>
       <point x="374" y="818"/>
       <point x="362" y="790"/>
-      <point x="362" y="753" type="curve" name="dh01" smooth="yes"/>
+      <point x="362" y="753" type="curve" smooth="yes" name="dh01"/>
       <point x="362" y="701"/>
       <point x="386" y="656"/>
       <point x="434" y="611" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/semicolon.glif b/source/Hack-Regular.ufo/glyphs/semicolon.glif
index 5accdabec..bd34ff9f3 100644
--- a/source/Hack-Regular.ufo/glyphs/semicolon.glif
+++ b/source/Hack-Regular.ufo/glyphs/semicolon.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="semicolon" format="1">
+<glyph name="semicolon" format="2">
   <advance width="1233"/>
   <unicode hex="003B"/>
   <outline>
     <contour>
-      <point x="610" y="703" type="curve" name="dv01" smooth="yes"/>
+      <point x="610" y="703" type="curve" smooth="yes" name="dv01"/>
       <point x="562" y="703"/>
       <point x="522" y="720"/>
       <point x="490" y="753" type="curve"/>
       <point x="457" y="785"/>
       <point x="440" y="828"/>
-      <point x="440" y="881" type="curve" name="dh01" smooth="yes"/>
+      <point x="440" y="881" type="curve" smooth="yes" name="dh01"/>
       <point x="440" y="933"/>
       <point x="457" y="976"/>
       <point x="490" y="1009" type="curve" smooth="yes"/>
       <point x="522" y="1042"/>
       <point x="562" y="1058"/>
-      <point x="610" y="1058" type="curve" name="dv02" smooth="yes"/>
+      <point x="610" y="1058" type="curve" smooth="yes" name="dv02"/>
       <point x="659" y="1058"/>
       <point x="699" y="1042"/>
       <point x="731" y="1009" type="curve" smooth="yes"/>
       <point x="764" y="976"/>
       <point x="780" y="934"/>
-      <point x="780" y="881" type="curve" name="hr01" smooth="yes"/>
+      <point x="780" y="881" type="curve" smooth="yes" name="hr01"/>
       <point x="780" y="828"/>
       <point x="764" y="785"/>
       <point x="731" y="753" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="659" y="-10" type="curve" name="hr02"/>
       <point x="642" y="-14"/>
       <point x="629" y="-15"/>
-      <point x="617" y="-15" type="curve" name="ab01" smooth="yes"/>
+      <point x="617" y="-15" type="curve" smooth="yes" name="ab01"/>
       <point x="573" y="-15"/>
       <point x="532" y="-1"/>
       <point x="501" y="26" type="curve"/>
@@ -45,16 +45,16 @@
       <point x="455" y="142" type="curve" smooth="yes"/>
       <point x="455" y="189"/>
       <point x="470" y="231"/>
-      <point x="503" y="260" type="curve" name="hr03" smooth="yes"/>
+      <point x="503" y="260" type="curve" smooth="yes" name="hr03"/>
       <point x="531" y="285"/>
       <point x="574" y="302"/>
-      <point x="625" y="302" type="curve" name="sv01" smooth="yes"/>
+      <point x="625" y="302" type="curve" smooth="yes" name="sv01"/>
       <point x="684" y="302"/>
       <point x="731" y="278"/>
       <point x="764" y="231" type="curve" smooth="yes"/>
       <point x="796" y="184"/>
       <point x="812" y="118"/>
-      <point x="812" y="34" type="curve" name="sh01" smooth="yes"/>
+      <point x="812" y="34" type="curve" smooth="yes" name="sh01"/>
       <point x="812" y="-206"/>
       <point x="677" y="-385"/>
       <point x="442" y="-470" type="curve" name="av01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/seven.glif b/source/Hack-Regular.ufo/glyphs/seven.glif
index 684b57118..3d233f546 100644
--- a/source/Hack-Regular.ufo/glyphs/seven.glif
+++ b/source/Hack-Regular.ufo/glyphs/seven.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="seven" format="1">
+<glyph name="seven" format="2">
   <advance width="1233"/>
   <unicode hex="0037"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/seven.subs.glif b/source/Hack-Regular.ufo/glyphs/seven.subs.glif
index 8fe1b2cd3..7e0a93b07 100644
--- a/source/Hack-Regular.ufo/glyphs/seven.subs.glif
+++ b/source/Hack-Regular.ufo/glyphs/seven.subs.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="seven.subs" format="1">
+<glyph name="seven.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
diff --git a/source/Hack-Regular.ufo/glyphs/seveneighths.glif b/source/Hack-Regular.ufo/glyphs/seveneighths.glif
index 522f4d39e..9188ee090 100644
--- a/source/Hack-Regular.ufo/glyphs/seveneighths.glif
+++ b/source/Hack-Regular.ufo/glyphs/seveneighths.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="seveneighths" format="1">
+<glyph name="seveneighths" format="2">
   <advance width="1233"/>
   <unicode hex="215E"/>
   <outline>
@@ -19,7 +19,7 @@
       <point x="51" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="817" y="-286" type="curve" name="dv01" smooth="yes"/>
+      <point x="817" y="-286" type="curve" smooth="yes" name="dv01"/>
       <point x="629" y="-286"/>
       <point x="516" y="-196"/>
       <point x="516" y="-47" type="curve" smooth="yes"/>
@@ -28,10 +28,10 @@
       <point x="708" y="174" type="curve" name="ih01"/>
       <point x="600" y="198"/>
       <point x="538" y="268"/>
-      <point x="538" y="364" type="curve" name="sh03" smooth="yes"/>
+      <point x="538" y="364" type="curve" smooth="yes" name="sh03"/>
       <point x="538" y="496"/>
       <point x="645" y="580"/>
-      <point x="817" y="580" type="curve" name="dv07" smooth="yes"/>
+      <point x="817" y="580" type="curve" smooth="yes" name="dv07"/>
       <point x="990" y="580"/>
       <point x="1097" y="496"/>
       <point x="1097" y="364" type="curve" smooth="yes"/>
@@ -40,32 +40,32 @@
       <point x="927" y="174" type="curve" name="ih02"/>
       <point x="1052" y="149"/>
       <point x="1119" y="74"/>
-      <point x="1119" y="-46" type="curve" name="sh01" smooth="yes"/>
+      <point x="1119" y="-46" type="curve" smooth="yes" name="sh01"/>
       <point x="1119" y="-197"/>
       <point x="1006" y="-286"/>
     </contour>
     <contour>
-      <point x="817" y="215" type="curve" name="dv05" smooth="yes"/>
+      <point x="817" y="215" type="curve" smooth="yes" name="dv05"/>
       <point x="918" y="215"/>
       <point x="972" y="264"/>
-      <point x="972" y="353" type="curve" name="ah01" smooth="yes"/>
+      <point x="972" y="353" type="curve" smooth="yes" name="ah01"/>
       <point x="972" y="445"/>
       <point x="921" y="493"/>
-      <point x="817" y="493" type="curve" name="dv06" smooth="yes"/>
+      <point x="817" y="493" type="curve" smooth="yes" name="dv06"/>
       <point x="717" y="493"/>
       <point x="663" y="445"/>
-      <point x="663" y="353" type="curve" name="sh04" smooth="yes"/>
+      <point x="663" y="353" type="curve" smooth="yes" name="sh04"/>
       <point x="663" y="264"/>
       <point x="717" y="215"/>
     </contour>
     <contour>
-      <point x="817" y="-198" type="curve" name="dv02" smooth="yes"/>
+      <point x="817" y="-198" type="curve" smooth="yes" name="dv02"/>
       <point x="930" y="-198"/>
       <point x="993" y="-139"/>
       <point x="993" y="-35" type="curve" smooth="yes"/>
       <point x="993" y="69"/>
       <point x="929" y="127"/>
-      <point x="817" y="127" type="curve" name="dv04" smooth="yes"/>
+      <point x="817" y="127" type="curve" smooth="yes" name="dv04"/>
       <point x="704" y="127"/>
       <point x="642" y="69"/>
       <point x="642" y="-35" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/shade.glif b/source/Hack-Regular.ufo/glyphs/shade.glif
index edf408aa9..9b35592e0 100644
--- a/source/Hack-Regular.ufo/glyphs/shade.glif
+++ b/source/Hack-Regular.ufo/glyphs/shade.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="shade" format="1">
+<glyph name="shade" format="2">
   <advance width="1233"/>
   <unicode hex="2592"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/sigma.glif b/source/Hack-Regular.ufo/glyphs/sigma.glif
index 34f1c4738..b1b28d240 100644
--- a/source/Hack-Regular.ufo/glyphs/sigma.glif
+++ b/source/Hack-Regular.ufo/glyphs/sigma.glif
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="sigma" format="1">
+<glyph name="sigma" format="2">
   <advance width="1233"/>
   <unicode hex="03C3"/>
   <outline>
     <contour>
-      <point x="589" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="589" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="294" y="-29"/>
       <point x="119" y="176"/>
-      <point x="119" y="554" type="curve" name="sh01" smooth="yes"/>
+      <point x="119" y="554" type="curve" smooth="yes" name="sh01"/>
       <point x="119" y="914"/>
       <point x="277" y="1120"/>
-      <point x="598" y="1120" type="curve" name="at01" smooth="yes"/>
+      <point x="598" y="1120" type="curve" smooth="yes" name="at01"/>
       <point x="1113" y="1120" type="line"/>
       <point x="1113" y="936" type="line" name="sv01"/>
       <point x="872" y="936" type="line" name="sh02"/>
       <point x="1009" y="828"/>
       <point x="1078" y="680"/>
-      <point x="1078" y="493" type="curve" name="sh03" smooth="yes"/>
+      <point x="1078" y="493" type="curve" smooth="yes" name="sh03"/>
       <point x="1078" y="188"/>
       <point x="892" y="-29"/>
     </contour>
     <contour>
-      <point x="594" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="594" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="786" y="127"/>
       <point x="883" y="291"/>
-      <point x="883" y="498" type="curve" name="ah01" smooth="yes"/>
+      <point x="883" y="498" type="curve" smooth="yes" name="ah01"/>
       <point x="883" y="662"/>
       <point x="824" y="785"/>
       <point x="711" y="870" type="curve" smooth="yes"/>
@@ -33,7 +33,7 @@
       <point x="591" y="935" type="curve" name="sv02"/>
       <point x="411" y="935"/>
       <point x="314" y="843"/>
-      <point x="314" y="560" type="curve" name="sh04" smooth="yes"/>
+      <point x="314" y="560" type="curve" smooth="yes" name="sh04"/>
       <point x="314" y="272"/>
       <point x="411" y="127"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/similar.glif b/source/Hack-Regular.ufo/glyphs/similar.glif
index 888b15b1b..a3375a052 100644
--- a/source/Hack-Regular.ufo/glyphs/similar.glif
+++ b/source/Hack-Regular.ufo/glyphs/similar.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="similar" format="1">
+<glyph name="similar" format="2">
   <advance width="1233"/>
   <unicode hex="223C"/>
   <outline>
@@ -7,28 +7,28 @@
       <point x="88" y="671" type="line" name="hr00"/>
       <point x="192" y="751"/>
       <point x="285" y="786"/>
-      <point x="393" y="786" type="curve" name="hr01" smooth="yes"/>
+      <point x="393" y="786" type="curve" smooth="yes" name="hr01"/>
       <point x="457" y="786"/>
       <point x="532" y="775"/>
       <point x="623" y="732" type="curve" smooth="yes"/>
       <point x="655" y="717" type="line" smooth="yes"/>
       <point x="732" y="681"/>
       <point x="802" y="663"/>
-      <point x="865" y="663" type="curve" name="hr02" smooth="yes"/>
+      <point x="865" y="663" type="curve" smooth="yes" name="hr02"/>
       <point x="957" y="663"/>
       <point x="1045" y="702"/>
       <point x="1145" y="786" type="curve"/>
       <point x="1145" y="611" type="line" name="hr03"/>
       <point x="1053" y="538"/>
       <point x="959" y="497"/>
-      <point x="850" y="497" type="curve" name="hr04" smooth="yes"/>
+      <point x="850" y="497" type="curve" smooth="yes" name="hr04"/>
       <point x="778" y="497"/>
       <point x="726" y="513"/>
       <point x="645" y="548" type="curve" smooth="yes"/>
       <point x="612" y="562" type="line" smooth="yes"/>
       <point x="522" y="599"/>
       <point x="468" y="620"/>
-      <point x="385" y="620" type="curve" name="hr05" smooth="yes"/>
+      <point x="385" y="620" type="curve" smooth="yes" name="hr05"/>
       <point x="282" y="620"/>
       <point x="192" y="588"/>
       <point x="88" y="497" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/six.glif b/source/Hack-Regular.ufo/glyphs/six.glif
index c51469430..4f318524c 100644
--- a/source/Hack-Regular.ufo/glyphs/six.glif
+++ b/source/Hack-Regular.ufo/glyphs/six.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="six" format="1">
+<glyph name="six" format="2">
   <advance width="1233"/>
   <unicode hex="0036"/>
   <outline>
     <contour>
-      <point x="633" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="633" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="450" y="-29"/>
       <point x="334" y="38"/>
       <point x="255" y="159" type="curve" smooth="yes"/>
       <point x="171" y="290"/>
       <point x="133" y="480"/>
-      <point x="133" y="724" type="curve" name="dh01" smooth="yes"/>
+      <point x="133" y="724" type="curve" smooth="yes" name="dh01"/>
       <point x="133" y="1262"/>
       <point x="332" y="1520"/>
-      <point x="698" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="698" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="753" y="1520"/>
       <point x="805" y="1514"/>
       <point x="848" y="1505" type="curve" smooth="yes"/>
@@ -26,7 +26,7 @@
       <point x="857" y="1331" type="curve" smooth="yes"/>
       <point x="810" y="1344"/>
       <point x="758" y="1350"/>
-      <point x="711" y="1350" type="curve" name="sv01" smooth="yes"/>
+      <point x="711" y="1350" type="curve" smooth="yes" name="sv01"/>
       <point x="581" y="1350"/>
       <point x="483" y="1302"/>
       <point x="418" y="1206" type="curve" smooth="yes"/>
@@ -38,33 +38,33 @@
       <point x="452" y="934" type="curve" smooth="yes"/>
       <point x="512" y="971"/>
       <point x="575" y="987"/>
-      <point x="655" y="987" type="curve" name="dv04" smooth="yes"/>
+      <point x="655" y="987" type="curve" smooth="yes" name="dv04"/>
       <point x="930" y="987"/>
       <point x="1100" y="801"/>
-      <point x="1100" y="481" type="curve" name="hr01" smooth="yes"/>
+      <point x="1100" y="481" type="curve" smooth="yes" name="hr01"/>
       <point x="1100" y="156"/>
       <point x="933" y="-29"/>
     </contour>
     <contour>
-      <point x="633" y="129" type="curve" name="dv02" smooth="yes"/>
+      <point x="633" y="129" type="curve" smooth="yes" name="dv02"/>
       <point x="720" y="129"/>
       <point x="788" y="158"/>
       <point x="833" y="218" type="curve" smooth="yes"/>
       <point x="878" y="277"/>
       <point x="901" y="364"/>
-      <point x="901" y="479" type="curve" name="dh03" smooth="yes"/>
+      <point x="901" y="479" type="curve" smooth="yes" name="dh03"/>
       <point x="901" y="594"/>
       <point x="878" y="682"/>
       <point x="833" y="741" type="curve" smooth="yes"/>
       <point x="786" y="802"/>
       <point x="717" y="829"/>
-      <point x="634" y="829" type="curve" name="dv03" smooth="yes"/>
+      <point x="634" y="829" type="curve" smooth="yes" name="dv03"/>
       <point x="541" y="829"/>
       <point x="473" y="794"/>
       <point x="428" y="737" type="curve" smooth="yes"/>
       <point x="381" y="678"/>
       <point x="354" y="592"/>
-      <point x="354" y="479" type="curve" name="sh01" smooth="yes"/>
+      <point x="354" y="479" type="curve" smooth="yes" name="sh01"/>
       <point x="354" y="366"/>
       <point x="381" y="280"/>
       <point x="428" y="221" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/six.subs.glif b/source/Hack-Regular.ufo/glyphs/six.subs.glif
index 3dbade7f8..c177bbb74 100644
--- a/source/Hack-Regular.ufo/glyphs/six.subs.glif
+++ b/source/Hack-Regular.ufo/glyphs/six.subs.glif
@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="six.subs" format="1">
+<glyph name="six.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="640" y="-405" type="curve" name="hr00" smooth="yes"/>
+      <point x="640" y="-405" type="curve" smooth="yes" name="hr00"/>
       <point x="425" y="-405"/>
       <point x="329" y="-272"/>
-      <point x="329" y="28" type="curve" name="sh01" smooth="yes"/>
+      <point x="329" y="28" type="curve" smooth="yes" name="sh01"/>
       <point x="329" y="313"/>
       <point x="451" y="462"/>
-      <point x="680" y="462" type="curve" name="dv03" smooth="yes"/>
+      <point x="680" y="462" type="curve" smooth="yes" name="dv03"/>
       <point x="741" y="462"/>
       <point x="804" y="450"/>
       <point x="861" y="429" type="curve"/>
       <point x="861" y="325" type="line" name="ih01"/>
       <point x="809" y="352"/>
       <point x="750" y="367"/>
-      <point x="686" y="367" type="curve" name="dv02" smooth="yes"/>
+      <point x="686" y="367" type="curve" smooth="yes" name="dv02"/>
       <point x="526" y="367"/>
       <point x="444" y="259"/>
       <point x="444" y="47" type="curve" name="ih02"/>
       <point x="487" y="125"/>
       <point x="554" y="164"/>
-      <point x="647" y="164" type="curve" name="dv05" smooth="yes"/>
+      <point x="647" y="164" type="curve" smooth="yes" name="dv05"/>
       <point x="828" y="164"/>
       <point x="929" y="63"/>
-      <point x="929" y="-121" type="curve" name="sh02" smooth="yes"/>
+      <point x="929" y="-121" type="curve" smooth="yes" name="sh02"/>
       <point x="929" y="-302"/>
       <point x="824" y="-405"/>
     </contour>
     <contour>
-      <point x="638" y="-317" type="curve" name="dv01" smooth="yes"/>
+      <point x="638" y="-317" type="curve" smooth="yes" name="dv01"/>
       <point x="749" y="-317"/>
       <point x="805" y="-252"/>
-      <point x="805" y="-121" type="curve" name="ah01" smooth="yes"/>
+      <point x="805" y="-121" type="curve" smooth="yes" name="ah01"/>
       <point x="805" y="10"/>
       <point x="749" y="75"/>
-      <point x="638" y="75" type="curve" name="dv04" smooth="yes"/>
+      <point x="638" y="75" type="curve" smooth="yes" name="dv04"/>
       <point x="530" y="75"/>
       <point x="466" y="3"/>
-      <point x="466" y="-121" type="curve" name="sh03" smooth="yes"/>
+      <point x="466" y="-121" type="curve" smooth="yes" name="sh03"/>
       <point x="466" y="-245"/>
       <point x="530" y="-317"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/slash.glif b/source/Hack-Regular.ufo/glyphs/slash.glif
index b1bd31785..eb96ac9fd 100644
--- a/source/Hack-Regular.ufo/glyphs/slash.glif
+++ b/source/Hack-Regular.ufo/glyphs/slash.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="slash" format="1">
+<glyph name="slash" format="2">
   <advance width="1233"/>
   <unicode hex="002F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/space.glif b/source/Hack-Regular.ufo/glyphs/space.glif
index 6b1fa9261..13665e890 100644
--- a/source/Hack-Regular.ufo/glyphs/space.glif
+++ b/source/Hack-Regular.ufo/glyphs/space.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="space" format="1">
+<glyph name="space" format="2">
   <advance width="1233"/>
   <unicode hex="0020"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/sterling.glif b/source/Hack-Regular.ufo/glyphs/sterling.glif
index 73fab650b..ecf579701 100644
--- a/source/Hack-Regular.ufo/glyphs/sterling.glif
+++ b/source/Hack-Regular.ufo/glyphs/sterling.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="sterling" format="1">
+<glyph name="sterling" format="2">
   <advance width="1233"/>
   <unicode hex="00A3"/>
   <outline>
@@ -16,10 +16,10 @@
       <point x="485" y="1395" type="curve" smooth="yes"/>
       <point x="558" y="1479"/>
       <point x="670" y="1520"/>
-      <point x="810" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="810" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="858" y="1520"/>
       <point x="908" y="1515"/>
-      <point x="951" y="1506" type="curve" name="at02" smooth="yes"/>
+      <point x="951" y="1506" type="curve" smooth="yes" name="at02"/>
       <point x="983" y="1499"/>
       <point x="1039" y="1483"/>
       <point x="1092" y="1462" type="curve"/>
@@ -29,13 +29,13 @@
       <point x="967" y="1344" type="curve" smooth="yes"/>
       <point x="925" y="1359"/>
       <point x="882" y="1366"/>
-      <point x="837" y="1366" type="curve" name="sv01" smooth="yes"/>
+      <point x="837" y="1366" type="curve" smooth="yes" name="sv01"/>
       <point x="747" y="1366"/>
       <point x="681" y="1336"/>
       <point x="639" y="1277" type="curve" smooth="yes"/>
       <point x="596" y="1218"/>
       <point x="575" y="1124"/>
-      <point x="575" y="995" type="curve" name="sh02" smooth="yes"/>
+      <point x="575" y="995" type="curve" smooth="yes" name="sh02"/>
       <point x="575" y="778" type="line" name="sv02"/>
       <point x="946" y="778" type="line"/>
       <point x="946" y="635" type="line" name="sv03"/>
diff --git a/source/Hack-Regular.ufo/glyphs/suchthat.glif b/source/Hack-Regular.ufo/glyphs/suchthat.glif
index 5e8754a96..6a95eb798 100644
--- a/source/Hack-Regular.ufo/glyphs/suchthat.glif
+++ b/source/Hack-Regular.ufo/glyphs/suchthat.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="suchthat" format="1">
+<glyph name="suchthat" format="2">
   <advance width="1233"/>
   <unicode hex="220B"/>
   <outline>
@@ -20,10 +20,10 @@
       <point x="768" y="1219" type="curve" smooth="yes"/>
       <point x="717" y="1269"/>
       <point x="661" y="1294"/>
-      <point x="602" y="1294" type="curve" name="dv01" smooth="yes"/>
+      <point x="602" y="1294" type="curve" smooth="yes" name="dv01"/>
       <point x="130" y="1294" type="line"/>
       <point x="130" y="1464" type="line"/>
-      <point x="602" y="1464" type="line" name="dv02" smooth="yes"/>
+      <point x="602" y="1464" type="line" smooth="yes" name="dv02"/>
       <point x="783" y="1464"/>
       <point x="949" y="1324"/>
       <point x="1037" y="1100" type="curve" smooth="yes"/>
@@ -35,7 +35,7 @@
       <point x="854" y="98" type="curve" smooth="yes"/>
       <point x="777" y="33"/>
       <point x="693" y="0"/>
-      <point x="602" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="602" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="130" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/summation.glif b/source/Hack-Regular.ufo/glyphs/summation.glif
index c8abb7c0c..80c2d4267 100644
--- a/source/Hack-Regular.ufo/glyphs/summation.glif
+++ b/source/Hack-Regular.ufo/glyphs/summation.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="summation" format="1">
+<glyph name="summation" format="2">
   <advance width="1233"/>
   <unicode hex="2211"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/t.glif b/source/Hack-Regular.ufo/glyphs/t.glif
index 80ab218c4..628df388e 100644
--- a/source/Hack-Regular.ufo/glyphs/t.glif
+++ b/source/Hack-Regular.ufo/glyphs/t.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="t" format="1">
+<glyph name="t" format="2">
   <advance width="1233"/>
   <unicode hex="0074"/>
   <outline>
@@ -27,9 +27,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/tau.glif b/source/Hack-Regular.ufo/glyphs/tau.glif
index aa0e04568..f89452d7f 100644
--- a/source/Hack-Regular.ufo/glyphs/tau.glif
+++ b/source/Hack-Regular.ufo/glyphs/tau.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="tau" format="1">
+<glyph name="tau" format="2">
   <advance width="1233"/>
   <unicode hex="03C4"/>
   <outline>
     <contour>
-      <point x="864" y="0" type="line" name="ab01" smooth="yes"/>
+      <point x="864" y="0" type="line" smooth="yes" name="ab01"/>
       <point x="624" y="0"/>
       <point x="520" y="122"/>
-      <point x="520" y="406" type="curve" name="dh01" smooth="yes"/>
+      <point x="520" y="406" type="curve" smooth="yes" name="dh01"/>
       <point x="520" y="936" type="line" name="sv01"/>
       <point x="160" y="936" type="line"/>
       <point x="160" y="1118" type="line" name="hr01"/>
       <point x="1074" y="1118" type="line"/>
       <point x="1074" y="936" type="line" name="sv02"/>
       <point x="708" y="936" type="line" name="sv03"/>
-      <point x="708" y="395" type="line" name="dh02" smooth="yes"/>
+      <point x="708" y="395" type="line" smooth="yes" name="dh02"/>
       <point x="708" y="298"/>
       <point x="719" y="235"/>
       <point x="742" y="204" type="curve" smooth="yes"/>
       <point x="766" y="172"/>
       <point x="814" y="156"/>
-      <point x="886" y="156" type="curve" name="sv04" smooth="yes"/>
+      <point x="886" y="156" type="curve" smooth="yes" name="sv04"/>
       <point x="975" y="156" type="line" name="hr02"/>
       <point x="975" y="0" type="line" name="ab02"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/tbar.glif b/source/Hack-Regular.ufo/glyphs/tbar.glif
index 47a546e8c..30d759d47 100644
--- a/source/Hack-Regular.ufo/glyphs/tbar.glif
+++ b/source/Hack-Regular.ufo/glyphs/tbar.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="tbar" format="1">
+<glyph name="tbar" format="2">
   <advance width="1233"/>
   <unicode hex="0167"/>
   <outline>
     <contour>
-      <point x="807" y="-4" type="line" name="hr00" smooth="yes"/>
+      <point x="807" y="-4" type="line" smooth="yes" name="hr00"/>
       <point x="531" y="-4"/>
       <point x="430" y="94"/>
-      <point x="430" y="365" type="curve" name="dh01" smooth="yes"/>
+      <point x="430" y="365" type="curve" smooth="yes" name="dh01"/>
       <point x="430" y="602" type="line" name="dv01"/>
       <point x="201" y="602" type="line"/>
       <point x="201" y="744" type="line"/>
@@ -26,10 +26,10 @@
       <point x="843" y="744" type="line"/>
       <point x="843" y="602" type="line" name="sv05"/>
       <point x="614" y="602" type="line"/>
-      <point x="614" y="365" type="line" name="dh02" smooth="yes"/>
+      <point x="614" y="365" type="line" smooth="yes" name="dh02"/>
       <point x="614" y="200"/>
       <point x="669" y="143"/>
-      <point x="825" y="143" type="curve" name="sv06" smooth="yes"/>
+      <point x="825" y="143" type="curve" smooth="yes" name="sv06"/>
       <point x="1032" y="143" type="line" name="sv07"/>
       <point x="1032" y="-4" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/tcaron.glif b/source/Hack-Regular.ufo/glyphs/tcaron.glif
index dc510c28c..d18dd83e6 100644
--- a/source/Hack-Regular.ufo/glyphs/tcaron.glif
+++ b/source/Hack-Regular.ufo/glyphs/tcaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="tcaron" format="1">
+<glyph name="tcaron" format="2">
   <advance width="1233"/>
   <unicode hex="0165"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="751" y="1306" type="line" name="dv01"/>
     </contour>
     <contour>
-      <point x="807" y="-4" type="line" name="ab01" smooth="yes"/>
+      <point x="807" y="-4" type="line" smooth="yes" name="ab01"/>
       <point x="670" y="-4"/>
       <point x="572" y="24"/>
       <point x="515" y="79" type="curve" smooth="yes"/>
       <point x="458" y="134"/>
       <point x="430" y="229"/>
-      <point x="430" y="365" type="curve" name="dh01" smooth="yes"/>
+      <point x="430" y="365" type="curve" smooth="yes" name="dh01"/>
       <point x="430" y="977" type="line" name="sv01"/>
       <point x="131" y="977" type="line" name="sv02"/>
       <point x="131" y="1120" type="line" name="at01"/>
@@ -27,13 +27,13 @@
       <point x="1032" y="1120" type="line"/>
       <point x="1032" y="977" type="line" name="sv03"/>
       <point x="614" y="977" type="line" name="sv04"/>
-      <point x="614" y="365" type="line" name="dh02" smooth="yes"/>
+      <point x="614" y="365" type="line" smooth="yes" name="dh02"/>
       <point x="614" y="283"/>
       <point x="630" y="225"/>
       <point x="661" y="192" type="curve" smooth="yes"/>
       <point x="692" y="159"/>
       <point x="746" y="143"/>
-      <point x="825" y="143" type="curve" name="sv05" smooth="yes"/>
+      <point x="825" y="143" type="curve" smooth="yes" name="sv05"/>
       <point x="1032" y="143" type="line"/>
       <point x="1032" y="-4" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/therefore.glif b/source/Hack-Regular.ufo/glyphs/therefore.glif
index d8f51a54e..06ef15899 100644
--- a/source/Hack-Regular.ufo/glyphs/therefore.glif
+++ b/source/Hack-Regular.ufo/glyphs/therefore.glif
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="therefore" format="1">
+<glyph name="therefore" format="2">
   <advance width="1233"/>
   <unicode hex="2234"/>
   <outline>
     <contour>
-      <point x="518" y="851" type="line" name="hr00" smooth="yes"/>
+      <point x="518" y="851" type="line" smooth="yes" name="hr00"/>
       <point x="498" y="851"/>
       <point x="488" y="861"/>
-      <point x="488" y="881" type="curve" name="dh03" smooth="yes"/>
+      <point x="488" y="881" type="curve" smooth="yes" name="dh03"/>
       <point x="488" y="1126" type="line" smooth="yes"/>
       <point x="488" y="1146"/>
       <point x="498" y="1156"/>
-      <point x="518" y="1156" type="curve" name="dv03" smooth="yes"/>
+      <point x="518" y="1156" type="curve" smooth="yes" name="dv03"/>
       <point x="710" y="1156" type="line" smooth="yes"/>
       <point x="730" y="1156"/>
       <point x="740" y="1146"/>
       <point x="740" y="1126" type="curve" smooth="yes"/>
-      <point x="740" y="881" type="line" name="dh04" smooth="yes"/>
+      <point x="740" y="881" type="line" smooth="yes" name="dh04"/>
       <point x="740" y="861"/>
       <point x="730" y="851"/>
       <point x="710" y="851" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="217" y="134" type="line" name="dv01" smooth="yes"/>
+      <point x="217" y="134" type="line" smooth="yes" name="dv01"/>
       <point x="197" y="134"/>
       <point x="187" y="144"/>
-      <point x="187" y="164" type="curve" name="dh01" smooth="yes"/>
+      <point x="187" y="164" type="curve" smooth="yes" name="dh01"/>
       <point x="187" y="409" type="line" smooth="yes"/>
       <point x="187" y="429"/>
       <point x="197" y="439"/>
-      <point x="217" y="439" type="curve" name="dv02" smooth="yes"/>
+      <point x="217" y="439" type="curve" smooth="yes" name="dv02"/>
       <point x="409" y="439" type="line" smooth="yes"/>
       <point x="429" y="439"/>
       <point x="439" y="429"/>
       <point x="439" y="409" type="curve" smooth="yes"/>
-      <point x="439" y="164" type="line" name="dh02" smooth="yes"/>
+      <point x="439" y="164" type="line" smooth="yes" name="dh02"/>
       <point x="439" y="144"/>
       <point x="429" y="134"/>
       <point x="409" y="134" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="827" y="134" type="line" name="sv01" smooth="yes"/>
+      <point x="827" y="134" type="line" smooth="yes" name="sv01"/>
       <point x="807" y="134"/>
       <point x="797" y="144"/>
-      <point x="797" y="164" type="curve" name="dh05" smooth="yes"/>
+      <point x="797" y="164" type="curve" smooth="yes" name="dh05"/>
       <point x="797" y="409" type="line" smooth="yes"/>
       <point x="797" y="429"/>
       <point x="807" y="439"/>
-      <point x="827" y="439" type="curve" name="sv02" smooth="yes"/>
+      <point x="827" y="439" type="curve" smooth="yes" name="sv02"/>
       <point x="1019" y="439" type="line" smooth="yes"/>
       <point x="1039" y="439"/>
       <point x="1049" y="429"/>
       <point x="1049" y="409" type="curve" smooth="yes"/>
-      <point x="1049" y="164" type="line" name="dh06" smooth="yes"/>
+      <point x="1049" y="164" type="line" smooth="yes" name="dh06"/>
       <point x="1049" y="144"/>
       <point x="1039" y="134"/>
       <point x="1019" y="134" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/theta.glif b/source/Hack-Regular.ufo/glyphs/theta.glif
index 214b5e15f..bb5b3cebb 100644
--- a/source/Hack-Regular.ufo/glyphs/theta.glif
+++ b/source/Hack-Regular.ufo/glyphs/theta.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="theta" format="1">
+<glyph name="theta" format="2">
   <advance width="1233"/>
   <unicode hex="03B8"/>
   <outline>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="305" y="-29"/>
       <point x="137" y="237"/>
-      <point x="137" y="735" type="curve" name="sh01" smooth="yes"/>
+      <point x="137" y="735" type="curve" smooth="yes" name="sh01"/>
       <point x="137" y="1232"/>
       <point x="305" y="1500"/>
-      <point x="616" y="1500" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1500" type="curve" smooth="yes" name="at01"/>
       <point x="927" y="1500"/>
       <point x="1096" y="1233"/>
-      <point x="1096" y="734" type="curve" name="sh02" smooth="yes"/>
+      <point x="1096" y="734" type="curve" smooth="yes" name="sh02"/>
       <point x="1096" y="238"/>
       <point x="928" y="-29"/>
     </contour>
@@ -21,13 +21,13 @@
       <point x="899" y="828" type="line" name="sh03"/>
       <point x="891" y="1129"/>
       <point x="803" y="1342"/>
-      <point x="616" y="1342" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1342" type="curve" smooth="yes" name="sv01"/>
       <point x="430" y="1342"/>
       <point x="342" y="1129"/>
       <point x="334" y="828" type="curve" name="sh05"/>
     </contour>
     <contour>
-      <point x="616" y="129" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="129" type="curve" smooth="yes" name="dv01"/>
       <point x="804" y="129"/>
       <point x="891" y="345"/>
       <point x="899" y="644" type="curve" name="ah01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/thorn.glif b/source/Hack-Regular.ufo/glyphs/thorn.glif
index acf8ce7c6..db70e24e6 100644
--- a/source/Hack-Regular.ufo/glyphs/thorn.glif
+++ b/source/Hack-Regular.ufo/glyphs/thorn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="thorn" format="1">
+<glyph name="thorn" format="2">
   <advance width="1233"/>
   <unicode hex="00FE"/>
   <outline>
@@ -9,16 +9,16 @@
       <point x="375" y="977" type="line" name="iv01"/>
       <point x="438" y="1089"/>
       <point x="540" y="1147"/>
-      <point x="675" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="675" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="944" y="1147"/>
       <point x="1108" y="923"/>
-      <point x="1108" y="557" type="curve" name="sh02" smooth="yes"/>
+      <point x="1108" y="557" type="curve" smooth="yes" name="sh02"/>
       <point x="1108" y="374"/>
       <point x="1069" y="230"/>
       <point x="992" y="127" type="curve" smooth="yes"/>
       <point x="915" y="23"/>
       <point x="809" y="-29"/>
-      <point x="674" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="674" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="598" y="-29"/>
       <point x="545" y="-13"/>
       <point x="496" y="15" type="curve" smooth="yes"/>
@@ -29,19 +29,19 @@
       <point x="190" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="647" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="647" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="826" y="127"/>
       <point x="915" y="274"/>
-      <point x="915" y="559" type="curve" name="ah01" smooth="yes"/>
+      <point x="915" y="559" type="curve" smooth="yes" name="ah01"/>
       <point x="915" y="844"/>
       <point x="826" y="991"/>
-      <point x="647" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="647" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="558" y="991"/>
       <point x="490" y="955"/>
       <point x="444" y="882" type="curve" smooth="yes"/>
       <point x="398" y="809"/>
       <point x="375" y="701"/>
-      <point x="375" y="559" type="curve" name="sh04" smooth="yes"/>
+      <point x="375" y="559" type="curve" smooth="yes" name="sh04"/>
       <point x="375" y="417"/>
       <point x="398" y="310"/>
       <point x="444" y="237" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/three.glif b/source/Hack-Regular.ufo/glyphs/three.glif
index aaad8b82a..d54f1e618 100644
--- a/source/Hack-Regular.ufo/glyphs/three.glif
+++ b/source/Hack-Regular.ufo/glyphs/three.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="three" format="1">
+<glyph name="three" format="2">
   <advance width="1233"/>
   <unicode hex="0033"/>
   <outline>
     <contour>
-      <point x="566" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="566" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="502" y="-29"/>
       <point x="431" y="-23"/>
       <point x="359" y="-10" type="curve" smooth="yes"/>
@@ -17,34 +17,34 @@
       <point x="350" y="167" type="curve" smooth="yes"/>
       <point x="417" y="150"/>
       <point x="480" y="141"/>
-      <point x="547" y="141" type="curve" name="dv02" smooth="yes"/>
+      <point x="547" y="141" type="curve" smooth="yes" name="dv02"/>
       <point x="658" y="141"/>
       <point x="743" y="166"/>
-      <point x="802" y="216" type="curve" name="hr01" smooth="yes"/>
+      <point x="802" y="216" type="curve" smooth="yes" name="hr01"/>
       <point x="862" y="267"/>
       <point x="891" y="340"/>
-      <point x="891" y="429" type="curve" name="dh01" smooth="yes"/>
+      <point x="891" y="429" type="curve" smooth="yes" name="dh01"/>
       <point x="891" y="518"/>
       <point x="862" y="588"/>
       <point x="803" y="639" type="curve" smooth="yes"/>
       <point x="746" y="688"/>
       <point x="664" y="715"/>
-      <point x="561" y="715" type="curve" name="dv03" smooth="yes"/>
+      <point x="561" y="715" type="curve" smooth="yes" name="dv03"/>
       <point x="407" y="715" type="line"/>
       <point x="407" y="881" type="line"/>
-      <point x="561" y="881" type="line" name="dv04" smooth="yes"/>
+      <point x="561" y="881" type="line" smooth="yes" name="dv04"/>
       <point x="654" y="881"/>
       <point x="727" y="901"/>
       <point x="779" y="942" type="curve" smooth="yes"/>
       <point x="830" y="982"/>
       <point x="856" y="1040"/>
-      <point x="856" y="1115" type="curve" name="sh01" smooth="yes"/>
+      <point x="856" y="1115" type="curve" smooth="yes" name="sh01"/>
       <point x="856" y="1187"/>
       <point x="832" y="1248"/>
       <point x="784" y="1289" type="curve" smooth="yes"/>
       <point x="737" y="1330"/>
       <point x="667" y="1350"/>
-      <point x="574" y="1350" type="curve" name="sv01" smooth="yes"/>
+      <point x="574" y="1350" type="curve" smooth="yes" name="sv01"/>
       <point x="519" y="1350"/>
       <point x="457" y="1343"/>
       <point x="393" y="1330" type="curve" smooth="yes"/>
@@ -57,13 +57,13 @@
       <point x="410" y="1504" type="curve" smooth="yes"/>
       <point x="471" y="1515"/>
       <point x="528" y="1520"/>
-      <point x="579" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="579" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="719" y="1520"/>
       <point x="839" y="1484"/>
-      <point x="927" y="1411" type="curve" name="hr02" smooth="yes"/>
+      <point x="927" y="1411" type="curve" smooth="yes" name="hr02"/>
       <point x="1010" y="1342"/>
       <point x="1056" y="1243"/>
-      <point x="1056" y="1122" type="curve" name="ih01" smooth="yes"/>
+      <point x="1056" y="1122" type="curve" smooth="yes" name="ih01"/>
       <point x="1056" y="1035"/>
       <point x="1032" y="968"/>
       <point x="988" y="915" type="curve" smooth="yes"/>
@@ -75,7 +75,7 @@
       <point x="1013" y="661" type="curve" smooth="yes"/>
       <point x="1068" y="592"/>
       <point x="1091" y="507"/>
-      <point x="1091" y="411" type="curve" name="dh02" smooth="yes"/>
+      <point x="1091" y="411" type="curve" smooth="yes" name="dh02"/>
       <point x="1091" y="278"/>
       <point x="1046" y="168"/>
       <point x="954" y="89" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/three.subs.glif b/source/Hack-Regular.ufo/glyphs/three.subs.glif
index 8c9952c20..6c577a91c 100644
--- a/source/Hack-Regular.ufo/glyphs/three.subs.glif
+++ b/source/Hack-Regular.ufo/glyphs/three.subs.glif
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="three.subs" format="1">
+<glyph name="three.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="557" y="-440" type="curve" name="hr00" smooth="yes"/>
+      <point x="557" y="-440" type="curve" smooth="yes" name="hr00"/>
       <point x="480" y="-440"/>
       <point x="406" y="-426"/>
       <point x="326" y="-399" type="curve"/>
       <point x="326" y="-278" type="line"/>
       <point x="418" y="-314"/>
       <point x="493" y="-331"/>
-      <point x="553" y="-331" type="curve" name="dv01" smooth="yes"/>
+      <point x="553" y="-331" type="curve" smooth="yes" name="dv01"/>
       <point x="689" y="-331"/>
       <point x="772" y="-274"/>
       <point x="772" y="-182" type="curve" smooth="yes"/>
       <point x="772" y="-82"/>
       <point x="699" y="-32"/>
-      <point x="553" y="-32" type="curve" name="dv04" smooth="yes"/>
+      <point x="553" y="-32" type="curve" smooth="yes" name="dv04"/>
       <point x="487" y="-32" type="line"/>
       <point x="487" y="76" type="line"/>
-      <point x="561" y="76" type="line" name="dv05" smooth="yes"/>
+      <point x="561" y="76" type="line" smooth="yes" name="dv05"/>
       <point x="686" y="76"/>
       <point x="752" y="119"/>
-      <point x="752" y="199" type="curve" name="dh01" smooth="yes"/>
+      <point x="752" y="199" type="curve" smooth="yes" name="dh01"/>
       <point x="752" y="275"/>
       <point x="686" y="318"/>
-      <point x="569" y="318" type="curve" name="dv02" smooth="yes"/>
+      <point x="569" y="318" type="curve" smooth="yes" name="dv02"/>
       <point x="509" y="318"/>
       <point x="434" y="302"/>
       <point x="354" y="271" type="curve"/>
       <point x="354" y="392" type="line"/>
       <point x="446" y="415"/>
       <point x="522" y="427"/>
-      <point x="590" y="427" type="curve" name="dv03" smooth="yes"/>
+      <point x="590" y="427" type="curve" smooth="yes" name="dv03"/>
       <point x="782" y="427"/>
       <point x="903" y="342"/>
       <point x="903" y="210" type="curve" smooth="yes"/>
@@ -41,7 +41,7 @@
       <point x="731" y="27" type="curve" name="iv01"/>
       <point x="856" y="-1"/>
       <point x="924" y="-74"/>
-      <point x="924" y="-182" type="curve" name="dh02" smooth="yes"/>
+      <point x="924" y="-182" type="curve" smooth="yes" name="dh02"/>
       <point x="924" y="-349"/>
       <point x="794" y="-440"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/threeeighths.glif b/source/Hack-Regular.ufo/glyphs/threeeighths.glif
index 09fbe2a3c..cc19c44be 100644
--- a/source/Hack-Regular.ufo/glyphs/threeeighths.glif
+++ b/source/Hack-Regular.ufo/glyphs/threeeighths.glif
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="threeeighths" format="1">
+<glyph name="threeeighths" format="2">
   <advance width="1233"/>
   <unicode hex="215C"/>
   <outline>
     <contour>
-      <point x="299" y="809" type="curve" name="dv11" smooth="yes"/>
+      <point x="299" y="809" type="curve" smooth="yes" name="dv11"/>
       <point x="222" y="809"/>
       <point x="148" y="823"/>
       <point x="68" y="850" type="curve"/>
       <point x="68" y="971" type="line"/>
       <point x="160" y="935"/>
       <point x="235" y="918"/>
-      <point x="295" y="918" type="curve" name="dv12" smooth="yes"/>
+      <point x="295" y="918" type="curve" smooth="yes" name="dv12"/>
       <point x="431" y="918"/>
       <point x="514" y="975"/>
       <point x="514" y="1067" type="curve" smooth="yes"/>
       <point x="514" y="1167"/>
       <point x="441" y="1217"/>
-      <point x="295" y="1217" type="curve" name="dv07" smooth="yes"/>
+      <point x="295" y="1217" type="curve" smooth="yes" name="dv07"/>
       <point x="229" y="1217" type="line"/>
       <point x="229" y="1325" type="line"/>
-      <point x="303" y="1325" type="line" name="dv08" smooth="yes"/>
+      <point x="303" y="1325" type="line" smooth="yes" name="dv08"/>
       <point x="428" y="1325"/>
       <point x="494" y="1368"/>
-      <point x="494" y="1448" type="curve" name="dh01" smooth="yes"/>
+      <point x="494" y="1448" type="curve" smooth="yes" name="dh01"/>
       <point x="494" y="1524"/>
       <point x="428" y="1567"/>
-      <point x="311" y="1567" type="curve" name="dv03" smooth="yes"/>
+      <point x="311" y="1567" type="curve" smooth="yes" name="dv03"/>
       <point x="251" y="1567"/>
       <point x="176" y="1551"/>
       <point x="96" y="1520" type="curve"/>
       <point x="96" y="1641" type="line"/>
       <point x="188" y="1664"/>
       <point x="264" y="1676"/>
-      <point x="332" y="1676" type="curve" name="dv04" smooth="yes"/>
+      <point x="332" y="1676" type="curve" smooth="yes" name="dv04"/>
       <point x="524" y="1676"/>
       <point x="645" y="1591"/>
-      <point x="645" y="1459" type="curve" name="sh01" smooth="yes"/>
+      <point x="645" y="1459" type="curve" smooth="yes" name="sh01"/>
       <point x="645" y="1363"/>
       <point x="586" y="1301"/>
       <point x="473" y="1276" type="curve" name="iv01"/>
       <point x="598" y="1248"/>
       <point x="666" y="1175"/>
-      <point x="666" y="1067" type="curve" name="sh02" smooth="yes"/>
+      <point x="666" y="1067" type="curve" smooth="yes" name="sh02"/>
       <point x="666" y="900"/>
       <point x="536" y="809"/>
     </contour>
@@ -53,7 +53,7 @@
       <point x="51" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="817" y="-286" type="curve" name="dv01" smooth="yes"/>
+      <point x="817" y="-286" type="curve" smooth="yes" name="dv01"/>
       <point x="629" y="-286"/>
       <point x="516" y="-196"/>
       <point x="516" y="-47" type="curve" smooth="yes"/>
@@ -62,10 +62,10 @@
       <point x="708" y="174" type="curve" name="ih01"/>
       <point x="600" y="198"/>
       <point x="538" y="268"/>
-      <point x="538" y="364" type="curve" name="hr01" smooth="yes"/>
+      <point x="538" y="364" type="curve" smooth="yes" name="hr01"/>
       <point x="538" y="496"/>
       <point x="645" y="580"/>
-      <point x="817" y="580" type="curve" name="dv10" smooth="yes"/>
+      <point x="817" y="580" type="curve" smooth="yes" name="dv10"/>
       <point x="990" y="580"/>
       <point x="1097" y="496"/>
       <point x="1097" y="364" type="curve" smooth="yes"/>
@@ -74,35 +74,35 @@
       <point x="927" y="174" type="curve" name="ih02"/>
       <point x="1052" y="149"/>
       <point x="1119" y="74"/>
-      <point x="1119" y="-46" type="curve" name="dh04" smooth="yes"/>
+      <point x="1119" y="-46" type="curve" smooth="yes" name="dh04"/>
       <point x="1119" y="-197"/>
       <point x="1006" y="-286"/>
     </contour>
     <contour>
-      <point x="817" y="215" type="curve" name="dv06" smooth="yes"/>
+      <point x="817" y="215" type="curve" smooth="yes" name="dv06"/>
       <point x="918" y="215"/>
       <point x="972" y="264"/>
-      <point x="972" y="353" type="curve" name="dh03" smooth="yes"/>
+      <point x="972" y="353" type="curve" smooth="yes" name="dh03"/>
       <point x="972" y="445"/>
       <point x="921" y="493"/>
-      <point x="817" y="493" type="curve" name="dv09" smooth="yes"/>
+      <point x="817" y="493" type="curve" smooth="yes" name="dv09"/>
       <point x="717" y="493"/>
       <point x="663" y="445"/>
-      <point x="663" y="353" type="curve" name="sh03" smooth="yes"/>
+      <point x="663" y="353" type="curve" smooth="yes" name="sh03"/>
       <point x="663" y="264"/>
       <point x="717" y="215"/>
     </contour>
     <contour>
-      <point x="817" y="-198" type="curve" name="dv02" smooth="yes"/>
+      <point x="817" y="-198" type="curve" smooth="yes" name="dv02"/>
       <point x="930" y="-198"/>
       <point x="993" y="-139"/>
       <point x="993" y="-35" type="curve" smooth="yes"/>
       <point x="993" y="69"/>
       <point x="929" y="127"/>
-      <point x="817" y="127" type="curve" name="dv05" smooth="yes"/>
+      <point x="817" y="127" type="curve" smooth="yes" name="dv05"/>
       <point x="704" y="127"/>
       <point x="642" y="69"/>
-      <point x="642" y="-35" type="curve" name="dh02" smooth="yes"/>
+      <point x="642" y="-35" type="curve" smooth="yes" name="dh02"/>
       <point x="642" y="-139"/>
       <point x="708" y="-198"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/threequarters.glif b/source/Hack-Regular.ufo/glyphs/threequarters.glif
index f85971c92..76e9d766d 100644
--- a/source/Hack-Regular.ufo/glyphs/threequarters.glif
+++ b/source/Hack-Regular.ufo/glyphs/threequarters.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="threequarters" format="1">
+<glyph name="threequarters" format="2">
   <advance width="1233"/>
   <unicode hex="00BE"/>
   <outline>
     <contour>
-      <point x="335" y="809" type="curve" name="hr00" smooth="yes"/>
+      <point x="335" y="809" type="curve" smooth="yes" name="hr00"/>
       <point x="288" y="809"/>
       <point x="254" y="813"/>
       <point x="215" y="820" type="curve" smooth="yes"/>
@@ -17,7 +17,7 @@
       <point x="225" y="931" type="curve" smooth="yes"/>
       <point x="260" y="922"/>
       <point x="295" y="918"/>
-      <point x="329" y="918" type="curve" name="dv05" smooth="yes"/>
+      <point x="329" y="918" type="curve" smooth="yes" name="dv05"/>
       <point x="392" y="918"/>
       <point x="447" y="932"/>
       <point x="487" y="959" type="curve" smooth="yes"/>
@@ -29,22 +29,22 @@
       <point x="490" y="1179" type="curve" smooth="yes"/>
       <point x="453" y="1204"/>
       <point x="398" y="1217"/>
-      <point x="326" y="1217" type="curve" name="dv03" smooth="yes"/>
+      <point x="326" y="1217" type="curve" smooth="yes" name="dv03"/>
       <point x="260" y="1217" type="line"/>
       <point x="260" y="1325" type="line"/>
-      <point x="334" y="1325" type="line" name="dv04" smooth="yes"/>
+      <point x="334" y="1325" type="line" smooth="yes" name="dv04"/>
       <point x="395" y="1325"/>
       <point x="443" y="1336"/>
       <point x="476" y="1357" type="curve" smooth="yes"/>
       <point x="509" y="1378"/>
       <point x="525" y="1408"/>
-      <point x="525" y="1447" type="curve" name="sh01" smooth="yes"/>
+      <point x="525" y="1447" type="curve" smooth="yes" name="sh01"/>
       <point x="525" y="1486"/>
       <point x="509" y="1515"/>
       <point x="477" y="1536" type="curve" smooth="yes"/>
       <point x="445" y="1557"/>
       <point x="398" y="1567"/>
-      <point x="345" y="1567" type="curve" name="dv01" smooth="yes"/>
+      <point x="345" y="1567" type="curve" smooth="yes" name="dv01"/>
       <point x="310" y="1567"/>
       <point x="279" y="1563"/>
       <point x="242" y="1555" type="curve" smooth="yes"/>
@@ -57,7 +57,7 @@
       <point x="255" y="1667" type="curve" smooth="yes"/>
       <point x="294" y="1673"/>
       <point x="330" y="1676"/>
-      <point x="365" y="1676" type="curve" name="dv02" smooth="yes"/>
+      <point x="365" y="1676" type="curve" smooth="yes" name="dv02"/>
       <point x="460" y="1676"/>
       <point x="535" y="1656"/>
       <point x="592" y="1617" type="curve" smooth="yes"/>
@@ -75,7 +75,7 @@
       <point x="648" y="1201" type="curve" smooth="yes"/>
       <point x="681" y="1166"/>
       <point x="697" y="1120"/>
-      <point x="697" y="1065" type="curve" name="sh02" smooth="yes"/>
+      <point x="697" y="1065" type="curve" smooth="yes" name="sh02"/>
       <point x="697" y="984"/>
       <point x="665" y="921"/>
       <point x="602" y="876" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/tilde.glif b/source/Hack-Regular.ufo/glyphs/tilde.glif
index 17a290fd4..ecc041475 100644
--- a/source/Hack-Regular.ufo/glyphs/tilde.glif
+++ b/source/Hack-Regular.ufo/glyphs/tilde.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="tilde" format="1">
+<glyph name="tilde" format="2">
   <advance width="1233"/>
   <unicode hex="02DC"/>
   <outline>
     <contour>
-      <point x="555" y="1425" type="line" name="hr00" smooth="yes"/>
+      <point x="555" y="1425" type="line" smooth="yes" name="hr00"/>
       <point x="540" y="1439"/>
       <point x="528" y="1449"/>
       <point x="518" y="1455" type="curve" smooth="yes"/>
@@ -23,7 +23,7 @@
       <point x="339" y="1517" type="curve" smooth="yes"/>
       <point x="373" y="1566"/>
       <point x="420" y="1591"/>
-      <point x="481" y="1591" type="curve" name="dv02" smooth="yes"/>
+      <point x="481" y="1591" type="curve" smooth="yes" name="dv02"/>
       <point x="506" y="1591"/>
       <point x="530" y="1586"/>
       <point x="552" y="1577" type="curve" smooth="yes"/>
@@ -49,7 +49,7 @@
       <point x="894" y="1383" type="curve" smooth="yes"/>
       <point x="860" y="1334"/>
       <point x="813" y="1309"/>
-      <point x="752" y="1309" type="curve" name="sv02" smooth="yes"/>
+      <point x="752" y="1309" type="curve" smooth="yes" name="sv02"/>
       <point x="727" y="1309"/>
       <point x="703" y="1314"/>
       <point x="681" y="1323" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/tildecomb.glif b/source/Hack-Regular.ufo/glyphs/tildecomb.glif
index d2da71e70..7a4d7efca 100644
--- a/source/Hack-Regular.ufo/glyphs/tildecomb.glif
+++ b/source/Hack-Regular.ufo/glyphs/tildecomb.glif
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="tildecomb" format="1">
-  <advance width="0"/>
+<glyph name="tildecomb" format="2">
   <unicode hex="0303"/>
   <outline>
     <contour>
@@ -18,7 +17,7 @@
       <point x="-946" y="1309" type="line"/>
       <point x="-945" y="1489"/>
       <point x="-873" y="1591"/>
-      <point x="-752" y="1591" type="curve" name="dv02" smooth="yes"/>
+      <point x="-752" y="1591" type="curve" smooth="yes" name="dv02"/>
       <point x="-700" y="1591"/>
       <point x="-661" y="1574"/>
       <point x="-612" y="1530" type="curve"/>
@@ -35,7 +34,7 @@
       <point x="-287" y="1591" type="line"/>
       <point x="-288" y="1411"/>
       <point x="-360" y="1309"/>
-      <point x="-481" y="1309" type="curve" name="sv02" smooth="yes"/>
+      <point x="-481" y="1309" type="curve" smooth="yes" name="sv02"/>
       <point x="-533" y="1309"/>
       <point x="-572" y="1326"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/tonos.glif b/source/Hack-Regular.ufo/glyphs/tonos.glif
index 8c60bb154..88f6f906c 100644
--- a/source/Hack-Regular.ufo/glyphs/tonos.glif
+++ b/source/Hack-Regular.ufo/glyphs/tonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="tonos" format="1">
+<glyph name="tonos" format="2">
   <advance width="1233"/>
   <unicode hex="0384"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/trademark.glif b/source/Hack-Regular.ufo/glyphs/trademark.glif
index 4f4f3e77c..e8a9895d9 100644
--- a/source/Hack-Regular.ufo/glyphs/trademark.glif
+++ b/source/Hack-Regular.ufo/glyphs/trademark.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="trademark" format="1">
+<glyph name="trademark" format="2">
   <advance width="1233"/>
   <unicode hex="2122"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/triagdn.glif b/source/Hack-Regular.ufo/glyphs/triagdn.glif
index ae62ad357..4964145af 100644
--- a/source/Hack-Regular.ufo/glyphs/triagdn.glif
+++ b/source/Hack-Regular.ufo/glyphs/triagdn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="triagdn" format="1">
+<glyph name="triagdn" format="2">
   <advance width="1233"/>
   <unicode hex="25BC"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/triaglf.glif b/source/Hack-Regular.ufo/glyphs/triaglf.glif
index 5b464644c..a9eecf67b 100644
--- a/source/Hack-Regular.ufo/glyphs/triaglf.glif
+++ b/source/Hack-Regular.ufo/glyphs/triaglf.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="triaglf" format="1">
+<glyph name="triaglf" format="2">
   <advance width="1233"/>
   <unicode hex="25C4"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/triagrt.glif b/source/Hack-Regular.ufo/glyphs/triagrt.glif
index 4fa9ebf0a..76cd2a61c 100644
--- a/source/Hack-Regular.ufo/glyphs/triagrt.glif
+++ b/source/Hack-Regular.ufo/glyphs/triagrt.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="triagrt" format="1">
+<glyph name="triagrt" format="2">
   <advance width="1233"/>
   <unicode hex="25BA"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/triagup.glif b/source/Hack-Regular.ufo/glyphs/triagup.glif
index 8b827d704..6a5b3fba1 100644
--- a/source/Hack-Regular.ufo/glyphs/triagup.glif
+++ b/source/Hack-Regular.ufo/glyphs/triagup.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="triagup" format="1">
+<glyph name="triagup" format="2">
   <advance width="1233"/>
   <unicode hex="25B2"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/two.glif b/source/Hack-Regular.ufo/glyphs/two.glif
index 0023dbc84..998e22537 100644
--- a/source/Hack-Regular.ufo/glyphs/two.glif
+++ b/source/Hack-Regular.ufo/glyphs/two.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="two" format="1">
+<glyph name="two" format="2">
   <advance width="1233"/>
   <unicode hex="0032"/>
   <outline>
     <contour>
-      <point x="152" y="134" type="line" name="hr00" smooth="yes"/>
+      <point x="152" y="134" type="line" smooth="yes" name="hr00"/>
       <point x="152" y="159"/>
       <point x="158" y="177"/>
       <point x="177" y="196" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="807" y="929" type="curve" smooth="yes"/>
       <point x="830" y="980"/>
       <point x="842" y="1029"/>
-      <point x="842" y="1085" type="curve" name="dh01" smooth="yes"/>
+      <point x="842" y="1085" type="curve" smooth="yes" name="dh01"/>
       <point x="842" y="1165"/>
       <point x="818" y="1232"/>
       <point x="769" y="1279" type="curve" smooth="yes"/>
       <point x="720" y="1326"/>
       <point x="652" y="1350"/>
-      <point x="566" y="1350" type="curve" name="sv01" smooth="yes"/>
+      <point x="566" y="1350" type="curve" smooth="yes" name="sv01"/>
       <point x="446" y="1350"/>
       <point x="313" y="1306"/>
       <point x="164" y="1217" type="curve" name="iv01"/>
@@ -35,13 +35,13 @@
       <point x="367" y="1495" type="curve" smooth="yes"/>
       <point x="434" y="1512"/>
       <point x="499" y="1520"/>
-      <point x="563" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="563" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="702" y="1520"/>
       <point x="826" y="1484"/>
       <point x="917" y="1404" type="curve" smooth="yes"/>
       <point x="997" y="1333"/>
       <point x="1049" y="1230"/>
-      <point x="1049" y="1102" type="curve" name="sh01" smooth="yes"/>
+      <point x="1049" y="1102" type="curve" smooth="yes" name="sh01"/>
       <point x="1049" y="1034"/>
       <point x="1034" y="970"/>
       <point x="1005" y="905" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/two.subs.glif b/source/Hack-Regular.ufo/glyphs/two.subs.glif
index 5b9ba83d1..57cd68e1b 100644
--- a/source/Hack-Regular.ufo/glyphs/two.subs.glif
+++ b/source/Hack-Regular.ufo/glyphs/two.subs.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="two.subs" format="1">
+<glyph name="two.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
@@ -10,20 +10,20 @@
       <point x="695" y="84" type="curve" smooth="yes"/>
       <point x="722" y="125"/>
       <point x="735" y="162"/>
-      <point x="735" y="196" type="curve" name="dh01" smooth="yes"/>
+      <point x="735" y="196" type="curve" smooth="yes" name="dh01"/>
       <point x="735" y="277"/>
       <point x="662" y="333"/>
-      <point x="553" y="333" type="curve" name="dv02" smooth="yes"/>
+      <point x="553" y="333" type="curve" smooth="yes" name="dv02"/>
       <point x="487" y="333"/>
       <point x="412" y="309"/>
       <point x="328" y="261" type="curve"/>
       <point x="328" y="386" type="line"/>
       <point x="416" y="423"/>
       <point x="493" y="442"/>
-      <point x="573" y="442" type="curve" name="dv03" smooth="yes"/>
+      <point x="573" y="442" type="curve" smooth="yes" name="dv03"/>
       <point x="762" y="442"/>
       <point x="887" y="345"/>
-      <point x="887" y="202" type="curve" name="dh02" smooth="yes"/>
+      <point x="887" y="202" type="curve" smooth="yes" name="dh02"/>
       <point x="887" y="163"/>
       <point x="875" y="125"/>
       <point x="850" y="86" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/twodotenleader.glif b/source/Hack-Regular.ufo/glyphs/twodotenleader.glif
index 9e91f1891..24cee1583 100644
--- a/source/Hack-Regular.ufo/glyphs/twodotenleader.glif
+++ b/source/Hack-Regular.ufo/glyphs/twodotenleader.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="twodotenleader" format="1">
+<glyph name="twodotenleader" format="2">
   <advance width="1233"/>
   <unicode hex="2025"/>
   <outline>
     <contour>
-      <point x="286" y="0" type="line" name="hr00" smooth="yes"/>
+      <point x="286" y="0" type="line" smooth="yes" name="hr00"/>
       <point x="266" y="0"/>
       <point x="256" y="10"/>
-      <point x="256" y="30" type="curve" name="dh01" smooth="yes"/>
+      <point x="256" y="30" type="curve" smooth="yes" name="dh01"/>
       <point x="256" y="275" type="line" smooth="yes"/>
       <point x="256" y="295"/>
       <point x="266" y="305"/>
-      <point x="286" y="305" type="curve" name="sv01" smooth="yes"/>
+      <point x="286" y="305" type="curve" smooth="yes" name="sv01"/>
       <point x="478" y="305" type="line" smooth="yes"/>
       <point x="498" y="305"/>
       <point x="508" y="295"/>
       <point x="508" y="275" type="curve" smooth="yes"/>
-      <point x="508" y="30" type="line" name="dh02" smooth="yes"/>
+      <point x="508" y="30" type="line" smooth="yes" name="dh02"/>
       <point x="508" y="10"/>
       <point x="498" y="0"/>
       <point x="478" y="0" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="755" y="0" type="line" name="ab01" smooth="yes"/>
+      <point x="755" y="0" type="line" smooth="yes" name="ab01"/>
       <point x="735" y="0"/>
       <point x="725" y="10"/>
-      <point x="725" y="30" type="curve" name="dh03" smooth="yes"/>
+      <point x="725" y="30" type="curve" smooth="yes" name="dh03"/>
       <point x="725" y="275" type="line" smooth="yes"/>
       <point x="725" y="295"/>
       <point x="735" y="305"/>
-      <point x="755" y="305" type="curve" name="sv02" smooth="yes"/>
-      <point x="947" y="305" type="line" name="sv03" smooth="yes"/>
+      <point x="755" y="305" type="curve" smooth="yes" name="sv02"/>
+      <point x="947" y="305" type="line" smooth="yes" name="sv03"/>
       <point x="967" y="305"/>
       <point x="977" y="295"/>
       <point x="977" y="275" type="curve" smooth="yes"/>
-      <point x="977" y="30" type="line" name="dh04" smooth="yes"/>
+      <point x="977" y="30" type="line" smooth="yes" name="dh04"/>
       <point x="977" y="10"/>
       <point x="967" y="0"/>
       <point x="947" y="0" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/u.glif b/source/Hack-Regular.ufo/glyphs/u.glif
index b9e3b5f68..55ddf72f2 100644
--- a/source/Hack-Regular.ufo/glyphs/u.glif
+++ b/source/Hack-Regular.ufo/glyphs/u.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="u" format="1">
+<glyph name="u" format="2">
   <advance width="1233"/>
   <unicode hex="0075"/>
   <outline>
@@ -27,9 +27,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/uacute.glif b/source/Hack-Regular.ufo/glyphs/uacute.glif
index ebab1c86a..ed68cfb33 100644
--- a/source/Hack-Regular.ufo/glyphs/uacute.glif
+++ b/source/Hack-Regular.ufo/glyphs/uacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uacute" format="1">
+<glyph name="uacute" format="2">
   <advance width="1233"/>
   <unicode hex="00FA"/>
   <outline>
@@ -10,28 +10,28 @@
       <point x="475" y="1268" type="line" name="ih01"/>
     </contour>
     <contour>
-      <point x="534" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="534" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="420" y="-29"/>
       <point x="335" y="9"/>
       <point x="279" y="84" type="curve" smooth="yes"/>
       <point x="223" y="159"/>
       <point x="195" y="272"/>
-      <point x="195" y="424" type="curve" name="sh02" smooth="yes"/>
+      <point x="195" y="424" type="curve" smooth="yes" name="sh02"/>
       <point x="195" y="1118" type="line"/>
       <point x="379" y="1118" type="line"/>
-      <point x="379" y="424" type="line" name="hr02" smooth="yes"/>
+      <point x="379" y="424" type="line" smooth="yes" name="hr02"/>
       <point x="379" y="323"/>
       <point x="397" y="249"/>
       <point x="433" y="202" type="curve" smooth="yes"/>
       <point x="468" y="157"/>
       <point x="518" y="131"/>
-      <point x="598" y="131" type="curve" name="dv02" smooth="yes"/>
+      <point x="598" y="131" type="curve" smooth="yes" name="dv02"/>
       <point x="685" y="131"/>
       <point x="751" y="162"/>
       <point x="797" y="223" type="curve" smooth="yes"/>
       <point x="843" y="284"/>
       <point x="866" y="371"/>
-      <point x="866" y="485" type="curve" name="sh03" smooth="yes"/>
+      <point x="866" y="485" type="curve" smooth="yes" name="sh03"/>
       <point x="866" y="1118" type="line"/>
       <point x="1051" y="1118" type="line"/>
       <point x="1051" y="0" type="line" name="sh01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/ubreve.glif b/source/Hack-Regular.ufo/glyphs/ubreve.glif
index e83391c21..ac5b1f7fd 100644
--- a/source/Hack-Regular.ufo/glyphs/ubreve.glif
+++ b/source/Hack-Regular.ufo/glyphs/ubreve.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ubreve" format="1">
+<glyph name="ubreve" format="2">
   <advance width="1233"/>
   <unicode hex="016D"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="818" y="1585" type="line"/>
       <point x="801" y="1485"/>
       <point x="738" y="1435"/>
-      <point x="623" y="1435" type="curve" name="hr01" smooth="yes"/>
+      <point x="623" y="1435" type="curve" smooth="yes" name="hr01"/>
       <point x="507" y="1435"/>
       <point x="442" y="1485"/>
       <point x="429" y="1585" type="curve" name="hr02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/ucircumflex.glif b/source/Hack-Regular.ufo/glyphs/ucircumflex.glif
index 972c8d7d3..cd5200896 100644
--- a/source/Hack-Regular.ufo/glyphs/ucircumflex.glif
+++ b/source/Hack-Regular.ufo/glyphs/ucircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ucircumflex" format="1">
+<glyph name="ucircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="00FB"/>
   <outline>
@@ -13,28 +13,28 @@
       <point x="297" y="1268" type="line" name="ih03"/>
     </contour>
     <contour>
-      <point x="534" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="534" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="420" y="-29"/>
       <point x="335" y="9"/>
       <point x="279" y="84" type="curve" smooth="yes"/>
       <point x="223" y="159"/>
       <point x="195" y="272"/>
-      <point x="195" y="424" type="curve" name="hr02" smooth="yes"/>
+      <point x="195" y="424" type="curve" smooth="yes" name="hr02"/>
       <point x="195" y="1118" type="line"/>
       <point x="379" y="1118" type="line"/>
-      <point x="379" y="424" type="line" name="sh02" smooth="yes"/>
+      <point x="379" y="424" type="line" smooth="yes" name="sh02"/>
       <point x="379" y="323"/>
       <point x="397" y="249"/>
       <point x="433" y="202" type="curve" smooth="yes"/>
       <point x="468" y="157"/>
       <point x="518" y="131"/>
-      <point x="598" y="131" type="curve" name="dv02" smooth="yes"/>
+      <point x="598" y="131" type="curve" smooth="yes" name="dv02"/>
       <point x="685" y="131"/>
       <point x="751" y="162"/>
       <point x="797" y="223" type="curve" smooth="yes"/>
       <point x="843" y="284"/>
       <point x="866" y="371"/>
-      <point x="866" y="485" type="curve" name="sh03" smooth="yes"/>
+      <point x="866" y="485" type="curve" smooth="yes" name="sh03"/>
       <point x="866" y="1118" type="line"/>
       <point x="1051" y="1118" type="line"/>
       <point x="1051" y="0" type="line" name="sh01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/udieresis.glif b/source/Hack-Regular.ufo/glyphs/udieresis.glif
index b22b51c6a..69a68a99e 100644
--- a/source/Hack-Regular.ufo/glyphs/udieresis.glif
+++ b/source/Hack-Regular.ufo/glyphs/udieresis.glif
@@ -1,67 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="udieresis" format="1">
+<glyph name="udieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00FC"/>
   <outline>
     <contour>
-      <point x="349" y="1350" type="line" name="dv03" smooth="yes"/>
+      <point x="349" y="1350" type="line" smooth="yes" name="dv03"/>
       <point x="329" y="1350"/>
       <point x="319" y="1360"/>
-      <point x="319" y="1380" type="curve" name="hr01" smooth="yes"/>
+      <point x="319" y="1380" type="curve" smooth="yes" name="hr01"/>
       <point x="319" y="1522" type="line" smooth="yes"/>
       <point x="319" y="1542"/>
       <point x="329" y="1552"/>
-      <point x="349" y="1552" type="curve" name="dv04" smooth="yes"/>
+      <point x="349" y="1552" type="curve" smooth="yes" name="dv04"/>
       <point x="492" y="1552" type="line" smooth="yes"/>
       <point x="512" y="1552"/>
       <point x="522" y="1542"/>
       <point x="522" y="1522" type="curve" smooth="yes"/>
-      <point x="522" y="1380" type="line" name="sh01" smooth="yes"/>
+      <point x="522" y="1380" type="line" smooth="yes" name="sh01"/>
       <point x="522" y="1360"/>
       <point x="512" y="1350"/>
       <point x="492" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1350" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1350" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1350"/>
       <point x="711" y="1360"/>
-      <point x="711" y="1380" type="curve" name="hr02" smooth="yes"/>
+      <point x="711" y="1380" type="curve" smooth="yes" name="hr02"/>
       <point x="711" y="1522" type="line" smooth="yes"/>
       <point x="711" y="1542"/>
       <point x="721" y="1552"/>
-      <point x="741" y="1552" type="curve" name="sv02" smooth="yes"/>
+      <point x="741" y="1552" type="curve" smooth="yes" name="sv02"/>
       <point x="883" y="1552" type="line" smooth="yes"/>
       <point x="903" y="1552"/>
       <point x="913" y="1542"/>
       <point x="913" y="1522" type="curve" smooth="yes"/>
-      <point x="913" y="1380" type="line" name="dh03" smooth="yes"/>
+      <point x="913" y="1380" type="line" smooth="yes" name="dh03"/>
       <point x="913" y="1360"/>
       <point x="903" y="1350"/>
       <point x="883" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="534" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="534" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="420" y="-29"/>
       <point x="335" y="9"/>
       <point x="279" y="84" type="curve" smooth="yes"/>
       <point x="223" y="159"/>
       <point x="195" y="272"/>
-      <point x="195" y="424" type="curve" name="dh01" smooth="yes"/>
+      <point x="195" y="424" type="curve" smooth="yes" name="dh01"/>
       <point x="195" y="1118" type="line"/>
       <point x="379" y="1118" type="line"/>
-      <point x="379" y="424" type="line" name="dh02" smooth="yes"/>
+      <point x="379" y="424" type="line" smooth="yes" name="dh02"/>
       <point x="379" y="323"/>
       <point x="397" y="249"/>
       <point x="433" y="202" type="curve" smooth="yes"/>
       <point x="468" y="157"/>
       <point x="518" y="131"/>
-      <point x="598" y="131" type="curve" name="dv02" smooth="yes"/>
+      <point x="598" y="131" type="curve" smooth="yes" name="dv02"/>
       <point x="685" y="131"/>
       <point x="751" y="162"/>
       <point x="797" y="223" type="curve" smooth="yes"/>
       <point x="843" y="284"/>
       <point x="866" y="371"/>
-      <point x="866" y="485" type="curve" name="sh02" smooth="yes"/>
+      <point x="866" y="485" type="curve" smooth="yes" name="sh02"/>
       <point x="866" y="1118" type="line" name="hr03"/>
       <point x="1051" y="1118" type="line"/>
       <point x="1051" y="0" type="line" name="sh03"/>
diff --git a/source/Hack-Regular.ufo/glyphs/ugrave.glif b/source/Hack-Regular.ufo/glyphs/ugrave.glif
index 742240070..0e36fc008 100644
--- a/source/Hack-Regular.ufo/glyphs/ugrave.glif
+++ b/source/Hack-Regular.ufo/glyphs/ugrave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ugrave" format="1">
+<glyph name="ugrave" format="2">
   <advance width="1233"/>
   <unicode hex="00F9"/>
   <outline>
@@ -10,28 +10,28 @@
       <point x="604" y="1268" type="line"/>
     </contour>
     <contour>
-      <point x="534" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="534" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="420" y="-29"/>
       <point x="335" y="9"/>
       <point x="279" y="84" type="curve" smooth="yes"/>
       <point x="223" y="159"/>
       <point x="195" y="272"/>
-      <point x="195" y="424" type="curve" name="sh01" smooth="yes"/>
+      <point x="195" y="424" type="curve" smooth="yes" name="sh01"/>
       <point x="195" y="1118" type="line"/>
       <point x="379" y="1118" type="line"/>
-      <point x="379" y="424" type="line" name="hr02" smooth="yes"/>
+      <point x="379" y="424" type="line" smooth="yes" name="hr02"/>
       <point x="379" y="323"/>
       <point x="397" y="249"/>
       <point x="433" y="202" type="curve" smooth="yes"/>
       <point x="468" y="157"/>
       <point x="518" y="131"/>
-      <point x="598" y="131" type="curve" name="dv02" smooth="yes"/>
+      <point x="598" y="131" type="curve" smooth="yes" name="dv02"/>
       <point x="685" y="131"/>
       <point x="751" y="162"/>
       <point x="797" y="223" type="curve" smooth="yes"/>
       <point x="843" y="284"/>
       <point x="866" y="371"/>
-      <point x="866" y="485" type="curve" name="sh03" smooth="yes"/>
+      <point x="866" y="485" type="curve" smooth="yes" name="sh03"/>
       <point x="866" y="1118" type="line"/>
       <point x="1051" y="1118" type="line"/>
       <point x="1051" y="0" type="line" name="sh02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uhorn.glif b/source/Hack-Regular.ufo/glyphs/uhorn.glif
index 50df94c41..cb80c1899 100644
--- a/source/Hack-Regular.ufo/glyphs/uhorn.glif
+++ b/source/Hack-Regular.ufo/glyphs/uhorn.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uhorn" format="1">
+<glyph name="uhorn" format="2">
   <advance width="1233"/>
   <unicode hex="01B0"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="1174" y="1137" type="line" name="at01"/>
       <point x="1189" y="1081"/>
       <point x="1194" y="1043"/>
-      <point x="1194" y="994" type="curve" name="dh05" smooth="yes"/>
+      <point x="1194" y="994" type="curve" smooth="yes" name="dh05"/>
       <point x="1194" y="845"/>
       <point x="1139" y="764"/>
-      <point x="1020" y="764" type="curve" name="sv01" smooth="yes"/>
+      <point x="1020" y="764" type="curve" smooth="yes" name="sv01"/>
       <point x="979" y="764"/>
       <point x="942" y="774"/>
       <point x="895" y="801" type="curve"/>
@@ -19,28 +19,28 @@
       <point x="710" y="168" type="line" name="dh03"/>
       <point x="645" y="39"/>
       <point x="531" y="-29"/>
-      <point x="378" y="-29" type="curve" name="sv03" smooth="yes"/>
+      <point x="378" y="-29" type="curve" smooth="yes" name="sv03"/>
       <point x="149" y="-29"/>
       <point x="39" y="119"/>
-      <point x="39" y="424" type="curve" name="dh01" smooth="yes"/>
+      <point x="39" y="424" type="curve" smooth="yes" name="dh01"/>
       <point x="39" y="1118" type="line" name="at02"/>
       <point x="223" y="1118" type="line"/>
-      <point x="223" y="424" type="line" name="dh02" smooth="yes"/>
+      <point x="223" y="424" type="line" smooth="yes" name="dh02"/>
       <point x="223" y="223"/>
       <point x="293" y="131"/>
-      <point x="442" y="131" type="curve" name="sv02" smooth="yes"/>
+      <point x="442" y="131" type="curve" smooth="yes" name="sv02"/>
       <point x="617" y="131"/>
       <point x="710" y="256"/>
-      <point x="710" y="485" type="curve" name="sh01" smooth="yes"/>
+      <point x="710" y="485" type="curve" smooth="yes" name="sh01"/>
       <point x="710" y="1118" type="line" name="hr02"/>
       <point x="895" y="1118" type="line" name="sh02"/>
       <point x="895" y="929" type="line"/>
       <point x="929" y="912"/>
       <point x="958" y="903"/>
-      <point x="983" y="903" type="curve" name="sv04" smooth="yes"/>
+      <point x="983" y="903" type="curve" smooth="yes" name="sv04"/>
       <point x="1039" y="903"/>
       <point x="1071" y="941"/>
-      <point x="1071" y="1013" type="curve" name="dh04" smooth="yes"/>
+      <point x="1071" y="1013" type="curve" smooth="yes" name="dh04"/>
       <point x="1071" y="1054"/>
       <point x="1061" y="1096"/>
       <point x="1041" y="1137" type="curve" name="ih01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uhungarumlaut.glif b/source/Hack-Regular.ufo/glyphs/uhungarumlaut.glif
index 672238cc6..2b2fe1f10 100644
--- a/source/Hack-Regular.ufo/glyphs/uhungarumlaut.glif
+++ b/source/Hack-Regular.ufo/glyphs/uhungarumlaut.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uhungarumlaut" format="1">
+<glyph name="uhungarumlaut" format="2">
   <advance width="1233"/>
   <unicode hex="0171"/>
   <outline>
@@ -16,19 +16,19 @@
       <point x="664" y="1268" type="line" name="ih03"/>
     </contour>
     <contour>
-      <point x="534" y="-29" type="curve" name="sv03" smooth="yes"/>
+      <point x="534" y="-29" type="curve" smooth="yes" name="sv03"/>
       <point x="305" y="-29"/>
       <point x="195" y="119"/>
-      <point x="195" y="424" type="curve" name="sh01" smooth="yes"/>
+      <point x="195" y="424" type="curve" smooth="yes" name="sh01"/>
       <point x="195" y="1118" type="line"/>
       <point x="379" y="1118" type="line"/>
-      <point x="379" y="424" type="line" name="hr02" smooth="yes"/>
+      <point x="379" y="424" type="line" smooth="yes" name="hr02"/>
       <point x="379" y="223"/>
       <point x="449" y="131"/>
-      <point x="598" y="131" type="curve" name="sv02" smooth="yes"/>
+      <point x="598" y="131" type="curve" smooth="yes" name="sv02"/>
       <point x="773" y="131"/>
       <point x="866" y="256"/>
-      <point x="866" y="485" type="curve" name="sh05" smooth="yes"/>
+      <point x="866" y="485" type="curve" smooth="yes" name="sh05"/>
       <point x="866" y="1118" type="line"/>
       <point x="1051" y="1118" type="line"/>
       <point x="1051" y="0" type="line" name="sh02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/umacron.glif b/source/Hack-Regular.ufo/glyphs/umacron.glif
index 85a5247d6..62b36a798 100644
--- a/source/Hack-Regular.ufo/glyphs/umacron.glif
+++ b/source/Hack-Regular.ufo/glyphs/umacron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="umacron" format="1">
+<glyph name="umacron" format="2">
   <advance width="1233"/>
   <unicode hex="016B"/>
   <outline>
@@ -10,19 +10,19 @@
       <point x="317" y="1318" type="line"/>
     </contour>
     <contour>
-      <point x="534" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="534" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="305" y="-29"/>
       <point x="195" y="119"/>
-      <point x="195" y="424" type="curve" name="sh01" smooth="yes"/>
+      <point x="195" y="424" type="curve" smooth="yes" name="sh01"/>
       <point x="195" y="1118" type="line"/>
       <point x="379" y="1118" type="line"/>
-      <point x="379" y="424" type="line" name="sh02" smooth="yes"/>
+      <point x="379" y="424" type="line" smooth="yes" name="sh02"/>
       <point x="379" y="223"/>
       <point x="449" y="131"/>
-      <point x="598" y="131" type="curve" name="sv01" smooth="yes"/>
+      <point x="598" y="131" type="curve" smooth="yes" name="sv01"/>
       <point x="773" y="131"/>
       <point x="866" y="256"/>
-      <point x="866" y="485" type="curve" name="sh03" smooth="yes"/>
+      <point x="866" y="485" type="curve" smooth="yes" name="sh03"/>
       <point x="866" y="1118" type="line"/>
       <point x="1051" y="1118" type="line" name="hr02"/>
       <point x="1051" y="0" type="line" name="sh04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/underscore.glif b/source/Hack-Regular.ufo/glyphs/underscore.glif
index 4decaee4e..a39b21d09 100644
--- a/source/Hack-Regular.ufo/glyphs/underscore.glif
+++ b/source/Hack-Regular.ufo/glyphs/underscore.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="underscore" format="1">
+<glyph name="underscore" format="2">
   <advance width="1233"/>
   <unicode hex="005F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/underscoredbl.glif b/source/Hack-Regular.ufo/glyphs/underscoredbl.glif
index 63850617e..afc94109a 100644
--- a/source/Hack-Regular.ufo/glyphs/underscoredbl.glif
+++ b/source/Hack-Regular.ufo/glyphs/underscoredbl.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="underscoredbl" format="1">
+<glyph name="underscoredbl" format="2">
   <advance width="1233"/>
   <unicode hex="2017"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni00A_0.glif b/source/Hack-Regular.ufo/glyphs/uni00A_0.glif
index c0979d094..a4b993919 100644
--- a/source/Hack-Regular.ufo/glyphs/uni00A_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni00A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni00A0" format="1">
+<glyph name="uni00A0" format="2">
   <advance width="1233"/>
   <unicode hex="00A0"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni00A_D_.glif b/source/Hack-Regular.ufo/glyphs/uni00A_D_.glif
index 0254fe42b..31f65ec19 100644
--- a/source/Hack-Regular.ufo/glyphs/uni00A_D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni00A_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni00AD" format="1">
+<glyph name="uni00AD" format="2">
   <advance width="1233"/>
   <unicode hex="00AD"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni00B_2.glif b/source/Hack-Regular.ufo/glyphs/uni00B_2.glif
index ee2f38341..6ef9c90a6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni00B_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni00B_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni00B2" format="1">
+<glyph name="uni00B2" format="2">
   <advance width="1233"/>
   <unicode hex="00B2"/>
   <outline>
@@ -11,10 +11,10 @@
       <point x="695" y="1614" type="curve" smooth="yes"/>
       <point x="722" y="1655"/>
       <point x="735" y="1692"/>
-      <point x="735" y="1727" type="curve" name="dh01" smooth="yes"/>
+      <point x="735" y="1727" type="curve" smooth="yes" name="dh01"/>
       <point x="735" y="1807"/>
       <point x="662" y="1863"/>
-      <point x="555" y="1863" type="curve" name="dv02" smooth="yes"/>
+      <point x="555" y="1863" type="curve" smooth="yes" name="dv02"/>
       <point x="520" y="1863"/>
       <point x="485" y="1857"/>
       <point x="448" y="1845" type="curve" smooth="yes"/>
@@ -27,13 +27,13 @@
       <point x="454" y="1958" type="curve" smooth="yes"/>
       <point x="494" y="1967"/>
       <point x="533" y="1972"/>
-      <point x="576" y="1972" type="curve" name="dv03" smooth="yes"/>
+      <point x="576" y="1972" type="curve" smooth="yes" name="dv03"/>
       <point x="669" y="1972"/>
       <point x="744" y="1950"/>
       <point x="801" y="1906" type="curve" smooth="yes"/>
       <point x="860" y="1861"/>
       <point x="887" y="1801"/>
-      <point x="887" y="1734" type="curve" name="sh01" smooth="yes"/>
+      <point x="887" y="1734" type="curve" smooth="yes" name="sh01"/>
       <point x="887" y="1687"/>
       <point x="873" y="1653"/>
       <point x="850" y="1617" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni00B_3.glif b/source/Hack-Regular.ufo/glyphs/uni00B_3.glif
index 36a226248..b4d721d40 100644
--- a/source/Hack-Regular.ufo/glyphs/uni00B_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni00B_3.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni00B3" format="1">
+<glyph name="uni00B3" format="2">
   <advance width="1233"/>
   <unicode hex="00B3"/>
   <outline>
     <contour>
-      <point x="562" y="1109" type="curve" name="hr00" smooth="yes"/>
+      <point x="562" y="1109" type="curve" smooth="yes" name="hr00"/>
       <point x="515" y="1109"/>
       <point x="481" y="1113"/>
       <point x="442" y="1120" type="curve" smooth="yes"/>
@@ -17,7 +17,7 @@
       <point x="452" y="1231" type="curve" smooth="yes"/>
       <point x="487" y="1222"/>
       <point x="522" y="1218"/>
-      <point x="556" y="1218" type="curve" name="dv01" smooth="yes"/>
+      <point x="556" y="1218" type="curve" smooth="yes" name="dv01"/>
       <point x="619" y="1218"/>
       <point x="674" y="1232"/>
       <point x="714" y="1259" type="curve" smooth="yes"/>
@@ -29,22 +29,22 @@
       <point x="717" y="1479" type="curve" smooth="yes"/>
       <point x="680" y="1504"/>
       <point x="625" y="1517"/>
-      <point x="553" y="1517" type="curve" name="dv04" smooth="yes"/>
+      <point x="553" y="1517" type="curve" smooth="yes" name="dv04"/>
       <point x="487" y="1517" type="line"/>
       <point x="487" y="1625" type="line"/>
-      <point x="561" y="1625" type="line" name="dv05" smooth="yes"/>
+      <point x="561" y="1625" type="line" smooth="yes" name="dv05"/>
       <point x="622" y="1625"/>
       <point x="670" y="1636"/>
       <point x="703" y="1657" type="curve" smooth="yes"/>
       <point x="736" y="1678"/>
       <point x="752" y="1708"/>
-      <point x="752" y="1747" type="curve" name="dh01" smooth="yes"/>
+      <point x="752" y="1747" type="curve" smooth="yes" name="dh01"/>
       <point x="752" y="1786"/>
       <point x="736" y="1815"/>
       <point x="704" y="1836" type="curve" smooth="yes"/>
       <point x="672" y="1857"/>
       <point x="625" y="1867"/>
-      <point x="572" y="1867" type="curve" name="dv02" smooth="yes"/>
+      <point x="572" y="1867" type="curve" smooth="yes" name="dv02"/>
       <point x="537" y="1867"/>
       <point x="506" y="1863"/>
       <point x="469" y="1855" type="curve" smooth="yes"/>
@@ -57,7 +57,7 @@
       <point x="482" y="1967" type="curve" smooth="yes"/>
       <point x="521" y="1973"/>
       <point x="557" y="1976"/>
-      <point x="592" y="1976" type="curve" name="dv03" smooth="yes"/>
+      <point x="592" y="1976" type="curve" smooth="yes" name="dv03"/>
       <point x="687" y="1976"/>
       <point x="762" y="1956"/>
       <point x="819" y="1917" type="curve" smooth="yes"/>
@@ -75,7 +75,7 @@
       <point x="875" y="1501" type="curve" smooth="yes"/>
       <point x="908" y="1466"/>
       <point x="924" y="1420"/>
-      <point x="924" y="1365" type="curve" name="dh02" smooth="yes"/>
+      <point x="924" y="1365" type="curve" smooth="yes" name="dh02"/>
       <point x="924" y="1284"/>
       <point x="892" y="1221"/>
       <point x="829" y="1176" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni00B_5.glif b/source/Hack-Regular.ufo/glyphs/uni00B_5.glif
index 528f3535c..c94936022 100644
--- a/source/Hack-Regular.ufo/glyphs/uni00B_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni00B_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni00B5" format="1">
+<glyph name="uni00B5" format="2">
   <advance width="1233"/>
   <unicode hex="00B5"/>
   <outline>
@@ -12,22 +12,22 @@
       <point x="409" y="207" type="curve" smooth="yes"/>
       <point x="449" y="156"/>
       <point x="507" y="131"/>
-      <point x="582" y="131" type="curve" name="dv02" smooth="yes"/>
+      <point x="582" y="131" type="curve" smooth="yes" name="dv02"/>
       <point x="665" y="131"/>
       <point x="729" y="159"/>
       <point x="772" y="216" type="curve" smooth="yes"/>
       <point x="815" y="273"/>
       <point x="836" y="356"/>
-      <point x="836" y="467" type="curve" name="ah01" smooth="yes"/>
+      <point x="836" y="467" type="curve" smooth="yes" name="ah01"/>
       <point x="836" y="1120" type="line" name="at01"/>
       <point x="1021" y="1120" type="line"/>
-      <point x="1021" y="256" type="line" name="sh02" smooth="yes"/>
+      <point x="1021" y="256" type="line" smooth="yes" name="sh02"/>
       <point x="1021" y="217"/>
       <point x="1026" y="188"/>
       <point x="1037" y="169" type="curve" smooth="yes"/>
       <point x="1048" y="150"/>
       <point x="1064" y="141"/>
-      <point x="1083" y="141" type="curve" name="sv01" smooth="yes"/>
+      <point x="1083" y="141" type="curve" smooth="yes" name="sv01"/>
       <point x="1091" y="141"/>
       <point x="1100" y="143"/>
       <point x="1110" y="146" type="curve" smooth="yes"/>
@@ -40,7 +40,7 @@
       <point x="1080" y="-18" type="curve" smooth="yes"/>
       <point x="1056" y="-25"/>
       <point x="1033" y="-29"/>
-      <point x="1012" y="-29" type="curve" name="sh03" smooth="yes"/>
+      <point x="1012" y="-29" type="curve" smooth="yes" name="sh03"/>
       <point x="971" y="-29"/>
       <point x="938" y="-16"/>
       <point x="913" y="11" type="curve" smooth="yes"/>
@@ -52,7 +52,7 @@
       <point x="751" y="10" type="curve" smooth="yes"/>
       <point x="707" y="-16"/>
       <point x="655" y="-29"/>
-      <point x="594" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="594" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="474" y="-29"/>
       <point x="391" y="20"/>
       <point x="332" y="127" type="curve" name="ih02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni00B_9.glif b/source/Hack-Regular.ufo/glyphs/uni00B_9.glif
index 71411f6ed..ae945b4ce 100644
--- a/source/Hack-Regular.ufo/glyphs/uni00B_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni00B_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni00B9" format="1">
+<glyph name="uni00B9" format="2">
   <advance width="1233"/>
   <unicode hex="00B9"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0122.glif b/source/Hack-Regular.ufo/glyphs/uni0122.glif
index ac2cc9435..b308cdfcc 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0122.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0122.glif
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0122" format="1">
+<glyph name="uni0122" format="2">
   <advance width="1233"/>
   <unicode hex="0122"/>
   <outline>
     <contour>
-      <point x="700" y="-29" type="curve" name="dv03" smooth="yes"/>
+      <point x="700" y="-29" type="curve" smooth="yes" name="dv03"/>
       <point x="324" y="-29"/>
       <point x="102" y="255"/>
-      <point x="102" y="743" type="curve" name="dh01" smooth="yes"/>
+      <point x="102" y="743" type="curve" smooth="yes" name="dh01"/>
       <point x="102" y="1233"/>
       <point x="327" y="1520"/>
-      <point x="703" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="703" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="835" y="1520"/>
       <point x="945" y="1485"/>
       <point x="1053" y="1413" type="curve"/>
       <point x="1053" y="1206" type="line" name="ih01"/>
       <point x="945" y="1310"/>
       <point x="835" y="1356"/>
-      <point x="707" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="707" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="440" y="1356"/>
       <point x="313" y="1155"/>
-      <point x="313" y="739" type="curve" name="dh02" smooth="yes"/>
+      <point x="313" y="739" type="curve" smooth="yes" name="dh02"/>
       <point x="313" y="330"/>
       <point x="438" y="135"/>
-      <point x="705" y="135" type="curve" name="dv04" smooth="yes"/>
+      <point x="705" y="135" type="curve" smooth="yes" name="dv04"/>
       <point x="790" y="135"/>
       <point x="855" y="155"/>
       <point x="911" y="199" type="curve" name="sh01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0123.glif b/source/Hack-Regular.ufo/glyphs/uni0123.glif
index d4097143d..4c84c39d5 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0123.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0123.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0123" format="1">
+<glyph name="uni0123" format="2">
   <advance width="1233"/>
   <unicode hex="0123"/>
   <outline>
@@ -10,47 +10,47 @@
       <point x="514" y="1297" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="601" y="-440" type="curve" name="dv01" smooth="yes"/>
+      <point x="601" y="-440" type="curve" smooth="yes" name="dv01"/>
       <point x="500" y="-440"/>
       <point x="388" y="-421"/>
       <point x="276" y="-385" type="curve"/>
       <point x="276" y="-203" type="line" name="ih03"/>
       <point x="410" y="-265"/>
       <point x="509" y="-293"/>
-      <point x="607" y="-293" type="curve" name="dv02" smooth="yes"/>
+      <point x="607" y="-293" type="curve" smooth="yes" name="dv02"/>
       <point x="800" y="-293"/>
       <point x="886" y="-186"/>
-      <point x="886" y="45" type="curve" name="ah01" smooth="yes"/>
+      <point x="886" y="45" type="curve" smooth="yes" name="ah01"/>
       <point x="886" y="178" type="line" name="iv01"/>
       <point x="830" y="57"/>
       <point x="730" y="-8"/>
-      <point x="585" y="-8" type="curve" name="hr01" smooth="yes"/>
+      <point x="585" y="-8" type="curve" smooth="yes" name="hr01"/>
       <point x="318" y="-8"/>
       <point x="151" y="218"/>
-      <point x="151" y="570" type="curve" name="sh01" smooth="yes"/>
+      <point x="151" y="570" type="curve" smooth="yes" name="sh01"/>
       <point x="151" y="921"/>
       <point x="317" y="1147"/>
-      <point x="586" y="1147" type="curve" name="sv02" smooth="yes"/>
+      <point x="586" y="1147" type="curve" smooth="yes" name="sv02"/>
       <point x="723" y="1147"/>
       <point x="825" y="1090"/>
       <point x="886" y="971" type="curve" name="sh04"/>
       <point x="904" y="1116" type="line" name="at01"/>
       <point x="1070" y="1116" type="line"/>
-      <point x="1070" y="72" type="line" name="sh02" smooth="yes"/>
+      <point x="1070" y="72" type="line" smooth="yes" name="sh02"/>
       <point x="1070" y="-267"/>
       <point x="910" y="-440"/>
     </contour>
     <contour>
-      <point x="620" y="145" type="curve" name="sv03" smooth="yes"/>
+      <point x="620" y="145" type="curve" smooth="yes" name="sv03"/>
       <point x="796" y="145"/>
       <point x="886" y="292"/>
-      <point x="886" y="569" type="curve" name="sh05" smooth="yes"/>
+      <point x="886" y="569" type="curve" smooth="yes" name="sh05"/>
       <point x="886" y="846"/>
       <point x="796" y="991"/>
-      <point x="619" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="619" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="443" y="991"/>
       <point x="345" y="847"/>
-      <point x="345" y="570" type="curve" name="sh03" smooth="yes"/>
+      <point x="345" y="570" type="curve" smooth="yes" name="sh03"/>
       <point x="345" y="291"/>
       <point x="444" y="145"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0136.glif b/source/Hack-Regular.ufo/glyphs/uni0136.glif
index 3c6c54d32..a87d99d48 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0136.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0136.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0136" format="1">
+<glyph name="uni0136" format="2">
   <advance width="1233"/>
   <unicode hex="0136"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0137.glif b/source/Hack-Regular.ufo/glyphs/uni0137.glif
index 6f504c65d..2860afe08 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0137.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0137.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0137" format="1">
+<glyph name="uni0137" format="2">
   <advance width="1233"/>
   <unicode hex="0137"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni013B_.glif b/source/Hack-Regular.ufo/glyphs/uni013B_.glif
index db9dec656..0a6fbe54c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni013B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni013B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni013B" format="1">
+<glyph name="uni013B" format="2">
   <advance width="1233"/>
   <unicode hex="013B"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni013C_.glif b/source/Hack-Regular.ufo/glyphs/uni013C_.glif
index 3e0090fd5..9c04565fc 100644
--- a/source/Hack-Regular.ufo/glyphs/uni013C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni013C_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni013C" format="1">
+<glyph name="uni013C" format="2">
   <advance width="1233"/>
   <unicode hex="013C"/>
   <outline>
     <contour>
-      <point x="801" y="-8" type="line" name="ab01" smooth="yes"/>
+      <point x="801" y="-8" type="line" smooth="yes" name="ab01"/>
       <point x="580" y="-8"/>
       <point x="455" y="138"/>
-      <point x="455" y="398" type="curve" name="sh01" smooth="yes"/>
+      <point x="455" y="398" type="curve" smooth="yes" name="sh01"/>
       <point x="455" y="1412" type="line" name="sv01"/>
       <point x="160" y="1412" type="line"/>
       <point x="160" y="1556" type="line" name="dh01"/>
@@ -15,7 +15,7 @@
       <point x="639" y="398" type="line" smooth="yes"/>
       <point x="639" y="231"/>
       <point x="699" y="148"/>
-      <point x="819" y="148" type="curve" name="sv02" smooth="yes"/>
+      <point x="819" y="148" type="curve" smooth="yes" name="sv02"/>
       <point x="1034" y="148" type="line"/>
       <point x="1034" y="-8" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0145.glif b/source/Hack-Regular.ufo/glyphs/uni0145.glif
index 82ad96f3f..c940e6836 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0145.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0145.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0145" format="1">
+<glyph name="uni0145" format="2">
   <advance width="1233"/>
   <unicode hex="0145"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0146.glif b/source/Hack-Regular.ufo/glyphs/uni0146.glif
index 017f93d35..661753f37 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0146.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0146.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0146" format="1">
+<glyph name="uni0146" format="2">
   <advance width="1233"/>
   <unicode hex="0146"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="379" y="952" type="line" name="sh02"/>
       <point x="444" y="1081"/>
       <point x="558" y="1147"/>
-      <point x="711" y="1147" type="curve" name="sv02" smooth="yes"/>
+      <point x="711" y="1147" type="curve" smooth="yes" name="sv02"/>
       <point x="940" y="1147"/>
       <point x="1051" y="999"/>
       <point x="1051" y="694" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="866" y="694" type="line" smooth="yes"/>
       <point x="866" y="895"/>
       <point x="799" y="987"/>
-      <point x="648" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="648" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="473" y="987"/>
       <point x="379" y="862"/>
-      <point x="379" y="633" type="curve" name="sh04" smooth="yes"/>
+      <point x="379" y="633" type="curve" smooth="yes" name="sh04"/>
       <point x="379" y="0" type="line" name="ab01"/>
       <point x="195" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0156.glif b/source/Hack-Regular.ufo/glyphs/uni0156.glif
index 0ea615e59..4e4b67360 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0156.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0156.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0156" format="1">
+<glyph name="uni0156" format="2">
   <advance width="1233"/>
   <unicode hex="0156"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="559" y="1493" type="line" smooth="yes"/>
       <point x="886" y="1493"/>
       <point x="1067" y="1337"/>
-      <point x="1067" y="1069" type="curve" name="sh01" smooth="yes"/>
+      <point x="1067" y="1069" type="curve" smooth="yes" name="sh01"/>
       <point x="1067" y="856"/>
       <point x="953" y="734"/>
       <point x="760" y="705" type="curve" name="ih01"/>
@@ -20,19 +20,19 @@
       <point x="838" y="377" type="line" smooth="yes"/>
       <point x="734" y="596"/>
       <point x="667" y="631"/>
-      <point x="539" y="631" type="curve" name="dv03" smooth="yes"/>
+      <point x="539" y="631" type="curve" smooth="yes" name="dv03"/>
       <point x="346" y="631" type="line" name="sh03"/>
       <point x="346" y="0" type="line" name="ab02"/>
       <point x="143" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="567" y="797" type="line" name="dv04" smooth="yes"/>
+      <point x="567" y="797" type="line" smooth="yes" name="dv04"/>
       <point x="758" y="797"/>
       <point x="854" y="883"/>
-      <point x="854" y="1056" type="curve" name="ah01" smooth="yes"/>
+      <point x="854" y="1056" type="curve" smooth="yes" name="ah01"/>
       <point x="854" y="1237"/>
       <point x="751" y="1327"/>
-      <point x="559" y="1327" type="curve" name="sv01" smooth="yes"/>
+      <point x="559" y="1327" type="curve" smooth="yes" name="sv01"/>
       <point x="346" y="1327" type="line" name="sh02"/>
       <point x="346" y="797" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0157.glif b/source/Hack-Regular.ufo/glyphs/uni0157.glif
index e0389afe8..68e124c1a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0157.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0157.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0157" format="1">
+<glyph name="uni0157" format="2">
   <advance width="1233"/>
   <unicode hex="0157"/>
   <outline>
@@ -9,17 +9,17 @@
       <point x="487" y="901" type="line" name="dh02"/>
       <point x="547" y="1056"/>
       <point x="673" y="1147"/>
-      <point x="856" y="1147" type="curve" name="sv02" smooth="yes"/>
+      <point x="856" y="1147" type="curve" smooth="yes" name="sv02"/>
       <point x="945" y="1147"/>
       <point x="1023" y="1125"/>
       <point x="1095" y="1077" type="curve"/>
       <point x="1095" y="889" type="line" name="iv01"/>
       <point x="1015" y="950"/>
       <point x="938" y="977"/>
-      <point x="841" y="977" type="curve" name="sv01" smooth="yes"/>
+      <point x="841" y="977" type="curve" smooth="yes" name="sv01"/>
       <point x="610" y="977"/>
       <point x="487" y="830"/>
-      <point x="487" y="557" type="curve" name="sh01" smooth="yes"/>
+      <point x="487" y="557" type="curve" smooth="yes" name="sh01"/>
       <point x="487" y="0" type="line" name="ab01"/>
       <point x="302" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0162.glif b/source/Hack-Regular.ufo/glyphs/uni0162.glif
index ca2aafc74..4cf8b2fba 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0162.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0162.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0162" format="1">
+<glyph name="uni0162" format="2">
   <advance width="1233"/>
   <unicode hex="0162"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="569" y="0" type="line"/>
       <point x="618" y="-73"/>
       <point x="637" y="-127"/>
-      <point x="637" y="-180" type="curve" name="hr01" smooth="yes"/>
+      <point x="637" y="-180" type="curve" smooth="yes" name="hr01"/>
       <point x="637" y="-241"/>
       <point x="596" y="-272"/>
       <point x="513" y="-272" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0163.glif b/source/Hack-Regular.ufo/glyphs/uni0163.glif
index c1c8ab335..fd8dea946 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0163.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0163.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0163" format="1">
+<glyph name="uni0163" format="2">
   <advance width="1233"/>
   <unicode hex="0163"/>
   <outline>
@@ -49,7 +49,7 @@
       <point x="700" y="165" type="curve" smooth="yes"/>
       <point x="640" y="193"/>
       <point x="614" y="253"/>
-      <point x="614" y="365" type="curve" name="hr02" smooth="yes"/>
+      <point x="614" y="365" type="curve" smooth="yes" name="hr02"/>
       <point x="614" y="977" type="line"/>
       <point x="1032" y="977" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni01A_4.glif b/source/Hack-Regular.ufo/glyphs/uni01A_4.glif
index 3e11dd7a5..3cc65ac93 100644
--- a/source/Hack-Regular.ufo/glyphs/uni01A_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni01A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni01A4" format="1">
+<glyph name="uni01A4" format="2">
   <advance width="1233"/>
   <unicode hex="01A4"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0218.glif b/source/Hack-Regular.ufo/glyphs/uni0218.glif
index ea69fa576..ce07a8a93 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0218.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0218.glif
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0218" format="1">
+<glyph name="uni0218" format="2">
   <advance width="1233"/>
   <unicode hex="0218"/>
   <outline>
     <contour>
-      <point x="586" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="586" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="439" y="-29"/>
       <point x="302" y="1"/>
       <point x="158" y="61" type="curve"/>
       <point x="158" y="276" type="line" name="ih01"/>
       <point x="311" y="179"/>
       <point x="442" y="135"/>
-      <point x="583" y="135" type="curve" name="dv03" smooth="yes"/>
+      <point x="583" y="135" type="curve" smooth="yes" name="dv03"/>
       <point x="787" y="135"/>
       <point x="905" y="225"/>
-      <point x="905" y="405" type="curve" name="ah01" smooth="yes"/>
+      <point x="905" y="405" type="curve" smooth="yes" name="ah01"/>
       <point x="905" y="539"/>
       <point x="839" y="611"/>
       <point x="643" y="657" type="curve" smooth="yes"/>
       <point x="535" y="682" type="line" smooth="yes"/>
       <point x="255" y="746"/>
       <point x="139" y="869"/>
-      <point x="139" y="1077" type="curve" name="sh01" smooth="yes"/>
+      <point x="139" y="1077" type="curve" smooth="yes" name="sh01"/>
       <point x="139" y="1346"/>
       <point x="334" y="1520"/>
-      <point x="631" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="631" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="745" y="1520"/>
       <point x="872" y="1494"/>
       <point x="1012" y="1442" type="curve"/>
       <point x="1012" y="1237" type="line" name="ih02"/>
       <point x="889" y="1316"/>
       <point x="765" y="1356"/>
-      <point x="640" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="640" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="451" y="1356"/>
       <point x="332" y="1265"/>
-      <point x="332" y="1101" type="curve" name="sh02" smooth="yes"/>
+      <point x="332" y="1101" type="curve" smooth="yes" name="sh02"/>
       <point x="332" y="982"/>
       <point x="395" y="915"/>
       <point x="590" y="872" type="curve" smooth="yes"/>
       <point x="696" y="848" type="line" smooth="yes"/>
       <point x="979" y="784"/>
       <point x="1098" y="644"/>
-      <point x="1098" y="411" type="curve" name="sh03" smooth="yes"/>
+      <point x="1098" y="411" type="curve" smooth="yes" name="sh03"/>
       <point x="1098" y="124"/>
       <point x="917" y="-29"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0219.glif b/source/Hack-Regular.ufo/glyphs/uni0219.glif
index 9eccb5668..706ccf529 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0219.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0219.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0219" format="1">
+<glyph name="uni0219" format="2">
   <advance width="1233"/>
   <unicode hex="0219"/>
   <outline>
     <contour>
-      <point x="587" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="587" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="471" y="-29"/>
       <point x="354" y="-6"/>
       <point x="213" y="41" type="curve" name="sh02"/>
       <point x="213" y="231" type="line"/>
       <point x="350" y="160"/>
       <point x="475" y="125"/>
-      <point x="588" y="125" type="curve" name="dv05" smooth="yes"/>
+      <point x="588" y="125" type="curve" smooth="yes" name="dv05"/>
       <point x="751" y="125"/>
       <point x="844" y="198"/>
-      <point x="844" y="305" type="curve" name="ah01" smooth="yes"/>
+      <point x="844" y="305" type="curve" smooth="yes" name="ah01"/>
       <point x="844" y="396"/>
       <point x="776" y="452"/>
       <point x="599" y="490" type="curve" smooth="yes"/>
@@ -22,20 +22,20 @@
       <point x="522" y="506" type="line" smooth="yes"/>
       <point x="303" y="549"/>
       <point x="217" y="646"/>
-      <point x="217" y="810" type="curve" name="sh01" smooth="yes"/>
+      <point x="217" y="810" type="curve" smooth="yes" name="sh01"/>
       <point x="217" y="1027"/>
       <point x="364" y="1147"/>
-      <point x="639" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="639" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="754" y="1147"/>
       <point x="866" y="1125"/>
       <point x="973" y="1081" type="curve"/>
       <point x="973" y="901" type="line" name="ih01"/>
       <point x="865" y="962"/>
       <point x="765" y="993"/>
-      <point x="645" y="993" type="curve" name="dv03" smooth="yes"/>
+      <point x="645" y="993" type="curve" smooth="yes" name="dv03"/>
       <point x="484" y="993"/>
       <point x="403" y="938"/>
-      <point x="403" y="828" type="curve" name="sh04" smooth="yes"/>
+      <point x="403" y="828" type="curve" smooth="yes" name="sh04"/>
       <point x="403" y="781"/>
       <point x="418" y="741"/>
       <point x="449" y="717" type="curve" smooth="yes"/>
@@ -45,7 +45,7 @@
       <point x="752" y="631" type="line" smooth="yes"/>
       <point x="936" y="596"/>
       <point x="1030" y="492"/>
-      <point x="1030" y="324" type="curve" name="sh03" smooth="yes"/>
+      <point x="1030" y="324" type="curve" smooth="yes" name="sh03"/>
       <point x="1030" y="103"/>
       <point x="863" y="-29"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni021A_.glif b/source/Hack-Regular.ufo/glyphs/uni021A_.glif
index 9f7f4c1bd..f0aee3a0e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni021A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni021A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni021A" format="1">
+<glyph name="uni021A" format="2">
   <advance width="1233"/>
   <unicode hex="021A"/>
   <outline>
@@ -8,20 +8,20 @@
       <point x="700" y="0" type="line" name="ih02"/>
       <point x="776" y="-84"/>
       <point x="809" y="-147"/>
-      <point x="809" y="-220" type="curve" name="dh02" smooth="yes"/>
+      <point x="809" y="-220" type="curve" smooth="yes" name="dh02"/>
       <point x="809" y="-333"/>
       <point x="729" y="-395"/>
-      <point x="569" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="569" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="512" y="-395"/>
       <point x="454" y="-387"/>
       <point x="395" y="-371" type="curve"/>
       <point x="395" y="-240" type="line" name="dh01"/>
       <point x="436" y="-263"/>
       <point x="493" y="-272"/>
-      <point x="542" y="-272" type="curve" name="dv02" smooth="yes"/>
+      <point x="542" y="-272" type="curve" smooth="yes" name="dv02"/>
       <point x="630" y="-272"/>
       <point x="670" y="-239"/>
-      <point x="670" y="-182" type="curve" name="sh02" smooth="yes"/>
+      <point x="670" y="-182" type="curve" smooth="yes" name="sh02"/>
       <point x="670" y="-141"/>
       <point x="647" y="-91"/>
       <point x="582" y="0" type="curve" name="hr01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni021B_.glif b/source/Hack-Regular.ufo/glyphs/uni021B_.glif
index 04208c1a0..abf125994 100644
--- a/source/Hack-Regular.ufo/glyphs/uni021B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni021B_.glif
@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni021B" format="1">
+<glyph name="uni021B" format="2">
   <advance width="1233"/>
   <unicode hex="021B"/>
   <outline>
     <contour>
       <point x="614" y="977" type="line" name="sv01"/>
-      <point x="614" y="365" type="line" name="dh02" smooth="yes"/>
+      <point x="614" y="365" type="line" smooth="yes" name="dh02"/>
       <point x="614" y="283"/>
       <point x="630" y="225"/>
       <point x="661" y="192" type="curve" smooth="yes"/>
       <point x="692" y="159"/>
       <point x="746" y="143"/>
-      <point x="825" y="143" type="curve" name="sv02" smooth="yes"/>
+      <point x="825" y="143" type="curve" smooth="yes" name="sv02"/>
       <point x="1032" y="143" type="line" name="sv03"/>
       <point x="1032" y="-4" type="line" name="ab01"/>
       <point x="838" y="-4" type="line" name="ih02"/>
       <point x="902" y="-79"/>
       <point x="930" y="-136"/>
-      <point x="930" y="-204" type="curve" name="sh01" smooth="yes"/>
+      <point x="930" y="-204" type="curve" smooth="yes" name="sh01"/>
       <point x="930" y="-317"/>
       <point x="850" y="-379"/>
-      <point x="690" y="-379" type="curve" name="dv01" smooth="yes"/>
+      <point x="690" y="-379" type="curve" smooth="yes" name="dv01"/>
       <point x="633" y="-379"/>
       <point x="575" y="-371"/>
       <point x="516" y="-355" type="curve"/>
       <point x="516" y="-224" type="line" name="ih01"/>
       <point x="557" y="-247"/>
       <point x="614" y="-256"/>
-      <point x="663" y="-256" type="curve" name="dv02" smooth="yes"/>
+      <point x="663" y="-256" type="curve" smooth="yes" name="dv02"/>
       <point x="751" y="-256"/>
       <point x="791" y="-223"/>
-      <point x="791" y="-166" type="curve" name="sh02" smooth="yes"/>
+      <point x="791" y="-166" type="curve" smooth="yes" name="sh02"/>
       <point x="791" y="-125"/>
       <point x="770" y="-82"/>
       <point x="714" y="1" type="curve" name="ab02"/>
       <point x="625" y="11"/>
       <point x="558" y="37"/>
-      <point x="515" y="79" type="curve" name="hr01" smooth="yes"/>
+      <point x="515" y="79" type="curve" smooth="yes" name="hr01"/>
       <point x="458" y="134"/>
       <point x="430" y="229"/>
-      <point x="430" y="365" type="curve" name="dh01" smooth="yes"/>
+      <point x="430" y="365" type="curve" smooth="yes" name="dh01"/>
       <point x="430" y="977" type="line" name="sv04"/>
       <point x="131" y="977" type="line" name="sv05"/>
       <point x="131" y="1120" type="line" name="at01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0394.glif b/source/Hack-Regular.ufo/glyphs/uni0394.glif
index 4425cfe1c..1ce7628ea 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0394.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0394.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0394" format="1">
+<glyph name="uni0394" format="2">
   <advance width="1233"/>
   <unicode hex="0394"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni03A_9.glif b/source/Hack-Regular.ufo/glyphs/uni03A_9.glif
index 20fff27ad..16a4b0106 100644
--- a/source/Hack-Regular.ufo/glyphs/uni03A_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni03A_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni03A9" format="1">
+<glyph name="uni03A9" format="2">
   <advance width="1233"/>
   <unicode hex="03A9"/>
   <outline>
@@ -11,19 +11,19 @@
       <point x="141" y="450" type="curve" smooth="yes"/>
       <point x="104" y="545"/>
       <point x="86" y="656"/>
-      <point x="86" y="783" type="curve" name="dh01" smooth="yes"/>
+      <point x="86" y="783" type="curve" smooth="yes" name="dh01"/>
       <point x="86" y="989"/>
       <point x="134" y="1154"/>
-      <point x="230" y="1277" type="curve" name="hr01" smooth="yes"/>
+      <point x="230" y="1277" type="curve" smooth="yes" name="hr01"/>
       <point x="325" y="1398"/>
       <point x="451" y="1460"/>
-      <point x="614" y="1460" type="curve" name="dv02" smooth="yes"/>
+      <point x="614" y="1460" type="curve" smooth="yes" name="dv02"/>
       <point x="781" y="1460"/>
       <point x="908" y="1396"/>
       <point x="1001" y="1277" type="curve" smooth="yes"/>
       <point x="1097" y="1155"/>
       <point x="1145" y="990"/>
-      <point x="1145" y="783" type="curve" name="dh04" smooth="yes"/>
+      <point x="1145" y="783" type="curve" smooth="yes" name="dh04"/>
       <point x="1145" y="656"/>
       <point x="1127" y="545"/>
       <point x="1090" y="450" type="curve" smooth="yes"/>
@@ -39,19 +39,19 @@
       <point x="883" y="413" type="curve" smooth="yes"/>
       <point x="927" y="521"/>
       <point x="950" y="649"/>
-      <point x="950" y="790" type="curve" name="sh02" smooth="yes"/>
+      <point x="950" y="790" type="curve" smooth="yes" name="sh02"/>
       <point x="950" y="945"/>
       <point x="922" y="1071"/>
       <point x="861" y="1162" type="curve" smooth="yes"/>
       <point x="804" y="1246"/>
       <point x="720" y="1294"/>
-      <point x="616" y="1294" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1294" type="curve" smooth="yes" name="dv01"/>
       <point x="507" y="1294"/>
       <point x="427" y="1242"/>
       <point x="372" y="1162" type="curve" smooth="yes"/>
       <point x="313" y="1075"/>
       <point x="283" y="954"/>
-      <point x="283" y="790" type="curve" name="dh02" smooth="yes"/>
+      <point x="283" y="790" type="curve" smooth="yes" name="dh02"/>
       <point x="283" y="649"/>
       <point x="306" y="521"/>
       <point x="350" y="413" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni03B_C_.glif b/source/Hack-Regular.ufo/glyphs/uni03B_C_.glif
index 5285e2eeb..113141459 100644
--- a/source/Hack-Regular.ufo/glyphs/uni03B_C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni03B_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni03BC" format="1">
+<glyph name="uni03BC" format="2">
   <advance width="1233"/>
   <unicode hex="03BC"/>
   <outline>
@@ -9,16 +9,16 @@
       <point x="379" y="424" type="line" smooth="yes"/>
       <point x="379" y="233"/>
       <point x="461" y="131"/>
-      <point x="610" y="131" type="curve" name="dv02" smooth="yes"/>
+      <point x="610" y="131" type="curve" smooth="yes" name="dv02"/>
       <point x="781" y="131"/>
       <point x="866" y="244"/>
-      <point x="866" y="467" type="curve" name="ah01" smooth="yes"/>
+      <point x="866" y="467" type="curve" smooth="yes" name="ah01"/>
       <point x="866" y="1120" type="line" name="at01"/>
       <point x="1051" y="1120" type="line"/>
-      <point x="1051" y="256" type="line" name="sh01" smooth="yes"/>
+      <point x="1051" y="256" type="line" smooth="yes" name="sh01"/>
       <point x="1051" y="176"/>
       <point x="1072" y="141"/>
-      <point x="1116" y="141" type="curve" name="sv01" smooth="yes"/>
+      <point x="1116" y="141" type="curve" smooth="yes" name="sv01"/>
       <point x="1121" y="141"/>
       <point x="1129" y="143"/>
       <point x="1140" y="146" type="curve" smooth="yes"/>
@@ -28,13 +28,13 @@
       <point x="1182" y="16" type="line"/>
       <point x="1131" y="-15"/>
       <point x="1087" y="-29"/>
-      <point x="1042" y="-29" type="curve" name="sh02" smooth="yes"/>
+      <point x="1042" y="-29" type="curve" smooth="yes" name="sh02"/>
       <point x="959" y="-29"/>
       <point x="909" y="24"/>
       <point x="893" y="129" type="curve" name="ih01"/>
       <point x="832" y="21"/>
       <point x="745" y="-29"/>
-      <point x="625" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="625" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="501" y="-29"/>
       <point x="422" y="19"/>
       <point x="362" y="127" type="curve" name="sh04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni03C_2.glif b/source/Hack-Regular.ufo/glyphs/uni03C_2.glif
index 06dad9baf..c7fe1e4e0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni03C_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni03C_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni03C2" format="1">
+<glyph name="uni03C2" format="2">
   <advance width="1233"/>
   <unicode hex="03C2"/>
   <outline>
@@ -7,32 +7,32 @@
       <point x="696" y="-279" type="line" name="dh03"/>
       <point x="778" y="-284"/>
       <point x="839" y="-235"/>
-      <point x="839" y="-155" type="curve" name="sh01" smooth="yes"/>
+      <point x="839" y="-155" type="curve" smooth="yes" name="sh01"/>
       <point x="839" y="-96"/>
       <point x="807" y="-44"/>
       <point x="718" y="-29" type="curve"/>
       <point x="610" y="-13"/>
       <point x="165" y="-13"/>
-      <point x="165" y="547" type="curve" name="dh01" smooth="yes"/>
+      <point x="165" y="547" type="curve" smooth="yes" name="dh01"/>
       <point x="165" y="929"/>
       <point x="371" y="1147"/>
-      <point x="711" y="1147" type="curve" name="dv02" smooth="yes"/>
+      <point x="711" y="1147" type="curve" smooth="yes" name="dv02"/>
       <point x="828" y="1147"/>
       <point x="924" y="1121"/>
       <point x="1031" y="1061" type="curve"/>
       <point x="1031" y="868" type="line"/>
       <point x="939" y="951"/>
       <point x="847" y="991"/>
-      <point x="723" y="991" type="curve" name="dv01" smooth="yes"/>
+      <point x="723" y="991" type="curve" smooth="yes" name="dv01"/>
       <point x="484" y="991"/>
       <point x="359" y="836"/>
-      <point x="359" y="557" type="curve" name="dh02" smooth="yes"/>
+      <point x="359" y="557" type="curve" smooth="yes" name="dh02"/>
       <point x="359" y="153"/>
       <point x="623" y="131"/>
       <point x="718" y="127" type="curve"/>
       <point x="915" y="114"/>
       <point x="1013" y="7"/>
-      <point x="1013" y="-146" type="curve" name="dh04" smooth="yes"/>
+      <point x="1013" y="-146" type="curve" smooth="yes" name="dh04"/>
       <point x="1013" y="-302"/>
       <point x="913" y="-430"/>
       <point x="696" y="-430" type="curve" name="hr01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni03F_4.glif b/source/Hack-Regular.ufo/glyphs/uni03F_4.glif
index 2e6e9b440..dfba47779 100644
--- a/source/Hack-Regular.ufo/glyphs/uni03F_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni03F_4.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni03F4" format="1">
+<glyph name="uni03F4" format="2">
   <advance width="1233"/>
   <unicode hex="03F4"/>
   <outline>
     <contour>
-      <point x="615" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="615" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="280" y="-29"/>
       <point x="117" y="221"/>
-      <point x="117" y="744" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="744" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="1267"/>
       <point x="280" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="953" y="1520"/>
       <point x="1116" y="1266"/>
-      <point x="1116" y="745" type="curve" name="sh02" smooth="yes"/>
+      <point x="1116" y="745" type="curve" smooth="yes" name="sh02"/>
       <point x="1116" y="225"/>
       <point x="952" y="-29"/>
     </contour>
@@ -21,13 +21,13 @@
       <point x="902" y="881" type="line" name="ah01"/>
       <point x="886" y="1178"/>
       <point x="821" y="1356"/>
-      <point x="616" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="408" y="1356"/>
       <point x="347" y="1172"/>
       <point x="331" y="881" type="curve" name="sh04"/>
     </contour>
     <contour>
-      <point x="617" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="821" y="135"/>
       <point x="900" y="310"/>
       <point x="905" y="711" type="curve" name="sh05"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni03F_6.glif b/source/Hack-Regular.ufo/glyphs/uni03F_6.glif
index 460900847..aae4f62b2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni03F_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni03F_6.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni03F6" format="1">
+<glyph name="uni03F6" format="2">
   <advance width="1233"/>
   <unicode hex="03F6"/>
   <outline>
     <contour>
-      <point x="450" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="450" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="381" y="-29"/>
       <point x="304" y="-22"/>
       <point x="241" y="-7" type="curve" smooth="yes"/>
@@ -13,7 +13,7 @@
       <point x="236" y="153" type="line" smooth="yes"/>
       <point x="287" y="136"/>
       <point x="361" y="127"/>
-      <point x="429" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="429" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="691" y="127"/>
       <point x="812" y="260"/>
       <point x="839" y="487" type="curve" name="dv04"/>
@@ -22,7 +22,7 @@
       <point x="839" y="631" type="line" name="dv05"/>
       <point x="815" y="854"/>
       <point x="689" y="991"/>
-      <point x="437" y="991" type="curve" name="dv02" smooth="yes"/>
+      <point x="437" y="991" type="curve" smooth="yes" name="dv02"/>
       <point x="365" y="991"/>
       <point x="293" y="980"/>
       <point x="236" y="965" type="curve" smooth="yes"/>
@@ -35,7 +35,7 @@
       <point x="241" y="1125" type="curve" smooth="yes"/>
       <point x="317" y="1140"/>
       <point x="384" y="1147"/>
-      <point x="449" y="1147" type="curve" name="dv03" smooth="yes"/>
+      <point x="449" y="1147" type="curve" smooth="yes" name="dv03"/>
       <point x="813" y="1147"/>
       <point x="1033" y="927"/>
       <point x="1033" y="560" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0400.glif b/source/Hack-Regular.ufo/glyphs/uni0400.glif
index dcb30207a..dd0cba0e7 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0400.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0400.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0400" format="1">
+<glyph name="uni0400" format="2">
   <advance width="1233"/>
   <unicode hex="0400"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0401.glif b/source/Hack-Regular.ufo/glyphs/uni0401.glif
index 54ae75e3a..cd8ce985a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0401.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0401.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0401" format="1">
+<glyph name="uni0401" format="2">
   <advance width="1233"/>
   <unicode hex="0401"/>
   <outline>
     <contour>
-      <point x="405" y="1649" type="line" name="dv01" smooth="yes"/>
+      <point x="405" y="1649" type="line" smooth="yes" name="dv01"/>
       <point x="385" y="1649"/>
       <point x="375" y="1659"/>
-      <point x="375" y="1679" type="curve" name="ih01" smooth="yes"/>
+      <point x="375" y="1679" type="curve" smooth="yes" name="ih01"/>
       <point x="375" y="1822" type="line" smooth="yes"/>
       <point x="375" y="1842"/>
       <point x="385" y="1852"/>
-      <point x="405" y="1852" type="curve" name="dv02" smooth="yes"/>
+      <point x="405" y="1852" type="curve" smooth="yes" name="dv02"/>
       <point x="548" y="1852" type="line" smooth="yes"/>
       <point x="568" y="1852"/>
       <point x="578" y="1842"/>
       <point x="578" y="1822" type="curve" smooth="yes"/>
-      <point x="578" y="1679" type="line" name="sh01" smooth="yes"/>
+      <point x="578" y="1679" type="line" smooth="yes" name="sh01"/>
       <point x="578" y="1659"/>
       <point x="568" y="1649"/>
       <point x="548" y="1649" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="797" y="1649" type="line" name="sv01" smooth="yes"/>
+      <point x="797" y="1649" type="line" smooth="yes" name="sv01"/>
       <point x="777" y="1649"/>
       <point x="767" y="1659"/>
-      <point x="767" y="1679" type="curve" name="dh03" smooth="yes"/>
+      <point x="767" y="1679" type="curve" smooth="yes" name="dh03"/>
       <point x="767" y="1822" type="line" smooth="yes"/>
       <point x="767" y="1842"/>
       <point x="777" y="1852"/>
-      <point x="797" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="797" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="939" y="1852" type="line" smooth="yes"/>
       <point x="959" y="1852"/>
       <point x="969" y="1842"/>
       <point x="969" y="1822" type="curve" smooth="yes"/>
-      <point x="969" y="1679" type="line" name="dh04" smooth="yes"/>
+      <point x="969" y="1679" type="line" smooth="yes" name="dh04"/>
       <point x="969" y="1659"/>
       <point x="959" y="1649"/>
       <point x="939" y="1649" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0402.glif b/source/Hack-Regular.ufo/glyphs/uni0402.glif
index 13d218df6..5cc524ab7 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0402.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0402.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0402" format="1">
+<glyph name="uni0402" format="2">
   <advance width="1233"/>
   <unicode hex="0402"/>
   <outline>
     <contour>
-      <point x="658" y="-470" type="curve" name="dv01" smooth="yes"/>
+      <point x="658" y="-470" type="curve" smooth="yes" name="dv01"/>
       <point x="628" y="-470"/>
       <point x="586" y="-468"/>
       <point x="576" y="-468" type="curve" name="sv01"/>
@@ -12,14 +12,14 @@
       <point x="651" y="-304" type="line"/>
       <point x="660" y="-305"/>
       <point x="667" y="-306"/>
-      <point x="687" y="-306" type="curve" name="dv02" smooth="yes"/>
+      <point x="687" y="-306" type="curve" smooth="yes" name="dv02"/>
       <point x="867" y="-306"/>
       <point x="932" y="-224"/>
-      <point x="932" y="46" type="curve" name="ah01" smooth="yes"/>
+      <point x="932" y="46" type="curve" smooth="yes" name="ah01"/>
       <point x="932" y="462" type="line" smooth="yes"/>
       <point x="932" y="667"/>
       <point x="863" y="755"/>
-      <point x="706" y="755" type="curve" name="dv03" smooth="yes"/>
+      <point x="706" y="755" type="curve" smooth="yes" name="dv03"/>
       <point x="639" y="755"/>
       <point x="579" y="740"/>
       <point x="520" y="713" type="curve" smooth="yes"/>
@@ -46,10 +46,10 @@
       <point x="516" y="892" type="curve"/>
       <point x="557" y="916"/>
       <point x="628" y="932"/>
-      <point x="729" y="939" type="curve" name="sv04" smooth="yes"/>
+      <point x="729" y="939" type="curve" smooth="yes" name="sv04"/>
       <point x="746" y="940"/>
       <point x="758" y="941"/>
-      <point x="777" y="941" type="curve" name="dv04" smooth="yes"/>
+      <point x="777" y="941" type="curve" smooth="yes" name="dv04"/>
       <point x="881" y="941"/>
       <point x="968" y="913"/>
       <point x="1025" y="857" type="curve" smooth="yes"/>
@@ -59,7 +59,7 @@
       <point x="1107" y="753"/>
       <point x="1135" y="640"/>
       <point x="1135" y="488" type="curve" smooth="yes"/>
-      <point x="1135" y="46" type="line" name="hr01" smooth="yes"/>
+      <point x="1135" y="46" type="line" smooth="yes" name="hr01"/>
       <point x="1135" y="-334"/>
       <point x="1006" y="-470"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0403.glif b/source/Hack-Regular.ufo/glyphs/uni0403.glif
index f56e23305..5c1e678de 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0403.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0403.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0403" format="1">
+<glyph name="uni0403" format="2">
   <advance width="1233"/>
   <unicode hex="0403"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0404.glif b/source/Hack-Regular.ufo/glyphs/uni0404.glif
index cb86ff49d..7b3638e01 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0404.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0404.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0404" format="1">
+<glyph name="uni0404" format="2">
   <advance width="1233"/>
   <unicode hex="0404"/>
   <outline>
     <contour>
-      <point x="733" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="733" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="350" y="-29"/>
       <point x="129" y="255"/>
-      <point x="129" y="743" type="curve" name="dh01" smooth="yes"/>
+      <point x="129" y="743" type="curve" smooth="yes" name="dh01"/>
       <point x="129" y="1234"/>
       <point x="353" y="1520"/>
-      <point x="733" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="733" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="850" y="1520"/>
       <point x="960" y="1493"/>
       <point x="1063" y="1438" type="curve"/>
       <point x="1063" y="1231" type="line"/>
       <point x="962" y="1314"/>
       <point x="849" y="1356"/>
-      <point x="724" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="724" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="467" y="1356"/>
       <point x="377" y="1174"/>
       <point x="345" y="831" type="curve" name="sh01"/>
@@ -26,7 +26,7 @@
       <point x="340" y="661" type="line" name="dh02"/>
       <point x="345" y="359"/>
       <point x="468" y="135"/>
-      <point x="731" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="731" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="848" y="135"/>
       <point x="964" y="177"/>
       <point x="1063" y="260" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0405.glif b/source/Hack-Regular.ufo/glyphs/uni0405.glif
index da37eef85..b58344591 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0405.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0405.glif
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0405" format="1">
+<glyph name="uni0405" format="2">
   <advance width="1233"/>
   <unicode hex="0405"/>
   <outline>
     <contour>
-      <point x="586" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="586" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="439" y="-29"/>
       <point x="302" y="1"/>
       <point x="158" y="61" type="curve"/>
       <point x="158" y="276" type="line" name="ih01"/>
       <point x="311" y="179"/>
       <point x="442" y="135"/>
-      <point x="583" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="583" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="787" y="135"/>
       <point x="905" y="225"/>
-      <point x="905" y="405" type="curve" name="ah01" smooth="yes"/>
+      <point x="905" y="405" type="curve" smooth="yes" name="ah01"/>
       <point x="905" y="539"/>
       <point x="839" y="611"/>
       <point x="643" y="657" type="curve" smooth="yes"/>
       <point x="535" y="682" type="line" smooth="yes"/>
       <point x="255" y="746"/>
       <point x="139" y="869"/>
-      <point x="139" y="1077" type="curve" name="sh01" smooth="yes"/>
+      <point x="139" y="1077" type="curve" smooth="yes" name="sh01"/>
       <point x="139" y="1346"/>
       <point x="334" y="1520"/>
-      <point x="631" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="631" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="745" y="1520"/>
       <point x="872" y="1494"/>
       <point x="1012" y="1442" type="curve"/>
       <point x="1012" y="1237" type="line" name="ih02"/>
       <point x="889" y="1316"/>
       <point x="765" y="1356"/>
-      <point x="640" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="640" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="451" y="1356"/>
       <point x="332" y="1265"/>
-      <point x="332" y="1101" type="curve" name="sh02" smooth="yes"/>
+      <point x="332" y="1101" type="curve" smooth="yes" name="sh02"/>
       <point x="332" y="982"/>
       <point x="395" y="915"/>
       <point x="590" y="872" type="curve" smooth="yes"/>
       <point x="696" y="848" type="line" smooth="yes"/>
       <point x="979" y="784"/>
       <point x="1098" y="644"/>
-      <point x="1098" y="411" type="curve" name="sh03" smooth="yes"/>
+      <point x="1098" y="411" type="curve" smooth="yes" name="sh03"/>
       <point x="1098" y="124"/>
       <point x="917" y="-29"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0406.glif b/source/Hack-Regular.ufo/glyphs/uni0406.glif
index d8321331a..8a413e6fc 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0406.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0406.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0406" format="1">
+<glyph name="uni0406" format="2">
   <advance width="1233"/>
   <unicode hex="0406"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0407.glif b/source/Hack-Regular.ufo/glyphs/uni0407.glif
index f6439365e..678109bb2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0407.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0407.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0407" format="1">
+<glyph name="uni0407" format="2">
   <advance width="1233"/>
   <unicode hex="0407"/>
   <outline>
     <contour>
-      <point x="349" y="1649" type="line" name="dv01" smooth="yes"/>
+      <point x="349" y="1649" type="line" smooth="yes" name="dv01"/>
       <point x="329" y="1649"/>
       <point x="319" y="1659"/>
-      <point x="319" y="1679" type="curve" name="dh01" smooth="yes"/>
+      <point x="319" y="1679" type="curve" smooth="yes" name="dh01"/>
       <point x="319" y="1822" type="line" smooth="yes"/>
       <point x="319" y="1842"/>
       <point x="329" y="1852"/>
-      <point x="349" y="1852" type="curve" name="dv02" smooth="yes"/>
+      <point x="349" y="1852" type="curve" smooth="yes" name="dv02"/>
       <point x="492" y="1852" type="line" smooth="yes"/>
       <point x="512" y="1852"/>
       <point x="522" y="1842"/>
       <point x="522" y="1822" type="curve" smooth="yes"/>
-      <point x="522" y="1679" type="line" name="dh02" smooth="yes"/>
+      <point x="522" y="1679" type="line" smooth="yes" name="dh02"/>
       <point x="522" y="1659"/>
       <point x="512" y="1649"/>
       <point x="492" y="1649" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1649" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1649" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1649"/>
       <point x="711" y="1659"/>
-      <point x="711" y="1679" type="curve" name="sh02" smooth="yes"/>
+      <point x="711" y="1679" type="curve" smooth="yes" name="sh02"/>
       <point x="711" y="1822" type="line" smooth="yes"/>
       <point x="711" y="1842"/>
       <point x="721" y="1852"/>
-      <point x="741" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="741" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="883" y="1852" type="line" smooth="yes"/>
       <point x="903" y="1852"/>
       <point x="913" y="1842"/>
-      <point x="913" y="1822" type="curve" name="hr01" smooth="yes"/>
-      <point x="913" y="1679" type="line" name="sh03" smooth="yes"/>
+      <point x="913" y="1822" type="curve" smooth="yes" name="hr01"/>
+      <point x="913" y="1679" type="line" smooth="yes" name="sh03"/>
       <point x="913" y="1659"/>
       <point x="903" y="1649"/>
       <point x="883" y="1649" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0408.glif b/source/Hack-Regular.ufo/glyphs/uni0408.glif
index 61e5af9bc..61124d053 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0408.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0408.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0408" format="1">
+<glyph name="uni0408" format="2">
   <advance width="1233"/>
   <unicode hex="0408"/>
   <outline>
     <contour>
-      <point x="506" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="506" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="372" y="-29"/>
       <point x="257" y="-4"/>
       <point x="109" y="61" type="curve"/>
       <point x="109" y="297" type="line"/>
       <point x="232" y="189"/>
       <point x="355" y="135"/>
-      <point x="504" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="504" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="689" y="135"/>
       <point x="754" y="219"/>
-      <point x="754" y="487" type="curve" name="dh01" smooth="yes"/>
+      <point x="754" y="487" type="curve" smooth="yes" name="dh01"/>
       <point x="754" y="1323" type="line" name="sv01"/>
       <point x="373" y="1323" type="line"/>
       <point x="373" y="1493" type="line" name="at01"/>
       <point x="956" y="1493" type="line"/>
-      <point x="956" y="487" type="line" name="dh02" smooth="yes"/>
+      <point x="956" y="487" type="line" smooth="yes" name="dh02"/>
       <point x="956" y="116"/>
       <point x="827" y="-29"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0409.glif b/source/Hack-Regular.ufo/glyphs/uni0409.glif
index 4afd86359..e4bd1cf2d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0409.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0409.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0409" format="1">
+<glyph name="uni0409" format="2">
   <advance width="1233"/>
   <unicode hex="0409"/>
   <outline>
@@ -10,17 +10,17 @@
       <point x="257" y="516" type="curve" name="sh01"/>
       <point x="265" y="638"/>
       <point x="267" y="863"/>
-      <point x="267" y="1067" type="curve" name="dh01" smooth="yes"/>
+      <point x="267" y="1067" type="curve" smooth="yes" name="dh01"/>
       <point x="267" y="1493" type="line" name="at01"/>
       <point x="811" y="1493" type="line" name="sh02"/>
       <point x="811" y="893" type="line"/>
-      <point x="832" y="893" type="line" name="dv02" smooth="yes"/>
+      <point x="832" y="893" type="line" smooth="yes" name="dv02"/>
       <point x="1024" y="893"/>
       <point x="1233" y="740"/>
-      <point x="1233" y="447" type="curve" name="dh06" smooth="yes"/>
+      <point x="1233" y="447" type="curve" smooth="yes" name="dh06"/>
       <point x="1233" y="154"/>
       <point x="1023" y="0"/>
-      <point x="832" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="832" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="625" y="0" type="line" name="dh03"/>
       <point x="625" y="1323" type="line" name="sv01"/>
       <point x="453" y="1323" type="line"/>
@@ -34,13 +34,13 @@
       <point x="0" y="0" type="curve" name="ab02"/>
     </contour>
     <contour>
-      <point x="832" y="166" type="line" name="sv02" smooth="yes"/>
+      <point x="832" y="166" type="line" smooth="yes" name="sv02"/>
       <point x="952" y="166"/>
       <point x="1047" y="263"/>
-      <point x="1047" y="444" type="curve" name="dh05" smooth="yes"/>
+      <point x="1047" y="444" type="curve" smooth="yes" name="dh05"/>
       <point x="1047" y="623"/>
       <point x="957" y="727"/>
-      <point x="832" y="727" type="curve" name="dv01" smooth="yes"/>
+      <point x="832" y="727" type="curve" smooth="yes" name="dv01"/>
       <point x="811" y="727" type="line"/>
       <point x="811" y="166" type="line" name="dh04"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni040A_.glif b/source/Hack-Regular.ufo/glyphs/uni040A_.glif
index f6c962205..44cee3991 100644
--- a/source/Hack-Regular.ufo/glyphs/uni040A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni040A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni040A" format="1">
+<glyph name="uni040A" format="2">
   <advance width="1233"/>
   <unicode hex="040A"/>
   <outline>
@@ -14,10 +14,10 @@
       <point x="832" y="893" type="line" smooth="yes"/>
       <point x="1071" y="893"/>
       <point x="1233" y="749"/>
-      <point x="1233" y="466" type="curve" name="dh05" smooth="yes"/>
+      <point x="1233" y="466" type="curve" smooth="yes" name="dh05"/>
       <point x="1233" y="143"/>
       <point x="1023" y="0"/>
-      <point x="832" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="832" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="625" y="0" type="line" name="sh01"/>
       <point x="625" y="711" type="line" name="dv01"/>
       <point x="230" y="711" type="line" name="sh02"/>
@@ -25,10 +25,10 @@
       <point x="44" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="832" y="166" type="line" name="sv02" smooth="yes"/>
+      <point x="832" y="166" type="line" smooth="yes" name="sv02"/>
       <point x="952" y="166"/>
       <point x="1047" y="260"/>
-      <point x="1047" y="444" type="curve" name="dh04" smooth="yes"/>
+      <point x="1047" y="444" type="curve" smooth="yes" name="dh04"/>
       <point x="1047" y="620"/>
       <point x="960" y="727"/>
       <point x="832" y="727" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni040B_.glif b/source/Hack-Regular.ufo/glyphs/uni040B_.glif
index 0686724c2..d6b59d87b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni040B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni040B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni040B" format="1">
+<glyph name="uni040B" format="2">
   <advance width="1233"/>
   <unicode hex="040B"/>
   <outline>
@@ -19,10 +19,10 @@
       <point x="516" y="892" type="curve"/>
       <point x="557" y="916"/>
       <point x="628" y="932"/>
-      <point x="729" y="939" type="curve" name="sv02" smooth="yes"/>
+      <point x="729" y="939" type="curve" smooth="yes" name="sv02"/>
       <point x="746" y="940"/>
       <point x="758" y="941"/>
-      <point x="777" y="941" type="curve" name="dv02" smooth="yes"/>
+      <point x="777" y="941" type="curve" smooth="yes" name="dv02"/>
       <point x="881" y="941"/>
       <point x="968" y="913"/>
       <point x="1025" y="857" type="curve" smooth="yes"/>
@@ -37,7 +37,7 @@
       <point x="932" y="462" type="line" smooth="yes"/>
       <point x="932" y="667"/>
       <point x="863" y="755"/>
-      <point x="706" y="755" type="curve" name="dv01" smooth="yes"/>
+      <point x="706" y="755" type="curve" smooth="yes" name="dv01"/>
       <point x="639" y="755"/>
       <point x="579" y="740"/>
       <point x="520" y="713" type="curve" smooth="yes"/>
@@ -46,7 +46,7 @@
       <point x="452" y="664" type="curve" smooth="yes"/>
       <point x="408" y="611"/>
       <point x="383" y="513"/>
-      <point x="383" y="401" type="curve" name="sh03" smooth="yes"/>
+      <point x="383" y="401" type="curve" smooth="yes" name="sh03"/>
       <point x="383" y="0" type="line" name="ab01"/>
       <point x="180" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni040C_.glif b/source/Hack-Regular.ufo/glyphs/uni040C_.glif
index fb52a258f..3a98bb847 100644
--- a/source/Hack-Regular.ufo/glyphs/uni040C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni040C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni040C" format="1">
+<glyph name="uni040C" format="2">
   <advance width="1233"/>
   <unicode hex="040C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni040D_.glif b/source/Hack-Regular.ufo/glyphs/uni040D_.glif
index d131d4b9e..8ff43050c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni040D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni040D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni040D" format="1">
+<glyph name="uni040D" format="2">
   <advance width="1233"/>
   <unicode hex="040D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni040E_.glif b/source/Hack-Regular.ufo/glyphs/uni040E_.glif
index ce678f93b..dbfceab8e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni040E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni040E_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni040E" format="1">
+<glyph name="uni040E" format="2">
   <advance width="1233"/>
   <unicode hex="040E"/>
   <outline>
     <contour>
-      <point x="636" y="1609" type="curve" name="dv01" smooth="yes"/>
+      <point x="636" y="1609" type="curve" smooth="yes" name="dv01"/>
       <point x="443" y="1609"/>
       <point x="338" y="1690"/>
       <point x="323" y="1851" type="curve"/>
       <point x="442" y="1851" type="line" name="sv01"/>
       <point x="458" y="1779"/>
       <point x="525" y="1740"/>
-      <point x="638" y="1740" type="curve" name="dv02" smooth="yes"/>
+      <point x="638" y="1740" type="curve" smooth="yes" name="dv02"/>
       <point x="747" y="1740"/>
       <point x="811" y="1777"/>
       <point x="831" y="1851" type="curve" name="sv02"/>
@@ -36,10 +36,10 @@
       <point x="761" y="425" type="line" smooth="yes"/>
       <point x="721" y="321"/>
       <point x="677" y="224"/>
-      <point x="633" y="156" type="curve" name="hr01" smooth="yes"/>
+      <point x="633" y="156" type="curve" smooth="yes" name="hr01"/>
       <point x="572" y="63"/>
       <point x="489" y="0"/>
-      <point x="352" y="0" type="curve" name="hr02" smooth="yes"/>
+      <point x="352" y="0" type="curve" smooth="yes" name="hr02"/>
       <point x="204" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni040F_.glif b/source/Hack-Regular.ufo/glyphs/uni040F_.glif
index bca521d65..770468572 100644
--- a/source/Hack-Regular.ufo/glyphs/uni040F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni040F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni040F" format="1">
+<glyph name="uni040F" format="2">
   <advance width="1233"/>
   <unicode hex="040F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0410.glif b/source/Hack-Regular.ufo/glyphs/uni0410.glif
index b78e6c4d5..c399c6b9a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0410.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0410.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0410" format="1">
+<glyph name="uni0410" format="2">
   <advance width="1233"/>
   <unicode hex="0410"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0411.glif b/source/Hack-Regular.ufo/glyphs/uni0411.glif
index cdf440130..be6ad3a5e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0411.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0411.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0411" format="1">
+<glyph name="uni0411" format="2">
   <advance width="1233"/>
   <unicode hex="0411"/>
   <outline>
@@ -15,20 +15,20 @@
       <point x="1084" y="671" type="curve" smooth="yes"/>
       <point x="1121" y="600"/>
       <point x="1137" y="506"/>
-      <point x="1137" y="419" type="curve" name="sh02" smooth="yes"/>
+      <point x="1137" y="419" type="curve" smooth="yes" name="sh02"/>
       <point x="1137" y="138"/>
       <point x="967" y="0"/>
-      <point x="608" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="608" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="166" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="608" y="166" type="line" name="sv02" smooth="yes"/>
+      <point x="608" y="166" type="line" smooth="yes" name="sv02"/>
       <point x="843" y="166"/>
       <point x="934" y="242"/>
-      <point x="934" y="429" type="curve" name="ah01" smooth="yes"/>
+      <point x="934" y="429" type="curve" smooth="yes" name="ah01"/>
       <point x="934" y="625"/>
       <point x="833" y="713"/>
-      <point x="608" y="713" type="curve" name="dv01" smooth="yes"/>
+      <point x="608" y="713" type="curve" smooth="yes" name="dv01"/>
       <point x="369" y="713" type="line" name="sh03"/>
       <point x="369" y="166" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0412.glif b/source/Hack-Regular.ufo/glyphs/uni0412.glif
index d8e7083de..71cd4627f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0412.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0412.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0412" format="1">
+<glyph name="uni0412" format="2">
   <advance width="1233"/>
   <unicode hex="0412"/>
   <outline>
@@ -8,37 +8,37 @@
       <point x="608" y="1493" type="line" smooth="yes"/>
       <point x="913" y="1493"/>
       <point x="1085" y="1357"/>
-      <point x="1085" y="1110" type="curve" name="dh03" smooth="yes"/>
+      <point x="1085" y="1110" type="curve" smooth="yes" name="dh03"/>
       <point x="1085" y="931"/>
       <point x="998" y="826"/>
       <point x="823" y="799" type="curve" name="ih01"/>
       <point x="1017" y="770"/>
       <point x="1137" y="626"/>
-      <point x="1137" y="407" type="curve" name="sh02" smooth="yes"/>
+      <point x="1137" y="407" type="curve" smooth="yes" name="sh02"/>
       <point x="1137" y="139"/>
       <point x="961" y="0"/>
-      <point x="608" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="608" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="166" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="604" y="877" type="line" name="dv01" smooth="yes"/>
+      <point x="604" y="877" type="line" smooth="yes" name="dv01"/>
       <point x="796" y="877"/>
       <point x="881" y="947"/>
-      <point x="881" y="1110" type="curve" name="hr01" smooth="yes"/>
+      <point x="881" y="1110" type="curve" smooth="yes" name="hr01"/>
       <point x="881" y="1265"/>
       <point x="804" y="1327"/>
-      <point x="604" y="1327" type="curve" name="sv01" smooth="yes"/>
+      <point x="604" y="1327" type="curve" smooth="yes" name="sv01"/>
       <point x="369" y="1327" type="line" name="dh02"/>
       <point x="369" y="877" type="line"/>
     </contour>
     <contour>
-      <point x="608" y="166" type="line" name="hr02" smooth="yes"/>
+      <point x="608" y="166" type="line" smooth="yes" name="hr02"/>
       <point x="843" y="166"/>
       <point x="934" y="242"/>
-      <point x="934" y="429" type="curve" name="sh01" smooth="yes"/>
+      <point x="934" y="429" type="curve" smooth="yes" name="sh01"/>
       <point x="934" y="625"/>
       <point x="833" y="713"/>
-      <point x="608" y="713" type="curve" name="hr03" smooth="yes"/>
+      <point x="608" y="713" type="curve" smooth="yes" name="hr03"/>
       <point x="369" y="713" type="line" name="sh03"/>
       <point x="369" y="166" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0413.glif b/source/Hack-Regular.ufo/glyphs/uni0413.glif
index a995bed70..bbf2bbb59 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0413.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0413.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0413" format="1">
+<glyph name="uni0413" format="2">
   <advance width="1233"/>
   <unicode hex="0413"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0414.glif b/source/Hack-Regular.ufo/glyphs/uni0414.glif
index f3a76e8fb..d4e7d8b3a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0414.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0414.glif
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0414" format="1">
+<glyph name="uni0414" format="2">
   <advance width="1233"/>
   <unicode hex="0414"/>
   <outline>
     <contour>
       <point x="33" y="170" type="line" name="dh01"/>
-      <point x="110" y="170" type="line" name="sv02" smooth="yes"/>
+      <point x="110" y="170" type="line" smooth="yes" name="sv02"/>
       <point x="174" y="170"/>
       <point x="227" y="668"/>
-      <point x="227" y="1027" type="curve" name="dh03" smooth="yes"/>
+      <point x="227" y="1027" type="curve" smooth="yes" name="dh03"/>
       <point x="227" y="1493" type="line" name="at01"/>
       <point x="1079" y="1493" type="line"/>
       <point x="1079" y="170" type="line" name="dh06"/>
@@ -24,7 +24,7 @@
       <point x="876" y="170" type="line" name="dh05"/>
       <point x="876" y="1323" type="line" name="hr03"/>
       <point x="430" y="1323" type="line"/>
-      <point x="430" y="1026" type="line" name="dh04" smooth="yes"/>
+      <point x="430" y="1026" type="line" smooth="yes" name="dh04"/>
       <point x="430" y="727"/>
       <point x="378" y="233"/>
       <point x="370" y="214" type="curve" smooth="yes"/>
@@ -33,7 +33,7 @@
       <point x="364" y="192" type="curve" smooth="yes"/>
       <point x="364" y="177"/>
       <point x="380" y="170"/>
-      <point x="411" y="170" type="curve" name="sv03" smooth="yes"/>
+      <point x="411" y="170" type="curve" smooth="yes" name="sv03"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0415.glif b/source/Hack-Regular.ufo/glyphs/uni0415.glif
index 74d2989f9..a7976af27 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0415.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0415.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0415" format="1">
+<glyph name="uni0415" format="2">
   <advance width="1233"/>
   <unicode hex="0415"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0416.glif b/source/Hack-Regular.ufo/glyphs/uni0416.glif
index 601a1e7ad..148bf4ee4 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0416.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0416.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0416" format="1">
+<glyph name="uni0416" format="2">
   <advance width="1233"/>
   <unicode hex="0416"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0417.glif b/source/Hack-Regular.ufo/glyphs/uni0417.glif
index 63e6ea34d..dca95cfb2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0417.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0417.glif
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0417" format="1">
+<glyph name="uni0417" format="2">
   <advance width="1233"/>
   <unicode hex="0417"/>
   <outline>
     <contour>
-      <point x="553" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="553" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="421" y="-29"/>
       <point x="274" y="-3"/>
       <point x="137" y="45" type="curve"/>
       <point x="137" y="246" type="line"/>
       <point x="274" y="174"/>
       <point x="404" y="141"/>
-      <point x="532" y="141" type="curve" name="hr01" smooth="yes"/>
+      <point x="532" y="141" type="curve" smooth="yes" name="hr01"/>
       <point x="757" y="141"/>
       <point x="879" y="245"/>
-      <point x="879" y="426" type="curve" name="sh02" smooth="yes"/>
+      <point x="879" y="426" type="curve" smooth="yes" name="sh02"/>
       <point x="879" y="608"/>
       <point x="752" y="715"/>
-      <point x="549" y="715" type="curve" name="dv02" smooth="yes"/>
+      <point x="549" y="715" type="curve" smooth="yes" name="dv02"/>
       <point x="395" y="715" type="line"/>
       <point x="395" y="881" type="line"/>
-      <point x="549" y="881" type="line" name="dv03" smooth="yes"/>
+      <point x="549" y="881" type="line" smooth="yes" name="dv03"/>
       <point x="736" y="881"/>
       <point x="844" y="963"/>
-      <point x="844" y="1118" type="curve" name="sh01" smooth="yes"/>
+      <point x="844" y="1118" type="curve" smooth="yes" name="sh01"/>
       <point x="844" y="1266"/>
       <point x="745" y="1350"/>
-      <point x="557" y="1350" type="curve" name="sv01" smooth="yes"/>
+      <point x="557" y="1350" type="curve" smooth="yes" name="sv01"/>
       <point x="456" y="1350"/>
       <point x="326" y="1326"/>
       <point x="182" y="1270" type="curve"/>
       <point x="182" y="1456" type="line"/>
       <point x="343" y="1499"/>
       <point x="465" y="1520"/>
-      <point x="569" y="1520" type="curve" name="hr02" smooth="yes"/>
+      <point x="569" y="1520" type="curve" smooth="yes" name="hr02"/>
       <point x="853" y="1520"/>
       <point x="1044" y="1361"/>
-      <point x="1044" y="1122" type="curve" name="sh03" smooth="yes"/>
+      <point x="1044" y="1122" type="curve" smooth="yes" name="sh03"/>
       <point x="1044" y="954"/>
       <point x="952" y="844"/>
       <point x="776" y="799" type="curve" name="iv01"/>
       <point x="973" y="747"/>
       <point x="1079" y="613"/>
-      <point x="1079" y="410" type="curve" name="sh04" smooth="yes"/>
+      <point x="1079" y="410" type="curve" smooth="yes" name="sh04"/>
       <point x="1079" y="137"/>
       <point x="885" y="-29"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0418.glif b/source/Hack-Regular.ufo/glyphs/uni0418.glif
index 2903755eb..0f287f93d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0418.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0418.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0418" format="1">
+<glyph name="uni0418" format="2">
   <advance width="1233"/>
   <unicode hex="0418"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0419.glif b/source/Hack-Regular.ufo/glyphs/uni0419.glif
index 564de6acf..6860d9f6e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0419.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0419.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0419" format="1">
+<glyph name="uni0419" format="2">
   <advance width="1233"/>
   <unicode hex="0419"/>
   <outline>
     <contour>
-      <point x="616" y="1609" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1609" type="curve" smooth="yes" name="dv01"/>
       <point x="423" y="1609"/>
       <point x="318" y="1690"/>
       <point x="303" y="1851" type="curve"/>
       <point x="422" y="1851" type="line" name="sv01"/>
       <point x="438" y="1779"/>
       <point x="507" y="1740"/>
-      <point x="616" y="1740" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1740" type="curve" smooth="yes" name="dv02"/>
       <point x="726" y="1740"/>
       <point x="791" y="1777"/>
       <point x="811" y="1851" type="curve" name="sv02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni041A_.glif b/source/Hack-Regular.ufo/glyphs/uni041A_.glif
index 94af4f9df..d93aff1e1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni041A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni041A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni041A" format="1">
+<glyph name="uni041A" format="2">
   <advance width="1233"/>
   <unicode hex="041A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni041B_.glif b/source/Hack-Regular.ufo/glyphs/uni041B_.glif
index b283a29c9..770ab1a25 100644
--- a/source/Hack-Regular.ufo/glyphs/uni041B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni041B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni041B" format="1">
+<glyph name="uni041B" format="2">
   <advance width="1233"/>
   <unicode hex="041B"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="280" y="516" type="curve" name="sh02"/>
       <point x="288" y="638"/>
       <point x="290" y="863"/>
-      <point x="290" y="1067" type="curve" name="sh01" smooth="yes"/>
+      <point x="290" y="1067" type="curve" smooth="yes" name="sh01"/>
       <point x="290" y="1493" type="line" name="at01"/>
       <point x="1104" y="1493" type="line"/>
       <point x="1104" y="0" type="line" name="sh03"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni041C_.glif b/source/Hack-Regular.ufo/glyphs/uni041C_.glif
index 9e7bce47f..98ad5628f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni041C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni041C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni041C" format="1">
+<glyph name="uni041C" format="2">
   <advance width="1233"/>
   <unicode hex="041C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni041D_.glif b/source/Hack-Regular.ufo/glyphs/uni041D_.glif
index cfb306406..c57808c3e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni041D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni041D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni041D" format="1">
+<glyph name="uni041D" format="2">
   <advance width="1233"/>
   <unicode hex="041D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni041E_.glif b/source/Hack-Regular.ufo/glyphs/uni041E_.glif
index 6d5b41f1c..40c61b1dd 100644
--- a/source/Hack-Regular.ufo/glyphs/uni041E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni041E_.glif
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni041E" format="1">
+<glyph name="uni041E" format="2">
   <advance width="1233"/>
   <unicode hex="041E"/>
   <outline>
     <contour>
-      <point x="615" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="615" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="280" y="-29"/>
       <point x="117" y="221"/>
-      <point x="117" y="744" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="744" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="1267"/>
       <point x="280" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="953" y="1520"/>
       <point x="1116" y="1266"/>
-      <point x="1116" y="745" type="curve" name="sh02" smooth="yes"/>
+      <point x="1116" y="745" type="curve" smooth="yes" name="sh02"/>
       <point x="1116" y="225"/>
       <point x="952" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="719" y="135"/>
       <point x="793" y="182"/>
       <point x="838" y="276" type="curve" smooth="yes"/>
       <point x="883" y="368"/>
       <point x="905" y="524"/>
-      <point x="905" y="745" type="curve" name="ah01" smooth="yes"/>
+      <point x="905" y="745" type="curve" smooth="yes" name="ah01"/>
       <point x="905" y="965"/>
       <point x="883" y="1122"/>
       <point x="838" y="1215" type="curve" smooth="yes"/>
       <point x="793" y="1309"/>
       <point x="719" y="1356"/>
-      <point x="616" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="514" y="1356"/>
       <point x="441" y="1309"/>
       <point x="396" y="1215" type="curve" smooth="yes"/>
       <point x="351" y="1120"/>
       <point x="328" y="964"/>
-      <point x="328" y="745" type="curve" name="sh03" smooth="yes"/>
+      <point x="328" y="745" type="curve" smooth="yes" name="sh03"/>
       <point x="328" y="527"/>
       <point x="351" y="371"/>
       <point x="396" y="276" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni041F_.glif b/source/Hack-Regular.ufo/glyphs/uni041F_.glif
index 131f7c5ce..a01d9fd5f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni041F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni041F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni041F" format="1">
+<glyph name="uni041F" format="2">
   <advance width="1233"/>
   <unicode hex="041F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0420.glif b/source/Hack-Regular.ufo/glyphs/uni0420.glif
index 54f35f938..cc47923ba 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0420.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0420.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0420" format="1">
+<glyph name="uni0420" format="2">
   <advance width="1233"/>
   <unicode hex="0420"/>
   <outline>
@@ -8,22 +8,22 @@
       <point x="633" y="1493" type="line" smooth="yes"/>
       <point x="968" y="1493"/>
       <point x="1141" y="1342"/>
-      <point x="1141" y="1046" type="curve" name="sh01" smooth="yes"/>
+      <point x="1141" y="1046" type="curve" smooth="yes" name="sh01"/>
       <point x="1141" y="751"/>
       <point x="970" y="600"/>
-      <point x="633" y="600" type="curve" name="dv01" smooth="yes"/>
+      <point x="633" y="600" type="curve" smooth="yes" name="dv01"/>
       <point x="399" y="600" type="line" name="sh03"/>
       <point x="399" y="0" type="line" name="ab01"/>
       <point x="197" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="633" y="766" type="line" name="dv02" smooth="yes"/>
+      <point x="633" y="766" type="line" smooth="yes" name="dv02"/>
       <point x="821" y="766"/>
       <point x="930" y="868"/>
-      <point x="930" y="1047" type="curve" name="ah01" smooth="yes"/>
+      <point x="930" y="1047" type="curve" smooth="yes" name="ah01"/>
       <point x="930" y="1226"/>
       <point x="822" y="1327"/>
-      <point x="633" y="1327" type="curve" name="sv01" smooth="yes"/>
+      <point x="633" y="1327" type="curve" smooth="yes" name="sv01"/>
       <point x="399" y="1327" type="line" name="sh02"/>
       <point x="399" y="766" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0421.glif b/source/Hack-Regular.ufo/glyphs/uni0421.glif
index 34f13df00..297c56d24 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0421.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0421.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0421" format="1">
+<glyph name="uni0421" format="2">
   <advance width="1233"/>
   <unicode hex="0421"/>
   <outline>
     <contour>
-      <point x="742" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="742" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="555" y="-29"/>
       <point x="404" y="37"/>
       <point x="297" y="174" type="curve" smooth="yes"/>
@@ -29,7 +29,7 @@
       <point x="448" y="1204" type="curve" smooth="yes"/>
       <point x="383" y="1103"/>
       <point x="350" y="950"/>
-      <point x="350" y="745" type="curve" name="hr01" smooth="yes"/>
+      <point x="350" y="745" type="curve" smooth="yes" name="hr01"/>
       <point x="350" y="337"/>
       <point x="480" y="135"/>
       <point x="743" y="135" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0422.glif b/source/Hack-Regular.ufo/glyphs/uni0422.glif
index eca262a0c..425924e82 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0422.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0422.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0422" format="1">
+<glyph name="uni0422" format="2">
   <advance width="1233"/>
   <unicode hex="0422"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0423.glif b/source/Hack-Regular.ufo/glyphs/uni0423.glif
index 47a30f1d2..49b163363 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0423.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0423.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0423" format="1">
+<glyph name="uni0423" format="2">
   <advance width="1233"/>
   <unicode hex="0423"/>
   <outline>
@@ -23,7 +23,7 @@
       <point x="633" y="156" type="curve" smooth="yes"/>
       <point x="572" y="63"/>
       <point x="489" y="0"/>
-      <point x="352" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="352" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="204" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0424.glif b/source/Hack-Regular.ufo/glyphs/uni0424.glif
index d95dc192c..816e4e821 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0424.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0424.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0424" format="1">
+<glyph name="uni0424" format="2">
   <advance width="1233"/>
   <unicode hex="0424"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="515" y="152" type="line" name="hr00"/>
       <point x="170" y="168"/>
       <point x="66" y="430"/>
-      <point x="66" y="772" type="curve" name="sh01" smooth="yes"/>
+      <point x="66" y="772" type="curve" smooth="yes" name="sh01"/>
       <point x="66" y="1111"/>
       <point x="168" y="1360"/>
       <point x="515" y="1371" type="curve" name="sh02"/>
@@ -16,7 +16,7 @@
       <point x="718" y="1371" type="line"/>
       <point x="1078" y="1358"/>
       <point x="1167" y="1099"/>
-      <point x="1167" y="762" type="curve" name="sh06" smooth="yes"/>
+      <point x="1167" y="762" type="curve" smooth="yes" name="sh06"/>
       <point x="1167" y="406"/>
       <point x="1067" y="165"/>
       <point x="718" y="152" type="curve" name="sh03"/>
@@ -27,7 +27,7 @@
       <point x="515" y="1207" type="line" name="sh07"/>
       <point x="294" y="1172"/>
       <point x="277" y="1027"/>
-      <point x="277" y="761" type="curve" name="sh08" smooth="yes"/>
+      <point x="277" y="761" type="curve" smooth="yes" name="sh08"/>
       <point x="277" y="495"/>
       <point x="294" y="351"/>
       <point x="515" y="316" type="curve"/>
@@ -36,7 +36,7 @@
       <point x="718" y="316" type="line" name="sh09"/>
       <point x="937" y="351"/>
       <point x="956" y="495"/>
-      <point x="956" y="761" type="curve" name="sh05" smooth="yes"/>
+      <point x="956" y="761" type="curve" smooth="yes" name="sh05"/>
       <point x="956" y="1027"/>
       <point x="937" y="1172"/>
       <point x="718" y="1207" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0425.glif b/source/Hack-Regular.ufo/glyphs/uni0425.glif
index 313a83aa1..101978f43 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0425.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0425.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0425" format="1">
+<glyph name="uni0425" format="2">
   <advance width="1233"/>
   <unicode hex="0425"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0426.glif b/source/Hack-Regular.ufo/glyphs/uni0426.glif
index 861f4cd94..2b955b28d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0426.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0426.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0426" format="1">
+<glyph name="uni0426" format="2">
   <advance width="1233"/>
   <unicode hex="0426"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0427.glif b/source/Hack-Regular.ufo/glyphs/uni0427.glif
index e1cb0b85b..d95d18348 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0427.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0427.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0427" format="1">
+<glyph name="uni0427" format="2">
   <advance width="1233"/>
   <unicode hex="0427"/>
   <outline>
@@ -7,16 +7,16 @@
       <point x="889" y="658" type="line" name="hr00"/>
       <point x="750" y="589"/>
       <point x="664" y="577"/>
-      <point x="544" y="577" type="curve" name="dv01" smooth="yes"/>
+      <point x="544" y="577" type="curve" smooth="yes" name="dv01"/>
       <point x="323" y="577"/>
       <point x="137" y="618"/>
-      <point x="137" y="980" type="curve" name="sh01" smooth="yes"/>
+      <point x="137" y="980" type="curve" smooth="yes" name="sh01"/>
       <point x="137" y="1493" type="line" name="at01"/>
       <point x="340" y="1493" type="line"/>
-      <point x="340" y="1006" type="line" name="sh02" smooth="yes"/>
+      <point x="340" y="1006" type="line" smooth="yes" name="sh02"/>
       <point x="340" y="782"/>
       <point x="415" y="763"/>
-      <point x="587" y="763" type="curve" name="dv02" smooth="yes"/>
+      <point x="587" y="763" type="curve" smooth="yes" name="dv02"/>
       <point x="709" y="763"/>
       <point x="774" y="773"/>
       <point x="889" y="861" type="curve" name="sh03"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0428.glif b/source/Hack-Regular.ufo/glyphs/uni0428.glif
index 5c1bc63cf..3c8131f45 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0428.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0428.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0428" format="1">
+<glyph name="uni0428" format="2">
   <advance width="1233"/>
   <unicode hex="0428"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0429.glif b/source/Hack-Regular.ufo/glyphs/uni0429.glif
index 0b8fe91f6..402927156 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0429.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0429.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0429" format="1">
+<glyph name="uni0429" format="2">
   <advance width="1233"/>
   <unicode hex="0429"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni042A_.glif b/source/Hack-Regular.ufo/glyphs/uni042A_.glif
index 0b87e9214..cf57ec402 100644
--- a/source/Hack-Regular.ufo/glyphs/uni042A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni042A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni042A" format="1">
+<glyph name="uni042A" format="2">
   <advance width="1233"/>
   <unicode hex="042A"/>
   <outline>
@@ -9,23 +9,23 @@
       <point x="52" y="1493" type="line" name="dh01"/>
       <point x="515" y="1493" type="line" name="dh02"/>
       <point x="515" y="893" type="line"/>
-      <point x="653" y="893" type="line" name="hr01" smooth="yes"/>
+      <point x="653" y="893" type="line" smooth="yes" name="hr01"/>
       <point x="990" y="893"/>
       <point x="1161" y="742"/>
-      <point x="1161" y="447" type="curve" name="dh04" smooth="yes"/>
+      <point x="1161" y="447" type="curve" smooth="yes" name="dh04"/>
       <point x="1161" y="151"/>
       <point x="988" y="0"/>
-      <point x="653" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="653" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="313" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="653" y="166" type="line" name="sv01" smooth="yes"/>
+      <point x="653" y="166" type="line" smooth="yes" name="sv01"/>
       <point x="842" y="166"/>
       <point x="950" y="267"/>
-      <point x="950" y="446" type="curve" name="dh03" smooth="yes"/>
+      <point x="950" y="446" type="curve" smooth="yes" name="dh03"/>
       <point x="950" y="625"/>
       <point x="841" y="727"/>
-      <point x="653" y="727" type="curve" name="hr02" smooth="yes"/>
+      <point x="653" y="727" type="curve" smooth="yes" name="hr02"/>
       <point x="515" y="727" type="line" name="sh02"/>
       <point x="515" y="166" type="line" name="hr03"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni042B_.glif b/source/Hack-Regular.ufo/glyphs/uni042B_.glif
index 8adea602e..1b6edfc23 100644
--- a/source/Hack-Regular.ufo/glyphs/uni042B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni042B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni042B" format="1">
+<glyph name="uni042B" format="2">
   <advance width="1233"/>
   <unicode hex="042B"/>
   <outline>
@@ -7,13 +7,13 @@
       <point x="65" y="1493" type="line" name="hr00"/>
       <point x="267" y="1493" type="line" name="dh01"/>
       <point x="267" y="893" type="line"/>
-      <point x="358" y="893" type="line" name="dv02" smooth="yes"/>
+      <point x="358" y="893" type="line" smooth="yes" name="dv02"/>
       <point x="617" y="893"/>
       <point x="809" y="740"/>
-      <point x="809" y="447" type="curve" name="dh03" smooth="yes"/>
+      <point x="809" y="447" type="curve" smooth="yes" name="dh03"/>
       <point x="809" y="153"/>
       <point x="614" y="0"/>
-      <point x="358" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="358" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="65" y="0" type="line"/>
     </contour>
     <contour>
@@ -23,13 +23,13 @@
       <point x="931" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="358" y="166" type="line" name="sv01" smooth="yes"/>
+      <point x="358" y="166" type="line" smooth="yes" name="sv01"/>
       <point x="494" y="166"/>
       <point x="598" y="246"/>
-      <point x="598" y="446" type="curve" name="dh02" smooth="yes"/>
+      <point x="598" y="446" type="curve" smooth="yes" name="dh02"/>
       <point x="598" y="625"/>
       <point x="518" y="727"/>
-      <point x="358" y="727" type="curve" name="dv01" smooth="yes"/>
+      <point x="358" y="727" type="curve" smooth="yes" name="dv01"/>
       <point x="267" y="727" type="line" name="sh01"/>
       <point x="267" y="166" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni042C_.glif b/source/Hack-Regular.ufo/glyphs/uni042C_.glif
index 484f78975..43f2dca25 100644
--- a/source/Hack-Regular.ufo/glyphs/uni042C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni042C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni042C" format="1">
+<glyph name="uni042C" format="2">
   <advance width="1233"/>
   <unicode hex="042C"/>
   <outline>
@@ -7,23 +7,23 @@
       <point x="197" y="1493" type="line" name="hr00"/>
       <point x="399" y="1493" type="line" name="sh01"/>
       <point x="399" y="893" type="line"/>
-      <point x="633" y="893" type="line" name="dv02" smooth="yes"/>
+      <point x="633" y="893" type="line" smooth="yes" name="dv02"/>
       <point x="970" y="893"/>
       <point x="1141" y="742"/>
-      <point x="1141" y="447" type="curve" name="sh02" smooth="yes"/>
+      <point x="1141" y="447" type="curve" smooth="yes" name="sh02"/>
       <point x="1141" y="151"/>
       <point x="968" y="0"/>
-      <point x="633" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="633" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="197" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="633" y="166" type="line" name="sv01" smooth="yes"/>
+      <point x="633" y="166" type="line" smooth="yes" name="sv01"/>
       <point x="822" y="166"/>
       <point x="930" y="267"/>
-      <point x="930" y="446" type="curve" name="ah01" smooth="yes"/>
+      <point x="930" y="446" type="curve" smooth="yes" name="ah01"/>
       <point x="930" y="625"/>
       <point x="821" y="727"/>
-      <point x="633" y="727" type="curve" name="dv01" smooth="yes"/>
+      <point x="633" y="727" type="curve" smooth="yes" name="dv01"/>
       <point x="399" y="727" type="line" name="sh03"/>
       <point x="399" y="166" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni042D_.glif b/source/Hack-Regular.ufo/glyphs/uni042D_.glif
index 4f96d7353..5ab2721ad 100644
--- a/source/Hack-Regular.ufo/glyphs/uni042D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni042D_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni042D" format="1">
+<glyph name="uni042D" format="2">
   <advance width="1233"/>
   <unicode hex="042D"/>
   <outline>
     <contour>
-      <point x="499" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="499" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="382" y="-29"/>
       <point x="272" y="-2"/>
       <point x="169" y="53" type="curve"/>
       <point x="169" y="260" type="line"/>
       <point x="269" y="176"/>
       <point x="388" y="135"/>
-      <point x="501" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="501" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="761" y="135"/>
       <point x="884" y="351"/>
       <point x="892" y="661" type="curve" name="dh01"/>
@@ -20,17 +20,17 @@
       <point x="887" y="831" type="line" name="sh01"/>
       <point x="847" y="1199"/>
       <point x="758" y="1356"/>
-      <point x="510" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="510" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="381" y="1356"/>
       <point x="270" y="1315"/>
       <point x="169" y="1231" type="curve"/>
       <point x="169" y="1438" type="line"/>
       <point x="272" y="1493"/>
       <point x="382" y="1520"/>
-      <point x="499" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="499" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="879" y="1520"/>
       <point x="1103" y="1234"/>
-      <point x="1103" y="743" type="curve" name="dh02" smooth="yes"/>
+      <point x="1103" y="743" type="curve" smooth="yes" name="dh02"/>
       <point x="1103" y="255"/>
       <point x="882" y="-29"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni042E_.glif b/source/Hack-Regular.ufo/glyphs/uni042E_.glif
index 88eed5605..33af1e739 100644
--- a/source/Hack-Regular.ufo/glyphs/uni042E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni042E_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni042E" format="1">
+<glyph name="uni042E" format="2">
   <advance width="1233"/>
   <unicode hex="042E"/>
   <outline>
     <contour>
-      <point x="792" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="792" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="526" y="-29"/>
       <point x="407" y="216"/>
       <point x="394" y="666" type="curve" name="dh03"/>
@@ -17,33 +17,33 @@
       <point x="394" y="836" type="line" name="sh02"/>
       <point x="407" y="1267"/>
       <point x="524" y="1520"/>
-      <point x="793" y="1520" type="curve" name="at02" smooth="yes"/>
+      <point x="793" y="1520" type="curve" smooth="yes" name="at02"/>
       <point x="1062" y="1520"/>
       <point x="1193" y="1266"/>
-      <point x="1193" y="745" type="curve" name="dh06" smooth="yes"/>
+      <point x="1193" y="745" type="curve" smooth="yes" name="dh06"/>
       <point x="1193" y="224"/>
       <point x="1061" y="-29"/>
     </contour>
     <contour>
-      <point x="794" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="794" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="867" y="135"/>
       <point x="915" y="181"/>
       <point x="947" y="276" type="curve" smooth="yes"/>
       <point x="979" y="369"/>
       <point x="995" y="517"/>
-      <point x="995" y="745" type="curve" name="dh05" smooth="yes"/>
+      <point x="995" y="745" type="curve" smooth="yes" name="dh05"/>
       <point x="995" y="973"/>
       <point x="979" y="1120"/>
-      <point x="947" y="1215" type="curve" name="hr01" smooth="yes"/>
+      <point x="947" y="1215" type="curve" smooth="yes" name="hr01"/>
       <point x="916" y="1307"/>
       <point x="869" y="1356"/>
-      <point x="793" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="793" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="722" y="1356"/>
       <point x="670" y="1309"/>
       <point x="639" y="1215" type="curve" smooth="yes"/>
       <point x="607" y="1121"/>
       <point x="591" y="964"/>
-      <point x="591" y="745" type="curve" name="dh04" smooth="yes"/>
+      <point x="591" y="745" type="curve" smooth="yes" name="dh04"/>
       <point x="591" y="526"/>
       <point x="607" y="370"/>
       <point x="639" y="276" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni042F_.glif b/source/Hack-Regular.ufo/glyphs/uni042F_.glif
index db6866428..6a432d928 100644
--- a/source/Hack-Regular.ufo/glyphs/uni042F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni042F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni042F" format="1">
+<glyph name="uni042F" format="2">
   <advance width="1233"/>
   <unicode hex="042F"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="415" y="666" type="line" name="hr00"/>
       <point x="271" y="719"/>
       <point x="129" y="821"/>
-      <point x="129" y="1065" type="curve" name="sh01" smooth="yes"/>
+      <point x="129" y="1065" type="curve" smooth="yes" name="sh01"/>
       <point x="129" y="1339"/>
       <point x="308" y="1493"/>
-      <point x="637" y="1493" type="curve" name="at01" smooth="yes"/>
+      <point x="637" y="1493" type="curve" smooth="yes" name="at01"/>
       <point x="1103" y="1493" type="line"/>
       <point x="1103" y="0" type="line" name="sh02"/>
       <point x="900" y="0" type="line" name="ah01"/>
@@ -25,7 +25,7 @@
       <point x="637" y="1327" type="line" smooth="yes"/>
       <point x="445" y="1327"/>
       <point x="342" y="1237"/>
-      <point x="342" y="1056" type="curve" name="sh04" smooth="yes"/>
+      <point x="342" y="1056" type="curve" smooth="yes" name="sh04"/>
       <point x="342" y="883"/>
       <point x="438" y="797"/>
       <point x="629" y="797" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0430.glif b/source/Hack-Regular.ufo/glyphs/uni0430.glif
index 7c076eb95..15182cd08 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0430.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0430.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0430" format="1">
+<glyph name="uni0430" format="2">
   <advance width="1233"/>
   <unicode hex="0430"/>
   <outline>
     <contour>
-      <point x="513" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="513" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="397" y="-29"/>
       <point x="305" y="3"/>
       <point x="238" y="68" type="curve" smooth="yes"/>
       <point x="174" y="129"/>
       <point x="136" y="210"/>
-      <point x="136" y="327" type="curve" name="sh01" smooth="yes"/>
+      <point x="136" y="327" type="curve" smooth="yes" name="sh01"/>
       <point x="136" y="450"/>
       <point x="178" y="545"/>
       <point x="262" y="610" type="curve" smooth="yes"/>
@@ -24,7 +24,7 @@
       <point x="809" y="931" type="curve" smooth="yes"/>
       <point x="765" y="971"/>
       <point x="692" y="991"/>
-      <point x="596" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="596" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="533" y="991"/>
       <point x="469" y="982"/>
       <point x="405" y="964" type="curve" smooth="yes"/>
@@ -37,7 +37,7 @@
       <point x="414" y="1128" type="curve" smooth="yes"/>
       <point x="475" y="1141"/>
       <point x="536" y="1147"/>
-      <point x="597" y="1147" type="curve" name="hr01" smooth="yes"/>
+      <point x="597" y="1147" type="curve" smooth="yes" name="hr01"/>
       <point x="692" y="1147"/>
       <point x="767" y="1133"/>
       <point x="834" y="1105" type="curve" smooth="yes"/>
@@ -49,11 +49,11 @@
       <point x="1046" y="860" type="curve" smooth="yes"/>
       <point x="1057" y="811"/>
       <point x="1062" y="738"/>
-      <point x="1062" y="639" type="curve" name="sh03" smooth="yes"/>
+      <point x="1062" y="639" type="curve" smooth="yes" name="sh03"/>
       <point x="1062" y="410" type="line"/>
       <point x="1065" y="333"/>
       <point x="1064" y="277"/>
-      <point x="1071" y="226" type="curve" name="sh04" smooth="yes"/>
+      <point x="1071" y="226" type="curve" smooth="yes" name="sh04"/>
       <point x="1078" y="170"/>
       <point x="1087" y="116"/>
       <point x="1094" y="91" type="curve" smooth="yes"/>
@@ -74,13 +74,13 @@
       <point x="594" y="-29"/>
     </contour>
     <contour>
-      <point x="551" y="125" type="curve" name="dv02" smooth="yes"/>
+      <point x="551" y="125" type="curve" smooth="yes" name="dv02"/>
       <point x="652" y="125"/>
       <point x="731" y="160"/>
       <point x="789" y="231" type="curve" smooth="yes"/>
       <point x="848" y="303"/>
       <point x="877" y="400"/>
-      <point x="877" y="522" type="curve" name="sh05" smooth="yes"/>
+      <point x="877" y="522" type="curve" smooth="yes" name="sh05"/>
       <point x="877" y="563" type="line" name="dv04"/>
       <point x="644" y="563" type="line" smooth="yes"/>
       <point x="537" y="563"/>
@@ -88,7 +88,7 @@
       <point x="402" y="507" type="curve" smooth="yes"/>
       <point x="345" y="468"/>
       <point x="320" y="412"/>
-      <point x="320" y="337" type="curve" name="sh02" smooth="yes"/>
+      <point x="320" y="337" type="curve" smooth="yes" name="sh02"/>
       <point x="320" y="268"/>
       <point x="342" y="217"/>
       <point x="381" y="181" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0431.glif b/source/Hack-Regular.ufo/glyphs/uni0431.glif
index 33a1e629c..a308aec7a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0431.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0431.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0431" format="1">
+<glyph name="uni0431" format="2">
   <advance width="1233"/>
   <unicode hex="0431"/>
   <outline>
     <contour>
-      <point x="617" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="308" y="-29"/>
       <point x="137" y="176"/>
-      <point x="137" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="137" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="137" y="569"/>
       <point x="138" y="579"/>
-      <point x="138" y="594" type="curve" name="sh02" smooth="yes"/>
+      <point x="138" y="594" type="curve" smooth="yes" name="sh02"/>
       <point x="138" y="601"/>
       <point x="138" y="609"/>
       <point x="137" y="621" type="curve" name="sh03"/>
       <point x="130" y="788" type="line" smooth="yes"/>
       <point x="127" y="863"/>
       <point x="125" y="926"/>
-      <point x="125" y="954" type="curve" name="sh04" smooth="yes"/>
+      <point x="125" y="954" type="curve" smooth="yes" name="sh04"/>
       <point x="125" y="973"/>
       <point x="126" y="993"/>
-      <point x="127" y="1004" type="curve" name="sh05" smooth="yes"/>
+      <point x="127" y="1004" type="curve" smooth="yes" name="sh05"/>
       <point x="148" y="1194"/>
       <point x="233" y="1399"/>
       <point x="440" y="1497" type="curve" smooth="yes"/>
@@ -44,24 +44,24 @@
       <point x="285" y="1024" type="line" name="ih01"/>
       <point x="369" y="1111"/>
       <point x="491" y="1147"/>
-      <point x="620" y="1147" type="curve" name="dv03" smooth="yes"/>
+      <point x="620" y="1147" type="curve" smooth="yes" name="dv03"/>
       <point x="926" y="1147"/>
       <point x="1096" y="942"/>
-      <point x="1096" y="558" type="curve" name="sh07" smooth="yes"/>
+      <point x="1096" y="558" type="curve" smooth="yes" name="sh07"/>
       <point x="1096" y="177"/>
       <point x="926" y="-29"/>
     </contour>
     <contour>
-      <point x="618" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="618" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="807" y="127"/>
       <point x="901" y="271"/>
-      <point x="901" y="559" type="curve" name="ah01" smooth="yes"/>
+      <point x="901" y="559" type="curve" smooth="yes" name="ah01"/>
       <point x="901" y="847"/>
       <point x="806" y="991"/>
-      <point x="617" y="991" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="991" type="curve" smooth="yes" name="dv02"/>
       <point x="427" y="991"/>
       <point x="332" y="848"/>
-      <point x="332" y="561" type="curve" name="sh06" smooth="yes"/>
+      <point x="332" y="561" type="curve" smooth="yes" name="sh06"/>
       <point x="332" y="274"/>
       <point x="426" y="127"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0432.glif b/source/Hack-Regular.ufo/glyphs/uni0432.glif
index 4edf58236..c3d839f98 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0432.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0432.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0432" format="1">
+<glyph name="uni0432" format="2">
   <advance width="1233"/>
   <unicode hex="0432"/>
   <outline>
@@ -8,37 +8,37 @@
       <point x="636" y="1120" type="line" smooth="yes"/>
       <point x="840" y="1120"/>
       <point x="1006" y="1029"/>
-      <point x="1006" y="837" type="curve" name="dh03" smooth="yes"/>
+      <point x="1006" y="837" type="curve" smooth="yes" name="dh03"/>
       <point x="1006" y="719"/>
       <point x="943" y="616"/>
       <point x="812" y="600" type="curve" name="ih01"/>
       <point x="990" y="568"/>
       <point x="1054" y="473"/>
-      <point x="1054" y="329" type="curve" name="sh02" smooth="yes"/>
+      <point x="1054" y="329" type="curve" smooth="yes" name="sh02"/>
       <point x="1054" y="113"/>
       <point x="912" y="0"/>
-      <point x="652" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="652" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="239" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="651" y="665" type="line" name="dv01" smooth="yes"/>
+      <point x="651" y="665" type="line" smooth="yes" name="dv01"/>
       <point x="764" y="665"/>
       <point x="820" y="728"/>
-      <point x="820" y="817" type="curve" name="hr01" smooth="yes"/>
+      <point x="820" y="817" type="curve" smooth="yes" name="hr01"/>
       <point x="820" y="906"/>
       <point x="765" y="970"/>
-      <point x="650" y="970" type="curve" name="sv01" smooth="yes"/>
+      <point x="650" y="970" type="curve" smooth="yes" name="sv01"/>
       <point x="423" y="970" type="line" name="dh02"/>
       <point x="423" y="665" type="line"/>
     </contour>
     <contour>
-      <point x="662" y="150" type="line" name="hr02" smooth="yes"/>
+      <point x="662" y="150" type="line" smooth="yes" name="hr02"/>
       <point x="789" y="150"/>
       <point x="858" y="232"/>
-      <point x="858" y="347" type="curve" name="sh01" smooth="yes"/>
+      <point x="858" y="347" type="curve" smooth="yes" name="sh01"/>
       <point x="858" y="447"/>
       <point x="806" y="515"/>
-      <point x="666" y="515" type="curve" name="hr03" smooth="yes"/>
+      <point x="666" y="515" type="curve" smooth="yes" name="hr03"/>
       <point x="423" y="515" type="line" name="sh03"/>
       <point x="423" y="150" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0433.glif b/source/Hack-Regular.ufo/glyphs/uni0433.glif
index 7d7c78ea3..8e653ed9c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0433.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0433.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0433" format="1">
+<glyph name="uni0433" format="2">
   <advance width="1233"/>
   <unicode hex="0433"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0434.glif b/source/Hack-Regular.ufo/glyphs/uni0434.glif
index 40f910deb..fa99e5309 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0434.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0434.glif
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0434" format="1">
+<glyph name="uni0434" format="2">
   <advance width="1233"/>
   <unicode hex="0434"/>
   <outline>
     <contour>
       <point x="105" y="150" type="line" name="dh01"/>
-      <point x="172" y="150" type="line" name="sv02" smooth="yes"/>
+      <point x="172" y="150" type="line" smooth="yes" name="sv02"/>
       <point x="245" y="150"/>
       <point x="259" y="572"/>
-      <point x="259" y="704" type="curve" name="sh01" smooth="yes"/>
+      <point x="259" y="704" type="curve" smooth="yes" name="sh01"/>
       <point x="259" y="1120" type="line" name="at01"/>
       <point x="1007" y="1120" type="line"/>
       <point x="1007" y="150" type="line" name="dh03"/>
@@ -27,7 +27,7 @@
       <point x="442" y="700" type="line" smooth="yes"/>
       <point x="442" y="660"/>
       <point x="436" y="537"/>
-      <point x="423" y="353" type="curve" name="sh03" smooth="yes"/>
+      <point x="423" y="353" type="curve" smooth="yes" name="sh03"/>
       <point x="416" y="256"/>
       <point x="412" y="206"/>
       <point x="407" y="193" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="400" y="166" type="curve" smooth="yes"/>
       <point x="400" y="155"/>
       <point x="405" y="150"/>
-      <point x="434" y="150" type="curve" name="sv05" smooth="yes"/>
+      <point x="434" y="150" type="curve" smooth="yes" name="sv05"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0435.glif b/source/Hack-Regular.ufo/glyphs/uni0435.glif
index 019c0cb17..ef186d142 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0435.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0435.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0435" format="1">
+<glyph name="uni0435" format="2">
   <advance width="1233"/>
   <unicode hex="0435"/>
   <outline>
     <contour>
-      <point x="677" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="677" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="330" y="-29"/>
       <point x="124" y="195"/>
-      <point x="124" y="555" type="curve" name="sh01" smooth="yes"/>
+      <point x="124" y="555" type="curve" smooth="yes" name="sh01"/>
       <point x="124" y="916"/>
       <point x="333" y="1147"/>
-      <point x="645" y="1147" type="curve" name="dv03" smooth="yes"/>
+      <point x="645" y="1147" type="curve" smooth="yes" name="dv03"/>
       <point x="941" y="1147"/>
       <point x="1113" y="941"/>
-      <point x="1113" y="606" type="curve" name="sh02" smooth="yes"/>
+      <point x="1113" y="606" type="curve" smooth="yes" name="sh02"/>
       <point x="1113" y="516" type="line"/>
       <point x="316" y="516" type="line" name="sh03"/>
       <point x="316" y="510" type="line" smooth="yes"/>
       <point x="316" y="266"/>
       <point x="450" y="127"/>
-      <point x="680" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="680" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="800" y="127"/>
       <point x="925" y="164"/>
       <point x="1070" y="240" type="curve" name="ih01"/>
@@ -31,7 +31,7 @@
       <point x="929" y="660" type="line" name="ah01"/>
       <point x="925" y="869"/>
       <point x="828" y="991"/>
-      <point x="647" y="991" type="curve" name="dv02" smooth="yes"/>
+      <point x="647" y="991" type="curve" smooth="yes" name="dv02"/>
       <point x="466" y="991"/>
       <point x="346" y="871"/>
       <point x="323" y="659" type="curve" name="sh04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0436.glif b/source/Hack-Regular.ufo/glyphs/uni0436.glif
index ffd410b6a..a8a938fd6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0436.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0436.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0436" format="1">
+<glyph name="uni0436" format="2">
   <advance width="1233"/>
   <unicode hex="0436"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0437.glif b/source/Hack-Regular.ufo/glyphs/uni0437.glif
index 6b121ccc9..bd5116c73 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0437.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0437.glif
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0437" format="1">
+<glyph name="uni0437" format="2">
   <advance width="1233"/>
   <unicode hex="0437"/>
   <outline>
     <contour>
-      <point x="539" y="-22" type="curve" name="ab01" smooth="yes"/>
+      <point x="539" y="-22" type="curve" smooth="yes" name="ab01"/>
       <point x="419" y="-22"/>
       <point x="306" y="-5"/>
       <point x="169" y="34" type="curve"/>
       <point x="169" y="207" type="line"/>
       <point x="270" y="162"/>
       <point x="394" y="138"/>
-      <point x="526" y="138" type="curve" name="hr01" smooth="yes"/>
+      <point x="526" y="138" type="curve" smooth="yes" name="hr01"/>
       <point x="759" y="138"/>
       <point x="881" y="213"/>
-      <point x="881" y="334" type="curve" name="sh02" smooth="yes"/>
+      <point x="881" y="334" type="curve" smooth="yes" name="sh02"/>
       <point x="881" y="454"/>
       <point x="761" y="532"/>
-      <point x="562" y="532" type="curve" name="dv02" smooth="yes"/>
+      <point x="562" y="532" type="curve" smooth="yes" name="dv02"/>
       <point x="404" y="532" type="line"/>
       <point x="404" y="676" type="line"/>
-      <point x="569" y="676" type="line" name="dv03" smooth="yes"/>
+      <point x="569" y="676" type="line" smooth="yes" name="dv03"/>
       <point x="752" y="676"/>
       <point x="849" y="739"/>
-      <point x="849" y="830" type="curve" name="sh01" smooth="yes"/>
+      <point x="849" y="830" type="curve" smooth="yes" name="sh01"/>
       <point x="849" y="922"/>
       <point x="747" y="984"/>
-      <point x="558" y="984" type="curve" name="dv01" smooth="yes"/>
+      <point x="558" y="984" type="curve" smooth="yes" name="dv01"/>
       <point x="463" y="984"/>
       <point x="350" y="968"/>
       <point x="210" y="932" type="curve"/>
       <point x="210" y="1099" type="line"/>
       <point x="350" y="1131"/>
       <point x="472" y="1147"/>
-      <point x="577" y="1147" type="curve" name="hr02" smooth="yes"/>
+      <point x="577" y="1147" type="curve" smooth="yes" name="hr02"/>
       <point x="857" y="1147"/>
       <point x="1032" y="1034"/>
-      <point x="1032" y="856" type="curve" name="sh03" smooth="yes"/>
+      <point x="1032" y="856" type="curve" smooth="yes" name="sh03"/>
       <point x="1032" y="728"/>
       <point x="943" y="640"/>
       <point x="783" y="607" type="curve" name="iv01"/>
       <point x="954" y="575"/>
       <point x="1064" y="480"/>
-      <point x="1064" y="321" type="curve" name="sh04" smooth="yes"/>
+      <point x="1064" y="321" type="curve" smooth="yes" name="sh04"/>
       <point x="1064" y="110"/>
       <point x="871" y="-22"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0438.glif b/source/Hack-Regular.ufo/glyphs/uni0438.glif
index 46edbe192..169a98775 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0438.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0438.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0438" format="1">
+<glyph name="uni0438" format="2">
   <advance width="1233"/>
   <unicode hex="0438"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0439.glif b/source/Hack-Regular.ufo/glyphs/uni0439.glif
index 0e8f5f2b1..8bcbaf262 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0439.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0439.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0439" format="1">
+<glyph name="uni0439" format="2">
   <advance width="1233"/>
   <unicode hex="0439"/>
   <outline>
     <contour>
-      <point x="616" y="1272" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1272" type="curve" smooth="yes" name="sv01"/>
       <point x="423" y="1272"/>
       <point x="318" y="1368"/>
       <point x="303" y="1559" type="curve" name="at01"/>
       <point x="422" y="1559" type="line"/>
       <point x="437" y="1463"/>
       <point x="494" y="1409"/>
-      <point x="615" y="1409" type="curve" name="sv02" smooth="yes"/>
+      <point x="615" y="1409" type="curve" smooth="yes" name="sv02"/>
       <point x="730" y="1409"/>
       <point x="792" y="1458"/>
       <point x="811" y="1559" type="curve" name="at02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni043A_.glif b/source/Hack-Regular.ufo/glyphs/uni043A_.glif
index 77442efb9..9826893ff 100644
--- a/source/Hack-Regular.ufo/glyphs/uni043A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni043A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni043A" format="1">
+<glyph name="uni043A" format="2">
   <advance width="1233"/>
   <unicode hex="043A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni043B_.glif b/source/Hack-Regular.ufo/glyphs/uni043B_.glif
index abb024716..802c0ec01 100644
--- a/source/Hack-Regular.ufo/glyphs/uni043B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni043B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni043B" format="1">
+<glyph name="uni043B" format="2">
   <advance width="1233"/>
   <unicode hex="043B"/>
   <outline>
@@ -11,20 +11,20 @@
       <point x="275" y="408" type="curve" name="sh02"/>
       <point x="280" y="477"/>
       <point x="285" y="604"/>
-      <point x="285" y="722" type="curve" name="sh01" smooth="yes"/>
+      <point x="285" y="722" type="curve" smooth="yes" name="sh01"/>
       <point x="285" y="1120" type="line" name="at01"/>
       <point x="1070" y="1120" type="line"/>
       <point x="1070" y="0" type="line" name="sh03"/>
       <point x="886" y="0" type="line" name="ah01"/>
       <point x="886" y="970" type="line" name="sv01"/>
       <point x="469" y="970" type="line"/>
-      <point x="469" y="725" type="line" name="sh04" smooth="yes"/>
+      <point x="469" y="725" type="line" smooth="yes" name="sh04"/>
       <point x="469" y="512"/>
       <point x="469" y="262"/>
       <point x="367" y="117" type="curve" smooth="yes"/>
       <point x="312" y="40"/>
       <point x="236" y="0"/>
-      <point x="105" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="105" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="50" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni043C_.glif b/source/Hack-Regular.ufo/glyphs/uni043C_.glif
index d59afddd9..7d0fe851d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni043C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni043C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni043C" format="1">
+<glyph name="uni043C" format="2">
   <advance width="1233"/>
   <unicode hex="043C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni043D_.glif b/source/Hack-Regular.ufo/glyphs/uni043D_.glif
index e12875618..5ab0464b5 100644
--- a/source/Hack-Regular.ufo/glyphs/uni043D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni043D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni043D" format="1">
+<glyph name="uni043D" format="2">
   <advance width="1233"/>
   <unicode hex="043D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni043E_.glif b/source/Hack-Regular.ufo/glyphs/uni043E_.glif
index 48205d1a4..27d176308 100644
--- a/source/Hack-Regular.ufo/glyphs/uni043E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni043E_.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni043E" format="1">
+<glyph name="uni043E" format="2">
   <advance width="1233"/>
   <unicode hex="043E"/>
   <outline>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="303" y="-29"/>
       <point x="137" y="174"/>
-      <point x="137" y="558" type="curve" name="sh01" smooth="yes"/>
+      <point x="137" y="558" type="curve" smooth="yes" name="sh01"/>
       <point x="137" y="939"/>
       <point x="305" y="1147"/>
-      <point x="616" y="1147" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="dv03"/>
       <point x="927" y="1147"/>
       <point x="1096" y="939"/>
-      <point x="1096" y="558" type="curve" name="sh02" smooth="yes"/>
+      <point x="1096" y="558" type="curve" smooth="yes" name="sh02"/>
       <point x="1096" y="177"/>
       <point x="928" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="805" y="127"/>
       <point x="901" y="274"/>
-      <point x="901" y="559" type="curve" name="ah01" smooth="yes"/>
+      <point x="901" y="559" type="curve" smooth="yes" name="ah01"/>
       <point x="901" y="846"/>
       <point x="805" y="991"/>
-      <point x="616" y="991" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="991" type="curve" smooth="yes" name="dv02"/>
       <point x="428" y="991"/>
       <point x="332" y="846"/>
-      <point x="332" y="559" type="curve" name="sh03" smooth="yes"/>
+      <point x="332" y="559" type="curve" smooth="yes" name="sh03"/>
       <point x="332" y="274"/>
       <point x="428" y="127"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni043F_.glif b/source/Hack-Regular.ufo/glyphs/uni043F_.glif
index 141c97457..04aea60b1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni043F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni043F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni043F" format="1">
+<glyph name="uni043F" format="2">
   <advance width="1233"/>
   <unicode hex="043F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0440.glif b/source/Hack-Regular.ufo/glyphs/uni0440.glif
index 1000a1479..20b27638a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0440.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0440.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0440" format="1">
+<glyph name="uni0440" format="2">
   <advance width="1233"/>
   <unicode hex="0440"/>
   <outline>
@@ -9,13 +9,13 @@
       <point x="375" y="977" type="line" name="sh02"/>
       <point x="439" y="1092"/>
       <point x="542" y="1147"/>
-      <point x="677" y="1147" type="curve" name="sv02" smooth="yes"/>
+      <point x="677" y="1147" type="curve" smooth="yes" name="sv02"/>
       <point x="943" y="1147"/>
       <point x="1108" y="925"/>
-      <point x="1108" y="558" type="curve" name="sh03" smooth="yes"/>
+      <point x="1108" y="558" type="curve" smooth="yes" name="sh03"/>
       <point x="1108" y="191"/>
       <point x="943" y="-29"/>
-      <point x="676" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="676" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="536" y="-29"/>
       <point x="435" y="29"/>
       <point x="375" y="141" type="curve" name="sh04"/>
@@ -23,16 +23,16 @@
       <point x="190" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="647" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="647" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="826" y="127"/>
       <point x="915" y="272"/>
-      <point x="915" y="559" type="curve" name="ah01" smooth="yes"/>
+      <point x="915" y="559" type="curve" smooth="yes" name="ah01"/>
       <point x="915" y="846"/>
       <point x="826" y="991"/>
-      <point x="647" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="647" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="467" y="991"/>
       <point x="375" y="844"/>
-      <point x="375" y="559" type="curve" name="hr01" smooth="yes"/>
+      <point x="375" y="559" type="curve" smooth="yes" name="hr01"/>
       <point x="375" y="274"/>
       <point x="467" y="127"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0441.glif b/source/Hack-Regular.ufo/glyphs/uni0441.glif
index 21f080352..0471a9c33 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0441.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0441.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0441" format="1">
+<glyph name="uni0441" format="2">
   <advance width="1233"/>
   <unicode hex="0441"/>
   <outline>
     <contour>
-      <point x="712" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="712" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="545" y="-29"/>
       <point x="406" y="24"/>
       <point x="310" y="127" type="curve" smooth="yes"/>
@@ -35,7 +35,7 @@
       <point x="451" y="879" type="curve" smooth="yes"/>
       <point x="389" y="804"/>
       <point x="358" y="697"/>
-      <point x="358" y="560" type="curve" name="hr01" smooth="yes"/>
+      <point x="358" y="560" type="curve" smooth="yes" name="hr01"/>
       <point x="358" y="432"/>
       <point x="384" y="320"/>
       <point x="451" y="240" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0442.glif b/source/Hack-Regular.ufo/glyphs/uni0442.glif
index 432fabd2d..4e0ebfdb5 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0442.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0442.glif
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0442" format="1">
+<glyph name="uni0442" format="2">
   <advance width="1233"/>
   <unicode hex="0442"/>
   <outline>
     <contour>
       <point x="525" y="970" type="line" name="hr00"/>
-      <point x="214" y="970" type="line"/>
-      <point x="214" y="1120" type="line" name="at01"/>
-      <point x="1020" y="1120" type="line"/>
-      <point x="1020" y="970" type="line" name="sv01"/>
+      <point x="134" y="970" type="line"/>
+      <point x="134" y="1120" type="line" name="at01"/>
+      <point x="1100" y="1120" type="line"/>
+      <point x="1100" y="970" type="line" name="sv01"/>
       <point x="709" y="970" type="line" name="dh01"/>
       <point x="709" y="0" type="line" name="ab01"/>
       <point x="525" y="0" type="line"/>
@@ -17,7 +17,7 @@
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2017-07-11 17:15:08 +0000</string>
+      <string>2018-05-30 17:48:01 +0000</string>
     </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0443.glif b/source/Hack-Regular.ufo/glyphs/uni0443.glif
index bbe868618..40ed2c60b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0443.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0443.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0443" format="1">
+<glyph name="uni0443" format="2">
   <advance width="1233"/>
   <unicode hex="0443"/>
   <outline>
@@ -26,7 +26,7 @@
       <point x="617" y="-270" type="curve" smooth="yes"/>
       <point x="558" y="-370"/>
       <point x="475" y="-426"/>
-      <point x="342" y="-426" type="curve" name="ab01" smooth="yes"/>
+      <point x="342" y="-426" type="curve" smooth="yes" name="ab01"/>
       <point x="194" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0444.glif b/source/Hack-Regular.ufo/glyphs/uni0444.glif
index fa1d436f5..eb51e2b27 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0444.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0444.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0444" format="1">
+<glyph name="uni0444" format="2">
   <advance width="1233"/>
   <unicode hex="0444"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="525" y="-29" type="line" name="hr00"/>
       <point x="232" y="0"/>
       <point x="104" y="159"/>
-      <point x="104" y="560" type="curve" name="sh01" smooth="yes"/>
+      <point x="104" y="560" type="curve" smooth="yes" name="sh01"/>
       <point x="104" y="957"/>
       <point x="229" y="1118"/>
       <point x="525" y="1147" type="curve" name="sh02"/>
@@ -16,7 +16,7 @@
       <point x="709" y="1147" type="line"/>
       <point x="1005" y="1118"/>
       <point x="1130" y="957"/>
-      <point x="1130" y="560" type="curve" name="sh06" smooth="yes"/>
+      <point x="1130" y="560" type="curve" smooth="yes" name="sh06"/>
       <point x="1130" y="159"/>
       <point x="1002" y="0"/>
       <point x="709" y="-29" type="curve" name="sh03"/>
@@ -27,7 +27,7 @@
       <point x="525" y="982" type="line" name="sh07"/>
       <point x="365" y="950"/>
       <point x="299" y="885"/>
-      <point x="299" y="559" type="curve" name="sh08" smooth="yes"/>
+      <point x="299" y="559" type="curve" smooth="yes" name="sh08"/>
       <point x="299" y="232"/>
       <point x="365" y="159"/>
       <point x="525" y="127" type="curve"/>
@@ -36,7 +36,7 @@
       <point x="709" y="127" type="line" name="sh09"/>
       <point x="869" y="159"/>
       <point x="935" y="232"/>
-      <point x="935" y="559" type="curve" name="sh05" smooth="yes"/>
+      <point x="935" y="559" type="curve" smooth="yes" name="sh05"/>
       <point x="935" y="885"/>
       <point x="869" y="950"/>
       <point x="709" y="982" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0445.glif b/source/Hack-Regular.ufo/glyphs/uni0445.glif
index 0a671fd3f..b7ac1819c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0445.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0445.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0445" format="1">
+<glyph name="uni0445" format="2">
   <advance width="1233"/>
   <unicode hex="0445"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0446.glif b/source/Hack-Regular.ufo/glyphs/uni0446.glif
index 1fa388633..3cee3c052 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0446.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0446.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0446" format="1">
+<glyph name="uni0446" format="2">
   <advance width="1233"/>
   <unicode hex="0446"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0447.glif b/source/Hack-Regular.ufo/glyphs/uni0447.glif
index fc0d8f280..b6b66a006 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0447.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0447.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0447" format="1">
+<glyph name="uni0447" format="2">
   <advance width="1233"/>
   <unicode hex="0447"/>
   <outline>
@@ -7,16 +7,16 @@
       <point x="837" y="466" type="line" name="hr00"/>
       <point x="816" y="458"/>
       <point x="700" y="402"/>
-      <point x="531" y="402" type="curve" name="dv01" smooth="yes"/>
+      <point x="531" y="402" type="curve" smooth="yes" name="dv01"/>
       <point x="306" y="402"/>
       <point x="165" y="502"/>
-      <point x="165" y="755" type="curve" name="sh01" smooth="yes"/>
+      <point x="165" y="755" type="curve" smooth="yes" name="sh01"/>
       <point x="165" y="1122" type="line" name="at01"/>
       <point x="349" y="1122" type="line"/>
-      <point x="349" y="755" type="line" name="sh02" smooth="yes"/>
+      <point x="349" y="755" type="line" smooth="yes" name="sh02"/>
       <point x="349" y="583"/>
       <point x="462" y="562"/>
-      <point x="590" y="562" type="curve" name="dv02" smooth="yes"/>
+      <point x="590" y="562" type="curve" smooth="yes" name="dv02"/>
       <point x="682" y="562"/>
       <point x="754" y="573"/>
       <point x="837" y="621" type="curve" name="sh03"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0448.glif b/source/Hack-Regular.ufo/glyphs/uni0448.glif
index 669a8ac4f..2feb456fd 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0448.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0448.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0448" format="1">
+<glyph name="uni0448" format="2">
   <advance width="1233"/>
   <unicode hex="0448"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0449.glif b/source/Hack-Regular.ufo/glyphs/uni0449.glif
index 565686572..0867c53d9 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0449.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0449.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0449" format="1">
+<glyph name="uni0449" format="2">
   <advance width="1233"/>
   <unicode hex="0449"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni044A_.glif b/source/Hack-Regular.ufo/glyphs/uni044A_.glif
index 97b941ca7..36f50c012 100644
--- a/source/Hack-Regular.ufo/glyphs/uni044A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni044A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni044A" format="1">
+<glyph name="uni044A" format="2">
   <advance width="1233"/>
   <unicode hex="044A"/>
   <outline>
@@ -9,23 +9,23 @@
       <point x="60" y="1120" type="line" name="dh01"/>
       <point x="492" y="1120" type="line" name="dh02"/>
       <point x="492" y="667" type="line"/>
-      <point x="748" y="667" type="line" name="hr01" smooth="yes"/>
+      <point x="748" y="667" type="line" smooth="yes" name="hr01"/>
       <point x="1027" y="667"/>
       <point x="1194" y="558"/>
-      <point x="1194" y="331" type="curve" name="dh04" smooth="yes"/>
+      <point x="1194" y="331" type="curve" smooth="yes" name="dh04"/>
       <point x="1194" y="108"/>
       <point x="1033" y="0"/>
-      <point x="748" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="748" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="308" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="740" y="156" type="line" name="sv01" smooth="yes"/>
+      <point x="740" y="156" type="line" smooth="yes" name="sv01"/>
       <point x="905" y="156"/>
       <point x="998" y="213"/>
-      <point x="998" y="333" type="curve" name="dh03" smooth="yes"/>
+      <point x="998" y="333" type="curve" smooth="yes" name="dh03"/>
       <point x="998" y="454"/>
       <point x="903" y="514"/>
-      <point x="740" y="514" type="curve" name="hr02" smooth="yes"/>
+      <point x="740" y="514" type="curve" smooth="yes" name="hr02"/>
       <point x="492" y="514" type="line" name="sh02"/>
       <point x="492" y="156" type="line" name="hr03"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni044B_.glif b/source/Hack-Regular.ufo/glyphs/uni044B_.glif
index d2eb261ef..90cd17f00 100644
--- a/source/Hack-Regular.ufo/glyphs/uni044B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni044B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni044B" format="1">
+<glyph name="uni044B" format="2">
   <advance width="1233"/>
   <unicode hex="044B"/>
   <outline>
@@ -7,13 +7,13 @@
       <point x="104" y="1120" type="line" name="hr00"/>
       <point x="286" y="1120" type="line" name="dh01"/>
       <point x="286" y="667" type="line"/>
-      <point x="377" y="667" type="line" name="dv02" smooth="yes"/>
+      <point x="377" y="667" type="line" smooth="yes" name="dv02"/>
       <point x="656" y="667"/>
       <point x="823" y="558"/>
-      <point x="823" y="331" type="curve" name="dh03" smooth="yes"/>
+      <point x="823" y="331" type="curve" smooth="yes" name="dh03"/>
       <point x="823" y="108"/>
       <point x="662" y="0"/>
-      <point x="377" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="377" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="104" y="0" type="line"/>
     </contour>
     <contour>
@@ -23,13 +23,13 @@
       <point x="945" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="369" y="154" type="line" name="sv01" smooth="yes"/>
+      <point x="369" y="154" type="line" smooth="yes" name="sv01"/>
       <point x="534" y="154"/>
       <point x="627" y="212"/>
-      <point x="627" y="333" type="curve" name="dh02" smooth="yes"/>
+      <point x="627" y="333" type="curve" smooth="yes" name="dh02"/>
       <point x="627" y="456"/>
       <point x="532" y="516"/>
-      <point x="369" y="516" type="curve" name="dv01" smooth="yes"/>
+      <point x="369" y="516" type="curve" smooth="yes" name="dv01"/>
       <point x="286" y="516" type="line" name="sh01"/>
       <point x="286" y="154" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni044C_.glif b/source/Hack-Regular.ufo/glyphs/uni044C_.glif
index 7148c281e..437e5ebc8 100644
--- a/source/Hack-Regular.ufo/glyphs/uni044C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni044C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni044C" format="1">
+<glyph name="uni044C" format="2">
   <advance width="1233"/>
   <unicode hex="044C"/>
   <outline>
@@ -7,23 +7,23 @@
       <point x="225" y="1120" type="line" name="hr00"/>
       <point x="409" y="1120" type="line" name="sh01"/>
       <point x="409" y="667" type="line"/>
-      <point x="665" y="667" type="line" name="dv02" smooth="yes"/>
+      <point x="665" y="667" type="line" smooth="yes" name="dv02"/>
       <point x="942" y="667"/>
       <point x="1110" y="558"/>
-      <point x="1110" y="330" type="curve" name="sh02" smooth="yes"/>
+      <point x="1110" y="330" type="curve" smooth="yes" name="sh02"/>
       <point x="1110" y="109"/>
       <point x="950" y="0"/>
-      <point x="665" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="665" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="225" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="657" y="153" type="line" name="sv01" smooth="yes"/>
+      <point x="657" y="153" type="line" smooth="yes" name="sv01"/>
       <point x="828" y="153"/>
       <point x="914" y="213"/>
-      <point x="914" y="333" type="curve" name="ah01" smooth="yes"/>
+      <point x="914" y="333" type="curve" smooth="yes" name="ah01"/>
       <point x="914" y="458"/>
       <point x="828" y="514"/>
-      <point x="657" y="514" type="curve" name="dv01" smooth="yes"/>
+      <point x="657" y="514" type="curve" smooth="yes" name="dv01"/>
       <point x="409" y="514" type="line" name="sh03"/>
       <point x="409" y="153" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni044D_.glif b/source/Hack-Regular.ufo/glyphs/uni044D_.glif
index 0cf41ba90..98656de97 100644
--- a/source/Hack-Regular.ufo/glyphs/uni044D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni044D_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni044D" format="1">
+<glyph name="uni044D" format="2">
   <advance width="1233"/>
   <unicode hex="044D"/>
   <outline>
     <contour>
-      <point x="545" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="545" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="432" y="-29"/>
       <point x="333" y="-4"/>
       <point x="225" y="57" type="curve"/>
       <point x="225" y="248" type="line"/>
       <point x="308" y="168"/>
       <point x="408" y="127"/>
-      <point x="533" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="533" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="773" y="127"/>
       <point x="883" y="283"/>
       <point x="896" y="516" type="curve" name="dh01"/>
@@ -20,17 +20,17 @@
       <point x="891" y="660" type="line" name="sh01"/>
       <point x="867" y="836"/>
       <point x="775" y="991"/>
-      <point x="534" y="991" type="curve" name="dv02" smooth="yes"/>
+      <point x="534" y="991" type="curve" smooth="yes" name="dv02"/>
       <point x="413" y="991"/>
       <point x="318" y="952"/>
       <point x="225" y="868" type="curve"/>
       <point x="225" y="1061" type="line"/>
       <point x="334" y="1122"/>
       <point x="432" y="1147"/>
-      <point x="544" y="1147" type="curve" name="dv03" smooth="yes"/>
+      <point x="544" y="1147" type="curve" smooth="yes" name="dv03"/>
       <point x="882" y="1147"/>
       <point x="1091" y="927"/>
-      <point x="1091" y="559" type="curve" name="dh02" smooth="yes"/>
+      <point x="1091" y="559" type="curve" smooth="yes" name="dh02"/>
       <point x="1091" y="191"/>
       <point x="881" y="-29"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni044E_.glif b/source/Hack-Regular.ufo/glyphs/uni044E_.glif
index 1def0e747..e1bfb1fa9 100644
--- a/source/Hack-Regular.ufo/glyphs/uni044E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni044E_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni044E" format="1">
+<glyph name="uni044E" format="2">
   <advance width="1233"/>
   <unicode hex="044E"/>
   <outline>
     <contour>
-      <point x="828" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="828" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="620" y="-29"/>
       <point x="465" y="165"/>
       <point x="444" y="484" type="curve" name="dh03"/>
@@ -17,10 +17,10 @@
       <point x="444" y="634" type="line" name="sh02"/>
       <point x="465" y="973"/>
       <point x="621" y="1147"/>
-      <point x="824" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="824" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="1037" y="1147"/>
       <point x="1208" y="956"/>
-      <point x="1208" y="558" type="curve" name="dh05" smooth="yes"/>
+      <point x="1208" y="558" type="curve" smooth="yes" name="dh05"/>
       <point x="1208" y="151"/>
       <point x="1029" y="-29"/>
     </contour>
@@ -28,25 +28,25 @@
       <point x="689" y="243" type="curve" smooth="yes"/>
       <point x="725" y="164"/>
       <point x="774" y="126"/>
-      <point x="825" y="126" type="curve" name="dv02" smooth="yes"/>
+      <point x="825" y="126" type="curve" smooth="yes" name="dv02"/>
       <point x="877" y="126"/>
       <point x="928" y="168"/>
       <point x="963" y="252" type="curve" smooth="yes"/>
       <point x="994" y="328"/>
       <point x="1013" y="439"/>
-      <point x="1013" y="574" type="curve" name="hr01" smooth="yes"/>
+      <point x="1013" y="574" type="curve" smooth="yes" name="hr01"/>
       <point x="1013" y="706"/>
       <point x="994" y="809"/>
       <point x="957" y="882" type="curve" smooth="yes"/>
       <point x="922" y="953"/>
       <point x="875" y="990"/>
-      <point x="827" y="990" type="curve" name="dv03" smooth="yes"/>
+      <point x="827" y="990" type="curve" smooth="yes" name="dv03"/>
       <point x="776" y="990"/>
       <point x="729" y="949"/>
       <point x="692" y="868" type="curve" smooth="yes"/>
       <point x="656" y="788"/>
       <point x="636" y="682"/>
-      <point x="636" y="551" type="curve" name="dh04" smooth="yes"/>
+      <point x="636" y="551" type="curve" smooth="yes" name="dh04"/>
       <point x="636" y="420"/>
       <point x="656" y="315"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni044F_.glif b/source/Hack-Regular.ufo/glyphs/uni044F_.glif
index d634630e7..3cd4dacc5 100644
--- a/source/Hack-Regular.ufo/glyphs/uni044F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni044F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni044F" format="1">
+<glyph name="uni044F" format="2">
   <advance width="1233"/>
   <unicode hex="044F"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="450" y="479" type="line" name="hr00"/>
       <point x="383" y="506"/>
       <point x="227" y="576"/>
-      <point x="227" y="795" type="curve" name="sh01" smooth="yes"/>
+      <point x="227" y="795" type="curve" smooth="yes" name="sh01"/>
       <point x="227" y="1024"/>
       <point x="397" y="1120"/>
-      <point x="597" y="1120" type="curve" name="at01" smooth="yes"/>
+      <point x="597" y="1120" type="curve" smooth="yes" name="at01"/>
       <point x="994" y="1120" type="line"/>
       <point x="994" y="0" type="line" name="sh02"/>
       <point x="810" y="0" type="line" name="ah01"/>
@@ -25,7 +25,7 @@
       <point x="583" y="970" type="line" smooth="yes"/>
       <point x="508" y="970"/>
       <point x="413" y="916"/>
-      <point x="413" y="787" type="curve" name="sh04" smooth="yes"/>
+      <point x="413" y="787" type="curve" smooth="yes" name="sh04"/>
       <point x="413" y="659"/>
       <point x="509" y="605"/>
       <point x="582" y="605" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0450.glif b/source/Hack-Regular.ufo/glyphs/uni0450.glif
index d4ccf7129..57ca75dc8 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0450.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0450.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0450" format="1">
+<glyph name="uni0450" format="2">
   <advance width="1233"/>
   <unicode hex="0450"/>
   <outline>
@@ -10,22 +10,22 @@
       <point x="575" y="1297" type="line"/>
     </contour>
     <contour>
-      <point x="677" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="677" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="330" y="-29"/>
       <point x="124" y="195"/>
-      <point x="124" y="555" type="curve" name="sh01" smooth="yes"/>
+      <point x="124" y="555" type="curve" smooth="yes" name="sh01"/>
       <point x="124" y="916"/>
       <point x="333" y="1147"/>
-      <point x="645" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="645" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="941" y="1147"/>
       <point x="1113" y="941"/>
-      <point x="1113" y="606" type="curve" name="sh03" smooth="yes"/>
+      <point x="1113" y="606" type="curve" smooth="yes" name="sh03"/>
       <point x="1113" y="516" type="line"/>
       <point x="316" y="516" type="line" name="sh02"/>
       <point x="316" y="510" type="line" smooth="yes"/>
       <point x="316" y="266"/>
       <point x="450" y="127"/>
-      <point x="680" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="680" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="800" y="127"/>
       <point x="925" y="164"/>
       <point x="1070" y="240" type="curve" name="ih02"/>
@@ -37,7 +37,7 @@
       <point x="929" y="660" type="line" name="ah01"/>
       <point x="925" y="869"/>
       <point x="828" y="991"/>
-      <point x="647" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="647" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="466" y="991"/>
       <point x="346" y="871"/>
       <point x="323" y="659" type="curve" name="sh04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0451.glif b/source/Hack-Regular.ufo/glyphs/uni0451.glif
index 5d6596895..a00733563 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0451.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0451.glif
@@ -1,61 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0451" format="1">
+<glyph name="uni0451" format="2">
   <advance width="1233"/>
   <unicode hex="0451"/>
   <outline>
     <contour>
-      <point x="385" y="1347" type="line" name="dv03" smooth="yes"/>
+      <point x="385" y="1347" type="line" smooth="yes" name="dv03"/>
       <point x="365" y="1347"/>
       <point x="355" y="1357"/>
-      <point x="355" y="1377" type="curve" name="dh03" smooth="yes"/>
+      <point x="355" y="1377" type="curve" smooth="yes" name="dh03"/>
       <point x="355" y="1519" type="line" smooth="yes"/>
       <point x="355" y="1539"/>
       <point x="365" y="1549"/>
-      <point x="385" y="1549" type="curve" name="dv04" smooth="yes"/>
+      <point x="385" y="1549" type="curve" smooth="yes" name="dv04"/>
       <point x="528" y="1549" type="line" smooth="yes"/>
       <point x="548" y="1549"/>
       <point x="558" y="1539"/>
       <point x="558" y="1519" type="curve" smooth="yes"/>
-      <point x="558" y="1377" type="line" name="dh04" smooth="yes"/>
+      <point x="558" y="1377" type="line" smooth="yes" name="dh04"/>
       <point x="558" y="1357"/>
       <point x="548" y="1347"/>
       <point x="528" y="1347" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="777" y="1347" type="line" name="sv01" smooth="yes"/>
+      <point x="777" y="1347" type="line" smooth="yes" name="sv01"/>
       <point x="757" y="1347"/>
       <point x="747" y="1357"/>
-      <point x="747" y="1377" type="curve" name="dh05" smooth="yes"/>
+      <point x="747" y="1377" type="curve" smooth="yes" name="dh05"/>
       <point x="747" y="1519" type="line" smooth="yes"/>
       <point x="747" y="1539"/>
       <point x="757" y="1549"/>
-      <point x="777" y="1549" type="curve" name="sv02" smooth="yes"/>
+      <point x="777" y="1549" type="curve" smooth="yes" name="sv02"/>
       <point x="919" y="1549" type="line" smooth="yes"/>
       <point x="939" y="1549"/>
       <point x="949" y="1539"/>
       <point x="949" y="1519" type="curve" smooth="yes"/>
-      <point x="949" y="1377" type="line" name="dh06" smooth="yes"/>
+      <point x="949" y="1377" type="line" smooth="yes" name="dh06"/>
       <point x="949" y="1357"/>
       <point x="939" y="1347"/>
-      <point x="919" y="1347" type="curve" name="hr01" smooth="yes"/>
+      <point x="919" y="1347" type="curve" smooth="yes" name="hr01"/>
     </contour>
     <contour>
-      <point x="677" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="677" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="330" y="-29"/>
       <point x="124" y="195"/>
-      <point x="124" y="555" type="curve" name="dh01" smooth="yes"/>
+      <point x="124" y="555" type="curve" smooth="yes" name="dh01"/>
       <point x="124" y="916"/>
       <point x="333" y="1147"/>
-      <point x="645" y="1147" type="curve" name="dv06" smooth="yes"/>
+      <point x="645" y="1147" type="curve" smooth="yes" name="dv06"/>
       <point x="941" y="1147"/>
       <point x="1113" y="941"/>
-      <point x="1113" y="606" type="curve" name="sh01" smooth="yes"/>
+      <point x="1113" y="606" type="curve" smooth="yes" name="sh01"/>
       <point x="1113" y="516" type="line"/>
       <point x="316" y="516" type="line" name="dh02"/>
       <point x="316" y="510" type="line" smooth="yes"/>
       <point x="316" y="266"/>
       <point x="450" y="127"/>
-      <point x="680" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="680" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="800" y="127"/>
       <point x="925" y="164"/>
       <point x="1070" y="240" type="curve" name="ih02"/>
@@ -67,7 +67,7 @@
       <point x="929" y="660" type="line" name="ih01"/>
       <point x="925" y="869"/>
       <point x="828" y="991"/>
-      <point x="647" y="991" type="curve" name="dv05" smooth="yes"/>
+      <point x="647" y="991" type="curve" smooth="yes" name="dv05"/>
       <point x="466" y="991"/>
       <point x="346" y="871"/>
       <point x="323" y="659" type="curve" name="sh02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0452.glif b/source/Hack-Regular.ufo/glyphs/uni0452.glif
index bc646c550..8f765b54d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0452.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0452.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0452" format="1">
+<glyph name="uni0452" format="2">
   <advance width="1233"/>
   <unicode hex="0452"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="661" y="-261" type="line" name="dh03"/>
       <point x="821" y="-232"/>
       <point x="955" y="-35"/>
-      <point x="955" y="304" type="curve" name="sh01" smooth="yes"/>
+      <point x="955" y="304" type="curve" smooth="yes" name="sh01"/>
       <point x="955" y="507"/>
       <point x="906" y="615"/>
-      <point x="731" y="615" type="curve" name="dv01" smooth="yes"/>
+      <point x="731" y="615" type="curve" smooth="yes" name="dv01"/>
       <point x="539" y="615"/>
       <point x="449" y="490"/>
       <point x="449" y="261" type="curve" smooth="yes"/>
@@ -29,10 +29,10 @@
       <point x="449" y="580" type="line" name="ih01"/>
       <point x="514" y="709"/>
       <point x="625" y="775"/>
-      <point x="788" y="775" type="curve" name="dv02" smooth="yes"/>
+      <point x="788" y="775" type="curve" smooth="yes" name="dv02"/>
       <point x="1036" y="775"/>
       <point x="1148" y="617"/>
-      <point x="1148" y="296" type="curve" name="dh04" smooth="yes"/>
+      <point x="1148" y="296" type="curve" smooth="yes" name="dh04"/>
       <point x="1148" y="-94"/>
       <point x="983" y="-368"/>
       <point x="661" y="-426" type="curve" name="hr01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0453.glif b/source/Hack-Regular.ufo/glyphs/uni0453.glif
index 40e6c20d9..9a3928c83 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0453.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0453.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0453" format="1">
+<glyph name="uni0453" format="2">
   <advance width="1233"/>
   <unicode hex="0453"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0454.glif b/source/Hack-Regular.ufo/glyphs/uni0454.glif
index 5b8c4e19c..778b8fd86 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0454.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0454.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0454" format="1">
+<glyph name="uni0454" format="2">
   <advance width="1233"/>
   <unicode hex="0454"/>
   <outline>
     <contour>
-      <point x="711" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="711" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="375" y="-29"/>
       <point x="165" y="191"/>
-      <point x="165" y="559" type="curve" name="dh01" smooth="yes"/>
+      <point x="165" y="559" type="curve" smooth="yes" name="dh01"/>
       <point x="165" y="927"/>
       <point x="374" y="1147"/>
-      <point x="712" y="1147" type="curve" name="dv03" smooth="yes"/>
+      <point x="712" y="1147" type="curve" smooth="yes" name="dv03"/>
       <point x="824" y="1147"/>
       <point x="920" y="1122"/>
       <point x="1031" y="1061" type="curve"/>
       <point x="1031" y="868" type="line"/>
       <point x="940" y="949"/>
       <point x="849" y="991"/>
-      <point x="722" y="991" type="curve" name="dv02" smooth="yes"/>
+      <point x="722" y="991" type="curve" smooth="yes" name="dv02"/>
       <point x="480" y="991"/>
       <point x="389" y="837"/>
       <point x="365" y="659" type="curve" name="sh01"/>
@@ -26,7 +26,7 @@
       <point x="360" y="516" type="line" name="dh02"/>
       <point x="373" y="283"/>
       <point x="483" y="127"/>
-      <point x="723" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="723" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="848" y="127"/>
       <point x="948" y="168"/>
       <point x="1031" y="248" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0455.glif b/source/Hack-Regular.ufo/glyphs/uni0455.glif
index bf1bcb25c..96631bf53 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0455.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0455.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0455" format="1">
+<glyph name="uni0455" format="2">
   <advance width="1233"/>
   <unicode hex="0455"/>
   <outline>
     <contour>
-      <point x="587" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="587" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="471" y="-29"/>
       <point x="354" y="-6"/>
       <point x="213" y="41" type="curve" name="sh02"/>
       <point x="213" y="231" type="line"/>
       <point x="350" y="160"/>
       <point x="475" y="125"/>
-      <point x="588" y="125" type="curve" name="dv01" smooth="yes"/>
+      <point x="588" y="125" type="curve" smooth="yes" name="dv01"/>
       <point x="751" y="125"/>
       <point x="844" y="198"/>
-      <point x="844" y="305" type="curve" name="ah01" smooth="yes"/>
+      <point x="844" y="305" type="curve" smooth="yes" name="ah01"/>
       <point x="844" y="396"/>
       <point x="776" y="452"/>
       <point x="599" y="490" type="curve" smooth="yes"/>
@@ -22,20 +22,20 @@
       <point x="522" y="506" type="line" smooth="yes"/>
       <point x="303" y="549"/>
       <point x="217" y="646"/>
-      <point x="217" y="810" type="curve" name="sh01" smooth="yes"/>
+      <point x="217" y="810" type="curve" smooth="yes" name="sh01"/>
       <point x="217" y="1027"/>
       <point x="364" y="1147"/>
-      <point x="639" y="1147" type="curve" name="dv03" smooth="yes"/>
+      <point x="639" y="1147" type="curve" smooth="yes" name="dv03"/>
       <point x="754" y="1147"/>
       <point x="866" y="1125"/>
       <point x="973" y="1081" type="curve"/>
       <point x="973" y="901" type="line" name="ih01"/>
       <point x="865" y="962"/>
       <point x="765" y="993"/>
-      <point x="645" y="993" type="curve" name="dv02" smooth="yes"/>
+      <point x="645" y="993" type="curve" smooth="yes" name="dv02"/>
       <point x="484" y="993"/>
       <point x="403" y="938"/>
-      <point x="403" y="828" type="curve" name="sh04" smooth="yes"/>
+      <point x="403" y="828" type="curve" smooth="yes" name="sh04"/>
       <point x="403" y="781"/>
       <point x="418" y="741"/>
       <point x="449" y="717" type="curve" smooth="yes"/>
@@ -45,7 +45,7 @@
       <point x="752" y="631" type="line" smooth="yes"/>
       <point x="936" y="596"/>
       <point x="1030" y="492"/>
-      <point x="1030" y="324" type="curve" name="sh03" smooth="yes"/>
+      <point x="1030" y="324" type="curve" smooth="yes" name="sh03"/>
       <point x="1030" y="103"/>
       <point x="863" y="-29"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0456.glif b/source/Hack-Regular.ufo/glyphs/uni0456.glif
index 4b5821b00..ca7ec4ce8 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0456.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0456.glif
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0456" format="1">
+<glyph name="uni0456" format="2">
   <advance width="1233"/>
   <unicode hex="0456"/>
   <outline>
     <contour>
-      <point x="495" y="1323" type="line" name="sv01" smooth="yes"/>
+      <point x="495" y="1323" type="line" smooth="yes" name="sv01"/>
       <point x="474" y="1323"/>
       <point x="463" y="1333"/>
-      <point x="463" y="1353" type="curve" name="sh02" smooth="yes"/>
+      <point x="463" y="1353" type="curve" smooth="yes" name="sh02"/>
       <point x="463" y="1526" type="line" smooth="yes"/>
       <point x="463" y="1546"/>
       <point x="474" y="1556"/>
-      <point x="495" y="1556" type="curve" name="hr01" smooth="yes"/>
+      <point x="495" y="1556" type="curve" smooth="yes" name="hr01"/>
       <point x="625" y="1556" type="line" smooth="yes"/>
       <point x="646" y="1556"/>
       <point x="657" y="1546"/>
-      <point x="657" y="1526" type="curve" name="sh03" smooth="yes"/>
-      <point x="657" y="1353" type="line" name="sh05" smooth="yes"/>
+      <point x="657" y="1526" type="curve" smooth="yes" name="sh03"/>
+      <point x="657" y="1353" type="line" smooth="yes" name="sh05"/>
       <point x="657" y="1333"/>
       <point x="646" y="1323"/>
       <point x="625" y="1323" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="657" y="398" type="line" name="sh04" smooth="yes"/>
+      <point x="657" y="398" type="line" smooth="yes" name="sh04"/>
       <point x="657" y="315"/>
       <point x="672" y="252"/>
       <point x="703" y="211" type="curve" smooth="yes"/>
       <point x="735" y="167"/>
       <point x="780" y="148"/>
-      <point x="837" y="148" type="curve" name="sv02" smooth="yes"/>
+      <point x="837" y="148" type="curve" smooth="yes" name="sv02"/>
       <point x="1052" y="148" type="line"/>
       <point x="1052" y="-8" type="line" name="ab01"/>
       <point x="819" y="-8" type="line" smooth="yes"/>
@@ -37,7 +37,7 @@
       <point x="564" y="98" type="curve" smooth="yes"/>
       <point x="503" y="169"/>
       <point x="473" y="269"/>
-      <point x="473" y="398" type="curve" name="sh01" smooth="yes"/>
+      <point x="473" y="398" type="curve" smooth="yes" name="sh01"/>
       <point x="473" y="976" type="line" name="sv03"/>
       <point x="228" y="976" type="line"/>
       <point x="228" y="1120" type="line" name="dh01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0457.glif b/source/Hack-Regular.ufo/glyphs/uni0457.glif
index 2b300434d..eee928f23 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0457.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0457.glif
@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0457" format="1">
+<glyph name="uni0457" format="2">
   <advance width="1233"/>
   <unicode hex="0457"/>
   <outline>
     <contour>
-      <point x="258" y="1321" type="line" name="dv01" smooth="yes"/>
+      <point x="258" y="1321" type="line" smooth="yes" name="dv01"/>
       <point x="238" y="1321"/>
       <point x="228" y="1331"/>
-      <point x="228" y="1351" type="curve" name="dh01" smooth="yes"/>
+      <point x="228" y="1351" type="curve" smooth="yes" name="dh01"/>
       <point x="228" y="1493" type="line" smooth="yes"/>
       <point x="228" y="1513"/>
       <point x="238" y="1523"/>
-      <point x="258" y="1523" type="curve" name="dv02" smooth="yes"/>
+      <point x="258" y="1523" type="curve" smooth="yes" name="dv02"/>
       <point x="401" y="1523" type="line" smooth="yes"/>
       <point x="421" y="1523"/>
       <point x="431" y="1513"/>
       <point x="431" y="1493" type="curve" smooth="yes"/>
-      <point x="431" y="1351" type="line" name="dh02" smooth="yes"/>
+      <point x="431" y="1351" type="line" smooth="yes" name="dh02"/>
       <point x="431" y="1331"/>
       <point x="421" y="1321"/>
       <point x="401" y="1321" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="650" y="1321" type="line" name="sv01" smooth="yes"/>
+      <point x="650" y="1321" type="line" smooth="yes" name="sv01"/>
       <point x="630" y="1321"/>
       <point x="620" y="1331"/>
-      <point x="620" y="1351" type="curve" name="ih01" smooth="yes"/>
+      <point x="620" y="1351" type="curve" smooth="yes" name="ih01"/>
       <point x="620" y="1493" type="line" smooth="yes"/>
       <point x="620" y="1513"/>
       <point x="630" y="1523"/>
-      <point x="650" y="1523" type="curve" name="sv02" smooth="yes"/>
+      <point x="650" y="1523" type="curve" smooth="yes" name="sv02"/>
       <point x="792" y="1523" type="line" smooth="yes"/>
       <point x="812" y="1523"/>
       <point x="822" y="1513"/>
-      <point x="822" y="1493" type="curve" name="hr01" smooth="yes"/>
-      <point x="822" y="1351" type="line" name="sh01" smooth="yes"/>
+      <point x="822" y="1493" type="curve" smooth="yes" name="hr01"/>
+      <point x="822" y="1351" type="line" smooth="yes" name="sh01"/>
       <point x="822" y="1331"/>
       <point x="812" y="1321"/>
       <point x="792" y="1321" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="657" y="398" type="line" name="dh04" smooth="yes"/>
+      <point x="657" y="398" type="line" smooth="yes" name="dh04"/>
       <point x="657" y="315"/>
       <point x="672" y="252"/>
       <point x="703" y="211" type="curve" smooth="yes"/>
       <point x="735" y="167"/>
       <point x="780" y="148"/>
-      <point x="837" y="148" type="curve" name="sv03" smooth="yes"/>
+      <point x="837" y="148" type="curve" smooth="yes" name="sv03"/>
       <point x="1052" y="148" type="line"/>
       <point x="1052" y="-8" type="line" name="ab01"/>
       <point x="819" y="-8" type="line" smooth="yes"/>
@@ -55,7 +55,7 @@
       <point x="564" y="98" type="curve" smooth="yes"/>
       <point x="503" y="169"/>
       <point x="473" y="269"/>
-      <point x="473" y="398" type="curve" name="dh03" smooth="yes"/>
+      <point x="473" y="398" type="curve" smooth="yes" name="dh03"/>
       <point x="473" y="976" type="line" name="sv04"/>
       <point x="228" y="976" type="line" name="sh02"/>
       <point x="228" y="1120" type="line" name="at01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0458.glif b/source/Hack-Regular.ufo/glyphs/uni0458.glif
index e9203d828..bcd11ca6f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0458.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0458.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0458" format="1">
+<glyph name="uni0458" format="2">
   <advance width="1233"/>
   <unicode hex="0458"/>
   <outline>
     <contour>
-      <point x="674" y="1323" type="line" name="sv01" smooth="yes"/>
+      <point x="674" y="1323" type="line" smooth="yes" name="sv01"/>
       <point x="653" y="1323"/>
       <point x="642" y="1333"/>
-      <point x="642" y="1353" type="curve" name="sh02" smooth="yes"/>
+      <point x="642" y="1353" type="curve" smooth="yes" name="sh02"/>
       <point x="642" y="1526" type="line" smooth="yes"/>
       <point x="642" y="1546"/>
       <point x="653" y="1556"/>
-      <point x="674" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="674" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="804" y="1556" type="line" smooth="yes"/>
       <point x="825" y="1556"/>
       <point x="836" y="1546"/>
-      <point x="836" y="1526" type="curve" name="sh03" smooth="yes"/>
-      <point x="836" y="1353" type="line" name="hr01" smooth="yes"/>
+      <point x="836" y="1526" type="curve" smooth="yes" name="sh03"/>
+      <point x="836" y="1353" type="line" smooth="yes" name="hr01"/>
       <point x="836" y="1333"/>
       <point x="825" y="1323"/>
       <point x="804" y="1323" type="curve" smooth="yes"/>
@@ -26,15 +26,15 @@
       <point x="472" y="-270" type="line" smooth="yes"/>
       <point x="592" y="-270"/>
       <point x="652" y="-187"/>
-      <point x="652" y="-20" type="curve" name="sh01" smooth="yes"/>
+      <point x="652" y="-20" type="curve" smooth="yes" name="sh01"/>
       <point x="652" y="977" type="line" name="sv03"/>
       <point x="335" y="977" type="line"/>
       <point x="335" y="1120" type="line" name="dh01"/>
       <point x="836" y="1120" type="line" name="dh02"/>
-      <point x="836" y="-20" type="line" name="sh04" smooth="yes"/>
+      <point x="836" y="-20" type="line" smooth="yes" name="sh04"/>
       <point x="836" y="-281"/>
       <point x="713" y="-426"/>
-      <point x="492" y="-426" type="curve" name="ab01" smooth="yes"/>
+      <point x="492" y="-426" type="curve" smooth="yes" name="ab01"/>
       <point x="238" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0459.glif b/source/Hack-Regular.ufo/glyphs/uni0459.glif
index 7e59904ce..9adfffe93 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0459.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0459.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0459" format="1">
+<glyph name="uni0459" format="2">
   <advance width="1233"/>
   <unicode hex="0459"/>
   <outline>
@@ -11,17 +11,17 @@
       <point x="241" y="408" type="curve" name="sh01"/>
       <point x="246" y="477"/>
       <point x="251" y="604"/>
-      <point x="251" y="722" type="curve" name="dh01" smooth="yes"/>
+      <point x="251" y="722" type="curve" smooth="yes" name="dh01"/>
       <point x="251" y="1120" type="line" name="at01"/>
       <point x="816" y="1120" type="line" name="sh02"/>
       <point x="816" y="667" type="line"/>
-      <point x="837" y="667" type="line" name="dv02" smooth="yes"/>
+      <point x="837" y="667" type="line" smooth="yes" name="dv02"/>
       <point x="1049" y="667"/>
       <point x="1233" y="558"/>
-      <point x="1233" y="331" type="curve" name="dh06" smooth="yes"/>
+      <point x="1233" y="331" type="curve" smooth="yes" name="dh06"/>
       <point x="1233" y="109"/>
       <point x="1056" y="0"/>
-      <point x="837" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="837" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="648" y="0" type="line" name="dh03"/>
       <point x="648" y="970" type="line" name="sv01"/>
       <point x="419" y="970" type="line"/>
@@ -32,17 +32,17 @@
       <point x="310" y="105" type="curve" smooth="yes"/>
       <point x="265" y="45"/>
       <point x="202" y="0"/>
-      <point x="55" y="0" type="curve" name="ab02" smooth="yes"/>
+      <point x="55" y="0" type="curve" smooth="yes" name="ab02"/>
       <point x="16" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="829" y="153" type="line" name="sv02" smooth="yes"/>
+      <point x="829" y="153" type="line" smooth="yes" name="sv02"/>
       <point x="968" y="153"/>
       <point x="1037" y="213"/>
-      <point x="1037" y="334" type="curve" name="dh05" smooth="yes"/>
+      <point x="1037" y="334" type="curve" smooth="yes" name="dh05"/>
       <point x="1037" y="454"/>
       <point x="968" y="514"/>
-      <point x="829" y="514" type="curve" name="dv01" smooth="yes"/>
+      <point x="829" y="514" type="curve" smooth="yes" name="dv01"/>
       <point x="816" y="514" type="line"/>
       <point x="816" y="153" type="line" name="dh04"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni045A_.glif b/source/Hack-Regular.ufo/glyphs/uni045A_.glif
index 7898b1149..6350afac0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni045A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni045A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni045A" format="1">
+<glyph name="uni045A" format="2">
   <advance width="1233"/>
   <unicode hex="045A"/>
   <outline>
@@ -14,10 +14,10 @@
       <point x="827" y="667" type="line" smooth="yes"/>
       <point x="1039" y="667"/>
       <point x="1223" y="558"/>
-      <point x="1223" y="331" type="curve" name="dh05" smooth="yes"/>
+      <point x="1223" y="331" type="curve" smooth="yes" name="dh05"/>
       <point x="1223" y="109"/>
       <point x="1046" y="0"/>
-      <point x="827" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="827" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="638" y="0" type="line" name="sh01"/>
       <point x="638" y="515" type="line" name="dv01"/>
       <point x="274" y="515" type="line" name="sh02"/>
@@ -25,13 +25,13 @@
       <point x="106" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="819" y="153" type="line" name="sv02" smooth="yes"/>
+      <point x="819" y="153" type="line" smooth="yes" name="sv02"/>
       <point x="958" y="153"/>
       <point x="1027" y="213"/>
-      <point x="1027" y="334" type="curve" name="dh04" smooth="yes"/>
+      <point x="1027" y="334" type="curve" smooth="yes" name="dh04"/>
       <point x="1027" y="454"/>
       <point x="958" y="514"/>
-      <point x="819" y="514" type="curve" name="sv03" smooth="yes"/>
+      <point x="819" y="514" type="curve" smooth="yes" name="sv03"/>
       <point x="806" y="514" type="line" name="sh03"/>
       <point x="806" y="153" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni045B_.glif b/source/Hack-Regular.ufo/glyphs/uni045B_.glif
index 9f3a2274c..0325a9454 100644
--- a/source/Hack-Regular.ufo/glyphs/uni045B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni045B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni045B" format="1">
+<glyph name="uni045B" format="2">
   <advance width="1233"/>
   <unicode hex="045B"/>
   <outline>
@@ -17,7 +17,7 @@
       <point x="439" y="580" type="line" name="iv01"/>
       <point x="504" y="709"/>
       <point x="618" y="775"/>
-      <point x="771" y="775" type="curve" name="dv02" smooth="yes"/>
+      <point x="771" y="775" type="curve" smooth="yes" name="dv02"/>
       <point x="1000" y="775"/>
       <point x="1111" y="627"/>
       <point x="1111" y="322" type="curve" smooth="yes"/>
@@ -26,10 +26,10 @@
       <point x="926" y="322" type="line" smooth="yes"/>
       <point x="926" y="523"/>
       <point x="859" y="615"/>
-      <point x="708" y="615" type="curve" name="dv01" smooth="yes"/>
+      <point x="708" y="615" type="curve" smooth="yes" name="dv01"/>
       <point x="533" y="615"/>
       <point x="439" y="490"/>
-      <point x="439" y="261" type="curve" name="sh05" smooth="yes"/>
+      <point x="439" y="261" type="curve" smooth="yes" name="sh05"/>
       <point x="439" y="0" type="line" name="ab01"/>
       <point x="255" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni045C_.glif b/source/Hack-Regular.ufo/glyphs/uni045C_.glif
index 13f87eb12..c659d0baa 100644
--- a/source/Hack-Regular.ufo/glyphs/uni045C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni045C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni045C" format="1">
+<glyph name="uni045C" format="2">
   <advance width="1233"/>
   <unicode hex="045C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni045D_.glif b/source/Hack-Regular.ufo/glyphs/uni045D_.glif
index 70df2c2fe..42d93ad65 100644
--- a/source/Hack-Regular.ufo/glyphs/uni045D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni045D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni045D" format="1">
+<glyph name="uni045D" format="2">
   <advance width="1233"/>
   <unicode hex="045D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni045E_.glif b/source/Hack-Regular.ufo/glyphs/uni045E_.glif
index be877d9b9..2377428dc 100644
--- a/source/Hack-Regular.ufo/glyphs/uni045E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni045E_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni045E" format="1">
+<glyph name="uni045E" format="2">
   <advance width="1233"/>
   <unicode hex="045E"/>
   <outline>
     <contour>
-      <point x="626" y="1270" type="curve" name="sv01" smooth="yes"/>
+      <point x="626" y="1270" type="curve" smooth="yes" name="sv01"/>
       <point x="433" y="1270"/>
       <point x="328" y="1366"/>
       <point x="313" y="1557" type="curve" name="at03"/>
       <point x="432" y="1557" type="line"/>
       <point x="447" y="1461"/>
       <point x="504" y="1407"/>
-      <point x="625" y="1407" type="curve" name="sv02" smooth="yes"/>
+      <point x="625" y="1407" type="curve" smooth="yes" name="sv02"/>
       <point x="740" y="1407"/>
       <point x="802" y="1456"/>
       <point x="821" y="1557" type="curve" name="at04"/>
@@ -39,10 +39,10 @@
       <point x="751" y="52" type="curve" smooth="yes"/>
       <point x="682" y="-132"/>
       <point x="649" y="-217"/>
-      <point x="617" y="-270" type="curve" name="hr01" smooth="yes"/>
+      <point x="617" y="-270" type="curve" smooth="yes" name="hr01"/>
       <point x="558" y="-370"/>
       <point x="475" y="-426"/>
-      <point x="342" y="-426" type="curve" name="hr02" smooth="yes"/>
+      <point x="342" y="-426" type="curve" smooth="yes" name="hr02"/>
       <point x="194" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni045F_.glif b/source/Hack-Regular.ufo/glyphs/uni045F_.glif
index 3d7c9f41e..6e2e11445 100644
--- a/source/Hack-Regular.ufo/glyphs/uni045F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni045F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni045F" format="1">
+<glyph name="uni045F" format="2">
   <advance width="1233"/>
   <unicode hex="045F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0462.glif b/source/Hack-Regular.ufo/glyphs/uni0462.glif
index ca9e9d846..c760c2e37 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0462.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0462.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0462" format="1">
+<glyph name="uni0462" format="2">
   <advance width="1233"/>
   <unicode hex="0462"/>
   <outline>
@@ -15,23 +15,23 @@
       <point x="864" y="1105" type="line" name="sv02"/>
       <point x="495" y="1105" type="line" name="sh02"/>
       <point x="495" y="893" type="line"/>
-      <point x="633" y="893" type="line" name="dv02" smooth="yes"/>
+      <point x="633" y="893" type="line" smooth="yes" name="dv02"/>
       <point x="970" y="893"/>
       <point x="1141" y="742"/>
-      <point x="1141" y="447" type="curve" name="sh04" smooth="yes"/>
+      <point x="1141" y="447" type="curve" smooth="yes" name="sh04"/>
       <point x="1141" y="151"/>
       <point x="968" y="0"/>
-      <point x="633" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="633" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="293" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="633" y="166" type="line" name="sv03" smooth="yes"/>
+      <point x="633" y="166" type="line" smooth="yes" name="sv03"/>
       <point x="822" y="166"/>
       <point x="930" y="267"/>
-      <point x="930" y="446" type="curve" name="ah01" smooth="yes"/>
+      <point x="930" y="446" type="curve" smooth="yes" name="ah01"/>
       <point x="930" y="625"/>
       <point x="821" y="727"/>
-      <point x="633" y="727" type="curve" name="dv01" smooth="yes"/>
+      <point x="633" y="727" type="curve" smooth="yes" name="dv01"/>
       <point x="495" y="727" type="line" name="sh05"/>
       <point x="495" y="166" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0463.glif b/source/Hack-Regular.ufo/glyphs/uni0463.glif
index 2879f5174..67b13e4a9 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0463.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0463.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0463" format="1">
+<glyph name="uni0463" format="2">
   <advance width="1233"/>
   <unicode hex="0463"/>
   <outline>
@@ -15,23 +15,23 @@
       <point x="907" y="973" type="line" name="sv02"/>
       <point x="482" y="973" type="line" name="sh02"/>
       <point x="482" y="667" type="line"/>
-      <point x="738" y="667" type="line" name="dv02" smooth="yes"/>
+      <point x="738" y="667" type="line" smooth="yes" name="dv02"/>
       <point x="1017" y="667"/>
       <point x="1184" y="558"/>
-      <point x="1184" y="331" type="curve" name="sh04" smooth="yes"/>
+      <point x="1184" y="331" type="curve" smooth="yes" name="sh04"/>
       <point x="1184" y="108"/>
       <point x="1023" y="0"/>
-      <point x="738" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="738" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="298" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="730" y="156" type="line" name="sv03" smooth="yes"/>
+      <point x="730" y="156" type="line" smooth="yes" name="sv03"/>
       <point x="895" y="156"/>
       <point x="988" y="213"/>
-      <point x="988" y="333" type="curve" name="ah01" smooth="yes"/>
+      <point x="988" y="333" type="curve" smooth="yes" name="ah01"/>
       <point x="988" y="454"/>
       <point x="893" y="514"/>
-      <point x="730" y="514" type="curve" name="dv01" smooth="yes"/>
+      <point x="730" y="514" type="curve" smooth="yes" name="dv01"/>
       <point x="482" y="514" type="line" name="sh05"/>
       <point x="482" y="156" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0472.glif b/source/Hack-Regular.ufo/glyphs/uni0472.glif
index e216da260..143ea018c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0472.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0472.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0472" format="1">
+<glyph name="uni0472" format="2">
   <advance width="1233"/>
   <unicode hex="0472"/>
   <outline>
     <contour>
-      <point x="615" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="615" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="280" y="-29"/>
       <point x="117" y="221"/>
-      <point x="117" y="744" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="744" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="1267"/>
       <point x="280" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="953" y="1520"/>
       <point x="1116" y="1266"/>
-      <point x="1116" y="745" type="curve" name="sh02" smooth="yes"/>
+      <point x="1116" y="745" type="curve" smooth="yes" name="sh02"/>
       <point x="1116" y="225"/>
       <point x="952" y="-29"/>
     </contour>
@@ -21,13 +21,13 @@
       <point x="904" y="828" type="line" name="ah01"/>
       <point x="893" y="1180"/>
       <point x="820" y="1356"/>
-      <point x="616" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="412" y="1356"/>
       <point x="340" y="1180"/>
       <point x="329" y="828" type="curve" name="sh03"/>
     </contour>
     <contour>
-      <point x="617" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="819" y="135"/>
       <point x="890" y="304"/>
       <point x="903" y="644" type="curve" name="sh04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0473.glif b/source/Hack-Regular.ufo/glyphs/uni0473.glif
index ff7bcdd0d..a70756f5b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0473.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0473.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0473" format="1">
+<glyph name="uni0473" format="2">
   <advance width="1233"/>
   <unicode hex="0473"/>
   <outline>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="305" y="-29"/>
       <point x="137" y="176"/>
-      <point x="137" y="560" type="curve" name="sh01" smooth="yes"/>
+      <point x="137" y="560" type="curve" smooth="yes" name="sh01"/>
       <point x="137" y="749"/>
       <point x="178" y="895"/>
       <point x="260" y="996" type="curve" smooth="yes"/>
       <point x="340" y="1093"/>
       <point x="454" y="1147"/>
-      <point x="615" y="1147" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1147" type="curve" smooth="yes" name="dv03"/>
       <point x="928" y="1147"/>
       <point x="1096" y="940"/>
-      <point x="1096" y="559" type="curve" name="sh02" smooth="yes"/>
+      <point x="1096" y="559" type="curve" smooth="yes" name="sh02"/>
       <point x="1096" y="175"/>
       <point x="929" y="-29"/>
     </contour>
@@ -24,13 +24,13 @@
       <point x="900" y="611" type="line" name="ah01"/>
       <point x="889" y="846"/>
       <point x="804" y="991"/>
-      <point x="616" y="991" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="991" type="curve" smooth="yes" name="dv02"/>
       <point x="429" y="991"/>
       <point x="344" y="846"/>
       <point x="333" y="611" type="curve" name="sh03"/>
     </contour>
     <contour>
-      <point x="616" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="804" y="127"/>
       <point x="876" y="270"/>
       <point x="895" y="447" type="curve" name="sh04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0490.glif b/source/Hack-Regular.ufo/glyphs/uni0490.glif
index 3902e662d..4eb0b5f1e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0490.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0490.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0490" format="1">
+<glyph name="uni0490" format="2">
   <advance width="1233"/>
   <unicode hex="0490"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0491.glif b/source/Hack-Regular.ufo/glyphs/uni0491.glif
index 4848093cd..c4799f893 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0491.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0491.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0491" format="1">
+<glyph name="uni0491" format="2">
   <advance width="1233"/>
   <unicode hex="0491"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0492.glif b/source/Hack-Regular.ufo/glyphs/uni0492.glif
index cc35e05b6..63de97e91 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0492.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0492.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0492" format="1">
+<glyph name="uni0492" format="2">
   <advance width="1233"/>
   <unicode hex="0492"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0493.glif b/source/Hack-Regular.ufo/glyphs/uni0493.glif
index dd6c9537c..afc94b3ed 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0493.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0493.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0493" format="1">
+<glyph name="uni0493" format="2">
   <advance width="1233"/>
   <unicode hex="0493"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0494.glif b/source/Hack-Regular.ufo/glyphs/uni0494.glif
index 83e70fd51..ded6f13e7 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0494.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0494.glif
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0494" format="1">
+<glyph name="uni0494" format="2">
   <advance width="1233"/>
   <unicode hex="0494"/>
   <outline>
     <contour>
       <point x="589" y="-240" type="line" name="dh03"/>
-      <point x="651" y="-240" type="line" name="dv02" smooth="yes"/>
+      <point x="651" y="-240" type="line" smooth="yes" name="dv02"/>
       <point x="830" y="-240"/>
       <point x="896" y="-155"/>
-      <point x="896" y="104" type="curve" name="sh01" smooth="yes"/>
+      <point x="896" y="104" type="curve" smooth="yes" name="sh01"/>
       <point x="896" y="394" type="line" smooth="yes"/>
       <point x="896" y="605"/>
       <point x="813" y="711"/>
-      <point x="648" y="711" type="curve" name="dv03" smooth="yes"/>
+      <point x="648" y="711" type="curve" smooth="yes" name="dv03"/>
       <point x="378" y="711" type="line"/>
       <point x="378" y="0" type="line" name="dh02"/>
       <point x="175" y="0" type="line" name="dh01"/>
@@ -21,17 +21,17 @@
       <point x="1099" y="1323" type="line" name="sv01"/>
       <point x="378" y="1323" type="line" name="sh03"/>
       <point x="378" y="881" type="line"/>
-      <point x="689" y="881" type="line" name="dv04" smooth="yes"/>
+      <point x="689" y="881" type="line" smooth="yes" name="dv04"/>
       <point x="814" y="881"/>
       <point x="914" y="841"/>
       <point x="988" y="762" type="curve" smooth="yes"/>
       <point x="1064" y="681"/>
       <point x="1099" y="570"/>
-      <point x="1099" y="410" type="curve" name="hr01" smooth="yes"/>
-      <point x="1099" y="104" type="line" name="dh04" smooth="yes"/>
+      <point x="1099" y="410" type="curve" smooth="yes" name="hr01"/>
+      <point x="1099" y="104" type="line" smooth="yes" name="dh04"/>
       <point x="1099" y="-253"/>
       <point x="969" y="-410"/>
-      <point x="665" y="-410" type="curve" name="dv01" smooth="yes"/>
+      <point x="665" y="-410" type="curve" smooth="yes" name="dv01"/>
       <point x="589" y="-410" type="line" name="hr02"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0495.glif b/source/Hack-Regular.ufo/glyphs/uni0495.glif
index c87517fd1..bdc16c120 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0495.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0495.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0495" format="1">
+<glyph name="uni0495" format="2">
   <advance width="1233"/>
   <unicode hex="0495"/>
   <outline>
@@ -8,11 +8,11 @@
       <point x="711" y="-270" type="line" smooth="yes"/>
       <point x="858" y="-270"/>
       <point x="892" y="-216"/>
-      <point x="892" y="-20" type="curve" name="ah01" smooth="yes"/>
+      <point x="892" y="-20" type="curve" smooth="yes" name="ah01"/>
       <point x="892" y="244" type="line" smooth="yes"/>
       <point x="892" y="471"/>
       <point x="850" y="487"/>
-      <point x="671" y="487" type="curve" name="dv01" smooth="yes"/>
+      <point x="671" y="487" type="curve" smooth="yes" name="dv01"/>
       <point x="411" y="487" type="line"/>
       <point x="411" y="0" type="line" name="sh02"/>
       <point x="227" y="0" type="line" name="sh01"/>
@@ -21,14 +21,14 @@
       <point x="979" y="936" type="line" name="sv01"/>
       <point x="411" y="936" type="line" name="sh03"/>
       <point x="411" y="631" type="line"/>
-      <point x="661" y="631" type="line" name="dv02" smooth="yes"/>
+      <point x="661" y="631" type="line" smooth="yes" name="dv02"/>
       <point x="1009" y="631"/>
       <point x="1076" y="555"/>
       <point x="1076" y="250" type="curve" smooth="yes"/>
-      <point x="1076" y="-20" type="line" name="sh04" smooth="yes"/>
+      <point x="1076" y="-20" type="line" smooth="yes" name="sh04"/>
       <point x="1076" y="-304"/>
       <point x="972" y="-426"/>
-      <point x="732" y="-426" type="curve" name="ab01" smooth="yes"/>
+      <point x="732" y="-426" type="curve" smooth="yes" name="ab01"/>
       <point x="539" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0496.glif b/source/Hack-Regular.ufo/glyphs/uni0496.glif
index ac2ab5a8b..add9381bc 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0496.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0496.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0496" format="1">
+<glyph name="uni0496" format="2">
   <advance width="1233"/>
   <unicode hex="0496"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0497.glif b/source/Hack-Regular.ufo/glyphs/uni0497.glif
index 090257d80..18f90ff78 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0497.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0497.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0497" format="1">
+<glyph name="uni0497" format="2">
   <advance width="1233"/>
   <unicode hex="0497"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0498.glif b/source/Hack-Regular.ufo/glyphs/uni0498.glif
index 475ffb033..fdf4a520a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0498.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0498.glif
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0498" format="1">
+<glyph name="uni0498" format="2">
   <advance width="1233"/>
   <unicode hex="0498"/>
   <outline>
     <contour>
-      <point x="1079" y="410" type="curve" name="sh01" smooth="yes"/>
+      <point x="1079" y="410" type="curve" smooth="yes" name="sh01"/>
       <point x="1079" y="164"/>
       <point x="922" y="5"/>
       <point x="648" y="-24" type="curve" name="ih01"/>
       <point x="708" y="-96"/>
       <point x="736" y="-153"/>
-      <point x="736" y="-220" type="curve" name="hr01" smooth="yes"/>
+      <point x="736" y="-220" type="curve" smooth="yes" name="hr01"/>
       <point x="736" y="-333"/>
       <point x="656" y="-395"/>
-      <point x="496" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="496" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="439" y="-395"/>
       <point x="381" y="-387"/>
       <point x="322" y="-371" type="curve"/>
       <point x="322" y="-240" type="line" name="dh01"/>
       <point x="363" y="-263"/>
       <point x="420" y="-272"/>
-      <point x="469" y="-272" type="curve" name="dv02" smooth="yes"/>
+      <point x="469" y="-272" type="curve" smooth="yes" name="dv02"/>
       <point x="557" y="-272"/>
       <point x="597" y="-239"/>
-      <point x="597" y="-182" type="curve" name="sh02" smooth="yes"/>
+      <point x="597" y="-182" type="curve" smooth="yes" name="sh02"/>
       <point x="597" y="-145"/>
       <point x="580" y="-102"/>
       <point x="529" y="-29" type="curve" name="dv03"/>
@@ -33,32 +33,32 @@
       <point x="137" y="246" type="line"/>
       <point x="274" y="174"/>
       <point x="404" y="141"/>
-      <point x="532" y="141" type="curve" name="dv04" smooth="yes"/>
+      <point x="532" y="141" type="curve" smooth="yes" name="dv04"/>
       <point x="757" y="141"/>
       <point x="879" y="245"/>
-      <point x="879" y="426" type="curve" name="hr02" smooth="yes"/>
+      <point x="879" y="426" type="curve" smooth="yes" name="hr02"/>
       <point x="879" y="608"/>
       <point x="752" y="715"/>
-      <point x="549" y="715" type="curve" name="dv05" smooth="yes"/>
+      <point x="549" y="715" type="curve" smooth="yes" name="dv05"/>
       <point x="395" y="715" type="line"/>
       <point x="395" y="881" type="line"/>
-      <point x="549" y="881" type="line" name="dv06" smooth="yes"/>
+      <point x="549" y="881" type="line" smooth="yes" name="dv06"/>
       <point x="736" y="881"/>
       <point x="844" y="963"/>
-      <point x="844" y="1118" type="curve" name="dh02" smooth="yes"/>
+      <point x="844" y="1118" type="curve" smooth="yes" name="dh02"/>
       <point x="844" y="1266"/>
       <point x="745" y="1350"/>
-      <point x="557" y="1350" type="curve" name="sv01" smooth="yes"/>
+      <point x="557" y="1350" type="curve" smooth="yes" name="sv01"/>
       <point x="456" y="1350"/>
       <point x="326" y="1326"/>
       <point x="182" y="1270" type="curve" name="hr03"/>
       <point x="182" y="1456" type="line"/>
       <point x="343" y="1499"/>
       <point x="465" y="1520"/>
-      <point x="569" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="569" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="853" y="1520"/>
       <point x="1044" y="1361"/>
-      <point x="1044" y="1122" type="curve" name="dh03" smooth="yes"/>
+      <point x="1044" y="1122" type="curve" smooth="yes" name="dh03"/>
       <point x="1044" y="954"/>
       <point x="952" y="844"/>
       <point x="776" y="799" type="curve" name="ih02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0499.glif b/source/Hack-Regular.ufo/glyphs/uni0499.glif
index 9de242254..3dd72ea93 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0499.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0499.glif
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0499" format="1">
+<glyph name="uni0499" format="2">
   <advance width="1233"/>
   <unicode hex="0499"/>
   <outline>
     <contour>
-      <point x="1064" y="321" type="curve" name="sh01" smooth="yes"/>
+      <point x="1064" y="321" type="curve" smooth="yes" name="sh01"/>
       <point x="1064" y="135"/>
       <point x="913" y="10"/>
       <point x="648" y="-17" type="curve" name="ih01"/>
       <point x="712" y="-93"/>
       <point x="742" y="-152"/>
-      <point x="742" y="-220" type="curve" name="hr01" smooth="yes"/>
+      <point x="742" y="-220" type="curve" smooth="yes" name="hr01"/>
       <point x="742" y="-333"/>
       <point x="662" y="-395"/>
-      <point x="502" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="502" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="445" y="-395"/>
       <point x="387" y="-387"/>
       <point x="328" y="-371" type="curve"/>
       <point x="328" y="-240" type="line" name="dh01"/>
       <point x="369" y="-263"/>
       <point x="426" y="-272"/>
-      <point x="475" y="-272" type="curve" name="dv02" smooth="yes"/>
+      <point x="475" y="-272" type="curve" smooth="yes" name="dv02"/>
       <point x="563" y="-272"/>
       <point x="603" y="-239"/>
-      <point x="603" y="-182" type="curve" name="sh02" smooth="yes"/>
+      <point x="603" y="-182" type="curve" smooth="yes" name="sh02"/>
       <point x="603" y="-143"/>
       <point x="586" y="-99"/>
       <point x="531" y="-22" type="curve" name="ab01"/>
@@ -33,32 +33,32 @@
       <point x="169" y="207" type="line"/>
       <point x="270" y="162"/>
       <point x="394" y="138"/>
-      <point x="526" y="138" type="curve" name="sv01" smooth="yes"/>
+      <point x="526" y="138" type="curve" smooth="yes" name="sv01"/>
       <point x="759" y="138"/>
       <point x="881" y="213"/>
-      <point x="881" y="334" type="curve" name="hr02" smooth="yes"/>
+      <point x="881" y="334" type="curve" smooth="yes" name="hr02"/>
       <point x="881" y="454"/>
       <point x="761" y="532"/>
-      <point x="562" y="532" type="curve" name="dv05" smooth="yes"/>
+      <point x="562" y="532" type="curve" smooth="yes" name="dv05"/>
       <point x="404" y="532" type="line"/>
       <point x="404" y="676" type="line"/>
-      <point x="569" y="676" type="line" name="dv06" smooth="yes"/>
+      <point x="569" y="676" type="line" smooth="yes" name="dv06"/>
       <point x="752" y="676"/>
       <point x="849" y="739"/>
-      <point x="849" y="830" type="curve" name="dh02" smooth="yes"/>
+      <point x="849" y="830" type="curve" smooth="yes" name="dh02"/>
       <point x="849" y="922"/>
       <point x="747" y="984"/>
-      <point x="558" y="984" type="curve" name="dv03" smooth="yes"/>
+      <point x="558" y="984" type="curve" smooth="yes" name="dv03"/>
       <point x="463" y="984"/>
       <point x="350" y="968"/>
       <point x="210" y="932" type="curve" name="hr03"/>
       <point x="210" y="1099" type="line"/>
       <point x="350" y="1131"/>
       <point x="472" y="1147"/>
-      <point x="577" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="577" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="857" y="1147"/>
       <point x="1032" y="1034"/>
-      <point x="1032" y="856" type="curve" name="dh03" smooth="yes"/>
+      <point x="1032" y="856" type="curve" smooth="yes" name="dh03"/>
       <point x="1032" y="728"/>
       <point x="943" y="640"/>
       <point x="783" y="607" type="curve" name="ih02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni049A_.glif b/source/Hack-Regular.ufo/glyphs/uni049A_.glif
index 2284ee7ae..9904a3151 100644
--- a/source/Hack-Regular.ufo/glyphs/uni049A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni049A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni049A" format="1">
+<glyph name="uni049A" format="2">
   <advance width="1233"/>
   <unicode hex="049A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni049B_.glif b/source/Hack-Regular.ufo/glyphs/uni049B_.glif
index c6a5231a9..bf613ad5b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni049B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni049B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni049B" format="1">
+<glyph name="uni049B" format="2">
   <advance width="1233"/>
   <unicode hex="049B"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04A_2.glif b/source/Hack-Regular.ufo/glyphs/uni04A_2.glif
index bfee4511b..e3a188cb7 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04A_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04A_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04A2" format="1">
+<glyph name="uni04A2" format="2">
   <advance width="1233"/>
   <unicode hex="04A2"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04A_3.glif b/source/Hack-Regular.ufo/glyphs/uni04A_3.glif
index 1e262f2a6..592611fe0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04A_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04A_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04A3" format="1">
+<glyph name="uni04A3" format="2">
   <advance width="1233"/>
   <unicode hex="04A3"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04A_4.glif b/source/Hack-Regular.ufo/glyphs/uni04A_4.glif
index b47066396..ecea70a14 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04A_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04A4" format="1">
+<glyph name="uni04A4" format="2">
   <advance width="1233"/>
   <unicode hex="04A4"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04A_5.glif b/source/Hack-Regular.ufo/glyphs/uni04A_5.glif
index e31d761da..25b30d8d3 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04A_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04A_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04A5" format="1">
+<glyph name="uni04A5" format="2">
   <advance width="1233"/>
   <unicode hex="04A5"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04A_A_.glif b/source/Hack-Regular.ufo/glyphs/uni04A_A_.glif
index b24ad6fc1..e3d97c204 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04A_A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04A_A_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04AA" format="1">
+<glyph name="uni04AA" format="2">
   <advance width="1233"/>
   <unicode hex="04AA"/>
   <outline>
     <contour>
-      <point x="740" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="740" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="481" y="1356"/>
       <point x="350" y="1154"/>
-      <point x="350" y="745" type="curve" name="dh02" smooth="yes"/>
+      <point x="350" y="745" type="curve" smooth="yes" name="dh02"/>
       <point x="350" y="338"/>
       <point x="480" y="135"/>
-      <point x="740" y="135" type="curve" name="dv04" smooth="yes"/>
+      <point x="740" y="135" type="curve" smooth="yes" name="dv04"/>
       <point x="861" y="135"/>
       <point x="976" y="179"/>
       <point x="1073" y="260" type="curve"/>
@@ -20,29 +20,29 @@
       <point x="822" y="-25" type="curve" name="ih01"/>
       <point x="882" y="-97"/>
       <point x="909" y="-153"/>
-      <point x="909" y="-220" type="curve" name="dh04" smooth="yes"/>
+      <point x="909" y="-220" type="curve" smooth="yes" name="dh04"/>
       <point x="909" y="-333"/>
       <point x="829" y="-395"/>
-      <point x="669" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="669" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="612" y="-395"/>
       <point x="554" y="-387"/>
       <point x="495" y="-371" type="curve" name="hr01"/>
       <point x="495" y="-240" type="line" name="dh03"/>
       <point x="536" y="-263"/>
       <point x="593" y="-272"/>
-      <point x="642" y="-272" type="curve" name="dv02" smooth="yes"/>
+      <point x="642" y="-272" type="curve" smooth="yes" name="dv02"/>
       <point x="730" y="-272"/>
       <point x="770" y="-239"/>
-      <point x="770" y="-182" type="curve" name="sh01" smooth="yes"/>
+      <point x="770" y="-182" type="curve" smooth="yes" name="sh01"/>
       <point x="770" y="-143"/>
       <point x="753" y="-101"/>
       <point x="702" y="-28" type="curve" name="dv03"/>
       <point x="344" y="-9"/>
       <point x="139" y="273"/>
-      <point x="139" y="743" type="curve" name="dh01" smooth="yes"/>
+      <point x="139" y="743" type="curve" smooth="yes" name="dh01"/>
       <point x="139" y="1233"/>
       <point x="361" y="1520"/>
-      <point x="745" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="745" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="864" y="1520"/>
       <point x="969" y="1494"/>
       <point x="1073" y="1438" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04A_B_.glif b/source/Hack-Regular.ufo/glyphs/uni04A_B_.glif
index f36bae536..93f85cd7c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04A_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04A_B_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04AB" format="1">
+<glyph name="uni04AB" format="2">
   <advance width="1233"/>
   <unicode hex="04AB"/>
   <outline>
     <contour>
-      <point x="723" y="991" type="curve" name="dv03" smooth="yes"/>
+      <point x="723" y="991" type="curve" smooth="yes" name="dv03"/>
       <point x="484" y="991"/>
       <point x="359" y="836"/>
-      <point x="359" y="560" type="curve" name="dh02" smooth="yes"/>
+      <point x="359" y="560" type="curve" smooth="yes" name="dh02"/>
       <point x="359" y="281"/>
       <point x="485" y="127"/>
-      <point x="724" y="127" type="curve" name="dv06" smooth="yes"/>
+      <point x="724" y="127" type="curve" smooth="yes" name="dv06"/>
       <point x="841" y="127"/>
       <point x="943" y="164"/>
       <point x="1031" y="248" type="curve"/>
@@ -20,29 +20,29 @@
       <point x="795" y="-24" type="curve" name="ih01"/>
       <point x="855" y="-96"/>
       <point x="883" y="-153"/>
-      <point x="883" y="-220" type="curve" name="dh04" smooth="yes"/>
+      <point x="883" y="-220" type="curve" smooth="yes" name="dh04"/>
       <point x="883" y="-333"/>
       <point x="803" y="-395"/>
-      <point x="643" y="-395" type="curve" name="dv01" smooth="yes"/>
+      <point x="643" y="-395" type="curve" smooth="yes" name="dv01"/>
       <point x="586" y="-395"/>
       <point x="528" y="-387"/>
       <point x="469" y="-371" type="curve" name="hr01"/>
       <point x="469" y="-240" type="line" name="dh03"/>
       <point x="510" y="-263"/>
       <point x="567" y="-272"/>
-      <point x="616" y="-272" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="-272" type="curve" smooth="yes" name="dv02"/>
       <point x="704" y="-272"/>
       <point x="744" y="-239"/>
-      <point x="744" y="-182" type="curve" name="sh01" smooth="yes"/>
+      <point x="744" y="-182" type="curve" smooth="yes" name="sh01"/>
       <point x="744" y="-145"/>
       <point x="727" y="-103"/>
       <point x="676" y="-28" type="curve" name="dv05"/>
       <point x="360" y="-12"/>
       <point x="165" y="203"/>
-      <point x="165" y="559" type="curve" name="dh01" smooth="yes"/>
+      <point x="165" y="559" type="curve" smooth="yes" name="dh01"/>
       <point x="165" y="927"/>
       <point x="374" y="1147"/>
-      <point x="712" y="1147" type="curve" name="dv04" smooth="yes"/>
+      <point x="712" y="1147" type="curve" smooth="yes" name="dv04"/>
       <point x="824" y="1147"/>
       <point x="920" y="1122"/>
       <point x="1031" y="1061" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04A_C_.glif b/source/Hack-Regular.ufo/glyphs/uni04A_C_.glif
index 084fad34a..684baf33d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04A_C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04A_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04AC" format="1">
+<glyph name="uni04AC" format="2">
   <advance width="1233"/>
   <unicode hex="04AC"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04A_D_.glif b/source/Hack-Regular.ufo/glyphs/uni04A_D_.glif
index 679698419..66da5c8f3 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04A_D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04A_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04AD" format="1">
+<glyph name="uni04AD" format="2">
   <advance width="1233"/>
   <unicode hex="04AD"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04A_E_.glif b/source/Hack-Regular.ufo/glyphs/uni04A_E_.glif
index d6caf6c7b..e6ecd3c47 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04A_E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04A_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04AE" format="1">
+<glyph name="uni04AE" format="2">
   <advance width="1233"/>
   <unicode hex="04AE"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04A_F_.glif b/source/Hack-Regular.ufo/glyphs/uni04A_F_.glif
index b125ea275..0f6043b1b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04A_F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04A_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04AF" format="1">
+<glyph name="uni04AF" format="2">
   <advance width="1233"/>
   <unicode hex="04AF"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04B_0.glif b/source/Hack-Regular.ufo/glyphs/uni04B_0.glif
index 5152dac5f..1b1223a1b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04B_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04B_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04B0" format="1">
+<glyph name="uni04B0" format="2">
   <advance width="1233"/>
   <unicode hex="04B0"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04B_1.glif b/source/Hack-Regular.ufo/glyphs/uni04B_1.glif
index b6ed131c9..3fa530e49 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04B_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04B_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04B1" format="1">
+<glyph name="uni04B1" format="2">
   <advance width="1233"/>
   <unicode hex="04B1"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04B_2.glif b/source/Hack-Regular.ufo/glyphs/uni04B_2.glif
index 0cf7ce229..9bd2f8193 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04B_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04B_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04B2" format="1">
+<glyph name="uni04B2" format="2">
   <advance width="1233"/>
   <unicode hex="04B2"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04B_3.glif b/source/Hack-Regular.ufo/glyphs/uni04B_3.glif
index 700342f45..79ab673dc 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04B_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04B3" format="1">
+<glyph name="uni04B3" format="2">
   <advance width="1233"/>
   <unicode hex="04B3"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04B_A_.glif b/source/Hack-Regular.ufo/glyphs/uni04B_A_.glif
index 6cda60d87..76bb9df59 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04B_A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04B_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04BA" format="1">
+<glyph name="uni04BA" format="2">
   <advance width="1233"/>
   <unicode hex="04BA"/>
   <outline>
@@ -29,7 +29,7 @@
       <point x="912" y="474" type="line" smooth="yes"/>
       <point x="912" y="679"/>
       <point x="843" y="767"/>
-      <point x="686" y="767" type="curve" name="dv01" smooth="yes"/>
+      <point x="686" y="767" type="curve" smooth="yes" name="dv01"/>
       <point x="619" y="767"/>
       <point x="559" y="752"/>
       <point x="500" y="725" type="curve" smooth="yes"/>
@@ -38,7 +38,7 @@
       <point x="432" y="676" type="curve" smooth="yes"/>
       <point x="388" y="623"/>
       <point x="363" y="525"/>
-      <point x="363" y="413" type="curve" name="sh03" smooth="yes"/>
+      <point x="363" y="413" type="curve" smooth="yes" name="sh03"/>
       <point x="363" y="0" type="line" name="ab01"/>
       <point x="160" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04B_B_.glif b/source/Hack-Regular.ufo/glyphs/uni04B_B_.glif
index 5c03f60e8..5b1539240 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04B_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04B_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04BB" format="1">
+<glyph name="uni04BB" format="2">
   <advance width="1233"/>
   <unicode hex="04BB"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="379" y="952" type="line" name="iv01"/>
       <point x="444" y="1081"/>
       <point x="558" y="1147"/>
-      <point x="711" y="1147" type="curve" name="dv02" smooth="yes"/>
+      <point x="711" y="1147" type="curve" smooth="yes" name="dv02"/>
       <point x="940" y="1147"/>
       <point x="1051" y="999"/>
       <point x="1051" y="694" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="866" y="694" type="line" smooth="yes"/>
       <point x="866" y="895"/>
       <point x="799" y="987"/>
-      <point x="648" y="987" type="curve" name="dv01" smooth="yes"/>
+      <point x="648" y="987" type="curve" smooth="yes" name="dv01"/>
       <point x="473" y="987"/>
       <point x="379" y="862"/>
-      <point x="379" y="633" type="curve" name="sh03" smooth="yes"/>
+      <point x="379" y="633" type="curve" smooth="yes" name="sh03"/>
       <point x="379" y="0" type="line" name="ab01"/>
       <point x="195" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04C_0.glif b/source/Hack-Regular.ufo/glyphs/uni04C_0.glif
index 7e92a31c4..94ee7bdb2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04C_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04C_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C0" format="1">
+<glyph name="uni04C0" format="2">
   <advance width="1233"/>
   <unicode hex="04C0"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04C_1.glif b/source/Hack-Regular.ufo/glyphs/uni04C_1.glif
index c3c4f9db4..f83c5d560 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04C_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04C_1.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C1" format="1">
+<glyph name="uni04C1" format="2">
   <advance width="1233"/>
   <unicode hex="04C1"/>
   <outline>
     <contour>
-      <point x="616" y="1609" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1609" type="curve" smooth="yes" name="dv01"/>
       <point x="423" y="1609"/>
       <point x="318" y="1690"/>
       <point x="303" y="1851" type="curve"/>
       <point x="422" y="1851" type="line" name="sv01"/>
       <point x="438" y="1779"/>
       <point x="507" y="1740"/>
-      <point x="616" y="1740" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1740" type="curve" smooth="yes" name="dv02"/>
       <point x="726" y="1740"/>
       <point x="791" y="1777"/>
       <point x="811" y="1851" type="curve" name="sv02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04C_2.glif b/source/Hack-Regular.ufo/glyphs/uni04C_2.glif
index 4aa120c49..d87397ddd 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04C_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04C_2.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C2" format="1">
+<glyph name="uni04C2" format="2">
   <advance width="1233"/>
   <unicode hex="04C2"/>
   <outline>
     <contour>
-      <point x="616" y="1321" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1321" type="curve" smooth="yes" name="dv01"/>
       <point x="423" y="1321"/>
       <point x="318" y="1417"/>
       <point x="303" y="1608" type="curve"/>
       <point x="422" y="1608" type="line" name="sv01"/>
       <point x="437" y="1508"/>
       <point x="501" y="1458"/>
-      <point x="616" y="1458" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1458" type="curve" smooth="yes" name="dv02"/>
       <point x="727" y="1458"/>
       <point x="792" y="1508"/>
       <point x="811" y="1608" type="curve" name="sv02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04C_3.glif b/source/Hack-Regular.ufo/glyphs/uni04C_3.glif
index 693acd0bc..0a79861d2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04C_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04C_3.glif
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C3" format="1">
+<glyph name="uni04C3" format="2">
   <advance width="1233"/>
   <unicode hex="04C3"/>
   <outline>
     <contour>
       <point x="551" y="-240" type="line" name="dh03"/>
-      <point x="613" y="-240" type="line" name="dv02" smooth="yes"/>
+      <point x="613" y="-240" type="line" smooth="yes" name="dv02"/>
       <point x="792" y="-240"/>
       <point x="858" y="-155"/>
-      <point x="858" y="104" type="curve" name="sh01" smooth="yes"/>
+      <point x="858" y="104" type="curve" smooth="yes" name="sh01"/>
       <point x="858" y="394" type="line" smooth="yes"/>
       <point x="858" y="605"/>
       <point x="775" y="711"/>
-      <point x="610" y="711" type="curve" name="dv03" smooth="yes"/>
+      <point x="610" y="711" type="curve" smooth="yes" name="dv03"/>
       <point x="459" y="711" type="line"/>
       <point x="340" y="584" type="line"/>
       <point x="340" y="0" type="line" name="dh02"/>
@@ -26,11 +26,11 @@
       <point x="651" y="881" type="line" smooth="yes"/>
       <point x="894" y="881"/>
       <point x="1061" y="727"/>
-      <point x="1061" y="410" type="curve" name="hr01" smooth="yes"/>
-      <point x="1061" y="104" type="line" name="dh04" smooth="yes"/>
+      <point x="1061" y="410" type="curve" smooth="yes" name="hr01"/>
+      <point x="1061" y="104" type="line" smooth="yes" name="dh04"/>
       <point x="1061" y="-253"/>
       <point x="931" y="-410"/>
-      <point x="627" y="-410" type="curve" name="dv01" smooth="yes"/>
+      <point x="627" y="-410" type="curve" smooth="yes" name="dv01"/>
       <point x="551" y="-410" type="line" name="hr02"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04C_4.glif b/source/Hack-Regular.ufo/glyphs/uni04C_4.glif
index 1073b6705..40517d9ae 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04C_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04C_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C4" format="1">
+<glyph name="uni04C4" format="2">
   <advance width="1233"/>
   <unicode hex="04C4"/>
   <outline>
@@ -8,11 +8,11 @@
       <point x="706" y="-270" type="line" smooth="yes"/>
       <point x="853" y="-270"/>
       <point x="887" y="-216"/>
-      <point x="887" y="-20" type="curve" name="ah01" smooth="yes"/>
+      <point x="887" y="-20" type="curve" smooth="yes" name="ah01"/>
       <point x="887" y="244" type="line" smooth="yes"/>
       <point x="887" y="471"/>
       <point x="845" y="487"/>
-      <point x="666" y="487" type="curve" name="dv01" smooth="yes"/>
+      <point x="666" y="487" type="curve" smooth="yes" name="dv01"/>
       <point x="445" y="487" type="line"/>
       <point x="406" y="449" type="line"/>
       <point x="406" y="0" type="line" name="sh02"/>
@@ -23,14 +23,14 @@
       <point x="889" y="1120" type="line" name="sh05"/>
       <point x="1113" y="1120" type="line"/>
       <point x="598" y="631" type="line" name="ih02"/>
-      <point x="656" y="631" type="line" name="dv02" smooth="yes"/>
+      <point x="656" y="631" type="line" smooth="yes" name="dv02"/>
       <point x="1004" y="631"/>
       <point x="1071" y="555"/>
       <point x="1071" y="250" type="curve" smooth="yes"/>
-      <point x="1071" y="-20" type="line" name="sh04" smooth="yes"/>
+      <point x="1071" y="-20" type="line" smooth="yes" name="sh04"/>
       <point x="1071" y="-304"/>
       <point x="967" y="-426"/>
-      <point x="727" y="-426" type="curve" name="ab01" smooth="yes"/>
+      <point x="727" y="-426" type="curve" smooth="yes" name="ab01"/>
       <point x="534" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04C_7.glif b/source/Hack-Regular.ufo/glyphs/uni04C_7.glif
index 06f844d39..916a3bb0b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04C_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04C_7.glif
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C7" format="1">
+<glyph name="uni04C7" format="2">
   <advance width="1233"/>
   <unicode hex="04C7"/>
   <outline>
     <contour>
       <point x="586" y="-240" type="line" name="dh03"/>
-      <point x="648" y="-240" type="line" name="dv02" smooth="yes"/>
+      <point x="648" y="-240" type="line" smooth="yes" name="dv02"/>
       <point x="827" y="-240"/>
       <point x="893" y="-155"/>
-      <point x="893" y="104" type="curve" name="sh01" smooth="yes"/>
+      <point x="893" y="104" type="curve" smooth="yes" name="sh01"/>
       <point x="893" y="711" type="line" name="dv03"/>
       <point x="340" y="711" type="line" name="hr01"/>
       <point x="340" y="0" type="line" name="dh02"/>
@@ -19,10 +19,10 @@
       <point x="893" y="881" type="line" name="sh03"/>
       <point x="893" y="1493" type="line" name="at02"/>
       <point x="1096" y="1493" type="line"/>
-      <point x="1096" y="104" type="line" name="dh04" smooth="yes"/>
+      <point x="1096" y="104" type="line" smooth="yes" name="dh04"/>
       <point x="1096" y="-256"/>
       <point x="966" y="-410"/>
-      <point x="662" y="-410" type="curve" name="dv01" smooth="yes"/>
+      <point x="662" y="-410" type="curve" smooth="yes" name="dv01"/>
       <point x="586" y="-410" type="line" name="hr02"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04C_8.glif b/source/Hack-Regular.ufo/glyphs/uni04C_8.glif
index 5f1f55d8d..92ab89c07 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04C_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04C_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04C8" format="1">
+<glyph name="uni04C8" format="2">
   <advance width="1233"/>
   <unicode hex="04C8"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="695" y="-270" type="line" smooth="yes"/>
       <point x="842" y="-270"/>
       <point x="876" y="-216"/>
-      <point x="876" y="-20" type="curve" name="ah01" smooth="yes"/>
+      <point x="876" y="-20" type="curve" smooth="yes" name="ah01"/>
       <point x="876" y="505" type="line" name="dv01"/>
       <point x="389" y="505" type="line"/>
       <point x="389" y="0" type="line" name="sh02"/>
@@ -19,10 +19,10 @@
       <point x="876" y="675" type="line" name="sh04"/>
       <point x="876" y="1120" type="line" name="at02"/>
       <point x="1060" y="1120" type="line"/>
-      <point x="1060" y="-20" type="line" name="sh05" smooth="yes"/>
+      <point x="1060" y="-20" type="line" smooth="yes" name="sh05"/>
       <point x="1060" y="-304"/>
       <point x="956" y="-426"/>
-      <point x="716" y="-426" type="curve" name="ab01" smooth="yes"/>
+      <point x="716" y="-426" type="curve" smooth="yes" name="ab01"/>
       <point x="523" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04C_B_.glif b/source/Hack-Regular.ufo/glyphs/uni04C_B_.glif
index 09edac96f..9f08b22ba 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04C_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04C_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04CB" format="1">
+<glyph name="uni04CB" format="2">
   <advance width="1233"/>
   <unicode hex="04CB"/>
   <outline>
@@ -23,13 +23,13 @@
       <point x="214" y="690" type="curve" smooth="yes"/>
       <point x="161" y="762"/>
       <point x="130" y="869"/>
-      <point x="130" y="1030" type="curve" name="dh01" smooth="yes"/>
+      <point x="130" y="1030" type="curve" smooth="yes" name="dh01"/>
       <point x="130" y="1495" type="line" name="at01"/>
       <point x="333" y="1495" type="line"/>
-      <point x="333" y="1056" type="line" name="dh02" smooth="yes"/>
+      <point x="333" y="1056" type="line" smooth="yes" name="dh02"/>
       <point x="333" y="852"/>
       <point x="401" y="763"/>
-      <point x="554" y="763" type="curve" name="dv02" smooth="yes"/>
+      <point x="554" y="763" type="curve" smooth="yes" name="dv02"/>
       <point x="613" y="763"/>
       <point x="685" y="776"/>
       <point x="745" y="804" type="curve" smooth="yes"/>
@@ -38,7 +38,7 @@
       <point x="812" y="854" type="curve" smooth="yes"/>
       <point x="853" y="903"/>
       <point x="882" y="994"/>
-      <point x="882" y="1117" type="curve" name="sh01" smooth="yes"/>
+      <point x="882" y="1117" type="curve" smooth="yes" name="sh01"/>
       <point x="882" y="1495" type="line" name="sh03"/>
       <point x="1085" y="1495" type="line"/>
       <point x="1085" y="0" type="line" name="sh04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04C_C_.glif b/source/Hack-Regular.ufo/glyphs/uni04C_C_.glif
index 8c1305477..3478d8773 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04C_C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04C_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04CC" format="1">
+<glyph name="uni04CC" format="2">
   <advance width="1233"/>
   <unicode hex="04CC"/>
   <outline>
@@ -15,19 +15,19 @@
       <point x="714" y="452" type="curve" smooth="yes"/>
       <point x="657" y="419"/>
       <point x="593" y="402"/>
-      <point x="516" y="402" type="curve" name="dv01" smooth="yes"/>
+      <point x="516" y="402" type="curve" smooth="yes" name="dv01"/>
       <point x="285" y="402"/>
       <point x="175" y="550"/>
-      <point x="175" y="855" type="curve" name="dh01" smooth="yes"/>
+      <point x="175" y="855" type="curve" smooth="yes" name="dh01"/>
       <point x="175" y="1122" type="line" name="at01"/>
       <point x="360" y="1122" type="line"/>
-      <point x="360" y="855" type="line" name="dh02" smooth="yes"/>
+      <point x="360" y="855" type="line" smooth="yes" name="dh02"/>
       <point x="360" y="654"/>
       <point x="427" y="562"/>
-      <point x="578" y="562" type="curve" name="dv02" smooth="yes"/>
+      <point x="578" y="562" type="curve" smooth="yes" name="dv02"/>
       <point x="753" y="562"/>
       <point x="847" y="687"/>
-      <point x="847" y="916" type="curve" name="sh01" smooth="yes"/>
+      <point x="847" y="916" type="curve" smooth="yes" name="sh01"/>
       <point x="847" y="1122" type="line" name="sh03"/>
       <point x="1031" y="1122" type="line"/>
       <point x="1031" y="0" type="line" name="sh04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04C_F_.glif b/source/Hack-Regular.ufo/glyphs/uni04C_F_.glif
index c84fe8060..14a1195f1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04C_F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04C_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04CF" format="1">
+<glyph name="uni04CF" format="2">
   <advance width="1233"/>
   <unicode hex="04CF"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04D_0.glif b/source/Hack-Regular.ufo/glyphs/uni04D_0.glif
index 900fc4229..8c1f572f6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04D_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04D_0.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D0" format="1">
+<glyph name="uni04D0" format="2">
   <advance width="1233"/>
   <unicode hex="04D0"/>
   <outline>
     <contour>
-      <point x="616" y="1609" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1609" type="curve" smooth="yes" name="dv01"/>
       <point x="423" y="1609"/>
       <point x="318" y="1690"/>
       <point x="303" y="1851" type="curve"/>
       <point x="422" y="1851" type="line" name="dv02"/>
       <point x="438" y="1779"/>
       <point x="505" y="1740"/>
-      <point x="618" y="1740" type="curve" name="sv01" smooth="yes"/>
+      <point x="618" y="1740" type="curve" smooth="yes" name="sv01"/>
       <point x="727" y="1740"/>
       <point x="791" y="1777"/>
       <point x="811" y="1851" type="curve" name="sv02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04D_1.glif b/source/Hack-Regular.ufo/glyphs/uni04D_1.glif
index 70032da32..fe0e82308 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04D_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04D_1.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D1" format="1">
+<glyph name="uni04D1" format="2">
   <advance width="1233"/>
   <unicode hex="04D1"/>
   <outline>
     <contour>
-      <point x="616" y="1298" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1298" type="curve" smooth="yes" name="dv03"/>
       <point x="423" y="1298"/>
       <point x="318" y="1394"/>
       <point x="303" y="1585" type="curve"/>
       <point x="422" y="1585" type="line" name="dv04"/>
       <point x="437" y="1489"/>
       <point x="494" y="1435"/>
-      <point x="615" y="1435" type="curve" name="sv01" smooth="yes"/>
+      <point x="615" y="1435" type="curve" smooth="yes" name="sv01"/>
       <point x="730" y="1435"/>
       <point x="792" y="1484"/>
       <point x="811" y="1585" type="curve" name="sv02"/>
@@ -20,13 +20,13 @@
       <point x="810" y="1298"/>
     </contour>
     <contour>
-      <point x="520" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="520" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="404" y="-29"/>
       <point x="312" y="3"/>
       <point x="245" y="68" type="curve" smooth="yes"/>
       <point x="181" y="129"/>
       <point x="143" y="210"/>
-      <point x="143" y="327" type="curve" name="sh01" smooth="yes"/>
+      <point x="143" y="327" type="curve" smooth="yes" name="sh01"/>
       <point x="143" y="450"/>
       <point x="185" y="545"/>
       <point x="269" y="610" type="curve" smooth="yes"/>
@@ -37,10 +37,10 @@
       <point x="884" y="736" type="line" smooth="yes"/>
       <point x="884" y="821"/>
       <point x="861" y="890"/>
-      <point x="816" y="931" type="curve" name="hr01" smooth="yes"/>
+      <point x="816" y="931" type="curve" smooth="yes" name="hr01"/>
       <point x="772" y="971"/>
       <point x="699" y="991"/>
-      <point x="603" y="991" type="curve" name="dv05" smooth="yes"/>
+      <point x="603" y="991" type="curve" smooth="yes" name="dv05"/>
       <point x="540" y="991"/>
       <point x="476" y="982"/>
       <point x="412" y="964" type="curve" smooth="yes"/>
@@ -53,7 +53,7 @@
       <point x="421" y="1128" type="curve" smooth="yes"/>
       <point x="482" y="1141"/>
       <point x="543" y="1147"/>
-      <point x="604" y="1147" type="curve" name="dv06" smooth="yes"/>
+      <point x="604" y="1147" type="curve" smooth="yes" name="dv06"/>
       <point x="699" y="1147"/>
       <point x="774" y="1133"/>
       <point x="841" y="1105" type="curve" smooth="yes"/>
@@ -65,11 +65,11 @@
       <point x="1053" y="860" type="curve" smooth="yes"/>
       <point x="1064" y="811"/>
       <point x="1069" y="738"/>
-      <point x="1069" y="639" type="curve" name="sh03" smooth="yes"/>
+      <point x="1069" y="639" type="curve" smooth="yes" name="sh03"/>
       <point x="1069" y="410" type="line"/>
       <point x="1072" y="333"/>
       <point x="1071" y="277"/>
-      <point x="1078" y="226" type="curve" name="sh04" smooth="yes"/>
+      <point x="1078" y="226" type="curve" smooth="yes" name="sh04"/>
       <point x="1085" y="170"/>
       <point x="1094" y="116"/>
       <point x="1101" y="91" type="curve" smooth="yes"/>
@@ -90,13 +90,13 @@
       <point x="601" y="-29"/>
     </contour>
     <contour>
-      <point x="558" y="125" type="curve" name="dv02" smooth="yes"/>
+      <point x="558" y="125" type="curve" smooth="yes" name="dv02"/>
       <point x="659" y="125"/>
       <point x="738" y="160"/>
       <point x="796" y="231" type="curve" smooth="yes"/>
       <point x="855" y="303"/>
       <point x="884" y="400"/>
-      <point x="884" y="522" type="curve" name="sh05" smooth="yes"/>
+      <point x="884" y="522" type="curve" smooth="yes" name="sh05"/>
       <point x="884" y="563" type="line" name="hr02"/>
       <point x="651" y="563" type="line" smooth="yes"/>
       <point x="544" y="563"/>
@@ -104,10 +104,10 @@
       <point x="409" y="507" type="curve" smooth="yes"/>
       <point x="352" y="468"/>
       <point x="327" y="412"/>
-      <point x="327" y="337" type="curve" name="sh02" smooth="yes"/>
+      <point x="327" y="337" type="curve" smooth="yes" name="sh02"/>
       <point x="327" y="268"/>
       <point x="349" y="217"/>
-      <point x="388" y="181" type="curve" name="hr03" smooth="yes"/>
+      <point x="388" y="181" type="curve" smooth="yes" name="hr03"/>
       <point x="427" y="146"/>
       <point x="481" y="125"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04D_2.glif b/source/Hack-Regular.ufo/glyphs/uni04D_2.glif
index 69a4c7f58..d22cea45e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04D_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04D_2.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D2" format="1">
+<glyph name="uni04D2" format="2">
   <advance width="1233"/>
   <unicode hex="04D2"/>
   <outline>
     <contour>
-      <point x="349" y="1649" type="line" name="hr00" smooth="yes"/>
+      <point x="349" y="1649" type="line" smooth="yes" name="hr00"/>
       <point x="329" y="1649"/>
       <point x="319" y="1659"/>
-      <point x="319" y="1679" type="curve" name="sh01" smooth="yes"/>
+      <point x="319" y="1679" type="curve" smooth="yes" name="sh01"/>
       <point x="319" y="1822" type="line" smooth="yes"/>
       <point x="319" y="1842"/>
       <point x="329" y="1852"/>
-      <point x="349" y="1852" type="curve" name="dv01" smooth="yes"/>
+      <point x="349" y="1852" type="curve" smooth="yes" name="dv01"/>
       <point x="492" y="1852" type="line" smooth="yes"/>
       <point x="512" y="1852"/>
       <point x="522" y="1842"/>
       <point x="522" y="1822" type="curve" smooth="yes"/>
-      <point x="522" y="1679" type="line" name="sh02" smooth="yes"/>
+      <point x="522" y="1679" type="line" smooth="yes" name="sh02"/>
       <point x="522" y="1659"/>
       <point x="512" y="1649"/>
       <point x="492" y="1649" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1649" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1649" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1649"/>
       <point x="711" y="1659"/>
-      <point x="711" y="1679" type="curve" name="ah01" smooth="yes"/>
+      <point x="711" y="1679" type="curve" smooth="yes" name="ah01"/>
       <point x="711" y="1822" type="line" smooth="yes"/>
       <point x="711" y="1842"/>
       <point x="721" y="1852"/>
-      <point x="741" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="741" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="883" y="1852" type="line" smooth="yes"/>
       <point x="903" y="1852"/>
       <point x="913" y="1842"/>
       <point x="913" y="1822" type="curve" smooth="yes"/>
-      <point x="913" y="1679" type="line" name="sh03" smooth="yes"/>
+      <point x="913" y="1679" type="line" smooth="yes" name="sh03"/>
       <point x="913" y="1659"/>
       <point x="903" y="1649"/>
       <point x="883" y="1649" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04D_3.glif b/source/Hack-Regular.ufo/glyphs/uni04D_3.glif
index 59bedfa8e..e6f62fb05 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04D_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04D_3.glif
@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D3" format="1">
+<glyph name="uni04D3" format="2">
   <advance width="1233"/>
   <unicode hex="04D3"/>
   <outline>
     <contour>
-      <point x="349" y="1350" type="line" name="dv03" smooth="yes"/>
+      <point x="349" y="1350" type="line" smooth="yes" name="dv03"/>
       <point x="329" y="1350"/>
       <point x="319" y="1360"/>
-      <point x="319" y="1380" type="curve" name="sh01" smooth="yes"/>
+      <point x="319" y="1380" type="curve" smooth="yes" name="sh01"/>
       <point x="319" y="1522" type="line" smooth="yes"/>
       <point x="319" y="1542"/>
       <point x="329" y="1552"/>
-      <point x="349" y="1552" type="curve" name="dv04" smooth="yes"/>
+      <point x="349" y="1552" type="curve" smooth="yes" name="dv04"/>
       <point x="492" y="1552" type="line" smooth="yes"/>
       <point x="512" y="1552"/>
       <point x="522" y="1542"/>
       <point x="522" y="1522" type="curve" smooth="yes"/>
-      <point x="522" y="1380" type="line" name="sh02" smooth="yes"/>
+      <point x="522" y="1380" type="line" smooth="yes" name="sh02"/>
       <point x="522" y="1360"/>
       <point x="512" y="1350"/>
       <point x="492" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1350" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1350" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1350"/>
       <point x="711" y="1360"/>
-      <point x="711" y="1380" type="curve" name="sh03" smooth="yes"/>
+      <point x="711" y="1380" type="curve" smooth="yes" name="sh03"/>
       <point x="711" y="1522" type="line" smooth="yes"/>
       <point x="711" y="1542"/>
       <point x="721" y="1552"/>
-      <point x="741" y="1552" type="curve" name="sv02" smooth="yes"/>
+      <point x="741" y="1552" type="curve" smooth="yes" name="sv02"/>
       <point x="883" y="1552" type="line" smooth="yes"/>
       <point x="903" y="1552"/>
       <point x="913" y="1542"/>
-      <point x="913" y="1522" type="curve" name="hr01" smooth="yes"/>
-      <point x="913" y="1380" type="line" name="ih01" smooth="yes"/>
+      <point x="913" y="1522" type="curve" smooth="yes" name="hr01"/>
+      <point x="913" y="1380" type="line" smooth="yes" name="ih01"/>
       <point x="913" y="1360"/>
       <point x="903" y="1350"/>
       <point x="883" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="520" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="520" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="404" y="-29"/>
       <point x="312" y="3"/>
       <point x="245" y="68" type="curve" smooth="yes"/>
       <point x="181" y="129"/>
       <point x="143" y="210"/>
-      <point x="143" y="327" type="curve" name="dh01" smooth="yes"/>
+      <point x="143" y="327" type="curve" smooth="yes" name="dh01"/>
       <point x="143" y="450"/>
       <point x="185" y="545"/>
       <point x="269" y="610" type="curve" smooth="yes"/>
@@ -60,7 +60,7 @@
       <point x="816" y="931" type="curve" smooth="yes"/>
       <point x="772" y="971"/>
       <point x="699" y="991"/>
-      <point x="603" y="991" type="curve" name="dv05" smooth="yes"/>
+      <point x="603" y="991" type="curve" smooth="yes" name="dv05"/>
       <point x="540" y="991"/>
       <point x="476" y="982"/>
       <point x="412" y="964" type="curve" smooth="yes"/>
@@ -73,7 +73,7 @@
       <point x="421" y="1128" type="curve" smooth="yes"/>
       <point x="482" y="1141"/>
       <point x="543" y="1147"/>
-      <point x="604" y="1147" type="curve" name="dv06" smooth="yes"/>
+      <point x="604" y="1147" type="curve" smooth="yes" name="dv06"/>
       <point x="699" y="1147"/>
       <point x="774" y="1133"/>
       <point x="841" y="1105" type="curve" smooth="yes"/>
@@ -85,11 +85,11 @@
       <point x="1053" y="860" type="curve" smooth="yes"/>
       <point x="1064" y="811"/>
       <point x="1069" y="738"/>
-      <point x="1069" y="639" type="curve" name="dh04" smooth="yes"/>
+      <point x="1069" y="639" type="curve" smooth="yes" name="dh04"/>
       <point x="1069" y="410" type="line"/>
       <point x="1072" y="333"/>
       <point x="1071" y="277"/>
-      <point x="1078" y="226" type="curve" name="hr02" smooth="yes"/>
+      <point x="1078" y="226" type="curve" smooth="yes" name="hr02"/>
       <point x="1085" y="170"/>
       <point x="1094" y="116"/>
       <point x="1101" y="91" type="curve" smooth="yes"/>
@@ -110,13 +110,13 @@
       <point x="601" y="-29"/>
     </contour>
     <contour>
-      <point x="558" y="125" type="curve" name="dv02" smooth="yes"/>
+      <point x="558" y="125" type="curve" smooth="yes" name="dv02"/>
       <point x="659" y="125"/>
       <point x="738" y="160"/>
       <point x="796" y="231" type="curve" smooth="yes"/>
       <point x="855" y="303"/>
       <point x="884" y="400"/>
-      <point x="884" y="522" type="curve" name="sh05" smooth="yes"/>
+      <point x="884" y="522" type="curve" smooth="yes" name="sh05"/>
       <point x="884" y="563" type="line" name="dv07"/>
       <point x="651" y="563" type="line" smooth="yes"/>
       <point x="544" y="563"/>
@@ -124,7 +124,7 @@
       <point x="409" y="507" type="curve" smooth="yes"/>
       <point x="352" y="468"/>
       <point x="327" y="412"/>
-      <point x="327" y="337" type="curve" name="dh02" smooth="yes"/>
+      <point x="327" y="337" type="curve" smooth="yes" name="dh02"/>
       <point x="327" y="268"/>
       <point x="349" y="217"/>
       <point x="388" y="181" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04D_4.glif b/source/Hack-Regular.ufo/glyphs/uni04D_4.glif
index 0bd32f41d..bdf2afaf3 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04D_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04D_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D4" format="1">
+<glyph name="uni04D4" format="2">
   <advance width="1233"/>
   <unicode hex="04D4"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04D_5.glif b/source/Hack-Regular.ufo/glyphs/uni04D_5.glif
index e64e5e235..bfc467f5c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04D_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04D_5.glif
@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D5" format="1">
+<glyph name="uni04D5" format="2">
   <advance width="1233"/>
   <unicode hex="04D5"/>
   <outline>
     <contour>
-      <point x="357" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="357" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="150" y="-29"/>
       <point x="41" y="91"/>
-      <point x="41" y="303" type="curve" name="dh01" smooth="yes"/>
+      <point x="41" y="303" type="curve" smooth="yes" name="dh01"/>
       <point x="41" y="539"/>
       <point x="176" y="657"/>
-      <point x="432" y="657" type="curve" name="sv01" smooth="yes"/>
+      <point x="432" y="657" type="curve" smooth="yes" name="sv01"/>
       <point x="549" y="657" type="line" name="dh03"/>
       <point x="549" y="745" type="line" smooth="yes"/>
       <point x="549" y="906"/>
       <point x="482" y="993"/>
-      <point x="355" y="993" type="curve" name="dv02" smooth="yes"/>
+      <point x="355" y="993" type="curve" smooth="yes" name="dv02"/>
       <point x="280" y="993"/>
       <point x="190" y="963"/>
       <point x="106" y="911" type="curve" name="ih01"/>
       <point x="106" y="1079" type="line"/>
       <point x="210" y="1126"/>
       <point x="293" y="1147"/>
-      <point x="377" y="1147" type="curve" name="dv03" smooth="yes"/>
+      <point x="377" y="1147" type="curve" smooth="yes" name="dv03"/>
       <point x="495" y="1147"/>
       <point x="578" y="1105"/>
       <point x="627" y="1020" type="curve" name="ih02"/>
       <point x="670" y="1096"/>
       <point x="750" y="1147"/>
-      <point x="887" y="1147" type="curve" name="sv02" smooth="yes"/>
+      <point x="887" y="1147" type="curve" smooth="yes" name="sv02"/>
       <point x="1114" y="1147"/>
       <point x="1200" y="1008"/>
-      <point x="1200" y="604" type="curve" name="dh06" smooth="yes"/>
+      <point x="1200" y="604" type="curve" smooth="yes" name="dh06"/>
       <point x="1200" y="514" type="line" name="dv04"/>
       <point x="709" y="514" type="line" name="sh01"/>
       <point x="708" y="494"/>
       <point x="707" y="470"/>
-      <point x="707" y="441" type="curve" name="dh04" smooth="yes"/>
+      <point x="707" y="441" type="curve" smooth="yes" name="dh04"/>
       <point x="707" y="214"/>
       <point x="766" y="125"/>
-      <point x="924" y="125" type="curve" name="sv03" smooth="yes"/>
+      <point x="924" y="125" type="curve" smooth="yes" name="sv03"/>
       <point x="1024" y="125"/>
       <point x="1113" y="159"/>
       <point x="1178" y="227" type="curve" name="ih03"/>
       <point x="1178" y="55" type="line"/>
       <point x="1103" y="-1"/>
       <point x="1015" y="-29"/>
-      <point x="916" y="-29" type="curve" name="sv04" smooth="yes"/>
+      <point x="916" y="-29" type="curve" smooth="yes" name="sv04"/>
       <point x="771" y="-29"/>
       <point x="670" y="30"/>
       <point x="629" y="131" type="curve" name="ih04"/>
@@ -58,25 +58,25 @@
       <point x="1036" y="709" type="line" smooth="yes"/>
       <point x="1036" y="910"/>
       <point x="988" y="993"/>
-      <point x="872" y="993" type="curve" name="sv05" smooth="yes"/>
+      <point x="872" y="993" type="curve" smooth="yes" name="sv05"/>
       <point x="756" y="993"/>
       <point x="709" y="909"/>
-      <point x="709" y="700" type="curve" name="sh02" smooth="yes"/>
+      <point x="709" y="700" type="curve" smooth="yes" name="sh02"/>
       <point x="709" y="657" type="line"/>
     </contour>
     <contour>
-      <point x="375" y="125" type="curve" name="dv01" smooth="yes"/>
+      <point x="375" y="125" type="curve" smooth="yes" name="dv01"/>
       <point x="438" y="125"/>
       <point x="481" y="147"/>
       <point x="506" y="192" type="curve" smooth="yes"/>
       <point x="529" y="235"/>
       <point x="543" y="306"/>
-      <point x="543" y="442" type="curve" name="sh03" smooth="yes"/>
+      <point x="543" y="442" type="curve" smooth="yes" name="sh03"/>
       <point x="543" y="514" type="line" name="sv06"/>
       <point x="494" y="514" type="line" smooth="yes"/>
       <point x="275" y="514"/>
       <point x="205" y="461"/>
-      <point x="205" y="320" type="curve" name="dh02" smooth="yes"/>
+      <point x="205" y="320" type="curve" smooth="yes" name="dh02"/>
       <point x="205" y="187"/>
       <point x="266" y="125"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04D_6.glif b/source/Hack-Regular.ufo/glyphs/uni04D_6.glif
index 4a50e1a10..22a77ab8f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04D_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04D_6.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D6" format="1">
+<glyph name="uni04D6" format="2">
   <advance width="1233"/>
   <unicode hex="04D6"/>
   <outline>
     <contour>
-      <point x="634" y="1609" type="curve" name="dv01" smooth="yes"/>
+      <point x="634" y="1609" type="curve" smooth="yes" name="dv01"/>
       <point x="441" y="1609"/>
       <point x="336" y="1690"/>
       <point x="321" y="1851" type="curve"/>
       <point x="440" y="1851" type="line" name="sv01"/>
       <point x="456" y="1779"/>
       <point x="523" y="1740"/>
-      <point x="636" y="1740" type="curve" name="dv02" smooth="yes"/>
+      <point x="636" y="1740" type="curve" smooth="yes" name="dv02"/>
       <point x="745" y="1740"/>
       <point x="809" y="1777"/>
       <point x="829" y="1851" type="curve" name="sv02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04D_7.glif b/source/Hack-Regular.ufo/glyphs/uni04D_7.glif
index 7b5abbbc9..89956e058 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04D_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04D_7.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D7" format="1">
+<glyph name="uni04D7" format="2">
   <advance width="1233"/>
   <unicode hex="04D7"/>
   <outline>
     <contour>
-      <point x="631" y="1298" type="curve" name="dv03" smooth="yes"/>
+      <point x="631" y="1298" type="curve" smooth="yes" name="dv03"/>
       <point x="438" y="1298"/>
       <point x="333" y="1394"/>
       <point x="318" y="1585" type="curve" name="sh03"/>
       <point x="437" y="1585" type="line" name="sv01"/>
       <point x="452" y="1489"/>
       <point x="509" y="1435"/>
-      <point x="630" y="1435" type="curve" name="dv04" smooth="yes"/>
+      <point x="630" y="1435" type="curve" smooth="yes" name="dv04"/>
       <point x="745" y="1435"/>
       <point x="807" y="1484"/>
       <point x="826" y="1585" type="curve" name="sv02"/>
@@ -20,22 +20,22 @@
       <point x="825" y="1298"/>
     </contour>
     <contour>
-      <point x="677" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="677" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="330" y="-29"/>
       <point x="124" y="195"/>
-      <point x="124" y="555" type="curve" name="sh01" smooth="yes"/>
+      <point x="124" y="555" type="curve" smooth="yes" name="sh01"/>
       <point x="124" y="916"/>
       <point x="333" y="1147"/>
-      <point x="645" y="1147" type="curve" name="dv05" smooth="yes"/>
+      <point x="645" y="1147" type="curve" smooth="yes" name="dv05"/>
       <point x="941" y="1147"/>
       <point x="1113" y="941"/>
-      <point x="1113" y="606" type="curve" name="sh04" smooth="yes"/>
+      <point x="1113" y="606" type="curve" smooth="yes" name="sh04"/>
       <point x="1113" y="516" type="line"/>
       <point x="316" y="516" type="line" name="sh02"/>
       <point x="316" y="510" type="line" smooth="yes"/>
       <point x="316" y="266"/>
       <point x="450" y="127"/>
-      <point x="680" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="680" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="800" y="127"/>
       <point x="925" y="164"/>
       <point x="1070" y="240" type="curve" name="ih01"/>
@@ -47,7 +47,7 @@
       <point x="929" y="660" type="line" name="ah01"/>
       <point x="925" y="869"/>
       <point x="828" y="991"/>
-      <point x="647" y="991" type="curve" name="hr01" smooth="yes"/>
+      <point x="647" y="991" type="curve" smooth="yes" name="hr01"/>
       <point x="466" y="991"/>
       <point x="346" y="871"/>
       <point x="323" y="659" type="curve" name="hr02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04D_8.glif b/source/Hack-Regular.ufo/glyphs/uni04D_8.glif
index 1fb748878..b7029f9e0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04D_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04D_8.glif
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D8" format="1">
+<glyph name="uni04D8" format="2">
   <advance width="1233"/>
   <unicode hex="04D8"/>
   <outline>
     <contour>
-      <point x="615" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="615" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="279" y="-29"/>
       <point x="117" y="222"/>
-      <point x="117" y="745" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="745" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="828" type="line"/>
       <point x="904" y="828" type="line" name="ah01"/>
       <point x="904" y="836" type="line" smooth="yes"/>
       <point x="904" y="1158"/>
       <point x="820" y="1356"/>
-      <point x="607" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="607" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="506" y="1356"/>
       <point x="381" y="1310"/>
       <point x="286" y="1231" type="curve" name="ih01"/>
       <point x="286" y="1438" type="line"/>
       <point x="390" y="1494"/>
       <point x="500" y="1520"/>
-      <point x="611" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="611" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="952" y="1520"/>
       <point x="1116" y="1269"/>
-      <point x="1116" y="746" type="curve" name="sh03" smooth="yes"/>
+      <point x="1116" y="746" type="curve" smooth="yes" name="sh03"/>
       <point x="1116" y="225"/>
       <point x="954" y="-29"/>
     </contour>
     <contour>
-      <point x="621" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="621" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="817" y="135"/>
       <point x="890" y="305"/>
       <point x="903" y="644" type="curve" name="sh04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04D_9.glif b/source/Hack-Regular.ufo/glyphs/uni04D_9.glif
index a9d869b65..ddf523d83 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04D_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04D_9.glif
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04D9" format="1">
+<glyph name="uni04D9" format="2">
   <advance width="1233"/>
   <unicode hex="04D9"/>
   <outline>
     <contour>
-      <point x="610" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="610" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="314" y="-29"/>
       <point x="142" y="177"/>
-      <point x="142" y="512" type="curve" name="sh01" smooth="yes"/>
+      <point x="142" y="512" type="curve" smooth="yes" name="sh01"/>
       <point x="142" y="602" type="line"/>
       <point x="939" y="602" type="line" name="ah01"/>
       <point x="939" y="608" type="line" smooth="yes"/>
       <point x="939" y="852"/>
       <point x="805" y="991"/>
-      <point x="575" y="991" type="curve" name="dv02" smooth="yes"/>
+      <point x="575" y="991" type="curve" smooth="yes" name="dv02"/>
       <point x="455" y="991"/>
       <point x="330" y="954"/>
       <point x="185" y="878" type="curve" name="ih01"/>
       <point x="185" y="1061" type="line"/>
       <point x="326" y="1118"/>
       <point x="453" y="1147"/>
-      <point x="578" y="1147" type="curve" name="dv03" smooth="yes"/>
+      <point x="578" y="1147" type="curve" smooth="yes" name="dv03"/>
       <point x="924" y="1147"/>
       <point x="1131" y="923"/>
-      <point x="1131" y="563" type="curve" name="sh03" smooth="yes"/>
+      <point x="1131" y="563" type="curve" smooth="yes" name="sh03"/>
       <point x="1131" y="202"/>
       <point x="922" y="-29"/>
     </contour>
     <contour>
-      <point x="608" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="608" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="789" y="127"/>
       <point x="909" y="247"/>
       <point x="932" y="459" type="curve" name="sh04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04D_A_.glif b/source/Hack-Regular.ufo/glyphs/uni04D_A_.glif
index 0bf5da9ca..ef70e74cd 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04D_A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04D_A_.glif
@@ -1,70 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04DA" format="1">
+<glyph name="uni04DA" format="2">
   <advance width="1233"/>
   <unicode hex="04DA"/>
   <outline>
     <contour>
-      <point x="349" y="1649" type="line" name="dv02" smooth="yes"/>
+      <point x="349" y="1649" type="line" smooth="yes" name="dv02"/>
       <point x="329" y="1649"/>
       <point x="319" y="1659"/>
-      <point x="319" y="1679" type="curve" name="sh01" smooth="yes"/>
+      <point x="319" y="1679" type="curve" smooth="yes" name="sh01"/>
       <point x="319" y="1822" type="line" smooth="yes"/>
       <point x="319" y="1842"/>
       <point x="329" y="1852"/>
-      <point x="349" y="1852" type="curve" name="dv03" smooth="yes"/>
+      <point x="349" y="1852" type="curve" smooth="yes" name="dv03"/>
       <point x="492" y="1852" type="line" smooth="yes"/>
       <point x="512" y="1852"/>
       <point x="522" y="1842"/>
       <point x="522" y="1822" type="curve" smooth="yes"/>
-      <point x="522" y="1679" type="line" name="sh02" smooth="yes"/>
+      <point x="522" y="1679" type="line" smooth="yes" name="sh02"/>
       <point x="522" y="1659"/>
       <point x="512" y="1649"/>
       <point x="492" y="1649" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1649" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1649" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1649"/>
       <point x="711" y="1659"/>
-      <point x="711" y="1679" type="curve" name="dh03" smooth="yes"/>
+      <point x="711" y="1679" type="curve" smooth="yes" name="dh03"/>
       <point x="711" y="1822" type="line" smooth="yes"/>
       <point x="711" y="1842"/>
       <point x="721" y="1852"/>
-      <point x="741" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="741" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="883" y="1852" type="line" smooth="yes"/>
       <point x="903" y="1852"/>
       <point x="913" y="1842"/>
       <point x="913" y="1822" type="curve" smooth="yes"/>
-      <point x="913" y="1679" type="line" name="dh04" smooth="yes"/>
+      <point x="913" y="1679" type="line" smooth="yes" name="dh04"/>
       <point x="913" y="1659"/>
       <point x="903" y="1649"/>
       <point x="883" y="1649" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="615" y="-29" type="curve" name="hr01" smooth="yes"/>
+      <point x="615" y="-29" type="curve" smooth="yes" name="hr01"/>
       <point x="279" y="-29"/>
       <point x="117" y="222"/>
-      <point x="117" y="745" type="curve" name="dh01" smooth="yes"/>
+      <point x="117" y="745" type="curve" smooth="yes" name="dh01"/>
       <point x="117" y="828" type="line"/>
       <point x="904" y="828" type="line" name="sh03"/>
       <point x="904" y="836" type="line" smooth="yes"/>
       <point x="904" y="1158"/>
       <point x="820" y="1356"/>
-      <point x="607" y="1356" type="curve" name="sv03" smooth="yes"/>
+      <point x="607" y="1356" type="curve" smooth="yes" name="sv03"/>
       <point x="506" y="1356"/>
       <point x="381" y="1310"/>
       <point x="286" y="1231" type="curve" name="ih01"/>
       <point x="286" y="1438" type="line"/>
       <point x="390" y="1494"/>
       <point x="500" y="1520"/>
-      <point x="611" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="611" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="952" y="1520"/>
       <point x="1116" y="1269"/>
-      <point x="1116" y="746" type="curve" name="sh04" smooth="yes"/>
+      <point x="1116" y="746" type="curve" smooth="yes" name="sh04"/>
       <point x="1116" y="225"/>
       <point x="954" y="-29"/>
     </contour>
     <contour>
-      <point x="621" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="621" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="817" y="135"/>
       <point x="890" y="305"/>
       <point x="903" y="644" type="curve" name="sh05"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04D_B_.glif b/source/Hack-Regular.ufo/glyphs/uni04D_B_.glif
index eff0469a7..72c044c86 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04D_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04D_B_.glif
@@ -1,70 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04DB" format="1">
+<glyph name="uni04DB" format="2">
   <advance width="1233"/>
   <unicode hex="04DB"/>
   <outline>
     <contour>
-      <point x="369" y="1350" type="line" name="hr00" smooth="yes"/>
+      <point x="369" y="1350" type="line" smooth="yes" name="hr00"/>
       <point x="349" y="1350"/>
       <point x="339" y="1360"/>
-      <point x="339" y="1380" type="curve" name="sh01" smooth="yes"/>
+      <point x="339" y="1380" type="curve" smooth="yes" name="sh01"/>
       <point x="339" y="1522" type="line" smooth="yes"/>
       <point x="339" y="1542"/>
       <point x="349" y="1552"/>
-      <point x="369" y="1552" type="curve" name="dv03" smooth="yes"/>
+      <point x="369" y="1552" type="curve" smooth="yes" name="dv03"/>
       <point x="512" y="1552" type="line" smooth="yes"/>
       <point x="532" y="1552"/>
       <point x="542" y="1542"/>
       <point x="542" y="1522" type="curve" smooth="yes"/>
-      <point x="542" y="1380" type="line" name="sh02" smooth="yes"/>
+      <point x="542" y="1380" type="line" smooth="yes" name="sh02"/>
       <point x="542" y="1360"/>
       <point x="532" y="1350"/>
       <point x="512" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="761" y="1350" type="line" name="sv01" smooth="yes"/>
+      <point x="761" y="1350" type="line" smooth="yes" name="sv01"/>
       <point x="741" y="1350"/>
       <point x="731" y="1360"/>
-      <point x="731" y="1380" type="curve" name="dh03" smooth="yes"/>
+      <point x="731" y="1380" type="curve" smooth="yes" name="dh03"/>
       <point x="731" y="1522" type="line" smooth="yes"/>
       <point x="731" y="1542"/>
       <point x="741" y="1552"/>
-      <point x="761" y="1552" type="curve" name="sv02" smooth="yes"/>
+      <point x="761" y="1552" type="curve" smooth="yes" name="sv02"/>
       <point x="903" y="1552" type="line" smooth="yes"/>
       <point x="923" y="1552"/>
       <point x="933" y="1542"/>
       <point x="933" y="1522" type="curve" smooth="yes"/>
-      <point x="933" y="1380" type="line" name="dh04" smooth="yes"/>
+      <point x="933" y="1380" type="line" smooth="yes" name="dh04"/>
       <point x="933" y="1360"/>
       <point x="923" y="1350"/>
       <point x="903" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="610" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="610" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="314" y="-29"/>
       <point x="142" y="177"/>
-      <point x="142" y="512" type="curve" name="dh01" smooth="yes"/>
+      <point x="142" y="512" type="curve" smooth="yes" name="dh01"/>
       <point x="142" y="602" type="line"/>
       <point x="939" y="602" type="line" name="sh03"/>
       <point x="939" y="608" type="line" smooth="yes"/>
       <point x="939" y="852"/>
       <point x="805" y="991"/>
-      <point x="575" y="991" type="curve" name="dv04" smooth="yes"/>
+      <point x="575" y="991" type="curve" smooth="yes" name="dv04"/>
       <point x="455" y="991"/>
       <point x="330" y="954"/>
       <point x="185" y="878" type="curve" name="ih01"/>
       <point x="185" y="1061" type="line"/>
       <point x="326" y="1118"/>
       <point x="453" y="1147"/>
-      <point x="578" y="1147" type="curve" name="dv05" smooth="yes"/>
+      <point x="578" y="1147" type="curve" smooth="yes" name="dv05"/>
       <point x="924" y="1147"/>
       <point x="1131" y="923"/>
-      <point x="1131" y="563" type="curve" name="sh04" smooth="yes"/>
+      <point x="1131" y="563" type="curve" smooth="yes" name="sh04"/>
       <point x="1131" y="202"/>
       <point x="922" y="-29"/>
     </contour>
     <contour>
-      <point x="608" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="608" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="789" y="127"/>
       <point x="909" y="247"/>
       <point x="932" y="459" type="curve" name="sh05"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04D_C_.glif b/source/Hack-Regular.ufo/glyphs/uni04D_C_.glif
index aead3c933..13a012eeb 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04D_C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04D_C_.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04DC" format="1">
+<glyph name="uni04DC" format="2">
   <advance width="1233"/>
   <unicode hex="04DC"/>
   <outline>
     <contour>
-      <point x="349" y="1649" type="line" name="hr00" smooth="yes"/>
+      <point x="349" y="1649" type="line" smooth="yes" name="hr00"/>
       <point x="329" y="1649"/>
       <point x="319" y="1659"/>
-      <point x="319" y="1679" type="curve" name="dh01" smooth="yes"/>
+      <point x="319" y="1679" type="curve" smooth="yes" name="dh01"/>
       <point x="319" y="1822" type="line" smooth="yes"/>
       <point x="319" y="1842"/>
       <point x="329" y="1852"/>
-      <point x="349" y="1852" type="curve" name="dv01" smooth="yes"/>
+      <point x="349" y="1852" type="curve" smooth="yes" name="dv01"/>
       <point x="492" y="1852" type="line" smooth="yes"/>
       <point x="512" y="1852"/>
       <point x="522" y="1842"/>
       <point x="522" y="1822" type="curve" smooth="yes"/>
-      <point x="522" y="1679" type="line" name="dh02" smooth="yes"/>
+      <point x="522" y="1679" type="line" smooth="yes" name="dh02"/>
       <point x="522" y="1659"/>
       <point x="512" y="1649"/>
       <point x="492" y="1649" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1649" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1649" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1649"/>
       <point x="711" y="1659"/>
-      <point x="711" y="1679" type="curve" name="sh02" smooth="yes"/>
+      <point x="711" y="1679" type="curve" smooth="yes" name="sh02"/>
       <point x="711" y="1822" type="line" smooth="yes"/>
       <point x="711" y="1842"/>
       <point x="721" y="1852"/>
-      <point x="741" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="741" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="883" y="1852" type="line" smooth="yes"/>
       <point x="903" y="1852"/>
       <point x="913" y="1842"/>
       <point x="913" y="1822" type="curve" smooth="yes"/>
-      <point x="913" y="1679" type="line" name="sh03" smooth="yes"/>
+      <point x="913" y="1679" type="line" smooth="yes" name="sh03"/>
       <point x="913" y="1659"/>
       <point x="903" y="1649"/>
       <point x="883" y="1649" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04D_D_.glif b/source/Hack-Regular.ufo/glyphs/uni04D_D_.glif
index eadc3dd89..8ada9cf4f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04D_D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04D_D_.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04DD" format="1">
+<glyph name="uni04DD" format="2">
   <advance width="1233"/>
   <unicode hex="04DD"/>
   <outline>
     <contour>
-      <point x="349" y="1321" type="line" name="hr00" smooth="yes"/>
+      <point x="349" y="1321" type="line" smooth="yes" name="hr00"/>
       <point x="329" y="1321"/>
       <point x="319" y="1331"/>
-      <point x="319" y="1351" type="curve" name="dh01" smooth="yes"/>
+      <point x="319" y="1351" type="curve" smooth="yes" name="dh01"/>
       <point x="319" y="1493" type="line" smooth="yes"/>
       <point x="319" y="1513"/>
       <point x="329" y="1523"/>
-      <point x="349" y="1523" type="curve" name="dv01" smooth="yes"/>
+      <point x="349" y="1523" type="curve" smooth="yes" name="dv01"/>
       <point x="492" y="1523" type="line" smooth="yes"/>
       <point x="512" y="1523"/>
       <point x="522" y="1513"/>
       <point x="522" y="1493" type="curve" smooth="yes"/>
-      <point x="522" y="1351" type="line" name="dh02" smooth="yes"/>
+      <point x="522" y="1351" type="line" smooth="yes" name="dh02"/>
       <point x="522" y="1331"/>
       <point x="512" y="1321"/>
       <point x="492" y="1321" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1321" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1321" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1321"/>
       <point x="711" y="1331"/>
-      <point x="711" y="1351" type="curve" name="sh02" smooth="yes"/>
+      <point x="711" y="1351" type="curve" smooth="yes" name="sh02"/>
       <point x="711" y="1493" type="line" smooth="yes"/>
       <point x="711" y="1513"/>
       <point x="721" y="1523"/>
-      <point x="741" y="1523" type="curve" name="sv02" smooth="yes"/>
+      <point x="741" y="1523" type="curve" smooth="yes" name="sv02"/>
       <point x="883" y="1523" type="line" smooth="yes"/>
       <point x="903" y="1523"/>
       <point x="913" y="1513"/>
       <point x="913" y="1493" type="curve" smooth="yes"/>
-      <point x="913" y="1351" type="line" name="sh03" smooth="yes"/>
+      <point x="913" y="1351" type="line" smooth="yes" name="sh03"/>
       <point x="913" y="1331"/>
       <point x="903" y="1321"/>
       <point x="883" y="1321" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04D_E_.glif b/source/Hack-Regular.ufo/glyphs/uni04D_E_.glif
index 9a631e81c..05fbdfb2f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04D_E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04D_E_.glif
@@ -1,84 +1,84 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04DE" format="1">
+<glyph name="uni04DE" format="2">
   <advance width="1233"/>
   <unicode hex="04DE"/>
   <outline>
     <contour>
-      <point x="332" y="1649" type="line" name="dv02" smooth="yes"/>
+      <point x="332" y="1649" type="line" smooth="yes" name="dv02"/>
       <point x="312" y="1649"/>
       <point x="302" y="1659"/>
-      <point x="302" y="1679" type="curve" name="dh01" smooth="yes"/>
+      <point x="302" y="1679" type="curve" smooth="yes" name="dh01"/>
       <point x="302" y="1822" type="line" smooth="yes"/>
       <point x="302" y="1842"/>
       <point x="312" y="1852"/>
-      <point x="332" y="1852" type="curve" name="hr01" smooth="yes"/>
+      <point x="332" y="1852" type="curve" smooth="yes" name="hr01"/>
       <point x="475" y="1852" type="line" smooth="yes"/>
       <point x="495" y="1852"/>
       <point x="505" y="1842"/>
       <point x="505" y="1822" type="curve" smooth="yes"/>
-      <point x="505" y="1679" type="line" name="dh02" smooth="yes"/>
+      <point x="505" y="1679" type="line" smooth="yes" name="dh02"/>
       <point x="505" y="1659"/>
       <point x="495" y="1649"/>
       <point x="475" y="1649" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="724" y="1649" type="line" name="sv01" smooth="yes"/>
+      <point x="724" y="1649" type="line" smooth="yes" name="sv01"/>
       <point x="704" y="1649"/>
       <point x="694" y="1659"/>
-      <point x="694" y="1679" type="curve" name="dh03" smooth="yes"/>
+      <point x="694" y="1679" type="curve" smooth="yes" name="dh03"/>
       <point x="694" y="1822" type="line" smooth="yes"/>
       <point x="694" y="1842"/>
       <point x="704" y="1852"/>
-      <point x="724" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="724" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="866" y="1852" type="line" smooth="yes"/>
       <point x="886" y="1852"/>
       <point x="896" y="1842"/>
-      <point x="896" y="1822" type="curve" name="hr02" smooth="yes"/>
-      <point x="896" y="1679" type="line" name="dh04" smooth="yes"/>
+      <point x="896" y="1822" type="curve" smooth="yes" name="hr02"/>
+      <point x="896" y="1679" type="line" smooth="yes" name="dh04"/>
       <point x="896" y="1659"/>
       <point x="886" y="1649"/>
       <point x="866" y="1649" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="553" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="553" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="421" y="-29"/>
       <point x="274" y="-3"/>
       <point x="137" y="45" type="curve"/>
       <point x="137" y="246" type="line"/>
       <point x="274" y="174"/>
       <point x="404" y="141"/>
-      <point x="532" y="141" type="curve" name="hr03" smooth="yes"/>
+      <point x="532" y="141" type="curve" smooth="yes" name="hr03"/>
       <point x="757" y="141"/>
       <point x="879" y="245"/>
-      <point x="879" y="426" type="curve" name="sh02" smooth="yes"/>
+      <point x="879" y="426" type="curve" smooth="yes" name="sh02"/>
       <point x="879" y="608"/>
       <point x="752" y="715"/>
-      <point x="549" y="715" type="curve" name="dv03" smooth="yes"/>
+      <point x="549" y="715" type="curve" smooth="yes" name="dv03"/>
       <point x="395" y="715" type="line"/>
       <point x="395" y="881" type="line"/>
-      <point x="549" y="881" type="line" name="dv04" smooth="yes"/>
+      <point x="549" y="881" type="line" smooth="yes" name="dv04"/>
       <point x="736" y="881"/>
       <point x="844" y="963"/>
-      <point x="844" y="1118" type="curve" name="ih01" smooth="yes"/>
+      <point x="844" y="1118" type="curve" smooth="yes" name="ih01"/>
       <point x="844" y="1266"/>
       <point x="745" y="1350"/>
-      <point x="557" y="1350" type="curve" name="sv03" smooth="yes"/>
+      <point x="557" y="1350" type="curve" smooth="yes" name="sv03"/>
       <point x="456" y="1350"/>
       <point x="326" y="1326"/>
       <point x="182" y="1270" type="curve"/>
       <point x="182" y="1456" type="line"/>
       <point x="343" y="1499"/>
       <point x="465" y="1520"/>
-      <point x="569" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="569" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="853" y="1520"/>
       <point x="1044" y="1361"/>
-      <point x="1044" y="1122" type="curve" name="sh01" smooth="yes"/>
+      <point x="1044" y="1122" type="curve" smooth="yes" name="sh01"/>
       <point x="1044" y="954"/>
       <point x="952" y="844"/>
       <point x="776" y="799" type="curve" name="ih02"/>
       <point x="973" y="747"/>
       <point x="1079" y="613"/>
-      <point x="1079" y="410" type="curve" name="sh03" smooth="yes"/>
+      <point x="1079" y="410" type="curve" smooth="yes" name="sh03"/>
       <point x="1079" y="137"/>
       <point x="885" y="-29"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04D_F_.glif b/source/Hack-Regular.ufo/glyphs/uni04D_F_.glif
index 64ddc5368..074185ee0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04D_F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04D_F_.glif
@@ -1,84 +1,84 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04DF" format="1">
+<glyph name="uni04DF" format="2">
   <advance width="1233"/>
   <unicode hex="04DF"/>
   <outline>
     <contour>
-      <point x="334" y="1350" type="line" name="dv01" smooth="yes"/>
+      <point x="334" y="1350" type="line" smooth="yes" name="dv01"/>
       <point x="314" y="1350"/>
       <point x="304" y="1360"/>
-      <point x="304" y="1380" type="curve" name="dh01" smooth="yes"/>
+      <point x="304" y="1380" type="curve" smooth="yes" name="dh01"/>
       <point x="304" y="1522" type="line" smooth="yes"/>
       <point x="304" y="1542"/>
       <point x="314" y="1552"/>
-      <point x="334" y="1552" type="curve" name="hr01" smooth="yes"/>
+      <point x="334" y="1552" type="curve" smooth="yes" name="hr01"/>
       <point x="477" y="1552" type="line" smooth="yes"/>
       <point x="497" y="1552"/>
       <point x="507" y="1542"/>
       <point x="507" y="1522" type="curve" smooth="yes"/>
-      <point x="507" y="1380" type="line" name="dh02" smooth="yes"/>
+      <point x="507" y="1380" type="line" smooth="yes" name="dh02"/>
       <point x="507" y="1360"/>
       <point x="497" y="1350"/>
       <point x="477" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="726" y="1350" type="line" name="sv01" smooth="yes"/>
+      <point x="726" y="1350" type="line" smooth="yes" name="sv01"/>
       <point x="706" y="1350"/>
       <point x="696" y="1360"/>
-      <point x="696" y="1380" type="curve" name="dh03" smooth="yes"/>
+      <point x="696" y="1380" type="curve" smooth="yes" name="dh03"/>
       <point x="696" y="1522" type="line" smooth="yes"/>
       <point x="696" y="1542"/>
       <point x="706" y="1552"/>
-      <point x="726" y="1552" type="curve" name="sv02" smooth="yes"/>
+      <point x="726" y="1552" type="curve" smooth="yes" name="sv02"/>
       <point x="868" y="1552" type="line" smooth="yes"/>
       <point x="888" y="1552"/>
       <point x="898" y="1542"/>
-      <point x="898" y="1522" type="curve" name="hr02" smooth="yes"/>
-      <point x="898" y="1380" type="line" name="dh04" smooth="yes"/>
+      <point x="898" y="1522" type="curve" smooth="yes" name="hr02"/>
+      <point x="898" y="1380" type="line" smooth="yes" name="dh04"/>
       <point x="898" y="1360"/>
       <point x="888" y="1350"/>
       <point x="868" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="539" y="-22" type="curve" name="ab01" smooth="yes"/>
+      <point x="539" y="-22" type="curve" smooth="yes" name="ab01"/>
       <point x="419" y="-22"/>
       <point x="306" y="-5"/>
       <point x="169" y="34" type="curve"/>
       <point x="169" y="207" type="line"/>
       <point x="270" y="162"/>
       <point x="394" y="138"/>
-      <point x="526" y="138" type="curve" name="hr03" smooth="yes"/>
+      <point x="526" y="138" type="curve" smooth="yes" name="hr03"/>
       <point x="759" y="138"/>
       <point x="881" y="213"/>
-      <point x="881" y="334" type="curve" name="sh02" smooth="yes"/>
+      <point x="881" y="334" type="curve" smooth="yes" name="sh02"/>
       <point x="881" y="454"/>
       <point x="761" y="532"/>
-      <point x="562" y="532" type="curve" name="dv02" smooth="yes"/>
+      <point x="562" y="532" type="curve" smooth="yes" name="dv02"/>
       <point x="404" y="532" type="line"/>
       <point x="404" y="676" type="line"/>
-      <point x="569" y="676" type="line" name="dv03" smooth="yes"/>
+      <point x="569" y="676" type="line" smooth="yes" name="dv03"/>
       <point x="752" y="676"/>
       <point x="849" y="739"/>
-      <point x="849" y="830" type="curve" name="ih01" smooth="yes"/>
+      <point x="849" y="830" type="curve" smooth="yes" name="ih01"/>
       <point x="849" y="922"/>
       <point x="747" y="984"/>
-      <point x="558" y="984" type="curve" name="dv04" smooth="yes"/>
+      <point x="558" y="984" type="curve" smooth="yes" name="dv04"/>
       <point x="463" y="984"/>
       <point x="350" y="968"/>
       <point x="210" y="932" type="curve"/>
       <point x="210" y="1099" type="line"/>
       <point x="350" y="1131"/>
       <point x="472" y="1147"/>
-      <point x="577" y="1147" type="curve" name="dv05" smooth="yes"/>
+      <point x="577" y="1147" type="curve" smooth="yes" name="dv05"/>
       <point x="857" y="1147"/>
       <point x="1032" y="1034"/>
-      <point x="1032" y="856" type="curve" name="sh01" smooth="yes"/>
+      <point x="1032" y="856" type="curve" smooth="yes" name="sh01"/>
       <point x="1032" y="728"/>
       <point x="943" y="640"/>
       <point x="783" y="607" type="curve" name="ih02"/>
       <point x="954" y="575"/>
       <point x="1064" y="480"/>
-      <point x="1064" y="321" type="curve" name="sh03" smooth="yes"/>
+      <point x="1064" y="321" type="curve" smooth="yes" name="sh03"/>
       <point x="1064" y="110"/>
       <point x="871" y="-22"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04E_0.glif b/source/Hack-Regular.ufo/glyphs/uni04E_0.glif
index 415bcf0e5..d3367a3b1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04E_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04E_0.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E0" format="1">
+<glyph name="uni04E0" format="2">
   <advance width="1233"/>
   <unicode hex="04E0"/>
   <outline>
     <contour>
-      <point x="615" y="-28" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="-28" type="curve" smooth="yes" name="dv01"/>
       <point x="235" y="-28"/>
       <point x="26" y="140"/>
       <point x="26" y="435" type="curve" name="sh01"/>
       <point x="228" y="435" type="line" name="sh02"/>
       <point x="228" y="243"/>
       <point x="363" y="142"/>
-      <point x="616" y="142" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="142" type="curve" smooth="yes" name="dv02"/>
       <point x="871" y="142"/>
       <point x="1006" y="244"/>
-      <point x="1006" y="432" type="curve" name="ah01" smooth="yes"/>
+      <point x="1006" y="432" type="curve" smooth="yes" name="ah01"/>
       <point x="1006" y="616"/>
       <point x="875" y="716"/>
-      <point x="656" y="716" type="curve" name="dv03" smooth="yes"/>
+      <point x="656" y="716" type="curve" smooth="yes" name="dv03"/>
       <point x="482" y="716" type="line"/>
       <point x="482" y="882" type="line"/>
       <point x="852" y="1323" type="line" name="ih01"/>
@@ -28,10 +28,10 @@
       <point x="708" y="884" type="line" name="ih02"/>
       <point x="848" y="884"/>
       <point x="1021" y="814"/>
-      <point x="1126" y="677" type="curve" name="hr01" smooth="yes"/>
+      <point x="1126" y="677" type="curve" smooth="yes" name="hr01"/>
       <point x="1183" y="601"/>
       <point x="1206" y="525"/>
-      <point x="1206" y="429" type="curve" name="sh03" smooth="yes"/>
+      <point x="1206" y="429" type="curve" smooth="yes" name="sh03"/>
       <point x="1206" y="141"/>
       <point x="995" y="-28"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04E_1.glif b/source/Hack-Regular.ufo/glyphs/uni04E_1.glif
index 151218407..2548bf058 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04E_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04E_1.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E1" format="1">
+<glyph name="uni04E1" format="2">
   <advance width="1233"/>
   <unicode hex="04E1"/>
   <outline>
     <contour>
-      <point x="551" y="-436" type="curve" name="hr00" smooth="yes"/>
+      <point x="551" y="-436" type="curve" smooth="yes" name="hr00"/>
       <point x="421" y="-436"/>
       <point x="296" y="-415"/>
       <point x="145" y="-362" type="curve"/>
       <point x="145" y="-167" type="line"/>
       <point x="258" y="-232"/>
       <point x="393" y="-266"/>
-      <point x="538" y="-266" type="curve" name="dv01" smooth="yes"/>
+      <point x="538" y="-266" type="curve" smooth="yes" name="dv01"/>
       <point x="793" y="-266"/>
       <point x="927" y="-163"/>
-      <point x="927" y="24" type="curve" name="dh01" smooth="yes"/>
+      <point x="927" y="24" type="curve" smooth="yes" name="dh01"/>
       <point x="927" y="205"/>
       <point x="796" y="308"/>
-      <point x="577" y="308" type="curve" name="dv02" smooth="yes"/>
+      <point x="577" y="308" type="curve" smooth="yes" name="dv02"/>
       <point x="403" y="308" type="line"/>
       <point x="403" y="474" type="line"/>
       <point x="833" y="973" type="line" name="sv01"/>
@@ -31,7 +31,7 @@
       <point x="1047" y="269" type="curve" smooth="yes"/>
       <point x="1103" y="196"/>
       <point x="1128" y="121"/>
-      <point x="1128" y="22" type="curve" name="dh02" smooth="yes"/>
+      <point x="1128" y="22" type="curve" smooth="yes" name="dh02"/>
       <point x="1128" y="-268"/>
       <point x="911" y="-436"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04E_2.glif b/source/Hack-Regular.ufo/glyphs/uni04E_2.glif
index 734ba04bd..ede7a9251 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04E_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04E_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E2" format="1">
+<glyph name="uni04E2" format="2">
   <advance width="1233"/>
   <unicode hex="04E2"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04E_3.glif b/source/Hack-Regular.ufo/glyphs/uni04E_3.glif
index 4ee3eaee5..2b98536bf 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04E_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04E_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E3" format="1">
+<glyph name="uni04E3" format="2">
   <advance width="1233"/>
   <unicode hex="04E3"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04E_4.glif b/source/Hack-Regular.ufo/glyphs/uni04E_4.glif
index 88332202c..29d993b64 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04E_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04E_4.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E4" format="1">
+<glyph name="uni04E4" format="2">
   <advance width="1233"/>
   <unicode hex="04E4"/>
   <outline>
     <contour>
-      <point x="349" y="1649" type="line" name="dv01" smooth="yes"/>
+      <point x="349" y="1649" type="line" smooth="yes" name="dv01"/>
       <point x="329" y="1649"/>
       <point x="319" y="1659"/>
-      <point x="319" y="1679" type="curve" name="ih01" smooth="yes"/>
+      <point x="319" y="1679" type="curve" smooth="yes" name="ih01"/>
       <point x="319" y="1822" type="line" smooth="yes"/>
       <point x="319" y="1842"/>
       <point x="329" y="1852"/>
-      <point x="349" y="1852" type="curve" name="dv02" smooth="yes"/>
+      <point x="349" y="1852" type="curve" smooth="yes" name="dv02"/>
       <point x="492" y="1852" type="line" smooth="yes"/>
       <point x="512" y="1852"/>
       <point x="522" y="1842"/>
       <point x="522" y="1822" type="curve" smooth="yes"/>
-      <point x="522" y="1679" type="line" name="sh01" smooth="yes"/>
+      <point x="522" y="1679" type="line" smooth="yes" name="sh01"/>
       <point x="522" y="1659"/>
       <point x="512" y="1649"/>
       <point x="492" y="1649" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1649" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1649" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1649"/>
       <point x="711" y="1659"/>
-      <point x="711" y="1679" type="curve" name="dh03" smooth="yes"/>
+      <point x="711" y="1679" type="curve" smooth="yes" name="dh03"/>
       <point x="711" y="1822" type="line" smooth="yes"/>
       <point x="711" y="1842"/>
       <point x="721" y="1852"/>
-      <point x="741" y="1852" type="curve" name="hr01" smooth="yes"/>
+      <point x="741" y="1852" type="curve" smooth="yes" name="hr01"/>
       <point x="883" y="1852" type="line" smooth="yes"/>
       <point x="903" y="1852"/>
       <point x="913" y="1842"/>
       <point x="913" y="1822" type="curve" smooth="yes"/>
-      <point x="913" y="1679" type="line" name="dh04" smooth="yes"/>
+      <point x="913" y="1679" type="line" smooth="yes" name="dh04"/>
       <point x="913" y="1659"/>
       <point x="903" y="1649"/>
       <point x="883" y="1649" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04E_5.glif b/source/Hack-Regular.ufo/glyphs/uni04E_5.glif
index 9a1b3c652..522a87b80 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04E_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04E_5.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E5" format="1">
+<glyph name="uni04E5" format="2">
   <advance width="1233"/>
   <unicode hex="04E5"/>
   <outline>
     <contour>
-      <point x="349" y="1322" type="line" name="dv01" smooth="yes"/>
+      <point x="349" y="1322" type="line" smooth="yes" name="dv01"/>
       <point x="329" y="1322"/>
       <point x="319" y="1332"/>
-      <point x="319" y="1352" type="curve" name="ih01" smooth="yes"/>
+      <point x="319" y="1352" type="curve" smooth="yes" name="ih01"/>
       <point x="319" y="1494" type="line" smooth="yes"/>
       <point x="319" y="1514"/>
       <point x="329" y="1524"/>
-      <point x="349" y="1524" type="curve" name="dv02" smooth="yes"/>
+      <point x="349" y="1524" type="curve" smooth="yes" name="dv02"/>
       <point x="492" y="1524" type="line" smooth="yes"/>
       <point x="512" y="1524"/>
       <point x="522" y="1514"/>
       <point x="522" y="1494" type="curve" smooth="yes"/>
-      <point x="522" y="1352" type="line" name="sh01" smooth="yes"/>
+      <point x="522" y="1352" type="line" smooth="yes" name="sh01"/>
       <point x="522" y="1332"/>
       <point x="512" y="1322"/>
       <point x="492" y="1322" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1322" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1322" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1322"/>
       <point x="711" y="1332"/>
-      <point x="711" y="1352" type="curve" name="dh03" smooth="yes"/>
+      <point x="711" y="1352" type="curve" smooth="yes" name="dh03"/>
       <point x="711" y="1494" type="line" smooth="yes"/>
       <point x="711" y="1514"/>
       <point x="721" y="1524"/>
-      <point x="741" y="1524" type="curve" name="hr01" smooth="yes"/>
+      <point x="741" y="1524" type="curve" smooth="yes" name="hr01"/>
       <point x="883" y="1524" type="line" smooth="yes"/>
       <point x="903" y="1524"/>
       <point x="913" y="1514"/>
       <point x="913" y="1494" type="curve" smooth="yes"/>
-      <point x="913" y="1352" type="line" name="dh04" smooth="yes"/>
+      <point x="913" y="1352" type="line" smooth="yes" name="dh04"/>
       <point x="913" y="1332"/>
       <point x="903" y="1322"/>
       <point x="883" y="1322" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04E_6.glif b/source/Hack-Regular.ufo/glyphs/uni04E_6.glif
index 00d008da8..19feb8428 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04E_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04E_6.glif
@@ -1,78 +1,78 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E6" format="1">
+<glyph name="uni04E6" format="2">
   <advance width="1233"/>
   <unicode hex="04E6"/>
   <outline>
     <contour>
-      <point x="349" y="1649" type="line" name="dv03" smooth="yes"/>
+      <point x="349" y="1649" type="line" smooth="yes" name="dv03"/>
       <point x="329" y="1649"/>
       <point x="319" y="1659"/>
-      <point x="319" y="1679" type="curve" name="sh01" smooth="yes"/>
+      <point x="319" y="1679" type="curve" smooth="yes" name="sh01"/>
       <point x="319" y="1822" type="line" smooth="yes"/>
       <point x="319" y="1842"/>
       <point x="329" y="1852"/>
-      <point x="349" y="1852" type="curve" name="dv04" smooth="yes"/>
+      <point x="349" y="1852" type="curve" smooth="yes" name="dv04"/>
       <point x="492" y="1852" type="line" smooth="yes"/>
       <point x="512" y="1852"/>
       <point x="522" y="1842"/>
       <point x="522" y="1822" type="curve" smooth="yes"/>
-      <point x="522" y="1679" type="line" name="sh02" smooth="yes"/>
+      <point x="522" y="1679" type="line" smooth="yes" name="sh02"/>
       <point x="522" y="1659"/>
       <point x="512" y="1649"/>
       <point x="492" y="1649" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1649" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1649" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1649"/>
       <point x="711" y="1659"/>
-      <point x="711" y="1679" type="curve" name="dh03" smooth="yes"/>
+      <point x="711" y="1679" type="curve" smooth="yes" name="dh03"/>
       <point x="711" y="1822" type="line" smooth="yes"/>
       <point x="711" y="1842"/>
       <point x="721" y="1852"/>
-      <point x="741" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="741" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="883" y="1852" type="line" smooth="yes"/>
       <point x="903" y="1852"/>
       <point x="913" y="1842"/>
       <point x="913" y="1822" type="curve" smooth="yes"/>
-      <point x="913" y="1679" type="line" name="dh04" smooth="yes"/>
+      <point x="913" y="1679" type="line" smooth="yes" name="dh04"/>
       <point x="913" y="1659"/>
       <point x="903" y="1649"/>
-      <point x="883" y="1649" type="curve" name="hr01" smooth="yes"/>
+      <point x="883" y="1649" type="curve" smooth="yes" name="hr01"/>
     </contour>
     <contour>
-      <point x="615" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="280" y="-29"/>
       <point x="117" y="221"/>
-      <point x="117" y="744" type="curve" name="dh01" smooth="yes"/>
+      <point x="117" y="744" type="curve" smooth="yes" name="dh01"/>
       <point x="117" y="1267"/>
       <point x="280" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="953" y="1520"/>
       <point x="1116" y="1266"/>
-      <point x="1116" y="745" type="curve" name="sh03" smooth="yes"/>
+      <point x="1116" y="745" type="curve" smooth="yes" name="sh03"/>
       <point x="1116" y="225"/>
       <point x="952" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="719" y="135"/>
       <point x="793" y="182"/>
       <point x="838" y="276" type="curve" smooth="yes"/>
       <point x="883" y="368"/>
       <point x="905" y="524"/>
-      <point x="905" y="745" type="curve" name="sh04" smooth="yes"/>
+      <point x="905" y="745" type="curve" smooth="yes" name="sh04"/>
       <point x="905" y="965"/>
       <point x="883" y="1122"/>
       <point x="838" y="1215" type="curve" smooth="yes"/>
       <point x="793" y="1309"/>
       <point x="719" y="1356"/>
-      <point x="616" y="1356" type="curve" name="sv03" smooth="yes"/>
+      <point x="616" y="1356" type="curve" smooth="yes" name="sv03"/>
       <point x="514" y="1356"/>
       <point x="441" y="1309"/>
       <point x="396" y="1215" type="curve" smooth="yes"/>
       <point x="351" y="1120"/>
       <point x="328" y="964"/>
-      <point x="328" y="745" type="curve" name="dh02" smooth="yes"/>
+      <point x="328" y="745" type="curve" smooth="yes" name="dh02"/>
       <point x="328" y="527"/>
       <point x="351" y="371"/>
       <point x="396" y="276" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04E_7.glif b/source/Hack-Regular.ufo/glyphs/uni04E_7.glif
index 588911137..c2c3e64e2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04E_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04E_7.glif
@@ -1,69 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E7" format="1">
+<glyph name="uni04E7" format="2">
   <advance width="1233"/>
   <unicode hex="04E7"/>
   <outline>
     <contour>
-      <point x="349" y="1350" type="line" name="dv03" smooth="yes"/>
+      <point x="349" y="1350" type="line" smooth="yes" name="dv03"/>
       <point x="329" y="1350"/>
       <point x="319" y="1360"/>
-      <point x="319" y="1380" type="curve" name="sh01" smooth="yes"/>
+      <point x="319" y="1380" type="curve" smooth="yes" name="sh01"/>
       <point x="319" y="1522" type="line" smooth="yes"/>
       <point x="319" y="1542"/>
       <point x="329" y="1552"/>
-      <point x="349" y="1552" type="curve" name="dv04" smooth="yes"/>
+      <point x="349" y="1552" type="curve" smooth="yes" name="dv04"/>
       <point x="492" y="1552" type="line" smooth="yes"/>
       <point x="512" y="1552"/>
       <point x="522" y="1542"/>
       <point x="522" y="1522" type="curve" smooth="yes"/>
-      <point x="522" y="1380" type="line" name="sh02" smooth="yes"/>
+      <point x="522" y="1380" type="line" smooth="yes" name="sh02"/>
       <point x="522" y="1360"/>
       <point x="512" y="1350"/>
       <point x="492" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1350" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1350" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1350"/>
       <point x="711" y="1360"/>
-      <point x="711" y="1380" type="curve" name="dh03" smooth="yes"/>
+      <point x="711" y="1380" type="curve" smooth="yes" name="dh03"/>
       <point x="711" y="1522" type="line" smooth="yes"/>
       <point x="711" y="1542"/>
       <point x="721" y="1552"/>
-      <point x="741" y="1552" type="curve" name="hr01" smooth="yes"/>
+      <point x="741" y="1552" type="curve" smooth="yes" name="hr01"/>
       <point x="883" y="1552" type="line" smooth="yes"/>
       <point x="903" y="1552"/>
       <point x="913" y="1542"/>
       <point x="913" y="1522" type="curve" smooth="yes"/>
-      <point x="913" y="1380" type="line" name="dh04" smooth="yes"/>
+      <point x="913" y="1380" type="line" smooth="yes" name="dh04"/>
       <point x="913" y="1360"/>
       <point x="903" y="1350"/>
       <point x="883" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="303" y="-29"/>
       <point x="137" y="174"/>
-      <point x="137" y="558" type="curve" name="dh01" smooth="yes"/>
+      <point x="137" y="558" type="curve" smooth="yes" name="dh01"/>
       <point x="137" y="939"/>
       <point x="305" y="1147"/>
-      <point x="616" y="1147" type="curve" name="dv06" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="dv06"/>
       <point x="927" y="1147"/>
       <point x="1096" y="939"/>
-      <point x="1096" y="558" type="curve" name="sh03" smooth="yes"/>
+      <point x="1096" y="558" type="curve" smooth="yes" name="sh03"/>
       <point x="1096" y="177"/>
       <point x="928" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="805" y="127"/>
       <point x="901" y="274"/>
-      <point x="901" y="559" type="curve" name="sh04" smooth="yes"/>
+      <point x="901" y="559" type="curve" smooth="yes" name="sh04"/>
       <point x="901" y="846"/>
       <point x="805" y="991"/>
-      <point x="616" y="991" type="curve" name="dv05" smooth="yes"/>
+      <point x="616" y="991" type="curve" smooth="yes" name="dv05"/>
       <point x="428" y="991"/>
       <point x="332" y="846"/>
-      <point x="332" y="559" type="curve" name="dh02" smooth="yes"/>
+      <point x="332" y="559" type="curve" smooth="yes" name="dh02"/>
       <point x="332" y="274"/>
       <point x="428" y="127"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04E_8.glif b/source/Hack-Regular.ufo/glyphs/uni04E_8.glif
index 210446cf6..04ddaf23a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04E_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04E_8.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E8" format="1">
+<glyph name="uni04E8" format="2">
   <advance width="1233"/>
   <unicode hex="04E8"/>
   <outline>
     <contour>
-      <point x="615" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="615" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="280" y="-29"/>
       <point x="117" y="221"/>
-      <point x="117" y="744" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="744" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="1267"/>
       <point x="280" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="953" y="1520"/>
       <point x="1116" y="1266"/>
-      <point x="1116" y="745" type="curve" name="sh02" smooth="yes"/>
+      <point x="1116" y="745" type="curve" smooth="yes" name="sh02"/>
       <point x="1116" y="225"/>
       <point x="952" y="-29"/>
     </contour>
@@ -21,13 +21,13 @@
       <point x="902" y="881" type="line" name="ah01"/>
       <point x="886" y="1178"/>
       <point x="821" y="1356"/>
-      <point x="616" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="408" y="1356"/>
       <point x="347" y="1172"/>
       <point x="331" y="881" type="curve" name="sh04"/>
     </contour>
     <contour>
-      <point x="617" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="821" y="135"/>
       <point x="900" y="310"/>
       <point x="905" y="711" type="curve" name="sh05"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04E_9.glif b/source/Hack-Regular.ufo/glyphs/uni04E_9.glif
index ba622575f..3dabe0551 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04E_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04E_9.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04E9" format="1">
+<glyph name="uni04E9" format="2">
   <advance width="1233"/>
   <unicode hex="04E9"/>
   <outline>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="305" y="-29"/>
       <point x="137" y="176"/>
-      <point x="137" y="560" type="curve" name="sh01" smooth="yes"/>
+      <point x="137" y="560" type="curve" smooth="yes" name="sh01"/>
       <point x="137" y="749"/>
       <point x="178" y="895"/>
       <point x="260" y="996" type="curve" smooth="yes"/>
       <point x="340" y="1093"/>
       <point x="454" y="1147"/>
-      <point x="615" y="1147" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1147" type="curve" smooth="yes" name="dv03"/>
       <point x="928" y="1147"/>
       <point x="1096" y="940"/>
-      <point x="1096" y="559" type="curve" name="sh02" smooth="yes"/>
+      <point x="1096" y="559" type="curve" smooth="yes" name="sh02"/>
       <point x="1096" y="175"/>
       <point x="929" y="-29"/>
     </contour>
@@ -24,13 +24,13 @@
       <point x="900" y="611" type="line" name="ah01"/>
       <point x="889" y="846"/>
       <point x="804" y="991"/>
-      <point x="616" y="991" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="991" type="curve" smooth="yes" name="dv02"/>
       <point x="429" y="991"/>
       <point x="344" y="846"/>
       <point x="333" y="611" type="curve" name="sh03"/>
     </contour>
     <contour>
-      <point x="616" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="804" y="127"/>
       <point x="876" y="270"/>
       <point x="895" y="447" type="curve" name="sh04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04E_A_.glif b/source/Hack-Regular.ufo/glyphs/uni04E_A_.glif
index cbc1bc068..7b88f5db9 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04E_A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04E_A_.glif
@@ -1,55 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04EA" format="1">
+<glyph name="uni04EA" format="2">
   <advance width="1233"/>
   <unicode hex="04EA"/>
   <outline>
     <contour>
-      <point x="349" y="1649" type="line" name="dv03" smooth="yes"/>
+      <point x="349" y="1649" type="line" smooth="yes" name="dv03"/>
       <point x="329" y="1649"/>
       <point x="319" y="1659"/>
-      <point x="319" y="1679" type="curve" name="sh01" smooth="yes"/>
+      <point x="319" y="1679" type="curve" smooth="yes" name="sh01"/>
       <point x="319" y="1822" type="line" smooth="yes"/>
       <point x="319" y="1842"/>
       <point x="329" y="1852"/>
-      <point x="349" y="1852" type="curve" name="dv04" smooth="yes"/>
+      <point x="349" y="1852" type="curve" smooth="yes" name="dv04"/>
       <point x="492" y="1852" type="line" smooth="yes"/>
       <point x="512" y="1852"/>
       <point x="522" y="1842"/>
       <point x="522" y="1822" type="curve" smooth="yes"/>
-      <point x="522" y="1679" type="line" name="sh02" smooth="yes"/>
+      <point x="522" y="1679" type="line" smooth="yes" name="sh02"/>
       <point x="522" y="1659"/>
       <point x="512" y="1649"/>
       <point x="492" y="1649" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1649" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1649" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1649"/>
       <point x="711" y="1659"/>
-      <point x="711" y="1679" type="curve" name="dh03" smooth="yes"/>
+      <point x="711" y="1679" type="curve" smooth="yes" name="dh03"/>
       <point x="711" y="1822" type="line" smooth="yes"/>
       <point x="711" y="1842"/>
       <point x="721" y="1852"/>
-      <point x="741" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="741" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="883" y="1852" type="line" smooth="yes"/>
       <point x="903" y="1852"/>
       <point x="913" y="1842"/>
-      <point x="913" y="1822" type="curve" name="hr01" smooth="yes"/>
-      <point x="913" y="1679" type="line" name="dh04" smooth="yes"/>
+      <point x="913" y="1822" type="curve" smooth="yes" name="hr01"/>
+      <point x="913" y="1679" type="line" smooth="yes" name="dh04"/>
       <point x="913" y="1659"/>
       <point x="903" y="1649"/>
       <point x="883" y="1649" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="615" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="280" y="-29"/>
       <point x="117" y="221"/>
-      <point x="117" y="744" type="curve" name="dh01" smooth="yes"/>
+      <point x="117" y="744" type="curve" smooth="yes" name="dh01"/>
       <point x="117" y="1267"/>
       <point x="280" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="953" y="1520"/>
       <point x="1116" y="1266"/>
-      <point x="1116" y="745" type="curve" name="sh03" smooth="yes"/>
+      <point x="1116" y="745" type="curve" smooth="yes" name="sh03"/>
       <point x="1116" y="225"/>
       <point x="952" y="-29"/>
     </contour>
@@ -57,13 +57,13 @@
       <point x="902" y="881" type="line" name="sh04"/>
       <point x="886" y="1178"/>
       <point x="821" y="1356"/>
-      <point x="616" y="1356" type="curve" name="sv03" smooth="yes"/>
+      <point x="616" y="1356" type="curve" smooth="yes" name="sv03"/>
       <point x="408" y="1356"/>
       <point x="347" y="1172"/>
       <point x="331" y="881" type="curve" name="sh05"/>
     </contour>
     <contour>
-      <point x="617" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="821" y="135"/>
       <point x="900" y="310"/>
       <point x="905" y="711" type="curve" name="sh06"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04E_B_.glif b/source/Hack-Regular.ufo/glyphs/uni04E_B_.glif
index 205788e0c..b2efb7226 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04E_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04E_B_.glif
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04EB" format="1">
+<glyph name="uni04EB" format="2">
   <advance width="1233"/>
   <unicode hex="04EB"/>
   <outline>
     <contour>
-      <point x="349" y="1350" type="line" name="dv03" smooth="yes"/>
+      <point x="349" y="1350" type="line" smooth="yes" name="dv03"/>
       <point x="329" y="1350"/>
       <point x="319" y="1360"/>
-      <point x="319" y="1380" type="curve" name="sh01" smooth="yes"/>
+      <point x="319" y="1380" type="curve" smooth="yes" name="sh01"/>
       <point x="319" y="1522" type="line" smooth="yes"/>
       <point x="319" y="1542"/>
       <point x="329" y="1552"/>
-      <point x="349" y="1552" type="curve" name="dv04" smooth="yes"/>
+      <point x="349" y="1552" type="curve" smooth="yes" name="dv04"/>
       <point x="492" y="1552" type="line" smooth="yes"/>
       <point x="512" y="1552"/>
       <point x="522" y="1542"/>
       <point x="522" y="1522" type="curve" smooth="yes"/>
-      <point x="522" y="1380" type="line" name="sh02" smooth="yes"/>
+      <point x="522" y="1380" type="line" smooth="yes" name="sh02"/>
       <point x="522" y="1360"/>
       <point x="512" y="1350"/>
       <point x="492" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1350" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1350" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1350"/>
       <point x="711" y="1360"/>
-      <point x="711" y="1380" type="curve" name="dh03" smooth="yes"/>
+      <point x="711" y="1380" type="curve" smooth="yes" name="dh03"/>
       <point x="711" y="1522" type="line" smooth="yes"/>
       <point x="711" y="1542"/>
       <point x="721" y="1552"/>
-      <point x="741" y="1552" type="curve" name="sv02" smooth="yes"/>
+      <point x="741" y="1552" type="curve" smooth="yes" name="sv02"/>
       <point x="883" y="1552" type="line" smooth="yes"/>
       <point x="903" y="1552"/>
       <point x="913" y="1542"/>
       <point x="913" y="1522" type="curve" smooth="yes"/>
-      <point x="913" y="1380" type="line" name="hr01" smooth="yes"/>
+      <point x="913" y="1380" type="line" smooth="yes" name="hr01"/>
       <point x="913" y="1360"/>
       <point x="903" y="1350"/>
       <point x="883" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="616" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="305" y="-29"/>
       <point x="137" y="176"/>
-      <point x="137" y="560" type="curve" name="dh01" smooth="yes"/>
+      <point x="137" y="560" type="curve" smooth="yes" name="dh01"/>
       <point x="137" y="749"/>
       <point x="178" y="895"/>
       <point x="260" y="996" type="curve" smooth="yes"/>
       <point x="340" y="1093"/>
       <point x="454" y="1147"/>
-      <point x="615" y="1147" type="curve" name="dv06" smooth="yes"/>
+      <point x="615" y="1147" type="curve" smooth="yes" name="dv06"/>
       <point x="928" y="1147"/>
       <point x="1096" y="940"/>
-      <point x="1096" y="559" type="curve" name="sh03" smooth="yes"/>
+      <point x="1096" y="559" type="curve" smooth="yes" name="sh03"/>
       <point x="1096" y="175"/>
       <point x="929" y="-29"/>
     </contour>
@@ -60,13 +60,13 @@
       <point x="900" y="611" type="line" name="sh04"/>
       <point x="889" y="846"/>
       <point x="804" y="991"/>
-      <point x="616" y="991" type="curve" name="dv05" smooth="yes"/>
+      <point x="616" y="991" type="curve" smooth="yes" name="dv05"/>
       <point x="429" y="991"/>
       <point x="344" y="846"/>
       <point x="333" y="611" type="curve" name="dh02"/>
     </contour>
     <contour>
-      <point x="616" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="804" y="127"/>
       <point x="876" y="270"/>
       <point x="895" y="447" type="curve" name="sh05"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04E_C_.glif b/source/Hack-Regular.ufo/glyphs/uni04E_C_.glif
index c258d901d..b84d5b8ae 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04E_C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04E_C_.glif
@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04EC" format="1">
+<glyph name="uni04EC" format="2">
   <advance width="1233"/>
   <unicode hex="04EC"/>
   <outline>
     <contour>
-      <point x="336" y="1649" type="line" name="hr00" smooth="yes"/>
+      <point x="336" y="1649" type="line" smooth="yes" name="hr00"/>
       <point x="316" y="1649"/>
       <point x="306" y="1659"/>
-      <point x="306" y="1679" type="curve" name="dh01" smooth="yes"/>
+      <point x="306" y="1679" type="curve" smooth="yes" name="dh01"/>
       <point x="306" y="1822" type="line" smooth="yes"/>
       <point x="306" y="1842"/>
       <point x="316" y="1852"/>
-      <point x="336" y="1852" type="curve" name="dv03" smooth="yes"/>
+      <point x="336" y="1852" type="curve" smooth="yes" name="dv03"/>
       <point x="479" y="1852" type="line" smooth="yes"/>
       <point x="499" y="1852"/>
       <point x="509" y="1842"/>
       <point x="509" y="1822" type="curve" smooth="yes"/>
-      <point x="509" y="1679" type="line" name="dh02" smooth="yes"/>
+      <point x="509" y="1679" type="line" smooth="yes" name="dh02"/>
       <point x="509" y="1659"/>
       <point x="499" y="1649"/>
       <point x="479" y="1649" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="728" y="1649" type="line" name="sv01" smooth="yes"/>
+      <point x="728" y="1649" type="line" smooth="yes" name="sv01"/>
       <point x="708" y="1649"/>
       <point x="698" y="1659"/>
-      <point x="698" y="1679" type="curve" name="dh03" smooth="yes"/>
+      <point x="698" y="1679" type="curve" smooth="yes" name="dh03"/>
       <point x="698" y="1822" type="line" smooth="yes"/>
       <point x="698" y="1842"/>
       <point x="708" y="1852"/>
-      <point x="728" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="728" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="870" y="1852" type="line" smooth="yes"/>
       <point x="890" y="1852"/>
       <point x="900" y="1842"/>
       <point x="900" y="1822" type="curve" smooth="yes"/>
-      <point x="900" y="1679" type="line" name="dh04" smooth="yes"/>
+      <point x="900" y="1679" type="line" smooth="yes" name="dh04"/>
       <point x="900" y="1659"/>
       <point x="890" y="1649"/>
       <point x="870" y="1649" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="509" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="509" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="392" y="-29"/>
       <point x="282" y="-2"/>
       <point x="179" y="53" type="curve"/>
       <point x="179" y="260" type="line"/>
       <point x="279" y="176"/>
       <point x="398" y="135"/>
-      <point x="511" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="511" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="771" y="135"/>
       <point x="894" y="351"/>
       <point x="902" y="661" type="curve" name="sh01"/>
@@ -56,17 +56,17 @@
       <point x="897" y="831" type="line" name="sh02"/>
       <point x="857" y="1199"/>
       <point x="768" y="1356"/>
-      <point x="520" y="1356" type="curve" name="sv03" smooth="yes"/>
+      <point x="520" y="1356" type="curve" smooth="yes" name="sv03"/>
       <point x="391" y="1356"/>
       <point x="280" y="1315"/>
       <point x="179" y="1231" type="curve"/>
       <point x="179" y="1438" type="line"/>
       <point x="282" y="1493"/>
       <point x="392" y="1520"/>
-      <point x="509" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="509" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="889" y="1520"/>
       <point x="1113" y="1234"/>
-      <point x="1113" y="743" type="curve" name="sh03" smooth="yes"/>
+      <point x="1113" y="743" type="curve" smooth="yes" name="sh03"/>
       <point x="1113" y="255"/>
       <point x="892" y="-29"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04E_D_.glif b/source/Hack-Regular.ufo/glyphs/uni04E_D_.glif
index d9189dd00..bd127fcf6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04E_D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04E_D_.glif
@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04ED" format="1">
+<glyph name="uni04ED" format="2">
   <advance width="1233"/>
   <unicode hex="04ED"/>
   <outline>
     <contour>
-      <point x="329" y="1350" type="line" name="dv03" smooth="yes"/>
+      <point x="329" y="1350" type="line" smooth="yes" name="dv03"/>
       <point x="309" y="1350"/>
       <point x="299" y="1360"/>
-      <point x="299" y="1380" type="curve" name="dh01" smooth="yes"/>
+      <point x="299" y="1380" type="curve" smooth="yes" name="dh01"/>
       <point x="299" y="1522" type="line" smooth="yes"/>
       <point x="299" y="1542"/>
       <point x="309" y="1552"/>
-      <point x="329" y="1552" type="curve" name="dv04" smooth="yes"/>
+      <point x="329" y="1552" type="curve" smooth="yes" name="dv04"/>
       <point x="472" y="1552" type="line" smooth="yes"/>
       <point x="492" y="1552"/>
       <point x="502" y="1542"/>
       <point x="502" y="1522" type="curve" smooth="yes"/>
-      <point x="502" y="1380" type="line" name="dh02" smooth="yes"/>
+      <point x="502" y="1380" type="line" smooth="yes" name="dh02"/>
       <point x="502" y="1360"/>
       <point x="492" y="1350"/>
       <point x="472" y="1350" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="721" y="1350" type="line" name="sv01" smooth="yes"/>
+      <point x="721" y="1350" type="line" smooth="yes" name="sv01"/>
       <point x="701" y="1350"/>
       <point x="691" y="1360"/>
-      <point x="691" y="1380" type="curve" name="dh03" smooth="yes"/>
+      <point x="691" y="1380" type="curve" smooth="yes" name="dh03"/>
       <point x="691" y="1522" type="line" smooth="yes"/>
       <point x="691" y="1542"/>
       <point x="701" y="1552"/>
-      <point x="721" y="1552" type="curve" name="sv02" smooth="yes"/>
+      <point x="721" y="1552" type="curve" smooth="yes" name="sv02"/>
       <point x="863" y="1552" type="line" smooth="yes"/>
       <point x="883" y="1552"/>
       <point x="893" y="1542"/>
       <point x="893" y="1522" type="curve" smooth="yes"/>
-      <point x="893" y="1380" type="line" name="dh04" smooth="yes"/>
+      <point x="893" y="1380" type="line" smooth="yes" name="dh04"/>
       <point x="893" y="1360"/>
       <point x="883" y="1350"/>
-      <point x="863" y="1350" type="curve" name="hr01" smooth="yes"/>
+      <point x="863" y="1350" type="curve" smooth="yes" name="hr01"/>
     </contour>
     <contour>
-      <point x="535" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="535" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="422" y="-29"/>
       <point x="323" y="-4"/>
       <point x="215" y="57" type="curve"/>
       <point x="215" y="248" type="line"/>
       <point x="298" y="168"/>
       <point x="398" y="127"/>
-      <point x="523" y="127" type="curve" name="dv02" smooth="yes"/>
+      <point x="523" y="127" type="curve" smooth="yes" name="dv02"/>
       <point x="763" y="127"/>
       <point x="873" y="283"/>
       <point x="886" y="516" type="curve" name="sh01"/>
@@ -56,17 +56,17 @@
       <point x="881" y="660" type="line" name="sh02"/>
       <point x="857" y="836"/>
       <point x="765" y="991"/>
-      <point x="524" y="991" type="curve" name="dv05" smooth="yes"/>
+      <point x="524" y="991" type="curve" smooth="yes" name="dv05"/>
       <point x="403" y="991"/>
       <point x="308" y="952"/>
       <point x="215" y="868" type="curve"/>
       <point x="215" y="1061" type="line"/>
       <point x="324" y="1122"/>
       <point x="422" y="1147"/>
-      <point x="534" y="1147" type="curve" name="dv06" smooth="yes"/>
+      <point x="534" y="1147" type="curve" smooth="yes" name="dv06"/>
       <point x="872" y="1147"/>
       <point x="1081" y="927"/>
-      <point x="1081" y="559" type="curve" name="sh03" smooth="yes"/>
+      <point x="1081" y="559" type="curve" smooth="yes" name="sh03"/>
       <point x="1081" y="191"/>
       <point x="871" y="-29"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04E_E_.glif b/source/Hack-Regular.ufo/glyphs/uni04E_E_.glif
index 1576de763..bbaa5c4f2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04E_E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04E_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04EE" format="1">
+<glyph name="uni04EE" format="2">
   <advance width="1233"/>
   <unicode hex="04EE"/>
   <outline>
@@ -29,7 +29,7 @@
       <point x="633" y="156" type="curve" smooth="yes"/>
       <point x="572" y="63"/>
       <point x="489" y="0"/>
-      <point x="352" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="352" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="204" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04E_F_.glif b/source/Hack-Regular.ufo/glyphs/uni04E_F_.glif
index c09239cbb..e5e3a3c4c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04E_F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04E_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04EF" format="1">
+<glyph name="uni04EF" format="2">
   <advance width="1233"/>
   <unicode hex="04EF"/>
   <outline>
@@ -32,7 +32,7 @@
       <point x="607" y="-270" type="curve" smooth="yes"/>
       <point x="548" y="-370"/>
       <point x="465" y="-426"/>
-      <point x="332" y="-426" type="curve" name="ab01" smooth="yes"/>
+      <point x="332" y="-426" type="curve" smooth="yes" name="ab01"/>
       <point x="184" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04F_0.glif b/source/Hack-Regular.ufo/glyphs/uni04F_0.glif
index a55b8215a..e77dae061 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04F_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04F_0.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F0" format="1">
+<glyph name="uni04F0" format="2">
   <advance width="1233"/>
   <unicode hex="04F0"/>
   <outline>
     <contour>
-      <point x="369" y="1649" type="line" name="hr00" smooth="yes"/>
+      <point x="369" y="1649" type="line" smooth="yes" name="hr00"/>
       <point x="349" y="1649"/>
       <point x="339" y="1659"/>
-      <point x="339" y="1679" type="curve" name="sh01" smooth="yes"/>
+      <point x="339" y="1679" type="curve" smooth="yes" name="sh01"/>
       <point x="339" y="1822" type="line" smooth="yes"/>
       <point x="339" y="1842"/>
       <point x="349" y="1852"/>
-      <point x="369" y="1852" type="curve" name="dv01" smooth="yes"/>
+      <point x="369" y="1852" type="curve" smooth="yes" name="dv01"/>
       <point x="512" y="1852" type="line" smooth="yes"/>
       <point x="532" y="1852"/>
       <point x="542" y="1842"/>
       <point x="542" y="1822" type="curve" smooth="yes"/>
-      <point x="542" y="1679" type="line" name="sh02" smooth="yes"/>
+      <point x="542" y="1679" type="line" smooth="yes" name="sh02"/>
       <point x="542" y="1659"/>
       <point x="532" y="1649"/>
       <point x="512" y="1649" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="761" y="1649" type="line" name="sv01" smooth="yes"/>
+      <point x="761" y="1649" type="line" smooth="yes" name="sv01"/>
       <point x="741" y="1649"/>
       <point x="731" y="1659"/>
-      <point x="731" y="1679" type="curve" name="ah01" smooth="yes"/>
+      <point x="731" y="1679" type="curve" smooth="yes" name="ah01"/>
       <point x="731" y="1822" type="line" smooth="yes"/>
       <point x="731" y="1842"/>
       <point x="741" y="1852"/>
-      <point x="761" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="761" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="903" y="1852" type="line" smooth="yes"/>
       <point x="923" y="1852"/>
       <point x="933" y="1842"/>
       <point x="933" y="1822" type="curve" smooth="yes"/>
-      <point x="933" y="1679" type="line" name="sh03" smooth="yes"/>
+      <point x="933" y="1679" type="line" smooth="yes" name="sh03"/>
       <point x="933" y="1659"/>
       <point x="923" y="1649"/>
       <point x="903" y="1649" type="curve" smooth="yes"/>
@@ -59,7 +59,7 @@
       <point x="633" y="156" type="curve" smooth="yes"/>
       <point x="572" y="63"/>
       <point x="489" y="0"/>
-      <point x="352" y="0" type="curve" name="sh06" smooth="yes"/>
+      <point x="352" y="0" type="curve" smooth="yes" name="sh06"/>
       <point x="204" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04F_1.glif b/source/Hack-Regular.ufo/glyphs/uni04F_1.glif
index 4d9d9dbcb..7fcd8a97a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04F_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04F_1.glif
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F1" format="1">
+<glyph name="uni04F1" format="2">
   <advance width="1233"/>
   <unicode hex="04F1"/>
   <outline>
     <contour>
-      <point x="349" y="1312" type="line" name="hr00" smooth="yes"/>
+      <point x="349" y="1312" type="line" smooth="yes" name="hr00"/>
       <point x="329" y="1312"/>
       <point x="319" y="1322"/>
-      <point x="319" y="1342" type="curve" name="sh01" smooth="yes"/>
+      <point x="319" y="1342" type="curve" smooth="yes" name="sh01"/>
       <point x="319" y="1484" type="line" smooth="yes"/>
       <point x="319" y="1504"/>
       <point x="329" y="1514"/>
-      <point x="349" y="1514" type="curve" name="at03" smooth="yes"/>
+      <point x="349" y="1514" type="curve" smooth="yes" name="at03"/>
       <point x="492" y="1514" type="line" smooth="yes"/>
       <point x="512" y="1514"/>
       <point x="522" y="1504"/>
       <point x="522" y="1484" type="curve" smooth="yes"/>
-      <point x="522" y="1342" type="line" name="sh02" smooth="yes"/>
+      <point x="522" y="1342" type="line" smooth="yes" name="sh02"/>
       <point x="522" y="1322"/>
       <point x="512" y="1312"/>
       <point x="492" y="1312" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1312" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1312" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1312"/>
       <point x="711" y="1322"/>
-      <point x="711" y="1342" type="curve" name="ah01" smooth="yes"/>
+      <point x="711" y="1342" type="curve" smooth="yes" name="ah01"/>
       <point x="711" y="1484" type="line" smooth="yes"/>
       <point x="711" y="1504"/>
       <point x="721" y="1514"/>
-      <point x="741" y="1514" type="curve" name="at04" smooth="yes"/>
+      <point x="741" y="1514" type="curve" smooth="yes" name="at04"/>
       <point x="883" y="1514" type="line" smooth="yes"/>
       <point x="903" y="1514"/>
       <point x="913" y="1504"/>
       <point x="913" y="1484" type="curve" smooth="yes"/>
-      <point x="913" y="1342" type="line" name="sh03" smooth="yes"/>
+      <point x="913" y="1342" type="line" smooth="yes" name="sh03"/>
       <point x="913" y="1322"/>
       <point x="903" y="1312"/>
-      <point x="883" y="1312" type="curve" name="sv02" smooth="yes"/>
+      <point x="883" y="1312" type="curve" smooth="yes" name="sv02"/>
     </contour>
     <contour>
       <point x="184" y="-272" type="line" name="sv03"/>
@@ -62,7 +62,7 @@
       <point x="607" y="-270" type="curve" smooth="yes"/>
       <point x="548" y="-370"/>
       <point x="465" y="-426"/>
-      <point x="332" y="-426" type="curve" name="sh04" smooth="yes"/>
+      <point x="332" y="-426" type="curve" smooth="yes" name="sh04"/>
       <point x="184" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04F_2.glif b/source/Hack-Regular.ufo/glyphs/uni04F_2.glif
index fa5b55779..f60ce2e94 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04F_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04F_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F2" format="1">
+<glyph name="uni04F2" format="2">
   <advance width="1233"/>
   <unicode hex="04F2"/>
   <outline>
@@ -35,7 +35,7 @@
       <point x="633" y="156" type="curve" smooth="yes"/>
       <point x="572" y="63"/>
       <point x="489" y="0"/>
-      <point x="352" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="352" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="204" y="0" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04F_3.glif b/source/Hack-Regular.ufo/glyphs/uni04F_3.glif
index 184e8d22c..0b49bafb1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04F_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04F_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F3" format="1">
+<glyph name="uni04F3" format="2">
   <advance width="1233"/>
   <unicode hex="04F3"/>
   <outline>
@@ -38,7 +38,7 @@
       <point x="607" y="-270" type="curve" smooth="yes"/>
       <point x="548" y="-370"/>
       <point x="465" y="-426"/>
-      <point x="332" y="-426" type="curve" name="ab01" smooth="yes"/>
+      <point x="332" y="-426" type="curve" smooth="yes" name="ab01"/>
       <point x="184" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04F_4.glif b/source/Hack-Regular.ufo/glyphs/uni04F_4.glif
index 9f512816e..e4048ec4f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04F_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04F_4.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F4" format="1">
+<glyph name="uni04F4" format="2">
   <advance width="1233"/>
   <unicode hex="04F4"/>
   <outline>
     <contour>
-      <point x="339" y="1649" type="line" name="dv01" smooth="yes"/>
+      <point x="339" y="1649" type="line" smooth="yes" name="dv01"/>
       <point x="319" y="1649"/>
       <point x="309" y="1659"/>
-      <point x="309" y="1679" type="curve" name="ih01" smooth="yes"/>
+      <point x="309" y="1679" type="curve" smooth="yes" name="ih01"/>
       <point x="309" y="1822" type="line" smooth="yes"/>
       <point x="309" y="1842"/>
       <point x="319" y="1852"/>
-      <point x="339" y="1852" type="curve" name="dv02" smooth="yes"/>
+      <point x="339" y="1852" type="curve" smooth="yes" name="dv02"/>
       <point x="482" y="1852" type="line" smooth="yes"/>
       <point x="502" y="1852"/>
       <point x="512" y="1842"/>
       <point x="512" y="1822" type="curve" smooth="yes"/>
-      <point x="512" y="1679" type="line" name="sh01" smooth="yes"/>
+      <point x="512" y="1679" type="line" smooth="yes" name="sh01"/>
       <point x="512" y="1659"/>
       <point x="502" y="1649"/>
       <point x="482" y="1649" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="731" y="1649" type="line" name="sv01" smooth="yes"/>
+      <point x="731" y="1649" type="line" smooth="yes" name="sv01"/>
       <point x="711" y="1649"/>
       <point x="701" y="1659"/>
-      <point x="701" y="1679" type="curve" name="dh03" smooth="yes"/>
+      <point x="701" y="1679" type="curve" smooth="yes" name="dh03"/>
       <point x="701" y="1822" type="line" smooth="yes"/>
       <point x="701" y="1842"/>
       <point x="711" y="1852"/>
-      <point x="731" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="731" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="873" y="1852" type="line" smooth="yes"/>
       <point x="893" y="1852"/>
       <point x="903" y="1842"/>
-      <point x="903" y="1822" type="curve" name="hr01" smooth="yes"/>
-      <point x="903" y="1679" type="line" name="dh04" smooth="yes"/>
+      <point x="903" y="1822" type="curve" smooth="yes" name="hr01"/>
+      <point x="903" y="1679" type="line" smooth="yes" name="dh04"/>
       <point x="903" y="1659"/>
       <point x="893" y="1649"/>
       <point x="873" y="1649" type="curve" smooth="yes"/>
@@ -43,16 +43,16 @@
       <point x="879" y="658" type="line" name="ih02"/>
       <point x="740" y="589"/>
       <point x="654" y="577"/>
-      <point x="534" y="577" type="curve" name="dv03" smooth="yes"/>
+      <point x="534" y="577" type="curve" smooth="yes" name="dv03"/>
       <point x="313" y="577"/>
       <point x="127" y="618"/>
-      <point x="127" y="980" type="curve" name="dh01" smooth="yes"/>
+      <point x="127" y="980" type="curve" smooth="yes" name="dh01"/>
       <point x="127" y="1493" type="line" name="at01"/>
       <point x="330" y="1493" type="line"/>
-      <point x="330" y="1006" type="line" name="dh02" smooth="yes"/>
+      <point x="330" y="1006" type="line" smooth="yes" name="dh02"/>
       <point x="330" y="782"/>
       <point x="405" y="763"/>
-      <point x="577" y="763" type="curve" name="dv04" smooth="yes"/>
+      <point x="577" y="763" type="curve" smooth="yes" name="dv04"/>
       <point x="699" y="763"/>
       <point x="764" y="773"/>
       <point x="879" y="861" type="curve" name="sh02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04F_5.glif b/source/Hack-Regular.ufo/glyphs/uni04F_5.glif
index c5421a3a2..d65d2baf6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04F_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04F_5.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F5" format="1">
+<glyph name="uni04F5" format="2">
   <advance width="1233"/>
   <unicode hex="04F5"/>
   <outline>
     <contour>
-      <point x="359" y="1323" type="line" name="dv01" smooth="yes"/>
+      <point x="359" y="1323" type="line" smooth="yes" name="dv01"/>
       <point x="339" y="1323"/>
       <point x="329" y="1333"/>
-      <point x="329" y="1353" type="curve" name="ih01" smooth="yes"/>
+      <point x="329" y="1353" type="curve" smooth="yes" name="ih01"/>
       <point x="329" y="1495" type="line" smooth="yes"/>
       <point x="329" y="1515"/>
       <point x="339" y="1525"/>
-      <point x="359" y="1525" type="curve" name="dv02" smooth="yes"/>
+      <point x="359" y="1525" type="curve" smooth="yes" name="dv02"/>
       <point x="502" y="1525" type="line" smooth="yes"/>
       <point x="522" y="1525"/>
       <point x="532" y="1515"/>
       <point x="532" y="1495" type="curve" smooth="yes"/>
-      <point x="532" y="1353" type="line" name="sh01" smooth="yes"/>
+      <point x="532" y="1353" type="line" smooth="yes" name="sh01"/>
       <point x="532" y="1333"/>
       <point x="522" y="1323"/>
       <point x="502" y="1323" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="751" y="1323" type="line" name="sv01" smooth="yes"/>
+      <point x="751" y="1323" type="line" smooth="yes" name="sv01"/>
       <point x="731" y="1323"/>
       <point x="721" y="1333"/>
-      <point x="721" y="1353" type="curve" name="dh03" smooth="yes"/>
+      <point x="721" y="1353" type="curve" smooth="yes" name="dh03"/>
       <point x="721" y="1495" type="line" smooth="yes"/>
       <point x="721" y="1515"/>
       <point x="731" y="1525"/>
-      <point x="751" y="1525" type="curve" name="sv02" smooth="yes"/>
+      <point x="751" y="1525" type="curve" smooth="yes" name="sv02"/>
       <point x="893" y="1525" type="line" smooth="yes"/>
       <point x="913" y="1525"/>
       <point x="923" y="1515"/>
-      <point x="923" y="1495" type="curve" name="hr01" smooth="yes"/>
-      <point x="923" y="1353" type="line" name="dh04" smooth="yes"/>
+      <point x="923" y="1495" type="curve" smooth="yes" name="hr01"/>
+      <point x="923" y="1353" type="line" smooth="yes" name="dh04"/>
       <point x="923" y="1333"/>
       <point x="913" y="1323"/>
       <point x="893" y="1323" type="curve" smooth="yes"/>
@@ -43,16 +43,16 @@
       <point x="837" y="466" type="line" name="ih02"/>
       <point x="816" y="458"/>
       <point x="700" y="402"/>
-      <point x="531" y="402" type="curve" name="dv03" smooth="yes"/>
+      <point x="531" y="402" type="curve" smooth="yes" name="dv03"/>
       <point x="306" y="402"/>
       <point x="165" y="502"/>
-      <point x="165" y="755" type="curve" name="dh01" smooth="yes"/>
+      <point x="165" y="755" type="curve" smooth="yes" name="dh01"/>
       <point x="165" y="1122" type="line" name="at01"/>
       <point x="349" y="1122" type="line"/>
-      <point x="349" y="755" type="line" name="dh02" smooth="yes"/>
+      <point x="349" y="755" type="line" smooth="yes" name="dh02"/>
       <point x="349" y="584"/>
       <point x="458" y="562"/>
-      <point x="590" y="562" type="curve" name="dv04" smooth="yes"/>
+      <point x="590" y="562" type="curve" smooth="yes" name="dv04"/>
       <point x="689" y="562"/>
       <point x="756" y="575"/>
       <point x="837" y="621" type="curve" name="sh02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04F_6.glif b/source/Hack-Regular.ufo/glyphs/uni04F_6.glif
index 9125605b7..e140436da 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04F_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04F_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F6" format="1">
+<glyph name="uni04F6" format="2">
   <advance width="1233"/>
   <unicode hex="04F6"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04F_7.glif b/source/Hack-Regular.ufo/glyphs/uni04F_7.glif
index 88a5e7941..9e1c7787c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04F_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04F_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F7" format="1">
+<glyph name="uni04F7" format="2">
   <advance width="1233"/>
   <unicode hex="04F7"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04F_8.glif b/source/Hack-Regular.ufo/glyphs/uni04F_8.glif
index 8893566f1..6fcd48ee5 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04F_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04F_8.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F8" format="1">
+<glyph name="uni04F8" format="2">
   <advance width="1233"/>
   <unicode hex="04F8"/>
   <outline>
     <contour>
-      <point x="366" y="1649" type="line" name="dv01" smooth="yes"/>
+      <point x="366" y="1649" type="line" smooth="yes" name="dv01"/>
       <point x="346" y="1649"/>
       <point x="336" y="1659"/>
-      <point x="336" y="1679" type="curve" name="dh02" smooth="yes"/>
+      <point x="336" y="1679" type="curve" smooth="yes" name="dh02"/>
       <point x="336" y="1822" type="line" smooth="yes"/>
       <point x="336" y="1842"/>
       <point x="346" y="1852"/>
-      <point x="366" y="1852" type="curve" name="dv02" smooth="yes"/>
+      <point x="366" y="1852" type="curve" smooth="yes" name="dv02"/>
       <point x="509" y="1852" type="line" smooth="yes"/>
       <point x="529" y="1852"/>
       <point x="539" y="1842"/>
       <point x="539" y="1822" type="curve" smooth="yes"/>
-      <point x="539" y="1679" type="line" name="dh03" smooth="yes"/>
+      <point x="539" y="1679" type="line" smooth="yes" name="dh03"/>
       <point x="539" y="1659"/>
       <point x="529" y="1649"/>
       <point x="509" y="1649" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="758" y="1649" type="line" name="sv01" smooth="yes"/>
+      <point x="758" y="1649" type="line" smooth="yes" name="sv01"/>
       <point x="738" y="1649"/>
       <point x="728" y="1659"/>
-      <point x="728" y="1679" type="curve" name="ih01" smooth="yes"/>
+      <point x="728" y="1679" type="curve" smooth="yes" name="ih01"/>
       <point x="728" y="1822" type="line" smooth="yes"/>
       <point x="728" y="1842"/>
       <point x="738" y="1852"/>
-      <point x="758" y="1852" type="curve" name="sv02" smooth="yes"/>
+      <point x="758" y="1852" type="curve" smooth="yes" name="sv02"/>
       <point x="900" y="1852" type="line" smooth="yes"/>
       <point x="920" y="1852"/>
       <point x="930" y="1842"/>
       <point x="930" y="1822" type="curve" smooth="yes"/>
-      <point x="930" y="1679" type="line" name="sh01" smooth="yes"/>
+      <point x="930" y="1679" type="line" smooth="yes" name="sh01"/>
       <point x="930" y="1659"/>
       <point x="920" y="1649"/>
       <point x="900" y="1649" type="curve" smooth="yes"/>
@@ -43,13 +43,13 @@
       <point x="82" y="1493" type="line" name="dh01"/>
       <point x="284" y="1493" type="line" name="hr01"/>
       <point x="284" y="893" type="line"/>
-      <point x="375" y="893" type="line" name="dv04" smooth="yes"/>
+      <point x="375" y="893" type="line" smooth="yes" name="dv04"/>
       <point x="634" y="893"/>
       <point x="826" y="740"/>
-      <point x="826" y="447" type="curve" name="dh05" smooth="yes"/>
+      <point x="826" y="447" type="curve" smooth="yes" name="dh05"/>
       <point x="826" y="153"/>
       <point x="631" y="0"/>
-      <point x="375" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="375" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="82" y="0" type="line"/>
     </contour>
     <contour>
@@ -59,13 +59,13 @@
       <point x="948" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="375" y="166" type="line" name="sv03" smooth="yes"/>
+      <point x="375" y="166" type="line" smooth="yes" name="sv03"/>
       <point x="511" y="166"/>
       <point x="615" y="246"/>
-      <point x="615" y="446" type="curve" name="dh04" smooth="yes"/>
+      <point x="615" y="446" type="curve" smooth="yes" name="dh04"/>
       <point x="615" y="625"/>
       <point x="535" y="727"/>
-      <point x="375" y="727" type="curve" name="dv03" smooth="yes"/>
+      <point x="375" y="727" type="curve" smooth="yes" name="dv03"/>
       <point x="284" y="727" type="line" name="sh02"/>
       <point x="284" y="166" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni04F_9.glif b/source/Hack-Regular.ufo/glyphs/uni04F_9.glif
index 79265305d..ea389578c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni04F_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni04F_9.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni04F9" format="1">
+<glyph name="uni04F9" format="2">
   <advance width="1233"/>
   <unicode hex="04F9"/>
   <outline>
     <contour>
-      <point x="349" y="1321" type="line" name="dv01" smooth="yes"/>
+      <point x="349" y="1321" type="line" smooth="yes" name="dv01"/>
       <point x="329" y="1321"/>
       <point x="319" y="1331"/>
-      <point x="319" y="1351" type="curve" name="dh02" smooth="yes"/>
+      <point x="319" y="1351" type="curve" smooth="yes" name="dh02"/>
       <point x="319" y="1493" type="line" smooth="yes"/>
       <point x="319" y="1513"/>
       <point x="329" y="1523"/>
-      <point x="349" y="1523" type="curve" name="dv02" smooth="yes"/>
+      <point x="349" y="1523" type="curve" smooth="yes" name="dv02"/>
       <point x="492" y="1523" type="line" smooth="yes"/>
       <point x="512" y="1523"/>
       <point x="522" y="1513"/>
       <point x="522" y="1493" type="curve" smooth="yes"/>
-      <point x="522" y="1351" type="line" name="dh03" smooth="yes"/>
+      <point x="522" y="1351" type="line" smooth="yes" name="dh03"/>
       <point x="522" y="1331"/>
       <point x="512" y="1321"/>
       <point x="492" y="1321" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1321" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1321" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1321"/>
       <point x="711" y="1331"/>
-      <point x="711" y="1351" type="curve" name="ih01" smooth="yes"/>
+      <point x="711" y="1351" type="curve" smooth="yes" name="ih01"/>
       <point x="711" y="1493" type="line" smooth="yes"/>
       <point x="711" y="1513"/>
       <point x="721" y="1523"/>
-      <point x="741" y="1523" type="curve" name="sv02" smooth="yes"/>
+      <point x="741" y="1523" type="curve" smooth="yes" name="sv02"/>
       <point x="883" y="1523" type="line" smooth="yes"/>
       <point x="903" y="1523"/>
       <point x="913" y="1513"/>
       <point x="913" y="1493" type="curve" smooth="yes"/>
-      <point x="913" y="1351" type="line" name="sh01" smooth="yes"/>
+      <point x="913" y="1351" type="line" smooth="yes" name="sh01"/>
       <point x="913" y="1331"/>
       <point x="903" y="1321"/>
       <point x="883" y="1321" type="curve" smooth="yes"/>
@@ -43,13 +43,13 @@
       <point x="104" y="1120" type="line" name="dh01"/>
       <point x="286" y="1120" type="line" name="hr01"/>
       <point x="286" y="667" type="line"/>
-      <point x="377" y="667" type="line" name="dv04" smooth="yes"/>
+      <point x="377" y="667" type="line" smooth="yes" name="dv04"/>
       <point x="656" y="667"/>
       <point x="823" y="558"/>
-      <point x="823" y="331" type="curve" name="dh05" smooth="yes"/>
+      <point x="823" y="331" type="curve" smooth="yes" name="dh05"/>
       <point x="823" y="108"/>
       <point x="662" y="0"/>
-      <point x="377" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="377" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="104" y="0" type="line"/>
     </contour>
     <contour>
@@ -59,13 +59,13 @@
       <point x="945" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="369" y="154" type="line" name="sv03" smooth="yes"/>
+      <point x="369" y="154" type="line" smooth="yes" name="sv03"/>
       <point x="534" y="154"/>
       <point x="627" y="212"/>
-      <point x="627" y="333" type="curve" name="dh04" smooth="yes"/>
+      <point x="627" y="333" type="curve" smooth="yes" name="dh04"/>
       <point x="627" y="456"/>
       <point x="532" y="516"/>
-      <point x="369" y="516" type="curve" name="dv03" smooth="yes"/>
+      <point x="369" y="516" type="curve" smooth="yes" name="dv03"/>
       <point x="286" y="516" type="line" name="sh02"/>
       <point x="286" y="154" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0510.glif b/source/Hack-Regular.ufo/glyphs/uni0510.glif
index 30317e86f..511de1bfd 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0510.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0510.glif
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0510" format="1">
+<glyph name="uni0510" format="2">
   <advance width="1233"/>
   <unicode hex="0510"/>
   <outline>
     <contour>
-      <point x="663" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="663" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="331" y="-29"/>
       <point x="137" y="137"/>
-      <point x="137" y="410" type="curve" name="sh01" smooth="yes"/>
+      <point x="137" y="410" type="curve" smooth="yes" name="sh01"/>
       <point x="137" y="613"/>
       <point x="243" y="747"/>
       <point x="440" y="799" type="curve" name="iv01"/>
       <point x="264" y="844"/>
       <point x="172" y="952"/>
-      <point x="172" y="1120" type="curve" name="sh02" smooth="yes"/>
+      <point x="172" y="1120" type="curve" smooth="yes" name="sh02"/>
       <point x="172" y="1359"/>
       <point x="363" y="1520"/>
-      <point x="647" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="647" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="751" y="1520"/>
       <point x="873" y="1499"/>
       <point x="1034" y="1456" type="curve"/>
       <point x="1034" y="1270" type="line"/>
       <point x="890" y="1326"/>
       <point x="760" y="1350"/>
-      <point x="659" y="1350" type="curve" name="sv01" smooth="yes"/>
+      <point x="659" y="1350" type="curve" smooth="yes" name="sv01"/>
       <point x="471" y="1350"/>
       <point x="372" y="1266"/>
-      <point x="372" y="1118" type="curve" name="sh03" smooth="yes"/>
+      <point x="372" y="1118" type="curve" smooth="yes" name="sh03"/>
       <point x="372" y="963"/>
       <point x="480" y="881"/>
-      <point x="667" y="881" type="curve" name="hr01" smooth="yes"/>
+      <point x="667" y="881" type="curve" smooth="yes" name="hr01"/>
       <point x="821" y="881" type="line" name="dv04"/>
       <point x="821" y="715" type="line" name="dv03"/>
       <point x="667" y="715" type="line" smooth="yes"/>
       <point x="464" y="715"/>
       <point x="337" y="608"/>
-      <point x="337" y="426" type="curve" name="sh04" smooth="yes"/>
+      <point x="337" y="426" type="curve" smooth="yes" name="sh04"/>
       <point x="337" y="245"/>
       <point x="459" y="141"/>
-      <point x="684" y="141" type="curve" name="dv02" smooth="yes"/>
+      <point x="684" y="141" type="curve" smooth="yes" name="dv02"/>
       <point x="812" y="141"/>
       <point x="942" y="174"/>
       <point x="1079" y="246" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0511.glif b/source/Hack-Regular.ufo/glyphs/uni0511.glif
index c939f5978..8f7de3707 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0511.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0511.glif
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0511" format="1">
+<glyph name="uni0511" format="2">
   <advance width="1233"/>
   <unicode hex="0511"/>
   <outline>
     <contour>
-      <point x="693" y="-22" type="curve" name="ab01" smooth="yes"/>
+      <point x="693" y="-22" type="curve" smooth="yes" name="ab01"/>
       <point x="361" y="-22"/>
       <point x="169" y="110"/>
-      <point x="169" y="321" type="curve" name="sh01" smooth="yes"/>
+      <point x="169" y="321" type="curve" smooth="yes" name="sh01"/>
       <point x="169" y="480"/>
       <point x="277" y="575"/>
       <point x="449" y="607" type="curve" name="iv01"/>
       <point x="289" y="640"/>
       <point x="201" y="728"/>
-      <point x="201" y="856" type="curve" name="sh02" smooth="yes"/>
+      <point x="201" y="856" type="curve" smooth="yes" name="sh02"/>
       <point x="201" y="1034"/>
       <point x="375" y="1147"/>
-      <point x="655" y="1147" type="curve" name="dv02" smooth="yes"/>
+      <point x="655" y="1147" type="curve" smooth="yes" name="dv02"/>
       <point x="760" y="1147"/>
       <point x="883" y="1131"/>
       <point x="1023" y="1099" type="curve"/>
       <point x="1023" y="932" type="line"/>
       <point x="883" y="968"/>
       <point x="770" y="984"/>
-      <point x="674" y="984" type="curve" name="dv01" smooth="yes"/>
+      <point x="674" y="984" type="curve" smooth="yes" name="dv01"/>
       <point x="485" y="984"/>
       <point x="384" y="922"/>
-      <point x="384" y="830" type="curve" name="sh03" smooth="yes"/>
+      <point x="384" y="830" type="curve" smooth="yes" name="sh03"/>
       <point x="384" y="739"/>
       <point x="482" y="676"/>
-      <point x="663" y="676" type="curve" name="hr01" smooth="yes"/>
+      <point x="663" y="676" type="curve" smooth="yes" name="hr01"/>
       <point x="829" y="676" type="line" name="dv04"/>
       <point x="829" y="532" type="line" name="dv03"/>
       <point x="670" y="532" type="line" smooth="yes"/>
       <point x="470" y="532"/>
       <point x="352" y="454"/>
-      <point x="352" y="334" type="curve" name="sh04" smooth="yes"/>
+      <point x="352" y="334" type="curve" smooth="yes" name="sh04"/>
       <point x="352" y="213"/>
       <point x="474" y="138"/>
-      <point x="707" y="138" type="curve" name="sv01" smooth="yes"/>
+      <point x="707" y="138" type="curve" smooth="yes" name="sv01"/>
       <point x="839" y="138"/>
       <point x="960" y="162"/>
       <point x="1064" y="207" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni051A_.glif b/source/Hack-Regular.ufo/glyphs/uni051A_.glif
index 767dbfd95..c17a8ebed 100644
--- a/source/Hack-Regular.ufo/glyphs/uni051A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni051A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni051A" format="1">
+<glyph name="uni051A" format="2">
   <advance width="1233"/>
   <unicode hex="051A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni051B_.glif b/source/Hack-Regular.ufo/glyphs/uni051B_.glif
index 2826caa0c..2d641103c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni051B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni051B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni051B" format="1">
+<glyph name="uni051B" format="2">
   <advance width="1233"/>
   <unicode hex="051B"/>
   <outline>
@@ -7,13 +7,13 @@
       <point x="865" y="139" type="line" name="iv01"/>
       <point x="804" y="26"/>
       <point x="703" y="-33"/>
-      <point x="563" y="-33" type="curve" name="dv01" smooth="yes"/>
+      <point x="563" y="-33" type="curve" smooth="yes" name="dv01"/>
       <point x="298" y="-33"/>
       <point x="132" y="187"/>
-      <point x="132" y="554" type="curve" name="sh01" smooth="yes"/>
+      <point x="132" y="554" type="curve" smooth="yes" name="sh01"/>
       <point x="132" y="920"/>
       <point x="298" y="1143"/>
-      <point x="563" y="1143" type="curve" name="at02" smooth="yes"/>
+      <point x="563" y="1143" type="curve" smooth="yes" name="at02"/>
       <point x="700" y="1143"/>
       <point x="804" y="1085"/>
       <point x="865" y="973" type="curve" name="sh02"/>
@@ -23,16 +23,16 @@
       <point x="865" y="-430" type="line" name="ah01"/>
     </contour>
     <contour>
-      <point x="595" y="123" type="curve" name="dv02" smooth="yes"/>
+      <point x="595" y="123" type="curve" smooth="yes" name="dv02"/>
       <point x="774" y="123"/>
       <point x="865" y="270"/>
-      <point x="865" y="555" type="curve" name="hr01" smooth="yes"/>
+      <point x="865" y="555" type="curve" smooth="yes" name="hr01"/>
       <point x="865" y="840"/>
       <point x="774" y="987"/>
-      <point x="595" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="595" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="416" y="987"/>
       <point x="327" y="842"/>
-      <point x="327" y="555" type="curve" name="sh04" smooth="yes"/>
+      <point x="327" y="555" type="curve" smooth="yes" name="sh04"/>
       <point x="327" y="268"/>
       <point x="416" y="123"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni051C_.glif b/source/Hack-Regular.ufo/glyphs/uni051C_.glif
index a0b443415..147253d61 100644
--- a/source/Hack-Regular.ufo/glyphs/uni051C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni051C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni051C" format="1">
+<glyph name="uni051C" format="2">
   <advance width="1233"/>
   <unicode hex="051C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni051D_.glif b/source/Hack-Regular.ufo/glyphs/uni051D_.glif
index 4bc10b8cd..c82013679 100644
--- a/source/Hack-Regular.ufo/glyphs/uni051D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni051D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni051D" format="1">
+<glyph name="uni051D" format="2">
   <advance width="1233"/>
   <unicode hex="051D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0531.glif b/source/Hack-Regular.ufo/glyphs/uni0531.glif
index 08d8dbfba..e2d197f94 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0531.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0531.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0531" format="1">
+<glyph name="uni0531" format="2">
   <advance width="1233"/>
   <unicode hex="0531"/>
   <outline>
@@ -10,19 +10,19 @@
       <point x="868" y="39" type="curve" name="sh02"/>
       <point x="793" y="-6"/>
       <point x="699" y="-29"/>
-      <point x="587" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="587" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="440" y="-29"/>
       <point x="324" y="10"/>
       <point x="244" y="90" type="curve" smooth="yes"/>
       <point x="163" y="170"/>
       <point x="119" y="290"/>
-      <point x="119" y="457" type="curve" name="sh03" smooth="yes"/>
+      <point x="119" y="457" type="curve" smooth="yes" name="sh03"/>
       <point x="119" y="1493" type="line" name="at01"/>
       <point x="321" y="1493" type="line"/>
-      <point x="321" y="395" type="line" name="sh04" smooth="yes"/>
+      <point x="321" y="395" type="line" smooth="yes" name="sh04"/>
       <point x="321" y="277"/>
       <point x="360" y="135"/>
-      <point x="588" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="588" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="637" y="135"/>
       <point x="680" y="142"/>
       <point x="716" y="155" type="curve" name="ih01"/>
@@ -35,10 +35,10 @@
       <point x="833" y="268" type="curve" name="ih02"/>
       <point x="850" y="309"/>
       <point x="855" y="352"/>
-      <point x="855" y="395" type="curve" name="ah01" smooth="yes"/>
+      <point x="855" y="395" type="curve" smooth="yes" name="ah01"/>
       <point x="855" y="1493" type="line" name="at02"/>
       <point x="1057" y="1493" type="line"/>
-      <point x="1057" y="457" type="line" name="sh01" smooth="yes"/>
+      <point x="1057" y="457" type="line" smooth="yes" name="sh01"/>
       <point x="1057" y="333"/>
       <point x="1033" y="238"/>
       <point x="988" y="162" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0532.glif b/source/Hack-Regular.ufo/glyphs/uni0532.glif
index 493ea72f9..e77932e8b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0532.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0532.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0532" format="1">
+<glyph name="uni0532" format="2">
   <advance width="1233"/>
   <unicode hex="0532"/>
   <outline>
     <contour>
-      <point x="128" y="1036" type="line" name="hr00" smooth="yes"/>
+      <point x="128" y="1036" type="line" smooth="yes" name="hr00"/>
       <point x="128" y="1203"/>
       <point x="172" y="1322"/>
       <point x="253" y="1402" type="curve" smooth="yes"/>
       <point x="333" y="1481"/>
       <point x="444" y="1520"/>
-      <point x="596" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="596" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="745" y="1520"/>
       <point x="861" y="1482"/>
       <point x="942" y="1402" type="curve" smooth="yes"/>
@@ -22,10 +22,10 @@
       <point x="864" y="1098" type="line" smooth="yes"/>
       <point x="864" y="1216"/>
       <point x="825" y="1356"/>
-      <point x="596" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="596" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="369" y="1356"/>
       <point x="330" y="1216"/>
-      <point x="330" y="1098" type="curve" name="sh02" smooth="yes"/>
+      <point x="330" y="1098" type="curve" smooth="yes" name="sh02"/>
       <point x="330" y="621" type="line"/>
       <point x="1104" y="621" type="line" name="dv02"/>
       <point x="1104" y="451" type="line" name="dv01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0533.glif b/source/Hack-Regular.ufo/glyphs/uni0533.glif
index 623f41fb7..17c3f081c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0533.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0533.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0533" format="1">
+<glyph name="uni0533" format="2">
   <advance width="1233"/>
   <unicode hex="0533"/>
   <outline>
@@ -11,16 +11,16 @@
       <point x="212" y="579" type="curve" smooth="yes"/>
       <point x="131" y="667"/>
       <point x="85" y="796"/>
-      <point x="85" y="991" type="curve" name="sh01" smooth="yes"/>
+      <point x="85" y="991" type="curve" smooth="yes" name="sh01"/>
       <point x="85" y="1367"/>
       <point x="256" y="1520"/>
-      <point x="552" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="552" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="700" y="1520"/>
       <point x="817" y="1482"/>
       <point x="898" y="1397" type="curve" smooth="yes"/>
       <point x="978" y="1312"/>
       <point x="1023" y="1180"/>
-      <point x="1023" y="988" type="curve" name="sh03" smooth="yes"/>
+      <point x="1023" y="988" type="curve" smooth="yes" name="sh03"/>
       <point x="1023" y="621" type="line" name="sv01"/>
       <point x="1148" y="621" type="line"/>
       <point x="1148" y="451" type="line" name="sv02"/>
@@ -33,10 +33,10 @@
       <point x="821" y="1058" type="line" smooth="yes"/>
       <point x="821" y="1205"/>
       <point x="780" y="1356"/>
-      <point x="551" y="1356" type="curve" name="sv03" smooth="yes"/>
+      <point x="551" y="1356" type="curve" smooth="yes" name="sv03"/>
       <point x="324" y="1356"/>
       <point x="287" y="1204"/>
-      <point x="287" y="988" type="curve" name="sh05" smooth="yes"/>
+      <point x="287" y="988" type="curve" smooth="yes" name="sh05"/>
       <point x="287" y="880"/>
       <point x="297" y="788"/>
       <point x="334" y="724" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0534.glif b/source/Hack-Regular.ufo/glyphs/uni0534.glif
index 545e8e080..3429f681a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0534.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0534.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0534" format="1">
+<glyph name="uni0534" format="2">
   <advance width="1233"/>
   <unicode hex="0534"/>
   <outline>
     <contour>
-      <point x="790" y="1098" type="line" name="dh02" smooth="yes"/>
+      <point x="790" y="1098" type="line" smooth="yes" name="dh02"/>
       <point x="790" y="1216"/>
       <point x="751" y="1356"/>
-      <point x="522" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="522" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="295" y="1356"/>
       <point x="256" y="1216"/>
       <point x="256" y="1098" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="179" y="1402" type="curve" smooth="yes"/>
       <point x="259" y="1481"/>
       <point x="370" y="1520"/>
-      <point x="522" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="522" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="671" y="1520"/>
       <point x="787" y="1482"/>
       <point x="868" y="1402" type="curve" smooth="yes"/>
       <point x="948" y="1322"/>
       <point x="992" y="1203"/>
-      <point x="992" y="1036" type="curve" name="dh03" smooth="yes"/>
+      <point x="992" y="1036" type="curve" smooth="yes" name="dh03"/>
       <point x="992" y="621" type="line"/>
       <point x="1179" y="621" type="line" name="sh01"/>
       <point x="1179" y="451" type="line" name="dv01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0535.glif b/source/Hack-Regular.ufo/glyphs/uni0535.glif
index 87dbc12c7..4c71a3d1e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0535.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0535.glif
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0535" format="1">
+<glyph name="uni0535" format="2">
   <advance width="1233"/>
   <unicode hex="0535"/>
   <outline>
     <contour>
-      <point x="596" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="596" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="449" y="-29"/>
       <point x="333" y="10"/>
       <point x="253" y="90" type="curve" smooth="yes"/>
       <point x="172" y="170"/>
       <point x="128" y="290"/>
-      <point x="128" y="457" type="curve" name="sh01" smooth="yes"/>
+      <point x="128" y="457" type="curve" smooth="yes" name="sh01"/>
       <point x="128" y="1493" type="line" name="at01"/>
       <point x="330" y="1493" type="line" name="sh03"/>
       <point x="330" y="1120" type="line" name="at02"/>
       <point x="1104" y="1120" type="line"/>
       <point x="1104" y="950" type="line" name="sv01"/>
       <point x="330" y="950" type="line"/>
-      <point x="330" y="395" type="line" name="sh02" smooth="yes"/>
+      <point x="330" y="395" type="line" smooth="yes" name="sh02"/>
       <point x="330" y="277"/>
       <point x="369" y="135"/>
-      <point x="596" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="596" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="825" y="135"/>
       <point x="864" y="277"/>
-      <point x="864" y="395" type="curve" name="ah01" smooth="yes"/>
+      <point x="864" y="395" type="curve" smooth="yes" name="ah01"/>
       <point x="864" y="618" type="line"/>
       <point x="1066" y="618" type="line"/>
-      <point x="1066" y="457" type="line" name="sh04" smooth="yes"/>
+      <point x="1066" y="457" type="line" smooth="yes" name="sh04"/>
       <point x="1066" y="290"/>
       <point x="1022" y="170"/>
       <point x="942" y="90" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0536.glif b/source/Hack-Regular.ufo/glyphs/uni0536.glif
index b0ffb1bf0..fc1bd06f4 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0536.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0536.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0536" format="1">
+<glyph name="uni0536" format="2">
   <advance width="1233"/>
   <unicode hex="0536"/>
   <outline>
@@ -16,28 +16,28 @@
       <point x="834" y="522" type="curve" smooth="yes"/>
       <point x="898" y="642"/>
       <point x="926" y="767"/>
-      <point x="926" y="922" type="curve" name="dh03" smooth="yes"/>
+      <point x="926" y="922" type="curve" smooth="yes" name="dh03"/>
       <point x="926" y="1050"/>
       <point x="906" y="1171"/>
       <point x="850" y="1252" type="curve" smooth="yes"/>
       <point x="799" y="1324"/>
       <point x="729" y="1356"/>
-      <point x="614" y="1356" type="curve" name="sv02" smooth="yes"/>
+      <point x="614" y="1356" type="curve" smooth="yes" name="sv02"/>
       <point x="396" y="1356"/>
       <point x="299" y="1235"/>
-      <point x="299" y="895" type="curve" name="hr01" smooth="yes"/>
+      <point x="299" y="895" type="curve" smooth="yes" name="hr01"/>
       <point x="299" y="875" type="line" name="dh02"/>
       <point x="96" y="875" type="line" name="dh01"/>
       <point x="96" y="895" type="line" smooth="yes"/>
       <point x="96" y="1355"/>
       <point x="320" y="1520"/>
-      <point x="612" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="612" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="764" y="1520"/>
       <point x="886" y="1478"/>
       <point x="981" y="1379" type="curve" smooth="yes"/>
       <point x="1085" y="1271"/>
       <point x="1137" y="1111"/>
-      <point x="1137" y="911" type="curve" name="dh04" smooth="yes"/>
+      <point x="1137" y="911" type="curve" smooth="yes" name="dh04"/>
       <point x="1137" y="771"/>
       <point x="1111" y="656"/>
       <point x="1066" y="551" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0537.glif b/source/Hack-Regular.ufo/glyphs/uni0537.glif
index 46efb5dfc..404e6c2d3 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0537.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0537.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0537" format="1">
+<glyph name="uni0537" format="2">
   <advance width="1233"/>
   <unicode hex="0537"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0538.glif b/source/Hack-Regular.ufo/glyphs/uni0538.glif
index aadc0d173..01ab96ff0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0538.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0538.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0538" format="1">
+<glyph name="uni0538" format="2">
   <advance width="1233"/>
   <unicode hex="0538"/>
   <outline>
     <contour>
-      <point x="128" y="1036" type="line" name="hr00" smooth="yes"/>
+      <point x="128" y="1036" type="line" smooth="yes" name="hr00"/>
       <point x="128" y="1203"/>
       <point x="172" y="1323"/>
       <point x="253" y="1403" type="curve" smooth="yes"/>
       <point x="333" y="1483"/>
       <point x="449" y="1522"/>
-      <point x="596" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="596" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="741" y="1522"/>
       <point x="861" y="1484"/>
       <point x="942" y="1403" type="curve" smooth="yes"/>
@@ -22,10 +22,10 @@
       <point x="864" y="1098" type="line" smooth="yes"/>
       <point x="864" y="1216"/>
       <point x="825" y="1358"/>
-      <point x="596" y="1358" type="curve" name="dv01" smooth="yes"/>
+      <point x="596" y="1358" type="curve" smooth="yes" name="dv01"/>
       <point x="369" y="1358"/>
       <point x="330" y="1216"/>
-      <point x="330" y="1098" type="curve" name="sh02" smooth="yes"/>
+      <point x="330" y="1098" type="curve" smooth="yes" name="sh02"/>
       <point x="330" y="170" type="line" name="sv01"/>
       <point x="1104" y="170" type="line"/>
       <point x="1104" y="0" type="line" name="ab01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0539.glif b/source/Hack-Regular.ufo/glyphs/uni0539.glif
index bd4b3203d..6d8dcd8df 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0539.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0539.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0539" format="1">
+<glyph name="uni0539" format="2">
   <advance width="1233"/>
   <unicode hex="0539"/>
   <outline>
     <contour>
-      <point x="750" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="750" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="565" y="-29"/>
       <point x="421" y="102"/>
-      <point x="421" y="415" type="curve" name="dh03" smooth="yes"/>
+      <point x="421" y="415" type="curve" smooth="yes" name="dh03"/>
       <point x="421" y="728"/>
       <point x="563" y="875"/>
-      <point x="754" y="875" type="curve" name="sv01" smooth="yes"/>
+      <point x="754" y="875" type="curve" smooth="yes" name="sv01"/>
       <point x="892" y="875" type="line" name="dh05"/>
       <point x="892" y="899" type="line" smooth="yes"/>
       <point x="892" y="1070"/>
@@ -21,7 +21,7 @@
       <point x="735" y="1331" type="curve" smooth="yes"/>
       <point x="696" y="1348"/>
       <point x="645" y="1356"/>
-      <point x="582" y="1356" type="curve" name="sv02" smooth="yes"/>
+      <point x="582" y="1356" type="curve" smooth="yes" name="sv02"/>
       <point x="338" y="1356"/>
       <point x="269" y="1232"/>
       <point x="269" y="909" type="curve" smooth="yes"/>
@@ -33,7 +33,7 @@
       <point x="208" y="1374" type="curve" smooth="yes"/>
       <point x="296" y="1471"/>
       <point x="422" y="1520"/>
-      <point x="581" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="581" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="744" y="1520"/>
       <point x="870" y="1468"/>
       <point x="955" y="1371" type="curve" smooth="yes"/>
@@ -52,21 +52,21 @@
       <point x="849" y="-29"/>
     </contour>
     <contour>
-      <point x="752" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="752" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="799" y="135"/>
       <point x="834" y="151"/>
       <point x="858" y="196" type="curve" smooth="yes"/>
       <point x="881" y="239"/>
       <point x="892" y="307"/>
-      <point x="892" y="415" type="curve" name="sh01" smooth="yes"/>
+      <point x="892" y="415" type="curve" smooth="yes" name="sh01"/>
       <point x="892" y="700" type="line" name="sv03"/>
       <point x="754" y="700" type="line" smooth="yes"/>
       <point x="684" y="700"/>
       <point x="641" y="666"/>
-      <point x="627" y="555" type="curve" name="sh02" smooth="yes"/>
+      <point x="627" y="555" type="curve" smooth="yes" name="sh02"/>
       <point x="622" y="518"/>
       <point x="619" y="473"/>
-      <point x="619" y="413" type="curve" name="dh04" smooth="yes"/>
+      <point x="619" y="413" type="curve" smooth="yes" name="dh04"/>
       <point x="619" y="304"/>
       <point x="629" y="234"/>
       <point x="652" y="191" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni053A_.glif b/source/Hack-Regular.ufo/glyphs/uni053A_.glif
index e2cc22bb6..32565739f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni053A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni053A_.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni053A" format="1">
+<glyph name="uni053A" format="2">
   <advance width="1233"/>
   <unicode hex="053A"/>
   <outline>
     <contour>
-      <point x="542" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="542" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="237" y="-29"/>
       <point x="70" y="164"/>
-      <point x="70" y="539" type="curve" name="sh01" smooth="yes"/>
+      <point x="70" y="539" type="curve" smooth="yes" name="sh01"/>
       <point x="70" y="735"/>
       <point x="117" y="877"/>
       <point x="197" y="973" type="curve" smooth="yes"/>
       <point x="278" y="1069"/>
       <point x="396" y="1120"/>
-      <point x="537" y="1120" type="curve" name="at02" smooth="yes"/>
+      <point x="537" y="1120" type="curve" smooth="yes" name="at02"/>
       <point x="806" y="1120" type="line" name="ah01"/>
       <point x="806" y="1493" type="line" name="at01"/>
       <point x="1008" y="1493" type="line"/>
@@ -29,18 +29,18 @@
       <point x="682" y="-29"/>
     </contour>
     <contour>
-      <point x="541" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="541" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="762" y="135"/>
       <point x="806" y="286"/>
-      <point x="806" y="433" type="curve" name="sh04" smooth="yes"/>
+      <point x="806" y="433" type="curve" smooth="yes" name="sh04"/>
       <point x="806" y="950" type="line" name="sv02"/>
-      <point x="537" y="950" type="line" name="sv03" smooth="yes"/>
+      <point x="537" y="950" type="line" smooth="yes" name="sv03"/>
       <point x="421" y="950"/>
       <point x="356" y="904"/>
       <point x="319" y="828" type="curve" smooth="yes"/>
       <point x="284" y="756"/>
       <point x="272" y="659"/>
-      <point x="272" y="542" type="curve" name="sh05" smooth="yes"/>
+      <point x="272" y="542" type="curve" smooth="yes" name="sh05"/>
       <point x="272" y="327"/>
       <point x="305" y="135"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni053B_.glif b/source/Hack-Regular.ufo/glyphs/uni053B_.glif
index 06a6b2a38..7eef62562 100644
--- a/source/Hack-Regular.ufo/glyphs/uni053B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni053B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni053B" format="1">
+<glyph name="uni053B" format="2">
   <advance width="1233"/>
   <unicode hex="053B"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="389" y="1061" type="line" name="iv01"/>
       <point x="469" y="1117"/>
       <point x="555" y="1141"/>
-      <point x="663" y="1141" type="curve" name="at01" smooth="yes"/>
+      <point x="663" y="1141" type="curve" smooth="yes" name="at01"/>
       <point x="800" y="1141"/>
       <point x="920" y="1102"/>
       <point x="1001" y="1022" type="curve" smooth="yes"/>
@@ -21,10 +21,10 @@
       <point x="923" y="717" type="line" smooth="yes"/>
       <point x="923" y="835"/>
       <point x="884" y="977"/>
-      <point x="655" y="977" type="curve" name="sv01" smooth="yes"/>
+      <point x="655" y="977" type="curve" smooth="yes" name="sv01"/>
       <point x="428" y="977"/>
       <point x="389" y="835"/>
-      <point x="389" y="717" type="curve" name="sh03" smooth="yes"/>
+      <point x="389" y="717" type="curve" smooth="yes" name="sh03"/>
       <point x="389" y="0" type="line" name="ab01"/>
       <point x="187" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni053C_.glif b/source/Hack-Regular.ufo/glyphs/uni053C_.glif
index e473b32b9..3985b7dc8 100644
--- a/source/Hack-Regular.ufo/glyphs/uni053C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni053C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni053C" format="1">
+<glyph name="uni053C" format="2">
   <advance width="1233"/>
   <unicode hex="053C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni053D_.glif b/source/Hack-Regular.ufo/glyphs/uni053D_.glif
index 9bfba6621..c69418676 100644
--- a/source/Hack-Regular.ufo/glyphs/uni053D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni053D_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni053D" format="1">
+<glyph name="uni053D" format="2">
   <advance width="1233"/>
   <unicode hex="053D"/>
   <outline>
     <contour>
-      <point x="806" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="806" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="658" y="-29"/>
       <point x="579" y="9"/>
       <point x="530" y="80" type="curve" smooth="yes"/>
       <point x="478" y="155"/>
       <point x="462" y="265"/>
-      <point x="462" y="425" type="curve" name="dh03" smooth="yes"/>
+      <point x="462" y="425" type="curve" smooth="yes" name="dh03"/>
       <point x="462" y="945" type="line" name="sv01"/>
       <point x="279" y="945" type="line"/>
       <point x="279" y="0" type="line" name="dh02"/>
@@ -19,19 +19,19 @@
       <point x="279" y="1493" type="line" name="sh01"/>
       <point x="279" y="1120" type="line" name="at02"/>
       <point x="648" y="1120" type="line"/>
-      <point x="648" y="401" type="line" name="dh04" smooth="yes"/>
+      <point x="648" y="401" type="line" smooth="yes" name="dh04"/>
       <point x="648" y="201"/>
       <point x="678" y="135"/>
-      <point x="806" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="806" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="871" y="135"/>
       <point x="908" y="153"/>
-      <point x="928" y="193" type="curve" name="hr01" smooth="yes"/>
+      <point x="928" y="193" type="curve" smooth="yes" name="hr01"/>
       <point x="948" y="234"/>
       <point x="954" y="301"/>
-      <point x="954" y="401" type="curve" name="dh05" smooth="yes"/>
+      <point x="954" y="401" type="curve" smooth="yes" name="dh05"/>
       <point x="954" y="1120" type="line" name="at03"/>
       <point x="1140" y="1120" type="line"/>
-      <point x="1140" y="425" type="line" name="dh06" smooth="yes"/>
+      <point x="1140" y="425" type="line" smooth="yes" name="dh06"/>
       <point x="1140" y="265"/>
       <point x="1126" y="155"/>
       <point x="1078" y="80" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni053E_.glif b/source/Hack-Regular.ufo/glyphs/uni053E_.glif
index 634427759..ad1aeeb4b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni053E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni053E_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni053E" format="1">
+<glyph name="uni053E" format="2">
   <advance width="1233"/>
   <unicode hex="053E"/>
   <outline>
     <contour>
-      <point x="626" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="626" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="416" y="-29"/>
       <point x="285" y="43"/>
       <point x="206" y="159" type="curve" smooth="yes"/>
       <point x="126" y="276"/>
       <point x="100" y="436"/>
-      <point x="100" y="611" type="curve" name="ih01" smooth="yes"/>
+      <point x="100" y="611" type="curve" smooth="yes" name="ih01"/>
       <point x="100" y="796"/>
       <point x="131" y="942"/>
       <point x="192" y="1081" type="curve" name="sv01"/>
@@ -24,17 +24,17 @@
       <point x="518" y="1448" type="curve" smooth="yes"/>
       <point x="606" y="1495"/>
       <point x="702" y="1520"/>
-      <point x="829" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="829" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="892" y="1520"/>
       <point x="956" y="1514"/>
-      <point x="1011" y="1502" type="curve" name="at03" smooth="yes"/>
+      <point x="1011" y="1502" type="curve" smooth="yes" name="at03"/>
       <point x="1067" y="1490"/>
       <point x="1118" y="1471"/>
       <point x="1174" y="1448" type="curve" name="sh01"/>
       <point x="1174" y="1233" type="line" name="ih02"/>
       <point x="1030" y="1326"/>
       <point x="909" y="1357"/>
-      <point x="800" y="1357" type="curve" name="sv02" smooth="yes"/>
+      <point x="800" y="1357" type="curve" smooth="yes" name="sv02"/>
       <point x="675" y="1357"/>
       <point x="578" y="1316"/>
       <point x="502" y="1247" type="curve" name="ih03"/>
@@ -43,7 +43,7 @@
       <point x="1001" y="1079" type="curve" smooth="yes"/>
       <point x="1114" y="974"/>
       <point x="1178" y="818"/>
-      <point x="1178" y="593" type="curve" name="dh04" smooth="yes"/>
+      <point x="1178" y="593" type="curve" smooth="yes" name="dh04"/>
       <point x="1178" y="484"/>
       <point x="1163" y="380"/>
       <point x="1130" y="291" type="curve" smooth="yes"/>
@@ -54,13 +54,13 @@
       <point x="767" y="-29"/>
     </contour>
     <contour>
-      <point x="632" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="632" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="853" y="135"/>
       <point x="930" y="235"/>
       <point x="956" y="372" type="curve" smooth="yes"/>
       <point x="969" y="439"/>
       <point x="970" y="529"/>
-      <point x="970" y="581" type="curve" name="dh03" smooth="yes"/>
+      <point x="970" y="581" type="curve" smooth="yes" name="dh03"/>
       <point x="970" y="674"/>
       <point x="967" y="765"/>
       <point x="940" y="840" type="curve" smooth="yes"/>
@@ -69,18 +69,18 @@
       <point x="784" y="1013" type="curve" smooth="yes"/>
       <point x="699" y="1056"/>
       <point x="578" y="1081"/>
-      <point x="399" y="1081" type="curve" name="hr01" smooth="yes"/>
+      <point x="399" y="1081" type="curve" smooth="yes" name="hr01"/>
       <point x="387" y="1081" type="line" name="sv03"/>
       <point x="330" y="952"/>
       <point x="307" y="793"/>
-      <point x="307" y="621" type="curve" name="sh02" smooth="yes"/>
+      <point x="307" y="621" type="curve" smooth="yes" name="sh02"/>
       <point x="307" y="585" type="line" smooth="yes"/>
       <point x="307" y="513"/>
       <point x="307" y="446"/>
       <point x="318" y="383" type="curve" smooth="yes"/>
       <point x="330" y="307"/>
       <point x="352" y="248"/>
-      <point x="399" y="205" type="curve" name="hr02" smooth="yes"/>
+      <point x="399" y="205" type="curve" smooth="yes" name="hr02"/>
       <point x="447" y="161"/>
       <point x="519" y="135"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni053F_.glif b/source/Hack-Regular.ufo/glyphs/uni053F_.glif
index ba9c6ea8a..7d695212d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni053F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni053F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni053F" format="1">
+<glyph name="uni053F" format="2">
   <advance width="1233"/>
   <unicode hex="053F"/>
   <outline>
@@ -7,22 +7,22 @@
       <point x="883" y="431" type="line" name="hr00"/>
       <point x="811" y="383"/>
       <point x="730" y="352"/>
-      <point x="607" y="352" type="curve" name="dv01" smooth="yes"/>
+      <point x="607" y="352" type="curve" smooth="yes" name="dv01"/>
       <point x="466" y="352"/>
       <point x="351" y="394"/>
       <point x="272" y="471" type="curve" smooth="yes"/>
       <point x="191" y="551"/>
       <point x="147" y="671"/>
-      <point x="147" y="838" type="curve" name="sh01" smooth="yes"/>
+      <point x="147" y="838" type="curve" smooth="yes" name="sh01"/>
       <point x="147" y="1493" type="line" name="at01"/>
       <point x="349" y="1493" type="line"/>
-      <point x="349" y="776" type="line" name="sh02" smooth="yes"/>
+      <point x="349" y="776" type="line" smooth="yes" name="sh02"/>
       <point x="349" y="658"/>
       <point x="388" y="516"/>
-      <point x="615" y="516" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="516" type="curve" smooth="yes" name="dv02"/>
       <point x="844" y="516"/>
       <point x="883" y="658"/>
-      <point x="883" y="776" type="curve" name="sh03" smooth="yes"/>
+      <point x="883" y="776" type="curve" smooth="yes" name="sh03"/>
       <point x="883" y="1120" type="line" name="at02"/>
       <point x="1085" y="1120" type="line"/>
       <point x="1085" y="0" type="line" name="sh04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0540.glif b/source/Hack-Regular.ufo/glyphs/uni0540.glif
index 1db4141d1..d5ac307a1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0540.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0540.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0540" format="1">
+<glyph name="uni0540" format="2">
   <advance width="1233"/>
   <unicode hex="0540"/>
   <outline>
     <contour>
-      <point x="320" y="266" type="line" name="hr00" smooth="yes"/>
+      <point x="320" y="266" type="line" smooth="yes" name="hr00"/>
       <point x="240" y="298"/>
       <point x="187" y="327"/>
       <point x="144" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0541.glif b/source/Hack-Regular.ufo/glyphs/uni0541.glif
index 3943982d0..1fecb9685 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0541.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0541.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0541" format="1">
+<glyph name="uni0541" format="2">
   <advance width="1233"/>
   <unicode hex="0541"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="839" y="148" type="curve"/>
       <point x="722" y="36"/>
       <point x="585" y="-29"/>
-      <point x="433" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="433" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="341" y="-29"/>
       <point x="260" y="-5"/>
       <point x="200" y="46" type="curve" smooth="yes"/>
@@ -22,19 +22,19 @@
       <point x="200" y="490" type="curve" smooth="yes"/>
       <point x="256" y="542"/>
       <point x="338" y="570"/>
-      <point x="435" y="570" type="curve" name="dv04" smooth="yes"/>
+      <point x="435" y="570" type="curve" smooth="yes" name="dv04"/>
       <point x="572" y="570"/>
       <point x="700" y="515"/>
       <point x="817" y="427" type="curve"/>
       <point x="890" y="570"/>
       <point x="925" y="717"/>
-      <point x="925" y="901" type="curve" name="ah01" smooth="yes"/>
+      <point x="925" y="901" type="curve" smooth="yes" name="ah01"/>
       <point x="925" y="1054"/>
       <point x="901" y="1179"/>
       <point x="850" y="1252" type="curve" smooth="yes"/>
       <point x="797" y="1329"/>
       <point x="711" y="1356"/>
-      <point x="611" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="611" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="397" y="1356"/>
       <point x="298" y="1235"/>
       <point x="298" y="895" type="curve" smooth="yes"/>
@@ -46,13 +46,13 @@
       <point x="244" y="1380" type="curve" smooth="yes"/>
       <point x="336" y="1479"/>
       <point x="465" y="1520"/>
-      <point x="609" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="609" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="756" y="1520"/>
       <point x="888" y="1478"/>
       <point x="981" y="1382" type="curve" smooth="yes"/>
       <point x="1077" y="1283"/>
       <point x="1136" y="1125"/>
-      <point x="1136" y="901" type="curve" name="sh03" smooth="yes"/>
+      <point x="1136" y="901" type="curve" smooth="yes" name="sh03"/>
       <point x="1136" y="661"/>
       <point x="1068" y="459"/>
       <point x="961" y="295" type="curve"/>
@@ -61,16 +61,16 @@
       <point x="1138" y="54" type="curve" name="sh04"/>
     </contour>
     <contour>
-      <point x="438" y="133" type="curve" name="dv02" smooth="yes"/>
+      <point x="438" y="133" type="curve" smooth="yes" name="dv02"/>
       <point x="529" y="133"/>
       <point x="628" y="183"/>
       <point x="715" y="279" type="curve"/>
       <point x="623" y="362"/>
       <point x="527" y="408"/>
-      <point x="440" y="408" type="curve" name="dv03" smooth="yes"/>
+      <point x="440" y="408" type="curve" smooth="yes" name="dv03"/>
       <point x="349" y="408"/>
       <point x="300" y="357"/>
-      <point x="300" y="269" type="curve" name="sh05" smooth="yes"/>
+      <point x="300" y="269" type="curve" smooth="yes" name="sh05"/>
       <point x="300" y="182"/>
       <point x="347" y="133"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0542.glif b/source/Hack-Regular.ufo/glyphs/uni0542.glif
index 1cfb550bd..63d238c60 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0542.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0542.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0542" format="1">
+<glyph name="uni0542" format="2">
   <advance width="1233"/>
   <unicode hex="0542"/>
   <outline>
     <contour>
-      <point x="790" y="1098" type="line" name="dh03" smooth="yes"/>
+      <point x="790" y="1098" type="line" smooth="yes" name="dh03"/>
       <point x="790" y="1216"/>
       <point x="751" y="1356"/>
-      <point x="522" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="522" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="295" y="1356"/>
       <point x="256" y="1216"/>
       <point x="256" y="1098" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="179" y="1402" type="curve" smooth="yes"/>
       <point x="259" y="1481"/>
       <point x="370" y="1520"/>
-      <point x="522" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="522" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="671" y="1520"/>
       <point x="787" y="1482"/>
       <point x="868" y="1402" type="curve" smooth="yes"/>
       <point x="948" y="1322"/>
       <point x="992" y="1203"/>
-      <point x="992" y="1036" type="curve" name="dh04" smooth="yes"/>
+      <point x="992" y="1036" type="curve" smooth="yes" name="dh04"/>
       <point x="992" y="170" type="line" name="sv02"/>
       <point x="1179" y="170" type="line" name="sh01"/>
       <point x="1179" y="0" type="line" name="ab01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0543.glif b/source/Hack-Regular.ufo/glyphs/uni0543.glif
index a39d51844..3f6b79d87 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0543.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0543.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0543" format="1">
+<glyph name="uni0543" format="2">
   <advance width="1233"/>
   <unicode hex="0543"/>
   <outline>
     <contour>
-      <point x="363" y="0" type="line" name="ab01" smooth="yes"/>
+      <point x="363" y="0" type="line" smooth="yes" name="ab01"/>
       <point x="288" y="0"/>
       <point x="218" y="14"/>
       <point x="165" y="54" type="curve" smooth="yes"/>
       <point x="116" y="91"/>
       <point x="86" y="147"/>
-      <point x="86" y="238" type="curve" name="dh01" smooth="yes"/>
+      <point x="86" y="238" type="curve" smooth="yes" name="dh01"/>
       <point x="86" y="352"/>
       <point x="135" y="481"/>
       <point x="255" y="687" type="curve" smooth="yes"/>
@@ -38,7 +38,7 @@
       <point x="429" y="618" type="curve" smooth="yes"/>
       <point x="341" y="465"/>
       <point x="302" y="366"/>
-      <point x="302" y="295" type="curve" name="dh02" smooth="yes"/>
+      <point x="302" y="295" type="curve" smooth="yes" name="dh02"/>
       <point x="302" y="203"/>
       <point x="370" y="175"/>
       <point x="491" y="175" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0544.glif b/source/Hack-Regular.ufo/glyphs/uni0544.glif
index 0fe9f1362..2ea3fef11 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0544.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0544.glif
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0544" format="1">
+<glyph name="uni0544" format="2">
   <advance width="1233"/>
   <unicode hex="0544"/>
   <outline>
     <contour>
-      <point x="554" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="554" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="407" y="-29"/>
       <point x="291" y="10"/>
       <point x="211" y="90" type="curve" smooth="yes"/>
       <point x="130" y="170"/>
       <point x="86" y="290"/>
-      <point x="86" y="457" type="curve" name="dh01" smooth="yes"/>
+      <point x="86" y="457" type="curve" smooth="yes" name="dh01"/>
       <point x="86" y="1493" type="line" name="at01"/>
       <point x="288" y="1493" type="line" name="hr01"/>
-      <point x="288" y="395" type="line" name="dh02" smooth="yes"/>
+      <point x="288" y="395" type="line" smooth="yes" name="dh02"/>
       <point x="288" y="277"/>
       <point x="327" y="135"/>
-      <point x="554" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="554" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="783" y="135"/>
       <point x="822" y="277"/>
-      <point x="822" y="395" type="curve" name="dh03" smooth="yes"/>
+      <point x="822" y="395" type="curve" smooth="yes" name="dh03"/>
       <point x="822" y="1493" type="line" name="at02"/>
       <point x="1211" y="1493" type="line"/>
       <point x="1211" y="1323" type="line" name="sh01"/>
       <point x="1024" y="1323" type="line"/>
-      <point x="1024" y="457" type="line" name="dh04" smooth="yes"/>
+      <point x="1024" y="457" type="line" smooth="yes" name="dh04"/>
       <point x="1024" y="290"/>
       <point x="980" y="170"/>
       <point x="900" y="90" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0545.glif b/source/Hack-Regular.ufo/glyphs/uni0545.glif
index eb057c1c7..1839fcf76 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0545.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0545.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0545" format="1">
+<glyph name="uni0545" format="2">
   <advance width="1233"/>
   <unicode hex="0545"/>
   <outline>
     <contour>
-      <point x="656" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="656" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="299" y="-29"/>
       <point x="147" y="193"/>
       <point x="147" y="447" type="curve"/>
@@ -14,44 +14,44 @@
       <point x="426" y="227" type="curve" smooth="yes"/>
       <point x="473" y="172"/>
       <point x="544" y="135"/>
-      <point x="657" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="657" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="764" y="135"/>
       <point x="839" y="167"/>
-      <point x="888" y="222" type="curve" name="hr01" smooth="yes"/>
+      <point x="888" y="222" type="curve" smooth="yes" name="hr01"/>
       <point x="935" y="273"/>
       <point x="959" y="346"/>
-      <point x="959" y="430" type="curve" name="dh01" smooth="yes"/>
+      <point x="959" y="430" type="curve" smooth="yes" name="dh01"/>
       <point x="959" y="517"/>
       <point x="933" y="584"/>
       <point x="881" y="632" type="curve" smooth="yes"/>
       <point x="829" y="679"/>
       <point x="753" y="705"/>
-      <point x="656" y="705" type="curve" name="dv03" smooth="yes"/>
+      <point x="656" y="705" type="curve" smooth="yes" name="dv03"/>
       <point x="64" y="705" type="line"/>
       <point x="64" y="875" type="line"/>
-      <point x="656" y="875" type="line" name="hr02" smooth="yes"/>
+      <point x="656" y="875" type="line" smooth="yes" name="hr02"/>
       <point x="744" y="875"/>
       <point x="805" y="905"/>
       <point x="845" y="953" type="curve" smooth="yes"/>
       <point x="884" y="1000"/>
       <point x="900" y="1060"/>
-      <point x="900" y="1128" type="curve" name="sh01" smooth="yes"/>
+      <point x="900" y="1128" type="curve" smooth="yes" name="sh01"/>
       <point x="900" y="1283"/>
       <point x="815" y="1356"/>
-      <point x="655" y="1356" type="curve" name="sv02" smooth="yes"/>
+      <point x="655" y="1356" type="curve" smooth="yes" name="sv02"/>
       <point x="499" y="1356"/>
       <point x="417" y="1284"/>
       <point x="417" y="1120" type="curve" name="dh04"/>
       <point x="207" y="1120" type="line" name="dh03"/>
       <point x="207" y="1364"/>
       <point x="389" y="1520"/>
-      <point x="655" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="655" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="791" y="1520"/>
       <point x="903" y="1481"/>
-      <point x="983" y="1413" type="curve" name="hr03" smooth="yes"/>
+      <point x="983" y="1413" type="curve" smooth="yes" name="hr03"/>
       <point x="1059" y="1348"/>
       <point x="1110" y="1251"/>
-      <point x="1110" y="1126" type="curve" name="ih01" smooth="yes"/>
+      <point x="1110" y="1126" type="curve" smooth="yes" name="ih01"/>
       <point x="1110" y="1046"/>
       <point x="1090" y="978"/>
       <point x="1055" y="922" type="curve" smooth="yes"/>
@@ -60,7 +60,7 @@
       <point x="907" y="805" type="curve" name="ih02"/>
       <point x="1089" y="760"/>
       <point x="1169" y="611"/>
-      <point x="1169" y="441" type="curve" name="dh02" smooth="yes"/>
+      <point x="1169" y="441" type="curve" smooth="yes" name="dh02"/>
       <point x="1169" y="324"/>
       <point x="1134" y="204"/>
       <point x="1047" y="113" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0546.glif b/source/Hack-Regular.ufo/glyphs/uni0546.glif
index bc4e10d2e..b495221dd 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0546.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0546.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0546" format="1">
+<glyph name="uni0546" format="2">
   <advance width="1233"/>
   <unicode hex="0546"/>
   <outline>
     <contour>
-      <point x="709" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="709" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="562" y="-29"/>
       <point x="446" y="10"/>
       <point x="366" y="90" type="curve" smooth="yes"/>
       <point x="285" y="170"/>
       <point x="241" y="290"/>
-      <point x="241" y="457" type="curve" name="sh01" smooth="yes"/>
+      <point x="241" y="457" type="curve" smooth="yes" name="sh01"/>
       <point x="241" y="1323" type="line" name="sv01"/>
       <point x="54" y="1323" type="line"/>
       <point x="54" y="1493" type="line" name="dh01"/>
@@ -18,13 +18,13 @@
       <point x="443" y="395" type="line" smooth="yes"/>
       <point x="443" y="277"/>
       <point x="482" y="135"/>
-      <point x="709" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="709" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="938" y="135"/>
       <point x="977" y="277"/>
-      <point x="977" y="395" type="curve" name="dh03" smooth="yes"/>
+      <point x="977" y="395" type="curve" smooth="yes" name="dh03"/>
       <point x="977" y="618" type="line"/>
       <point x="1179" y="618" type="line" name="hr01"/>
-      <point x="1179" y="457" type="line" name="dh04" smooth="yes"/>
+      <point x="1179" y="457" type="line" smooth="yes" name="dh04"/>
       <point x="1179" y="290"/>
       <point x="1135" y="170"/>
       <point x="1055" y="90" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0547.glif b/source/Hack-Regular.ufo/glyphs/uni0547.glif
index 711e4397d..8b74503d6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0547.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0547.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0547" format="1">
+<glyph name="uni0547" format="2">
   <advance width="1233"/>
   <unicode hex="0547"/>
   <outline>
     <contour>
-      <point x="625" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="625" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="334" y="-29"/>
       <point x="96" y="146"/>
-      <point x="96" y="597" type="curve" name="sh01" smooth="yes"/>
+      <point x="96" y="597" type="curve" smooth="yes" name="sh01"/>
       <point x="96" y="817"/>
       <point x="151" y="977"/>
       <point x="230" y="1082" type="curve" smooth="yes"/>
@@ -29,7 +29,7 @@
       <point x="789" y="1115" type="line"/>
       <point x="755" y="1131"/>
       <point x="677" y="1147"/>
-      <point x="624" y="1147" type="curve" name="av02" smooth="yes"/>
+      <point x="624" y="1147" type="curve" smooth="yes" name="av02"/>
       <point x="527" y="1147"/>
       <point x="450" y="1097"/>
       <point x="393" y="997" type="curve" smooth="yes"/>
@@ -38,22 +38,22 @@
       <point x="329" y="824" type="curve" smooth="yes"/>
       <point x="314" y="757"/>
       <point x="307" y="681"/>
-      <point x="307" y="594" type="curve" name="sh03" smooth="yes"/>
+      <point x="307" y="594" type="curve" smooth="yes" name="sh03"/>
       <point x="307" y="430"/>
       <point x="333" y="312"/>
       <point x="384" y="240" type="curve" smooth="yes"/>
       <point x="436" y="167"/>
       <point x="515" y="135"/>
-      <point x="624" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="624" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="733" y="135"/>
       <point x="809" y="166"/>
       <point x="860" y="238" type="curve" smooth="yes"/>
       <point x="911" y="311"/>
       <point x="934" y="424"/>
-      <point x="934" y="596" type="curve" name="ah01" smooth="yes"/>
+      <point x="934" y="596" type="curve" smooth="yes" name="ah01"/>
       <point x="934" y="618" type="line"/>
       <point x="1137" y="618" type="line"/>
-      <point x="1137" y="596" type="line" name="sh02" smooth="yes"/>
+      <point x="1137" y="596" type="line" smooth="yes" name="sh02"/>
       <point x="1137" y="364"/>
       <point x="1080" y="211"/>
       <point x="988" y="111" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0548.glif b/source/Hack-Regular.ufo/glyphs/uni0548.glif
index 8d9f1b0f6..e002548b7 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0548.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0548.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0548" format="1">
+<glyph name="uni0548" format="2">
   <advance width="1233"/>
   <unicode hex="0548"/>
   <outline>
     <contour>
-      <point x="147" y="1036" type="line" name="hr00" smooth="yes"/>
+      <point x="147" y="1036" type="line" smooth="yes" name="hr00"/>
       <point x="147" y="1203"/>
       <point x="191" y="1323"/>
       <point x="272" y="1403" type="curve" smooth="yes"/>
       <point x="352" y="1483"/>
       <point x="468" y="1522"/>
-      <point x="615" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="760" y="1522"/>
       <point x="880" y="1484"/>
       <point x="961" y="1403" type="curve" smooth="yes"/>
@@ -22,10 +22,10 @@
       <point x="883" y="1098" type="line" smooth="yes"/>
       <point x="883" y="1216"/>
       <point x="844" y="1358"/>
-      <point x="615" y="1358" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="1358" type="curve" smooth="yes" name="dv01"/>
       <point x="388" y="1358"/>
       <point x="349" y="1216"/>
-      <point x="349" y="1098" type="curve" name="sh02" smooth="yes"/>
+      <point x="349" y="1098" type="curve" smooth="yes" name="sh02"/>
       <point x="349" y="0" type="line" name="ab01"/>
       <point x="147" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0549.glif b/source/Hack-Regular.ufo/glyphs/uni0549.glif
index 6acd791b7..c6e296a22 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0549.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0549.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0549" format="1">
+<glyph name="uni0549" format="2">
   <advance width="1233"/>
   <unicode hex="0549"/>
   <outline>
@@ -18,13 +18,13 @@
       <point x="904" y="668" type="curve" smooth="yes"/>
       <point x="919" y="733"/>
       <point x="926" y="810"/>
-      <point x="926" y="897" type="curve" name="ah01" smooth="yes"/>
+      <point x="926" y="897" type="curve" smooth="yes" name="ah01"/>
       <point x="926" y="1061"/>
       <point x="900" y="1179"/>
       <point x="849" y="1251" type="curve" smooth="yes"/>
       <point x="797" y="1324"/>
       <point x="720" y="1356"/>
-      <point x="609" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="609" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="502" y="1356"/>
       <point x="425" y="1326"/>
       <point x="374" y="1253" type="curve" smooth="yes"/>
@@ -39,13 +39,13 @@
       <point x="245" y="1380" type="curve" smooth="yes"/>
       <point x="337" y="1479"/>
       <point x="467" y="1520"/>
-      <point x="608" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="608" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="756" y="1520"/>
       <point x="886" y="1476"/>
       <point x="982" y="1376" type="curve" smooth="yes"/>
       <point x="1077" y="1276"/>
       <point x="1137" y="1121"/>
-      <point x="1137" y="894" type="curve" name="sh03" smooth="yes"/>
+      <point x="1137" y="894" type="curve" smooth="yes" name="sh03"/>
       <point x="1137" y="446"/>
       <point x="901" y="251"/>
       <point x="741" y="251" type="curve" name="ih02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni054A_.glif b/source/Hack-Regular.ufo/glyphs/uni054A_.glif
index 4a0a94a0b..46f42f52b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni054A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni054A_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni054A" format="1">
+<glyph name="uni054A" format="2">
   <advance width="1233"/>
   <unicode hex="054A"/>
   <outline>
     <contour>
-      <point x="958" y="917" type="line" name="hr00" smooth="yes"/>
+      <point x="958" y="917" type="line" smooth="yes" name="hr00"/>
       <point x="958" y="1022"/>
       <point x="951" y="1124"/>
       <point x="912" y="1204" type="curve" smooth="yes"/>
@@ -22,10 +22,10 @@
       <point x="45" y="932" type="line" smooth="yes"/>
       <point x="45" y="1279"/>
       <point x="201" y="1520"/>
-      <point x="601" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="601" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1011" y="1520"/>
       <point x="1148" y="1279"/>
-      <point x="1148" y="932" type="curve" name="dh05" smooth="yes"/>
+      <point x="1148" y="932" type="curve" smooth="yes" name="dh05"/>
       <point x="1148" y="0" type="line" name="ab01"/>
       <point x="958" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni054B_.glif b/source/Hack-Regular.ufo/glyphs/uni054B_.glif
index cbdc7c1fe..8883f90d3 100644
--- a/source/Hack-Regular.ufo/glyphs/uni054B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni054B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni054B" format="1">
+<glyph name="uni054B" format="2">
   <advance width="1233"/>
   <unicode hex="054B"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="620" y="259" type="curve"/>
       <point x="636" y="328"/>
       <point x="646" y="391"/>
-      <point x="646" y="447" type="curve" name="dh03" smooth="yes"/>
+      <point x="646" y="447" type="curve" smooth="yes" name="dh03"/>
       <point x="646" y="515"/>
       <point x="632" y="569"/>
       <point x="600" y="608" type="curve" smooth="yes"/>
@@ -28,22 +28,22 @@
       <point x="109" y="847" type="curve" smooth="yes"/>
       <point x="97" y="890"/>
       <point x="96" y="932"/>
-      <point x="96" y="960" type="curve" name="dh01" smooth="yes"/>
+      <point x="96" y="960" type="curve" smooth="yes" name="dh01"/>
       <point x="96" y="1060"/>
       <point x="109" y="1144"/>
       <point x="141" y="1224" type="curve" smooth="yes"/>
       <point x="174" y="1307"/>
       <point x="225" y="1379"/>
-      <point x="300" y="1432" type="curve" name="hr01" smooth="yes"/>
+      <point x="300" y="1432" type="curve" smooth="yes" name="hr01"/>
       <point x="376" y="1487"/>
       <point x="474" y="1520"/>
-      <point x="611" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="611" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="811" y="1520"/>
       <point x="939" y="1446"/>
       <point x="1020" y="1333" type="curve" smooth="yes"/>
       <point x="1103" y="1215"/>
       <point x="1136" y="1059"/>
-      <point x="1136" y="912" type="curve" name="dh04" smooth="yes"/>
+      <point x="1136" y="912" type="curve" smooth="yes" name="dh04"/>
       <point x="1136" y="725"/>
       <point x="1085" y="572"/>
       <point x="1013" y="448" type="curve" smooth="yes"/>
@@ -58,13 +58,13 @@
       <point x="776" y="423" type="curve" name="sh02"/>
       <point x="870" y="563"/>
       <point x="925" y="708"/>
-      <point x="925" y="916" type="curve" name="hr02" smooth="yes"/>
+      <point x="925" y="916" type="curve" smooth="yes" name="hr02"/>
       <point x="925" y="1024"/>
       <point x="910" y="1146"/>
       <point x="865" y="1226" type="curve" smooth="yes"/>
       <point x="818" y="1310"/>
       <point x="735" y="1356"/>
-      <point x="614" y="1356" type="curve" name="sv03" smooth="yes"/>
+      <point x="614" y="1356" type="curve" smooth="yes" name="sv03"/>
       <point x="526" y="1356"/>
       <point x="466" y="1333"/>
       <point x="422" y="1298" type="curve" smooth="yes"/>
@@ -73,7 +73,7 @@
       <point x="327" y="1161" type="curve" smooth="yes"/>
       <point x="310" y="1112"/>
       <point x="301" y="1058"/>
-      <point x="301" y="997" type="curve" name="dh02" smooth="yes"/>
+      <point x="301" y="997" type="curve" smooth="yes" name="dh02"/>
       <point x="301" y="952"/>
       <point x="306" y="909"/>
       <point x="331" y="882" type="curve" smooth="yes"/>
@@ -82,10 +82,10 @@
       <point x="483" y="842" type="curve" name="dv02"/>
       <point x="545" y="839"/>
       <point x="638" y="831"/>
-      <point x="708" y="745" type="curve" name="hr03" smooth="yes"/>
+      <point x="708" y="745" type="curve" smooth="yes" name="hr03"/>
       <point x="757" y="684"/>
       <point x="782" y="601"/>
-      <point x="782" y="505" type="curve" name="hr04" smooth="yes"/>
+      <point x="782" y="505" type="curve" smooth="yes" name="hr04"/>
       <point x="782" y="478"/>
       <point x="780" y="451"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni054C_.glif b/source/Hack-Regular.ufo/glyphs/uni054C_.glif
index cec4912f4..c045f4bdd 100644
--- a/source/Hack-Regular.ufo/glyphs/uni054C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni054C_.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni054C" format="1">
+<glyph name="uni054C" format="2">
   <advance width="1233"/>
   <unicode hex="054C"/>
   <outline>
     <contour>
-      <point x="98" y="1036" type="line" name="dh01" smooth="yes"/>
+      <point x="98" y="1036" type="line" smooth="yes" name="dh01"/>
       <point x="98" y="1203"/>
       <point x="142" y="1322"/>
       <point x="223" y="1402" type="curve" smooth="yes"/>
       <point x="303" y="1481"/>
       <point x="414" y="1520"/>
-      <point x="566" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="566" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="715" y="1520"/>
       <point x="831" y="1482"/>
       <point x="912" y="1402" type="curve" smooth="yes"/>
       <point x="992" y="1322"/>
       <point x="1036" y="1203"/>
-      <point x="1036" y="1036" type="curve" name="sh01" smooth="yes"/>
+      <point x="1036" y="1036" type="curve" smooth="yes" name="sh01"/>
       <point x="1036" y="621" type="line"/>
       <point x="1223" y="621" type="line" name="dv01"/>
       <point x="1223" y="451" type="line" name="sh02"/>
@@ -26,10 +26,10 @@
       <point x="834" y="1098" type="line" smooth="yes"/>
       <point x="834" y="1216"/>
       <point x="795" y="1356"/>
-      <point x="566" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="566" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="339" y="1356"/>
       <point x="300" y="1216"/>
-      <point x="300" y="1098" type="curve" name="dh02" smooth="yes"/>
+      <point x="300" y="1098" type="curve" smooth="yes" name="dh02"/>
       <point x="300" y="0" type="line" name="ab01"/>
       <point x="98" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni054D_.glif b/source/Hack-Regular.ufo/glyphs/uni054D_.glif
index c962e3bcc..cd6577565 100644
--- a/source/Hack-Regular.ufo/glyphs/uni054D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni054D_.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni054D" format="1">
+<glyph name="uni054D" format="2">
   <advance width="1233"/>
   <unicode hex="054D"/>
   <outline>
     <contour>
-      <point x="615" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="615" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="468" y="-29"/>
       <point x="352" y="10"/>
       <point x="272" y="90" type="curve" smooth="yes"/>
       <point x="191" y="170"/>
       <point x="147" y="290"/>
-      <point x="147" y="457" type="curve" name="sh01" smooth="yes"/>
+      <point x="147" y="457" type="curve" smooth="yes" name="sh01"/>
       <point x="147" y="1493" type="line" name="at01"/>
       <point x="349" y="1493" type="line"/>
-      <point x="349" y="395" type="line" name="sh02" smooth="yes"/>
+      <point x="349" y="395" type="line" smooth="yes" name="sh02"/>
       <point x="349" y="277"/>
       <point x="388" y="135"/>
-      <point x="615" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="844" y="135"/>
       <point x="883" y="277"/>
-      <point x="883" y="395" type="curve" name="ah01" smooth="yes"/>
+      <point x="883" y="395" type="curve" smooth="yes" name="ah01"/>
       <point x="883" y="1493" type="line" name="at02"/>
       <point x="1085" y="1493" type="line"/>
-      <point x="1085" y="457" type="line" name="sh03" smooth="yes"/>
+      <point x="1085" y="457" type="line" smooth="yes" name="sh03"/>
       <point x="1085" y="290"/>
       <point x="1041" y="170"/>
       <point x="961" y="90" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni054E_.glif b/source/Hack-Regular.ufo/glyphs/uni054E_.glif
index a5b98b4b7..363cdc155 100644
--- a/source/Hack-Regular.ufo/glyphs/uni054E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni054E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni054E" format="1">
+<glyph name="uni054E" format="2">
   <advance width="1233"/>
   <unicode hex="054E"/>
   <outline>
@@ -7,22 +7,22 @@
       <point x="769" y="431" type="line" name="iv01"/>
       <point x="697" y="383"/>
       <point x="616" y="352"/>
-      <point x="493" y="352" type="curve" name="dv01" smooth="yes"/>
+      <point x="493" y="352" type="curve" smooth="yes" name="dv01"/>
       <point x="352" y="352"/>
       <point x="237" y="394"/>
       <point x="158" y="471" type="curve" smooth="yes"/>
       <point x="77" y="551"/>
       <point x="33" y="671"/>
-      <point x="33" y="838" type="curve" name="hr01" smooth="yes"/>
+      <point x="33" y="838" type="curve" smooth="yes" name="hr01"/>
       <point x="33" y="1120" type="line" name="at02"/>
       <point x="235" y="1120" type="line"/>
-      <point x="235" y="776" type="line" name="dh01" smooth="yes"/>
+      <point x="235" y="776" type="line" smooth="yes" name="dh01"/>
       <point x="235" y="658"/>
       <point x="274" y="516"/>
-      <point x="501" y="516" type="curve" name="dv02" smooth="yes"/>
+      <point x="501" y="516" type="curve" smooth="yes" name="dv02"/>
       <point x="730" y="516"/>
       <point x="769" y="658"/>
-      <point x="769" y="776" type="curve" name="sh01" smooth="yes"/>
+      <point x="769" y="776" type="curve" smooth="yes" name="sh01"/>
       <point x="769" y="1493" type="line" name="at01"/>
       <point x="971" y="1493" type="line"/>
       <point x="971" y="170" type="line" name="dh03"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni054F_.glif b/source/Hack-Regular.ufo/glyphs/uni054F_.glif
index 6cccb2a82..cb959d2d8 100644
--- a/source/Hack-Regular.ufo/glyphs/uni054F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni054F_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni054F" format="1">
+<glyph name="uni054F" format="2">
   <advance width="1233"/>
   <unicode hex="054F"/>
   <outline>
     <contour>
-      <point x="631" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="631" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="304" y="-29"/>
       <point x="105" y="163"/>
       <point x="105" y="447" type="curve" name="dh01"/>
@@ -14,13 +14,13 @@
       <point x="406" y="216" type="curve" smooth="yes"/>
       <point x="464" y="162"/>
       <point x="539" y="135"/>
-      <point x="631" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="631" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="720" y="135"/>
       <point x="792" y="160"/>
       <point x="845" y="210" type="curve" smooth="yes"/>
       <point x="896" y="257"/>
       <point x="928" y="327"/>
-      <point x="928" y="415" type="curve" name="dh03" smooth="yes"/>
+      <point x="928" y="415" type="curve" smooth="yes" name="dh03"/>
       <point x="928" y="514"/>
       <point x="886" y="575"/>
       <point x="809" y="622" type="curve" smooth="yes"/>
@@ -32,23 +32,23 @@
       <point x="284" y="852" type="curve" smooth="yes"/>
       <point x="212" y="912"/>
       <point x="164" y="991"/>
-      <point x="164" y="1120" type="curve" name="ih01" smooth="yes"/>
+      <point x="164" y="1120" type="curve" smooth="yes" name="ih01"/>
       <point x="164" y="1336"/>
       <point x="305" y="1520"/>
-      <point x="611" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="611" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="921" y="1520"/>
       <point x="1068" y="1336"/>
       <point x="1068" y="1120" type="curve" name="sv01"/>
       <point x="858" y="1120" type="line"/>
       <point x="858" y="1260"/>
       <point x="786" y="1355"/>
-      <point x="612" y="1355" type="curve" name="sv02" smooth="yes"/>
+      <point x="612" y="1355" type="curve" smooth="yes" name="sv02"/>
       <point x="527" y="1355"/>
       <point x="465" y="1332"/>
       <point x="425" y="1293" type="curve" smooth="yes"/>
       <point x="382" y="1250"/>
       <point x="364" y="1191"/>
-      <point x="364" y="1134" type="curve" name="sh01" smooth="yes"/>
+      <point x="364" y="1134" type="curve" smooth="yes" name="sh01"/>
       <point x="364" y="1057"/>
       <point x="396" y="1009"/>
       <point x="443" y="974" type="curve" smooth="yes"/>
@@ -63,10 +63,10 @@
       <point x="961" y="749" type="curve" smooth="yes"/>
       <point x="1025" y="705"/>
       <point x="1078" y="648"/>
-      <point x="1106" y="564" type="curve" name="hr02" smooth="yes"/>
+      <point x="1106" y="564" type="curve" smooth="yes" name="hr02"/>
       <point x="1120" y="523"/>
       <point x="1127" y="476"/>
-      <point x="1127" y="423" type="curve" name="dh04" smooth="yes"/>
+      <point x="1127" y="423" type="curve" smooth="yes" name="dh04"/>
       <point x="1127" y="291"/>
       <point x="1083" y="180"/>
       <point x="999" y="100" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0550.glif b/source/Hack-Regular.ufo/glyphs/uni0550.glif
index 5479a2139..ddcb44966 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0550.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0550.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0550" format="1">
+<glyph name="uni0550" format="2">
   <advance width="1233"/>
   <unicode hex="0550"/>
   <outline>
     <contour>
-      <point x="147" y="1036" type="line" name="hr00" smooth="yes"/>
+      <point x="147" y="1036" type="line" smooth="yes" name="hr00"/>
       <point x="147" y="1203"/>
       <point x="191" y="1323"/>
       <point x="272" y="1403" type="curve" smooth="yes"/>
       <point x="352" y="1483"/>
       <point x="468" y="1522"/>
-      <point x="615" y="1522" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="1522" type="curve" smooth="yes" name="dv02"/>
       <point x="760" y="1522"/>
       <point x="880" y="1484"/>
       <point x="961" y="1403" type="curve" smooth="yes"/>
@@ -22,10 +22,10 @@
       <point x="883" y="1098" type="line" smooth="yes"/>
       <point x="883" y="1216"/>
       <point x="844" y="1358"/>
-      <point x="615" y="1358" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="1358" type="curve" smooth="yes" name="dv01"/>
       <point x="388" y="1358"/>
       <point x="349" y="1216"/>
-      <point x="349" y="1098" type="curve" name="sh02" smooth="yes"/>
+      <point x="349" y="1098" type="curve" smooth="yes" name="sh02"/>
       <point x="349" y="0" type="line" name="ab01"/>
       <point x="147" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0551.glif b/source/Hack-Regular.ufo/glyphs/uni0551.glif
index 13d587048..b271a1394 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0551.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0551.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0551" format="1">
+<glyph name="uni0551" format="2">
   <advance width="1233"/>
   <unicode hex="0551"/>
   <outline>
@@ -11,31 +11,31 @@
       <point x="357" y="447" type="line" name="sv01"/>
       <point x="357" y="276"/>
       <point x="440" y="135"/>
-      <point x="656" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="656" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="771" y="135"/>
       <point x="845" y="173"/>
       <point x="892" y="229" type="curve" smooth="yes"/>
       <point x="939" y="286"/>
       <point x="959" y="366"/>
-      <point x="959" y="441" type="curve" name="dh01" smooth="yes"/>
+      <point x="959" y="441" type="curve" smooth="yes" name="dh01"/>
       <point x="959" y="606"/>
       <point x="852" y="705"/>
-      <point x="658" y="705" type="curve" name="dv03" smooth="yes"/>
+      <point x="658" y="705" type="curve" smooth="yes" name="dv03"/>
       <point x="64" y="705" type="line"/>
       <point x="64" y="875" type="line" name="sv02"/>
       <point x="337" y="875" type="line" name="hr01"/>
       <point x="252" y="920"/>
       <point x="206" y="1029"/>
-      <point x="206" y="1130" type="curve" name="dh03" smooth="yes"/>
+      <point x="206" y="1130" type="curve" smooth="yes" name="dh03"/>
       <point x="206" y="1234"/>
       <point x="247" y="1337"/>
       <point x="326" y="1409" type="curve" smooth="yes"/>
       <point x="399" y="1477"/>
       <point x="508" y="1520"/>
-      <point x="657" y="1520" type="curve" name="hr02" smooth="yes"/>
+      <point x="657" y="1520" type="curve" smooth="yes" name="hr02"/>
       <point x="943" y="1520"/>
       <point x="1110" y="1359"/>
-      <point x="1110" y="1121" type="curve" name="ih01" smooth="yes"/>
+      <point x="1110" y="1121" type="curve" smooth="yes" name="ih01"/>
       <point x="1110" y="1040"/>
       <point x="1090" y="974"/>
       <point x="1055" y="919" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="907" y="805" type="curve" name="ih02"/>
       <point x="1089" y="760"/>
       <point x="1169" y="604"/>
-      <point x="1169" y="440" type="curve" name="dh02" smooth="yes"/>
+      <point x="1169" y="440" type="curve" smooth="yes" name="dh02"/>
       <point x="1169" y="321"/>
       <point x="1132" y="203"/>
       <point x="1048" y="115" type="curve" smooth="yes"/>
@@ -52,25 +52,25 @@
       <point x="835" y="-29"/>
     </contour>
     <contour>
-      <point x="656" y="875" type="curve" name="dv04" smooth="yes"/>
+      <point x="656" y="875" type="curve" smooth="yes" name="dv04"/>
       <point x="838" y="875"/>
       <point x="900" y="991"/>
-      <point x="900" y="1121" type="curve" name="sh01" smooth="yes"/>
+      <point x="900" y="1121" type="curve" smooth="yes" name="sh01"/>
       <point x="900" y="1180"/>
       <point x="888" y="1243"/>
-      <point x="851" y="1286" type="curve" name="hr03" smooth="yes"/>
+      <point x="851" y="1286" type="curve" smooth="yes" name="hr03"/>
       <point x="832" y="1307"/>
       <point x="805" y="1326"/>
       <point x="777" y="1337" type="curve" smooth="yes"/>
       <point x="746" y="1349"/>
       <point x="711" y="1356"/>
-      <point x="660" y="1356" type="curve" name="sv03" smooth="yes"/>
+      <point x="660" y="1356" type="curve" smooth="yes" name="sv03"/>
       <point x="560" y="1356"/>
       <point x="501" y="1329"/>
       <point x="465" y="1286" type="curve" smooth="yes"/>
       <point x="430" y="1243"/>
       <point x="416" y="1187"/>
-      <point x="416" y="1119" type="curve" name="hr04" smooth="yes"/>
+      <point x="416" y="1119" type="curve" smooth="yes" name="hr04"/>
       <point x="416" y="1056"/>
       <point x="428" y="994"/>
       <point x="464" y="950" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0552.glif b/source/Hack-Regular.ufo/glyphs/uni0552.glif
index 6e4a75b6a..fbde5ca56 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0552.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0552.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0552" format="1">
+<glyph name="uni0552" format="2">
   <advance width="1233"/>
   <unicode hex="0552"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0553.glif b/source/Hack-Regular.ufo/glyphs/uni0553.glif
index d3ceed6d7..b421f5b1f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0553.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0553.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0553" format="1">
+<glyph name="uni0553" format="2">
   <advance width="1233"/>
   <unicode hex="0553"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="159" y="329" type="curve" smooth="yes"/>
       <point x="95" y="428"/>
       <point x="70" y="563"/>
-      <point x="70" y="763" type="curve" name="dh01" smooth="yes"/>
+      <point x="70" y="763" type="curve" smooth="yes" name="dh01"/>
       <point x="70" y="952"/>
       <point x="92" y="1098"/>
       <point x="160" y="1202" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="711" y="1371" type="line" name="sv01"/>
       <point x="1070" y="1358"/>
       <point x="1162" y="1136"/>
-      <point x="1162" y="765" type="curve" name="dh05" smooth="yes"/>
+      <point x="1162" y="765" type="curve" smooth="yes" name="dh05"/>
       <point x="1162" y="394"/>
       <point x="1070" y="170"/>
       <point x="711" y="157" type="curve" name="dh03"/>
@@ -36,7 +36,7 @@
       <point x="319" y="1102" type="curve" smooth="yes"/>
       <point x="279" y="1033"/>
       <point x="265" y="925"/>
-      <point x="265" y="766" type="curve" name="dh02" smooth="yes"/>
+      <point x="265" y="766" type="curve" smooth="yes" name="dh02"/>
       <point x="265" y="606"/>
       <point x="279" y="498"/>
       <point x="320" y="423" type="curve" smooth="yes"/>
@@ -48,7 +48,7 @@
       <point x="711" y="316" type="line" name="sh04"/>
       <point x="907" y="324"/>
       <point x="964" y="446"/>
-      <point x="964" y="765" type="curve" name="dh04" smooth="yes"/>
+      <point x="964" y="765" type="curve" smooth="yes" name="dh04"/>
       <point x="964" y="926"/>
       <point x="950" y="1033"/>
       <point x="911" y="1102" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0554.glif b/source/Hack-Regular.ufo/glyphs/uni0554.glif
index 0e65922d6..19707a6a4 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0554.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0554.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0554" format="1">
+<glyph name="uni0554" format="2">
   <advance width="1233"/>
   <unicode hex="0554"/>
   <outline>
@@ -14,16 +14,16 @@
       <point x="340" y="1395" type="curve" smooth="yes"/>
       <point x="420" y="1476"/>
       <point x="536" y="1520"/>
-      <point x="696" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="696" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="1028" y="1520"/>
       <point x="1166" y="1330"/>
-      <point x="1166" y="1076" type="curve" name="sh02" smooth="yes"/>
+      <point x="1166" y="1076" type="curve" smooth="yes" name="sh02"/>
       <point x="1166" y="947"/>
       <point x="1131" y="841"/>
       <point x="1054" y="761" type="curve" smooth="yes"/>
       <point x="979" y="685"/>
       <point x="867" y="634"/>
-      <point x="716" y="634" type="curve" name="dv01" smooth="yes"/>
+      <point x="716" y="634" type="curve" smooth="yes" name="dv01"/>
       <point x="656" y="634"/>
       <point x="605" y="642"/>
       <point x="554" y="661" type="curve" smooth="yes"/>
@@ -38,13 +38,13 @@
       <point x="227" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="706" y="798" type="curve" name="dv02" smooth="yes"/>
+      <point x="706" y="798" type="curve" smooth="yes" name="dv02"/>
       <point x="810" y="798"/>
       <point x="873" y="828"/>
       <point x="910" y="873" type="curve" smooth="yes"/>
       <point x="949" y="921"/>
       <point x="963" y="992"/>
-      <point x="963" y="1077" type="curve" name="ah01" smooth="yes"/>
+      <point x="963" y="1077" type="curve" smooth="yes" name="ah01"/>
       <point x="963" y="1162"/>
       <point x="949" y="1230"/>
       <point x="909" y="1279" type="curve" smooth="yes"/>
@@ -53,10 +53,10 @@
       <point x="828" y="1336" type="curve" smooth="yes"/>
       <point x="792" y="1349"/>
       <point x="749" y="1356"/>
-      <point x="698" y="1356" type="curve" name="sv03" smooth="yes"/>
+      <point x="698" y="1356" type="curve" smooth="yes" name="sv03"/>
       <point x="490" y="1356"/>
       <point x="430" y="1244"/>
-      <point x="430" y="1083" type="curve" name="sh06" smooth="yes"/>
+      <point x="430" y="1083" type="curve" smooth="yes" name="sh06"/>
       <point x="430" y="914"/>
       <point x="500" y="798"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0555.glif b/source/Hack-Regular.ufo/glyphs/uni0555.glif
index 4d5413184..223f5d997 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0555.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0555.glif
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0555" format="1">
+<glyph name="uni0555" format="2">
   <advance width="1233"/>
   <unicode hex="0555"/>
   <outline>
     <contour>
-      <point x="615" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="615" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="280" y="-29"/>
       <point x="117" y="221"/>
-      <point x="117" y="744" type="curve" name="sh01" smooth="yes"/>
+      <point x="117" y="744" type="curve" smooth="yes" name="sh01"/>
       <point x="117" y="1267"/>
       <point x="280" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="953" y="1520"/>
       <point x="1116" y="1266"/>
-      <point x="1116" y="745" type="curve" name="sh02" smooth="yes"/>
+      <point x="1116" y="745" type="curve" smooth="yes" name="sh02"/>
       <point x="1116" y="225"/>
       <point x="952" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="727" y="135"/>
       <point x="795" y="186"/>
       <point x="838" y="277" type="curve" smooth="yes"/>
       <point x="880" y="365"/>
       <point x="905" y="506"/>
-      <point x="905" y="747" type="curve" name="ah01" smooth="yes"/>
+      <point x="905" y="747" type="curve" smooth="yes" name="ah01"/>
       <point x="905" y="987"/>
       <point x="879" y="1125"/>
       <point x="837" y="1215" type="curve" smooth="yes"/>
       <point x="790" y="1311"/>
       <point x="721" y="1356"/>
-      <point x="617" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="617" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="512" y="1356"/>
       <point x="441" y="1310"/>
       <point x="396" y="1214" type="curve" smooth="yes"/>
       <point x="351" y="1119"/>
       <point x="328" y="962"/>
-      <point x="328" y="745" type="curve" name="sh03" smooth="yes"/>
+      <point x="328" y="745" type="curve" smooth="yes" name="sh03"/>
       <point x="328" y="525"/>
       <point x="349" y="374"/>
       <point x="396" y="277" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0556.glif b/source/Hack-Regular.ufo/glyphs/uni0556.glif
index 976656a96..0d3a849bc 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0556.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0556.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0556" format="1">
+<glyph name="uni0556" format="2">
   <advance width="1233"/>
   <unicode hex="0556"/>
   <outline>
     <contour>
-      <point x="628" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="628" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="465" y="-29"/>
       <point x="359" y="-15"/>
       <point x="279" y="24" type="curve" smooth="yes"/>
       <point x="100" y="109"/>
       <point x="71" y="314"/>
-      <point x="71" y="537" type="curve" name="dh01" smooth="yes"/>
+      <point x="71" y="537" type="curve" smooth="yes" name="dh01"/>
       <point x="71" y="556" type="line"/>
       <point x="265" y="556" type="line"/>
-      <point x="265" y="537" type="line" name="dh02" smooth="yes"/>
+      <point x="265" y="537" type="line" smooth="yes" name="dh02"/>
       <point x="265" y="394"/>
       <point x="273" y="307"/>
       <point x="307" y="241" type="curve" smooth="yes"/>
@@ -23,13 +23,13 @@
       <point x="518" y="952" type="line" name="sv01"/>
       <point x="255" y="952"/>
       <point x="141" y="1038"/>
-      <point x="141" y="1223" type="curve" name="ih01" smooth="yes"/>
+      <point x="141" y="1223" type="curve" smooth="yes" name="ih01"/>
       <point x="141" y="1315"/>
       <point x="168" y="1383"/>
       <point x="232" y="1428" type="curve" smooth="yes"/>
       <point x="294" y="1471"/>
       <point x="393" y="1493"/>
-      <point x="529" y="1493" type="curve" name="at01" smooth="yes"/>
+      <point x="529" y="1493" type="curve" smooth="yes" name="at01"/>
       <point x="711" y="1493" type="line" name="sh01"/>
       <point x="711" y="1120" type="line" name="at02"/>
       <point x="894" y="1112"/>
@@ -37,7 +37,7 @@
       <point x="1062" y="979" type="curve" smooth="yes"/>
       <point x="1138" y="880"/>
       <point x="1162" y="732"/>
-      <point x="1162" y="540" type="curve" name="dh06" smooth="yes"/>
+      <point x="1162" y="540" type="curve" smooth="yes" name="dh06"/>
       <point x="1162" y="423"/>
       <point x="1153" y="318"/>
       <point x="1122" y="229" type="curve" smooth="yes"/>
@@ -46,7 +46,7 @@
       <point x="955" y="24" type="curve" smooth="yes"/>
       <point x="916" y="3"/>
       <point x="869" y="-11"/>
-      <point x="814" y="-19" type="curve" name="sv02" smooth="yes"/>
+      <point x="814" y="-19" type="curve" smooth="yes" name="sv02"/>
       <point x="758" y="-27"/>
       <point x="689" y="-29"/>
     </contour>
@@ -54,7 +54,7 @@
       <point x="518" y="1329" type="line" name="sh02"/>
       <point x="392" y="1329"/>
       <point x="342" y="1316"/>
-      <point x="342" y="1223" type="curve" name="sh03" smooth="yes"/>
+      <point x="342" y="1223" type="curve" smooth="yes" name="sh03"/>
       <point x="342" y="1131"/>
       <point x="392" y="1120"/>
       <point x="518" y="1120" type="curve" name="hr01"/>
@@ -63,7 +63,7 @@
       <point x="711" y="133" type="line" name="dh04"/>
       <point x="931" y="133"/>
       <point x="964" y="271"/>
-      <point x="964" y="542" type="curve" name="dh05" smooth="yes"/>
+      <point x="964" y="542" type="curve" smooth="yes" name="dh05"/>
       <point x="964" y="824"/>
       <point x="931" y="949"/>
       <point x="711" y="949" type="curve" name="sv03"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0559.glif b/source/Hack-Regular.ufo/glyphs/uni0559.glif
index 61d5ec3c4..ad2ce2b8f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0559.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0559.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0559" format="1">
+<glyph name="uni0559" format="2">
   <advance width="1233"/>
   <unicode hex="0559"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="754" y="1007" type="line" name="sh02"/>
       <point x="599" y="1007"/>
       <point x="480" y="1129"/>
-      <point x="480" y="1282" type="curve" name="hr01" smooth="yes"/>
+      <point x="480" y="1282" type="curve" smooth="yes" name="hr01"/>
       <point x="480" y="1434"/>
       <point x="599" y="1556"/>
       <point x="754" y="1556" type="curve" name="hr02"/>
       <point x="754" y="1433" type="line" name="sh01"/>
       <point x="670" y="1433"/>
       <point x="602" y="1366"/>
-      <point x="602" y="1282" type="curve" name="dh01" smooth="yes"/>
+      <point x="602" y="1282" type="curve" smooth="yes" name="dh01"/>
       <point x="602" y="1198"/>
       <point x="670" y="1130"/>
       <point x="754" y="1130" type="curve" name="at01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni055A_.glif b/source/Hack-Regular.ufo/glyphs/uni055A_.glif
index 69e6f91f1..8e4c77eba 100644
--- a/source/Hack-Regular.ufo/glyphs/uni055A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni055A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni055A" format="1">
+<glyph name="uni055A" format="2">
   <advance width="1233"/>
   <unicode hex="055A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni055B_.glif b/source/Hack-Regular.ufo/glyphs/uni055B_.glif
index 8f27de6fa..8ed465580 100644
--- a/source/Hack-Regular.ufo/glyphs/uni055B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni055B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni055B" format="1">
+<glyph name="uni055B" format="2">
   <advance width="1233"/>
   <unicode hex="055B"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni055C_.glif b/source/Hack-Regular.ufo/glyphs/uni055C_.glif
index b0e193890..22eb11e80 100644
--- a/source/Hack-Regular.ufo/glyphs/uni055C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni055C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni055C" format="1">
+<glyph name="uni055C" format="2">
   <advance width="1233"/>
   <unicode hex="055C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni055D_.glif b/source/Hack-Regular.ufo/glyphs/uni055D_.glif
index b2cb21bca..e142befdf 100644
--- a/source/Hack-Regular.ufo/glyphs/uni055D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni055D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni055D" format="1">
+<glyph name="uni055D" format="2">
   <advance width="1233"/>
   <unicode hex="055D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni055E_.glif b/source/Hack-Regular.ufo/glyphs/uni055E_.glif
index 25a2fbf1c..28db2d910 100644
--- a/source/Hack-Regular.ufo/glyphs/uni055E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni055E_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni055E" format="1">
+<glyph name="uni055E" format="2">
   <advance width="1233"/>
   <unicode hex="055E"/>
   <outline>
     <contour>
-      <point x="792" y="1256" type="curve" name="av01" smooth="yes"/>
+      <point x="792" y="1256" type="curve" smooth="yes" name="av01"/>
       <point x="736" y="1256"/>
       <point x="682" y="1268"/>
       <point x="633" y="1301" type="curve" smooth="yes"/>
@@ -14,19 +14,19 @@
       <point x="696" y="1454" type="line"/>
       <point x="703" y="1415"/>
       <point x="740" y="1393"/>
-      <point x="787" y="1393" type="curve" name="sv02" smooth="yes"/>
+      <point x="787" y="1393" type="curve" smooth="yes" name="sv02"/>
       <point x="822" y="1393"/>
       <point x="848" y="1405"/>
       <point x="864" y="1424" type="curve" smooth="yes"/>
       <point x="878" y="1441"/>
       <point x="885" y="1465"/>
-      <point x="885" y="1497" type="curve" name="ah01" smooth="yes"/>
+      <point x="885" y="1497" type="curve" smooth="yes" name="ah01"/>
       <point x="885" y="1550"/>
       <point x="864" y="1593"/>
-      <point x="829" y="1621" type="curve" name="hr01" smooth="yes"/>
+      <point x="829" y="1621" type="curve" smooth="yes" name="hr01"/>
       <point x="794" y="1649"/>
       <point x="747" y="1663"/>
-      <point x="690" y="1663" type="curve" name="dv01" smooth="yes"/>
+      <point x="690" y="1663" type="curve" smooth="yes" name="dv01"/>
       <point x="659" y="1663"/>
       <point x="625" y="1659"/>
       <point x="593" y="1650" type="curve" smooth="yes"/>
@@ -43,13 +43,13 @@
       <point x="560" y="1798" type="curve" smooth="yes"/>
       <point x="601" y="1808"/>
       <point x="643" y="1813"/>
-      <point x="687" y="1813" type="curve" name="dv02" smooth="yes"/>
+      <point x="687" y="1813" type="curve" smooth="yes" name="dv02"/>
       <point x="779" y="1813"/>
       <point x="866" y="1791"/>
-      <point x="937" y="1739" type="curve" name="hr02" smooth="yes"/>
+      <point x="937" y="1739" type="curve" smooth="yes" name="hr02"/>
       <point x="1006" y="1688"/>
       <point x="1054" y="1609"/>
-      <point x="1054" y="1504" type="curve" name="sh03" smooth="yes"/>
+      <point x="1054" y="1504" type="curve" smooth="yes" name="sh03"/>
       <point x="1054" y="1425"/>
       <point x="1028" y="1367"/>
       <point x="987" y="1327" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni055F_.glif b/source/Hack-Regular.ufo/glyphs/uni055F_.glif
index a0389a6b1..06d11090c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni055F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni055F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni055F" format="1">
+<glyph name="uni055F" format="2">
   <advance width="1233"/>
   <unicode hex="055F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0561.glif b/source/Hack-Regular.ufo/glyphs/uni0561.glif
index 3bd7a9c8c..db3df3147 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0561.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0561.glif
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0561" format="1">
+<glyph name="uni0561" format="2">
   <advance width="1233"/>
   <unicode hex="0561"/>
   <outline>
     <contour>
-      <point x="344" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="344" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="261" y="-27"/>
       <point x="200" y="-3"/>
       <point x="159" y="76" type="curve" smooth="yes"/>
       <point x="121" y="148"/>
       <point x="103" y="263"/>
-      <point x="103" y="471" type="curve" name="dh01" smooth="yes"/>
+      <point x="103" y="471" type="curve" smooth="yes" name="dh01"/>
       <point x="103" y="1120" type="line" name="at01"/>
       <point x="271" y="1120" type="line" name="hr01"/>
-      <point x="271" y="479" type="line" name="dh02" smooth="yes"/>
+      <point x="271" y="479" type="line" smooth="yes" name="dh02"/>
       <point x="271" y="400"/>
       <point x="273" y="336"/>
-      <point x="277" y="287" type="curve" name="sh01" smooth="yes"/>
+      <point x="277" y="287" type="curve" smooth="yes" name="sh01"/>
       <point x="285" y="188"/>
       <point x="298" y="127"/>
-      <point x="394" y="127" type="curve" name="sv01" smooth="yes"/>
+      <point x="394" y="127" type="curve" smooth="yes" name="sv01"/>
       <point x="454" y="127"/>
       <point x="483" y="149"/>
       <point x="502" y="188" type="curve" smooth="yes"/>
       <point x="523" y="231"/>
       <point x="533" y="315"/>
-      <point x="533" y="479" type="curve" name="dh03" smooth="yes"/>
+      <point x="533" y="479" type="curve" smooth="yes" name="dh03"/>
       <point x="533" y="1120" type="line" name="hr02"/>
       <point x="701" y="1120" type="line"/>
-      <point x="701" y="479" type="line" name="dh04" smooth="yes"/>
+      <point x="701" y="479" type="line" smooth="yes" name="dh04"/>
       <point x="701" y="281"/>
       <point x="714" y="218"/>
       <point x="730" y="183" type="curve" smooth="yes"/>
       <point x="747" y="148"/>
       <point x="779" y="127"/>
-      <point x="832" y="127" type="curve" name="sv02" smooth="yes"/>
+      <point x="832" y="127" type="curve" smooth="yes" name="sv02"/>
       <point x="889" y="127"/>
       <point x="916" y="152"/>
       <point x="932" y="188" type="curve" smooth="yes"/>
       <point x="955" y="237"/>
       <point x="962" y="330"/>
-      <point x="962" y="479" type="curve" name="sh02" smooth="yes"/>
+      <point x="962" y="479" type="curve" smooth="yes" name="sh02"/>
       <point x="962" y="1120" type="line" name="at02"/>
       <point x="1129" y="1120" type="line"/>
       <point x="1129" y="0" type="line" name="dh06"/>
@@ -48,7 +48,7 @@
       <point x="962" y="96" type="line" name="iv01"/>
       <point x="917" y="14"/>
       <point x="851" y="-27"/>
-      <point x="764" y="-27" type="curve" name="ab02" smooth="yes"/>
+      <point x="764" y="-27" type="curve" smooth="yes" name="ab02"/>
       <point x="673" y="-27"/>
       <point x="601" y="15"/>
       <point x="562" y="114" type="curve" name="ih01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0562.glif b/source/Hack-Regular.ufo/glyphs/uni0562.glif
index b3188ebdc..6966b748c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0562.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0562.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0562" format="1">
+<glyph name="uni0562" format="2">
   <advance width="1233"/>
   <unicode hex="0562"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="377" y="952" type="line" name="iv01"/>
       <point x="442" y="1081"/>
       <point x="556" y="1147"/>
-      <point x="709" y="1147" type="curve" name="sv02" smooth="yes"/>
+      <point x="709" y="1147" type="curve" smooth="yes" name="sv02"/>
       <point x="940" y="1147"/>
       <point x="1049" y="1001"/>
       <point x="1049" y="694" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="864" y="694" type="line" smooth="yes"/>
       <point x="864" y="895"/>
       <point x="797" y="987"/>
-      <point x="646" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="646" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="471" y="987"/>
       <point x="377" y="865"/>
-      <point x="377" y="633" type="curve" name="sh04" smooth="yes"/>
+      <point x="377" y="633" type="curve" smooth="yes" name="sh04"/>
       <point x="377" y="143" type="line" name="sv03"/>
       <point x="1059" y="143" type="line" name="sh05"/>
       <point x="1059" y="0" type="line" name="ab01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0563.glif b/source/Hack-Regular.ufo/glyphs/uni0563.glif
index 250749f97..a1d898c73 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0563.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0563.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0563" format="1">
+<glyph name="uni0563" format="2">
   <advance width="1233"/>
   <unicode hex="0563"/>
   <outline>
@@ -7,16 +7,16 @@
       <point x="806" y="139" type="line" name="dh03"/>
       <point x="746" y="26"/>
       <point x="645" y="-33"/>
-      <point x="506" y="-33" type="curve" name="sv01" smooth="yes"/>
+      <point x="506" y="-33" type="curve" smooth="yes" name="sv01"/>
       <point x="373" y="-33"/>
       <point x="265" y="23"/>
       <point x="189" y="124" type="curve" smooth="yes"/>
       <point x="113" y="227"/>
       <point x="73" y="369"/>
-      <point x="73" y="552" type="curve" name="dh01" smooth="yes"/>
+      <point x="73" y="552" type="curve" smooth="yes" name="dh01"/>
       <point x="73" y="919"/>
       <point x="239" y="1143"/>
-      <point x="506" y="1143" type="curve" name="at02" smooth="yes"/>
+      <point x="506" y="1143" type="curve" smooth="yes" name="at02"/>
       <point x="642" y="1143"/>
       <point x="745" y="1086"/>
       <point x="806" y="973" type="curve" name="sh01"/>
@@ -30,19 +30,19 @@
       <point x="806" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="536" y="123" type="curve" name="hr04" smooth="yes"/>
+      <point x="536" y="123" type="curve" smooth="yes" name="hr04"/>
       <point x="716" y="123"/>
       <point x="806" y="268"/>
-      <point x="806" y="555" type="curve" name="sh04" smooth="yes"/>
+      <point x="806" y="555" type="curve" smooth="yes" name="sh04"/>
       <point x="806" y="842"/>
       <point x="716" y="987"/>
-      <point x="536" y="987" type="curve" name="sv02" smooth="yes"/>
+      <point x="536" y="987" type="curve" smooth="yes" name="sv02"/>
       <point x="447" y="987"/>
       <point x="380" y="951"/>
       <point x="335" y="879" type="curve" smooth="yes"/>
       <point x="290" y="806"/>
       <point x="268" y="698"/>
-      <point x="268" y="555" type="curve" name="dh02" smooth="yes"/>
+      <point x="268" y="555" type="curve" smooth="yes" name="dh02"/>
       <point x="268" y="267"/>
       <point x="357" y="123"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0564.glif b/source/Hack-Regular.ufo/glyphs/uni0564.glif
index bce2dd94c..a6082cd47 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0564.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0564.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0564" format="1">
+<glyph name="uni0564" format="2">
   <advance width="1233"/>
   <unicode hex="0564"/>
   <outline>
     <contour>
-      <point x="855" y="694" type="line" name="dh02" smooth="yes"/>
+      <point x="855" y="694" type="line" smooth="yes" name="dh02"/>
       <point x="855" y="895"/>
       <point x="788" y="987"/>
-      <point x="637" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="637" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="462" y="987"/>
       <point x="368" y="865"/>
       <point x="368" y="633" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="368" y="952" type="line" name="sh01"/>
       <point x="433" y="1081"/>
       <point x="547" y="1147"/>
-      <point x="700" y="1147" type="curve" name="sv02" smooth="yes"/>
+      <point x="700" y="1147" type="curve" smooth="yes" name="sv02"/>
       <point x="931" y="1147"/>
       <point x="1040" y="1001"/>
-      <point x="1040" y="694" type="curve" name="hr03" smooth="yes"/>
+      <point x="1040" y="694" type="curve" smooth="yes" name="hr03"/>
       <point x="1040" y="143" type="line" name="sv03"/>
       <point x="1188" y="143" type="line" name="sh02"/>
       <point x="1188" y="0" type="line" name="ab02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0565.glif b/source/Hack-Regular.ufo/glyphs/uni0565.glif
index b0b6c748c..19e83843f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0565.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0565.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0565" format="1">
+<glyph name="uni0565" format="2">
   <advance width="1233"/>
   <unicode hex="0565"/>
   <outline>
     <contour>
-      <point x="522" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="522" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="291" y="-29"/>
       <point x="184" y="119"/>
-      <point x="184" y="424" type="curve" name="sh01" smooth="yes"/>
+      <point x="184" y="424" type="curve" smooth="yes" name="sh01"/>
       <point x="184" y="1556" type="line" name="hr01"/>
       <point x="368" y="1556" type="line" name="sh03"/>
       <point x="368" y="1120" type="line" name="at01"/>
       <point x="1089" y="1120" type="line"/>
       <point x="1089" y="977" type="line" name="sv03"/>
       <point x="368" y="977" type="line"/>
-      <point x="368" y="424" type="line" name="sh02" smooth="yes"/>
+      <point x="368" y="424" type="line" smooth="yes" name="sh02"/>
       <point x="368" y="223"/>
       <point x="438" y="131"/>
-      <point x="587" y="131" type="curve" name="sv01" smooth="yes"/>
+      <point x="587" y="131" type="curve" smooth="yes" name="sv01"/>
       <point x="763" y="131"/>
       <point x="855" y="254"/>
       <point x="855" y="485" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0566.glif b/source/Hack-Regular.ufo/glyphs/uni0566.glif
index d8311ec52..ff41f50a1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0566.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0566.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0566" format="1">
+<glyph name="uni0566" format="2">
   <advance width="1233"/>
   <unicode hex="0566"/>
   <outline>
@@ -7,16 +7,16 @@
       <point x="836" y="139" type="line" name="iv01"/>
       <point x="776" y="26"/>
       <point x="675" y="-33"/>
-      <point x="536" y="-33" type="curve" name="dv01" smooth="yes"/>
+      <point x="536" y="-33" type="curve" smooth="yes" name="dv01"/>
       <point x="403" y="-33"/>
       <point x="295" y="23"/>
       <point x="219" y="124" type="curve" smooth="yes"/>
       <point x="143" y="227"/>
       <point x="103" y="369"/>
-      <point x="103" y="552" type="curve" name="dh01" smooth="yes"/>
+      <point x="103" y="552" type="curve" smooth="yes" name="dh01"/>
       <point x="103" y="919"/>
       <point x="269" y="1143"/>
-      <point x="536" y="1143" type="curve" name="at01" smooth="yes"/>
+      <point x="536" y="1143" type="curve" smooth="yes" name="at01"/>
       <point x="672" y="1143"/>
       <point x="775" y="1086"/>
       <point x="836" y="973" type="curve" name="sh01"/>
@@ -28,19 +28,19 @@
       <point x="836" y="-426" type="line" name="dh03"/>
     </contour>
     <contour>
-      <point x="566" y="123" type="curve" name="hr03" smooth="yes"/>
+      <point x="566" y="123" type="curve" smooth="yes" name="hr03"/>
       <point x="746" y="123"/>
       <point x="836" y="268"/>
-      <point x="836" y="555" type="curve" name="sh03" smooth="yes"/>
+      <point x="836" y="555" type="curve" smooth="yes" name="sh03"/>
       <point x="836" y="842"/>
       <point x="746" y="987"/>
-      <point x="566" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="566" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="477" y="987"/>
       <point x="410" y="951"/>
       <point x="365" y="879" type="curve" smooth="yes"/>
       <point x="320" y="806"/>
       <point x="298" y="698"/>
-      <point x="298" y="555" type="curve" name="dh02" smooth="yes"/>
+      <point x="298" y="555" type="curve" smooth="yes" name="dh02"/>
       <point x="298" y="267"/>
       <point x="387" y="123"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0567.glif b/source/Hack-Regular.ufo/glyphs/uni0567.glif
index 77ce8aa7d..e1c5ab8c3 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0567.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0567.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0567" format="1">
+<glyph name="uni0567" format="2">
   <advance width="1233"/>
   <unicode hex="0567"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0568.glif b/source/Hack-Regular.ufo/glyphs/uni0568.glif
index 251b68126..cc26fb29f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0568.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0568.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0568" format="1">
+<glyph name="uni0568" format="2">
   <advance width="1233"/>
   <unicode hex="0568"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="367" y="952" type="line" name="sh02"/>
       <point x="432" y="1081"/>
       <point x="546" y="1147"/>
-      <point x="699" y="1147" type="curve" name="sv02" smooth="yes"/>
+      <point x="699" y="1147" type="curve" smooth="yes" name="sv02"/>
       <point x="930" y="1147"/>
       <point x="1039" y="1001"/>
       <point x="1039" y="694" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="854" y="694" type="line" smooth="yes"/>
       <point x="854" y="895"/>
       <point x="787" y="987"/>
-      <point x="636" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="636" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="461" y="987"/>
       <point x="367" y="865"/>
-      <point x="367" y="633" type="curve" name="sh04" smooth="yes"/>
+      <point x="367" y="633" type="curve" smooth="yes" name="sh04"/>
       <point x="367" y="-283" type="line" name="sv03"/>
       <point x="1049" y="-283" type="line" name="sh05"/>
       <point x="1049" y="-426" type="line" name="hr01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0569.glif b/source/Hack-Regular.ufo/glyphs/uni0569.glif
index cc6a5d5f8..5a12b9a8c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0569.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0569.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0569" format="1">
+<glyph name="uni0569" format="2">
   <advance width="1233"/>
   <unicode hex="0569"/>
   <outline>
@@ -9,10 +9,10 @@
       <point x="290" y="950" type="line" name="dh02"/>
       <point x="335" y="1027"/>
       <point x="383" y="1076"/>
-      <point x="440" y="1107" type="curve" name="at01" smooth="yes"/>
+      <point x="440" y="1107" type="curve" smooth="yes" name="at01"/>
       <point x="491" y="1134"/>
       <point x="555" y="1147"/>
-      <point x="630" y="1147" type="curve" name="dv02" smooth="yes"/>
+      <point x="630" y="1147" type="curve" smooth="yes" name="dv02"/>
       <point x="786" y="1147"/>
       <point x="893" y="1089"/>
       <point x="972" y="988" type="curve" smooth="yes"/>
@@ -24,28 +24,28 @@
       <point x="1102" y="416" type="line" name="sh01"/>
       <point x="1073" y="68"/>
       <point x="902" y="-29"/>
-      <point x="731" y="-29" type="curve" name="dv03" smooth="yes"/>
+      <point x="731" y="-29" type="curve" smooth="yes" name="dv03"/>
       <point x="546" y="-29"/>
       <point x="421" y="78"/>
-      <point x="421" y="255" type="curve" name="dh03" smooth="yes"/>
+      <point x="421" y="255" type="curve" smooth="yes" name="dh03"/>
       <point x="421" y="462"/>
       <point x="575" y="559"/>
-      <point x="734" y="559" type="curve" name="sv01" smooth="yes"/>
+      <point x="734" y="559" type="curve" smooth="yes" name="sv01"/>
       <point x="935" y="559" type="line" name="dh05"/>
       <point x="932" y="704"/>
       <point x="899" y="808"/>
       <point x="847" y="879" type="curve" smooth="yes"/>
       <point x="790" y="956"/>
       <point x="704" y="995"/>
-      <point x="591" y="995" type="curve" name="dv01" smooth="yes"/>
+      <point x="591" y="995" type="curve" smooth="yes" name="dv01"/>
       <point x="397" y="995"/>
       <point x="290" y="889"/>
-      <point x="290" y="619" type="curve" name="sh02" smooth="yes"/>
+      <point x="290" y="619" type="curve" smooth="yes" name="sh02"/>
       <point x="290" y="-426" type="line" name="ab01"/>
       <point x="106" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="731" y="107" type="curve" name="dv04" smooth="yes"/>
+      <point x="731" y="107" type="curve" smooth="yes" name="dv04"/>
       <point x="784" y="107"/>
       <point x="827" y="127"/>
       <point x="862" y="176" type="curve" smooth="yes"/>
@@ -58,10 +58,10 @@
       <point x="638" y="376" type="curve" smooth="yes"/>
       <point x="611" y="348"/>
       <point x="593" y="307"/>
-      <point x="593" y="254" type="curve" name="dh04" smooth="yes"/>
+      <point x="593" y="254" type="curve" smooth="yes" name="dh04"/>
       <point x="593" y="214"/>
       <point x="603" y="178"/>
-      <point x="626" y="151" type="curve" name="hr01" smooth="yes"/>
+      <point x="626" y="151" type="curve" smooth="yes" name="hr01"/>
       <point x="647" y="126"/>
       <point x="679" y="107"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni056A_.glif b/source/Hack-Regular.ufo/glyphs/uni056A_.glif
index f99c56278..972c5bac4 100644
--- a/source/Hack-Regular.ufo/glyphs/uni056A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni056A_.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni056A" format="1">
+<glyph name="uni056A" format="2">
   <advance width="1233"/>
   <unicode hex="056A"/>
   <outline>
     <contour>
-      <point x="551" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="551" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="387" y="-29"/>
       <point x="276" y="33"/>
       <point x="201" y="138" type="curve" smooth="yes"/>
       <point x="125" y="246"/>
       <point x="93" y="393"/>
-      <point x="93" y="554" type="curve" name="sh01" smooth="yes"/>
+      <point x="93" y="554" type="curve" smooth="yes" name="sh01"/>
       <point x="93" y="714"/>
       <point x="125" y="848"/>
       <point x="198" y="952" type="curve" smooth="yes"/>
       <point x="271" y="1055"/>
       <point x="385" y="1120"/>
-      <point x="549" y="1120" type="curve" name="at02" smooth="yes"/>
+      <point x="549" y="1120" type="curve" smooth="yes" name="at02"/>
       <point x="826" y="1120" type="line" name="ah01"/>
       <point x="826" y="1556" type="line" name="at01"/>
       <point x="1011" y="1556" type="line"/>
@@ -29,18 +29,18 @@
       <point x="869" y="-29"/>
     </contour>
     <contour>
-      <point x="555" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="555" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="644" y="127"/>
       <point x="714" y="166"/>
       <point x="761" y="243" type="curve" smooth="yes"/>
       <point x="805" y="318"/>
       <point x="826" y="423"/>
-      <point x="826" y="559" type="curve" name="sh04" smooth="yes"/>
+      <point x="826" y="559" type="curve" smooth="yes" name="sh04"/>
       <point x="826" y="977" type="line" name="sv02"/>
-      <point x="551" y="977" type="line" name="sv03" smooth="yes"/>
+      <point x="551" y="977" type="line" smooth="yes" name="sv03"/>
       <point x="394" y="977"/>
       <point x="288" y="823"/>
-      <point x="288" y="552" type="curve" name="sh05" smooth="yes"/>
+      <point x="288" y="552" type="curve" smooth="yes" name="sh05"/>
       <point x="288" y="427"/>
       <point x="309" y="318"/>
       <point x="353" y="242" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni056B_.glif b/source/Hack-Regular.ufo/glyphs/uni056B_.glif
index 87875fd7a..bf6523039 100644
--- a/source/Hack-Regular.ufo/glyphs/uni056B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni056B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni056B" format="1">
+<glyph name="uni056B" format="2">
   <advance width="1233"/>
   <unicode hex="056B"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="372" y="952" type="line" name="iv01"/>
       <point x="437" y="1081"/>
       <point x="551" y="1147"/>
-      <point x="704" y="1147" type="curve" name="dv02" smooth="yes"/>
+      <point x="704" y="1147" type="curve" smooth="yes" name="dv02"/>
       <point x="935" y="1147"/>
       <point x="1044" y="1001"/>
       <point x="1044" y="694" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="859" y="694" type="line" smooth="yes"/>
       <point x="859" y="895"/>
       <point x="792" y="987"/>
-      <point x="641" y="987" type="curve" name="dv01" smooth="yes"/>
+      <point x="641" y="987" type="curve" smooth="yes" name="dv01"/>
       <point x="466" y="987"/>
       <point x="372" y="865"/>
-      <point x="372" y="633" type="curve" name="sh03" smooth="yes"/>
+      <point x="372" y="633" type="curve" smooth="yes" name="sh03"/>
       <point x="372" y="-426" type="line" name="ab01"/>
       <point x="188" y="-426" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni056C_.glif b/source/Hack-Regular.ufo/glyphs/uni056C_.glif
index fe3da72a5..3a3372c97 100644
--- a/source/Hack-Regular.ufo/glyphs/uni056C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni056C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni056C" format="1">
+<glyph name="uni056C" format="2">
   <advance width="1233"/>
   <unicode hex="056C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni056D_.glif b/source/Hack-Regular.ufo/glyphs/uni056D_.glif
index b23a29fbb..f36956df6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni056D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni056D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni056D" format="1">
+<glyph name="uni056D" format="2">
   <advance width="1233"/>
   <unicode hex="056D"/>
   <outline>
@@ -9,26 +9,26 @@
       <point x="271" y="1024" type="line" name="iv01"/>
       <point x="318" y="1107"/>
       <point x="380" y="1147"/>
-      <point x="472" y="1147" type="curve" name="dv02" smooth="yes"/>
+      <point x="472" y="1147" type="curve" smooth="yes" name="dv02"/>
       <point x="561" y="1147"/>
       <point x="621" y="1109"/>
       <point x="656" y="1038" type="curve" smooth="yes"/>
       <point x="691" y="966"/>
       <point x="700" y="864"/>
       <point x="700" y="731" type="curve" smooth="yes"/>
-      <point x="700" y="479" type="line" name="sh04" smooth="yes"/>
+      <point x="700" y="479" type="line" smooth="yes" name="sh04"/>
       <point x="700" y="281"/>
       <point x="713" y="218"/>
       <point x="729" y="183" type="curve" smooth="yes"/>
       <point x="746" y="148"/>
       <point x="778" y="127"/>
-      <point x="831" y="127" type="curve" name="sv01" smooth="yes"/>
+      <point x="831" y="127" type="curve" smooth="yes" name="sv01"/>
       <point x="888" y="127"/>
       <point x="915" y="152"/>
       <point x="931" y="188" type="curve" smooth="yes"/>
       <point x="954" y="237"/>
       <point x="961" y="330"/>
-      <point x="961" y="479" type="curve" name="sh06" smooth="yes"/>
+      <point x="961" y="479" type="curve" smooth="yes" name="sh06"/>
       <point x="961" y="1120" type="line" name="hr01"/>
       <point x="1128" y="1120" type="line"/>
       <point x="1128" y="0" type="line" name="sh07"/>
@@ -36,26 +36,26 @@
       <point x="961" y="96" type="line" name="iv02"/>
       <point x="914" y="13"/>
       <point x="852" y="-27"/>
-      <point x="760" y="-27" type="curve" name="ab02" smooth="yes"/>
+      <point x="760" y="-27" type="curve" smooth="yes" name="ab02"/>
       <point x="671" y="-27"/>
       <point x="612" y="11"/>
-      <point x="577" y="82" type="curve" name="hr02" smooth="yes"/>
+      <point x="577" y="82" type="curve" smooth="yes" name="hr02"/>
       <point x="542" y="154"/>
       <point x="532" y="256"/>
-      <point x="532" y="389" type="curve" name="sh03" smooth="yes"/>
+      <point x="532" y="389" type="curve" smooth="yes" name="sh03"/>
       <point x="532" y="641" type="line" smooth="yes"/>
       <point x="532" y="838"/>
       <point x="519" y="902"/>
       <point x="503" y="937" type="curve" smooth="yes"/>
       <point x="486" y="972"/>
       <point x="454" y="993"/>
-      <point x="401" y="993" type="curve" name="dv01" smooth="yes"/>
+      <point x="401" y="993" type="curve" smooth="yes" name="dv01"/>
       <point x="344" y="993"/>
       <point x="317" y="968"/>
       <point x="301" y="932" type="curve" smooth="yes"/>
       <point x="278" y="883"/>
       <point x="271" y="790"/>
-      <point x="271" y="641" type="curve" name="sh08" smooth="yes"/>
+      <point x="271" y="641" type="curve" smooth="yes" name="sh08"/>
       <point x="271" y="-426" type="line" name="ab01"/>
       <point x="104" y="-426" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni056E_.glif b/source/Hack-Regular.ufo/glyphs/uni056E_.glif
index d7b429a3b..a6c961249 100644
--- a/source/Hack-Regular.ufo/glyphs/uni056E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni056E_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni056E" format="1">
+<glyph name="uni056E" format="2">
   <advance width="1233"/>
   <unicode hex="056E"/>
   <outline>
     <contour>
-      <point x="615" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="615" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="447" y="-29"/>
       <point x="330" y="33"/>
       <point x="253" y="132" type="curve" smooth="yes"/>
       <point x="173" y="232"/>
       <point x="137" y="371"/>
-      <point x="137" y="536" type="curve" name="sh01" smooth="yes"/>
+      <point x="137" y="536" type="curve" smooth="yes" name="sh01"/>
       <point x="137" y="896"/>
       <point x="311" y="1072"/>
       <point x="523" y="1111" type="curve" name="ih01"/>
@@ -27,7 +27,7 @@
       <point x="1083" y="734" type="curve" name="sh04"/>
       <point x="1094" y="662"/>
       <point x="1096" y="585"/>
-      <point x="1096" y="556" type="curve" name="sh02" smooth="yes"/>
+      <point x="1096" y="556" type="curve" smooth="yes" name="sh02"/>
       <point x="1096" y="372"/>
       <point x="1061" y="232"/>
       <point x="981" y="132" type="curve" smooth="yes"/>
@@ -35,23 +35,23 @@
       <point x="784" y="-29"/>
     </contour>
     <contour>
-      <point x="614" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="614" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="718" y="127"/>
       <point x="792" y="172"/>
       <point x="839" y="248" type="curve" smooth="yes"/>
       <point x="880" y="317"/>
       <point x="901" y="413"/>
-      <point x="901" y="561" type="curve" name="ah01" smooth="yes"/>
+      <point x="901" y="561" type="curve" smooth="yes" name="ah01"/>
       <point x="901" y="593"/>
       <point x="901" y="680"/>
       <point x="882" y="752" type="curve" smooth="yes"/>
       <point x="865" y="823"/>
       <point x="830" y="894"/>
       <point x="769" y="950" type="curve" name="sv02"/>
-      <point x="616" y="950" type="line" name="sv03" smooth="yes"/>
+      <point x="616" y="950" type="line" smooth="yes" name="sv03"/>
       <point x="408" y="950"/>
       <point x="330" y="762"/>
-      <point x="330" y="535" type="curve" name="sh05" smooth="yes"/>
+      <point x="330" y="535" type="curve" smooth="yes" name="sh05"/>
       <point x="330" y="424"/>
       <point x="349" y="323"/>
       <point x="394" y="248" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni056F_.glif b/source/Hack-Regular.ufo/glyphs/uni056F_.glif
index 452a7d2a8..ce83e8104 100644
--- a/source/Hack-Regular.ufo/glyphs/uni056F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni056F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni056F" format="1">
+<glyph name="uni056F" format="2">
   <advance width="1233"/>
   <unicode hex="056F"/>
   <outline>
@@ -7,19 +7,19 @@
       <point x="859" y="168" type="line" name="hr00"/>
       <point x="794" y="39"/>
       <point x="682" y="-29"/>
-      <point x="526" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="526" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="295" y="-29"/>
       <point x="188" y="119"/>
-      <point x="188" y="424" type="curve" name="sh01" smooth="yes"/>
+      <point x="188" y="424" type="curve" smooth="yes" name="sh01"/>
       <point x="188" y="1556" type="line" name="at01"/>
       <point x="372" y="1556" type="line"/>
-      <point x="372" y="424" type="line" name="sh02" smooth="yes"/>
+      <point x="372" y="424" type="line" smooth="yes" name="sh02"/>
       <point x="372" y="223"/>
       <point x="442" y="131"/>
-      <point x="591" y="131" type="curve" name="dv02" smooth="yes"/>
+      <point x="591" y="131" type="curve" smooth="yes" name="dv02"/>
       <point x="767" y="131"/>
       <point x="859" y="254"/>
-      <point x="859" y="485" type="curve" name="sh03" smooth="yes"/>
+      <point x="859" y="485" type="curve" smooth="yes" name="sh03"/>
       <point x="859" y="1120" type="line" name="at02"/>
       <point x="1044" y="1120" type="line"/>
       <point x="1044" y="-426" type="line" name="sh04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0570.glif b/source/Hack-Regular.ufo/glyphs/uni0570.glif
index aa1fc3c23..1d8019a9b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0570.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0570.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0570" format="1">
+<glyph name="uni0570" format="2">
   <advance width="1233"/>
   <unicode hex="0570"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="373" y="952" type="line" name="iv01"/>
       <point x="438" y="1081"/>
       <point x="552" y="1147"/>
-      <point x="705" y="1147" type="curve" name="dv02" smooth="yes"/>
+      <point x="705" y="1147" type="curve" smooth="yes" name="dv02"/>
       <point x="934" y="1147"/>
       <point x="1045" y="999"/>
       <point x="1045" y="694" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="860" y="694" type="line" smooth="yes"/>
       <point x="860" y="895"/>
       <point x="793" y="987"/>
-      <point x="642" y="987" type="curve" name="dv01" smooth="yes"/>
+      <point x="642" y="987" type="curve" smooth="yes" name="dv01"/>
       <point x="467" y="987"/>
       <point x="373" y="862"/>
-      <point x="373" y="633" type="curve" name="sh03" smooth="yes"/>
+      <point x="373" y="633" type="curve" smooth="yes" name="sh03"/>
       <point x="373" y="0" type="line" name="ab01"/>
       <point x="189" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0571.glif b/source/Hack-Regular.ufo/glyphs/uni0571.glif
index 32dd2b731..2210669ad 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0571.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0571.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0571" format="1">
+<glyph name="uni0571" format="2">
   <advance width="1233"/>
   <unicode hex="0571"/>
   <outline>
     <contour>
-      <point x="540" y="-30" type="curve" name="dv01" smooth="yes"/>
+      <point x="540" y="-30" type="curve" smooth="yes" name="dv01"/>
       <point x="305" y="-30"/>
       <point x="166" y="154"/>
-      <point x="166" y="419" type="curve" name="dh01" smooth="yes"/>
+      <point x="166" y="419" type="curve" smooth="yes" name="dh01"/>
       <point x="166" y="680"/>
       <point x="300" y="913"/>
       <point x="544" y="1121" type="curve" name="ih02"/>
       <point x="392" y="1140"/>
       <point x="320" y="1248"/>
-      <point x="320" y="1355" type="curve" name="ih01" smooth="yes"/>
+      <point x="320" y="1355" type="curve" smooth="yes" name="ih01"/>
       <point x="320" y="1398"/>
       <point x="331" y="1440"/>
       <point x="355" y="1477" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="548" y="1471" type="line" smooth="yes"/>
       <point x="527" y="1438"/>
       <point x="516" y="1406"/>
-      <point x="516" y="1374" type="curve" name="sh02" smooth="yes"/>
+      <point x="516" y="1374" type="curve" smooth="yes" name="sh02"/>
       <point x="516" y="1337"/>
       <point x="529" y="1306"/>
       <point x="554" y="1281" type="curve" smooth="yes"/>
@@ -55,13 +55,13 @@
       <point x="624" y="-30"/>
     </contour>
     <contour>
-      <point x="594" y="131" type="curve" name="hr02" smooth="yes"/>
+      <point x="594" y="131" type="curve" smooth="yes" name="hr02"/>
       <point x="690" y="131"/>
       <point x="763" y="170"/>
       <point x="808" y="233" type="curve" smooth="yes"/>
       <point x="851" y="292"/>
       <point x="872" y="375"/>
-      <point x="872" y="470" type="curve" name="sh03" smooth="yes"/>
+      <point x="872" y="470" type="curve" smooth="yes" name="sh03"/>
       <point x="872" y="556" type="line" smooth="yes"/>
       <point x="872" y="694"/>
       <point x="828" y="890"/>
@@ -71,10 +71,10 @@
       <point x="436" y="750" type="curve" smooth="yes"/>
       <point x="387" y="658"/>
       <point x="357" y="561"/>
-      <point x="357" y="448" type="curve" name="dh02" smooth="yes"/>
+      <point x="357" y="448" type="curve" smooth="yes" name="dh02"/>
       <point x="357" y="361"/>
       <point x="374" y="282"/>
-      <point x="413" y="223" type="curve" name="hr03" smooth="yes"/>
+      <point x="413" y="223" type="curve" smooth="yes" name="hr03"/>
       <point x="453" y="162"/>
       <point x="510" y="131"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0572.glif b/source/Hack-Regular.ufo/glyphs/uni0572.glif
index 8a5502547..99ee69859 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0572.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0572.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0572" format="1">
+<glyph name="uni0572" format="2">
   <advance width="1233"/>
   <unicode hex="0572"/>
   <outline>
     <contour>
-      <point x="865" y="694" type="line" name="dh02" smooth="yes"/>
+      <point x="865" y="694" type="line" smooth="yes" name="dh02"/>
       <point x="865" y="895"/>
       <point x="798" y="987"/>
-      <point x="647" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="647" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="472" y="987"/>
       <point x="378" y="865"/>
       <point x="378" y="633" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="378" y="952" type="line" name="hr02"/>
       <point x="443" y="1081"/>
       <point x="557" y="1147"/>
-      <point x="710" y="1147" type="curve" name="sv02" smooth="yes"/>
+      <point x="710" y="1147" type="curve" smooth="yes" name="sv02"/>
       <point x="941" y="1147"/>
       <point x="1050" y="1001"/>
-      <point x="1050" y="694" type="curve" name="dh03" smooth="yes"/>
+      <point x="1050" y="694" type="curve" smooth="yes" name="dh03"/>
       <point x="1050" y="-283" type="line" name="sv03"/>
       <point x="1199" y="-283" type="line" name="sh01"/>
       <point x="1199" y="-426" type="line" name="ab01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0573.glif b/source/Hack-Regular.ufo/glyphs/uni0573.glif
index 5544d609c..aa692c45b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0573.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0573.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0573" format="1">
+<glyph name="uni0573" format="2">
   <advance width="1233"/>
   <unicode hex="0573"/>
   <outline>
     <contour>
-      <point x="553" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="553" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="425" y="-29"/>
       <point x="340" y="17"/>
       <point x="280" y="92" type="curve" smooth="yes"/>
@@ -19,17 +19,17 @@
       <point x="364" y="1120" type="line"/>
       <point x="500" y="1371"/>
       <point x="699" y="1556"/>
-      <point x="956" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="956" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="974" y="1556"/>
       <point x="991" y="1555"/>
-      <point x="1007" y="1553" type="curve" name="at02" smooth="yes"/>
+      <point x="1007" y="1553" type="curve" smooth="yes" name="at02"/>
       <point x="1022" y="1550"/>
       <point x="1033" y="1549"/>
       <point x="1044" y="1545" type="curve" name="at03"/>
       <point x="1044" y="1394" type="line" name="ih01"/>
       <point x="1017" y="1406"/>
       <point x="977" y="1413"/>
-      <point x="942" y="1413" type="curve" name="hr01" smooth="yes"/>
+      <point x="942" y="1413" type="curve" smooth="yes" name="hr01"/>
       <point x="866" y="1413"/>
       <point x="793" y="1380"/>
       <point x="732" y="1333" type="curve" smooth="yes"/>
@@ -46,13 +46,13 @@
       <point x="720" y="-29"/>
     </contour>
     <contour>
-      <point x="614" y="131" type="curve" name="dv02" smooth="yes"/>
+      <point x="614" y="131" type="curve" smooth="yes" name="dv02"/>
       <point x="718" y="131"/>
       <point x="783" y="175"/>
       <point x="826" y="240" type="curve" smooth="yes"/>
       <point x="869" y="304"/>
       <point x="885" y="389"/>
-      <point x="885" y="470" type="curve" name="sh01" smooth="yes"/>
+      <point x="885" y="470" type="curve" smooth="yes" name="sh01"/>
       <point x="885" y="609" type="line" smooth="yes"/>
       <point x="885" y="814"/>
       <point x="770" y="956"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0574.glif b/source/Hack-Regular.ufo/glyphs/uni0574.glif
index 8974f14e3..2d92e62c5 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0574.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0574.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0574" format="1">
+<glyph name="uni0574" format="2">
   <advance width="1233"/>
   <unicode hex="0574"/>
   <outline>
     <contour>
-      <point x="482" y="-29" type="curve" name="sv01" smooth="yes"/>
+      <point x="482" y="-29" type="curve" smooth="yes" name="sv01"/>
       <point x="251" y="-29"/>
       <point x="144" y="119"/>
-      <point x="144" y="424" type="curve" name="dh01" smooth="yes"/>
+      <point x="144" y="424" type="curve" smooth="yes" name="dh01"/>
       <point x="144" y="1120" type="line" name="hr01"/>
       <point x="328" y="1120" type="line"/>
-      <point x="328" y="424" type="line" name="dh02" smooth="yes"/>
+      <point x="328" y="424" type="line" smooth="yes" name="dh02"/>
       <point x="328" y="223"/>
       <point x="398" y="131"/>
-      <point x="547" y="131" type="curve" name="hr02" smooth="yes"/>
+      <point x="547" y="131" type="curve" smooth="yes" name="hr02"/>
       <point x="723" y="131"/>
       <point x="815" y="254"/>
-      <point x="815" y="485" type="curve" name="sh01" smooth="yes"/>
+      <point x="815" y="485" type="curve" smooth="yes" name="sh01"/>
       <point x="815" y="1556" type="line" name="at01"/>
       <point x="1168" y="1556" type="line"/>
       <point x="1168" y="1413" type="line" name="sh02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0575.glif b/source/Hack-Regular.ufo/glyphs/uni0575.glif
index 8dc13da2c..c609216b5 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0575.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0575.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0575" format="1">
+<glyph name="uni0575" format="2">
   <advance width="1233"/>
   <unicode hex="0575"/>
   <outline>
@@ -8,13 +8,13 @@
       <point x="451" y="-270" type="line" smooth="yes"/>
       <point x="571" y="-270"/>
       <point x="631" y="-187"/>
-      <point x="631" y="-20" type="curve" name="dh01" smooth="yes"/>
+      <point x="631" y="-20" type="curve" smooth="yes" name="dh01"/>
       <point x="631" y="1120" type="line" name="at01"/>
       <point x="815" y="1120" type="line"/>
-      <point x="815" y="-20" type="line" name="dh02" smooth="yes"/>
+      <point x="815" y="-20" type="line" smooth="yes" name="dh02"/>
       <point x="815" y="-283"/>
       <point x="694" y="-426"/>
-      <point x="471" y="-426" type="curve" name="ab01" smooth="yes"/>
+      <point x="471" y="-426" type="curve" smooth="yes" name="ab01"/>
       <point x="217" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0576.glif b/source/Hack-Regular.ufo/glyphs/uni0576.glif
index 7b2595a72..fa7ff82a2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0576.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0576.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0576" format="1">
+<glyph name="uni0576" format="2">
   <advance width="1233"/>
   <unicode hex="0576"/>
   <outline>
     <contour>
-      <point x="530" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="530" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="299" y="-29"/>
       <point x="192" y="119"/>
-      <point x="192" y="424" type="curve" name="sh01" smooth="yes"/>
+      <point x="192" y="424" type="curve" smooth="yes" name="sh01"/>
       <point x="192" y="1413" type="line" name="hr01"/>
       <point x="24" y="1413" type="line"/>
       <point x="24" y="1556" type="line" name="dh01"/>
@@ -15,10 +15,10 @@
       <point x="376" y="424" type="line" smooth="yes"/>
       <point x="376" y="223"/>
       <point x="446" y="131"/>
-      <point x="595" y="131" type="curve" name="sv01" smooth="yes"/>
+      <point x="595" y="131" type="curve" smooth="yes" name="sv01"/>
       <point x="771" y="131"/>
       <point x="863" y="254"/>
-      <point x="863" y="485" type="curve" name="sh02" smooth="yes"/>
+      <point x="863" y="485" type="curve" smooth="yes" name="sh02"/>
       <point x="863" y="1120" type="line" name="at01"/>
       <point x="1048" y="1120" type="line"/>
       <point x="1048" y="0" type="line" name="dh04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0577.glif b/source/Hack-Regular.ufo/glyphs/uni0577.glif
index 99574cbb1..5d63cdffd 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0577.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0577.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0577" format="1">
+<glyph name="uni0577" format="2">
   <advance width="1233"/>
   <unicode hex="0577"/>
   <outline>
     <contour>
-      <point x="352" y="-426" type="line" name="hr00" smooth="yes"/>
+      <point x="352" y="-426" type="line" smooth="yes" name="hr00"/>
       <point x="296" y="-426"/>
       <point x="250" y="-407"/>
       <point x="218" y="-375" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="761" y="467" type="curve" smooth="yes"/>
       <point x="829" y="558"/>
       <point x="870" y="643"/>
-      <point x="870" y="740" type="curve" name="dh01" smooth="yes"/>
+      <point x="870" y="740" type="curve" smooth="yes" name="dh01"/>
       <point x="870" y="808"/>
       <point x="850" y="875"/>
       <point x="794" y="924" type="curve" smooth="yes"/>
       <point x="743" y="969"/>
       <point x="669" y="994"/>
-      <point x="585" y="994" type="curve" name="dv01" smooth="yes"/>
+      <point x="585" y="994" type="curve" smooth="yes" name="dv01"/>
       <point x="522" y="994"/>
       <point x="477" y="980"/>
       <point x="434" y="957" type="curve" smooth="yes"/>
@@ -35,13 +35,13 @@
       <point x="180" y="951" type="line"/>
       <point x="276" y="1074"/>
       <point x="406" y="1148"/>
-      <point x="594" y="1148" type="curve" name="dv02" smooth="yes"/>
+      <point x="594" y="1148" type="curve" smooth="yes" name="dv02"/>
       <point x="723" y="1148"/>
       <point x="842" y="1112"/>
       <point x="926" y="1040" type="curve" smooth="yes"/>
       <point x="1011" y="967"/>
       <point x="1054" y="863"/>
-      <point x="1054" y="746" type="curve" name="dh02" smooth="yes"/>
+      <point x="1054" y="746" type="curve" smooth="yes" name="dh02"/>
       <point x="1054" y="633"/>
       <point x="1014" y="539"/>
       <point x="949" y="440" type="curve" smooth="yes"/>
@@ -59,7 +59,7 @@
       <point x="380" y="-207" type="curve" smooth="yes"/>
       <point x="380" y="-228"/>
       <point x="397" y="-283"/>
-      <point x="465" y="-283" type="curve" name="sv01" smooth="yes"/>
+      <point x="465" y="-283" type="curve" smooth="yes" name="sv01"/>
       <point x="1004" y="-283" type="line" name="sv02"/>
       <point x="1004" y="-426" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0578.glif b/source/Hack-Regular.ufo/glyphs/uni0578.glif
index aff957572..882f5f304 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0578.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0578.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0578" format="1">
+<glyph name="uni0578" format="2">
   <advance width="1233"/>
   <unicode hex="0578"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="373" y="952" type="line" name="sh02"/>
       <point x="438" y="1081"/>
       <point x="552" y="1147"/>
-      <point x="705" y="1147" type="curve" name="sv02" smooth="yes"/>
+      <point x="705" y="1147" type="curve" smooth="yes" name="sv02"/>
       <point x="934" y="1147"/>
       <point x="1045" y="999"/>
       <point x="1045" y="694" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="860" y="694" type="line" smooth="yes"/>
       <point x="860" y="895"/>
       <point x="793" y="987"/>
-      <point x="642" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="642" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="467" y="987"/>
       <point x="373" y="862"/>
-      <point x="373" y="633" type="curve" name="sh04" smooth="yes"/>
+      <point x="373" y="633" type="curve" smooth="yes" name="sh04"/>
       <point x="373" y="0" type="line" name="hr01"/>
       <point x="189" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0579.glif b/source/Hack-Regular.ufo/glyphs/uni0579.glif
index 75b9b13f2..bfbb88842 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0579.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0579.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0579" format="1">
+<glyph name="uni0579" format="2">
   <advance width="1233"/>
   <unicode hex="0579"/>
   <outline>
     <contour>
-      <point x="412" y="-426" type="line" name="ab01" smooth="yes"/>
+      <point x="412" y="-426" type="line" smooth="yes" name="ab01"/>
       <point x="367" y="-426"/>
       <point x="328" y="-414"/>
       <point x="293" y="-383" type="curve" smooth="yes"/>
       <point x="261" y="-354"/>
       <point x="242" y="-315"/>
-      <point x="242" y="-250" type="curve" name="dh01" smooth="yes"/>
+      <point x="242" y="-250" type="curve" smooth="yes" name="dh01"/>
       <point x="242" y="-103"/>
       <point x="340" y="121"/>
       <point x="466" y="302" type="curve" smooth="yes"/>
@@ -19,7 +19,7 @@
       <point x="675" y="551" type="curve" name="iv01"/>
       <point x="556" y="551"/>
       <point x="360" y="635"/>
-      <point x="360" y="836" type="curve" name="ih01" smooth="yes"/>
+      <point x="360" y="836" type="curve" smooth="yes" name="ih01"/>
       <point x="360" y="916"/>
       <point x="391" y="1001"/>
       <point x="464" y="1074" type="curve" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="651" y="1027" type="line" smooth="yes"/>
       <point x="588" y="967"/>
       <point x="545" y="902"/>
-      <point x="545" y="839" type="curve" name="sh01" smooth="yes"/>
+      <point x="545" y="839" type="curve" smooth="yes" name="sh01"/>
       <point x="545" y="784"/>
       <point x="578" y="750"/>
       <point x="619" y="727" type="curve" smooth="yes"/>
@@ -44,13 +44,13 @@
       <point x="585" y="187" type="curve"/>
       <point x="492" y="47"/>
       <point x="439" y="-90"/>
-      <point x="439" y="-173" type="curve" name="dh02" smooth="yes"/>
+      <point x="439" y="-173" type="curve" smooth="yes" name="dh02"/>
       <point x="439" y="-204"/>
       <point x="447" y="-229"/>
       <point x="463" y="-250" type="curve" smooth="yes"/>
       <point x="478" y="-270"/>
       <point x="499" y="-283"/>
-      <point x="527" y="-283" type="curve" name="hr02" smooth="yes"/>
+      <point x="527" y="-283" type="curve" smooth="yes" name="hr02"/>
       <point x="990" y="-283" type="line" name="sv01"/>
       <point x="990" y="-426" type="line" name="ab02"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni057A_.glif b/source/Hack-Regular.ufo/glyphs/uni057A_.glif
index df89307be..d97f77b53 100644
--- a/source/Hack-Regular.ufo/glyphs/uni057A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni057A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni057A" format="1">
+<glyph name="uni057A" format="2">
   <advance width="1233"/>
   <unicode hex="057A"/>
   <outline>
@@ -7,49 +7,49 @@
       <point x="957" y="96" type="line" name="hr00"/>
       <point x="912" y="14"/>
       <point x="846" y="-27"/>
-      <point x="759" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="759" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="668" y="-27"/>
       <point x="596" y="15"/>
       <point x="557" y="114" type="curve" name="ih01"/>
       <point x="510" y="18"/>
       <point x="448" y="-27"/>
-      <point x="339" y="-27" type="curve" name="ab02" smooth="yes"/>
+      <point x="339" y="-27" type="curve" smooth="yes" name="ab02"/>
       <point x="256" y="-27"/>
       <point x="195" y="-3"/>
       <point x="154" y="76" type="curve" smooth="yes"/>
       <point x="116" y="148"/>
       <point x="98" y="263"/>
-      <point x="98" y="471" type="curve" name="dh01" smooth="yes"/>
+      <point x="98" y="471" type="curve" smooth="yes" name="dh01"/>
       <point x="98" y="1120" type="line" name="at01"/>
       <point x="266" y="1120" type="line"/>
-      <point x="266" y="479" type="line" name="dh02" smooth="yes"/>
+      <point x="266" y="479" type="line" smooth="yes" name="dh02"/>
       <point x="266" y="400"/>
       <point x="268" y="336"/>
-      <point x="272" y="287" type="curve" name="sh01" smooth="yes"/>
+      <point x="272" y="287" type="curve" smooth="yes" name="sh01"/>
       <point x="280" y="188"/>
       <point x="293" y="127"/>
-      <point x="389" y="127" type="curve" name="sv01" smooth="yes"/>
+      <point x="389" y="127" type="curve" smooth="yes" name="sv01"/>
       <point x="449" y="127"/>
       <point x="478" y="149"/>
       <point x="497" y="188" type="curve" smooth="yes"/>
       <point x="518" y="231"/>
       <point x="528" y="315"/>
-      <point x="528" y="479" type="curve" name="dh03" smooth="yes"/>
+      <point x="528" y="479" type="curve" smooth="yes" name="dh03"/>
       <point x="528" y="1120" type="line" name="at02"/>
       <point x="696" y="1120" type="line"/>
-      <point x="696" y="479" type="line" name="dh04" smooth="yes"/>
+      <point x="696" y="479" type="line" smooth="yes" name="dh04"/>
       <point x="696" y="281"/>
       <point x="709" y="218"/>
       <point x="725" y="183" type="curve" smooth="yes"/>
       <point x="742" y="148"/>
       <point x="774" y="127"/>
-      <point x="827" y="127" type="curve" name="sv02" smooth="yes"/>
+      <point x="827" y="127" type="curve" smooth="yes" name="sv02"/>
       <point x="884" y="127"/>
       <point x="911" y="152"/>
       <point x="927" y="188" type="curve" smooth="yes"/>
       <point x="950" y="237"/>
       <point x="957" y="330"/>
-      <point x="957" y="479" type="curve" name="sh02" smooth="yes"/>
+      <point x="957" y="479" type="curve" smooth="yes" name="sh02"/>
       <point x="957" y="1120" type="line" name="at03"/>
       <point x="1124" y="1120" type="line"/>
       <point x="1124" y="-426" type="line" name="dh06"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni057B_.glif b/source/Hack-Regular.ufo/glyphs/uni057B_.glif
index 5131d2014..0b71a7b99 100644
--- a/source/Hack-Regular.ufo/glyphs/uni057B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni057B_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni057B" format="1">
+<glyph name="uni057B" format="2">
   <advance width="1233"/>
   <unicode hex="057B"/>
   <outline>
     <contour>
-      <point x="363" y="-426" type="line" name="hr00" smooth="yes"/>
+      <point x="363" y="-426" type="line" smooth="yes" name="hr00"/>
       <point x="262" y="-426"/>
       <point x="180" y="-361"/>
-      <point x="180" y="-261" type="curve" name="sh01" smooth="yes"/>
+      <point x="180" y="-261" type="curve" smooth="yes" name="sh01"/>
       <point x="180" y="-158"/>
       <point x="265" y="-63"/>
       <point x="334" y="14" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="403" y="133" type="curve" smooth="yes"/>
       <point x="414" y="172"/>
       <point x="414" y="209"/>
-      <point x="414" y="233" type="curve" name="dh03" smooth="yes"/>
+      <point x="414" y="233" type="curve" smooth="yes" name="dh03"/>
       <point x="414" y="320"/>
       <point x="401" y="375"/>
       <point x="351" y="446" type="curve" smooth="yes"/>
@@ -28,19 +28,19 @@
       <point x="186" y="688" type="curve" smooth="yes"/>
       <point x="175" y="715"/>
       <point x="168" y="744"/>
-      <point x="168" y="784" type="curve" name="dh01" smooth="yes"/>
+      <point x="168" y="784" type="curve" smooth="yes" name="dh01"/>
       <point x="168" y="885"/>
       <point x="217" y="978"/>
       <point x="300" y="1046" type="curve" smooth="yes"/>
       <point x="376" y="1109"/>
       <point x="482" y="1148"/>
-      <point x="610" y="1148" type="curve" name="dv02" smooth="yes"/>
+      <point x="610" y="1148" type="curve" smooth="yes" name="dv02"/>
       <point x="720" y="1148"/>
       <point x="839" y="1117"/>
       <point x="932" y="1043" type="curve" smooth="yes"/>
       <point x="1020" y="971"/>
       <point x="1065" y="874"/>
-      <point x="1065" y="753" type="curve" name="dh06" smooth="yes"/>
+      <point x="1065" y="753" type="curve" smooth="yes" name="dh06"/>
       <point x="1065" y="636"/>
       <point x="1023" y="538"/>
       <point x="960" y="442" type="curve" smooth="yes"/>
@@ -58,7 +58,7 @@
       <point x="391" y="-209" type="curve" smooth="yes"/>
       <point x="391" y="-264"/>
       <point x="448" y="-283"/>
-      <point x="476" y="-283" type="curve" name="sv01" smooth="yes"/>
+      <point x="476" y="-283" type="curve" smooth="yes" name="sv01"/>
       <point x="1015" y="-283" type="line"/>
       <point x="1015" y="-426" type="line"/>
     </contour>
@@ -66,19 +66,19 @@
       <point x="512" y="188" type="curve" name="ih01"/>
       <point x="681" y="352"/>
       <point x="881" y="531"/>
-      <point x="881" y="740" type="curve" name="dh05" smooth="yes"/>
+      <point x="881" y="740" type="curve" smooth="yes" name="dh05"/>
       <point x="881" y="820"/>
       <point x="853" y="884"/>
       <point x="802" y="928" type="curve" smooth="yes"/>
       <point x="750" y="973"/>
       <point x="680" y="994"/>
-      <point x="604" y="994" type="curve" name="dv01" smooth="yes"/>
+      <point x="604" y="994" type="curve" smooth="yes" name="dv01"/>
       <point x="532" y="994"/>
       <point x="475" y="976"/>
       <point x="432" y="941" type="curve" smooth="yes"/>
       <point x="384" y="902"/>
       <point x="356" y="848"/>
-      <point x="356" y="792" type="curve" name="dh02" smooth="yes"/>
+      <point x="356" y="792" type="curve" smooth="yes" name="dh02"/>
       <point x="356" y="753"/>
       <point x="370" y="713"/>
       <point x="410" y="653" type="curve" smooth="yes"/>
@@ -90,7 +90,7 @@
       <point x="547" y="433" type="curve" smooth="yes"/>
       <point x="557" y="406"/>
       <point x="562" y="377"/>
-      <point x="562" y="348" type="curve" name="dh04" smooth="yes"/>
+      <point x="562" y="348" type="curve" smooth="yes" name="dh04"/>
       <point x="562" y="295"/>
       <point x="545" y="241"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni057C_.glif b/source/Hack-Regular.ufo/glyphs/uni057C_.glif
index b0473b1ae..eba887985 100644
--- a/source/Hack-Regular.ufo/glyphs/uni057C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni057C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni057C" format="1">
+<glyph name="uni057C" format="2">
   <advance width="1233"/>
   <unicode hex="057C"/>
   <outline>
@@ -9,10 +9,10 @@
       <point x="366" y="948" type="line" name="sh02"/>
       <point x="431" y="1081"/>
       <point x="538" y="1147"/>
-      <point x="695" y="1147" type="curve" name="dv02" smooth="yes"/>
+      <point x="695" y="1147" type="curve" smooth="yes" name="dv02"/>
       <point x="965" y="1147"/>
       <point x="1072" y="950"/>
-      <point x="1072" y="677" type="curve" name="sh03" smooth="yes"/>
+      <point x="1072" y="677" type="curve" smooth="yes" name="sh03"/>
       <point x="1072" y="572"/>
       <point x="1056" y="474"/>
       <point x="1017" y="383" type="curve" smooth="yes"/>
@@ -28,16 +28,16 @@
       <point x="821" y="354" type="curve" smooth="yes"/>
       <point x="860" y="431"/>
       <point x="880" y="517"/>
-      <point x="880" y="633" type="curve" name="ah01" smooth="yes"/>
+      <point x="880" y="633" type="curve" smooth="yes" name="ah01"/>
       <point x="880" y="724"/>
       <point x="867" y="814"/>
       <point x="823" y="883" type="curve" smooth="yes"/>
       <point x="780" y="950"/>
       <point x="717" y="987"/>
-      <point x="625" y="987" type="curve" name="dv01" smooth="yes"/>
+      <point x="625" y="987" type="curve" smooth="yes" name="dv01"/>
       <point x="451" y="987"/>
       <point x="366" y="840"/>
-      <point x="366" y="653" type="curve" name="sh04" smooth="yes"/>
+      <point x="366" y="653" type="curve" smooth="yes" name="sh04"/>
       <point x="366" y="0" type="line" name="hr01"/>
       <point x="182" y="0" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni057D_.glif b/source/Hack-Regular.ufo/glyphs/uni057D_.glif
index 6fa607602..42a65b00e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni057D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni057D_.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni057D" format="1">
+<glyph name="uni057D" format="2">
   <advance width="1233"/>
   <unicode hex="057D"/>
   <outline>
     <contour>
-      <point x="528" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="528" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="299" y="-29"/>
       <point x="189" y="119"/>
-      <point x="189" y="424" type="curve" name="sh01" smooth="yes"/>
+      <point x="189" y="424" type="curve" smooth="yes" name="sh01"/>
       <point x="189" y="1118" type="line" name="hr01"/>
       <point x="373" y="1118" type="line"/>
-      <point x="373" y="424" type="line" name="sh02" smooth="yes"/>
+      <point x="373" y="424" type="line" smooth="yes" name="sh02"/>
       <point x="373" y="223"/>
       <point x="443" y="131"/>
-      <point x="592" y="131" type="curve" name="sv01" smooth="yes"/>
+      <point x="592" y="131" type="curve" smooth="yes" name="sv01"/>
       <point x="767" y="131"/>
       <point x="860" y="256"/>
-      <point x="860" y="485" type="curve" name="sh03" smooth="yes"/>
+      <point x="860" y="485" type="curve" smooth="yes" name="sh03"/>
       <point x="860" y="1118" type="line" name="at01"/>
       <point x="1045" y="1118" type="line"/>
       <point x="1045" y="0" type="line" name="sh04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni057E_.glif b/source/Hack-Regular.ufo/glyphs/uni057E_.glif
index 0cda7d65b..6d2729131 100644
--- a/source/Hack-Regular.ufo/glyphs/uni057E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni057E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni057E" format="1">
+<glyph name="uni057E" format="2">
   <advance width="1233"/>
   <unicode hex="057E"/>
   <outline>
@@ -7,19 +7,19 @@
       <point x="853" y="168" type="line" name="iv01"/>
       <point x="788" y="39"/>
       <point x="676" y="-29"/>
-      <point x="520" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="520" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="289" y="-29"/>
       <point x="182" y="119"/>
-      <point x="182" y="424" type="curve" name="dh01" smooth="yes"/>
+      <point x="182" y="424" type="curve" smooth="yes" name="dh01"/>
       <point x="182" y="1120" type="line" name="hr01"/>
       <point x="366" y="1120" type="line"/>
-      <point x="366" y="424" type="line" name="dh02" smooth="yes"/>
+      <point x="366" y="424" type="line" smooth="yes" name="dh02"/>
       <point x="366" y="223"/>
       <point x="436" y="131"/>
-      <point x="585" y="131" type="curve" name="dv02" smooth="yes"/>
+      <point x="585" y="131" type="curve" smooth="yes" name="dv02"/>
       <point x="761" y="131"/>
       <point x="853" y="254"/>
-      <point x="853" y="485" type="curve" name="sh01" smooth="yes"/>
+      <point x="853" y="485" type="curve" smooth="yes" name="sh01"/>
       <point x="853" y="1556" type="line" name="at01"/>
       <point x="1038" y="1556" type="line"/>
       <point x="1038" y="-281" type="line" name="dh04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni057F_.glif b/source/Hack-Regular.ufo/glyphs/uni057F_.glif
index a9a3febc8..0f022cc25 100644
--- a/source/Hack-Regular.ufo/glyphs/uni057F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni057F_.glif
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni057F" format="1">
+<glyph name="uni057F" format="2">
   <advance width="1233"/>
   <unicode hex="057F"/>
   <outline>
     <contour>
-      <point x="333" y="-27" type="curve" name="ab02" smooth="yes"/>
+      <point x="333" y="-27" type="curve" smooth="yes" name="ab02"/>
       <point x="246" y="-27"/>
       <point x="185" y="9"/>
       <point x="150" y="80" type="curve" smooth="yes"/>
       <point x="115" y="152"/>
       <point x="104" y="256"/>
-      <point x="104" y="393" type="curve" name="hr01" smooth="yes"/>
+      <point x="104" y="393" type="curve" smooth="yes" name="hr01"/>
       <point x="104" y="1120" type="line" name="at01"/>
       <point x="272" y="1120" type="line"/>
-      <point x="272" y="479" type="line" name="sh01" smooth="yes"/>
+      <point x="272" y="479" type="line" smooth="yes" name="sh01"/>
       <point x="272" y="281"/>
       <point x="285" y="218"/>
       <point x="301" y="183" type="curve" smooth="yes"/>
       <point x="318" y="148"/>
       <point x="350" y="127"/>
-      <point x="403" y="127" type="curve" name="sv01" smooth="yes"/>
+      <point x="403" y="127" type="curve" smooth="yes" name="sv01"/>
       <point x="460" y="127"/>
       <point x="487" y="152"/>
       <point x="503" y="188" type="curve" smooth="yes"/>
       <point x="526" y="237"/>
       <point x="533" y="330"/>
-      <point x="533" y="479" type="curve" name="sh02" smooth="yes"/>
+      <point x="533" y="479" type="curve" smooth="yes" name="sh02"/>
       <point x="533" y="1120" type="line" name="at02"/>
       <point x="700" y="1120" type="line" name="sh04"/>
       <point x="700" y="1024" type="line" name="ih01"/>
       <point x="749" y="1112"/>
       <point x="813" y="1147"/>
-      <point x="901" y="1147" type="curve" name="sv03" smooth="yes"/>
+      <point x="901" y="1147" type="curve" smooth="yes" name="sv03"/>
       <point x="987" y="1147"/>
       <point x="1048" y="1111"/>
       <point x="1083" y="1040" type="curve" smooth="yes"/>
       <point x="1118" y="968"/>
       <point x="1129" y="864"/>
-      <point x="1129" y="727" type="curve" name="hr02" smooth="yes"/>
+      <point x="1129" y="727" type="curve" smooth="yes" name="hr02"/>
       <point x="1129" y="0" type="line" name="sh06"/>
       <point x="961" y="0" type="line" name="sh05"/>
       <point x="961" y="641" type="line" smooth="yes"/>
@@ -46,13 +46,13 @@
       <point x="933" y="937" type="curve" smooth="yes"/>
       <point x="914" y="976"/>
       <point x="876" y="993"/>
-      <point x="828" y="993" type="curve" name="sv02" smooth="yes"/>
+      <point x="828" y="993" type="curve" smooth="yes" name="sv02"/>
       <point x="737" y="993"/>
       <point x="719" y="927"/>
-      <point x="708" y="839" type="curve" name="sh07" smooth="yes"/>
+      <point x="708" y="839" type="curve" smooth="yes" name="sh07"/>
       <point x="703" y="796"/>
       <point x="700" y="742"/>
-      <point x="700" y="674" type="curve" name="sh03" smooth="yes"/>
+      <point x="700" y="674" type="curve" smooth="yes" name="sh03"/>
       <point x="700" y="0" type="line" name="ab01"/>
       <point x="533" y="0" type="line" name="sh08"/>
       <point x="533" y="96" type="line" name="ih02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0580.glif b/source/Hack-Regular.ufo/glyphs/uni0580.glif
index 6681d3452..06e4e7f0a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0580.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0580.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0580" format="1">
+<glyph name="uni0580" format="2">
   <advance width="1233"/>
   <unicode hex="0580"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="372" y="952" type="line" name="sh02"/>
       <point x="437" y="1081"/>
       <point x="551" y="1147"/>
-      <point x="704" y="1147" type="curve" name="sv02" smooth="yes"/>
+      <point x="704" y="1147" type="curve" smooth="yes" name="sv02"/>
       <point x="935" y="1147"/>
       <point x="1044" y="1001"/>
       <point x="1044" y="694" type="curve" smooth="yes"/>
@@ -18,10 +18,10 @@
       <point x="859" y="694" type="line" smooth="yes"/>
       <point x="859" y="895"/>
       <point x="792" y="987"/>
-      <point x="641" y="987" type="curve" name="sv01" smooth="yes"/>
+      <point x="641" y="987" type="curve" smooth="yes" name="sv01"/>
       <point x="466" y="987"/>
       <point x="372" y="865"/>
-      <point x="372" y="633" type="curve" name="sh04" smooth="yes"/>
+      <point x="372" y="633" type="curve" smooth="yes" name="sh04"/>
       <point x="372" y="-426" type="line" name="hr01"/>
       <point x="188" y="-426" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0581.glif b/source/Hack-Regular.ufo/glyphs/uni0581.glif
index ec1075822..95d42d3b0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0581.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0581.glif
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0581" format="1">
+<glyph name="uni0581" format="2">
   <advance width="1233"/>
   <unicode hex="0581"/>
   <outline>
     <contour>
-      <point x="597" y="-440" type="curve" name="dv01" smooth="yes"/>
+      <point x="597" y="-440" type="curve" smooth="yes" name="dv01"/>
       <point x="496" y="-440"/>
       <point x="384" y="-421"/>
       <point x="272" y="-385" type="curve"/>
       <point x="272" y="-203" type="line" name="ih01"/>
       <point x="406" y="-265"/>
       <point x="505" y="-293"/>
-      <point x="603" y="-293" type="curve" name="dv02" smooth="yes"/>
+      <point x="603" y="-293" type="curve" smooth="yes" name="dv02"/>
       <point x="796" y="-293"/>
       <point x="882" y="-186"/>
-      <point x="882" y="45" type="curve" name="ah01" smooth="yes"/>
+      <point x="882" y="45" type="curve" smooth="yes" name="ah01"/>
       <point x="882" y="178" type="line" name="iv01"/>
       <point x="826" y="57"/>
       <point x="726" y="-8"/>
-      <point x="581" y="-8" type="curve" name="ab01" smooth="yes"/>
+      <point x="581" y="-8" type="curve" smooth="yes" name="ab01"/>
       <point x="314" y="-8"/>
       <point x="147" y="218"/>
-      <point x="147" y="570" type="curve" name="sh01" smooth="yes"/>
+      <point x="147" y="570" type="curve" smooth="yes" name="sh01"/>
       <point x="147" y="921"/>
       <point x="313" y="1147"/>
-      <point x="582" y="1147" type="curve" name="sv02" smooth="yes"/>
+      <point x="582" y="1147" type="curve" smooth="yes" name="sv02"/>
       <point x="719" y="1147"/>
       <point x="821" y="1090"/>
       <point x="882" y="971" type="curve" name="sh03"/>
       <point x="900" y="1116" type="line" name="hr01"/>
       <point x="1066" y="1116" type="line"/>
-      <point x="1066" y="72" type="line" name="sh04" smooth="yes"/>
+      <point x="1066" y="72" type="line" smooth="yes" name="sh04"/>
       <point x="1066" y="-267"/>
       <point x="906" y="-440"/>
     </contour>
     <contour>
-      <point x="616" y="145" type="curve" name="sv03" smooth="yes"/>
+      <point x="616" y="145" type="curve" smooth="yes" name="sv03"/>
       <point x="792" y="145"/>
       <point x="882" y="292"/>
-      <point x="882" y="569" type="curve" name="sh05" smooth="yes"/>
+      <point x="882" y="569" type="curve" smooth="yes" name="sh05"/>
       <point x="882" y="846"/>
       <point x="792" y="991"/>
-      <point x="615" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="615" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="439" y="991"/>
       <point x="341" y="847"/>
-      <point x="341" y="570" type="curve" name="sh02" smooth="yes"/>
+      <point x="341" y="570" type="curve" smooth="yes" name="sh02"/>
       <point x="341" y="291"/>
       <point x="440" y="145"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0582.glif b/source/Hack-Regular.ufo/glyphs/uni0582.glif
index 688c00be3..c8e637fdd 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0582.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0582.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0582" format="1">
+<glyph name="uni0582" format="2">
   <advance width="1233"/>
   <unicode hex="0582"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0583.glif b/source/Hack-Regular.ufo/glyphs/uni0583.glif
index e6c5b3451..beeb6169d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0583.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0583.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0583" format="1">
+<glyph name="uni0583" format="2">
   <advance width="1233"/>
   <unicode hex="0583"/>
   <outline>
@@ -7,34 +7,34 @@
       <point x="533" y="96" type="line" name="iv01"/>
       <point x="484" y="8"/>
       <point x="420" y="-27"/>
-      <point x="333" y="-27" type="curve" name="ab01" smooth="yes"/>
+      <point x="333" y="-27" type="curve" smooth="yes" name="ab01"/>
       <point x="246" y="-27"/>
       <point x="185" y="9"/>
       <point x="150" y="80" type="curve" smooth="yes"/>
       <point x="115" y="152"/>
       <point x="104" y="256"/>
-      <point x="104" y="393" type="curve" name="sh01" smooth="yes"/>
+      <point x="104" y="393" type="curve" smooth="yes" name="sh01"/>
       <point x="104" y="1120" type="line" name="at02"/>
       <point x="272" y="1120" type="line"/>
-      <point x="272" y="479" type="line" name="sh02" smooth="yes"/>
+      <point x="272" y="479" type="line" smooth="yes" name="sh02"/>
       <point x="272" y="281"/>
       <point x="285" y="218"/>
       <point x="301" y="183" type="curve" smooth="yes"/>
       <point x="318" y="148"/>
       <point x="350" y="127"/>
-      <point x="403" y="127" type="curve" name="sv01" smooth="yes"/>
+      <point x="403" y="127" type="curve" smooth="yes" name="sv01"/>
       <point x="460" y="127"/>
       <point x="487" y="152"/>
       <point x="503" y="188" type="curve" smooth="yes"/>
       <point x="526" y="237"/>
       <point x="533" y="330"/>
-      <point x="533" y="479" type="curve" name="sh04" smooth="yes"/>
+      <point x="533" y="479" type="curve" smooth="yes" name="sh04"/>
       <point x="533" y="1556" type="line" name="at01"/>
       <point x="700" y="1556" type="line" name="sh06"/>
       <point x="700" y="1024" type="line" name="ih01"/>
       <point x="749" y="1112"/>
       <point x="813" y="1147"/>
-      <point x="901" y="1147" type="curve" name="dv02" smooth="yes"/>
+      <point x="901" y="1147" type="curve" smooth="yes" name="dv02"/>
       <point x="987" y="1147"/>
       <point x="1048" y="1111"/>
       <point x="1083" y="1040" type="curve" smooth="yes"/>
@@ -49,10 +49,10 @@
       <point x="933" y="937" type="curve" smooth="yes"/>
       <point x="914" y="976"/>
       <point x="876" y="993"/>
-      <point x="828" y="993" type="curve" name="dv01" smooth="yes"/>
+      <point x="828" y="993" type="curve" smooth="yes" name="dv01"/>
       <point x="737" y="993"/>
       <point x="719" y="927"/>
-      <point x="708" y="839" type="curve" name="sh08" smooth="yes"/>
+      <point x="708" y="839" type="curve" smooth="yes" name="sh08"/>
       <point x="703" y="796"/>
       <point x="700" y="742"/>
       <point x="700" y="674" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0584.glif b/source/Hack-Regular.ufo/glyphs/uni0584.glif
index 418df7c85..2703a8b2b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0584.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0584.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0584" format="1">
+<glyph name="uni0584" format="2">
   <advance width="1233"/>
   <unicode hex="0584"/>
   <outline>
@@ -13,16 +13,16 @@
       <point x="384" y="977" type="line" name="sh04"/>
       <point x="445" y="1090"/>
       <point x="548" y="1147"/>
-      <point x="684" y="1147" type="curve" name="sv02" smooth="yes"/>
+      <point x="684" y="1147" type="curve" smooth="yes" name="sv02"/>
       <point x="951" y="1147"/>
       <point x="1117" y="923"/>
-      <point x="1117" y="555" type="curve" name="sh05" smooth="yes"/>
+      <point x="1117" y="555" type="curve" smooth="yes" name="sh05"/>
       <point x="1117" y="376"/>
       <point x="1079" y="232"/>
       <point x="1002" y="128" type="curve" smooth="yes"/>
       <point x="926" y="27"/>
       <point x="820" y="-29"/>
-      <point x="683" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="683" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="544" y="-29"/>
       <point x="445" y="28"/>
       <point x="384" y="141" type="curve" name="sh06"/>
@@ -34,19 +34,19 @@
       <point x="199" y="-426" type="line"/>
     </contour>
     <contour>
-      <point x="656" y="127" type="curve" name="hr01" smooth="yes"/>
+      <point x="656" y="127" type="curve" smooth="yes" name="hr01"/>
       <point x="745" y="127"/>
       <point x="812" y="163"/>
       <point x="857" y="236" type="curve" smooth="yes"/>
       <point x="902" y="307"/>
       <point x="924" y="415"/>
-      <point x="924" y="559" type="curve" name="ah01" smooth="yes"/>
+      <point x="924" y="559" type="curve" smooth="yes" name="ah01"/>
       <point x="924" y="847"/>
       <point x="835" y="991"/>
-      <point x="656" y="991" type="curve" name="sv01" smooth="yes"/>
+      <point x="656" y="991" type="curve" smooth="yes" name="sv01"/>
       <point x="475" y="991"/>
       <point x="384" y="846"/>
-      <point x="384" y="559" type="curve" name="sh07" smooth="yes"/>
+      <point x="384" y="559" type="curve" smooth="yes" name="sh07"/>
       <point x="384" y="272"/>
       <point x="475" y="127"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0585.glif b/source/Hack-Regular.ufo/glyphs/uni0585.glif
index cb7cd6c46..1fcf064a0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0585.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0585.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0585" format="1">
+<glyph name="uni0585" format="2">
   <advance width="1233"/>
   <unicode hex="0585"/>
   <outline>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="303" y="-29"/>
       <point x="137" y="174"/>
-      <point x="137" y="558" type="curve" name="sh01" smooth="yes"/>
+      <point x="137" y="558" type="curve" smooth="yes" name="sh01"/>
       <point x="137" y="939"/>
       <point x="305" y="1147"/>
-      <point x="616" y="1147" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1147" type="curve" smooth="yes" name="dv03"/>
       <point x="927" y="1147"/>
       <point x="1096" y="939"/>
-      <point x="1096" y="558" type="curve" name="sh02" smooth="yes"/>
+      <point x="1096" y="558" type="curve" smooth="yes" name="sh02"/>
       <point x="1096" y="177"/>
       <point x="928" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="127" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="127" type="curve" smooth="yes" name="dv01"/>
       <point x="805" y="127"/>
       <point x="901" y="274"/>
-      <point x="901" y="559" type="curve" name="ah01" smooth="yes"/>
+      <point x="901" y="559" type="curve" smooth="yes" name="ah01"/>
       <point x="901" y="846"/>
       <point x="805" y="991"/>
-      <point x="616" y="991" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="991" type="curve" smooth="yes" name="dv02"/>
       <point x="428" y="991"/>
       <point x="332" y="846"/>
-      <point x="332" y="559" type="curve" name="sh03" smooth="yes"/>
+      <point x="332" y="559" type="curve" smooth="yes" name="sh03"/>
       <point x="332" y="274"/>
       <point x="428" y="127"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0586.glif b/source/Hack-Regular.ufo/glyphs/uni0586.glif
index 700eb3336..7a4589edd 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0586.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0586.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0586" format="1">
+<glyph name="uni0586" format="2">
   <advance width="1233"/>
   <unicode hex="0586"/>
   <outline>
@@ -21,18 +21,18 @@
       <point x="481" y="952" type="line" name="dv01"/>
       <point x="220" y="952"/>
       <point x="60" y="1076"/>
-      <point x="60" y="1258" type="curve" name="dh01" smooth="yes"/>
+      <point x="60" y="1258" type="curve" smooth="yes" name="dh01"/>
       <point x="60" y="1349"/>
       <point x="98" y="1426"/>
       <point x="174" y="1479" type="curve" smooth="yes"/>
       <point x="249" y="1530"/>
       <point x="354" y="1556"/>
-      <point x="490" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="490" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="665" y="1556" type="line" name="sh02"/>
       <point x="665" y="1115" type="line" name="sv01"/>
       <point x="1033" y="1115"/>
       <point x="1177" y="921"/>
-      <point x="1177" y="578" type="curve" name="dh05" smooth="yes"/>
+      <point x="1177" y="578" type="curve" smooth="yes" name="dh05"/>
       <point x="1177" y="233"/>
       <point x="1036" y="-5"/>
       <point x="665" y="-5" type="curve" name="dh03"/>
@@ -43,7 +43,7 @@
       <point x="481" y="1414" type="line" name="sh03"/>
       <point x="314" y="1414"/>
       <point x="240" y="1357"/>
-      <point x="240" y="1268" type="curve" name="dh02" smooth="yes"/>
+      <point x="240" y="1268" type="curve" smooth="yes" name="dh02"/>
       <point x="240" y="1172"/>
       <point x="322" y="1115"/>
       <point x="481" y="1115" type="curve" name="dv02"/>
@@ -55,7 +55,7 @@
       <point x="925" y="263" type="curve" smooth="yes"/>
       <point x="976" y="342"/>
       <point x="996" y="449"/>
-      <point x="996" y="578" type="curve" name="dh04" smooth="yes"/>
+      <point x="996" y="578" type="curve" smooth="yes" name="dh04"/>
       <point x="996" y="815"/>
       <point x="930" y="952"/>
       <point x="665" y="952" type="curve" name="sv02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0587.glif b/source/Hack-Regular.ufo/glyphs/uni0587.glif
index 1537f2519..b5144b803 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0587.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0587.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0587" format="1">
+<glyph name="uni0587" format="2">
   <advance width="1233"/>
   <unicode hex="0587"/>
   <outline>
     <contour>
-      <point x="450" y="-29" type="curve" name="sv01" smooth="yes"/>
+      <point x="450" y="-29" type="curve" smooth="yes" name="sv01"/>
       <point x="219" y="-29"/>
       <point x="112" y="119"/>
-      <point x="112" y="424" type="curve" name="dh01" smooth="yes"/>
+      <point x="112" y="424" type="curve" smooth="yes" name="dh01"/>
       <point x="112" y="1556" type="line" name="hr01"/>
       <point x="296" y="1556" type="line"/>
-      <point x="296" y="424" type="line" name="dh02" smooth="yes"/>
+      <point x="296" y="424" type="line" smooth="yes" name="dh02"/>
       <point x="296" y="223"/>
       <point x="366" y="131"/>
-      <point x="515" y="131" type="curve" name="hr02" smooth="yes"/>
+      <point x="515" y="131" type="curve" smooth="yes" name="hr02"/>
       <point x="691" y="131"/>
       <point x="783" y="254"/>
-      <point x="783" y="485" type="curve" name="sh01" smooth="yes"/>
+      <point x="783" y="485" type="curve" smooth="yes" name="sh01"/>
       <point x="783" y="1120" type="line" name="at01"/>
       <point x="968" y="1120" type="line"/>
       <point x="968" y="143" type="line" name="dh04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0589.glif b/source/Hack-Regular.ufo/glyphs/uni0589.glif
index af26cd1ab..42954e376 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0589.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0589.glif
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0589" format="1">
+<glyph name="uni0589" format="2">
   <advance width="1233"/>
   <unicode hex="0589"/>
   <outline>
     <contour>
-      <point x="541" y="596" type="line" name="hr00" smooth="yes"/>
+      <point x="541" y="596" type="line" smooth="yes" name="hr00"/>
       <point x="521" y="596"/>
       <point x="511" y="606"/>
-      <point x="511" y="626" type="curve" name="dh01" smooth="yes"/>
+      <point x="511" y="626" type="curve" smooth="yes" name="dh01"/>
       <point x="511" y="820" type="line" smooth="yes"/>
       <point x="511" y="840"/>
       <point x="521" y="850"/>
-      <point x="541" y="850" type="curve" name="dv01" smooth="yes"/>
+      <point x="541" y="850" type="curve" smooth="yes" name="dv01"/>
       <point x="692" y="850" type="line" smooth="yes"/>
       <point x="712" y="850"/>
       <point x="722" y="840"/>
       <point x="722" y="820" type="curve" smooth="yes"/>
-      <point x="722" y="626" type="line" name="dh02" smooth="yes"/>
+      <point x="722" y="626" type="line" smooth="yes" name="dh02"/>
       <point x="722" y="606"/>
       <point x="712" y="596"/>
       <point x="692" y="596" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="541" y="0" type="line" name="ab01" smooth="yes"/>
+      <point x="541" y="0" type="line" smooth="yes" name="ab01"/>
       <point x="521" y="0"/>
       <point x="511" y="10"/>
-      <point x="511" y="30" type="curve" name="sh01" smooth="yes"/>
+      <point x="511" y="30" type="curve" smooth="yes" name="sh01"/>
       <point x="511" y="224" type="line" smooth="yes"/>
       <point x="511" y="244"/>
       <point x="521" y="254"/>
-      <point x="541" y="254" type="curve" name="sv01" smooth="yes"/>
+      <point x="541" y="254" type="curve" smooth="yes" name="sv01"/>
       <point x="692" y="254" type="line" smooth="yes"/>
       <point x="712" y="254"/>
       <point x="722" y="244"/>
-      <point x="722" y="224" type="curve" name="sh02" smooth="yes"/>
+      <point x="722" y="224" type="curve" smooth="yes" name="sh02"/>
       <point x="722" y="30" type="line" smooth="yes"/>
       <point x="722" y="10"/>
       <point x="712" y="0"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni058A_.glif b/source/Hack-Regular.ufo/glyphs/uni058A_.glif
index 2b915dae6..f740b2d93 100644
--- a/source/Hack-Regular.ufo/glyphs/uni058A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni058A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni058A" format="1">
+<glyph name="uni058A" format="2">
   <advance width="1233"/>
   <unicode hex="058A"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="356" y="643" type="line" name="hr00"/>
       <point x="441" y="602"/>
       <point x="525" y="583"/>
-      <point x="610" y="583" type="curve" name="dv02" smooth="yes"/>
+      <point x="610" y="583" type="curve" smooth="yes" name="dv02"/>
       <point x="698" y="583"/>
       <point x="786" y="604"/>
       <point x="877" y="643" type="curve" name="av01"/>
       <point x="877" y="479" type="line"/>
       <point x="786" y="440"/>
       <point x="698" y="420"/>
-      <point x="609" y="420" type="curve" name="dv01" smooth="yes"/>
+      <point x="609" y="420" type="curve" smooth="yes" name="dv01"/>
       <point x="525" y="420"/>
       <point x="440" y="439"/>
       <point x="356" y="479" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni0E_3F_.glif b/source/Hack-Regular.ufo/glyphs/uni0E_3F_.glif
index ba6e28b69..0a1c202e8 100644
--- a/source/Hack-Regular.ufo/glyphs/uni0E_3F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni0E_3F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni0E3F" format="1">
+<glyph name="uni0E3F" format="2">
   <advance width="1233"/>
   <unicode hex="0E3F"/>
   <outline>
@@ -13,13 +13,13 @@
       <point x="660" y="1305" type="line" name="dv02"/>
       <point x="899" y="1292"/>
       <point x="1069" y="1193"/>
-      <point x="1069" y="971" type="curve" name="dh06" smooth="yes"/>
+      <point x="1069" y="971" type="curve" smooth="yes" name="dh06"/>
       <point x="1069" y="810"/>
       <point x="981" y="722"/>
       <point x="817" y="699" type="curve" name="hr01"/>
       <point x="1010" y="672"/>
       <point x="1120" y="547"/>
-      <point x="1120" y="356" type="curve" name="sh04" smooth="yes"/>
+      <point x="1120" y="356" type="curve" smooth="yes" name="sh04"/>
       <point x="1120" y="125"/>
       <point x="953" y="12"/>
       <point x="660" y="1" type="curve" name="dh04"/>
@@ -36,7 +36,7 @@
       <point x="660" y="769" type="line" name="hr02"/>
       <point x="784" y="780"/>
       <point x="873" y="824"/>
-      <point x="873" y="971" type="curve" name="dh05" smooth="yes"/>
+      <point x="873" y="971" type="curve" smooth="yes" name="dh05"/>
       <point x="873" y="1106"/>
       <point x="796" y="1151"/>
       <point x="660" y="1159" type="curve" name="hr03"/>
@@ -51,7 +51,7 @@
       <point x="660" y="146" type="line" name="sh08"/>
       <point x="836" y="154"/>
       <point x="924" y="213"/>
-      <point x="924" y="375" type="curve" name="sh03" smooth="yes"/>
+      <point x="924" y="375" type="curve" smooth="yes" name="sh03"/>
       <point x="924" y="549"/>
       <point x="823" y="611"/>
       <point x="660" y="622" type="curve" name="dv03"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10D_0.glif b/source/Hack-Regular.ufo/glyphs/uni10D_0.glif
index 594acc846..8d1d36061 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10D_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10D_0.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D0" format="1">
+<glyph name="uni10D0" format="2">
   <advance width="1233"/>
   <unicode hex="10D0"/>
   <outline>
     <contour>
-      <point x="609" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="609" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="310" y="0"/>
       <point x="160" y="164"/>
-      <point x="160" y="438" type="curve" name="dh01" smooth="yes"/>
+      <point x="160" y="438" type="curve" smooth="yes" name="dh01"/>
       <point x="160" y="522"/>
       <point x="174" y="575"/>
       <point x="240" y="660" type="curve"/>
       <point x="430" y="660" type="line" name="ih01"/>
       <point x="362" y="579"/>
       <point x="345" y="534"/>
-      <point x="345" y="453" type="curve" name="dh02" smooth="yes"/>
+      <point x="345" y="453" type="curve" smooth="yes" name="dh02"/>
       <point x="345" y="265"/>
       <point x="436" y="145"/>
-      <point x="617" y="145" type="curve" name="sv01" smooth="yes"/>
+      <point x="617" y="145" type="curve" smooth="yes" name="sv01"/>
       <point x="798" y="145"/>
       <point x="889" y="263"/>
-      <point x="889" y="466" type="curve" name="dh05" smooth="yes"/>
+      <point x="889" y="466" type="curve" smooth="yes" name="dh05"/>
       <point x="889" y="621"/>
       <point x="836" y="713"/>
       <point x="700" y="768" type="curve"/>
@@ -33,7 +33,7 @@
       <point x="714" y="934" type="curve"/>
       <point x="974" y="835"/>
       <point x="1075" y="704"/>
-      <point x="1075" y="469" type="curve" name="dh06" smooth="yes"/>
+      <point x="1075" y="469" type="curve" smooth="yes" name="dh06"/>
       <point x="1075" y="178"/>
       <point x="920" y="0"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10D_1.glif b/source/Hack-Regular.ufo/glyphs/uni10D_1.glif
index a511283fc..96e2f8c33 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10D_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10D_1.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D1" format="1">
+<glyph name="uni10D1" format="2">
   <advance width="1233"/>
   <unicode hex="10D1"/>
   <outline>
     <contour>
-      <point x="621" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="621" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="314" y="0"/>
       <point x="159" y="191"/>
-      <point x="159" y="531" type="curve" name="dh01" smooth="yes"/>
+      <point x="159" y="531" type="curve" smooth="yes" name="dh01"/>
       <point x="159" y="842"/>
       <point x="289" y="997"/>
       <point x="548" y="1056" type="curve" name="dh05"/>
@@ -28,21 +28,21 @@
       <point x="713" y="1056" type="line" name="dh06"/>
       <point x="959" y="970"/>
       <point x="1076" y="818"/>
-      <point x="1076" y="524" type="curve" name="dh04" smooth="yes"/>
+      <point x="1076" y="524" type="curve" smooth="yes" name="dh04"/>
       <point x="1076" y="189"/>
       <point x="925" y="0"/>
     </contour>
     <contour>
-      <point x="620" y="145" type="curve" name="sv01" smooth="yes"/>
+      <point x="620" y="145" type="curve" smooth="yes" name="sv01"/>
       <point x="801" y="145"/>
       <point x="888" y="283"/>
-      <point x="888" y="538" type="curve" name="dh03" smooth="yes"/>
+      <point x="888" y="538" type="curve" smooth="yes" name="dh03"/>
       <point x="888" y="795"/>
       <point x="801" y="916"/>
       <point x="617" y="916" type="curve" smooth="yes"/>
       <point x="436" y="916"/>
       <point x="345" y="791"/>
-      <point x="345" y="542" type="curve" name="dh02" smooth="yes"/>
+      <point x="345" y="542" type="curve" smooth="yes" name="dh02"/>
       <point x="345" y="285"/>
       <point x="437" y="145"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10D_2.glif b/source/Hack-Regular.ufo/glyphs/uni10D_2.glif
index 9b047021e..f8040088d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10D_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10D_2.glif
@@ -1,59 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D2" format="1">
+<glyph name="uni10D2" format="2">
   <advance width="1233"/>
   <unicode hex="10D2"/>
   <outline>
     <contour>
-      <point x="638" y="-425" type="curve" name="ab01" smooth="yes"/>
+      <point x="638" y="-425" type="curve" smooth="yes" name="ab01"/>
       <point x="273" y="-425"/>
       <point x="111" y="-197"/>
-      <point x="111" y="31" type="curve" name="dh01" smooth="yes"/>
+      <point x="111" y="31" type="curve" smooth="yes" name="dh01"/>
       <point x="111" y="266"/>
       <point x="283" y="504"/>
       <point x="651" y="509" type="curve" name="dv04"/>
       <point x="717" y="559"/>
       <point x="761" y="648"/>
-      <point x="761" y="728" type="curve" name="dh03" smooth="yes"/>
+      <point x="761" y="728" type="curve" smooth="yes" name="dh03"/>
       <point x="761" y="820"/>
       <point x="703" y="903"/>
-      <point x="544" y="903" type="curve" name="dv01" smooth="yes"/>
+      <point x="544" y="903" type="curve" smooth="yes" name="dv01"/>
       <point x="427" y="903"/>
       <point x="366" y="858"/>
-      <point x="366" y="762" type="curve" name="sh01" smooth="yes"/>
+      <point x="366" y="762" type="curve" smooth="yes" name="sh01"/>
       <point x="366" y="734"/>
       <point x="371" y="705"/>
       <point x="381" y="675" type="curve"/>
       <point x="244" y="593" type="line"/>
       <point x="213" y="644"/>
       <point x="198" y="707"/>
-      <point x="198" y="775" type="curve" name="ih01" smooth="yes"/>
+      <point x="198" y="775" type="curve" smooth="yes" name="ih01"/>
       <point x="198" y="958"/>
       <point x="309" y="1045"/>
-      <point x="554" y="1045" type="curve" name="dv02" smooth="yes"/>
+      <point x="554" y="1045" type="curve" smooth="yes" name="dv02"/>
       <point x="811" y="1045"/>
       <point x="943" y="949"/>
-      <point x="943" y="752" type="curve" name="dh04" smooth="yes"/>
+      <point x="943" y="752" type="curve" smooth="yes" name="dh04"/>
       <point x="943" y="644"/>
       <point x="904" y="560"/>
       <point x="821" y="504" type="curve" name="hr01"/>
       <point x="821" y="484" type="line"/>
       <point x="1022" y="409"/>
       <point x="1121" y="269"/>
-      <point x="1121" y="40" type="curve" name="sh02" smooth="yes"/>
+      <point x="1121" y="40" type="curve" smooth="yes" name="sh02"/>
       <point x="1121" y="-269"/>
       <point x="941" y="-425"/>
     </contour>
     <contour>
-      <point x="616" y="-276" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="-276" type="curve" smooth="yes" name="sv01"/>
       <point x="833" y="-276"/>
       <point x="943" y="-164"/>
-      <point x="943" y="29" type="curve" name="sh03" smooth="yes"/>
+      <point x="943" y="29" type="curve" smooth="yes" name="sh03"/>
       <point x="943" y="265"/>
       <point x="780" y="366"/>
-      <point x="617" y="366" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="366" type="curve" smooth="yes" name="dv03"/>
       <point x="454" y="366"/>
       <point x="289" y="265"/>
-      <point x="289" y="28" type="curve" name="dh02" smooth="yes"/>
+      <point x="289" y="28" type="curve" smooth="yes" name="dh02"/>
       <point x="289" y="-164"/>
       <point x="397" y="-276"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10D_3.glif b/source/Hack-Regular.ufo/glyphs/uni10D_3.glif
index 8536bdc0f..714ef6959 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10D_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10D_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D3" format="1">
+<glyph name="uni10D3" format="2">
   <advance width="1233"/>
   <unicode hex="10D3"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="780" y="-425" type="line" name="ab01"/>
       <point x="712" y="-300"/>
       <point x="608" y="-249"/>
-      <point x="500" y="-249" type="curve" name="dv03" smooth="yes"/>
+      <point x="500" y="-249" type="curve" smooth="yes" name="dv03"/>
       <point x="416" y="-249"/>
       <point x="333" y="-279"/>
       <point x="265" y="-330" type="curve"/>
@@ -18,35 +18,35 @@
       <point x="345" y="-152" type="line"/>
       <point x="150" y="33"/>
       <point x="55" y="286"/>
-      <point x="55" y="571" type="curve" name="dh01" smooth="yes"/>
+      <point x="55" y="571" type="curve" smooth="yes" name="dh01"/>
       <point x="55" y="884"/>
       <point x="173" y="1035"/>
-      <point x="381" y="1035" type="curve" name="dv02" smooth="yes"/>
+      <point x="381" y="1035" type="curve" smooth="yes" name="dv02"/>
       <point x="457" y="1035"/>
       <point x="503" y="1014"/>
       <point x="570" y="937" type="curve"/>
       <point x="590" y="937" type="line"/>
       <point x="630" y="1002"/>
       <point x="706" y="1035"/>
-      <point x="819" y="1035" type="curve" name="sv01" smooth="yes"/>
+      <point x="819" y="1035" type="curve" smooth="yes" name="sv01"/>
       <point x="1058" y="1035"/>
       <point x="1178" y="879"/>
       <point x="1178" y="566" type="curve" smooth="yes"/>
-      <point x="1178" y="546" type="line" name="dh05" smooth="yes"/>
+      <point x="1178" y="546" type="line" smooth="yes" name="dh05"/>
       <point x="1178" y="209"/>
       <point x="1064" y="40"/>
-      <point x="835" y="40" type="curve" name="sv02" smooth="yes"/>
+      <point x="835" y="40" type="curve" smooth="yes" name="sv02"/>
       <point x="605" y="40"/>
       <point x="490" y="216"/>
-      <point x="490" y="567" type="curve" name="dh03" smooth="yes"/>
+      <point x="490" y="567" type="curve" smooth="yes" name="dh03"/>
       <point x="490" y="801" type="line" smooth="yes"/>
       <point x="490" y="863"/>
       <point x="466" y="894"/>
-      <point x="417" y="894" type="curve" name="hr01" smooth="yes"/>
-      <point x="374" y="894" type="line" name="dv01" smooth="yes"/>
+      <point x="417" y="894" type="curve" smooth="yes" name="hr01"/>
+      <point x="374" y="894" type="line" smooth="yes" name="dv01"/>
       <point x="288" y="894"/>
       <point x="245" y="789"/>
-      <point x="245" y="578" type="curve" name="dh02" smooth="yes"/>
+      <point x="245" y="578" type="curve" smooth="yes" name="dh02"/>
       <point x="245" y="469" type="line" smooth="yes"/>
       <point x="245" y="129"/>
       <point x="374" y="-7"/>
@@ -56,19 +56,19 @@
       <point x="982" y="-424" type="curve" name="ih01"/>
     </contour>
     <contour>
-      <point x="831" y="185" type="curve" name="dv04" smooth="yes"/>
+      <point x="831" y="185" type="curve" smooth="yes" name="dv04"/>
       <point x="939" y="185"/>
       <point x="989" y="264"/>
-      <point x="989" y="441" type="curve" name="dh04" smooth="yes"/>
+      <point x="989" y="441" type="curve" smooth="yes" name="dh04"/>
       <point x="989" y="653" type="line" smooth="yes"/>
       <point x="989" y="814"/>
       <point x="939" y="894"/>
-      <point x="840" y="894" type="curve" name="sv03" smooth="yes"/>
+      <point x="840" y="894" type="curve" smooth="yes" name="sv03"/>
       <point x="769" y="894" type="line" smooth="yes"/>
       <point x="690" y="894"/>
       <point x="650" y="833"/>
       <point x="650" y="712" type="curve" smooth="yes"/>
-      <point x="650" y="465" type="line" name="hr02" smooth="yes"/>
+      <point x="650" y="465" type="line" smooth="yes" name="hr02"/>
       <point x="650" y="277"/>
       <point x="714" y="185"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10D_4.glif b/source/Hack-Regular.ufo/glyphs/uni10D_4.glif
index 28605f5ae..1cc9dab8f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10D_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10D_4.glif
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D4" format="1">
+<glyph name="uni10D4" format="2">
   <advance width="1233"/>
   <unicode hex="10D4"/>
   <outline>
     <contour>
-      <point x="631" y="-425" type="curve" name="ab01" smooth="yes"/>
+      <point x="631" y="-425" type="curve" smooth="yes" name="ab01"/>
       <point x="318" y="-425"/>
       <point x="160" y="-280"/>
-      <point x="160" y="-40" type="curve" name="dh01" smooth="yes"/>
+      <point x="160" y="-40" type="curve" smooth="yes" name="dh01"/>
       <point x="160" y="70"/>
       <point x="192" y="141"/>
       <point x="301" y="226" type="curve"/>
       <point x="489" y="226" type="line" name="ih01"/>
       <point x="393" y="146"/>
       <point x="345" y="75"/>
-      <point x="345" y="-34" type="curve" name="dh02" smooth="yes"/>
+      <point x="345" y="-34" type="curve" smooth="yes" name="dh02"/>
       <point x="345" y="-190"/>
       <point x="440" y="-283"/>
-      <point x="635" y="-283" type="curve" name="sv01" smooth="yes"/>
+      <point x="635" y="-283" type="curve" smooth="yes" name="sv01"/>
       <point x="811" y="-283"/>
       <point x="899" y="-203"/>
-      <point x="899" y="-42" type="curve" name="dh03" smooth="yes"/>
+      <point x="899" y="-42" type="curve" smooth="yes" name="dh03"/>
       <point x="899" y="634" type="line" smooth="yes"/>
       <point x="899" y="817"/>
       <point x="821" y="903"/>
-      <point x="657" y="903" type="curve" name="dv01" smooth="yes"/>
+      <point x="657" y="903" type="curve" smooth="yes" name="dv01"/>
       <point x="506" y="903"/>
       <point x="425" y="830"/>
-      <point x="425" y="681" type="curve" name="sh01" smooth="yes"/>
+      <point x="425" y="681" type="curve" smooth="yes" name="sh01"/>
       <point x="425" y="607"/>
       <point x="446" y="536"/>
       <point x="487" y="469" type="curve" name="ih02"/>
       <point x="311" y="468" type="line"/>
       <point x="271" y="521"/>
       <point x="255" y="598"/>
-      <point x="255" y="670" type="curve" name="hr01" smooth="yes"/>
+      <point x="255" y="670" type="curve" smooth="yes" name="hr01"/>
       <point x="255" y="922"/>
       <point x="454" y="1045"/>
-      <point x="654" y="1045" type="curve" name="dv02" smooth="yes"/>
+      <point x="654" y="1045" type="curve" smooth="yes" name="dv02"/>
       <point x="864" y="1045"/>
       <point x="1075" y="910"/>
       <point x="1075" y="633" type="curve" smooth="yes"/>
-      <point x="1075" y="-32" type="line" name="dh04" smooth="yes"/>
+      <point x="1075" y="-32" type="line" smooth="yes" name="dh04"/>
       <point x="1075" y="-296"/>
       <point x="931" y="-425"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10D_5.glif b/source/Hack-Regular.ufo/glyphs/uni10D_5.glif
index 2939d89e4..5e2a41b2c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10D_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10D_5.glif
@@ -1,62 +1,62 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D5" format="1">
+<glyph name="uni10D5" format="2">
   <advance width="1233"/>
   <unicode hex="10D5"/>
   <outline>
     <contour>
-      <point x="624" y="-425" type="curve" name="ab01" smooth="yes"/>
+      <point x="624" y="-425" type="curve" smooth="yes" name="ab01"/>
       <point x="312" y="-425"/>
       <point x="158" y="-279"/>
-      <point x="158" y="-43" type="curve" name="dh01" smooth="yes"/>
+      <point x="158" y="-43" type="curve" smooth="yes" name="dh01"/>
       <point x="158" y="42"/>
       <point x="178" y="92"/>
       <point x="265" y="185" type="curve"/>
       <point x="457" y="185" type="line" name="ih01"/>
       <point x="366" y="83"/>
       <point x="345" y="40"/>
-      <point x="345" y="-36" type="curve" name="dh02" smooth="yes"/>
+      <point x="345" y="-36" type="curve" smooth="yes" name="dh02"/>
       <point x="345" y="-189"/>
       <point x="434" y="-283"/>
-      <point x="625" y="-283" type="curve" name="sv01" smooth="yes"/>
+      <point x="625" y="-283" type="curve" smooth="yes" name="sv01"/>
       <point x="794" y="-283"/>
       <point x="890" y="-209"/>
-      <point x="890" y="-60" type="curve" name="sh01" smooth="yes"/>
+      <point x="890" y="-60" type="curve" smooth="yes" name="sh01"/>
       <point x="890" y="38" type="line" smooth="yes"/>
       <point x="890" y="200"/>
       <point x="811" y="281"/>
-      <point x="653" y="281" type="curve" name="dv03" smooth="yes"/>
+      <point x="653" y="281" type="curve" smooth="yes" name="dv03"/>
       <point x="580" y="281" type="line" name="dh03"/>
       <point x="580" y="421" type="line"/>
-      <point x="653" y="421" type="line" name="dv04" smooth="yes"/>
+      <point x="653" y="421" type="line" smooth="yes" name="dv04"/>
       <point x="804" y="421"/>
       <point x="879" y="539"/>
-      <point x="879" y="666" type="curve" name="hr01" smooth="yes"/>
+      <point x="879" y="666" type="curve" smooth="yes" name="hr01"/>
       <point x="879" y="783"/>
       <point x="816" y="903"/>
-      <point x="632" y="903" type="curve" name="dv01" smooth="yes"/>
+      <point x="632" y="903" type="curve" smooth="yes" name="dv01"/>
       <point x="495" y="903"/>
       <point x="394" y="836"/>
-      <point x="394" y="702" type="curve" name="hr02" smooth="yes"/>
+      <point x="394" y="702" type="curve" smooth="yes" name="hr02"/>
       <point x="394" y="650"/>
       <point x="409" y="576"/>
       <point x="440" y="493" type="curve" name="ih03"/>
       <point x="279" y="493" type="line"/>
       <point x="239" y="548"/>
       <point x="219" y="617"/>
-      <point x="219" y="701" type="curve" name="ih02" smooth="yes"/>
+      <point x="219" y="701" type="curve" smooth="yes" name="ih02"/>
       <point x="219" y="930"/>
       <point x="370" y="1045"/>
-      <point x="639" y="1045" type="curve" name="dv02" smooth="yes"/>
+      <point x="639" y="1045" type="curve" smooth="yes" name="dv02"/>
       <point x="928" y="1045"/>
       <point x="1066" y="912"/>
-      <point x="1066" y="676" type="curve" name="sh02" smooth="yes"/>
+      <point x="1066" y="676" type="curve" smooth="yes" name="sh02"/>
       <point x="1066" y="512"/>
       <point x="999" y="421"/>
       <point x="837" y="355" type="curve"/>
       <point x="837" y="335" type="line"/>
       <point x="995" y="306"/>
       <point x="1074" y="205"/>
-      <point x="1074" y="34" type="curve" name="dh04" smooth="yes"/>
+      <point x="1074" y="34" type="curve" smooth="yes" name="dh04"/>
       <point x="1074" y="-45" type="line" smooth="yes"/>
       <point x="1074" y="-300"/>
       <point x="917" y="-425"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10D_6.glif b/source/Hack-Regular.ufo/glyphs/uni10D_6.glif
index 87236fac8..498ad95a8 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10D_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10D_6.glif
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D6" format="1">
+<glyph name="uni10D6" format="2">
   <advance width="1233"/>
   <unicode hex="10D6"/>
   <outline>
     <contour>
-      <point x="640" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="640" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="335" y="0"/>
       <point x="183" y="168"/>
-      <point x="183" y="503" type="curve" name="sh01" smooth="yes"/>
+      <point x="183" y="503" type="curve" smooth="yes" name="sh01"/>
       <point x="183" y="724"/>
       <point x="250" y="859"/>
       <point x="383" y="908" type="curve"/>
       <point x="383" y="928" type="line"/>
       <point x="240" y="971"/>
       <point x="184" y="1067"/>
-      <point x="184" y="1224" type="curve" name="dh01" smooth="yes"/>
+      <point x="184" y="1224" type="curve" smooth="yes" name="dh01"/>
       <point x="184" y="1444"/>
       <point x="294" y="1556"/>
-      <point x="525" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="525" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="753" y="1556"/>
       <point x="866" y="1446"/>
-      <point x="866" y="1239" type="curve" name="dh04" smooth="yes"/>
+      <point x="866" y="1239" type="curve" smooth="yes" name="dh04"/>
       <point x="866" y="1130"/>
       <point x="834" y="1050"/>
       <point x="773" y="993" type="curve"/>
       <point x="773" y="973" type="line" name="sv01"/>
       <point x="990" y="943"/>
       <point x="1099" y="787"/>
-      <point x="1099" y="505" type="curve" name="dh06" smooth="yes"/>
+      <point x="1099" y="505" type="curve" smooth="yes" name="dh06"/>
       <point x="1099" y="168"/>
       <point x="946" y="0"/>
     </contour>
     <contour>
-      <point x="533" y="983" type="curve" name="dv02" smooth="yes"/>
+      <point x="533" y="983" type="curve" smooth="yes" name="dv02"/>
       <point x="653" y="983"/>
       <point x="709" y="1061"/>
-      <point x="709" y="1189" type="curve" name="dh03" smooth="yes"/>
+      <point x="709" y="1189" type="curve" smooth="yes" name="dh03"/>
       <point x="709" y="1352"/>
       <point x="619" y="1415"/>
-      <point x="530" y="1415" type="curve" name="sv02" smooth="yes"/>
+      <point x="530" y="1415" type="curve" smooth="yes" name="sv02"/>
       <point x="438" y="1415"/>
       <point x="351" y="1347"/>
-      <point x="351" y="1192" type="curve" name="dh02" smooth="yes"/>
+      <point x="351" y="1192" type="curve" smooth="yes" name="dh02"/>
       <point x="351" y="1061"/>
       <point x="412" y="983"/>
     </contour>
     <contour>
-      <point x="641" y="145" type="curve" name="sv03" smooth="yes"/>
+      <point x="641" y="145" type="curve" smooth="yes" name="sv03"/>
       <point x="822" y="145"/>
       <point x="914" y="273"/>
-      <point x="914" y="493" type="curve" name="dh05" smooth="yes"/>
+      <point x="914" y="493" type="curve" smooth="yes" name="dh05"/>
       <point x="914" y="761"/>
       <point x="779" y="875"/>
-      <point x="643" y="875" type="curve" name="dv01" smooth="yes"/>
+      <point x="643" y="875" type="curve" smooth="yes" name="dv01"/>
       <point x="507" y="875"/>
       <point x="371" y="761"/>
       <point x="371" y="491" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10D_7.glif b/source/Hack-Regular.ufo/glyphs/uni10D_7.glif
index 25c9db56b..486a36da7 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10D_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10D_7.glif
@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D7" format="1">
+<glyph name="uni10D7" format="2">
   <advance width="1233"/>
   <unicode hex="10D7"/>
   <outline>
     <contour>
-      <point x="409" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="409" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="177" y="0"/>
       <point x="45" y="174"/>
-      <point x="45" y="519" type="curve" name="dh01" smooth="yes"/>
+      <point x="45" y="519" type="curve" smooth="yes" name="dh01"/>
       <point x="45" y="549" type="line" smooth="yes"/>
       <point x="45" y="872"/>
       <point x="171" y="1035"/>
-      <point x="419" y="1035" type="curve" name="sv01" smooth="yes"/>
+      <point x="419" y="1035" type="curve" smooth="yes" name="sv01"/>
       <point x="518" y="1035"/>
       <point x="590" y="1009"/>
       <point x="643" y="936" type="curve"/>
       <point x="657" y="936" type="line"/>
       <point x="714" y="1011"/>
       <point x="775" y="1035"/>
-      <point x="855" y="1035" type="curve" name="dv02" smooth="yes"/>
+      <point x="855" y="1035" type="curve" smooth="yes" name="dv02"/>
       <point x="1056" y="1035"/>
       <point x="1168" y="885"/>
       <point x="1168" y="584" type="curve" smooth="yes"/>
-      <point x="1168" y="517" type="line" name="dh06" smooth="yes"/>
+      <point x="1168" y="517" type="line" smooth="yes" name="dh06"/>
       <point x="1168" y="284"/>
       <point x="1088" y="111"/>
       <point x="929" y="0" type="curve" name="ab01"/>
       <point x="767" y="0" type="line" name="ih01"/>
       <point x="908" y="116"/>
       <point x="979" y="281"/>
-      <point x="979" y="496" type="curve" name="dh05" smooth="yes"/>
+      <point x="979" y="496" type="curve" smooth="yes" name="dh05"/>
       <point x="979" y="613" type="line" smooth="yes"/>
       <point x="979" y="800"/>
       <point x="935" y="894"/>
-      <point x="847" y="894" type="curve" name="dv01" smooth="yes"/>
+      <point x="847" y="894" type="curve" smooth="yes" name="dv01"/>
       <point x="814" y="894" type="line" smooth="yes"/>
       <point x="759" y="894"/>
       <point x="731" y="833"/>
       <point x="731" y="712" type="curve" smooth="yes"/>
-      <point x="731" y="492" type="line" name="dh04" smooth="yes"/>
+      <point x="731" y="492" type="line" smooth="yes" name="dh04"/>
       <point x="731" y="153"/>
       <point x="628" y="0"/>
     </contour>
     <contour>
-      <point x="405" y="145" type="curve" name="sv02" smooth="yes"/>
+      <point x="405" y="145" type="curve" smooth="yes" name="sv02"/>
       <point x="515" y="145"/>
       <point x="570" y="226"/>
-      <point x="570" y="388" type="curve" name="dh03" smooth="yes"/>
+      <point x="570" y="388" type="curve" smooth="yes" name="dh03"/>
       <point x="570" y="749" type="line" smooth="yes"/>
       <point x="570" y="849"/>
       <point x="549" y="894"/>
@@ -55,7 +55,7 @@
       <point x="294" y="892"/>
       <point x="235" y="808"/>
       <point x="235" y="621" type="curve" smooth="yes"/>
-      <point x="235" y="432" type="line" name="dh02" smooth="yes"/>
+      <point x="235" y="432" type="line" smooth="yes" name="dh02"/>
       <point x="235" y="235"/>
       <point x="289" y="145"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10D_8.glif b/source/Hack-Regular.ufo/glyphs/uni10D_8.glif
index efa8fd48c..3a62a9f5d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10D_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10D_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D8" format="1">
+<glyph name="uni10D8" format="2">
   <advance width="1233"/>
   <unicode hex="10D8"/>
   <outline>
@@ -7,26 +7,26 @@
       <point x="396" y="0" type="line" name="hr00"/>
       <point x="231" y="144"/>
       <point x="160" y="324"/>
-      <point x="160" y="551" type="curve" name="sh01" smooth="yes"/>
+      <point x="160" y="551" type="curve" smooth="yes" name="sh01"/>
       <point x="160" y="880"/>
       <point x="313" y="1045"/>
-      <point x="619" y="1045" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1045" type="curve" smooth="yes" name="dv02"/>
       <point x="922" y="1045"/>
       <point x="1074" y="881"/>
-      <point x="1074" y="554" type="curve" name="sh02" smooth="yes"/>
+      <point x="1074" y="554" type="curve" smooth="yes" name="sh02"/>
       <point x="1074" y="322"/>
       <point x="999" y="137"/>
       <point x="834" y="0" type="curve" name="ab01"/>
       <point x="688" y="0" type="line" name="ih01"/>
       <point x="819" y="168"/>
       <point x="889" y="383"/>
-      <point x="889" y="565" type="curve" name="ah01" smooth="yes"/>
+      <point x="889" y="565" type="curve" smooth="yes" name="ah01"/>
       <point x="889" y="754"/>
       <point x="813" y="902"/>
-      <point x="618" y="902" type="curve" name="dv01" smooth="yes"/>
+      <point x="618" y="902" type="curve" smooth="yes" name="dv01"/>
       <point x="446" y="902"/>
       <point x="346" y="785"/>
-      <point x="346" y="552" type="curve" name="sh03" smooth="yes"/>
+      <point x="346" y="552" type="curve" smooth="yes" name="sh03"/>
       <point x="346" y="363"/>
       <point x="412" y="179"/>
       <point x="544" y="0" type="curve" name="ih02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10D_9.glif b/source/Hack-Regular.ufo/glyphs/uni10D_9.glif
index 3ce1065f8..1d1ecd0fe 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10D_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10D_9.glif
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10D9" format="1">
+<glyph name="uni10D9" format="2">
   <advance width="1233"/>
   <unicode hex="10D9"/>
   <outline>
     <contour>
-      <point x="630" y="-423" type="curve" name="dv01" smooth="yes"/>
+      <point x="630" y="-423" type="curve" smooth="yes" name="dv01"/>
       <point x="315" y="-423"/>
       <point x="158" y="-275"/>
-      <point x="158" y="-16" type="curve" name="dh01" smooth="yes"/>
+      <point x="158" y="-16" type="curve" smooth="yes" name="dh01"/>
       <point x="158" y="89"/>
       <point x="185" y="161"/>
       <point x="270" y="241" type="curve"/>
       <point x="443" y="241" type="line" name="ih01"/>
       <point x="376" y="163"/>
       <point x="345" y="91"/>
-      <point x="345" y="-10" type="curve" name="dh02" smooth="yes"/>
+      <point x="345" y="-10" type="curve" smooth="yes" name="dh02"/>
       <point x="345" y="-183"/>
       <point x="440" y="-282"/>
-      <point x="629" y="-282" type="curve" name="dv02" smooth="yes"/>
+      <point x="629" y="-282" type="curve" smooth="yes" name="dv02"/>
       <point x="802" y="-282"/>
       <point x="888" y="-198"/>
-      <point x="888" y="-30" type="curve" name="sh02" smooth="yes"/>
+      <point x="888" y="-30" type="curve" smooth="yes" name="sh02"/>
       <point x="888" y="20" type="line" smooth="yes"/>
       <point x="888" y="201"/>
       <point x="809" y="292"/>
-      <point x="650" y="292" type="curve" name="hr01" smooth="yes"/>
+      <point x="650" y="292" type="curve" smooth="yes" name="hr01"/>
       <point x="585" y="292" type="line" name="dh03"/>
       <point x="585" y="444" type="line" name="hr02"/>
-      <point x="650" y="444" type="line" name="dv05" smooth="yes"/>
+      <point x="650" y="444" type="line" smooth="yes" name="dv05"/>
       <point x="803" y="444"/>
       <point x="878" y="514"/>
-      <point x="878" y="635" type="curve" name="sh01" smooth="yes"/>
+      <point x="878" y="635" type="curve" smooth="yes" name="sh01"/>
       <point x="878" y="796"/>
       <point x="745" y="872"/>
       <point x="456" y="872" type="curve" name="dv03"/>
@@ -44,7 +44,7 @@
       <point x="792" y="365" type="line"/>
       <point x="977" y="333"/>
       <point x="1076" y="220"/>
-      <point x="1076" y="20" type="curve" name="dh04" smooth="yes"/>
+      <point x="1076" y="20" type="curve" smooth="yes" name="dh04"/>
       <point x="1076" y="-30" type="line" smooth="yes"/>
       <point x="1076" y="-292"/>
       <point x="927" y="-423"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10D_A_.glif b/source/Hack-Regular.ufo/glyphs/uni10D_A_.glif
index 0f9396247..132f82692 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10D_A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10D_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10DA" format="1">
+<glyph name="uni10DA" format="2">
   <advance width="1233"/>
   <unicode hex="10DA"/>
   <outline>
@@ -18,38 +18,38 @@
       <point x="409" y="-61" type="line"/>
       <point x="242" y="112"/>
       <point x="160" y="337"/>
-      <point x="160" y="574" type="curve" name="hr01" smooth="yes"/>
+      <point x="160" y="574" type="curve" smooth="yes" name="hr01"/>
       <point x="160" y="891"/>
       <point x="311" y="1045"/>
-      <point x="612" y="1045" type="curve" name="dv02" smooth="yes"/>
+      <point x="612" y="1045" type="curve" smooth="yes" name="dv02"/>
       <point x="923" y="1045"/>
       <point x="1074" y="882"/>
-      <point x="1074" y="593" type="curve" name="sh02" smooth="yes"/>
+      <point x="1074" y="593" type="curve" smooth="yes" name="sh02"/>
       <point x="1074" y="483"/>
       <point x="1053" y="448"/>
       <point x="1015" y="383" type="curve" smooth="yes"/>
       <point x="994" y="346"/>
       <point x="971" y="300"/>
-      <point x="971" y="212" type="curve" name="dh03" smooth="yes"/>
+      <point x="971" y="212" type="curve" smooth="yes" name="dh03"/>
       <point x="971" y="185"/>
       <point x="973" y="163"/>
       <point x="976" y="136" type="curve" name="hr02"/>
       <point x="817" y="135" type="line" name="sh03"/>
       <point x="813" y="167"/>
       <point x="811" y="197"/>
-      <point x="811" y="225" type="curve" name="dh02" smooth="yes"/>
+      <point x="811" y="225" type="curve" smooth="yes" name="dh02"/>
       <point x="811" y="304"/>
       <point x="825" y="340"/>
       <point x="843" y="376" type="curve" smooth="yes"/>
       <point x="870" y="432"/>
       <point x="889" y="478"/>
-      <point x="889" y="578" type="curve" name="sh01" smooth="yes"/>
+      <point x="889" y="578" type="curve" smooth="yes" name="sh01"/>
       <point x="889" y="799"/>
       <point x="800" y="904"/>
-      <point x="615" y="904" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="904" type="curve" smooth="yes" name="dv01"/>
       <point x="430" y="904"/>
       <point x="345" y="795"/>
-      <point x="345" y="558" type="curve" name="dh01" smooth="yes"/>
+      <point x="345" y="558" type="curve" smooth="yes" name="dh01"/>
       <point x="345" y="222"/>
       <point x="516" y="33"/>
       <point x="649" y="-73" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10D_B_.glif b/source/Hack-Regular.ufo/glyphs/uni10D_B_.glif
index ed8a24ef2..c8992de24 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10D_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10D_B_.glif
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10DB" format="1">
+<glyph name="uni10DB" format="2">
   <advance width="1233"/>
   <unicode hex="10DB"/>
   <outline>
     <contour>
-      <point x="616" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="616" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="304" y="0"/>
       <point x="146" y="173"/>
-      <point x="146" y="525" type="curve" name="dh01" smooth="yes"/>
+      <point x="146" y="525" type="curve" smooth="yes" name="dh01"/>
       <point x="146" y="872"/>
       <point x="303" y="1046"/>
-      <point x="598" y="1046" type="curve" name="dv02" smooth="yes"/>
+      <point x="598" y="1046" type="curve" smooth="yes" name="dv02"/>
       <point x="738" y="1046"/>
       <point x="821" y="1008"/>
       <point x="869" y="921" type="curve"/>
       <point x="889" y="921" type="line"/>
-      <point x="889" y="1179" type="line" name="dh03" smooth="yes"/>
+      <point x="889" y="1179" type="line" smooth="yes" name="dh03"/>
       <point x="889" y="1345"/>
       <point x="746" y="1416"/>
-      <point x="610" y="1416" type="curve" name="sv01" smooth="yes"/>
+      <point x="610" y="1416" type="curve" smooth="yes" name="sv01"/>
       <point x="489" y="1416"/>
       <point x="373" y="1359"/>
       <point x="373" y="1263" type="curve" smooth="yes"/>
@@ -27,25 +27,25 @@
       <point x="186" y="1263" type="line" smooth="yes"/>
       <point x="186" y="1459"/>
       <point x="324" y="1557"/>
-      <point x="601" y="1557" type="curve" name="at01" smooth="yes"/>
+      <point x="601" y="1557" type="curve" smooth="yes" name="at01"/>
       <point x="910" y="1557"/>
       <point x="1064" y="1431"/>
-      <point x="1064" y="1179" type="curve" name="dh04" smooth="yes"/>
-      <point x="1064" y="495" type="line" name="hr02" smooth="yes"/>
+      <point x="1064" y="1179" type="curve" smooth="yes" name="dh04"/>
+      <point x="1064" y="495" type="line" smooth="yes" name="hr02"/>
       <point x="1064" y="163"/>
       <point x="916" y="0"/>
     </contour>
     <contour>
-      <point x="628" y="145" type="curve" name="sv02" smooth="yes"/>
+      <point x="628" y="145" type="curve" smooth="yes" name="sv02"/>
       <point x="789" y="145"/>
       <point x="876" y="261"/>
-      <point x="876" y="506" type="curve" name="sh02" smooth="yes"/>
+      <point x="876" y="506" type="curve" smooth="yes" name="sh02"/>
       <point x="876" y="767"/>
       <point x="780" y="902"/>
-      <point x="613" y="902" type="curve" name="dv01" smooth="yes"/>
+      <point x="613" y="902" type="curve" smooth="yes" name="dv01"/>
       <point x="420" y="902"/>
       <point x="334" y="715"/>
-      <point x="334" y="527" type="curve" name="dh02" smooth="yes"/>
+      <point x="334" y="527" type="curve" smooth="yes" name="dh02"/>
       <point x="334" y="336"/>
       <point x="423" y="145"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10D_C_.glif b/source/Hack-Regular.ufo/glyphs/uni10D_C_.glif
index 10083650c..a38d396de 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10D_C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10D_C_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10DC" format="1">
+<glyph name="uni10DC" format="2">
   <advance width="1233"/>
   <unicode hex="10DC"/>
   <outline>
     <contour>
-      <point x="607" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="607" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="312" y="0"/>
       <point x="159" y="163"/>
-      <point x="159" y="490" type="curve" name="sh01" smooth="yes"/>
+      <point x="159" y="490" type="curve" smooth="yes" name="sh01"/>
       <point x="159" y="1184" type="line"/>
       <point x="158" y="1415"/>
       <point x="268" y="1531"/>
@@ -17,29 +17,29 @@
       <point x="471" y="1388" type="line" smooth="yes"/>
       <point x="377" y="1388"/>
       <point x="330" y="1329"/>
-      <point x="330" y="1212" type="curve" name="sh03" smooth="yes"/>
+      <point x="330" y="1212" type="curve" smooth="yes" name="sh03"/>
       <point x="330" y="918" type="line" name="sv01"/>
       <point x="365" y="918" type="line"/>
       <point x="412" y="1006"/>
       <point x="484" y="1046"/>
-      <point x="627" y="1046" type="curve" name="dv04" smooth="yes"/>
+      <point x="627" y="1046" type="curve" smooth="yes" name="dv04"/>
       <point x="919" y="1046"/>
       <point x="1074" y="879"/>
-      <point x="1074" y="531" type="curve" name="sh04" smooth="yes"/>
+      <point x="1074" y="531" type="curve" smooth="yes" name="sh04"/>
       <point x="1074" y="186"/>
       <point x="920" y="0"/>
     </contour>
     <contour>
-      <point x="609" y="146" type="curve" name="sv02" smooth="yes"/>
+      <point x="609" y="146" type="curve" smooth="yes" name="sv02"/>
       <point x="797" y="146"/>
       <point x="889" y="279"/>
-      <point x="889" y="534" type="curve" name="ah01" smooth="yes"/>
+      <point x="889" y="534" type="curve" smooth="yes" name="ah01"/>
       <point x="889" y="783"/>
       <point x="798" y="904"/>
-      <point x="615" y="904" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="904" type="curve" smooth="yes" name="dv03"/>
       <point x="428" y="904"/>
       <point x="338" y="782"/>
-      <point x="338" y="526" type="curve" name="sh02" smooth="yes"/>
+      <point x="338" y="526" type="curve" smooth="yes" name="sh02"/>
       <point x="338" y="273"/>
       <point x="428" y="146"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10D_D_.glif b/source/Hack-Regular.ufo/glyphs/uni10D_D_.glif
index e78a1e6e8..b4b9fc969 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10D_D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10D_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10DD" format="1">
+<glyph name="uni10DD" format="2">
   <advance width="1233"/>
   <unicode hex="10DD"/>
   <outline>
@@ -7,29 +7,29 @@
       <point x="254" y="0" type="line" name="hr00"/>
       <point x="121" y="149"/>
       <point x="55" y="303"/>
-      <point x="55" y="461" type="curve" name="dh01" smooth="yes"/>
+      <point x="55" y="461" type="curve" smooth="yes" name="dh01"/>
       <point x="55" y="563" type="line" smooth="yes"/>
       <point x="55" y="878"/>
       <point x="190" y="1035"/>
-      <point x="414" y="1035" type="curve" name="sv01" smooth="yes"/>
+      <point x="414" y="1035" type="curve" smooth="yes" name="sv01"/>
       <point x="509" y="1035"/>
       <point x="554" y="1007"/>
       <point x="611" y="931" type="curve"/>
       <point x="628" y="931" type="line"/>
       <point x="687" y="1015"/>
       <point x="732" y="1035"/>
-      <point x="813" y="1035" type="curve" name="dv02" smooth="yes"/>
+      <point x="813" y="1035" type="curve" smooth="yes" name="dv02"/>
       <point x="1040" y="1035"/>
       <point x="1178" y="878"/>
       <point x="1178" y="561" type="curve" smooth="yes"/>
-      <point x="1178" y="454" type="line" name="dh06" smooth="yes"/>
+      <point x="1178" y="454" type="line" smooth="yes" name="dh06"/>
       <point x="1178" y="297"/>
       <point x="1115" y="145"/>
       <point x="990" y="0" type="curve" name="ab01"/>
       <point x="811" y="0" type="line" name="ih01"/>
       <point x="930" y="129"/>
       <point x="990" y="262"/>
-      <point x="990" y="399" type="curve" name="dh05" smooth="yes"/>
+      <point x="990" y="399" type="curve" smooth="yes" name="dh05"/>
       <point x="990" y="680" type="line" smooth="yes"/>
       <point x="990" y="823"/>
       <point x="939" y="895"/>
@@ -43,12 +43,12 @@
       <point x="538" y="687" type="line" smooth="yes"/>
       <point x="538" y="825"/>
       <point x="516" y="894"/>
-      <point x="472" y="894" type="curve" name="sv02" smooth="yes"/>
+      <point x="472" y="894" type="curve" smooth="yes" name="sv02"/>
       <point x="395" y="894" type="line" smooth="yes"/>
       <point x="296" y="894"/>
       <point x="247" y="818"/>
       <point x="247" y="666" type="curve" smooth="yes"/>
-      <point x="247" y="406" type="line" name="dh02" smooth="yes"/>
+      <point x="247" y="406" type="line" smooth="yes" name="dh02"/>
       <point x="247" y="259"/>
       <point x="312" y="129"/>
       <point x="448" y="0" type="curve" name="ih02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10D_E_.glif b/source/Hack-Regular.ufo/glyphs/uni10D_E_.glif
index 35d486dca..9bf2439a9 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10D_E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10D_E_.glif
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10DE" format="1">
+<glyph name="uni10DE" format="2">
   <advance width="1233"/>
   <unicode hex="10DE"/>
   <outline>
     <contour>
-      <point x="619" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="619" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="326" y="0"/>
       <point x="160" y="144"/>
-      <point x="160" y="429" type="curve" name="dh01" smooth="yes"/>
+      <point x="160" y="429" type="curve" smooth="yes" name="dh01"/>
       <point x="160" y="555"/>
       <point x="194" y="648"/>
       <point x="261" y="707" type="curve"/>
       <point x="436" y="707" type="line" name="ih01"/>
       <point x="375" y="624"/>
       <point x="345" y="532"/>
-      <point x="345" y="431" type="curve" name="hr01" smooth="yes"/>
+      <point x="345" y="431" type="curve" smooth="yes" name="hr01"/>
       <point x="345" y="240"/>
       <point x="446" y="145"/>
-      <point x="621" y="145" type="curve" name="sv01" smooth="yes"/>
+      <point x="621" y="145" type="curve" smooth="yes" name="sv01"/>
       <point x="804" y="145"/>
       <point x="888" y="249"/>
-      <point x="888" y="469" type="curve" name="sh01" smooth="yes"/>
+      <point x="888" y="469" type="curve" smooth="yes" name="sh01"/>
       <point x="888" y="696"/>
       <point x="799" y="804"/>
-      <point x="612" y="804" type="curve" name="dv01" smooth="yes"/>
+      <point x="612" y="804" type="curve" smooth="yes" name="dv01"/>
       <point x="549" y="804" type="line"/>
       <point x="549" y="939" type="line" name="dh02"/>
-      <point x="631" y="939" type="line" name="dv02" smooth="yes"/>
+      <point x="631" y="939" type="line" smooth="yes" name="dv02"/>
       <point x="771" y="939"/>
       <point x="847" y="1017"/>
-      <point x="847" y="1105" type="curve" name="hr02" smooth="yes"/>
+      <point x="847" y="1105" type="curve" smooth="yes" name="hr02"/>
       <point x="847" y="1197"/>
       <point x="760" y="1297"/>
       <point x="568" y="1321" type="curve"/>
@@ -42,14 +42,14 @@
       <point x="687" y="1439" type="curve"/>
       <point x="915" y="1412"/>
       <point x="1030" y="1316"/>
-      <point x="1030" y="1135" type="curve" name="dh03" smooth="yes"/>
+      <point x="1030" y="1135" type="curve" smooth="yes" name="dh03"/>
       <point x="1030" y="1007"/>
       <point x="973" y="916"/>
       <point x="844" y="873" type="curve" name="sh03"/>
       <point x="844" y="853" type="line"/>
       <point x="1005" y="776"/>
       <point x="1076" y="661"/>
-      <point x="1076" y="457" type="curve" name="sh02" smooth="yes"/>
+      <point x="1076" y="457" type="curve" smooth="yes" name="sh02"/>
       <point x="1076" y="160"/>
       <point x="928" y="0"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10D_F_.glif b/source/Hack-Regular.ufo/glyphs/uni10D_F_.glif
index 5f74bce46..4a6768cca 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10D_F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10D_F_.glif
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10DF" format="1">
+<glyph name="uni10DF" format="2">
   <advance width="1233"/>
   <unicode hex="10DF"/>
   <outline>
     <contour>
-      <point x="607" y="-423" type="curve" name="dv01" smooth="yes"/>
+      <point x="607" y="-423" type="curve" smooth="yes" name="dv01"/>
       <point x="310" y="-423"/>
       <point x="160" y="-303"/>
       <point x="159" y="-56" type="curve" name="dh01"/>
       <point x="346" y="-56" type="line" name="dh02"/>
       <point x="345" y="-207"/>
       <point x="432" y="-283"/>
-      <point x="609" y="-283" type="curve" name="dv02" smooth="yes"/>
+      <point x="609" y="-283" type="curve" smooth="yes" name="dv02"/>
       <point x="802" y="-283"/>
       <point x="900" y="-195"/>
-      <point x="900" y="-16" type="curve" name="dh05" smooth="yes"/>
+      <point x="900" y="-16" type="curve" smooth="yes" name="dh05"/>
       <point x="900" y="920" type="line"/>
       <point x="465" y="868" type="line"/>
       <point x="465" y="808" type="line"/>
       <point x="612" y="751"/>
       <point x="686" y="635"/>
-      <point x="686" y="490" type="curve" name="dh04" smooth="yes"/>
+      <point x="686" y="490" type="curve" smooth="yes" name="dh04"/>
       <point x="686" y="278"/>
       <point x="522" y="175"/>
       <point x="159" y="174" type="curve" name="sh01"/>
       <point x="159" y="341" type="line" name="dv03"/>
       <point x="427" y="341"/>
       <point x="518" y="388"/>
-      <point x="518" y="505" type="curve" name="dh03" smooth="yes"/>
+      <point x="518" y="505" type="curve" smooth="yes" name="dh03"/>
       <point x="518" y="642"/>
       <point x="393" y="770"/>
       <point x="159" y="815" type="curve" name="sh02"/>
       <point x="159" y="945" type="line"/>
       <point x="1075" y="1074" type="line" name="hr01"/>
-      <point x="1075" y="-18" type="line" name="dh06" smooth="yes"/>
+      <point x="1075" y="-18" type="line" smooth="yes" name="dh06"/>
       <point x="1075" y="-288"/>
       <point x="919" y="-423"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10E_0.glif b/source/Hack-Regular.ufo/glyphs/uni10E_0.glif
index a9ed6d346..6472b6d2f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10E_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10E_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E0" format="1">
+<glyph name="uni10E0" format="2">
   <advance width="1233"/>
   <unicode hex="10E0"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="265" y="0" type="line" name="hr00"/>
       <point x="125" y="140"/>
       <point x="55" y="303"/>
-      <point x="55" y="490" type="curve" name="dh01" smooth="yes"/>
+      <point x="55" y="490" type="curve" smooth="yes" name="dh01"/>
       <point x="55" y="593" type="line" smooth="yes"/>
       <point x="55" y="928"/>
       <point x="260" y="1393"/>
@@ -24,22 +24,22 @@
       <point x="631" y="937" type="line"/>
       <point x="678" y="1001"/>
       <point x="756" y="1035"/>
-      <point x="861" y="1035" type="curve" name="dv02" smooth="yes"/>
+      <point x="861" y="1035" type="curve" smooth="yes" name="dv02"/>
       <point x="1073" y="1035"/>
       <point x="1178" y="891"/>
       <point x="1178" y="596" type="curve" smooth="yes"/>
-      <point x="1178" y="454" type="line" name="dh06" smooth="yes"/>
+      <point x="1178" y="454" type="line" smooth="yes" name="dh06"/>
       <point x="1178" y="291"/>
       <point x="1109" y="139"/>
       <point x="970" y="0" type="curve" name="ab01"/>
       <point x="773" y="0" type="line" name="ih02"/>
       <point x="917" y="123"/>
       <point x="989" y="257"/>
-      <point x="989" y="403" type="curve" name="dh05" smooth="yes"/>
+      <point x="989" y="403" type="curve" smooth="yes" name="dh05"/>
       <point x="989" y="596" type="line" smooth="yes"/>
       <point x="989" y="795"/>
       <point x="945" y="894"/>
-      <point x="857" y="894" type="curve" name="dv01" smooth="yes"/>
+      <point x="857" y="894" type="curve" smooth="yes" name="dv01"/>
       <point x="769" y="894" type="line" smooth="yes"/>
       <point x="726" y="894"/>
       <point x="704" y="838"/>
@@ -49,12 +49,12 @@
       <point x="545" y="727" type="line"/>
       <point x="546" y="838"/>
       <point x="522" y="894"/>
-      <point x="472" y="894" type="curve" name="sv02" smooth="yes"/>
+      <point x="472" y="894" type="curve" smooth="yes" name="sv02"/>
       <point x="348" y="894" type="line" smooth="yes"/>
       <point x="279" y="894"/>
       <point x="245" y="796"/>
       <point x="245" y="601" type="curve" smooth="yes"/>
-      <point x="245" y="436" type="line" name="dh02" smooth="yes"/>
+      <point x="245" y="436" type="line" smooth="yes" name="dh02"/>
       <point x="245" y="269"/>
       <point x="322" y="123"/>
       <point x="475" y="0" type="curve" name="ih03"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10E_1.glif b/source/Hack-Regular.ufo/glyphs/uni10E_1.glif
index 7e8d98cac..6158facdd 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10E_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10E_1.glif
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E1" format="1">
+<glyph name="uni10E1" format="2">
   <advance width="1233"/>
   <unicode hex="10E1"/>
   <outline>
     <contour>
-      <point x="618" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="618" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="317" y="0"/>
       <point x="159" y="172"/>
-      <point x="159" y="515" type="curve" name="dh01" smooth="yes"/>
+      <point x="159" y="515" type="curve" smooth="yes" name="dh01"/>
       <point x="159" y="1521" type="line" name="av01"/>
       <point x="341" y="1521" type="line"/>
-      <point x="341" y="515" type="line" name="dh02" smooth="yes"/>
+      <point x="341" y="515" type="line" smooth="yes" name="dh02"/>
       <point x="341" y="267"/>
       <point x="437" y="145"/>
-      <point x="618" y="145" type="curve" name="sv01" smooth="yes"/>
+      <point x="618" y="145" type="curve" smooth="yes" name="sv01"/>
       <point x="801" y="145"/>
       <point x="889" y="273"/>
-      <point x="889" y="496" type="curve" name="dh05" smooth="yes"/>
+      <point x="889" y="496" type="curve" smooth="yes" name="dh05"/>
       <point x="889" y="630"/>
       <point x="857" y="705"/>
       <point x="754" y="771" type="curve"/>
       <point x="689" y="814"/>
       <point x="618" y="859"/>
-      <point x="618" y="956" type="curve" name="dh03" smooth="yes"/>
+      <point x="618" y="956" type="curve" smooth="yes" name="dh03"/>
       <point x="618" y="1053"/>
       <point x="691" y="1147"/>
       <point x="824" y="1227" type="curve"/>
       <point x="911" y="1103" type="line"/>
       <point x="808" y="1063"/>
       <point x="769" y="1025"/>
-      <point x="769" y="986" type="curve" name="dh04" smooth="yes"/>
+      <point x="769" y="986" type="curve" smooth="yes" name="dh04"/>
       <point x="769" y="928"/>
       <point x="855" y="870"/>
       <point x="922" y="827" type="curve" smooth="yes"/>
       <point x="1036" y="753"/>
       <point x="1075" y="657"/>
-      <point x="1075" y="496" type="curve" name="dh06" smooth="yes"/>
+      <point x="1075" y="496" type="curve" smooth="yes" name="dh06"/>
       <point x="1075" y="177"/>
       <point x="925" y="0"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10E_2.glif b/source/Hack-Regular.ufo/glyphs/uni10E_2.glif
index f2578eded..b2fa2a9ba 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10E_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10E_2.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E2" format="1">
+<glyph name="uni10E2" format="2">
   <advance width="1233"/>
   <unicode hex="10E2"/>
   <outline>
     <contour>
-      <point x="598" y="-423" type="curve" name="hr00" smooth="yes"/>
+      <point x="598" y="-423" type="curve" smooth="yes" name="hr00"/>
       <point x="250" y="-423"/>
       <point x="45" y="-185"/>
-      <point x="45" y="285" type="curve" name="sh01" smooth="yes"/>
+      <point x="45" y="285" type="curve" smooth="yes" name="sh01"/>
       <point x="45" y="710"/>
       <point x="212" y="945"/>
       <point x="551" y="1001" type="curve"/>
@@ -16,15 +16,15 @@
       <point x="687" y="997" type="line"/>
       <point x="1015" y="944"/>
       <point x="1187" y="605"/>
-      <point x="1187" y="261" type="curve" name="sh02" smooth="yes"/>
+      <point x="1187" y="261" type="curve" smooth="yes" name="sh02"/>
       <point x="1187" y="-83"/>
       <point x="1015" y="-423"/>
     </contour>
     <contour>
-      <point x="618" y="-283" type="curve" name="dv01" smooth="yes"/>
+      <point x="618" y="-283" type="curve" smooth="yes" name="dv01"/>
       <point x="875" y="-283"/>
       <point x="1006" y="-88"/>
-      <point x="1006" y="284" type="curve" name="ah01" smooth="yes"/>
+      <point x="1006" y="284" type="curve" smooth="yes" name="ah01"/>
       <point x="1006" y="612"/>
       <point x="907" y="811"/>
       <point x="687" y="888" type="curve" name="ih01"/>
@@ -33,7 +33,7 @@
       <point x="551" y="887" type="line" name="ih02"/>
       <point x="334" y="811"/>
       <point x="233" y="613"/>
-      <point x="233" y="282" type="curve" name="sh03" smooth="yes"/>
+      <point x="233" y="282" type="curve" smooth="yes" name="sh03"/>
       <point x="233" y="-93"/>
       <point x="359" y="-283"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10E_3.glif b/source/Hack-Regular.ufo/glyphs/uni10E_3.glif
index 87a5ef48b..b8f024f18 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10E_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10E_3.glif
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E3" format="1">
+<glyph name="uni10E3" format="2">
   <advance width="1233"/>
   <unicode hex="10E3"/>
   <outline>
     <contour>
-      <point x="658" y="-423" type="curve" name="dv01" smooth="yes"/>
+      <point x="658" y="-423" type="curve" smooth="yes" name="dv01"/>
       <point x="341" y="-423"/>
       <point x="180" y="-272"/>
-      <point x="180" y="-19" type="curve" name="dh01" smooth="yes"/>
+      <point x="180" y="-19" type="curve" smooth="yes" name="dh01"/>
       <point x="180" y="99"/>
       <point x="214" y="175"/>
       <point x="325" y="246" type="curve"/>
       <point x="504" y="246" type="line" name="ih01"/>
       <point x="400" y="150"/>
       <point x="366" y="81"/>
-      <point x="366" y="-17" type="curve" name="dh02" smooth="yes"/>
+      <point x="366" y="-17" type="curve" smooth="yes" name="dh02"/>
       <point x="366" y="-182"/>
       <point x="464" y="-283"/>
-      <point x="660" y="-283" type="curve" name="dv02" smooth="yes"/>
+      <point x="660" y="-283" type="curve" smooth="yes" name="dv02"/>
       <point x="833" y="-283"/>
       <point x="920" y="-203"/>
-      <point x="920" y="-43" type="curve" name="hr01" smooth="yes"/>
+      <point x="920" y="-43" type="curve" smooth="yes" name="hr01"/>
       <point x="920" y="703" type="line" smooth="yes"/>
       <point x="920" y="826"/>
       <point x="859" y="894"/>
-      <point x="798" y="894" type="curve" name="sv01" smooth="yes"/>
+      <point x="798" y="894" type="curve" smooth="yes" name="sv01"/>
       <point x="730" y="894"/>
       <point x="658" y="811"/>
       <point x="658" y="623" type="curve" name="hr02"/>
@@ -39,31 +39,31 @@
       <point x="303" y="826" type="curve" smooth="yes"/>
       <point x="287" y="796"/>
       <point x="266" y="759"/>
-      <point x="211" y="759" type="curve" name="dv03" smooth="yes"/>
+      <point x="211" y="759" type="curve" smooth="yes" name="dv03"/>
       <point x="162" y="759"/>
       <point x="110" y="791"/>
       <point x="55" y="854" type="curve"/>
       <point x="105" y="1035" type="line" name="av01"/>
       <point x="150" y="964"/>
       <point x="179" y="937"/>
-      <point x="216" y="937" type="curve" name="dv04" smooth="yes"/>
+      <point x="216" y="937" type="curve" smooth="yes" name="dv04"/>
       <point x="253" y="937"/>
       <point x="272" y="963"/>
       <point x="291" y="987" type="curve" smooth="yes"/>
       <point x="315" y="1019"/>
       <point x="341" y="1036"/>
-      <point x="388" y="1036" type="curve" name="av02" smooth="yes"/>
+      <point x="388" y="1036" type="curve" smooth="yes" name="av02"/>
       <point x="462" y="1036"/>
       <point x="515" y="992"/>
       <point x="569" y="852" type="curve"/>
       <point x="589" y="852" type="line"/>
       <point x="648" y="997"/>
       <point x="711" y="1035"/>
-      <point x="814" y="1035" type="curve" name="av03" smooth="yes"/>
+      <point x="814" y="1035" type="curve" smooth="yes" name="av03"/>
       <point x="987" y="1035"/>
       <point x="1098" y="925"/>
       <point x="1098" y="703" type="curve" smooth="yes"/>
-      <point x="1098" y="-43" type="line" name="dh04" smooth="yes"/>
+      <point x="1098" y="-43" type="line" smooth="yes" name="dh04"/>
       <point x="1098" y="-296"/>
       <point x="951" y="-423"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10E_4.glif b/source/Hack-Regular.ufo/glyphs/uni10E_4.glif
index 2b938f025..5bd2dad78 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10E_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10E_4.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E4" format="1">
+<glyph name="uni10E4" format="2">
   <advance width="1233"/>
   <unicode hex="10E4"/>
   <outline>
     <contour>
-      <point x="655" y="-425" type="line" name="ab01" smooth="yes"/>
+      <point x="655" y="-425" type="line" smooth="yes" name="ab01"/>
       <point x="368" y="-425"/>
       <point x="225" y="-295"/>
       <point x="225" y="-36" type="curve" name="sh01"/>
       <point x="408" y="-36" type="line" name="sh02"/>
       <point x="408" y="-201"/>
       <point x="491" y="-283"/>
-      <point x="657" y="-283" type="curve" name="sv01" smooth="yes"/>
+      <point x="657" y="-283" type="curve" smooth="yes" name="sv01"/>
       <point x="704" y="-283" type="line" smooth="yes"/>
       <point x="889" y="-283"/>
       <point x="982" y="-209"/>
-      <point x="982" y="-61" type="curve" name="sh04" smooth="yes"/>
+      <point x="982" y="-61" type="curve" smooth="yes" name="sh04"/>
       <point x="982" y="40" type="line" smooth="yes"/>
       <point x="982" y="151"/>
       <point x="963" y="207"/>
@@ -25,62 +25,62 @@
       <point x="925" y="359" type="line" name="sv03"/>
       <point x="961" y="360"/>
       <point x="979" y="409"/>
-      <point x="979" y="508" type="curve" name="sh03" smooth="yes"/>
+      <point x="979" y="508" type="curve" smooth="yes" name="sh03"/>
       <point x="979" y="690" type="line" smooth="yes"/>
       <point x="979" y="826"/>
       <point x="946" y="894"/>
-      <point x="879" y="894" type="curve" name="dv01" smooth="yes"/>
+      <point x="879" y="894" type="curve" smooth="yes" name="dv01"/>
       <point x="796" y="894" type="line" smooth="yes"/>
       <point x="757" y="894"/>
       <point x="737" y="853"/>
       <point x="737" y="771" type="curve" smooth="yes"/>
-      <point x="737" y="569" type="line" name="dh04" smooth="yes"/>
+      <point x="737" y="569" type="line" smooth="yes" name="dh04"/>
       <point x="737" y="241"/>
       <point x="557" y="88"/>
-      <point x="380" y="88" type="curve" name="dv03" smooth="yes"/>
+      <point x="380" y="88" type="curve" smooth="yes" name="dv03"/>
       <point x="211" y="88"/>
       <point x="45" y="230"/>
-      <point x="45" y="497" type="curve" name="dh01" smooth="yes"/>
+      <point x="45" y="497" type="curve" smooth="yes" name="dh01"/>
       <point x="45" y="625" type="line" smooth="yes"/>
       <point x="45" y="898"/>
       <point x="176" y="1035"/>
-      <point x="409" y="1035" type="curve" name="sv04" smooth="yes"/>
+      <point x="409" y="1035" type="curve" smooth="yes" name="sv04"/>
       <point x="509" y="1035"/>
       <point x="573" y="1011"/>
       <point x="625" y="936" type="curve"/>
       <point x="642" y="936" type="line"/>
       <point x="706" y="1002"/>
       <point x="785" y="1035"/>
-      <point x="878" y="1035" type="curve" name="dv02" smooth="yes"/>
+      <point x="878" y="1035" type="curve" smooth="yes" name="dv02"/>
       <point x="1071" y="1035"/>
       <point x="1168" y="895"/>
-      <point x="1168" y="643" type="curve" name="sh05" smooth="yes"/>
+      <point x="1168" y="643" type="curve" smooth="yes" name="sh05"/>
       <point x="1168" y="460"/>
       <point x="1117" y="356"/>
       <point x="1010" y="297" type="curve" name="hr01"/>
       <point x="1010" y="277" type="line"/>
       <point x="1117" y="216"/>
       <point x="1171" y="138"/>
-      <point x="1171" y="44" type="curve" name="dh06" smooth="yes"/>
-      <point x="1171" y="-61" type="line" name="hr02" smooth="yes"/>
+      <point x="1171" y="44" type="curve" smooth="yes" name="dh06"/>
+      <point x="1171" y="-61" type="line" smooth="yes" name="hr02"/>
       <point x="1171" y="-304"/>
       <point x="1018" y="-425"/>
       <point x="711" y="-425" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="409" y="215" type="curve" name="dv04" smooth="yes"/>
+      <point x="409" y="215" type="curve" smooth="yes" name="dv04"/>
       <point x="515" y="215"/>
       <point x="568" y="302"/>
-      <point x="568" y="476" type="curve" name="dh03" smooth="yes"/>
+      <point x="568" y="476" type="curve" smooth="yes" name="dh03"/>
       <point x="568" y="727" type="line" smooth="yes"/>
       <point x="568" y="838"/>
       <point x="537" y="894"/>
-      <point x="474" y="894" type="curve" name="sv05" smooth="yes"/>
+      <point x="474" y="894" type="curve" smooth="yes" name="sv05"/>
       <point x="397" y="894" type="line" smooth="yes"/>
       <point x="289" y="894"/>
       <point x="235" y="807"/>
-      <point x="235" y="632" type="curve" name="hr03" smooth="yes"/>
-      <point x="235" y="512" type="line" name="dh02" smooth="yes"/>
+      <point x="235" y="632" type="curve" smooth="yes" name="hr03"/>
+      <point x="235" y="512" type="line" smooth="yes" name="dh02"/>
       <point x="235" y="313"/>
       <point x="294" y="215"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10E_5.glif b/source/Hack-Regular.ufo/glyphs/uni10E_5.glif
index b977d5478..3cf2f3c99 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10E_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10E_5.glif
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E5" format="1">
+<glyph name="uni10E5" format="2">
   <advance width="1233"/>
   <unicode hex="10E5"/>
   <outline>
     <contour>
-      <point x="598" y="-425" type="curve" name="ab01" smooth="yes"/>
+      <point x="598" y="-425" type="curve" smooth="yes" name="ab01"/>
       <point x="291" y="-425"/>
       <point x="130" y="-264"/>
-      <point x="130" y="-20" type="curve" name="dh01" smooth="yes"/>
+      <point x="130" y="-20" type="curve" smooth="yes" name="dh01"/>
       <point x="130" y="89"/>
       <point x="162" y="151"/>
       <point x="264" y="232" type="curve"/>
       <point x="440" y="231" type="line" name="ih01"/>
       <point x="346" y="137"/>
       <point x="315" y="74"/>
-      <point x="315" y="-17" type="curve" name="dh02" smooth="yes"/>
+      <point x="315" y="-17" type="curve" smooth="yes" name="dh02"/>
       <point x="315" y="-177"/>
       <point x="414" y="-283"/>
-      <point x="598" y="-283" type="curve" name="sv01" smooth="yes"/>
+      <point x="598" y="-283" type="curve" smooth="yes" name="sv01"/>
       <point x="789" y="-283"/>
       <point x="868" y="-169"/>
       <point x="869" y="67" type="curve" smooth="yes"/>
-      <point x="870" y="363" type="line" name="dh03" smooth="yes"/>
+      <point x="870" y="363" type="line" smooth="yes" name="dh03"/>
       <point x="871" y="728"/>
       <point x="777" y="903"/>
-      <point x="564" y="903" type="curve" name="dv01" smooth="yes"/>
+      <point x="564" y="903" type="curve" smooth="yes" name="dv01"/>
       <point x="447" y="903"/>
       <point x="384" y="851"/>
-      <point x="384" y="720" type="curve" name="sh01" smooth="yes"/>
+      <point x="384" y="720" type="curve" smooth="yes" name="sh01"/>
       <point x="384" y="634"/>
       <point x="412" y="524"/>
       <point x="466" y="470" type="curve" name="ih03"/>
       <point x="287" y="470" type="line"/>
       <point x="238" y="546"/>
       <point x="217" y="643"/>
-      <point x="217" y="734" type="curve" name="ih02" smooth="yes"/>
+      <point x="217" y="734" type="curve" smooth="yes" name="ih02"/>
       <point x="217" y="959"/>
       <point x="348" y="1046"/>
-      <point x="496" y="1046" type="curve" name="dv02" smooth="yes"/>
+      <point x="496" y="1046" type="curve" smooth="yes" name="dv02"/>
       <point x="634" y="1046"/>
       <point x="777" y="971"/>
       <point x="852" y="856" type="curve"/>
       <point x="869" y="856" type="line" name="hr01"/>
       <point x="870" y="1521" type="line" name="av01"/>
       <point x="1043" y="1521" type="line"/>
-      <point x="1043" y="67" type="line" name="dh04" smooth="yes"/>
+      <point x="1043" y="67" type="line" smooth="yes" name="dh04"/>
       <point x="1043" y="-270"/>
       <point x="899" y="-425"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10E_6.glif b/source/Hack-Regular.ufo/glyphs/uni10E_6.glif
index d84a92631..3180623c6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10E_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10E_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E6" format="1">
+<glyph name="uni10E6" format="2">
   <advance width="1233"/>
   <unicode hex="10E6"/>
   <outline>
@@ -18,33 +18,33 @@
       <point x="359" y="-94" type="line"/>
       <point x="156" y="80"/>
       <point x="55" y="265"/>
-      <point x="55" y="462" type="curve" name="dh01" smooth="yes"/>
+      <point x="55" y="462" type="curve" smooth="yes" name="dh01"/>
       <point x="55" y="542" type="line" smooth="yes"/>
       <point x="55" y="873"/>
       <point x="176" y="1036"/>
-      <point x="396" y="1036" type="curve" name="sv01" smooth="yes"/>
+      <point x="396" y="1036" type="curve" smooth="yes" name="sv01"/>
       <point x="497" y="1036"/>
       <point x="560" y="1001"/>
       <point x="611" y="932" type="curve"/>
       <point x="627" y="932" type="line"/>
       <point x="674" y="1001"/>
       <point x="749" y="1036"/>
-      <point x="851" y="1036" type="curve" name="dv02" smooth="yes"/>
+      <point x="851" y="1036" type="curve" smooth="yes" name="dv02"/>
       <point x="1064" y="1036"/>
       <point x="1178" y="885"/>
       <point x="1178" y="586" type="curve" smooth="yes"/>
-      <point x="1178" y="516" type="line" name="dh06" smooth="yes"/>
+      <point x="1178" y="516" type="line" smooth="yes" name="dh06"/>
       <point x="1178" y="353"/>
       <point x="1122" y="212"/>
       <point x="1009" y="95" type="curve"/>
       <point x="869" y="94" type="line" name="ih01"/>
       <point x="949" y="205"/>
       <point x="989" y="318"/>
-      <point x="989" y="435" type="curve" name="dh05" smooth="yes"/>
+      <point x="989" y="435" type="curve" smooth="yes" name="dh05"/>
       <point x="989" y="654" type="line" smooth="yes"/>
       <point x="989" y="814"/>
       <point x="944" y="894"/>
-      <point x="855" y="894" type="curve" name="dv01" smooth="yes"/>
+      <point x="855" y="894" type="curve" smooth="yes" name="dv01"/>
       <point x="755" y="894" type="line" smooth="yes"/>
       <point x="716" y="894"/>
       <point x="697" y="836"/>
@@ -54,12 +54,12 @@
       <point x="537" y="719" type="line" smooth="yes"/>
       <point x="537" y="836"/>
       <point x="515" y="894"/>
-      <point x="472" y="894" type="curve" name="sv02" smooth="yes"/>
+      <point x="472" y="894" type="curve" smooth="yes" name="sv02"/>
       <point x="396" y="894" type="line" smooth="yes"/>
       <point x="295" y="894"/>
       <point x="245" y="807"/>
       <point x="245" y="632" type="curve" smooth="yes"/>
-      <point x="245" y="494" type="line" name="dh02" smooth="yes"/>
+      <point x="245" y="494" type="line" smooth="yes" name="dh02"/>
       <point x="245" y="162"/>
       <point x="433" y="36"/>
       <point x="576" y="-43" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10E_7.glif b/source/Hack-Regular.ufo/glyphs/uni10E_7.glif
index 930e02cb2..3d2282361 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10E_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10E_7.glif
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E7" format="1">
+<glyph name="uni10E7" format="2">
   <advance width="1233"/>
   <unicode hex="10E7"/>
   <outline>
     <contour>
-      <point x="628" y="-423" type="curve" name="dv01" smooth="yes"/>
+      <point x="628" y="-423" type="curve" smooth="yes" name="dv01"/>
       <point x="316" y="-423"/>
       <point x="158" y="-291"/>
       <point x="158" y="-23" type="curve" name="sh02"/>
       <point x="346" y="-23" type="line" name="sh04"/>
       <point x="346" y="-198"/>
       <point x="442" y="-284"/>
-      <point x="629" y="-284" type="curve" name="dv02" smooth="yes"/>
+      <point x="629" y="-284" type="curve" smooth="yes" name="dv02"/>
       <point x="806" y="-284"/>
       <point x="895" y="-204"/>
-      <point x="895" y="-43" type="curve" name="ah01" smooth="yes"/>
+      <point x="895" y="-43" type="curve" smooth="yes" name="ah01"/>
       <point x="895" y="201" type="line"/>
       <point x="875" y="201" type="line"/>
       <point x="814" y="134"/>
       <point x="733" y="103"/>
-      <point x="606" y="103" type="curve" name="dv03" smooth="yes"/>
+      <point x="606" y="103" type="curve" smooth="yes" name="dv03"/>
       <point x="309" y="103"/>
       <point x="158" y="281"/>
-      <point x="158" y="562" type="curve" name="sh01" smooth="yes"/>
+      <point x="158" y="562" type="curve" smooth="yes" name="sh01"/>
       <point x="158" y="766"/>
       <point x="238" y="893"/>
       <point x="437" y="1015" type="curve" name="av01"/>
       <point x="653" y="1015" type="line" name="ih01"/>
       <point x="427" y="858"/>
       <point x="345" y="742"/>
-      <point x="345" y="558" type="curve" name="sh03" smooth="yes"/>
+      <point x="345" y="558" type="curve" smooth="yes" name="sh03"/>
       <point x="345" y="367"/>
       <point x="434" y="251"/>
-      <point x="631" y="251" type="curve" name="dv04" smooth="yes"/>
+      <point x="631" y="251" type="curve" smooth="yes" name="dv04"/>
       <point x="792" y="251"/>
       <point x="895" y="329"/>
-      <point x="895" y="486" type="curve" name="sh06" smooth="yes"/>
+      <point x="895" y="486" type="curve" smooth="yes" name="sh06"/>
       <point x="895" y="1007" type="line" name="av02"/>
       <point x="1074" y="1007" type="line" name="hr01"/>
-      <point x="1074" y="-47" type="line" name="sh05" smooth="yes"/>
+      <point x="1074" y="-47" type="line" smooth="yes" name="sh05"/>
       <point x="1074" y="-300"/>
       <point x="927" y="-423"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10E_8.glif b/source/Hack-Regular.ufo/glyphs/uni10E_8.glif
index 0460c1e0e..441a39f20 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10E_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10E_8.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E8" format="1">
+<glyph name="uni10E8" format="2">
   <advance width="1233"/>
   <unicode hex="10E8"/>
   <outline>
     <contour>
-      <point x="662" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="662" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="315" y="0"/>
       <point x="158" y="267"/>
-      <point x="158" y="530" type="curve" name="ih01" smooth="yes"/>
+      <point x="158" y="530" type="curve" smooth="yes" name="ih01"/>
       <point x="158" y="791"/>
       <point x="313" y="1046"/>
-      <point x="613" y="1046" type="curve" name="dv02" smooth="yes"/>
+      <point x="613" y="1046" type="curve" smooth="yes" name="dv02"/>
       <point x="737" y="1046"/>
       <point x="828" y="1004"/>
       <point x="875" y="916" type="curve" name="sv01"/>
@@ -18,7 +18,7 @@
       <point x="895" y="1205" type="line" smooth="yes"/>
       <point x="895" y="1347"/>
       <point x="848" y="1418"/>
-      <point x="753" y="1418" type="curve" name="sv02" smooth="yes"/>
+      <point x="753" y="1418" type="curve" smooth="yes" name="sv02"/>
       <point x="659" y="1418"/>
       <point x="612" y="1348"/>
       <point x="612" y="1208" type="curve" smooth="yes"/>
@@ -27,39 +27,39 @@
       <point x="455" y="1210" type="line" smooth="yes"/>
       <point x="455" y="1349"/>
       <point x="394" y="1418"/>
-      <point x="312" y="1418" type="curve" name="sv03" smooth="yes"/>
+      <point x="312" y="1418" type="curve" smooth="yes" name="sv03"/>
       <point x="237" y="1418"/>
       <point x="210" y="1362"/>
       <point x="210" y="1192" type="curve" name="hr01"/>
       <point x="55" y="1192" type="line" name="dh01"/>
       <point x="55" y="1441"/>
       <point x="128" y="1556"/>
-      <point x="281" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="281" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="394" y="1556"/>
       <point x="481" y="1495"/>
       <point x="524" y="1363" type="curve"/>
       <point x="544" y="1363" type="line" name="hr02"/>
       <point x="587" y="1496"/>
       <point x="653" y="1556"/>
-      <point x="788" y="1556" type="curve" name="at02" smooth="yes"/>
+      <point x="788" y="1556" type="curve" smooth="yes" name="at02"/>
       <point x="977" y="1556"/>
       <point x="1074" y="1443"/>
       <point x="1074" y="1236" type="curve"/>
-      <point x="1076" y="477" type="line" name="hr03" smooth="yes"/>
+      <point x="1076" y="477" type="line" smooth="yes" name="hr03"/>
       <point x="1077" y="166"/>
       <point x="935" y="0"/>
     </contour>
     <contour>
-      <point x="637" y="145" type="curve" name="sv04" smooth="yes"/>
+      <point x="637" y="145" type="curve" smooth="yes" name="sv04"/>
       <point x="812" y="145"/>
       <point x="890" y="260"/>
-      <point x="890" y="505" type="curve" name="dh04" smooth="yes"/>
+      <point x="890" y="505" type="curve" smooth="yes" name="dh04"/>
       <point x="890" y="776"/>
       <point x="797" y="904"/>
-      <point x="613" y="904" type="curve" name="dv01" smooth="yes"/>
+      <point x="613" y="904" type="curve" smooth="yes" name="dv01"/>
       <point x="432" y="904"/>
       <point x="346" y="778"/>
-      <point x="346" y="538" type="curve" name="sh02" smooth="yes"/>
+      <point x="346" y="538" type="curve" smooth="yes" name="sh02"/>
       <point x="346" y="271"/>
       <point x="453" y="145"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10E_9.glif b/source/Hack-Regular.ufo/glyphs/uni10E_9.glif
index 0b56c094d..336b0749e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10E_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10E_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10E9" format="1">
+<glyph name="uni10E9" format="2">
   <advance width="1233"/>
   <unicode hex="10E9"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="160" y="1214" type="line" name="hr00"/>
       <point x="160" y="1443"/>
       <point x="279" y="1556"/>
-      <point x="535" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="535" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="776" y="1556"/>
       <point x="922" y="1452"/>
       <point x="941" y="1243" type="curve"/>
@@ -16,23 +16,23 @@
       <point x="845" y="986" type="curve"/>
       <point x="1005" y="917"/>
       <point x="1076" y="737"/>
-      <point x="1076" y="529" type="curve" name="sh01" smooth="yes"/>
+      <point x="1076" y="529" type="curve" smooth="yes" name="sh01"/>
       <point x="1076" y="293"/>
       <point x="984" y="128"/>
       <point x="796" y="0" type="curve" name="ab01"/>
       <point x="618" y="0" type="line" name="ih01"/>
       <point x="799" y="133"/>
       <point x="888" y="355"/>
-      <point x="888" y="543" type="curve" name="ah01" smooth="yes"/>
+      <point x="888" y="543" type="curve" smooth="yes" name="ah01"/>
       <point x="888" y="730"/>
       <point x="800" y="883"/>
       <point x="627" y="883" type="curve" name="sv01"/>
       <point x="616" y="884"/>
       <point x="605" y="884"/>
-      <point x="594" y="884" type="curve" name="dv01" smooth="yes"/>
+      <point x="594" y="884" type="curve" smooth="yes" name="dv01"/>
       <point x="422" y="884"/>
       <point x="336" y="785"/>
-      <point x="336" y="587" type="curve" name="sh03" smooth="yes"/>
+      <point x="336" y="587" type="curve" smooth="yes" name="sh03"/>
       <point x="336" y="0" type="line" name="ab02"/>
       <point x="158" y="0" type="line"/>
     </contour>
@@ -40,7 +40,7 @@
       <point x="366" y="917" type="line"/>
       <point x="400" y="986"/>
       <point x="484" y="1021"/>
-      <point x="619" y="1021" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1021" type="curve" smooth="yes" name="dv02"/>
       <point x="650" y="1021"/>
       <point x="685" y="1019"/>
       <point x="722" y="1015" type="curve" name="sv02"/>
@@ -49,10 +49,10 @@
       <point x="778" y="1224" type="curve"/>
       <point x="759" y="1348"/>
       <point x="676" y="1415"/>
-      <point x="537" y="1415" type="curve" name="sv03" smooth="yes"/>
+      <point x="537" y="1415" type="curve" smooth="yes" name="sv03"/>
       <point x="400" y="1415"/>
       <point x="336" y="1349"/>
-      <point x="336" y="1201" type="curve" name="sh02" smooth="yes"/>
+      <point x="336" y="1201" type="curve" smooth="yes" name="sh02"/>
       <point x="336" y="917" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10E_A_.glif b/source/Hack-Regular.ufo/glyphs/uni10E_A_.glif
index 9da2ada2b..a1aa0e1cc 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10E_A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10E_A_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10EA" format="1">
+<glyph name="uni10EA" format="2">
   <advance width="1233"/>
   <unicode hex="10EA"/>
   <outline>
     <contour>
-      <point x="636" y="-423" type="curve" name="dv01" smooth="yes"/>
+      <point x="636" y="-423" type="curve" smooth="yes" name="dv01"/>
       <point x="265" y="-423"/>
       <point x="86" y="-196"/>
-      <point x="86" y="284" type="curve" name="hr01" smooth="yes"/>
+      <point x="86" y="284" type="curve" smooth="yes" name="hr01"/>
       <point x="86" y="381" type="line" smooth="yes"/>
       <point x="86" y="597"/>
       <point x="156" y="824"/>
@@ -16,25 +16,25 @@
       <point x="331" y="817"/>
       <point x="275" y="634"/>
       <point x="275" y="442" type="curve" smooth="yes"/>
-      <point x="275" y="284" type="line" name="dh01" smooth="yes"/>
+      <point x="275" y="284" type="line" smooth="yes" name="dh01"/>
       <point x="275" y="-101"/>
       <point x="392" y="-283"/>
-      <point x="636" y="-283" type="curve" name="dv02" smooth="yes"/>
+      <point x="636" y="-283" type="curve" smooth="yes" name="dv02"/>
       <point x="840" y="-283"/>
       <point x="967" y="-155"/>
-      <point x="967" y="88" type="curve" name="sh01" smooth="yes"/>
+      <point x="967" y="88" type="curve" smooth="yes" name="sh01"/>
       <point x="967" y="248"/>
       <point x="914" y="321"/>
-      <point x="785" y="321" type="curve" name="hr03" smooth="yes"/>
+      <point x="785" y="321" type="curve" smooth="yes" name="hr03"/>
       <point x="601" y="321" type="line"/>
       <point x="601" y="457" type="line"/>
-      <point x="777" y="457" type="line" name="dv03" smooth="yes"/>
+      <point x="777" y="457" type="line" smooth="yes" name="dv03"/>
       <point x="888" y="457"/>
       <point x="940" y="524"/>
-      <point x="940" y="631" type="curve" name="sh02" smooth="yes"/>
+      <point x="940" y="631" type="curve" smooth="yes" name="sh02"/>
       <point x="940" y="735"/>
       <point x="888" y="768"/>
-      <point x="780" y="808" type="curve" name="hr04" smooth="yes"/>
+      <point x="780" y="808" type="curve" smooth="yes" name="hr04"/>
       <point x="723" y="829"/>
       <point x="639" y="862"/>
       <point x="636" y="1026" type="curve" name="hr05"/>
@@ -44,14 +44,14 @@
       <point x="949" y="855" type="curve" smooth="yes"/>
       <point x="1008" y="831"/>
       <point x="1116" y="790"/>
-      <point x="1116" y="646" type="curve" name="dh02" smooth="yes"/>
+      <point x="1116" y="646" type="curve" smooth="yes" name="dh02"/>
       <point x="1116" y="538"/>
       <point x="1056" y="461"/>
       <point x="945" y="404" type="curve" name="sh03"/>
       <point x="945" y="384" type="line"/>
       <point x="1093" y="290"/>
       <point x="1146" y="202"/>
-      <point x="1146" y="45" type="curve" name="sh04" smooth="yes"/>
+      <point x="1146" y="45" type="curve" smooth="yes" name="sh04"/>
       <point x="1146" y="-239"/>
       <point x="970" y="-423"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10E_B_.glif b/source/Hack-Regular.ufo/glyphs/uni10E_B_.glif
index 99bac6ccb..5dd03e511 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10E_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10E_B_.glif
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10EB" format="1">
+<glyph name="uni10EB" format="2">
   <advance width="1233"/>
   <unicode hex="10EB"/>
   <outline>
     <contour>
-      <point x="593" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="593" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="286" y="0"/>
       <point x="138" y="168"/>
-      <point x="138" y="515" type="curve" name="sh01" smooth="yes"/>
+      <point x="138" y="515" type="curve" smooth="yes" name="sh01"/>
       <point x="138" y="867"/>
       <point x="287" y="1046"/>
-      <point x="594" y="1046" type="curve" name="dv02" smooth="yes"/>
+      <point x="594" y="1046" type="curve" smooth="yes" name="dv02"/>
       <point x="735" y="1046"/>
       <point x="824" y="1008"/>
       <point x="857" y="931" type="curve"/>
       <point x="877" y="931" type="line" name="ah01"/>
       <point x="877" y="1521" type="line" name="av01"/>
       <point x="1055" y="1521" type="line"/>
-      <point x="1055" y="517" type="line" name="sh02" smooth="yes"/>
+      <point x="1055" y="517" type="line" smooth="yes" name="sh02"/>
       <point x="1055" y="170"/>
       <point x="905" y="0"/>
     </contour>
     <contour>
-      <point x="592" y="145" type="curve" name="sv01" smooth="yes"/>
+      <point x="592" y="145" type="curve" smooth="yes" name="sv01"/>
       <point x="777" y="145"/>
       <point x="869" y="270"/>
-      <point x="869" y="521" type="curve" name="sh03" smooth="yes"/>
+      <point x="869" y="521" type="curve" smooth="yes" name="sh03"/>
       <point x="869" y="777"/>
       <point x="774" y="903"/>
-      <point x="595" y="903" type="curve" name="dv01" smooth="yes"/>
+      <point x="595" y="903" type="curve" smooth="yes" name="dv01"/>
       <point x="412" y="903"/>
       <point x="325" y="772"/>
-      <point x="325" y="516" type="curve" name="sh04" smooth="yes"/>
+      <point x="325" y="516" type="curve" smooth="yes" name="sh04"/>
       <point x="325" y="264"/>
       <point x="409" y="145"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10E_C_.glif b/source/Hack-Regular.ufo/glyphs/uni10E_C_.glif
index c881d2487..d863468ab 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10E_C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10E_C_.glif
@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10EC" format="1">
+<glyph name="uni10EC" format="2">
   <advance width="1233"/>
   <unicode hex="10EC"/>
   <outline>
     <contour>
-      <point x="589" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="589" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="316" y="0"/>
       <point x="161" y="176"/>
-      <point x="161" y="527" type="curve" name="dh01" smooth="yes"/>
+      <point x="161" y="527" type="curve" smooth="yes" name="dh01"/>
       <point x="161" y="1236" type="line" smooth="yes"/>
       <point x="161" y="1451"/>
       <point x="265" y="1556"/>
-      <point x="449" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="449" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="580" y="1556"/>
       <point x="649" y="1500"/>
       <point x="693" y="1363" type="curve"/>
       <point x="713" y="1363" type="line"/>
       <point x="753" y="1490"/>
       <point x="839" y="1556"/>
-      <point x="955" y="1556" type="curve" name="at02" smooth="yes"/>
+      <point x="955" y="1556" type="curve" smooth="yes" name="at02"/>
       <point x="1108" y="1556"/>
       <point x="1180" y="1441"/>
       <point x="1180" y="1192" type="curve" name="sh01"/>
       <point x="1027" y="1192" type="line" name="ih01"/>
       <point x="1027" y="1362"/>
       <point x="1000" y="1418"/>
-      <point x="925" y="1418" type="curve" name="sv01" smooth="yes"/>
+      <point x="925" y="1418" type="curve" smooth="yes" name="sv01"/>
       <point x="842" y="1418"/>
       <point x="782" y="1349"/>
       <point x="782" y="1210" type="curve" smooth="yes"/>
       <point x="782" y="1175" type="line" name="dh04"/>
       <point x="625" y="1175" type="line" name="dh03"/>
-      <point x="625" y="1208" type="line" name="hr01" smooth="yes"/>
+      <point x="625" y="1208" type="line" smooth="yes" name="hr01"/>
       <point x="625" y="1348"/>
       <point x="578" y="1418"/>
-      <point x="484" y="1418" type="curve" name="sv02" smooth="yes"/>
+      <point x="484" y="1418" type="curve" smooth="yes" name="sv02"/>
       <point x="389" y="1418"/>
       <point x="342" y="1347"/>
-      <point x="342" y="1205" type="curve" name="sh02" smooth="yes"/>
+      <point x="342" y="1205" type="curve" smooth="yes" name="sh02"/>
       <point x="342" y="916" type="line" name="hr02"/>
       <point x="362" y="916" type="line"/>
       <point x="409" y="1004"/>
       <point x="504" y="1046"/>
-      <point x="625" y="1046" type="curve" name="dv02" smooth="yes"/>
+      <point x="625" y="1046" type="curve" smooth="yes" name="dv02"/>
       <point x="923" y="1046"/>
       <point x="1074" y="790"/>
-      <point x="1074" y="527" type="curve" name="dh06" smooth="yes"/>
+      <point x="1074" y="527" type="curve" smooth="yes" name="dh06"/>
       <point x="1074" y="265"/>
       <point x="925" y="0"/>
     </contour>
     <contour>
-      <point x="889" y="522" type="curve" name="dh05" smooth="yes"/>
+      <point x="889" y="522" type="curve" smooth="yes" name="dh05"/>
       <point x="889" y="781"/>
       <point x="750" y="905"/>
-      <point x="610" y="905" type="curve" name="dv01" smooth="yes"/>
+      <point x="610" y="905" type="curve" smooth="yes" name="dv01"/>
       <point x="482" y="905"/>
       <point x="347" y="799"/>
-      <point x="347" y="549" type="curve" name="dh02" smooth="yes"/>
+      <point x="347" y="549" type="curve" smooth="yes" name="dh02"/>
       <point x="347" y="297"/>
       <point x="483" y="146"/>
-      <point x="627" y="146" type="curve" name="sv03" smooth="yes"/>
+      <point x="627" y="146" type="curve" smooth="yes" name="sv03"/>
       <point x="758" y="146"/>
       <point x="889" y="271"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10E_D_.glif b/source/Hack-Regular.ufo/glyphs/uni10E_D_.glif
index ec485e352..abb17f56f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10E_D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10E_D_.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10ED" format="1">
+<glyph name="uni10ED" format="2">
   <advance width="1233"/>
   <unicode hex="10ED"/>
   <outline>
     <contour>
-      <point x="618" y="-423" type="curve" name="dv01" smooth="yes"/>
+      <point x="618" y="-423" type="curve" smooth="yes" name="dv01"/>
       <point x="311" y="-423"/>
       <point x="160" y="-282"/>
-      <point x="160" y="-38" type="curve" name="dh01" smooth="yes"/>
+      <point x="160" y="-38" type="curve" smooth="yes" name="dh01"/>
       <point x="160" y="56"/>
       <point x="182" y="111"/>
       <point x="241" y="181" type="curve"/>
       <point x="384" y="76" type="line"/>
       <point x="359" y="52"/>
       <point x="346" y="15"/>
-      <point x="346" y="-34" type="curve" name="dh02" smooth="yes"/>
+      <point x="346" y="-34" type="curve" smooth="yes" name="dh02"/>
       <point x="346" y="-198"/>
       <point x="479" y="-283"/>
-      <point x="615" y="-283" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="-283" type="curve" smooth="yes" name="dv02"/>
       <point x="751" y="-283"/>
       <point x="888" y="-197"/>
-      <point x="888" y="-24" type="curve" name="dh03" smooth="yes"/>
+      <point x="888" y="-24" type="curve" smooth="yes" name="dh03"/>
       <point x="888" y="88"/>
       <point x="832" y="171"/>
       <point x="712" y="239" type="curve" name="hr01"/>
@@ -30,7 +30,7 @@
       <point x="507" y="433" type="line" name="dv06"/>
       <point x="301" y="433"/>
       <point x="198" y="542"/>
-      <point x="198" y="761" type="curve" name="ih01" smooth="yes"/>
+      <point x="198" y="761" type="curve" smooth="yes" name="ih01"/>
       <point x="198" y="983"/>
       <point x="305" y="1094"/>
       <point x="519" y="1094" type="curve" name="dv04"/>
@@ -53,24 +53,24 @@
       <point x="933" y="282" type="curve"/>
       <point x="1028" y="217"/>
       <point x="1076" y="118"/>
-      <point x="1076" y="-27" type="curve" name="dh04" smooth="yes"/>
+      <point x="1076" y="-27" type="curve" smooth="yes" name="dh04"/>
       <point x="1076" y="-286"/>
       <point x="925" y="-423"/>
     </contour>
     <contour>
-      <point x="540" y="562" type="curve" name="dv07" smooth="yes"/>
+      <point x="540" y="562" type="curve" smooth="yes" name="dv07"/>
       <point x="597" y="562"/>
       <point x="638" y="579"/>
       <point x="665" y="613" type="curve" smooth="yes"/>
       <point x="692" y="648"/>
       <point x="705" y="700"/>
-      <point x="705" y="756" type="curve" name="hr05" smooth="yes"/>
+      <point x="705" y="756" type="curve" smooth="yes" name="hr05"/>
       <point x="705" y="896"/>
       <point x="622" y="957"/>
-      <point x="538" y="957" type="curve" name="dv03" smooth="yes"/>
+      <point x="538" y="957" type="curve" smooth="yes" name="dv03"/>
       <point x="455" y="957"/>
       <point x="372" y="898"/>
-      <point x="372" y="752" type="curve" name="sh06" smooth="yes"/>
+      <point x="372" y="752" type="curve" smooth="yes" name="sh06"/>
       <point x="372" y="632"/>
       <point x="427" y="562"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10E_E_.glif b/source/Hack-Regular.ufo/glyphs/uni10E_E_.glif
index 8ac160d29..827560d7a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10E_E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10E_E_.glif
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10EE" format="1">
+<glyph name="uni10EE" format="2">
   <advance width="1233"/>
   <unicode hex="10EE"/>
   <outline>
     <contour>
-      <point x="638" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="638" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="332" y="0"/>
       <point x="179" y="175"/>
-      <point x="179" y="525" type="curve" name="sh01" smooth="yes"/>
+      <point x="179" y="525" type="curve" smooth="yes" name="sh01"/>
       <point x="179" y="1521" type="line" name="av01"/>
       <point x="350" y="1521" type="line"/>
       <point x="350" y="914" type="line" name="sh02"/>
       <point x="391" y="914" type="line"/>
       <point x="447" y="1011"/>
       <point x="526" y="1046"/>
-      <point x="654" y="1046" type="curve" name="dv02" smooth="yes"/>
+      <point x="654" y="1046" type="curve" smooth="yes" name="dv02"/>
       <point x="937" y="1046"/>
       <point x="1096" y="873"/>
-      <point x="1096" y="522" type="curve" name="sh03" smooth="yes"/>
+      <point x="1096" y="522" type="curve" smooth="yes" name="sh03"/>
       <point x="1096" y="175"/>
       <point x="945" y="0"/>
     </contour>
     <contour>
-      <point x="639" y="145" type="curve" name="sv01" smooth="yes"/>
+      <point x="639" y="145" type="curve" smooth="yes" name="sv01"/>
       <point x="819" y="145"/>
       <point x="909" y="271"/>
-      <point x="909" y="524" type="curve" name="ah01" smooth="yes"/>
+      <point x="909" y="524" type="curve" smooth="yes" name="ah01"/>
       <point x="909" y="777"/>
       <point x="819" y="904"/>
-      <point x="639" y="904" type="curve" name="dv01" smooth="yes"/>
+      <point x="639" y="904" type="curve" smooth="yes" name="dv01"/>
       <point x="456" y="904"/>
       <point x="365" y="777"/>
       <point x="365" y="524" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10E_F_.glif b/source/Hack-Regular.ufo/glyphs/uni10E_F_.glif
index 9672cfd92..6c9ff12c3 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10E_F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10E_F_.glif
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10EF" format="1">
+<glyph name="uni10EF" format="2">
   <advance width="1233"/>
   <unicode hex="10EF"/>
   <outline>
     <contour>
-      <point x="613" y="-423" type="curve" name="dv01" smooth="yes"/>
+      <point x="613" y="-423" type="curve" smooth="yes" name="dv01"/>
       <point x="309" y="-423"/>
       <point x="159" y="-258"/>
-      <point x="159" y="14" type="curve" name="dh01" smooth="yes"/>
+      <point x="159" y="14" type="curve" smooth="yes" name="dh01"/>
       <point x="159" y="130"/>
       <point x="186" y="196"/>
       <point x="266" y="305" type="curve"/>
       <point x="410" y="216" type="line"/>
       <point x="356" y="128"/>
       <point x="346" y="83"/>
-      <point x="346" y="27" type="curve" name="dh02" smooth="yes"/>
+      <point x="346" y="27" type="curve" smooth="yes" name="dh02"/>
       <point x="346" y="-168"/>
       <point x="482" y="-282"/>
-      <point x="617" y="-282" type="curve" name="hr01" smooth="yes"/>
+      <point x="617" y="-282" type="curve" smooth="yes" name="hr01"/>
       <point x="754" y="-282"/>
       <point x="888" y="-166"/>
-      <point x="888" y="30" type="curve" name="dh03" smooth="yes"/>
+      <point x="888" y="30" type="curve" smooth="yes" name="dh03"/>
       <point x="888" y="154"/>
       <point x="834" y="254"/>
       <point x="695" y="369" type="curve" name="hr02"/>
       <point x="581" y="484"/>
       <point x="524" y="586"/>
-      <point x="524" y="675" type="curve" name="sh02" smooth="yes"/>
+      <point x="524" y="675" type="curve" smooth="yes" name="sh02"/>
       <point x="524" y="835" type="line" name="hr03"/>
       <point x="197" y="955" type="line" name="ih01"/>
       <point x="197" y="1135" type="line" name="hr04"/>
@@ -37,13 +37,13 @@
       <point x="1006" y="843" type="line"/>
       <point x="1006" y="666" type="line" name="sh06"/>
       <point x="670" y="800" type="line" name="sh07"/>
-      <point x="670" y="675" type="line" name="sh04" smooth="yes"/>
+      <point x="670" y="675" type="line" smooth="yes" name="sh04"/>
       <point x="670" y="627"/>
       <point x="742" y="541"/>
       <point x="885" y="417" type="curve"/>
       <point x="1024" y="278"/>
       <point x="1076" y="172"/>
-      <point x="1076" y="16" type="curve" name="dh04" smooth="yes"/>
+      <point x="1076" y="16" type="curve" smooth="yes" name="dh04"/>
       <point x="1076" y="-254"/>
       <point x="921" y="-423"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10F_0.glif b/source/Hack-Regular.ufo/glyphs/uni10F_0.glif
index a11d0755e..5161f69ee 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10F_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10F_0.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F0" format="1">
+<glyph name="uni10F0" format="2">
   <advance width="1233"/>
   <unicode hex="10F0"/>
   <outline>
     <contour>
-      <point x="604" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="604" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="295" y="0"/>
       <point x="140" y="139"/>
-      <point x="140" y="416" type="curve" name="dh01" smooth="yes"/>
+      <point x="140" y="416" type="curve" smooth="yes" name="dh01"/>
       <point x="140" y="517" type="line" name="sv01"/>
       <point x="328" y="517" type="line"/>
       <point x="328" y="416" type="line" name="dh02"/>
       <point x="327" y="232"/>
       <point x="416" y="140"/>
-      <point x="595" y="140" type="curve" name="sv02" smooth="yes"/>
+      <point x="595" y="140" type="curve" smooth="yes" name="sv02"/>
       <point x="800" y="140"/>
       <point x="873" y="258"/>
       <point x="873" y="365" type="curve" smooth="yes"/>
       <point x="873" y="449"/>
       <point x="826" y="527"/>
-      <point x="762" y="527" type="curve" name="dv01" smooth="yes"/>
+      <point x="762" y="527" type="curve" smooth="yes" name="dv01"/>
       <point x="511" y="527" type="line"/>
       <point x="511" y="677" type="line"/>
-      <point x="762" y="677" type="line" name="dv02" smooth="yes"/>
+      <point x="762" y="677" type="line" smooth="yes" name="dv02"/>
       <point x="829" y="677"/>
       <point x="863" y="737"/>
-      <point x="863" y="796" type="curve" name="sh01" smooth="yes"/>
+      <point x="863" y="796" type="curve" smooth="yes" name="sh01"/>
       <point x="863" y="856"/>
       <point x="829" y="914"/>
-      <point x="762" y="914" type="curve" name="dv03" smooth="yes"/>
+      <point x="762" y="914" type="curve" smooth="yes" name="dv03"/>
       <point x="511" y="914" type="line"/>
       <point x="511" y="1066" type="line"/>
-      <point x="760" y="1066" type="line" name="dv04" smooth="yes"/>
+      <point x="760" y="1066" type="line" smooth="yes" name="dv04"/>
       <point x="820" y="1066"/>
       <point x="852" y="1121"/>
-      <point x="852" y="1182" type="curve" name="dh05" smooth="yes"/>
+      <point x="852" y="1182" type="curve" smooth="yes" name="dh05"/>
       <point x="852" y="1260"/>
       <point x="802" y="1281"/>
       <point x="596" y="1316" type="curve"/>
@@ -54,14 +54,14 @@
       <point x="894" y="987" type="line"/>
       <point x="998" y="951"/>
       <point x="1048" y="886"/>
-      <point x="1048" y="798" type="curve" name="sh02" smooth="yes"/>
+      <point x="1048" y="798" type="curve" smooth="yes" name="sh02"/>
       <point x="1048" y="713"/>
       <point x="999" y="651"/>
       <point x="900" y="612" type="curve"/>
       <point x="900" y="592" type="line"/>
       <point x="1015" y="520"/>
       <point x="1058" y="455"/>
-      <point x="1058" y="342" type="curve" name="dh06" smooth="yes"/>
+      <point x="1058" y="342" type="curve" smooth="yes" name="dh06"/>
       <point x="1058" y="130"/>
       <point x="905" y="0"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10F_1.glif b/source/Hack-Regular.ufo/glyphs/uni10F_1.glif
index 8050e707c..4d0c157b0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10F_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10F_1.glif
@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F1" format="1">
+<glyph name="uni10F1" format="2">
   <advance width="1233"/>
   <unicode hex="10F1"/>
   <outline>
     <contour>
-      <point x="660" y="-423" type="curve" name="dv01" smooth="yes"/>
+      <point x="660" y="-423" type="curve" smooth="yes" name="dv01"/>
       <point x="279" y="-423"/>
       <point x="138" y="-254"/>
-      <point x="138" y="102" type="curve" name="dh01" smooth="yes"/>
+      <point x="138" y="102" type="curve" smooth="yes" name="dh01"/>
       <point x="138" y="229"/>
       <point x="156" y="432"/>
       <point x="193" y="617" type="curve" smooth="yes"/>
       <point x="204" y="670"/>
       <point x="211" y="710"/>
-      <point x="211" y="777" type="curve" name="ih01" smooth="yes"/>
+      <point x="211" y="777" type="curve" smooth="yes" name="ih01"/>
       <point x="211" y="898"/>
       <point x="188" y="1022"/>
       <point x="143" y="1163" type="curve" name="ih02"/>
       <point x="328" y="1163" type="line"/>
       <point x="367" y="1043"/>
       <point x="386" y="917"/>
-      <point x="386" y="786" type="curve" name="sh01" smooth="yes"/>
+      <point x="386" y="786" type="curve" smooth="yes" name="sh01"/>
       <point x="386" y="733"/>
       <point x="383" y="676"/>
       <point x="375" y="617" type="curve" name="sh02"/>
       <point x="338" y="463"/>
       <point x="325" y="206"/>
-      <point x="325" y="90" type="curve" name="dh02" smooth="yes"/>
+      <point x="325" y="90" type="curve" smooth="yes" name="dh02"/>
       <point x="325" y="-113"/>
       <point x="367" y="-284"/>
-      <point x="674" y="-284" type="curve" name="dv02" smooth="yes"/>
+      <point x="674" y="-284" type="curve" smooth="yes" name="dv02"/>
       <point x="843" y="-284"/>
       <point x="915" y="-232"/>
-      <point x="915" y="-105" type="curve" name="sh03" smooth="yes"/>
+      <point x="915" y="-105" type="curve" smooth="yes" name="sh03"/>
       <point x="915" y="-5"/>
       <point x="871" y="76"/>
-      <point x="781" y="76" type="curve" name="dv03" smooth="yes"/>
+      <point x="781" y="76" type="curve" smooth="yes" name="dv03"/>
       <point x="645" y="76" type="line" name="sh04"/>
       <point x="645" y="218" type="line"/>
-      <point x="781" y="218" type="line" name="dv04" smooth="yes"/>
+      <point x="781" y="218" type="line" smooth="yes" name="dv04"/>
       <point x="870" y="218"/>
       <point x="915" y="265"/>
-      <point x="915" y="360" type="curve" name="hr01" smooth="yes"/>
+      <point x="915" y="360" type="curve" smooth="yes" name="hr01"/>
       <point x="915" y="459"/>
       <point x="871" y="517"/>
-      <point x="783" y="517" type="curve" name="dv07" smooth="yes"/>
+      <point x="783" y="517" type="curve" smooth="yes" name="dv07"/>
       <point x="645" y="517" type="line" name="hr02"/>
       <point x="645" y="655" type="line"/>
-      <point x="783" y="655" type="line" name="dv08" smooth="yes"/>
+      <point x="783" y="655" type="line" smooth="yes" name="dv08"/>
       <point x="871" y="655"/>
       <point x="915" y="707"/>
-      <point x="915" y="806" type="curve" name="hr03" smooth="yes"/>
+      <point x="915" y="806" type="curve" smooth="yes" name="hr03"/>
       <point x="915" y="899"/>
       <point x="874" y="942"/>
-      <point x="781" y="942" type="curve" name="dv05" smooth="yes"/>
+      <point x="781" y="942" type="curve" smooth="yes" name="dv05"/>
       <point x="645" y="942" type="line" name="hr04"/>
       <point x="645" y="1087" type="line"/>
-      <point x="781" y="1087" type="line" name="dv06" smooth="yes"/>
+      <point x="781" y="1087" type="line" smooth="yes" name="dv06"/>
       <point x="868" y="1087"/>
       <point x="915" y="1136"/>
-      <point x="915" y="1192" type="curve" name="hr05" smooth="yes"/>
+      <point x="915" y="1192" type="curve" smooth="yes" name="hr05"/>
       <point x="915" y="1253"/>
       <point x="858" y="1320"/>
       <point x="729" y="1344" type="curve"/>
@@ -72,28 +72,28 @@
       <point x="938" y="1429" type="curve" smooth="yes"/>
       <point x="983" y="1413"/>
       <point x="1095" y="1376"/>
-      <point x="1095" y="1229" type="curve" name="hr07" smooth="yes"/>
+      <point x="1095" y="1229" type="curve" smooth="yes" name="hr07"/>
       <point x="1095" y="1122"/>
       <point x="1037" y="1053"/>
       <point x="916" y="1030" type="curve" name="sh05"/>
       <point x="916" y="1010" type="line"/>
       <point x="1037" y="982"/>
       <point x="1095" y="918"/>
-      <point x="1095" y="806" type="curve" name="sh06" smooth="yes"/>
+      <point x="1095" y="806" type="curve" smooth="yes" name="sh06"/>
       <point x="1095" y="697"/>
       <point x="1038" y="613"/>
       <point x="916" y="594" type="curve" name="hr08"/>
       <point x="916" y="574" type="line"/>
       <point x="1035" y="551"/>
       <point x="1095" y="468"/>
-      <point x="1095" y="360" type="curve" name="sh07" smooth="yes"/>
+      <point x="1095" y="360" type="curve" smooth="yes" name="sh07"/>
       <point x="1095" y="256"/>
       <point x="1040" y="194"/>
       <point x="916" y="159" type="curve" name="sh08"/>
       <point x="916" y="139" type="line"/>
       <point x="1033" y="102"/>
       <point x="1095" y="13"/>
-      <point x="1095" y="-122" type="curve" name="hr09" smooth="yes"/>
+      <point x="1095" y="-122" type="curve" smooth="yes" name="hr09"/>
       <point x="1095" y="-326"/>
       <point x="953" y="-423"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10F_2.glif b/source/Hack-Regular.ufo/glyphs/uni10F_2.glif
index 5f0899d57..6e7654802 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10F_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10F_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F2" format="1">
+<glyph name="uni10F2" format="2">
   <advance width="1233"/>
   <unicode hex="10F2"/>
   <outline>
@@ -10,13 +10,13 @@
       <point x="430" y="29" type="curve"/>
       <point x="250" y="142"/>
       <point x="160" y="306"/>
-      <point x="160" y="521" type="curve" name="sh01" smooth="yes"/>
+      <point x="160" y="521" type="curve" smooth="yes" name="sh01"/>
       <point x="160" y="866"/>
       <point x="391" y="1046"/>
-      <point x="620" y="1046" type="curve" name="dv02" smooth="yes"/>
+      <point x="620" y="1046" type="curve" smooth="yes" name="dv02"/>
       <point x="848" y="1046"/>
       <point x="1076" y="868"/>
-      <point x="1076" y="524" type="curve" name="sh02" smooth="yes"/>
+      <point x="1076" y="524" type="curve" smooth="yes" name="sh02"/>
       <point x="1076" y="304"/>
       <point x="986" y="145"/>
       <point x="795" y="29" type="curve"/>
@@ -35,13 +35,13 @@
       <point x="616" y="118" type="curve"/>
       <point x="807" y="179"/>
       <point x="889" y="307"/>
-      <point x="889" y="530" type="curve" name="ah01" smooth="yes"/>
+      <point x="889" y="530" type="curve" smooth="yes" name="ah01"/>
       <point x="889" y="770"/>
       <point x="798" y="902"/>
-      <point x="615" y="902" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="902" type="curve" smooth="yes" name="dv01"/>
       <point x="434" y="902"/>
       <point x="345" y="770"/>
-      <point x="345" y="533" type="curve" name="sh03" smooth="yes"/>
+      <point x="345" y="533" type="curve" smooth="yes" name="sh03"/>
       <point x="345" y="310"/>
       <point x="423" y="182"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10F_3.glif b/source/Hack-Regular.ufo/glyphs/uni10F_3.glif
index e41a2c621..b7fc5b53c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10F_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10F_3.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F3" format="1">
+<glyph name="uni10F3" format="2">
   <advance width="1233"/>
   <unicode hex="10F3"/>
   <outline>
     <contour>
-      <point x="618" y="-283" type="curve" name="sv01" smooth="yes"/>
+      <point x="618" y="-283" type="curve" smooth="yes" name="sv01"/>
       <point x="797" y="-283"/>
       <point x="886" y="-195"/>
-      <point x="886" y="-20" type="curve" name="dh03" smooth="yes"/>
+      <point x="886" y="-20" type="curve" smooth="yes" name="dh03"/>
       <point x="886" y="12" type="line" smooth="yes"/>
       <point x="886" y="211"/>
       <point x="780" y="311"/>
       <point x="568" y="310" type="curve" name="dv01"/>
       <point x="454" y="310" type="line"/>
       <point x="454" y="470" type="line"/>
-      <point x="568" y="470" type="line" name="dv02" smooth="yes"/>
+      <point x="568" y="470" type="line" smooth="yes" name="dv02"/>
       <point x="765" y="470"/>
       <point x="857" y="600"/>
       <point x="854" y="827" type="curve" smooth="yes"/>
@@ -30,10 +30,10 @@
       <point x="984" y="321"/>
       <point x="1076" y="193"/>
       <point x="1076" y="12" type="curve" smooth="yes"/>
-      <point x="1076" y="-20" type="line" name="dh04" smooth="yes"/>
+      <point x="1076" y="-20" type="line" smooth="yes" name="dh04"/>
       <point x="1076" y="-288"/>
       <point x="844" y="-424"/>
-      <point x="616" y="-424" type="curve" name="ab01" smooth="yes"/>
+      <point x="616" y="-424" type="curve" smooth="yes" name="ab01"/>
       <point x="387" y="-424"/>
       <point x="159" y="-290"/>
       <point x="159" y="-20" type="curve" name="dh01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10F_4.glif b/source/Hack-Regular.ufo/glyphs/uni10F_4.glif
index f11134111..0f785ba88 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10F_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10F_4.glif
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F4" format="1">
+<glyph name="uni10F4" format="2">
   <advance width="1233"/>
   <unicode hex="10F4"/>
   <outline>
     <contour>
-      <point x="609" y="-425" type="curve" name="ab01" smooth="yes"/>
+      <point x="609" y="-425" type="curve" smooth="yes" name="ab01"/>
       <point x="304" y="-425"/>
       <point x="151" y="-290"/>
       <point x="151" y="-20" type="curve" name="sh01"/>
       <point x="341" y="-20" type="line" name="sh02"/>
       <point x="341" y="-196"/>
       <point x="430" y="-284"/>
-      <point x="608" y="-284" type="curve" name="sv01" smooth="yes"/>
+      <point x="608" y="-284" type="curve" smooth="yes" name="sv01"/>
       <point x="787" y="-284"/>
       <point x="877" y="-196"/>
-      <point x="877" y="-20" type="curve" name="sh03" smooth="yes"/>
+      <point x="877" y="-20" type="curve" smooth="yes" name="sh03"/>
       <point x="877" y="35" type="line" smooth="yes"/>
       <point x="877" y="192"/>
       <point x="785" y="271"/>
-      <point x="602" y="271" type="curve" name="dv01" smooth="yes"/>
+      <point x="602" y="271" type="curve" smooth="yes" name="dv01"/>
       <point x="446" y="271" type="line"/>
       <point x="446" y="428" type="line"/>
       <point x="602" y="428" type="line" name="hr01"/>
@@ -27,20 +27,20 @@
       <point x="878" y="853" type="curve" name="dh03"/>
       <point x="793" y="826"/>
       <point x="700" y="816"/>
-      <point x="605" y="816" type="curve" name="dv02" smooth="yes"/>
+      <point x="605" y="816" type="curve" smooth="yes" name="dv02"/>
       <point x="296" y="816"/>
       <point x="151" y="934"/>
-      <point x="151" y="1175" type="curve" name="dh01" smooth="yes"/>
+      <point x="151" y="1175" type="curve" smooth="yes" name="dh01"/>
       <point x="151" y="1420"/>
       <point x="299" y="1558"/>
       <point x="610" y="1557" type="curve" name="at01"/>
       <point x="610" y="1415" type="line" name="sh04"/>
       <point x="402" y="1415"/>
       <point x="298" y="1330"/>
-      <point x="298" y="1178" type="curve" name="dh02" smooth="yes"/>
+      <point x="298" y="1178" type="curve" smooth="yes" name="dh02"/>
       <point x="298" y="1029"/>
       <point x="399" y="959"/>
-      <point x="598" y="959" type="curve" name="dv03" smooth="yes"/>
+      <point x="598" y="959" type="curve" smooth="yes" name="dv03"/>
       <point x="775" y="959"/>
       <point x="918" y="1015"/>
       <point x="1067" y="1127" type="curve" name="sh05"/>
@@ -51,7 +51,7 @@
       <point x="759" y="343" type="line" name="hr02"/>
       <point x="965" y="302"/>
       <point x="1068" y="199"/>
-      <point x="1068" y="35" type="curve" name="hr03" smooth="yes"/>
+      <point x="1068" y="35" type="curve" smooth="yes" name="hr03"/>
       <point x="1068" y="-20" type="line" smooth="yes"/>
       <point x="1068" y="-290"/>
       <point x="915" y="-425"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10F_5.glif b/source/Hack-Regular.ufo/glyphs/uni10F_5.glif
index de6e61f65..717263b49 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10F_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10F_5.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F5" format="1">
+<glyph name="uni10F5" format="2">
   <advance width="1233"/>
   <unicode hex="10F5"/>
   <outline>
     <contour>
-      <point x="565" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="565" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="264" y="0"/>
       <point x="114" y="114"/>
-      <point x="114" y="341" type="curve" name="dh01" smooth="yes"/>
+      <point x="114" y="341" type="curve" smooth="yes" name="dh01"/>
       <point x="114" y="572"/>
       <point x="263" y="695"/>
       <point x="566" y="695" type="curve" smooth="yes"/>
@@ -16,13 +16,13 @@
       <point x="566" y="856" type="line" smooth="yes"/>
       <point x="263" y="856"/>
       <point x="114" y="982"/>
-      <point x="114" y="1214" type="curve" name="sh01" smooth="yes"/>
+      <point x="114" y="1214" type="curve" smooth="yes" name="sh01"/>
       <point x="114" y="1446"/>
       <point x="264" y="1557"/>
-      <point x="567" y="1557" type="curve" name="at01" smooth="yes"/>
+      <point x="567" y="1557" type="curve" smooth="yes" name="at01"/>
       <point x="866" y="1557"/>
       <point x="1009" y="1449"/>
-      <point x="1009" y="1220" type="curve" name="sh02" smooth="yes"/>
+      <point x="1009" y="1220" type="curve" smooth="yes" name="sh02"/>
       <point x="1009" y="1004" type="line" name="sv01"/>
       <point x="1123" y="1004" type="line" name="sh03"/>
       <point x="1123" y="856" type="line" name="sv02"/>
@@ -40,24 +40,24 @@
       <point x="839" y="1220" type="line" smooth="yes"/>
       <point x="839" y="1350"/>
       <point x="750" y="1415"/>
-      <point x="572" y="1415" type="curve" name="hr04" smooth="yes"/>
+      <point x="572" y="1415" type="curve" smooth="yes" name="hr04"/>
       <point x="389" y="1415"/>
       <point x="304" y="1350"/>
-      <point x="304" y="1213" type="curve" name="sh04" smooth="yes"/>
+      <point x="304" y="1213" type="curve" smooth="yes" name="sh04"/>
       <point x="304" y="1076"/>
       <point x="391" y="1004"/>
       <point x="566" y="1004" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="571" y="140" type="curve" name="sv03" smooth="yes"/>
+      <point x="571" y="140" type="curve" smooth="yes" name="sv03"/>
       <point x="750" y="140"/>
       <point x="839" y="210"/>
-      <point x="839" y="351" type="curve" name="sh05" smooth="yes"/>
+      <point x="839" y="351" type="curve" smooth="yes" name="sh05"/>
       <point x="839" y="547" type="line" name="dv01"/>
       <point x="566" y="547" type="line" smooth="yes"/>
       <point x="390" y="547"/>
       <point x="304" y="478"/>
-      <point x="304" y="343" type="curve" name="dh02" smooth="yes"/>
+      <point x="304" y="343" type="curve" smooth="yes" name="dh02"/>
       <point x="304" y="208"/>
       <point x="393" y="140"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10F_6.glif b/source/Hack-Regular.ufo/glyphs/uni10F_6.glif
index f059e4050..5ac1ed736 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10F_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10F_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F6" format="1">
+<glyph name="uni10F6" format="2">
   <advance width="1233"/>
   <unicode hex="10F6"/>
   <outline>
@@ -12,36 +12,36 @@
       <point x="534" y="845"/>
       <point x="508" y="904"/>
       <point x="457" y="904" type="curve"/>
-      <point x="360" y="903" type="line" name="dv01" smooth="yes"/>
+      <point x="360" y="903" type="line" smooth="yes" name="dv01"/>
       <point x="280" y="902"/>
       <point x="245" y="842"/>
       <point x="245" y="715" type="curve" smooth="yes"/>
-      <point x="245" y="396" type="line" name="dh02" smooth="yes"/>
+      <point x="245" y="396" type="line" smooth="yes" name="dh02"/>
       <point x="245" y="251"/>
       <point x="288" y="179"/>
       <point x="373" y="179" type="curve" name="sh02"/>
       <point x="373" y="31" type="line"/>
       <point x="161" y="33"/>
       <point x="55" y="159"/>
-      <point x="55" y="410" type="curve" name="dh01" smooth="yes"/>
+      <point x="55" y="410" type="curve" smooth="yes" name="dh01"/>
       <point x="55" y="650" type="line" smooth="yes"/>
       <point x="55" y="914"/>
       <point x="157" y="1046"/>
-      <point x="360" y="1046" type="curve" name="dv02" smooth="yes"/>
+      <point x="360" y="1046" type="curve" smooth="yes" name="dv02"/>
       <point x="483" y="1046"/>
       <point x="566" y="998"/>
       <point x="611" y="901" type="curve" name="sv01"/>
       <point x="627" y="901" type="line"/>
       <point x="668" y="998"/>
       <point x="749" y="1046"/>
-      <point x="872" y="1046" type="curve" name="sv02" smooth="yes"/>
+      <point x="872" y="1046" type="curve" smooth="yes" name="sv02"/>
       <point x="1076" y="1046"/>
       <point x="1178" y="914"/>
       <point x="1178" y="650" type="curve" smooth="yes"/>
-      <point x="1178" y="406" type="line" name="dh05" smooth="yes"/>
+      <point x="1178" y="406" type="line" smooth="yes" name="dh05"/>
       <point x="1178" y="134"/>
       <point x="1072" y="0"/>
-      <point x="881" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="881" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="788" y="0"/>
       <point x="739" y="32"/>
       <point x="719" y="116" type="curve"/>
@@ -52,18 +52,18 @@
       <point x="360" y="-424" type="curve" name="hr01"/>
     </contour>
     <contour>
-      <point x="864" y="145" type="curve" name="sv03" smooth="yes"/>
+      <point x="864" y="145" type="curve" smooth="yes" name="sv03"/>
       <point x="951" y="145"/>
       <point x="989" y="195"/>
-      <point x="989" y="312" type="curve" name="hr02" smooth="yes"/>
+      <point x="989" y="312" type="curve" smooth="yes" name="hr02"/>
       <point x="989" y="729" type="line" smooth="yes"/>
       <point x="989" y="846"/>
       <point x="944" y="904"/>
-      <point x="853" y="904" type="curve" name="sv04" smooth="yes"/>
+      <point x="853" y="904" type="curve" smooth="yes" name="sv04"/>
       <point x="777" y="904" type="line" smooth="yes"/>
       <point x="728" y="904"/>
       <point x="704" y="848"/>
-      <point x="704" y="737" type="curve" name="hr03" smooth="yes"/>
+      <point x="704" y="737" type="curve" smooth="yes" name="hr03"/>
       <point x="704" y="356" type="line" smooth="yes"/>
       <point x="704" y="215"/>
       <point x="763" y="145"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10F_7.glif b/source/Hack-Regular.ufo/glyphs/uni10F_7.glif
index e3cb0d224..447f14606 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10F_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10F_7.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F7" format="1">
+<glyph name="uni10F7" format="2">
   <advance width="1233"/>
   <unicode hex="10F7"/>
   <outline>
     <contour>
-      <point x="623" y="-423" type="curve" name="dv01" smooth="yes"/>
+      <point x="623" y="-423" type="curve" smooth="yes" name="dv01"/>
       <point x="241" y="-423"/>
       <point x="106" y="-215"/>
-      <point x="106" y="13" type="curve" name="dh01" smooth="yes"/>
+      <point x="106" y="13" type="curve" smooth="yes" name="dh01"/>
       <point x="106" y="211"/>
       <point x="209" y="388"/>
       <point x="434" y="484" type="curve" smooth="yes"/>
       <point x="573" y="544"/>
       <point x="758" y="572"/>
-      <point x="758" y="743" type="curve" name="dh03" smooth="yes"/>
+      <point x="758" y="743" type="curve" smooth="yes" name="dh03"/>
       <point x="758" y="835"/>
       <point x="707" y="903"/>
-      <point x="593" y="903" type="curve" name="dv03" smooth="yes"/>
+      <point x="593" y="903" type="curve" smooth="yes" name="dv03"/>
       <point x="492" y="903"/>
       <point x="424" y="849"/>
       <point x="424" y="744" type="curve" name="sh01"/>
@@ -25,29 +25,29 @@
       <point x="254" y="732" type="line" name="hr01"/>
       <point x="254" y="943"/>
       <point x="375" y="1046"/>
-      <point x="596" y="1046" type="curve" name="dv04" smooth="yes"/>
+      <point x="596" y="1046" type="curve" smooth="yes" name="dv04"/>
       <point x="840" y="1046"/>
       <point x="947" y="917"/>
-      <point x="947" y="769" type="curve" name="dh04" smooth="yes"/>
+      <point x="947" y="769" type="curve" smooth="yes" name="dh04"/>
       <point x="947" y="613"/>
       <point x="829" y="445"/>
       <point x="609" y="359" type="curve"/>
       <point x="397" y="306"/>
       <point x="297" y="142"/>
-      <point x="297" y="-4" type="curve" name="dh02" smooth="yes"/>
+      <point x="297" y="-4" type="curve" smooth="yes" name="dh02"/>
       <point x="297" y="-148"/>
       <point x="393" y="-284"/>
-      <point x="621" y="-284" type="curve" name="dv02" smooth="yes"/>
+      <point x="621" y="-284" type="curve" smooth="yes" name="dv02"/>
       <point x="816" y="-284"/>
       <point x="936" y="-185"/>
-      <point x="936" y="13" type="curve" name="sh02" smooth="yes"/>
+      <point x="936" y="13" type="curve" smooth="yes" name="sh02"/>
       <point x="936" y="95"/>
       <point x="915" y="154"/>
       <point x="872" y="190" type="curve" name="ih01"/>
       <point x="1026" y="282" type="line"/>
       <point x="1091" y="210"/>
       <point x="1126" y="116"/>
-      <point x="1126" y="-4" type="curve" name="hr02" smooth="yes"/>
+      <point x="1126" y="-4" type="curve" smooth="yes" name="hr02"/>
       <point x="1126" y="-281"/>
       <point x="936" y="-423"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10F_8.glif b/source/Hack-Regular.ufo/glyphs/uni10F_8.glif
index 8d18200f9..a575430d4 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10F_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10F_8.glif
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F8" format="1">
+<glyph name="uni10F8" format="2">
   <advance width="1233"/>
   <unicode hex="10F8"/>
   <outline>
     <contour>
-      <point x="638" y="-423" type="curve" name="dv01" smooth="yes"/>
+      <point x="638" y="-423" type="curve" smooth="yes" name="dv01"/>
       <point x="332" y="-423"/>
       <point x="179" y="-291"/>
-      <point x="179" y="-27" type="curve" name="sh01" smooth="yes"/>
+      <point x="179" y="-27" type="curve" smooth="yes" name="sh01"/>
       <point x="179" y="1022" type="line"/>
       <point x="352" y="1022" type="line" name="hr01"/>
-      <point x="352" y="458" type="line" name="hr02" smooth="yes"/>
+      <point x="352" y="458" type="line" smooth="yes" name="hr02"/>
       <point x="352" y="331"/>
       <point x="462" y="267"/>
-      <point x="622" y="267" type="curve" name="dv04" smooth="yes"/>
+      <point x="622" y="267" type="curve" smooth="yes" name="dv04"/>
       <point x="819" y="267"/>
       <point x="907" y="362"/>
-      <point x="907" y="557" type="curve" name="ah01" smooth="yes"/>
+      <point x="907" y="557" type="curve" smooth="yes" name="ah01"/>
       <point x="907" y="749"/>
       <point x="821" y="878"/>
       <point x="644" y="1001" type="curve" name="ih01"/>
       <point x="815" y="1064" type="line" name="av01"/>
       <point x="991" y="923"/>
       <point x="1095" y="704"/>
-      <point x="1095" y="512" type="curve" name="sh03" smooth="yes"/>
+      <point x="1095" y="512" type="curve" smooth="yes" name="sh03"/>
       <point x="1095" y="295"/>
       <point x="961" y="115"/>
       <point x="644" y="115" type="curve"/>
@@ -32,10 +32,10 @@
       <point x="429" y="145"/>
       <point x="372" y="204" type="curve"/>
       <point x="352" y="204" type="line"/>
-      <point x="352" y="-23" type="line" name="sh02" smooth="yes"/>
+      <point x="352" y="-23" type="line" smooth="yes" name="sh02"/>
       <point x="352" y="-196"/>
       <point x="488" y="-284"/>
-      <point x="628" y="-284" type="curve" name="dv02" smooth="yes"/>
+      <point x="628" y="-284" type="curve" smooth="yes" name="dv02"/>
       <point x="767" y="-284"/>
       <point x="907" y="-196"/>
       <point x="907" y="-23" type="curve" name="sh04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10F_9.glif b/source/Hack-Regular.ufo/glyphs/uni10F_9.glif
index b207b4d39..1fd9287e6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10F_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10F_9.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10F9" format="1">
+<glyph name="uni10F9" format="2">
   <advance width="1233"/>
   <unicode hex="10F9"/>
   <outline>
     <contour>
-      <point x="628" y="-425" type="curve" name="ab01" smooth="yes"/>
+      <point x="628" y="-425" type="curve" smooth="yes" name="ab01"/>
       <point x="387" y="-425"/>
       <point x="274" y="-324"/>
-      <point x="274" y="-121" type="curve" name="ih01" smooth="yes"/>
+      <point x="274" y="-121" type="curve" smooth="yes" name="ih01"/>
       <point x="274" y="46"/>
       <point x="352" y="143"/>
       <point x="513" y="202" type="curve" name="ih03"/>
       <point x="232" y="261"/>
       <point x="101" y="405"/>
-      <point x="101" y="618" type="curve" name="dh01" smooth="yes"/>
+      <point x="101" y="618" type="curve" smooth="yes" name="dh01"/>
       <point x="101" y="913"/>
       <point x="354" y="1060"/>
-      <point x="606" y="1060" type="curve" name="dv01" smooth="yes"/>
+      <point x="606" y="1060" type="curve" smooth="yes" name="dv01"/>
       <point x="860" y="1060"/>
       <point x="1114" y="910"/>
-      <point x="1114" y="625" type="curve" name="sh01" smooth="yes"/>
+      <point x="1114" y="625" type="curve" smooth="yes" name="sh01"/>
       <point x="1114" y="438"/>
       <point x="1004" y="292"/>
       <point x="752" y="173" type="curve" name="hr01"/>
       <point x="529" y="83"/>
       <point x="458" y="-2"/>
-      <point x="458" y="-119" type="curve" name="sh02" smooth="yes"/>
+      <point x="458" y="-119" type="curve" smooth="yes" name="sh02"/>
       <point x="458" y="-222"/>
       <point x="511" y="-284"/>
-      <point x="631" y="-284" type="curve" name="sv01" smooth="yes"/>
+      <point x="631" y="-284" type="curve" smooth="yes" name="sv01"/>
       <point x="735" y="-284"/>
       <point x="811" y="-236"/>
-      <point x="811" y="-143" type="curve" name="dh03" smooth="yes"/>
+      <point x="811" y="-143" type="curve" smooth="yes" name="dh03"/>
       <point x="811" y="-67" type="line" name="hr02"/>
       <point x="989" y="-67" type="line"/>
-      <point x="989" y="-143" type="line" name="dh04" smooth="yes"/>
+      <point x="989" y="-143" type="line" smooth="yes" name="dh04"/>
       <point x="989" y="-331"/>
       <point x="857" y="-425"/>
     </contour>
@@ -42,13 +42,13 @@
       <point x="612" y="326" type="curve"/>
       <point x="833" y="355"/>
       <point x="927" y="454"/>
-      <point x="927" y="629" type="curve" name="ih02" smooth="yes"/>
+      <point x="927" y="629" type="curve" smooth="yes" name="ih02"/>
       <point x="927" y="816"/>
       <point x="823" y="917"/>
-      <point x="611" y="917" type="curve" name="hr03" smooth="yes"/>
+      <point x="611" y="917" type="curve" smooth="yes" name="hr03"/>
       <point x="398" y="917"/>
       <point x="292" y="814"/>
-      <point x="292" y="629" type="curve" name="dh02" smooth="yes"/>
+      <point x="292" y="629" type="curve" smooth="yes" name="dh02"/>
       <point x="292" y="444"/>
       <point x="399" y="351"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10F_A_.glif b/source/Hack-Regular.ufo/glyphs/uni10F_A_.glif
index 91d4a5073..1aaeebb23 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10F_A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10F_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10FA" format="1">
+<glyph name="uni10FA" format="2">
   <advance width="1233"/>
   <unicode hex="10FA"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="693" y="-68" type="curve" smooth="yes"/>
       <point x="656" y="-32"/>
       <point x="612" y="-8"/>
-      <point x="541" y="-8" type="curve" name="ab01" smooth="yes"/>
+      <point x="541" y="-8" type="curve" smooth="yes" name="ab01"/>
       <point x="449" y="-8"/>
       <point x="387" y="-48"/>
       <point x="343" y="-124" type="curve" name="sh03"/>
@@ -21,26 +21,26 @@
       <point x="396" y="106" type="line"/>
       <point x="237" y="222"/>
       <point x="160" y="392"/>
-      <point x="160" y="603" type="curve" name="sh01" smooth="yes"/>
+      <point x="160" y="603" type="curve" smooth="yes" name="sh01"/>
       <point x="160" y="903"/>
       <point x="321" y="1043"/>
       <point x="644" y="1046" type="curve" name="dv02"/>
       <point x="931" y="1023"/>
       <point x="1075" y="904"/>
-      <point x="1075" y="691" type="curve" name="sh04" smooth="yes"/>
+      <point x="1075" y="691" type="curve" smooth="yes" name="sh04"/>
       <point x="1075" y="568"/>
       <point x="1027" y="414"/>
       <point x="932" y="227" type="curve"/>
       <point x="787" y="288" type="line"/>
       <point x="859" y="448"/>
       <point x="895" y="576"/>
-      <point x="895" y="673" type="curve" name="ah01" smooth="yes"/>
+      <point x="895" y="673" type="curve" smooth="yes" name="ah01"/>
       <point x="895" y="822"/>
       <point x="811" y="903"/>
-      <point x="635" y="903" type="curve" name="dv01" smooth="yes"/>
+      <point x="635" y="903" type="curve" smooth="yes" name="dv01"/>
       <point x="440" y="903"/>
       <point x="352" y="806"/>
-      <point x="352" y="589" type="curve" name="sh02" smooth="yes"/>
+      <point x="352" y="589" type="curve" smooth="yes" name="sh02"/>
       <point x="352" y="408"/>
       <point x="414" y="270"/>
       <point x="561" y="147" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10F_B_.glif b/source/Hack-Regular.ufo/glyphs/uni10F_B_.glif
index f1c494ed3..919801398 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10F_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10F_B_.glif
@@ -1,57 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10FB" format="1">
+<glyph name="uni10FB" format="2">
   <advance width="1233"/>
   <unicode hex="10FB"/>
   <outline>
     <contour>
-      <point x="321" y="819" type="line" name="hr00" smooth="yes"/>
+      <point x="321" y="819" type="line" smooth="yes" name="hr00"/>
       <point x="301" y="819"/>
       <point x="291" y="829"/>
-      <point x="291" y="849" type="curve" name="sh01" smooth="yes"/>
+      <point x="291" y="849" type="curve" smooth="yes" name="sh01"/>
       <point x="291" y="965" type="line" smooth="yes"/>
       <point x="291" y="985"/>
       <point x="301" y="995"/>
-      <point x="321" y="995" type="curve" name="dv03" smooth="yes"/>
+      <point x="321" y="995" type="curve" smooth="yes" name="dv03"/>
       <point x="453" y="995" type="line" smooth="yes"/>
       <point x="473" y="995"/>
       <point x="483" y="985"/>
       <point x="483" y="965" type="curve" smooth="yes"/>
-      <point x="483" y="849" type="line" name="sh02" smooth="yes"/>
+      <point x="483" y="849" type="line" smooth="yes" name="sh02"/>
       <point x="483" y="829"/>
       <point x="473" y="819"/>
       <point x="453" y="819" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="786" y="456" type="line" name="dv04" smooth="yes"/>
+      <point x="786" y="456" type="line" smooth="yes" name="dv04"/>
       <point x="766" y="456"/>
       <point x="756" y="466"/>
-      <point x="756" y="486" type="curve" name="ah01" smooth="yes"/>
+      <point x="756" y="486" type="curve" smooth="yes" name="ah01"/>
       <point x="756" y="600" type="line" smooth="yes"/>
       <point x="756" y="620"/>
       <point x="766" y="630"/>
-      <point x="786" y="630" type="curve" name="dv05" smooth="yes"/>
+      <point x="786" y="630" type="curve" smooth="yes" name="dv05"/>
       <point x="912" y="630" type="line" smooth="yes"/>
       <point x="932" y="630"/>
       <point x="942" y="620"/>
       <point x="942" y="600" type="curve" smooth="yes"/>
-      <point x="942" y="486" type="line" name="sh03" smooth="yes"/>
+      <point x="942" y="486" type="line" smooth="yes" name="sh03"/>
       <point x="942" y="466"/>
       <point x="932" y="456"/>
       <point x="912" y="456" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="321" y="50" type="line" name="dv01" smooth="yes"/>
+      <point x="321" y="50" type="line" smooth="yes" name="dv01"/>
       <point x="301" y="50"/>
       <point x="291" y="60"/>
-      <point x="291" y="80" type="curve" name="sh04" smooth="yes"/>
+      <point x="291" y="80" type="curve" smooth="yes" name="sh04"/>
       <point x="291" y="194" type="line" smooth="yes"/>
       <point x="291" y="214"/>
       <point x="301" y="224"/>
-      <point x="321" y="224" type="curve" name="dv02" smooth="yes"/>
+      <point x="321" y="224" type="curve" smooth="yes" name="dv02"/>
       <point x="450" y="224" type="line" smooth="yes"/>
       <point x="470" y="224"/>
       <point x="480" y="214"/>
-      <point x="480" y="194" type="curve" name="sh05" smooth="yes"/>
+      <point x="480" y="194" type="curve" smooth="yes" name="sh05"/>
       <point x="480" y="80" type="line" smooth="yes"/>
       <point x="480" y="60"/>
       <point x="470" y="50"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni10F_C_.glif b/source/Hack-Regular.ufo/glyphs/uni10F_C_.glif
index a684f3629..288691550 100644
--- a/source/Hack-Regular.ufo/glyphs/uni10F_C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni10F_C_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni10FC" format="1">
+<glyph name="uni10FC" format="2">
   <advance width="1233"/>
   <unicode hex="10FC"/>
   <outline>
     <contour>
-      <point x="606" y="757" type="curve" name="hr00" smooth="yes"/>
+      <point x="606" y="757" type="curve" smooth="yes" name="hr00"/>
       <point x="478" y="757"/>
       <point x="405" y="851"/>
       <point x="405" y="1043" type="curve" smooth="yes"/>
-      <point x="405" y="1375" type="line" name="sh01" smooth="yes"/>
+      <point x="405" y="1375" type="line" smooth="yes" name="sh01"/>
       <point x="405" y="1496"/>
       <point x="467" y="1556"/>
-      <point x="590" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="590" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="825" y="1556" type="line" name="sh03"/>
       <point x="825" y="1474" type="line" name="sv01"/>
       <point x="567" y="1476" type="line"/>
@@ -22,21 +22,21 @@
       <point x="620" y="1316" type="line" name="dv03"/>
       <point x="758" y="1316"/>
       <point x="827" y="1179"/>
-      <point x="827" y="1037" type="curve" name="sh02" smooth="yes"/>
+      <point x="827" y="1037" type="curve" smooth="yes" name="sh02"/>
       <point x="827" y="897"/>
       <point x="760" y="757"/>
     </contour>
     <contour>
-      <point x="618" y="836" type="curve" name="dv01" smooth="yes"/>
+      <point x="618" y="836" type="curve" smooth="yes" name="dv01"/>
       <point x="694" y="836"/>
       <point x="734" y="912"/>
-      <point x="734" y="1035" type="curve" name="ah01" smooth="yes"/>
+      <point x="734" y="1035" type="curve" smooth="yes" name="ah01"/>
       <point x="734" y="1163"/>
       <point x="692" y="1223"/>
-      <point x="620" y="1223" type="curve" name="dv02" smooth="yes"/>
+      <point x="620" y="1223" type="curve" smooth="yes" name="dv02"/>
       <point x="531" y="1223"/>
       <point x="498" y="1127"/>
-      <point x="498" y="1031" type="curve" name="sh05" smooth="yes"/>
+      <point x="498" y="1031" type="curve" smooth="yes" name="sh05"/>
       <point x="498" y="932"/>
       <point x="534" y="836"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni1E_B_C_.glif b/source/Hack-Regular.ufo/glyphs/uni1E_B_C_.glif
index 9ae14605f..a90ac0a35 100644
--- a/source/Hack-Regular.ufo/glyphs/uni1E_B_C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni1E_B_C_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni1EBC" format="1">
+<glyph name="uni1EBC" format="2">
   <advance width="1233"/>
   <unicode hex="1EBC"/>
   <outline>
     <contour>
-      <point x="442" y="1639" type="line" name="hr00" smooth="yes"/>
+      <point x="442" y="1639" type="line" smooth="yes" name="hr00"/>
       <point x="442" y="1668"/>
       <point x="449" y="1692"/>
       <point x="462" y="1709" type="curve" smooth="yes"/>
@@ -31,7 +31,7 @@
       <point x="851" y="1846" type="line" smooth="yes"/>
       <point x="851" y="1793"/>
       <point x="821" y="1754"/>
-      <point x="780" y="1754" type="curve" name="hr01" smooth="yes"/>
+      <point x="780" y="1754" type="curve" smooth="yes" name="hr01"/>
       <point x="759" y="1754"/>
       <point x="735" y="1762"/>
       <point x="708" y="1779" type="curve"/>
@@ -41,7 +41,7 @@
       <point x="572" y="1844" type="curve" smooth="yes"/>
       <point x="547" y="1849"/>
       <point x="525" y="1852"/>
-      <point x="506" y="1852" type="curve" name="hr02" smooth="yes"/>
+      <point x="506" y="1852" type="curve" smooth="yes" name="hr02"/>
       <point x="449" y="1852"/>
       <point x="403" y="1832"/>
       <point x="369" y="1793" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni1E_B_D_.glif b/source/Hack-Regular.ufo/glyphs/uni1E_B_D_.glif
index 716b3505d..21a1fd2a2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni1E_B_D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni1E_B_D_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni1EBD" format="1">
+<glyph name="uni1EBD" format="2">
   <advance width="1233"/>
   <unicode hex="1EBD"/>
   <outline>
     <contour>
-      <point x="452" y="1377" type="curve" name="hr00" smooth="yes"/>
+      <point x="452" y="1377" type="curve" smooth="yes" name="hr00"/>
       <point x="464" y="1402"/>
       <point x="482" y="1414"/>
       <point x="506" y="1414" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni1E_F_8.glif b/source/Hack-Regular.ufo/glyphs/uni1E_F_8.glif
index 71bf0e73d..78ca882da 100644
--- a/source/Hack-Regular.ufo/glyphs/uni1E_F_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni1E_F_8.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni1EF8" format="1">
+<glyph name="uni1EF8" format="2">
   <advance width="1233"/>
   <unicode hex="1EF8"/>
   <outline>
     <contour>
-      <point x="422" y="1639" type="line" name="hr00" smooth="yes"/>
+      <point x="422" y="1639" type="line" smooth="yes" name="hr00"/>
       <point x="422" y="1668"/>
       <point x="429" y="1692"/>
       <point x="442" y="1709" type="curve" smooth="yes"/>
@@ -31,7 +31,7 @@
       <point x="831" y="1846" type="line" smooth="yes"/>
       <point x="831" y="1793"/>
       <point x="801" y="1754"/>
-      <point x="760" y="1754" type="curve" name="hr01" smooth="yes"/>
+      <point x="760" y="1754" type="curve" smooth="yes" name="hr01"/>
       <point x="739" y="1754"/>
       <point x="715" y="1762"/>
       <point x="688" y="1779" type="curve"/>
@@ -41,7 +41,7 @@
       <point x="552" y="1844" type="curve" smooth="yes"/>
       <point x="527" y="1849"/>
       <point x="505" y="1852"/>
-      <point x="486" y="1852" type="curve" name="hr02" smooth="yes"/>
+      <point x="486" y="1852" type="curve" smooth="yes" name="hr02"/>
       <point x="429" y="1852"/>
       <point x="383" y="1832"/>
       <point x="349" y="1793" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni1E_F_9.glif b/source/Hack-Regular.ufo/glyphs/uni1E_F_9.glif
index 2e942f1d0..2a13643dd 100644
--- a/source/Hack-Regular.ufo/glyphs/uni1E_F_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni1E_F_9.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni1EF9" format="1">
+<glyph name="uni1EF9" format="2">
   <advance width="1233"/>
   <unicode hex="1EF9"/>
   <outline>
     <contour>
-      <point x="461" y="1404" type="curve" name="hr00" smooth="yes"/>
+      <point x="461" y="1404" type="curve" smooth="yes" name="hr00"/>
       <point x="473" y="1429"/>
       <point x="492" y="1441"/>
       <point x="517" y="1441" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2000.glif b/source/Hack-Regular.ufo/glyphs/uni2000.glif
index d0ebf1f93..fcf33b66d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2000.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2000.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2000" format="1">
+<glyph name="uni2000" format="2">
   <advance width="1233"/>
   <unicode hex="2000"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2001.glif b/source/Hack-Regular.ufo/glyphs/uni2001.glif
index 2d9044ed7..52cc3eb33 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2001.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2001.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2001" format="1">
+<glyph name="uni2001" format="2">
   <advance width="1233"/>
   <unicode hex="2001"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2002.glif b/source/Hack-Regular.ufo/glyphs/uni2002.glif
index 118881251..d3ed2c892 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2002.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2002.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2002" format="1">
+<glyph name="uni2002" format="2">
   <advance width="1233"/>
   <unicode hex="2002"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2003.glif b/source/Hack-Regular.ufo/glyphs/uni2003.glif
index ed1727198..6c33cbbb4 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2003.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2003.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2003" format="1">
+<glyph name="uni2003" format="2">
   <advance width="1233"/>
   <unicode hex="2003"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2004.glif b/source/Hack-Regular.ufo/glyphs/uni2004.glif
index 7760d1614..832cf5e86 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2004.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2004.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2004" format="1">
+<glyph name="uni2004" format="2">
   <advance width="1233"/>
   <unicode hex="2004"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2005.glif b/source/Hack-Regular.ufo/glyphs/uni2005.glif
index c74724fd0..d3890d22c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2005.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2005.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2005" format="1">
+<glyph name="uni2005" format="2">
   <advance width="1233"/>
   <unicode hex="2005"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2006.glif b/source/Hack-Regular.ufo/glyphs/uni2006.glif
index 8ebfe7b0f..38d77599d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2006.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2006.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2006" format="1">
+<glyph name="uni2006" format="2">
   <advance width="1233"/>
   <unicode hex="2006"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2007.glif b/source/Hack-Regular.ufo/glyphs/uni2007.glif
index 9feeb6e4e..efb323052 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2007.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2007.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2007" format="1">
+<glyph name="uni2007" format="2">
   <advance width="1233"/>
   <unicode hex="2007"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2008.glif b/source/Hack-Regular.ufo/glyphs/uni2008.glif
index ead1bfbab..98b293250 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2008.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2008.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2008" format="1">
+<glyph name="uni2008" format="2">
   <advance width="1233"/>
   <unicode hex="2008"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2009.glif b/source/Hack-Regular.ufo/glyphs/uni2009.glif
index 6bcafac01..ccc5dddc7 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2009.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2009.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2009" format="1">
+<glyph name="uni2009" format="2">
   <advance width="1233"/>
   <unicode hex="2009"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni200A_.glif b/source/Hack-Regular.ufo/glyphs/uni200A_.glif
index 7f7754a85..e24c197d9 100644
--- a/source/Hack-Regular.ufo/glyphs/uni200A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni200A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni200A" format="1">
+<glyph name="uni200A" format="2">
   <advance width="1233"/>
   <unicode hex="200A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2010.glif b/source/Hack-Regular.ufo/glyphs/uni2010.glif
index 56693ec0b..85237aa76 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2010.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2010.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2010" format="1">
+<glyph name="uni2010" format="2">
   <advance width="1233"/>
   <unicode hex="2010"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2011.glif b/source/Hack-Regular.ufo/glyphs/uni2011.glif
index ab5d43ac3..104898622 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2011.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2011.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2011" format="1">
+<glyph name="uni2011" format="2">
   <advance width="1233"/>
   <unicode hex="2011"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2015.glif b/source/Hack-Regular.ufo/glyphs/uni2015.glif
index d01673ea7..fc386e808 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2015.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2015.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2015" format="1">
+<glyph name="uni2015" format="2">
   <advance width="1233"/>
   <unicode hex="2015"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2016.glif b/source/Hack-Regular.ufo/glyphs/uni2016.glif
index 0eaa88bdf..2ea9e0cde 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2016.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2016.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2016" format="1">
+<glyph name="uni2016" format="2">
   <advance width="1233"/>
   <unicode hex="2016"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni201F_.glif b/source/Hack-Regular.ufo/glyphs/uni201F_.glif
index c27ed48b3..838ad5634 100644
--- a/source/Hack-Regular.ufo/glyphs/uni201F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni201F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni201F" format="1">
+<glyph name="uni201F" format="2">
   <advance width="1233"/>
   <unicode hex="201F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2023.glif b/source/Hack-Regular.ufo/glyphs/uni2023.glif
index 3c0fa939c..f6eb9eae6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2023.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2023.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2023" format="1">
+<glyph name="uni2023" format="2">
   <advance width="1233"/>
   <unicode hex="2023"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni202F_.glif b/source/Hack-Regular.ufo/glyphs/uni202F_.glif
index 33cb9cc4c..ce697df98 100644
--- a/source/Hack-Regular.ufo/glyphs/uni202F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni202F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni202F" format="1">
+<glyph name="uni202F" format="2">
   <advance width="1233"/>
   <unicode hex="202F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2031.glif b/source/Hack-Regular.ufo/glyphs/uni2031.glif
index da8a295f8..9041b37a7 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2031.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2031.glif
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2031" format="1">
+<glyph name="uni2031" format="2">
   <advance width="1233"/>
   <unicode hex="2031"/>
   <outline>
     <contour>
-      <point x="286" y="856" type="curve" name="dv05" smooth="yes"/>
+      <point x="286" y="856" type="curve" smooth="yes" name="dv05"/>
       <point x="126" y="856"/>
       <point x="0" y="984"/>
-      <point x="0" y="1144" type="curve" name="dh01" smooth="yes"/>
+      <point x="0" y="1144" type="curve" smooth="yes" name="dh01"/>
       <point x="0" y="1304"/>
       <point x="126" y="1432"/>
-      <point x="287" y="1432" type="curve" name="dv02" smooth="yes"/>
+      <point x="287" y="1432" type="curve" smooth="yes" name="dv02"/>
       <point x="447" y="1432"/>
       <point x="573" y="1305"/>
-      <point x="573" y="1145" type="curve" name="sh01" smooth="yes"/>
+      <point x="573" y="1145" type="curve" smooth="yes" name="sh01"/>
       <point x="573" y="984"/>
       <point x="447" y="856"/>
     </contour>
     <contour>
-      <point x="287" y="979" type="curve" name="dv06" smooth="yes"/>
+      <point x="287" y="979" type="curve" smooth="yes" name="dv06"/>
       <point x="379" y="979"/>
       <point x="453" y="1053"/>
-      <point x="453" y="1144" type="curve" name="ih01" smooth="yes"/>
+      <point x="453" y="1144" type="curve" smooth="yes" name="ih01"/>
       <point x="453" y="1234"/>
       <point x="378" y="1311"/>
-      <point x="285" y="1311" type="curve" name="dv01" smooth="yes"/>
+      <point x="285" y="1311" type="curve" smooth="yes" name="dv01"/>
       <point x="240" y="1311"/>
       <point x="202" y="1295"/>
       <point x="170" y="1263" type="curve" smooth="yes"/>
       <point x="137" y="1230"/>
       <point x="121" y="1191"/>
-      <point x="121" y="1146" type="curve" name="dh02" smooth="yes"/>
+      <point x="121" y="1146" type="curve" smooth="yes" name="dh02"/>
       <point x="121" y="1053"/>
       <point x="195" y="979"/>
     </contour>
@@ -41,13 +41,13 @@
       <point x="72" y="567" type="line"/>
     </contour>
     <contour>
-      <point x="239" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="239" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="103" y="0"/>
       <point x="0" y="124"/>
-      <point x="0" y="287" type="curve" name="sh02" smooth="yes"/>
+      <point x="0" y="287" type="curve" smooth="yes" name="sh02"/>
       <point x="0" y="450"/>
       <point x="103" y="575"/>
-      <point x="240" y="575" type="curve" name="dv04" smooth="yes"/>
+      <point x="240" y="575" type="curve" smooth="yes" name="dv04"/>
       <point x="305" y="575"/>
       <point x="361" y="547"/>
       <point x="407" y="492" type="curve" smooth="yes"/>
@@ -59,7 +59,7 @@
       <point x="445" y="492" type="curve" smooth="yes"/>
       <point x="492" y="548"/>
       <point x="547" y="575"/>
-      <point x="619" y="575" type="curve" name="sv01" smooth="yes"/>
+      <point x="619" y="575" type="curve" smooth="yes" name="sv01"/>
       <point x="702" y="575"/>
       <point x="743" y="534"/>
       <point x="785" y="492" type="curve" smooth="yes"/>
@@ -71,13 +71,13 @@
       <point x="823" y="492" type="curve" smooth="yes"/>
       <point x="868" y="544"/>
       <point x="924" y="575"/>
-      <point x="992" y="575" type="curve" name="sv02" smooth="yes"/>
+      <point x="992" y="575" type="curve" smooth="yes" name="sv02"/>
       <point x="1128" y="575"/>
       <point x="1233" y="450"/>
-      <point x="1233" y="289" type="curve" name="dh07" smooth="yes"/>
+      <point x="1233" y="289" type="curve" smooth="yes" name="dh07"/>
       <point x="1233" y="128"/>
       <point x="1128" y="0"/>
-      <point x="991" y="0" type="curve" name="ab02" smooth="yes"/>
+      <point x="991" y="0" type="curve" smooth="yes" name="ab02"/>
       <point x="922" y="0"/>
       <point x="868" y="32"/>
       <point x="823" y="84" type="curve" smooth="yes"/>
@@ -89,7 +89,7 @@
       <point x="785" y="84" type="curve" smooth="yes"/>
       <point x="738" y="31"/>
       <point x="691" y="0"/>
-      <point x="618" y="0" type="curve" name="ab03" smooth="yes"/>
+      <point x="618" y="0" type="curve" smooth="yes" name="ab03"/>
       <point x="549" y="0"/>
       <point x="492" y="28"/>
       <point x="445" y="84" type="curve" smooth="yes"/>
@@ -103,13 +103,13 @@
       <point x="304" y="0"/>
     </contour>
     <contour>
-      <point x="237" y="121" type="curve" name="sv03" smooth="yes"/>
+      <point x="237" y="121" type="curve" smooth="yes" name="sv03"/>
       <point x="313" y="121"/>
       <point x="376" y="197"/>
-      <point x="376" y="288" type="curve" name="dh03" smooth="yes"/>
+      <point x="376" y="288" type="curve" smooth="yes" name="dh03"/>
       <point x="376" y="378"/>
       <point x="314" y="455"/>
-      <point x="237" y="455" type="curve" name="dv03" smooth="yes"/>
+      <point x="237" y="455" type="curve" smooth="yes" name="dv03"/>
       <point x="161" y="455"/>
       <point x="101" y="381"/>
       <point x="101" y="288" type="curve" smooth="yes"/>
@@ -117,30 +117,30 @@
       <point x="161" y="121"/>
     </contour>
     <contour>
-      <point x="616" y="121" type="curve" name="sv04" smooth="yes"/>
+      <point x="616" y="121" type="curve" smooth="yes" name="sv04"/>
       <point x="693" y="121"/>
       <point x="754" y="195"/>
-      <point x="754" y="287" type="curve" name="dh05" smooth="yes"/>
+      <point x="754" y="287" type="curve" smooth="yes" name="dh05"/>
       <point x="754" y="380"/>
       <point x="691" y="455"/>
-      <point x="615" y="455" type="curve" name="sv05" smooth="yes"/>
+      <point x="615" y="455" type="curve" smooth="yes" name="sv05"/>
       <point x="539" y="455"/>
       <point x="477" y="381"/>
-      <point x="477" y="288" type="curve" name="dh04" smooth="yes"/>
+      <point x="477" y="288" type="curve" smooth="yes" name="dh04"/>
       <point x="477" y="195"/>
       <point x="539" y="121"/>
     </contour>
     <contour>
-      <point x="994" y="121" type="curve" name="sv06" smooth="yes"/>
+      <point x="994" y="121" type="curve" smooth="yes" name="sv06"/>
       <point x="1071" y="121"/>
       <point x="1132" y="195"/>
-      <point x="1132" y="287" type="curve" name="dh06" smooth="yes"/>
+      <point x="1132" y="287" type="curve" smooth="yes" name="dh06"/>
       <point x="1132" y="380"/>
       <point x="1069" y="455"/>
-      <point x="993" y="455" type="curve" name="sv07" smooth="yes"/>
+      <point x="993" y="455" type="curve" smooth="yes" name="sv07"/>
       <point x="917" y="455"/>
       <point x="855" y="381"/>
-      <point x="855" y="288" type="curve" name="hr01" smooth="yes"/>
+      <point x="855" y="288" type="curve" smooth="yes" name="hr01"/>
       <point x="855" y="195"/>
       <point x="917" y="121"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2035.glif b/source/Hack-Regular.ufo/glyphs/uni2035.glif
index c61a53b43..0b93ea3a4 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2035.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2035.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2035" format="1">
+<glyph name="uni2035" format="2">
   <advance width="1233"/>
   <unicode hex="2035"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2036.glif b/source/Hack-Regular.ufo/glyphs/uni2036.glif
index e5c962e69..7a7c239db 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2036.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2036.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2036" format="1">
+<glyph name="uni2036" format="2">
   <advance width="1233"/>
   <unicode hex="2036"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2037.glif b/source/Hack-Regular.ufo/glyphs/uni2037.glif
index e3891f0d3..31e1de738 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2037.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2037.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2037" format="1">
+<glyph name="uni2037" format="2">
   <advance width="1233"/>
   <unicode hex="2037"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni203D_.glif b/source/Hack-Regular.ufo/glyphs/uni203D_.glif
index 8ba776dd4..efa23215f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni203D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni203D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni203D" format="1">
+<glyph name="uni203D" format="2">
   <advance width="1233"/>
   <unicode hex="203D"/>
   <outline>
@@ -14,17 +14,17 @@
       <point x="244" y="1407" type="line" name="dh01"/>
       <point x="371" y="1484"/>
       <point x="499" y="1520"/>
-      <point x="628" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="628" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="882" y="1520"/>
       <point x="1040" y="1381"/>
-      <point x="1040" y="1168" type="curve" name="dh03" smooth="yes"/>
+      <point x="1040" y="1168" type="curve" smooth="yes" name="dh03"/>
       <point x="1040" y="1071"/>
       <point x="1007" y="990"/>
       <point x="879" y="868" type="curve"/>
       <point x="791" y="782" type="line" smooth="yes"/>
       <point x="696" y="689"/>
       <point x="684" y="652"/>
-      <point x="684" y="571" type="curve" name="sh02" smooth="yes"/>
+      <point x="684" y="571" type="curve" smooth="yes" name="sh02"/>
       <point x="684" y="401" type="line" name="hr01"/>
       <point x="494" y="401" type="line"/>
     </contour>
@@ -32,32 +32,32 @@
       <point x="729" y="961" type="line" smooth="yes"/>
       <point x="805" y="1037"/>
       <point x="838" y="1081"/>
-      <point x="838" y="1156" type="curve" name="dh02" smooth="yes"/>
+      <point x="838" y="1156" type="curve" smooth="yes" name="dh02"/>
       <point x="838" y="1277"/>
       <point x="752" y="1327"/>
       <point x="684" y="1346" type="curve" name="hr02"/>
       <point x="684" y="916" type="line"/>
     </contour>
     <contour>
-      <point x="593" y="-40" type="curve" name="dv01" smooth="yes"/>
+      <point x="593" y="-40" type="curve" smooth="yes" name="dv01"/>
       <point x="552" y="-40"/>
       <point x="517" y="-26"/>
       <point x="489" y="2" type="curve" smooth="yes"/>
       <point x="460" y="31"/>
       <point x="446" y="70"/>
-      <point x="446" y="113" type="curve" name="ih01" smooth="yes"/>
+      <point x="446" y="113" type="curve" smooth="yes" name="ih01"/>
       <point x="446" y="156"/>
       <point x="460" y="194"/>
       <point x="488" y="222" type="curve" smooth="yes"/>
       <point x="511" y="245"/>
       <point x="547" y="264"/>
-      <point x="592" y="264" type="curve" name="dv02" smooth="yes"/>
+      <point x="592" y="264" type="curve" smooth="yes" name="dv02"/>
       <point x="635" y="264"/>
       <point x="669" y="249"/>
-      <point x="696" y="222" type="curve" name="hr03" smooth="yes"/>
+      <point x="696" y="222" type="curve" smooth="yes" name="hr03"/>
       <point x="724" y="194"/>
       <point x="738" y="158"/>
-      <point x="738" y="113" type="curve" name="sh03" smooth="yes"/>
+      <point x="738" y="113" type="curve" smooth="yes" name="sh03"/>
       <point x="738" y="68"/>
       <point x="724" y="31"/>
       <point x="696" y="3" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni203E_.glif b/source/Hack-Regular.ufo/glyphs/uni203E_.glif
index 6d2082d0e..192075e4b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni203E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni203E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni203E" format="1">
+<glyph name="uni203E" format="2">
   <advance width="1233"/>
   <unicode hex="203E"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni203F_.glif b/source/Hack-Regular.ufo/glyphs/uni203F_.glif
index 4f627beb4..737d32993 100644
--- a/source/Hack-Regular.ufo/glyphs/uni203F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni203F_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni203F" format="1">
+<glyph name="uni203F" format="2">
   <advance width="1233"/>
   <unicode hex="203F"/>
   <outline>
     <contour>
-      <point x="614" y="-485" type="curve" name="hr00" smooth="yes"/>
+      <point x="614" y="-485" type="curve" smooth="yes" name="hr00"/>
       <point x="390" y="-485"/>
       <point x="169" y="-409"/>
       <point x="-68" y="-249" type="curve"/>
@@ -14,7 +14,7 @@
       <point x="273" y="-279" type="curve" smooth="yes"/>
       <point x="386" y="-314"/>
       <point x="493" y="-331"/>
-      <point x="613" y="-331" type="curve" name="dv01" smooth="yes"/>
+      <point x="613" y="-331" type="curve" smooth="yes" name="dv01"/>
       <point x="849" y="-331"/>
       <point x="1069" y="-263"/>
       <point x="1300" y="-123" type="curve" name="av02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2045.glif b/source/Hack-Regular.ufo/glyphs/uni2045.glif
index ce0dc432c..c64173be4 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2045.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2045.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2045" format="1">
+<glyph name="uni2045" format="2">
   <advance width="1233"/>
   <unicode hex="2045"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2046.glif b/source/Hack-Regular.ufo/glyphs/uni2046.glif
index 96b995a6a..c33fc0f64 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2046.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2046.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2046" format="1">
+<glyph name="uni2046" format="2">
   <advance width="1233"/>
   <unicode hex="2046"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2047.glif b/source/Hack-Regular.ufo/glyphs/uni2047.glif
index 8ebc9d484..97301a361 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2047.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2047.glif
@@ -1,98 +1,98 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2047" format="1">
+<glyph name="uni2047" format="2">
   <advance width="1233"/>
   <unicode hex="2047"/>
   <outline>
     <contour>
-      <point x="168" y="555" type="line" name="ih01" smooth="yes"/>
+      <point x="168" y="555" type="line" smooth="yes" name="ih01"/>
       <point x="168" y="689"/>
       <point x="190" y="763"/>
       <point x="262" y="872" type="curve" smooth="yes"/>
       <point x="321" y="961" type="line" smooth="yes"/>
       <point x="373" y="1040"/>
       <point x="391" y="1092"/>
-      <point x="391" y="1151" type="curve" name="ih02" smooth="yes"/>
+      <point x="391" y="1151" type="curve" smooth="yes" name="ih02"/>
       <point x="391" y="1260"/>
       <point x="330" y="1313"/>
-      <point x="242" y="1313" type="curve" name="dv03" smooth="yes"/>
+      <point x="242" y="1313" type="curve" smooth="yes" name="dv03"/>
       <point x="171" y="1313"/>
       <point x="115" y="1277"/>
       <point x="34" y="1190" type="curve" name="hr01"/>
       <point x="34" y="1407" type="line" name="hr02"/>
       <point x="120" y="1488"/>
       <point x="194" y="1521"/>
-      <point x="307" y="1521" type="curve" name="dv04" smooth="yes"/>
+      <point x="307" y="1521" type="curve" smooth="yes" name="dv04"/>
       <point x="310" y="1521"/>
       <point x="318" y="1521"/>
-      <point x="329" y="1520" type="curve" name="sv01" smooth="yes"/>
+      <point x="329" y="1520" type="curve" smooth="yes" name="sv01"/>
       <point x="500" y="1505"/>
       <point x="593" y="1387"/>
-      <point x="593" y="1170" type="curve" name="sh01" smooth="yes"/>
+      <point x="593" y="1170" type="curve" smooth="yes" name="sh01"/>
       <point x="593" y="1068"/>
       <point x="572" y="994"/>
       <point x="489" y="868" type="curve" smooth="yes"/>
       <point x="432" y="782" type="line" smooth="yes"/>
       <point x="372" y="690"/>
       <point x="362" y="652"/>
-      <point x="362" y="571" type="curve" name="sh02" smooth="yes"/>
+      <point x="362" y="571" type="curve" smooth="yes" name="sh02"/>
       <point x="362" y="401" type="line"/>
       <point x="168" y="401" type="line"/>
     </contour>
     <contour>
-      <point x="776" y="555" type="line" name="ih03" smooth="yes"/>
+      <point x="776" y="555" type="line" smooth="yes" name="ih03"/>
       <point x="776" y="689"/>
       <point x="798" y="763"/>
       <point x="870" y="872" type="curve" smooth="yes"/>
       <point x="929" y="961" type="line" smooth="yes"/>
       <point x="981" y="1040"/>
       <point x="999" y="1092"/>
-      <point x="999" y="1151" type="curve" name="hr03" smooth="yes"/>
+      <point x="999" y="1151" type="curve" smooth="yes" name="hr03"/>
       <point x="999" y="1260"/>
       <point x="938" y="1313"/>
-      <point x="850" y="1313" type="curve" name="sv02" smooth="yes"/>
+      <point x="850" y="1313" type="curve" smooth="yes" name="sv02"/>
       <point x="779" y="1313"/>
       <point x="723" y="1277"/>
       <point x="642" y="1190" type="curve" name="ih04"/>
       <point x="642" y="1407" type="line"/>
       <point x="728" y="1488"/>
       <point x="802" y="1521"/>
-      <point x="915" y="1521" type="curve" name="sv03" smooth="yes"/>
+      <point x="915" y="1521" type="curve" smooth="yes" name="sv03"/>
       <point x="918" y="1521"/>
       <point x="926" y="1521"/>
-      <point x="937" y="1520" type="curve" name="sv04" smooth="yes"/>
+      <point x="937" y="1520" type="curve" smooth="yes" name="sv04"/>
       <point x="1108" y="1505"/>
       <point x="1201" y="1387"/>
-      <point x="1201" y="1170" type="curve" name="sh03" smooth="yes"/>
+      <point x="1201" y="1170" type="curve" smooth="yes" name="sh03"/>
       <point x="1201" y="1068"/>
       <point x="1180" y="994"/>
       <point x="1097" y="868" type="curve" smooth="yes"/>
       <point x="1040" y="782" type="line" smooth="yes"/>
       <point x="980" y="690"/>
       <point x="970" y="652"/>
-      <point x="970" y="571" type="curve" name="sh04" smooth="yes"/>
+      <point x="970" y="571" type="curve" smooth="yes" name="sh04"/>
       <point x="970" y="401" type="line"/>
       <point x="776" y="401" type="line"/>
     </contour>
     <contour>
-      <point x="269" y="-40" type="curve" name="dv01" smooth="yes"/>
+      <point x="269" y="-40" type="curve" smooth="yes" name="dv01"/>
       <point x="228" y="-40"/>
       <point x="193" y="-26"/>
       <point x="165" y="2" type="curve" smooth="yes"/>
       <point x="136" y="31"/>
       <point x="122" y="70"/>
-      <point x="122" y="113" type="curve" name="dh01" smooth="yes"/>
+      <point x="122" y="113" type="curve" smooth="yes" name="dh01"/>
       <point x="122" y="156"/>
       <point x="136" y="194"/>
       <point x="164" y="222" type="curve" smooth="yes"/>
       <point x="187" y="245"/>
       <point x="223" y="264"/>
-      <point x="268" y="264" type="curve" name="dv02" smooth="yes"/>
+      <point x="268" y="264" type="curve" smooth="yes" name="dv02"/>
       <point x="311" y="264"/>
       <point x="345" y="249"/>
       <point x="372" y="222" type="curve" smooth="yes"/>
       <point x="400" y="194"/>
       <point x="414" y="158"/>
-      <point x="414" y="113" type="curve" name="dh02" smooth="yes"/>
+      <point x="414" y="113" type="curve" smooth="yes" name="dh02"/>
       <point x="414" y="68"/>
       <point x="400" y="31"/>
       <point x="372" y="3" type="curve" smooth="yes"/>
@@ -100,25 +100,25 @@
       <point x="309" y="-40"/>
     </contour>
     <contour>
-      <point x="881" y="-40" type="curve" name="sv05" smooth="yes"/>
+      <point x="881" y="-40" type="curve" smooth="yes" name="sv05"/>
       <point x="840" y="-40"/>
       <point x="805" y="-26"/>
       <point x="777" y="2" type="curve" smooth="yes"/>
       <point x="748" y="31"/>
       <point x="734" y="70"/>
-      <point x="734" y="113" type="curve" name="dh03" smooth="yes"/>
+      <point x="734" y="113" type="curve" smooth="yes" name="dh03"/>
       <point x="734" y="156"/>
       <point x="748" y="194"/>
       <point x="776" y="222" type="curve" smooth="yes"/>
       <point x="799" y="245"/>
       <point x="835" y="264"/>
-      <point x="880" y="264" type="curve" name="sv06" smooth="yes"/>
+      <point x="880" y="264" type="curve" smooth="yes" name="sv06"/>
       <point x="923" y="264"/>
       <point x="957" y="249"/>
       <point x="984" y="222" type="curve" smooth="yes"/>
       <point x="1012" y="194"/>
       <point x="1026" y="158"/>
-      <point x="1026" y="113" type="curve" name="dh04" smooth="yes"/>
+      <point x="1026" y="113" type="curve" smooth="yes" name="dh04"/>
       <point x="1026" y="68"/>
       <point x="1012" y="31"/>
       <point x="984" y="3" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2048.glif b/source/Hack-Regular.ufo/glyphs/uni2048.glif
index 9a90c952d..bb49f79d7 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2048.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2048.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2048" format="1">
+<glyph name="uni2048" format="2">
   <advance width="1233"/>
   <unicode hex="2048"/>
   <outline>
     <contour>
-      <point x="168" y="555" type="line" name="ih01" smooth="yes"/>
+      <point x="168" y="555" type="line" smooth="yes" name="ih01"/>
       <point x="168" y="689"/>
       <point x="190" y="763"/>
       <point x="262" y="872" type="curve" smooth="yes"/>
       <point x="321" y="961" type="line" smooth="yes"/>
       <point x="373" y="1040"/>
       <point x="391" y="1092"/>
-      <point x="391" y="1151" type="curve" name="ih02" smooth="yes"/>
+      <point x="391" y="1151" type="curve" smooth="yes" name="ih02"/>
       <point x="391" y="1260"/>
       <point x="330" y="1313"/>
-      <point x="242" y="1313" type="curve" name="sv01" smooth="yes"/>
+      <point x="242" y="1313" type="curve" smooth="yes" name="sv01"/>
       <point x="171" y="1313"/>
       <point x="115" y="1277"/>
       <point x="34" y="1190" type="curve"/>
       <point x="34" y="1407" type="line"/>
       <point x="120" y="1488"/>
       <point x="194" y="1521"/>
-      <point x="307" y="1521" type="curve" name="av01" smooth="yes"/>
+      <point x="307" y="1521" type="curve" smooth="yes" name="av01"/>
       <point x="310" y="1521"/>
       <point x="318" y="1521"/>
-      <point x="329" y="1520" type="curve" name="av02" smooth="yes"/>
+      <point x="329" y="1520" type="curve" smooth="yes" name="av02"/>
       <point x="500" y="1505"/>
       <point x="593" y="1387"/>
-      <point x="593" y="1170" type="curve" name="sh01" smooth="yes"/>
+      <point x="593" y="1170" type="curve" smooth="yes" name="sh01"/>
       <point x="593" y="1068"/>
       <point x="572" y="994"/>
       <point x="489" y="868" type="curve" smooth="yes"/>
       <point x="432" y="782" type="line" smooth="yes"/>
       <point x="372" y="690"/>
       <point x="362" y="652"/>
-      <point x="362" y="571" type="curve" name="sh02" smooth="yes"/>
+      <point x="362" y="571" type="curve" smooth="yes" name="sh02"/>
       <point x="362" y="401" type="line"/>
       <point x="168" y="401" type="line" name="hr01"/>
     </contour>
@@ -47,25 +47,25 @@
       <point x="858" y="486" type="line"/>
     </contour>
     <contour>
-      <point x="273" y="-40" type="curve" name="dv01" smooth="yes"/>
+      <point x="273" y="-40" type="curve" smooth="yes" name="dv01"/>
       <point x="232" y="-40"/>
       <point x="197" y="-26"/>
       <point x="169" y="2" type="curve" smooth="yes"/>
       <point x="140" y="31"/>
       <point x="126" y="70"/>
-      <point x="126" y="113" type="curve" name="dh01" smooth="yes"/>
+      <point x="126" y="113" type="curve" smooth="yes" name="dh01"/>
       <point x="126" y="156"/>
       <point x="140" y="194"/>
-      <point x="168" y="222" type="curve" name="hr03" smooth="yes"/>
+      <point x="168" y="222" type="curve" smooth="yes" name="hr03"/>
       <point x="191" y="245"/>
       <point x="227" y="264"/>
-      <point x="272" y="264" type="curve" name="dv02" smooth="yes"/>
+      <point x="272" y="264" type="curve" smooth="yes" name="dv02"/>
       <point x="315" y="264"/>
       <point x="349" y="249"/>
       <point x="376" y="222" type="curve" smooth="yes"/>
       <point x="404" y="194"/>
       <point x="418" y="158"/>
-      <point x="418" y="113" type="curve" name="dh02" smooth="yes"/>
+      <point x="418" y="113" type="curve" smooth="yes" name="dh02"/>
       <point x="418" y="68"/>
       <point x="404" y="31"/>
       <point x="376" y="3" type="curve" smooth="yes"/>
@@ -73,25 +73,25 @@
       <point x="313" y="-40"/>
     </contour>
     <contour>
-      <point x="915" y="-40" type="curve" name="sv02" smooth="yes"/>
+      <point x="915" y="-40" type="curve" smooth="yes" name="sv02"/>
       <point x="874" y="-40"/>
       <point x="839" y="-26"/>
       <point x="811" y="2" type="curve" smooth="yes"/>
       <point x="782" y="31"/>
       <point x="768" y="70"/>
-      <point x="768" y="113" type="curve" name="sh03" smooth="yes"/>
+      <point x="768" y="113" type="curve" smooth="yes" name="sh03"/>
       <point x="768" y="156"/>
       <point x="782" y="194"/>
       <point x="810" y="222" type="curve" smooth="yes"/>
       <point x="833" y="245"/>
       <point x="869" y="264"/>
-      <point x="914" y="264" type="curve" name="sv03" smooth="yes"/>
+      <point x="914" y="264" type="curve" smooth="yes" name="sv03"/>
       <point x="957" y="264"/>
       <point x="991" y="249"/>
       <point x="1018" y="222" type="curve" smooth="yes"/>
       <point x="1046" y="194"/>
       <point x="1060" y="158"/>
-      <point x="1060" y="113" type="curve" name="sh04" smooth="yes"/>
+      <point x="1060" y="113" type="curve" smooth="yes" name="sh04"/>
       <point x="1060" y="68"/>
       <point x="1046" y="31"/>
       <point x="1018" y="3" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2049.glif b/source/Hack-Regular.ufo/glyphs/uni2049.glif
index d50f7b1a0..015f37970 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2049.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2049.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2049" format="1">
+<glyph name="uni2049" format="2">
   <advance width="1233"/>
   <unicode hex="2049"/>
   <outline>
     <contour>
-      <point x="776" y="555" type="line" name="ih01" smooth="yes"/>
+      <point x="776" y="555" type="line" smooth="yes" name="ih01"/>
       <point x="776" y="689"/>
       <point x="798" y="763"/>
       <point x="870" y="872" type="curve" smooth="yes"/>
       <point x="929" y="961" type="line" smooth="yes"/>
       <point x="981" y="1040"/>
       <point x="999" y="1092"/>
-      <point x="999" y="1151" type="curve" name="ih02" smooth="yes"/>
+      <point x="999" y="1151" type="curve" smooth="yes" name="ih02"/>
       <point x="999" y="1260"/>
       <point x="938" y="1313"/>
-      <point x="850" y="1313" type="curve" name="dv03" smooth="yes"/>
+      <point x="850" y="1313" type="curve" smooth="yes" name="dv03"/>
       <point x="779" y="1313"/>
       <point x="723" y="1277"/>
       <point x="642" y="1190" type="curve" name="hr01"/>
       <point x="642" y="1407" type="line" name="hr02"/>
       <point x="728" y="1488"/>
       <point x="802" y="1521"/>
-      <point x="915" y="1521" type="curve" name="dv04" smooth="yes"/>
+      <point x="915" y="1521" type="curve" smooth="yes" name="dv04"/>
       <point x="918" y="1521"/>
       <point x="926" y="1521"/>
-      <point x="937" y="1520" type="curve" name="sv01" smooth="yes"/>
+      <point x="937" y="1520" type="curve" smooth="yes" name="sv01"/>
       <point x="1108" y="1505"/>
       <point x="1201" y="1387"/>
-      <point x="1201" y="1170" type="curve" name="sh01" smooth="yes"/>
+      <point x="1201" y="1170" type="curve" smooth="yes" name="sh01"/>
       <point x="1201" y="1068"/>
       <point x="1180" y="994"/>
       <point x="1097" y="868" type="curve" smooth="yes"/>
       <point x="1040" y="782" type="line" smooth="yes"/>
       <point x="980" y="690"/>
       <point x="970" y="652"/>
-      <point x="970" y="571" type="curve" name="sh02" smooth="yes"/>
+      <point x="970" y="571" type="curve" smooth="yes" name="sh02"/>
       <point x="970" y="401" type="line"/>
       <point x="776" y="401" type="line"/>
     </contour>
@@ -47,25 +47,25 @@
       <point x="229" y="481" type="line"/>
     </contour>
     <contour>
-      <point x="312" y="-40" type="curve" name="dv01" smooth="yes"/>
+      <point x="312" y="-40" type="curve" smooth="yes" name="dv01"/>
       <point x="271" y="-40"/>
       <point x="236" y="-26"/>
       <point x="208" y="2" type="curve" smooth="yes"/>
       <point x="179" y="31"/>
       <point x="165" y="70"/>
-      <point x="165" y="113" type="curve" name="dh01" smooth="yes"/>
+      <point x="165" y="113" type="curve" smooth="yes" name="dh01"/>
       <point x="165" y="156"/>
       <point x="179" y="194"/>
       <point x="207" y="222" type="curve" smooth="yes"/>
       <point x="230" y="245"/>
       <point x="266" y="264"/>
-      <point x="311" y="264" type="curve" name="dv02" smooth="yes"/>
+      <point x="311" y="264" type="curve" smooth="yes" name="dv02"/>
       <point x="354" y="264"/>
       <point x="388" y="249"/>
       <point x="415" y="222" type="curve" smooth="yes"/>
       <point x="443" y="194"/>
       <point x="457" y="158"/>
-      <point x="457" y="113" type="curve" name="dh02" smooth="yes"/>
+      <point x="457" y="113" type="curve" smooth="yes" name="dh02"/>
       <point x="457" y="68"/>
       <point x="443" y="31"/>
       <point x="415" y="3" type="curve" smooth="yes"/>
@@ -73,25 +73,25 @@
       <point x="352" y="-40"/>
     </contour>
     <contour>
-      <point x="881" y="-40" type="curve" name="sv02" smooth="yes"/>
+      <point x="881" y="-40" type="curve" smooth="yes" name="sv02"/>
       <point x="840" y="-40"/>
       <point x="805" y="-26"/>
       <point x="777" y="2" type="curve" smooth="yes"/>
       <point x="748" y="31"/>
       <point x="734" y="70"/>
-      <point x="734" y="113" type="curve" name="hr04" smooth="yes"/>
+      <point x="734" y="113" type="curve" smooth="yes" name="hr04"/>
       <point x="734" y="156"/>
       <point x="748" y="194"/>
       <point x="776" y="222" type="curve" smooth="yes"/>
       <point x="799" y="245"/>
       <point x="835" y="264"/>
-      <point x="880" y="264" type="curve" name="sv03" smooth="yes"/>
+      <point x="880" y="264" type="curve" smooth="yes" name="sv03"/>
       <point x="923" y="264"/>
       <point x="957" y="249"/>
       <point x="984" y="222" type="curve" smooth="yes"/>
       <point x="1012" y="194"/>
       <point x="1026" y="158"/>
-      <point x="1026" y="113" type="curve" name="dh03" smooth="yes"/>
+      <point x="1026" y="113" type="curve" smooth="yes" name="dh03"/>
       <point x="1026" y="68"/>
       <point x="1012" y="31"/>
       <point x="984" y="3" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni204B_.glif b/source/Hack-Regular.ufo/glyphs/uni204B_.glif
index 4ebe45750..c2cfa096f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni204B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni204B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni204B" format="1">
+<glyph name="uni204B" format="2">
   <advance width="1233"/>
   <unicode hex="204B"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni205F_.glif b/source/Hack-Regular.ufo/glyphs/uni205F_.glif
index 94f3ccd11..5eac8ab7f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni205F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni205F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni205F" format="1">
+<glyph name="uni205F" format="2">
   <advance width="1233"/>
   <unicode hex="205F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2070.glif b/source/Hack-Regular.ufo/glyphs/uni2070.glif
index a759d04b5..9b16ef576 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2070.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2070.glif
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2070" format="1">
+<glyph name="uni2070" format="2">
   <advance width="1233"/>
   <unicode hex="2070"/>
   <outline>
     <contour>
-      <point x="616" y="1120" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1120" type="curve" smooth="yes" name="dv01"/>
       <point x="415" y="1120"/>
       <point x="317" y="1266"/>
-      <point x="317" y="1553" type="curve" name="dh01" smooth="yes"/>
+      <point x="317" y="1553" type="curve" smooth="yes" name="dh01"/>
       <point x="317" y="1842"/>
       <point x="417" y="1987"/>
-      <point x="616" y="1987" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1987" type="curve" smooth="yes" name="dv03"/>
       <point x="816" y="1987"/>
       <point x="917" y="1842"/>
-      <point x="917" y="1553" type="curve" name="dh06" smooth="yes"/>
+      <point x="917" y="1553" type="curve" smooth="yes" name="dh06"/>
       <point x="917" y="1266"/>
       <point x="816" y="1120"/>
     </contour>
     <contour>
-      <point x="616" y="1209" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1209" type="curve" smooth="yes" name="dv02"/>
       <point x="733" y="1209"/>
       <point x="791" y="1320"/>
-      <point x="791" y="1553" type="curve" name="dh05" smooth="yes"/>
+      <point x="791" y="1553" type="curve" smooth="yes" name="dh05"/>
       <point x="791" y="1788"/>
       <point x="733" y="1898"/>
-      <point x="616" y="1898" type="curve" name="hr01" smooth="yes"/>
+      <point x="616" y="1898" type="curve" smooth="yes" name="hr01"/>
       <point x="499" y="1898"/>
       <point x="442" y="1788"/>
-      <point x="442" y="1553" type="curve" name="dh02" smooth="yes"/>
+      <point x="442" y="1553" type="curve" smooth="yes" name="dh02"/>
       <point x="442" y="1320"/>
       <point x="499" y="1209"/>
     </contour>
@@ -38,13 +38,13 @@
       <point x="557" y="1502" type="curve" smooth="yes"/>
       <point x="542" y="1516"/>
       <point x="534" y="1534"/>
-      <point x="534" y="1555" type="curve" name="dh03" smooth="yes"/>
+      <point x="534" y="1555" type="curve" smooth="yes" name="dh03"/>
       <point x="534" y="1598"/>
       <point x="570" y="1632"/>
-      <point x="615" y="1632" type="curve" name="sv01" smooth="yes"/>
+      <point x="615" y="1632" type="curve" smooth="yes" name="sv01"/>
       <point x="664" y="1632"/>
       <point x="699" y="1598"/>
-      <point x="699" y="1555" type="curve" name="dh04" smooth="yes"/>
+      <point x="699" y="1555" type="curve" smooth="yes" name="dh04"/>
       <point x="699" y="1511"/>
       <point x="662" y="1481"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2074.glif b/source/Hack-Regular.ufo/glyphs/uni2074.glif
index c6713eef1..bfd3e1a7c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2074.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2074.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2074" format="1">
+<glyph name="uni2074" format="2">
   <advance width="1233"/>
   <unicode hex="2074"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2075.glif b/source/Hack-Regular.ufo/glyphs/uni2075.glif
index 59ba52731..88001e770 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2075.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2075.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2075" format="1">
+<glyph name="uni2075" format="2">
   <advance width="1233"/>
   <unicode hex="2075"/>
   <outline>
     <contour>
-      <point x="563" y="1084" type="curve" name="hr00" smooth="yes"/>
+      <point x="563" y="1084" type="curve" smooth="yes" name="hr00"/>
       <point x="464" y="1084"/>
       <point x="383" y="1096"/>
       <point x="319" y="1120" type="curve"/>
       <point x="319" y="1234" type="line"/>
       <point x="388" y="1199"/>
       <point x="471" y="1179"/>
-      <point x="551" y="1179" type="curve" name="dv01" smooth="yes"/>
+      <point x="551" y="1179" type="curve" smooth="yes" name="dv01"/>
       <point x="691" y="1179"/>
       <point x="767" y="1247"/>
-      <point x="767" y="1368" type="curve" name="ah01" smooth="yes"/>
+      <point x="767" y="1368" type="curve" smooth="yes" name="ah01"/>
       <point x="767" y="1488"/>
       <point x="685" y="1557"/>
-      <point x="548" y="1557" type="curve" name="dv04" smooth="yes"/>
+      <point x="548" y="1557" type="curve" smooth="yes" name="dv04"/>
       <point x="481" y="1557"/>
       <point x="418" y="1543"/>
       <point x="358" y="1516" type="curve" name="sh01"/>
@@ -28,10 +28,10 @@
       <point x="473" y="1635" type="line" name="sh02"/>
       <point x="506" y="1646"/>
       <point x="542" y="1652"/>
-      <point x="581" y="1652" type="curve" name="dv05" smooth="yes"/>
+      <point x="581" y="1652" type="curve" smooth="yes" name="dv05"/>
       <point x="772" y="1652"/>
       <point x="893" y="1543"/>
-      <point x="893" y="1368" type="curve" name="sh03" smooth="yes"/>
+      <point x="893" y="1368" type="curve" smooth="yes" name="sh03"/>
       <point x="893" y="1192"/>
       <point x="767" y="1084"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2076.glif b/source/Hack-Regular.ufo/glyphs/uni2076.glif
index 33dbe0574..8c1bc4c3b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2076.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2076.glif
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2076" format="1">
+<glyph name="uni2076" format="2">
   <advance width="1233"/>
   <unicode hex="2076"/>
   <outline>
     <contour>
-      <point x="640" y="1102" type="curve" name="hr00" smooth="yes"/>
+      <point x="640" y="1102" type="curve" smooth="yes" name="hr00"/>
       <point x="425" y="1102"/>
       <point x="329" y="1235"/>
-      <point x="329" y="1535" type="curve" name="sh01" smooth="yes"/>
+      <point x="329" y="1535" type="curve" smooth="yes" name="sh01"/>
       <point x="329" y="1820"/>
       <point x="451" y="1969"/>
-      <point x="680" y="1969" type="curve" name="dv03" smooth="yes"/>
+      <point x="680" y="1969" type="curve" smooth="yes" name="dv03"/>
       <point x="741" y="1969"/>
       <point x="804" y="1957"/>
       <point x="861" y="1936" type="curve"/>
       <point x="861" y="1832" type="line" name="ih01"/>
       <point x="809" y="1859"/>
       <point x="750" y="1874"/>
-      <point x="686" y="1874" type="curve" name="dv02" smooth="yes"/>
+      <point x="686" y="1874" type="curve" smooth="yes" name="dv02"/>
       <point x="526" y="1874"/>
       <point x="444" y="1766"/>
       <point x="444" y="1554" type="curve" name="ih02"/>
       <point x="487" y="1632"/>
       <point x="554" y="1671"/>
-      <point x="647" y="1671" type="curve" name="dv05" smooth="yes"/>
+      <point x="647" y="1671" type="curve" smooth="yes" name="dv05"/>
       <point x="828" y="1671"/>
       <point x="929" y="1570"/>
-      <point x="929" y="1386" type="curve" name="sh02" smooth="yes"/>
+      <point x="929" y="1386" type="curve" smooth="yes" name="sh02"/>
       <point x="929" y="1205"/>
       <point x="824" y="1102"/>
     </contour>
     <contour>
-      <point x="638" y="1190" type="curve" name="dv01" smooth="yes"/>
+      <point x="638" y="1190" type="curve" smooth="yes" name="dv01"/>
       <point x="749" y="1190"/>
       <point x="805" y="1255"/>
-      <point x="805" y="1386" type="curve" name="ah01" smooth="yes"/>
+      <point x="805" y="1386" type="curve" smooth="yes" name="ah01"/>
       <point x="805" y="1517"/>
       <point x="749" y="1582"/>
-      <point x="638" y="1582" type="curve" name="dv04" smooth="yes"/>
+      <point x="638" y="1582" type="curve" smooth="yes" name="dv04"/>
       <point x="530" y="1582"/>
       <point x="466" y="1510"/>
-      <point x="466" y="1386" type="curve" name="sh03" smooth="yes"/>
+      <point x="466" y="1386" type="curve" smooth="yes" name="sh03"/>
       <point x="466" y="1262"/>
       <point x="530" y="1190"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2077.glif b/source/Hack-Regular.ufo/glyphs/uni2077.glif
index 983d9ab0c..103d2e074 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2077.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2077.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2077" format="1">
+<glyph name="uni2077" format="2">
   <advance width="1233"/>
   <unicode hex="2077"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2078.glif b/source/Hack-Regular.ufo/glyphs/uni2078.glif
index 0ed90f81f..2d2f821a6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2078.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2078.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2078" format="1">
+<glyph name="uni2078" format="2">
   <advance width="1233"/>
   <unicode hex="2078"/>
   <outline>
     <contour>
-      <point x="616" y="1108" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="1108" type="curve" smooth="yes" name="hr00"/>
       <point x="428" y="1108"/>
       <point x="315" y="1198"/>
       <point x="315" y="1347" type="curve" smooth="yes"/>
@@ -13,10 +13,10 @@
       <point x="507" y="1568" type="curve" name="ih01"/>
       <point x="399" y="1592"/>
       <point x="337" y="1662"/>
-      <point x="337" y="1758" type="curve" name="sh01" smooth="yes"/>
+      <point x="337" y="1758" type="curve" smooth="yes" name="sh01"/>
       <point x="337" y="1890"/>
       <point x="444" y="1974"/>
-      <point x="616" y="1974" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1974" type="curve" smooth="yes" name="dv03"/>
       <point x="789" y="1974"/>
       <point x="896" y="1890"/>
       <point x="896" y="1758" type="curve" smooth="yes"/>
@@ -25,32 +25,32 @@
       <point x="726" y="1568" type="curve" name="ih02"/>
       <point x="851" y="1543"/>
       <point x="918" y="1468"/>
-      <point x="918" y="1348" type="curve" name="sh02" smooth="yes"/>
+      <point x="918" y="1348" type="curve" smooth="yes" name="sh02"/>
       <point x="918" y="1197"/>
       <point x="805" y="1108"/>
     </contour>
     <contour>
-      <point x="616" y="1609" type="curve" name="dv05" smooth="yes"/>
+      <point x="616" y="1609" type="curve" smooth="yes" name="dv05"/>
       <point x="717" y="1609"/>
       <point x="771" y="1658"/>
-      <point x="771" y="1747" type="curve" name="ah01" smooth="yes"/>
+      <point x="771" y="1747" type="curve" smooth="yes" name="ah01"/>
       <point x="771" y="1839"/>
       <point x="720" y="1887"/>
-      <point x="616" y="1887" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1887" type="curve" smooth="yes" name="dv02"/>
       <point x="516" y="1887"/>
       <point x="462" y="1839"/>
-      <point x="462" y="1747" type="curve" name="sh03" smooth="yes"/>
+      <point x="462" y="1747" type="curve" smooth="yes" name="sh03"/>
       <point x="462" y="1658"/>
       <point x="516" y="1609"/>
     </contour>
     <contour>
-      <point x="616" y="1196" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1196" type="curve" smooth="yes" name="dv01"/>
       <point x="729" y="1196"/>
       <point x="792" y="1255"/>
       <point x="792" y="1359" type="curve" smooth="yes"/>
       <point x="792" y="1463"/>
       <point x="728" y="1521"/>
-      <point x="616" y="1521" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="1521" type="curve" smooth="yes" name="dv04"/>
       <point x="503" y="1521"/>
       <point x="441" y="1463"/>
       <point x="441" y="1359" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2079.glif b/source/Hack-Regular.ufo/glyphs/uni2079.glif
index 52e9fee00..dcd171b9c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2079.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2079.glif
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2079" format="1">
+<glyph name="uni2079" format="2">
   <advance width="1233"/>
   <unicode hex="2079"/>
   <outline>
     <contour>
-      <point x="551" y="1113" type="curve" name="hr00" smooth="yes"/>
+      <point x="551" y="1113" type="curve" smooth="yes" name="hr00"/>
       <point x="491" y="1113"/>
       <point x="428" y="1125"/>
       <point x="371" y="1146" type="curve"/>
       <point x="371" y="1250" type="line" name="ih01"/>
       <point x="424" y="1223"/>
       <point x="482" y="1208"/>
-      <point x="546" y="1208" type="curve" name="dv01" smooth="yes"/>
+      <point x="546" y="1208" type="curve" smooth="yes" name="dv01"/>
       <point x="707" y="1208"/>
       <point x="788" y="1314"/>
       <point x="788" y="1527" type="curve" name="ih02"/>
       <point x="749" y="1451"/>
       <point x="677" y="1411"/>
-      <point x="585" y="1411" type="curve" name="sv01" smooth="yes"/>
+      <point x="585" y="1411" type="curve" smooth="yes" name="sv01"/>
       <point x="402" y="1411"/>
       <point x="304" y="1513"/>
-      <point x="304" y="1697" type="curve" name="sh01" smooth="yes"/>
+      <point x="304" y="1697" type="curve" smooth="yes" name="sh01"/>
       <point x="304" y="1878"/>
       <point x="408" y="1980"/>
-      <point x="592" y="1980" type="curve" name="dv03" smooth="yes"/>
+      <point x="592" y="1980" type="curve" smooth="yes" name="dv03"/>
       <point x="808" y="1980"/>
       <point x="904" y="1846"/>
-      <point x="904" y="1546" type="curve" name="sh03" smooth="yes"/>
+      <point x="904" y="1546" type="curve" smooth="yes" name="sh03"/>
       <point x="904" y="1263"/>
       <point x="782" y="1113"/>
     </contour>
     <contour>
-      <point x="595" y="1499" type="curve" name="at01" smooth="yes"/>
+      <point x="595" y="1499" type="curve" smooth="yes" name="at01"/>
       <point x="703" y="1499"/>
       <point x="766" y="1571"/>
-      <point x="766" y="1696" type="curve" name="ah01" smooth="yes"/>
+      <point x="766" y="1696" type="curve" smooth="yes" name="ah01"/>
       <point x="766" y="1820"/>
       <point x="703" y="1892"/>
-      <point x="595" y="1892" type="curve" name="dv02" smooth="yes"/>
+      <point x="595" y="1892" type="curve" smooth="yes" name="dv02"/>
       <point x="483" y="1892"/>
       <point x="427" y="1827"/>
-      <point x="427" y="1696" type="curve" name="sh02" smooth="yes"/>
+      <point x="427" y="1696" type="curve" smooth="yes" name="sh02"/>
       <point x="427" y="1565"/>
       <point x="483" y="1499"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni207A_.glif b/source/Hack-Regular.ufo/glyphs/uni207A_.glif
index 514c23ae1..efd7cca98 100644
--- a/source/Hack-Regular.ufo/glyphs/uni207A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni207A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni207A" format="1">
+<glyph name="uni207A" format="2">
   <advance width="1233"/>
   <unicode hex="207A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni207B_.glif b/source/Hack-Regular.ufo/glyphs/uni207B_.glif
index 9f2cf7f98..1c049cd17 100644
--- a/source/Hack-Regular.ufo/glyphs/uni207B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni207B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni207B" format="1">
+<glyph name="uni207B" format="2">
   <advance width="1233"/>
   <unicode hex="207B"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni207C_.glif b/source/Hack-Regular.ufo/glyphs/uni207C_.glif
index 81a6b744e..35f9f7665 100644
--- a/source/Hack-Regular.ufo/glyphs/uni207C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni207C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni207C" format="1">
+<glyph name="uni207C" format="2">
   <advance width="1233"/>
   <unicode hex="207C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni207D_.glif b/source/Hack-Regular.ufo/glyphs/uni207D_.glif
index 5e75ac289..b70dbdafa 100644
--- a/source/Hack-Regular.ufo/glyphs/uni207D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni207D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni207D" format="1">
+<glyph name="uni207D" format="2">
   <advance width="1233"/>
   <unicode hex="207D"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="660" y="517" type="line" name="hr00"/>
       <point x="535" y="696"/>
       <point x="472" y="860"/>
-      <point x="472" y="1028" type="curve" name="dh01" smooth="yes"/>
+      <point x="472" y="1028" type="curve" smooth="yes" name="dh01"/>
       <point x="472" y="1196"/>
       <point x="535" y="1361"/>
       <point x="660" y="1538" type="curve" name="av01"/>
       <point x="762" y="1538" type="line"/>
       <point x="650" y="1369"/>
       <point x="594" y="1199"/>
-      <point x="594" y="1028" type="curve" name="dh02" smooth="yes"/>
+      <point x="594" y="1028" type="curve" smooth="yes" name="dh02"/>
       <point x="594" y="856"/>
       <point x="649" y="690"/>
       <point x="762" y="517" type="curve" name="av02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni207E_.glif b/source/Hack-Regular.ufo/glyphs/uni207E_.glif
index 2f05fa5a4..46d9098f5 100644
--- a/source/Hack-Regular.ufo/glyphs/uni207E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni207E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni207E" format="1">
+<glyph name="uni207E" format="2">
   <advance width="1233"/>
   <unicode hex="207E"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="472" y="517" type="line" name="hr00"/>
       <point x="583" y="689"/>
       <point x="639" y="860"/>
-      <point x="639" y="1029" type="curve" name="dh01" smooth="yes"/>
+      <point x="639" y="1029" type="curve" smooth="yes" name="dh01"/>
       <point x="639" y="1198"/>
       <point x="583" y="1368"/>
       <point x="472" y="1538" type="curve" name="av01"/>
       <point x="573" y="1538" type="line"/>
       <point x="701" y="1361"/>
       <point x="761" y="1196"/>
-      <point x="761" y="1028" type="curve" name="dh02" smooth="yes"/>
+      <point x="761" y="1028" type="curve" smooth="yes" name="dh02"/>
       <point x="761" y="859"/>
       <point x="701" y="694"/>
       <point x="573" y="517" type="curve" name="av02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni208A_.glif b/source/Hack-Regular.ufo/glyphs/uni208A_.glif
index ff429d917..f1853f4f1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni208A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni208A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni208A" format="1">
+<glyph name="uni208A" format="2">
   <advance width="1233"/>
   <unicode hex="208A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni208B_.glif b/source/Hack-Regular.ufo/glyphs/uni208B_.glif
index 156a38d0e..acc31efe9 100644
--- a/source/Hack-Regular.ufo/glyphs/uni208B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni208B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni208B" format="1">
+<glyph name="uni208B" format="2">
   <advance width="1233"/>
   <unicode hex="208B"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni208C_.glif b/source/Hack-Regular.ufo/glyphs/uni208C_.glif
index e4ff3f621..f20c70c76 100644
--- a/source/Hack-Regular.ufo/glyphs/uni208C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni208C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni208C" format="1">
+<glyph name="uni208C" format="2">
   <advance width="1233"/>
   <unicode hex="208C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni208D_.glif b/source/Hack-Regular.ufo/glyphs/uni208D_.glif
index 7c8df8bc6..fa9cd20ac 100644
--- a/source/Hack-Regular.ufo/glyphs/uni208D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni208D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni208D" format="1">
+<glyph name="uni208D" format="2">
   <advance width="1233"/>
   <unicode hex="208D"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="660" y="-151" type="line" name="hr00"/>
       <point x="535" y="28"/>
       <point x="472" y="192"/>
-      <point x="472" y="360" type="curve" name="dh01" smooth="yes"/>
+      <point x="472" y="360" type="curve" smooth="yes" name="dh01"/>
       <point x="472" y="528"/>
       <point x="535" y="693"/>
       <point x="660" y="870" type="curve" name="av01"/>
       <point x="762" y="870" type="line"/>
       <point x="650" y="701"/>
       <point x="594" y="531"/>
-      <point x="594" y="360" type="curve" name="dh02" smooth="yes"/>
+      <point x="594" y="360" type="curve" smooth="yes" name="dh02"/>
       <point x="594" y="188"/>
       <point x="649" y="22"/>
       <point x="762" y="-151" type="curve" name="av02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni208E_.glif b/source/Hack-Regular.ufo/glyphs/uni208E_.glif
index 318feeb3e..7689a3d71 100644
--- a/source/Hack-Regular.ufo/glyphs/uni208E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni208E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni208E" format="1">
+<glyph name="uni208E" format="2">
   <advance width="1233"/>
   <unicode hex="208E"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="472" y="-151" type="line" name="hr00"/>
       <point x="583" y="21"/>
       <point x="639" y="192"/>
-      <point x="639" y="361" type="curve" name="dh01" smooth="yes"/>
+      <point x="639" y="361" type="curve" smooth="yes" name="dh01"/>
       <point x="639" y="530"/>
       <point x="583" y="700"/>
       <point x="472" y="870" type="curve" name="av01"/>
       <point x="573" y="870" type="line"/>
       <point x="701" y="693"/>
       <point x="761" y="528"/>
-      <point x="761" y="360" type="curve" name="dh02" smooth="yes"/>
+      <point x="761" y="360" type="curve" smooth="yes" name="dh02"/>
       <point x="761" y="191"/>
       <point x="701" y="26"/>
       <point x="573" y="-151" type="curve" name="av02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni20A_0.glif b/source/Hack-Regular.ufo/glyphs/uni20A_0.glif
index 59132c6aa..9ea2c62c6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni20A_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni20A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20A0" format="1">
+<glyph name="uni20A0" format="2">
   <advance width="1233"/>
   <unicode hex="20A0"/>
   <outline>
@@ -7,26 +7,26 @@
       <point x="687" y="428" type="line" name="hr00"/>
       <point x="607" y="355"/>
       <point x="521" y="317"/>
-      <point x="418" y="317" type="curve" name="dv01" smooth="yes"/>
+      <point x="418" y="317" type="curve" smooth="yes" name="dv01"/>
       <point x="167" y="317"/>
       <point x="10" y="544"/>
-      <point x="10" y="913" type="curve" name="sh01" smooth="yes"/>
+      <point x="10" y="913" type="curve" smooth="yes" name="sh01"/>
       <point x="10" y="1282"/>
       <point x="167" y="1509"/>
-      <point x="419" y="1509" type="curve" name="at01" smooth="yes"/>
+      <point x="419" y="1509" type="curve" smooth="yes" name="at01"/>
       <point x="520" y="1509"/>
       <point x="610" y="1472"/>
       <point x="687" y="1399" type="curve" name="sh02"/>
       <point x="687" y="1236" type="line" name="ih01"/>
       <point x="612" y="1332"/>
       <point x="524" y="1380"/>
-      <point x="424" y="1380" type="curve" name="sv01" smooth="yes"/>
+      <point x="424" y="1380" type="curve" smooth="yes" name="sv01"/>
       <point x="235" y="1380"/>
       <point x="130" y="1218"/>
-      <point x="130" y="913" type="curve" name="sh04" smooth="yes"/>
+      <point x="130" y="913" type="curve" smooth="yes" name="sh04"/>
       <point x="130" y="608"/>
       <point x="235" y="446"/>
-      <point x="424" y="446" type="curve" name="dv02" smooth="yes"/>
+      <point x="424" y="446" type="curve" smooth="yes" name="dv02"/>
       <point x="524" y="446"/>
       <point x="612" y="494"/>
       <point x="687" y="590" type="curve" name="ah01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni20A_2.glif b/source/Hack-Regular.ufo/glyphs/uni20A_2.glif
index 06573c1de..c1765db8b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni20A_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni20A_2.glif
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20A2" format="1">
+<glyph name="uni20A2" format="2">
   <advance width="1233"/>
   <unicode hex="20A2"/>
   <outline>
     <contour>
-      <point x="706" y="-28" type="curve" name="dv01" smooth="yes"/>
+      <point x="706" y="-28" type="curve" smooth="yes" name="dv01"/>
       <point x="329" y="-28"/>
       <point x="95" y="266"/>
-      <point x="95" y="746" type="curve" name="dh01" smooth="yes"/>
+      <point x="95" y="746" type="curve" smooth="yes" name="dh01"/>
       <point x="95" y="1225"/>
       <point x="328" y="1520"/>
-      <point x="708" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="708" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="859" y="1520"/>
       <point x="993" y="1473"/>
       <point x="1108" y="1378" type="curve" name="hr01"/>
       <point x="1108" y="1165" type="line" name="ih01"/>
       <point x="996" y="1290"/>
       <point x="872" y="1354"/>
-      <point x="715" y="1354" type="curve" name="sv01" smooth="yes"/>
+      <point x="715" y="1354" type="curve" smooth="yes" name="sv01"/>
       <point x="432" y="1354"/>
       <point x="274" y="1140"/>
-      <point x="274" y="743" type="curve" name="dh02" smooth="yes"/>
+      <point x="274" y="743" type="curve" smooth="yes" name="dh02"/>
       <point x="274" y="353"/>
       <point x="427" y="187"/>
       <point x="615" y="147" type="curve" name="dh03"/>
@@ -29,17 +29,17 @@
       <point x="755" y="851" type="line" name="hr02"/>
       <point x="812" y="972"/>
       <point x="907" y="1032"/>
-      <point x="1038" y="1032" type="curve" name="sv02" smooth="yes"/>
+      <point x="1038" y="1032" type="curve" smooth="yes" name="sv02"/>
       <point x="1062" y="1032"/>
       <point x="1084" y="1030"/>
       <point x="1112" y="1023" type="curve" name="sh02"/>
       <point x="1113" y="853" type="line"/>
       <point x="1082" y="874"/>
       <point x="1044" y="884"/>
-      <point x="1001" y="884" type="curve" name="dv02" smooth="yes"/>
+      <point x="1001" y="884" type="curve" smooth="yes" name="dv02"/>
       <point x="844" y="884"/>
       <point x="755" y="760"/>
-      <point x="755" y="531" type="curve" name="hr03" smooth="yes"/>
+      <point x="755" y="531" type="curve" smooth="yes" name="hr03"/>
       <point x="755" y="138" type="line" name="dh04"/>
       <point x="874" y="147"/>
       <point x="995" y="199"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni20A_5.glif b/source/Hack-Regular.ufo/glyphs/uni20A_5.glif
index 7bfbc068a..f1b5d42e2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni20A_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni20A_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20A5" format="1">
+<glyph name="uni20A5" format="2">
   <advance width="1233"/>
   <unicode hex="20A5"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="507" y="937" type="curve" smooth="yes"/>
       <point x="490" y="972"/>
       <point x="462" y="993"/>
-      <point x="406" y="993" type="curve" name="dv01" smooth="yes"/>
+      <point x="406" y="993" type="curve" smooth="yes" name="dv01"/>
       <point x="347" y="993"/>
       <point x="322" y="967"/>
       <point x="306" y="932" type="curve" smooth="yes"/>
@@ -24,7 +24,7 @@
       <point x="276" y="1024" type="line" name="sh01"/>
       <point x="323" y="1108"/>
       <point x="387" y="1147"/>
-      <point x="475" y="1147" type="curve" name="dv02" smooth="yes"/>
+      <point x="475" y="1147" type="curve" smooth="yes" name="dv02"/>
       <point x="574" y="1147"/>
       <point x="625" y="1098"/>
       <point x="654" y="1050" type="curve" name="ih01"/>
@@ -33,7 +33,7 @@
       <point x="778" y="1122" type="line" name="ih02"/>
       <point x="809" y="1139"/>
       <point x="846" y="1147"/>
-      <point x="889" y="1147" type="curve" name="sv01" smooth="yes"/>
+      <point x="889" y="1147" type="curve" smooth="yes" name="sv01"/>
       <point x="974" y="1147"/>
       <point x="1041" y="1115"/>
       <point x="1080" y="1043" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="940" y="936" type="curve" name="hr01"/>
       <point x="925" y="971"/>
       <point x="897" y="993"/>
-      <point x="841" y="993" type="curve" name="sv02" smooth="yes"/>
+      <point x="841" y="993" type="curve" smooth="yes" name="sv02"/>
       <point x="790" y="993"/>
       <point x="756" y="975"/>
       <point x="736" y="932" type="curve" smooth="yes"/>
       <point x="713" y="885"/>
       <point x="705" y="800"/>
-      <point x="705" y="641" type="curve" name="dh04" smooth="yes"/>
+      <point x="705" y="641" type="curve" smooth="yes" name="dh04"/>
       <point x="705" y="0" type="line" name="ab01"/>
       <point x="537" y="0" type="line" name="sh02"/>
       <point x="537" y="176" type="line" name="hr02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni20A_6.glif b/source/Hack-Regular.ufo/glyphs/uni20A_6.glif
index 47ef421a8..11f9d366b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni20A_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni20A_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20A6" format="1">
+<glyph name="uni20A6" format="2">
   <advance width="1233"/>
   <unicode hex="20A6"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni20A_8.glif b/source/Hack-Regular.ufo/glyphs/uni20A_8.glif
index 0741b9bdd..74842ba0e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni20A_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni20A_8.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20A8" format="1">
+<glyph name="uni20A8" format="2">
   <advance width="1233"/>
   <unicode hex="20A8"/>
   <outline>
     <contour>
-      <point x="928" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="928" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="884" y="-29"/>
       <point x="849" y="-22"/>
-      <point x="809" y="-11" type="curve" name="ab01" smooth="yes"/>
+      <point x="809" y="-11" type="curve" smooth="yes" name="ab01"/>
       <point x="782" y="-4"/>
       <point x="771" y="0"/>
       <point x="752" y="7" type="curve" name="ih01"/>
@@ -16,15 +16,15 @@
       <point x="493" y="383" type="line"/>
       <point x="429" y="580"/>
       <point x="385" y="631"/>
-      <point x="280" y="631" type="curve" name="dv03" smooth="yes"/>
+      <point x="280" y="631" type="curve" smooth="yes" name="dv03"/>
       <point x="139" y="631" type="line"/>
       <point x="139" y="0" type="line" name="dh02"/>
       <point x="10" y="0" type="line" name="dh01"/>
       <point x="10" y="1493" type="line" name="at01"/>
-      <point x="302" y="1493" type="line" name="hr01" smooth="yes"/>
+      <point x="302" y="1493" type="line" smooth="yes" name="hr01"/>
       <point x="522" y="1493"/>
       <point x="627" y="1348"/>
-      <point x="627" y="1071" type="curve" name="dh04" smooth="yes"/>
+      <point x="627" y="1071" type="curve" smooth="yes" name="dh04"/>
       <point x="627" y="866"/>
       <point x="570" y="749"/>
       <point x="463" y="700" type="curve" name="ih03"/>
@@ -34,48 +34,48 @@
       <point x="681" y="228" type="line"/>
       <point x="765" y="160"/>
       <point x="847" y="125"/>
-      <point x="932" y="125" type="curve" name="sv01" smooth="yes"/>
+      <point x="932" y="125" type="curve" smooth="yes" name="sv01"/>
       <point x="1043" y="125"/>
       <point x="1104" y="183"/>
-      <point x="1104" y="304" type="curve" name="hr02" smooth="yes"/>
+      <point x="1104" y="304" type="curve" smooth="yes" name="hr02"/>
       <point x="1104" y="408"/>
       <point x="1057" y="442"/>
       <point x="930" y="487" type="curve" smooth="yes"/>
       <point x="889" y="502" type="line"/>
       <point x="741" y="550"/>
       <point x="682" y="644"/>
-      <point x="682" y="815" type="curve" name="dh05" smooth="yes"/>
+      <point x="682" y="815" type="curve" smooth="yes" name="dh05"/>
       <point x="682" y="1030"/>
       <point x="776" y="1147"/>
-      <point x="963" y="1147" type="curve" name="dv02" smooth="yes"/>
+      <point x="963" y="1147" type="curve" smooth="yes" name="dv02"/>
       <point x="1042" y="1147"/>
       <point x="1125" y="1126"/>
       <point x="1186" y="1087" type="curve"/>
       <point x="1186" y="913" type="line" name="sh01"/>
       <point x="1118" y="966"/>
       <point x="1049" y="993"/>
-      <point x="969" y="993" type="curve" name="dv01" smooth="yes"/>
+      <point x="969" y="993" type="curve" smooth="yes" name="dv01"/>
       <point x="854" y="993"/>
       <point x="796" y="937"/>
-      <point x="796" y="824" type="curve" name="dh06" smooth="yes"/>
+      <point x="796" y="824" type="curve" smooth="yes" name="dh06"/>
       <point x="796" y="747"/>
       <point x="822" y="698"/>
       <point x="953" y="655" type="curve" smooth="yes"/>
       <point x="994" y="641" type="line" smooth="yes"/>
       <point x="1158" y="585"/>
       <point x="1225" y="493"/>
-      <point x="1225" y="319" type="curve" name="dh07" smooth="yes"/>
+      <point x="1225" y="319" type="curve" smooth="yes" name="dh07"/>
       <point x="1225" y="95"/>
       <point x="1113" y="-29"/>
     </contour>
     <contour>
-      <point x="302" y="797" type="line" name="dv04" smooth="yes"/>
+      <point x="302" y="797" type="line" smooth="yes" name="dv04"/>
       <point x="427" y="797"/>
       <point x="491" y="887"/>
-      <point x="491" y="1063" type="curve" name="dh03" smooth="yes"/>
+      <point x="491" y="1063" type="curve" smooth="yes" name="dh03"/>
       <point x="491" y="1239"/>
       <point x="427" y="1327"/>
-      <point x="302" y="1327" type="curve" name="sv03" smooth="yes"/>
+      <point x="302" y="1327" type="curve" smooth="yes" name="sv03"/>
       <point x="139" y="1327" type="line" name="sh02"/>
       <point x="139" y="797" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni20A_9.glif b/source/Hack-Regular.ufo/glyphs/uni20A_9.glif
index 5498d0870..ada7b4694 100644
--- a/source/Hack-Regular.ufo/glyphs/uni20A_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni20A_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20A9" format="1">
+<glyph name="uni20A9" format="2">
   <advance width="1233"/>
   <unicode hex="20A9"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni20A_A_.glif b/source/Hack-Regular.ufo/glyphs/uni20A_A_.glif
index a2dadb738..af28991af 100644
--- a/source/Hack-Regular.ufo/glyphs/uni20A_A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni20A_A_.glif
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20AA" format="1">
+<glyph name="uni20AA" format="2">
   <advance width="1233"/>
   <unicode hex="20AA"/>
   <outline>
     <contour>
       <point x="42" y="1490" type="line" name="hr00"/>
-      <point x="461" y="1493" type="line" name="at01" smooth="yes"/>
+      <point x="461" y="1493" type="line" smooth="yes" name="at01"/>
       <point x="730" y="1494"/>
       <point x="879" y="1296"/>
       <point x="879" y="903" type="curve" smooth="yes"/>
@@ -20,16 +20,16 @@
       <point x="42" y="-29" type="line"/>
     </contour>
     <contour>
-      <point x="775" y="-29" type="line" name="dv01" smooth="yes"/>
+      <point x="775" y="-29" type="line" smooth="yes" name="dv01"/>
       <point x="500" y="-29"/>
       <point x="357" y="172"/>
-      <point x="357" y="561" type="curve" name="dh02" smooth="yes"/>
+      <point x="357" y="561" type="curve" smooth="yes" name="dh02"/>
       <point x="357" y="928" type="line"/>
       <point x="506" y="928" type="line"/>
-      <point x="506" y="586" type="line" name="dh03" smooth="yes"/>
+      <point x="506" y="586" type="line" smooth="yes" name="dh03"/>
       <point x="506" y="266"/>
       <point x="583" y="135"/>
-      <point x="775" y="135" type="curve" name="dv02" smooth="yes"/>
+      <point x="775" y="135" type="curve" smooth="yes" name="dv02"/>
       <point x="1048" y="135" type="line" name="dh06"/>
       <point x="1048" y="1493" type="line" name="at02"/>
       <point x="1191" y="1493" type="line" name="sv02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni20A_D_.glif b/source/Hack-Regular.ufo/glyphs/uni20A_D_.glif
index ef3cedba0..77fb1190a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni20A_D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni20A_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20AD" format="1">
+<glyph name="uni20AD" format="2">
   <advance width="1233"/>
   <unicode hex="20AD"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni20A_E_.glif b/source/Hack-Regular.ufo/glyphs/uni20A_E_.glif
index 410c050a7..900edf57c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni20A_E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni20A_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20AE" format="1">
+<glyph name="uni20AE" format="2">
   <advance width="1233"/>
   <unicode hex="20AE"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni20A_F_.glif b/source/Hack-Regular.ufo/glyphs/uni20A_F_.glif
index e4d148855..c26f9f2f8 100644
--- a/source/Hack-Regular.ufo/glyphs/uni20A_F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni20A_F_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20AF" format="1">
+<glyph name="uni20AF" format="2">
   <advance width="1233"/>
   <unicode hex="20AF"/>
   <outline>
     <contour>
-      <point x="166" y="-29" type="curve" name="sv01" smooth="yes"/>
+      <point x="166" y="-29" type="curve" smooth="yes" name="sv01"/>
       <point x="93" y="-29"/>
       <point x="30" y="67"/>
       <point x="30" y="202" type="curve" smooth="yes"/>
       <point x="30" y="322"/>
       <point x="80" y="424"/>
-      <point x="156" y="424" type="curve" name="sv02" smooth="yes"/>
+      <point x="156" y="424" type="curve" smooth="yes" name="sv02"/>
       <point x="179" y="424"/>
       <point x="205" y="415"/>
       <point x="232" y="396" type="curve" name="iv01"/>
@@ -30,13 +30,13 @@
       <point x="257" y="1456" type="curve" smooth="yes"/>
       <point x="300" y="1501"/>
       <point x="353" y="1520"/>
-      <point x="417" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="417" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="554" y="1520"/>
       <point x="660" y="1433"/>
       <point x="728" y="1288" type="curve" smooth="yes"/>
       <point x="787" y="1163"/>
       <point x="816" y="991"/>
-      <point x="816" y="807" type="curve" name="sh02" smooth="yes"/>
+      <point x="816" y="807" type="curve" smooth="yes" name="sh02"/>
       <point x="816" y="669"/>
       <point x="800" y="474"/>
       <point x="752" y="307" type="curve" smooth="yes"/>
@@ -45,7 +45,7 @@
       <point x="650" y="76" type="curve" smooth="yes"/>
       <point x="601" y="8"/>
       <point x="543" y="-29"/>
-      <point x="479" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="479" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="443" y="-29"/>
       <point x="410" y="-18"/>
       <point x="375" y="13" type="curve" smooth="yes"/>
@@ -60,13 +60,13 @@
       <point x="205" y="-29"/>
     </contour>
     <contour>
-      <point x="483" y="151" type="curve" name="dv02" smooth="yes"/>
+      <point x="483" y="151" type="curve" smooth="yes" name="dv02"/>
       <point x="559" y="151"/>
       <point x="612" y="259"/>
       <point x="649" y="395" type="curve"/>
       <point x="681" y="521"/>
       <point x="700" y="677"/>
-      <point x="700" y="805" type="curve" name="sh01" smooth="yes"/>
+      <point x="700" y="805" type="curve" smooth="yes" name="sh01"/>
       <point x="700" y="956"/>
       <point x="677" y="1079"/>
       <point x="638" y="1167" type="curve" smooth="yes"/>
@@ -92,29 +92,29 @@
       <point x="1065" y="753" type="curve" smooth="yes"/>
       <point x="1120" y="753"/>
       <point x="1161" y="710"/>
-      <point x="1188" y="643" type="curve" name="hr01" smooth="yes"/>
+      <point x="1188" y="643" type="curve" smooth="yes" name="hr01"/>
       <point x="1211" y="586"/>
       <point x="1222" y="510"/>
-      <point x="1222" y="415" type="curve" name="sh03" smooth="yes"/>
+      <point x="1222" y="415" type="curve" smooth="yes" name="sh03"/>
       <point x="1222" y="255"/>
       <point x="1191" y="117"/>
-      <point x="1128" y="33" type="curve" name="sh04" smooth="yes"/>
+      <point x="1128" y="33" type="curve" smooth="yes" name="sh04"/>
       <point x="1096" y="-10"/>
       <point x="1063" y="-30"/>
-      <point x="1034" y="-30" type="curve" name="sv03" smooth="yes"/>
+      <point x="1034" y="-30" type="curve" smooth="yes" name="sv03"/>
       <point x="995" y="-30"/>
       <point x="953" y="7"/>
       <point x="932" y="75" type="curve" name="ih01"/>
       <point x="870" y="-455" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="1032" y="149" type="curve" name="sv04" smooth="yes"/>
+      <point x="1032" y="149" type="curve" smooth="yes" name="sv04"/>
       <point x="1057" y="149"/>
       <point x="1079" y="174"/>
       <point x="1095" y="217" type="curve" smooth="yes"/>
       <point x="1110" y="253"/>
       <point x="1125" y="327"/>
-      <point x="1125" y="410" type="curve" name="ah01" smooth="yes"/>
+      <point x="1125" y="410" type="curve" smooth="yes" name="ah01"/>
       <point x="1125" y="462"/>
       <point x="1119" y="509"/>
       <point x="1110" y="536" type="curve" smooth="yes"/>
@@ -131,7 +131,7 @@
       <point x="988" y="149"/>
     </contour>
     <contour>
-      <point x="159" y="142" type="curve" name="sv05" smooth="yes"/>
+      <point x="159" y="142" type="curve" smooth="yes" name="sv05"/>
       <point x="178" y="142"/>
       <point x="189" y="161"/>
       <point x="201" y="204" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni20B_0.glif b/source/Hack-Regular.ufo/glyphs/uni20B_0.glif
index 8b3e16680..191c36bf7 100644
--- a/source/Hack-Regular.ufo/glyphs/uni20B_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni20B_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B0" format="1">
+<glyph name="uni20B0" format="2">
   <advance width="1233"/>
   <unicode hex="20B0"/>
   <outline>
@@ -7,50 +7,50 @@
       <point x="682" y="133" type="line" name="sh01"/>
       <point x="861" y="133"/>
       <point x="980" y="227"/>
-      <point x="980" y="395" type="curve" name="sh03" smooth="yes"/>
+      <point x="980" y="395" type="curve" smooth="yes" name="sh03"/>
       <point x="980" y="475"/>
       <point x="954" y="523"/>
       <point x="861" y="616" type="curve"/>
       <point x="762" y="525"/>
       <point x="685" y="490"/>
-      <point x="612" y="490" type="curve" name="dv02" smooth="yes"/>
+      <point x="612" y="490" type="curve" smooth="yes" name="dv02"/>
       <point x="510" y="490"/>
       <point x="455" y="559"/>
       <point x="428" y="594" type="curve" smooth="yes"/>
       <point x="392" y="641"/>
       <point x="363" y="664"/>
-      <point x="331" y="664" type="curve" name="hr01" smooth="yes"/>
+      <point x="331" y="664" type="curve" smooth="yes" name="hr01"/>
       <point x="291" y="664"/>
       <point x="251" y="624"/>
       <point x="185" y="516" type="curve"/>
       <point x="46" y="612" type="line"/>
       <point x="155" y="787"/>
       <point x="226" y="852"/>
-      <point x="321" y="852" type="curve" name="hr02" smooth="yes"/>
+      <point x="321" y="852" type="curve" smooth="yes" name="hr02"/>
       <point x="380" y="852"/>
       <point x="445" y="829"/>
       <point x="492" y="774" type="curve" smooth="yes"/>
       <point x="557" y="698"/>
       <point x="586" y="667"/>
-      <point x="617" y="667" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="667" type="curve" smooth="yes" name="dv03"/>
       <point x="641" y="667"/>
       <point x="678" y="686"/>
       <point x="717" y="733" type="curve"/>
       <point x="564" y="854"/>
       <point x="490" y="994"/>
-      <point x="490" y="1167" type="curve" name="dh01" smooth="yes"/>
+      <point x="490" y="1167" type="curve" smooth="yes" name="dh01"/>
       <point x="490" y="1393"/>
       <point x="618" y="1520"/>
-      <point x="790" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="790" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="950" y="1520"/>
       <point x="1092" y="1408"/>
-      <point x="1092" y="1152" type="curve" name="hr03" smooth="yes"/>
+      <point x="1092" y="1152" type="curve" smooth="yes" name="hr03"/>
       <point x="1092" y="1021"/>
       <point x="1057" y="879"/>
       <point x="985" y="766" type="curve"/>
       <point x="1110" y="651"/>
       <point x="1166" y="545"/>
-      <point x="1166" y="398" type="curve" name="sh02" smooth="yes"/>
+      <point x="1166" y="398" type="curve" smooth="yes" name="sh02"/>
       <point x="1166" y="160"/>
       <point x="1018" y="-29"/>
       <point x="682" y="-29" type="curve" name="dv01"/>
@@ -59,13 +59,13 @@
       <point x="834" y="881" type="curve"/>
       <point x="879" y="949"/>
       <point x="902" y="1057"/>
-      <point x="902" y="1152" type="curve" name="hr04" smooth="yes"/>
+      <point x="902" y="1152" type="curve" smooth="yes" name="hr04"/>
       <point x="902" y="1289"/>
       <point x="855" y="1362"/>
-      <point x="790" y="1362" type="curve" name="sv01" smooth="yes"/>
+      <point x="790" y="1362" type="curve" smooth="yes" name="sv01"/>
       <point x="721" y="1362"/>
       <point x="680" y="1278"/>
-      <point x="680" y="1170" type="curve" name="dh02" smooth="yes"/>
+      <point x="680" y="1170" type="curve" smooth="yes" name="dh02"/>
       <point x="680" y="1049"/>
       <point x="730" y="961"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni20B_1.glif b/source/Hack-Regular.ufo/glyphs/uni20B_1.glif
index 01d623eb1..086e98be1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni20B_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni20B_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B1" format="1">
+<glyph name="uni20B1" format="2">
   <advance width="1233"/>
   <unicode hex="20B1"/>
   <outline>
@@ -31,7 +31,7 @@
       <point x="1119" y="882" type="line"/>
       <point x="1069" y="718"/>
       <point x="932" y="600"/>
-      <point x="633" y="600" type="curve" name="dv02" smooth="yes"/>
+      <point x="633" y="600" type="curve" smooth="yes" name="dv02"/>
       <point x="399" y="600" type="line" name="sh03"/>
       <point x="399" y="0" type="line" name="ab01"/>
       <point x="197" y="0" type="line"/>
@@ -40,7 +40,7 @@
       <point x="875" y="1228" type="line" name="sv05"/>
       <point x="824" y="1294"/>
       <point x="743" y="1327"/>
-      <point x="633" y="1327" type="curve" name="sv06" smooth="yes"/>
+      <point x="633" y="1327" type="curve" smooth="yes" name="sv06"/>
       <point x="399" y="1327" type="line" name="sh04"/>
       <point x="399" y="1228" type="line"/>
     </contour>
@@ -56,7 +56,7 @@
       <point x="399" y="997" type="line"/>
     </contour>
     <contour>
-      <point x="633" y="766" type="line" name="dv03" smooth="yes"/>
+      <point x="633" y="766" type="line" smooth="yes" name="dv03"/>
       <point x="750" y="766"/>
       <point x="835" y="805"/>
       <point x="886" y="882" type="curve" name="sv09"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni20B_2.glif b/source/Hack-Regular.ufo/glyphs/uni20B_2.glif
index b06a98dc7..07c2514bf 100644
--- a/source/Hack-Regular.ufo/glyphs/uni20B_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni20B_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B2" format="1">
+<glyph name="uni20B2" format="2">
   <advance width="1233"/>
   <unicode hex="20B2"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="581" y="-22" type="line" name="dh03"/>
       <point x="284" y="18"/>
       <point x="53" y="259"/>
-      <point x="53" y="745" type="curve" name="dh01" smooth="yes"/>
+      <point x="53" y="745" type="curve" smooth="yes" name="dh01"/>
       <point x="53" y="1232"/>
       <point x="284" y="1473"/>
       <point x="581" y="1513" type="curve" name="sh01"/>
@@ -43,7 +43,7 @@
       <point x="369" y="1201" type="curve" smooth="yes"/>
       <point x="295" y="1099"/>
       <point x="258" y="947"/>
-      <point x="258" y="745" type="curve" name="dh02" smooth="yes"/>
+      <point x="258" y="745" type="curve" smooth="yes" name="dh02"/>
       <point x="258" y="544"/>
       <point x="295" y="392"/>
       <point x="369" y="290" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni20B_3.glif b/source/Hack-Regular.ufo/glyphs/uni20B_3.glif
index 49b2a9422..9ce5c34f9 100644
--- a/source/Hack-Regular.ufo/glyphs/uni20B_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni20B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B3" format="1">
+<glyph name="uni20B3" format="2">
   <advance width="1233"/>
   <unicode hex="20B3"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni20B_4.glif b/source/Hack-Regular.ufo/glyphs/uni20B_4.glif
index 2609d5e91..f1e17721a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni20B_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni20B_4.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B4" format="1">
+<glyph name="uni20B4" format="2">
   <advance width="1233"/>
   <unicode hex="20B4"/>
   <outline>
     <contour>
-      <point x="651" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="651" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="320" y="-29"/>
       <point x="139" y="124"/>
-      <point x="139" y="408" type="curve" name="sh01" smooth="yes"/>
+      <point x="139" y="408" type="curve" smooth="yes" name="sh01"/>
       <point x="139" y="459"/>
       <point x="145" y="507"/>
       <point x="157" y="550" type="curve" name="ih01"/>
@@ -26,20 +26,20 @@
       <point x="850" y="959" type="curve" smooth="yes"/>
       <point x="886" y="995"/>
       <point x="905" y="1041"/>
-      <point x="905" y="1105" type="curve" name="ah01" smooth="yes"/>
+      <point x="905" y="1105" type="curve" smooth="yes" name="ah01"/>
       <point x="905" y="1264"/>
       <point x="786" y="1356"/>
-      <point x="596" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="596" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="472" y="1356"/>
       <point x="348" y="1316"/>
       <point x="225" y="1237" type="curve" name="ih03"/>
       <point x="225" y="1442" type="line"/>
       <point x="365" y="1494"/>
       <point x="492" y="1520"/>
-      <point x="606" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="606" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="903" y="1520"/>
       <point x="1098" y="1346"/>
-      <point x="1098" y="1079" type="curve" name="sh03" smooth="yes"/>
+      <point x="1098" y="1079" type="curve" smooth="yes" name="sh03"/>
       <point x="1098" y="1029"/>
       <point x="1091" y="984"/>
       <point x="1077" y="943" type="curve" name="ih04"/>
@@ -55,10 +55,10 @@
       <point x="376" y="550" type="line"/>
       <point x="347" y="511"/>
       <point x="332" y="459"/>
-      <point x="332" y="399" type="curve" name="sh02" smooth="yes"/>
+      <point x="332" y="399" type="curve" smooth="yes" name="sh02"/>
       <point x="332" y="228"/>
       <point x="448" y="135"/>
-      <point x="655" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="655" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="795" y="135"/>
       <point x="926" y="179"/>
       <point x="1079" y="276" type="curve" name="ih06"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni20B_5.glif b/source/Hack-Regular.ufo/glyphs/uni20B_5.glif
index cad87a445..fdadbb47b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni20B_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni20B_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B5" format="1">
+<glyph name="uni20B5" format="2">
   <advance width="1233"/>
   <unicode hex="20B5"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="395" y="8"/>
       <point x="130" y="225"/>
       <point x="130" y="643" type="curve" smooth="yes"/>
-      <point x="130" y="660" type="line" name="dh01" smooth="yes"/>
+      <point x="130" y="660" type="line" smooth="yes" name="dh01"/>
       <point x="130" y="1090"/>
       <point x="404" y="1292"/>
       <point x="641" y="1324" type="curve" name="dh03"/>
@@ -40,10 +40,10 @@
       <point x="483" y="1070" type="curve" smooth="yes"/>
       <point x="371" y="961"/>
       <point x="341" y="793"/>
-      <point x="341" y="656" type="curve" name="dh02" smooth="yes"/>
+      <point x="341" y="656" type="curve" smooth="yes" name="dh02"/>
       <point x="341" y="605"/>
       <point x="345" y="556"/>
-      <point x="350" y="520" type="curve" name="sh04" smooth="yes"/>
+      <point x="350" y="520" type="curve" smooth="yes" name="sh04"/>
       <point x="367" y="397"/>
       <point x="417" y="296"/>
       <point x="482" y="232" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni20B_7.glif b/source/Hack-Regular.ufo/glyphs/uni20B_7.glif
index 5def3749b..7099c5c69 100644
--- a/source/Hack-Regular.ufo/glyphs/uni20B_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni20B_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B7" format="1">
+<glyph name="uni20B7" format="2">
   <advance width="1233"/>
   <unicode hex="20B7"/>
   <outline>
@@ -69,13 +69,13 @@
       <point x="555" y="921"/>
       <point x="615" y="893"/>
       <point x="700" y="866" type="curve" smooth="yes"/>
-      <point x="821" y="827" type="line" name="hr01" smooth="yes"/>
+      <point x="821" y="827" type="line" smooth="yes" name="hr01"/>
       <point x="1043" y="756"/>
       <point x="1135" y="662"/>
       <point x="1135" y="473" type="curve" smooth="yes"/>
       <point x="1135" y="324"/>
       <point x="1080" y="200"/>
-      <point x="969" y="109" type="curve" name="hr03" smooth="yes"/>
+      <point x="969" y="109" type="curve" smooth="yes" name="hr03"/>
       <point x="868" y="26"/>
       <point x="736" y="-20"/>
       <point x="574" y="-28" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni20B_8.glif b/source/Hack-Regular.ufo/glyphs/uni20B_8.glif
index 1f971d003..49e4f19bc 100644
--- a/source/Hack-Regular.ufo/glyphs/uni20B_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni20B_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B8" format="1">
+<glyph name="uni20B8" format="2">
   <advance width="1233"/>
   <unicode hex="20B8"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni20B_9.glif b/source/Hack-Regular.ufo/glyphs/uni20B_9.glif
index ef5ad8b6c..9ff094a4a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni20B_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni20B_9.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni20B9" format="1">
+<glyph name="uni20B9" format="2">
   <advance width="1233"/>
   <unicode hex="20B9"/>
   <outline>
     <contour>
-      <point x="626" y="377" type="line" name="hr00" smooth="yes"/>
+      <point x="626" y="377" type="line" smooth="yes" name="hr00"/>
       <point x="522" y="596"/>
       <point x="455" y="631"/>
-      <point x="327" y="631" type="curve" name="dv03" smooth="yes"/>
+      <point x="327" y="631" type="curve" smooth="yes" name="dv03"/>
       <point x="134" y="631" type="line"/>
       <point x="134" y="797" type="line"/>
-      <point x="355" y="797" type="line" name="dv04" smooth="yes"/>
+      <point x="355" y="797" type="line" smooth="yes" name="dv04"/>
       <point x="548" y="797"/>
       <point x="627" y="904"/>
       <point x="640" y="1040" type="curve" name="dv01"/>
@@ -19,7 +19,7 @@
       <point x="634" y="1163" type="line" name="dv02"/>
       <point x="613" y="1264"/>
       <point x="539" y="1370"/>
-      <point x="347" y="1370" type="curve" name="sv01" smooth="yes"/>
+      <point x="347" y="1370" type="curve" smooth="yes" name="sv01"/>
       <point x="104" y="1370" type="line"/>
       <point x="159" y="1493" type="line" name="at01"/>
       <point x="1137" y="1493" type="line"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2116.glif b/source/Hack-Regular.ufo/glyphs/uni2116.glif
index d0e450d57..bb6026023 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2116.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2116.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2116" format="1">
+<glyph name="uni2116" format="2">
   <advance width="1233"/>
   <unicode hex="2116"/>
   <outline>
@@ -25,7 +25,7 @@
       <point x="1130" y="1379" type="curve"/>
       <point x="1088" y="1454"/>
       <point x="1029" y="1492"/>
-      <point x="953" y="1492" type="curve" name="hr01" smooth="yes"/>
+      <point x="953" y="1492" type="curve" smooth="yes" name="hr01"/>
       <point x="880" y="1492"/>
       <point x="821" y="1455"/>
       <point x="776" y="1380" type="curve" smooth="yes"/>
@@ -54,7 +54,7 @@
       <point x="953" y="1375" type="curve" smooth="yes"/>
       <point x="997" y="1375"/>
       <point x="1032" y="1349"/>
-      <point x="1057" y="1297" type="curve" name="hr02" smooth="yes"/>
+      <point x="1057" y="1297" type="curve" smooth="yes" name="hr02"/>
       <point x="1082" y="1244"/>
       <point x="1095" y="1173"/>
       <point x="1095" y="1082" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2126.glif b/source/Hack-Regular.ufo/glyphs/uni2126.glif
index 0aecc9339..450aaec0d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2126.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2126.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2126" format="1">
+<glyph name="uni2126" format="2">
   <advance width="1233"/>
   <unicode hex="2126"/>
   <outline>
@@ -8,13 +8,13 @@
       <point x="319" y="172" type="line"/>
       <point x="159" y="346"/>
       <point x="86" y="528"/>
-      <point x="86" y="778" type="curve" name="dh01" smooth="yes"/>
+      <point x="86" y="778" type="curve" smooth="yes" name="dh01"/>
       <point x="86" y="1200"/>
       <point x="294" y="1460"/>
-      <point x="615" y="1460" type="curve" name="hr01" smooth="yes"/>
+      <point x="615" y="1460" type="curve" smooth="yes" name="hr01"/>
       <point x="938" y="1460"/>
       <point x="1145" y="1198"/>
-      <point x="1145" y="778" type="curve" name="dh04" smooth="yes"/>
+      <point x="1145" y="778" type="curve" smooth="yes" name="dh04"/>
       <point x="1145" y="533"/>
       <point x="1074" y="349"/>
       <point x="911" y="172" type="curve" name="ih01"/>
@@ -24,13 +24,13 @@
       <point x="696" y="172" type="line" name="dh03"/>
       <point x="851" y="268"/>
       <point x="950" y="505"/>
-      <point x="950" y="788" type="curve" name="sh02" smooth="yes"/>
+      <point x="950" y="788" type="curve" smooth="yes" name="sh02"/>
       <point x="950" y="1112"/>
       <point x="820" y="1294"/>
-      <point x="616" y="1294" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1294" type="curve" smooth="yes" name="dv01"/>
       <point x="411" y="1294"/>
       <point x="283" y="1112"/>
-      <point x="283" y="789" type="curve" name="dh02" smooth="yes"/>
+      <point x="283" y="789" type="curve" smooth="yes" name="dh02"/>
       <point x="283" y="519"/>
       <point x="373" y="273"/>
       <point x="537" y="172" type="curve" name="sh03"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2150.glif b/source/Hack-Regular.ufo/glyphs/uni2150.glif
index 57987bc9f..7a1b071c7 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2150.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2150.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2150" format="1">
+<glyph name="uni2150" format="2">
   <advance width="1233"/>
   <unicode hex="2150"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2151.glif b/source/Hack-Regular.ufo/glyphs/uni2151.glif
index a20e9ffaf..93c040f27 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2151.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2151.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2151" format="1">
+<glyph name="uni2151" format="2">
   <advance width="1233"/>
   <unicode hex="2151"/>
   <outline>
@@ -23,43 +23,43 @@
       <point x="51" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="752" y="-275" type="curve" name="dv01" smooth="yes"/>
+      <point x="752" y="-275" type="curve" smooth="yes" name="dv01"/>
       <point x="692" y="-275"/>
       <point x="629" y="-263"/>
       <point x="572" y="-242" type="curve"/>
       <point x="572" y="-138" type="line" name="ih01"/>
       <point x="625" y="-165"/>
       <point x="683" y="-180"/>
-      <point x="747" y="-180" type="curve" name="dv02" smooth="yes"/>
+      <point x="747" y="-180" type="curve" smooth="yes" name="dv02"/>
       <point x="908" y="-180"/>
       <point x="989" y="-74"/>
       <point x="989" y="139" type="curve" name="ih02"/>
       <point x="950" y="63"/>
       <point x="878" y="23"/>
-      <point x="786" y="23" type="curve" name="dv03" smooth="yes"/>
+      <point x="786" y="23" type="curve" smooth="yes" name="dv03"/>
       <point x="603" y="23"/>
       <point x="505" y="125"/>
-      <point x="505" y="309" type="curve" name="dh03" smooth="yes"/>
+      <point x="505" y="309" type="curve" smooth="yes" name="dh03"/>
       <point x="505" y="490"/>
       <point x="609" y="592"/>
-      <point x="793" y="592" type="curve" name="dv06" smooth="yes"/>
+      <point x="793" y="592" type="curve" smooth="yes" name="dv06"/>
       <point x="1009" y="592"/>
       <point x="1105" y="458"/>
-      <point x="1105" y="158" type="curve" name="dh05" smooth="yes"/>
+      <point x="1105" y="158" type="curve" smooth="yes" name="dh05"/>
       <point x="1105" y="-125"/>
       <point x="983" y="-275"/>
     </contour>
     <contour>
-      <point x="796" y="111" type="curve" name="dv04" smooth="yes"/>
+      <point x="796" y="111" type="curve" smooth="yes" name="dv04"/>
       <point x="904" y="111"/>
       <point x="967" y="183"/>
-      <point x="967" y="308" type="curve" name="dh04" smooth="yes"/>
+      <point x="967" y="308" type="curve" smooth="yes" name="dh04"/>
       <point x="967" y="432"/>
       <point x="904" y="504"/>
-      <point x="796" y="504" type="curve" name="dv05" smooth="yes"/>
+      <point x="796" y="504" type="curve" smooth="yes" name="dv05"/>
       <point x="684" y="504"/>
       <point x="628" y="439"/>
-      <point x="628" y="308" type="curve" name="hr01" smooth="yes"/>
+      <point x="628" y="308" type="curve" smooth="yes" name="hr01"/>
       <point x="628" y="177"/>
       <point x="684" y="111"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2153.glif b/source/Hack-Regular.ufo/glyphs/uni2153.glif
index 6776910f3..e36c7e205 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2153.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2153.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2153" format="1">
+<glyph name="uni2153" format="2">
   <advance width="1233"/>
   <unicode hex="2153"/>
   <outline>
@@ -23,36 +23,36 @@
       <point x="51" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="758" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="758" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="681" y="-285"/>
       <point x="607" y="-271"/>
       <point x="527" y="-244" type="curve"/>
       <point x="527" y="-123" type="line" name="ih01"/>
       <point x="619" y="-159"/>
       <point x="694" y="-176"/>
-      <point x="754" y="-176" type="curve" name="dv02" smooth="yes"/>
+      <point x="754" y="-176" type="curve" smooth="yes" name="dv02"/>
       <point x="890" y="-176"/>
       <point x="973" y="-119"/>
       <point x="973" y="-27" type="curve" smooth="yes"/>
       <point x="973" y="73"/>
       <point x="900" y="123"/>
-      <point x="754" y="123" type="curve" name="dv03" smooth="yes"/>
+      <point x="754" y="123" type="curve" smooth="yes" name="dv03"/>
       <point x="688" y="123" type="line"/>
       <point x="688" y="231" type="line"/>
-      <point x="762" y="231" type="line" name="dv04" smooth="yes"/>
+      <point x="762" y="231" type="line" smooth="yes" name="dv04"/>
       <point x="887" y="231"/>
       <point x="953" y="274"/>
-      <point x="953" y="354" type="curve" name="dh03" smooth="yes"/>
+      <point x="953" y="354" type="curve" smooth="yes" name="dh03"/>
       <point x="953" y="430"/>
       <point x="887" y="473"/>
-      <point x="770" y="473" type="curve" name="dv05" smooth="yes"/>
+      <point x="770" y="473" type="curve" smooth="yes" name="dv05"/>
       <point x="710" y="473"/>
       <point x="635" y="457"/>
       <point x="555" y="426" type="curve" name="ih02"/>
       <point x="555" y="547" type="line"/>
       <point x="647" y="570"/>
       <point x="723" y="582"/>
-      <point x="791" y="582" type="curve" name="dv06" smooth="yes"/>
+      <point x="791" y="582" type="curve" smooth="yes" name="dv06"/>
       <point x="983" y="582"/>
       <point x="1104" y="497"/>
       <point x="1104" y="365" type="curve" smooth="yes"/>
@@ -61,7 +61,7 @@
       <point x="932" y="182" type="curve" name="hr01"/>
       <point x="1057" y="154"/>
       <point x="1125" y="81"/>
-      <point x="1125" y="-27" type="curve" name="dh04" smooth="yes"/>
+      <point x="1125" y="-27" type="curve" smooth="yes" name="dh04"/>
       <point x="1125" y="-194"/>
       <point x="995" y="-285"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2154.glif b/source/Hack-Regular.ufo/glyphs/uni2154.glif
index ce0545050..efeca867b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2154.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2154.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2154" format="1">
+<glyph name="uni2154" format="2">
   <advance width="1233"/>
   <unicode hex="2154"/>
   <outline>
@@ -11,20 +11,20 @@
       <point x="437" y="1318" type="curve" smooth="yes"/>
       <point x="464" y="1359"/>
       <point x="477" y="1396"/>
-      <point x="477" y="1430" type="curve" name="sh01" smooth="yes"/>
+      <point x="477" y="1430" type="curve" smooth="yes" name="sh01"/>
       <point x="477" y="1511"/>
       <point x="404" y="1567"/>
-      <point x="295" y="1567" type="curve" name="dv03" smooth="yes"/>
+      <point x="295" y="1567" type="curve" smooth="yes" name="dv03"/>
       <point x="229" y="1567"/>
       <point x="154" y="1543"/>
       <point x="70" y="1495" type="curve"/>
       <point x="70" y="1620" type="line"/>
       <point x="158" y="1657"/>
       <point x="235" y="1676"/>
-      <point x="315" y="1676" type="curve" name="dv04" smooth="yes"/>
+      <point x="315" y="1676" type="curve" smooth="yes" name="dv04"/>
       <point x="504" y="1676"/>
       <point x="629" y="1579"/>
-      <point x="629" y="1436" type="curve" name="sh02" smooth="yes"/>
+      <point x="629" y="1436" type="curve" smooth="yes" name="sh02"/>
       <point x="629" y="1397"/>
       <point x="617" y="1359"/>
       <point x="592" y="1320" type="curve" smooth="yes"/>
@@ -43,36 +43,36 @@
       <point x="51" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="758" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="758" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="681" y="-285"/>
       <point x="607" y="-271"/>
       <point x="527" y="-244" type="curve"/>
       <point x="527" y="-123" type="line" name="ih01"/>
       <point x="619" y="-159"/>
       <point x="694" y="-176"/>
-      <point x="754" y="-176" type="curve" name="dv02" smooth="yes"/>
+      <point x="754" y="-176" type="curve" smooth="yes" name="dv02"/>
       <point x="890" y="-176"/>
       <point x="973" y="-119"/>
       <point x="973" y="-27" type="curve" smooth="yes"/>
       <point x="973" y="73"/>
       <point x="900" y="123"/>
-      <point x="754" y="123" type="curve" name="dv05" smooth="yes"/>
+      <point x="754" y="123" type="curve" smooth="yes" name="dv05"/>
       <point x="688" y="123" type="line"/>
       <point x="688" y="231" type="line"/>
-      <point x="762" y="231" type="line" name="dv06" smooth="yes"/>
+      <point x="762" y="231" type="line" smooth="yes" name="dv06"/>
       <point x="887" y="231"/>
       <point x="953" y="274"/>
-      <point x="953" y="354" type="curve" name="ah01" smooth="yes"/>
+      <point x="953" y="354" type="curve" smooth="yes" name="ah01"/>
       <point x="953" y="430"/>
       <point x="887" y="473"/>
-      <point x="770" y="473" type="curve" name="dv07" smooth="yes"/>
+      <point x="770" y="473" type="curve" smooth="yes" name="dv07"/>
       <point x="710" y="473"/>
       <point x="635" y="457"/>
       <point x="555" y="426" type="curve" name="ih02"/>
       <point x="555" y="547" type="line"/>
       <point x="647" y="570"/>
       <point x="723" y="582"/>
-      <point x="791" y="582" type="curve" name="dv08" smooth="yes"/>
+      <point x="791" y="582" type="curve" smooth="yes" name="dv08"/>
       <point x="983" y="582"/>
       <point x="1104" y="497"/>
       <point x="1104" y="365" type="curve" smooth="yes"/>
@@ -81,7 +81,7 @@
       <point x="932" y="182" type="curve" name="ih03"/>
       <point x="1057" y="154"/>
       <point x="1125" y="81"/>
-      <point x="1125" y="-27" type="curve" name="sh04" smooth="yes"/>
+      <point x="1125" y="-27" type="curve" smooth="yes" name="sh04"/>
       <point x="1125" y="-194"/>
       <point x="995" y="-285"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2155.glif b/source/Hack-Regular.ufo/glyphs/uni2155.glif
index 922ffa08c..492987374 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2155.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2155.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2155" format="1">
+<glyph name="uni2155" format="2">
   <advance width="1233"/>
   <unicode hex="2155"/>
   <outline>
@@ -23,20 +23,20 @@
       <point x="51" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="764" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="764" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="665" y="-285"/>
       <point x="584" y="-273"/>
       <point x="520" y="-249" type="curve"/>
       <point x="520" y="-135" type="line" name="ih01"/>
       <point x="589" y="-170"/>
       <point x="672" y="-190"/>
-      <point x="752" y="-190" type="curve" name="dv02" smooth="yes"/>
+      <point x="752" y="-190" type="curve" smooth="yes" name="dv02"/>
       <point x="892" y="-190"/>
       <point x="968" y="-122"/>
-      <point x="968" y="-1" type="curve" name="dh05" smooth="yes"/>
+      <point x="968" y="-1" type="curve" smooth="yes" name="dh05"/>
       <point x="968" y="119"/>
       <point x="886" y="188"/>
-      <point x="749" y="188" type="curve" name="dv03" smooth="yes"/>
+      <point x="749" y="188" type="curve" smooth="yes" name="dv03"/>
       <point x="682" y="188"/>
       <point x="619" y="174"/>
       <point x="559" y="147" type="curve" name="dh03"/>
@@ -47,10 +47,10 @@
       <point x="674" y="266" type="line" name="dh04"/>
       <point x="707" y="277"/>
       <point x="743" y="283"/>
-      <point x="782" y="283" type="curve" name="hr01" smooth="yes"/>
+      <point x="782" y="283" type="curve" smooth="yes" name="hr01"/>
       <point x="973" y="283"/>
       <point x="1094" y="174"/>
-      <point x="1094" y="-1" type="curve" name="dh06" smooth="yes"/>
+      <point x="1094" y="-1" type="curve" smooth="yes" name="dh06"/>
       <point x="1094" y="-177"/>
       <point x="968" y="-285"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2156.glif b/source/Hack-Regular.ufo/glyphs/uni2156.glif
index 5f2109f83..c05597ed5 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2156.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2156.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2156" format="1">
+<glyph name="uni2156" format="2">
   <advance width="1233"/>
   <unicode hex="2156"/>
   <outline>
@@ -11,20 +11,20 @@
       <point x="437" y="1318" type="curve" smooth="yes"/>
       <point x="464" y="1359"/>
       <point x="477" y="1396"/>
-      <point x="477" y="1430" type="curve" name="dh01" smooth="yes"/>
+      <point x="477" y="1430" type="curve" smooth="yes" name="dh01"/>
       <point x="477" y="1511"/>
       <point x="404" y="1567"/>
-      <point x="295" y="1567" type="curve" name="dv03" smooth="yes"/>
+      <point x="295" y="1567" type="curve" smooth="yes" name="dv03"/>
       <point x="229" y="1567"/>
       <point x="154" y="1543"/>
       <point x="70" y="1495" type="curve"/>
       <point x="70" y="1620" type="line"/>
       <point x="158" y="1657"/>
       <point x="235" y="1676"/>
-      <point x="315" y="1676" type="curve" name="dv04" smooth="yes"/>
+      <point x="315" y="1676" type="curve" smooth="yes" name="dv04"/>
       <point x="504" y="1676"/>
       <point x="629" y="1579"/>
-      <point x="629" y="1436" type="curve" name="dh02" smooth="yes"/>
+      <point x="629" y="1436" type="curve" smooth="yes" name="dh02"/>
       <point x="629" y="1397"/>
       <point x="617" y="1359"/>
       <point x="592" y="1320" type="curve" smooth="yes"/>
@@ -43,20 +43,20 @@
       <point x="51" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="764" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="764" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="665" y="-285"/>
       <point x="584" y="-273"/>
       <point x="520" y="-249" type="curve"/>
       <point x="520" y="-135" type="line" name="ih01"/>
       <point x="589" y="-170"/>
       <point x="672" y="-190"/>
-      <point x="752" y="-190" type="curve" name="dv02" smooth="yes"/>
+      <point x="752" y="-190" type="curve" smooth="yes" name="dv02"/>
       <point x="892" y="-190"/>
       <point x="968" y="-122"/>
-      <point x="968" y="-1" type="curve" name="dh03" smooth="yes"/>
+      <point x="968" y="-1" type="curve" smooth="yes" name="dh03"/>
       <point x="968" y="119"/>
       <point x="886" y="188"/>
-      <point x="749" y="188" type="curve" name="dv05" smooth="yes"/>
+      <point x="749" y="188" type="curve" smooth="yes" name="dv05"/>
       <point x="682" y="188"/>
       <point x="619" y="174"/>
       <point x="559" y="147" type="curve" name="hr01"/>
@@ -67,10 +67,10 @@
       <point x="674" y="266" type="line" name="sh02"/>
       <point x="707" y="277"/>
       <point x="743" y="283"/>
-      <point x="782" y="283" type="curve" name="dv06" smooth="yes"/>
+      <point x="782" y="283" type="curve" smooth="yes" name="dv06"/>
       <point x="973" y="283"/>
       <point x="1094" y="174"/>
-      <point x="1094" y="-1" type="curve" name="dh04" smooth="yes"/>
+      <point x="1094" y="-1" type="curve" smooth="yes" name="dh04"/>
       <point x="1094" y="-177"/>
       <point x="968" y="-285"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2157.glif b/source/Hack-Regular.ufo/glyphs/uni2157.glif
index d5eed0af8..edb0fe673 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2157.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2157.glif
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2157" format="1">
+<glyph name="uni2157" format="2">
   <advance width="1233"/>
   <unicode hex="2157"/>
   <outline>
     <contour>
-      <point x="299" y="809" type="curve" name="dv11" smooth="yes"/>
+      <point x="299" y="809" type="curve" smooth="yes" name="dv11"/>
       <point x="222" y="809"/>
       <point x="148" y="823"/>
       <point x="68" y="850" type="curve"/>
       <point x="68" y="971" type="line"/>
       <point x="160" y="935"/>
       <point x="235" y="918"/>
-      <point x="295" y="918" type="curve" name="dv12" smooth="yes"/>
+      <point x="295" y="918" type="curve" smooth="yes" name="dv12"/>
       <point x="431" y="918"/>
       <point x="514" y="975"/>
       <point x="514" y="1067" type="curve" smooth="yes"/>
       <point x="514" y="1167"/>
       <point x="441" y="1217"/>
-      <point x="295" y="1217" type="curve" name="dv05" smooth="yes"/>
+      <point x="295" y="1217" type="curve" smooth="yes" name="dv05"/>
       <point x="229" y="1217" type="line"/>
       <point x="229" y="1325" type="line"/>
-      <point x="303" y="1325" type="line" name="dv06" smooth="yes"/>
+      <point x="303" y="1325" type="line" smooth="yes" name="dv06"/>
       <point x="428" y="1325"/>
       <point x="494" y="1368"/>
-      <point x="494" y="1448" type="curve" name="dh01" smooth="yes"/>
+      <point x="494" y="1448" type="curve" smooth="yes" name="dh01"/>
       <point x="494" y="1524"/>
       <point x="428" y="1567"/>
-      <point x="311" y="1567" type="curve" name="dv03" smooth="yes"/>
+      <point x="311" y="1567" type="curve" smooth="yes" name="dv03"/>
       <point x="251" y="1567"/>
       <point x="176" y="1551"/>
       <point x="96" y="1520" type="curve"/>
       <point x="96" y="1641" type="line"/>
       <point x="188" y="1664"/>
       <point x="264" y="1676"/>
-      <point x="332" y="1676" type="curve" name="dv04" smooth="yes"/>
+      <point x="332" y="1676" type="curve" smooth="yes" name="dv04"/>
       <point x="524" y="1676"/>
       <point x="645" y="1591"/>
       <point x="645" y="1459" type="curve" smooth="yes"/>
@@ -42,7 +42,7 @@
       <point x="473" y="1276" type="curve" name="iv01"/>
       <point x="598" y="1248"/>
       <point x="666" y="1175"/>
-      <point x="666" y="1067" type="curve" name="dh02" smooth="yes"/>
+      <point x="666" y="1067" type="curve" smooth="yes" name="dh02"/>
       <point x="666" y="900"/>
       <point x="536" y="809"/>
     </contour>
@@ -53,20 +53,20 @@
       <point x="51" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="764" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="764" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="665" y="-285"/>
       <point x="584" y="-273"/>
       <point x="520" y="-249" type="curve"/>
       <point x="520" y="-135" type="line" name="ih01"/>
       <point x="589" y="-170"/>
       <point x="672" y="-190"/>
-      <point x="752" y="-190" type="curve" name="dv02" smooth="yes"/>
+      <point x="752" y="-190" type="curve" smooth="yes" name="dv02"/>
       <point x="892" y="-190"/>
       <point x="968" y="-122"/>
-      <point x="968" y="-1" type="curve" name="dh03" smooth="yes"/>
+      <point x="968" y="-1" type="curve" smooth="yes" name="dh03"/>
       <point x="968" y="119"/>
       <point x="886" y="188"/>
-      <point x="749" y="188" type="curve" name="dv07" smooth="yes"/>
+      <point x="749" y="188" type="curve" smooth="yes" name="dv07"/>
       <point x="682" y="188"/>
       <point x="619" y="174"/>
       <point x="559" y="147" type="curve" name="hr01"/>
@@ -77,10 +77,10 @@
       <point x="674" y="266" type="line" name="hr02"/>
       <point x="707" y="277"/>
       <point x="743" y="283"/>
-      <point x="782" y="283" type="curve" name="dv08" smooth="yes"/>
+      <point x="782" y="283" type="curve" smooth="yes" name="dv08"/>
       <point x="973" y="283"/>
       <point x="1094" y="174"/>
-      <point x="1094" y="-1" type="curve" name="dh04" smooth="yes"/>
+      <point x="1094" y="-1" type="curve" smooth="yes" name="dh04"/>
       <point x="1094" y="-177"/>
       <point x="968" y="-285"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2158.glif b/source/Hack-Regular.ufo/glyphs/uni2158.glif
index 41671674e..72366dd99 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2158.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2158.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2158" format="1">
+<glyph name="uni2158" format="2">
   <advance width="1233"/>
   <unicode hex="2158"/>
   <outline>
@@ -28,20 +28,20 @@
       <point x="51" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="764" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="764" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="665" y="-285"/>
       <point x="584" y="-273"/>
       <point x="520" y="-249" type="curve"/>
       <point x="520" y="-135" type="line" name="ih01"/>
       <point x="589" y="-170"/>
       <point x="672" y="-190"/>
-      <point x="752" y="-190" type="curve" name="dv02" smooth="yes"/>
+      <point x="752" y="-190" type="curve" smooth="yes" name="dv02"/>
       <point x="892" y="-190"/>
       <point x="968" y="-122"/>
-      <point x="968" y="-1" type="curve" name="dh04" smooth="yes"/>
+      <point x="968" y="-1" type="curve" smooth="yes" name="dh04"/>
       <point x="968" y="119"/>
       <point x="886" y="188"/>
-      <point x="749" y="188" type="curve" name="dv03" smooth="yes"/>
+      <point x="749" y="188" type="curve" smooth="yes" name="dv03"/>
       <point x="682" y="188"/>
       <point x="619" y="174"/>
       <point x="559" y="147" type="curve" name="dh02"/>
@@ -52,10 +52,10 @@
       <point x="674" y="266" type="line" name="dh03"/>
       <point x="707" y="277"/>
       <point x="743" y="283"/>
-      <point x="782" y="283" type="curve" name="dv04" smooth="yes"/>
+      <point x="782" y="283" type="curve" smooth="yes" name="dv04"/>
       <point x="973" y="283"/>
       <point x="1094" y="174"/>
-      <point x="1094" y="-1" type="curve" name="dh05" smooth="yes"/>
+      <point x="1094" y="-1" type="curve" smooth="yes" name="dh05"/>
       <point x="1094" y="-177"/>
       <point x="968" y="-285"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2159.glif b/source/Hack-Regular.ufo/glyphs/uni2159.glif
index 7c3777f70..99403f54e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2159.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2159.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2159" format="1">
+<glyph name="uni2159" format="2">
   <advance width="1233"/>
   <unicode hex="2159"/>
   <outline>
@@ -23,43 +23,43 @@
       <point x="51" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="841" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="841" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="626" y="-285"/>
       <point x="530" y="-152"/>
-      <point x="530" y="148" type="curve" name="dh03" smooth="yes"/>
+      <point x="530" y="148" type="curve" smooth="yes" name="dh03"/>
       <point x="530" y="433"/>
       <point x="652" y="582"/>
-      <point x="881" y="582" type="curve" name="dv06" smooth="yes"/>
+      <point x="881" y="582" type="curve" smooth="yes" name="dv06"/>
       <point x="942" y="582"/>
       <point x="1005" y="570"/>
       <point x="1062" y="549" type="curve"/>
       <point x="1062" y="445" type="line" name="ih01"/>
       <point x="1010" y="472"/>
       <point x="951" y="487"/>
-      <point x="887" y="487" type="curve" name="dv05" smooth="yes"/>
+      <point x="887" y="487" type="curve" smooth="yes" name="dv05"/>
       <point x="727" y="487"/>
       <point x="645" y="379"/>
       <point x="645" y="167" type="curve" name="dh04"/>
       <point x="688" y="245"/>
       <point x="755" y="284"/>
-      <point x="848" y="284" type="curve" name="dv04" smooth="yes"/>
+      <point x="848" y="284" type="curve" smooth="yes" name="dv04"/>
       <point x="1029" y="284"/>
       <point x="1130" y="183"/>
-      <point x="1130" y="-1" type="curve" name="dh06" smooth="yes"/>
+      <point x="1130" y="-1" type="curve" smooth="yes" name="dh06"/>
       <point x="1130" y="-182"/>
       <point x="1025" y="-285"/>
     </contour>
     <contour>
-      <point x="839" y="-197" type="curve" name="dv02" smooth="yes"/>
+      <point x="839" y="-197" type="curve" smooth="yes" name="dv02"/>
       <point x="950" y="-197"/>
       <point x="1006" y="-132"/>
-      <point x="1006" y="-1" type="curve" name="dh05" smooth="yes"/>
+      <point x="1006" y="-1" type="curve" smooth="yes" name="dh05"/>
       <point x="1006" y="130"/>
       <point x="950" y="195"/>
-      <point x="839" y="195" type="curve" name="dv03" smooth="yes"/>
+      <point x="839" y="195" type="curve" smooth="yes" name="dv03"/>
       <point x="731" y="195"/>
       <point x="667" y="123"/>
-      <point x="667" y="-1" type="curve" name="hr01" smooth="yes"/>
+      <point x="667" y="-1" type="curve" smooth="yes" name="hr01"/>
       <point x="667" y="-125"/>
       <point x="731" y="-197"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni215A_.glif b/source/Hack-Regular.ufo/glyphs/uni215A_.glif
index e91fa98a6..f4ea8e64b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni215A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni215A_.glif
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni215A" format="1">
+<glyph name="uni215A" format="2">
   <advance width="1233"/>
   <unicode hex="215A"/>
   <outline>
     <contour>
-      <point x="305" y="809" type="curve" name="dv10" smooth="yes"/>
+      <point x="305" y="809" type="curve" smooth="yes" name="dv10"/>
       <point x="206" y="809"/>
       <point x="125" y="821"/>
       <point x="61" y="845" type="curve"/>
       <point x="61" y="959" type="line"/>
       <point x="130" y="924"/>
       <point x="213" y="904"/>
-      <point x="293" y="904" type="curve" name="dv11" smooth="yes"/>
+      <point x="293" y="904" type="curve" smooth="yes" name="dv11"/>
       <point x="433" y="904"/>
       <point x="509" y="972"/>
       <point x="509" y="1093" type="curve" smooth="yes"/>
       <point x="509" y="1213"/>
       <point x="427" y="1282"/>
-      <point x="290" y="1282" type="curve" name="dv05" smooth="yes"/>
+      <point x="290" y="1282" type="curve" smooth="yes" name="dv05"/>
       <point x="223" y="1282"/>
       <point x="160" y="1268"/>
       <point x="100" y="1241" type="curve" name="dh01"/>
@@ -28,10 +28,10 @@
       <point x="215" y="1360" type="line" name="dh02"/>
       <point x="248" y="1371"/>
       <point x="284" y="1377"/>
-      <point x="323" y="1377" type="curve" name="dv06" smooth="yes"/>
+      <point x="323" y="1377" type="curve" smooth="yes" name="dv06"/>
       <point x="514" y="1377"/>
       <point x="635" y="1268"/>
-      <point x="635" y="1093" type="curve" name="dh04" smooth="yes"/>
+      <point x="635" y="1093" type="curve" smooth="yes" name="dh04"/>
       <point x="635" y="917"/>
       <point x="509" y="809"/>
     </contour>
@@ -42,43 +42,43 @@
       <point x="51" y="504" type="line"/>
     </contour>
     <contour>
-      <point x="841" y="-285" type="curve" name="dv01" smooth="yes"/>
+      <point x="841" y="-285" type="curve" smooth="yes" name="dv01"/>
       <point x="626" y="-285"/>
       <point x="530" y="-152"/>
-      <point x="530" y="148" type="curve" name="dh03" smooth="yes"/>
+      <point x="530" y="148" type="curve" smooth="yes" name="dh03"/>
       <point x="530" y="433"/>
       <point x="652" y="582"/>
-      <point x="881" y="582" type="curve" name="hr01" smooth="yes"/>
+      <point x="881" y="582" type="curve" smooth="yes" name="hr01"/>
       <point x="942" y="582"/>
       <point x="1005" y="570"/>
       <point x="1062" y="549" type="curve"/>
       <point x="1062" y="445" type="line" name="ih01"/>
       <point x="1010" y="472"/>
       <point x="951" y="487"/>
-      <point x="887" y="487" type="curve" name="dv09" smooth="yes"/>
+      <point x="887" y="487" type="curve" smooth="yes" name="dv09"/>
       <point x="727" y="487"/>
       <point x="645" y="379"/>
       <point x="645" y="167" type="curve" name="sh01"/>
       <point x="688" y="245"/>
       <point x="755" y="284"/>
-      <point x="848" y="284" type="curve" name="dv08" smooth="yes"/>
+      <point x="848" y="284" type="curve" smooth="yes" name="dv08"/>
       <point x="1029" y="284"/>
       <point x="1130" y="183"/>
-      <point x="1130" y="-1" type="curve" name="dh06" smooth="yes"/>
+      <point x="1130" y="-1" type="curve" smooth="yes" name="dh06"/>
       <point x="1130" y="-182"/>
       <point x="1025" y="-285"/>
     </contour>
     <contour>
-      <point x="839" y="-197" type="curve" name="dv02" smooth="yes"/>
+      <point x="839" y="-197" type="curve" smooth="yes" name="dv02"/>
       <point x="950" y="-197"/>
       <point x="1006" y="-132"/>
-      <point x="1006" y="-1" type="curve" name="dh05" smooth="yes"/>
+      <point x="1006" y="-1" type="curve" smooth="yes" name="dh05"/>
       <point x="1006" y="130"/>
       <point x="950" y="195"/>
-      <point x="839" y="195" type="curve" name="dv07" smooth="yes"/>
+      <point x="839" y="195" type="curve" smooth="yes" name="dv07"/>
       <point x="731" y="195"/>
       <point x="667" y="123"/>
-      <point x="667" y="-1" type="curve" name="sh02" smooth="yes"/>
+      <point x="667" y="-1" type="curve" smooth="yes" name="sh02"/>
       <point x="667" y="-125"/>
       <point x="731" y="-197"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni215F_.glif b/source/Hack-Regular.ufo/glyphs/uni215F_.glif
index 8b8b274cd..a9997b2e3 100644
--- a/source/Hack-Regular.ufo/glyphs/uni215F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni215F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni215F" format="1">
+<glyph name="uni215F" format="2">
   <advance width="1233"/>
   <unicode hex="215F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2196.glif b/source/Hack-Regular.ufo/glyphs/uni2196.glif
index e3c0bce37..efce5435c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2196.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2196.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2196" format="1">
+<glyph name="uni2196" format="2">
   <advance width="1233"/>
   <unicode hex="2196"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2197.glif b/source/Hack-Regular.ufo/glyphs/uni2197.glif
index 84cd4a6a6..7fb368325 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2197.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2197.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2197" format="1">
+<glyph name="uni2197" format="2">
   <advance width="1233"/>
   <unicode hex="2197"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2198.glif b/source/Hack-Regular.ufo/glyphs/uni2198.glif
index 1fd0685a6..a62305074 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2198.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2198.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2198" format="1">
+<glyph name="uni2198" format="2">
   <advance width="1233"/>
   <unicode hex="2198"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2199.glif b/source/Hack-Regular.ufo/glyphs/uni2199.glif
index 739cc5ba7..bf0cff064 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2199.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2199.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2199" format="1">
+<glyph name="uni2199" format="2">
   <advance width="1233"/>
   <unicode hex="2199"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni219A_.glif b/source/Hack-Regular.ufo/glyphs/uni219A_.glif
index ee6852fcb..6d22997e0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni219A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni219A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni219A" format="1">
+<glyph name="uni219A" format="2">
   <advance width="1233"/>
   <unicode hex="219A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni219B_.glif b/source/Hack-Regular.ufo/glyphs/uni219B_.glif
index 34c6fea04..5d0edae15 100644
--- a/source/Hack-Regular.ufo/glyphs/uni219B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni219B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni219B" format="1">
+<glyph name="uni219B" format="2">
   <advance width="1233"/>
   <unicode hex="219B"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni219C_.glif b/source/Hack-Regular.ufo/glyphs/uni219C_.glif
index b9d406b2f..e87adefc1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni219C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni219C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni219C" format="1">
+<glyph name="uni219C" format="2">
   <advance width="1233"/>
   <unicode hex="219C"/>
   <outline>
@@ -14,7 +14,7 @@
       <point x="401" y="607" type="curve" smooth="yes"/>
       <point x="425" y="579"/>
       <point x="464" y="553"/>
-      <point x="511" y="553" type="curve" name="sv01" smooth="yes"/>
+      <point x="511" y="553" type="curve" smooth="yes" name="sv01"/>
       <point x="547" y="553"/>
       <point x="581" y="569"/>
       <point x="616" y="609" type="curve" smooth="yes"/>
@@ -26,7 +26,7 @@
       <point x="794" y="841" type="curve" smooth="yes"/>
       <point x="825" y="856"/>
       <point x="857" y="864"/>
-      <point x="892" y="864" type="curve" name="av03" smooth="yes"/>
+      <point x="892" y="864" type="curve" smooth="yes" name="av03"/>
       <point x="972" y="864"/>
       <point x="1033" y="824"/>
       <point x="1076" y="773" type="curve" smooth="yes"/>
@@ -39,7 +39,7 @@
       <point x="950" y="695" type="curve" smooth="yes"/>
       <point x="933" y="704"/>
       <point x="915" y="709"/>
-      <point x="894" y="709" type="curve" name="sv02" smooth="yes"/>
+      <point x="894" y="709" type="curve" smooth="yes" name="sv02"/>
       <point x="858" y="709"/>
       <point x="819" y="692"/>
       <point x="787" y="655" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="607" y="422" type="curve" smooth="yes"/>
       <point x="575" y="407"/>
       <point x="542" y="399"/>
-      <point x="509" y="399" type="curve" name="hr03" smooth="yes"/>
+      <point x="509" y="399" type="curve" smooth="yes" name="hr03"/>
       <point x="433" y="399"/>
       <point x="370" y="438"/>
       <point x="325" y="491" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni219D_.glif b/source/Hack-Regular.ufo/glyphs/uni219D_.glif
index 68547b5b4..b3cde608d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni219D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni219D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni219D" format="1">
+<glyph name="uni219D" format="2">
   <advance width="1233"/>
   <unicode hex="219D"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="908" y="491" type="line" smooth="yes"/>
       <point x="860" y="434"/>
       <point x="798" y="399"/>
-      <point x="723" y="399" type="curve" name="av01" smooth="yes"/>
+      <point x="723" y="399" type="curve" smooth="yes" name="av01"/>
       <point x="654" y="399"/>
       <point x="594" y="430"/>
       <point x="542" y="491" type="curve" smooth="yes"/>
@@ -17,10 +17,10 @@
       <point x="482" y="593" type="curve" smooth="yes"/>
       <point x="458" y="653"/>
       <point x="427" y="680"/>
-      <point x="396" y="695" type="curve" name="hr01" smooth="yes"/>
+      <point x="396" y="695" type="curve" smooth="yes" name="hr01"/>
       <point x="377" y="704"/>
       <point x="360" y="709"/>
-      <point x="339" y="709" type="curve" name="sv01" smooth="yes"/>
+      <point x="339" y="709" type="curve" smooth="yes" name="sv01"/>
       <point x="292" y="709"/>
       <point x="261" y="685"/>
       <point x="234" y="654" type="curve" smooth="yes"/>
@@ -33,10 +33,10 @@
       <point x="241" y="841" type="curve" smooth="yes"/>
       <point x="270" y="856"/>
       <point x="303" y="864"/>
-      <point x="339" y="864" type="curve" name="av02" smooth="yes"/>
+      <point x="339" y="864" type="curve" smooth="yes" name="av02"/>
       <point x="412" y="864"/>
       <point x="472" y="833"/>
-      <point x="523" y="773" type="curve" name="hr02" smooth="yes"/>
+      <point x="523" y="773" type="curve" smooth="yes" name="hr02"/>
       <point x="555" y="734"/>
       <point x="571" y="699"/>
       <point x="583" y="670" type="curve" smooth="yes"/>
@@ -45,7 +45,7 @@
       <point x="667" y="568" type="curve" smooth="yes"/>
       <point x="684" y="558"/>
       <point x="702" y="553"/>
-      <point x="723" y="553" type="curve" name="sv02" smooth="yes"/>
+      <point x="723" y="553" type="curve" smooth="yes" name="sv02"/>
       <point x="768" y="553"/>
       <point x="808" y="579"/>
       <point x="832" y="607" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni219E_.glif b/source/Hack-Regular.ufo/glyphs/uni219E_.glif
index d57316d28..cdf491191 100644
--- a/source/Hack-Regular.ufo/glyphs/uni219E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni219E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni219E" format="1">
+<glyph name="uni219E" format="2">
   <advance width="1233"/>
   <unicode hex="219E"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni219F_.glif b/source/Hack-Regular.ufo/glyphs/uni219F_.glif
index 33fdc95ca..248026654 100644
--- a/source/Hack-Regular.ufo/glyphs/uni219F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni219F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni219F" format="1">
+<glyph name="uni219F" format="2">
   <advance width="1233"/>
   <unicode hex="219F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21A_0.glif b/source/Hack-Regular.ufo/glyphs/uni21A_0.glif
index 35723ac32..c40648995 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21A_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A0" format="1">
+<glyph name="uni21A0" format="2">
   <advance width="1233"/>
   <unicode hex="21A0"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21A_1.glif b/source/Hack-Regular.ufo/glyphs/uni21A_1.glif
index 5cf2c00a6..d4cca99fc 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21A_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21A_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A1" format="1">
+<glyph name="uni21A1" format="2">
   <advance width="1233"/>
   <unicode hex="21A1"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21A_2.glif b/source/Hack-Regular.ufo/glyphs/uni21A_2.glif
index af39b074a..238daa375 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21A_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21A_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A2" format="1">
+<glyph name="uni21A2" format="2">
   <advance width="1233"/>
   <unicode hex="21A2"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21A_3.glif b/source/Hack-Regular.ufo/glyphs/uni21A_3.glif
index 8c7a57e84..61cccae7b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21A_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21A_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A3" format="1">
+<glyph name="uni21A3" format="2">
   <advance width="1233"/>
   <unicode hex="21A3"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21A_4.glif b/source/Hack-Regular.ufo/glyphs/uni21A_4.glif
index acffdde08..8d2de8f9b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21A_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A4" format="1">
+<glyph name="uni21A4" format="2">
   <advance width="1233"/>
   <unicode hex="21A4"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21A_5.glif b/source/Hack-Regular.ufo/glyphs/uni21A_5.glif
index 4f598ad1d..3d504cfd2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21A_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21A_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A5" format="1">
+<glyph name="uni21A5" format="2">
   <advance width="1233"/>
   <unicode hex="21A5"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21A_6.glif b/source/Hack-Regular.ufo/glyphs/uni21A_6.glif
index 7d9937a65..e5df636dd 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21A_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21A_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A6" format="1">
+<glyph name="uni21A6" format="2">
   <advance width="1233"/>
   <unicode hex="21A6"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21A_7.glif b/source/Hack-Regular.ufo/glyphs/uni21A_7.glif
index 2a5a32c8c..e7b2af8e0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21A_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21A_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A7" format="1">
+<glyph name="uni21A7" format="2">
   <advance width="1233"/>
   <unicode hex="21A7"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21A_9.glif b/source/Hack-Regular.ufo/glyphs/uni21A_9.glif
index 12c30011e..e08f94b1e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21A_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21A_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21A9" format="1">
+<glyph name="uni21A9" format="2">
   <advance width="1233"/>
   <unicode hex="21A9"/>
   <outline>
@@ -9,13 +9,13 @@
       <point x="357" y="893" type="line"/>
       <point x="447" y="803" type="line"/>
       <point x="287" y="643" type="line"/>
-      <point x="868" y="643" type="line" name="dv02" smooth="yes"/>
+      <point x="868" y="643" type="line" smooth="yes" name="dv02"/>
       <point x="911" y="643"/>
       <point x="945" y="659"/>
       <point x="966" y="680" type="curve" smooth="yes"/>
       <point x="989" y="703"/>
       <point x="1003" y="735"/>
-      <point x="1003" y="770" type="curve" name="sh01" smooth="yes"/>
+      <point x="1003" y="770" type="curve" smooth="yes" name="sh01"/>
       <point x="1003" y="809"/>
       <point x="986" y="839"/>
       <point x="966" y="858" type="curve" smooth="yes"/>
@@ -28,13 +28,13 @@
       <point x="1081" y="974" type="curve" smooth="yes"/>
       <point x="1138" y="917"/>
       <point x="1167" y="850"/>
-      <point x="1167" y="771" type="curve" name="dh02" smooth="yes"/>
+      <point x="1167" y="771" type="curve" smooth="yes" name="dh02"/>
       <point x="1167" y="699"/>
       <point x="1142" y="624"/>
       <point x="1082" y="564" type="curve"/>
       <point x="1026" y="510"/>
       <point x="952" y="479"/>
-      <point x="908" y="479" type="curve" name="dv01" smooth="yes"/>
+      <point x="908" y="479" type="curve" smooth="yes" name="dv01"/>
       <point x="287" y="479" type="line"/>
       <point x="447" y="319" type="line"/>
       <point x="357" y="229" type="line" name="av01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21A_A_.glif b/source/Hack-Regular.ufo/glyphs/uni21A_A_.glif
index 651c38c4e..9e1847423 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21A_A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21A_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21AA" format="1">
+<glyph name="uni21AA" format="2">
   <advance width="1233"/>
   <unicode hex="21AA"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="152" y="564" type="curve" smooth="yes"/>
       <point x="85" y="629"/>
       <point x="66" y="704"/>
-      <point x="66" y="768" type="curve" name="dh01" smooth="yes"/>
+      <point x="66" y="768" type="curve" smooth="yes" name="dh01"/>
       <point x="66" y="852"/>
       <point x="100" y="926"/>
       <point x="151" y="975" type="curve" smooth="yes"/>
@@ -25,10 +25,10 @@
       <point x="267" y="858" type="curve" smooth="yes"/>
       <point x="247" y="839"/>
       <point x="230" y="809"/>
-      <point x="230" y="770" type="curve" name="dh02" smooth="yes"/>
+      <point x="230" y="770" type="curve" smooth="yes" name="dh02"/>
       <point x="230" y="735"/>
       <point x="244" y="703"/>
-      <point x="267" y="680" type="curve" name="hr01" smooth="yes"/>
+      <point x="267" y="680" type="curve" smooth="yes" name="hr01"/>
       <point x="288" y="659"/>
       <point x="322" y="643"/>
       <point x="365" y="643" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21A_B_.glif b/source/Hack-Regular.ufo/glyphs/uni21A_B_.glif
index 7c3eec4da..5389348f4 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21A_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21A_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21AB" format="1">
+<glyph name="uni21AB" format="2">
   <advance width="1233"/>
   <unicode hex="21AB"/>
   <outline>
@@ -16,19 +16,19 @@
       <point x="676" y="974" type="curve" smooth="yes"/>
       <point x="723" y="1021"/>
       <point x="796" y="1059"/>
-      <point x="880" y="1059" type="curve" name="dv02" smooth="yes"/>
+      <point x="880" y="1059" type="curve" smooth="yes" name="dv02"/>
       <point x="961" y="1059"/>
       <point x="1032" y="1023"/>
       <point x="1081" y="975" type="curve" smooth="yes"/>
       <point x="1138" y="919"/>
       <point x="1167" y="848"/>
-      <point x="1167" y="769" type="curve" name="sh02" smooth="yes"/>
+      <point x="1167" y="769" type="curve" smooth="yes" name="sh02"/>
       <point x="1167" y="694"/>
       <point x="1142" y="624"/>
       <point x="1082" y="565" type="curve" smooth="yes"/>
       <point x="1021" y="504"/>
       <point x="946" y="479"/>
-      <point x="908" y="479" type="curve" name="dv03" smooth="yes"/>
+      <point x="908" y="479" type="curve" smooth="yes" name="dv03"/>
       <point x="757" y="479" type="line" name="sh04"/>
       <point x="757" y="266" type="line"/>
       <point x="593" y="266" type="line" name="sh05"/>
@@ -38,19 +38,19 @@
       <point x="357" y="229" type="line" name="av01"/>
     </contour>
     <contour>
-      <point x="868" y="643" type="line" name="dv04" smooth="yes"/>
+      <point x="868" y="643" type="line" smooth="yes" name="dv04"/>
       <point x="907" y="643"/>
       <point x="940" y="655"/>
       <point x="966" y="680" type="curve" smooth="yes"/>
       <point x="989" y="703"/>
       <point x="1003" y="735"/>
-      <point x="1003" y="770" type="curve" name="ah01" smooth="yes"/>
+      <point x="1003" y="770" type="curve" smooth="yes" name="ah01"/>
       <point x="1003" y="803"/>
       <point x="990" y="835"/>
       <point x="966" y="858" type="curve" smooth="yes"/>
       <point x="945" y="878"/>
       <point x="911" y="895"/>
-      <point x="880" y="895" type="curve" name="dv01" smooth="yes"/>
+      <point x="880" y="895" type="curve" smooth="yes" name="dv01"/>
       <point x="813" y="895"/>
       <point x="757" y="839"/>
       <point x="757" y="768" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21A_C_.glif b/source/Hack-Regular.ufo/glyphs/uni21A_C_.glif
index e6d2db826..202f39662 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21A_C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21A_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21AC" format="1">
+<glyph name="uni21AC" format="2">
   <advance width="1233"/>
   <unicode hex="21AC"/>
   <outline>
@@ -16,19 +16,19 @@
       <point x="151" y="565" type="curve" smooth="yes"/>
       <point x="91" y="624"/>
       <point x="66" y="694"/>
-      <point x="66" y="769" type="curve" name="sh02" smooth="yes"/>
+      <point x="66" y="769" type="curve" smooth="yes" name="sh02"/>
       <point x="66" y="848"/>
       <point x="95" y="919"/>
       <point x="152" y="975" type="curve" smooth="yes"/>
       <point x="201" y="1023"/>
       <point x="272" y="1059"/>
-      <point x="353" y="1059" type="curve" name="dv02" smooth="yes"/>
+      <point x="353" y="1059" type="curve" smooth="yes" name="dv02"/>
       <point x="437" y="1059"/>
       <point x="510" y="1021"/>
       <point x="557" y="974" type="curve" smooth="yes"/>
       <point x="614" y="917"/>
       <point x="640" y="841"/>
-      <point x="640" y="768" type="curve" name="sh03" smooth="yes"/>
+      <point x="640" y="768" type="curve" smooth="yes" name="sh03"/>
       <point x="640" y="643" type="line"/>
       <point x="946" y="643" type="line" name="dv04"/>
       <point x="786" y="803" type="line"/>
@@ -42,13 +42,13 @@
       <point x="476" y="768" type="line" smooth="yes"/>
       <point x="476" y="839"/>
       <point x="417" y="895"/>
-      <point x="354" y="895" type="curve" name="dv01" smooth="yes"/>
+      <point x="354" y="895" type="curve" smooth="yes" name="dv01"/>
       <point x="323" y="895"/>
       <point x="288" y="878"/>
       <point x="267" y="858" type="curve" smooth="yes"/>
       <point x="243" y="835"/>
       <point x="230" y="803"/>
-      <point x="230" y="770" type="curve" name="sh05" smooth="yes"/>
+      <point x="230" y="770" type="curve" smooth="yes" name="sh05"/>
       <point x="230" y="735"/>
       <point x="244" y="703"/>
       <point x="267" y="680" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21A_D_.glif b/source/Hack-Regular.ufo/glyphs/uni21A_D_.glif
index 3b5c81e48..166e38250 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21A_D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21A_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21AD" format="1">
+<glyph name="uni21AD" format="2">
   <advance width="1233"/>
   <unicode hex="21AD"/>
   <outline>
@@ -27,7 +27,7 @@
       <point x="559" y="723" type="curve" smooth="yes"/>
       <point x="578" y="734"/>
       <point x="597" y="740"/>
-      <point x="617" y="740" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="740" type="curve" smooth="yes" name="dv02"/>
       <point x="664" y="740"/>
       <point x="701" y="708"/>
       <point x="724" y="673" type="curve" smooth="yes"/>
@@ -60,7 +60,7 @@
       <point x="906" y="460" type="curve" smooth="yes"/>
       <point x="879" y="425"/>
       <point x="851" y="393"/>
-      <point x="802" y="393" type="curve" name="sv01" smooth="yes"/>
+      <point x="802" y="393" type="curve" smooth="yes" name="sv01"/>
       <point x="758" y="393"/>
       <point x="722" y="417"/>
       <point x="693" y="460" type="curve" smooth="yes"/>
@@ -84,7 +84,7 @@
       <point x="491" y="410" type="curve" smooth="yes"/>
       <point x="474" y="399"/>
       <point x="454" y="393"/>
-      <point x="433" y="393" type="curve" name="dv01" smooth="yes"/>
+      <point x="433" y="393" type="curve" smooth="yes" name="dv01"/>
       <point x="386" y="393"/>
       <point x="358" y="420"/>
       <point x="327" y="460" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21A_E_.glif b/source/Hack-Regular.ufo/glyphs/uni21A_E_.glif
index 40332f532..088238c34 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21A_E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21A_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21AE" format="1">
+<glyph name="uni21AE" format="2">
   <advance width="1233"/>
   <unicode hex="21AE"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21A_F_.glif b/source/Hack-Regular.ufo/glyphs/uni21A_F_.glif
index 27b480124..a49543160 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21A_F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21A_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21AF" format="1">
+<glyph name="uni21AF" format="2">
   <advance width="1233"/>
   <unicode hex="21AF"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21B_0.glif b/source/Hack-Regular.ufo/glyphs/uni21B_0.glif
index a3ffd8175..324054615 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21B_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21B_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B0" format="1">
+<glyph name="uni21B0" format="2">
   <advance width="1233"/>
   <unicode hex="21B0"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21B_1.glif b/source/Hack-Regular.ufo/glyphs/uni21B_1.glif
index 417564780..b4e5448bd 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21B_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21B_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B1" format="1">
+<glyph name="uni21B1" format="2">
   <advance width="1233"/>
   <unicode hex="21B1"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21B_2.glif b/source/Hack-Regular.ufo/glyphs/uni21B_2.glif
index 844fd2d4c..f7e470221 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21B_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21B_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B2" format="1">
+<glyph name="uni21B2" format="2">
   <advance width="1233"/>
   <unicode hex="21B2"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21B_3.glif b/source/Hack-Regular.ufo/glyphs/uni21B_3.glif
index 514d96bf5..b086d1277 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21B_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B3" format="1">
+<glyph name="uni21B3" format="2">
   <advance width="1233"/>
   <unicode hex="21B3"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21B_4.glif b/source/Hack-Regular.ufo/glyphs/uni21B_4.glif
index 761b1acec..f6568700d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21B_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21B_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B4" format="1">
+<glyph name="uni21B4" format="2">
   <advance width="1233"/>
   <unicode hex="21B4"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21B_6.glif b/source/Hack-Regular.ufo/glyphs/uni21B_6.glif
index b44449fbe..0603c6d02 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21B_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21B_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B6" format="1">
+<glyph name="uni21B6" format="2">
   <advance width="1233"/>
   <unicode hex="21B6"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="459" y="882" type="curve" smooth="yes"/>
       <point x="536" y="958"/>
       <point x="633" y="997"/>
-      <point x="745" y="997" type="curve" name="dv02" smooth="yes"/>
+      <point x="745" y="997" type="curve" smooth="yes" name="dv02"/>
       <point x="862" y="997"/>
       <point x="958" y="953"/>
       <point x="1031" y="881" type="curve" smooth="yes"/>
@@ -23,10 +23,10 @@
       <point x="1000" y="596" type="line" name="sv01"/>
       <point x="1000" y="671"/>
       <point x="970" y="739"/>
-      <point x="925" y="786" type="curve" name="hr01" smooth="yes"/>
+      <point x="925" y="786" type="curve" smooth="yes" name="hr01"/>
       <point x="889" y="825"/>
       <point x="828" y="862"/>
-      <point x="747" y="862" type="curve" name="dv01" smooth="yes"/>
+      <point x="747" y="862" type="curve" smooth="yes" name="dv01"/>
       <point x="678" y="862"/>
       <point x="613" y="834"/>
       <point x="565" y="787" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21B_7.glif b/source/Hack-Regular.ufo/glyphs/uni21B_7.glif
index 3da267ed2..bd29d4318 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21B_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21B_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B7" format="1">
+<glyph name="uni21B7" format="2">
   <advance width="1233"/>
   <unicode hex="21B7"/>
   <outline>
@@ -7,13 +7,13 @@
       <point x="488" y="635" type="line" name="hr00"/>
       <point x="578" y="725" type="line"/>
       <point x="738" y="565" type="line"/>
-      <point x="738" y="588" type="line" name="dh01" smooth="yes"/>
+      <point x="738" y="588" type="line" smooth="yes" name="dh01"/>
       <point x="738" y="683"/>
       <point x="720" y="732"/>
       <point x="667" y="785" type="curve" smooth="yes"/>
       <point x="618" y="834"/>
       <point x="565" y="862"/>
-      <point x="489" y="862" type="curve" name="dv01" smooth="yes"/>
+      <point x="489" y="862" type="curve" smooth="yes" name="dv01"/>
       <point x="416" y="862"/>
       <point x="356" y="836"/>
       <point x="308" y="785" type="curve" smooth="yes"/>
@@ -23,13 +23,13 @@
       <point x="81" y="596" type="line"/>
       <point x="84" y="823"/>
       <point x="262" y="997"/>
-      <point x="488" y="997" type="curve" name="dv02" smooth="yes"/>
+      <point x="488" y="997" type="curve" smooth="yes" name="dv02"/>
       <point x="600" y="997"/>
       <point x="697" y="958"/>
       <point x="774" y="882" type="curve" smooth="yes"/>
       <point x="854" y="803"/>
       <point x="897" y="698"/>
-      <point x="901" y="589" type="curve" name="hr01" smooth="yes"/>
+      <point x="901" y="589" type="curve" smooth="yes" name="hr01"/>
       <point x="902" y="565" type="line"/>
       <point x="1062" y="725" type="line"/>
       <point x="1152" y="635" type="line"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21B_8.glif b/source/Hack-Regular.ufo/glyphs/uni21B_8.glif
index e1661fe03..b84171324 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21B_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21B_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B8" format="1">
+<glyph name="uni21B8" format="2">
   <advance width="1233"/>
   <unicode hex="21B8"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21B_9.glif b/source/Hack-Regular.ufo/glyphs/uni21B_9.glif
index 79122d8c4..09587b96c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21B_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21B_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21B9" format="1">
+<glyph name="uni21B9" format="2">
   <advance width="1233"/>
   <unicode hex="21B9"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21B_A_.glif b/source/Hack-Regular.ufo/glyphs/uni21B_A_.glif
index dbb77ef13..6731f33e5 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21B_A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21B_A_.glif
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21BA" format="1">
+<glyph name="uni21BA" format="2">
   <advance width="1233"/>
   <unicode hex="21BA"/>
   <outline>
     <contour>
-      <point x="591" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="591" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="454" y="0"/>
       <point x="329" y="54"/>
       <point x="237" y="146" type="curve" smooth="yes"/>
       <point x="141" y="242"/>
       <point x="89" y="368"/>
-      <point x="89" y="505" type="curve" name="dh01" smooth="yes"/>
+      <point x="89" y="505" type="curve" smooth="yes" name="dh01"/>
       <point x="89" y="640"/>
       <point x="138" y="758"/>
       <point x="237" y="861" type="curve"/>
       <point x="356" y="746" type="line"/>
       <point x="287" y="678"/>
       <point x="255" y="596"/>
-      <point x="255" y="505" type="curve" name="hr01" smooth="yes"/>
+      <point x="255" y="505" type="curve" smooth="yes" name="hr01"/>
       <point x="255" y="409"/>
       <point x="290" y="326"/>
       <point x="355" y="262" type="curve" smooth="yes"/>
       <point x="415" y="202"/>
       <point x="497" y="163"/>
-      <point x="594" y="163" type="curve" name="sv01" smooth="yes"/>
+      <point x="594" y="163" type="curve" smooth="yes" name="sv01"/>
       <point x="687" y="163"/>
       <point x="772" y="199"/>
       <point x="835" y="262" type="curve" smooth="yes"/>
       <point x="896" y="323"/>
       <point x="934" y="410"/>
-      <point x="934" y="502" type="curve" name="hr02" smooth="yes"/>
+      <point x="934" y="502" type="curve" smooth="yes" name="hr02"/>
       <point x="934" y="596"/>
       <point x="892" y="699"/>
       <point x="834" y="746" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="946" y="861" type="line" smooth="yes"/>
       <point x="1046" y="761"/>
       <point x="1094" y="638"/>
-      <point x="1094" y="505" type="curve" name="dh04" smooth="yes"/>
+      <point x="1094" y="505" type="curve" smooth="yes" name="dh04"/>
       <point x="1094" y="366"/>
       <point x="1043" y="243"/>
       <point x="947" y="147" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21B_B_.glif b/source/Hack-Regular.ufo/glyphs/uni21B_B_.glif
index fcc534a76..6f161e7b0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21B_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21B_B_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21BB" format="1">
+<glyph name="uni21BB" format="2">
   <advance width="1233"/>
   <unicode hex="21BB"/>
   <outline>
     <contour>
-      <point x="642" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="642" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="505" y="0"/>
       <point x="379" y="55"/>
       <point x="286" y="147" type="curve" smooth="yes"/>
       <point x="194" y="239"/>
       <point x="138" y="361"/>
-      <point x="138" y="504" type="curve" name="ih01" smooth="yes"/>
+      <point x="138" y="504" type="curve" smooth="yes" name="ih01"/>
       <point x="138" y="640"/>
       <point x="190" y="764"/>
       <point x="287" y="861" type="curve" smooth="yes"/>
@@ -25,26 +25,26 @@
       <point x="399" y="746" type="line" smooth="yes"/>
       <point x="341" y="699"/>
       <point x="299" y="596"/>
-      <point x="299" y="502" type="curve" name="sh02" smooth="yes"/>
+      <point x="299" y="502" type="curve" smooth="yes" name="sh02"/>
       <point x="299" y="410"/>
       <point x="337" y="323"/>
       <point x="398" y="262" type="curve" smooth="yes"/>
       <point x="461" y="199"/>
       <point x="546" y="163"/>
-      <point x="639" y="163" type="curve" name="sv02" smooth="yes"/>
+      <point x="639" y="163" type="curve" smooth="yes" name="sv02"/>
       <point x="736" y="163"/>
       <point x="818" y="202"/>
-      <point x="878" y="262" type="curve" name="hr01" smooth="yes"/>
+      <point x="878" y="262" type="curve" smooth="yes" name="hr01"/>
       <point x="943" y="326"/>
       <point x="978" y="409"/>
-      <point x="978" y="505" type="curve" name="dh03" smooth="yes"/>
+      <point x="978" y="505" type="curve" smooth="yes" name="dh03"/>
       <point x="978" y="596"/>
       <point x="946" y="678"/>
       <point x="877" y="746" type="curve"/>
       <point x="996" y="861" type="line"/>
       <point x="1095" y="758"/>
       <point x="1144" y="640"/>
-      <point x="1144" y="505" type="curve" name="hr02" smooth="yes"/>
+      <point x="1144" y="505" type="curve" smooth="yes" name="hr02"/>
       <point x="1144" y="368"/>
       <point x="1092" y="242"/>
       <point x="996" y="146" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21B_C_.glif b/source/Hack-Regular.ufo/glyphs/uni21B_C_.glif
index 8b11354f7..f81e2faa0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21B_C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21B_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21BC" format="1">
+<glyph name="uni21BC" format="2">
   <advance width="1233"/>
   <unicode hex="21BC"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21B_D_.glif b/source/Hack-Regular.ufo/glyphs/uni21B_D_.glif
index d66298e53..a8694f030 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21B_D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21B_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21BD" format="1">
+<glyph name="uni21BD" format="2">
   <advance width="1233"/>
   <unicode hex="21BD"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21B_E_.glif b/source/Hack-Regular.ufo/glyphs/uni21B_E_.glif
index caf0fafb9..6639222a7 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21B_E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21B_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21BE" format="1">
+<glyph name="uni21BE" format="2">
   <advance width="1233"/>
   <unicode hex="21BE"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21B_F_.glif b/source/Hack-Regular.ufo/glyphs/uni21B_F_.glif
index 1359c7c03..5af991b12 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21B_F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21B_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21BF" format="1">
+<glyph name="uni21BF" format="2">
   <advance width="1233"/>
   <unicode hex="21BF"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21C_0.glif b/source/Hack-Regular.ufo/glyphs/uni21C_0.glif
index 67b552fe8..72066a27b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21C_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21C_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C0" format="1">
+<glyph name="uni21C0" format="2">
   <advance width="1233"/>
   <unicode hex="21C0"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21C_1.glif b/source/Hack-Regular.ufo/glyphs/uni21C_1.glif
index ecb2927bf..bc14d5975 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21C_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21C_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C1" format="1">
+<glyph name="uni21C1" format="2">
   <advance width="1233"/>
   <unicode hex="21C1"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21C_2.glif b/source/Hack-Regular.ufo/glyphs/uni21C_2.glif
index 66b9f7054..f1c7ef5e5 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21C_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21C_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C2" format="1">
+<glyph name="uni21C2" format="2">
   <advance width="1233"/>
   <unicode hex="21C2"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21C_3.glif b/source/Hack-Regular.ufo/glyphs/uni21C_3.glif
index bcffd68f5..f73e7a2db 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21C_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21C_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C3" format="1">
+<glyph name="uni21C3" format="2">
   <advance width="1233"/>
   <unicode hex="21C3"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21C_4.glif b/source/Hack-Regular.ufo/glyphs/uni21C_4.glif
index 86d543d9d..0238aa456 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21C_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21C_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C4" format="1">
+<glyph name="uni21C4" format="2">
   <advance width="1233"/>
   <unicode hex="21C4"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21C_5.glif b/source/Hack-Regular.ufo/glyphs/uni21C_5.glif
index db1da371f..1cc6a3aa2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21C_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21C_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C5" format="1">
+<glyph name="uni21C5" format="2">
   <advance width="1233"/>
   <unicode hex="21C5"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21C_6.glif b/source/Hack-Regular.ufo/glyphs/uni21C_6.glif
index ef997610f..b884c70e7 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21C_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21C_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C6" format="1">
+<glyph name="uni21C6" format="2">
   <advance width="1233"/>
   <unicode hex="21C6"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21C_7.glif b/source/Hack-Regular.ufo/glyphs/uni21C_7.glif
index b58130c14..0f5912d8a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21C_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21C_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C7" format="1">
+<glyph name="uni21C7" format="2">
   <advance width="1233"/>
   <unicode hex="21C7"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21C_8.glif b/source/Hack-Regular.ufo/glyphs/uni21C_8.glif
index c558dc36f..ac9e7c6cd 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21C_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21C_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C8" format="1">
+<glyph name="uni21C8" format="2">
   <advance width="1233"/>
   <unicode hex="21C8"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21C_9.glif b/source/Hack-Regular.ufo/glyphs/uni21C_9.glif
index 29f9940b0..f902b1ad5 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21C_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21C_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21C9" format="1">
+<glyph name="uni21C9" format="2">
   <advance width="1233"/>
   <unicode hex="21C9"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21C_A_.glif b/source/Hack-Regular.ufo/glyphs/uni21C_A_.glif
index 1be45211f..94c249ba1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21C_A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21C_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21CA" format="1">
+<glyph name="uni21CA" format="2">
   <advance width="1233"/>
   <unicode hex="21CA"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21C_B_.glif b/source/Hack-Regular.ufo/glyphs/uni21C_B_.glif
index cbf6e465e..e2e6cb513 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21C_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21C_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21CB" format="1">
+<glyph name="uni21CB" format="2">
   <advance width="1233"/>
   <unicode hex="21CB"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21C_C_.glif b/source/Hack-Regular.ufo/glyphs/uni21C_C_.glif
index 57e70d3db..916507062 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21C_C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21C_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21CC" format="1">
+<glyph name="uni21CC" format="2">
   <advance width="1233"/>
   <unicode hex="21CC"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21C_D_.glif b/source/Hack-Regular.ufo/glyphs/uni21C_D_.glif
index 081509671..6c2918ce9 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21C_D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21C_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21CD" format="1">
+<glyph name="uni21CD" format="2">
   <advance width="1233"/>
   <unicode hex="21CD"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21C_E_.glif b/source/Hack-Regular.ufo/glyphs/uni21C_E_.glif
index 8e4d73448..a1e36f66a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21C_E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21C_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21CE" format="1">
+<glyph name="uni21CE" format="2">
   <advance width="1233"/>
   <unicode hex="21CE"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21C_F_.glif b/source/Hack-Regular.ufo/glyphs/uni21C_F_.glif
index 56a57c79f..aafdf1ec2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21C_F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21C_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21CF" format="1">
+<glyph name="uni21CF" format="2">
   <advance width="1233"/>
   <unicode hex="21CF"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21D_5.glif b/source/Hack-Regular.ufo/glyphs/uni21D_5.glif
index 4fffc9ddf..443b14c69 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21D_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21D_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21D5" format="1">
+<glyph name="uni21D5" format="2">
   <advance width="1233"/>
   <unicode hex="21D5"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21D_6.glif b/source/Hack-Regular.ufo/glyphs/uni21D_6.glif
index 35787241a..93451825c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21D_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21D_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21D6" format="1">
+<glyph name="uni21D6" format="2">
   <advance width="1233"/>
   <unicode hex="21D6"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21D_7.glif b/source/Hack-Regular.ufo/glyphs/uni21D_7.glif
index 9a862170a..c553b699c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21D_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21D_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21D7" format="1">
+<glyph name="uni21D7" format="2">
   <advance width="1233"/>
   <unicode hex="21D7"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21D_8.glif b/source/Hack-Regular.ufo/glyphs/uni21D_8.glif
index aa91d159c..aa424758f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21D_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21D_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21D8" format="1">
+<glyph name="uni21D8" format="2">
   <advance width="1233"/>
   <unicode hex="21D8"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21D_9.glif b/source/Hack-Regular.ufo/glyphs/uni21D_9.glif
index 29fb9ad61..a4dd8d565 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21D_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21D_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21D9" format="1">
+<glyph name="uni21D9" format="2">
   <advance width="1233"/>
   <unicode hex="21D9"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21D_A_.glif b/source/Hack-Regular.ufo/glyphs/uni21D_A_.glif
index 937389035..784ccdc25 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21D_A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21D_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21DA" format="1">
+<glyph name="uni21DA" format="2">
   <advance width="1233"/>
   <unicode hex="21DA"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21D_B_.glif b/source/Hack-Regular.ufo/glyphs/uni21D_B_.glif
index 30701043d..953c00066 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21D_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21D_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21DB" format="1">
+<glyph name="uni21DB" format="2">
   <advance width="1233"/>
   <unicode hex="21DB"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21D_C_.glif b/source/Hack-Regular.ufo/glyphs/uni21D_C_.glif
index 8ea9a402a..c3775f439 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21D_C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21D_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21DC" format="1">
+<glyph name="uni21DC" format="2">
   <advance width="1233"/>
   <unicode hex="21DC"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21D_D_.glif b/source/Hack-Regular.ufo/glyphs/uni21D_D_.glif
index 5e7dd8e7f..08eb408e0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21D_D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21D_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21DD" format="1">
+<glyph name="uni21DD" format="2">
   <advance width="1233"/>
   <unicode hex="21DD"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21E_0.glif b/source/Hack-Regular.ufo/glyphs/uni21E_0.glif
index 93aacbac3..2d057ff75 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21E_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21E_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E0" format="1">
+<glyph name="uni21E0" format="2">
   <advance width="1233"/>
   <unicode hex="21E0"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21E_1.glif b/source/Hack-Regular.ufo/glyphs/uni21E_1.glif
index fdffc1d3b..73fdc55e6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21E_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21E_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E1" format="1">
+<glyph name="uni21E1" format="2">
   <advance width="1233"/>
   <unicode hex="21E1"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21E_2.glif b/source/Hack-Regular.ufo/glyphs/uni21E_2.glif
index 360825c25..5a47839ca 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21E_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21E_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E2" format="1">
+<glyph name="uni21E2" format="2">
   <advance width="1233"/>
   <unicode hex="21E2"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21E_3.glif b/source/Hack-Regular.ufo/glyphs/uni21E_3.glif
index ab43c96e8..a6a50d08f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21E_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21E_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E3" format="1">
+<glyph name="uni21E3" format="2">
   <advance width="1233"/>
   <unicode hex="21E3"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21E_4.glif b/source/Hack-Regular.ufo/glyphs/uni21E_4.glif
index 1fbef41cd..5989538b9 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21E_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21E_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E4" format="1">
+<glyph name="uni21E4" format="2">
   <advance width="1233"/>
   <unicode hex="21E4"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21E_5.glif b/source/Hack-Regular.ufo/glyphs/uni21E_5.glif
index 80148190b..8a4f2c7f2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21E_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21E_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E5" format="1">
+<glyph name="uni21E5" format="2">
   <advance width="1233"/>
   <unicode hex="21E5"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21E_6.glif b/source/Hack-Regular.ufo/glyphs/uni21E_6.glif
index 159fbec84..b3c7a9a47 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21E_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21E_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E6" format="1">
+<glyph name="uni21E6" format="2">
   <advance width="1233"/>
   <unicode hex="21E6"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21E_7.glif b/source/Hack-Regular.ufo/glyphs/uni21E_7.glif
index f6bff6515..90c1a99ea 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21E_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21E_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E7" format="1">
+<glyph name="uni21E7" format="2">
   <advance width="1233"/>
   <unicode hex="21E7"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21E_8.glif b/source/Hack-Regular.ufo/glyphs/uni21E_8.glif
index 9fbb15657..71d53b152 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21E_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21E_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E8" format="1">
+<glyph name="uni21E8" format="2">
   <advance width="1233"/>
   <unicode hex="21E8"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21E_9.glif b/source/Hack-Regular.ufo/glyphs/uni21E_9.glif
index 7bda8bb54..fcad226a7 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21E_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21E_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21E9" format="1">
+<glyph name="uni21E9" format="2">
   <advance width="1233"/>
   <unicode hex="21E9"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21E_B_.glif b/source/Hack-Regular.ufo/glyphs/uni21E_B_.glif
index 28ef11294..3863f8e21 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21E_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21E_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21EB" format="1">
+<glyph name="uni21EB" format="2">
   <advance width="1233"/>
   <unicode hex="21EB"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21E_C_.glif b/source/Hack-Regular.ufo/glyphs/uni21E_C_.glif
index a2c0e762b..340799a35 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21E_C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21E_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21EC" format="1">
+<glyph name="uni21EC" format="2">
   <advance width="1233"/>
   <unicode hex="21EC"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21E_D_.glif b/source/Hack-Regular.ufo/glyphs/uni21E_D_.glif
index 29c469f48..d43de6d58 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21E_D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21E_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21ED" format="1">
+<glyph name="uni21ED" format="2">
   <advance width="1233"/>
   <unicode hex="21ED"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21E_E_.glif b/source/Hack-Regular.ufo/glyphs/uni21E_E_.glif
index 9fc2a8caf..028a8094d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21E_E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21E_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21EE" format="1">
+<glyph name="uni21EE" format="2">
   <advance width="1233"/>
   <unicode hex="21EE"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21E_F_.glif b/source/Hack-Regular.ufo/glyphs/uni21E_F_.glif
index ddb3f2adf..79d79df20 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21E_F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21E_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21EF" format="1">
+<glyph name="uni21EF" format="2">
   <advance width="1233"/>
   <unicode hex="21EF"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21F_0.glif b/source/Hack-Regular.ufo/glyphs/uni21F_0.glif
index bb47a7abe..14b3ef90f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21F_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21F_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F0" format="1">
+<glyph name="uni21F0" format="2">
   <advance width="1233"/>
   <unicode hex="21F0"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21F_1.glif b/source/Hack-Regular.ufo/glyphs/uni21F_1.glif
index ee214643b..7f9417370 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21F_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21F_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F1" format="1">
+<glyph name="uni21F1" format="2">
   <advance width="1233"/>
   <unicode hex="21F1"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21F_2.glif b/source/Hack-Regular.ufo/glyphs/uni21F_2.glif
index b5e39bac3..36dad6924 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21F_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21F_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F2" format="1">
+<glyph name="uni21F2" format="2">
   <advance width="1233"/>
   <unicode hex="21F2"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21F_3.glif b/source/Hack-Regular.ufo/glyphs/uni21F_3.glif
index 1ee0cd5ff..51350f93d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21F_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21F_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F3" format="1">
+<glyph name="uni21F3" format="2">
   <advance width="1233"/>
   <unicode hex="21F3"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21F_4.glif b/source/Hack-Regular.ufo/glyphs/uni21F_4.glif
index 87cb1e481..3d3eaccc4 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21F_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21F_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F4" format="1">
+<glyph name="uni21F4" format="2">
   <advance width="1233"/>
   <unicode hex="21F4"/>
   <outline>
@@ -9,7 +9,7 @@
       <point x="709" y="479" type="line"/>
       <point x="685" y="394"/>
       <point x="595" y="284"/>
-      <point x="436" y="284" type="curve" name="dv01" smooth="yes"/>
+      <point x="436" y="284" type="curve" smooth="yes" name="dv01"/>
       <point x="279" y="284"/>
       <point x="197" y="391"/>
       <point x="173" y="479" type="curve" name="sv01"/>
@@ -18,7 +18,7 @@
       <point x="173" y="643" type="line"/>
       <point x="197" y="732"/>
       <point x="283" y="843"/>
-      <point x="439" y="843" type="curve" name="dv04" smooth="yes"/>
+      <point x="439" y="843" type="curve" smooth="yes" name="dv04"/>
       <point x="520" y="843"/>
       <point x="583" y="814"/>
       <point x="638" y="759" type="curve" smooth="yes"/>
@@ -42,7 +42,7 @@
       <point x="559" y="680" type="curve" smooth="yes"/>
       <point x="528" y="711"/>
       <point x="492" y="729"/>
-      <point x="441" y="729" type="curve" name="dv03" smooth="yes"/>
+      <point x="441" y="729" type="curve" smooth="yes" name="dv03"/>
       <point x="394" y="729"/>
       <point x="355" y="713"/>
       <point x="322" y="680" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="293" y="643" type="curve" name="iv01"/>
     </contour>
     <contour>
-      <point x="437" y="396" type="curve" name="dv02" smooth="yes"/>
+      <point x="437" y="396" type="curve" smooth="yes" name="dv02"/>
       <point x="483" y="396"/>
       <point x="524" y="412"/>
       <point x="559" y="444" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21F_5.glif b/source/Hack-Regular.ufo/glyphs/uni21F_5.glif
index 11f4c6ffe..ce55b3310 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21F_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21F_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F5" format="1">
+<glyph name="uni21F5" format="2">
   <advance width="1233"/>
   <unicode hex="21F5"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21F_6.glif b/source/Hack-Regular.ufo/glyphs/uni21F_6.glif
index 48eba6398..9b10e3144 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21F_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21F_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F6" format="1">
+<glyph name="uni21F6" format="2">
   <advance width="1233"/>
   <unicode hex="21F6"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21F_7.glif b/source/Hack-Regular.ufo/glyphs/uni21F_7.glif
index 92574d1e4..7215dd41b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21F_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21F_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F7" format="1">
+<glyph name="uni21F7" format="2">
   <advance width="1233"/>
   <unicode hex="21F7"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21F_8.glif b/source/Hack-Regular.ufo/glyphs/uni21F_8.glif
index fda52b84f..f8925624b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21F_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21F_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F8" format="1">
+<glyph name="uni21F8" format="2">
   <advance width="1233"/>
   <unicode hex="21F8"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21F_9.glif b/source/Hack-Regular.ufo/glyphs/uni21F_9.glif
index 08b6d4ac5..16879693a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21F_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21F_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21F9" format="1">
+<glyph name="uni21F9" format="2">
   <advance width="1233"/>
   <unicode hex="21F9"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21F_A_.glif b/source/Hack-Regular.ufo/glyphs/uni21F_A_.glif
index 6b4e40ca2..8a0406589 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21F_A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21F_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21FA" format="1">
+<glyph name="uni21FA" format="2">
   <advance width="1233"/>
   <unicode hex="21FA"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21F_B_.glif b/source/Hack-Regular.ufo/glyphs/uni21F_B_.glif
index 3cb924cb9..480cdafb5 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21F_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21F_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21FB" format="1">
+<glyph name="uni21FB" format="2">
   <advance width="1233"/>
   <unicode hex="21FB"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21F_C_.glif b/source/Hack-Regular.ufo/glyphs/uni21F_C_.glif
index a951ad082..1a767efd2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21F_C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21F_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21FC" format="1">
+<glyph name="uni21FC" format="2">
   <advance width="1233"/>
   <unicode hex="21FC"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21F_D_.glif b/source/Hack-Regular.ufo/glyphs/uni21F_D_.glif
index dc986956b..2c6a2e10d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21F_D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21F_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21FD" format="1">
+<glyph name="uni21FD" format="2">
   <advance width="1233"/>
   <unicode hex="21FD"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21F_E_.glif b/source/Hack-Regular.ufo/glyphs/uni21F_E_.glif
index 170c7252f..3d16930dc 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21F_E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21F_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21FE" format="1">
+<glyph name="uni21FE" format="2">
   <advance width="1233"/>
   <unicode hex="21FE"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni21F_F_.glif b/source/Hack-Regular.ufo/glyphs/uni21F_F_.glif
index e571b1b2a..12187d47e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni21F_F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni21F_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni21FF" format="1">
+<glyph name="uni21FF" format="2">
   <advance width="1233"/>
   <unicode hex="21FF"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2201.glif b/source/Hack-Regular.ufo/glyphs/uni2201.glif
index 8bf38ab93..a2e570363 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2201.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2201.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2201" format="1">
+<glyph name="uni2201" format="2">
   <advance width="1233"/>
   <unicode hex="2201"/>
   <outline>
     <contour>
-      <point x="636" y="-29" type="curve" name="dv01" smooth="yes"/>
+      <point x="636" y="-29" type="curve" smooth="yes" name="dv01"/>
       <point x="467" y="-29"/>
       <point x="338" y="37"/>
       <point x="250" y="169" type="curve" smooth="yes"/>
       <point x="158" y="306"/>
       <point x="117" y="496"/>
-      <point x="117" y="743" type="curve" name="dh01" smooth="yes"/>
+      <point x="117" y="743" type="curve" smooth="yes" name="dh01"/>
       <point x="117" y="1248"/>
       <point x="294" y="1520"/>
-      <point x="637" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="637" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="970" y="1520"/>
       <point x="1076" y="1260"/>
       <point x="1116" y="1079" type="curve" name="hr01"/>
@@ -23,13 +23,13 @@
       <point x="869" y="1207" type="curve" smooth="yes"/>
       <point x="822" y="1303"/>
       <point x="743" y="1360"/>
-      <point x="632" y="1360" type="curve" name="sv01" smooth="yes"/>
+      <point x="632" y="1360" type="curve" smooth="yes" name="sv01"/>
       <point x="425" y="1360"/>
       <point x="320" y="1157"/>
-      <point x="320" y="745" type="curve" name="hr02" smooth="yes"/>
+      <point x="320" y="745" type="curve" smooth="yes" name="hr02"/>
       <point x="320" y="333"/>
       <point x="425" y="130"/>
-      <point x="632" y="130" type="curve" name="dv02" smooth="yes"/>
+      <point x="632" y="130" type="curve" smooth="yes" name="dv02"/>
       <point x="743" y="130"/>
       <point x="822" y="187"/>
       <point x="869" y="283" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2204.glif b/source/Hack-Regular.ufo/glyphs/uni2204.glif
index 802024750..618da55b1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2204.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2204.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2204" format="1">
+<glyph name="uni2204" format="2">
   <advance width="1233"/>
   <unicode hex="2204"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2206.glif b/source/Hack-Regular.ufo/glyphs/uni2206.glif
index 289a93b37..a5e6cf56f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2206.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2206.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2206" format="1">
+<glyph name="uni2206" format="2">
   <advance width="1233"/>
   <unicode hex="2206"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni220A_.glif b/source/Hack-Regular.ufo/glyphs/uni220A_.glif
index 661e99fc4..af2ab6c89 100644
--- a/source/Hack-Regular.ufo/glyphs/uni220A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni220A_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni220A" format="1">
+<glyph name="uni220A" format="2">
   <advance width="1233"/>
   <unicode hex="220A"/>
   <outline>
     <contour>
-      <point x="630" y="165" type="line" name="hr00" smooth="yes"/>
+      <point x="630" y="165" type="line" smooth="yes" name="hr00"/>
       <point x="448" y="165"/>
       <point x="285" y="255"/>
       <point x="197" y="402" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="379" y="1054" type="curve" smooth="yes"/>
       <point x="456" y="1096"/>
       <point x="539" y="1117"/>
-      <point x="630" y="1117" type="curve" name="at01" smooth="yes"/>
+      <point x="630" y="1117" type="curve" smooth="yes" name="at01"/>
       <point x="1102" y="1117" type="line"/>
       <point x="1102" y="947" type="line" name="sv01"/>
       <point x="630" y="947" type="line" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="315" y="556" type="line"/>
       <point x="345" y="459"/>
       <point x="453" y="335"/>
-      <point x="630" y="335" type="curve" name="dv01" smooth="yes"/>
+      <point x="630" y="335" type="curve" smooth="yes" name="dv01"/>
       <point x="1102" y="335" type="line"/>
       <point x="1102" y="165" type="line" name="sv02"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni220C_.glif b/source/Hack-Regular.ufo/glyphs/uni220C_.glif
index b831fb7f9..e442a14ba 100644
--- a/source/Hack-Regular.ufo/glyphs/uni220C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni220C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni220C" format="1">
+<glyph name="uni220C" format="2">
   <advance width="1233"/>
   <unicode hex="220C"/>
   <outline>
@@ -16,10 +16,10 @@
       <point x="645" y="1290" type="line"/>
       <point x="632" y="1293"/>
       <point x="618" y="1294"/>
-      <point x="602" y="1294" type="curve" name="dv01" smooth="yes"/>
+      <point x="602" y="1294" type="curve" smooth="yes" name="dv01"/>
       <point x="130" y="1294" type="line"/>
       <point x="130" y="1464" type="line"/>
-      <point x="602" y="1464" type="line" name="dv02" smooth="yes"/>
+      <point x="602" y="1464" type="line" smooth="yes" name="dv02"/>
       <point x="633" y="1464"/>
       <point x="664" y="1460"/>
       <point x="694" y="1452" type="curve"/>
@@ -34,7 +34,7 @@
       <point x="854" y="98" type="curve" smooth="yes"/>
       <point x="777" y="33"/>
       <point x="693" y="0"/>
-      <point x="602" y="0" type="curve" name="ab02" smooth="yes"/>
+      <point x="602" y="0" type="curve" smooth="yes" name="ab02"/>
       <point x="431" y="0" type="line"/>
       <point x="377" y="-177" type="line" name="av01"/>
     </contour>
@@ -46,7 +46,7 @@
       <point x="679" y="817" type="line" name="iv02"/>
     </contour>
     <contour>
-      <point x="602" y="170" type="line" name="sv03" smooth="yes"/>
+      <point x="602" y="170" type="line" smooth="yes" name="sv03"/>
       <point x="723" y="170"/>
       <point x="829" y="278"/>
       <point x="888" y="450" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni220D_.glif b/source/Hack-Regular.ufo/glyphs/uni220D_.glif
index ec75a792d..0506f9075 100644
--- a/source/Hack-Regular.ufo/glyphs/uni220D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni220D_.glif
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni220D" format="1">
+<glyph name="uni220D" format="2">
   <advance width="1233"/>
   <unicode hex="220D"/>
   <outline>
     <contour>
       <point x="130" y="335" type="line" name="hr00"/>
-      <point x="602" y="335" type="line" name="dv02" smooth="yes"/>
+      <point x="602" y="335" type="line" smooth="yes" name="dv02"/>
       <point x="781" y="335"/>
       <point x="888" y="459"/>
       <point x="918" y="556" type="curve" name="dv03"/>
@@ -14,7 +14,7 @@
       <point x="918" y="726" type="line" name="dv04"/>
       <point x="888" y="823"/>
       <point x="781" y="947"/>
-      <point x="602" y="947" type="curve" name="sv01" smooth="yes"/>
+      <point x="602" y="947" type="curve" smooth="yes" name="sv01"/>
       <point x="130" y="947" type="line"/>
       <point x="130" y="1117" type="line" name="at01"/>
       <point x="602" y="1117" type="line" smooth="yes"/>
@@ -29,7 +29,7 @@
       <point x="853" y="229" type="curve" smooth="yes"/>
       <point x="776" y="186"/>
       <point x="693" y="165"/>
-      <point x="602" y="165" type="curve" name="dv01" smooth="yes"/>
+      <point x="602" y="165" type="curve" smooth="yes" name="dv01"/>
       <point x="130" y="165" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni220E_.glif b/source/Hack-Regular.ufo/glyphs/uni220E_.glif
index 6daf54592..eeaff1bf1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni220E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni220E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni220E" format="1">
+<glyph name="uni220E" format="2">
   <advance width="1233"/>
   <unicode hex="220E"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2210.glif b/source/Hack-Regular.ufo/glyphs/uni2210.glif
index 71be89b75..d8d7c6b0f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2210.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2210.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2210" format="1">
+<glyph name="uni2210" format="2">
   <advance width="1233"/>
   <unicode hex="2210"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2213.glif b/source/Hack-Regular.ufo/glyphs/uni2213.glif
index 2497f804e..c389ac106 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2213.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2213.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2213" format="1">
+<glyph name="uni2213" format="2">
   <advance width="1233"/>
   <unicode hex="2213"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2215.glif b/source/Hack-Regular.ufo/glyphs/uni2215.glif
index edeb670cf..5eaccc566 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2215.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2215.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2215" format="1">
+<glyph name="uni2215" format="2">
   <advance width="1233"/>
   <unicode hex="2215"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2218.glif b/source/Hack-Regular.ufo/glyphs/uni2218.glif
index 9a2136b9d..3fcb738fb 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2218.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2218.glif
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2218" format="1">
+<glyph name="uni2218" format="2">
   <advance width="1233"/>
   <unicode hex="2218"/>
   <outline>
     <contour>
-      <point x="613" y="327" type="curve" name="hr00" smooth="yes"/>
+      <point x="613" y="327" type="curve" smooth="yes" name="hr00"/>
       <point x="434" y="327"/>
       <point x="299" y="462"/>
-      <point x="299" y="641" type="curve" name="sh01" smooth="yes"/>
+      <point x="299" y="641" type="curve" smooth="yes" name="sh01"/>
       <point x="299" y="822"/>
       <point x="438" y="962"/>
-      <point x="617" y="962" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="962" type="curve" smooth="yes" name="dv03"/>
       <point x="705" y="962"/>
       <point x="782" y="928"/>
       <point x="842" y="867" type="curve" smooth="yes"/>
       <point x="906" y="803"/>
       <point x="934" y="727"/>
-      <point x="934" y="644" type="curve" name="sh02" smooth="yes"/>
+      <point x="934" y="644" type="curve" smooth="yes" name="sh02"/>
       <point x="934" y="464"/>
       <point x="793" y="327"/>
     </contour>
     <contour>
-      <point x="614" y="454" type="curve" name="dv01" smooth="yes"/>
+      <point x="614" y="454" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="454"/>
       <point x="807" y="537"/>
-      <point x="807" y="642" type="curve" name="ah01" smooth="yes"/>
+      <point x="807" y="642" type="curve" smooth="yes" name="ah01"/>
       <point x="807" y="747"/>
       <point x="722" y="833"/>
-      <point x="615" y="833" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="833" type="curve" smooth="yes" name="dv02"/>
       <point x="511" y="833"/>
       <point x="426" y="749"/>
-      <point x="426" y="641" type="curve" name="sh03" smooth="yes"/>
+      <point x="426" y="641" type="curve" smooth="yes" name="sh03"/>
       <point x="426" y="535"/>
       <point x="509" y="454"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2219.glif b/source/Hack-Regular.ufo/glyphs/uni2219.glif
index 77b26254a..c8482bc33 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2219.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2219.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2219" format="1">
+<glyph name="uni2219" format="2">
   <advance width="1233"/>
   <unicode hex="2219"/>
   <outline>
     <contour>
-      <point x="519" y="559" type="line" name="hr00" smooth="yes"/>
+      <point x="519" y="559" type="line" smooth="yes" name="hr00"/>
       <point x="499" y="559"/>
       <point x="489" y="569"/>
-      <point x="489" y="589" type="curve" name="dh01" smooth="yes"/>
+      <point x="489" y="589" type="curve" smooth="yes" name="dh01"/>
       <point x="489" y="834" type="line" smooth="yes"/>
       <point x="489" y="854"/>
       <point x="499" y="864"/>
-      <point x="519" y="864" type="curve" name="dv01" smooth="yes"/>
+      <point x="519" y="864" type="curve" smooth="yes" name="dv01"/>
       <point x="711" y="864" type="line" smooth="yes"/>
       <point x="731" y="864"/>
       <point x="741" y="854"/>
       <point x="741" y="834" type="curve" smooth="yes"/>
-      <point x="741" y="589" type="line" name="dh02" smooth="yes"/>
+      <point x="741" y="589" type="line" smooth="yes" name="dh02"/>
       <point x="741" y="569"/>
       <point x="731" y="559"/>
-      <point x="711" y="559" type="curve" name="sv01" smooth="yes"/>
+      <point x="711" y="559" type="curve" smooth="yes" name="sv01"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Regular.ufo/glyphs/uni221B_.glif b/source/Hack-Regular.ufo/glyphs/uni221B_.glif
index 7e6f305c6..6d2f90e4b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni221B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni221B_.glif
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni221B" format="1">
+<glyph name="uni221B" format="2">
   <advance width="1233"/>
   <unicode hex="221B"/>
   <outline>
     <contour>
-      <point x="409" y="1043" type="curve" name="hr00" smooth="yes"/>
+      <point x="409" y="1043" type="curve" smooth="yes" name="hr00"/>
       <point x="321" y="1043"/>
       <point x="251" y="1057"/>
       <point x="171" y="1084" type="curve"/>
       <point x="171" y="1205" type="line" name="iv01"/>
       <point x="264" y="1169"/>
       <point x="333" y="1152"/>
-      <point x="404" y="1152" type="curve" name="dv03" smooth="yes"/>
+      <point x="404" y="1152" type="curve" smooth="yes" name="dv03"/>
       <point x="530" y="1152"/>
       <point x="617" y="1206"/>
       <point x="617" y="1306" type="curve" smooth="yes"/>
       <point x="617" y="1398"/>
       <point x="545" y="1451"/>
-      <point x="398" y="1451" type="curve" name="sv01" smooth="yes"/>
+      <point x="398" y="1451" type="curve" smooth="yes" name="sv01"/>
       <point x="332" y="1451" type="line"/>
       <point x="332" y="1559" type="line" name="at01"/>
       <point x="406" y="1559" type="line" smooth="yes"/>
       <point x="531" y="1559"/>
       <point x="597" y="1603"/>
-      <point x="597" y="1680" type="curve" name="dh01" smooth="yes"/>
+      <point x="597" y="1680" type="curve" smooth="yes" name="dh01"/>
       <point x="597" y="1757"/>
       <point x="530" y="1801"/>
-      <point x="419" y="1801" type="curve" name="dv01" smooth="yes"/>
+      <point x="419" y="1801" type="curve" smooth="yes" name="dv01"/>
       <point x="352" y="1801"/>
       <point x="279" y="1785"/>
       <point x="199" y="1754" type="curve"/>
       <point x="199" y="1875" type="line"/>
       <point x="291" y="1898"/>
       <point x="366" y="1910"/>
-      <point x="438" y="1910" type="curve" name="dv02" smooth="yes"/>
+      <point x="438" y="1910" type="curve" smooth="yes" name="dv02"/>
       <point x="626" y="1910"/>
       <point x="748" y="1824"/>
       <point x="748" y="1692" type="curve" smooth="yes"/>
@@ -42,7 +42,7 @@
       <point x="576" y="1510" type="curve" name="iv02"/>
       <point x="705" y="1481"/>
       <point x="769" y="1410"/>
-      <point x="769" y="1297" type="curve" name="dh02" smooth="yes"/>
+      <point x="769" y="1297" type="curve" smooth="yes" name="dh02"/>
       <point x="769" y="1137"/>
       <point x="634" y="1043"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni221C_.glif b/source/Hack-Regular.ufo/glyphs/uni221C_.glif
index d2fb19210..1324b5da7 100644
--- a/source/Hack-Regular.ufo/glyphs/uni221C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni221C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni221C" format="1">
+<glyph name="uni221C" format="2">
   <advance width="1233"/>
   <unicode hex="221C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2223.glif b/source/Hack-Regular.ufo/glyphs/uni2223.glif
index e5bcbd570..36daad4e2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2223.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2223.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2223" format="1">
+<glyph name="uni2223" format="2">
   <advance width="1233"/>
   <unicode hex="2223"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni222C_.glif b/source/Hack-Regular.ufo/glyphs/uni222C_.glif
index 70acd59c9..c9e281820 100644
--- a/source/Hack-Regular.ufo/glyphs/uni222C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni222C_.glif
@@ -1,61 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni222C" format="1">
+<glyph name="uni222C" format="2">
   <advance width="1233"/>
   <unicode hex="222C"/>
   <outline>
     <contour>
-      <point x="250" y="-388" type="curve" name="hr00" smooth="yes"/>
+      <point x="250" y="-388" type="curve" smooth="yes" name="hr00"/>
       <point x="197" y="-388"/>
       <point x="123" y="-370"/>
       <point x="63" y="-331" type="curve"/>
       <point x="130" y="-204" type="line"/>
       <point x="167" y="-224"/>
       <point x="200" y="-238"/>
-      <point x="227" y="-238" type="curve" name="dv01" smooth="yes"/>
+      <point x="227" y="-238" type="curve" smooth="yes" name="dv01"/>
       <point x="278" y="-238"/>
       <point x="308" y="-193"/>
       <point x="308" y="-68" type="curve" name="sh01"/>
       <point x="309" y="1502" type="line"/>
       <point x="309" y="1632"/>
       <point x="391" y="1797"/>
-      <point x="551" y="1797" type="curve" name="dv03" smooth="yes"/>
+      <point x="551" y="1797" type="curve" smooth="yes" name="dv03"/>
       <point x="604" y="1797"/>
       <point x="678" y="1779"/>
       <point x="738" y="1740" type="curve" name="sh02"/>
       <point x="671" y="1613" type="line"/>
       <point x="638" y="1632"/>
       <point x="604" y="1647"/>
-      <point x="575" y="1647" type="curve" name="dv02" smooth="yes"/>
+      <point x="575" y="1647" type="curve" smooth="yes" name="dv02"/>
       <point x="527" y="1647"/>
       <point x="492" y="1606"/>
       <point x="492" y="1477" type="curve" smooth="yes"/>
-      <point x="492" y="-93" type="line" name="sh03" smooth="yes"/>
+      <point x="492" y="-93" type="line" smooth="yes" name="sh03"/>
       <point x="492" y="-225"/>
       <point x="409" y="-388"/>
     </contour>
     <contour>
-      <point x="681" y="-388" type="curve" name="sv01" smooth="yes"/>
+      <point x="681" y="-388" type="curve" smooth="yes" name="sv01"/>
       <point x="628" y="-388"/>
       <point x="554" y="-370"/>
       <point x="494" y="-331" type="curve" name="sh04"/>
       <point x="561" y="-204" type="line"/>
       <point x="598" y="-224"/>
       <point x="631" y="-238"/>
-      <point x="659" y="-238" type="curve" name="sv02" smooth="yes"/>
+      <point x="659" y="-238" type="curve" smooth="yes" name="sv02"/>
       <point x="710" y="-238"/>
       <point x="740" y="-193"/>
-      <point x="740" y="-68" type="curve" name="ah01" smooth="yes"/>
+      <point x="740" y="-68" type="curve" smooth="yes" name="ah01"/>
       <point x="740" y="1502" type="line" smooth="yes"/>
       <point x="740" y="1634"/>
       <point x="823" y="1797"/>
-      <point x="982" y="1797" type="curve" name="sv03" smooth="yes"/>
+      <point x="982" y="1797" type="curve" smooth="yes" name="sv03"/>
       <point x="1035" y="1797"/>
       <point x="1109" y="1779"/>
       <point x="1169" y="1740" type="curve"/>
       <point x="1102" y="1613" type="line"/>
       <point x="1069" y="1632"/>
       <point x="1035" y="1647"/>
-      <point x="1006" y="1647" type="curve" name="sv04" smooth="yes"/>
+      <point x="1006" y="1647" type="curve" smooth="yes" name="sv04"/>
       <point x="958" y="1647"/>
       <point x="924" y="1606"/>
       <point x="924" y="1477" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni222D_.glif b/source/Hack-Regular.ufo/glyphs/uni222D_.glif
index 8e9502f22..63f8ecbfe 100644
--- a/source/Hack-Regular.ufo/glyphs/uni222D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni222D_.glif
@@ -1,95 +1,95 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni222D" format="1">
+<glyph name="uni222D" format="2">
   <advance width="1233"/>
   <unicode hex="222D"/>
   <outline>
     <contour>
-      <point x="178" y="-361" type="curve" name="hr00" smooth="yes"/>
+      <point x="178" y="-361" type="curve" smooth="yes" name="hr00"/>
       <point x="135" y="-361"/>
       <point x="101" y="-352"/>
       <point x="53" y="-333" type="curve"/>
       <point x="89" y="-191" type="line"/>
       <point x="110" y="-200"/>
       <point x="148" y="-205"/>
-      <point x="164" y="-205" type="curve" name="dv01" smooth="yes"/>
+      <point x="164" y="-205" type="curve" smooth="yes" name="dv01"/>
       <point x="191" y="-205"/>
       <point x="200" y="-190"/>
-      <point x="200" y="-127" type="curve" name="dh01" smooth="yes"/>
+      <point x="200" y="-127" type="curve" smooth="yes" name="dh01"/>
       <point x="200" y="1502" type="line" smooth="yes"/>
       <point x="200" y="1650"/>
       <point x="261" y="1770"/>
-      <point x="407" y="1770" type="curve" name="dv03" smooth="yes"/>
+      <point x="407" y="1770" type="curve" smooth="yes" name="dv03"/>
       <point x="450" y="1770"/>
       <point x="484" y="1761"/>
       <point x="532" y="1742" type="curve"/>
       <point x="496" y="1600" type="line"/>
       <point x="472" y="1611"/>
       <point x="436" y="1614"/>
-      <point x="421" y="1614" type="curve" name="dv02" smooth="yes"/>
+      <point x="421" y="1614" type="curve" smooth="yes" name="dv02"/>
       <point x="393" y="1614"/>
       <point x="384" y="1599"/>
       <point x="384" y="1536" type="curve" smooth="yes"/>
-      <point x="384" y="-93" type="line" name="dh02" smooth="yes"/>
+      <point x="384" y="-93" type="line" smooth="yes" name="dh02"/>
       <point x="384" y="-242"/>
       <point x="325" y="-361"/>
     </contour>
     <contour>
-      <point x="503" y="-361" type="curve" name="sv01" smooth="yes"/>
+      <point x="503" y="-361" type="curve" smooth="yes" name="sv01"/>
       <point x="460" y="-361"/>
       <point x="426" y="-352"/>
       <point x="378" y="-333" type="curve"/>
       <point x="414" y="-191" type="line"/>
       <point x="438" y="-202"/>
       <point x="474" y="-205"/>
-      <point x="489" y="-205" type="curve" name="sv02" smooth="yes"/>
+      <point x="489" y="-205" type="curve" smooth="yes" name="sv02"/>
       <point x="517" y="-205"/>
       <point x="526" y="-190"/>
-      <point x="526" y="-127" type="curve" name="dh03" smooth="yes"/>
+      <point x="526" y="-127" type="curve" smooth="yes" name="dh03"/>
       <point x="526" y="1502" type="line" smooth="yes"/>
       <point x="526" y="1650"/>
       <point x="585" y="1770"/>
-      <point x="732" y="1770" type="curve" name="sv03" smooth="yes"/>
+      <point x="732" y="1770" type="curve" smooth="yes" name="sv03"/>
       <point x="775" y="1770"/>
       <point x="809" y="1761"/>
       <point x="857" y="1742" type="curve"/>
       <point x="821" y="1600" type="line"/>
       <point x="800" y="1609"/>
       <point x="762" y="1614"/>
-      <point x="746" y="1614" type="curve" name="sv04" smooth="yes"/>
+      <point x="746" y="1614" type="curve" smooth="yes" name="sv04"/>
       <point x="719" y="1614"/>
       <point x="710" y="1599"/>
       <point x="710" y="1536" type="curve" smooth="yes"/>
-      <point x="710" y="-93" type="line" name="dh04" smooth="yes"/>
+      <point x="710" y="-93" type="line" smooth="yes" name="dh04"/>
       <point x="710" y="-242"/>
       <point x="649" y="-361"/>
     </contour>
     <contour>
-      <point x="827" y="-361" type="curve" name="sv05" smooth="yes"/>
+      <point x="827" y="-361" type="curve" smooth="yes" name="sv05"/>
       <point x="784" y="-361"/>
       <point x="750" y="-352"/>
       <point x="702" y="-333" type="curve"/>
       <point x="738" y="-191" type="line"/>
       <point x="762" y="-202"/>
       <point x="798" y="-205"/>
-      <point x="813" y="-205" type="curve" name="sv06" smooth="yes"/>
+      <point x="813" y="-205" type="curve" smooth="yes" name="sv06"/>
       <point x="841" y="-205"/>
       <point x="850" y="-190"/>
-      <point x="850" y="-127" type="curve" name="dh05" smooth="yes"/>
+      <point x="850" y="-127" type="curve" smooth="yes" name="dh05"/>
       <point x="850" y="1502" type="line" smooth="yes"/>
       <point x="850" y="1650"/>
       <point x="909" y="1770"/>
-      <point x="1056" y="1770" type="curve" name="sv07" smooth="yes"/>
+      <point x="1056" y="1770" type="curve" smooth="yes" name="sv07"/>
       <point x="1099" y="1770"/>
       <point x="1133" y="1761"/>
       <point x="1181" y="1742" type="curve"/>
       <point x="1145" y="1600" type="line"/>
       <point x="1124" y="1609"/>
       <point x="1086" y="1614"/>
-      <point x="1070" y="1614" type="curve" name="sv08" smooth="yes"/>
+      <point x="1070" y="1614" type="curve" smooth="yes" name="sv08"/>
       <point x="1043" y="1614"/>
       <point x="1034" y="1599"/>
       <point x="1034" y="1536" type="curve" smooth="yes"/>
-      <point x="1034" y="-93" type="line" name="dh06" smooth="yes"/>
+      <point x="1034" y="-93" type="line" smooth="yes" name="dh06"/>
       <point x="1034" y="-242"/>
       <point x="973" y="-361"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2235.glif b/source/Hack-Regular.ufo/glyphs/uni2235.glif
index 04d057827..a52c60c96 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2235.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2235.glif
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2235" format="1">
+<glyph name="uni2235" format="2">
   <advance width="1233"/>
   <unicode hex="2235"/>
   <outline>
     <contour>
-      <point x="218" y="851" type="line" name="hr00" smooth="yes"/>
+      <point x="218" y="851" type="line" smooth="yes" name="hr00"/>
       <point x="198" y="851"/>
       <point x="188" y="861"/>
-      <point x="188" y="881" type="curve" name="dh01" smooth="yes"/>
+      <point x="188" y="881" type="curve" smooth="yes" name="dh01"/>
       <point x="188" y="1126" type="line" smooth="yes"/>
       <point x="188" y="1146"/>
       <point x="198" y="1156"/>
-      <point x="218" y="1156" type="curve" name="dv03" smooth="yes"/>
+      <point x="218" y="1156" type="curve" smooth="yes" name="dv03"/>
       <point x="410" y="1156" type="line" smooth="yes"/>
       <point x="430" y="1156"/>
       <point x="440" y="1146"/>
       <point x="440" y="1126" type="curve" smooth="yes"/>
-      <point x="440" y="881" type="line" name="dh02" smooth="yes"/>
+      <point x="440" y="881" type="line" smooth="yes" name="dh02"/>
       <point x="440" y="861"/>
       <point x="430" y="851"/>
       <point x="410" y="851" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="823" y="851" type="line" name="sv01" smooth="yes"/>
+      <point x="823" y="851" type="line" smooth="yes" name="sv01"/>
       <point x="803" y="851"/>
       <point x="793" y="861"/>
-      <point x="793" y="881" type="curve" name="dh05" smooth="yes"/>
+      <point x="793" y="881" type="curve" smooth="yes" name="dh05"/>
       <point x="793" y="1126" type="line" smooth="yes"/>
       <point x="793" y="1146"/>
       <point x="803" y="1156"/>
-      <point x="823" y="1156" type="curve" name="sv02" smooth="yes"/>
+      <point x="823" y="1156" type="curve" smooth="yes" name="sv02"/>
       <point x="1015" y="1156" type="line" smooth="yes"/>
       <point x="1035" y="1156"/>
       <point x="1045" y="1146"/>
       <point x="1045" y="1126" type="curve" smooth="yes"/>
-      <point x="1045" y="881" type="line" name="dh06" smooth="yes"/>
+      <point x="1045" y="881" type="line" smooth="yes" name="dh06"/>
       <point x="1045" y="861"/>
       <point x="1035" y="851"/>
       <point x="1015" y="851" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="522" y="134" type="line" name="dv01" smooth="yes"/>
+      <point x="522" y="134" type="line" smooth="yes" name="dv01"/>
       <point x="502" y="134"/>
       <point x="492" y="144"/>
-      <point x="492" y="164" type="curve" name="dh03" smooth="yes"/>
+      <point x="492" y="164" type="curve" smooth="yes" name="dh03"/>
       <point x="492" y="409" type="line" smooth="yes"/>
       <point x="492" y="429"/>
       <point x="502" y="439"/>
-      <point x="522" y="439" type="curve" name="dv02" smooth="yes"/>
+      <point x="522" y="439" type="curve" smooth="yes" name="dv02"/>
       <point x="714" y="439" type="line" smooth="yes"/>
       <point x="734" y="439"/>
       <point x="744" y="429"/>
       <point x="744" y="409" type="curve" smooth="yes"/>
-      <point x="744" y="164" type="line" name="dh04" smooth="yes"/>
+      <point x="744" y="164" type="line" smooth="yes" name="dh04"/>
       <point x="744" y="144"/>
       <point x="734" y="134"/>
       <point x="714" y="134" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2236.glif b/source/Hack-Regular.ufo/glyphs/uni2236.glif
index a1235892d..12b8c243a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2236.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2236.glif
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2236" format="1">
+<glyph name="uni2236" format="2">
   <advance width="1233"/>
   <unicode hex="2236"/>
   <outline>
     <contour>
-      <point x="518" y="851" type="line" name="hr00" smooth="yes"/>
+      <point x="518" y="851" type="line" smooth="yes" name="hr00"/>
       <point x="498" y="851"/>
       <point x="488" y="861"/>
-      <point x="488" y="881" type="curve" name="dh01" smooth="yes"/>
+      <point x="488" y="881" type="curve" smooth="yes" name="dh01"/>
       <point x="488" y="1126" type="line" smooth="yes"/>
       <point x="488" y="1146"/>
       <point x="498" y="1156"/>
-      <point x="518" y="1156" type="curve" name="dv03" smooth="yes"/>
+      <point x="518" y="1156" type="curve" smooth="yes" name="dv03"/>
       <point x="710" y="1156" type="line" smooth="yes"/>
       <point x="730" y="1156"/>
       <point x="740" y="1146"/>
       <point x="740" y="1126" type="curve" smooth="yes"/>
-      <point x="740" y="881" type="line" name="dh02" smooth="yes"/>
+      <point x="740" y="881" type="line" smooth="yes" name="dh02"/>
       <point x="740" y="861"/>
       <point x="730" y="851"/>
       <point x="710" y="851" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="522" y="134" type="line" name="dv01" smooth="yes"/>
+      <point x="522" y="134" type="line" smooth="yes" name="dv01"/>
       <point x="502" y="134"/>
       <point x="492" y="144"/>
-      <point x="492" y="164" type="curve" name="sh01" smooth="yes"/>
+      <point x="492" y="164" type="curve" smooth="yes" name="sh01"/>
       <point x="492" y="409" type="line" smooth="yes"/>
       <point x="492" y="429"/>
       <point x="502" y="439"/>
-      <point x="522" y="439" type="curve" name="dv02" smooth="yes"/>
+      <point x="522" y="439" type="curve" smooth="yes" name="dv02"/>
       <point x="714" y="439" type="line" smooth="yes"/>
       <point x="734" y="439"/>
       <point x="744" y="429"/>
-      <point x="744" y="409" type="curve" name="sh02" smooth="yes"/>
+      <point x="744" y="409" type="curve" smooth="yes" name="sh02"/>
       <point x="744" y="164" type="line" smooth="yes"/>
       <point x="744" y="144"/>
       <point x="734" y="134"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2237.glif b/source/Hack-Regular.ufo/glyphs/uni2237.glif
index b592a7d9f..0dcb69299 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2237.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2237.glif
@@ -1,75 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2237" format="1">
+<glyph name="uni2237" format="2">
   <advance width="1233"/>
   <unicode hex="2237"/>
   <outline>
     <contour>
-      <point x="218" y="851" type="line" name="hr00" smooth="yes"/>
+      <point x="218" y="851" type="line" smooth="yes" name="hr00"/>
       <point x="198" y="851"/>
       <point x="188" y="861"/>
-      <point x="188" y="881" type="curve" name="sh01" smooth="yes"/>
+      <point x="188" y="881" type="curve" smooth="yes" name="sh01"/>
       <point x="188" y="1126" type="line" smooth="yes"/>
       <point x="188" y="1146"/>
       <point x="198" y="1156"/>
-      <point x="218" y="1156" type="curve" name="dv03" smooth="yes"/>
+      <point x="218" y="1156" type="curve" smooth="yes" name="dv03"/>
       <point x="410" y="1156" type="line" smooth="yes"/>
       <point x="430" y="1156"/>
       <point x="440" y="1146"/>
       <point x="440" y="1126" type="curve" smooth="yes"/>
-      <point x="440" y="881" type="line" name="sh02" smooth="yes"/>
+      <point x="440" y="881" type="line" smooth="yes" name="sh02"/>
       <point x="440" y="861"/>
       <point x="430" y="851"/>
       <point x="410" y="851" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="823" y="851" type="line" name="sv01" smooth="yes"/>
+      <point x="823" y="851" type="line" smooth="yes" name="sv01"/>
       <point x="803" y="851"/>
       <point x="793" y="861"/>
-      <point x="793" y="881" type="curve" name="ah01" smooth="yes"/>
+      <point x="793" y="881" type="curve" smooth="yes" name="ah01"/>
       <point x="793" y="1126" type="line" smooth="yes"/>
       <point x="793" y="1146"/>
       <point x="803" y="1156"/>
-      <point x="823" y="1156" type="curve" name="sv02" smooth="yes"/>
+      <point x="823" y="1156" type="curve" smooth="yes" name="sv02"/>
       <point x="1015" y="1156" type="line" smooth="yes"/>
       <point x="1035" y="1156"/>
       <point x="1045" y="1146"/>
       <point x="1045" y="1126" type="curve" smooth="yes"/>
-      <point x="1045" y="881" type="line" name="sh03" smooth="yes"/>
+      <point x="1045" y="881" type="line" smooth="yes" name="sh03"/>
       <point x="1045" y="861"/>
       <point x="1035" y="851"/>
       <point x="1015" y="851" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="217" y="134" type="line" name="dv01" smooth="yes"/>
+      <point x="217" y="134" type="line" smooth="yes" name="dv01"/>
       <point x="197" y="134"/>
       <point x="187" y="144"/>
-      <point x="187" y="164" type="curve" name="sh04" smooth="yes"/>
+      <point x="187" y="164" type="curve" smooth="yes" name="sh04"/>
       <point x="187" y="409" type="line" smooth="yes"/>
       <point x="187" y="429"/>
       <point x="197" y="439"/>
-      <point x="217" y="439" type="curve" name="dv02" smooth="yes"/>
+      <point x="217" y="439" type="curve" smooth="yes" name="dv02"/>
       <point x="409" y="439" type="line" smooth="yes"/>
       <point x="429" y="439"/>
       <point x="439" y="429"/>
-      <point x="439" y="409" type="curve" name="sh05" smooth="yes"/>
+      <point x="439" y="409" type="curve" smooth="yes" name="sh05"/>
       <point x="439" y="164" type="line" smooth="yes"/>
       <point x="439" y="144"/>
       <point x="429" y="134"/>
       <point x="409" y="134" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="827" y="134" type="line" name="sv03" smooth="yes"/>
+      <point x="827" y="134" type="line" smooth="yes" name="sv03"/>
       <point x="807" y="134"/>
       <point x="797" y="144"/>
-      <point x="797" y="164" type="curve" name="sh06" smooth="yes"/>
+      <point x="797" y="164" type="curve" smooth="yes" name="sh06"/>
       <point x="797" y="409" type="line" smooth="yes"/>
       <point x="797" y="429"/>
       <point x="807" y="439"/>
-      <point x="827" y="439" type="curve" name="sv04" smooth="yes"/>
+      <point x="827" y="439" type="curve" smooth="yes" name="sv04"/>
       <point x="1019" y="439" type="line" smooth="yes"/>
       <point x="1039" y="439"/>
       <point x="1049" y="429"/>
-      <point x="1049" y="409" type="curve" name="sh07" smooth="yes"/>
+      <point x="1049" y="409" type="curve" smooth="yes" name="sh07"/>
       <point x="1049" y="164" type="line" smooth="yes"/>
       <point x="1049" y="144"/>
       <point x="1039" y="134"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2238.glif b/source/Hack-Regular.ufo/glyphs/uni2238.glif
index 08b977aef..18bf2cfb5 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2238.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2238.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2238" format="1">
+<glyph name="uni2238" format="2">
   <advance width="1233"/>
   <unicode hex="2238"/>
   <outline>
     <contour>
-      <point x="521" y="851" type="line" name="hr00" smooth="yes"/>
+      <point x="521" y="851" type="line" smooth="yes" name="hr00"/>
       <point x="501" y="851"/>
       <point x="491" y="861"/>
-      <point x="491" y="881" type="curve" name="dh01" smooth="yes"/>
+      <point x="491" y="881" type="curve" smooth="yes" name="dh01"/>
       <point x="491" y="1126" type="line" smooth="yes"/>
       <point x="491" y="1146"/>
       <point x="501" y="1156"/>
-      <point x="521" y="1156" type="curve" name="dv03" smooth="yes"/>
+      <point x="521" y="1156" type="curve" smooth="yes" name="dv03"/>
       <point x="713" y="1156" type="line" smooth="yes"/>
       <point x="733" y="1156"/>
       <point x="743" y="1146"/>
       <point x="743" y="1126" type="curve" smooth="yes"/>
-      <point x="743" y="881" type="line" name="dh02" smooth="yes"/>
+      <point x="743" y="881" type="line" smooth="yes" name="dh02"/>
       <point x="743" y="861"/>
       <point x="733" y="851"/>
       <point x="713" y="851" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2239.glif b/source/Hack-Regular.ufo/glyphs/uni2239.glif
index 8415a3ff4..545ac0dfb 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2239.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2239.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2239" format="1">
+<glyph name="uni2239" format="2">
   <advance width="1233"/>
   <unicode hex="2239"/>
   <outline>
     <contour>
-      <point x="937" y="851" type="line" name="hr00" smooth="yes"/>
+      <point x="937" y="851" type="line" smooth="yes" name="hr00"/>
       <point x="917" y="851"/>
       <point x="907" y="861"/>
-      <point x="907" y="881" type="curve" name="dh01" smooth="yes"/>
+      <point x="907" y="881" type="curve" smooth="yes" name="dh01"/>
       <point x="907" y="1126" type="line" smooth="yes"/>
       <point x="907" y="1146"/>
       <point x="917" y="1156"/>
-      <point x="937" y="1156" type="curve" name="dv03" smooth="yes"/>
+      <point x="937" y="1156" type="curve" smooth="yes" name="dv03"/>
       <point x="1129" y="1156" type="line" smooth="yes"/>
       <point x="1149" y="1156"/>
       <point x="1159" y="1146"/>
       <point x="1159" y="1126" type="curve" smooth="yes"/>
-      <point x="1159" y="881" type="line" name="dh02" smooth="yes"/>
+      <point x="1159" y="881" type="line" smooth="yes" name="dh02"/>
       <point x="1159" y="861"/>
       <point x="1149" y="851"/>
       <point x="1129" y="851" type="curve" smooth="yes"/>
@@ -28,18 +28,18 @@
       <point x="74" y="557" type="line"/>
     </contour>
     <contour>
-      <point x="935" y="134" type="line" name="dv01" smooth="yes"/>
+      <point x="935" y="134" type="line" smooth="yes" name="dv01"/>
       <point x="915" y="134"/>
       <point x="905" y="144"/>
-      <point x="905" y="164" type="curve" name="sh01" smooth="yes"/>
+      <point x="905" y="164" type="curve" smooth="yes" name="sh01"/>
       <point x="905" y="409" type="line" smooth="yes"/>
       <point x="905" y="429"/>
       <point x="915" y="439"/>
-      <point x="935" y="439" type="curve" name="dv02" smooth="yes"/>
+      <point x="935" y="439" type="curve" smooth="yes" name="dv02"/>
       <point x="1127" y="439" type="line" smooth="yes"/>
       <point x="1147" y="439"/>
       <point x="1157" y="429"/>
-      <point x="1157" y="409" type="curve" name="sh02" smooth="yes"/>
+      <point x="1157" y="409" type="curve" smooth="yes" name="sh02"/>
       <point x="1157" y="164" type="line" smooth="yes"/>
       <point x="1157" y="144"/>
       <point x="1147" y="134"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni223A_.glif b/source/Hack-Regular.ufo/glyphs/uni223A_.glif
index 97d74463a..f8f6d0f04 100644
--- a/source/Hack-Regular.ufo/glyphs/uni223A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni223A_.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni223A" format="1">
+<glyph name="uni223A" format="2">
   <advance width="1233"/>
   <unicode hex="223A"/>
   <outline>
     <contour>
-      <point x="118" y="851" type="line" name="hr00" smooth="yes"/>
+      <point x="118" y="851" type="line" smooth="yes" name="hr00"/>
       <point x="98" y="851"/>
       <point x="88" y="861"/>
-      <point x="88" y="881" type="curve" name="sh01" smooth="yes"/>
+      <point x="88" y="881" type="curve" smooth="yes" name="sh01"/>
       <point x="88" y="1126" type="line" smooth="yes"/>
       <point x="88" y="1146"/>
       <point x="98" y="1156"/>
-      <point x="118" y="1156" type="curve" name="dv03" smooth="yes"/>
+      <point x="118" y="1156" type="curve" smooth="yes" name="dv03"/>
       <point x="310" y="1156" type="line" smooth="yes"/>
       <point x="330" y="1156"/>
       <point x="340" y="1146"/>
       <point x="340" y="1126" type="curve" smooth="yes"/>
-      <point x="340" y="881" type="line" name="sh02" smooth="yes"/>
+      <point x="340" y="881" type="line" smooth="yes" name="sh02"/>
       <point x="340" y="861"/>
       <point x="330" y="851"/>
       <point x="310" y="851" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="923" y="851" type="line" name="sv01" smooth="yes"/>
+      <point x="923" y="851" type="line" smooth="yes" name="sv01"/>
       <point x="903" y="851"/>
       <point x="893" y="861"/>
-      <point x="893" y="881" type="curve" name="ah01" smooth="yes"/>
+      <point x="893" y="881" type="curve" smooth="yes" name="ah01"/>
       <point x="893" y="1126" type="line" smooth="yes"/>
       <point x="893" y="1146"/>
       <point x="903" y="1156"/>
-      <point x="923" y="1156" type="curve" name="sv02" smooth="yes"/>
+      <point x="923" y="1156" type="curve" smooth="yes" name="sv02"/>
       <point x="1115" y="1156" type="line" smooth="yes"/>
       <point x="1135" y="1156"/>
       <point x="1145" y="1146"/>
       <point x="1145" y="1126" type="curve" smooth="yes"/>
-      <point x="1145" y="881" type="line" name="sh03" smooth="yes"/>
+      <point x="1145" y="881" type="line" smooth="yes" name="sh03"/>
       <point x="1145" y="861"/>
       <point x="1135" y="851"/>
       <point x="1115" y="851" type="curve" smooth="yes"/>
@@ -46,36 +46,36 @@
       <point x="88" y="557" type="line"/>
     </contour>
     <contour>
-      <point x="117" y="134" type="line" name="dv01" smooth="yes"/>
+      <point x="117" y="134" type="line" smooth="yes" name="dv01"/>
       <point x="97" y="134"/>
       <point x="87" y="144"/>
-      <point x="87" y="164" type="curve" name="sh06" smooth="yes"/>
+      <point x="87" y="164" type="curve" smooth="yes" name="sh06"/>
       <point x="87" y="409" type="line" smooth="yes"/>
       <point x="87" y="429"/>
       <point x="97" y="439"/>
-      <point x="117" y="439" type="curve" name="dv02" smooth="yes"/>
+      <point x="117" y="439" type="curve" smooth="yes" name="dv02"/>
       <point x="309" y="439" type="line" smooth="yes"/>
       <point x="329" y="439"/>
       <point x="339" y="429"/>
-      <point x="339" y="409" type="curve" name="sh07" smooth="yes"/>
+      <point x="339" y="409" type="curve" smooth="yes" name="sh07"/>
       <point x="339" y="164" type="line" smooth="yes"/>
       <point x="339" y="144"/>
       <point x="329" y="134"/>
       <point x="309" y="134" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="927" y="134" type="line" name="sv03" smooth="yes"/>
+      <point x="927" y="134" type="line" smooth="yes" name="sv03"/>
       <point x="907" y="134"/>
       <point x="897" y="144"/>
-      <point x="897" y="164" type="curve" name="sh08" smooth="yes"/>
+      <point x="897" y="164" type="curve" smooth="yes" name="sh08"/>
       <point x="897" y="409" type="line" smooth="yes"/>
       <point x="897" y="429"/>
       <point x="907" y="439"/>
-      <point x="927" y="439" type="curve" name="sv04" smooth="yes"/>
+      <point x="927" y="439" type="curve" smooth="yes" name="sv04"/>
       <point x="1119" y="439" type="line" smooth="yes"/>
       <point x="1139" y="439"/>
       <point x="1149" y="429"/>
-      <point x="1149" y="409" type="curve" name="sh09" smooth="yes"/>
+      <point x="1149" y="409" type="curve" smooth="yes" name="sh09"/>
       <point x="1149" y="164" type="line" smooth="yes"/>
       <point x="1149" y="144"/>
       <point x="1139" y="134"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni223B_.glif b/source/Hack-Regular.ufo/glyphs/uni223B_.glif
index dcec4dfaf..e2144b5ee 100644
--- a/source/Hack-Regular.ufo/glyphs/uni223B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni223B_.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni223B" format="1">
+<glyph name="uni223B" format="2">
   <advance width="1233"/>
   <unicode hex="223B"/>
   <outline>
     <contour>
-      <point x="521" y="851" type="line" name="dv03" smooth="yes"/>
+      <point x="521" y="851" type="line" smooth="yes" name="dv03"/>
       <point x="501" y="851"/>
       <point x="491" y="861"/>
-      <point x="491" y="881" type="curve" name="dh01" smooth="yes"/>
+      <point x="491" y="881" type="curve" smooth="yes" name="dh01"/>
       <point x="491" y="1126" type="line" smooth="yes"/>
       <point x="491" y="1146"/>
       <point x="501" y="1156"/>
-      <point x="521" y="1156" type="curve" name="dv04" smooth="yes"/>
+      <point x="521" y="1156" type="curve" smooth="yes" name="dv04"/>
       <point x="713" y="1156" type="line" smooth="yes"/>
       <point x="733" y="1156"/>
       <point x="743" y="1146"/>
       <point x="743" y="1126" type="curve" smooth="yes"/>
-      <point x="743" y="881" type="line" name="dh02" smooth="yes"/>
+      <point x="743" y="881" type="line" smooth="yes" name="dh02"/>
       <point x="743" y="861"/>
       <point x="733" y="851"/>
       <point x="713" y="851" type="curve" smooth="yes"/>
@@ -25,45 +25,45 @@
       <point x="88" y="671" type="line"/>
       <point x="192" y="751"/>
       <point x="285" y="786"/>
-      <point x="393" y="786" type="curve" name="hr01" smooth="yes"/>
+      <point x="393" y="786" type="curve" smooth="yes" name="hr01"/>
       <point x="457" y="786"/>
       <point x="532" y="775"/>
       <point x="623" y="732" type="curve" smooth="yes"/>
       <point x="655" y="717" type="line" smooth="yes"/>
       <point x="732" y="681"/>
       <point x="802" y="663"/>
-      <point x="865" y="663" type="curve" name="hr02" smooth="yes"/>
+      <point x="865" y="663" type="curve" smooth="yes" name="hr02"/>
       <point x="957" y="663"/>
       <point x="1045" y="702"/>
       <point x="1145" y="786" type="curve"/>
       <point x="1145" y="611" type="line" name="hr03"/>
       <point x="1053" y="538"/>
       <point x="959" y="497"/>
-      <point x="850" y="497" type="curve" name="hr04" smooth="yes"/>
+      <point x="850" y="497" type="curve" smooth="yes" name="hr04"/>
       <point x="778" y="497"/>
       <point x="726" y="513"/>
       <point x="645" y="548" type="curve" smooth="yes"/>
       <point x="612" y="562" type="line" smooth="yes"/>
       <point x="522" y="599"/>
       <point x="468" y="620"/>
-      <point x="385" y="620" type="curve" name="hr05" smooth="yes"/>
+      <point x="385" y="620" type="curve" smooth="yes" name="hr05"/>
       <point x="282" y="620"/>
       <point x="192" y="588"/>
       <point x="88" y="497" type="curve"/>
     </contour>
     <contour>
-      <point x="520" y="134" type="line" name="dv01" smooth="yes"/>
+      <point x="520" y="134" type="line" smooth="yes" name="dv01"/>
       <point x="500" y="134"/>
       <point x="490" y="144"/>
-      <point x="490" y="164" type="curve" name="sh01" smooth="yes"/>
+      <point x="490" y="164" type="curve" smooth="yes" name="sh01"/>
       <point x="490" y="409" type="line" smooth="yes"/>
       <point x="490" y="429"/>
       <point x="500" y="439"/>
-      <point x="520" y="439" type="curve" name="dv02" smooth="yes"/>
+      <point x="520" y="439" type="curve" smooth="yes" name="dv02"/>
       <point x="712" y="439" type="line" smooth="yes"/>
       <point x="732" y="439"/>
       <point x="742" y="429"/>
-      <point x="742" y="409" type="curve" name="sh02" smooth="yes"/>
+      <point x="742" y="409" type="curve" smooth="yes" name="sh02"/>
       <point x="742" y="164" type="line" smooth="yes"/>
       <point x="742" y="144"/>
       <point x="732" y="134"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni223D_.glif b/source/Hack-Regular.ufo/glyphs/uni223D_.glif
index 9d1483328..55d694409 100644
--- a/source/Hack-Regular.ufo/glyphs/uni223D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni223D_.glif
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni223D" format="1">
+<glyph name="uni223D" format="2">
   <advance width="1233"/>
   <unicode hex="223D"/>
   <outline>
     <contour>
-      <point x="381" y="497" type="curve" name="dv01" smooth="yes"/>
+      <point x="381" y="497" type="curve" smooth="yes" name="dv01"/>
       <point x="281" y="497"/>
       <point x="188" y="531"/>
       <point x="88" y="611" type="curve"/>
       <point x="88" y="786" type="line"/>
       <point x="188" y="702"/>
       <point x="276" y="663"/>
-      <point x="368" y="663" type="curve" name="hr01" smooth="yes"/>
+      <point x="368" y="663" type="curve" smooth="yes" name="hr01"/>
       <point x="431" y="663"/>
       <point x="501" y="681"/>
-      <point x="578" y="717" type="curve" name="hr02" smooth="yes"/>
+      <point x="578" y="717" type="curve" smooth="yes" name="hr02"/>
       <point x="610" y="732" type="line" smooth="yes"/>
       <point x="701" y="775"/>
       <point x="776" y="786"/>
-      <point x="840" y="786" type="curve" name="hr03" smooth="yes"/>
+      <point x="840" y="786" type="curve" smooth="yes" name="hr03"/>
       <point x="948" y="786"/>
       <point x="1041" y="751"/>
       <point x="1145" y="671" type="curve"/>
       <point x="1145" y="497" type="line"/>
       <point x="1044" y="585"/>
       <point x="956" y="620"/>
-      <point x="848" y="620" type="curve" name="hr04" smooth="yes"/>
+      <point x="848" y="620" type="curve" smooth="yes" name="hr04"/>
       <point x="765" y="620"/>
       <point x="711" y="599"/>
       <point x="621" y="562" type="curve" name="hr05"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2241.glif b/source/Hack-Regular.ufo/glyphs/uni2241.glif
index 6cd5bc6fe..9963d6ae2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2241.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2241.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2241" format="1">
+<glyph name="uni2241" format="2">
   <advance width="1233"/>
   <unicode hex="2241"/>
   <outline>
@@ -11,14 +11,14 @@
       <point x="484" y="608" type="curve" smooth="yes"/>
       <point x="449" y="616"/>
       <point x="414" y="620"/>
-      <point x="381" y="620" type="curve" name="dv03" smooth="yes"/>
+      <point x="381" y="620" type="curve" smooth="yes" name="dv03"/>
       <point x="276" y="620"/>
       <point x="185" y="582"/>
       <point x="88" y="497" type="curve" name="hr01"/>
       <point x="88" y="671" type="line" name="hr02"/>
       <point x="192" y="751"/>
       <point x="284" y="786"/>
-      <point x="392" y="786" type="curve" name="dv04" smooth="yes"/>
+      <point x="392" y="786" type="curve" smooth="yes" name="dv04"/>
       <point x="468" y="786"/>
       <point x="533" y="768"/>
       <point x="572" y="752" type="curve"/>
@@ -27,14 +27,14 @@
       <point x="703" y="697" type="line" name="hr03"/>
       <point x="761" y="674"/>
       <point x="815" y="663"/>
-      <point x="864" y="663" type="curve" name="dv02" smooth="yes"/>
+      <point x="864" y="663" type="curve" smooth="yes" name="dv02"/>
       <point x="957" y="663"/>
       <point x="1045" y="702"/>
       <point x="1145" y="786" type="curve" name="hr04"/>
       <point x="1145" y="611" type="line" name="hr05"/>
       <point x="1053" y="538"/>
       <point x="958" y="497"/>
-      <point x="853" y="497" type="curve" name="dv01" smooth="yes"/>
+      <point x="853" y="497" type="curve" smooth="yes" name="dv01"/>
       <point x="792" y="497"/>
       <point x="735" y="511"/>
       <point x="667" y="538" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2242.glif b/source/Hack-Regular.ufo/glyphs/uni2242.glif
index 2bd78d6c5..dc60d7145 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2242.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2242.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2242" format="1">
+<glyph name="uni2242" format="2">
   <advance width="1233"/>
   <unicode hex="2242"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="88" y="479" type="line" name="hr02"/>
       <point x="192" y="562"/>
       <point x="287" y="596"/>
-      <point x="390" y="596" type="curve" name="dv04" smooth="yes"/>
+      <point x="390" y="596" type="curve" smooth="yes" name="dv04"/>
       <point x="463" y="596"/>
       <point x="533" y="578"/>
       <point x="621" y="541" type="curve" name="hr03"/>
@@ -21,21 +21,21 @@
       <point x="655" y="526" type="line" smooth="yes"/>
       <point x="736" y="489"/>
       <point x="797" y="471"/>
-      <point x="861" y="471" type="curve" name="dv02" smooth="yes"/>
+      <point x="861" y="471" type="curve" smooth="yes" name="dv02"/>
       <point x="957" y="471"/>
       <point x="1045" y="511"/>
       <point x="1145" y="596" type="curve"/>
       <point x="1145" y="420" type="line" name="hr05"/>
       <point x="1052" y="345"/>
       <point x="957" y="305"/>
-      <point x="853" y="305" type="curve" name="dv01" smooth="yes"/>
+      <point x="853" y="305" type="curve" smooth="yes" name="dv01"/>
       <point x="785" y="305"/>
       <point x="721" y="321"/>
       <point x="645" y="356" type="curve" smooth="yes"/>
       <point x="612" y="371" type="line" smooth="yes"/>
       <point x="504" y="420"/>
       <point x="435" y="430"/>
-      <point x="382" y="430" type="curve" name="dv03" smooth="yes"/>
+      <point x="382" y="430" type="curve" smooth="yes" name="dv03"/>
       <point x="274" y="430"/>
       <point x="187" y="392"/>
       <point x="88" y="305" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2243.glif b/source/Hack-Regular.ufo/glyphs/uni2243.glif
index 38d73dd70..6f82c3c2a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2243.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2243.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2243" format="1">
+<glyph name="uni2243" format="2">
   <advance width="1233"/>
   <unicode hex="2243"/>
   <outline>
@@ -7,28 +7,28 @@
       <point x="88" y="848" type="line" name="hr00"/>
       <point x="192" y="928"/>
       <point x="285" y="963"/>
-      <point x="393" y="963" type="curve" name="dv02" smooth="yes"/>
+      <point x="393" y="963" type="curve" smooth="yes" name="dv02"/>
       <point x="457" y="963"/>
       <point x="532" y="952"/>
       <point x="623" y="909" type="curve" smooth="yes"/>
       <point x="655" y="894" type="line" smooth="yes"/>
       <point x="732" y="858"/>
       <point x="802" y="840"/>
-      <point x="865" y="840" type="curve" name="dv04" smooth="yes"/>
+      <point x="865" y="840" type="curve" smooth="yes" name="dv04"/>
       <point x="957" y="840"/>
       <point x="1045" y="879"/>
       <point x="1145" y="963" type="curve" name="hr01"/>
       <point x="1145" y="788" type="line"/>
       <point x="1053" y="715"/>
       <point x="959" y="674"/>
-      <point x="850" y="674" type="curve" name="dv03" smooth="yes"/>
+      <point x="850" y="674" type="curve" smooth="yes" name="dv03"/>
       <point x="778" y="674"/>
       <point x="726" y="690"/>
-      <point x="645" y="725" type="curve" name="hr02" smooth="yes"/>
+      <point x="645" y="725" type="curve" smooth="yes" name="hr02"/>
       <point x="612" y="739" type="line" smooth="yes"/>
       <point x="522" y="776"/>
       <point x="468" y="797"/>
-      <point x="385" y="797" type="curve" name="hr03" smooth="yes"/>
+      <point x="385" y="797" type="curve" smooth="yes" name="hr03"/>
       <point x="282" y="797"/>
       <point x="192" y="765"/>
       <point x="88" y="674" type="curve" name="hr04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2244.glif b/source/Hack-Regular.ufo/glyphs/uni2244.glif
index bbab26712..6173bb310 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2244.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2244.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2244" format="1">
+<glyph name="uni2244" format="2">
   <advance width="1233"/>
   <unicode hex="2244"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="571" y="755" type="line"/>
       <point x="512" y="782"/>
       <point x="447" y="797"/>
-      <point x="380" y="797" type="curve" name="dv03" smooth="yes"/>
+      <point x="380" y="797" type="curve" smooth="yes" name="dv03"/>
       <point x="329" y="797"/>
       <point x="283" y="788"/>
       <point x="240" y="770" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="88" y="845" type="line"/>
       <point x="200" y="941"/>
       <point x="314" y="964"/>
-      <point x="402" y="964" type="curve" name="dv04" smooth="yes"/>
+      <point x="402" y="964" type="curve" smooth="yes" name="dv04"/>
       <point x="471" y="964"/>
       <point x="521" y="948"/>
       <point x="614" y="914" type="curve" smooth="yes"/>
@@ -33,14 +33,14 @@
       <point x="800" y="849" type="line" name="hr01"/>
       <point x="823" y="845"/>
       <point x="845" y="843"/>
-      <point x="866" y="843" type="curve" name="dv06" smooth="yes"/>
+      <point x="866" y="843" type="curve" smooth="yes" name="dv06"/>
       <point x="974" y="843"/>
       <point x="1068" y="893"/>
       <point x="1145" y="966" type="curve" name="iv02"/>
       <point x="1145" y="788" type="line"/>
       <point x="1073" y="718"/>
       <point x="930" y="672"/>
-      <point x="840" y="672" type="curve" name="dv05" smooth="yes"/>
+      <point x="840" y="672" type="curve" smooth="yes" name="dv05"/>
       <point x="799" y="672"/>
       <point x="765" y="682"/>
       <point x="702" y="702" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2246.glif b/source/Hack-Regular.ufo/glyphs/uni2246.glif
index bfd8cac08..04a1ffa8a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2246.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2246.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2246" format="1">
+<glyph name="uni2246" format="2">
   <advance width="1233"/>
   <unicode hex="2246"/>
   <outline>
@@ -7,28 +7,28 @@
       <point x="88" y="1052" type="line" name="hr00"/>
       <point x="200" y="1137"/>
       <point x="291" y="1167"/>
-      <point x="399" y="1167" type="curve" name="dv03" smooth="yes"/>
+      <point x="399" y="1167" type="curve" smooth="yes" name="dv03"/>
       <point x="447" y="1167"/>
       <point x="510" y="1160"/>
       <point x="623" y="1112" type="curve" smooth="yes"/>
       <point x="655" y="1098" type="line" smooth="yes"/>
       <point x="736" y="1062"/>
       <point x="797" y="1044"/>
-      <point x="862" y="1044" type="curve" name="dv05" smooth="yes"/>
+      <point x="862" y="1044" type="curve" smooth="yes" name="dv05"/>
       <point x="958" y="1044"/>
       <point x="1045" y="1083"/>
       <point x="1145" y="1167" type="curve"/>
       <point x="1145" y="992" type="line"/>
       <point x="1053" y="919"/>
       <point x="959" y="878"/>
-      <point x="850" y="878" type="curve" name="dv04" smooth="yes"/>
+      <point x="850" y="878" type="curve" smooth="yes" name="dv04"/>
       <point x="778" y="878"/>
       <point x="726" y="894"/>
       <point x="645" y="929" type="curve" smooth="yes"/>
       <point x="612" y="943" type="line" smooth="yes"/>
       <point x="522" y="980"/>
       <point x="468" y="1001"/>
-      <point x="385" y="1001" type="curve" name="dv02" smooth="yes"/>
+      <point x="385" y="1001" type="curve" smooth="yes" name="dv02"/>
       <point x="282" y="1001"/>
       <point x="192" y="969"/>
       <point x="88" y="878" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2247.glif b/source/Hack-Regular.ufo/glyphs/uni2247.glif
index a0658a2fa..8133a53b1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2247.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2247.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2247" format="1">
+<glyph name="uni2247" format="2">
   <advance width="1233"/>
   <unicode hex="2247"/>
   <outline>
@@ -19,14 +19,14 @@
       <point x="612" y="943" type="curve" smooth="yes"/>
       <point x="508" y="988"/>
       <point x="448" y="1001"/>
-      <point x="384" y="1001" type="curve" name="dv03" smooth="yes"/>
+      <point x="384" y="1001" type="curve" smooth="yes" name="dv03"/>
       <point x="275" y="1001"/>
       <point x="185" y="963"/>
       <point x="88" y="878" type="curve" name="hr01"/>
       <point x="88" y="1052" type="line" name="hr02"/>
       <point x="192" y="1132"/>
       <point x="282" y="1167"/>
-      <point x="399" y="1167" type="curve" name="dv04" smooth="yes"/>
+      <point x="399" y="1167" type="curve" smooth="yes" name="dv04"/>
       <point x="464" y="1167"/>
       <point x="524" y="1156"/>
       <point x="623" y="1113" type="curve" smooth="yes"/>
@@ -36,14 +36,14 @@
       <point x="841" y="1045" type="line" name="hr03"/>
       <point x="848" y="1044"/>
       <point x="856" y="1044"/>
-      <point x="864" y="1044" type="curve" name="dv06" smooth="yes"/>
+      <point x="864" y="1044" type="curve" smooth="yes" name="dv06"/>
       <point x="957" y="1044"/>
       <point x="1045" y="1083"/>
       <point x="1145" y="1167" type="curve" name="hr04"/>
       <point x="1145" y="992" type="line" name="hr05"/>
       <point x="1045" y="912"/>
       <point x="953" y="878"/>
-      <point x="850" y="878" type="curve" name="dv05" smooth="yes"/>
+      <point x="850" y="878" type="curve" smooth="yes" name="dv05"/>
       <point x="826" y="878"/>
       <point x="807" y="880"/>
       <point x="784" y="884" type="curve" name="sv01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2249.glif b/source/Hack-Regular.ufo/glyphs/uni2249.glif
index 2bff6c7f4..ac1885c90 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2249.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2249.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2249" format="1">
+<glyph name="uni2249" format="2">
   <advance width="1233"/>
   <unicode hex="2249"/>
   <outline>
@@ -8,28 +8,28 @@
       <point x="477" y="419" type="line"/>
       <point x="444" y="426"/>
       <point x="411" y="430"/>
-      <point x="380" y="430" type="curve" name="dv02" smooth="yes"/>
+      <point x="380" y="430" type="curve" smooth="yes" name="dv02"/>
       <point x="276" y="430"/>
       <point x="188" y="393"/>
       <point x="88" y="305" type="curve" name="iv01"/>
       <point x="88" y="479" type="line"/>
       <point x="191" y="560"/>
       <point x="286" y="596"/>
-      <point x="390" y="596" type="curve" name="hr01" smooth="yes"/>
+      <point x="390" y="596" type="curve" smooth="yes" name="hr01"/>
       <point x="437" y="596"/>
       <point x="477" y="589"/>
       <point x="524" y="576" type="curve" name="hr02"/>
       <point x="578" y="754" type="line"/>
       <point x="505" y="783"/>
       <point x="448" y="797"/>
-      <point x="383" y="797" type="curve" name="dv03" smooth="yes"/>
+      <point x="383" y="797" type="curve" smooth="yes" name="dv03"/>
       <point x="275" y="797"/>
       <point x="185" y="759"/>
       <point x="88" y="674" type="curve" name="iv02"/>
       <point x="88" y="848" type="line"/>
       <point x="189" y="925"/>
       <point x="279" y="963"/>
-      <point x="399" y="963" type="curve" name="hr03" smooth="yes"/>
+      <point x="399" y="963" type="curve" smooth="yes" name="hr03"/>
       <point x="466" y="963"/>
       <point x="519" y="951"/>
       <point x="624" y="908" type="curve" name="hr04"/>
@@ -38,31 +38,31 @@
       <point x="758" y="855" type="line"/>
       <point x="796" y="845"/>
       <point x="831" y="840"/>
-      <point x="864" y="840" type="curve" name="dv04" smooth="yes"/>
+      <point x="864" y="840" type="curve" smooth="yes" name="dv04"/>
       <point x="957" y="840"/>
       <point x="1045" y="879"/>
       <point x="1145" y="963" type="curve" name="hr05"/>
       <point x="1145" y="788" type="line"/>
       <point x="1049" y="712"/>
       <point x="955" y="674"/>
-      <point x="851" y="674" type="curve" name="hr06" smooth="yes"/>
+      <point x="851" y="674" type="curve" smooth="yes" name="hr06"/>
       <point x="806" y="674"/>
       <point x="759" y="682"/>
       <point x="711" y="699" type="curve" name="hr07"/>
       <point x="659" y="524" type="line"/>
       <point x="736" y="489"/>
       <point x="804" y="471"/>
-      <point x="864" y="471" type="curve" name="dv01" smooth="yes"/>
+      <point x="864" y="471" type="curve" smooth="yes" name="dv01"/>
       <point x="956" y="471"/>
       <point x="1045" y="511"/>
       <point x="1145" y="596" type="curve" name="iv03"/>
       <point x="1145" y="420" type="line"/>
       <point x="1048" y="343"/>
       <point x="953" y="305"/>
-      <point x="852" y="305" type="curve" name="hr08" smooth="yes"/>
+      <point x="852" y="305" type="curve" smooth="yes" name="hr08"/>
       <point x="785" y="305"/>
       <point x="713" y="321"/>
-      <point x="645" y="356" type="curve" name="hr09" smooth="yes"/>
+      <point x="645" y="356" type="curve" smooth="yes" name="hr09"/>
       <point x="614" y="372" type="line"/>
       <point x="516" y="48" type="line" name="av02"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni224A_.glif b/source/Hack-Regular.ufo/glyphs/uni224A_.glif
index 693b06a87..b7b0047a2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni224A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni224A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni224A" format="1">
+<glyph name="uni224A" format="2">
   <advance width="1233"/>
   <unicode hex="224A"/>
   <outline>
@@ -7,28 +7,28 @@
       <point x="88" y="1056" type="line" name="hr00"/>
       <point x="192" y="1136"/>
       <point x="285" y="1171"/>
-      <point x="393" y="1171" type="curve" name="dv02" smooth="yes"/>
+      <point x="393" y="1171" type="curve" smooth="yes" name="dv02"/>
       <point x="457" y="1171"/>
       <point x="532" y="1160"/>
       <point x="623" y="1117" type="curve" smooth="yes"/>
       <point x="655" y="1102" type="line" smooth="yes"/>
       <point x="732" y="1066"/>
       <point x="802" y="1048"/>
-      <point x="865" y="1048" type="curve" name="dv04" smooth="yes"/>
+      <point x="865" y="1048" type="curve" smooth="yes" name="dv04"/>
       <point x="957" y="1048"/>
       <point x="1045" y="1087"/>
       <point x="1145" y="1171" type="curve" name="hr01"/>
       <point x="1145" y="996" type="line"/>
       <point x="1053" y="923"/>
       <point x="959" y="882"/>
-      <point x="850" y="882" type="curve" name="dv03" smooth="yes"/>
+      <point x="850" y="882" type="curve" smooth="yes" name="dv03"/>
       <point x="778" y="882"/>
       <point x="726" y="898"/>
-      <point x="645" y="933" type="curve" name="hr02" smooth="yes"/>
+      <point x="645" y="933" type="curve" smooth="yes" name="hr02"/>
       <point x="612" y="947" type="line" smooth="yes"/>
       <point x="522" y="984"/>
       <point x="468" y="1005"/>
-      <point x="385" y="1005" type="curve" name="hr03" smooth="yes"/>
+      <point x="385" y="1005" type="curve" smooth="yes" name="hr03"/>
       <point x="282" y="1005"/>
       <point x="192" y="973"/>
       <point x="88" y="882" type="curve" name="hr04"/>
@@ -37,7 +37,7 @@
       <point x="88" y="687" type="line"/>
       <point x="192" y="770"/>
       <point x="287" y="804"/>
-      <point x="390" y="804" type="curve" name="dv07" smooth="yes"/>
+      <point x="390" y="804" type="curve" smooth="yes" name="dv07"/>
       <point x="463" y="804"/>
       <point x="533" y="786"/>
       <point x="621" y="749" type="curve"/>
@@ -45,21 +45,21 @@
       <point x="655" y="734" type="line" smooth="yes"/>
       <point x="736" y="697"/>
       <point x="797" y="679"/>
-      <point x="861" y="679" type="curve" name="dv06" smooth="yes"/>
+      <point x="861" y="679" type="curve" smooth="yes" name="dv06"/>
       <point x="957" y="679"/>
       <point x="1045" y="719"/>
       <point x="1145" y="804" type="curve" name="hr07"/>
       <point x="1145" y="628" type="line"/>
       <point x="1052" y="553"/>
       <point x="957" y="513"/>
-      <point x="853" y="513" type="curve" name="dv05" smooth="yes"/>
+      <point x="853" y="513" type="curve" smooth="yes" name="dv05"/>
       <point x="785" y="513"/>
       <point x="721" y="529"/>
-      <point x="645" y="564" type="curve" name="hr08" smooth="yes"/>
+      <point x="645" y="564" type="curve" smooth="yes" name="hr08"/>
       <point x="612" y="579" type="line" smooth="yes"/>
       <point x="504" y="628"/>
       <point x="435" y="638"/>
-      <point x="382" y="638" type="curve" name="hr09" smooth="yes"/>
+      <point x="382" y="638" type="curve" smooth="yes" name="hr09"/>
       <point x="274" y="638"/>
       <point x="187" y="600"/>
       <point x="88" y="513" type="curve" name="hr10"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni224B_.glif b/source/Hack-Regular.ufo/glyphs/uni224B_.glif
index 4372138b6..943cc72a6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni224B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni224B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni224B" format="1">
+<glyph name="uni224B" format="2">
   <advance width="1233"/>
   <unicode hex="224B"/>
   <outline>
@@ -7,28 +7,28 @@
       <point x="88" y="1056" type="line" name="hr00"/>
       <point x="192" y="1136"/>
       <point x="285" y="1171"/>
-      <point x="393" y="1171" type="curve" name="hr01" smooth="yes"/>
+      <point x="393" y="1171" type="curve" smooth="yes" name="hr01"/>
       <point x="457" y="1171"/>
       <point x="532" y="1160"/>
       <point x="623" y="1117" type="curve" smooth="yes"/>
       <point x="655" y="1102" type="line" smooth="yes"/>
       <point x="732" y="1066"/>
       <point x="802" y="1048"/>
-      <point x="865" y="1048" type="curve" name="hr02" smooth="yes"/>
+      <point x="865" y="1048" type="curve" smooth="yes" name="hr02"/>
       <point x="957" y="1048"/>
       <point x="1045" y="1087"/>
       <point x="1145" y="1171" type="curve"/>
       <point x="1145" y="996" type="line" name="hr03"/>
       <point x="1053" y="923"/>
       <point x="959" y="882"/>
-      <point x="850" y="882" type="curve" name="hr04" smooth="yes"/>
+      <point x="850" y="882" type="curve" smooth="yes" name="hr04"/>
       <point x="778" y="882"/>
       <point x="726" y="898"/>
       <point x="645" y="933" type="curve" smooth="yes"/>
       <point x="612" y="947" type="line" smooth="yes"/>
       <point x="522" y="984"/>
       <point x="468" y="1005"/>
-      <point x="385" y="1005" type="curve" name="dv02" smooth="yes"/>
+      <point x="385" y="1005" type="curve" smooth="yes" name="dv02"/>
       <point x="282" y="1005"/>
       <point x="192" y="973"/>
       <point x="88" y="882" type="curve" name="hr05"/>
@@ -37,7 +37,7 @@
       <point x="88" y="687" type="line"/>
       <point x="192" y="770"/>
       <point x="287" y="804"/>
-      <point x="390" y="804" type="curve" name="dv04" smooth="yes"/>
+      <point x="390" y="804" type="curve" smooth="yes" name="dv04"/>
       <point x="463" y="804"/>
       <point x="533" y="786"/>
       <point x="621" y="749" type="curve" name="hr07"/>
@@ -45,21 +45,21 @@
       <point x="655" y="734" type="line" smooth="yes"/>
       <point x="736" y="697"/>
       <point x="797" y="679"/>
-      <point x="861" y="679" type="curve" name="hr08" smooth="yes"/>
+      <point x="861" y="679" type="curve" smooth="yes" name="hr08"/>
       <point x="957" y="679"/>
       <point x="1045" y="719"/>
       <point x="1145" y="804" type="curve"/>
       <point x="1145" y="628" type="line" name="hr09"/>
       <point x="1052" y="553"/>
       <point x="957" y="513"/>
-      <point x="853" y="513" type="curve" name="hr10" smooth="yes"/>
+      <point x="853" y="513" type="curve" smooth="yes" name="hr10"/>
       <point x="785" y="513"/>
       <point x="721" y="529"/>
       <point x="645" y="564" type="curve" smooth="yes"/>
       <point x="612" y="579" type="line" smooth="yes"/>
       <point x="504" y="628"/>
       <point x="435" y="638"/>
-      <point x="382" y="638" type="curve" name="dv03" smooth="yes"/>
+      <point x="382" y="638" type="curve" smooth="yes" name="dv03"/>
       <point x="274" y="638"/>
       <point x="187" y="600"/>
       <point x="88" y="513" type="curve" name="hr11"/>
@@ -68,7 +68,7 @@
       <point x="88" y="323" type="line"/>
       <point x="192" y="406"/>
       <point x="287" y="440"/>
-      <point x="390" y="440" type="curve" name="dv01" smooth="yes"/>
+      <point x="390" y="440" type="curve" smooth="yes" name="dv01"/>
       <point x="463" y="440"/>
       <point x="533" y="422"/>
       <point x="621" y="385" type="curve" name="hr13"/>
@@ -76,21 +76,21 @@
       <point x="655" y="370" type="line" smooth="yes"/>
       <point x="736" y="333"/>
       <point x="797" y="315"/>
-      <point x="861" y="315" type="curve" name="hr14" smooth="yes"/>
+      <point x="861" y="315" type="curve" smooth="yes" name="hr14"/>
       <point x="957" y="315"/>
       <point x="1045" y="355"/>
       <point x="1145" y="440" type="curve"/>
       <point x="1145" y="264" type="line" name="hr15"/>
       <point x="1052" y="189"/>
       <point x="957" y="149"/>
-      <point x="853" y="149" type="curve" name="hr16" smooth="yes"/>
+      <point x="853" y="149" type="curve" smooth="yes" name="hr16"/>
       <point x="785" y="149"/>
       <point x="721" y="165"/>
       <point x="645" y="200" type="curve" smooth="yes"/>
       <point x="612" y="215" type="line" smooth="yes"/>
       <point x="504" y="264"/>
       <point x="435" y="274"/>
-      <point x="382" y="274" type="curve" name="hr17" smooth="yes"/>
+      <point x="382" y="274" type="curve" smooth="yes" name="hr17"/>
       <point x="274" y="274"/>
       <point x="187" y="236"/>
       <point x="88" y="149" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni224C_.glif b/source/Hack-Regular.ufo/glyphs/uni224C_.glif
index e0f5a4d4f..913c62864 100644
--- a/source/Hack-Regular.ufo/glyphs/uni224C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni224C_.glif
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni224C" format="1">
+<glyph name="uni224C" format="2">
   <advance width="1233"/>
   <unicode hex="224C"/>
   <outline>
     <contour>
-      <point x="381" y="878" type="curve" name="dv03" smooth="yes"/>
+      <point x="381" y="878" type="curve" smooth="yes" name="dv03"/>
       <point x="281" y="878"/>
       <point x="188" y="912"/>
       <point x="88" y="992" type="curve"/>
       <point x="88" y="1167" type="line"/>
       <point x="188" y="1083"/>
       <point x="275" y="1044"/>
-      <point x="371" y="1044" type="curve" name="dv04" smooth="yes"/>
+      <point x="371" y="1044" type="curve" smooth="yes" name="dv04"/>
       <point x="439" y="1044"/>
       <point x="498" y="1063"/>
       <point x="578" y="1098" type="curve" smooth="yes"/>
       <point x="610" y="1112" type="line" smooth="yes"/>
       <point x="723" y="1160"/>
       <point x="786" y="1167"/>
-      <point x="834" y="1167" type="curve" name="dv02" smooth="yes"/>
+      <point x="834" y="1167" type="curve" smooth="yes" name="dv02"/>
       <point x="941" y="1167"/>
       <point x="1033" y="1137"/>
       <point x="1145" y="1052" type="curve"/>
       <point x="1145" y="878" type="line"/>
       <point x="1044" y="966"/>
       <point x="956" y="1001"/>
-      <point x="848" y="1001" type="curve" name="dv01" smooth="yes"/>
+      <point x="848" y="1001" type="curve" smooth="yes" name="dv01"/>
       <point x="765" y="1001"/>
       <point x="711" y="980"/>
       <point x="621" y="943" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni224D_.glif b/source/Hack-Regular.ufo/glyphs/uni224D_.glif
index 442427b0b..eb2d7e33a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni224D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni224D_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni224D" format="1">
+<glyph name="uni224D" format="2">
   <advance width="1233"/>
   <unicode hex="224D"/>
   <outline>
     <contour>
-      <point x="617" y="729" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="729" type="curve" smooth="yes" name="hr00"/>
       <point x="484" y="729"/>
       <point x="307" y="781"/>
       <point x="87" y="885" type="curve"/>
@@ -23,7 +23,7 @@
       <point x="88" y="399" type="line"/>
       <point x="307" y="503"/>
       <point x="483" y="555"/>
-      <point x="616" y="555" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="555" type="curve" smooth="yes" name="dv02"/>
       <point x="749" y="555"/>
       <point x="926" y="503"/>
       <point x="1145" y="399" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni224E_.glif b/source/Hack-Regular.ufo/glyphs/uni224E_.glif
index 75fb9bc1d..2a1132def 100644
--- a/source/Hack-Regular.ufo/glyphs/uni224E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni224E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni224E" format="1">
+<glyph name="uni224E" format="2">
   <advance width="1233"/>
   <unicode hex="224E"/>
   <outline>
@@ -11,7 +11,7 @@
       <point x="461" y="1163" type="curve" smooth="yes"/>
       <point x="508" y="1195"/>
       <point x="557" y="1214"/>
-      <point x="613" y="1214" type="curve" name="dv04" smooth="yes"/>
+      <point x="613" y="1214" type="curve" smooth="yes" name="dv04"/>
       <point x="720" y="1214"/>
       <point x="835" y="1143"/>
       <point x="886" y="1038" type="curve" smooth="yes"/>
@@ -26,7 +26,7 @@
       <point x="708" y="1025" type="curve" smooth="yes"/>
       <point x="679" y="1052"/>
       <point x="652" y="1060"/>
-      <point x="617" y="1059" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="1059" type="curve" smooth="yes" name="dv03"/>
       <point x="545" y="1056"/>
       <point x="488" y="1010"/>
       <point x="456" y="914" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="88" y="762" type="line" name="sh02"/>
     </contour>
     <contour>
-      <point x="617" y="68" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="68" type="curve" smooth="yes" name="dv01"/>
       <point x="537" y="68"/>
       <point x="415" y="116"/>
       <point x="348" y="244" type="curve" smooth="yes"/>
@@ -51,7 +51,7 @@
       <point x="526" y="257" type="curve" smooth="yes"/>
       <point x="549" y="238"/>
       <point x="582" y="223"/>
-      <point x="619" y="223" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="223" type="curve" smooth="yes" name="dv02"/>
       <point x="683" y="223"/>
       <point x="743" y="269"/>
       <point x="778" y="368" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni224F_.glif b/source/Hack-Regular.ufo/glyphs/uni224F_.glif
index 2b3d36b40..2d78a92fd 100644
--- a/source/Hack-Regular.ufo/glyphs/uni224F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni224F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni224F" format="1">
+<glyph name="uni224F" format="2">
   <advance width="1233"/>
   <unicode hex="224F"/>
   <outline>
@@ -11,7 +11,7 @@
       <point x="461" y="1163" type="curve" smooth="yes"/>
       <point x="508" y="1195"/>
       <point x="557" y="1214"/>
-      <point x="613" y="1214" type="curve" name="dv03" smooth="yes"/>
+      <point x="613" y="1214" type="curve" smooth="yes" name="dv03"/>
       <point x="720" y="1214"/>
       <point x="835" y="1143"/>
       <point x="886" y="1038" type="curve" smooth="yes"/>
@@ -26,7 +26,7 @@
       <point x="708" y="1025" type="curve" smooth="yes"/>
       <point x="679" y="1052"/>
       <point x="652" y="1060"/>
-      <point x="617" y="1059" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="1059" type="curve" smooth="yes" name="dv02"/>
       <point x="545" y="1056"/>
       <point x="488" y="1010"/>
       <point x="456" y="914" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2250.glif b/source/Hack-Regular.ufo/glyphs/uni2250.glif
index 4f1d635ce..d493b6c12 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2250.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2250.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2250" format="1">
+<glyph name="uni2250" format="2">
   <advance width="1233"/>
   <unicode hex="2250"/>
   <outline>
     <contour>
-      <point x="521" y="1000" type="line" name="hr00" smooth="yes"/>
+      <point x="521" y="1000" type="line" smooth="yes" name="hr00"/>
       <point x="501" y="1000"/>
       <point x="491" y="1010"/>
-      <point x="491" y="1030" type="curve" name="dh01" smooth="yes"/>
+      <point x="491" y="1030" type="curve" smooth="yes" name="dh01"/>
       <point x="491" y="1275" type="line" smooth="yes"/>
       <point x="491" y="1295"/>
       <point x="501" y="1305"/>
-      <point x="521" y="1305" type="curve" name="dv03" smooth="yes"/>
+      <point x="521" y="1305" type="curve" smooth="yes" name="dv03"/>
       <point x="713" y="1305" type="line" smooth="yes"/>
       <point x="733" y="1305"/>
       <point x="743" y="1295"/>
       <point x="743" y="1275" type="curve" smooth="yes"/>
-      <point x="743" y="1030" type="line" name="dh02" smooth="yes"/>
+      <point x="743" y="1030" type="line" smooth="yes" name="dh02"/>
       <point x="743" y="1010"/>
       <point x="733" y="1000"/>
       <point x="713" y="1000" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2251.glif b/source/Hack-Regular.ufo/glyphs/uni2251.glif
index c24f38e20..799ef7d92 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2251.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2251.glif
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2251" format="1">
+<glyph name="uni2251" format="2">
   <advance width="1233"/>
   <unicode hex="2251"/>
   <outline>
     <contour>
-      <point x="521" y="1305" type="line" name="hr00" smooth="yes"/>
+      <point x="521" y="1305" type="line" smooth="yes" name="hr00"/>
       <point x="501" y="1305"/>
       <point x="491" y="1295"/>
-      <point x="491" y="1275" type="curve" name="sh01" smooth="yes"/>
+      <point x="491" y="1275" type="curve" smooth="yes" name="sh01"/>
       <point x="491" y="1305" type="line"/>
     </contour>
     <contour>
-      <point x="743" y="1275" type="line" name="sh02" smooth="yes"/>
+      <point x="743" y="1275" type="line" smooth="yes" name="sh02"/>
       <point x="743" y="1295"/>
       <point x="733" y="1305"/>
-      <point x="713" y="1305" type="curve" name="ih01" smooth="yes"/>
+      <point x="713" y="1305" type="curve" smooth="yes" name="ih01"/>
       <point x="743" y="1305" type="line"/>
     </contour>
     <contour>
-      <point x="491" y="1030" type="line" name="sh03" smooth="yes"/>
+      <point x="491" y="1030" type="line" smooth="yes" name="sh03"/>
       <point x="491" y="1010"/>
       <point x="501" y="1000"/>
-      <point x="521" y="1000" type="curve" name="ih02" smooth="yes"/>
+      <point x="521" y="1000" type="curve" smooth="yes" name="ih02"/>
       <point x="491" y="1000" type="line"/>
     </contour>
     <contour>
-      <point x="713" y="1000" type="line" name="ih03" smooth="yes"/>
+      <point x="713" y="1000" type="line" smooth="yes" name="ih03"/>
       <point x="733" y="1000"/>
       <point x="743" y="1010"/>
-      <point x="743" y="1030" type="curve" name="sh04" smooth="yes"/>
+      <point x="743" y="1030" type="curve" smooth="yes" name="sh04"/>
       <point x="743" y="1000" type="line"/>
     </contour>
     <contour>
@@ -44,18 +44,18 @@
       <point x="88" y="352" type="line"/>
     </contour>
     <contour>
-      <point x="712" y="282" type="line" name="sv01" smooth="yes"/>
+      <point x="712" y="282" type="line" smooth="yes" name="sv01"/>
       <point x="732" y="282"/>
       <point x="742" y="272"/>
       <point x="742" y="252" type="curve" smooth="yes"/>
-      <point x="742" y="7" type="line" name="dh02" smooth="yes"/>
+      <point x="742" y="7" type="line" smooth="yes" name="dh02"/>
       <point x="742" y="-13"/>
       <point x="732" y="-23"/>
-      <point x="712" y="-23" type="curve" name="ab01" smooth="yes"/>
+      <point x="712" y="-23" type="curve" smooth="yes" name="ab01"/>
       <point x="520" y="-23" type="line" smooth="yes"/>
       <point x="500" y="-23"/>
       <point x="490" y="-13"/>
-      <point x="490" y="7" type="curve" name="dh01" smooth="yes"/>
+      <point x="490" y="7" type="curve" smooth="yes" name="dh01"/>
       <point x="490" y="252" type="line" smooth="yes"/>
       <point x="490" y="272"/>
       <point x="500" y="282"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2252.glif b/source/Hack-Regular.ufo/glyphs/uni2252.glif
index 31056fb4a..bfbcf527d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2252.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2252.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2252" format="1">
+<glyph name="uni2252" format="2">
   <advance width="1233"/>
   <unicode hex="2252"/>
   <outline>
     <contour>
-      <point x="118" y="1000" type="line" name="hr00" smooth="yes"/>
+      <point x="118" y="1000" type="line" smooth="yes" name="hr00"/>
       <point x="98" y="1000"/>
       <point x="88" y="1010"/>
-      <point x="88" y="1030" type="curve" name="sh01" smooth="yes"/>
+      <point x="88" y="1030" type="curve" smooth="yes" name="sh01"/>
       <point x="88" y="1275" type="line" smooth="yes"/>
       <point x="88" y="1295"/>
       <point x="98" y="1305"/>
-      <point x="118" y="1305" type="curve" name="dv01" smooth="yes"/>
+      <point x="118" y="1305" type="curve" smooth="yes" name="dv01"/>
       <point x="310" y="1305" type="line" smooth="yes"/>
       <point x="330" y="1305"/>
       <point x="340" y="1295"/>
       <point x="340" y="1275" type="curve" smooth="yes"/>
-      <point x="340" y="1030" type="line" name="sh02" smooth="yes"/>
+      <point x="340" y="1030" type="line" smooth="yes" name="sh02"/>
       <point x="340" y="1010"/>
       <point x="330" y="1000"/>
       <point x="310" y="1000" type="curve" smooth="yes"/>
@@ -34,19 +34,19 @@
       <point x="88" y="352" type="line"/>
     </contour>
     <contour>
-      <point x="923" y="-20" type="line" name="ab01" smooth="yes"/>
+      <point x="923" y="-20" type="line" smooth="yes" name="ab01"/>
       <point x="903" y="-20"/>
       <point x="893" y="-10"/>
-      <point x="893" y="10" type="curve" name="ah01" smooth="yes"/>
+      <point x="893" y="10" type="curve" smooth="yes" name="ah01"/>
       <point x="893" y="255" type="line" smooth="yes"/>
       <point x="893" y="275"/>
       <point x="903" y="285"/>
-      <point x="923" y="285" type="curve" name="sv01" smooth="yes"/>
+      <point x="923" y="285" type="curve" smooth="yes" name="sv01"/>
       <point x="1115" y="285" type="line" smooth="yes"/>
       <point x="1135" y="285"/>
       <point x="1145" y="275"/>
       <point x="1145" y="255" type="curve" smooth="yes"/>
-      <point x="1145" y="10" type="line" name="sh04" smooth="yes"/>
+      <point x="1145" y="10" type="line" smooth="yes" name="sh04"/>
       <point x="1145" y="-10"/>
       <point x="1135" y="-20"/>
       <point x="1115" y="-20" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2253.glif b/source/Hack-Regular.ufo/glyphs/uni2253.glif
index 9ea56c1b1..750a3c33f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2253.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2253.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2253" format="1">
+<glyph name="uni2253" format="2">
   <advance width="1233"/>
   <unicode hex="2253"/>
   <outline>
     <contour>
-      <point x="923" y="1000" type="line" name="hr00" smooth="yes"/>
+      <point x="923" y="1000" type="line" smooth="yes" name="hr00"/>
       <point x="903" y="1000"/>
       <point x="893" y="1010"/>
-      <point x="893" y="1030" type="curve" name="ah01" smooth="yes"/>
+      <point x="893" y="1030" type="curve" smooth="yes" name="ah01"/>
       <point x="893" y="1275" type="line" smooth="yes"/>
       <point x="893" y="1295"/>
       <point x="903" y="1305"/>
-      <point x="923" y="1305" type="curve" name="dv01" smooth="yes"/>
+      <point x="923" y="1305" type="curve" smooth="yes" name="dv01"/>
       <point x="1115" y="1305" type="line" smooth="yes"/>
       <point x="1135" y="1305"/>
       <point x="1145" y="1295"/>
       <point x="1145" y="1275" type="curve" smooth="yes"/>
-      <point x="1145" y="1030" type="line" name="sh01" smooth="yes"/>
+      <point x="1145" y="1030" type="line" smooth="yes" name="sh01"/>
       <point x="1145" y="1010"/>
       <point x="1135" y="1000"/>
       <point x="1115" y="1000" type="curve" smooth="yes"/>
@@ -34,18 +34,18 @@
       <point x="88" y="352" type="line" name="sh02"/>
     </contour>
     <contour>
-      <point x="117" y="-20" type="line" name="ab01" smooth="yes"/>
+      <point x="117" y="-20" type="line" smooth="yes" name="ab01"/>
       <point x="97" y="-20"/>
       <point x="87" y="-10"/>
-      <point x="87" y="10" type="curve" name="sh06" smooth="yes"/>
+      <point x="87" y="10" type="curve" smooth="yes" name="sh06"/>
       <point x="87" y="255" type="line" smooth="yes"/>
       <point x="87" y="275"/>
       <point x="97" y="285"/>
-      <point x="117" y="285" type="curve" name="sv01" smooth="yes"/>
+      <point x="117" y="285" type="curve" smooth="yes" name="sv01"/>
       <point x="309" y="285" type="line" smooth="yes"/>
       <point x="329" y="285"/>
       <point x="339" y="275"/>
-      <point x="339" y="255" type="curve" name="sh07" smooth="yes"/>
+      <point x="339" y="255" type="curve" smooth="yes" name="sh07"/>
       <point x="339" y="10" type="line" smooth="yes"/>
       <point x="339" y="-10"/>
       <point x="329" y="-20"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2254.glif b/source/Hack-Regular.ufo/glyphs/uni2254.glif
index 48ea48cce..2167cdbdc 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2254.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2254.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2254" format="1">
+<glyph name="uni2254" format="2">
   <advance width="1233"/>
   <unicode hex="2254"/>
   <outline>
     <contour>
-      <point x="104" y="709" type="line" name="dv07" smooth="yes"/>
+      <point x="104" y="709" type="line" smooth="yes" name="dv07"/>
       <point x="84" y="709"/>
       <point x="74" y="719"/>
-      <point x="74" y="739" type="curve" name="dh01" smooth="yes"/>
+      <point x="74" y="739" type="curve" smooth="yes" name="dh01"/>
       <point x="74" y="951" type="line" smooth="yes"/>
       <point x="74" y="971"/>
       <point x="84" y="981"/>
-      <point x="104" y="981" type="curve" name="dv08" smooth="yes"/>
-      <point x="280" y="981" type="line" name="hr01" smooth="yes"/>
+      <point x="104" y="981" type="curve" smooth="yes" name="dv08"/>
+      <point x="280" y="981" type="line" smooth="yes" name="hr01"/>
       <point x="300" y="981"/>
       <point x="310" y="971"/>
       <point x="310" y="951" type="curve" smooth="yes"/>
-      <point x="310" y="739" type="line" name="dh02" smooth="yes"/>
+      <point x="310" y="739" type="line" smooth="yes" name="dh02"/>
       <point x="310" y="719"/>
       <point x="300" y="709"/>
       <point x="280" y="709" type="curve" smooth="yes"/>
@@ -28,18 +28,18 @@
       <point x="386" y="760" type="line"/>
     </contour>
     <contour>
-      <point x="104" y="302" type="line" name="dv01" smooth="yes"/>
+      <point x="104" y="302" type="line" smooth="yes" name="dv01"/>
       <point x="84" y="302"/>
       <point x="74" y="312"/>
-      <point x="74" y="332" type="curve" name="sh01" smooth="yes"/>
+      <point x="74" y="332" type="curve" smooth="yes" name="sh01"/>
       <point x="74" y="544" type="line" smooth="yes"/>
       <point x="74" y="564"/>
       <point x="84" y="574"/>
-      <point x="104" y="574" type="curve" name="dv02" smooth="yes"/>
-      <point x="280" y="574" type="line" name="hr02" smooth="yes"/>
+      <point x="104" y="574" type="curve" smooth="yes" name="dv02"/>
+      <point x="280" y="574" type="line" smooth="yes" name="hr02"/>
       <point x="300" y="574"/>
       <point x="310" y="564"/>
-      <point x="310" y="544" type="curve" name="sh02" smooth="yes"/>
+      <point x="310" y="544" type="curve" smooth="yes" name="sh02"/>
       <point x="310" y="332" type="line" smooth="yes"/>
       <point x="310" y="312"/>
       <point x="300" y="302"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2255.glif b/source/Hack-Regular.ufo/glyphs/uni2255.glif
index 50cfccbc8..1e211ffc4 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2255.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2255.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2255" format="1">
+<glyph name="uni2255" format="2">
   <advance width="1233"/>
   <unicode hex="2255"/>
   <outline>
     <contour>
-      <point x="953" y="709" type="line" name="dv07" smooth="yes"/>
+      <point x="953" y="709" type="line" smooth="yes" name="dv07"/>
       <point x="933" y="709"/>
       <point x="923" y="719"/>
-      <point x="923" y="739" type="curve" name="dh01" smooth="yes"/>
+      <point x="923" y="739" type="curve" smooth="yes" name="dh01"/>
       <point x="923" y="951" type="line" smooth="yes"/>
       <point x="923" y="971"/>
       <point x="933" y="981"/>
-      <point x="953" y="981" type="curve" name="dv08" smooth="yes"/>
-      <point x="1129" y="981" type="line" name="hr01" smooth="yes"/>
+      <point x="953" y="981" type="curve" smooth="yes" name="dv08"/>
+      <point x="1129" y="981" type="line" smooth="yes" name="hr01"/>
       <point x="1149" y="981"/>
       <point x="1159" y="971"/>
       <point x="1159" y="951" type="curve" smooth="yes"/>
-      <point x="1159" y="739" type="line" name="dh02" smooth="yes"/>
+      <point x="1159" y="739" type="line" smooth="yes" name="dh02"/>
       <point x="1159" y="719"/>
       <point x="1149" y="709"/>
       <point x="1129" y="709" type="curve" smooth="yes"/>
@@ -28,18 +28,18 @@
       <point x="74" y="760" type="line"/>
     </contour>
     <contour>
-      <point x="953" y="302" type="line" name="dv01" smooth="yes"/>
+      <point x="953" y="302" type="line" smooth="yes" name="dv01"/>
       <point x="933" y="302"/>
       <point x="923" y="312"/>
-      <point x="923" y="332" type="curve" name="sh01" smooth="yes"/>
+      <point x="923" y="332" type="curve" smooth="yes" name="sh01"/>
       <point x="923" y="544" type="line" smooth="yes"/>
       <point x="923" y="564"/>
       <point x="933" y="574"/>
-      <point x="953" y="574" type="curve" name="dv02" smooth="yes"/>
-      <point x="1129" y="574" type="line" name="hr02" smooth="yes"/>
+      <point x="953" y="574" type="curve" smooth="yes" name="dv02"/>
+      <point x="1129" y="574" type="line" smooth="yes" name="hr02"/>
       <point x="1149" y="574"/>
       <point x="1159" y="564"/>
-      <point x="1159" y="544" type="curve" name="sh02" smooth="yes"/>
+      <point x="1159" y="544" type="curve" smooth="yes" name="sh02"/>
       <point x="1159" y="332" type="line" smooth="yes"/>
       <point x="1159" y="312"/>
       <point x="1149" y="302"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2256.glif b/source/Hack-Regular.ufo/glyphs/uni2256.glif
index 55906f45f..66a0c89a1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2256.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2256.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2256" format="1">
+<glyph name="uni2256" format="2">
   <advance width="1233"/>
   <unicode hex="2256"/>
   <outline>
@@ -8,7 +8,7 @@
       <point x="406" y="522" type="line" name="ih01"/>
       <point x="389" y="563"/>
       <point x="381" y="603"/>
-      <point x="381" y="642" type="curve" name="sh01" smooth="yes"/>
+      <point x="381" y="642" type="curve" smooth="yes" name="sh01"/>
       <point x="381" y="683"/>
       <point x="390" y="723"/>
       <point x="408" y="762" type="curve" name="ih02"/>
@@ -19,7 +19,7 @@
       <point x="834" y="762" type="line" name="ih03"/>
       <point x="851" y="746"/>
       <point x="860" y="699"/>
-      <point x="860" y="648" type="curve" name="sh03" smooth="yes"/>
+      <point x="860" y="648" type="curve" smooth="yes" name="sh03"/>
       <point x="860" y="605"/>
       <point x="854" y="573"/>
       <point x="833" y="522" type="curve" name="ih04"/>
@@ -31,14 +31,14 @@
       <point x="693" y="522" type="line" name="sv02"/>
       <point x="728" y="554"/>
       <point x="744" y="597"/>
-      <point x="744" y="640" type="curve" name="ah01" smooth="yes"/>
+      <point x="744" y="640" type="curve" smooth="yes" name="ah01"/>
       <point x="744" y="684"/>
       <point x="727" y="727"/>
       <point x="692" y="762" type="curve" name="sv03"/>
       <point x="549" y="762" type="line"/>
       <point x="514" y="730"/>
       <point x="497" y="690"/>
-      <point x="497" y="642" type="curve" name="sh02" smooth="yes"/>
+      <point x="497" y="642" type="curve" smooth="yes" name="sh02"/>
       <point x="497" y="594"/>
       <point x="514" y="554"/>
       <point x="548" y="522" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2257.glif b/source/Hack-Regular.ufo/glyphs/uni2257.glif
index 9cca58ee5..711eabb81 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2257.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2257.glif
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2257" format="1">
+<glyph name="uni2257" format="2">
   <advance width="1233"/>
   <unicode hex="2257"/>
   <outline>
     <contour>
-      <point x="614" y="1000" type="curve" name="hr00" smooth="yes"/>
+      <point x="614" y="1000" type="curve" smooth="yes" name="hr00"/>
       <point x="451" y="1000"/>
       <point x="328" y="1119"/>
-      <point x="328" y="1275" type="curve" name="sh01" smooth="yes"/>
+      <point x="328" y="1275" type="curve" smooth="yes" name="sh01"/>
       <point x="328" y="1432"/>
       <point x="456" y="1557"/>
-      <point x="616" y="1557" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1557" type="curve" smooth="yes" name="at01"/>
       <point x="696" y="1557"/>
       <point x="771" y="1526"/>
       <point x="822" y="1474" type="curve"/>
       <point x="878" y="1421"/>
       <point x="906" y="1353"/>
-      <point x="906" y="1278" type="curve" name="sh02" smooth="yes"/>
+      <point x="906" y="1278" type="curve" smooth="yes" name="sh02"/>
       <point x="906" y="1122"/>
       <point x="778" y="1000"/>
     </contour>
     <contour>
-      <point x="617" y="1111" type="curve" name="dv05" smooth="yes"/>
+      <point x="617" y="1111" type="curve" smooth="yes" name="dv05"/>
       <point x="714" y="1111"/>
       <point x="790" y="1184"/>
-      <point x="790" y="1276" type="curve" name="ah01" smooth="yes"/>
+      <point x="790" y="1276" type="curve" smooth="yes" name="ah01"/>
       <point x="790" y="1369"/>
       <point x="713" y="1444"/>
-      <point x="617" y="1444" type="curve" name="sv01" smooth="yes"/>
+      <point x="617" y="1444" type="curve" smooth="yes" name="sv01"/>
       <point x="520" y="1444"/>
       <point x="444" y="1369"/>
-      <point x="444" y="1276" type="curve" name="sh03" smooth="yes"/>
+      <point x="444" y="1276" type="curve" smooth="yes" name="sh03"/>
       <point x="444" y="1184"/>
       <point x="520" y="1111"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2258.glif b/source/Hack-Regular.ufo/glyphs/uni2258.glif
index 5f88f70c7..5ebfcf104 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2258.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2258.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2258" format="1">
+<glyph name="uni2258" format="2">
   <advance width="1233"/>
   <unicode hex="2258"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="182" y="1204" type="line" name="hr00"/>
       <point x="321" y="1305"/>
       <point x="467" y="1355"/>
-      <point x="619" y="1355" type="curve" name="dv04" smooth="yes"/>
+      <point x="619" y="1355" type="curve" smooth="yes" name="dv04"/>
       <point x="772" y="1355"/>
       <point x="916" y="1305"/>
       <point x="1051" y="1204" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2259.glif b/source/Hack-Regular.ufo/glyphs/uni2259.glif
index 63196c84c..7775137f3 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2259.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2259.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2259" format="1">
+<glyph name="uni2259" format="2">
   <advance width="1233"/>
   <unicode hex="2259"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni225A_.glif b/source/Hack-Regular.ufo/glyphs/uni225A_.glif
index c97815dcd..9e89adcb1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni225A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni225A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni225A" format="1">
+<glyph name="uni225A" format="2">
   <advance width="1233"/>
   <unicode hex="225A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni225B_.glif b/source/Hack-Regular.ufo/glyphs/uni225B_.glif
index 7179fa15d..61a9eea3b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni225B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni225B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni225B" format="1">
+<glyph name="uni225B" format="2">
   <advance width="1233"/>
   <unicode hex="225B"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni225C_.glif b/source/Hack-Regular.ufo/glyphs/uni225C_.glif
index e69041027..b249a3206 100644
--- a/source/Hack-Regular.ufo/glyphs/uni225C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni225C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni225C" format="1">
+<glyph name="uni225C" format="2">
   <advance width="1233"/>
   <unicode hex="225C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni225D_.glif b/source/Hack-Regular.ufo/glyphs/uni225D_.glif
index d8564f61e..2f31becb0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni225D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni225D_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni225D" format="1">
+<glyph name="uni225D" format="2">
   <advance width="1233"/>
   <unicode hex="225D"/>
   <outline>
     <contour>
-      <point x="238" y="994" type="curve" name="sv01" smooth="yes"/>
+      <point x="238" y="994" type="curve" smooth="yes" name="sv01"/>
       <point x="135" y="994"/>
       <point x="69" y="1078"/>
-      <point x="69" y="1205" type="curve" name="dh01" smooth="yes"/>
+      <point x="69" y="1205" type="curve" smooth="yes" name="dh01"/>
       <point x="69" y="1332"/>
       <point x="135" y="1417"/>
-      <point x="238" y="1417" type="curve" name="sv02" smooth="yes"/>
+      <point x="238" y="1417" type="curve" smooth="yes" name="sv02"/>
       <point x="290" y="1417"/>
       <point x="335" y="1395"/>
       <point x="363" y="1346" type="curve"/>
@@ -27,16 +27,16 @@
       <point x="907" y="1356" type="line" name="dv02"/>
       <point x="907" y="1407" type="line"/>
       <point x="970" y="1407" type="line" name="sh02"/>
-      <point x="970" y="1435" type="line" name="sh04" smooth="yes"/>
+      <point x="970" y="1435" type="line" smooth="yes" name="sh04"/>
       <point x="970" y="1527"/>
       <point x="1009" y="1564"/>
-      <point x="1101" y="1564" type="curve" name="at01" smooth="yes"/>
+      <point x="1101" y="1564" type="curve" smooth="yes" name="at01"/>
       <point x="1164" y="1564" type="line"/>
       <point x="1164" y="1509" type="line" name="sv04"/>
       <point x="1100" y="1509" type="line" smooth="yes"/>
       <point x="1053" y="1509"/>
       <point x="1037" y="1492"/>
-      <point x="1037" y="1443" type="curve" name="sh05" smooth="yes"/>
+      <point x="1037" y="1443" type="curve" smooth="yes" name="sh05"/>
       <point x="1037" y="1407" type="line" name="sv05"/>
       <point x="1146" y="1407" type="line" name="sh07"/>
       <point x="1146" y="1356" type="line" name="sv06"/>
@@ -45,21 +45,21 @@
       <point x="970" y="1004" type="line" name="sh03"/>
     </contour>
     <contour>
-      <point x="701" y="994" type="curve" name="dv05" smooth="yes"/>
+      <point x="701" y="994" type="curve" smooth="yes" name="dv05"/>
       <point x="570" y="994"/>
       <point x="490" y="1071"/>
-      <point x="490" y="1204" type="curve" name="dh05" smooth="yes"/>
+      <point x="490" y="1204" type="curve" smooth="yes" name="dh05"/>
       <point x="490" y="1334"/>
       <point x="569" y="1417"/>
-      <point x="686" y="1417" type="curve" name="dv03" smooth="yes"/>
+      <point x="686" y="1417" type="curve" smooth="yes" name="dv03"/>
       <point x="798" y="1417"/>
       <point x="864" y="1343"/>
-      <point x="864" y="1222" type="curve" name="hr01" smooth="yes"/>
+      <point x="864" y="1222" type="curve" smooth="yes" name="hr01"/>
       <point x="864" y="1190" type="line"/>
       <point x="560" y="1190" type="line" name="dh06"/>
       <point x="565" y="1098"/>
       <point x="615" y="1050"/>
-      <point x="707" y="1050" type="curve" name="dv06" smooth="yes"/>
+      <point x="707" y="1050" type="curve" smooth="yes" name="dv06"/>
       <point x="752" y="1050"/>
       <point x="800" y="1062"/>
       <point x="849" y="1087" type="curve" name="ih01"/>
@@ -68,19 +68,19 @@
       <point x="750" y="994"/>
     </contour>
     <contour>
-      <point x="251" y="1049" type="curve" name="sv08" smooth="yes"/>
+      <point x="251" y="1049" type="curve" smooth="yes" name="sv08"/>
       <point x="322" y="1049"/>
       <point x="363" y="1107"/>
-      <point x="363" y="1206" type="curve" name="sh08" smooth="yes"/>
+      <point x="363" y="1206" type="curve" smooth="yes" name="sh08"/>
       <point x="363" y="1305"/>
       <point x="322" y="1362"/>
-      <point x="251" y="1362" type="curve" name="sv09" smooth="yes"/>
+      <point x="251" y="1362" type="curve" smooth="yes" name="sv09"/>
       <point x="216" y="1362"/>
       <point x="188" y="1348"/>
       <point x="168" y="1321" type="curve" smooth="yes"/>
       <point x="148" y="1293"/>
       <point x="138" y="1255"/>
-      <point x="138" y="1207" type="curve" name="dh02" smooth="yes"/>
+      <point x="138" y="1207" type="curve" smooth="yes" name="dh02"/>
       <point x="138" y="1107"/>
       <point x="180" y="1049"/>
     </contour>
@@ -88,7 +88,7 @@
       <point x="798" y="1242" type="line" name="dh07"/>
       <point x="795" y="1315"/>
       <point x="757" y="1361"/>
-      <point x="685" y="1361" type="curve" name="sv10" smooth="yes"/>
+      <point x="685" y="1361" type="curve" smooth="yes" name="sv10"/>
       <point x="613" y="1361"/>
       <point x="569" y="1314"/>
       <point x="562" y="1241" type="curve" name="sh09"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni225E_.glif b/source/Hack-Regular.ufo/glyphs/uni225E_.glif
index 84b5c8eec..b937d3f55 100644
--- a/source/Hack-Regular.ufo/glyphs/uni225E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni225E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni225E" format="1">
+<glyph name="uni225E" format="2">
   <advance width="1233"/>
   <unicode hex="225E"/>
   <outline>
@@ -9,13 +9,13 @@
       <point x="310" y="1458" type="line" name="sh01"/>
       <point x="349" y="1522"/>
       <point x="403" y="1556"/>
-      <point x="482" y="1556" type="curve" name="at01" smooth="yes"/>
+      <point x="482" y="1556" type="curve" smooth="yes" name="at01"/>
       <point x="559" y="1556"/>
       <point x="615" y="1521"/>
       <point x="646" y="1437" type="curve" name="ih01"/>
       <point x="689" y="1516"/>
       <point x="752" y="1556"/>
-      <point x="833" y="1556" type="curve" name="at02" smooth="yes"/>
+      <point x="833" y="1556" type="curve" smooth="yes" name="at02"/>
       <point x="950" y="1556"/>
       <point x="1012" y="1473"/>
       <point x="1012" y="1325" type="curve" smooth="yes"/>
@@ -24,7 +24,7 @@
       <point x="923" y="1322" type="line" smooth="yes"/>
       <point x="923" y="1429"/>
       <point x="886" y="1478"/>
-      <point x="809" y="1478" type="curve" name="sv01" smooth="yes"/>
+      <point x="809" y="1478" type="curve" smooth="yes" name="sv01"/>
       <point x="720" y="1478"/>
       <point x="661" y="1412"/>
       <point x="661" y="1304" type="curve" smooth="yes"/>
@@ -33,10 +33,10 @@
       <point x="572" y="1322" type="line" smooth="yes"/>
       <point x="572" y="1430"/>
       <point x="536" y="1478"/>
-      <point x="459" y="1478" type="curve" name="sv02" smooth="yes"/>
+      <point x="459" y="1478" type="curve" smooth="yes" name="sv02"/>
       <point x="367" y="1478"/>
       <point x="310" y="1412"/>
-      <point x="310" y="1304" type="curve" name="sh06" smooth="yes"/>
+      <point x="310" y="1304" type="curve" smooth="yes" name="sh06"/>
       <point x="310" y="994" type="line"/>
       <point x="221" y="994" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni225F_.glif b/source/Hack-Regular.ufo/glyphs/uni225F_.glif
index 60fbbcf6f..0fa039433 100644
--- a/source/Hack-Regular.ufo/glyphs/uni225F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni225F_.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni225F" format="1">
+<glyph name="uni225F" format="2">
   <advance width="1233"/>
   <unicode hex="225F"/>
   <outline>
     <contour>
-      <point x="542" y="1272" type="line" name="hr00" smooth="yes"/>
+      <point x="542" y="1272" type="line" smooth="yes" name="hr00"/>
       <point x="542" y="1346"/>
       <point x="558" y="1373"/>
       <point x="615" y="1430" type="curve" smooth="yes"/>
       <point x="660" y="1474" type="line" smooth="yes"/>
       <point x="695" y="1509"/>
       <point x="714" y="1533"/>
-      <point x="714" y="1572" type="curve" name="ah01" smooth="yes"/>
+      <point x="714" y="1572" type="curve" smooth="yes" name="ah01"/>
       <point x="714" y="1632"/>
       <point x="668" y="1672"/>
-      <point x="597" y="1672" type="curve" name="dv03" smooth="yes"/>
+      <point x="597" y="1672" type="curve" smooth="yes" name="dv03"/>
       <point x="541" y="1672"/>
       <point x="482" y="1648"/>
       <point x="417" y="1604" type="curve"/>
       <point x="417" y="1698" type="line"/>
       <point x="480" y="1735"/>
       <point x="545" y="1754"/>
-      <point x="610" y="1754" type="curve" name="dv04" smooth="yes"/>
+      <point x="610" y="1754" type="curve" smooth="yes" name="dv04"/>
       <point x="735" y="1754"/>
       <point x="816" y="1683"/>
-      <point x="816" y="1578" type="curve" name="sh01" smooth="yes"/>
+      <point x="816" y="1578" type="curve" smooth="yes" name="sh01"/>
       <point x="816" y="1523"/>
       <point x="794" y="1485"/>
       <point x="735" y="1428" type="curve" smooth="yes"/>
       <point x="691" y="1385" type="line" smooth="yes"/>
       <point x="654" y="1351"/>
       <point x="649" y="1337"/>
-      <point x="644" y="1322" type="curve" name="sh03" smooth="yes"/>
+      <point x="644" y="1322" type="curve" smooth="yes" name="sh03"/>
       <point x="640" y="1309"/>
       <point x="638" y="1291"/>
-      <point x="638" y="1256" type="curve" name="sh02" smooth="yes"/>
+      <point x="638" y="1256" type="curve" smooth="yes" name="sh02"/>
       <point x="638" y="1194" type="line"/>
       <point x="542" y="1194" type="line"/>
     </contour>
@@ -42,15 +42,15 @@
       <point x="569" y="994" type="line" smooth="yes"/>
       <point x="549" y="994"/>
       <point x="539" y="1004"/>
-      <point x="539" y="1024" type="curve" name="sh04" smooth="yes"/>
+      <point x="539" y="1024" type="curve" smooth="yes" name="sh04"/>
       <point x="539" y="1091" type="line" smooth="yes"/>
       <point x="539" y="1111"/>
       <point x="549" y="1121"/>
-      <point x="569" y="1121" type="curve" name="at01" smooth="yes"/>
+      <point x="569" y="1121" type="curve" smooth="yes" name="at01"/>
       <point x="611" y="1121" type="line" smooth="yes"/>
       <point x="631" y="1121"/>
       <point x="641" y="1111"/>
-      <point x="641" y="1091" type="curve" name="sh05" smooth="yes"/>
+      <point x="641" y="1091" type="curve" smooth="yes" name="sh05"/>
       <point x="641" y="1024" type="line" smooth="yes"/>
       <point x="641" y="1004"/>
       <point x="631" y="994"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2262.glif b/source/Hack-Regular.ufo/glyphs/uni2262.glif
index c21302c2b..d7043ceda 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2262.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2262.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2262" format="1">
+<glyph name="uni2262" format="2">
   <advance width="1233"/>
   <unicode hex="2262"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2263.glif b/source/Hack-Regular.ufo/glyphs/uni2263.glif
index 8f87e263c..33027fd94 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2263.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2263.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2263" format="1">
+<glyph name="uni2263" format="2">
   <advance width="1233"/>
   <unicode hex="2263"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2266.glif b/source/Hack-Regular.ufo/glyphs/uni2266.glif
index ed9852f19..de279956d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2266.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2266.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2266" format="1">
+<glyph name="uni2266" format="2">
   <advance width="1233"/>
   <unicode hex="2266"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2267.glif b/source/Hack-Regular.ufo/glyphs/uni2267.glif
index f4c695c85..6b85f1573 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2267.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2267.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2267" format="1">
+<glyph name="uni2267" format="2">
   <advance width="1233"/>
   <unicode hex="2267"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2268.glif b/source/Hack-Regular.ufo/glyphs/uni2268.glif
index 6cdc5bbc5..801c8f16f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2268.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2268.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2268" format="1">
+<glyph name="uni2268" format="2">
   <advance width="1233"/>
   <unicode hex="2268"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2269.glif b/source/Hack-Regular.ufo/glyphs/uni2269.glif
index 22b7a3b0f..b1f8f9468 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2269.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2269.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2269" format="1">
+<glyph name="uni2269" format="2">
   <advance width="1233"/>
   <unicode hex="2269"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni226D_.glif b/source/Hack-Regular.ufo/glyphs/uni226D_.glif
index d9de97328..59d8ef725 100644
--- a/source/Hack-Regular.ufo/glyphs/uni226D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni226D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni226D" format="1">
+<glyph name="uni226D" format="2">
   <advance width="1233"/>
   <unicode hex="226D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni226E_.glif b/source/Hack-Regular.ufo/glyphs/uni226E_.glif
index d176e85a0..e102dc065 100644
--- a/source/Hack-Regular.ufo/glyphs/uni226E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni226E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni226E" format="1">
+<glyph name="uni226E" format="2">
   <advance width="1233"/>
   <unicode hex="226E"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni226F_.glif b/source/Hack-Regular.ufo/glyphs/uni226F_.glif
index 4c90f956a..25459cab1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni226F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni226F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni226F" format="1">
+<glyph name="uni226F" format="2">
   <advance width="1233"/>
   <unicode hex="226F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2270.glif b/source/Hack-Regular.ufo/glyphs/uni2270.glif
index 45dea8b29..460a3c475 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2270.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2270.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2270" format="1">
+<glyph name="uni2270" format="2">
   <advance width="1233"/>
   <unicode hex="2270"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2271.glif b/source/Hack-Regular.ufo/glyphs/uni2271.glif
index 0aafba116..766e172d0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2271.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2271.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2271" format="1">
+<glyph name="uni2271" format="2">
   <advance width="1233"/>
   <unicode hex="2271"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2272.glif b/source/Hack-Regular.ufo/glyphs/uni2272.glif
index 5d2759476..90aac4a3d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2272.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2272.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2272" format="1">
+<glyph name="uni2272" format="2">
   <advance width="1233"/>
   <unicode hex="2272"/>
   <outline>
@@ -16,28 +16,28 @@
       <point x="86" y="130" type="line" name="hr04"/>
       <point x="198" y="215"/>
       <point x="289" y="245"/>
-      <point x="397" y="245" type="curve" name="dv04" smooth="yes"/>
+      <point x="397" y="245" type="curve" smooth="yes" name="dv04"/>
       <point x="445" y="245"/>
       <point x="508" y="238"/>
       <point x="621" y="190" type="curve" smooth="yes"/>
-      <point x="653" y="176" type="line" name="hr05" smooth="yes"/>
+      <point x="653" y="176" type="line" smooth="yes" name="hr05"/>
       <point x="734" y="140"/>
       <point x="795" y="122"/>
-      <point x="860" y="122" type="curve" name="dv02" smooth="yes"/>
+      <point x="860" y="122" type="curve" smooth="yes" name="dv02"/>
       <point x="956" y="122"/>
       <point x="1043" y="161"/>
       <point x="1143" y="245" type="curve"/>
       <point x="1143" y="70" type="line"/>
       <point x="1051" y="-3"/>
       <point x="957" y="-44"/>
-      <point x="848" y="-44" type="curve" name="dv01" smooth="yes"/>
+      <point x="848" y="-44" type="curve" smooth="yes" name="dv01"/>
       <point x="776" y="-44"/>
       <point x="724" y="-28"/>
       <point x="643" y="7" type="curve" smooth="yes"/>
       <point x="610" y="21" type="line" smooth="yes"/>
       <point x="520" y="58"/>
       <point x="466" y="79"/>
-      <point x="383" y="79" type="curve" name="dv03" smooth="yes"/>
+      <point x="383" y="79" type="curve" smooth="yes" name="dv03"/>
       <point x="280" y="79"/>
       <point x="190" y="47"/>
       <point x="86" y="-44" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2273.glif b/source/Hack-Regular.ufo/glyphs/uni2273.glif
index b331ae361..dbb5ebab5 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2273.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2273.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2273" format="1">
+<glyph name="uni2273" format="2">
   <advance width="1233"/>
   <unicode hex="2273"/>
   <outline>
@@ -16,28 +16,28 @@
       <point x="86" y="130" type="line" name="hr04"/>
       <point x="198" y="215"/>
       <point x="289" y="245"/>
-      <point x="397" y="245" type="curve" name="dv04" smooth="yes"/>
+      <point x="397" y="245" type="curve" smooth="yes" name="dv04"/>
       <point x="445" y="245"/>
       <point x="508" y="238"/>
       <point x="621" y="190" type="curve" smooth="yes"/>
-      <point x="653" y="176" type="line" name="hr05" smooth="yes"/>
+      <point x="653" y="176" type="line" smooth="yes" name="hr05"/>
       <point x="734" y="140"/>
       <point x="795" y="122"/>
-      <point x="860" y="122" type="curve" name="dv02" smooth="yes"/>
+      <point x="860" y="122" type="curve" smooth="yes" name="dv02"/>
       <point x="956" y="122"/>
       <point x="1043" y="161"/>
       <point x="1143" y="245" type="curve"/>
       <point x="1143" y="70" type="line"/>
       <point x="1051" y="-3"/>
       <point x="957" y="-44"/>
-      <point x="848" y="-44" type="curve" name="dv01" smooth="yes"/>
+      <point x="848" y="-44" type="curve" smooth="yes" name="dv01"/>
       <point x="776" y="-44"/>
       <point x="724" y="-28"/>
       <point x="643" y="7" type="curve" smooth="yes"/>
       <point x="610" y="21" type="line" smooth="yes"/>
       <point x="520" y="58"/>
       <point x="466" y="79"/>
-      <point x="383" y="79" type="curve" name="dv03" smooth="yes"/>
+      <point x="383" y="79" type="curve" smooth="yes" name="dv03"/>
       <point x="280" y="79"/>
       <point x="190" y="47"/>
       <point x="86" y="-44" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2274.glif b/source/Hack-Regular.ufo/glyphs/uni2274.glif
index 6bd521e95..d6fa6023c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2274.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2274.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2274" format="1">
+<glyph name="uni2274" format="2">
   <advance width="1233"/>
   <unicode hex="2274"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="86" y="130" type="line"/>
       <point x="190" y="210"/>
       <point x="282" y="245"/>
-      <point x="390" y="245" type="curve" name="dv04" smooth="yes"/>
+      <point x="390" y="245" type="curve" smooth="yes" name="dv04"/>
       <point x="409" y="245"/>
       <point x="420" y="244"/>
       <point x="435" y="243" type="curve" name="sv01"/>
@@ -36,14 +36,14 @@
       <point x="653" y="176" type="curve"/>
       <point x="730" y="140"/>
       <point x="799" y="122"/>
-      <point x="862" y="122" type="curve" name="dv02" smooth="yes"/>
+      <point x="862" y="122" type="curve" smooth="yes" name="dv02"/>
       <point x="955" y="122"/>
       <point x="1043" y="161"/>
       <point x="1143" y="245" type="curve" name="iv05"/>
       <point x="1143" y="70" type="line"/>
       <point x="1043" y="-10"/>
       <point x="951" y="-44"/>
-      <point x="847" y="-44" type="curve" name="dv01" smooth="yes"/>
+      <point x="847" y="-44" type="curve" smooth="yes" name="dv01"/>
       <point x="771" y="-44"/>
       <point x="721" y="-25"/>
       <point x="643" y="7" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2275.glif b/source/Hack-Regular.ufo/glyphs/uni2275.glif
index ced951798..5a28ee271 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2275.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2275.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2275" format="1">
+<glyph name="uni2275" format="2">
   <advance width="1233"/>
   <unicode hex="2275"/>
   <outline>
@@ -37,14 +37,14 @@
       <point x="653" y="176" type="line" smooth="yes"/>
       <point x="730" y="140"/>
       <point x="800" y="122"/>
-      <point x="863" y="122" type="curve" name="dv02" smooth="yes"/>
+      <point x="863" y="122" type="curve" smooth="yes" name="dv02"/>
       <point x="955" y="122"/>
       <point x="1043" y="161"/>
       <point x="1143" y="245" type="curve" name="iv06"/>
       <point x="1143" y="70" type="line"/>
       <point x="1047" y="-6"/>
       <point x="951" y="-44"/>
-      <point x="847" y="-44" type="curve" name="dv01" smooth="yes"/>
+      <point x="847" y="-44" type="curve" smooth="yes" name="dv01"/>
       <point x="778" y="-44"/>
       <point x="723" y="-28"/>
       <point x="643" y="7" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2276.glif b/source/Hack-Regular.ufo/glyphs/uni2276.glif
index 2a52b5667..d63ec34b9 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2276.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2276.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2276" format="1">
+<glyph name="uni2276" format="2">
   <advance width="1233"/>
   <unicode hex="2276"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2277.glif b/source/Hack-Regular.ufo/glyphs/uni2277.glif
index 06cb06f97..60edbeae8 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2277.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2277.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2277" format="1">
+<glyph name="uni2277" format="2">
   <advance width="1233"/>
   <unicode hex="2277"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2278.glif b/source/Hack-Regular.ufo/glyphs/uni2278.glif
index 2c15eac55..d1d9ade44 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2278.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2278.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2278" format="1">
+<glyph name="uni2278" format="2">
   <advance width="1233"/>
   <unicode hex="2278"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2279.glif b/source/Hack-Regular.ufo/glyphs/uni2279.glif
index c37c8879c..6128c3444 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2279.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2279.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2279" format="1">
+<glyph name="uni2279" format="2">
   <advance width="1233"/>
   <unicode hex="2279"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni227A_.glif b/source/Hack-Regular.ufo/glyphs/uni227A_.glif
index ddf4bf5d7..cedcaddcc 100644
--- a/source/Hack-Regular.ufo/glyphs/uni227A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni227A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni227A" format="1">
+<glyph name="uni227A" format="2">
   <advance width="1233"/>
   <unicode hex="227A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni227B_.glif b/source/Hack-Regular.ufo/glyphs/uni227B_.glif
index a191bc3d6..d2daa1720 100644
--- a/source/Hack-Regular.ufo/glyphs/uni227B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni227B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni227B" format="1">
+<glyph name="uni227B" format="2">
   <advance width="1233"/>
   <unicode hex="227B"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni227C_.glif b/source/Hack-Regular.ufo/glyphs/uni227C_.glif
index c29f31b3f..edaa8cb45 100644
--- a/source/Hack-Regular.ufo/glyphs/uni227C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni227C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni227C" format="1">
+<glyph name="uni227C" format="2">
   <advance width="1233"/>
   <unicode hex="227C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni227D_.glif b/source/Hack-Regular.ufo/glyphs/uni227D_.glif
index dd9f38c25..9af8f9b4d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni227D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni227D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni227D" format="1">
+<glyph name="uni227D" format="2">
   <advance width="1233"/>
   <unicode hex="227D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni227E_.glif b/source/Hack-Regular.ufo/glyphs/uni227E_.glif
index c3c8d6a61..d74a04d0f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni227E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni227E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni227E" format="1">
+<glyph name="uni227E" format="2">
   <advance width="1233"/>
   <unicode hex="227E"/>
   <outline>
@@ -24,28 +24,28 @@
       <point x="86" y="60" type="line" name="hr04"/>
       <point x="190" y="140"/>
       <point x="283" y="175"/>
-      <point x="391" y="175" type="curve" name="dv04" smooth="yes"/>
+      <point x="391" y="175" type="curve" smooth="yes" name="dv04"/>
       <point x="455" y="175"/>
       <point x="530" y="164"/>
       <point x="621" y="121" type="curve" smooth="yes"/>
-      <point x="653" y="106" type="line" name="hr05" smooth="yes"/>
+      <point x="653" y="106" type="line" smooth="yes" name="hr05"/>
       <point x="730" y="70"/>
       <point x="800" y="52"/>
-      <point x="863" y="52" type="curve" name="dv02" smooth="yes"/>
+      <point x="863" y="52" type="curve" smooth="yes" name="dv02"/>
       <point x="955" y="52"/>
       <point x="1043" y="91"/>
       <point x="1143" y="175" type="curve"/>
       <point x="1143" y="0" type="line"/>
       <point x="1051" y="-73"/>
       <point x="957" y="-114"/>
-      <point x="848" y="-114" type="curve" name="dv01" smooth="yes"/>
+      <point x="848" y="-114" type="curve" smooth="yes" name="dv01"/>
       <point x="776" y="-114"/>
       <point x="724" y="-98"/>
       <point x="643" y="-63" type="curve" smooth="yes"/>
       <point x="610" y="-49" type="line" smooth="yes"/>
       <point x="520" y="-12"/>
       <point x="466" y="9"/>
-      <point x="383" y="9" type="curve" name="dv03" smooth="yes"/>
+      <point x="383" y="9" type="curve" smooth="yes" name="dv03"/>
       <point x="280" y="9"/>
       <point x="190" y="-23"/>
       <point x="86" y="-114" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni227F_.glif b/source/Hack-Regular.ufo/glyphs/uni227F_.glif
index fb4d6ce23..6926391a3 100644
--- a/source/Hack-Regular.ufo/glyphs/uni227F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni227F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni227F" format="1">
+<glyph name="uni227F" format="2">
   <advance width="1233"/>
   <unicode hex="227F"/>
   <outline>
@@ -24,28 +24,28 @@
       <point x="86" y="60" type="line" name="hr04"/>
       <point x="190" y="140"/>
       <point x="283" y="175"/>
-      <point x="391" y="175" type="curve" name="dv04" smooth="yes"/>
+      <point x="391" y="175" type="curve" smooth="yes" name="dv04"/>
       <point x="455" y="175"/>
       <point x="530" y="164"/>
       <point x="621" y="121" type="curve" smooth="yes"/>
-      <point x="653" y="106" type="line" name="hr05" smooth="yes"/>
+      <point x="653" y="106" type="line" smooth="yes" name="hr05"/>
       <point x="730" y="70"/>
       <point x="800" y="52"/>
-      <point x="863" y="52" type="curve" name="dv02" smooth="yes"/>
+      <point x="863" y="52" type="curve" smooth="yes" name="dv02"/>
       <point x="955" y="52"/>
       <point x="1043" y="91"/>
       <point x="1143" y="175" type="curve"/>
       <point x="1143" y="0" type="line"/>
       <point x="1051" y="-73"/>
       <point x="957" y="-114"/>
-      <point x="848" y="-114" type="curve" name="dv01" smooth="yes"/>
+      <point x="848" y="-114" type="curve" smooth="yes" name="dv01"/>
       <point x="776" y="-114"/>
       <point x="724" y="-98"/>
       <point x="643" y="-63" type="curve" smooth="yes"/>
       <point x="610" y="-49" type="line" smooth="yes"/>
       <point x="520" y="-12"/>
       <point x="466" y="9"/>
-      <point x="383" y="9" type="curve" name="dv03" smooth="yes"/>
+      <point x="383" y="9" type="curve" smooth="yes" name="dv03"/>
       <point x="280" y="9"/>
       <point x="190" y="-23"/>
       <point x="86" y="-114" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2280.glif b/source/Hack-Regular.ufo/glyphs/uni2280.glif
index 38b9d6f34..13544a203 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2280.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2280.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2280" format="1">
+<glyph name="uni2280" format="2">
   <advance width="1233"/>
   <unicode hex="2280"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2281.glif b/source/Hack-Regular.ufo/glyphs/uni2281.glif
index 8f80108f7..fc2c669dd 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2281.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2281.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2281" format="1">
+<glyph name="uni2281" format="2">
   <advance width="1233"/>
   <unicode hex="2281"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2285.glif b/source/Hack-Regular.ufo/glyphs/uni2285.glif
index 2ed583f0f..a76554575 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2285.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2285.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2285" format="1">
+<glyph name="uni2285" format="2">
   <advance width="1233"/>
   <unicode hex="2285"/>
   <outline>
@@ -21,18 +21,18 @@
       <point x="1006" y="980" type="curve" smooth="yes"/>
       <point x="1097" y="888"/>
       <point x="1145" y="778"/>
-      <point x="1145" y="646" type="curve" name="dh02" smooth="yes"/>
+      <point x="1145" y="646" type="curve" smooth="yes" name="dh02"/>
       <point x="1145" y="374"/>
       <point x="935" y="163"/>
-      <point x="668" y="163" type="curve" name="sv02" smooth="yes"/>
+      <point x="668" y="163" type="curve" smooth="yes" name="sv02"/>
       <point x="542" y="163" type="line"/>
       <point x="467" y="-60" type="line" name="av01"/>
     </contour>
     <contour>
-      <point x="668" y="313" type="line" name="sv03" smooth="yes"/>
+      <point x="668" y="313" type="line" smooth="yes" name="sv03"/>
       <point x="851" y="313"/>
       <point x="995" y="457"/>
-      <point x="995" y="644" type="curve" name="dh01" smooth="yes"/>
+      <point x="995" y="644" type="curve" smooth="yes" name="dh01"/>
       <point x="995" y="732"/>
       <point x="964" y="809"/>
       <point x="900" y="873" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2288.glif b/source/Hack-Regular.ufo/glyphs/uni2288.glif
index fc1b64139..c3e7a8fb8 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2288.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2288.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2288" format="1">
+<glyph name="uni2288" format="2">
   <advance width="1233"/>
   <unicode hex="2288"/>
   <outline>
@@ -12,10 +12,10 @@
       <point x="429" y="342" type="line"/>
       <point x="278" y="384"/>
       <point x="88" y="539"/>
-      <point x="88" y="797" type="curve" name="dh01" smooth="yes"/>
+      <point x="88" y="797" type="curve" smooth="yes" name="dh01"/>
       <point x="88" y="1069"/>
       <point x="298" y="1280"/>
-      <point x="565" y="1280" type="curve" name="sv02" smooth="yes"/>
+      <point x="565" y="1280" type="curve" smooth="yes" name="sv02"/>
       <point x="743" y="1280" type="line"/>
       <point x="814" y="1494" type="line" name="at01"/>
       <point x="972" y="1441" type="line"/>
@@ -38,7 +38,7 @@
       <point x="565" y="1130" type="line" smooth="yes"/>
       <point x="382" y="1130"/>
       <point x="238" y="986"/>
-      <point x="238" y="799" type="curve" name="dh02" smooth="yes"/>
+      <point x="238" y="799" type="curve" smooth="yes" name="dh02"/>
       <point x="238" y="623"/>
       <point x="366" y="518"/>
       <point x="476" y="486" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2289.glif b/source/Hack-Regular.ufo/glyphs/uni2289.glif
index ca9e74717..dce638de2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2289.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2289.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2289" format="1">
+<glyph name="uni2289" format="2">
   <advance width="1233"/>
   <unicode hex="2289"/>
   <outline>
@@ -16,10 +16,10 @@
       <point x="692" y="1129" type="line"/>
       <point x="684" y="1130"/>
       <point x="676" y="1130"/>
-      <point x="668" y="1130" type="curve" name="dv01" smooth="yes"/>
+      <point x="668" y="1130" type="curve" smooth="yes" name="dv01"/>
       <point x="88" y="1130" type="line"/>
       <point x="88" y="1280" type="line"/>
-      <point x="668" y="1280" type="line" name="dv02" smooth="yes"/>
+      <point x="668" y="1280" type="line" smooth="yes" name="dv02"/>
       <point x="693" y="1280"/>
       <point x="718" y="1278"/>
       <point x="741" y="1275" type="curve" name="sv02"/>
@@ -31,10 +31,10 @@
       <point x="1006" y="1141" type="curve" smooth="yes"/>
       <point x="1099" y="1046"/>
       <point x="1145" y="934"/>
-      <point x="1145" y="806" type="curve" name="dh02" smooth="yes"/>
+      <point x="1145" y="806" type="curve" smooth="yes" name="dh02"/>
       <point x="1145" y="534"/>
       <point x="935" y="324"/>
-      <point x="667" y="324" type="curve" name="sv03" smooth="yes"/>
+      <point x="667" y="324" type="curve" smooth="yes" name="sv03"/>
       <point x="599" y="324" type="line"/>
       <point x="547" y="170" type="line" name="sv04"/>
       <point x="1145" y="170" type="line" name="sh01"/>
@@ -43,10 +43,10 @@
       <point x="420" y="-212" type="line" name="av01"/>
     </contour>
     <contour>
-      <point x="668" y="474" type="line" name="sv05" smooth="yes"/>
+      <point x="668" y="474" type="line" smooth="yes" name="sv05"/>
       <point x="849" y="474"/>
       <point x="995" y="617"/>
-      <point x="995" y="804" type="curve" name="dh01" smooth="yes"/>
+      <point x="995" y="804" type="curve" smooth="yes" name="dh01"/>
       <point x="995" y="896"/>
       <point x="960" y="974"/>
       <point x="900" y="1034" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni228A_.glif b/source/Hack-Regular.ufo/glyphs/uni228A_.glif
index 41876053e..0d23c268f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni228A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni228A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni228A" format="1">
+<glyph name="uni228A" format="2">
   <advance width="1233"/>
   <unicode hex="228A"/>
   <outline>
@@ -10,10 +10,10 @@
       <point x="88" y="170" type="line" name="sv01"/>
       <point x="576" y="170" type="line"/>
       <point x="700" y="324" type="line"/>
-      <point x="566" y="324" type="line" name="dv03" smooth="yes"/>
+      <point x="566" y="324" type="line" smooth="yes" name="dv03"/>
       <point x="298" y="324"/>
       <point x="88" y="537"/>
-      <point x="88" y="802" type="curve" name="dh01" smooth="yes"/>
+      <point x="88" y="802" type="curve" smooth="yes" name="dh01"/>
       <point x="88" y="1066"/>
       <point x="298" y="1280"/>
       <point x="565" y="1280" type="curve" smooth="yes"/>
@@ -22,10 +22,10 @@
       <point x="565" y="1130" type="line" smooth="yes"/>
       <point x="382" y="1130"/>
       <point x="238" y="982"/>
-      <point x="238" y="802" type="curve" name="dh02" smooth="yes"/>
+      <point x="238" y="802" type="curve" smooth="yes" name="dh02"/>
       <point x="238" y="618"/>
       <point x="385" y="474"/>
-      <point x="565" y="474" type="curve" name="dv04" smooth="yes"/>
+      <point x="565" y="474" type="curve" smooth="yes" name="dv04"/>
       <point x="1145" y="474" type="line"/>
       <point x="1145" y="324" type="line" name="sv02"/>
       <point x="810" y="324" type="line"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni228B_.glif b/source/Hack-Regular.ufo/glyphs/uni228B_.glif
index a81f4a1f7..39b8591d4 100644
--- a/source/Hack-Regular.ufo/glyphs/uni228B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni228B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni228B" format="1">
+<glyph name="uni228B" format="2">
   <advance width="1233"/>
   <unicode hex="228B"/>
   <outline>
@@ -12,22 +12,22 @@
       <point x="700" y="325" type="line" name="iv01"/>
       <point x="689" y="324"/>
       <point x="678" y="324"/>
-      <point x="667" y="324" type="curve" name="dv03" smooth="yes"/>
+      <point x="667" y="324" type="curve" smooth="yes" name="dv03"/>
       <point x="88" y="324" type="line"/>
       <point x="88" y="474" type="line"/>
-      <point x="668" y="474" type="line" name="dv04" smooth="yes"/>
+      <point x="668" y="474" type="line" smooth="yes" name="dv04"/>
       <point x="848" y="474"/>
       <point x="995" y="618"/>
-      <point x="995" y="802" type="curve" name="dh01" smooth="yes"/>
+      <point x="995" y="802" type="curve" smooth="yes" name="dh01"/>
       <point x="995" y="982"/>
       <point x="851" y="1130"/>
-      <point x="668" y="1130" type="curve" name="dv01" smooth="yes"/>
+      <point x="668" y="1130" type="curve" smooth="yes" name="dv01"/>
       <point x="88" y="1130" type="line"/>
       <point x="88" y="1280" type="line"/>
-      <point x="668" y="1280" type="line" name="dv02" smooth="yes"/>
+      <point x="668" y="1280" type="line" smooth="yes" name="dv02"/>
       <point x="935" y="1280"/>
       <point x="1145" y="1067"/>
-      <point x="1145" y="798" type="curve" name="dh02" smooth="yes"/>
+      <point x="1145" y="798" type="curve" smooth="yes" name="dh02"/>
       <point x="1145" y="538"/>
       <point x="950" y="376"/>
       <point x="791" y="339" type="curve" name="iv02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni228D_.glif b/source/Hack-Regular.ufo/glyphs/uni228D_.glif
index 2adae4c02..2b971af65 100644
--- a/source/Hack-Regular.ufo/glyphs/uni228D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni228D_.glif
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni228D" format="1">
+<glyph name="uni228D" format="2">
   <advance width="1233"/>
   <unicode hex="228D"/>
   <outline>
     <contour>
-      <point x="617" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="269" y="-29"/>
       <point x="131" y="100"/>
-      <point x="131" y="495" type="curve" name="dh01" smooth="yes"/>
+      <point x="131" y="495" type="curve" smooth="yes" name="dh01"/>
       <point x="131" y="1284" type="line" name="av01"/>
       <point x="303" y="1284" type="line"/>
-      <point x="303" y="540" type="line" name="dh02" smooth="yes"/>
+      <point x="303" y="540" type="line" smooth="yes" name="dh02"/>
       <point x="303" y="215"/>
       <point x="396" y="135"/>
-      <point x="617" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="837" y="135"/>
       <point x="930" y="215"/>
-      <point x="930" y="540" type="curve" name="dh05" smooth="yes"/>
+      <point x="930" y="540" type="curve" smooth="yes" name="dh05"/>
       <point x="930" y="1284" type="line" name="av02"/>
       <point x="1102" y="1284" type="line"/>
-      <point x="1102" y="495" type="line" name="dh06" smooth="yes"/>
+      <point x="1102" y="495" type="line" smooth="yes" name="dh06"/>
       <point x="1102" y="100"/>
       <point x="964" y="-29"/>
     </contour>
     <contour>
-      <point x="539" y="446" type="line" name="dv02" smooth="yes"/>
+      <point x="539" y="446" type="line" smooth="yes" name="dv02"/>
       <point x="519" y="446"/>
       <point x="509" y="456"/>
-      <point x="509" y="476" type="curve" name="dh03" smooth="yes"/>
+      <point x="509" y="476" type="curve" smooth="yes" name="dh03"/>
       <point x="509" y="642" type="line" smooth="yes"/>
       <point x="509" y="662"/>
       <point x="519" y="672"/>
-      <point x="539" y="672" type="curve" name="dv03" smooth="yes"/>
+      <point x="539" y="672" type="curve" smooth="yes" name="dv03"/>
       <point x="691" y="672" type="line" smooth="yes"/>
       <point x="711" y="672"/>
       <point x="721" y="662"/>
       <point x="721" y="642" type="curve" smooth="yes"/>
-      <point x="721" y="476" type="line" name="dh04" smooth="yes"/>
+      <point x="721" y="476" type="line" smooth="yes" name="dh04"/>
       <point x="721" y="456"/>
       <point x="711" y="446"/>
       <point x="691" y="446" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni228E_.glif b/source/Hack-Regular.ufo/glyphs/uni228E_.glif
index bd4de025b..d476a5790 100644
--- a/source/Hack-Regular.ufo/glyphs/uni228E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni228E_.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni228E" format="1">
+<glyph name="uni228E" format="2">
   <advance width="1233"/>
   <unicode hex="228E"/>
   <outline>
     <contour>
-      <point x="617" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="269" y="-29"/>
       <point x="131" y="100"/>
-      <point x="131" y="495" type="curve" name="sh01" smooth="yes"/>
+      <point x="131" y="495" type="curve" smooth="yes" name="sh01"/>
       <point x="131" y="1284" type="line" name="av01"/>
       <point x="303" y="1284" type="line"/>
-      <point x="303" y="540" type="line" name="sh02" smooth="yes"/>
+      <point x="303" y="540" type="line" smooth="yes" name="sh02"/>
       <point x="303" y="215"/>
       <point x="396" y="135"/>
-      <point x="617" y="135" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="135" type="curve" smooth="yes" name="dv01"/>
       <point x="837" y="135"/>
       <point x="930" y="215"/>
-      <point x="930" y="540" type="curve" name="sh04" smooth="yes"/>
+      <point x="930" y="540" type="curve" smooth="yes" name="sh04"/>
       <point x="930" y="1284" type="line" name="av02"/>
       <point x="1102" y="1284" type="line"/>
-      <point x="1102" y="495" type="line" name="sh05" smooth="yes"/>
+      <point x="1102" y="495" type="line" smooth="yes" name="sh05"/>
       <point x="1102" y="100"/>
       <point x="964" y="-29"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni228F_.glif b/source/Hack-Regular.ufo/glyphs/uni228F_.glif
index 4f92fb4b1..f7497da43 100644
--- a/source/Hack-Regular.ufo/glyphs/uni228F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni228F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni228F" format="1">
+<glyph name="uni228F" format="2">
   <advance width="1233"/>
   <unicode hex="228F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2290.glif b/source/Hack-Regular.ufo/glyphs/uni2290.glif
index 33bedbbc1..d74b6e4bc 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2290.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2290.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2290" format="1">
+<glyph name="uni2290" format="2">
   <advance width="1233"/>
   <unicode hex="2290"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2291.glif b/source/Hack-Regular.ufo/glyphs/uni2291.glif
index d502f1b74..12401ec8c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2291.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2291.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2291" format="1">
+<glyph name="uni2291" format="2">
   <advance width="1233"/>
   <unicode hex="2291"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2292.glif b/source/Hack-Regular.ufo/glyphs/uni2292.glif
index 052f0010d..aedb6a7a2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2292.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2292.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2292" format="1">
+<glyph name="uni2292" format="2">
   <advance width="1233"/>
   <unicode hex="2292"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2293.glif b/source/Hack-Regular.ufo/glyphs/uni2293.glif
index b6c42bb21..ae2e1cfc9 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2293.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2293.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2293" format="1">
+<glyph name="uni2293" format="2">
   <advance width="1233"/>
   <unicode hex="2293"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2294.glif b/source/Hack-Regular.ufo/glyphs/uni2294.glif
index 9fde1ef65..ea5f786cf 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2294.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2294.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2294" format="1">
+<glyph name="uni2294" format="2">
   <advance width="1233"/>
   <unicode hex="2294"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2296.glif b/source/Hack-Regular.ufo/glyphs/uni2296.glif
index 58419b04f..1bafeb6dd 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2296.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2296.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2296" format="1">
+<glyph name="uni2296" format="2">
   <advance width="1233"/>
   <unicode hex="2296"/>
   <outline>
     <contour>
-      <point x="617" y="106" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="106" type="curve" smooth="yes" name="hr00"/>
       <point x="465" y="106"/>
       <point x="331" y="168"/>
       <point x="236" y="263" type="curve" smooth="yes"/>
       <point x="132" y="367"/>
       <point x="80" y="503"/>
-      <point x="80" y="644" type="curve" name="sh01" smooth="yes"/>
+      <point x="80" y="644" type="curve" smooth="yes" name="sh01"/>
       <point x="80" y="785"/>
       <point x="132" y="919"/>
       <point x="236" y="1023" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="412" y="1142" type="curve" smooth="yes"/>
       <point x="479" y="1170"/>
       <point x="544" y="1182"/>
-      <point x="613" y="1182" type="curve" name="dv03" smooth="yes"/>
+      <point x="613" y="1182" type="curve" smooth="yes" name="dv03"/>
       <point x="770" y="1182"/>
       <point x="901" y="1120"/>
       <point x="997" y="1024" type="curve" smooth="yes"/>
       <point x="1101" y="920"/>
       <point x="1153" y="786"/>
-      <point x="1153" y="643" type="curve" name="sh02" smooth="yes"/>
+      <point x="1153" y="643" type="curve" smooth="yes" name="sh02"/>
       <point x="1153" y="504"/>
       <point x="1102" y="368"/>
       <point x="997" y="263" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="770" y="106"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="533"/>
-      <point x="1012" y="646" type="curve" name="ah01" smooth="yes"/>
+      <point x="1012" y="646" type="curve" smooth="yes" name="ah01"/>
       <point x="1012" y="747"/>
       <point x="977" y="844"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="412" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2298.glif b/source/Hack-Regular.ufo/glyphs/uni2298.glif
index b7aaf80a3..2e20e41ab 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2298.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2298.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2298" format="1">
+<glyph name="uni2298" format="2">
   <advance width="1233"/>
   <unicode hex="2298"/>
   <outline>
     <contour>
-      <point x="617" y="106" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="106" type="curve" smooth="yes" name="hr00"/>
       <point x="465" y="106"/>
       <point x="331" y="168"/>
       <point x="236" y="263" type="curve" smooth="yes"/>
       <point x="132" y="367"/>
       <point x="80" y="503"/>
-      <point x="80" y="644" type="curve" name="sh01" smooth="yes"/>
+      <point x="80" y="644" type="curve" smooth="yes" name="sh01"/>
       <point x="80" y="785"/>
       <point x="132" y="919"/>
       <point x="236" y="1023" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="412" y="1142" type="curve" smooth="yes"/>
       <point x="479" y="1170"/>
       <point x="544" y="1182"/>
-      <point x="613" y="1182" type="curve" name="dv03" smooth="yes"/>
+      <point x="613" y="1182" type="curve" smooth="yes" name="dv03"/>
       <point x="770" y="1182"/>
       <point x="901" y="1120"/>
       <point x="997" y="1024" type="curve" smooth="yes"/>
       <point x="1101" y="920"/>
       <point x="1153" y="786"/>
-      <point x="1153" y="643" type="curve" name="sh02" smooth="yes"/>
+      <point x="1153" y="643" type="curve" smooth="yes" name="sh02"/>
       <point x="1153" y="504"/>
       <point x="1102" y="368"/>
       <point x="997" y="263" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="770" y="106"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="533"/>
-      <point x="1012" y="646" type="curve" name="ah01" smooth="yes"/>
+      <point x="1012" y="646" type="curve" smooth="yes" name="ah01"/>
       <point x="1012" y="747"/>
       <point x="977" y="844"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="412" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2299.glif b/source/Hack-Regular.ufo/glyphs/uni2299.glif
index 4c104c798..e01218e8c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2299.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2299.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2299" format="1">
+<glyph name="uni2299" format="2">
   <advance width="1233"/>
   <unicode hex="2299"/>
   <outline>
     <contour>
-      <point x="617" y="106" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="106" type="curve" smooth="yes" name="hr00"/>
       <point x="465" y="106"/>
       <point x="331" y="168"/>
       <point x="236" y="263" type="curve" smooth="yes"/>
       <point x="132" y="367"/>
       <point x="80" y="503"/>
-      <point x="80" y="644" type="curve" name="dh01" smooth="yes"/>
+      <point x="80" y="644" type="curve" smooth="yes" name="dh01"/>
       <point x="80" y="785"/>
       <point x="132" y="919"/>
       <point x="236" y="1023" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="412" y="1142" type="curve" smooth="yes"/>
       <point x="479" y="1170"/>
       <point x="544" y="1182"/>
-      <point x="613" y="1182" type="curve" name="dv03" smooth="yes"/>
+      <point x="613" y="1182" type="curve" smooth="yes" name="dv03"/>
       <point x="770" y="1182"/>
       <point x="901" y="1120"/>
       <point x="997" y="1024" type="curve" smooth="yes"/>
       <point x="1101" y="920"/>
       <point x="1153" y="786"/>
-      <point x="1153" y="643" type="curve" name="dh06" smooth="yes"/>
+      <point x="1153" y="643" type="curve" smooth="yes" name="dh06"/>
       <point x="1153" y="504"/>
       <point x="1102" y="368"/>
       <point x="997" y="263" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="770" y="106"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="533"/>
-      <point x="1012" y="646" type="curve" name="dh05" smooth="yes"/>
+      <point x="1012" y="646" type="curve" smooth="yes" name="dh05"/>
       <point x="1012" y="747"/>
       <point x="977" y="844"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="412" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="dh02" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="dh02"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni229A_.glif b/source/Hack-Regular.ufo/glyphs/uni229A_.glif
index c6784f846..62c363c79 100644
--- a/source/Hack-Regular.ufo/glyphs/uni229A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni229A_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni229A" format="1">
+<glyph name="uni229A" format="2">
   <advance width="1233"/>
   <unicode hex="229A"/>
   <outline>
     <contour>
-      <point x="617" y="106" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="106" type="curve" smooth="yes" name="hr00"/>
       <point x="465" y="106"/>
       <point x="331" y="168"/>
       <point x="236" y="263" type="curve" smooth="yes"/>
       <point x="132" y="367"/>
       <point x="80" y="503"/>
-      <point x="80" y="644" type="curve" name="dh01" smooth="yes"/>
+      <point x="80" y="644" type="curve" smooth="yes" name="dh01"/>
       <point x="80" y="785"/>
       <point x="132" y="919"/>
       <point x="236" y="1023" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="412" y="1142" type="curve" smooth="yes"/>
       <point x="479" y="1170"/>
       <point x="544" y="1182"/>
-      <point x="613" y="1182" type="curve" name="dv03" smooth="yes"/>
+      <point x="613" y="1182" type="curve" smooth="yes" name="dv03"/>
       <point x="770" y="1182"/>
       <point x="901" y="1120"/>
       <point x="997" y="1024" type="curve" smooth="yes"/>
       <point x="1101" y="920"/>
       <point x="1153" y="786"/>
-      <point x="1153" y="643" type="curve" name="dh08" smooth="yes"/>
+      <point x="1153" y="643" type="curve" smooth="yes" name="dh08"/>
       <point x="1153" y="504"/>
       <point x="1102" y="368"/>
       <point x="997" y="263" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="770" y="106"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="533"/>
-      <point x="1012" y="646" type="curve" name="dh07" smooth="yes"/>
+      <point x="1012" y="646" type="curve" smooth="yes" name="dh07"/>
       <point x="1012" y="747"/>
       <point x="977" y="844"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="412" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="dh02" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="dh02"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
@@ -62,36 +62,36 @@
       <point x="509" y="246"/>
     </contour>
     <contour>
-      <point x="614" y="378" type="curve" name="dv04" smooth="yes"/>
+      <point x="614" y="378" type="curve" smooth="yes" name="dv04"/>
       <point x="463" y="378"/>
       <point x="350" y="492"/>
-      <point x="350" y="641" type="curve" name="dh03" smooth="yes"/>
+      <point x="350" y="641" type="curve" smooth="yes" name="dh03"/>
       <point x="350" y="793"/>
       <point x="467" y="911"/>
-      <point x="616" y="911" type="curve" name="dv07" smooth="yes"/>
+      <point x="616" y="911" type="curve" smooth="yes" name="dv07"/>
       <point x="689" y="911"/>
       <point x="757" y="883"/>
       <point x="806" y="831" type="curve"/>
       <point x="857" y="782"/>
       <point x="883" y="717"/>
-      <point x="883" y="645" type="curve" name="dh06" smooth="yes"/>
+      <point x="883" y="645" type="curve" smooth="yes" name="dh06"/>
       <point x="883" y="493"/>
       <point x="765" y="378"/>
     </contour>
     <contour>
-      <point x="615" y="511" type="curve" name="dv05" smooth="yes"/>
+      <point x="615" y="511" type="curve" smooth="yes" name="dv05"/>
       <point x="690" y="511"/>
       <point x="750" y="568"/>
-      <point x="750" y="644" type="curve" name="dh05" smooth="yes"/>
+      <point x="750" y="644" type="curve" smooth="yes" name="dh05"/>
       <point x="750" y="680"/>
       <point x="737" y="711"/>
       <point x="711" y="737" type="curve" smooth="yes"/>
       <point x="687" y="761"/>
       <point x="655" y="776"/>
-      <point x="616" y="776" type="curve" name="dv06" smooth="yes"/>
+      <point x="616" y="776" type="curve" smooth="yes" name="dv06"/>
       <point x="542" y="776"/>
       <point x="483" y="717"/>
-      <point x="483" y="642" type="curve" name="dh04" smooth="yes"/>
+      <point x="483" y="642" type="curve" smooth="yes" name="dh04"/>
       <point x="483" y="567"/>
       <point x="540" y="511"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni229B_.glif b/source/Hack-Regular.ufo/glyphs/uni229B_.glif
index 5efc4b8f5..f7d8ab6b5 100644
--- a/source/Hack-Regular.ufo/glyphs/uni229B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni229B_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni229B" format="1">
+<glyph name="uni229B" format="2">
   <advance width="1233"/>
   <unicode hex="229B"/>
   <outline>
     <contour>
-      <point x="617" y="106" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="106" type="curve" smooth="yes" name="hr00"/>
       <point x="465" y="106"/>
       <point x="331" y="168"/>
       <point x="236" y="263" type="curve" smooth="yes"/>
       <point x="132" y="367"/>
       <point x="80" y="503"/>
-      <point x="80" y="644" type="curve" name="sh01" smooth="yes"/>
+      <point x="80" y="644" type="curve" smooth="yes" name="sh01"/>
       <point x="80" y="785"/>
       <point x="132" y="919"/>
       <point x="236" y="1023" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="412" y="1142" type="curve" smooth="yes"/>
       <point x="479" y="1170"/>
       <point x="544" y="1182"/>
-      <point x="613" y="1182" type="curve" name="av01" smooth="yes"/>
+      <point x="613" y="1182" type="curve" smooth="yes" name="av01"/>
       <point x="770" y="1182"/>
       <point x="901" y="1120"/>
       <point x="997" y="1024" type="curve" smooth="yes"/>
       <point x="1101" y="920"/>
       <point x="1153" y="786"/>
-      <point x="1153" y="643" type="curve" name="sh04" smooth="yes"/>
+      <point x="1153" y="643" type="curve" smooth="yes" name="sh04"/>
       <point x="1153" y="504"/>
       <point x="1102" y="368"/>
       <point x="997" y="263" type="curve" smooth="yes"/>
@@ -57,7 +57,7 @@
       <point x="248" y="792" type="line"/>
       <point x="230" y="746"/>
       <point x="221" y="696"/>
-      <point x="221" y="642" type="curve" name="sh06" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="sh06"/>
       <point x="221" y="588"/>
       <point x="230" y="538"/>
       <point x="249" y="492" type="curve"/>
@@ -66,7 +66,7 @@
       <point x="984" y="492" type="line"/>
       <point x="1003" y="538"/>
       <point x="1012" y="588"/>
-      <point x="1012" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="1012" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="1012" y="696"/>
       <point x="1003" y="746"/>
       <point x="985" y="792" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni229C_.glif b/source/Hack-Regular.ufo/glyphs/uni229C_.glif
index 1755c2d88..f3f75b0e2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni229C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni229C_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni229C" format="1">
+<glyph name="uni229C" format="2">
   <advance width="1233"/>
   <unicode hex="229C"/>
   <outline>
     <contour>
-      <point x="617" y="106" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="106" type="curve" smooth="yes" name="hr00"/>
       <point x="465" y="106"/>
       <point x="331" y="168"/>
       <point x="236" y="263" type="curve" smooth="yes"/>
       <point x="132" y="367"/>
       <point x="80" y="503"/>
-      <point x="80" y="644" type="curve" name="sh01" smooth="yes"/>
+      <point x="80" y="644" type="curve" smooth="yes" name="sh01"/>
       <point x="80" y="785"/>
       <point x="132" y="919"/>
       <point x="236" y="1023" type="curve" smooth="yes"/>
@@ -19,13 +19,13 @@
       <point x="412" y="1142" type="curve" smooth="yes"/>
       <point x="479" y="1170"/>
       <point x="544" y="1182"/>
-      <point x="613" y="1182" type="curve" name="dv03" smooth="yes"/>
+      <point x="613" y="1182" type="curve" smooth="yes" name="dv03"/>
       <point x="770" y="1182"/>
       <point x="901" y="1120"/>
       <point x="997" y="1024" type="curve" smooth="yes"/>
       <point x="1101" y="920"/>
       <point x="1153" y="786"/>
-      <point x="1153" y="643" type="curve" name="sh02" smooth="yes"/>
+      <point x="1153" y="643" type="curve" smooth="yes" name="sh02"/>
       <point x="1153" y="504"/>
       <point x="1102" y="368"/>
       <point x="997" y="263" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="770" y="106"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="533"/>
-      <point x="1012" y="646" type="curve" name="ah01" smooth="yes"/>
+      <point x="1012" y="646" type="curve" smooth="yes" name="ah01"/>
       <point x="1012" y="747"/>
       <point x="977" y="844"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="412" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni229D_.glif b/source/Hack-Regular.ufo/glyphs/uni229D_.glif
index 04d110918..5a6401b55 100644
--- a/source/Hack-Regular.ufo/glyphs/uni229D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni229D_.glif
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni229D" format="1">
+<glyph name="uni229D" format="2">
   <advance width="1233"/>
   <unicode hex="229D"/>
   <outline>
     <contour>
-      <point x="617" y="106" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="106" type="curve" smooth="yes" name="hr00"/>
       <point x="465" y="106"/>
       <point x="331" y="168"/>
       <point x="236" y="263" type="curve" smooth="yes"/>
       <point x="132" y="367"/>
       <point x="80" y="503"/>
-      <point x="80" y="644" type="curve" name="sh01" smooth="yes"/>
+      <point x="80" y="644" type="curve" smooth="yes" name="sh01"/>
       <point x="80" y="785"/>
       <point x="132" y="919"/>
       <point x="236" y="1023" type="curve" smooth="yes"/>
       <point x="287" y="1074"/>
       <point x="348" y="1115"/>
-      <point x="412" y="1142" type="curve" name="sh03" smooth="yes"/>
+      <point x="412" y="1142" type="curve" smooth="yes" name="sh03"/>
       <point x="479" y="1170"/>
       <point x="544" y="1182"/>
-      <point x="613" y="1182" type="curve" name="dv03" smooth="yes"/>
+      <point x="613" y="1182" type="curve" smooth="yes" name="dv03"/>
       <point x="770" y="1182"/>
       <point x="901" y="1120"/>
       <point x="997" y="1024" type="curve" smooth="yes"/>
       <point x="1101" y="920"/>
       <point x="1153" y="786"/>
-      <point x="1153" y="643" type="curve" name="sh05" smooth="yes"/>
+      <point x="1153" y="643" type="curve" smooth="yes" name="sh05"/>
       <point x="1153" y="504"/>
       <point x="1102" y="368"/>
       <point x="997" y="263" type="curve" smooth="yes"/>
@@ -33,13 +33,13 @@
       <point x="770" y="106"/>
     </contour>
     <contour>
-      <point x="616" y="246" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="246" type="curve" smooth="yes" name="dv01"/>
       <point x="721" y="246"/>
       <point x="822" y="289"/>
       <point x="897" y="362" type="curve" smooth="yes"/>
       <point x="969" y="434"/>
       <point x="1012" y="533"/>
-      <point x="1012" y="646" type="curve" name="sh04" smooth="yes"/>
+      <point x="1012" y="646" type="curve" smooth="yes" name="sh04"/>
       <point x="1012" y="747"/>
       <point x="977" y="844"/>
       <point x="896" y="924" type="curve" smooth="yes"/>
@@ -48,13 +48,13 @@
       <point x="768" y="1011" type="curve" smooth="yes"/>
       <point x="721" y="1031"/>
       <point x="671" y="1041"/>
-      <point x="619" y="1041" type="curve" name="dv02" smooth="yes"/>
+      <point x="619" y="1041" type="curve" smooth="yes" name="dv02"/>
       <point x="515" y="1041"/>
       <point x="412" y="1001"/>
       <point x="336" y="925" type="curve" smooth="yes"/>
       <point x="259" y="848"/>
       <point x="221" y="746"/>
-      <point x="221" y="642" type="curve" name="sh06" smooth="yes"/>
+      <point x="221" y="642" type="curve" smooth="yes" name="sh06"/>
       <point x="221" y="530"/>
       <point x="264" y="434"/>
       <point x="337" y="362" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni229E_.glif b/source/Hack-Regular.ufo/glyphs/uni229E_.glif
index 789907223..1e67e6c85 100644
--- a/source/Hack-Regular.ufo/glyphs/uni229E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni229E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni229E" format="1">
+<glyph name="uni229E" format="2">
   <advance width="1233"/>
   <unicode hex="229E"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni229F_.glif b/source/Hack-Regular.ufo/glyphs/uni229F_.glif
index 37baa426c..3e11b4e61 100644
--- a/source/Hack-Regular.ufo/glyphs/uni229F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni229F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni229F" format="1">
+<glyph name="uni229F" format="2">
   <advance width="1233"/>
   <unicode hex="229F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22A_0.glif b/source/Hack-Regular.ufo/glyphs/uni22A_0.glif
index 091c78727..d9d5b6ff9 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22A_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22A0" format="1">
+<glyph name="uni22A0" format="2">
   <advance width="1233"/>
   <unicode hex="22A0"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22A_1.glif b/source/Hack-Regular.ufo/glyphs/uni22A_1.glif
index 92956634d..bb6fb70d5 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22A_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22A_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22A1" format="1">
+<glyph name="uni22A1" format="2">
   <advance width="1233"/>
   <unicode hex="22A1"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22A_2.glif b/source/Hack-Regular.ufo/glyphs/uni22A_2.glif
index ff6f4772f..9e38ff04f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22A_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22A_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22A2" format="1">
+<glyph name="uni22A2" format="2">
   <advance width="1233"/>
   <unicode hex="22A2"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22A_3.glif b/source/Hack-Regular.ufo/glyphs/uni22A_3.glif
index f1ea1eb18..b942c2d55 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22A_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22A_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22A3" format="1">
+<glyph name="uni22A3" format="2">
   <advance width="1233"/>
   <unicode hex="22A3"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22A_4.glif b/source/Hack-Regular.ufo/glyphs/uni22A_4.glif
index 3976b0e9e..1974a9b0f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22A_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22A4" format="1">
+<glyph name="uni22A4" format="2">
   <advance width="1233"/>
   <unicode hex="22A4"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22B_2.glif b/source/Hack-Regular.ufo/glyphs/uni22B_2.glif
index aaa260d91..65e8332e5 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22B_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22B_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22B2" format="1">
+<glyph name="uni22B2" format="2">
   <advance width="1233"/>
   <unicode hex="22B2"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22B_3.glif b/source/Hack-Regular.ufo/glyphs/uni22B_3.glif
index 9babd93a9..61ae187df 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22B_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22B3" format="1">
+<glyph name="uni22B3" format="2">
   <advance width="1233"/>
   <unicode hex="22B3"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22B_4.glif b/source/Hack-Regular.ufo/glyphs/uni22B_4.glif
index 8444e673c..d0dab1a7d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22B_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22B_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22B4" format="1">
+<glyph name="uni22B4" format="2">
   <advance width="1233"/>
   <unicode hex="22B4"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22B_5.glif b/source/Hack-Regular.ufo/glyphs/uni22B_5.glif
index ca58abee0..362016c4a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22B_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22B_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22B5" format="1">
+<glyph name="uni22B5" format="2">
   <advance width="1233"/>
   <unicode hex="22B5"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22B_8.glif b/source/Hack-Regular.ufo/glyphs/uni22B_8.glif
index 80abd6c8c..3d6b3a27d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22B_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22B_8.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22B8" format="1">
+<glyph name="uni22B8" format="2">
   <advance width="1233"/>
   <unicode hex="22B8"/>
   <outline>
     <contour>
-      <point x="920" y="359" type="curve" name="hr00" smooth="yes"/>
+      <point x="920" y="359" type="curve" smooth="yes" name="hr00"/>
       <point x="759" y="359"/>
       <point x="671" y="474"/>
       <point x="647" y="558" type="curve" name="dv04"/>
@@ -13,21 +13,21 @@
       <point x="646" y="726" type="line" name="dv05"/>
       <point x="670" y="818"/>
       <point x="770" y="930"/>
-      <point x="920" y="930" type="curve" name="dv03" smooth="yes"/>
+      <point x="920" y="930" type="curve" smooth="yes" name="dv03"/>
       <point x="1081" y="930"/>
       <point x="1205" y="803"/>
-      <point x="1205" y="641" type="curve" name="dh02" smooth="yes"/>
+      <point x="1205" y="641" type="curve" smooth="yes" name="dh02"/>
       <point x="1205" y="481"/>
       <point x="1084" y="359"/>
     </contour>
     <contour>
-      <point x="920" y="507" type="curve" name="dv01" smooth="yes"/>
+      <point x="920" y="507" type="curve" smooth="yes" name="dv01"/>
       <point x="997" y="507"/>
       <point x="1057" y="567"/>
-      <point x="1057" y="643" type="curve" name="dh01" smooth="yes"/>
+      <point x="1057" y="643" type="curve" smooth="yes" name="dh01"/>
       <point x="1057" y="719"/>
       <point x="997" y="780"/>
-      <point x="921" y="780" type="curve" name="dv02" smooth="yes"/>
+      <point x="921" y="780" type="curve" smooth="yes" name="dv02"/>
       <point x="844" y="780"/>
       <point x="783" y="718"/>
       <point x="783" y="642" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22C_2.glif b/source/Hack-Regular.ufo/glyphs/uni22C_2.glif
index 27b252f75..7fa8538c0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22C_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22C_2.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22C2" format="1">
+<glyph name="uni22C2" format="2">
   <advance width="1233"/>
   <unicode hex="22C2"/>
   <outline>
     <contour>
-      <point x="131" y="1023" type="line" name="hr00" smooth="yes"/>
+      <point x="131" y="1023" type="line" smooth="yes" name="hr00"/>
       <point x="131" y="1418"/>
       <point x="269" y="1547"/>
-      <point x="616" y="1547" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1547" type="curve" smooth="yes" name="dv02"/>
       <point x="964" y="1547"/>
       <point x="1102" y="1418"/>
       <point x="1102" y="1023" type="curve" smooth="yes"/>
@@ -16,10 +16,10 @@
       <point x="930" y="978" type="line" smooth="yes"/>
       <point x="930" y="1303"/>
       <point x="837" y="1383"/>
-      <point x="616" y="1383" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1383" type="curve" smooth="yes" name="dv01"/>
       <point x="396" y="1383"/>
       <point x="303" y="1303"/>
-      <point x="303" y="978" type="curve" name="sh02" smooth="yes"/>
+      <point x="303" y="978" type="curve" smooth="yes" name="sh02"/>
       <point x="303" y="-436" type="line" name="av01"/>
       <point x="131" y="-436" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22C_3.glif b/source/Hack-Regular.ufo/glyphs/uni22C_3.glif
index 33b8b1523..4054e4cc1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22C_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22C_3.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22C3" format="1">
+<glyph name="uni22C3" format="2">
   <advance width="1233"/>
   <unicode hex="22C3"/>
   <outline>
     <contour>
-      <point x="617" y="-465" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-465" type="curve" smooth="yes" name="hr00"/>
       <point x="269" y="-465"/>
       <point x="131" y="-336"/>
-      <point x="131" y="59" type="curve" name="sh01" smooth="yes"/>
+      <point x="131" y="59" type="curve" smooth="yes" name="sh01"/>
       <point x="131" y="1518" type="line" name="at01"/>
       <point x="303" y="1518" type="line"/>
-      <point x="303" y="104" type="line" name="sh02" smooth="yes"/>
+      <point x="303" y="104" type="line" smooth="yes" name="sh02"/>
       <point x="303" y="-221"/>
       <point x="396" y="-301"/>
-      <point x="617" y="-301" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="-301" type="curve" smooth="yes" name="dv01"/>
       <point x="837" y="-301"/>
       <point x="930" y="-221"/>
-      <point x="930" y="104" type="curve" name="ah01" smooth="yes"/>
+      <point x="930" y="104" type="curve" smooth="yes" name="ah01"/>
       <point x="930" y="1518" type="line" name="at02"/>
       <point x="1102" y="1518" type="line"/>
-      <point x="1102" y="59" type="line" name="sh03" smooth="yes"/>
+      <point x="1102" y="59" type="line" smooth="yes" name="sh03"/>
       <point x="1102" y="-336"/>
       <point x="964" y="-465"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22C_4.glif b/source/Hack-Regular.ufo/glyphs/uni22C_4.glif
index 2c2cab31a..29294d33f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22C_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22C_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22C4" format="1">
+<glyph name="uni22C4" format="2">
   <advance width="1233"/>
   <unicode hex="22C4"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22C_6.glif b/source/Hack-Regular.ufo/glyphs/uni22C_6.glif
index 1d9dbbeb1..92117d79e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22C_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22C_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22C6" format="1">
+<glyph name="uni22C6" format="2">
   <advance width="1233"/>
   <unicode hex="22C6"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22C_D_.glif b/source/Hack-Regular.ufo/glyphs/uni22C_D_.glif
index 6f579cd84..84ee152b9 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22C_D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22C_D_.glif
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22CD" format="1">
+<glyph name="uni22CD" format="2">
   <advance width="1233"/>
   <unicode hex="22CD"/>
   <outline>
     <contour>
-      <point x="381" y="674" type="curve" name="dv03" smooth="yes"/>
+      <point x="381" y="674" type="curve" smooth="yes" name="dv03"/>
       <point x="281" y="674"/>
       <point x="188" y="708"/>
       <point x="88" y="788" type="curve"/>
       <point x="88" y="963" type="line"/>
       <point x="188" y="879"/>
       <point x="276" y="840"/>
-      <point x="368" y="840" type="curve" name="dv04" smooth="yes"/>
+      <point x="368" y="840" type="curve" smooth="yes" name="dv04"/>
       <point x="431" y="840"/>
       <point x="501" y="858"/>
       <point x="578" y="894" type="curve" smooth="yes"/>
       <point x="610" y="909" type="line" smooth="yes"/>
       <point x="701" y="952"/>
       <point x="776" y="963"/>
-      <point x="840" y="963" type="curve" name="dv02" smooth="yes"/>
+      <point x="840" y="963" type="curve" smooth="yes" name="dv02"/>
       <point x="948" y="963"/>
       <point x="1041" y="928"/>
       <point x="1145" y="848" type="curve" name="hr01"/>
       <point x="1145" y="674" type="line" name="hr02"/>
       <point x="1044" y="762"/>
       <point x="956" y="797"/>
-      <point x="848" y="797" type="curve" name="dv01" smooth="yes"/>
+      <point x="848" y="797" type="curve" smooth="yes" name="dv01"/>
       <point x="765" y="797"/>
       <point x="711" y="776"/>
       <point x="621" y="739" type="curve" name="hr03"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22C_E_.glif b/source/Hack-Regular.ufo/glyphs/uni22C_E_.glif
index d0e793f63..150b7bba6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22C_E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22C_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22CE" format="1">
+<glyph name="uni22CE" format="2">
   <advance width="1233"/>
   <unicode hex="22CE"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22C_F_.glif b/source/Hack-Regular.ufo/glyphs/uni22C_F_.glif
index 982defd88..d74dfb67e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22C_F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22C_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22CF" format="1">
+<glyph name="uni22CF" format="2">
   <advance width="1233"/>
   <unicode hex="22CF"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22D_0.glif b/source/Hack-Regular.ufo/glyphs/uni22D_0.glif
index f176dc061..f4f66a140 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22D_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22D_0.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22D0" format="1">
+<glyph name="uni22D0" format="2">
   <advance width="1233"/>
   <unicode hex="22D0"/>
   <outline>
     <contour>
-      <point x="738" y="-6" type="line" name="hr00" smooth="yes"/>
+      <point x="738" y="-6" type="line" smooth="yes" name="hr00"/>
       <point x="378" y="-6"/>
       <point x="90" y="282"/>
-      <point x="90" y="642" type="curve" name="sh01" smooth="yes"/>
+      <point x="90" y="642" type="curve" smooth="yes" name="sh01"/>
       <point x="90" y="1000"/>
       <point x="375" y="1290"/>
       <point x="736" y="1290" type="curve" smooth="yes"/>
@@ -16,18 +16,18 @@
       <point x="737" y="1120" type="line" smooth="yes"/>
       <point x="470" y="1120"/>
       <point x="260" y="907"/>
-      <point x="260" y="642" type="curve" name="sh02" smooth="yes"/>
+      <point x="260" y="642" type="curve" smooth="yes" name="sh02"/>
       <point x="260" y="376"/>
       <point x="470" y="164"/>
-      <point x="738" y="164" type="curve" name="sv01" smooth="yes"/>
+      <point x="738" y="164" type="curve" smooth="yes" name="sv01"/>
       <point x="1143" y="164" type="line"/>
       <point x="1143" y="-6" type="line"/>
     </contour>
     <contour>
-      <point x="737" y="334" type="line" name="dv03" smooth="yes"/>
+      <point x="737" y="334" type="line" smooth="yes" name="dv03"/>
       <point x="566" y="334"/>
       <point x="430" y="470"/>
-      <point x="430" y="642" type="curve" name="ah01" smooth="yes"/>
+      <point x="430" y="642" type="curve" smooth="yes" name="ah01"/>
       <point x="430" y="813"/>
       <point x="565" y="950"/>
       <point x="737" y="950" type="curve" smooth="yes"/>
@@ -36,10 +36,10 @@
       <point x="738" y="780" type="line" smooth="yes"/>
       <point x="661" y="780"/>
       <point x="600" y="718"/>
-      <point x="600" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="600" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="600" y="565"/>
       <point x="661" y="504"/>
-      <point x="738" y="504" type="curve" name="dv04" smooth="yes"/>
+      <point x="738" y="504" type="curve" smooth="yes" name="dv04"/>
       <point x="1143" y="504" type="line"/>
       <point x="1143" y="334" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22D_1.glif b/source/Hack-Regular.ufo/glyphs/uni22D_1.glif
index 56260615e..93eb45bb1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22D_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22D_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22D1" format="1">
+<glyph name="uni22D1" format="2">
   <advance width="1233"/>
   <unicode hex="22D1"/>
   <outline>
@@ -8,39 +8,39 @@
       <point x="496" y="164" type="line" smooth="yes"/>
       <point x="763" y="164"/>
       <point x="973" y="377"/>
-      <point x="973" y="643" type="curve" name="ah01" smooth="yes"/>
+      <point x="973" y="643" type="curve" smooth="yes" name="ah01"/>
       <point x="973" y="907"/>
       <point x="763" y="1120"/>
-      <point x="495" y="1120" type="curve" name="dv01" smooth="yes"/>
+      <point x="495" y="1120" type="curve" smooth="yes" name="dv01"/>
       <point x="90" y="1120" type="line"/>
       <point x="90" y="1290" type="line"/>
-      <point x="495" y="1290" type="line" name="dv02" smooth="yes"/>
+      <point x="495" y="1290" type="line" smooth="yes" name="dv02"/>
       <point x="855" y="1290"/>
       <point x="1143" y="1002"/>
-      <point x="1143" y="642" type="curve" name="sh01" smooth="yes"/>
+      <point x="1143" y="642" type="curve" smooth="yes" name="sh01"/>
       <point x="1143" y="284"/>
       <point x="858" y="-6"/>
-      <point x="497" y="-6" type="curve" name="ab01" smooth="yes"/>
+      <point x="497" y="-6" type="curve" smooth="yes" name="ab01"/>
       <point x="90" y="-6" type="line"/>
     </contour>
     <contour>
       <point x="90" y="504" type="line"/>
-      <point x="495" y="504" type="line" name="dv04" smooth="yes"/>
+      <point x="495" y="504" type="line" smooth="yes" name="dv04"/>
       <point x="572" y="504"/>
       <point x="633" y="566"/>
-      <point x="633" y="642" type="curve" name="sh02" smooth="yes"/>
+      <point x="633" y="642" type="curve" smooth="yes" name="sh02"/>
       <point x="633" y="719"/>
       <point x="572" y="780"/>
-      <point x="495" y="780" type="curve" name="dv05" smooth="yes"/>
+      <point x="495" y="780" type="curve" smooth="yes" name="dv05"/>
       <point x="90" y="780" type="line"/>
       <point x="90" y="950" type="line"/>
-      <point x="496" y="950" type="line" name="dv06" smooth="yes"/>
+      <point x="496" y="950" type="line" smooth="yes" name="dv06"/>
       <point x="667" y="950"/>
       <point x="803" y="814"/>
-      <point x="803" y="642" type="curve" name="sh03" smooth="yes"/>
+      <point x="803" y="642" type="curve" smooth="yes" name="sh03"/>
       <point x="803" y="471"/>
       <point x="668" y="334"/>
-      <point x="496" y="334" type="curve" name="dv03" smooth="yes"/>
+      <point x="496" y="334" type="curve" smooth="yes" name="dv03"/>
       <point x="90" y="334" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22D_A_.glif b/source/Hack-Regular.ufo/glyphs/uni22D_A_.glif
index 85ddd7c53..240c71b1c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22D_A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22D_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22DA" format="1">
+<glyph name="uni22DA" format="2">
   <advance width="1233"/>
   <unicode hex="22DA"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22D_B_.glif b/source/Hack-Regular.ufo/glyphs/uni22D_B_.glif
index a213ab447..a029c0f6d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22D_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22D_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22DB" format="1">
+<glyph name="uni22DB" format="2">
   <advance width="1233"/>
   <unicode hex="22DB"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22D_C_.glif b/source/Hack-Regular.ufo/glyphs/uni22D_C_.glif
index 037d47290..b7d7d0499 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22D_C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22D_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22DC" format="1">
+<glyph name="uni22DC" format="2">
   <advance width="1233"/>
   <unicode hex="22DC"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22D_D_.glif b/source/Hack-Regular.ufo/glyphs/uni22D_D_.glif
index c2ed23094..fb833a570 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22D_D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22D_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22DD" format="1">
+<glyph name="uni22DD" format="2">
   <advance width="1233"/>
   <unicode hex="22DD"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22D_E_.glif b/source/Hack-Regular.ufo/glyphs/uni22D_E_.glif
index 26843d144..c5e18f150 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22D_E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22D_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22DE" format="1">
+<glyph name="uni22DE" format="2">
   <advance width="1233"/>
   <unicode hex="22DE"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22D_F_.glif b/source/Hack-Regular.ufo/glyphs/uni22D_F_.glif
index a45c4191a..168a85978 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22D_F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22D_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22DF" format="1">
+<glyph name="uni22DF" format="2">
   <advance width="1233"/>
   <unicode hex="22DF"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22E_0.glif b/source/Hack-Regular.ufo/glyphs/uni22E_0.glif
index 731ffde7e..dd0d3cc78 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22E_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22E_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E0" format="1">
+<glyph name="uni22E0" format="2">
   <advance width="1233"/>
   <unicode hex="22E0"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22E_1.glif b/source/Hack-Regular.ufo/glyphs/uni22E_1.glif
index 3f1f46c49..2ba3f5932 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22E_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22E_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E1" format="1">
+<glyph name="uni22E1" format="2">
   <advance width="1233"/>
   <unicode hex="22E1"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22E_2.glif b/source/Hack-Regular.ufo/glyphs/uni22E_2.glif
index a8b1e8a74..2de8abb7d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22E_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22E_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E2" format="1">
+<glyph name="uni22E2" format="2">
   <advance width="1233"/>
   <unicode hex="22E2"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22E_3.glif b/source/Hack-Regular.ufo/glyphs/uni22E_3.glif
index 900ac83eb..b80d8c304 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22E_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22E_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E3" format="1">
+<glyph name="uni22E3" format="2">
   <advance width="1233"/>
   <unicode hex="22E3"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22E_4.glif b/source/Hack-Regular.ufo/glyphs/uni22E_4.glif
index 061d76e37..ba1c08b12 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22E_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22E_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E4" format="1">
+<glyph name="uni22E4" format="2">
   <advance width="1233"/>
   <unicode hex="22E4"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22E_5.glif b/source/Hack-Regular.ufo/glyphs/uni22E_5.glif
index ae32d8fd5..b7a5c5807 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22E_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22E_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E5" format="1">
+<glyph name="uni22E5" format="2">
   <advance width="1233"/>
   <unicode hex="22E5"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22E_6.glif b/source/Hack-Regular.ufo/glyphs/uni22E_6.glif
index 2c2065787..eb15120ab 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22E_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22E_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E6" format="1">
+<glyph name="uni22E6" format="2">
   <advance width="1233"/>
   <unicode hex="22E6"/>
   <outline>
@@ -11,14 +11,14 @@
       <point x="482" y="67" type="curve" smooth="yes"/>
       <point x="447" y="75"/>
       <point x="412" y="79"/>
-      <point x="379" y="79" type="curve" name="dv03" smooth="yes"/>
+      <point x="379" y="79" type="curve" smooth="yes" name="dv03"/>
       <point x="274" y="79"/>
       <point x="183" y="41"/>
       <point x="86" y="-44" type="curve" name="hr01"/>
       <point x="86" y="130" type="line" name="hr02"/>
       <point x="190" y="210"/>
       <point x="282" y="245"/>
-      <point x="391" y="245" type="curve" name="dv04" smooth="yes"/>
+      <point x="391" y="245" type="curve" smooth="yes" name="dv04"/>
       <point x="471" y="245"/>
       <point x="531" y="227"/>
       <point x="570" y="211" type="curve"/>
@@ -34,14 +34,14 @@
       <point x="701" y="156" type="line" name="hr03"/>
       <point x="759" y="133"/>
       <point x="813" y="122"/>
-      <point x="862" y="122" type="curve" name="dv02" smooth="yes"/>
+      <point x="862" y="122" type="curve" smooth="yes" name="dv02"/>
       <point x="955" y="122"/>
       <point x="1043" y="161"/>
       <point x="1143" y="245" type="curve" name="hr04"/>
       <point x="1143" y="70" type="line" name="hr05"/>
       <point x="1051" y="-3"/>
       <point x="956" y="-44"/>
-      <point x="851" y="-44" type="curve" name="dv01" smooth="yes"/>
+      <point x="851" y="-44" type="curve" smooth="yes" name="dv01"/>
       <point x="790" y="-44"/>
       <point x="733" y="-30"/>
       <point x="665" y="-3" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22E_7.glif b/source/Hack-Regular.ufo/glyphs/uni22E_7.glif
index 31b869cce..626de7d8e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22E_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22E_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E7" format="1">
+<glyph name="uni22E7" format="2">
   <advance width="1233"/>
   <unicode hex="22E7"/>
   <outline>
@@ -11,14 +11,14 @@
       <point x="482" y="67" type="curve" smooth="yes"/>
       <point x="447" y="75"/>
       <point x="412" y="79"/>
-      <point x="379" y="79" type="curve" name="dv03" smooth="yes"/>
+      <point x="379" y="79" type="curve" smooth="yes" name="dv03"/>
       <point x="274" y="79"/>
       <point x="183" y="41"/>
       <point x="86" y="-44" type="curve" name="hr01"/>
       <point x="86" y="130" type="line" name="hr02"/>
       <point x="190" y="210"/>
       <point x="282" y="245"/>
-      <point x="391" y="245" type="curve" name="dv04" smooth="yes"/>
+      <point x="391" y="245" type="curve" smooth="yes" name="dv04"/>
       <point x="471" y="245"/>
       <point x="531" y="227"/>
       <point x="570" y="211" type="curve"/>
@@ -35,14 +35,14 @@
       <point x="701" y="156" type="line" name="hr03"/>
       <point x="759" y="133"/>
       <point x="813" y="122"/>
-      <point x="862" y="122" type="curve" name="dv02" smooth="yes"/>
+      <point x="862" y="122" type="curve" smooth="yes" name="dv02"/>
       <point x="955" y="122"/>
       <point x="1043" y="161"/>
       <point x="1143" y="245" type="curve" name="hr04"/>
       <point x="1143" y="70" type="line" name="hr05"/>
       <point x="1051" y="-3"/>
       <point x="956" y="-44"/>
-      <point x="851" y="-44" type="curve" name="dv01" smooth="yes"/>
+      <point x="851" y="-44" type="curve" smooth="yes" name="dv01"/>
       <point x="790" y="-44"/>
       <point x="733" y="-30"/>
       <point x="665" y="-3" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22E_8.glif b/source/Hack-Regular.ufo/glyphs/uni22E_8.glif
index 4c4ff872f..de0488f3c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22E_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22E_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E8" format="1">
+<glyph name="uni22E8" format="2">
   <advance width="1233"/>
   <unicode hex="22E8"/>
   <outline>
@@ -28,14 +28,14 @@
       <point x="482" y="-3" type="curve" smooth="yes"/>
       <point x="447" y="5"/>
       <point x="412" y="9"/>
-      <point x="379" y="9" type="curve" name="hr03" smooth="yes"/>
+      <point x="379" y="9" type="curve" smooth="yes" name="hr03"/>
       <point x="274" y="9"/>
       <point x="183" y="-29"/>
       <point x="86" y="-114" type="curve" name="iv02"/>
       <point x="86" y="60" type="line" name="hr04"/>
       <point x="190" y="140"/>
       <point x="282" y="175"/>
-      <point x="390" y="175" type="curve" name="hr05" smooth="yes"/>
+      <point x="390" y="175" type="curve" smooth="yes" name="hr05"/>
       <point x="466" y="175"/>
       <point x="531" y="157"/>
       <point x="570" y="141" type="curve"/>
@@ -44,14 +44,14 @@
       <point x="701" y="86" type="line"/>
       <point x="759" y="63"/>
       <point x="813" y="52"/>
-      <point x="862" y="52" type="curve" name="dv02" smooth="yes"/>
+      <point x="862" y="52" type="curve" smooth="yes" name="dv02"/>
       <point x="955" y="52"/>
       <point x="1043" y="91"/>
       <point x="1143" y="175" type="curve" name="iv03"/>
       <point x="1143" y="0" type="line"/>
       <point x="1051" y="-73"/>
       <point x="956" y="-114"/>
-      <point x="851" y="-114" type="curve" name="dv01" smooth="yes"/>
+      <point x="851" y="-114" type="curve" smooth="yes" name="dv01"/>
       <point x="790" y="-114"/>
       <point x="733" y="-100"/>
       <point x="665" y="-73" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22E_9.glif b/source/Hack-Regular.ufo/glyphs/uni22E_9.glif
index 7976e0d09..b2bd46b1a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22E_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22E_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22E9" format="1">
+<glyph name="uni22E9" format="2">
   <advance width="1233"/>
   <unicode hex="22E9"/>
   <outline>
@@ -28,14 +28,14 @@
       <point x="482" y="-3" type="curve" smooth="yes"/>
       <point x="447" y="5"/>
       <point x="412" y="9"/>
-      <point x="379" y="9" type="curve" name="hr03" smooth="yes"/>
+      <point x="379" y="9" type="curve" smooth="yes" name="hr03"/>
       <point x="274" y="9"/>
       <point x="183" y="-29"/>
       <point x="86" y="-114" type="curve" name="iv03"/>
       <point x="86" y="60" type="line" name="hr04"/>
       <point x="190" y="140"/>
       <point x="282" y="175"/>
-      <point x="390" y="175" type="curve" name="hr05" smooth="yes"/>
+      <point x="390" y="175" type="curve" smooth="yes" name="hr05"/>
       <point x="466" y="175"/>
       <point x="531" y="157"/>
       <point x="570" y="141" type="curve"/>
@@ -44,14 +44,14 @@
       <point x="701" y="86" type="line"/>
       <point x="759" y="63"/>
       <point x="813" y="52"/>
-      <point x="862" y="52" type="curve" name="dv02" smooth="yes"/>
+      <point x="862" y="52" type="curve" smooth="yes" name="dv02"/>
       <point x="955" y="52"/>
       <point x="1043" y="91"/>
       <point x="1143" y="175" type="curve" name="iv04"/>
       <point x="1143" y="0" type="line"/>
       <point x="1051" y="-73"/>
       <point x="956" y="-114"/>
-      <point x="851" y="-114" type="curve" name="dv01" smooth="yes"/>
+      <point x="851" y="-114" type="curve" smooth="yes" name="dv01"/>
       <point x="790" y="-114"/>
       <point x="733" y="-100"/>
       <point x="665" y="-73" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni22E_F_.glif b/source/Hack-Regular.ufo/glyphs/uni22E_F_.glif
index 2357efbad..0640f5c6e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni22E_F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni22E_F_.glif
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni22EF" format="1">
+<glyph name="uni22EF" format="2">
   <advance width="1233"/>
   <unicode hex="22EF"/>
   <outline>
     <contour>
-      <point x="110" y="490" type="line" name="hr00" smooth="yes"/>
+      <point x="110" y="490" type="line" smooth="yes" name="hr00"/>
       <point x="90" y="490"/>
       <point x="80" y="500"/>
-      <point x="80" y="520" type="curve" name="dh01" smooth="yes"/>
+      <point x="80" y="520" type="curve" smooth="yes" name="dh01"/>
       <point x="80" y="765" type="line" smooth="yes"/>
       <point x="80" y="785"/>
       <point x="90" y="795"/>
-      <point x="110" y="795" type="curve" name="dv01" smooth="yes"/>
+      <point x="110" y="795" type="curve" smooth="yes" name="dv01"/>
       <point x="302" y="795" type="line" smooth="yes"/>
       <point x="322" y="795"/>
       <point x="332" y="785"/>
       <point x="332" y="765" type="curve" smooth="yes"/>
-      <point x="332" y="520" type="line" name="dh02" smooth="yes"/>
+      <point x="332" y="520" type="line" smooth="yes" name="dh02"/>
       <point x="332" y="500"/>
       <point x="322" y="490"/>
       <point x="302" y="490" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="519" y="490" type="line" name="sv01" smooth="yes"/>
+      <point x="519" y="490" type="line" smooth="yes" name="sv01"/>
       <point x="499" y="490"/>
       <point x="489" y="500"/>
-      <point x="489" y="520" type="curve" name="dh03" smooth="yes"/>
+      <point x="489" y="520" type="curve" smooth="yes" name="dh03"/>
       <point x="489" y="765" type="line" smooth="yes"/>
       <point x="489" y="785"/>
       <point x="499" y="795"/>
-      <point x="519" y="795" type="curve" name="sv02" smooth="yes"/>
+      <point x="519" y="795" type="curve" smooth="yes" name="sv02"/>
       <point x="711" y="795" type="line" smooth="yes"/>
       <point x="731" y="795"/>
       <point x="741" y="785"/>
       <point x="741" y="765" type="curve" smooth="yes"/>
-      <point x="741" y="520" type="line" name="dh04" smooth="yes"/>
+      <point x="741" y="520" type="line" smooth="yes" name="dh04"/>
       <point x="741" y="500"/>
       <point x="731" y="490"/>
       <point x="711" y="490" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="929" y="490" type="line" name="sv03" smooth="yes"/>
+      <point x="929" y="490" type="line" smooth="yes" name="sv03"/>
       <point x="909" y="490"/>
       <point x="899" y="500"/>
-      <point x="899" y="520" type="curve" name="dh05" smooth="yes"/>
+      <point x="899" y="520" type="curve" smooth="yes" name="dh05"/>
       <point x="899" y="765" type="line" smooth="yes"/>
       <point x="899" y="785"/>
       <point x="909" y="795"/>
-      <point x="929" y="795" type="curve" name="sv04" smooth="yes"/>
+      <point x="929" y="795" type="curve" smooth="yes" name="sv04"/>
       <point x="1121" y="795" type="line" smooth="yes"/>
       <point x="1141" y="795"/>
       <point x="1151" y="785"/>
       <point x="1151" y="765" type="curve" smooth="yes"/>
-      <point x="1151" y="520" type="line" name="dh06" smooth="yes"/>
+      <point x="1151" y="520" type="line" smooth="yes" name="dh06"/>
       <point x="1151" y="500"/>
       <point x="1141" y="490"/>
       <point x="1121" y="490" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2304.glif b/source/Hack-Regular.ufo/glyphs/uni2304.glif
index 8f4b4c116..726565437 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2304.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2304.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2304" format="1">
+<glyph name="uni2304" format="2">
   <advance width="1233"/>
   <unicode hex="2304"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2308.glif b/source/Hack-Regular.ufo/glyphs/uni2308.glif
index a032d7a82..a567ceca4 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2308.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2308.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2308" format="1">
+<glyph name="uni2308" format="2">
   <advance width="1233"/>
   <unicode hex="2308"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2309.glif b/source/Hack-Regular.ufo/glyphs/uni2309.glif
index d32f63289..9e18158aa 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2309.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2309.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2309" format="1">
+<glyph name="uni2309" format="2">
   <advance width="1233"/>
   <unicode hex="2309"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni230A_.glif b/source/Hack-Regular.ufo/glyphs/uni230A_.glif
index 8ddc5bb0e..a906b7e57 100644
--- a/source/Hack-Regular.ufo/glyphs/uni230A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni230A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni230A" format="1">
+<glyph name="uni230A" format="2">
   <advance width="1233"/>
   <unicode hex="230A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni230B_.glif b/source/Hack-Regular.ufo/glyphs/uni230B_.glif
index 5e8a61afd..12df02428 100644
--- a/source/Hack-Regular.ufo/glyphs/uni230B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni230B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni230B" format="1">
+<glyph name="uni230B" format="2">
   <advance width="1233"/>
   <unicode hex="230B"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni239B_.glif b/source/Hack-Regular.ufo/glyphs/uni239B_.glif
index 8e7a286f5..92dd2709d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni239B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni239B_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni239B" format="1">
+<glyph name="uni239B" format="2">
   <advance width="1233"/>
   <unicode hex="239B"/>
   <outline>
     <contour>
-      <point x="280" y="-294" type="line" name="hr00" smooth="yes"/>
+      <point x="280" y="-294" type="line" smooth="yes" name="hr00"/>
       <point x="280" y="930"/>
       <point x="571" y="1581"/>
       <point x="792" y="1926" type="curve" name="av02"/>
       <point x="952" y="1926" type="line"/>
       <point x="604" y="1227"/>
       <point x="475" y="755"/>
-      <point x="475" y="-294" type="curve" name="dh01" smooth="yes"/>
+      <point x="475" y="-294" type="curve" smooth="yes" name="dh01"/>
       <point x="475" y="-528" type="line" name="av01"/>
       <point x="280" y="-528" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni239C_.glif b/source/Hack-Regular.ufo/glyphs/uni239C_.glif
index e0b7ac215..b7089d0e0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni239C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni239C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni239C" format="1">
+<glyph name="uni239C" format="2">
   <advance width="1233"/>
   <unicode hex="239C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni239D_.glif b/source/Hack-Regular.ufo/glyphs/uni239D_.glif
index 49f77229b..84c78c9eb 100644
--- a/source/Hack-Regular.ufo/glyphs/uni239D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni239D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni239D" format="1">
+<glyph name="uni239D" format="2">
   <advance width="1233"/>
   <unicode hex="239D"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="792" y="-492" type="line" name="hr00"/>
       <point x="515" y="-58"/>
       <point x="280" y="603"/>
-      <point x="280" y="1695" type="curve" name="dh01" smooth="yes"/>
+      <point x="280" y="1695" type="curve" smooth="yes" name="dh01"/>
       <point x="280" y="1929" type="line" name="av01"/>
       <point x="475" y="1929" type="line"/>
-      <point x="475" y="1695" type="line" name="dh02" smooth="yes"/>
+      <point x="475" y="1695" type="line" smooth="yes" name="dh02"/>
       <point x="475" y="551"/>
       <point x="680" y="56"/>
       <point x="952" y="-492" type="curve" name="ab01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni239E_.glif b/source/Hack-Regular.ufo/glyphs/uni239E_.glif
index 02febe357..0238c93ef 100644
--- a/source/Hack-Regular.ufo/glyphs/uni239E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni239E_.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni239E" format="1">
+<glyph name="uni239E" format="2">
   <advance width="1233"/>
   <unicode hex="239E"/>
   <outline>
     <contour>
-      <point x="758" y="-294" type="line" name="hr00" smooth="yes"/>
+      <point x="758" y="-294" type="line" smooth="yes" name="hr00"/>
       <point x="758" y="755"/>
       <point x="629" y="1227"/>
       <point x="281" y="1926" type="curve" name="av02"/>
       <point x="441" y="1926" type="line"/>
       <point x="662" y="1581"/>
       <point x="953" y="930"/>
-      <point x="953" y="-294" type="curve" name="dh01" smooth="yes"/>
+      <point x="953" y="-294" type="curve" smooth="yes" name="dh01"/>
       <point x="953" y="-528" type="line" name="av01"/>
       <point x="758" y="-528" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni239F_.glif b/source/Hack-Regular.ufo/glyphs/uni239F_.glif
index cea8d54c2..07510cfc1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni239F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni239F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni239F" format="1">
+<glyph name="uni239F" format="2">
   <advance width="1233"/>
   <unicode hex="239F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni23A_0.glif b/source/Hack-Regular.ufo/glyphs/uni23A_0.glif
index db90ae765..8a823ea5a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni23A_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni23A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A0" format="1">
+<glyph name="uni23A0" format="2">
   <advance width="1233"/>
   <unicode hex="23A0"/>
   <outline>
@@ -7,10 +7,10 @@
       <point x="281" y="-492" type="line" name="hr00"/>
       <point x="553" y="56"/>
       <point x="758" y="551"/>
-      <point x="758" y="1695" type="curve" name="dh01" smooth="yes"/>
+      <point x="758" y="1695" type="curve" smooth="yes" name="dh01"/>
       <point x="758" y="1929" type="line" name="av01"/>
       <point x="953" y="1929" type="line"/>
-      <point x="953" y="1695" type="line" name="dh02" smooth="yes"/>
+      <point x="953" y="1695" type="line" smooth="yes" name="dh02"/>
       <point x="953" y="603"/>
       <point x="718" y="-58"/>
       <point x="441" y="-492" type="curve" name="ab01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni23A_1.glif b/source/Hack-Regular.ufo/glyphs/uni23A_1.glif
index 9e2770007..89c7ab99c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni23A_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni23A_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A1" format="1">
+<glyph name="uni23A1" format="2">
   <advance width="1233"/>
   <unicode hex="23A1"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni23A_2.glif b/source/Hack-Regular.ufo/glyphs/uni23A_2.glif
index cbc6807f3..0fa4ae110 100644
--- a/source/Hack-Regular.ufo/glyphs/uni23A_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni23A_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A2" format="1">
+<glyph name="uni23A2" format="2">
   <advance width="1233"/>
   <unicode hex="23A2"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni23A_3.glif b/source/Hack-Regular.ufo/glyphs/uni23A_3.glif
index 6de0a516e..df508981f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni23A_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni23A_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A3" format="1">
+<glyph name="uni23A3" format="2">
   <advance width="1233"/>
   <unicode hex="23A3"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni23A_4.glif b/source/Hack-Regular.ufo/glyphs/uni23A_4.glif
index 350891111..faf1762f0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni23A_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni23A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A4" format="1">
+<glyph name="uni23A4" format="2">
   <advance width="1233"/>
   <unicode hex="23A4"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni23A_5.glif b/source/Hack-Regular.ufo/glyphs/uni23A_5.glif
index a76e4b4de..f340d4859 100644
--- a/source/Hack-Regular.ufo/glyphs/uni23A_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni23A_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A5" format="1">
+<glyph name="uni23A5" format="2">
   <advance width="1233"/>
   <unicode hex="23A5"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni23A_6.glif b/source/Hack-Regular.ufo/glyphs/uni23A_6.glif
index fe1059209..7096df932 100644
--- a/source/Hack-Regular.ufo/glyphs/uni23A_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni23A_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A6" format="1">
+<glyph name="uni23A6" format="2">
   <advance width="1233"/>
   <unicode hex="23A6"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni23A_7.glif b/source/Hack-Regular.ufo/glyphs/uni23A_7.glif
index 50c46c41f..2d6f634bb 100644
--- a/source/Hack-Regular.ufo/glyphs/uni23A_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni23A_7.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A7" format="1">
+<glyph name="uni23A7" format="2">
   <advance width="1233"/>
   <unicode hex="23A7"/>
   <outline>
     <contour>
-      <point x="524" y="1375" type="line" name="hr00" smooth="yes"/>
+      <point x="524" y="1375" type="line" smooth="yes" name="hr00"/>
       <point x="524" y="1672"/>
       <point x="694" y="1901"/>
       <point x="942" y="1901" type="curve" smooth="yes"/>
@@ -13,7 +13,7 @@
       <point x="936" y="1725" type="line" smooth="yes"/>
       <point x="801" y="1725"/>
       <point x="710" y="1586"/>
-      <point x="710" y="1383" type="curve" name="dh01" smooth="yes"/>
+      <point x="710" y="1383" type="curve" smooth="yes" name="dh01"/>
       <point x="710" y="-534" type="line" name="av01"/>
       <point x="524" y="-534" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni23A_8.glif b/source/Hack-Regular.ufo/glyphs/uni23A_8.glif
index d32bb4f98..14b550f70 100644
--- a/source/Hack-Regular.ufo/glyphs/uni23A_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni23A_8.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A8" format="1">
+<glyph name="uni23A8" format="2">
   <advance width="1233"/>
   <unicode hex="23A8"/>
   <outline>
     <contour>
-      <point x="524" y="8" type="line" name="hr00" smooth="yes"/>
+      <point x="524" y="8" type="line" smooth="yes" name="hr00"/>
       <point x="524" y="598"/>
       <point x="425" y="603"/>
-      <point x="78" y="611" type="curve" name="dv01" smooth="yes"/>
+      <point x="78" y="611" type="curve" smooth="yes" name="dv01"/>
       <point x="17" y="612" type="line"/>
       <point x="17" y="799" type="line"/>
-      <point x="78" y="799" type="line" name="dv02" smooth="yes"/>
+      <point x="78" y="799" type="line" smooth="yes" name="dv02"/>
       <point x="423" y="799"/>
       <point x="524" y="822"/>
-      <point x="524" y="1402" type="curve" name="sh01" smooth="yes"/>
+      <point x="524" y="1402" type="curve" smooth="yes" name="sh01"/>
       <point x="524" y="1926" type="line" name="av02"/>
       <point x="710" y="1926" type="line" name="sh02"/>
       <point x="710" y="1390" type="line" smooth="yes"/>
@@ -28,7 +28,7 @@
       <point x="609" y="612" type="curve" smooth="yes"/>
       <point x="674" y="513"/>
       <point x="710" y="325"/>
-      <point x="710" y="20" type="curve" name="dh01" smooth="yes"/>
+      <point x="710" y="20" type="curve" smooth="yes" name="dh01"/>
       <point x="710" y="-516" type="line" name="av01"/>
       <point x="524" y="-516" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni23A_9.glif b/source/Hack-Regular.ufo/glyphs/uni23A_9.glif
index 55509b4db..f767e574e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni23A_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni23A_9.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23A9" format="1">
+<glyph name="uni23A9" format="2">
   <advance width="1233"/>
   <unicode hex="23A9"/>
   <outline>
     <contour>
-      <point x="942" y="-492" type="line" name="hr00" smooth="yes"/>
+      <point x="942" y="-492" type="line" smooth="yes" name="hr00"/>
       <point x="698" y="-492"/>
       <point x="524" y="-266"/>
-      <point x="524" y="34" type="curve" name="dh01" smooth="yes"/>
+      <point x="524" y="34" type="curve" smooth="yes" name="dh01"/>
       <point x="524" y="1926" type="line" name="av01"/>
       <point x="710" y="1926" type="line"/>
-      <point x="710" y="26" type="line" name="dh02" smooth="yes"/>
+      <point x="710" y="26" type="line" smooth="yes" name="dh02"/>
       <point x="710" y="-179"/>
       <point x="801" y="-316"/>
-      <point x="936" y="-316" type="curve" name="sv01" smooth="yes"/>
+      <point x="936" y="-316" type="curve" smooth="yes" name="sv01"/>
       <point x="1217" y="-316" type="line" name="sv02"/>
       <point x="1217" y="-492" type="line" name="ab01"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni23A_A_.glif b/source/Hack-Regular.ufo/glyphs/uni23A_A_.glif
index 7342b0790..27a6b3aac 100644
--- a/source/Hack-Regular.ufo/glyphs/uni23A_A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni23A_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23AA" format="1">
+<glyph name="uni23AA" format="2">
   <advance width="1233"/>
   <unicode hex="23AA"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni23A_B_.glif b/source/Hack-Regular.ufo/glyphs/uni23A_B_.glif
index c79ce929f..d37835bcc 100644
--- a/source/Hack-Regular.ufo/glyphs/uni23A_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni23A_B_.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23AB" format="1">
+<glyph name="uni23AB" format="2">
   <advance width="1233"/>
   <unicode hex="23AB"/>
   <outline>
     <contour>
-      <point x="523" y="1383" type="line" name="hr00" smooth="yes"/>
+      <point x="523" y="1383" type="line" smooth="yes" name="hr00"/>
       <point x="523" y="1586"/>
       <point x="432" y="1725"/>
-      <point x="297" y="1725" type="curve" name="dv01" smooth="yes"/>
+      <point x="297" y="1725" type="curve" smooth="yes" name="dv01"/>
       <point x="16" y="1725" type="line"/>
       <point x="16" y="1901" type="line"/>
-      <point x="291" y="1901" type="line" name="dv02" smooth="yes"/>
+      <point x="291" y="1901" type="line" smooth="yes" name="dv02"/>
       <point x="539" y="1901"/>
       <point x="709" y="1672"/>
-      <point x="709" y="1375" type="curve" name="dh01" smooth="yes"/>
+      <point x="709" y="1375" type="curve" smooth="yes" name="dh01"/>
       <point x="709" y="-534" type="line" name="av01"/>
       <point x="523" y="-534" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni23A_C_.glif b/source/Hack-Regular.ufo/glyphs/uni23A_C_.glif
index 9c726c28c..e104a00e2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni23A_C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni23A_C_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23AC" format="1">
+<glyph name="uni23AC" format="2">
   <advance width="1233"/>
   <unicode hex="23AC"/>
   <outline>
     <contour>
-      <point x="523" y="20" type="line" name="hr00" smooth="yes"/>
+      <point x="523" y="20" type="line" smooth="yes" name="hr00"/>
       <point x="523" y="325"/>
       <point x="557" y="513"/>
       <point x="624" y="612" type="curve" smooth="yes"/>
@@ -16,19 +16,19 @@
       <point x="624" y="798" type="curve" smooth="yes"/>
       <point x="557" y="899"/>
       <point x="523" y="1097"/>
-      <point x="523" y="1390" type="curve" name="sh01" smooth="yes"/>
+      <point x="523" y="1390" type="curve" smooth="yes" name="sh01"/>
       <point x="523" y="1926" type="line" name="av02"/>
       <point x="709" y="1926" type="line" name="sh02"/>
       <point x="709" y="1402" type="line" smooth="yes"/>
       <point x="709" y="822"/>
       <point x="810" y="799"/>
-      <point x="1155" y="799" type="curve" name="dv02" smooth="yes"/>
+      <point x="1155" y="799" type="curve" smooth="yes" name="dv02"/>
       <point x="1216" y="799" type="line"/>
       <point x="1216" y="612" type="line"/>
-      <point x="1155" y="611" type="line" name="dv01" smooth="yes"/>
+      <point x="1155" y="611" type="line" smooth="yes" name="dv01"/>
       <point x="808" y="603"/>
       <point x="709" y="598"/>
-      <point x="709" y="8" type="curve" name="dh01" smooth="yes"/>
+      <point x="709" y="8" type="curve" smooth="yes" name="dh01"/>
       <point x="709" y="-516" type="line" name="av01"/>
       <point x="523" y="-516" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni23A_D_.glif b/source/Hack-Regular.ufo/glyphs/uni23A_D_.glif
index 6b59fb48a..1939a626a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni23A_D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni23A_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23AD" format="1">
+<glyph name="uni23AD" format="2">
   <advance width="1233"/>
   <unicode hex="23AD"/>
   <outline>
@@ -8,13 +8,13 @@
       <point x="297" y="-316" type="line" smooth="yes"/>
       <point x="432" y="-316"/>
       <point x="523" y="-179"/>
-      <point x="523" y="26" type="curve" name="dh01" smooth="yes"/>
+      <point x="523" y="26" type="curve" smooth="yes" name="dh01"/>
       <point x="523" y="1926" type="line" name="av01"/>
       <point x="709" y="1926" type="line"/>
-      <point x="709" y="34" type="line" name="dh02" smooth="yes"/>
+      <point x="709" y="34" type="line" smooth="yes" name="dh02"/>
       <point x="709" y="-266"/>
       <point x="535" y="-492"/>
-      <point x="291" y="-492" type="curve" name="ab01" smooth="yes"/>
+      <point x="291" y="-492" type="curve" smooth="yes" name="ab01"/>
       <point x="16" y="-492" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni23A_E_.glif b/source/Hack-Regular.ufo/glyphs/uni23A_E_.glif
index 73fada53a..832e4acef 100644
--- a/source/Hack-Regular.ufo/glyphs/uni23A_E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni23A_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni23AE" format="1">
+<glyph name="uni23AE" format="2">
   <advance width="1233"/>
   <unicode hex="23AE"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2500.glif b/source/Hack-Regular.ufo/glyphs/uni2500.glif
index 73488f5b9..4c3c724bd 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2500.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2500.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2500" format="1">
+<glyph name="uni2500" format="2">
   <advance width="1233"/>
   <unicode hex="2500"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2501.glif b/source/Hack-Regular.ufo/glyphs/uni2501.glif
index 407b806a5..b4b7c57cb 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2501.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2501.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2501" format="1">
+<glyph name="uni2501" format="2">
   <advance width="1233"/>
   <unicode hex="2501"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2502.glif b/source/Hack-Regular.ufo/glyphs/uni2502.glif
index fa8872f18..13a2c6442 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2502.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2502.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2502" format="1">
+<glyph name="uni2502" format="2">
   <advance width="1233"/>
   <unicode hex="2502"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2503.glif b/source/Hack-Regular.ufo/glyphs/uni2503.glif
index 0e067d62b..1e6d150a4 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2503.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2503.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2503" format="1">
+<glyph name="uni2503" format="2">
   <advance width="1233"/>
   <unicode hex="2503"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2504.glif b/source/Hack-Regular.ufo/glyphs/uni2504.glif
index d50a36d0e..5d4329be7 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2504.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2504.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2504" format="1">
+<glyph name="uni2504" format="2">
   <advance width="1233"/>
   <unicode hex="2504"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2505.glif b/source/Hack-Regular.ufo/glyphs/uni2505.glif
index 5ba7c8463..754eec4a6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2505.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2505.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2505" format="1">
+<glyph name="uni2505" format="2">
   <advance width="1233"/>
   <unicode hex="2505"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2506.glif b/source/Hack-Regular.ufo/glyphs/uni2506.glif
index 5efa3b8d6..f78770484 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2506.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2506.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2506" format="1">
+<glyph name="uni2506" format="2">
   <advance width="1233"/>
   <unicode hex="2506"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2507.glif b/source/Hack-Regular.ufo/glyphs/uni2507.glif
index 5708e0d89..b4eba2c2b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2507.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2507.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2507" format="1">
+<glyph name="uni2507" format="2">
   <advance width="1233"/>
   <unicode hex="2507"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2508.glif b/source/Hack-Regular.ufo/glyphs/uni2508.glif
index 36048e87f..24c5f527c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2508.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2508.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2508" format="1">
+<glyph name="uni2508" format="2">
   <advance width="1233"/>
   <unicode hex="2508"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2509.glif b/source/Hack-Regular.ufo/glyphs/uni2509.glif
index 72288fcc1..5ba4882de 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2509.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2509.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2509" format="1">
+<glyph name="uni2509" format="2">
   <advance width="1233"/>
   <unicode hex="2509"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni250A_.glif b/source/Hack-Regular.ufo/glyphs/uni250A_.glif
index 326419d4f..cc5657bf8 100644
--- a/source/Hack-Regular.ufo/glyphs/uni250A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni250A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni250A" format="1">
+<glyph name="uni250A" format="2">
   <advance width="1233"/>
   <unicode hex="250A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni250B_.glif b/source/Hack-Regular.ufo/glyphs/uni250B_.glif
index c3ee89732..62cafe2d5 100644
--- a/source/Hack-Regular.ufo/glyphs/uni250B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni250B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni250B" format="1">
+<glyph name="uni250B" format="2">
   <advance width="1233"/>
   <unicode hex="250B"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni250C_.glif b/source/Hack-Regular.ufo/glyphs/uni250C_.glif
index 3bb58457a..fc997d4f4 100644
--- a/source/Hack-Regular.ufo/glyphs/uni250C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni250C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni250C" format="1">
+<glyph name="uni250C" format="2">
   <advance width="1233"/>
   <unicode hex="250C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni250D_.glif b/source/Hack-Regular.ufo/glyphs/uni250D_.glif
index c13da916a..e34115b1f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni250D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni250D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni250D" format="1">
+<glyph name="uni250D" format="2">
   <advance width="1233"/>
   <unicode hex="250D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni250E_.glif b/source/Hack-Regular.ufo/glyphs/uni250E_.glif
index 4c1a00c1f..7696eb5f3 100644
--- a/source/Hack-Regular.ufo/glyphs/uni250E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni250E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni250E" format="1">
+<glyph name="uni250E" format="2">
   <advance width="1233"/>
   <unicode hex="250E"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni250F_.glif b/source/Hack-Regular.ufo/glyphs/uni250F_.glif
index de7ebbd8c..8ce72f96a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni250F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni250F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni250F" format="1">
+<glyph name="uni250F" format="2">
   <advance width="1233"/>
   <unicode hex="250F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2510.glif b/source/Hack-Regular.ufo/glyphs/uni2510.glif
index ca6ae96b8..b619a2b32 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2510.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2510.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2510" format="1">
+<glyph name="uni2510" format="2">
   <advance width="1233"/>
   <unicode hex="2510"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2511.glif b/source/Hack-Regular.ufo/glyphs/uni2511.glif
index 730313a7f..49566b695 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2511.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2511.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2511" format="1">
+<glyph name="uni2511" format="2">
   <advance width="1233"/>
   <unicode hex="2511"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2512.glif b/source/Hack-Regular.ufo/glyphs/uni2512.glif
index 6ac0b73da..57d91c592 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2512.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2512.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2512" format="1">
+<glyph name="uni2512" format="2">
   <advance width="1233"/>
   <unicode hex="2512"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2513.glif b/source/Hack-Regular.ufo/glyphs/uni2513.glif
index 07da56005..939e456bd 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2513.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2513.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2513" format="1">
+<glyph name="uni2513" format="2">
   <advance width="1233"/>
   <unicode hex="2513"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2514.glif b/source/Hack-Regular.ufo/glyphs/uni2514.glif
index 6ea01e67e..cd4e6db7a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2514.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2514.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2514" format="1">
+<glyph name="uni2514" format="2">
   <advance width="1233"/>
   <unicode hex="2514"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2515.glif b/source/Hack-Regular.ufo/glyphs/uni2515.glif
index d80bfefe6..8a437d13f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2515.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2515.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2515" format="1">
+<glyph name="uni2515" format="2">
   <advance width="1233"/>
   <unicode hex="2515"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2516.glif b/source/Hack-Regular.ufo/glyphs/uni2516.glif
index a1e7786d8..a4d2007fb 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2516.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2516.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2516" format="1">
+<glyph name="uni2516" format="2">
   <advance width="1233"/>
   <unicode hex="2516"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2517.glif b/source/Hack-Regular.ufo/glyphs/uni2517.glif
index 80b5b9a16..e1218e29e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2517.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2517.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2517" format="1">
+<glyph name="uni2517" format="2">
   <advance width="1233"/>
   <unicode hex="2517"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2518.glif b/source/Hack-Regular.ufo/glyphs/uni2518.glif
index 017273e68..837c14e81 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2518.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2518.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2518" format="1">
+<glyph name="uni2518" format="2">
   <advance width="1233"/>
   <unicode hex="2518"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2519.glif b/source/Hack-Regular.ufo/glyphs/uni2519.glif
index 754033b48..16fd46687 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2519.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2519.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2519" format="1">
+<glyph name="uni2519" format="2">
   <advance width="1233"/>
   <unicode hex="2519"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni251A_.glif b/source/Hack-Regular.ufo/glyphs/uni251A_.glif
index 0079f5dcb..29771eed8 100644
--- a/source/Hack-Regular.ufo/glyphs/uni251A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni251A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni251A" format="1">
+<glyph name="uni251A" format="2">
   <advance width="1233"/>
   <unicode hex="251A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni251B_.glif b/source/Hack-Regular.ufo/glyphs/uni251B_.glif
index 0975ba76c..4d876080f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni251B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni251B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni251B" format="1">
+<glyph name="uni251B" format="2">
   <advance width="1233"/>
   <unicode hex="251B"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni251C_.glif b/source/Hack-Regular.ufo/glyphs/uni251C_.glif
index 317eef6ff..035384e8e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni251C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni251C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni251C" format="1">
+<glyph name="uni251C" format="2">
   <advance width="1233"/>
   <unicode hex="251C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni251D_.glif b/source/Hack-Regular.ufo/glyphs/uni251D_.glif
index 7917d89b5..82133e678 100644
--- a/source/Hack-Regular.ufo/glyphs/uni251D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni251D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni251D" format="1">
+<glyph name="uni251D" format="2">
   <advance width="1233"/>
   <unicode hex="251D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni251E_.glif b/source/Hack-Regular.ufo/glyphs/uni251E_.glif
index ec76929ee..6f8e608a6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni251E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni251E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni251E" format="1">
+<glyph name="uni251E" format="2">
   <advance width="1233"/>
   <unicode hex="251E"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni251F_.glif b/source/Hack-Regular.ufo/glyphs/uni251F_.glif
index 7951311b3..0ba4a983e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni251F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni251F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni251F" format="1">
+<glyph name="uni251F" format="2">
   <advance width="1233"/>
   <unicode hex="251F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2520.glif b/source/Hack-Regular.ufo/glyphs/uni2520.glif
index 48b8d811d..d7db40b19 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2520.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2520.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2520" format="1">
+<glyph name="uni2520" format="2">
   <advance width="1233"/>
   <unicode hex="2520"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2521.glif b/source/Hack-Regular.ufo/glyphs/uni2521.glif
index 9a9189030..99d8e5651 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2521.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2521.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2521" format="1">
+<glyph name="uni2521" format="2">
   <advance width="1233"/>
   <unicode hex="2521"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2522.glif b/source/Hack-Regular.ufo/glyphs/uni2522.glif
index beec610ae..e46fe28b7 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2522.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2522.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2522" format="1">
+<glyph name="uni2522" format="2">
   <advance width="1233"/>
   <unicode hex="2522"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2523.glif b/source/Hack-Regular.ufo/glyphs/uni2523.glif
index 64dbc41bc..f4dacb474 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2523.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2523.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2523" format="1">
+<glyph name="uni2523" format="2">
   <advance width="1233"/>
   <unicode hex="2523"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2524.glif b/source/Hack-Regular.ufo/glyphs/uni2524.glif
index e25dd4855..7c1c49f3b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2524.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2524.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2524" format="1">
+<glyph name="uni2524" format="2">
   <advance width="1233"/>
   <unicode hex="2524"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2525.glif b/source/Hack-Regular.ufo/glyphs/uni2525.glif
index 3a2ba11c6..ebd9cd8f1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2525.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2525.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2525" format="1">
+<glyph name="uni2525" format="2">
   <advance width="1233"/>
   <unicode hex="2525"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2526.glif b/source/Hack-Regular.ufo/glyphs/uni2526.glif
index b23927ce0..fd5234524 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2526.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2526.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2526" format="1">
+<glyph name="uni2526" format="2">
   <advance width="1233"/>
   <unicode hex="2526"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2527.glif b/source/Hack-Regular.ufo/glyphs/uni2527.glif
index f08eebe71..f746e9af2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2527.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2527.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2527" format="1">
+<glyph name="uni2527" format="2">
   <advance width="1233"/>
   <unicode hex="2527"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2528.glif b/source/Hack-Regular.ufo/glyphs/uni2528.glif
index fc50e2952..dddc9bfb3 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2528.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2528.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2528" format="1">
+<glyph name="uni2528" format="2">
   <advance width="1233"/>
   <unicode hex="2528"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2529.glif b/source/Hack-Regular.ufo/glyphs/uni2529.glif
index 4c4a6320d..36019c98c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2529.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2529.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2529" format="1">
+<glyph name="uni2529" format="2">
   <advance width="1233"/>
   <unicode hex="2529"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni252A_.glif b/source/Hack-Regular.ufo/glyphs/uni252A_.glif
index de1e3f6ca..58ce526ba 100644
--- a/source/Hack-Regular.ufo/glyphs/uni252A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni252A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni252A" format="1">
+<glyph name="uni252A" format="2">
   <advance width="1233"/>
   <unicode hex="252A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni252B_.glif b/source/Hack-Regular.ufo/glyphs/uni252B_.glif
index 9af4bb7e3..1bb97939d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni252B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni252B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni252B" format="1">
+<glyph name="uni252B" format="2">
   <advance width="1233"/>
   <unicode hex="252B"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni252C_.glif b/source/Hack-Regular.ufo/glyphs/uni252C_.glif
index 71c9aebce..a5ceefa4a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni252C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni252C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni252C" format="1">
+<glyph name="uni252C" format="2">
   <advance width="1233"/>
   <unicode hex="252C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni252D_.glif b/source/Hack-Regular.ufo/glyphs/uni252D_.glif
index 7870a65dc..3adb19018 100644
--- a/source/Hack-Regular.ufo/glyphs/uni252D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni252D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni252D" format="1">
+<glyph name="uni252D" format="2">
   <advance width="1233"/>
   <unicode hex="252D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni252E_.glif b/source/Hack-Regular.ufo/glyphs/uni252E_.glif
index 3a5c6d74d..1d2a8974d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni252E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni252E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni252E" format="1">
+<glyph name="uni252E" format="2">
   <advance width="1233"/>
   <unicode hex="252E"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni252F_.glif b/source/Hack-Regular.ufo/glyphs/uni252F_.glif
index 3e6e9d1f0..b4b65ba37 100644
--- a/source/Hack-Regular.ufo/glyphs/uni252F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni252F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni252F" format="1">
+<glyph name="uni252F" format="2">
   <advance width="1233"/>
   <unicode hex="252F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2530.glif b/source/Hack-Regular.ufo/glyphs/uni2530.glif
index 50e93e19a..c37b0a903 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2530.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2530.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2530" format="1">
+<glyph name="uni2530" format="2">
   <advance width="1233"/>
   <unicode hex="2530"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2531.glif b/source/Hack-Regular.ufo/glyphs/uni2531.glif
index fe41525b6..ab1daaa5b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2531.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2531.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2531" format="1">
+<glyph name="uni2531" format="2">
   <advance width="1233"/>
   <unicode hex="2531"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2532.glif b/source/Hack-Regular.ufo/glyphs/uni2532.glif
index 2113c7f6e..d27193aee 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2532.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2532.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2532" format="1">
+<glyph name="uni2532" format="2">
   <advance width="1233"/>
   <unicode hex="2532"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2533.glif b/source/Hack-Regular.ufo/glyphs/uni2533.glif
index 7158447b9..b2340787d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2533.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2533.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2533" format="1">
+<glyph name="uni2533" format="2">
   <advance width="1233"/>
   <unicode hex="2533"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2534.glif b/source/Hack-Regular.ufo/glyphs/uni2534.glif
index fc64d96bd..44f1e90ec 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2534.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2534.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2534" format="1">
+<glyph name="uni2534" format="2">
   <advance width="1233"/>
   <unicode hex="2534"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2535.glif b/source/Hack-Regular.ufo/glyphs/uni2535.glif
index 86b705611..92b5d9fb4 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2535.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2535.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2535" format="1">
+<glyph name="uni2535" format="2">
   <advance width="1233"/>
   <unicode hex="2535"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2536.glif b/source/Hack-Regular.ufo/glyphs/uni2536.glif
index 5ba854889..0bc16e000 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2536.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2536.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2536" format="1">
+<glyph name="uni2536" format="2">
   <advance width="1233"/>
   <unicode hex="2536"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2537.glif b/source/Hack-Regular.ufo/glyphs/uni2537.glif
index d06adad76..50634f1f0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2537.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2537.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2537" format="1">
+<glyph name="uni2537" format="2">
   <advance width="1233"/>
   <unicode hex="2537"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2538.glif b/source/Hack-Regular.ufo/glyphs/uni2538.glif
index 63679b811..3fbe88513 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2538.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2538.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2538" format="1">
+<glyph name="uni2538" format="2">
   <advance width="1233"/>
   <unicode hex="2538"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2539.glif b/source/Hack-Regular.ufo/glyphs/uni2539.glif
index 0aeb1ae5b..871292d9f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2539.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2539.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2539" format="1">
+<glyph name="uni2539" format="2">
   <advance width="1233"/>
   <unicode hex="2539"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni253A_.glif b/source/Hack-Regular.ufo/glyphs/uni253A_.glif
index d1f9403e1..6f14e3242 100644
--- a/source/Hack-Regular.ufo/glyphs/uni253A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni253A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni253A" format="1">
+<glyph name="uni253A" format="2">
   <advance width="1233"/>
   <unicode hex="253A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni253B_.glif b/source/Hack-Regular.ufo/glyphs/uni253B_.glif
index 6d1f8b5c9..14fe114d1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni253B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni253B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni253B" format="1">
+<glyph name="uni253B" format="2">
   <advance width="1233"/>
   <unicode hex="253B"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni253C_.glif b/source/Hack-Regular.ufo/glyphs/uni253C_.glif
index 581841704..74676cf9e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni253C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni253C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni253C" format="1">
+<glyph name="uni253C" format="2">
   <advance width="1233"/>
   <unicode hex="253C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni253D_.glif b/source/Hack-Regular.ufo/glyphs/uni253D_.glif
index f5841e09a..c4b47a679 100644
--- a/source/Hack-Regular.ufo/glyphs/uni253D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni253D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni253D" format="1">
+<glyph name="uni253D" format="2">
   <advance width="1233"/>
   <unicode hex="253D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni253E_.glif b/source/Hack-Regular.ufo/glyphs/uni253E_.glif
index 7ba89e7b1..5b551a63a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni253E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni253E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni253E" format="1">
+<glyph name="uni253E" format="2">
   <advance width="1233"/>
   <unicode hex="253E"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni253F_.glif b/source/Hack-Regular.ufo/glyphs/uni253F_.glif
index 1fcc62cbd..fefe01919 100644
--- a/source/Hack-Regular.ufo/glyphs/uni253F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni253F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni253F" format="1">
+<glyph name="uni253F" format="2">
   <advance width="1233"/>
   <unicode hex="253F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2540.glif b/source/Hack-Regular.ufo/glyphs/uni2540.glif
index 8734d3ccf..2ad2367f8 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2540.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2540.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2540" format="1">
+<glyph name="uni2540" format="2">
   <advance width="1233"/>
   <unicode hex="2540"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2541.glif b/source/Hack-Regular.ufo/glyphs/uni2541.glif
index 9bef0eee8..874c8ee08 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2541.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2541.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2541" format="1">
+<glyph name="uni2541" format="2">
   <advance width="1233"/>
   <unicode hex="2541"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2542.glif b/source/Hack-Regular.ufo/glyphs/uni2542.glif
index ad562119e..99e2e676f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2542.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2542.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2542" format="1">
+<glyph name="uni2542" format="2">
   <advance width="1233"/>
   <unicode hex="2542"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2543.glif b/source/Hack-Regular.ufo/glyphs/uni2543.glif
index 5166af2b6..0a2c4cf84 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2543.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2543.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2543" format="1">
+<glyph name="uni2543" format="2">
   <advance width="1233"/>
   <unicode hex="2543"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2544.glif b/source/Hack-Regular.ufo/glyphs/uni2544.glif
index 48e31de5c..58ec46752 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2544.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2544.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2544" format="1">
+<glyph name="uni2544" format="2">
   <advance width="1233"/>
   <unicode hex="2544"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2545.glif b/source/Hack-Regular.ufo/glyphs/uni2545.glif
index b9f2378bd..b005e36e2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2545.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2545.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2545" format="1">
+<glyph name="uni2545" format="2">
   <advance width="1233"/>
   <unicode hex="2545"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2546.glif b/source/Hack-Regular.ufo/glyphs/uni2546.glif
index cdaaf29e8..6e0d525bd 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2546.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2546.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2546" format="1">
+<glyph name="uni2546" format="2">
   <advance width="1233"/>
   <unicode hex="2546"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2547.glif b/source/Hack-Regular.ufo/glyphs/uni2547.glif
index fbbbae3de..9dc7aeab4 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2547.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2547.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2547" format="1">
+<glyph name="uni2547" format="2">
   <advance width="1233"/>
   <unicode hex="2547"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2548.glif b/source/Hack-Regular.ufo/glyphs/uni2548.glif
index 3c3e28a92..c34823556 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2548.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2548.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2548" format="1">
+<glyph name="uni2548" format="2">
   <advance width="1233"/>
   <unicode hex="2548"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2549.glif b/source/Hack-Regular.ufo/glyphs/uni2549.glif
index b3d0471df..5d6be817d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2549.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2549.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2549" format="1">
+<glyph name="uni2549" format="2">
   <advance width="1233"/>
   <unicode hex="2549"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni254A_.glif b/source/Hack-Regular.ufo/glyphs/uni254A_.glif
index f2328d0bc..01a40ee11 100644
--- a/source/Hack-Regular.ufo/glyphs/uni254A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni254A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni254A" format="1">
+<glyph name="uni254A" format="2">
   <advance width="1233"/>
   <unicode hex="254A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni254B_.glif b/source/Hack-Regular.ufo/glyphs/uni254B_.glif
index 89e3ecc7c..86d15e211 100644
--- a/source/Hack-Regular.ufo/glyphs/uni254B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni254B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni254B" format="1">
+<glyph name="uni254B" format="2">
   <advance width="1233"/>
   <unicode hex="254B"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni254C_.glif b/source/Hack-Regular.ufo/glyphs/uni254C_.glif
index bf16884c5..0d7049383 100644
--- a/source/Hack-Regular.ufo/glyphs/uni254C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni254C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni254C" format="1">
+<glyph name="uni254C" format="2">
   <advance width="1233"/>
   <unicode hex="254C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni254D_.glif b/source/Hack-Regular.ufo/glyphs/uni254D_.glif
index 79d4abc50..2f595fd35 100644
--- a/source/Hack-Regular.ufo/glyphs/uni254D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni254D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni254D" format="1">
+<glyph name="uni254D" format="2">
   <advance width="1233"/>
   <unicode hex="254D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni254E_.glif b/source/Hack-Regular.ufo/glyphs/uni254E_.glif
index 170dcfdd4..7fe74afe7 100644
--- a/source/Hack-Regular.ufo/glyphs/uni254E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni254E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni254E" format="1">
+<glyph name="uni254E" format="2">
   <advance width="1233"/>
   <unicode hex="254E"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni254F_.glif b/source/Hack-Regular.ufo/glyphs/uni254F_.glif
index 7a00fdbf5..598352872 100644
--- a/source/Hack-Regular.ufo/glyphs/uni254F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni254F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni254F" format="1">
+<glyph name="uni254F" format="2">
   <advance width="1233"/>
   <unicode hex="254F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2550.glif b/source/Hack-Regular.ufo/glyphs/uni2550.glif
index b47e7f6cf..3a3127b08 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2550.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2550.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2550" format="1">
+<glyph name="uni2550" format="2">
   <advance width="1233"/>
   <unicode hex="2550"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2551.glif b/source/Hack-Regular.ufo/glyphs/uni2551.glif
index 261f33ce0..b86f5797d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2551.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2551.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2551" format="1">
+<glyph name="uni2551" format="2">
   <advance width="1233"/>
   <unicode hex="2551"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2552.glif b/source/Hack-Regular.ufo/glyphs/uni2552.glif
index 5e8a62bfd..5cf675e17 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2552.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2552.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2552" format="1">
+<glyph name="uni2552" format="2">
   <advance width="1233"/>
   <unicode hex="2552"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2553.glif b/source/Hack-Regular.ufo/glyphs/uni2553.glif
index 03e805d83..b79ca303d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2553.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2553.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2553" format="1">
+<glyph name="uni2553" format="2">
   <advance width="1233"/>
   <unicode hex="2553"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2554.glif b/source/Hack-Regular.ufo/glyphs/uni2554.glif
index 97badf786..2dd8ae161 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2554.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2554.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2554" format="1">
+<glyph name="uni2554" format="2">
   <advance width="1233"/>
   <unicode hex="2554"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2555.glif b/source/Hack-Regular.ufo/glyphs/uni2555.glif
index 94103017c..68866dfb1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2555.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2555.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2555" format="1">
+<glyph name="uni2555" format="2">
   <advance width="1233"/>
   <unicode hex="2555"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2556.glif b/source/Hack-Regular.ufo/glyphs/uni2556.glif
index b3208e323..cdab621c7 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2556.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2556.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2556" format="1">
+<glyph name="uni2556" format="2">
   <advance width="1233"/>
   <unicode hex="2556"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2557.glif b/source/Hack-Regular.ufo/glyphs/uni2557.glif
index bb82a4b47..e2af7ab8d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2557.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2557.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2557" format="1">
+<glyph name="uni2557" format="2">
   <advance width="1233"/>
   <unicode hex="2557"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2558.glif b/source/Hack-Regular.ufo/glyphs/uni2558.glif
index 396f9de67..4e262549a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2558.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2558.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2558" format="1">
+<glyph name="uni2558" format="2">
   <advance width="1233"/>
   <unicode hex="2558"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2559.glif b/source/Hack-Regular.ufo/glyphs/uni2559.glif
index ba1eeeb4e..c122a93c1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2559.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2559.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2559" format="1">
+<glyph name="uni2559" format="2">
   <advance width="1233"/>
   <unicode hex="2559"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni255A_.glif b/source/Hack-Regular.ufo/glyphs/uni255A_.glif
index 1136c2a8e..f017411f2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni255A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni255A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni255A" format="1">
+<glyph name="uni255A" format="2">
   <advance width="1233"/>
   <unicode hex="255A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni255B_.glif b/source/Hack-Regular.ufo/glyphs/uni255B_.glif
index 904566700..0d441cda2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni255B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni255B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni255B" format="1">
+<glyph name="uni255B" format="2">
   <advance width="1233"/>
   <unicode hex="255B"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni255C_.glif b/source/Hack-Regular.ufo/glyphs/uni255C_.glif
index fc8692c05..8419d131f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni255C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni255C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni255C" format="1">
+<glyph name="uni255C" format="2">
   <advance width="1233"/>
   <unicode hex="255C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni255D_.glif b/source/Hack-Regular.ufo/glyphs/uni255D_.glif
index d1873f016..b093d68da 100644
--- a/source/Hack-Regular.ufo/glyphs/uni255D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni255D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni255D" format="1">
+<glyph name="uni255D" format="2">
   <advance width="1233"/>
   <unicode hex="255D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni255E_.glif b/source/Hack-Regular.ufo/glyphs/uni255E_.glif
index 18076afa2..b1469a4aa 100644
--- a/source/Hack-Regular.ufo/glyphs/uni255E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni255E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni255E" format="1">
+<glyph name="uni255E" format="2">
   <advance width="1233"/>
   <unicode hex="255E"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni255F_.glif b/source/Hack-Regular.ufo/glyphs/uni255F_.glif
index 40de34e6f..a1b53b07d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni255F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni255F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni255F" format="1">
+<glyph name="uni255F" format="2">
   <advance width="1233"/>
   <unicode hex="255F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2560.glif b/source/Hack-Regular.ufo/glyphs/uni2560.glif
index 256d00fbc..e06097e96 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2560.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2560.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2560" format="1">
+<glyph name="uni2560" format="2">
   <advance width="1233"/>
   <unicode hex="2560"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2561.glif b/source/Hack-Regular.ufo/glyphs/uni2561.glif
index 217236652..9da45f067 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2561.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2561.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2561" format="1">
+<glyph name="uni2561" format="2">
   <advance width="1233"/>
   <unicode hex="2561"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2562.glif b/source/Hack-Regular.ufo/glyphs/uni2562.glif
index 852242a73..be486e9ba 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2562.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2562.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2562" format="1">
+<glyph name="uni2562" format="2">
   <advance width="1233"/>
   <unicode hex="2562"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2563.glif b/source/Hack-Regular.ufo/glyphs/uni2563.glif
index 3135ce979..2f5b42d98 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2563.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2563.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2563" format="1">
+<glyph name="uni2563" format="2">
   <advance width="1233"/>
   <unicode hex="2563"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2564.glif b/source/Hack-Regular.ufo/glyphs/uni2564.glif
index f38dc6867..b3e049b39 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2564.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2564.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2564" format="1">
+<glyph name="uni2564" format="2">
   <advance width="1233"/>
   <unicode hex="2564"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2565.glif b/source/Hack-Regular.ufo/glyphs/uni2565.glif
index 32918026a..d73b072df 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2565.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2565.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2565" format="1">
+<glyph name="uni2565" format="2">
   <advance width="1233"/>
   <unicode hex="2565"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2566.glif b/source/Hack-Regular.ufo/glyphs/uni2566.glif
index 56e6dd721..a94f7d09c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2566.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2566.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2566" format="1">
+<glyph name="uni2566" format="2">
   <advance width="1233"/>
   <unicode hex="2566"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2567.glif b/source/Hack-Regular.ufo/glyphs/uni2567.glif
index 68b908f96..223af2028 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2567.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2567.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2567" format="1">
+<glyph name="uni2567" format="2">
   <advance width="1233"/>
   <unicode hex="2567"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2568.glif b/source/Hack-Regular.ufo/glyphs/uni2568.glif
index f549fa3bb..d38e8939e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2568.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2568.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2568" format="1">
+<glyph name="uni2568" format="2">
   <advance width="1233"/>
   <unicode hex="2568"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2569.glif b/source/Hack-Regular.ufo/glyphs/uni2569.glif
index 1a12528ef..b4e716f26 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2569.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2569.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2569" format="1">
+<glyph name="uni2569" format="2">
   <advance width="1233"/>
   <unicode hex="2569"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni256A_.glif b/source/Hack-Regular.ufo/glyphs/uni256A_.glif
index 04e260d1f..2ef579caa 100644
--- a/source/Hack-Regular.ufo/glyphs/uni256A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni256A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni256A" format="1">
+<glyph name="uni256A" format="2">
   <advance width="1233"/>
   <unicode hex="256A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni256B_.glif b/source/Hack-Regular.ufo/glyphs/uni256B_.glif
index 7333d3239..6d45122c3 100644
--- a/source/Hack-Regular.ufo/glyphs/uni256B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni256B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni256B" format="1">
+<glyph name="uni256B" format="2">
   <advance width="1233"/>
   <unicode hex="256B"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni256C_.glif b/source/Hack-Regular.ufo/glyphs/uni256C_.glif
index cd88ad20e..496a383b9 100644
--- a/source/Hack-Regular.ufo/glyphs/uni256C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni256C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni256C" format="1">
+<glyph name="uni256C" format="2">
   <advance width="1233"/>
   <unicode hex="256C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni256D_.glif b/source/Hack-Regular.ufo/glyphs/uni256D_.glif
index 8760acadf..d93b489d4 100644
--- a/source/Hack-Regular.ufo/glyphs/uni256D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni256D_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni256D" format="1">
+<glyph name="uni256D" format="2">
   <advance width="1233"/>
   <unicode hex="256D"/>
   <outline>
     <contour>
-      <point x="536" y="368" type="line" name="hr00" smooth="yes"/>
+      <point x="536" y="368" type="line" smooth="yes" name="hr00"/>
       <point x="536" y="588"/>
       <point x="648" y="790"/>
       <point x="876" y="790" type="curve" smooth="yes"/>
@@ -13,7 +13,7 @@
       <point x="876" y="618" type="line" smooth="yes"/>
       <point x="756" y="618"/>
       <point x="696" y="535"/>
-      <point x="696" y="368" type="curve" name="dh01" smooth="yes"/>
+      <point x="696" y="368" type="curve" smooth="yes" name="dh01"/>
       <point x="696" y="-530" type="line" name="av01"/>
       <point x="536" y="-530" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni256E_.glif b/source/Hack-Regular.ufo/glyphs/uni256E_.glif
index 8e445e2ab..e58b7c33a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni256E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni256E_.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni256E" format="1">
+<glyph name="uni256E" format="2">
   <advance width="1233"/>
   <unicode hex="256E"/>
   <outline>
     <contour>
-      <point x="536" y="368" type="line" name="hr00" smooth="yes"/>
+      <point x="536" y="368" type="line" smooth="yes" name="hr00"/>
       <point x="536" y="535"/>
       <point x="476" y="618"/>
-      <point x="356" y="618" type="curve" name="dv01" smooth="yes"/>
+      <point x="356" y="618" type="curve" smooth="yes" name="dv01"/>
       <point x="-20" y="618" type="line"/>
       <point x="-20" y="790" type="line"/>
-      <point x="356" y="790" type="line" name="dv02" smooth="yes"/>
+      <point x="356" y="790" type="line" smooth="yes" name="dv02"/>
       <point x="580" y="790"/>
       <point x="696" y="592"/>
-      <point x="696" y="368" type="curve" name="dh01" smooth="yes"/>
+      <point x="696" y="368" type="curve" smooth="yes" name="dh01"/>
       <point x="696" y="-530" type="line" name="av01"/>
       <point x="536" y="-530" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni256F_.glif b/source/Hack-Regular.ufo/glyphs/uni256F_.glif
index 5351c8523..e21cf5a0a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni256F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni256F_.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni256F" format="1">
+<glyph name="uni256F" format="2">
   <advance width="1233"/>
   <unicode hex="256F"/>
   <outline>
     <contour>
       <point x="-20" y="790" type="line" name="hr00"/>
-      <point x="356" y="790" type="line" name="dv02" smooth="yes"/>
+      <point x="356" y="790" type="line" smooth="yes" name="dv02"/>
       <point x="476" y="790"/>
       <point x="536" y="873"/>
-      <point x="536" y="1040" type="curve" name="dh01" smooth="yes"/>
+      <point x="536" y="1040" type="curve" smooth="yes" name="dh01"/>
       <point x="536" y="1950" type="line" name="av01"/>
       <point x="696" y="1950" type="line"/>
-      <point x="696" y="1040" type="line" name="dh02" smooth="yes"/>
+      <point x="696" y="1040" type="line" smooth="yes" name="dh02"/>
       <point x="696" y="816"/>
       <point x="580" y="618"/>
-      <point x="356" y="618" type="curve" name="dv01" smooth="yes"/>
+      <point x="356" y="618" type="curve" smooth="yes" name="dv01"/>
       <point x="-20" y="618" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2570.glif b/source/Hack-Regular.ufo/glyphs/uni2570.glif
index 4aa6427df..cd040d380 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2570.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2570.glif
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2570" format="1">
+<glyph name="uni2570" format="2">
   <advance width="1233"/>
   <unicode hex="2570"/>
   <outline>
     <contour>
-      <point x="876" y="618" type="line" name="hr00" smooth="yes"/>
+      <point x="876" y="618" type="line" smooth="yes" name="hr00"/>
       <point x="652" y="618"/>
       <point x="536" y="816"/>
-      <point x="536" y="1040" type="curve" name="dh01" smooth="yes"/>
+      <point x="536" y="1040" type="curve" smooth="yes" name="dh01"/>
       <point x="536" y="1950" type="line" name="av01"/>
       <point x="696" y="1950" type="line"/>
-      <point x="696" y="1040" type="line" name="dh02" smooth="yes"/>
+      <point x="696" y="1040" type="line" smooth="yes" name="dh02"/>
       <point x="696" y="873"/>
       <point x="756" y="790"/>
-      <point x="876" y="790" type="curve" name="dv01" smooth="yes"/>
+      <point x="876" y="790" type="curve" smooth="yes" name="dv01"/>
       <point x="1253" y="790" type="line"/>
       <point x="1253" y="618" type="line" name="sv01"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2571.glif b/source/Hack-Regular.ufo/glyphs/uni2571.glif
index 44ff55c93..eef474427 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2571.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2571.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2571" format="1">
+<glyph name="uni2571" format="2">
   <advance width="1233"/>
   <unicode hex="2571"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2572.glif b/source/Hack-Regular.ufo/glyphs/uni2572.glif
index ca5e423c0..498ab0ee7 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2572.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2572.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2572" format="1">
+<glyph name="uni2572" format="2">
   <advance width="1233"/>
   <unicode hex="2572"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2573.glif b/source/Hack-Regular.ufo/glyphs/uni2573.glif
index 159f35381..8fbf5b682 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2573.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2573.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2573" format="1">
+<glyph name="uni2573" format="2">
   <advance width="1233"/>
   <unicode hex="2573"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2574.glif b/source/Hack-Regular.ufo/glyphs/uni2574.glif
index e7c84c71f..0e09ba91f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2574.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2574.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2574" format="1">
+<glyph name="uni2574" format="2">
   <advance width="1233"/>
   <unicode hex="2574"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2575.glif b/source/Hack-Regular.ufo/glyphs/uni2575.glif
index 96e280131..ec944d0a4 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2575.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2575.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2575" format="1">
+<glyph name="uni2575" format="2">
   <advance width="1233"/>
   <unicode hex="2575"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2576.glif b/source/Hack-Regular.ufo/glyphs/uni2576.glif
index 1b39e2a22..11ed02cb6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2576.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2576.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2576" format="1">
+<glyph name="uni2576" format="2">
   <advance width="1233"/>
   <unicode hex="2576"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2577.glif b/source/Hack-Regular.ufo/glyphs/uni2577.glif
index aa48e51a7..53060389c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2577.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2577.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2577" format="1">
+<glyph name="uni2577" format="2">
   <advance width="1233"/>
   <unicode hex="2577"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2578.glif b/source/Hack-Regular.ufo/glyphs/uni2578.glif
index 00736562c..0945fca2e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2578.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2578.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2578" format="1">
+<glyph name="uni2578" format="2">
   <advance width="1233"/>
   <unicode hex="2578"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2579.glif b/source/Hack-Regular.ufo/glyphs/uni2579.glif
index 8c11f2f6e..128bd20e7 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2579.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2579.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2579" format="1">
+<glyph name="uni2579" format="2">
   <advance width="1233"/>
   <unicode hex="2579"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni257A_.glif b/source/Hack-Regular.ufo/glyphs/uni257A_.glif
index b3693128a..a0d9bff9c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni257A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni257A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni257A" format="1">
+<glyph name="uni257A" format="2">
   <advance width="1233"/>
   <unicode hex="257A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni257B_.glif b/source/Hack-Regular.ufo/glyphs/uni257B_.glif
index 2393151f1..5912156b3 100644
--- a/source/Hack-Regular.ufo/glyphs/uni257B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni257B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni257B" format="1">
+<glyph name="uni257B" format="2">
   <advance width="1233"/>
   <unicode hex="257B"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni257C_.glif b/source/Hack-Regular.ufo/glyphs/uni257C_.glif
index 283219c78..b38ca326b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni257C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni257C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni257C" format="1">
+<glyph name="uni257C" format="2">
   <advance width="1233"/>
   <unicode hex="257C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni257D_.glif b/source/Hack-Regular.ufo/glyphs/uni257D_.glif
index 194dbdb46..3f8e9ceeb 100644
--- a/source/Hack-Regular.ufo/glyphs/uni257D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni257D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni257D" format="1">
+<glyph name="uni257D" format="2">
   <advance width="1233"/>
   <unicode hex="257D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni257E_.glif b/source/Hack-Regular.ufo/glyphs/uni257E_.glif
index 2aff928e0..7115d7f36 100644
--- a/source/Hack-Regular.ufo/glyphs/uni257E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni257E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni257E" format="1">
+<glyph name="uni257E" format="2">
   <advance width="1233"/>
   <unicode hex="257E"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni257F_.glif b/source/Hack-Regular.ufo/glyphs/uni257F_.glif
index d48717c62..4d3d7d4d6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni257F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni257F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni257F" format="1">
+<glyph name="uni257F" format="2">
   <advance width="1233"/>
   <unicode hex="257F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2581.glif b/source/Hack-Regular.ufo/glyphs/uni2581.glif
index 7f60f7225..23e6e5108 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2581.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2581.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2581" format="1">
+<glyph name="uni2581" format="2">
   <advance width="1233"/>
   <unicode hex="2581"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2582.glif b/source/Hack-Regular.ufo/glyphs/uni2582.glif
index c9478afcc..f8bfb0f42 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2582.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2582.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2582" format="1">
+<glyph name="uni2582" format="2">
   <advance width="1233"/>
   <unicode hex="2582"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2583.glif b/source/Hack-Regular.ufo/glyphs/uni2583.glif
index b8dcb4bd2..e1857a7c5 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2583.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2583.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2583" format="1">
+<glyph name="uni2583" format="2">
   <advance width="1233"/>
   <unicode hex="2583"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2585.glif b/source/Hack-Regular.ufo/glyphs/uni2585.glif
index acd7aea7e..e9b1c23b3 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2585.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2585.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2585" format="1">
+<glyph name="uni2585" format="2">
   <advance width="1233"/>
   <unicode hex="2585"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2586.glif b/source/Hack-Regular.ufo/glyphs/uni2586.glif
index b5de7913d..ef703250c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2586.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2586.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2586" format="1">
+<glyph name="uni2586" format="2">
   <advance width="1233"/>
   <unicode hex="2586"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2587.glif b/source/Hack-Regular.ufo/glyphs/uni2587.glif
index 007ee00cc..fd9d448e0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2587.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2587.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2587" format="1">
+<glyph name="uni2587" format="2">
   <advance width="1233"/>
   <unicode hex="2587"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2589.glif b/source/Hack-Regular.ufo/glyphs/uni2589.glif
index ec9e9d3a4..3117b7dfd 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2589.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2589.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2589" format="1">
+<glyph name="uni2589" format="2">
   <advance width="1233"/>
   <unicode hex="2589"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni258A_.glif b/source/Hack-Regular.ufo/glyphs/uni258A_.glif
index a73454fa8..fd5676311 100644
--- a/source/Hack-Regular.ufo/glyphs/uni258A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni258A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni258A" format="1">
+<glyph name="uni258A" format="2">
   <advance width="1233"/>
   <unicode hex="258A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni258B_.glif b/source/Hack-Regular.ufo/glyphs/uni258B_.glif
index 72d224b5a..89e6f2c33 100644
--- a/source/Hack-Regular.ufo/glyphs/uni258B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni258B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni258B" format="1">
+<glyph name="uni258B" format="2">
   <advance width="1233"/>
   <unicode hex="258B"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni258D_.glif b/source/Hack-Regular.ufo/glyphs/uni258D_.glif
index b0ef39274..98ff96a34 100644
--- a/source/Hack-Regular.ufo/glyphs/uni258D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni258D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni258D" format="1">
+<glyph name="uni258D" format="2">
   <advance width="1233"/>
   <unicode hex="258D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni258E_.glif b/source/Hack-Regular.ufo/glyphs/uni258E_.glif
index b4d1a0915..521e1a6bd 100644
--- a/source/Hack-Regular.ufo/glyphs/uni258E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni258E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni258E" format="1">
+<glyph name="uni258E" format="2">
   <advance width="1233"/>
   <unicode hex="258E"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni258F_.glif b/source/Hack-Regular.ufo/glyphs/uni258F_.glif
index 750e2552a..553621be7 100644
--- a/source/Hack-Regular.ufo/glyphs/uni258F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni258F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni258F" format="1">
+<glyph name="uni258F" format="2">
   <advance width="1233"/>
   <unicode hex="258F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2594.glif b/source/Hack-Regular.ufo/glyphs/uni2594.glif
index d79840b5e..59c332b67 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2594.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2594.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2594" format="1">
+<glyph name="uni2594" format="2">
   <advance width="1233"/>
   <unicode hex="2594"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2595.glif b/source/Hack-Regular.ufo/glyphs/uni2595.glif
index cda179a58..db5d70a0d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2595.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2595.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2595" format="1">
+<glyph name="uni2595" format="2">
   <advance width="1233"/>
   <unicode hex="2595"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2596.glif b/source/Hack-Regular.ufo/glyphs/uni2596.glif
index 2efeec59c..f68528753 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2596.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2596.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2596" format="1">
+<glyph name="uni2596" format="2">
   <advance width="1233"/>
   <unicode hex="2596"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2597.glif b/source/Hack-Regular.ufo/glyphs/uni2597.glif
index 54090d9e5..e57f76e3f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2597.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2597.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2597" format="1">
+<glyph name="uni2597" format="2">
   <advance width="1233"/>
   <unicode hex="2597"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2598.glif b/source/Hack-Regular.ufo/glyphs/uni2598.glif
index 4ad146ffd..f13d553ef 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2598.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2598.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2598" format="1">
+<glyph name="uni2598" format="2">
   <advance width="1233"/>
   <unicode hex="2598"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2599.glif b/source/Hack-Regular.ufo/glyphs/uni2599.glif
index b68987725..75dfb6d26 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2599.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2599.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2599" format="1">
+<glyph name="uni2599" format="2">
   <advance width="1233"/>
   <unicode hex="2599"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni259A_.glif b/source/Hack-Regular.ufo/glyphs/uni259A_.glif
index 37b0c3d80..5c821a0bf 100644
--- a/source/Hack-Regular.ufo/glyphs/uni259A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni259A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni259A" format="1">
+<glyph name="uni259A" format="2">
   <advance width="1233"/>
   <unicode hex="259A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni259B_.glif b/source/Hack-Regular.ufo/glyphs/uni259B_.glif
index f3ff59173..bc66e342a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni259B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni259B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni259B" format="1">
+<glyph name="uni259B" format="2">
   <advance width="1233"/>
   <unicode hex="259B"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni259C_.glif b/source/Hack-Regular.ufo/glyphs/uni259C_.glif
index 3d3236bb4..8fab417cc 100644
--- a/source/Hack-Regular.ufo/glyphs/uni259C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni259C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni259C" format="1">
+<glyph name="uni259C" format="2">
   <advance width="1233"/>
   <unicode hex="259C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni259D_.glif b/source/Hack-Regular.ufo/glyphs/uni259D_.glif
index 515a344a5..53ec6e2f6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni259D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni259D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni259D" format="1">
+<glyph name="uni259D" format="2">
   <advance width="1233"/>
   <unicode hex="259D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni259E_.glif b/source/Hack-Regular.ufo/glyphs/uni259E_.glif
index 2d975680b..59ac6eb46 100644
--- a/source/Hack-Regular.ufo/glyphs/uni259E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni259E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni259E" format="1">
+<glyph name="uni259E" format="2">
   <advance width="1233"/>
   <unicode hex="259E"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni259F_.glif b/source/Hack-Regular.ufo/glyphs/uni259F_.glif
index 6b9499033..2342c43fa 100644
--- a/source/Hack-Regular.ufo/glyphs/uni259F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni259F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni259F" format="1">
+<glyph name="uni259F" format="2">
   <advance width="1233"/>
   <unicode hex="259F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25A_1.glif b/source/Hack-Regular.ufo/glyphs/uni25A_1.glif
index c26194bf7..6315b4736 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25A_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25A_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A1" format="1">
+<glyph name="uni25A1" format="2">
   <advance width="1233"/>
   <unicode hex="25A1"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25A_2.glif b/source/Hack-Regular.ufo/glyphs/uni25A_2.glif
index f2127405e..858066667 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25A_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25A_2.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A2" format="1">
+<glyph name="uni25A2" format="2">
   <advance width="1233"/>
   <unicode hex="25A2"/>
   <outline>
     <contour>
-      <point x="348" y="-78" type="line" name="hr00" smooth="yes"/>
+      <point x="348" y="-78" type="line" smooth="yes" name="hr00"/>
       <point x="120" y="-78"/>
       <point x="6" y="36"/>
-      <point x="6" y="264" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="264" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="800" type="line" smooth="yes"/>
       <point x="6" y="1028"/>
       <point x="120" y="1142"/>
-      <point x="348" y="1142" type="curve" name="at01" smooth="yes"/>
+      <point x="348" y="1142" type="curve" smooth="yes" name="at01"/>
       <point x="885" y="1142" type="line" smooth="yes"/>
       <point x="1113" y="1142"/>
       <point x="1227" y="1028"/>
       <point x="1227" y="800" type="curve" smooth="yes"/>
-      <point x="1227" y="264" type="line" name="sh02" smooth="yes"/>
+      <point x="1227" y="264" type="line" smooth="yes" name="sh02"/>
       <point x="1227" y="36"/>
       <point x="1113" y="-78"/>
       <point x="885" y="-78" type="curve" smooth="yes"/>
@@ -25,19 +25,19 @@
       <point x="885" y="36" type="line" smooth="yes"/>
       <point x="1037" y="36"/>
       <point x="1113" y="112"/>
-      <point x="1113" y="264" type="curve" name="ah01" smooth="yes"/>
+      <point x="1113" y="264" type="curve" smooth="yes" name="ah01"/>
       <point x="1113" y="800" type="line" smooth="yes"/>
       <point x="1113" y="952"/>
       <point x="1037" y="1028"/>
-      <point x="885" y="1028" type="curve" name="sv01" smooth="yes"/>
+      <point x="885" y="1028" type="curve" smooth="yes" name="sv01"/>
       <point x="348" y="1028" type="line" smooth="yes"/>
       <point x="196" y="1028"/>
       <point x="120" y="952"/>
       <point x="120" y="800" type="curve" smooth="yes"/>
-      <point x="120" y="264" type="line" name="sh03" smooth="yes"/>
+      <point x="120" y="264" type="line" smooth="yes" name="sh03"/>
       <point x="120" y="112"/>
       <point x="196" y="36"/>
-      <point x="348" y="36" type="curve" name="dv01" smooth="yes"/>
+      <point x="348" y="36" type="curve" smooth="yes" name="dv01"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25A_3.glif b/source/Hack-Regular.ufo/glyphs/uni25A_3.glif
index 36c94bbfe..c042b6bc1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25A_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25A_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A3" format="1">
+<glyph name="uni25A3" format="2">
   <advance width="1233"/>
   <unicode hex="25A3"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25A_4.glif b/source/Hack-Regular.ufo/glyphs/uni25A_4.glif
index 5e3714ff2..21fdb7759 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25A_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A4" format="1">
+<glyph name="uni25A4" format="2">
   <advance width="1233"/>
   <unicode hex="25A4"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25A_5.glif b/source/Hack-Regular.ufo/glyphs/uni25A_5.glif
index 0fbe65d2c..812b2bcc5 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25A_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25A_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A5" format="1">
+<glyph name="uni25A5" format="2">
   <advance width="1233"/>
   <unicode hex="25A5"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25A_6.glif b/source/Hack-Regular.ufo/glyphs/uni25A_6.glif
index c26e2bbc0..6144835f6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25A_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25A_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A6" format="1">
+<glyph name="uni25A6" format="2">
   <advance width="1233"/>
   <unicode hex="25A6"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25A_7.glif b/source/Hack-Regular.ufo/glyphs/uni25A_7.glif
index ab64b0c85..e6dce2a0d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25A_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25A_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A7" format="1">
+<glyph name="uni25A7" format="2">
   <advance width="1233"/>
   <unicode hex="25A7"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25A_8.glif b/source/Hack-Regular.ufo/glyphs/uni25A_8.glif
index 401d22e1b..5e76c45f1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25A_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25A_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A8" format="1">
+<glyph name="uni25A8" format="2">
   <advance width="1233"/>
   <unicode hex="25A8"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25A_9.glif b/source/Hack-Regular.ufo/glyphs/uni25A_9.glif
index 61797e14b..4ed18f324 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25A_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25A_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25A9" format="1">
+<glyph name="uni25A9" format="2">
   <advance width="1233"/>
   <unicode hex="25A9"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25A_A_.glif b/source/Hack-Regular.ufo/glyphs/uni25A_A_.glif
index 959453953..16104d2c6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25A_A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25A_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25AA" format="1">
+<glyph name="uni25AA" format="2">
   <advance width="1233"/>
   <unicode hex="25AA"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25A_B_.glif b/source/Hack-Regular.ufo/glyphs/uni25A_B_.glif
index 0b3cb50c9..638b2ab31 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25A_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25A_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25AB" format="1">
+<glyph name="uni25AB" format="2">
   <advance width="1233"/>
   <unicode hex="25AB"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25A_D_.glif b/source/Hack-Regular.ufo/glyphs/uni25A_D_.glif
index b22543c04..2eb4c8ecb 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25A_D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25A_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25AD" format="1">
+<glyph name="uni25AD" format="2">
   <advance width="1233"/>
   <unicode hex="25AD"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25A_E_.glif b/source/Hack-Regular.ufo/glyphs/uni25A_E_.glif
index 813bd9b32..24040b324 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25A_E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25A_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25AE" format="1">
+<glyph name="uni25AE" format="2">
   <advance width="1233"/>
   <unicode hex="25AE"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25A_F_.glif b/source/Hack-Regular.ufo/glyphs/uni25A_F_.glif
index 7c8ab6805..fb0cb65b0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25A_F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25A_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25AF" format="1">
+<glyph name="uni25AF" format="2">
   <advance width="1233"/>
   <unicode hex="25AF"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25B_0.glif b/source/Hack-Regular.ufo/glyphs/uni25B_0.glif
index 32067171c..36e07ee33 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25B_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25B_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B0" format="1">
+<glyph name="uni25B0" format="2">
   <advance width="1233"/>
   <unicode hex="25B0"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25B_1.glif b/source/Hack-Regular.ufo/glyphs/uni25B_1.glif
index accea48ba..880415fd6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25B_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25B_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B1" format="1">
+<glyph name="uni25B1" format="2">
   <advance width="1233"/>
   <unicode hex="25B1"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25B_3.glif b/source/Hack-Regular.ufo/glyphs/uni25B_3.glif
index fd52a7831..8eeebcbe8 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25B_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B3" format="1">
+<glyph name="uni25B3" format="2">
   <advance width="1233"/>
   <unicode hex="25B3"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25B_4.glif b/source/Hack-Regular.ufo/glyphs/uni25B_4.glif
index 2f4c8ad2d..a7300a0c1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25B_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25B_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B4" format="1">
+<glyph name="uni25B4" format="2">
   <advance width="1233"/>
   <unicode hex="25B4"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25B_5.glif b/source/Hack-Regular.ufo/glyphs/uni25B_5.glif
index 3da52a099..3d8d86a09 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25B_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25B_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B5" format="1">
+<glyph name="uni25B5" format="2">
   <advance width="1233"/>
   <unicode hex="25B5"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25B_6.glif b/source/Hack-Regular.ufo/glyphs/uni25B_6.glif
index b24ca8021..a353e767f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25B_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25B_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B6" format="1">
+<glyph name="uni25B6" format="2">
   <advance width="1233"/>
   <unicode hex="25B6"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25B_7.glif b/source/Hack-Regular.ufo/glyphs/uni25B_7.glif
index 0e05e4231..efa8ffeea 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25B_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25B_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B7" format="1">
+<glyph name="uni25B7" format="2">
   <advance width="1233"/>
   <unicode hex="25B7"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25B_8.glif b/source/Hack-Regular.ufo/glyphs/uni25B_8.glif
index 283363ed9..d95e6bf41 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25B_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25B_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B8" format="1">
+<glyph name="uni25B8" format="2">
   <advance width="1233"/>
   <unicode hex="25B8"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25B_9.glif b/source/Hack-Regular.ufo/glyphs/uni25B_9.glif
index 6ee625376..385aca318 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25B_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25B_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25B9" format="1">
+<glyph name="uni25B9" format="2">
   <advance width="1233"/>
   <unicode hex="25B9"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25B_B_.glif b/source/Hack-Regular.ufo/glyphs/uni25B_B_.glif
index 129f3d1dc..140725d5b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25B_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25B_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25BB" format="1">
+<glyph name="uni25BB" format="2">
   <advance width="1233"/>
   <unicode hex="25BB"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25B_D_.glif b/source/Hack-Regular.ufo/glyphs/uni25B_D_.glif
index a5beca320..1616d7f0d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25B_D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25B_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25BD" format="1">
+<glyph name="uni25BD" format="2">
   <advance width="1233"/>
   <unicode hex="25BD"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25B_E_.glif b/source/Hack-Regular.ufo/glyphs/uni25B_E_.glif
index ab81e1a04..c8b768042 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25B_E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25B_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25BE" format="1">
+<glyph name="uni25BE" format="2">
   <advance width="1233"/>
   <unicode hex="25BE"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25B_F_.glif b/source/Hack-Regular.ufo/glyphs/uni25B_F_.glif
index ad009b48a..79b3c7447 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25B_F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25B_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25BF" format="1">
+<glyph name="uni25BF" format="2">
   <advance width="1233"/>
   <unicode hex="25BF"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25C_0.glif b/source/Hack-Regular.ufo/glyphs/uni25C_0.glif
index fc2633cbd..f87fcba59 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25C_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25C_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C0" format="1">
+<glyph name="uni25C0" format="2">
   <advance width="1233"/>
   <unicode hex="25C0"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25C_1.glif b/source/Hack-Regular.ufo/glyphs/uni25C_1.glif
index 219fd6c09..fa5e5e82b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25C_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25C_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C1" format="1">
+<glyph name="uni25C1" format="2">
   <advance width="1233"/>
   <unicode hex="25C1"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25C_2.glif b/source/Hack-Regular.ufo/glyphs/uni25C_2.glif
index 93b5430fb..92d86f80b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25C_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25C_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C2" format="1">
+<glyph name="uni25C2" format="2">
   <advance width="1233"/>
   <unicode hex="25C2"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25C_3.glif b/source/Hack-Regular.ufo/glyphs/uni25C_3.glif
index 426dc11ea..ebc3ff8c4 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25C_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25C_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C3" format="1">
+<glyph name="uni25C3" format="2">
   <advance width="1233"/>
   <unicode hex="25C3"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25C_5.glif b/source/Hack-Regular.ufo/glyphs/uni25C_5.glif
index 8f0472fdc..097675f8b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25C_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25C_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C5" format="1">
+<glyph name="uni25C5" format="2">
   <advance width="1233"/>
   <unicode hex="25C5"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25C_6.glif b/source/Hack-Regular.ufo/glyphs/uni25C_6.glif
index bbd364d75..0cc721da9 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25C_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25C_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C6" format="1">
+<glyph name="uni25C6" format="2">
   <advance width="1233"/>
   <unicode hex="25C6"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25C_7.glif b/source/Hack-Regular.ufo/glyphs/uni25C_7.glif
index 7dd66189b..aa413a176 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25C_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25C_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C7" format="1">
+<glyph name="uni25C7" format="2">
   <advance width="1233"/>
   <unicode hex="25C7"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25C_8.glif b/source/Hack-Regular.ufo/glyphs/uni25C_8.glif
index c7309c626..f5ee8c31b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25C_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25C_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C8" format="1">
+<glyph name="uni25C8" format="2">
   <advance width="1233"/>
   <unicode hex="25C8"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25C_9.glif b/source/Hack-Regular.ufo/glyphs/uni25C_9.glif
index 8fa8f4de4..d332acdad 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25C_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25C_9.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25C9" format="1">
+<glyph name="uni25C9" format="2">
   <advance width="1233"/>
   <unicode hex="25C9"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv03"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="616" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="692" y="39"/>
       <point x="778" y="62"/>
       <point x="861" y="109" type="curve" smooth="yes"/>
       <point x="1021" y="200"/>
       <point x="1105" y="349"/>
-      <point x="1105" y="532" type="curve" name="ah01" smooth="yes"/>
+      <point x="1105" y="532" type="curve" smooth="yes" name="ah01"/>
       <point x="1105" y="715"/>
       <point x="1021" y="864"/>
       <point x="861" y="955" type="curve" smooth="yes"/>
       <point x="778" y="1002"/>
       <point x="692" y="1025"/>
-      <point x="616" y="1025" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1025" type="curve" smooth="yes" name="dv02"/>
       <point x="540" y="1025"/>
       <point x="454" y="1002"/>
       <point x="371" y="955" type="curve" smooth="yes"/>
       <point x="216" y="867"/>
       <point x="128" y="723"/>
-      <point x="128" y="532" type="curve" name="sh03" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="sh03"/>
       <point x="128" y="341"/>
       <point x="216" y="197"/>
       <point x="371" y="109" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25C_C_.glif b/source/Hack-Regular.ufo/glyphs/uni25C_C_.glif
index 969161cbf..df176d399 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25C_C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25C_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25CC" format="1">
+<glyph name="uni25CC" format="2">
   <advance width="1233"/>
   <unicode hex="25CC"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="466" y="1127" type="line" name="hr00"/>
       <point x="516" y="1141"/>
       <point x="566" y="1148"/>
-      <point x="616" y="1148" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="1148" type="curve" smooth="yes" name="dv04"/>
       <point x="666" y="1148"/>
       <point x="716" y="1141"/>
       <point x="766" y="1127" type="curve"/>
       <point x="736" y="1008" type="line"/>
       <point x="695" y="1019"/>
       <point x="655" y="1025"/>
-      <point x="616" y="1025" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1025" type="curve" smooth="yes" name="dv03"/>
       <point x="577" y="1025"/>
       <point x="537" y="1019"/>
       <point x="496" y="1008" type="curve"/>
@@ -43,14 +43,14 @@
       <point x="22" y="382" type="line"/>
       <point x="11" y="427"/>
       <point x="6" y="477"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="587"/>
       <point x="11" y="637"/>
       <point x="22" y="682" type="curve"/>
       <point x="141" y="652" type="line" name="sh03"/>
       <point x="132" y="615"/>
       <point x="128" y="575"/>
-      <point x="128" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="128" y="489"/>
       <point x="132" y="449"/>
       <point x="141" y="412" type="curve" name="sh04"/>
@@ -59,14 +59,14 @@
       <point x="1092" y="412" type="line" name="sh05"/>
       <point x="1101" y="449"/>
       <point x="1105" y="489"/>
-      <point x="1105" y="532" type="curve" name="ah01" smooth="yes"/>
+      <point x="1105" y="532" type="curve" smooth="yes" name="ah01"/>
       <point x="1105" y="575"/>
       <point x="1101" y="615"/>
       <point x="1092" y="652" type="curve" name="sh06"/>
       <point x="1211" y="682" type="line"/>
       <point x="1222" y="637"/>
       <point x="1227" y="587"/>
-      <point x="1227" y="532" type="curve" name="sh07" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh07"/>
       <point x="1227" y="477"/>
       <point x="1222" y="427"/>
       <point x="1211" y="382" type="curve"/>
@@ -92,14 +92,14 @@
       <point x="921" y="4" type="curve"/>
     </contour>
     <contour>
-      <point x="616" y="-84" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-84" type="curve" smooth="yes" name="dv01"/>
       <point x="566" y="-84"/>
       <point x="516" y="-77"/>
       <point x="466" y="-63" type="curve"/>
       <point x="496" y="56" type="line"/>
       <point x="537" y="45"/>
       <point x="577" y="39"/>
-      <point x="616" y="39" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv02"/>
       <point x="655" y="39"/>
       <point x="695" y="45"/>
       <point x="736" y="56" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25C_D_.glif b/source/Hack-Regular.ufo/glyphs/uni25C_D_.glif
index edbff584f..0af4260c5 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25C_D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25C_D_.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25CD" format="1">
+<glyph name="uni25CD" format="2">
   <advance width="1233"/>
   <unicode hex="25CD"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="dh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="dh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="dh12" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="dh12"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -81,7 +81,7 @@
       <point x="1002" y="226" type="line" name="dh10"/>
       <point x="1071" y="309"/>
       <point x="1105" y="411"/>
-      <point x="1105" y="532" type="curve" name="dh11" smooth="yes"/>
+      <point x="1105" y="532" type="curve" smooth="yes" name="dh11"/>
       <point x="1105" y="653"/>
       <point x="1071" y="755"/>
       <point x="1002" y="838" type="curve" name="iv03"/>
@@ -90,7 +90,7 @@
       <point x="226" y="832" type="line" name="dh03"/>
       <point x="161" y="751"/>
       <point x="128" y="651"/>
-      <point x="128" y="532" type="curve" name="dh02" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="dh02"/>
       <point x="128" y="413"/>
       <point x="161" y="313"/>
       <point x="226" y="232" type="curve" name="iv04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25C_E_.glif b/source/Hack-Regular.ufo/glyphs/uni25C_E_.glif
index 5a1a8765c..c5f74c61e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25C_E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25C_E_.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25CE" format="1">
+<glyph name="uni25CE" format="2">
   <advance width="1233"/>
   <unicode hex="25CE"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="dh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="dh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv03"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="dh08" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="dh08"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="616" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="692" y="39"/>
       <point x="778" y="62"/>
       <point x="861" y="109" type="curve" smooth="yes"/>
       <point x="1021" y="200"/>
       <point x="1105" y="349"/>
-      <point x="1105" y="532" type="curve" name="dh07" smooth="yes"/>
+      <point x="1105" y="532" type="curve" smooth="yes" name="dh07"/>
       <point x="1105" y="715"/>
       <point x="1021" y="864"/>
       <point x="861" y="955" type="curve" smooth="yes"/>
       <point x="778" y="1002"/>
       <point x="692" y="1025"/>
-      <point x="616" y="1025" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1025" type="curve" smooth="yes" name="dv02"/>
       <point x="540" y="1025"/>
       <point x="454" y="1002"/>
       <point x="371" y="955" type="curve" smooth="yes"/>
       <point x="216" y="867"/>
       <point x="128" y="723"/>
-      <point x="128" y="532" type="curve" name="dh02" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="dh02"/>
       <point x="128" y="341"/>
       <point x="216" y="197"/>
       <point x="371" y="109" type="curve" smooth="yes"/>
@@ -56,25 +56,25 @@
       <point x="540" y="39"/>
     </contour>
     <contour>
-      <point x="616" y="286" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="286" type="curve" smooth="yes" name="dv04"/>
       <point x="580" y="286"/>
       <point x="536" y="297"/>
       <point x="493" y="321" type="curve" smooth="yes"/>
       <point x="414" y="365"/>
       <point x="372" y="440"/>
-      <point x="372" y="532" type="curve" name="dh03" smooth="yes"/>
+      <point x="372" y="532" type="curve" smooth="yes" name="dh03"/>
       <point x="372" y="624"/>
       <point x="414" y="699"/>
       <point x="493" y="743" type="curve" smooth="yes"/>
       <point x="536" y="767"/>
       <point x="580" y="778"/>
-      <point x="616" y="778" type="curve" name="dv05" smooth="yes"/>
+      <point x="616" y="778" type="curve" smooth="yes" name="dv05"/>
       <point x="655" y="778"/>
       <point x="700" y="766"/>
       <point x="739" y="743" type="curve" smooth="yes"/>
       <point x="812" y="702"/>
       <point x="861" y="632"/>
-      <point x="861" y="532" type="curve" name="dh06" smooth="yes"/>
+      <point x="861" y="532" type="curve" smooth="yes" name="dh06"/>
       <point x="861" y="432"/>
       <point x="812" y="362"/>
       <point x="739" y="321" type="curve" smooth="yes"/>
@@ -88,7 +88,7 @@
       <point x="684" y="416" type="curve" smooth="yes"/>
       <point x="729" y="443"/>
       <point x="751" y="481"/>
-      <point x="751" y="532" type="curve" name="dh05" smooth="yes"/>
+      <point x="751" y="532" type="curve" smooth="yes" name="dh05"/>
       <point x="751" y="583"/>
       <point x="729" y="621"/>
       <point x="684" y="648" type="curve" smooth="yes"/>
@@ -100,7 +100,7 @@
       <point x="549" y="648" type="curve" smooth="yes"/>
       <point x="504" y="622"/>
       <point x="482" y="583"/>
-      <point x="482" y="532" type="curve" name="dh04" smooth="yes"/>
+      <point x="482" y="532" type="curve" smooth="yes" name="dh04"/>
       <point x="482" y="481"/>
       <point x="504" y="442"/>
       <point x="549" y="416" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25C_F_.glif b/source/Hack-Regular.ufo/glyphs/uni25C_F_.glif
index 46c39961b..309ec8c30 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25C_F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25C_F_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25CF" format="1">
+<glyph name="uni25CF" format="2">
   <advance width="1233"/>
   <unicode hex="25CF"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
@@ -16,7 +16,7 @@
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25D_0.glif b/source/Hack-Regular.ufo/glyphs/uni25D_0.glif
index 718c14e9a..b2dc1c3b4 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25D_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25D_0.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D0" format="1">
+<glyph name="uni25D0" format="2">
   <advance width="1233"/>
   <unicode hex="25D0"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
@@ -16,13 +16,13 @@
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="dh02" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="dh02"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="861" y="109" type="curve" smooth="yes"/>
       <point x="1021" y="200"/>
       <point x="1105" y="349"/>
-      <point x="1105" y="532" type="curve" name="dh01" smooth="yes"/>
+      <point x="1105" y="532" type="curve" smooth="yes" name="dh01"/>
       <point x="1105" y="715"/>
       <point x="1021" y="864"/>
       <point x="861" y="955" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25D_1.glif b/source/Hack-Regular.ufo/glyphs/uni25D_1.glif
index bc2550c08..0b5101c8b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25D_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25D_1.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D1" format="1">
+<glyph name="uni25D1" format="2">
   <advance width="1233"/>
   <unicode hex="25D1"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="dh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="dh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="372" y="954" type="curve" smooth="yes"/>
       <point x="211" y="861"/>
       <point x="128" y="725"/>
-      <point x="128" y="532" type="curve" name="dh02" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="dh02"/>
       <point x="128" y="339"/>
       <point x="211" y="203"/>
       <point x="372" y="110" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25D_2.glif b/source/Hack-Regular.ufo/glyphs/uni25D_2.glif
index ef60c8abd..351ade671 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25D_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25D_2.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D2" format="1">
+<glyph name="uni25D2" format="2">
   <advance width="1233"/>
   <unicode hex="25D2"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -36,7 +36,7 @@
       <point x="860" y="954" type="curve" smooth="yes"/>
       <point x="779" y="1001"/>
       <point x="697" y="1025"/>
-      <point x="616" y="1025" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1025" type="curve" smooth="yes" name="dv01"/>
       <point x="535" y="1025"/>
       <point x="453" y="1001"/>
       <point x="372" y="954" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25D_3.glif b/source/Hack-Regular.ufo/glyphs/uni25D_3.glif
index 874e183a5..cca1ef30a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25D_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25D_3.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D3" format="1">
+<glyph name="uni25D3" format="2">
   <advance width="1233"/>
   <unicode hex="25D3"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -30,7 +30,7 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="616" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="692" y="39"/>
       <point x="778" y="62"/>
       <point x="861" y="109" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25D_4.glif b/source/Hack-Regular.ufo/glyphs/uni25D_4.glif
index 0cc033e00..edb500728 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25D_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25D_4.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D4" format="1">
+<glyph name="uni25D4" format="2">
   <advance width="1233"/>
   <unicode hex="25D4"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -30,7 +30,7 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="616" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="692" y="39"/>
       <point x="778" y="62"/>
       <point x="861" y="109" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="371" y="955" type="curve" smooth="yes"/>
       <point x="216" y="867"/>
       <point x="128" y="723"/>
-      <point x="128" y="532" type="curve" name="sh03" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="sh03"/>
       <point x="128" y="341"/>
       <point x="216" y="197"/>
       <point x="371" y="109" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25D_5.glif b/source/Hack-Regular.ufo/glyphs/uni25D_5.glif
index 9f56ce75e..06acd4559 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25D_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25D_5.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D5" format="1">
+<glyph name="uni25D5" format="2">
   <advance width="1233"/>
   <unicode hex="25D5"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="dh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="dh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25D_6.glif b/source/Hack-Regular.ufo/glyphs/uni25D_6.glif
index a98f8f614..4416ff83d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25D_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25D_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D6" format="1">
+<glyph name="uni25D6" format="2">
   <advance width="1233"/>
   <unicode hex="25D6"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25D_7.glif b/source/Hack-Regular.ufo/glyphs/uni25D_7.glif
index 61e4f5dc1..946edb7a2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25D_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25D_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25D7" format="1">
+<glyph name="uni25D7" format="2">
   <advance width="1233"/>
   <unicode hex="25D7"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25D_A_.glif b/source/Hack-Regular.ufo/glyphs/uni25D_A_.glif
index 7857beb74..6d2901ac1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25D_A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25D_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25DA" format="1">
+<glyph name="uni25DA" format="2">
   <advance width="1233"/>
   <unicode hex="25DA"/>
   <outline>
@@ -13,7 +13,7 @@
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="818" y="1120"/>
       <point x="710" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv03" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv03"/>
       <point x="524" y="1148"/>
       <point x="413" y="1119"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
@@ -29,7 +29,7 @@
       <point x="371" y="955" type="curve" smooth="yes"/>
       <point x="454" y="1002"/>
       <point x="540" y="1025"/>
-      <point x="616" y="1025" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1025" type="curve" smooth="yes" name="dv02"/>
       <point x="692" y="1025"/>
       <point x="778" y="1002"/>
       <point x="861" y="955" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25D_B_.glif b/source/Hack-Regular.ufo/glyphs/uni25D_B_.glif
index ab0e28865..aa100b37b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25D_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25D_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25DB" format="1">
+<glyph name="uni25DB" format="2">
   <advance width="1233"/>
   <unicode hex="25DB"/>
   <outline>
@@ -11,7 +11,7 @@
       <point x="311" y="4" type="curve" smooth="yes"/>
       <point x="416" y="-57"/>
       <point x="516" y="-84"/>
-      <point x="615" y="-84" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="-84" type="curve" smooth="yes" name="dv02"/>
       <point x="718" y="-84"/>
       <point x="820" y="-55"/>
       <point x="921" y="4" type="curve" smooth="yes"/>
@@ -23,7 +23,7 @@
       <point x="-20" y="-512" type="line" name="dv01"/>
     </contour>
     <contour>
-      <point x="616" y="39" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv03"/>
       <point x="535" y="39"/>
       <point x="453" y="63"/>
       <point x="372" y="110" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25D_C_.glif b/source/Hack-Regular.ufo/glyphs/uni25D_C_.glif
index ab269c712..5e74179ce 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25D_C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25D_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25DC" format="1">
+<glyph name="uni25DC" format="2">
   <advance width="1233"/>
   <unicode hex="25DC"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25D_D_.glif b/source/Hack-Regular.ufo/glyphs/uni25D_D_.glif
index 1ea0f735d..669f3e26b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25D_D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25D_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25DD" format="1">
+<glyph name="uni25DD" format="2">
   <advance width="1233"/>
   <unicode hex="25DD"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25D_E_.glif b/source/Hack-Regular.ufo/glyphs/uni25D_E_.glif
index 740a2bcbf..3480c12da 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25D_E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25D_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25DE" format="1">
+<glyph name="uni25DE" format="2">
   <advance width="1233"/>
   <unicode hex="25DE"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25D_F_.glif b/source/Hack-Regular.ufo/glyphs/uni25D_F_.glif
index 10dbdd9ff..dbb34517f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25D_F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25D_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25DF" format="1">
+<glyph name="uni25DF" format="2">
   <advance width="1233"/>
   <unicode hex="25DF"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25E_0.glif b/source/Hack-Regular.ufo/glyphs/uni25E_0.glif
index 34f9579c1..f06a32ac3 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25E_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25E_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E0" format="1">
+<glyph name="uni25E0" format="2">
   <advance width="1233"/>
   <unicode hex="25E0"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="311" y="1060" type="curve" smooth="yes"/>
       <point x="416" y="1121"/>
       <point x="516" y="1148"/>
-      <point x="615" y="1148" type="curve" name="dv02" smooth="yes"/>
+      <point x="615" y="1148" type="curve" smooth="yes" name="dv02"/>
       <point x="718" y="1148"/>
       <point x="820" y="1119"/>
       <point x="921" y="1060" type="curve" smooth="yes"/>
@@ -23,7 +23,7 @@
       <point x="860" y="954" type="curve" smooth="yes"/>
       <point x="779" y="1001"/>
       <point x="697" y="1025"/>
-      <point x="616" y="1025" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="1025" type="curve" smooth="yes" name="dv01"/>
       <point x="535" y="1025"/>
       <point x="453" y="1001"/>
       <point x="372" y="954" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25E_1.glif b/source/Hack-Regular.ufo/glyphs/uni25E_1.glif
index dae6e6e1e..82314c2f4 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25E_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25E_1.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E1" format="1">
+<glyph name="uni25E1" format="2">
   <advance width="1233"/>
   <unicode hex="25E1"/>
   <outline>
     <contour>
-      <point x="615" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="615" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="516" y="-84"/>
       <point x="416" y="-57"/>
       <point x="311" y="4" type="curve" smooth="yes"/>
@@ -17,7 +17,7 @@
       <point x="371" y="109" type="curve" smooth="yes"/>
       <point x="454" y="62"/>
       <point x="540" y="39"/>
-      <point x="616" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="692" y="39"/>
       <point x="778" y="62"/>
       <point x="861" y="109" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25E_2.glif b/source/Hack-Regular.ufo/glyphs/uni25E_2.glif
index 9812325a2..2273a2640 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25E_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25E_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E2" format="1">
+<glyph name="uni25E2" format="2">
   <advance width="1233"/>
   <unicode hex="25E2"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25E_3.glif b/source/Hack-Regular.ufo/glyphs/uni25E_3.glif
index 2c0c2bed2..9395dfd74 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25E_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25E_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E3" format="1">
+<glyph name="uni25E3" format="2">
   <advance width="1233"/>
   <unicode hex="25E3"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25E_4.glif b/source/Hack-Regular.ufo/glyphs/uni25E_4.glif
index 3cdf55d01..d928816df 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25E_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25E_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E4" format="1">
+<glyph name="uni25E4" format="2">
   <advance width="1233"/>
   <unicode hex="25E4"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25E_5.glif b/source/Hack-Regular.ufo/glyphs/uni25E_5.glif
index cf4b9096d..36495ab5b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25E_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25E_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E5" format="1">
+<glyph name="uni25E5" format="2">
   <advance width="1233"/>
   <unicode hex="25E5"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25E_7.glif b/source/Hack-Regular.ufo/glyphs/uni25E_7.glif
index 34b659d78..09d1bd3b3 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25E_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25E_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E7" format="1">
+<glyph name="uni25E7" format="2">
   <advance width="1233"/>
   <unicode hex="25E7"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25E_8.glif b/source/Hack-Regular.ufo/glyphs/uni25E_8.glif
index ff7393846..be563b66d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25E_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25E_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E8" format="1">
+<glyph name="uni25E8" format="2">
   <advance width="1233"/>
   <unicode hex="25E8"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25E_9.glif b/source/Hack-Regular.ufo/glyphs/uni25E_9.glif
index a4a76e740..a3fe5337a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25E_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25E_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25E9" format="1">
+<glyph name="uni25E9" format="2">
   <advance width="1233"/>
   <unicode hex="25E9"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25E_A_.glif b/source/Hack-Regular.ufo/glyphs/uni25E_A_.glif
index 5b8b31cce..89cb828c5 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25E_A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25E_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25EA" format="1">
+<glyph name="uni25EA" format="2">
   <advance width="1233"/>
   <unicode hex="25EA"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25E_B_.glif b/source/Hack-Regular.ufo/glyphs/uni25E_B_.glif
index da4f0b67f..9f6d2d523 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25E_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25E_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25EB" format="1">
+<glyph name="uni25EB" format="2">
   <advance width="1233"/>
   <unicode hex="25EB"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25E_C_.glif b/source/Hack-Regular.ufo/glyphs/uni25E_C_.glif
index 6e64bb63c..16c28af2c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25E_C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25E_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25EC" format="1">
+<glyph name="uni25EC" format="2">
   <advance width="1233"/>
   <unicode hex="25EC"/>
   <outline>
@@ -14,16 +14,16 @@
       <point x="177" y="36" type="line"/>
     </contour>
     <contour>
-      <point x="615" y="229" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="229" type="curve" smooth="yes" name="dv03"/>
       <point x="539" y="229"/>
       <point x="482" y="286"/>
-      <point x="482" y="362" type="curve" name="dh01" smooth="yes"/>
+      <point x="482" y="362" type="curve" smooth="yes" name="dh01"/>
       <point x="482" y="438"/>
       <point x="541" y="495"/>
-      <point x="616" y="495" type="curve" name="dv04" smooth="yes"/>
+      <point x="616" y="495" type="curve" smooth="yes" name="dv04"/>
       <point x="691" y="495"/>
       <point x="750" y="438"/>
-      <point x="750" y="362" type="curve" name="dh02" smooth="yes"/>
+      <point x="750" y="362" type="curve" smooth="yes" name="dh02"/>
       <point x="750" y="289"/>
       <point x="690" y="229"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25E_D_.glif b/source/Hack-Regular.ufo/glyphs/uni25E_D_.glif
index 023c62b95..718ea1d30 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25E_D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25E_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25ED" format="1">
+<glyph name="uni25ED" format="2">
   <advance width="1233"/>
   <unicode hex="25ED"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25E_E_.glif b/source/Hack-Regular.ufo/glyphs/uni25E_E_.glif
index 65a848776..08d9455fb 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25E_E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25E_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25EE" format="1">
+<glyph name="uni25EE" format="2">
   <advance width="1233"/>
   <unicode hex="25EE"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25E_F_.glif b/source/Hack-Regular.ufo/glyphs/uni25E_F_.glif
index 018ff748c..c63414932 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25E_F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25E_F_.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25EF" format="1">
+<glyph name="uni25EF" format="2">
   <advance width="1233"/>
   <unicode hex="25EF"/>
   <outline>
     <contour>
-      <point x="615" y="-110" type="curve" name="hr00" smooth="yes"/>
+      <point x="615" y="-110" type="curve" smooth="yes" name="hr00"/>
       <point x="511" y="-110"/>
       <point x="407" y="-83"/>
       <point x="298" y="-19" type="curve" smooth="yes"/>
       <point x="91" y="101"/>
       <point x="-20" y="280"/>
-      <point x="-20" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="-20" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="-20" y="784"/>
       <point x="91" y="963"/>
       <point x="298" y="1083" type="curve" smooth="yes"/>
       <point x="407" y="1147"/>
       <point x="511" y="1174"/>
-      <point x="615" y="1174" type="curve" name="dv03" smooth="yes"/>
+      <point x="615" y="1174" type="curve" smooth="yes" name="dv03"/>
       <point x="722" y="1174"/>
       <point x="829" y="1144"/>
       <point x="934" y="1083" type="curve" smooth="yes"/>
       <point x="1142" y="963"/>
       <point x="1253" y="784"/>
-      <point x="1253" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="1253" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="1253" y="280"/>
       <point x="1142" y="101"/>
       <point x="934" y="-19" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="722" y="-110"/>
     </contour>
     <contour>
-      <point x="616" y="18" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="18" type="curve" smooth="yes" name="dv01"/>
       <point x="700" y="18"/>
       <point x="792" y="45"/>
       <point x="872" y="90" type="curve" smooth="yes"/>
       <point x="1033" y="181"/>
       <point x="1126" y="333"/>
-      <point x="1126" y="532" type="curve" name="ah01" smooth="yes"/>
+      <point x="1126" y="532" type="curve" smooth="yes" name="ah01"/>
       <point x="1126" y="731"/>
       <point x="1033" y="883"/>
       <point x="872" y="974" type="curve" smooth="yes"/>
       <point x="792" y="1019"/>
       <point x="700" y="1046"/>
-      <point x="616" y="1046" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1046" type="curve" smooth="yes" name="dv02"/>
       <point x="540" y="1046"/>
       <point x="450" y="1025"/>
       <point x="361" y="974" type="curve" smooth="yes"/>
       <point x="204" y="886"/>
       <point x="107" y="734"/>
-      <point x="107" y="532" type="curve" name="sh03" smooth="yes"/>
+      <point x="107" y="532" type="curve" smooth="yes" name="sh03"/>
       <point x="107" y="329"/>
       <point x="205" y="178"/>
       <point x="361" y="90" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25F_0.glif b/source/Hack-Regular.ufo/glyphs/uni25F_0.glif
index 95a4712e3..dfa5bb855 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25F_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25F_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F0" format="1">
+<glyph name="uni25F0" format="2">
   <advance width="1233"/>
   <unicode hex="25F0"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25F_1.glif b/source/Hack-Regular.ufo/glyphs/uni25F_1.glif
index c3724eede..0930ad292 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25F_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25F_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F1" format="1">
+<glyph name="uni25F1" format="2">
   <advance width="1233"/>
   <unicode hex="25F1"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25F_2.glif b/source/Hack-Regular.ufo/glyphs/uni25F_2.glif
index fd3427be5..cfb1f711c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25F_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25F_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F2" format="1">
+<glyph name="uni25F2" format="2">
   <advance width="1233"/>
   <unicode hex="25F2"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25F_3.glif b/source/Hack-Regular.ufo/glyphs/uni25F_3.glif
index 333a31b57..8b36f1ebe 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25F_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25F_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F3" format="1">
+<glyph name="uni25F3" format="2">
   <advance width="1233"/>
   <unicode hex="25F3"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25F_4.glif b/source/Hack-Regular.ufo/glyphs/uni25F_4.glif
index 6b5bdbb8e..8540a59c1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25F_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25F_4.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F4" format="1">
+<glyph name="uni25F4" format="2">
   <advance width="1233"/>
   <unicode hex="25F4"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
@@ -16,13 +16,13 @@
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -30,13 +30,13 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="619" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="619" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="695" y="39"/>
       <point x="779" y="63"/>
       <point x="860" y="110" type="curve" smooth="yes"/>
       <point x="1023" y="204"/>
       <point x="1105" y="345"/>
-      <point x="1105" y="532" type="curve" name="ah01" smooth="yes"/>
+      <point x="1105" y="532" type="curve" smooth="yes" name="ah01"/>
       <point x="1105" y="719"/>
       <point x="1023" y="860"/>
       <point x="860" y="954" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25F_5.glif b/source/Hack-Regular.ufo/glyphs/uni25F_5.glif
index ee34f5d27..a7100203e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25F_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25F_5.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F5" format="1">
+<glyph name="uni25F5" format="2">
   <advance width="1233"/>
   <unicode hex="25F5"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
@@ -16,13 +16,13 @@
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
       <point x="1117" y="952"/>
       <point x="1227" y="772"/>
-      <point x="1227" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="1227" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="1227" y="292"/>
       <point x="1117" y="112"/>
       <point x="922" y="3" type="curve" smooth="yes"/>
@@ -36,13 +36,13 @@
       <point x="861" y="110" type="curve" smooth="yes"/>
       <point x="1008" y="193"/>
       <point x="1105" y="334"/>
-      <point x="1105" y="530" type="curve" name="ah01" smooth="yes"/>
+      <point x="1105" y="530" type="curve" smooth="yes" name="ah01"/>
       <point x="1105" y="713"/>
       <point x="1022" y="863"/>
       <point x="861" y="955" type="curve" smooth="yes"/>
       <point x="778" y="1002"/>
       <point x="691" y="1025"/>
-      <point x="615" y="1025" type="curve" name="dv01" smooth="yes"/>
+      <point x="615" y="1025" type="curve" smooth="yes" name="dv01"/>
       <point x="448" y="1025"/>
       <point x="159" y="903"/>
       <point x="131" y="588" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25F_6.glif b/source/Hack-Regular.ufo/glyphs/uni25F_6.glif
index 7a25ab7dd..4a05da63c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25F_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25F_6.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F6" format="1">
+<glyph name="uni25F6" format="2">
   <advance width="1233"/>
   <unicode hex="25F6"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="dv02" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="dv02"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
@@ -34,13 +34,13 @@
       <point x="1102" y="588" type="line" name="dv04"/>
       <point x="1074" y="905"/>
       <point x="785" y="1025"/>
-      <point x="613" y="1025" type="curve" name="dv01" smooth="yes"/>
+      <point x="613" y="1025" type="curve" smooth="yes" name="dv01"/>
       <point x="540" y="1025"/>
       <point x="457" y="1003"/>
       <point x="372" y="954" type="curve" smooth="yes"/>
       <point x="209" y="860"/>
       <point x="128" y="719"/>
-      <point x="128" y="532" type="curve" name="sh02" smooth="yes"/>
+      <point x="128" y="532" type="curve" smooth="yes" name="sh02"/>
       <point x="128" y="345"/>
       <point x="209" y="204"/>
       <point x="372" y="110" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25F_7.glif b/source/Hack-Regular.ufo/glyphs/uni25F_7.glif
index 27b1d258e..caa6425eb 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25F_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25F_7.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F7" format="1">
+<glyph name="uni25F7" format="2">
   <advance width="1233"/>
   <unicode hex="25F7"/>
   <outline>
     <contour>
-      <point x="617" y="-84" type="curve" name="hr00" smooth="yes"/>
+      <point x="617" y="-84" type="curve" smooth="yes" name="hr00"/>
       <point x="524" y="-84"/>
       <point x="413" y="-55"/>
       <point x="310" y="2" type="curve" smooth="yes"/>
       <point x="118" y="109"/>
       <point x="6" y="301"/>
-      <point x="6" y="532" type="curve" name="sh01" smooth="yes"/>
+      <point x="6" y="532" type="curve" smooth="yes" name="sh01"/>
       <point x="6" y="765"/>
       <point x="118" y="953"/>
       <point x="310" y="1062" type="curve" smooth="yes"/>
       <point x="413" y="1119"/>
       <point x="524" y="1148"/>
-      <point x="617" y="1148" type="curve" name="av01" smooth="yes"/>
+      <point x="617" y="1148" type="curve" smooth="yes" name="av01"/>
       <point x="710" y="1148"/>
       <point x="818" y="1120"/>
       <point x="922" y="1061" type="curve" smooth="yes"/>
@@ -30,7 +30,7 @@
       <point x="710" y="-84"/>
     </contour>
     <contour>
-      <point x="616" y="39" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="39" type="curve" smooth="yes" name="dv01"/>
       <point x="782" y="39"/>
       <point x="1070" y="158"/>
       <point x="1102" y="474" type="curve" name="dv02"/>
@@ -41,7 +41,7 @@
       <point x="371" y="954" type="curve" smooth="yes"/>
       <point x="214" y="865"/>
       <point x="128" y="722"/>
-      <point x="128" y="534" type="curve" name="sh02" smooth="yes"/>
+      <point x="128" y="534" type="curve" smooth="yes" name="sh02"/>
       <point x="128" y="351"/>
       <point x="210" y="201"/>
       <point x="371" y="109" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25F_8.glif b/source/Hack-Regular.ufo/glyphs/uni25F_8.glif
index 9267c054b..a42fa75c0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25F_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25F_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F8" format="1">
+<glyph name="uni25F8" format="2">
   <advance width="1233"/>
   <unicode hex="25F8"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25F_9.glif b/source/Hack-Regular.ufo/glyphs/uni25F_9.glif
index 1f5a37479..cc8543602 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25F_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25F_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25F9" format="1">
+<glyph name="uni25F9" format="2">
   <advance width="1233"/>
   <unicode hex="25F9"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25F_A_.glif b/source/Hack-Regular.ufo/glyphs/uni25F_A_.glif
index fc9bc6d69..3194c7f3f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25F_A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25F_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25FA" format="1">
+<glyph name="uni25FA" format="2">
   <advance width="1233"/>
   <unicode hex="25FA"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25F_B_.glif b/source/Hack-Regular.ufo/glyphs/uni25F_B_.glif
index 3b80d593c..d0c40cedb 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25F_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25F_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25FB" format="1">
+<glyph name="uni25FB" format="2">
   <advance width="1233"/>
   <unicode hex="25FB"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25F_C_.glif b/source/Hack-Regular.ufo/glyphs/uni25F_C_.glif
index 3be0a387b..212ba910f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25F_C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25F_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25FC" format="1">
+<glyph name="uni25FC" format="2">
   <advance width="1233"/>
   <unicode hex="25FC"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25F_D_.glif b/source/Hack-Regular.ufo/glyphs/uni25F_D_.glif
index 8814150b8..ef2bba730 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25F_D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25F_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25FD" format="1">
+<glyph name="uni25FD" format="2">
   <advance width="1233"/>
   <unicode hex="25FD"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25F_E_.glif b/source/Hack-Regular.ufo/glyphs/uni25F_E_.glif
index 00ff683ce..5b20fe01a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25F_E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25F_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25FE" format="1">
+<glyph name="uni25FE" format="2">
   <advance width="1233"/>
   <unicode hex="25FE"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni25F_F_.glif b/source/Hack-Regular.ufo/glyphs/uni25F_F_.glif
index 32d916c21..1e6646d70 100644
--- a/source/Hack-Regular.ufo/glyphs/uni25F_F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni25F_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni25FF" format="1">
+<glyph name="uni25FF" format="2">
   <advance width="1233"/>
   <unicode hex="25FF"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2756.glif b/source/Hack-Regular.ufo/glyphs/uni2756.glif
index 518de22d1..9df0b0453 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2756.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2756.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2756" format="1">
+<glyph name="uni2756" format="2">
   <advance width="1233"/>
   <unicode hex="2756"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2768.glif b/source/Hack-Regular.ufo/glyphs/uni2768.glif
index 864ad86d5..1f463e6a2 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2768.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2768.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2768" format="1">
+<glyph name="uni2768" format="2">
   <advance width="1233"/>
   <unicode hex="2768"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="461" y="123" type="curve" smooth="yes"/>
       <point x="318" y="266"/>
       <point x="240" y="442"/>
-      <point x="240" y="653" type="curve" name="dh01" smooth="yes"/>
+      <point x="240" y="653" type="curve" smooth="yes" name="dh01"/>
       <point x="240" y="862"/>
       <point x="317" y="1042"/>
       <point x="461" y="1186" type="curve" smooth="yes"/>
@@ -23,7 +23,7 @@
       <point x="675" y="1161" type="curve" smooth="yes"/>
       <point x="584" y="1018"/>
       <point x="542" y="851"/>
-      <point x="542" y="655" type="curve" name="dh02" smooth="yes"/>
+      <point x="542" y="655" type="curve" smooth="yes" name="dh02"/>
       <point x="542" y="458"/>
       <point x="585" y="290"/>
       <point x="674" y="149" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2769.glif b/source/Hack-Regular.ufo/glyphs/uni2769.glif
index eca1f2a9b..712627b60 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2769.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2769.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2769" format="1">
+<glyph name="uni2769" format="2">
   <advance width="1233"/>
   <unicode hex="2769"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="559" y="149" type="curve" smooth="yes"/>
       <point x="648" y="290"/>
       <point x="691" y="461"/>
-      <point x="691" y="648" type="curve" name="dh01" smooth="yes"/>
+      <point x="691" y="648" type="curve" smooth="yes" name="dh01"/>
       <point x="691" y="845"/>
       <point x="642" y="1043"/>
       <point x="559" y="1161" type="curve" smooth="yes"/>
@@ -26,7 +26,7 @@
       <point x="772" y="1186" type="curve" smooth="yes"/>
       <point x="924" y="1034"/>
       <point x="993" y="846"/>
-      <point x="993" y="660" type="curve" name="dh02" smooth="yes"/>
+      <point x="993" y="660" type="curve" smooth="yes" name="dh02"/>
       <point x="993" y="453"/>
       <point x="908" y="243"/>
       <point x="772" y="123" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni276A_.glif b/source/Hack-Regular.ufo/glyphs/uni276A_.glif
index 80825423e..a7bbe6355 100644
--- a/source/Hack-Regular.ufo/glyphs/uni276A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni276A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni276A" format="1">
+<glyph name="uni276A" format="2">
   <advance width="1233"/>
   <unicode hex="276A"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="601" y="-121" type="line" name="hr00"/>
       <point x="440" y="135"/>
       <point x="359" y="377"/>
-      <point x="359" y="621" type="curve" name="dh01" smooth="yes"/>
+      <point x="359" y="621" type="curve" smooth="yes" name="dh01"/>
       <point x="359" y="864"/>
       <point x="437" y="1105"/>
       <point x="601" y="1361" type="curve" name="av02"/>
       <point x="874" y="1361" type="line"/>
       <point x="730" y="1112"/>
       <point x="660" y="871"/>
-      <point x="660" y="622" type="curve" name="dh02" smooth="yes"/>
+      <point x="660" y="622" type="curve" smooth="yes" name="dh02"/>
       <point x="660" y="370"/>
       <point x="729" y="128"/>
       <point x="874" y="-121" type="curve" name="av01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni276B_.glif b/source/Hack-Regular.ufo/glyphs/uni276B_.glif
index 0eb0beded..bcada30fa 100644
--- a/source/Hack-Regular.ufo/glyphs/uni276B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni276B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni276B" format="1">
+<glyph name="uni276B" format="2">
   <advance width="1233"/>
   <unicode hex="276B"/>
   <outline>
@@ -7,14 +7,14 @@
       <point x="366" y="-121" type="line" name="hr00"/>
       <point x="506" y="120"/>
       <point x="574" y="355"/>
-      <point x="574" y="599" type="curve" name="dh01" smooth="yes"/>
+      <point x="574" y="599" type="curve" smooth="yes" name="dh01"/>
       <point x="574" y="843"/>
       <point x="507" y="1073"/>
       <point x="366" y="1316" type="curve" name="av01"/>
       <point x="631" y="1316" type="line"/>
       <point x="791" y="1067"/>
       <point x="867" y="835"/>
-      <point x="867" y="600" type="curve" name="dh02" smooth="yes"/>
+      <point x="867" y="600" type="curve" smooth="yes" name="dh02"/>
       <point x="867" y="361"/>
       <point x="788" y="127"/>
       <point x="631" y="-121" type="curve" name="av02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni276C_.glif b/source/Hack-Regular.ufo/glyphs/uni276C_.glif
index 52addd269..b56a4991d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni276C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni276C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni276C" format="1">
+<glyph name="uni276C" format="2">
   <advance width="1233"/>
   <unicode hex="276C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni276D_.glif b/source/Hack-Regular.ufo/glyphs/uni276D_.glif
index 82966ed32..4218e36fa 100644
--- a/source/Hack-Regular.ufo/glyphs/uni276D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni276D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni276D" format="1">
+<glyph name="uni276D" format="2">
   <advance width="1233"/>
   <unicode hex="276D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni276E_.glif b/source/Hack-Regular.ufo/glyphs/uni276E_.glif
index 6a77d7332..d485f90c0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni276E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni276E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni276E" format="1">
+<glyph name="uni276E" format="2">
   <advance width="1233"/>
   <unicode hex="276E"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni276F_.glif b/source/Hack-Regular.ufo/glyphs/uni276F_.glif
index 55c989008..1d43b367a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni276F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni276F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni276F" format="1">
+<glyph name="uni276F" format="2">
   <advance width="1233"/>
   <unicode hex="276F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2770.glif b/source/Hack-Regular.ufo/glyphs/uni2770.glif
index 0567c8ac0..283395f94 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2770.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2770.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2770" format="1">
+<glyph name="uni2770" format="2">
   <advance width="1233"/>
   <unicode hex="2770"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2771.glif b/source/Hack-Regular.ufo/glyphs/uni2771.glif
index f883c2582..07d29a8fb 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2771.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2771.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2771" format="1">
+<glyph name="uni2771" format="2">
   <advance width="1233"/>
   <unicode hex="2771"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2772.glif b/source/Hack-Regular.ufo/glyphs/uni2772.glif
index dfd00782e..b99d6924c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2772.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2772.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2772" format="1">
+<glyph name="uni2772" format="2">
   <advance width="1233"/>
   <unicode hex="2772"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2773.glif b/source/Hack-Regular.ufo/glyphs/uni2773.glif
index f63652bf3..346235637 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2773.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2773.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2773" format="1">
+<glyph name="uni2773" format="2">
   <advance width="1233"/>
   <unicode hex="2773"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2774.glif b/source/Hack-Regular.ufo/glyphs/uni2774.glif
index 72b32200a..23049a78c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2774.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2774.glif
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2774" format="1">
+<glyph name="uni2774" format="2">
   <advance width="1233"/>
   <unicode hex="2774"/>
   <outline>
     <contour>
-      <point x="801" y="-328" type="line" name="sv01" smooth="yes"/>
+      <point x="801" y="-328" type="line" smooth="yes" name="sv01"/>
       <point x="564" y="-328"/>
       <point x="503" y="-261"/>
-      <point x="503" y="4" type="curve" name="sh01" smooth="yes"/>
+      <point x="503" y="4" type="curve" smooth="yes" name="sh01"/>
       <point x="503" y="219" type="line" smooth="yes"/>
       <point x="503" y="400"/>
       <point x="460" y="460"/>
-      <point x="325" y="460" type="curve" name="hr01" smooth="yes"/>
+      <point x="325" y="460" type="curve" smooth="yes" name="hr01"/>
       <point x="281" y="460" type="line" name="dh01"/>
       <point x="281" y="588" type="line"/>
-      <point x="325" y="588" type="line" name="dv03" smooth="yes"/>
+      <point x="325" y="588" type="line" smooth="yes" name="dv03"/>
       <point x="461" y="588"/>
       <point x="503" y="647"/>
-      <point x="503" y="826" type="curve" name="sh02" smooth="yes"/>
+      <point x="503" y="826" type="curve" smooth="yes" name="sh02"/>
       <point x="503" y="1042" type="line" smooth="yes"/>
       <point x="503" y="1307"/>
       <point x="564" y="1373"/>
-      <point x="801" y="1373" type="curve" name="hr02" smooth="yes"/>
+      <point x="801" y="1373" type="curve" smooth="yes" name="hr02"/>
       <point x="952" y="1373" type="line" name="sh03"/>
       <point x="952" y="1244" type="line" name="dv02"/>
       <point x="903" y="1244" type="line" smooth="yes"/>
       <point x="770" y="1244"/>
       <point x="742" y="1207"/>
-      <point x="742" y="1038" type="curve" name="sh04" smooth="yes"/>
-      <point x="742" y="815" type="line" name="sh06" smooth="yes"/>
+      <point x="742" y="1038" type="curve" smooth="yes" name="sh04"/>
+      <point x="742" y="815" type="line" smooth="yes" name="sh06"/>
       <point x="742" y="625"/>
       <point x="703" y="555"/>
       <point x="598" y="523" type="curve" name="hr03"/>
       <point x="703" y="491"/>
       <point x="742" y="418"/>
-      <point x="742" y="231" type="curve" name="dh02" smooth="yes"/>
-      <point x="742" y="8" type="line" name="sh05" smooth="yes"/>
+      <point x="742" y="231" type="curve" smooth="yes" name="dh02"/>
+      <point x="742" y="8" type="line" smooth="yes" name="sh05"/>
       <point x="742" y="-161"/>
       <point x="770" y="-198"/>
-      <point x="903" y="-198" type="curve" name="hr04" smooth="yes"/>
+      <point x="903" y="-198" type="curve" smooth="yes" name="hr04"/>
       <point x="952" y="-198" type="line" name="hr05"/>
       <point x="952" y="-328" type="line" name="dv01"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2775.glif b/source/Hack-Regular.ufo/glyphs/uni2775.glif
index 25b5aed81..897e6573c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2775.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2775.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2775" format="1">
+<glyph name="uni2775" format="2">
   <advance width="1233"/>
   <unicode hex="2775"/>
   <outline>
     <contour>
       <point x="250" y="-204" type="line" name="dh01"/>
-      <point x="303" y="-204" type="line" name="dv01" smooth="yes"/>
+      <point x="303" y="-204" type="line" smooth="yes" name="dv01"/>
       <point x="450" y="-204"/>
       <point x="480" y="-167"/>
-      <point x="480" y="4" type="curve" name="sh01" smooth="yes"/>
-      <point x="480" y="230" type="line" name="sh02" smooth="yes"/>
+      <point x="480" y="4" type="curve" smooth="yes" name="sh01"/>
+      <point x="480" y="230" type="line" smooth="yes" name="sh02"/>
       <point x="480" y="419"/>
       <point x="520" y="494"/>
       <point x="636" y="526" type="curve" name="ih01"/>
       <point x="523" y="556"/>
       <point x="480" y="629"/>
-      <point x="480" y="821" type="curve" name="hr01" smooth="yes"/>
-      <point x="480" y="1046" type="line" name="sh03" smooth="yes"/>
+      <point x="480" y="821" type="curve" smooth="yes" name="hr01"/>
+      <point x="480" y="1046" type="line" smooth="yes" name="sh03"/>
       <point x="480" y="1218"/>
       <point x="450" y="1255"/>
       <point x="303" y="1255" type="curve" smooth="yes"/>
@@ -25,7 +25,7 @@
       <point x="415" y="1385" type="line" smooth="yes"/>
       <point x="674" y="1385"/>
       <point x="741" y="1318"/>
-      <point x="741" y="1050" type="curve" name="sh04" smooth="yes"/>
+      <point x="741" y="1050" type="curve" smooth="yes" name="sh04"/>
       <point x="741" y="831" type="line" smooth="yes"/>
       <point x="741" y="651"/>
       <point x="787" y="591"/>
@@ -36,7 +36,7 @@
       <point x="788" y="461"/>
       <point x="741" y="402"/>
       <point x="741" y="218" type="curve" smooth="yes"/>
-      <point x="741" y="1" type="line" name="dh02" smooth="yes"/>
+      <point x="741" y="1" type="line" smooth="yes" name="dh02"/>
       <point x="741" y="-267"/>
       <point x="674" y="-335"/>
       <point x="415" y="-335" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2794.glif b/source/Hack-Regular.ufo/glyphs/uni2794.glif
index b0de26c62..1f5e538fd 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2794.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2794.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2794" format="1">
+<glyph name="uni2794" format="2">
   <advance width="1233"/>
   <unicode hex="2794"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2798.glif b/source/Hack-Regular.ufo/glyphs/uni2798.glif
index 084bf95b8..9f84df30f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2798.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2798.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2798" format="1">
+<glyph name="uni2798" format="2">
   <advance width="1233"/>
   <unicode hex="2798"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2799.glif b/source/Hack-Regular.ufo/glyphs/uni2799.glif
index fd35bba38..c7a6570b5 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2799.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2799.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2799" format="1">
+<glyph name="uni2799" format="2">
   <advance width="1233"/>
   <unicode hex="2799"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni279A_.glif b/source/Hack-Regular.ufo/glyphs/uni279A_.glif
index d0c05f97b..b29710137 100644
--- a/source/Hack-Regular.ufo/glyphs/uni279A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni279A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni279A" format="1">
+<glyph name="uni279A" format="2">
   <advance width="1233"/>
   <unicode hex="279A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni279B_.glif b/source/Hack-Regular.ufo/glyphs/uni279B_.glif
index 9b6df9c0d..a618e85ad 100644
--- a/source/Hack-Regular.ufo/glyphs/uni279B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni279B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni279B" format="1">
+<glyph name="uni279B" format="2">
   <advance width="1233"/>
   <unicode hex="279B"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni279C_.glif b/source/Hack-Regular.ufo/glyphs/uni279C_.glif
index 93380b0af..ff0fa0c6f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni279C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni279C_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni279C" format="1">
+<glyph name="uni279C" format="2">
   <advance width="1233"/>
   <unicode hex="279C"/>
   <outline>
     <contour>
-      <point x="766" y="298" type="curve" name="av02" smooth="yes"/>
+      <point x="766" y="298" type="curve" smooth="yes" name="av02"/>
       <point x="740" y="298"/>
       <point x="718" y="307"/>
       <point x="700" y="325" type="curve" smooth="yes"/>
@@ -29,7 +29,7 @@
       <point x="142" y="785"/>
       <point x="167" y="785" type="curve" smooth="yes"/>
       <point x="839" y="785" type="line" name="dv02"/>
-      <point x="700" y="924" type="line" name="hr01" smooth="yes"/>
+      <point x="700" y="924" type="line" smooth="yes" name="hr01"/>
       <point x="683" y="941"/>
       <point x="672" y="966"/>
       <point x="672" y="991" type="curve" smooth="yes"/>
@@ -38,7 +38,7 @@
       <point x="700" y="1057" type="curve" smooth="yes"/>
       <point x="717" y="1074"/>
       <point x="739" y="1085"/>
-      <point x="766" y="1085" type="curve" name="av01" smooth="yes"/>
+      <point x="766" y="1085" type="curve" smooth="yes" name="av01"/>
       <point x="793" y="1085"/>
       <point x="816" y="1073"/>
       <point x="832" y="1057" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni279D_.glif b/source/Hack-Regular.ufo/glyphs/uni279D_.glif
index 1ae260b33..f51191e51 100644
--- a/source/Hack-Regular.ufo/glyphs/uni279D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni279D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni279D" format="1">
+<glyph name="uni279D" format="2">
   <advance width="1233"/>
   <unicode hex="279D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni279E_.glif b/source/Hack-Regular.ufo/glyphs/uni279E_.glif
index 679ccfabe..d6313a215 100644
--- a/source/Hack-Regular.ufo/glyphs/uni279E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni279E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni279E" format="1">
+<glyph name="uni279E" format="2">
   <advance width="1233"/>
   <unicode hex="279E"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni279F_.glif b/source/Hack-Regular.ufo/glyphs/uni279F_.glif
index 24fe36709..a540979ff 100644
--- a/source/Hack-Regular.ufo/glyphs/uni279F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni279F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni279F" format="1">
+<glyph name="uni279F" format="2">
   <advance width="1233"/>
   <unicode hex="279F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27A_0.glif b/source/Hack-Regular.ufo/glyphs/uni27A_0.glif
index 6b4a793e3..8ec5e5084 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27A_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27A0" format="1">
+<glyph name="uni27A0" format="2">
   <advance width="1233"/>
   <unicode hex="27A0"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27A_1.glif b/source/Hack-Regular.ufo/glyphs/uni27A_1.glif
index 1041b94f2..5e21f8ce0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27A_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27A_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27A1" format="1">
+<glyph name="uni27A1" format="2">
   <advance width="1233"/>
   <unicode hex="27A1"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27A_2.glif b/source/Hack-Regular.ufo/glyphs/uni27A_2.glif
index 029f24815..0ccc5e527 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27A_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27A_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27A2" format="1">
+<glyph name="uni27A2" format="2">
   <advance width="1233"/>
   <unicode hex="27A2"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27A_3.glif b/source/Hack-Regular.ufo/glyphs/uni27A_3.glif
index d4711f359..2965a3167 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27A_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27A_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27A3" format="1">
+<glyph name="uni27A3" format="2">
   <advance width="1233"/>
   <unicode hex="27A3"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27A_4.glif b/source/Hack-Regular.ufo/glyphs/uni27A_4.glif
index 69bef6327..94ecde205 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27A_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27A_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27A4" format="1">
+<glyph name="uni27A4" format="2">
   <advance width="1233"/>
   <unicode hex="27A4"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27A_5.glif b/source/Hack-Regular.ufo/glyphs/uni27A_5.glif
index ee96a1c2f..ece0f2a9f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27A_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27A_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27A5" format="1">
+<glyph name="uni27A5" format="2">
   <advance width="1233"/>
   <unicode hex="27A5"/>
   <outline>
@@ -12,7 +12,7 @@
       <point x="72" y="634"/>
       <point x="54" y="676"/>
       <point x="54" y="725" type="curve" smooth="yes"/>
-      <point x="54" y="1085" type="line" name="av01" smooth="yes"/>
+      <point x="54" y="1085" type="line" smooth="yes" name="av01"/>
       <point x="54" y="1036"/>
       <point x="72" y="994"/>
       <point x="108" y="958" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27A_6.glif b/source/Hack-Regular.ufo/glyphs/uni27A_6.glif
index 6024d8b8e..3dcd81728 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27A_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27A_6.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27A6" format="1">
+<glyph name="uni27A6" format="2">
   <advance width="1233"/>
   <unicode hex="27A6"/>
   <outline>
     <contour>
-      <point x="54" y="755" type="line" name="hr00" smooth="yes"/>
+      <point x="54" y="755" type="line" smooth="yes" name="hr00"/>
       <point x="54" y="804"/>
       <point x="72" y="846"/>
       <point x="108" y="882" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="108" y="522" type="curve" smooth="yes"/>
       <point x="72" y="486"/>
       <point x="54" y="444"/>
-      <point x="54" y="395" type="curve" name="av02" smooth="yes"/>
+      <point x="54" y="395" type="curve" smooth="yes" name="av02"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27A_7.glif b/source/Hack-Regular.ufo/glyphs/uni27A_7.glif
index 1c79bf547..9d39df232 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27A_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27A_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27A7" format="1">
+<glyph name="uni27A7" format="2">
   <advance width="1233"/>
   <unicode hex="27A7"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27A_8.glif b/source/Hack-Regular.ufo/glyphs/uni27A_8.glif
index dd764c8db..a094d97d6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27A_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27A_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27A8" format="1">
+<glyph name="uni27A8" format="2">
   <advance width="1233"/>
   <unicode hex="27A8"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27A_9.glif b/source/Hack-Regular.ufo/glyphs/uni27A_9.glif
index f0b877ee1..262fcd357 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27A_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27A_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27A9" format="1">
+<glyph name="uni27A9" format="2">
   <advance width="1233"/>
   <unicode hex="27A9"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27A_A_.glif b/source/Hack-Regular.ufo/glyphs/uni27A_A_.glif
index 345e06150..2e60ba1cc 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27A_A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27A_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27AA" format="1">
+<glyph name="uni27AA" format="2">
   <advance width="1233"/>
   <unicode hex="27AA"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27A_B_.glif b/source/Hack-Regular.ufo/glyphs/uni27A_B_.glif
index 62e9fe89f..88a6f468b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27A_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27A_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27AB" format="1">
+<glyph name="uni27AB" format="2">
   <advance width="1233"/>
   <unicode hex="27AB"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27A_C_.glif b/source/Hack-Regular.ufo/glyphs/uni27A_C_.glif
index 3d1a83b1c..b4113e177 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27A_C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27A_C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27AC" format="1">
+<glyph name="uni27AC" format="2">
   <advance width="1233"/>
   <unicode hex="27AC"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27A_D_.glif b/source/Hack-Regular.ufo/glyphs/uni27A_D_.glif
index 13b1bb802..281231dda 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27A_D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27A_D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27AD" format="1">
+<glyph name="uni27AD" format="2">
   <advance width="1233"/>
   <unicode hex="27AD"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27A_E_.glif b/source/Hack-Regular.ufo/glyphs/uni27A_E_.glif
index bdea22ec6..a95b572ea 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27A_E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27A_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27AE" format="1">
+<glyph name="uni27AE" format="2">
   <advance width="1233"/>
   <unicode hex="27AE"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27A_F_.glif b/source/Hack-Regular.ufo/glyphs/uni27A_F_.glif
index 88cd18b0a..708af23ed 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27A_F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27A_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27AF" format="1">
+<glyph name="uni27AF" format="2">
   <advance width="1233"/>
   <unicode hex="27AF"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27B_1.glif b/source/Hack-Regular.ufo/glyphs/uni27B_1.glif
index 82ba4f0e0..489675e77 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27B_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27B_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27B1" format="1">
+<glyph name="uni27B1" format="2">
   <advance width="1233"/>
   <unicode hex="27B1"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27B_2.glif b/source/Hack-Regular.ufo/glyphs/uni27B_2.glif
index 05f3bca69..a0d08e255 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27B_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27B_2.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27B2" format="1">
+<glyph name="uni27B2" format="2">
   <advance width="1233"/>
   <unicode hex="27B2"/>
   <outline>
     <contour>
-      <point x="586" y="189" type="curve" name="hr00" smooth="yes"/>
+      <point x="586" y="189" type="curve" smooth="yes" name="hr00"/>
       <point x="453" y="189"/>
       <point x="335" y="237"/>
       <point x="231" y="338" type="curve" smooth="yes"/>
@@ -22,7 +22,7 @@
       <point x="393" y="1158" type="curve" smooth="yes"/>
       <point x="454" y="1183"/>
       <point x="518" y="1196"/>
-      <point x="586" y="1196" type="curve" name="dv03" smooth="yes"/>
+      <point x="586" y="1196" type="curve" smooth="yes" name="dv03"/>
       <point x="718" y="1196"/>
       <point x="836" y="1148"/>
       <point x="940" y="1047" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27B_3.glif b/source/Hack-Regular.ufo/glyphs/uni27B_3.glif
index 1d2cb3677..657ae5689 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27B_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27B3" format="1">
+<glyph name="uni27B3" format="2">
   <advance width="1233"/>
   <unicode hex="27B3"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27B_4.glif b/source/Hack-Regular.ufo/glyphs/uni27B_4.glif
index dea5dee04..618a221b0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27B_4.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27B_4.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27B4" format="1">
+<glyph name="uni27B4" format="2">
   <advance width="1233"/>
   <unicode hex="27B4"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27B_5.glif b/source/Hack-Regular.ufo/glyphs/uni27B_5.glif
index 380c91430..ab211ac6b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27B_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27B_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27B5" format="1">
+<glyph name="uni27B5" format="2">
   <advance width="1233"/>
   <unicode hex="27B5"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27B_6.glif b/source/Hack-Regular.ufo/glyphs/uni27B_6.glif
index ad6251718..07616ce99 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27B_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27B_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27B6" format="1">
+<glyph name="uni27B6" format="2">
   <advance width="1233"/>
   <unicode hex="27B6"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27B_7.glif b/source/Hack-Regular.ufo/glyphs/uni27B_7.glif
index 1869da2ba..f174ef931 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27B_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27B_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27B7" format="1">
+<glyph name="uni27B7" format="2">
   <advance width="1233"/>
   <unicode hex="27B7"/>
   <outline>
@@ -30,7 +30,7 @@
       <point x="228" y="1026" type="curve" smooth="yes"/>
       <point x="279" y="1026"/>
       <point x="336" y="1005"/>
-      <point x="375" y="964" type="curve" name="iv03" smooth="yes"/>
+      <point x="375" y="964" type="curve" smooth="yes" name="iv03"/>
       <point x="336" y="1005"/>
       <point x="314" y="1061"/>
       <point x="314" y="1112" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27B_8.glif b/source/Hack-Regular.ufo/glyphs/uni27B_8.glif
index 553d00563..d33d2cd5d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27B_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27B_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27B8" format="1">
+<glyph name="uni27B8" format="2">
   <advance width="1233"/>
   <unicode hex="27B8"/>
   <outline>
@@ -21,10 +21,10 @@
       <point x="43" y="431" type="line"/>
       <point x="43" y="480"/>
       <point x="62" y="528"/>
-      <point x="97" y="561" type="curve" name="hr01" smooth="yes"/>
+      <point x="97" y="561" type="curve" smooth="yes" name="hr01"/>
       <point x="129" y="593"/>
       <point x="177" y="615"/>
-      <point x="226" y="615" type="curve" name="iv01" smooth="yes"/>
+      <point x="226" y="615" type="curve" smooth="yes" name="iv01"/>
       <point x="177" y="615"/>
       <point x="129" y="637"/>
       <point x="97" y="669" type="curve" smooth="yes"/>
@@ -41,7 +41,7 @@
       <point x="983" y="646" type="line" name="dv04"/>
       <point x="976" y="655"/>
       <point x="968" y="670"/>
-      <point x="960" y="690" type="curve" name="hr02" smooth="yes"/>
+      <point x="960" y="690" type="curve" smooth="yes" name="hr02"/>
       <point x="941" y="735"/>
       <point x="932" y="784"/>
       <point x="932" y="836" type="curve" name="av02"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27B_9.glif b/source/Hack-Regular.ufo/glyphs/uni27B_9.glif
index 9f4a16803..dcb9dda1d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27B_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27B_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27B9" format="1">
+<glyph name="uni27B9" format="2">
   <advance width="1233"/>
   <unicode hex="27B9"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="336" y="315" type="curve" smooth="yes"/>
       <point x="336" y="362"/>
       <point x="356" y="413"/>
-      <point x="393" y="452" type="curve" name="iv01" smooth="yes"/>
+      <point x="393" y="452" type="curve" smooth="yes" name="iv01"/>
       <point x="356" y="413"/>
       <point x="303" y="395"/>
       <point x="255" y="395" type="curve" smooth="yes"/>
@@ -33,7 +33,7 @@
       <point x="756" y="1147" type="curve" name="at01"/>
       <point x="793" y="1143"/>
       <point x="829" y="1141"/>
-      <point x="866" y="1141" type="curve" name="at02" smooth="yes"/>
+      <point x="866" y="1141" type="curve" smooth="yes" name="at02"/>
       <point x="957" y="1141"/>
       <point x="1040" y="1152"/>
       <point x="1116" y="1175" type="curve" name="av01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27B_A_.glif b/source/Hack-Regular.ufo/glyphs/uni27B_A_.glif
index 5a5a86878..b3cdcdcb1 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27B_A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27B_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27BA" format="1">
+<glyph name="uni27BA" format="2">
   <advance width="1233"/>
   <unicode hex="27BA"/>
   <outline>
@@ -19,7 +19,7 @@
       <point x="734" y="970" type="curve" smooth="yes"/>
       <point x="756" y="992"/>
       <point x="783" y="1003"/>
-      <point x="814" y="1003" type="curve" name="dv02" smooth="yes"/>
+      <point x="814" y="1003" type="curve" smooth="yes" name="dv02"/>
       <point x="845" y="1003"/>
       <point x="870" y="991"/>
       <point x="893" y="970" type="curve" smooth="yes"/>
@@ -59,7 +59,7 @@
       <point x="225" y="500"/>
     </contour>
     <contour>
-      <point x="814" y="298" type="curve" name="av01" smooth="yes"/>
+      <point x="814" y="298" type="curve" smooth="yes" name="av01"/>
       <point x="782" y="298"/>
       <point x="755" y="311"/>
       <point x="734" y="331" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27B_B_.glif b/source/Hack-Regular.ufo/glyphs/uni27B_B_.glif
index b6eab13d1..9be9e3ac9 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27B_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27B_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27BB" format="1">
+<glyph name="uni27BB" format="2">
   <advance width="1233"/>
   <unicode hex="27BB"/>
   <outline>
@@ -24,7 +24,7 @@
       <point x="973" y="498"/>
     </contour>
     <contour>
-      <point x="285" y="451" type="curve" name="dv01" smooth="yes"/>
+      <point x="285" y="451" type="curve" smooth="yes" name="dv01"/>
       <point x="230" y="451"/>
       <point x="172" y="483"/>
       <point x="148" y="510" type="curve"/>
@@ -42,7 +42,7 @@
       <point x="212" y="844" type="curve"/>
       <point x="235" y="854"/>
       <point x="259" y="859"/>
-      <point x="285" y="859" type="curve" name="dv02" smooth="yes"/>
+      <point x="285" y="859" type="curve" smooth="yes" name="dv02"/>
       <point x="342" y="859"/>
       <point x="404" y="835"/>
       <point x="460" y="800" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27B_C_.glif b/source/Hack-Regular.ufo/glyphs/uni27B_C_.glif
index cdd5f24ba..b961edc04 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27B_C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27B_C_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27BC" format="1">
+<glyph name="uni27BC" format="2">
   <advance width="1233"/>
   <unicode hex="27BC"/>
   <outline>
     <contour>
-      <point x="70" y="446" type="line" name="dv01" smooth="yes"/>
+      <point x="70" y="446" type="line" smooth="yes" name="dv01"/>
       <point x="54" y="446"/>
       <point x="38" y="461"/>
       <point x="38" y="480" type="curve" smooth="yes"/>
@@ -14,7 +14,7 @@
       <point x="133" y="677" type="line" smooth="yes"/>
       <point x="135" y="680"/>
       <point x="136" y="684"/>
-      <point x="136" y="690" type="curve" name="hr01" smooth="yes"/>
+      <point x="136" y="690" type="curve" smooth="yes" name="hr01"/>
       <point x="136" y="695"/>
       <point x="135" y="700"/>
       <point x="133" y="703" type="curve" smooth="yes"/>
@@ -27,7 +27,7 @@
       <point x="48" y="924" type="curve" smooth="yes"/>
       <point x="55" y="929"/>
       <point x="62" y="934"/>
-      <point x="70" y="934" type="curve" name="dv02" smooth="yes"/>
+      <point x="70" y="934" type="curve" smooth="yes" name="dv02"/>
       <point x="568" y="934" type="line" smooth="yes"/>
       <point x="576" y="934"/>
       <point x="585" y="931"/>
@@ -42,7 +42,7 @@
       <point x="693" y="748"/>
       <point x="697" y="747"/>
       <point x="700" y="747" type="curve" smooth="yes"/>
-      <point x="929" y="747" type="line" name="dv04" smooth="yes"/>
+      <point x="929" y="747" type="line" smooth="yes" name="dv04"/>
       <point x="937" y="747"/>
       <point x="947" y="752"/>
       <point x="952" y="757" type="curve" smooth="yes"/>
@@ -84,7 +84,7 @@
       <point x="945" y="471" type="curve" smooth="yes"/>
       <point x="938" y="478"/>
       <point x="935" y="486"/>
-      <point x="935" y="495" type="curve" name="hr02" smooth="yes"/>
+      <point x="935" y="495" type="curve" smooth="yes" name="hr02"/>
       <point x="935" y="498"/>
       <point x="936" y="500"/>
       <point x="937" y="507" type="curve" smooth="yes"/>
@@ -97,7 +97,7 @@
       <point x="952" y="623" type="curve" smooth="yes"/>
       <point x="947" y="628"/>
       <point x="937" y="633"/>
-      <point x="929" y="633" type="curve" name="dv03" smooth="yes"/>
+      <point x="929" y="633" type="curve" smooth="yes" name="dv03"/>
       <point x="700" y="633" type="line" smooth="yes"/>
       <point x="692" y="633"/>
       <point x="684" y="628"/>
@@ -111,7 +111,7 @@
       <point x="579" y="449" type="curve" smooth="yes"/>
       <point x="576" y="447"/>
       <point x="572" y="446"/>
-      <point x="568" y="446" type="curve" name="sv01" smooth="yes"/>
+      <point x="568" y="446" type="curve" smooth="yes" name="sv01"/>
     </contour>
   </outline>
   <lib>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27B_D_.glif b/source/Hack-Regular.ufo/glyphs/uni27B_D_.glif
index 84f941453..9a5b79d1c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27B_D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27B_D_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27BD" format="1">
+<glyph name="uni27BD" format="2">
   <advance width="1233"/>
   <unicode hex="27BD"/>
   <outline>
     <contour>
-      <point x="838" y="357" type="curve" name="hr00" smooth="yes"/>
+      <point x="838" y="357" type="curve" smooth="yes" name="hr00"/>
       <point x="829" y="357"/>
       <point x="822" y="362"/>
-      <point x="815" y="367" type="curve" name="av01" smooth="yes"/>
+      <point x="815" y="367" type="curve" smooth="yes" name="av01"/>
       <point x="808" y="374"/>
       <point x="805" y="381"/>
       <point x="805" y="390" type="curve" smooth="yes"/>
@@ -92,13 +92,13 @@
       <point x="805" y="976" type="curve" smooth="yes"/>
       <point x="805" y="985"/>
       <point x="808" y="992"/>
-      <point x="815" y="999" type="curve" name="av03" smooth="yes"/>
+      <point x="815" y="999" type="curve" smooth="yes" name="av03"/>
       <point x="822" y="1004"/>
       <point x="829" y="1009"/>
-      <point x="838" y="1009" type="curve" name="av04" smooth="yes"/>
+      <point x="838" y="1009" type="curve" smooth="yes" name="av04"/>
       <point x="846" y="1009"/>
       <point x="855" y="1004"/>
-      <point x="860" y="999" type="curve" name="av05" smooth="yes"/>
+      <point x="860" y="999" type="curve" smooth="yes" name="av05"/>
       <point x="1185" y="707" type="line" smooth="yes"/>
       <point x="1188" y="704"/>
       <point x="1191" y="700"/>
@@ -109,7 +109,7 @@
       <point x="1195" y="674"/>
       <point x="1192" y="666"/>
       <point x="1185" y="659" type="curve" smooth="yes"/>
-      <point x="860" y="367" type="line" name="av02" smooth="yes"/>
+      <point x="860" y="367" type="line" smooth="yes" name="av02"/>
       <point x="855" y="362"/>
       <point x="846" y="357"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27B_E_.glif b/source/Hack-Regular.ufo/glyphs/uni27B_E_.glif
index d0a4be9a0..3d63eaf55 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27B_E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27B_E_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27BE" format="1">
+<glyph name="uni27BE" format="2">
   <advance width="1233"/>
   <unicode hex="27BE"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27C_2.glif b/source/Hack-Regular.ufo/glyphs/uni27C_2.glif
index 8a2461629..a0f2a3e4b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27C_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27C_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27C2" format="1">
+<glyph name="uni27C2" format="2">
   <advance width="1233"/>
   <unicode hex="27C2"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27C_5.glif b/source/Hack-Regular.ufo/glyphs/uni27C_5.glif
index a2ba3b7ae..c6414b79a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27C_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27C_5.glif
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27C5" format="1">
+<glyph name="uni27C5" format="2">
   <advance width="1233"/>
   <unicode hex="27C5"/>
   <outline>
     <contour>
-      <point x="861" y="-334" type="line" name="hr00" smooth="yes"/>
+      <point x="861" y="-334" type="line" smooth="yes" name="hr00"/>
       <point x="834" y="-334"/>
       <point x="794" y="-331"/>
       <point x="754" y="-324" type="curve" name="av01"/>
       <point x="434" y="-276"/>
       <point x="309" y="-123"/>
-      <point x="309" y="88" type="curve" name="sh01" smooth="yes"/>
+      <point x="309" y="88" type="curve" smooth="yes" name="sh01"/>
       <point x="309" y="256"/>
       <point x="387" y="475"/>
       <point x="494" y="779" type="curve" smooth="yes"/>
       <point x="607" y="1102"/>
       <point x="672" y="1292"/>
-      <point x="672" y="1363" type="curve" name="ah01" smooth="yes"/>
+      <point x="672" y="1363" type="curve" smooth="yes" name="ah01"/>
       <point x="672" y="1419"/>
       <point x="633" y="1445"/>
-      <point x="586" y="1445" type="curve" name="sv01" smooth="yes"/>
+      <point x="586" y="1445" type="curve" smooth="yes" name="sv01"/>
       <point x="534" y="1445"/>
       <point x="507" y="1412"/>
       <point x="472" y="1308" type="curve" name="sh03"/>
       <point x="336" y="1357" type="line"/>
       <point x="370" y="1503"/>
       <point x="493" y="1574"/>
-      <point x="609" y="1574" type="curve" name="at01" smooth="yes"/>
+      <point x="609" y="1574" type="curve" smooth="yes" name="at01"/>
       <point x="721" y="1574"/>
       <point x="822" y="1508"/>
-      <point x="822" y="1367" type="curve" name="sh04" smooth="yes"/>
+      <point x="822" y="1367" type="curve" smooth="yes" name="sh04"/>
       <point x="822" y="1262"/>
       <point x="766" y="1053"/>
       <point x="654" y="736" type="curve" smooth="yes"/>
       <point x="545" y="430"/>
       <point x="476" y="229"/>
-      <point x="476" y="94" type="curve" name="sh02" smooth="yes"/>
+      <point x="476" y="94" type="curve" smooth="yes" name="sh02"/>
       <point x="476" y="-55"/>
       <point x="559" y="-122"/>
       <point x="751" y="-173" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27C_6.glif b/source/Hack-Regular.ufo/glyphs/uni27C_6.glif
index a834b82ef..02e5afd6d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27C_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27C_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27C6" format="1">
+<glyph name="uni27C6" format="2">
   <advance width="1233"/>
   <unicode hex="27C6"/>
   <outline>
@@ -13,38 +13,38 @@
       <point x="482" y="-173" type="curve" smooth="yes"/>
       <point x="677" y="-122"/>
       <point x="757" y="-53"/>
-      <point x="757" y="94" type="curve" name="ah01" smooth="yes"/>
+      <point x="757" y="94" type="curve" smooth="yes" name="ah01"/>
       <point x="757" y="230"/>
       <point x="686" y="429"/>
       <point x="579" y="736" type="curve"/>
       <point x="467" y="1053"/>
       <point x="411" y="1262"/>
-      <point x="411" y="1367" type="curve" name="sh01" smooth="yes"/>
+      <point x="411" y="1367" type="curve" smooth="yes" name="sh01"/>
       <point x="411" y="1508"/>
       <point x="512" y="1574"/>
-      <point x="624" y="1574" type="curve" name="at01" smooth="yes"/>
+      <point x="624" y="1574" type="curve" smooth="yes" name="at01"/>
       <point x="740" y="1574"/>
       <point x="863" y="1503"/>
       <point x="897" y="1357" type="curve"/>
       <point x="761" y="1308" type="line" name="sh02"/>
       <point x="724" y="1411"/>
       <point x="700" y="1445"/>
-      <point x="646" y="1445" type="curve" name="sv01" smooth="yes"/>
+      <point x="646" y="1445" type="curve" smooth="yes" name="sv01"/>
       <point x="598" y="1445"/>
       <point x="561" y="1418"/>
-      <point x="561" y="1362" type="curve" name="sh03" smooth="yes"/>
+      <point x="561" y="1362" type="curve" smooth="yes" name="sh03"/>
       <point x="561" y="1290"/>
       <point x="620" y="1120"/>
       <point x="740" y="779" type="curve" smooth="yes"/>
       <point x="847" y="474"/>
       <point x="924" y="254"/>
-      <point x="924" y="88" type="curve" name="sh04" smooth="yes"/>
+      <point x="924" y="88" type="curve" smooth="yes" name="sh04"/>
       <point x="924" y="-127"/>
       <point x="795" y="-276"/>
-      <point x="479" y="-324" type="curve" name="av01" smooth="yes"/>
+      <point x="479" y="-324" type="curve" smooth="yes" name="av01"/>
       <point x="439" y="-331"/>
       <point x="399" y="-334"/>
-      <point x="372" y="-334" type="curve" name="av02" smooth="yes"/>
+      <point x="372" y="-334" type="curve" smooth="yes" name="av02"/>
       <point x="311" y="-334" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27D_C_.glif b/source/Hack-Regular.ufo/glyphs/uni27D_C_.glif
index d159f3854..5f363ba38 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27D_C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27D_C_.glif
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27DC" format="1">
+<glyph name="uni27DC" format="2">
   <advance width="1233"/>
   <unicode hex="27DC"/>
   <outline>
     <contour>
-      <point x="313" y="359" type="curve" name="hr00" smooth="yes"/>
+      <point x="313" y="359" type="curve" smooth="yes" name="hr00"/>
       <point x="152" y="359"/>
       <point x="28" y="486"/>
-      <point x="28" y="648" type="curve" name="dh01" smooth="yes"/>
+      <point x="28" y="648" type="curve" smooth="yes" name="dh01"/>
       <point x="28" y="808"/>
       <point x="149" y="930"/>
-      <point x="313" y="930" type="curve" name="dv03" smooth="yes"/>
+      <point x="313" y="930" type="curve" smooth="yes" name="dv03"/>
       <point x="474" y="930"/>
       <point x="562" y="815"/>
       <point x="586" y="731" type="curve"/>
@@ -21,16 +21,16 @@
       <point x="469" y="359"/>
     </contour>
     <contour>
-      <point x="312" y="509" type="curve" name="dv01" smooth="yes"/>
+      <point x="312" y="509" type="curve" smooth="yes" name="dv01"/>
       <point x="389" y="509"/>
       <point x="450" y="571"/>
       <point x="450" y="647" type="curve" smooth="yes"/>
       <point x="450" y="722"/>
       <point x="390" y="782"/>
-      <point x="313" y="782" type="curve" name="dv02" smooth="yes"/>
+      <point x="313" y="782" type="curve" smooth="yes" name="dv02"/>
       <point x="236" y="782"/>
       <point x="176" y="722"/>
-      <point x="176" y="646" type="curve" name="dh02" smooth="yes"/>
+      <point x="176" y="646" type="curve" smooth="yes" name="dh02"/>
       <point x="176" y="570"/>
       <point x="236" y="509"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27E_0.glif b/source/Hack-Regular.ufo/glyphs/uni27E_0.glif
index 2485cb6d3..298a6d061 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27E_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27E_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27E0" format="1">
+<glyph name="uni27E0" format="2">
   <advance width="1233"/>
   <unicode hex="27E0"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27E_6.glif b/source/Hack-Regular.ufo/glyphs/uni27E_6.glif
index 57410b40f..e808bc18c 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27E_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27E_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27E6" format="1">
+<glyph name="uni27E6" format="2">
   <advance width="1233"/>
   <unicode hex="27E6"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27E_7.glif b/source/Hack-Regular.ufo/glyphs/uni27E_7.glif
index 3267f1445..640f50a4e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27E_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27E_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27E7" format="1">
+<glyph name="uni27E7" format="2">
   <advance width="1233"/>
   <unicode hex="27E7"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27E_8.glif b/source/Hack-Regular.ufo/glyphs/uni27E_8.glif
index 2da84bd2d..c1d465542 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27E_8.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27E_8.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27E8" format="1">
+<glyph name="uni27E8" format="2">
   <advance width="1233"/>
   <unicode hex="27E8"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27E_9.glif b/source/Hack-Regular.ufo/glyphs/uni27E_9.glif
index 897bb78f5..e0c77edce 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27E_9.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27E_9.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27E9" format="1">
+<glyph name="uni27E9" format="2">
   <advance width="1233"/>
   <unicode hex="27E9"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27E_A_.glif b/source/Hack-Regular.ufo/glyphs/uni27E_A_.glif
index 98ff93e54..0215f5279 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27E_A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27E_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27EA" format="1">
+<glyph name="uni27EA" format="2">
   <advance width="1233"/>
   <unicode hex="27EA"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27E_B_.glif b/source/Hack-Regular.ufo/glyphs/uni27E_B_.glif
index a5da6f1c5..7b55f8b5a 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27E_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27E_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27EB" format="1">
+<glyph name="uni27EB" format="2">
   <advance width="1233"/>
   <unicode hex="27EB"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27F_5.glif b/source/Hack-Regular.ufo/glyphs/uni27F_5.glif
index 494f82ff3..0b0f04fdd 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27F_5.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27F_5.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27F5" format="1">
+<glyph name="uni27F5" format="2">
   <advance width="1233"/>
   <unicode hex="27F5"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27F_6.glif b/source/Hack-Regular.ufo/glyphs/uni27F_6.glif
index 4f5dcd4e1..72fe90acb 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27F_6.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27F_6.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27F6" format="1">
+<glyph name="uni27F6" format="2">
   <advance width="1233"/>
   <unicode hex="27F6"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni27F_7.glif b/source/Hack-Regular.ufo/glyphs/uni27F_7.glif
index 8851e19ec..68201ee66 100644
--- a/source/Hack-Regular.ufo/glyphs/uni27F_7.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni27F_7.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni27F7" format="1">
+<glyph name="uni27F7" format="2">
   <advance width="1233"/>
   <unicode hex="27F7"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2987.glif b/source/Hack-Regular.ufo/glyphs/uni2987.glif
index a66056872..ff4c78d97 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2987.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2987.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2987" format="1">
+<glyph name="uni2987" format="2">
   <advance width="1233"/>
   <unicode hex="2987"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="933" y="-270" type="line" name="hr00"/>
       <point x="487" y="-162"/>
       <point x="300" y="238"/>
-      <point x="300" y="646" type="curve" name="dh01" smooth="yes"/>
+      <point x="300" y="646" type="curve" smooth="yes" name="dh01"/>
       <point x="300" y="1046"/>
       <point x="479" y="1446"/>
       <point x="933" y="1554" type="curve" name="dh04"/>
@@ -16,7 +16,7 @@
       <point x="833" y="1373" type="line" name="dh03"/>
       <point x="640" y="1321"/>
       <point x="475" y="978"/>
-      <point x="475" y="643" type="curve" name="dh02" smooth="yes"/>
+      <point x="475" y="643" type="curve" smooth="yes" name="dh02"/>
       <point x="475" y="308"/>
       <point x="640" y="-37"/>
       <point x="833" y="-89" type="curve" name="iv01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2988.glif b/source/Hack-Regular.ufo/glyphs/uni2988.glif
index b010b9ecf..86a5d5efa 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2988.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2988.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2988" format="1">
+<glyph name="uni2988" format="2">
   <advance width="1233"/>
   <unicode hex="2988"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="300" y="1554" type="line" name="hr00"/>
       <point x="746" y="1446"/>
       <point x="933" y="1047"/>
-      <point x="933" y="638" type="curve" name="dh03" smooth="yes"/>
+      <point x="933" y="638" type="curve" smooth="yes" name="dh03"/>
       <point x="933" y="237"/>
       <point x="754" y="-162"/>
       <point x="300" y="-270" type="curve" name="av01"/>
@@ -16,7 +16,7 @@
       <point x="400" y="-89" type="line" name="iv01"/>
       <point x="593" y="-37"/>
       <point x="758" y="306"/>
-      <point x="758" y="641" type="curve" name="dh02" smooth="yes"/>
+      <point x="758" y="641" type="curve" smooth="yes" name="dh02"/>
       <point x="758" y="976"/>
       <point x="593" y="1321"/>
       <point x="400" y="1373" type="curve" name="dh01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2997.glif b/source/Hack-Regular.ufo/glyphs/uni2997.glif
index 01369fc98..6e1fa2678 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2997.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2997.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2997" format="1">
+<glyph name="uni2997" format="2">
   <advance width="1233"/>
   <unicode hex="2997"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2998.glif b/source/Hack-Regular.ufo/glyphs/uni2998.glif
index 371d812f2..d8a5da2b6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2998.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2998.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2998" format="1">
+<glyph name="uni2998" format="2">
   <advance width="1233"/>
   <unicode hex="2998"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni29E_B_.glif b/source/Hack-Regular.ufo/glyphs/uni29E_B_.glif
index dff97d656..419f61c0f 100644
--- a/source/Hack-Regular.ufo/glyphs/uni29E_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni29E_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni29EB" format="1">
+<glyph name="uni29EB" format="2">
   <advance width="1233"/>
   <unicode hex="29EB"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni29F_A_.glif b/source/Hack-Regular.ufo/glyphs/uni29F_A_.glif
index cea9b6bd5..8feaab245 100644
--- a/source/Hack-Regular.ufo/glyphs/uni29F_A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni29F_A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni29FA" format="1">
+<glyph name="uni29FA" format="2">
   <advance width="1233"/>
   <unicode hex="29FA"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni29F_B_.glif b/source/Hack-Regular.ufo/glyphs/uni29F_B_.glif
index 6fb527b22..d754bafa4 100644
--- a/source/Hack-Regular.ufo/glyphs/uni29F_B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni29F_B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni29FB" format="1">
+<glyph name="uni29FB" format="2">
   <advance width="1233"/>
   <unicode hex="29FB"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2A_00.glif b/source/Hack-Regular.ufo/glyphs/uni2A_00.glif
index 4b5ddabad..d0a98016b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2A_00.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2A_00.glif
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2A00" format="1">
+<glyph name="uni2A00" format="2">
   <advance width="1233"/>
   <unicode hex="2A00"/>
   <outline>
     <contour>
-      <point x="616" y="-465" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-465" type="curve" smooth="yes" name="hr00"/>
       <point x="259" y="-465"/>
       <point x="80" y="-130"/>
-      <point x="80" y="540" type="curve" name="dh01" smooth="yes"/>
+      <point x="80" y="540" type="curve" smooth="yes" name="dh01"/>
       <point x="80" y="1211"/>
       <point x="259" y="1547"/>
-      <point x="616" y="1547" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="1547" type="curve" smooth="yes" name="dv03"/>
       <point x="974" y="1547"/>
       <point x="1153" y="1211"/>
-      <point x="1153" y="540" type="curve" name="dh06" smooth="yes"/>
+      <point x="1153" y="540" type="curve" smooth="yes" name="dh06"/>
       <point x="1153" y="-130"/>
       <point x="974" y="-465"/>
     </contour>
     <contour>
-      <point x="616" y="-325" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-325" type="curve" smooth="yes" name="dv01"/>
       <point x="881" y="-325"/>
       <point x="1013" y="-37"/>
-      <point x="1013" y="540" type="curve" name="dh05" smooth="yes"/>
+      <point x="1013" y="540" type="curve" smooth="yes" name="dh05"/>
       <point x="1013" y="1116"/>
       <point x="881" y="1407"/>
-      <point x="616" y="1407" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="1407" type="curve" smooth="yes" name="dv02"/>
       <point x="352" y="1407"/>
       <point x="220" y="1118"/>
-      <point x="220" y="540" type="curve" name="dh02" smooth="yes"/>
+      <point x="220" y="540" type="curve" smooth="yes" name="dh02"/>
       <point x="220" y="-37"/>
       <point x="352" y="-325"/>
     </contour>
     <contour>
-      <point x="519" y="376" type="line" name="dv04" smooth="yes"/>
+      <point x="519" y="376" type="line" smooth="yes" name="dv04"/>
       <point x="499" y="376"/>
       <point x="489" y="386"/>
-      <point x="489" y="406" type="curve" name="dh03" smooth="yes"/>
+      <point x="489" y="406" type="curve" smooth="yes" name="dh03"/>
       <point x="489" y="651" type="line" smooth="yes"/>
       <point x="489" y="671"/>
       <point x="499" y="681"/>
-      <point x="519" y="681" type="curve" name="dv05" smooth="yes"/>
+      <point x="519" y="681" type="curve" smooth="yes" name="dv05"/>
       <point x="711" y="681" type="line" smooth="yes"/>
       <point x="731" y="681"/>
       <point x="741" y="671"/>
       <point x="741" y="651" type="curve" smooth="yes"/>
-      <point x="741" y="406" type="line" name="dh04" smooth="yes"/>
+      <point x="741" y="406" type="line" smooth="yes" name="dh04"/>
       <point x="741" y="386"/>
       <point x="731" y="376"/>
       <point x="711" y="376" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2A_2F_.glif b/source/Hack-Regular.ufo/glyphs/uni2A_2F_.glif
index 10019de02..95c9c9d81 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2A_2F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2A_2F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2A2F" format="1">
+<glyph name="uni2A2F" format="2">
   <advance width="1233"/>
   <unicode hex="2A2F"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2A_6A_.glif b/source/Hack-Regular.ufo/glyphs/uni2A_6A_.glif
index 87703ea2b..75a22876d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2A_6A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2A_6A_.glif
@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2A6A" format="1">
+<glyph name="uni2A6A" format="2">
   <advance width="1233"/>
   <unicode hex="2A6A"/>
   <outline>
     <contour>
-      <point x="521" y="851" type="line" name="dv05" smooth="yes"/>
+      <point x="521" y="851" type="line" smooth="yes" name="dv05"/>
       <point x="501" y="851"/>
       <point x="491" y="861"/>
-      <point x="491" y="881" type="curve" name="hr01" smooth="yes"/>
+      <point x="491" y="881" type="curve" smooth="yes" name="hr01"/>
       <point x="491" y="1126" type="line" smooth="yes"/>
       <point x="491" y="1146"/>
       <point x="501" y="1156"/>
-      <point x="521" y="1156" type="curve" name="dv06" smooth="yes"/>
-      <point x="713" y="1156" type="line" name="hr02" smooth="yes"/>
+      <point x="521" y="1156" type="curve" smooth="yes" name="dv06"/>
+      <point x="713" y="1156" type="line" smooth="yes" name="hr02"/>
       <point x="733" y="1156"/>
       <point x="743" y="1146"/>
       <point x="743" y="1126" type="curve" smooth="yes"/>
-      <point x="743" y="881" type="line" name="hr03" smooth="yes"/>
+      <point x="743" y="881" type="line" smooth="yes" name="hr03"/>
       <point x="743" y="861"/>
       <point x="733" y="851"/>
-      <point x="713" y="851" type="curve" name="hr04" smooth="yes"/>
+      <point x="713" y="851" type="curve" smooth="yes" name="hr04"/>
     </contour>
     <contour>
       <point x="88" y="671" type="line"/>
       <point x="192" y="751"/>
       <point x="285" y="786"/>
-      <point x="393" y="786" type="curve" name="dv04" smooth="yes"/>
+      <point x="393" y="786" type="curve" smooth="yes" name="dv04"/>
       <point x="457" y="786"/>
       <point x="532" y="775"/>
-      <point x="623" y="732" type="curve" name="hr05" smooth="yes"/>
+      <point x="623" y="732" type="curve" smooth="yes" name="hr05"/>
       <point x="655" y="717" type="line" smooth="yes"/>
       <point x="732" y="681"/>
       <point x="802" y="663"/>
-      <point x="865" y="663" type="curve" name="dv02" smooth="yes"/>
+      <point x="865" y="663" type="curve" smooth="yes" name="dv02"/>
       <point x="957" y="663"/>
       <point x="1045" y="702"/>
       <point x="1145" y="786" type="curve"/>
       <point x="1145" y="611" type="line"/>
       <point x="1053" y="538"/>
       <point x="959" y="497"/>
-      <point x="850" y="497" type="curve" name="dv01" smooth="yes"/>
+      <point x="850" y="497" type="curve" smooth="yes" name="dv01"/>
       <point x="778" y="497"/>
       <point x="726" y="513"/>
       <point x="645" y="548" type="curve" smooth="yes"/>
       <point x="612" y="562" type="line" smooth="yes"/>
       <point x="522" y="599"/>
       <point x="468" y="620"/>
-      <point x="385" y="620" type="curve" name="dv03" smooth="yes"/>
+      <point x="385" y="620" type="curve" smooth="yes" name="dv03"/>
       <point x="282" y="620"/>
       <point x="192" y="588"/>
       <point x="88" y="497" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2A_6B_.glif b/source/Hack-Regular.ufo/glyphs/uni2A_6B_.glif
index 9f6d8a1bc..1d2234993 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2A_6B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2A_6B_.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2A6B" format="1">
+<glyph name="uni2A6B" format="2">
   <advance width="1233"/>
   <unicode hex="2A6B"/>
   <outline>
     <contour>
-      <point x="761" y="851" type="line" name="dv03" smooth="yes"/>
+      <point x="761" y="851" type="line" smooth="yes" name="dv03"/>
       <point x="741" y="851"/>
       <point x="731" y="861"/>
-      <point x="731" y="881" type="curve" name="ah01" smooth="yes"/>
+      <point x="731" y="881" type="curve" smooth="yes" name="ah01"/>
       <point x="731" y="1126" type="line" smooth="yes"/>
       <point x="731" y="1146"/>
       <point x="741" y="1156"/>
-      <point x="761" y="1156" type="curve" name="dv04" smooth="yes"/>
+      <point x="761" y="1156" type="curve" smooth="yes" name="dv04"/>
       <point x="953" y="1156" type="line" smooth="yes"/>
       <point x="973" y="1156"/>
       <point x="983" y="1146"/>
       <point x="983" y="1126" type="curve" smooth="yes"/>
-      <point x="983" y="881" type="line" name="sh01" smooth="yes"/>
+      <point x="983" y="881" type="line" smooth="yes" name="sh01"/>
       <point x="983" y="861"/>
       <point x="973" y="851"/>
       <point x="953" y="851" type="curve" smooth="yes"/>
@@ -25,46 +25,46 @@
       <point x="88" y="671" type="line"/>
       <point x="192" y="751"/>
       <point x="285" y="786"/>
-      <point x="393" y="786" type="curve" name="hr01" smooth="yes"/>
+      <point x="393" y="786" type="curve" smooth="yes" name="hr01"/>
       <point x="457" y="786"/>
       <point x="532" y="775"/>
       <point x="623" y="732" type="curve" smooth="yes"/>
       <point x="655" y="717" type="line" smooth="yes"/>
       <point x="732" y="681"/>
       <point x="802" y="663"/>
-      <point x="865" y="663" type="curve" name="hr02" smooth="yes"/>
+      <point x="865" y="663" type="curve" smooth="yes" name="hr02"/>
       <point x="957" y="663"/>
       <point x="1045" y="702"/>
       <point x="1145" y="786" type="curve"/>
       <point x="1145" y="611" type="line" name="hr03"/>
       <point x="1053" y="538"/>
       <point x="959" y="497"/>
-      <point x="850" y="497" type="curve" name="hr04" smooth="yes"/>
+      <point x="850" y="497" type="curve" smooth="yes" name="hr04"/>
       <point x="778" y="497"/>
       <point x="726" y="513"/>
       <point x="645" y="548" type="curve" smooth="yes"/>
       <point x="612" y="562" type="line" smooth="yes"/>
       <point x="522" y="599"/>
       <point x="468" y="620"/>
-      <point x="385" y="620" type="curve" name="hr05" smooth="yes"/>
+      <point x="385" y="620" type="curve" smooth="yes" name="hr05"/>
       <point x="282" y="620"/>
       <point x="192" y="588"/>
       <point x="88" y="497" type="curve"/>
     </contour>
     <contour>
-      <point x="280" y="134" type="line" name="dv01" smooth="yes"/>
+      <point x="280" y="134" type="line" smooth="yes" name="dv01"/>
       <point x="260" y="134"/>
       <point x="250" y="144"/>
-      <point x="250" y="164" type="curve" name="sh02" smooth="yes"/>
+      <point x="250" y="164" type="curve" smooth="yes" name="sh02"/>
       <point x="250" y="409" type="line" smooth="yes"/>
       <point x="250" y="429"/>
       <point x="260" y="439"/>
-      <point x="280" y="439" type="curve" name="dv02" smooth="yes"/>
+      <point x="280" y="439" type="curve" smooth="yes" name="dv02"/>
       <point x="472" y="439" type="line" smooth="yes"/>
       <point x="492" y="439"/>
       <point x="502" y="429"/>
       <point x="502" y="409" type="curve" smooth="yes"/>
-      <point x="502" y="164" type="line" name="sh03" smooth="yes"/>
+      <point x="502" y="164" type="line" smooth="yes" name="sh03"/>
       <point x="502" y="144"/>
       <point x="492" y="134"/>
       <point x="472" y="134" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2B_05.glif b/source/Hack-Regular.ufo/glyphs/uni2B_05.glif
index aae2dafb0..1c57ffc1d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2B_05.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2B_05.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B05" format="1">
+<glyph name="uni2B05" format="2">
   <advance width="1233"/>
   <unicode hex="2B05"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2B_06.glif b/source/Hack-Regular.ufo/glyphs/uni2B_06.glif
index 8301a2c45..e781b0ca5 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2B_06.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2B_06.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B06" format="1">
+<glyph name="uni2B06" format="2">
   <advance width="1233"/>
   <unicode hex="2B06"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2B_07.glif b/source/Hack-Regular.ufo/glyphs/uni2B_07.glif
index 9b1a7e792..94c3f0bc7 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2B_07.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2B_07.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B07" format="1">
+<glyph name="uni2B07" format="2">
   <advance width="1233"/>
   <unicode hex="2B07"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2B_08.glif b/source/Hack-Regular.ufo/glyphs/uni2B_08.glif
index a1663e612..bf05515aa 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2B_08.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2B_08.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B08" format="1">
+<glyph name="uni2B08" format="2">
   <advance width="1233"/>
   <unicode hex="2B08"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2B_09.glif b/source/Hack-Regular.ufo/glyphs/uni2B_09.glif
index 53bd2854b..443a0a27b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2B_09.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2B_09.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B09" format="1">
+<glyph name="uni2B09" format="2">
   <advance width="1233"/>
   <unicode hex="2B09"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2B_0A_.glif b/source/Hack-Regular.ufo/glyphs/uni2B_0A_.glif
index 07d99088d..8d7b58520 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2B_0A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2B_0A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B0A" format="1">
+<glyph name="uni2B0A" format="2">
   <advance width="1233"/>
   <unicode hex="2B0A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2B_0B_.glif b/source/Hack-Regular.ufo/glyphs/uni2B_0B_.glif
index 1ff77d49c..40a643378 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2B_0B_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2B_0B_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B0B" format="1">
+<glyph name="uni2B0B" format="2">
   <advance width="1233"/>
   <unicode hex="2B0B"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2B_0C_.glif b/source/Hack-Regular.ufo/glyphs/uni2B_0C_.glif
index 7464efd15..e77854f14 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2B_0C_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2B_0C_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B0C" format="1">
+<glyph name="uni2B0C" format="2">
   <advance width="1233"/>
   <unicode hex="2B0C"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2B_0D_.glif b/source/Hack-Regular.ufo/glyphs/uni2B_0D_.glif
index 13acb4c41..bd4b267a7 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2B_0D_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2B_0D_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B0D" format="1">
+<glyph name="uni2B0D" format="2">
   <advance width="1233"/>
   <unicode hex="2B0D"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2B_16.glif b/source/Hack-Regular.ufo/glyphs/uni2B_16.glif
index 874df6ab1..5a1a56a23 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2B_16.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2B_16.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B16" format="1">
+<glyph name="uni2B16" format="2">
   <advance width="1233"/>
   <unicode hex="2B16"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2B_17.glif b/source/Hack-Regular.ufo/glyphs/uni2B_17.glif
index 074464fff..083909981 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2B_17.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2B_17.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B17" format="1">
+<glyph name="uni2B17" format="2">
   <advance width="1233"/>
   <unicode hex="2B17"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2B_18.glif b/source/Hack-Regular.ufo/glyphs/uni2B_18.glif
index 1834720d1..91a26a4d4 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2B_18.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2B_18.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B18" format="1">
+<glyph name="uni2B18" format="2">
   <advance width="1233"/>
   <unicode hex="2B18"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2B_19.glif b/source/Hack-Regular.ufo/glyphs/uni2B_19.glif
index d47b5b184..41eb9616d 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2B_19.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2B_19.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B19" format="1">
+<glyph name="uni2B19" format="2">
   <advance width="1233"/>
   <unicode hex="2B19"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2B_1A_.glif b/source/Hack-Regular.ufo/glyphs/uni2B_1A_.glif
index d926e42c8..492f88fb0 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2B_1A_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2B_1A_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2B1A" format="1">
+<glyph name="uni2B1A" format="2">
   <advance width="1233"/>
   <unicode hex="2B1A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2E_18.case.glif b/source/Hack-Regular.ufo/glyphs/uni2E_18.case.glif
index f4f59283e..e2f227a6e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2E_18.case.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2E_18.case.glif
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E18.case" format="1">
+<glyph name="uni2E18.case" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="645" y="1230" type="curve" name="dv01" smooth="yes"/>
+      <point x="645" y="1230" type="curve" smooth="yes" name="dv01"/>
       <point x="604" y="1230"/>
       <point x="569" y="1244"/>
       <point x="541" y="1272" type="curve" smooth="yes"/>
       <point x="512" y="1301"/>
       <point x="498" y="1340"/>
-      <point x="498" y="1383" type="curve" name="dh03" smooth="yes"/>
+      <point x="498" y="1383" type="curve" smooth="yes" name="dh03"/>
       <point x="498" y="1426"/>
       <point x="512" y="1464"/>
       <point x="540" y="1492" type="curve" smooth="yes"/>
       <point x="563" y="1515"/>
       <point x="599" y="1534"/>
-      <point x="644" y="1534" type="curve" name="dv02" smooth="yes"/>
+      <point x="644" y="1534" type="curve" smooth="yes" name="dv02"/>
       <point x="687" y="1534"/>
       <point x="721" y="1519"/>
       <point x="748" y="1492" type="curve" smooth="yes"/>
       <point x="776" y="1464"/>
       <point x="790" y="1428"/>
-      <point x="790" y="1383" type="curve" name="dh04" smooth="yes"/>
+      <point x="790" y="1383" type="curve" smooth="yes" name="dh04"/>
       <point x="790" y="1338"/>
       <point x="776" y="1301"/>
       <point x="748" y="1273" type="curve" smooth="yes"/>
@@ -29,17 +29,17 @@
       <point x="685" y="1230"/>
     </contour>
     <contour>
-      <point x="605" y="-27" type="curve" name="hr01" smooth="yes"/>
+      <point x="605" y="-27" type="curve" smooth="yes" name="hr01"/>
       <point x="351" y="-27"/>
       <point x="193" y="112"/>
-      <point x="193" y="325" type="curve" name="dh01" smooth="yes"/>
+      <point x="193" y="325" type="curve" smooth="yes" name="dh01"/>
       <point x="193" y="424"/>
       <point x="227" y="501"/>
       <point x="354" y="625" type="curve" smooth="yes"/>
       <point x="442" y="711" type="line"/>
       <point x="538" y="801"/>
       <point x="549" y="843"/>
-      <point x="549" y="922" type="curve" name="sh01" smooth="yes"/>
+      <point x="549" y="922" type="curve" smooth="yes" name="sh01"/>
       <point x="549" y="1092" type="line" name="ih02"/>
       <point x="739" y="1092" type="line" name="sh02"/>
       <point x="739" y="151" type="line" name="ih03"/>
@@ -58,7 +58,7 @@
       <point x="504" y="532" type="line" smooth="yes"/>
       <point x="428" y="456"/>
       <point x="395" y="413"/>
-      <point x="395" y="337" type="curve" name="dh02" smooth="yes"/>
+      <point x="395" y="337" type="curve" smooth="yes" name="dh02"/>
       <point x="395" y="216"/>
       <point x="481" y="165"/>
       <point x="549" y="147" type="curve" name="ih01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2E_18.glif b/source/Hack-Regular.ufo/glyphs/uni2E_18.glif
index d52e7d151..6764ff93e 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2E_18.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2E_18.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E18" format="1">
+<glyph name="uni2E18" format="2">
   <advance width="1233"/>
   <unicode hex="2E18"/>
   <outline>
     <contour>
-      <point x="648" y="840" type="curve" name="sv01" smooth="yes"/>
+      <point x="648" y="840" type="curve" smooth="yes" name="sv01"/>
       <point x="607" y="840"/>
       <point x="572" y="854"/>
       <point x="544" y="882" type="curve" smooth="yes"/>
       <point x="515" y="911"/>
       <point x="501" y="950"/>
-      <point x="501" y="993" type="curve" name="dh03" smooth="yes"/>
+      <point x="501" y="993" type="curve" smooth="yes" name="dh03"/>
       <point x="501" y="1036"/>
       <point x="515" y="1074"/>
       <point x="543" y="1102" type="curve" smooth="yes"/>
       <point x="566" y="1125"/>
       <point x="602" y="1144"/>
-      <point x="647" y="1144" type="curve" name="at01" smooth="yes"/>
+      <point x="647" y="1144" type="curve" smooth="yes" name="at01"/>
       <point x="690" y="1144"/>
       <point x="724" y="1129"/>
       <point x="751" y="1102" type="curve" smooth="yes"/>
       <point x="779" y="1074"/>
       <point x="793" y="1038"/>
-      <point x="793" y="993" type="curve" name="dh04" smooth="yes"/>
+      <point x="793" y="993" type="curve" smooth="yes" name="dh04"/>
       <point x="793" y="948"/>
       <point x="779" y="911"/>
       <point x="751" y="883" type="curve" smooth="yes"/>
@@ -30,17 +30,17 @@
       <point x="688" y="840"/>
     </contour>
     <contour>
-      <point x="605" y="-400" type="curve" name="hr01" smooth="yes"/>
+      <point x="605" y="-400" type="curve" smooth="yes" name="hr01"/>
       <point x="351" y="-400"/>
       <point x="193" y="-261"/>
-      <point x="193" y="-48" type="curve" name="dh01" smooth="yes"/>
+      <point x="193" y="-48" type="curve" smooth="yes" name="dh01"/>
       <point x="193" y="51"/>
       <point x="227" y="128"/>
       <point x="354" y="252" type="curve" smooth="yes"/>
       <point x="442" y="338" type="line"/>
       <point x="538" y="428"/>
       <point x="549" y="470"/>
-      <point x="549" y="549" type="curve" name="sh01" smooth="yes"/>
+      <point x="549" y="549" type="curve" smooth="yes" name="sh01"/>
       <point x="549" y="719" type="line" name="ih02"/>
       <point x="739" y="719" type="line" name="sh02"/>
       <point x="739" y="-222" type="line" name="ih03"/>
@@ -59,7 +59,7 @@
       <point x="504" y="159" type="line" smooth="yes"/>
       <point x="428" y="83"/>
       <point x="395" y="40"/>
-      <point x="395" y="-36" type="curve" name="dh02" smooth="yes"/>
+      <point x="395" y="-36" type="curve" smooth="yes" name="dh02"/>
       <point x="395" y="-157"/>
       <point x="481" y="-208"/>
       <point x="549" y="-226" type="curve" name="ih01"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2E_1F_.glif b/source/Hack-Regular.ufo/glyphs/uni2E_1F_.glif
index 50a94ba02..77d954ce6 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2E_1F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2E_1F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E1F" format="1">
+<glyph name="uni2E1F" format="2">
   <advance width="1233"/>
   <unicode hex="2E1F"/>
   <outline>
@@ -7,28 +7,28 @@
       <point x="88" y="671" type="line" name="hr00"/>
       <point x="192" y="751"/>
       <point x="285" y="786"/>
-      <point x="393" y="786" type="curve" name="dv01" smooth="yes"/>
+      <point x="393" y="786" type="curve" smooth="yes" name="dv01"/>
       <point x="457" y="786"/>
       <point x="532" y="775"/>
       <point x="623" y="732" type="curve" smooth="yes"/>
       <point x="655" y="717" type="line" smooth="yes"/>
       <point x="732" y="681"/>
       <point x="802" y="663"/>
-      <point x="865" y="663" type="curve" name="dv03" smooth="yes"/>
+      <point x="865" y="663" type="curve" smooth="yes" name="dv03"/>
       <point x="957" y="663"/>
       <point x="1045" y="702"/>
       <point x="1145" y="786" type="curve" name="hr01"/>
       <point x="1145" y="611" type="line"/>
       <point x="1053" y="538"/>
       <point x="959" y="497"/>
-      <point x="850" y="497" type="curve" name="dv02" smooth="yes"/>
+      <point x="850" y="497" type="curve" smooth="yes" name="dv02"/>
       <point x="778" y="497"/>
       <point x="726" y="513"/>
-      <point x="645" y="548" type="curve" name="hr02" smooth="yes"/>
+      <point x="645" y="548" type="curve" smooth="yes" name="hr02"/>
       <point x="612" y="562" type="line" smooth="yes"/>
       <point x="522" y="599"/>
       <point x="468" y="620"/>
-      <point x="385" y="620" type="curve" name="hr03" smooth="yes"/>
+      <point x="385" y="620" type="curve" smooth="yes" name="hr03"/>
       <point x="282" y="620"/>
       <point x="192" y="588"/>
       <point x="88" y="497" type="curve" name="hr04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2E_22.glif b/source/Hack-Regular.ufo/glyphs/uni2E_22.glif
index 29dc0249b..0f4dded51 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2E_22.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2E_22.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E22" format="1">
+<glyph name="uni2E22" format="2">
   <advance width="1233"/>
   <unicode hex="2E22"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2E_23.glif b/source/Hack-Regular.ufo/glyphs/uni2E_23.glif
index 9eb77f398..a9a62135b 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2E_23.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2E_23.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E23" format="1">
+<glyph name="uni2E23" format="2">
   <advance width="1233"/>
   <unicode hex="2E23"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2E_24.glif b/source/Hack-Regular.ufo/glyphs/uni2E_24.glif
index e16a25634..c573e7018 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2E_24.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2E_24.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E24" format="1">
+<glyph name="uni2E24" format="2">
   <advance width="1233"/>
   <unicode hex="2E24"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2E_25.glif b/source/Hack-Regular.ufo/glyphs/uni2E_25.glif
index 6dc435c97..c3327a763 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2E_25.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2E_25.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E25" format="1">
+<glyph name="uni2E25" format="2">
   <advance width="1233"/>
   <unicode hex="2E25"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uni2E_2E_.glif b/source/Hack-Regular.ufo/glyphs/uni2E_2E_.glif
index 5352c8760..b78c8d010 100644
--- a/source/Hack-Regular.ufo/glyphs/uni2E_2E_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uni2E_2E_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uni2E2E" format="1">
+<glyph name="uni2E2E" format="2">
   <advance width="1233"/>
   <unicode hex="2E2E"/>
   <outline>
     <contour>
-      <point x="574" y="524" type="line" name="ih01" smooth="yes"/>
+      <point x="574" y="524" type="line" smooth="yes" name="ih01"/>
       <point x="574" y="593"/>
       <point x="570" y="629"/>
       <point x="562" y="657" type="curve" smooth="yes"/>
@@ -14,50 +14,50 @@
       <point x="380" y="868" type="line" smooth="yes"/>
       <point x="262" y="983"/>
       <point x="218" y="1059"/>
-      <point x="218" y="1170" type="curve" name="dh01" smooth="yes"/>
+      <point x="218" y="1170" type="curve" smooth="yes" name="dh01"/>
       <point x="218" y="1378"/>
       <point x="379" y="1520"/>
-      <point x="630" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="630" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="763" y="1520"/>
       <point x="894" y="1482"/>
       <point x="1015" y="1407" type="curve"/>
       <point x="1015" y="1219" type="line"/>
       <point x="886" y="1308"/>
       <point x="766" y="1356"/>
-      <point x="657" y="1356" type="curve" name="sv01" smooth="yes"/>
+      <point x="657" y="1356" type="curve" smooth="yes" name="sv01"/>
       <point x="517" y="1356"/>
       <point x="421" y="1276"/>
-      <point x="421" y="1156" type="curve" name="hr01" smooth="yes"/>
+      <point x="421" y="1156" type="curve" smooth="yes" name="hr01"/>
       <point x="421" y="1084"/>
       <point x="456" y="1033"/>
       <point x="529" y="961" type="curve" smooth="yes"/>
       <point x="619" y="872" type="line" smooth="yes"/>
       <point x="738" y="756"/>
       <point x="765" y="695"/>
-      <point x="765" y="555" type="curve" name="sh01" smooth="yes"/>
+      <point x="765" y="555" type="curve" smooth="yes" name="sh01"/>
       <point x="765" y="401" type="line"/>
       <point x="574" y="401" type="line"/>
     </contour>
     <contour>
-      <point x="669" y="-40" type="curve" name="dv01" smooth="yes"/>
+      <point x="669" y="-40" type="curve" smooth="yes" name="dv01"/>
       <point x="628" y="-40"/>
       <point x="593" y="-26"/>
       <point x="565" y="2" type="curve" smooth="yes"/>
       <point x="536" y="31"/>
       <point x="522" y="70"/>
-      <point x="522" y="113" type="curve" name="dh02" smooth="yes"/>
+      <point x="522" y="113" type="curve" smooth="yes" name="dh02"/>
       <point x="522" y="156"/>
       <point x="536" y="194"/>
       <point x="564" y="222" type="curve" smooth="yes"/>
       <point x="587" y="245"/>
       <point x="623" y="264"/>
-      <point x="668" y="264" type="curve" name="dv02" smooth="yes"/>
+      <point x="668" y="264" type="curve" smooth="yes" name="dv02"/>
       <point x="711" y="264"/>
       <point x="745" y="249"/>
       <point x="772" y="222" type="curve" smooth="yes"/>
       <point x="800" y="194"/>
       <point x="814" y="158"/>
-      <point x="814" y="113" type="curve" name="dh03" smooth="yes"/>
+      <point x="814" y="113" type="curve" smooth="yes" name="dh03"/>
       <point x="814" y="68"/>
       <point x="800" y="31"/>
       <point x="772" y="3" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uniE_0A_0.glif b/source/Hack-Regular.ufo/glyphs/uniE_0A_0.glif
index 4b063facc..33d485208 100644
--- a/source/Hack-Regular.ufo/glyphs/uniE_0A_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uniE_0A_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0A0" format="1">
+<glyph name="uniE0A0" format="2">
   <advance width="1233"/>
   <unicode hex="E0A0"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="279" y="624" type="line" name="iv01"/>
     </contour>
     <contour>
-      <point x="279" y="159" type="line" name="sh01" smooth="yes"/>
+      <point x="279" y="159" type="line" smooth="yes" name="sh01"/>
       <point x="279" y="266"/>
       <point x="302" y="352"/>
       <point x="349" y="419" type="curve" smooth="yes"/>
@@ -23,13 +23,13 @@
       <point x="747" y="765" type="curve" smooth="yes"/>
       <point x="770" y="811"/>
       <point x="781" y="873"/>
-      <point x="781" y="950" type="curve" name="dh02" smooth="yes"/>
+      <point x="781" y="950" type="curve" smooth="yes" name="dh02"/>
       <point x="781" y="1242" type="line"/>
       <point x="596" y="1242" type="line" name="ih01"/>
       <point x="856" y="1545" type="line"/>
       <point x="1113" y="1242" type="line" name="iv02"/>
       <point x="928" y="1242" type="line"/>
-      <point x="928" y="901" type="line" name="dh03" smooth="yes"/>
+      <point x="928" y="901" type="line" smooth="yes" name="dh03"/>
       <point x="928" y="793"/>
       <point x="916" y="708"/>
       <point x="881" y="640" type="curve" smooth="yes"/>
@@ -39,7 +39,7 @@
       <point x="672" y="442" type="line" smooth="yes"/>
       <point x="567" y="369"/>
       <point x="524" y="319"/>
-      <point x="524" y="159" type="curve" name="sh02" smooth="yes"/>
+      <point x="524" y="159" type="curve" smooth="yes" name="sh02"/>
       <point x="524" y="-267" type="line" name="ab01"/>
       <point x="279" y="-267" type="line"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uniE_0A_1.glif b/source/Hack-Regular.ufo/glyphs/uniE_0A_1.glif
index 946a5d679..b19d5baaa 100644
--- a/source/Hack-Regular.ufo/glyphs/uniE_0A_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uniE_0A_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0A1" format="1">
+<glyph name="uniE0A1" format="2">
   <advance width="1233"/>
   <unicode hex="E0A1"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uniE_0A_2.glif b/source/Hack-Regular.ufo/glyphs/uniE_0A_2.glif
index 64091a334..5c402e4dc 100644
--- a/source/Hack-Regular.ufo/glyphs/uniE_0A_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uniE_0A_2.glif
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0A2" format="1">
+<glyph name="uniE0A2" format="2">
   <advance width="1233"/>
   <unicode hex="E0A2"/>
   <outline>
     <contour>
-      <point x="276" y="-267" type="line" name="ab01" smooth="yes"/>
+      <point x="276" y="-267" type="line" smooth="yes" name="ab01"/>
       <point x="157" y="-267"/>
       <point x="98" y="-207"/>
       <point x="98" y="-86" type="curve" smooth="yes"/>
-      <point x="98" y="795" type="line" name="dh01" smooth="yes"/>
+      <point x="98" y="795" type="line" smooth="yes" name="dh01"/>
       <point x="98" y="924"/>
       <point x="150" y="989"/>
       <point x="253" y="989" type="curve" name="hr01"/>
@@ -18,24 +18,24 @@
       <point x="360" y="1673" type="curve" smooth="yes"/>
       <point x="428" y="1746"/>
       <point x="514" y="1783"/>
-      <point x="617" y="1783" type="curve" name="at01" smooth="yes"/>
+      <point x="617" y="1783" type="curve" smooth="yes" name="at01"/>
       <point x="720" y="1783"/>
       <point x="806" y="1746"/>
       <point x="874" y="1673" type="curve" smooth="yes"/>
       <point x="939" y="1601"/>
       <point x="981" y="1504"/>
-      <point x="981" y="1379" type="curve" name="hr02" smooth="yes"/>
+      <point x="981" y="1379" type="curve" smooth="yes" name="hr02"/>
       <point x="981" y="989" type="line" name="sh01"/>
       <point x="1084" y="989"/>
       <point x="1136" y="924"/>
-      <point x="1136" y="795" type="curve" name="dh03" smooth="yes"/>
-      <point x="1136" y="-86" type="line" name="hr03" smooth="yes"/>
+      <point x="1136" y="795" type="curve" smooth="yes" name="dh03"/>
+      <point x="1136" y="-86" type="line" smooth="yes" name="hr03"/>
       <point x="1136" y="-207"/>
       <point x="1076" y="-267"/>
       <point x="955" y="-267" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="617" y="1618" type="curve" name="sv01" smooth="yes"/>
+      <point x="617" y="1618" type="curve" smooth="yes" name="sv01"/>
       <point x="558" y="1618"/>
       <point x="513" y="1595"/>
       <point x="478" y="1552" type="curve" smooth="yes"/>
@@ -44,7 +44,7 @@
       <point x="428" y="1379" type="curve" smooth="yes"/>
       <point x="428" y="989" type="line" name="sh02"/>
       <point x="806" y="989" type="line" name="ih01"/>
-      <point x="806" y="1379" type="line" name="hr04" smooth="yes"/>
+      <point x="806" y="1379" type="line" smooth="yes" name="hr04"/>
       <point x="806" y="1523"/>
       <point x="729" y="1618"/>
     </contour>
@@ -52,19 +52,19 @@
       <point x="688" y="449" type="line" name="hr05"/>
       <point x="745" y="478"/>
       <point x="774" y="525"/>
-      <point x="774" y="590" type="curve" name="sh03" smooth="yes"/>
+      <point x="774" y="590" type="curve" smooth="yes" name="sh03"/>
       <point x="774" y="635"/>
       <point x="761" y="671"/>
       <point x="730" y="703" type="curve"/>
       <point x="698" y="734"/>
       <point x="662" y="750"/>
-      <point x="617" y="750" type="curve" name="dv01" smooth="yes"/>
+      <point x="617" y="750" type="curve" smooth="yes" name="dv01"/>
       <point x="572" y="750"/>
       <point x="536" y="734"/>
       <point x="504" y="703" type="curve"/>
       <point x="473" y="671"/>
       <point x="457" y="635"/>
-      <point x="457" y="588" type="curve" name="dh02" smooth="yes"/>
+      <point x="457" y="588" type="curve" smooth="yes" name="dh02"/>
       <point x="457" y="524"/>
       <point x="486" y="478"/>
       <point x="544" y="449" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/uniE_0B_0.glif b/source/Hack-Regular.ufo/glyphs/uniE_0B_0.glif
index 4bd3a2543..e4251a395 100644
--- a/source/Hack-Regular.ufo/glyphs/uniE_0B_0.glif
+++ b/source/Hack-Regular.ufo/glyphs/uniE_0B_0.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0B0" format="1">
+<glyph name="uniE0B0" format="2">
   <advance width="1233"/>
   <unicode hex="E0B0"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uniE_0B_1.glif b/source/Hack-Regular.ufo/glyphs/uniE_0B_1.glif
index 9944a0098..810354d4c 100644
--- a/source/Hack-Regular.ufo/glyphs/uniE_0B_1.glif
+++ b/source/Hack-Regular.ufo/glyphs/uniE_0B_1.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0B1" format="1">
+<glyph name="uniE0B1" format="2">
   <advance width="1233"/>
   <unicode hex="E0B1"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uniE_0B_2.glif b/source/Hack-Regular.ufo/glyphs/uniE_0B_2.glif
index 77282c49e..8fa0e69e0 100644
--- a/source/Hack-Regular.ufo/glyphs/uniE_0B_2.glif
+++ b/source/Hack-Regular.ufo/glyphs/uniE_0B_2.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0B2" format="1">
+<glyph name="uniE0B2" format="2">
   <advance width="1233"/>
   <unicode hex="E0B2"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uniE_0B_3.glif b/source/Hack-Regular.ufo/glyphs/uniE_0B_3.glif
index 7f76c4b93..900ebcaf8 100644
--- a/source/Hack-Regular.ufo/glyphs/uniE_0B_3.glif
+++ b/source/Hack-Regular.ufo/glyphs/uniE_0B_3.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniE0B3" format="1">
+<glyph name="uniE0B3" format="2">
   <advance width="1233"/>
   <unicode hex="E0B3"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uniF_E_F_F_.glif b/source/Hack-Regular.ufo/glyphs/uniF_E_F_F_.glif
index 3ca2362e7..f5d2cecac 100644
--- a/source/Hack-Regular.ufo/glyphs/uniF_E_F_F_.glif
+++ b/source/Hack-Regular.ufo/glyphs/uniF_E_F_F_.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uniFEFF" format="1">
+<glyph name="uniFEFF" format="2">
   <advance width="1233"/>
   <unicode hex="FEFF"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/union.glif b/source/Hack-Regular.ufo/glyphs/union.glif
index 36ec35e98..45ea017e6 100644
--- a/source/Hack-Regular.ufo/glyphs/union.glif
+++ b/source/Hack-Regular.ufo/glyphs/union.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="union" format="1">
+<glyph name="union" format="2">
   <advance width="1233"/>
   <unicode hex="222A"/>
   <outline>
     <contour>
-      <point x="616" y="0" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="0" type="curve" smooth="yes" name="hr00"/>
       <point x="484" y="0"/>
       <point x="351" y="40"/>
       <point x="274" y="117" type="curve" smooth="yes"/>
@@ -13,31 +13,31 @@
       <point x="189" y="278" type="curve" smooth="yes"/>
       <point x="172" y="347"/>
       <point x="164" y="446"/>
-      <point x="164" y="606" type="curve" name="sh01" smooth="yes"/>
+      <point x="164" y="606" type="curve" smooth="yes" name="sh01"/>
       <point x="164" y="1186" type="line" name="av01"/>
       <point x="337" y="1186" type="line"/>
-      <point x="337" y="514" type="line" name="sh02" smooth="yes"/>
+      <point x="337" y="514" type="line" smooth="yes" name="sh02"/>
       <point x="337" y="490"/>
       <point x="341" y="411"/>
-      <point x="349" y="354" type="curve" name="sh03" smooth="yes"/>
+      <point x="349" y="354" type="curve" smooth="yes" name="sh03"/>
       <point x="354" y="314"/>
       <point x="359" y="300"/>
       <point x="367" y="283" type="curve" smooth="yes"/>
       <point x="404" y="207"/>
       <point x="513" y="164"/>
-      <point x="614" y="164" type="curve" name="sv01" smooth="yes"/>
+      <point x="614" y="164" type="curve" smooth="yes" name="sv01"/>
       <point x="729" y="164"/>
       <point x="839" y="218"/>
       <point x="866" y="283" type="curve" smooth="yes"/>
       <point x="869" y="288"/>
       <point x="878" y="314"/>
-      <point x="885" y="354" type="curve" name="sh04" smooth="yes"/>
+      <point x="885" y="354" type="curve" smooth="yes" name="sh04"/>
       <point x="893" y="402"/>
       <point x="896" y="478"/>
-      <point x="896" y="512" type="curve" name="ah01" smooth="yes"/>
+      <point x="896" y="512" type="curve" smooth="yes" name="ah01"/>
       <point x="896" y="1186" type="line" name="av02"/>
       <point x="1068" y="1186" type="line"/>
-      <point x="1068" y="606" type="line" name="sh05" smooth="yes"/>
+      <point x="1068" y="606" type="line" smooth="yes" name="sh05"/>
       <point x="1068" y="413"/>
       <point x="1059" y="332"/>
       <point x="1043" y="276" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/universal.glif b/source/Hack-Regular.ufo/glyphs/universal.glif
index e0d528b23..f31583690 100644
--- a/source/Hack-Regular.ufo/glyphs/universal.glif
+++ b/source/Hack-Regular.ufo/glyphs/universal.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="universal" format="1">
+<glyph name="universal" format="2">
   <advance width="1233"/>
   <unicode hex="2200"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/uogonek.glif b/source/Hack-Regular.ufo/glyphs/uogonek.glif
index a3007bcdb..604c62b15 100644
--- a/source/Hack-Regular.ufo/glyphs/uogonek.glif
+++ b/source/Hack-Regular.ufo/glyphs/uogonek.glif
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uogonek" format="1">
+<glyph name="uogonek" format="2">
   <advance width="1233"/>
   <unicode hex="0173"/>
   <outline>
     <contour>
-      <point x="1076" y="-272" type="curve" name="dv01" smooth="yes"/>
+      <point x="1076" y="-272" type="curve" smooth="yes" name="dv01"/>
       <point x="1117" y="-272"/>
       <point x="1159" y="-262"/>
       <point x="1200" y="-242" type="curve" name="sh01"/>
       <point x="1200" y="-375" type="line"/>
       <point x="1144" y="-390"/>
       <point x="1106" y="-395"/>
-      <point x="1057" y="-395" type="curve" name="hr01" smooth="yes"/>
+      <point x="1057" y="-395" type="curve" smooth="yes" name="hr01"/>
       <point x="908" y="-395"/>
       <point x="827" y="-340"/>
-      <point x="827" y="-221" type="curve" name="dh03" smooth="yes"/>
+      <point x="827" y="-221" type="curve" smooth="yes" name="dh03"/>
       <point x="827" y="-155"/>
       <point x="853" y="-93"/>
       <point x="935" y="0" type="curve" name="ih01"/>
@@ -22,26 +22,26 @@
       <point x="866" y="168" type="line" name="hr02"/>
       <point x="801" y="39"/>
       <point x="687" y="-29"/>
-      <point x="534" y="-29" type="curve" name="dv02" smooth="yes"/>
+      <point x="534" y="-29" type="curve" smooth="yes" name="dv02"/>
       <point x="305" y="-29"/>
       <point x="195" y="119"/>
-      <point x="195" y="424" type="curve" name="dh01" smooth="yes"/>
+      <point x="195" y="424" type="curve" smooth="yes" name="dh01"/>
       <point x="195" y="1118" type="line" name="at01"/>
       <point x="379" y="1118" type="line"/>
-      <point x="379" y="424" type="line" name="dh02" smooth="yes"/>
+      <point x="379" y="424" type="line" smooth="yes" name="dh02"/>
       <point x="379" y="223"/>
       <point x="449" y="131"/>
-      <point x="598" y="131" type="curve" name="dv03" smooth="yes"/>
+      <point x="598" y="131" type="curve" smooth="yes" name="dv03"/>
       <point x="773" y="131"/>
       <point x="866" y="256"/>
-      <point x="866" y="485" type="curve" name="hr03" smooth="yes"/>
+      <point x="866" y="485" type="curve" smooth="yes" name="hr03"/>
       <point x="866" y="1118" type="line" name="at02"/>
       <point x="1051" y="1118" type="line" name="hr04"/>
       <point x="1051" y="0" type="line" name="sh02"/>
       <point x="1054" y="0" type="line"/>
       <point x="990" y="-87"/>
       <point x="966" y="-139"/>
-      <point x="966" y="-184" type="curve" name="dh04" smooth="yes"/>
+      <point x="966" y="-184" type="curve" smooth="yes" name="dh04"/>
       <point x="966" y="-240"/>
       <point x="1004" y="-272"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/upblock.glif b/source/Hack-Regular.ufo/glyphs/upblock.glif
index dfd4c2b20..360745d3c 100644
--- a/source/Hack-Regular.ufo/glyphs/upblock.glif
+++ b/source/Hack-Regular.ufo/glyphs/upblock.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="upblock" format="1">
+<glyph name="upblock" format="2">
   <advance width="1233"/>
   <unicode hex="2580"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/upsilon.glif b/source/Hack-Regular.ufo/glyphs/upsilon.glif
index 1845e838a..f284de7b4 100644
--- a/source/Hack-Regular.ufo/glyphs/upsilon.glif
+++ b/source/Hack-Regular.ufo/glyphs/upsilon.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="upsilon" format="1">
+<glyph name="upsilon" format="2">
   <advance width="1233"/>
   <unicode hex="03C5"/>
   <outline>
     <contour>
-      <point x="595" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="595" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="374" y="0"/>
       <point x="262" y="122"/>
       <point x="262" y="406" type="curve"/>
@@ -15,20 +15,20 @@
       <point x="450" y="395" type="line" smooth="yes"/>
       <point x="450" y="227"/>
       <point x="479" y="156"/>
-      <point x="604" y="156" type="curve" name="sv01" smooth="yes"/>
+      <point x="604" y="156" type="curve" smooth="yes" name="sv01"/>
       <point x="832" y="156"/>
       <point x="926" y="384"/>
-      <point x="942" y="640" type="curve" name="sh02" smooth="yes"/>
+      <point x="942" y="640" type="curve" smooth="yes" name="sh02"/>
       <point x="943" y="656"/>
       <point x="944" y="677"/>
-      <point x="944" y="698" type="curve" name="dh03" smooth="yes"/>
+      <point x="944" y="698" type="curve" smooth="yes" name="dh03"/>
       <point x="944" y="819"/>
       <point x="909" y="968"/>
       <point x="786" y="1120" type="curve" name="ih01"/>
       <point x="972" y="1120" type="line" name="hr01"/>
       <point x="1069" y="995"/>
       <point x="1129" y="832"/>
-      <point x="1129" y="645" type="curve" name="dh04" smooth="yes"/>
+      <point x="1129" y="645" type="curve" smooth="yes" name="dh04"/>
       <point x="1129" y="338"/>
       <point x="966" y="0"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/upsilondieresis.glif b/source/Hack-Regular.ufo/glyphs/upsilondieresis.glif
index 75c62203f..c84cdfc42 100644
--- a/source/Hack-Regular.ufo/glyphs/upsilondieresis.glif
+++ b/source/Hack-Regular.ufo/glyphs/upsilondieresis.glif
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="upsilondieresis" format="1">
+<glyph name="upsilondieresis" format="2">
   <advance width="1233"/>
   <unicode hex="03CB"/>
   <outline>
     <contour>
-      <point x="349" y="1322" type="line" name="dv01" smooth="yes"/>
+      <point x="349" y="1322" type="line" smooth="yes" name="dv01"/>
       <point x="329" y="1322"/>
       <point x="319" y="1332"/>
-      <point x="319" y="1352" type="curve" name="ih01" smooth="yes"/>
+      <point x="319" y="1352" type="curve" smooth="yes" name="ih01"/>
       <point x="319" y="1494" type="line" smooth="yes"/>
       <point x="319" y="1514"/>
       <point x="329" y="1524"/>
-      <point x="349" y="1524" type="curve" name="dv02" smooth="yes"/>
+      <point x="349" y="1524" type="curve" smooth="yes" name="dv02"/>
       <point x="492" y="1524" type="line" smooth="yes"/>
       <point x="512" y="1524"/>
       <point x="522" y="1514"/>
       <point x="522" y="1494" type="curve" smooth="yes"/>
-      <point x="522" y="1352" type="line" name="sh01" smooth="yes"/>
+      <point x="522" y="1352" type="line" smooth="yes" name="sh01"/>
       <point x="522" y="1332"/>
       <point x="512" y="1322"/>
       <point x="492" y="1322" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1322" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1322" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1322"/>
       <point x="711" y="1332"/>
-      <point x="711" y="1352" type="curve" name="dh03" smooth="yes"/>
+      <point x="711" y="1352" type="curve" smooth="yes" name="dh03"/>
       <point x="711" y="1494" type="line" smooth="yes"/>
       <point x="711" y="1514"/>
       <point x="721" y="1524"/>
-      <point x="741" y="1524" type="curve" name="hr01" smooth="yes"/>
+      <point x="741" y="1524" type="curve" smooth="yes" name="hr01"/>
       <point x="883" y="1524" type="line" smooth="yes"/>
       <point x="903" y="1524"/>
       <point x="913" y="1514"/>
       <point x="913" y="1494" type="curve" smooth="yes"/>
-      <point x="913" y="1352" type="line" name="dh04" smooth="yes"/>
+      <point x="913" y="1352" type="line" smooth="yes" name="dh04"/>
       <point x="913" y="1332"/>
       <point x="903" y="1322"/>
       <point x="883" y="1322" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="595" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="595" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="374" y="0"/>
       <point x="262" y="122"/>
       <point x="262" y="406" type="curve"/>
@@ -51,20 +51,20 @@
       <point x="450" y="395" type="line" smooth="yes"/>
       <point x="450" y="227"/>
       <point x="479" y="156"/>
-      <point x="604" y="156" type="curve" name="hr02" smooth="yes"/>
+      <point x="604" y="156" type="curve" smooth="yes" name="hr02"/>
       <point x="832" y="156"/>
       <point x="926" y="384"/>
-      <point x="942" y="640" type="curve" name="sh03" smooth="yes"/>
+      <point x="942" y="640" type="curve" smooth="yes" name="sh03"/>
       <point x="943" y="656"/>
       <point x="944" y="677"/>
-      <point x="944" y="698" type="curve" name="dh05" smooth="yes"/>
+      <point x="944" y="698" type="curve" smooth="yes" name="dh05"/>
       <point x="944" y="819"/>
       <point x="909" y="968"/>
       <point x="786" y="1120" type="curve" name="ih02"/>
       <point x="972" y="1120" type="line"/>
       <point x="1069" y="995"/>
       <point x="1129" y="832"/>
-      <point x="1129" y="645" type="curve" name="dh06" smooth="yes"/>
+      <point x="1129" y="645" type="curve" smooth="yes" name="dh06"/>
       <point x="1129" y="338"/>
       <point x="966" y="0"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/upsilondieresistonos.glif b/source/Hack-Regular.ufo/glyphs/upsilondieresistonos.glif
index 05708ec97..08ada8a31 100644
--- a/source/Hack-Regular.ufo/glyphs/upsilondieresistonos.glif
+++ b/source/Hack-Regular.ufo/glyphs/upsilondieresistonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="upsilondieresistonos" format="1">
+<glyph name="upsilondieresistonos" format="2">
   <advance width="1233"/>
   <unicode hex="03B0"/>
   <outline>
@@ -10,43 +10,43 @@
       <point x="485" y="1518" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="272" y="1326" type="line" name="sv01" smooth="yes"/>
+      <point x="272" y="1326" type="line" smooth="yes" name="sv01"/>
       <point x="252" y="1326"/>
       <point x="242" y="1336"/>
       <point x="242" y="1356" type="curve" smooth="yes"/>
       <point x="242" y="1498" type="line" smooth="yes"/>
       <point x="242" y="1518"/>
       <point x="252" y="1528"/>
-      <point x="272" y="1528" type="curve" name="at02" smooth="yes"/>
+      <point x="272" y="1528" type="curve" smooth="yes" name="at02"/>
       <point x="415" y="1528" type="line" smooth="yes"/>
       <point x="435" y="1528"/>
       <point x="445" y="1518"/>
-      <point x="445" y="1498" type="curve" name="sh01" smooth="yes"/>
+      <point x="445" y="1498" type="curve" smooth="yes" name="sh01"/>
       <point x="445" y="1356" type="line" smooth="yes"/>
       <point x="445" y="1336"/>
       <point x="435" y="1326"/>
-      <point x="415" y="1326" type="curve" name="hr01" smooth="yes"/>
+      <point x="415" y="1326" type="curve" smooth="yes" name="hr01"/>
     </contour>
     <contour>
-      <point x="749" y="1326" type="line" name="sv02" smooth="yes"/>
+      <point x="749" y="1326" type="line" smooth="yes" name="sv02"/>
       <point x="729" y="1326"/>
       <point x="719" y="1336"/>
-      <point x="719" y="1356" type="curve" name="dh01" smooth="yes"/>
+      <point x="719" y="1356" type="curve" smooth="yes" name="dh01"/>
       <point x="719" y="1498" type="line" smooth="yes"/>
       <point x="719" y="1518"/>
       <point x="729" y="1528"/>
-      <point x="749" y="1528" type="curve" name="at03" smooth="yes"/>
-      <point x="891" y="1528" type="line" name="hr02" smooth="yes"/>
+      <point x="749" y="1528" type="curve" smooth="yes" name="at03"/>
+      <point x="891" y="1528" type="line" smooth="yes" name="hr02"/>
       <point x="911" y="1528"/>
       <point x="921" y="1518"/>
-      <point x="921" y="1498" type="curve" name="hr03" smooth="yes"/>
-      <point x="921" y="1356" type="line" name="dh02" smooth="yes"/>
+      <point x="921" y="1498" type="curve" smooth="yes" name="hr03"/>
+      <point x="921" y="1356" type="line" smooth="yes" name="dh02"/>
       <point x="921" y="1336"/>
       <point x="911" y="1326"/>
-      <point x="891" y="1326" type="curve" name="hr04" smooth="yes"/>
+      <point x="891" y="1326" type="curve" smooth="yes" name="hr04"/>
     </contour>
     <contour>
-      <point x="608" y="-6" type="curve" name="ab01" smooth="yes"/>
+      <point x="608" y="-6" type="curve" smooth="yes" name="ab01"/>
       <point x="368" y="-6"/>
       <point x="262" y="116"/>
       <point x="262" y="400" type="curve" name="hr05"/>
@@ -57,20 +57,20 @@
       <point x="450" y="389" type="line" smooth="yes"/>
       <point x="450" y="196"/>
       <point x="484" y="150"/>
-      <point x="628" y="150" type="curve" name="hr08" smooth="yes"/>
+      <point x="628" y="150" type="curve" smooth="yes" name="hr08"/>
       <point x="829" y="150"/>
       <point x="921" y="385"/>
-      <point x="942" y="634" type="curve" name="sh03" smooth="yes"/>
+      <point x="942" y="634" type="curve" smooth="yes" name="sh03"/>
       <point x="943" y="653"/>
       <point x="944" y="670"/>
-      <point x="944" y="689" type="curve" name="hr09" smooth="yes"/>
+      <point x="944" y="689" type="curve" smooth="yes" name="hr09"/>
       <point x="944" y="815"/>
       <point x="909" y="962"/>
       <point x="786" y="1114" type="curve" name="hr10"/>
       <point x="972" y="1114" type="line"/>
       <point x="1065" y="994"/>
       <point x="1129" y="837"/>
-      <point x="1129" y="632" type="curve" name="dh03" smooth="yes"/>
+      <point x="1129" y="632" type="curve" smooth="yes" name="dh03"/>
       <point x="1129" y="332"/>
       <point x="956" y="-6"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/upsilontonos.glif b/source/Hack-Regular.ufo/glyphs/upsilontonos.glif
index 53ef86a70..9d2422253 100644
--- a/source/Hack-Regular.ufo/glyphs/upsilontonos.glif
+++ b/source/Hack-Regular.ufo/glyphs/upsilontonos.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="upsilontonos" format="1">
+<glyph name="upsilontonos" format="2">
   <advance width="1233"/>
   <unicode hex="03CD"/>
   <outline>
@@ -10,7 +10,7 @@
       <point x="475" y="1272" type="line" name="ih02"/>
     </contour>
     <contour>
-      <point x="595" y="0" type="curve" name="ab01" smooth="yes"/>
+      <point x="595" y="0" type="curve" smooth="yes" name="ab01"/>
       <point x="374" y="0"/>
       <point x="262" y="122"/>
       <point x="262" y="406" type="curve"/>
@@ -21,20 +21,20 @@
       <point x="450" y="395" type="line" smooth="yes"/>
       <point x="450" y="227"/>
       <point x="479" y="156"/>
-      <point x="604" y="156" type="curve" name="hr01" smooth="yes"/>
+      <point x="604" y="156" type="curve" smooth="yes" name="hr01"/>
       <point x="832" y="156"/>
       <point x="926" y="384"/>
-      <point x="942" y="640" type="curve" name="sh02" smooth="yes"/>
+      <point x="942" y="640" type="curve" smooth="yes" name="sh02"/>
       <point x="943" y="656"/>
       <point x="944" y="677"/>
-      <point x="944" y="698" type="curve" name="dh03" smooth="yes"/>
+      <point x="944" y="698" type="curve" smooth="yes" name="dh03"/>
       <point x="944" y="819"/>
       <point x="909" y="968"/>
       <point x="786" y="1120" type="curve" name="ih03"/>
       <point x="972" y="1120" type="line"/>
       <point x="1069" y="995"/>
       <point x="1129" y="832"/>
-      <point x="1129" y="645" type="curve" name="dh04" smooth="yes"/>
+      <point x="1129" y="645" type="curve" smooth="yes" name="dh04"/>
       <point x="1129" y="338"/>
       <point x="966" y="0"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/uring.glif b/source/Hack-Regular.ufo/glyphs/uring.glif
index 083ef6715..fa96903f7 100644
--- a/source/Hack-Regular.ufo/glyphs/uring.glif
+++ b/source/Hack-Regular.ufo/glyphs/uring.glif
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="uring" format="1">
+<glyph name="uring" format="2">
   <advance width="1233"/>
   <unicode hex="016F"/>
   <outline>
     <contour>
-      <point x="632" y="1204" type="curve" name="dv02" smooth="yes"/>
+      <point x="632" y="1204" type="curve" smooth="yes" name="dv02"/>
       <point x="478" y="1204"/>
       <point x="357" y="1326"/>
-      <point x="357" y="1479" type="curve" name="ih01" smooth="yes"/>
+      <point x="357" y="1479" type="curve" smooth="yes" name="ih01"/>
       <point x="357" y="1631"/>
       <point x="478" y="1753"/>
-      <point x="632" y="1753" type="curve" name="hr01" smooth="yes"/>
+      <point x="632" y="1753" type="curve" smooth="yes" name="hr01"/>
       <point x="787" y="1753"/>
       <point x="906" y="1631"/>
-      <point x="906" y="1479" type="curve" name="dh03" smooth="yes"/>
+      <point x="906" y="1479" type="curve" smooth="yes" name="dh03"/>
       <point x="906" y="1326"/>
       <point x="787" y="1204"/>
     </contour>
     <contour>
-      <point x="631" y="1327" type="curve" name="dv03" smooth="yes"/>
+      <point x="631" y="1327" type="curve" smooth="yes" name="dv03"/>
       <point x="715" y="1327"/>
       <point x="783" y="1395"/>
-      <point x="783" y="1479" type="curve" name="dh02" smooth="yes"/>
+      <point x="783" y="1479" type="curve" smooth="yes" name="dh02"/>
       <point x="783" y="1563"/>
       <point x="715" y="1630"/>
-      <point x="631" y="1630" type="curve" name="dv01" smooth="yes"/>
+      <point x="631" y="1630" type="curve" smooth="yes" name="dv01"/>
       <point x="546" y="1630"/>
       <point x="480" y="1564"/>
-      <point x="480" y="1479" type="curve" name="sh01" smooth="yes"/>
+      <point x="480" y="1479" type="curve" smooth="yes" name="sh01"/>
       <point x="480" y="1393"/>
       <point x="546" y="1327"/>
     </contour>
     <contour>
-      <point x="534" y="-29" type="curve" name="sv02" smooth="yes"/>
+      <point x="534" y="-29" type="curve" smooth="yes" name="sv02"/>
       <point x="305" y="-29"/>
       <point x="195" y="119"/>
-      <point x="195" y="424" type="curve" name="dh01" smooth="yes"/>
+      <point x="195" y="424" type="curve" smooth="yes" name="dh01"/>
       <point x="195" y="1118" type="line"/>
       <point x="379" y="1118" type="line"/>
-      <point x="379" y="424" type="line" name="hr02" smooth="yes"/>
+      <point x="379" y="424" type="line" smooth="yes" name="hr02"/>
       <point x="379" y="223"/>
       <point x="449" y="131"/>
-      <point x="598" y="131" type="curve" name="sv01" smooth="yes"/>
+      <point x="598" y="131" type="curve" smooth="yes" name="sv01"/>
       <point x="773" y="131"/>
       <point x="866" y="256"/>
-      <point x="866" y="485" type="curve" name="sh02" smooth="yes"/>
+      <point x="866" y="485" type="curve" smooth="yes" name="sh02"/>
       <point x="866" y="1118" type="line"/>
       <point x="1051" y="1118" type="line"/>
       <point x="1051" y="0" type="line" name="sh03"/>
diff --git a/source/Hack-Regular.ufo/glyphs/utilde.glif b/source/Hack-Regular.ufo/glyphs/utilde.glif
index 66217c393..846073350 100644
--- a/source/Hack-Regular.ufo/glyphs/utilde.glif
+++ b/source/Hack-Regular.ufo/glyphs/utilde.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="utilde" format="1">
+<glyph name="utilde" format="2">
   <advance width="1233"/>
   <unicode hex="0169"/>
   <outline>
@@ -7,7 +7,7 @@
       <point x="287" y="1257" type="line" name="hr00"/>
       <point x="287" y="1431"/>
       <point x="357" y="1539"/>
-      <point x="482" y="1539" type="curve" name="dv02" smooth="yes"/>
+      <point x="482" y="1539" type="curve" smooth="yes" name="dv02"/>
       <point x="533" y="1539"/>
       <point x="572" y="1522"/>
       <point x="621" y="1478" type="curve" name="hr01"/>
@@ -24,7 +24,7 @@
       <point x="946" y="1539" type="line"/>
       <point x="946" y="1365"/>
       <point x="876" y="1257"/>
-      <point x="751" y="1257" type="curve" name="sv02" smooth="yes"/>
+      <point x="751" y="1257" type="curve" smooth="yes" name="sv02"/>
       <point x="700" y="1257"/>
       <point x="661" y="1274"/>
       <point x="612" y="1318" type="curve"/>
@@ -34,25 +34,25 @@
       <point x="485" y="1412" type="curve" smooth="yes"/>
       <point x="462" y="1412"/>
       <point x="443" y="1400"/>
-      <point x="431" y="1375" type="curve" name="hr02" smooth="yes"/>
+      <point x="431" y="1375" type="curve" smooth="yes" name="hr02"/>
       <point x="418" y="1349"/>
       <point x="412" y="1310"/>
       <point x="411" y="1257" type="curve" name="dv01"/>
     </contour>
     <contour>
-      <point x="534" y="-29" type="curve" name="sv04" smooth="yes"/>
+      <point x="534" y="-29" type="curve" smooth="yes" name="sv04"/>
       <point x="305" y="-29"/>
       <point x="195" y="119"/>
-      <point x="195" y="424" type="curve" name="sh01" smooth="yes"/>
+      <point x="195" y="424" type="curve" smooth="yes" name="sh01"/>
       <point x="195" y="1118" type="line"/>
       <point x="379" y="1118" type="line"/>
-      <point x="379" y="424" type="line" name="sh02" smooth="yes"/>
+      <point x="379" y="424" type="line" smooth="yes" name="sh02"/>
       <point x="379" y="223"/>
       <point x="449" y="131"/>
-      <point x="598" y="131" type="curve" name="sv03" smooth="yes"/>
+      <point x="598" y="131" type="curve" smooth="yes" name="sv03"/>
       <point x="773" y="131"/>
       <point x="866" y="256"/>
-      <point x="866" y="485" type="curve" name="sh03" smooth="yes"/>
+      <point x="866" y="485" type="curve" smooth="yes" name="sh03"/>
       <point x="866" y="1118" type="line"/>
       <point x="1051" y="1118" type="line"/>
       <point x="1051" y="0" type="line" name="sh04"/>
diff --git a/source/Hack-Regular.ufo/glyphs/v.glif b/source/Hack-Regular.ufo/glyphs/v.glif
index 3952e7e07..9c99b4289 100644
--- a/source/Hack-Regular.ufo/glyphs/v.glif
+++ b/source/Hack-Regular.ufo/glyphs/v.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="v" format="1">
+<glyph name="v" format="2">
   <advance width="1233"/>
   <unicode hex="0076"/>
   <outline>
@@ -14,9 +14,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/w.glif b/source/Hack-Regular.ufo/glyphs/w.glif
index f4cf3e4fa..fa38dce5e 100644
--- a/source/Hack-Regular.ufo/glyphs/w.glif
+++ b/source/Hack-Regular.ufo/glyphs/w.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="w" format="1">
+<glyph name="w" format="2">
   <advance width="1233"/>
   <unicode hex="0077"/>
   <outline>
@@ -20,9 +20,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/wacute.glif b/source/Hack-Regular.ufo/glyphs/wacute.glif
index 23760c834..ba1f0dd22 100644
--- a/source/Hack-Regular.ufo/glyphs/wacute.glif
+++ b/source/Hack-Regular.ufo/glyphs/wacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="wacute" format="1">
+<glyph name="wacute" format="2">
   <advance width="1233"/>
   <unicode hex="1E83"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/wcircumflex.glif b/source/Hack-Regular.ufo/glyphs/wcircumflex.glif
index 97c928e42..59078da2a 100644
--- a/source/Hack-Regular.ufo/glyphs/wcircumflex.glif
+++ b/source/Hack-Regular.ufo/glyphs/wcircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="wcircumflex" format="1">
+<glyph name="wcircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0175"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/wdieresis.glif b/source/Hack-Regular.ufo/glyphs/wdieresis.glif
index f6155dc6a..2aaa37fbe 100644
--- a/source/Hack-Regular.ufo/glyphs/wdieresis.glif
+++ b/source/Hack-Regular.ufo/glyphs/wdieresis.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="wdieresis" format="1">
+<glyph name="wdieresis" format="2">
   <advance width="1233"/>
   <unicode hex="1E85"/>
   <outline>
     <contour>
-      <point x="349" y="1320" type="line" name="hr00" smooth="yes"/>
+      <point x="349" y="1320" type="line" smooth="yes" name="hr00"/>
       <point x="329" y="1320"/>
       <point x="319" y="1330"/>
-      <point x="319" y="1350" type="curve" name="sh01" smooth="yes"/>
+      <point x="319" y="1350" type="curve" smooth="yes" name="sh01"/>
       <point x="319" y="1492" type="line" smooth="yes"/>
       <point x="319" y="1512"/>
       <point x="329" y="1522"/>
-      <point x="349" y="1522" type="curve" name="dv01" smooth="yes"/>
+      <point x="349" y="1522" type="curve" smooth="yes" name="dv01"/>
       <point x="492" y="1522" type="line" smooth="yes"/>
       <point x="512" y="1522"/>
       <point x="522" y="1512"/>
       <point x="522" y="1492" type="curve" smooth="yes"/>
-      <point x="522" y="1350" type="line" name="sh02" smooth="yes"/>
+      <point x="522" y="1350" type="line" smooth="yes" name="sh02"/>
       <point x="522" y="1330"/>
       <point x="512" y="1320"/>
       <point x="492" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1320"/>
       <point x="711" y="1330"/>
-      <point x="711" y="1350" type="curve" name="ah01" smooth="yes"/>
+      <point x="711" y="1350" type="curve" smooth="yes" name="ah01"/>
       <point x="711" y="1492" type="line" smooth="yes"/>
       <point x="711" y="1512"/>
       <point x="721" y="1522"/>
-      <point x="741" y="1522" type="curve" name="sv02" smooth="yes"/>
+      <point x="741" y="1522" type="curve" smooth="yes" name="sv02"/>
       <point x="883" y="1522" type="line" smooth="yes"/>
       <point x="903" y="1522"/>
       <point x="913" y="1512"/>
       <point x="913" y="1492" type="curve" smooth="yes"/>
-      <point x="913" y="1350" type="line" name="sh03" smooth="yes"/>
+      <point x="913" y="1350" type="line" smooth="yes" name="sh03"/>
       <point x="913" y="1330"/>
       <point x="903" y="1320"/>
       <point x="883" y="1320" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/wgrave.glif b/source/Hack-Regular.ufo/glyphs/wgrave.glif
index 9fcb68c75..0ac181128 100644
--- a/source/Hack-Regular.ufo/glyphs/wgrave.glif
+++ b/source/Hack-Regular.ufo/glyphs/wgrave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="wgrave" format="1">
+<glyph name="wgrave" format="2">
   <advance width="1233"/>
   <unicode hex="1E81"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/x.glif b/source/Hack-Regular.ufo/glyphs/x.glif
index efb538ff4..5aff9f2db 100644
--- a/source/Hack-Regular.ufo/glyphs/x.glif
+++ b/source/Hack-Regular.ufo/glyphs/x.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="x" format="1">
+<glyph name="x" format="2">
   <advance width="1233"/>
   <unicode hex="0078"/>
   <outline>
@@ -19,9 +19,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/xi.glif b/source/Hack-Regular.ufo/glyphs/xi.glif
index 3d5789921..4a717cca2 100644
--- a/source/Hack-Regular.ufo/glyphs/xi.glif
+++ b/source/Hack-Regular.ufo/glyphs/xi.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="xi" format="1">
+<glyph name="xi" format="2">
   <advance width="1233"/>
   <unicode hex="03BE"/>
   <outline>
@@ -7,19 +7,19 @@
       <point x="763" y="-279" type="line" name="dh02"/>
       <point x="847" y="-284"/>
       <point x="906" y="-233"/>
-      <point x="906" y="-156" type="curve" name="sh01" smooth="yes"/>
+      <point x="906" y="-156" type="curve" smooth="yes" name="sh01"/>
       <point x="906" y="-95"/>
       <point x="869" y="-41"/>
       <point x="785" y="-29" type="curve" smooth="yes"/>
       <point x="673" y="-13"/>
       <point x="160" y="-20"/>
-      <point x="160" y="362" type="curve" name="dh01" smooth="yes"/>
+      <point x="160" y="362" type="curve" smooth="yes" name="dh01"/>
       <point x="160" y="551"/>
       <point x="287" y="724"/>
       <point x="495" y="796" type="curve" name="ih01"/>
       <point x="307" y="819"/>
       <point x="215" y="925"/>
-      <point x="215" y="1085" type="curve" name="sh02" smooth="yes"/>
+      <point x="215" y="1085" type="curve" smooth="yes" name="sh02"/>
       <point x="215" y="1226"/>
       <point x="284" y="1314"/>
       <point x="435" y="1371" type="curve" name="hr01"/>
@@ -29,20 +29,20 @@
       <point x="1016" y="1371" type="line" name="sv01"/>
       <point x="596" y="1371"/>
       <point x="387" y="1267"/>
-      <point x="387" y="1096" type="curve" name="sh04" smooth="yes"/>
+      <point x="387" y="1096" type="curve" smooth="yes" name="sh04"/>
       <point x="387" y="949"/>
       <point x="545" y="888"/>
       <point x="915" y="880" type="curve" name="sh05"/>
       <point x="915" y="710" type="line" name="dv01"/>
       <point x="524" y="681"/>
       <point x="347" y="540"/>
-      <point x="347" y="376" type="curve" name="hr02" smooth="yes"/>
+      <point x="347" y="376" type="curve" smooth="yes" name="hr02"/>
       <point x="347" y="167"/>
       <point x="639" y="147"/>
       <point x="785" y="127" type="curve"/>
       <point x="1004" y="95"/>
       <point x="1080" y="11"/>
-      <point x="1080" y="-137" type="curve" name="dh03" smooth="yes"/>
+      <point x="1080" y="-137" type="curve" smooth="yes" name="dh03"/>
       <point x="1080" y="-307"/>
       <point x="980" y="-430"/>
       <point x="763" y="-430" type="curve" name="hr03"/>
diff --git a/source/Hack-Regular.ufo/glyphs/y.glif b/source/Hack-Regular.ufo/glyphs/y.glif
index 6bc514208..cb78af446 100644
--- a/source/Hack-Regular.ufo/glyphs/y.glif
+++ b/source/Hack-Regular.ufo/glyphs/y.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="y" format="1">
+<glyph name="y" format="2">
   <advance width="1233"/>
   <unicode hex="0079"/>
   <outline>
@@ -35,9 +35,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/yacute.glif b/source/Hack-Regular.ufo/glyphs/yacute.glif
index 141e08d8c..3d9cbc1b4 100644
--- a/source/Hack-Regular.ufo/glyphs/yacute.glif
+++ b/source/Hack-Regular.ufo/glyphs/yacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="yacute" format="1">
+<glyph name="yacute" format="2">
   <advance width="1233"/>
   <unicode hex="00FD"/>
   <outline>
@@ -35,7 +35,7 @@
       <point x="494" y="-388" type="curve" smooth="yes"/>
       <point x="447" y="-413"/>
       <point x="387" y="-426"/>
-      <point x="332" y="-426" type="curve" name="ab01" smooth="yes"/>
+      <point x="332" y="-426" type="curve" smooth="yes" name="ab01"/>
       <point x="184" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/ycircumflex.glif b/source/Hack-Regular.ufo/glyphs/ycircumflex.glif
index 914ff279b..3f7ea78ee 100644
--- a/source/Hack-Regular.ufo/glyphs/ycircumflex.glif
+++ b/source/Hack-Regular.ufo/glyphs/ycircumflex.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ycircumflex" format="1">
+<glyph name="ycircumflex" format="2">
   <advance width="1233"/>
   <unicode hex="0177"/>
   <outline>
@@ -35,7 +35,7 @@
       <point x="607" y="-270" type="curve" smooth="yes"/>
       <point x="548" y="-370"/>
       <point x="465" y="-426"/>
-      <point x="332" y="-426" type="curve" name="ab01" smooth="yes"/>
+      <point x="332" y="-426" type="curve" smooth="yes" name="ab01"/>
       <point x="184" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/ydieresis.glif b/source/Hack-Regular.ufo/glyphs/ydieresis.glif
index 8c41340d8..502972bc4 100644
--- a/source/Hack-Regular.ufo/glyphs/ydieresis.glif
+++ b/source/Hack-Regular.ufo/glyphs/ydieresis.glif
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ydieresis" format="1">
+<glyph name="ydieresis" format="2">
   <advance width="1233"/>
   <unicode hex="00FF"/>
   <outline>
     <contour>
-      <point x="349" y="1320" type="line" name="hr00" smooth="yes"/>
+      <point x="349" y="1320" type="line" smooth="yes" name="hr00"/>
       <point x="329" y="1320"/>
       <point x="319" y="1330"/>
-      <point x="319" y="1350" type="curve" name="sh01" smooth="yes"/>
+      <point x="319" y="1350" type="curve" smooth="yes" name="sh01"/>
       <point x="319" y="1492" type="line" smooth="yes"/>
       <point x="319" y="1512"/>
       <point x="329" y="1522"/>
-      <point x="349" y="1522" type="curve" name="dv01" smooth="yes"/>
+      <point x="349" y="1522" type="curve" smooth="yes" name="dv01"/>
       <point x="492" y="1522" type="line" smooth="yes"/>
       <point x="512" y="1522"/>
       <point x="522" y="1512"/>
       <point x="522" y="1492" type="curve" smooth="yes"/>
-      <point x="522" y="1350" type="line" name="sh02" smooth="yes"/>
+      <point x="522" y="1350" type="line" smooth="yes" name="sh02"/>
       <point x="522" y="1330"/>
       <point x="512" y="1320"/>
       <point x="492" y="1320" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="741" y="1320" type="line" name="sv01" smooth="yes"/>
+      <point x="741" y="1320" type="line" smooth="yes" name="sv01"/>
       <point x="721" y="1320"/>
       <point x="711" y="1330"/>
-      <point x="711" y="1350" type="curve" name="ah01" smooth="yes"/>
+      <point x="711" y="1350" type="curve" smooth="yes" name="ah01"/>
       <point x="711" y="1492" type="line" smooth="yes"/>
       <point x="711" y="1512"/>
       <point x="721" y="1522"/>
-      <point x="741" y="1522" type="curve" name="sv02" smooth="yes"/>
+      <point x="741" y="1522" type="curve" smooth="yes" name="sv02"/>
       <point x="883" y="1522" type="line" smooth="yes"/>
       <point x="903" y="1522"/>
       <point x="913" y="1512"/>
       <point x="913" y="1492" type="curve" smooth="yes"/>
-      <point x="913" y="1350" type="line" name="sh03" smooth="yes"/>
+      <point x="913" y="1350" type="line" smooth="yes" name="sh03"/>
       <point x="913" y="1330"/>
       <point x="903" y="1320"/>
       <point x="883" y="1320" type="curve" smooth="yes"/>
@@ -65,7 +65,7 @@
       <point x="493" y="-387" type="curve" smooth="yes"/>
       <point x="447" y="-413"/>
       <point x="393" y="-426"/>
-      <point x="332" y="-426" type="curve" name="sh04" smooth="yes"/>
+      <point x="332" y="-426" type="curve" smooth="yes" name="sh04"/>
       <point x="184" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/yen.glif b/source/Hack-Regular.ufo/glyphs/yen.glif
index 832bdba72..047d21f58 100644
--- a/source/Hack-Regular.ufo/glyphs/yen.glif
+++ b/source/Hack-Regular.ufo/glyphs/yen.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="yen" format="1">
+<glyph name="yen" format="2">
   <advance width="1233"/>
   <unicode hex="00A5"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/ygrave.glif b/source/Hack-Regular.ufo/glyphs/ygrave.glif
index 5f8841105..ee6f6efdb 100644
--- a/source/Hack-Regular.ufo/glyphs/ygrave.glif
+++ b/source/Hack-Regular.ufo/glyphs/ygrave.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ygrave" format="1">
+<glyph name="ygrave" format="2">
   <advance width="1233"/>
   <unicode hex="1EF3"/>
   <outline>
@@ -32,7 +32,7 @@
       <point x="608" y="-270" type="curve" smooth="yes"/>
       <point x="551" y="-370"/>
       <point x="457" y="-426"/>
-      <point x="332" y="-426" type="curve" name="ab01" smooth="yes"/>
+      <point x="332" y="-426" type="curve" smooth="yes" name="ab01"/>
       <point x="184" y="-426" type="line"/>
     </contour>
   </outline>
diff --git a/source/Hack-Regular.ufo/glyphs/z.glif b/source/Hack-Regular.ufo/glyphs/z.glif
index 6c8cb3da3..359e30350 100644
--- a/source/Hack-Regular.ufo/glyphs/z.glif
+++ b/source/Hack-Regular.ufo/glyphs/z.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="z" format="1">
+<glyph name="z" format="2">
   <advance width="1233"/>
   <unicode hex="007A"/>
   <outline>
@@ -17,9 +17,9 @@
     </contour>
   </outline>
   <lib>
-  <dict>
-    <key>com.schriftgestaltung.Glyphs.lastChange</key>
-    <string>2017-07-11 17:15:08 +0000</string>
-  </dict>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2017-07-11 17:15:08 +0000</string>
+    </dict>
   </lib>
 </glyph>
diff --git a/source/Hack-Regular.ufo/glyphs/zacute.glif b/source/Hack-Regular.ufo/glyphs/zacute.glif
index 490e55feb..52261a5aa 100644
--- a/source/Hack-Regular.ufo/glyphs/zacute.glif
+++ b/source/Hack-Regular.ufo/glyphs/zacute.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="zacute" format="1">
+<glyph name="zacute" format="2">
   <advance width="1233"/>
   <unicode hex="017A"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/zcaron.glif b/source/Hack-Regular.ufo/glyphs/zcaron.glif
index 23d76e1cb..58b2677be 100644
--- a/source/Hack-Regular.ufo/glyphs/zcaron.glif
+++ b/source/Hack-Regular.ufo/glyphs/zcaron.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="zcaron" format="1">
+<glyph name="zcaron" format="2">
   <advance width="1233"/>
   <unicode hex="017E"/>
   <outline>
diff --git a/source/Hack-Regular.ufo/glyphs/zdotaccent.glif b/source/Hack-Regular.ufo/glyphs/zdotaccent.glif
index a5b41a797..810fbacd7 100644
--- a/source/Hack-Regular.ufo/glyphs/zdotaccent.glif
+++ b/source/Hack-Regular.ufo/glyphs/zdotaccent.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="zdotaccent" format="1">
+<glyph name="zdotaccent" format="2">
   <advance width="1233"/>
   <unicode hex="017C"/>
   <outline>
     <contour>
-      <point x="543" y="1322" type="line" name="hr00" smooth="yes"/>
+      <point x="543" y="1322" type="line" smooth="yes" name="hr00"/>
       <point x="523" y="1322"/>
       <point x="513" y="1332"/>
-      <point x="513" y="1352" type="curve" name="dh01" smooth="yes"/>
+      <point x="513" y="1352" type="curve" smooth="yes" name="dh01"/>
       <point x="513" y="1496" type="line" smooth="yes"/>
       <point x="513" y="1516"/>
       <point x="523" y="1526"/>
-      <point x="543" y="1526" type="curve" name="dv01" smooth="yes"/>
+      <point x="543" y="1526" type="curve" smooth="yes" name="dv01"/>
       <point x="688" y="1526" type="line" smooth="yes"/>
       <point x="708" y="1526"/>
       <point x="718" y="1516"/>
       <point x="718" y="1496" type="curve" smooth="yes"/>
-      <point x="718" y="1352" type="line" name="dh02" smooth="yes"/>
+      <point x="718" y="1352" type="line" smooth="yes" name="dh02"/>
       <point x="718" y="1332"/>
       <point x="708" y="1322"/>
       <point x="688" y="1322" type="curve" smooth="yes"/>
diff --git a/source/Hack-Regular.ufo/glyphs/zero.glif b/source/Hack-Regular.ufo/glyphs/zero.glif
index 6417327b3..071b8e4e3 100644
--- a/source/Hack-Regular.ufo/glyphs/zero.glif
+++ b/source/Hack-Regular.ufo/glyphs/zero.glif
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="zero" format="1">
+<glyph name="zero" format="2">
   <advance width="1233"/>
   <unicode hex="0030"/>
   <outline>
     <contour>
-      <point x="616" y="-29" type="curve" name="hr00" smooth="yes"/>
+      <point x="616" y="-29" type="curve" smooth="yes" name="hr00"/>
       <point x="456" y="-29"/>
       <point x="336" y="36"/>
       <point x="255" y="167" type="curve" smooth="yes"/>
       <point x="174" y="298"/>
       <point x="133" y="491"/>
-      <point x="133" y="745" type="curve" name="sh01" smooth="yes"/>
+      <point x="133" y="745" type="curve" smooth="yes" name="sh01"/>
       <point x="133" y="1000"/>
       <point x="174" y="1193"/>
       <point x="255" y="1324" type="curve" smooth="yes"/>
       <point x="336" y="1455"/>
       <point x="456" y="1520"/>
-      <point x="616" y="1520" type="curve" name="at01" smooth="yes"/>
+      <point x="616" y="1520" type="curve" smooth="yes" name="at01"/>
       <point x="773" y="1520"/>
       <point x="895" y="1457"/>
       <point x="978" y="1324" type="curve" smooth="yes"/>
       <point x="1058" y="1196"/>
       <point x="1100" y="1006"/>
-      <point x="1100" y="745" type="curve" name="sh04" smooth="yes"/>
+      <point x="1100" y="745" type="curve" smooth="yes" name="sh04"/>
       <point x="1100" y="484"/>
       <point x="1058" y="295"/>
       <point x="978" y="167" type="curve" smooth="yes"/>
@@ -30,25 +30,25 @@
       <point x="775" y="-29"/>
     </contour>
     <contour>
-      <point x="616" y="131" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="131" type="curve" smooth="yes" name="dv01"/>
       <point x="713" y="131"/>
       <point x="783" y="184"/>
       <point x="828" y="283" type="curve" smooth="yes"/>
       <point x="874" y="384"/>
       <point x="897" y="538"/>
-      <point x="897" y="745" type="curve" name="sh03" smooth="yes"/>
+      <point x="897" y="745" type="curve" smooth="yes" name="sh03"/>
       <point x="897" y="953"/>
       <point x="874" y="1107"/>
       <point x="828" y="1207" type="curve" smooth="yes"/>
       <point x="783" y="1307"/>
       <point x="715" y="1360"/>
-      <point x="616" y="1360" type="curve" name="sv01" smooth="yes"/>
+      <point x="616" y="1360" type="curve" smooth="yes" name="sv01"/>
       <point x="522" y="1360"/>
       <point x="452" y="1309"/>
       <point x="406" y="1208" type="curve" smooth="yes"/>
       <point x="359" y="1108"/>
       <point x="336" y="960"/>
-      <point x="336" y="745" type="curve" name="sh05" smooth="yes"/>
+      <point x="336" y="745" type="curve" smooth="yes" name="sh05"/>
       <point x="336" y="537"/>
       <point x="359" y="383"/>
       <point x="406" y="283" type="curve" smooth="yes"/>
@@ -62,7 +62,7 @@
       <point x="539" y="540" type="curve" smooth="yes"/>
       <point x="526" y="602"/>
       <point x="516" y="705"/>
-      <point x="516" y="750" type="curve" name="sh02" smooth="yes"/>
+      <point x="516" y="750" type="curve" smooth="yes" name="sh02"/>
       <point x="516" y="782"/>
       <point x="520" y="879"/>
       <point x="536" y="953" type="curve"/>
@@ -74,7 +74,7 @@
       <point x="695" y="950" type="curve" smooth="yes"/>
       <point x="708" y="884"/>
       <point x="717" y="788"/>
-      <point x="717" y="742" type="curve" name="sh06" smooth="yes"/>
+      <point x="717" y="742" type="curve" smooth="yes" name="sh06"/>
       <point x="717" y="715"/>
       <point x="713" y="624"/>
       <point x="700" y="542" type="curve"/>
diff --git a/source/Hack-Regular.ufo/glyphs/zero.subs.glif b/source/Hack-Regular.ufo/glyphs/zero.subs.glif
index 2992c0a0a..c4470b6fa 100644
--- a/source/Hack-Regular.ufo/glyphs/zero.subs.glif
+++ b/source/Hack-Regular.ufo/glyphs/zero.subs.glif
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="zero.subs" format="1">
+<glyph name="zero.subs" format="2">
   <advance width="1233"/>
   <outline>
     <contour>
-      <point x="616" y="-433" type="curve" name="dv01" smooth="yes"/>
+      <point x="616" y="-433" type="curve" smooth="yes" name="dv01"/>
       <point x="415" y="-433"/>
       <point x="317" y="-287"/>
-      <point x="317" y="0" type="curve" name="dh01" smooth="yes"/>
+      <point x="317" y="0" type="curve" smooth="yes" name="dh01"/>
       <point x="317" y="289"/>
       <point x="417" y="434"/>
-      <point x="616" y="434" type="curve" name="dv03" smooth="yes"/>
+      <point x="616" y="434" type="curve" smooth="yes" name="dv03"/>
       <point x="816" y="434"/>
       <point x="917" y="289"/>
-      <point x="917" y="0" type="curve" name="dh06" smooth="yes"/>
+      <point x="917" y="0" type="curve" smooth="yes" name="dh06"/>
       <point x="917" y="-287"/>
       <point x="816" y="-433"/>
     </contour>
     <contour>
-      <point x="616" y="-344" type="curve" name="dv02" smooth="yes"/>
+      <point x="616" y="-344" type="curve" smooth="yes" name="dv02"/>
       <point x="733" y="-344"/>
       <point x="791" y="-233"/>
-      <point x="791" y="0" type="curve" name="dh05" smooth="yes"/>
+      <point x="791" y="0" type="curve" smooth="yes" name="dh05"/>
       <point x="791" y="235"/>
       <point x="733" y="345"/>
-      <point x="616" y="345" type="curve" name="hr01" smooth="yes"/>
+      <point x="616" y="345" type="curve" smooth="yes" name="hr01"/>
       <point x="499" y="345"/>
       <point x="442" y="235"/>
-      <point x="442" y="0" type="curve" name="dh02" smooth="yes"/>
+      <point x="442" y="0" type="curve" smooth="yes" name="dh02"/>
       <point x="442" y="-233"/>
       <point x="499" y="-344"/>
     </contour>
@@ -37,13 +37,13 @@
       <point x="557" y="-51" type="curve" smooth="yes"/>
       <point x="542" y="-37"/>
       <point x="534" y="-19"/>
-      <point x="534" y="2" type="curve" name="dh03" smooth="yes"/>
+      <point x="534" y="2" type="curve" smooth="yes" name="dh03"/>
       <point x="534" y="45"/>
       <point x="570" y="79"/>
-      <point x="615" y="79" type="curve" name="sv01" smooth="yes"/>
+      <point x="615" y="79" type="curve" smooth="yes" name="sv01"/>
       <point x="664" y="79"/>
       <point x="699" y="45"/>
-      <point x="699" y="2" type="curve" name="dh04" smooth="yes"/>
+      <point x="699" y="2" type="curve" smooth="yes" name="dh04"/>
       <point x="699" y="-42"/>
       <point x="662" y="-72"/>
     </contour>
diff --git a/source/Hack-Regular.ufo/glyphs/zeta.glif b/source/Hack-Regular.ufo/glyphs/zeta.glif
index cc7bdeb41..5a5fc6ecd 100644
--- a/source/Hack-Regular.ufo/glyphs/zeta.glif
+++ b/source/Hack-Regular.ufo/glyphs/zeta.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="zeta" format="1">
+<glyph name="zeta" format="2">
   <advance width="1233"/>
   <unicode hex="03B6"/>
   <outline>
@@ -7,13 +7,13 @@
       <point x="738" y="-279" type="line" name="dh03"/>
       <point x="807" y="-284"/>
       <point x="881" y="-245"/>
-      <point x="881" y="-154" type="curve" name="sh01" smooth="yes"/>
+      <point x="881" y="-154" type="curve" smooth="yes" name="sh01"/>
       <point x="881" y="-90"/>
       <point x="844" y="-44"/>
       <point x="760" y="-29" type="curve"/>
       <point x="640" y="-5"/>
       <point x="154" y="-6"/>
-      <point x="154" y="498" type="curve" name="dh01" smooth="yes"/>
+      <point x="154" y="498" type="curve" smooth="yes" name="dh01"/>
       <point x="154" y="808"/>
       <point x="340" y="1136"/>
       <point x="724" y="1371" type="curve" name="ih01"/>
@@ -23,16 +23,16 @@
       <point x="1062" y="1371" type="line"/>
       <point x="579" y="1111"/>
       <point x="335" y="853"/>
-      <point x="335" y="585" type="curve" name="dh02" smooth="yes"/>
+      <point x="335" y="585" type="curve" smooth="yes" name="dh02"/>
       <point x="335" y="567"/>
       <point x="336" y="550"/>
-      <point x="338" y="534" type="curve" name="sh03" smooth="yes"/>
+      <point x="338" y="534" type="curve" smooth="yes" name="sh03"/>
       <point x="378" y="158"/>
       <point x="605" y="139"/>
       <point x="760" y="127" type="curve" smooth="yes"/>
       <point x="948" y="112"/>
       <point x="1055" y="21"/>
-      <point x="1055" y="-144" type="curve" name="dh04" smooth="yes"/>
+      <point x="1055" y="-144" type="curve" smooth="yes" name="dh04"/>
       <point x="1055" y="-301"/>
       <point x="955" y="-430"/>
       <point x="738" y="-430" type="curve" name="hr01"/>
diff --git a/source/Hack-Regular.ufo/layercontents.plist b/source/Hack-Regular.ufo/layercontents.plist
new file mode 100644
index 000000000..cf95d3573
--- /dev/null
+++ b/source/Hack-Regular.ufo/layercontents.plist
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<array>
+		<string>public.default</string>
+		<string>glyphs</string>
+	</array>
+</array>
+</plist>
diff --git a/source/Hack-Regular.ufo/lib.plist b/source/Hack-Regular.ufo/lib.plist
index 88e23df87..84540939c 100644
--- a/source/Hack-Regular.ufo/lib.plist
+++ b/source/Hack-Regular.ufo/lib.plist
@@ -1539,6 +1539,7 @@
 		<string>uni2077</string>
 		<string>uni2078</string>
 		<string>uni2079</string>
+		<string>ruble</string>
 		<string>guillemotleft</string>
 		<string>guillemotright</string>
 		<string>uni00B5</string>
diff --git a/source/Hack-Regular.ufo/metainfo.plist b/source/Hack-Regular.ufo/metainfo.plist
index 12a792239..632695b5a 100644
--- a/source/Hack-Regular.ufo/metainfo.plist
+++ b/source/Hack-Regular.ufo/metainfo.plist
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>creator</key>
-	<string>com.schriftgestaltung.GlyphsUFOExport</string>
+	<string>org.robofab.ufoLib</string>
 	<key>formatVersion</key>
-	<integer>2</integer>
+	<integer>3</integer>
 </dict>
 </plist>
diff --git a/source/glyphs/Hack.glyphs b/source/glyphs/Hack.glyphs
new file mode 100644
index 000000000..cd8148830
--- /dev/null
+++ b/source/glyphs/Hack.glyphs
@@ -0,0 +1,4928 @@
+{
+.appVersion = "1192";
+copyright = "Copyright (c) 2018 Source Foundry Authors / Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved.";
+customParameters = (
+{
+name = Axes;
+value = (
+{
+Name = Weight;
+Tag = wght;
+},
+{
+Name = "Optical size";
+Tag = opsz;
+},
+{
+Name = Width;
+Tag = wdth;
+}
+);
+},
+{
+name = licenseURL;
+value = "https://github.com/source-foundry/Hack/blob/master/LICENSE.md";
+},
+{
+name = license;
+value = "The work in the Hack project is Copyright 2018 Source Foundry Authors and licensed under the MIT License\012\012The work in the DejaVu project was committed to the public domain.\012\012Bitstream Vera Sans Mono Copyright 2003 Bitstream Inc. and licensed under the Bitstream Vera License with Reserved Font Names \"Bitstream\" and \"Vera\"\012\012MIT License\012\012Copyright (c) 2018 Source Foundry Authors\012\012Permission is hereby granted, free of charge, to any person obtaining a copy\012of this software and associated documentation files (the \"Software\"), to deal\012in the Software without restriction, including without limitation the rights\012to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\012copies of the Software, and to permit persons to whom the Software is\012furnished to do so, subject to the following conditions:\012\012The above copyright notice and this permission notice shall be included in all\012copies or substantial portions of the Software.\012\012THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\012IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\012FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\012AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\012LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\012OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\012SOFTWARE.\012\012BITSTREAM VERA LICENSE\012\012Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc.\012\012Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license (\"Fonts\") and associated documentation files (the \"Font Software\"), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions:\012\012The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces.\012\012The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words \"Bitstream\" or the word \"Vera\".\012\012This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the \"Bitstream Vera\" names.\012\012The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself.\012\012THE FONT SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.\012\012Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org.";
+}
+);
+date = "2019-02-12 04:19:51 +0000";
+designer = "Source Foundry Authors";
+designerURL = "https://github.com/source-foundry/Hack";
+familyName = Hack;
+featurePrefixes = (
+{
+automatic = 1;
+code = "languagesystem DFLT dflt;\012";
+name = Languagesystems;
+}
+);
+fontMaster = (
+{
+ascender = 760;
+capHeight = 730;
+customValue = 100;
+descender = -240;
+id = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+xHeight = 550;
+},
+{
+ascender = 760;
+capHeight = 730;
+customValue = 100;
+descender = -240;
+iconName = SemiBold;
+id = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+weight = Bold;
+weightValue = 200;
+xHeight = 550;
+}
+);
+glyphs = (
+{
+glyphname = A;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"119 0 LINE {name = ab02;}",
+"171 190 LINE",
+"427 190 LINE {name = dv01;}",
+"480 0 LINE",
+"583 0 LINE {name = ab01;}",
+"359 730 LINE",
+"240 730 LINE {name = hr00;}",
+"16 0 LINE"
+);
+},
+{
+closed = 1;
+nodes = (
+"299 643 LINE",
+"403 269 LINE {name = dv02;}",
+"196 269 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"158 0 LINE {name = ab02;}",
+"202 181 LINE",
+"396 181 LINE {name = dv01;}",
+"441 0 LINE",
+"586 0 LINE {name = ab01;}",
+"388 730 LINE",
+"211 730 LINE {name = hr00;}",
+"13 0 LINE"
+);
+},
+{
+closed = 1;
+nodes = (
+"299 599 LINE",
+"368 299 LINE {name = dv02;}",
+"231 299 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0041;
+},
+{
+glyphname = B;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"296 0 LINE SMOOTH {name = ab01;}",
+"456 0 OFFCURVE",
+"555 53 OFFCURVE",
+"555 200 CURVE SMOOTH {name = sh01;}",
+"555 299 OFFCURVE",
+"498 376 OFFCURVE",
+"402 390 CURVE {name = ih02;}",
+"483 401 OFFCURVE",
+"530 458 OFFCURVE",
+"530 550 CURVE SMOOTH {name = dh04;}",
+"530 676 OFFCURVE",
+"438 730 OFFCURVE",
+"296 730 CURVE SMOOTH",
+"81 730 LINE {name = dh01;}",
+"81 0 LINE"
+);
+},
+{
+closed = 1;
+nodes = (
+"180 348 LINE {name = sh02;}",
+"296 348 LINE SMOOTH {name = dv01;}",
+"404 348 OFFCURVE",
+"456 310 OFFCURVE",
+"456 207 CURVE SMOOTH {name = ih01;}",
+"456 113 OFFCURVE",
+"398 81 OFFCURVE",
+"296 81 CURVE SMOOTH {name = sv02;}",
+"180 81 LINE"
+);
+},
+{
+closed = 1;
+nodes = (
+"180 649 LINE {name = dh02;}",
+"296 649 LINE SMOOTH {name = sv01;}",
+"385 649 OFFCURVE",
+"430 623 OFFCURVE",
+"430 542 CURVE SMOOTH {name = dh03;}",
+"430 457 OFFCURVE",
+"384 428 OFFCURVE",
+"296 428 CURVE SMOOTH {name = hr01;}",
+"180 428 LINE {name = hr02;}"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"296 0 LINE SMOOTH {name = ab01;}",
+"487 0 OFFCURVE",
+"566 65 OFFCURVE",
+"566 205 CURVE SMOOTH {name = sh01;}",
+"566 319 OFFCURVE",
+"510 380 OFFCURVE",
+"398 390 CURVE {name = ih01;}",
+"492 400 OFFCURVE",
+"540 456 OFFCURVE",
+"540 550 CURVE SMOOTH {name = dh04;}",
+"540 682 OFFCURVE",
+"446 730 OFFCURVE",
+"296 730 CURVE SMOOTH",
+"61 730 LINE {name = dh01;}",
+"61 0 LINE"
+);
+},
+{
+closed = 1;
+nodes = (
+"200 331 LINE {name = sh02;}",
+"296 331 LINE SMOOTH {name = dv01;}",
+"384 331 OFFCURVE",
+"424 300 OFFCURVE",
+"424 221 CURVE SMOOTH {name = ih02;}",
+"424 143 OFFCURVE",
+"386 115 OFFCURVE",
+"296 115 CURVE SMOOTH {name = sv02;}",
+"200 115 LINE"
+);
+},
+{
+closed = 1;
+nodes = (
+"200 615 LINE {name = dh02;}",
+"296 615 LINE SMOOTH {name = sv01;}",
+"365 615 OFFCURVE",
+"402 593 OFFCURVE",
+"402 530 CURVE SMOOTH {name = dh03;}",
+"402 467 OFFCURVE",
+"365 446 OFFCURVE",
+"296 446 CURVE SMOOTH {name = hr01;}",
+"200 446 LINE {name = hr02;}"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0042;
+},
+{
+glyphname = C;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"423 -14 OFFCURVE",
+"471 -1 OFFCURVE",
+"524 26 CURVE",
+"524 127 LINE",
+"476 87 OFFCURVE",
+"419 66 OFFCURVE",
+"365 66 CURVE SMOOTH {name = dv01;}",
+"247 66 OFFCURVE",
+"171 165 OFFCURVE",
+"171 364 CURVE SMOOTH {name = dh02;}",
+"171 533 OFFCURVE",
+"233 662 OFFCURVE",
+"365 662 CURVE SMOOTH {name = sv01;}",
+"422 662 OFFCURVE",
+"479 638 OFFCURVE",
+"524 601 CURVE",
+"524 703 LINE",
+"472 732 OFFCURVE",
+"428 743 OFFCURVE",
+"365 743 CURVE SMOOTH {name = at01;}",
+"174 743 OFFCURVE",
+"68 601 OFFCURVE",
+"68 363 CURVE SMOOTH {name = dh01;}",
+"68 94 OFFCURVE",
+"174 -14 OFFCURVE",
+"365 -14 CURVE SMOOTH {name = hr00;}"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"423 -14 OFFCURVE",
+"479 -2 OFFCURVE",
+"522 21 CURVE",
+"522 181 LINE",
+"478 140 OFFCURVE",
+"433 115 OFFCURVE",
+"379 115 CURVE SMOOTH {name = dv01;}",
+"269 115 OFFCURVE",
+"219 225 OFFCURVE",
+"219 364 CURVE SMOOTH {name = dh02;}",
+"219 504 OFFCURVE",
+"269 613 OFFCURVE",
+"379 613 CURVE SMOOTH {name = sv01;}",
+"433 613 OFFCURVE",
+"480 586 OFFCURVE",
+"522 547 CURVE",
+"522 708 LINE",
+"477 733 OFFCURVE",
+"423 743 OFFCURVE",
+"370 743 CURVE SMOOTH {name = at01;}",
+"172 743 OFFCURVE",
+"69 590 OFFCURVE",
+"69 364 CURVE SMOOTH {name = dh01;}",
+"69 134 OFFCURVE",
+"172 -14 OFFCURVE",
+"370 -14 CURVE SMOOTH {name = hr00;}"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0043;
+},
+{
+glyphname = D;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"215 0 LINE SMOOTH {name = ab01;}",
+"448 0 OFFCURVE",
+"540 128 OFFCURVE",
+"540 365 CURVE SMOOTH {name = sh01;}",
+"540 614 OFFCURVE",
+"438 730 OFFCURVE",
+"215 730 CURVE SMOOTH",
+"67 730 LINE {name = hr00;}",
+"67 0 LINE"
+);
+},
+{
+closed = 1;
+nodes = (
+"166 649 LINE {name = sh02;}",
+"213 649 LINE SMOOTH {name = sv02;}",
+"392 649 OFFCURVE",
+"436 561 OFFCURVE",
+"436 365 CURVE SMOOTH {name = ah01;}",
+"436 172 OFFCURVE",
+"393 81 OFFCURVE",
+"213 81 CURVE SMOOTH {name = sv01;}",
+"166 81 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"221 0 LINE SMOOTH {name = ab01;}",
+"468 0 OFFCURVE",
+"557 118 OFFCURVE",
+"557 365 CURVE SMOOTH {name = sh01;}",
+"557 617 OFFCURVE",
+"465 730 OFFCURVE",
+"221 730 CURVE SMOOTH",
+"67 730 LINE {name = hr00;}",
+"67 0 LINE"
+);
+},
+{
+closed = 1;
+nodes = (
+"211 600 LINE {name = sh02;}",
+"250 600 LINE SMOOTH {name = sv02;}",
+"370 600 OFFCURVE",
+"407 514 OFFCURVE",
+"407 365 CURVE SMOOTH {name = ah01;}",
+"407 195 OFFCURVE",
+"370 130 OFFCURVE",
+"250 130 CURVE SMOOTH {name = sv01;}",
+"211 130 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0044;
+},
+{
+glyphname = E;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"537 0 LINE",
+"537 83 LINE",
+"194 83 LINE",
+"194 347 LINE",
+"513 347 LINE",
+"513 430 LINE",
+"194 430 LINE",
+"194 647 LINE",
+"528 647 LINE",
+"528 730 LINE",
+"95 730 LINE",
+"95 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"536 0 LINE",
+"536 127 LINE",
+"226 127 LINE",
+"226 318 LINE",
+"507 318 LINE",
+"507 445 LINE",
+"226 445 LINE",
+"226 603 LINE",
+"536 603 LINE",
+"536 730 LINE",
+"82 730 LINE",
+"82 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0045;
+},
+{
+glyphname = F;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"212 0 LINE",
+"212 338 LINE",
+"511 338 LINE",
+"511 421 LINE",
+"212 421 LINE",
+"212 647 LINE",
+"542 647 LINE",
+"542 730 LINE",
+"113 730 LINE",
+"113 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"232 0 LINE",
+"232 313 LINE",
+"514 313 LINE",
+"514 440 LINE",
+"232 440 LINE",
+"232 603 LINE",
+"542 603 LINE",
+"542 730 LINE",
+"88 730 LINE",
+"88 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0046;
+},
+{
+glyphname = G;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"413 -14 OFFCURVE",
+"486 11 OFFCURVE",
+"539 60 CURVE",
+"539 374 LINE",
+"339 374 LINE",
+"339 293 LINE",
+"445 293 LINE",
+"445 97 LINE",
+"419 77 OFFCURVE",
+"383 66 OFFCURVE",
+"344 66 CURVE SMOOTH",
+"227 66 OFFCURVE",
+"153 167 OFFCURVE",
+"153 362 CURVE SMOOTH",
+"153 559 OFFCURVE",
+"229 663 OFFCURVE",
+"347 663 CURVE SMOOTH",
+"404 663 OFFCURVE",
+"463 639 OFFCURVE",
+"514 590 CURVE",
+"514 691 LINE",
+"461 727 OFFCURVE",
+"408 743 OFFCURVE",
+"344 743 CURVE SMOOTH",
+"160 743 OFFCURVE",
+"50 601 OFFCURVE",
+"50 362 CURVE SMOOTH",
+"50 127 OFFCURVE",
+"160 -14 OFFCURVE",
+"341 -14 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"419 -14 OFFCURVE",
+"495 9 OFFCURVE",
+"552 58 CURVE",
+"552 392 LINE",
+"327 392 LINE",
+"327 271 LINE",
+"426 271 LINE",
+"426 132 LINE",
+"405 120 OFFCURVE",
+"387 115 OFFCURVE",
+"363 115 CURVE SMOOTH",
+"233 115 OFFCURVE",
+"207 262 OFFCURVE",
+"207 367 CURVE SMOOTH",
+"207 477 OFFCURVE",
+"235 614 OFFCURVE",
+"363 614 CURVE SMOOTH",
+"421 614 OFFCURVE",
+"487 586 OFFCURVE",
+"526 535 CURVE",
+"526 695 LINE",
+"474 727 OFFCURVE",
+"417 743 OFFCURVE",
+"350 743 CURVE SMOOTH",
+"118 743 OFFCURVE",
+"57 564 OFFCURVE",
+"57 367 CURVE SMOOTH",
+"57 172 OFFCURVE",
+"115 -14 OFFCURVE",
+"350 -14 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0047;
+},
+{
+glyphname = H;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"165 0 LINE",
+"165 347 LINE",
+"435 347 LINE",
+"435 0 LINE",
+"534 0 LINE",
+"534 730 LINE",
+"435 730 LINE",
+"435 430 LINE",
+"165 430 LINE",
+"165 730 LINE",
+"66 730 LINE",
+"66 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"210 0 LINE",
+"210 324 LINE",
+"390 324 LINE",
+"390 0 LINE",
+"534 0 LINE",
+"534 730 LINE",
+"390 730 LINE",
+"390 451 LINE",
+"210 451 LINE",
+"210 730 LINE",
+"66 730 LINE",
+"66 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0048;
+},
+{
+glyphname = I;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"503 0 LINE",
+"503 83 LINE",
+"350 83 LINE",
+"350 647 LINE",
+"503 647 LINE",
+"503 730 LINE",
+"98 730 LINE",
+"98 647 LINE",
+"251 647 LINE",
+"251 83 LINE",
+"98 83 LINE",
+"98 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"517 0 LINE",
+"517 127 LINE",
+"372 127 LINE",
+"372 603 LINE",
+"517 603 LINE",
+"517 730 LINE",
+"83 730 LINE",
+"83 603 LINE",
+"228 603 LINE",
+"228 127 LINE",
+"83 127 LINE",
+"83 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0049;
+},
+{
+glyphname = J;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"404 -14 OFFCURVE",
+"466 58 OFFCURVE",
+"466 238 CURVE SMOOTH",
+"466 730 LINE",
+"181 730 LINE",
+"181 647 LINE",
+"367 647 LINE",
+"367 238 LINE SMOOTH",
+"367 114 OFFCURVE",
+"320 66 OFFCURVE",
+"231 66 CURVE SMOOTH",
+"162 66 OFFCURVE",
+"111 93 OFFCURVE",
+"52 145 CURVE",
+"52 30 LINE",
+"119 0 OFFCURVE",
+"182 -14 OFFCURVE",
+"249 -14 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"423 -14 OFFCURVE",
+"491 60 OFFCURVE",
+"491 234 CURVE SMOOTH",
+"491 730 LINE",
+"171 730 LINE",
+"171 603 LINE",
+"347 603 LINE",
+"347 234 LINE SMOOTH",
+"347 159 OFFCURVE",
+"318 115 OFFCURVE",
+"241 115 CURVE SMOOTH",
+"174 115 OFFCURVE",
+"105 147 OFFCURVE",
+"52 203 CURVE",
+"52 36 LINE",
+"119 4 OFFCURVE",
+"196 -14 OFFCURVE",
+"265 -14 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 004A;
+},
+{
+glyphname = K;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"165 0 LINE",
+"165 285 LINE",
+"240 365 LINE",
+"478 0 LINE",
+"597 0 LINE",
+"305 431 LINE",
+"589 730 LINE",
+"473 730 LINE",
+"165 405 LINE",
+"165 730 LINE",
+"66 730 LINE",
+"66 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"200 0 LINE",
+"200 247 LINE",
+"264 328 LINE",
+"437 0 LINE",
+"597 0 LINE",
+"359 442 LINE",
+"589 729 LINE",
+"426 729 LINE",
+"200 441 LINE",
+"200 729 LINE",
+"56 729 LINE",
+"56 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 004B;
+},
+{
+glyphname = L;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"555 0 LINE",
+"555 83 LINE",
+"203 83 LINE",
+"203 730 LINE",
+"104 730 LINE",
+"104 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"560 0 LINE",
+"560 127 LINE",
+"252 127 LINE",
+"252 730 LINE",
+"108 730 LINE",
+"108 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 004C;
+},
+{
+glyphname = M;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"133 0 LINE",
+"133 645 LINE",
+"263 260 LINE",
+"338 260 LINE",
+"468 645 LINE",
+"468 0 LINE",
+"559 0 LINE",
+"559 730 LINE",
+"427 730 LINE",
+"300 358 LINE",
+"174 730 LINE",
+"42 730 LINE",
+"42 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"165 0 LINE",
+"165 585 LINE",
+"243 265 LINE",
+"358 265 LINE",
+"435 585 LINE",
+"435 0 LINE",
+"559 0 LINE",
+"559 730 LINE",
+"386 730 LINE",
+"300 409 LINE",
+"213 730 LINE",
+"41 730 LINE",
+"41 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 004D;
+},
+{
+glyphname = N;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"162 0 LINE",
+"162 601 LINE",
+"408 0 LINE",
+"533 0 LINE",
+"533 730 LINE",
+"438 730 LINE",
+"438 129 LINE",
+"192 730 LINE",
+"67 730 LINE",
+"67 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"185 0 LINE",
+"185 531 LINE",
+"389 0 LINE",
+"543 0 LINE",
+"543 730 LINE",
+"416 730 LINE",
+"416 199 LINE",
+"213 730 LINE",
+"58 730 LINE",
+"58 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 004E;
+},
+{
+glyphname = O;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"460 -14 OFFCURVE",
+"544 115 OFFCURVE",
+"544 364 CURVE SMOOTH",
+"544 613 OFFCURVE",
+"460 742 OFFCURVE",
+"300 742 CURVE SMOOTH",
+"139 742 OFFCURVE",
+"56 612 OFFCURVE",
+"56 364 CURVE SMOOTH",
+"56 115 OFFCURVE",
+"139 -14 OFFCURVE",
+"299 -14 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"179 66 OFFCURVE",
+"159 199 OFFCURVE",
+"159 364 CURVE SMOOTH",
+"159 530 OFFCURVE",
+"178 662 OFFCURVE",
+"299 662 CURVE SMOOTH",
+"419 662 OFFCURVE",
+"441 530 OFFCURVE",
+"441 364 CURVE SMOOTH",
+"441 199 OFFCURVE",
+"421 66 OFFCURVE",
+"299 66 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"466 -14 OFFCURVE",
+"557 121 OFFCURVE",
+"557 364 CURVE SMOOTH",
+"557 609 OFFCURVE",
+"465 742 OFFCURVE",
+"301 742 CURVE SMOOTH",
+"135 742 OFFCURVE",
+"45 610 OFFCURVE",
+"45 364 CURVE SMOOTH",
+"45 129 OFFCURVE",
+"139 -14 OFFCURVE",
+"301 -14 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"226 115 OFFCURVE",
+"193 201 OFFCURVE",
+"193 364 CURVE SMOOTH",
+"193 530 OFFCURVE",
+"226 613 OFFCURVE",
+"301 613 CURVE SMOOTH",
+"375 613 OFFCURVE",
+"409 530 OFFCURVE",
+"409 364 CURVE SMOOTH",
+"409 201 OFFCURVE",
+"375 115 OFFCURVE",
+"301 115 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 004F;
+},
+{
+glyphname = P;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"183 0 LINE",
+"183 293 LINE",
+"297 293 LINE SMOOTH",
+"443 293 OFFCURVE",
+"545 354 OFFCURVE",
+"545 511 CURVE SMOOTH",
+"545 669 OFFCURVE",
+"443 730 OFFCURVE",
+"297 730 CURVE SMOOTH",
+"84 730 LINE",
+"84 0 LINE"
+);
+},
+{
+closed = 1;
+nodes = (
+"183 649 LINE",
+"297 649 LINE SMOOTH",
+"385 649 OFFCURVE",
+"442 604 OFFCURVE",
+"442 513 CURVE SMOOTH",
+"442 422 OFFCURVE",
+"385 374 OFFCURVE",
+"297 374 CURVE SMOOTH",
+"183 374 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"225 0 LINE",
+"225 274 LINE",
+"292 274 LINE",
+"449 277 OFFCURVE",
+"562 319 OFFCURVE",
+"562 501 CURVE SMOOTH",
+"562 689 OFFCURVE",
+"449 730 OFFCURVE",
+"292 730 CURVE SMOOTH",
+"81 730 LINE",
+"81 0 LINE"
+);
+},
+{
+closed = 1;
+nodes = (
+"225 609 LINE",
+"292 609 LINE SMOOTH",
+"366 609 OFFCURVE",
+"412 591 OFFCURVE",
+"412 501 CURVE SMOOTH",
+"412 413 OFFCURVE",
+"366 394 OFFCURVE",
+"292 394 CURVE SMOOTH",
+"225 394 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0050;
+},
+{
+glyphname = Q;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"587 -171 LINE",
+"410 10 LINE",
+"492 76 OFFCURVE",
+"545 158 OFFCURVE",
+"545 365 CURVE SMOOTH",
+"545 614 OFFCURVE",
+"462 742 OFFCURVE",
+"301 742 CURVE SMOOTH",
+"141 742 OFFCURVE",
+"57 614 OFFCURVE",
+"57 365 CURVE SMOOTH",
+"57 158 OFFCURVE",
+"114 -13 OFFCURVE",
+"320 -13 CURVE",
+"472 -171 LINE"
+);
+},
+{
+closed = 1;
+nodes = (
+"180 66 OFFCURVE",
+"160 200 OFFCURVE",
+"160 365 CURVE SMOOTH",
+"160 531 OFFCURVE",
+"180 662 OFFCURVE",
+"301 662 CURVE SMOOTH",
+"422 662 OFFCURVE",
+"442 531 OFFCURVE",
+"442 365 CURVE SMOOTH",
+"442 200 OFFCURVE",
+"421 66 OFFCURVE",
+"301 66 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"602 -171 LINE",
+"437 25 LINE",
+"514 74 OFFCURVE",
+"557 204 OFFCURVE",
+"557 365 CURVE SMOOTH",
+"557 615 OFFCURVE",
+"466 742 OFFCURVE",
+"300 742 CURVE SMOOTH",
+"135 742 OFFCURVE",
+"45 614 OFFCURVE",
+"45 365 CURVE SMOOTH",
+"45 153 OFFCURVE",
+"157 -11 OFFCURVE",
+"319 -11 CURVE",
+"435 -171 LINE"
+);
+},
+{
+closed = 1;
+nodes = (
+"228 118 OFFCURVE",
+"195 209 OFFCURVE",
+"195 365 CURVE SMOOTH",
+"195 534 OFFCURVE",
+"228 613 OFFCURVE",
+"300 613 CURVE SMOOTH",
+"372 613 OFFCURVE",
+"407 534 OFFCURVE",
+"407 365 CURVE SMOOTH",
+"407 209 OFFCURVE",
+"372 118 OFFCURVE",
+"300 118 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0051;
+},
+{
+glyphname = R;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"167 0 LINE",
+"167 308 LINE",
+"261 308 LINE SMOOTH",
+"304 308 OFFCURVE",
+"368 266 OFFCURVE",
+"407 184 CURVE SMOOTH",
+"494 0 LINE",
+"600 0 LINE",
+"498 206 LINE SMOOTH",
+"471 260 OFFCURVE",
+"437 327 OFFCURVE",
+"369 344 CURVE",
+"465 358 OFFCURVE",
+"519 423 OFFCURVE",
+"519 526 CURVE SMOOTH",
+"519 648 OFFCURVE",
+"443 730 OFFCURVE",
+"271 730 CURVE SMOOTH",
+"68 730 LINE",
+"68 0 LINE"
+);
+},
+{
+closed = 1;
+nodes = (
+"167 649 LINE",
+"271 649 LINE SMOOTH",
+"367 649 OFFCURVE",
+"415 607 OFFCURVE",
+"415 516 CURVE SMOOTH",
+"415 424 OFFCURVE",
+"367 389 OFFCURVE",
+"275 389 CURVE SMOOTH",
+"167 389 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"207 0 LINE",
+"207 288 LINE",
+"253 288 LINE SMOOTH",
+"305 288 OFFCURVE",
+"330 236 OFFCURVE",
+"351 191 CURVE SMOOTH",
+"442 0 LINE",
+"600 0 LINE",
+"465 272 LINE SMOOTH",
+"448 305 OFFCURVE",
+"432 335 OFFCURVE",
+"392 344 CURVE",
+"492 357 OFFCURVE",
+"534 425 OFFCURVE",
+"534 527 CURVE SMOOTH",
+"534 693 OFFCURVE",
+"422 730 OFFCURVE",
+"271 730 CURVE SMOOTH",
+"63 730 LINE",
+"63 0 LINE"
+);
+},
+{
+closed = 1;
+nodes = (
+"207 609 LINE",
+"275 609 LINE SMOOTH",
+"347 609 OFFCURVE",
+"385 586 OFFCURVE",
+"385 510 CURVE SMOOTH",
+"385 433 OFFCURVE",
+"347 410 OFFCURVE",
+"275 410 CURVE SMOOTH",
+"207 410 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0052;
+},
+{
+glyphname = S;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"449 -14 OFFCURVE",
+"536 61 OFFCURVE",
+"536 201 CURVE SMOOTH",
+"536 322 OFFCURVE",
+"471 367 OFFCURVE",
+"313 420 CURVE SMOOTH",
+"206 456 OFFCURVE",
+"162 487 OFFCURVE",
+"162 545 CURVE SMOOTH",
+"162 617 OFFCURVE",
+"228 662 OFFCURVE",
+"313 662 CURVE SMOOTH",
+"370 662 OFFCURVE",
+"434 642 OFFCURVE",
+"494 604 CURVE",
+"494 704 LINE",
+"428 729 OFFCURVE",
+"366 742 OFFCURVE",
+"309 742 CURVE SMOOTH",
+"162 742 OFFCURVE",
+"68 657 OFFCURVE",
+"68 527 CURVE SMOOTH",
+"68 423 OFFCURVE",
+"127 380 OFFCURVE",
+"274 330 CURVE SMOOTH",
+"405 285 OFFCURVE",
+"442 250 OFFCURVE",
+"442 187 CURVE SMOOTH",
+"442 96 OFFCURVE",
+"370 66 OFFCURVE",
+"286 66 CURVE SMOOTH",
+"215 66 OFFCURVE",
+"150 88 OFFCURVE",
+"77 135 CURVE",
+"77 30 LINE",
+"148 0 OFFCURVE",
+"218 -14 OFFCURVE",
+"288 -14 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"453 -14 OFFCURVE",
+"542 65 OFFCURVE",
+"542 200 CURVE SMOOTH",
+"542 357 OFFCURVE",
+"426 403 OFFCURVE",
+"331 441 CURVE SMOOTH",
+"263 468 OFFCURVE",
+"204 485 OFFCURVE",
+"204 544 CURVE SMOOTH",
+"204 593 OFFCURVE",
+"244 623 OFFCURVE",
+"312 623 CURVE SMOOTH",
+"374 623 OFFCURVE",
+"440 600 OFFCURVE",
+"501 556 CURVE",
+"501 697 LINE",
+"433 728 OFFCURVE",
+"373 742 OFFCURVE",
+"308 742 CURVE SMOOTH",
+"154 742 OFFCURVE",
+"63 680 OFFCURVE",
+"63 533 CURVE SMOOTH",
+"63 377 OFFCURVE",
+"172 374 OFFCURVE",
+"269 326 CURVE SMOOTH",
+"366 278 OFFCURVE",
+"396 253 OFFCURVE",
+"396 200 CURVE SMOOTH",
+"396 136 OFFCURVE",
+"354 105 OFFCURVE",
+"281 105 CURVE SMOOTH",
+"214 105 OFFCURVE",
+"141 132 OFFCURVE",
+"66 186 CURVE",
+"66 37 LINE",
+"124 7 OFFCURVE",
+"217 -14 OFFCURVE",
+"299 -14 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0053;
+},
+{
+glyphname = T;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"350 0 LINE",
+"350 647 LINE",
+"578 647 LINE",
+"578 730 LINE",
+"22 730 LINE",
+"22 647 LINE",
+"251 647 LINE",
+"251 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"372 0 LINE",
+"372 604 LINE",
+"557 604 LINE",
+"557 730 LINE",
+"43 730 LINE",
+"43 604 LINE",
+"228 604 LINE",
+"228 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0054;
+},
+{
+glyphname = U;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"467 -14 OFFCURVE",
+"529 70 OFFCURVE",
+"529 280 CURVE SMOOTH",
+"529 730 LINE",
+"430 730 LINE",
+"430 234 LINE SMOOTH",
+"430 119 OFFCURVE",
+"392 66 OFFCURVE",
+"300 66 CURVE SMOOTH",
+"208 66 OFFCURVE",
+"170 119 OFFCURVE",
+"170 234 CURVE SMOOTH",
+"170 730 LINE",
+"71 730 LINE",
+"71 280 LINE SMOOTH",
+"71 70 OFFCURVE",
+"133 -14 OFFCURVE",
+"300 -14 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"472 -14 OFFCURVE",
+"549 82 OFFCURVE",
+"549 269 CURVE SMOOTH",
+"549 730 LINE",
+"405 730 LINE",
+"405 233 LINE SMOOTH",
+"405 160 OFFCURVE",
+"366 116 OFFCURVE",
+"300 116 CURVE SMOOTH",
+"234 116 OFFCURVE",
+"195 160 OFFCURVE",
+"195 233 CURVE SMOOTH",
+"195 730 LINE",
+"51 730 LINE",
+"51 269 LINE SMOOTH",
+"51 82 OFFCURVE",
+"128 -14 OFFCURVE",
+"300 -14 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0055;
+},
+{
+glyphname = V;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"360 0 LINE",
+"573 729 LINE",
+"471 729 LINE",
+"300 83 LINE",
+"129 729 LINE",
+"27 729 LINE",
+"240 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"400 0 LINE",
+"573 730 LINE",
+"428 730 LINE",
+"300 120 LINE",
+"172 730 LINE",
+"27 730 LINE",
+"200 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0056;
+},
+{
+glyphname = W;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"202 0 LINE",
+"301 433 LINE",
+"400 0 LINE",
+"493 0 LINE",
+"602 730 LINE",
+"506 730 LINE",
+"436 136 LINE",
+"352 529 LINE",
+"249 529 LINE",
+"166 137 LINE",
+"96 730 LINE",
+"0 730 LINE",
+"109 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"223 0 LINE",
+"301 383 LINE",
+"384 0 LINE",
+"518 0 LINE",
+"602 730 LINE",
+"475 730 LINE",
+"434 194 LINE",
+"361 540 LINE",
+"241 540 LINE",
+"178 194 LINE",
+"126 730 LINE",
+"0 730 LINE",
+"90 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0057;
+},
+{
+glyphname = X;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"114 0 LINE",
+"307 304 LINE",
+"486 0 LINE",
+"592 0 LINE",
+"358 374 LINE",
+"576 730 LINE",
+"470 730 LINE",
+"307 444 LINE",
+"147 730 LINE",
+"41 730 LINE",
+"252 374 LINE",
+"8 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"161 0 LINE",
+"300 241 LINE",
+"439 0 LINE",
+"588 0 LINE",
+"375 369 LINE",
+"582 730 LINE",
+"433 730 LINE",
+"300 497 LINE",
+"167 730 LINE",
+"18 730 LINE",
+"226 369 LINE",
+"12 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0058;
+},
+{
+glyphname = Y;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"350 0 LINE",
+"350 327 LINE",
+"582 730 LINE",
+"477 730 LINE",
+"300 407 LINE",
+"122 730 LINE",
+"17 730 LINE",
+"250 327 LINE",
+"250 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"372 0 LINE",
+"372 287 LINE",
+"597 730 LINE",
+"442 730 LINE",
+"300 436 LINE",
+"158 730 LINE",
+"3 730 LINE",
+"228 287 LINE",
+"228 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0059;
+},
+{
+glyphname = Z;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"547 0 LINE",
+"547 83 LINE",
+"156 83 LINE",
+"537 655 LINE",
+"537 730 LINE",
+"63 730 LINE",
+"63 647 LINE",
+"423 647 LINE",
+"53 75 LINE",
+"53 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"556 0 LINE",
+"556 127 LINE",
+"211 127 LINE",
+"549 611 LINE",
+"549 730 LINE",
+"56 730 LINE",
+"56 603 LINE",
+"373 603 LINE",
+"45 119 LINE",
+"45 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 005A;
+},
+{
+glyphname = a;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"324 -14 OFFCURVE",
+"398 17 OFFCURVE",
+"436 83 CURVE",
+"440 56 OFFCURVE",
+"446 25 OFFCURVE",
+"457 0 CURVE",
+"547 0 LINE",
+"523 57 OFFCURVE",
+"519 139 OFFCURVE",
+"519 200 CURVE SMOOTH",
+"519 312 LINE SMOOTH",
+"519 502 OFFCURVE",
+"462 560 OFFCURVE",
+"291 560 CURVE SMOOTH",
+"209 560 OFFCURVE",
+"166 544 OFFCURVE",
+"106 522 CURVE",
+"106 432 LINE",
+"162 464 OFFCURVE",
+"235 484 OFFCURVE",
+"291 484 CURVE SMOOTH",
+"384 484 OFFCURVE",
+"428 436 OFFCURVE",
+"428 345 CURVE",
+"308 345 LINE SMOOTH",
+"183 345 OFFCURVE",
+"66 304 OFFCURVE",
+"66 163 CURVE SMOOTH",
+"66 48 OFFCURVE",
+"143 -14 OFFCURVE",
+"249 -14 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"203 61 OFFCURVE",
+"156 95 OFFCURVE",
+"156 164 CURVE SMOOTH",
+"156 256 OFFCURVE",
+"239 275 OFFCURVE",
+"314 275 CURVE SMOOTH",
+"428 275 LINE",
+"428 255 LINE SMOOTH",
+"428 153 OFFCURVE",
+"383 61 OFFCURVE",
+"271 61 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"304 -14 OFFCURVE",
+"364 10 OFFCURVE",
+"402 61 CURVE",
+"406 36 OFFCURVE",
+"410 22 OFFCURVE",
+"422 0 CURVE",
+"564 0 LINE",
+"540 60 OFFCURVE",
+"539 94 OFFCURVE",
+"539 122 CURVE SMOOTH",
+"539 320 LINE SMOOTH",
+"539 514 OFFCURVE",
+"482 561 OFFCURVE",
+"303 561 CURVE SMOOTH",
+"234 561 OFFCURVE",
+"168 549 OFFCURVE",
+"101 522 CURVE",
+"101 400 LINE",
+"164 434 OFFCURVE",
+"222 454 OFFCURVE",
+"291 454 CURVE SMOOTH",
+"370 454 OFFCURVE",
+"399 429 OFFCURVE",
+"399 360 CURVE",
+"300 360 LINE SMOOTH",
+"168 360 OFFCURVE",
+"46 328 OFFCURVE",
+"46 174 CURVE SMOOTH",
+"46 52 OFFCURVE",
+"123 -14 OFFCURVE",
+"236 -14 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"230 85 OFFCURVE",
+"199 116 OFFCURVE",
+"199 169 CURVE SMOOTH",
+"199 252 OFFCURVE",
+"275 257 OFFCURVE",
+"342 257 CURVE SMOOTH",
+"399 257 LINE",
+"399 247 LINE SMOOTH",
+"399 170 OFFCURVE",
+"373 85 OFFCURVE",
+"283 85 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0061;
+},
+{
+glyphname = b;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"492 -14 OFFCURVE",
+"543 137 OFFCURVE",
+"543 273 CURVE SMOOTH",
+"543 409 OFFCURVE",
+"492 560 OFFCURVE",
+"335 560 CURVE SMOOTH",
+"268 560 OFFCURVE",
+"215 534 OFFCURVE",
+"184 477 CURVE",
+"184 760 LINE",
+"94 760 LINE",
+"94 0 LINE",
+"175 0 LINE",
+"184 69 LINE",
+"215 14 OFFCURVE",
+"268 -14 OFFCURVE",
+"335 -14 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"203 62 OFFCURVE",
+"184 183 OFFCURVE",
+"184 273 CURVE SMOOTH",
+"184 362 OFFCURVE",
+"203 484 OFFCURVE",
+"317 484 CURVE SMOOTH",
+"430 484 OFFCURVE",
+"448 362 OFFCURVE",
+"448 273 CURVE SMOOTH",
+"448 183 OFFCURVE",
+"430 62 OFFCURVE",
+"317 62 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"484 -14 OFFCURVE",
+"558 94 OFFCURVE",
+"558 274 CURVE SMOOTH",
+"558 454 OFFCURVE",
+"484 560 OFFCURVE",
+"361 560 CURVE SMOOTH",
+"296 560 OFFCURVE",
+"249 531 OFFCURVE",
+"216 469 CURVE",
+"216 760 LINE",
+"73 760 LINE",
+"73 0 LINE",
+"202 0 LINE",
+"216 81 LINE",
+"249 18 OFFCURVE",
+"296 -14 OFFCURVE",
+"361 -14 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"255 103 OFFCURVE",
+"216 170 OFFCURVE",
+"216 272 CURVE SMOOTH",
+"216 374 OFFCURVE",
+"257 441 OFFCURVE",
+"317 441 CURVE SMOOTH",
+"377 441 OFFCURVE",
+"415 374 OFFCURVE",
+"415 272 CURVE SMOOTH",
+"415 170 OFFCURVE",
+"377 103 OFFCURVE",
+"316 103 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0062;
+},
+{
+glyphname = c;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"404 -14 OFFCURVE",
+"453 -1 OFFCURVE",
+"502 28 CURVE",
+"502 122 LINE",
+"457 81 OFFCURVE",
+"411 62 OFFCURVE",
+"353 62 CURVE SMOOTH",
+"222 62 OFFCURVE",
+"174 156 OFFCURVE",
+"174 273 CURVE SMOOTH",
+"174 390 OFFCURVE",
+"222 485 OFFCURVE",
+"353 485 CURVE SMOOTH",
+"411 485 OFFCURVE",
+"457 466 OFFCURVE",
+"502 425 CURVE",
+"502 519 LINE",
+"453 547 OFFCURVE",
+"404 561 OFFCURVE",
+"345 561 CURVE SMOOTH",
+"171 561 OFFCURVE",
+"79 443 OFFCURVE",
+"79 273 CURVE SMOOTH",
+"79 103 OFFCURVE",
+"171 -14 OFFCURVE",
+"343 -14 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"403 -14 OFFCURVE",
+"455 -1 OFFCURVE",
+"507 28 CURVE",
+"507 159 LINE",
+"466 123 OFFCURVE",
+"417 103 OFFCURVE",
+"363 103 CURVE SMOOTH",
+"269 103 OFFCURVE",
+"216 163 OFFCURVE",
+"216 273 CURVE SMOOTH",
+"216 383 OFFCURVE",
+"269 444 OFFCURVE",
+"363 444 CURVE SMOOTH",
+"414 444 OFFCURVE",
+"466 426 OFFCURVE",
+"507 388 CURVE",
+"507 519 LINE",
+"455 548 OFFCURVE",
+"403 561 OFFCURVE",
+"343 561 CURVE SMOOTH",
+"172 561 OFFCURVE",
+"71 452 OFFCURVE",
+"71 272 CURVE SMOOTH",
+"71 92 OFFCURVE",
+"172 -14 OFFCURVE",
+"343 -14 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0063;
+},
+{
+glyphname = d;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"336 -14 OFFCURVE",
+"388 13 OFFCURVE",
+"419 69 CURVE",
+"428 0 LINE",
+"509 0 LINE",
+"509 760 LINE",
+"419 760 LINE",
+"419 477 LINE",
+"388 534 OFFCURVE",
+"336 560 OFFCURVE",
+"271 560 CURVE SMOOTH",
+"127 560 OFFCURVE",
+"60 430 OFFCURVE",
+"60 273 CURVE SMOOTH",
+"60 116 OFFCURVE",
+"127 -14 OFFCURVE",
+"271 -14 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"173 62 OFFCURVE",
+"155 183 OFFCURVE",
+"155 273 CURVE SMOOTH",
+"155 360 OFFCURVE",
+"173 484 OFFCURVE",
+"287 484 CURVE SMOOTH",
+"400 484 OFFCURVE",
+"419 360 OFFCURVE",
+"419 273 CURVE SMOOTH",
+"419 181 OFFCURVE",
+"400 62 OFFCURVE",
+"287 62 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"306 -14 OFFCURVE",
+"356 18 OFFCURVE",
+"386 81 CURVE",
+"400 0 LINE",
+"529 0 LINE",
+"529 760 LINE",
+"386 760 LINE",
+"386 469 LINE",
+"350 532 OFFCURVE",
+"306 560 OFFCURVE",
+"242 560 CURVE SMOOTH",
+"119 560 OFFCURVE",
+"44 452 OFFCURVE",
+"44 272 CURVE SMOOTH",
+"44 92 OFFCURVE",
+"119 -14 OFFCURVE",
+"242 -14 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"223 104 OFFCURVE",
+"187 169 OFFCURVE",
+"187 273 CURVE SMOOTH",
+"187 377 OFFCURVE",
+"223 442 OFFCURVE",
+"286 442 CURVE SMOOTH",
+"349 442 OFFCURVE",
+"386 377 OFFCURVE",
+"386 273 CURVE SMOOTH",
+"386 169 OFFCURVE",
+"349 104 OFFCURVE",
+"286 104 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0064;
+},
+{
+glyphname = e;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"381 -14 OFFCURVE",
+"451 -7 OFFCURVE",
+"522 28 CURVE",
+"522 122 LINE",
+"453 85 OFFCURVE",
+"381 74 OFFCURVE",
+"326 74 CURVE SMOOTH",
+"232 74 OFFCURVE",
+"154 152 OFFCURVE",
+"154 252 CURVE",
+"543 252 LINE",
+"543 273 LINE SMOOTH",
+"543 453 OFFCURVE",
+"461 560 OFFCURVE",
+"306 560 CURVE SMOOTH",
+"151 560 OFFCURVE",
+"61 453 OFFCURVE",
+"61 273 CURVE SMOOTH",
+"61 93 OFFCURVE",
+"156 -14 OFFCURVE",
+"325 -14 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"158 412 OFFCURVE",
+"208 484 OFFCURVE",
+"306 484 CURVE SMOOTH",
+"404 484 OFFCURVE",
+"454 412 OFFCURVE",
+"454 322 CURVE",
+"158 322 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"400 -14 OFFCURVE",
+"470 0 OFFCURVE",
+"536 27 CURVE",
+"536 158 LINE",
+"470 119 OFFCURVE",
+"393 99 OFFCURVE",
+"335 99 CURVE SMOOTH",
+"239 99 OFFCURVE",
+"194 152 OFFCURVE",
+"194 227 CURVE",
+"559 227 LINE",
+"559 270 LINE SMOOTH",
+"559 445 OFFCURVE",
+"451 560 OFFCURVE",
+"301 560 CURVE SMOOTH",
+"151 560 OFFCURVE",
+"43 445 OFFCURVE",
+"43 270 CURVE SMOOTH",
+"43 95 OFFCURVE",
+"143 -14 OFFCURVE",
+"335 -14 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"192 409 OFFCURVE",
+"236 449 OFFCURVE",
+"301 449 CURVE SMOOTH",
+"366 449 OFFCURVE",
+"414 409 OFFCURVE",
+"414 334 CURVE",
+"192 334 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0065;
+},
+{
+glyphname = f;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"316 0 LINE",
+"316 480 LINE",
+"504 480 LINE",
+"504 550 LINE",
+"316 550 LINE",
+"316 590 LINE SMOOTH",
+"316 646 OFFCURVE",
+"326 685 OFFCURVE",
+"399 685 CURVE SMOOTH",
+"504 685 LINE",
+"504 760 LINE",
+"399 760 LINE SMOOTH",
+"279 760 OFFCURVE",
+"227 696 OFFCURVE",
+"227 590 CURVE SMOOTH",
+"227 550 LINE",
+"81 550 LINE",
+"81 480 LINE",
+"227 480 LINE",
+"227 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"350 0 LINE",
+"350 440 LINE",
+"518 440 LINE",
+"518 550 LINE",
+"350 550 LINE",
+"350 595 LINE SMOOTH",
+"350 635 OFFCURVE",
+"366 650 OFFCURVE",
+"403 650 CURVE SMOOTH",
+"518 650 LINE",
+"518 760 LINE",
+"403 760 LINE SMOOTH",
+"254 760 OFFCURVE",
+"207 731 OFFCURVE",
+"207 585 CURVE SMOOTH",
+"207 550 LINE",
+"74 550 LINE",
+"74 440 LINE",
+"207 440 LINE",
+"207 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0066;
+},
+{
+glyphname = g;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"454 -215 OFFCURVE",
+"522 -118 OFFCURVE",
+"522 35 CURVE SMOOTH",
+"522 550 LINE",
+"441 550 LINE",
+"433 474 LINE",
+"402 534 OFFCURVE",
+"352 560 OFFCURVE",
+"286 560 CURVE SMOOTH",
+"129 560 OFFCURVE",
+"74 410 OFFCURVE",
+"74 278 CURVE SMOOTH",
+"74 144 OFFCURVE",
+"129 -4 OFFCURVE",
+"286 -4 CURVE SMOOTH",
+"352 -4 OFFCURVE",
+"402 24 OFFCURVE",
+"433 87 CURVE",
+"433 22 LINE SMOOTH",
+"433 -75 OFFCURVE",
+"395 -143 OFFCURVE",
+"297 -143 CURVE SMOOTH",
+"244 -143 OFFCURVE",
+"184 -123 OFFCURVE",
+"135 -99 CURVE",
+"135 -188 LINE",
+"186 -204 OFFCURVE",
+"240 -215 OFFCURVE",
+"292 -215 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"218 71 OFFCURVE",
+"168 154 OFFCURVE",
+"168 278 CURVE SMOOTH",
+"168 404 OFFCURVE",
+"218 485 OFFCURVE",
+"303 485 CURVE SMOOTH",
+"388 485 OFFCURVE",
+"433 403 OFFCURVE",
+"433 278 CURVE SMOOTH",
+"433 153 OFFCURVE",
+"388 71 OFFCURVE",
+"303 71 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"461 -215 OFFCURVE",
+"535 -142 OFFCURVE",
+"535 33 CURVE SMOOTH",
+"535 550 LINE",
+"406 550 LINE",
+"392 477 LINE",
+"364 531 OFFCURVE",
+"314 561 OFFCURVE",
+"248 561 CURVE SMOOTH",
+"99 561 OFFCURVE",
+"48 404 OFFCURVE",
+"48 280 CURVE SMOOTH",
+"48 147 OFFCURVE",
+"99 7 OFFCURVE",
+"253 7 CURVE SMOOTH",
+"318 7 OFFCURVE",
+"364 32 OFFCURVE",
+"392 84 CURVE",
+"392 17 LINE SMOOTH",
+"392 -62 OFFCURVE",
+"352 -101 OFFCURVE",
+"270 -101 CURVE SMOOTH",
+"220 -101 OFFCURVE",
+"157 -86 OFFCURVE",
+"105 -57 CURVE",
+"105 -188 LINE",
+"164 -206 OFFCURVE",
+"223 -215 OFFCURVE",
+"285 -215 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"232 120 OFFCURVE",
+"191 185 OFFCURVE",
+"191 280 CURVE SMOOTH",
+"191 375 OFFCURVE",
+"232 444 OFFCURVE",
+"292 444 CURVE SMOOTH",
+"352 444 OFFCURVE",
+"392 375 OFFCURVE",
+"392 280 CURVE SMOOTH",
+"392 185 OFFCURVE",
+"352 120 OFFCURVE",
+"292 120 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0067;
+},
+{
+glyphname = h;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"184 0 LINE",
+"184 309 LINE SMOOTH",
+"184 396 OFFCURVE",
+"214 482 OFFCURVE",
+"315 482 CURVE SMOOTH",
+"389 482 OFFCURVE",
+"422 437 OFFCURVE",
+"422 339 CURVE SMOOTH",
+"422 0 LINE",
+"512 0 LINE",
+"512 339 LINE SMOOTH",
+"512 455 OFFCURVE",
+"480 560 OFFCURVE",
+"346 560 CURVE SMOOTH",
+"271 560 OFFCURVE",
+"217 528 OFFCURVE",
+"184 465 CURVE",
+"184 760 LINE",
+"94 760 LINE",
+"94 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"225 0 LINE",
+"225 313 LINE SMOOTH",
+"225 394 OFFCURVE",
+"257 443 OFFCURVE",
+"312 443 CURVE SMOOTH",
+"358 443 OFFCURVE",
+"380 409 OFFCURVE",
+"380 333 CURVE SMOOTH",
+"380 0 LINE",
+"522 0 LINE",
+"522 355 LINE SMOOTH",
+"522 489 OFFCURVE",
+"468 560 OFFCURVE",
+"367 560 CURVE SMOOTH",
+"296 560 OFFCURVE",
+"246 526 OFFCURVE",
+"225 465 CURVE",
+"225 760 LINE",
+"83 760 LINE",
+"83 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0068;
+},
+{
+glyphname = i;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"532 -4 LINE",
+"532 72 LINE",
+"427 72 LINE SMOOTH",
+"376 72 OFFCURVE",
+"339 115 OFFCURVE",
+"339 194 CURVE SMOOTH",
+"339 550 LINE",
+"130 550 LINE",
+"130 480 LINE",
+"249 480 LINE",
+"249 194 LINE SMOOTH",
+"249 68 OFFCURVE",
+"311 -4 OFFCURVE",
+"418 -4 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"325 646 LINE SMOOTH",
+"334 646 OFFCURVE",
+"339 651 OFFCURVE",
+"339 661 CURVE SMOOTH",
+"339 745 LINE SMOOTH",
+"339 755 OFFCURVE",
+"334 760 OFFCURVE",
+"325 760 CURVE SMOOTH",
+"254 760 LINE SMOOTH",
+"245 760 OFFCURVE",
+"240 755 OFFCURVE",
+"240 745 CURVE SMOOTH",
+"240 661 LINE SMOOTH",
+"240 651 OFFCURVE",
+"245 646 OFFCURVE",
+"254 646 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"550 -6 LINE",
+"550 104 LINE",
+"436 104 LINE SMOOTH",
+"369 104 OFFCURVE",
+"348 148 OFFCURVE",
+"348 222 CURVE SMOOTH",
+"348 550 LINE",
+"89 550 LINE",
+"89 440 LINE",
+"205 440 LINE",
+"205 222 LINE SMOOTH",
+"205 61 OFFCURVE",
+"245 -6 OFFCURVE",
+"395 -6 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"333 612 LINE SMOOTH",
+"343 612 OFFCURVE",
+"348 617 OFFCURVE",
+"348 626 CURVE SMOOTH",
+"348 764 LINE SMOOTH",
+"348 774 OFFCURVE",
+"343 779 OFFCURVE",
+"333 779 CURVE SMOOTH",
+"219 779 LINE SMOOTH",
+"209 779 OFFCURVE",
+"205 774 OFFCURVE",
+"205 764 CURVE SMOOTH",
+"205 626 LINE SMOOTH",
+"205 617 OFFCURVE",
+"209 612 OFFCURVE",
+"219 612 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0069;
+},
+{
+glyphname = j;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"240 -208 LINE SMOOTH",
+"357 -208 OFFCURVE",
+"408 -151 OFFCURVE",
+"408 -10 CURVE SMOOTH",
+"408 550 LINE",
+"164 550 LINE",
+"164 480 LINE",
+"318 480 LINE",
+"318 -10 LINE SMOOTH",
+"318 -88 OFFCURVE",
+"284 -132 OFFCURVE",
+"230 -132 CURVE SMOOTH",
+"116 -132 LINE",
+"116 -208 LINE"
+);
+},
+{
+closed = 1;
+nodes = (
+"389 646 LINE SMOOTH",
+"398 646 OFFCURVE",
+"403 651 OFFCURVE",
+"403 661 CURVE SMOOTH",
+"403 745 LINE SMOOTH",
+"403 755 OFFCURVE",
+"398 760 OFFCURVE",
+"389 760 CURVE SMOOTH",
+"318 760 LINE SMOOTH",
+"309 760 OFFCURVE",
+"304 755 OFFCURVE",
+"304 745 CURVE SMOOTH",
+"304 661 LINE SMOOTH",
+"304 651 OFFCURVE",
+"309 646 OFFCURVE",
+"318 646 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"237 -207 LINE SMOOTH",
+"374 -207 OFFCURVE",
+"428 -142 OFFCURVE",
+"428 21 CURVE SMOOTH",
+"428 550 LINE",
+"140 550 LINE",
+"140 440 LINE",
+"285 440 LINE",
+"285 21 LINE SMOOTH",
+"285 -63 OFFCURVE",
+"260 -97 OFFCURVE",
+"197 -97 CURVE SMOOTH",
+"83 -97 LINE",
+"83 -207 LINE"
+);
+},
+{
+closed = 1;
+nodes = (
+"414 612 LINE SMOOTH",
+"423 612 OFFCURVE",
+"428 617 OFFCURVE",
+"428 626 CURVE SMOOTH",
+"428 764 LINE SMOOTH",
+"428 774 OFFCURVE",
+"423 779 OFFCURVE",
+"414 779 CURVE SMOOTH",
+"300 779 LINE SMOOTH",
+"290 779 OFFCURVE",
+"285 774 OFFCURVE",
+"285 764 CURVE SMOOTH",
+"285 626 LINE SMOOTH",
+"285 617 OFFCURVE",
+"290 612 OFFCURVE",
+"300 612 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 006A;
+},
+{
+glyphname = k;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"202 0 LINE",
+"202 219 LINE",
+"269 282 LINE",
+"471 0 LINE",
+"581 0 LINE",
+"332 341 LINE",
+"550 550 LINE",
+"441 550 LINE",
+"202 320 LINE",
+"202 760 LINE",
+"109 760 LINE",
+"109 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"227 0 LINE",
+"227 209 LINE",
+"276 256 LINE",
+"426 0 LINE",
+"584 0 LINE",
+"365 343 LINE",
+"575 550 LINE",
+"402 550 LINE",
+"227 361 LINE",
+"227 760 LINE",
+"84 760 LINE",
+"84 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 006B;
+},
+{
+glyphname = l;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"515 -4 LINE",
+"515 72 LINE",
+"406 72 LINE SMOOTH",
+"344 72 OFFCURVE",
+"322 114 OFFCURVE",
+"322 194 CURVE SMOOTH",
+"322 760 LINE",
+"88 760 LINE",
+"88 689 LINE",
+"232 689 LINE",
+"232 194 LINE SMOOTH",
+"232 56 OFFCURVE",
+"286 -4 OFFCURVE",
+"406 -4 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"539 -4 LINE",
+"539 106 LINE",
+"425 106 LINE SMOOTH",
+"360 106 OFFCURVE",
+"337 138 OFFCURVE",
+"337 224 CURVE SMOOTH",
+"337 760 LINE",
+"49 760 LINE",
+"49 650 LINE",
+"194 650 LINE",
+"194 224 LINE SMOOTH",
+"194 58 OFFCURVE",
+"235 -4 OFFCURVE",
+"385 -4 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 006C;
+},
+{
+glyphname = m;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"134 0 LINE",
+"134 313 LINE SMOOTH",
+"134 419 OFFCURVE",
+"134 485 OFFCURVE",
+"198 485 CURVE SMOOTH",
+"261 485 OFFCURVE",
+"261 419 OFFCURVE",
+"261 313 CURVE SMOOTH",
+"261 0 LINE",
+"343 0 LINE",
+"343 313 LINE SMOOTH",
+"343 419 OFFCURVE",
+"343 485 OFFCURVE",
+"410 485 CURVE SMOOTH",
+"472 485 OFFCURVE",
+"471 419 OFFCURVE",
+"471 313 CURVE SMOOTH",
+"471 0 LINE",
+"553 0 LINE",
+"553 317 LINE SMOOTH",
+"553 461 OFFCURVE",
+"541 560 OFFCURVE",
+"434 560 CURVE SMOOTH",
+"385 560 OFFCURVE",
+"352 539 OFFCURVE",
+"329 491 CURVE",
+"311 537 OFFCURVE",
+"279 560 OFFCURVE",
+"232 560 CURVE SMOOTH",
+"189 560 OFFCURVE",
+"156 540 OFFCURVE",
+"134 500 CURVE",
+"126 550 LINE",
+"52 550 LINE",
+"52 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"156 0 LINE",
+"156 351 LINE SMOOTH",
+"156 413 OFFCURVE",
+"160 453 OFFCURVE",
+"200 453 CURVE SMOOTH",
+"240 453 OFFCURVE",
+"243 413 OFFCURVE",
+"243 351 CURVE SMOOTH",
+"243 0 LINE",
+"359 0 LINE",
+"359 351 LINE SMOOTH",
+"359 413 OFFCURVE",
+"362 453 OFFCURVE",
+"402 453 CURVE SMOOTH",
+"442 453 OFFCURVE",
+"446 413 OFFCURVE",
+"446 351 CURVE SMOOTH",
+"446 0 LINE",
+"563 0 LINE",
+"563 308 LINE SMOOTH",
+"563 462 OFFCURVE",
+"555 560 OFFCURVE",
+"440 560 CURVE SMOOTH",
+"390 560 OFFCURVE",
+"358 539 OFFCURVE",
+"336 492 CURVE",
+"328 530 OFFCURVE",
+"287 560 OFFCURVE",
+"241 560 CURVE SMOOTH",
+"197 560 OFFCURVE",
+"160 534 OFFCURVE",
+"143 490 CURVE",
+"129 550 LINE",
+"39 550 LINE",
+"39 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 006D;
+},
+{
+glyphname = n;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"184 0 LINE",
+"184 310 LINE SMOOTH",
+"184 421 OFFCURVE",
+"223 483 OFFCURVE",
+"308 483 CURVE SMOOTH",
+"380 483 OFFCURVE",
+"422 439 OFFCURVE",
+"422 341 CURVE SMOOTH",
+"422 0 LINE",
+"512 0 LINE",
+"512 341 LINE SMOOTH",
+"512 488 OFFCURVE",
+"457 562 OFFCURVE",
+"345 562 CURVE SMOOTH",
+"271 562 OFFCURVE",
+"217 529 OFFCURVE",
+"184 466 CURVE",
+"175 550 LINE",
+"94 550 LINE",
+"94 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"225 0 LINE",
+"225 313 LINE SMOOTH",
+"225 394 OFFCURVE",
+"251 444 OFFCURVE",
+"306 444 CURVE SMOOTH",
+"351 444 OFFCURVE",
+"380 414 OFFCURVE",
+"380 337 CURVE SMOOTH",
+"380 0 LINE",
+"522 0 LINE",
+"522 355 LINE SMOOTH",
+"522 489 OFFCURVE",
+"468 560 OFFCURVE",
+"367 560 CURVE SMOOTH",
+"296 560 OFFCURVE",
+"246 526 OFFCURVE",
+"225 465 CURVE",
+"211 547 LINE",
+"83 547 LINE",
+"83 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 006E;
+},
+{
+glyphname = o;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"149 -14 OFFCURVE",
+"66 88 OFFCURVE",
+"66 273 CURVE SMOOTH",
+"66 459 OFFCURVE",
+"149 560 OFFCURVE",
+"301 560 CURVE SMOOTH",
+"452 560 OFFCURVE",
+"534 459 OFFCURVE",
+"534 273 CURVE SMOOTH",
+"534 88 OFFCURVE",
+"452 -14 OFFCURVE",
+"301 -14 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"390 62 OFFCURVE",
+"439 138 OFFCURVE",
+"439 273 CURVE SMOOTH",
+"439 409 OFFCURVE",
+"390 484 OFFCURVE",
+"301 484 CURVE SMOOTH",
+"211 484 OFFCURVE",
+"161 409 OFFCURVE",
+"161 273 CURVE SMOOTH",
+"161 138 OFFCURVE",
+"211 62 OFFCURVE",
+"301 62 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"145 -14 OFFCURVE",
+"47 97 OFFCURVE",
+"47 274 CURVE SMOOTH",
+"47 451 OFFCURVE",
+"145 560 OFFCURVE",
+"301 560 CURVE SMOOTH",
+"457 560 OFFCURVE",
+"553 451 OFFCURVE",
+"553 274 CURVE SMOOTH",
+"553 97 OFFCURVE",
+"457 -14 OFFCURVE",
+"301 -14 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"368 102 OFFCURVE",
+"410 168 OFFCURVE",
+"410 274 CURVE SMOOTH",
+"410 378 OFFCURVE",
+"368 444 OFFCURVE",
+"301 444 CURVE SMOOTH",
+"232 444 OFFCURVE",
+"190 378 OFFCURVE",
+"190 274 CURVE SMOOTH",
+"190 168 OFFCURVE",
+"232 102 OFFCURVE",
+"301 102 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 006F;
+},
+{
+glyphname = p;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"183 -208 LINE",
+"183 72 LINE",
+"213 18 OFFCURVE",
+"264 -11 OFFCURVE",
+"330 -11 CURVE SMOOTH",
+"461 -11 OFFCURVE",
+"541 99 OFFCURVE",
+"541 276 CURVE SMOOTH",
+"541 453 OFFCURVE",
+"461 563 OFFCURVE",
+"330 563 CURVE SMOOTH",
+"264 563 OFFCURVE",
+"213 535 OFFCURVE",
+"183 480 CURVE",
+"174 550 LINE",
+"93 550 LINE",
+"93 -208 LINE"
+);
+},
+{
+closed = 1;
+nodes = (
+"234 65 OFFCURVE",
+"183 138 OFFCURVE",
+"183 276 CURVE SMOOTH",
+"183 414 OFFCURVE",
+"234 487 OFFCURVE",
+"319 487 CURVE SMOOTH",
+"404 487 OFFCURVE",
+"447 414 OFFCURVE",
+"447 276 CURVE SMOOTH",
+"447 138 OFFCURVE",
+"404 65 OFFCURVE",
+"319 65 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"216 -208 LINE",
+"216 80 LINE",
+"248 20 OFFCURVE",
+"296 -11 OFFCURVE",
+"362 -11 CURVE SMOOTH",
+"484 -11 OFFCURVE",
+"558 97 OFFCURVE",
+"558 277 CURVE SMOOTH",
+"558 457 OFFCURVE",
+"484 563 OFFCURVE",
+"361 563 CURVE SMOOTH",
+"296 563 OFFCURVE",
+"248 531 OFFCURVE",
+"216 468 CURVE",
+"202 550 LINE",
+"73 550 LINE",
+"73 -208 LINE"
+);
+},
+{
+closed = 1;
+nodes = (
+"257 108 OFFCURVE",
+"216 177 OFFCURVE",
+"216 277 CURVE SMOOTH",
+"216 377 OFFCURVE",
+"257 446 OFFCURVE",
+"317 446 CURVE SMOOTH",
+"377 446 OFFCURVE",
+"415 377 OFFCURVE",
+"415 277 CURVE SMOOTH",
+"415 177 OFFCURVE",
+"377 108 OFFCURVE",
+"317 108 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0070;
+},
+{
+glyphname = q;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"515 -210 LINE",
+"515 550 LINE",
+"434 550 LINE",
+"425 480 LINE",
+"395 535 OFFCURVE",
+"345 563 OFFCURVE",
+"279 563 CURVE SMOOTH",
+"148 563 OFFCURVE",
+"67 452 OFFCURVE",
+"67 272 CURVE SMOOTH",
+"67 121 OFFCURVE",
+"127 -11 OFFCURVE",
+"276 -11 CURVE SMOOTH",
+"345 -11 OFFCURVE",
+"395 18 OFFCURVE",
+"425 73 CURVE",
+"425 -210 LINE"
+);
+},
+{
+closed = 1;
+nodes = (
+"209 65 OFFCURVE",
+"162 141 OFFCURVE",
+"162 276 CURVE SMOOTH",
+"162 411 OFFCURVE",
+"209 487 OFFCURVE",
+"294 487 CURVE SMOOTH",
+"378 487 OFFCURVE",
+"425 411 OFFCURVE",
+"425 276 CURVE SMOOTH",
+"425 141 OFFCURVE",
+"377 65 OFFCURVE",
+"294 65 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"529 -208 LINE",
+"529 550 LINE",
+"400 550 LINE",
+"386 468 LINE",
+"354 531 OFFCURVE",
+"306 563 OFFCURVE",
+"241 563 CURVE SMOOTH",
+"119 563 OFFCURVE",
+"44 456 OFFCURVE",
+"44 276 CURVE SMOOTH",
+"44 96 OFFCURVE",
+"119 -11 OFFCURVE",
+"241 -11 CURVE SMOOTH",
+"306 -11 OFFCURVE",
+"354 19 OFFCURVE",
+"386 80 CURVE",
+"386 -208 LINE"
+);
+},
+{
+closed = 1;
+nodes = (
+"225 108 OFFCURVE",
+"186 173 OFFCURVE",
+"186 277 CURVE SMOOTH",
+"186 379 OFFCURVE",
+"225 446 OFFCURVE",
+"286 446 CURVE SMOOTH",
+"347 446 OFFCURVE",
+"386 379 OFFCURVE",
+"386 277 CURVE SMOOTH",
+"386 173 OFFCURVE",
+"347 108 OFFCURVE",
+"286 108 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0071;
+},
+{
+glyphname = r;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"237 0 LINE",
+"237 272 LINE SMOOTH",
+"237 407 OFFCURVE",
+"298 480 OFFCURVE",
+"409 480 CURVE SMOOTH",
+"458 480 OFFCURVE",
+"500 466 OFFCURVE",
+"534 437 CURVE",
+"534 529 LINE",
+"500 552 OFFCURVE",
+"459 563 OFFCURVE",
+"416 563 CURVE SMOOTH",
+"331 563 OFFCURVE",
+"267 520 OFFCURVE",
+"237 443 CURVE",
+"228 550 LINE",
+"146 550 LINE",
+"146 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"260 0 LINE",
+"260 255 LINE SMOOTH",
+"260 379 OFFCURVE",
+"294 442 OFFCURVE",
+"413 442 CURVE SMOOTH",
+"471 442 OFFCURVE",
+"504 427 OFFCURVE",
+"537 399 CURVE",
+"537 535 LINE",
+"504 553 OFFCURVE",
+"466 563 OFFCURVE",
+"425 563 CURVE SMOOTH",
+"348 563 OFFCURVE",
+"288 527 OFFCURVE",
+"260 465 CURVE",
+"246 550 LINE",
+"117 550 LINE",
+"117 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0072;
+},
+{
+glyphname = s;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"421 -14 OFFCURVE",
+"503 55 OFFCURVE",
+"503 155 CURVE SMOOTH",
+"503 255 OFFCURVE",
+"411 295 OFFCURVE",
+"331 315 CURVE SMOOTH",
+"251 335 OFFCURVE",
+"197 360 OFFCURVE",
+"197 400 CURVE SMOOTH",
+"197 450 OFFCURVE",
+"239 485 OFFCURVE",
+"314 485 CURVE SMOOTH",
+"369 485 OFFCURVE",
+"423 470 OFFCURVE",
+"475 440 CURVE",
+"475 528 LINE",
+"423 549 OFFCURVE",
+"369 560 OFFCURVE",
+"314 560 CURVE SMOOTH",
+"180 560 OFFCURVE",
+"106 500 OFFCURVE",
+"106 400 CURVE SMOOTH",
+"106 300 OFFCURVE",
+"212 259 OFFCURVE",
+"292 239 CURVE SMOOTH",
+"372 219 OFFCURVE",
+"412 195 OFFCURVE",
+"412 155 CURVE SMOOTH",
+"412 105 OFFCURVE",
+"363 61 OFFCURVE",
+"288 61 CURVE SMOOTH",
+"233 61 OFFCURVE",
+"175 78 OFFCURVE",
+"104 113 CURVE",
+"104 20 LINE",
+"175 -3 OFFCURVE",
+"233 -14 OFFCURVE",
+"288 -14 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"446 -14 OFFCURVE",
+"521 44 OFFCURVE",
+"521 159 CURVE SMOOTH",
+"521 249 OFFCURVE",
+"475 299 OFFCURVE",
+"370 326 CURVE SMOOTH",
+"257 355 OFFCURVE",
+"219 369 OFFCURVE",
+"219 404 CURVE SMOOTH",
+"219 439 OFFCURVE",
+"256 456 OFFCURVE",
+"321 456 CURVE SMOOTH",
+"382 456 OFFCURVE",
+"426 441 OFFCURVE",
+"484 405 CURVE",
+"484 530 LINE",
+"426 551 OFFCURVE",
+"372 560 OFFCURVE",
+"312 560 CURVE SMOOTH",
+"164 560 OFFCURVE",
+"84 509 OFFCURVE",
+"84 394 CURVE SMOOTH",
+"84 304 OFFCURVE",
+"134 254 OFFCURVE",
+"241 229 CURVE SMOOTH",
+"353 203 OFFCURVE",
+"386 184 OFFCURVE",
+"386 149 CURVE SMOOTH",
+"386 114 OFFCURVE",
+"351 90 OFFCURVE",
+"286 90 CURVE SMOOTH",
+"228 90 OFFCURVE",
+"163 109 OFFCURVE",
+"93 145 CURVE",
+"93 20 LINE",
+"163 -3 OFFCURVE",
+"237 -14 OFFCURVE",
+"297 -14 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0073;
+},
+{
+glyphname = t;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"503 0 LINE",
+"503 76 LINE",
+"398 76 LINE SMOOTH",
+"327 76 OFFCURVE",
+"299 105 OFFCURVE",
+"299 180 CURVE SMOOTH",
+"299 480 LINE",
+"503 480 LINE",
+"503 550 LINE",
+"299 550 LINE",
+"299 735 LINE",
+"209 696 LINE",
+"209 550 LINE",
+"63 550 LINE",
+"63 480 LINE",
+"209 480 LINE",
+"209 180 LINE SMOOTH",
+"209 45 OFFCURVE",
+"258 0 OFFCURVE",
+"398 0 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"523 -2 LINE",
+"523 108 LINE",
+"408 108 LINE SMOOTH",
+"358 108 OFFCURVE",
+"336 130 OFFCURVE",
+"336 180 CURVE SMOOTH",
+"336 437 LINE",
+"523 437 LINE",
+"523 547 LINE",
+"336 547 LINE",
+"336 735 LINE",
+"193 671 LINE",
+"193 547 LINE",
+"53 547 LINE",
+"53 437 LINE",
+"193 437 LINE",
+"193 180 LINE SMOOTH",
+"193 40 OFFCURVE",
+"268 -2 OFFCURVE",
+"408 -2 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0074;
+},
+{
+glyphname = u;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"334 -14 OFFCURVE",
+"390 19 OFFCURVE",
+"422 82 CURVE",
+"431 0 LINE",
+"512 0 LINE",
+"512 550 LINE",
+"422 550 LINE",
+"422 237 LINE SMOOTH",
+"422 127 OFFCURVE",
+"374 64 OFFCURVE",
+"291 64 CURVE SMOOTH",
+"219 64 OFFCURVE",
+"184 111 OFFCURVE",
+"184 207 CURVE SMOOTH",
+"184 550 LINE",
+"94 550 LINE",
+"94 207 LINE SMOOTH",
+"94 61 OFFCURVE",
+"150 -14 OFFCURVE",
+"261 -14 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"303 -14 OFFCURVE",
+"353 20 OFFCURVE",
+"374 81 CURVE",
+"388 0 LINE",
+"517 0 LINE",
+"517 550 LINE",
+"374 550 LINE",
+"374 233 LINE SMOOTH",
+"374 151 OFFCURVE",
+"342 103 OFFCURVE",
+"288 103 CURVE SMOOTH",
+"242 103 OFFCURVE",
+"220 138 OFFCURVE",
+"220 213 CURVE SMOOTH",
+"220 550 LINE",
+"77 550 LINE",
+"77 191 LINE SMOOTH",
+"77 58 OFFCURVE",
+"132 -14 OFFCURVE",
+"233 -14 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0075;
+},
+{
+glyphname = v;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"358 0 LINE",
+"552 550 LINE",
+"459 550 LINE",
+"300 88 LINE",
+"141 550 LINE",
+"48 550 LINE",
+"242 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"388 0 LINE",
+"562 550 LINE",
+"417 550 LINE",
+"300 120 LINE",
+"183 550 LINE",
+"38 550 LINE",
+"212 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0076;
+},
+{
+glyphname = w;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"214 0 LINE",
+"301 300 LINE",
+"388 0 LINE",
+"474 0 LINE",
+"602 550 LINE",
+"513 550 LINE",
+"418 105 LINE",
+"339 387 LINE",
+"263 387 LINE",
+"184 105 LINE",
+"89 550 LINE",
+"0 550 LINE",
+"128 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"235 0 LINE",
+"301 284 LINE",
+"367 0 LINE",
+"503 0 LINE",
+"602 550 LINE",
+"483 550 LINE",
+"417 128 LINE",
+"359 404 LINE",
+"243 404 LINE",
+"185 128 LINE",
+"119 550 LINE",
+"0 550 LINE",
+"99 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0077;
+},
+{
+glyphname = x;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"140 0 LINE",
+"300 222 LINE",
+"460 0 LINE",
+"564 0 LINE",
+"349 288 LINE",
+"545 550 LINE",
+"444 550 LINE",
+"300 352 LINE",
+"155 550 LINE",
+"55 550 LINE",
+"251 288 LINE",
+"36 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"194 0 LINE",
+"301 187 LINE",
+"408 0 LINE",
+"575 0 LINE",
+"375 288 LINE",
+"559 550 LINE",
+"392 550 LINE",
+"301 387 LINE",
+"210 550 LINE",
+"43 550 LINE",
+"229 288 LINE",
+"27 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0078;
+},
+{
+glyphname = y;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"170 -208 LINE SMOOTH",
+"231 -208 OFFCURVE",
+"273 -177 OFFCURVE",
+"296 -129 CURVE",
+"562 550 LINE",
+"467 550 LINE",
+"307 119 LINE",
+"145 550 LINE",
+"50 550 LINE",
+"261 9 LINE",
+"216 -114 OFFCURVE",
+"210 -128 OFFCURVE",
+"89 -128 CURVE",
+"89 -208 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"184 -207 LINE SMOOTH",
+"291 -207 OFFCURVE",
+"320 -142 OFFCURVE",
+"351 -59 CURVE SMOOTH",
+"578 550 LINE",
+"428 550 LINE",
+"308 192 LINE",
+"183 550 LINE",
+"33 550 LINE",
+"241 15 LINE",
+"217 -87 OFFCURVE",
+"195 -88 OFFCURVE",
+"66 -88 CURVE",
+"66 -207 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0079;
+},
+{
+glyphname = z;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"507 0 LINE",
+"507 73 LINE",
+"193 73 LINE",
+"507 468 LINE",
+"507 550 LINE",
+"110 550 LINE",
+"110 478 LINE",
+"412 478 LINE",
+"98 83 LINE",
+"98 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"527 0 LINE",
+"527 107 LINE",
+"239 107 LINE",
+"527 438 LINE",
+"527 550 LINE",
+"90 550 LINE",
+"90 443 LINE",
+"366 443 LINE",
+"78 112 LINE",
+"78 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 007A;
+},
+{
+glyphname = zero;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"120 -14 OFFCURVE",
+"64 154 OFFCURVE",
+"64 364 CURVE SMOOTH {name = sh01;}",
+"64 574 OFFCURVE",
+"120 742 OFFCURVE",
+"300 742 CURVE SMOOTH {name = at01;}",
+"480 742 OFFCURVE",
+"536 574 OFFCURVE",
+"536 364 CURVE SMOOTH {name = sh04;}",
+"536 154 OFFCURVE",
+"480 -14 OFFCURVE",
+"300 -14 CURVE SMOOTH {name = hr00;}"
+);
+},
+{
+closed = 1;
+nodes = (
+"415 64 OFFCURVE",
+"437 219 OFFCURVE",
+"437 364 CURVE SMOOTH {name = sh03;}",
+"437 509 OFFCURVE",
+"415 664 OFFCURVE",
+"300 664 CURVE SMOOTH {name = sv01;}",
+"185 664 OFFCURVE",
+"163 509 OFFCURVE",
+"163 364 CURVE SMOOTH {name = sh05;}",
+"163 219 OFFCURVE",
+"185 64 OFFCURVE",
+"300 64 CURVE SMOOTH {name = dv01;}"
+);
+},
+{
+closed = 1;
+nodes = (
+"255 174 OFFCURVE",
+"249 284 OFFCURVE",
+"249 364 CURVE SMOOTH {name = sh02;}",
+"249 444 OFFCURVE",
+"255 554 OFFCURVE",
+"300 554 CURVE SMOOTH",
+"345 554 OFFCURVE",
+"351 444 OFFCURVE",
+"351 364 CURVE SMOOTH {name = sh06;}",
+"351 284 OFFCURVE",
+"345 174 OFFCURVE",
+"300 174 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"115 -14 OFFCURVE",
+"59 154 OFFCURVE",
+"59 364 CURVE SMOOTH {name = sh01;}",
+"59 574 OFFCURVE",
+"115 742 OFFCURVE",
+"300 742 CURVE SMOOTH {name = at01;}",
+"485 742 OFFCURVE",
+"541 574 OFFCURVE",
+"541 364 CURVE SMOOTH {name = sh04;}",
+"541 154 OFFCURVE",
+"485 -14 OFFCURVE",
+"300 -14 CURVE SMOOTH {name = hr00;}"
+);
+},
+{
+closed = 1;
+nodes = (
+"385 108 OFFCURVE",
+"396 234 OFFCURVE",
+"396 364 CURVE SMOOTH {name = sh03;}",
+"396 489 OFFCURVE",
+"385 620 OFFCURVE",
+"300 620 CURVE SMOOTH {name = sv01;}",
+"215 620 OFFCURVE",
+"204 494 OFFCURVE",
+"204 364 CURVE SMOOTH {name = sh05;}",
+"204 239 OFFCURVE",
+"215 108 OFFCURVE",
+"300 108 CURVE SMOOTH {name = dv01;}"
+);
+},
+{
+closed = 1;
+nodes = (
+"265 304 OFFCURVE",
+"240 329 OFFCURVE",
+"240 364 CURVE SMOOTH {name = sh02;}",
+"240 399 OFFCURVE",
+"265 424 OFFCURVE",
+"300 424 CURVE SMOOTH",
+"335 424 OFFCURVE",
+"360 399 OFFCURVE",
+"360 364 CURVE SMOOTH {name = sh08;}",
+"360 329 OFFCURVE",
+"335 304 OFFCURVE",
+"300 304 CURVE SMOOTH"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0030;
+},
+{
+glyphname = one;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"533 0 LINE {name = ab01;}",
+"533 83 LINE {name = sv01;}",
+"382 83 LINE {name = dh02;}",
+"382 730 LINE",
+"283 730 LINE {name = at01;}",
+"114 540 LINE",
+"168 475 LINE",
+"284 607 LINE",
+"284 83 LINE {name = dh01;}",
+"131 83 LINE {name = hr00;}",
+"131 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"553 0 LINE {name = ab01;}",
+"553 127 LINE {name = sv01;}",
+"392 127 LINE {name = dh02;}",
+"392 730 LINE",
+"253 730 LINE {name = at01;}",
+"74 534 LINE",
+"143 463 LINE",
+"252 582 LINE",
+"252 127 LINE {name = dh01;}",
+"91 127 LINE {name = hr00;}",
+"91 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0031;
+},
+{
+glyphname = two;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"517 0 LINE {name = ab01;}",
+"517 83 LINE {name = dh02;}",
+"179 83 LINE {name = sv02;}",
+"419 291 OFFCURVE",
+"512 410 OFFCURVE",
+"512 545 CURVE SMOOTH {name = sh01;}",
+"512 685 OFFCURVE",
+"413 742 OFFCURVE",
+"275 742 CURVE SMOOTH {name = at01;}",
+"194 742 OFFCURVE",
+"140 722 OFFCURVE",
+"80 694 CURVE",
+"80 594 LINE {name = iv01;}",
+"144 632 OFFCURVE",
+"212 660 OFFCURVE",
+"278 660 CURVE SMOOTH",
+"346 660 OFFCURVE",
+"406 630 OFFCURVE",
+"406 545 CURVE SMOOTH",
+"406 414 OFFCURVE",
+"263 272 OFFCURVE",
+"74 83 CURVE",
+"74 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"519 0 LINE {name = ab01;}",
+"519 127 LINE {name = dh02;}",
+"207 127 LINE {name = sv02;}",
+"495 396 OFFCURVE",
+"518 440 OFFCURVE",
+"518 539 CURVE SMOOTH {name = sh01;}",
+"518 658 OFFCURVE",
+"411 742 OFFCURVE",
+"272 742 CURVE SMOOTH {name = at01;}",
+"204 742 OFFCURVE",
+"136 726 OFFCURVE",
+"72 703 CURVE",
+"72 569 LINE {name = iv01;}",
+"131 603 OFFCURVE",
+"204 629 OFFCURVE",
+"259 629 CURVE SMOOTH {name = sv01;}",
+"328 629 OFFCURVE",
+"372 586 OFFCURVE",
+"372 528 CURVE SMOOTH {name = dh01;}",
+"372 457 OFFCURVE",
+"306 388 OFFCURVE",
+"56 127 CURVE {name = hr00;}",
+"56 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0032;
+},
+{
+glyphname = three;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"424 -14 OFFCURVE",
+"533 58 OFFCURVE",
+"533 201 CURVE SMOOTH {name = dh02;}",
+"533 301 OFFCURVE",
+"481 364 OFFCURVE",
+"385 390 CURVE {name = iv01;}",
+"467 411 OFFCURVE",
+"516 458 OFFCURVE",
+"516 548 CURVE SMOOTH {name = ih01;}",
+"516 673 OFFCURVE",
+"424 742 OFFCURVE",
+"283 742 CURVE SMOOTH {name = at01;}",
+"218 742 OFFCURVE",
+"157 727 OFFCURVE",
+"95 711 CURVE",
+"95 620 LINE",
+"153 643 OFFCURVE",
+"223 659 OFFCURVE",
+"280 659 CURVE SMOOTH {name = sv01;}",
+"368 659 OFFCURVE",
+"418 619 OFFCURVE",
+"418 544 CURVE SMOOTH {name = sh01;}",
+"418 464 OFFCURVE",
+"363 430 OFFCURVE",
+"274 430 CURVE SMOOTH {name = dv04;}",
+"199 430 LINE",
+"199 349 LINE",
+"274 349 LINE SMOOTH {name = dv03;}",
+"363 349 OFFCURVE",
+"435 304 OFFCURVE",
+"435 209 CURVE SMOOTH {name = dh01;}",
+"435 119 OFFCURVE",
+"369 69 OFFCURVE",
+"267 69 CURVE SMOOTH {name = dv02;}",
+"200 69 OFFCURVE",
+"134 89 OFFCURVE",
+"73 122 CURVE",
+"73 22 LINE",
+"138 0 OFFCURVE",
+"209 -14 OFFCURVE",
+"276 -14 CURVE SMOOTH {name = dv01;}"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"446 -14 OFFCURVE",
+"537 63 OFFCURVE",
+"537 202 CURVE SMOOTH {name = dh02;}",
+"537 312 OFFCURVE",
+"479 375 OFFCURVE",
+"377 393 CURVE {name = iv01;}",
+"466 409 OFFCURVE",
+"520 458 OFFCURVE",
+"520 553 CURVE SMOOTH {name = ih01;}",
+"520 683 OFFCURVE",
+"417 742 OFFCURVE",
+"275 742 CURVE SMOOTH {name = at01;}",
+"214 742 OFFCURVE",
+"146 730 OFFCURVE",
+"83 711 CURVE",
+"83 580 LINE",
+"144 603 OFFCURVE",
+"212 620 OFFCURVE",
+"267 620 CURVE SMOOTH {name = sv01;}",
+"338 620 OFFCURVE",
+"381 592 OFFCURVE",
+"381 535 CURVE SMOOTH {name = sh01;}",
+"381 479 OFFCURVE",
+"339 453 OFFCURVE",
+"268 453 CURVE SMOOTH {name = dv04;}",
+"191 453 LINE",
+"191 326 LINE",
+"268 326 LINE SMOOTH {name = dv03;}",
+"339 326 OFFCURVE",
+"399 285 OFFCURVE",
+"399 212 CURVE SMOOTH {name = dh01;}",
+"399 139 OFFCURVE",
+"343 109 OFFCURVE",
+"264 109 CURVE SMOOTH {name = dv02;}",
+"206 109 OFFCURVE",
+"120 126 OFFCURVE",
+"61 156 CURVE",
+"61 22 LINE",
+"130 -2 OFFCURVE",
+"200 -14 OFFCURVE",
+"271 -14 CURVE SMOOTH {name = dv01;}"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0033;
+},
+{
+glyphname = four;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"456 0 LINE {name = ab01;}",
+"456 174 LINE {name = dh01;}",
+"553 174 LINE {name = sv02;}",
+"553 254 LINE",
+"456 254 LINE {name = sv01;}",
+"456 730 LINE {name = sh01;}",
+"342 730 LINE {name = at01;}",
+"49 267 LINE",
+"49 174 LINE",
+"358 174 LINE {name = hr00;}",
+"358 0 LINE"
+);
+},
+{
+closed = 1;
+nodes = (
+"358 640 LINE",
+"358 254 LINE {name = sh02;}",
+"128 254 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"476 0 LINE {name = ab01;}",
+"476 157 LINE {name = dh01;}",
+"556 157 LINE {name = sv02;}",
+"556 281 LINE",
+"476 281 LINE {name = sv01;}",
+"476 730 LINE {name = sh01;}",
+"325 730 LINE {name = at01;}",
+"49 297 LINE",
+"49 157 LINE",
+"338 157 LINE {name = hr00;}",
+"338 0 LINE"
+);
+},
+{
+closed = 1;
+nodes = (
+"338 570 LINE",
+"338 281 LINE {name = sh02;}",
+"154 281 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0034;
+},
+{
+glyphname = five;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"425 -14 OFFCURVE",
+"522 80 OFFCURVE",
+"522 235 CURVE SMOOTH {name = sh03;}",
+"522 389 OFFCURVE",
+"424 482 OFFCURVE",
+"276 482 CURVE SMOOTH {name = dv03;}",
+"245 482 OFFCURVE",
+"220 478 OFFCURVE",
+"191 467 CURVE {name = sh02;}",
+"191 647 LINE",
+"470 647 LINE {name = sv01;}",
+"470 730 LINE",
+"101 730 LINE {name = at01;}",
+"101 363 LINE {name = sh01;}",
+"144 386 OFFCURVE",
+"194 399 OFFCURVE",
+"248 399 CURVE SMOOTH {name = dv02;}",
+"360 399 OFFCURVE",
+"423 340 OFFCURVE",
+"423 233 CURVE SMOOTH {name = ah01;}",
+"423 126 OFFCURVE",
+"360 69 OFFCURVE",
+"250 69 CURVE SMOOTH {name = dv01;}",
+"194 69 OFFCURVE",
+"126 87 OFFCURVE",
+"70 117 CURVE",
+"70 17 LINE",
+"129 -6 OFFCURVE",
+"206 -14 OFFCURVE",
+"256 -14 CURVE SMOOTH {name = hr00;}"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"434 -14 OFFCURVE",
+"534 79 OFFCURVE",
+"534 232 CURVE SMOOTH {name = sh03;}",
+"534 382 OFFCURVE",
+"454 480 OFFCURVE",
+"292 480 CURVE SMOOTH {name = dv03;}",
+"262 480 OFFCURVE",
+"240 477 OFFCURVE",
+"211 467 CURVE {name = sh02;}",
+"211 603 LINE",
+"490 603 LINE {name = sv01;}",
+"490 730 LINE",
+"94 730 LINE {name = at01;}",
+"94 322 LINE {name = sh01;}",
+"146 347 OFFCURVE",
+"192 360 OFFCURVE",
+"243 360 CURVE SMOOTH {name = dv02;}",
+"340 360 OFFCURVE",
+"394 314 OFFCURVE",
+"394 232 CURVE SMOOTH {name = ah01;}",
+"394 146 OFFCURVE",
+"331 107 OFFCURVE",
+"243 107 CURVE SMOOTH {name = dv01;}",
+"189 107 OFFCURVE",
+"122 122 OFFCURVE",
+"70 147 CURVE",
+"70 17 LINE",
+"130 -2 OFFCURVE",
+"200 -14 OFFCURVE",
+"260 -14 CURVE SMOOTH {name = hr00;}"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0035;
+},
+{
+glyphname = six;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"456 -14 OFFCURVE",
+"537 75 OFFCURVE",
+"537 234 CURVE SMOOTH {name = hr01;}",
+"537 390 OFFCURVE",
+"454 482 OFFCURVE",
+"320 482 CURVE SMOOTH {name = dv04;}",
+"243 482 OFFCURVE",
+"185 445 OFFCURVE",
+"156 381 CURVE {name = dh02;}",
+"156 542 OFFCURVE",
+"205 659 OFFCURVE",
+"347 659 CURVE SMOOTH {name = sv01;}",
+"395 659 OFFCURVE",
+"444 646 OFFCURVE",
+"484 622 CURVE {name = ih01;}",
+"484 713 LINE",
+"433 732 OFFCURVE",
+"393 742 OFFCURVE",
+"341 742 CURVE SMOOTH {name = at01;}",
+"162 742 OFFCURVE",
+"65 616 OFFCURVE",
+"65 354 CURVE SMOOTH {name = dh01;}",
+"65 134 OFFCURVE",
+"127 -14 OFFCURVE",
+"310 -14 CURVE SMOOTH {name = dv01;}"
+);
+},
+{
+closed = 1;
+nodes = (
+"217 63 OFFCURVE",
+"173 134 OFFCURVE",
+"173 234 CURVE SMOOTH {name = sh01;}",
+"173 334 OFFCURVE",
+"217 405 OFFCURVE",
+"307 405 CURVE SMOOTH {name = dv03;}",
+"398 405 OFFCURVE",
+"441 334 OFFCURVE",
+"441 234 CURVE SMOOTH {name = dh03;}",
+"441 134 OFFCURVE",
+"397 63 OFFCURVE",
+"307 63 CURVE SMOOTH {name = dv02;}"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"473 -15 OFFCURVE",
+"548 88 OFFCURVE",
+"548 243 CURVE SMOOTH {name = hr01;}",
+"548 388 OFFCURVE",
+"480 481 OFFCURVE",
+"343 481 CURVE SMOOTH {name = dv04;}",
+"282 481 OFFCURVE",
+"232 463 OFFCURVE",
+"199 417 CURVE {name = dh02;}",
+"204 555 OFFCURVE",
+"257 626 OFFCURVE",
+"360 626 CURVE SMOOTH {name = sv01;}",
+"414 626 OFFCURVE",
+"460 607 OFFCURVE",
+"503 582 CURVE {name = ih01;}",
+"503 713 LINE",
+"456 732 OFFCURVE",
+"412 742 OFFCURVE",
+"357 742 CURVE SMOOTH {name = at01;}",
+"138 742 OFFCURVE",
+"64 585 OFFCURVE",
+"64 354 CURVE SMOOTH {name = dh01;}",
+"64 134 OFFCURVE",
+"123 -15 OFFCURVE",
+"314 -15 CURVE SMOOTH {name = dv01;}"
+);
+},
+{
+closed = 1;
+nodes = (
+"244 101 OFFCURVE",
+"218 158 OFFCURVE",
+"218 233 CURVE SMOOTH {name = sh01;}",
+"218 308 OFFCURVE",
+"243 365 OFFCURVE",
+"313 365 CURVE SMOOTH {name = dv03;}",
+"383 365 OFFCURVE",
+"411 308 OFFCURVE",
+"411 233 CURVE SMOOTH {name = dh03;}",
+"411 158 OFFCURVE",
+"384 101 OFFCURVE",
+"314 101 CURVE SMOOTH {name = dv02;}"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0036;
+},
+{
+glyphname = seven;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"265 0 LINE {name = ab01;}",
+"526 688 LINE",
+"526 730 LINE",
+"67 730 LINE {name = at01;}",
+"67 647 LINE",
+"416 647 LINE {name = hr00;}",
+"162 0 LINE"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"279 0 LINE {name = ab01;}",
+"526 628 LINE",
+"526 730 LINE",
+"65 730 LINE {name = at01;}",
+"65 603 LINE",
+"369 603 LINE {name = hr00;}",
+"132 0 LINE"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0037;
+},
+{
+glyphname = eight;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"442 -14 OFFCURVE",
+"537 60 OFFCURVE",
+"537 196 CURVE SMOOTH {name = sh01;}",
+"537 299 OFFCURVE",
+"486 367 OFFCURVE",
+"386 387 CURVE {name = ih04;}",
+"469 407 OFFCURVE",
+"520 465 OFFCURVE",
+"520 555 CURVE SMOOTH {name = dh04;}",
+"520 675 OFFCURVE",
+"430 742 OFFCURVE",
+"300 742 CURVE SMOOTH {name = at01;}",
+"170 742 OFFCURVE",
+"80 675 OFFCURVE",
+"80 555 CURVE SMOOTH {name = ih03;}",
+"80 465 OFFCURVE",
+"131 407 OFFCURVE",
+"214 387 CURVE {name = ih02;}",
+"114 367 OFFCURVE",
+"63 299 OFFCURVE",
+"63 195 CURVE SMOOTH {name = dh01;}",
+"63 60 OFFCURVE",
+"151 -14 OFFCURVE",
+"300 -14 CURVE SMOOTH {name = dv01;}"
+);
+},
+{
+closed = 1;
+nodes = (
+"211 63 OFFCURVE",
+"162 116 OFFCURVE",
+"162 206 CURVE SMOOTH {name = dh02;}",
+"162 296 OFFCURVE",
+"210 346 OFFCURVE",
+"300 346 CURVE SMOOTH {name = dv02;}",
+"390 346 OFFCURVE",
+"438 294 OFFCURVE",
+"438 204 CURVE SMOOTH {name = ih01;}",
+"438 114 OFFCURVE",
+"391 63 OFFCURVE",
+"300 63 CURVE SMOOTH {name = hr03;}"
+);
+},
+{
+closed = 1;
+nodes = (
+"220 424 OFFCURVE",
+"178 464 OFFCURVE",
+"178 544 CURVE SMOOTH {name = sh02;}",
+"178 624 OFFCURVE",
+"220 666 OFFCURVE",
+"300 666 CURVE SMOOTH {name = hr02;}",
+"380 666 OFFCURVE",
+"422 624 OFFCURVE",
+"422 544 CURVE SMOOTH {name = dh03;}",
+"422 464 OFFCURVE",
+"380 424 OFFCURVE",
+"300 424 CURVE SMOOTH {name = dv03;}"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"449 -14 OFFCURVE",
+"538 75 OFFCURVE",
+"538 202 CURVE SMOOTH {name = sh02;}",
+"538 295 OFFCURVE",
+"490 362 OFFCURVE",
+"409 386 CURVE {name = ih03;}",
+"485 413 OFFCURVE",
+"520 471 OFFCURVE",
+"520 547 CURVE SMOOTH {name = dh04;}",
+"520 671 OFFCURVE",
+"435 742 OFFCURVE",
+"300 742 CURVE SMOOTH {name = at01;}",
+"165 742 OFFCURVE",
+"80 668 OFFCURVE",
+"80 547 CURVE SMOOTH {name = ih01;}",
+"80 468 OFFCURVE",
+"119 413 OFFCURVE",
+"193 386 CURVE {name = ih02;}",
+"108 362 OFFCURVE",
+"62 295 OFFCURVE",
+"62 202 CURVE SMOOTH {name = dh01;}",
+"62 75 OFFCURVE",
+"152 -14 OFFCURVE",
+"300 -14 CURVE SMOOTH {name = dv01;}"
+);
+},
+{
+closed = 1;
+nodes = (
+"235 102 OFFCURVE",
+"192 148 OFFCURVE",
+"192 213 CURVE SMOOTH {name = dh02;}",
+"192 278 OFFCURVE",
+"235 324 OFFCURVE",
+"300 324 CURVE SMOOTH {name = dv02;}",
+"365 324 OFFCURVE",
+"408 278 OFFCURVE",
+"408 213 CURVE SMOOTH {name = ih04;}",
+"408 148 OFFCURVE",
+"365 102 OFFCURVE",
+"300 102 CURVE SMOOTH {name = hr03;}"
+);
+},
+{
+closed = 1;
+nodes = (
+"240 442 OFFCURVE",
+"208 474 OFFCURVE",
+"208 534 CURVE SMOOTH {name = sh01;}",
+"208 594 OFFCURVE",
+"240 626 OFFCURVE",
+"300 626 CURVE SMOOTH {name = hr02;}",
+"360 626 OFFCURVE",
+"392 594 OFFCURVE",
+"392 534 CURVE SMOOTH {name = dh03;}",
+"392 474 OFFCURVE",
+"360 442 OFFCURVE",
+"300 442 CURVE SMOOTH {name = dv03;}"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0038;
+},
+{
+glyphname = nine;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+paths = (
+{
+closed = 1;
+nodes = (
+"466 -14 OFFCURVE",
+"533 149 OFFCURVE",
+"533 374 CURVE SMOOTH {name = dh03;}",
+"533 599 OFFCURVE",
+"474 742 OFFCURVE",
+"289 742 CURVE SMOOTH {name = at01;}",
+"139 742 OFFCURVE",
+"61 649 OFFCURVE",
+"61 494 CURVE SMOOTH {name = dh01;}",
+"61 339 OFFCURVE",
+"157 246 OFFCURVE",
+"284 246 CURVE SMOOTH {name = dv03;}",
+"363 246 OFFCURVE",
+"413 283 OFFCURVE",
+"442 347 CURVE {name = sh01;}",
+"442 188 OFFCURVE",
+"398 69 OFFCURVE",
+"254 69 CURVE SMOOTH {name = dv02;}",
+"204 69 OFFCURVE",
+"159 83 OFFCURVE",
+"114 106 CURVE {name = ih01;}",
+"114 15 LINE",
+"159 -4 OFFCURVE",
+"209 -14 OFFCURVE",
+"259 -14 CURVE SMOOTH {name = dv01;}"
+);
+},
+{
+closed = 1;
+nodes = (
+"194 323 OFFCURVE",
+"158 394 OFFCURVE",
+"158 494 CURVE SMOOTH {name = dh02;}",
+"158 594 OFFCURVE",
+"194 665 OFFCURVE",
+"289 665 CURVE SMOOTH {name = sv01;}",
+"384 665 OFFCURVE",
+"425 594 OFFCURVE",
+"425 494 CURVE SMOOTH {name = hr01;}",
+"425 394 OFFCURVE",
+"384 323 OFFCURVE",
+"289 323 CURVE SMOOTH {name = dv04;}"
+);
+}
+);
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+paths = (
+{
+closed = 1;
+nodes = (
+"463 -19 OFFCURVE",
+"537 145 OFFCURVE",
+"537 375 CURVE SMOOTH {name = dh03;}",
+"537 595 OFFCURVE",
+"476 742 OFFCURVE",
+"287 742 CURVE SMOOTH {name = at01;}",
+"129 742 OFFCURVE",
+"53 648 OFFCURVE",
+"53 493 CURVE SMOOTH {name = dh01;}",
+"53 338 OFFCURVE",
+"124 247 OFFCURVE",
+"259 247 CURVE SMOOTH {name = dv03;}",
+"324 247 OFFCURVE",
+"371 269 OFFCURVE",
+"402 311 CURVE {name = sh01;}",
+"402 184 OFFCURVE",
+"352 97 OFFCURVE",
+"241 97 CURVE SMOOTH {name = dv02;}",
+"188 97 OFFCURVE",
+"142 117 OFFCURVE",
+"98 141 CURVE {name = ih01;}",
+"98 10 LINE",
+"142 -8 OFFCURVE",
+"187 -19 OFFCURVE",
+"244 -19 CURVE SMOOTH {name = dv01;}"
+);
+},
+{
+closed = 1;
+nodes = (
+"222 362 OFFCURVE",
+"190 412 OFFCURVE",
+"190 497 CURVE SMOOTH {name = dh02;}",
+"190 582 OFFCURVE",
+"222 632 OFFCURVE",
+"287 632 CURVE SMOOTH {name = sv01;}",
+"352 632 OFFCURVE",
+"383 582 OFFCURVE",
+"383 497 CURVE SMOOTH {name = hr01;}",
+"383 412 OFFCURVE",
+"352 362 OFFCURVE",
+"287 362 CURVE SMOOTH {name = dv04;}"
+);
+}
+);
+width = 600;
+}
+);
+unicode = 0039;
+},
+{
+glyphname = period;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+width = 600;
+}
+);
+unicode = 002E;
+},
+{
+glyphname = comma;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+width = 600;
+}
+);
+unicode = 002C;
+},
+{
+glyphname = hyphen;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+width = 600;
+}
+);
+unicode = 002D;
+},
+{
+glyphname = space;
+lastChange = "2019-03-01 03:31:25 +0000";
+layers = (
+{
+layerId = "A38A55E9-0FA0-41CB-858E-AFEB657F7EAC";
+width = 600;
+},
+{
+layerId = "61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6";
+width = 600;
+}
+);
+unicode = 0020;
+}
+);
+instances = (
+{
+interpolationCustom = 100;
+interpolationWeight = 20;
+instanceInterpolations = {
+"61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6" = -0.8;
+"A38A55E9-0FA0-41CB-858E-AFEB657F7EAC" = 1.8;
+};
+name = Thin;
+weightClass = Thin;
+},
+{
+interpolationCustom = 100;
+interpolationWeight = 40;
+instanceInterpolations = {
+"61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6" = -0.6;
+"A38A55E9-0FA0-41CB-858E-AFEB657F7EAC" = 1.6;
+};
+name = UltraLight;
+weightClass = UltraLight;
+},
+{
+interpolationCustom = 100;
+interpolationWeight = 65;
+instanceInterpolations = {
+"61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6" = -0.35;
+"A38A55E9-0FA0-41CB-858E-AFEB657F7EAC" = 1.35;
+};
+name = Light;
+weightClass = Light;
+},
+{
+interpolationCustom = 100;
+instanceInterpolations = {
+"A38A55E9-0FA0-41CB-858E-AFEB657F7EAC" = 1;
+};
+name = Regular;
+},
+{
+interpolationCustom = 100;
+interpolationWeight = 125;
+instanceInterpolations = {
+"61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6" = 0.25;
+"A38A55E9-0FA0-41CB-858E-AFEB657F7EAC" = 0.75;
+};
+name = Medium;
+weightClass = Medium;
+},
+{
+interpolationCustom = 100;
+interpolationWeight = 166;
+instanceInterpolations = {
+"61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6" = 0.66;
+"A38A55E9-0FA0-41CB-858E-AFEB657F7EAC" = 0.34;
+};
+name = Semibold;
+weightClass = SemiBold;
+},
+{
+interpolationCustom = 100;
+interpolationWeight = 200;
+instanceInterpolations = {
+"61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6" = 1;
+};
+isBold = 1;
+linkStyle = Regular;
+name = Bold;
+weightClass = Bold;
+},
+{
+interpolationCustom = 100;
+interpolationWeight = 225;
+instanceInterpolations = {
+"61F2BD45-B671-4C55-AD7E-9EE71CCEAAE6" = 1.25;
+"A38A55E9-0FA0-41CB-858E-AFEB657F7EAC" = -0.25;
+};
+name = ExtraBold;
+weightClass = ExtraBold;
+}
+);
+manufacturer = "Source Foundry";
+manufacturerURL = "https://github.com/source-foundry";
+unitsPerEm = 1000;
+userData = {
+GSDimensionPlugin.Dimensions = {
+"A38A55E9-0FA0-41CB-858E-AFEB657F7EAC" = {
+};
+};
+};
+versionMajor = 5;
+versionMinor = 0;
+}
diff --git a/source/subset-lib/lib-bold.plist b/source/subset-lib/lib-bold.plist
index 2699250e9..e4c30037f 100644
--- a/source/subset-lib/lib-bold.plist
+++ b/source/subset-lib/lib-bold.plist
@@ -353,6 +353,7 @@
 		<string>uni20B7</string>
 		<string>uni20B8</string>
 		<string>uni20B9</string>
+		<string>ruble</string>
 		<string>uni2010</string>         <!-- Begin general punctuation-->
 		<string>uni2011</string>
 		<string>figuredash</string>
@@ -2008,6 +2009,7 @@
 		<string>uni2077</string>
 		<string>uni2078</string>
 		<string>uni2079</string>
+		<string>ruble</string>
 		<string>guillemotleft</string>
 		<string>guillemotright</string>
 		<string>uni00B5</string>
diff --git a/source/subset-lib/lib-bolditalic.plist b/source/subset-lib/lib-bolditalic.plist
index 11aae8552..d56a7dc1e 100644
--- a/source/subset-lib/lib-bolditalic.plist
+++ b/source/subset-lib/lib-bolditalic.plist
@@ -353,6 +353,7 @@
 		<string>uni20B7</string>
 		<string>uni20B8</string>
 		<string>uni20B9</string>
+		<string>ruble</string>
 		<string>uni2010</string>         <!-- Begin general punctuation-->
 		<string>uni2011</string>
 		<string>figuredash</string>
@@ -1953,6 +1954,7 @@
 		<string>uni2077</string>
 		<string>uni2078</string>
 		<string>uni2079</string>
+		<string>ruble</string>
 		<string>guillemotleft</string>
 		<string>guillemotright</string>
 		<string>uni00B5</string>
diff --git a/source/subset-lib/lib-italic.plist b/source/subset-lib/lib-italic.plist
index 437f1bff5..7cc0790e3 100644
--- a/source/subset-lib/lib-italic.plist
+++ b/source/subset-lib/lib-italic.plist
@@ -353,6 +353,7 @@
 		<string>uni20B7</string>
 		<string>uni20B8</string>
 		<string>uni20B9</string>
+		<string>ruble</string>
 		<string>uni2010</string>         <!-- Begin general punctuation-->
 		<string>uni2011</string>
 		<string>figuredash</string>
@@ -1950,6 +1951,7 @@
 		<string>uni2150</string>
 		<string>uni2151</string>
 		<string>uni2070</string>
+		<string>ruble</string>
 		<string>guillemotleft</string>
 		<string>guillemotright</string>
 		<string>uni00B5</string>
diff --git a/source/subset-lib/lib-regular.plist b/source/subset-lib/lib-regular.plist
index cb27f1e7d..e46630683 100644
--- a/source/subset-lib/lib-regular.plist
+++ b/source/subset-lib/lib-regular.plist
@@ -353,6 +353,7 @@
 		<string>uni20B7</string>
 		<string>uni20B8</string>
 		<string>uni20B9</string>
+		<string>ruble</string>
 		<string>uni2010</string>         <!-- Begin general punctuation-->
 		<string>uni2011</string>
 		<string>figuredash</string>
@@ -1931,6 +1932,7 @@
 		<string>uni2077</string>
 		<string>uni2078</string>
 		<string>uni2079</string>
+		<string>ruble</string>
 		<string>guillemotleft</string>
 		<string>guillemotright</string>
 		<string>uni00B5</string>
diff --git a/tools/scripts/diff/ttdiff.sh b/tools/scripts/diff/ttdiff.sh
old mode 100644
new mode 100755
diff --git a/tools/scripts/install/sfnt2woff-zopfli-build.sh b/tools/scripts/install/sfnt2woff-zopfli-build.sh
new file mode 100755
index 000000000..4cdd9bcf7
--- /dev/null
+++ b/tools/scripts/install/sfnt2woff-zopfli-build.sh
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# /////////////////////////////////////////////////////////////////
+#
+# sfnt2woff-zopfli-build.sh
+#  A shell script that builds the sfnt2woff-zopfli build dependency
+#  Copyright 2018 Christopher Simpkins
+#  MIT License
+#
+#  Usage: ./sfnt2woff-zopfli-build.sh
+#
+# /////////////////////////////////////////////////////////////////
+
+# The sfnt2woff-zopfli build directory.
+BUILD="$HOME/sfnt2woff-zopfli-build"
+
+# sfnt2woff-zopfli version
+SFNTWOFF_VERSION="1.1.0"
+SFNTWOFF="sfnt2woff-zopfli-$SFNTWOFF_VERSION"
+
+# Path to sfnt2woff-zopfli executable
+SFNTWOFF_BIN="$BUILD/$SFNTWOFF/sfnt2woff-zopfli"
+
+if test -d "$BUILD" -o -f "$BUILD"; then
+  echo "Build directory '$BUILD' must not exist."
+  exit 1
+fi
+
+mkdir "$BUILD"
+
+cd "$BUILD" || exit 1
+
+echo "#####"
+echo "Download archive."
+echo "#####"
+
+curl -L -O "https://github.com/bramstein/sfnt2woff-zopfli/archive/v$SFNTWOFF_VERSION.tar.gz"
+
+echo "#####"
+echo "Extract archives."
+echo "#####"
+
+tar -xzvf "v$SFNTWOFF_VERSION.tar.gz"
+
+cd "$SFNTWOFF" || exit 1
+
+echo "#####"
+echo "Build $SFNTWOFF."
+echo "#####"
+
+make
+
+if [ -f "$SFNTWOFF_BIN" ]; then
+	echo "sfnt2woff-zopfli successfully built on the path '$SFNTWOFF_BIN'"
+else
+	echo "The sfnt2woff-zopfli build failed."
+	exit 1
+fi
diff --git a/tools/scripts/install/woff2-compress-build.sh b/tools/scripts/install/woff2-compress-build.sh
new file mode 100755
index 000000000..3f17c959b
--- /dev/null
+++ b/tools/scripts/install/woff2-compress-build.sh
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+# /////////////////////////////////////////////////////////////////
+#
+# woff2-compress-build.sh
+#  A shell script that builds the woff2_compress build dependency
+#  Copyright 2018 Christopher Simpkins
+#  MIT License
+#
+#  Usage: ./woff2-compress-build.sh
+#
+# /////////////////////////////////////////////////////////////////
+
+# The woff2 git clone directory.
+BUILD="$HOME"
+INST="$HOME/woff2"
+WOFF2_COMMIT="5e5f2cf20d5f9d3373a2d8b4905105f80646c014"
+
+# woff2 executable path
+WOFF2_BIN="$BUILD/woff2/woff2_compress"
+
+if test -d "$INST" -o -f "$INST"; then
+  echo "Build directory \`$INST' must not exist."
+  exit 1
+fi
+
+cd "$BUILD" || exit 1
+
+echo "#####"
+echo "git clone woff2 project"
+echo "#####"
+
+# clone the woff2 repository
+git clone --recursive https://github.com/google/woff2.git
+
+cd "$INST" || exit 1
+
+# checkout desired version tag
+echo " "
+echo "Checking out woff2 at commit $WOFF2_COMMIT"
+git checkout $WOFF2_COMMIT
+
+echo "#####"
+echo "Build woff2"
+echo "#####"
+
+make clean all
+
+if [ -f "$WOFF2_BIN" ]; then
+	echo " "
+	echo "woff2_compress successfully built on the path '$WOFF2_BIN'"
+else
+	echo "The woff2_compress build failed."
+	exit 1
+fi